@blocklet/uploader-server 0.1.99 → 0.1.101

package/es/middlewares/companion.js

@@ -3,6 +3,7 @@ import bodyParser from "body-parser";
 import session from "express-session";
 import crypto from "crypto";
 const secret = crypto.randomBytes(32).toString("hex");
+const REWRITE_500_STATUS_CODE = 400;
 export function initCompanion({
   path,
   express,
@@ -44,6 +45,44 @@ export function initCompanion({
           hackerCompanion.options.providerOptions = dynamicProviderOptions;
         }
       });
+      const originalStatus = res.status.bind(res);
+      const originalSendStatus = res.sendStatus.bind(res);
+      const originalWriteHead = res.writeHead.bind(res);
+      res.status = (code) => {
+        if (code >= 500) {
+          return originalStatus(REWRITE_500_STATUS_CODE);
+        }
+        return originalStatus(code);
+      };
+      res.sendStatus = (code) => {
+        if (code >= 500) {
+          return originalSendStatus(REWRITE_500_STATUS_CODE);
+        }
+        return originalSendStatus(code);
+      };
+      res.writeHead = (statusCode, ...args) => {
+        if (res.headersSent) {
+          return originalWriteHead(statusCode, ...args);
+        }
+        const newStatusCode = statusCode >= 500 ? REWRITE_500_STATUS_CODE : statusCode;
+        return originalWriteHead(newStatusCode, ...args);
+      };
+      let _statusCode = res.statusCode;
+      Object.defineProperty(res, "statusCode", {
+        configurable: true,
+        // Allow further redefinition if necessary
+        enumerable: true,
+        get() {
+          return _statusCode;
+        },
+        set(code) {
+          if (code >= 500) {
+            _statusCode = REWRITE_500_STATUS_CODE;
+          } else {
+            _statusCode = code;
+          }
+        }
+      });
       next();
     },
     companionApp

package/es/utils.js

@@ -86,10 +86,10 @@ export async function proxyImageDownload(req, res, next) {
       }
     } catch (err) {
       logger.error("Proxy url failed: ", err);
-      res.status(500).send("Proxy url failed");
+      res.status(400).send("Proxy url failed");
     }
   } else {
-    res.status(500).send('Parameter "url" is required');
+    res.status(400).send('Parameter "url" is required');
   }
 }
 export function setPDFDownloadHeader(req, res) {

package/lib/middlewares/companion.js

@@ -10,6 +10,7 @@ var _expressSession = _interopRequireDefault(require("express-session"));
 var _crypto = _interopRequireDefault(require("crypto"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const secret = _crypto.default.randomBytes(32).toString("hex");
+const REWRITE_500_STATUS_CODE = 400;
 function initCompanion({
   path,
   express,
@@ -53,6 +54,44 @@ function initCompanion({
         hackerCompanion.options.providerOptions = dynamicProviderOptions;
       }
     });
+    const originalStatus = res.status.bind(res);
+    const originalSendStatus = res.sendStatus.bind(res);
+    const originalWriteHead = res.writeHead.bind(res);
+    res.status = code => {
+      if (code >= 500) {
+        return originalStatus(REWRITE_500_STATUS_CODE);
+      }
+      return originalStatus(code);
+    };
+    res.sendStatus = code => {
+      if (code >= 500) {
+        return originalSendStatus(REWRITE_500_STATUS_CODE);
+      }
+      return originalSendStatus(code);
+    };
+    res.writeHead = (statusCode, ...args) => {
+      if (res.headersSent) {
+        return originalWriteHead(statusCode, ...args);
+      }
+      const newStatusCode = statusCode >= 500 ? REWRITE_500_STATUS_CODE : statusCode;
+      return originalWriteHead(newStatusCode, ...args);
+    };
+    let _statusCode = res.statusCode;
+    Object.defineProperty(res, "statusCode", {
+      configurable: true,
+      // Allow further redefinition if necessary
+      enumerable: true,
+      get() {
+        return _statusCode;
+      },
+      set(code) {
+        if (code >= 500) {
+          _statusCode = REWRITE_500_STATUS_CODE;
+        } else {
+          _statusCode = code;
+        }
+      }
+    });
     next();
   }, companionApp);
   newCompanion.handle = app;

package/lib/utils.js

@@ -109,10 +109,10 @@ async function proxyImageDownload(req, res, next) {
       }
     } catch (err) {
       logger.error("Proxy url failed: ", err);
-      res.status(500).send("Proxy url failed");
+      res.status(400).send("Proxy url failed");
     }
   } else {
-    res.status(500).send('Parameter "url" is required');
+    res.status(400).send('Parameter "url" is required');
   }
 }
 function setPDFDownloadHeader(req, res) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/uploader-server",
-  "version": "0.1.99",
+  "version": "0.1.101",
   "description": "blocklet upload server",
   "publishConfig": {
     "access": "public"
@@ -49,10 +49,10 @@
     "axios": "^1.7.8"
   },
   "dependencies": {
-    "@abtnode/cron": "^1.16.43",
-    "@blocklet/constant": "^1.16.43",
-    "@blocklet/logger": "^1.16.43",
-    "@blocklet/sdk": "^1.16.43",
+    "@abtnode/cron": "^1.16.44",
+    "@blocklet/constant": "^1.16.44",
+    "@blocklet/logger": "^1.16.44",
+    "@blocklet/sdk": "^1.16.44",
     "@tus/file-store": "1.0.0",
     "@tus/server": "1.0.0",
     "@uppy/companion": "4.15.1",