@adaptivestone/framework 4.9.2 → 4.10.0

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 4.10.0
+
+[UPDATE] deps update
+[NEW] Static file middleware
+[BREAKING] This is a potencial breaking change and we switched from express.static to internal middleware that provide less features but faster. From API nothing was changed
+
 ### 4.9.2
 
 [UPDATE] deps update

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptivestone/framework",
-  "version": "4.9.2",
+  "version": "4.10.0",
   "description": "Adaptive stone node js framework",
   "main": "index.js",
   "engines": {
@@ -38,6 +38,7 @@
     "i18next-chained-backend": "^4.0.0",
     "i18next-fs-backend": "^2.0.0",
     "juice": "^9.0.0",
+    "mime": "^3.0.0",
     "minimist": "^1.2.5",
     "mongoose": "^7.0.0",
     "nodemailer": "^6.6.3",
@@ -58,7 +59,7 @@
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-vitest": "^0.3.1",
     "husky": "^8.0.0",
-    "lint-staged": "^14.0.0",
+    "lint-staged": "^15.0.0",
     "mongodb-memory-server": "^9.0.0",
     "nodemon": "^3.0.1",
     "prettier": "^3.0.0",

package/services/http/HttpServer.js

@@ -7,6 +7,7 @@ const RequestLoggerMiddleware = require('./middleware/RequestLogger');
 const I18nMiddleware = require('./middleware/I18n');
 const PrepareAppInfoMiddleware = require('./middleware/PrepareAppInfo');
 const RequestParserMiddleware = require('./middleware/RequestParser');
+const StaticFilesMiddleware = require('./middleware/StaticFiles');
 
 const Base = require('../../modules/Base');
 
@@ -33,9 +34,16 @@ class HttpServer extends Base {
       cors({
         origin: httpConfig.corsDomains,
       }),
-    ); // todo whitelist
-    this.express.use(express.static(this.app.foldersConfig.public));
-    this.express.use(express.static('./public'));
+    );
+    // todo whitelist
+    this.express.use(
+      new StaticFilesMiddleware(this.app, {
+        folders: [
+          this.app.foldersConfig.public,
+          path.join(__dirname, '../../public/files'),
+        ],
+      }).getMiddleware(),
+    );
 
     this.express.use(new RequestParserMiddleware(this.app).getMiddleware());
 

package/services/http/middleware/StaticFiles.js

@@ -0,0 +1,60 @@
+const fsPromises = require('node:fs/promises');
+const fs = require('node:fs');
+const path = require('node:path');
+const mime = require('mime');
+
+const AbstractMiddleware = require('./AbstractMiddleware');
+/**
+ * Middleware for static files
+ */
+class StaticFiles extends AbstractMiddleware {
+  constructor(app, params) {
+    super(app);
+    this.params = params;
+    if (!params || !params.folders || !params.folders.length) {
+      throw new Error('StaticFiles inited without folders config');
+    }
+  }
+
+  static get description() {
+    return 'Static file server middleware. Host you static files from public foolder. Mostly for dev.';
+  }
+
+  async middleware(req, res, next) {
+    if (req.method !== 'GET') {
+      // only get supported
+      return next();
+    }
+    const { folders } = this.params;
+
+    const promises = [];
+
+    for (const f of folders) {
+      const filePath = path.join(f, req.url);
+      promises.push(
+        fsPromises
+          .stat(filePath)
+          .catch(() => {
+            // nothing there, file just not exists
+          })
+          .then((stats) => ({ stats, file: filePath })),
+      );
+    }
+
+    const fileStats = await Promise.all(promises);
+
+    for (const fileStat of fileStats) {
+      if (fileStat.stats && fileStat.stats.isFile()) {
+        const contentType = mime.getType(fileStat.file);
+        const fileStream = fs.createReadStream(fileStat.file);
+        res.set('Content-Type', contentType);
+        fileStream.pipe(res);
+        return null;
+      }
+    }
+
+    return next();
+  }
+}
+
+module.exports = StaticFiles;