@blocklet/uploader-server 0.1.76 → 0.1.78

package/es/middlewares/local-storage.js

@@ -7,11 +7,11 @@ const crypto = require("crypto");
 const mime = require("mime-types");
 const joinUrlLib = require("url-join");
 const { default: queue } = require("p-queue");
-const { setPDFDownloadHeader } = require("../utils");
+const { setPDFDownloadHeader, logger } = require("../utils");
 const validFilePathInDirPath = (dirPath, filePath) => {
   const fileName = path.basename(filePath);
   if (!filePath.startsWith(dirPath) || path.join(dirPath, fileName) !== filePath) {
-    console.error("Invalid file path: ", filePath);
+    logger.error("Invalid file path: ", filePath);
     throw new Error("Invalid file path");
   }
   return true;
@@ -90,7 +90,7 @@ export function initLocalStorageServer({
         const result = await _onUploadFinish(req, res, uploadMetadata);
         return result;
       } catch (err) {
-        console.error("@blocklet/uploader: onUploadFinish error: ", err);
+        logger.error("@blocklet/uploader: onUploadFinish error: ", err);
         newServer.delete(uploadMetadata.id);
         res.setHeader("x-uploader-file-exist", false);
         throw err;
@@ -141,19 +141,19 @@ export function initLocalStorageServer({
         fn: () => {
           try {
             newServer.cleanUpExpiredUploads().then((count) => {
-              console.info(`@blocklet/uploader: cleanup expired uploads done: ${count}`);
+              logger.info(`@blocklet/uploader: cleanup expired uploads done: ${count}`);
             }).catch((err) => {
-              console.error(`@blocklet/uploader: cleanup expired uploads error`, err);
+              logger.error(`@blocklet/uploader: cleanup expired uploads error`, err);
             });
           } catch (err) {
-            console.error(`@blocklet/uploader: cleanup expired uploads error`, err);
+            logger.error(`@blocklet/uploader: cleanup expired uploads error`, err);
           }
         },
         options: { runOnInit: false }
       }
     ],
     onError: (err) => {
-      console.error("@blocklet/uploader: cleanup job failed", err);
+      logger.error("@blocklet/uploader: cleanup job failed", err);
     }
   });
   newServer.delete = async (key) => {
@@ -161,7 +161,7 @@ export function initLocalStorageServer({
       await configstore.delete(key);
       await configstore.delete(key, false);
     } catch (err) {
-      console.error("@blocklet/uploader: delete error: ", err);
+      logger.error("@blocklet/uploader: delete error: ", err);
     }
   };
   newServer.on(EVENTS.POST_RECEIVE, async (req, res, uploadMetadata) => {
@@ -262,7 +262,7 @@ export async function fileExistBeforeUpload(req, res, next) {
               ...realMetaData
             };
           } catch (err) {
-            console.error("@blocklet/uploader: parse metadata error: ", err);
+            logger.error("@blocklet/uploader: parse metadata error: ", err);
           }
         }
         const uploadResult = await uploaderProps.onUploadFinish(req, res, metaData);
@@ -282,7 +282,7 @@ export async function getMetaDataByFilePath(filePath) {
       const metaDataJson = JSON.parse(metaData);
       return metaDataJson;
     } catch (err) {
-      console.error("@blocklet/uploader: getMetaDataByPath error: ", err);
+      logger.error("@blocklet/uploader: getMetaDataByPath error: ", err);
     }
   }
   return null;
@@ -335,17 +335,17 @@ class RewriteFileConfigstore {
       if (isExist) {
         await fs.rm(filePath);
       } else {
-        console.log("Can not remove file, the file not exist: ", filePath);
+        logger.log("Can not remove file, the file not exist: ", filePath);
       }
     } catch (err) {
-      console.error("@blocklet/uploader: safeDeleteFile error: ", err);
+      logger.error("@blocklet/uploader: safeDeleteFile error: ", err);
     }
   }
   async delete(key, isMetadata = true) {
     try {
       await this.queue.add(() => this.safeDeleteFile(this.resolve(key, isMetadata)));
     } catch (err) {
-      console.error("@blocklet/uploader: delete error: ", err);
+      logger.error("@blocklet/uploader: delete error: ", err);
     }
   }
   async list() {

package/es/middlewares/static-resource.js

@@ -4,9 +4,8 @@ const config = require("@blocklet/sdk/lib/config");
 const { getResources } = require("@blocklet/sdk/lib/component");
 const joinUrl = require("url-join");
 const component = require("@blocklet/sdk/lib/component");
-const { setPDFDownloadHeader } = require("../utils");
+const { setPDFDownloadHeader, logger } = require("../utils");
 const { ImageBinDid } = require("../constants");
-const logger = console;
 const ImgResourceType = "imgpack";
 let skipRunningCheck = false;
 let resourceTypes = [
@@ -46,7 +45,7 @@ export const mappingResource = async () => {
     );
     return canUseResources;
   } catch (error) {
-    console.error(error);
+    logger.error(error);
   }
   return false;
 };

package/es/utils.d.ts

@@ -1,4 +1,5 @@
 import type { Method } from 'axios';
+export declare let logger: Console;
 type CallComponentOptions<D = any, P = any> = {
     name?: string;
     method?: Method;

package/es/utils.js

@@ -9,6 +9,11 @@ import crypto from "crypto";
 import { getSignData } from "@blocklet/sdk/lib/util/verify-sign";
 import FormData from "form-data";
 import omit from "lodash/omit";
+export let logger = console;
+if (process.env.BLOCKLET_LOG_DIR) {
+  const initLogger = require("@blocklet/logger");
+  logger = initLogger("uploader-server");
+}
 const DEFAULT_TTL = 5 * 60 * 1e3;
 const appUrl = process.env.BLOCKLET_APP_URL || "";
 const trustedDomainsCache = {
@@ -72,7 +77,7 @@ export async function proxyImageDownload(req, res, next) {
         throw new Error("download image error");
       }
     } catch (err) {
-      console.error("Proxy url failed: ", err);
+      logger.error("Proxy url failed: ", err);
       res.status(500).send("Proxy url failed");
     }
   } else {

package/lib/middlewares/local-storage.js

@@ -28,12 +28,13 @@ const {
   default: queue
 } = require("p-queue");
 const {
-  setPDFDownloadHeader
+  setPDFDownloadHeader,
+  logger
 } = require("../utils");
 const validFilePathInDirPath = (dirPath, filePath) => {
   const fileName = path.basename(filePath);
   if (!filePath.startsWith(dirPath) || path.join(dirPath, fileName) !== filePath) {
-    console.error("Invalid file path: ", filePath);
+    logger.error("Invalid file path: ", filePath);
     throw new Error("Invalid file path");
   }
   return true;
@@ -118,7 +119,7 @@ function initLocalStorageServer({
         const result = await _onUploadFinish(req, res, uploadMetadata);
         return result;
       } catch (err) {
-        console.error("@blocklet/uploader: onUploadFinish error: ", err);
+        logger.error("@blocklet/uploader: onUploadFinish error: ", err);
         newServer.delete(uploadMetadata.id);
         res.setHeader("x-uploader-file-exist", false);
         throw err;
@@ -171,12 +172,12 @@ function initLocalStorageServer({
       fn: () => {
         try {
           newServer.cleanUpExpiredUploads().then(count => {
-            console.info(`@blocklet/uploader: cleanup expired uploads done: ${count}`);
+            logger.info(`@blocklet/uploader: cleanup expired uploads done: ${count}`);
           }).catch(err => {
-            console.error(`@blocklet/uploader: cleanup expired uploads error`, err);
+            logger.error(`@blocklet/uploader: cleanup expired uploads error`, err);
           });
         } catch (err) {
-          console.error(`@blocklet/uploader: cleanup expired uploads error`, err);
+          logger.error(`@blocklet/uploader: cleanup expired uploads error`, err);
         }
       },
       options: {
@@ -184,7 +185,7 @@ function initLocalStorageServer({
       }
     }],
     onError: err => {
-      console.error("@blocklet/uploader: cleanup job failed", err);
+      logger.error("@blocklet/uploader: cleanup job failed", err);
     }
   });
   newServer.delete = async key => {
@@ -192,7 +193,7 @@ function initLocalStorageServer({
       await configstore.delete(key);
       await configstore.delete(key, false);
     } catch (err) {
-      console.error("@blocklet/uploader: delete error: ", err);
+      logger.error("@blocklet/uploader: delete error: ", err);
     }
   };
   newServer.on(EVENTS.POST_RECEIVE, async (req, res, uploadMetadata) => {
@@ -309,7 +310,7 @@ async function fileExistBeforeUpload(req, res, next) {
               ...realMetaData
             };
           } catch (err) {
-            console.error("@blocklet/uploader: parse metadata error: ", err);
+            logger.error("@blocklet/uploader: parse metadata error: ", err);
           }
         }
         const uploadResult = await uploaderProps.onUploadFinish(req, res, metaData);
@@ -329,7 +330,7 @@ async function getMetaDataByFilePath(filePath) {
       const metaDataJson = JSON.parse(metaData);
       return metaDataJson;
     } catch (err) {
-      console.error("@blocklet/uploader: getMetaDataByPath error: ", err);
+      logger.error("@blocklet/uploader: getMetaDataByPath error: ", err);
     }
   }
   return null;
@@ -384,17 +385,17 @@ class RewriteFileConfigstore {
       if (isExist) {
         await fs.rm(filePath);
       } else {
-        console.log("Can not remove file, the file not exist: ", filePath);
+        logger.log("Can not remove file, the file not exist: ", filePath);
       }
     } catch (err) {
-      console.error("@blocklet/uploader: safeDeleteFile error: ", err);
+      logger.error("@blocklet/uploader: safeDeleteFile error: ", err);
     }
   }
   async delete(key, isMetadata = true) {
     try {
       await this.queue.add(() => this.safeDeleteFile(this.resolve(key, isMetadata)));
     } catch (err) {
-      console.error("@blocklet/uploader: delete error: ", err);
+      logger.error("@blocklet/uploader: delete error: ", err);
     }
   }
   async list() {

package/lib/middlewares/static-resource.js

@@ -18,12 +18,12 @@ const {
 const joinUrl = require("url-join");
 const component = require("@blocklet/sdk/lib/component");
 const {
-  setPDFDownloadHeader
+  setPDFDownloadHeader,
+  logger
 } = require("../utils");
 const {
   ImageBinDid
 } = require("../constants");
-const logger = console;
 const ImgResourceType = "imgpack";
 let skipRunningCheck = false;
 let resourceTypes = [{
@@ -61,7 +61,7 @@ const mappingResource = async () => {
     );
     return canUseResources;
   } catch (error) {
-    console.error(error);
+    logger.error(error);
   }
   return false;
 };

package/lib/utils.d.ts

@@ -1,4 +1,5 @@
 import type { Method } from 'axios';
+export declare let logger: Console;
 type CallComponentOptions<D = any, P = any> = {
     name?: string;
     method?: Method;

package/lib/utils.js

@@ -7,6 +7,7 @@ exports.checkTrustedReferer = checkTrustedReferer;
 exports.getFileHash = void 0;
 exports.getMediaKitFileStream = getMediaKitFileStream;
 exports.getTrustedDomainsCache = getTrustedDomainsCache;
+exports.logger = void 0;
 exports.proxyImageDownload = proxyImageDownload;
 exports.setPDFDownloadHeader = setPDFDownloadHeader;
 exports.uploadToMediaKit = uploadToMediaKit;
@@ -22,6 +23,11 @@ var _verifySign = require("@blocklet/sdk/lib/util/verify-sign");
 var _formData = _interopRequireDefault(require("form-data"));
 var _omit = _interopRequireDefault(require("lodash/omit"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+let logger = exports.logger = console;
+if (process.env.BLOCKLET_LOG_DIR) {
+  const initLogger = require("@blocklet/logger");
+  exports.logger = logger = initLogger("uploader-server");
+}
 const DEFAULT_TTL = 5 * 60 * 1e3;
 const appUrl = process.env.BLOCKLET_APP_URL || "";
 const trustedDomainsCache = {
@@ -91,7 +97,7 @@ async function proxyImageDownload(req, res, next) {
         throw new Error("download image error");
       }
     } catch (err) {
-      console.error("Proxy url failed: ", err);
+      logger.error("Proxy url failed: ", err);
       res.status(500).send("Proxy url failed");
     }
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/uploader-server",
-  "version": "0.1.76",
+  "version": "0.1.78",
   "description": "blocklet upload server",
   "publishConfig": {
     "access": "public"
@@ -36,16 +36,15 @@
     "@uppy/companion": "4.15.1"
   },
   "dependencies": {
-    "@abtnode/cron": "^1.16.37",
-    "@blocklet/constant": "^1.16.37",
-    "@blocklet/logger": "^1.16.37",
-    "@blocklet/sdk": "^1.16.37",
+    "@abtnode/cron": "^1.16.38",
+    "@blocklet/constant": "^1.16.38",
+    "@blocklet/logger": "^1.16.38",
+    "@blocklet/sdk": "^1.16.38",
     "@tus/file-store": "1.0.0",
     "@tus/server": "1.0.0",
     "@uppy/companion": "4.15.1",
     "axios": "^1.7.8",
     "body-parser": "^1.20.3",
-    "crypto": "^1.0.1",
     "express-session": "1.17.3",
     "isbot": "^5.1.17",
     "mime-types": "^2.1.35",