projects
/
oweals
/
peertube.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid too many requests and fetching outbox
[oweals/peertube.git]
/
server
/
controllers
/
static.ts
diff --git
a/server/controllers/static.ts
b/server/controllers/static.ts
index b20bafc76d6cbf8152960671afe031246eb9c59e..eece9c06b5103b39728f0db37030f137b97adfe6 100644
(file)
--- a/
server/controllers/static.ts
+++ b/
server/controllers/static.ts
@@
-1,24
+1,20
@@
-import * as express from 'express'
import * as cors from 'cors'
import * as cors from 'cors'
-
-import {
- CONFIG,
- STATIC_MAX_AGE,
- STATIC_PATHS
-} from '../initializers'
-import { VideosPreviewCache } from '../lib'
+import * as express from 'express'
+import { CONFIG, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers'
+import { VideosPreviewCache } from '../lib/cache'
+import { asyncMiddleware } from '../middlewares'
const staticRouter = express.Router()
/*
const staticRouter = express.Router()
/*
- Cors is very important to let other
pod
s access torrent and video files
+ Cors is very important to let other
server
s access torrent and video files
*/
const torrentsPhysicalPath = CONFIG.STORAGE.TORRENTS_DIR
staticRouter.use(
STATIC_PATHS.TORRENTS,
cors(),
*/
const torrentsPhysicalPath = CONFIG.STORAGE.TORRENTS_DIR
staticRouter.use(
STATIC_PATHS.TORRENTS,
cors(),
- express.static(torrentsPhysicalPath, { maxAge:
STATIC_MAX_AGE })
+ express.static(torrentsPhysicalPath, { maxAge:
0 }) // Don't cache because we could regenerate the torrent file
)
// Videos path for webseeding
)
// Videos path for webseeding
@@
-36,10
+32,16
@@
staticRouter.use(
express.static(thumbnailsPhysicalPath, { maxAge: STATIC_MAX_AGE })
)
express.static(thumbnailsPhysicalPath, { maxAge: STATIC_MAX_AGE })
)
+const avatarsPhysicalPath = CONFIG.STORAGE.AVATARS_DIR
+staticRouter.use(
+ STATIC_PATHS.AVATARS,
+ express.static(avatarsPhysicalPath, { maxAge: STATIC_MAX_AGE })
+)
+
// Video previews path for express
staticRouter.use(
STATIC_PATHS.PREVIEWS + ':uuid.jpg',
// Video previews path for express
staticRouter.use(
STATIC_PATHS.PREVIEWS + ':uuid.jpg',
- getPreview
+ asyncMiddleware(getPreview)
)
// ---------------------------------------------------------------------------
)
// ---------------------------------------------------------------------------
@@
-50,11
+52,9
@@
export {
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-function getPreview (req: express.Request, res: express.Response, next: express.NextFunction) {
- VideosPreviewCache.Instance.getPreviewPath(req.params.uuid)
- .then(path => {
- if (!path) return res.sendStatus(404)
+async function getPreview (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const path = await VideosPreviewCache.Instance.getPreviewPath(req.params.uuid)
+ if (!path) return res.sendStatus(404)
- return res.sendFile(path, { maxAge: STATIC_MAX_AGE })
- })
+ return res.sendFile(path, { maxAge: STATIC_MAX_AGE })
}
}