diff --git a/packages/marketplace_server/src/controllers/static/index.js b/packages/marketplace_server/src/controllers/static/index.js index 00aed44b..1f579db9 100644 --- a/packages/marketplace_server/src/controllers/static/index.js +++ b/packages/marketplace_server/src/controllers/static/index.js @@ -1,27 +1,7 @@ -import path from "path" -import fs from "fs" -import LiveDirectory from "live-directory" - -function serveStaticFiles(req, res, live_dir) { +async function serveRemoteStatic(req, res) { const path = req.path.replace("/static", "") - const asset = live_dir.get(path) - - if (!asset) { - return res.status(404).send("Not Found") - } - - if (asset.cached) { - return res.send(asset.content) - } else { - const readable = asset.stream() - - return readable.pipe(res) - } -} - -async function serveRemoteStatic(req, res) { - global.storage.getObject(process.env.S3_BUCKET, req.path, (err, dataStream) => { + global.storage.getObject(process.env.S3_BUCKET, path, (err, dataStream) => { if (err) { console.log(err) return res.status(404).send("Not Found") @@ -37,33 +17,8 @@ async function serveRemoteStatic(req, res) { }) } -async function syncFolder(dir) { - const files = await fs.promises.readdir(dir) - - for await (const file of files) { - const filePath = path.resolve(dir, file) - - const stat = fs.statSync(filePath) - - if (stat.isDirectory()) { - await syncFolder(filePath) - } else { - const fileContent = await fs.promises.readFile(filePath) - - await global.storage.putObject(process.env.S3_BUCKET, filePath.replace(process.cwd(), ""), fileContent) - } - } -} - export default (router) => { - const StaticDirectory = new LiveDirectory(path.resolve(process.cwd(), "static"), { - static: true - }) - - //const static_dir = path.resolve(process.cwd(), "static") - //syncFolder(static_dir) - - router.get("*", (req, res) => serveRemoteStatic(req, res, StaticDirectory)) + router.get("*", (req, res) => serveRemoteStatic(req, res)) return { path: "/static/",