@blocklet/uploader-server 0.1.90 → 0.1.91

package/es/middlewares/static-resource.d.ts

@@ -6,6 +6,5 @@ type initStaticResourceMiddlewareOptions = {
     skipRunningCheck?: boolean;
 };
 export declare const initStaticResourceMiddleware: ({ options, resourceTypes: _resourceTypes, express, skipRunningCheck: _skipRunningCheck, }?: initStaticResourceMiddlewareOptions) => (req: any, res: any, next: Function) => void;
-export declare const getCanUseResources: () => any;
 export declare const initProxyToMediaKitUploadsMiddleware: ({ options, express }?: any) => (req: any, res: any, next: Function) => Promise<any>;
 export {};

package/es/middlewares/static-resource.js

@@ -1,11 +1,13 @@
-import { existsSync } from "fs";
+import { existsSync, readdirSync, statSync, createReadStream } from "fs";
 import { join, basename } from "path";
 import config from "@blocklet/sdk/lib/config";
 import { getResources } from "@blocklet/sdk/lib/component";
 import joinUrl from "url-join";
 import component from "@blocklet/sdk/lib/component";
+import mime from "mime-types";
 import { setPDFDownloadHeader, logger } from "../utils.js";
 import { ImageBinDid } from "../constants.js";
+import ms from "ms";
 const ImgResourceType = "imgpack";
 let skipRunningCheck = false;
 let resourceTypes = [
@@ -16,13 +18,14 @@ let resourceTypes = [
     // can be string or string[]
   }
 ];
-let canUseResources = [];
+let resourcesMap = /* @__PURE__ */ new Map();
 export const mappingResource = async () => {
   try {
     const resources = getResources({
       types: resourceTypes,
       skipRunningCheck
     });
+    let canUseResources = [];
     canUseResources = resources.map((resource) => {
       const originDir = resource.path;
       const resourceType = resourceTypes.find(({ type }) => originDir.endsWith(type));
@@ -38,11 +41,46 @@ export const mappingResource = async () => {
         blacklist: resourceType.blacklist
       }));
     }).filter(Boolean).flat();
-    logger.info(
-      "Mapping can use resources count: ",
-      canUseResources.length
-      // canUseResources
-    );
+    resourcesMap.clear();
+    for (const resource of canUseResources) {
+      const { dir, whitelist, blacklist, originDir, blockletInfo } = resource;
+      if (existsSync(dir)) {
+        try {
+          const files = readdirSync(dir);
+          for (const file of files) {
+            const filePath = join(dir, file);
+            let stat;
+            try {
+              stat = statSync(filePath);
+              if (stat.isDirectory()) continue;
+            } catch (e) {
+              continue;
+            }
+            if (whitelist?.length && !whitelist.some((ext) => file.endsWith(ext))) {
+              continue;
+            }
+            if (blacklist?.length && blacklist.some((ext) => file.endsWith(ext))) {
+              continue;
+            }
+            const contentType = mime.lookup(filePath) || "application/octet-stream";
+            resourcesMap.set(file, {
+              filePath,
+              dir,
+              originDir,
+              blockletInfo,
+              whitelist,
+              blacklist,
+              mtime: stat.mtime,
+              size: stat.size,
+              contentType
+            });
+          }
+        } catch (err) {
+          logger.error(`Error scanning directory ${dir}:`, err);
+        }
+      }
+    }
+    logger.info("Mapping resources: files count:", resourcesMap.size, "directories count:", canUseResources.length);
     return canUseResources;
   } catch (error) {
     logger.error(error);
@@ -56,12 +94,26 @@ events.on(Events.componentStarted, () => mappingResource());
 events.on(Events.componentStopped, () => mappingResource());
 events.on(Events.componentUpdated, () => mappingResource());
 export const initStaticResourceMiddleware = ({
-  options,
+  options = {},
   resourceTypes: _resourceTypes = resourceTypes,
   express,
   skipRunningCheck: _skipRunningCheck
 } = {}) => {
   skipRunningCheck = !!_skipRunningCheck;
+  let maxAgeInSeconds = 31536e3;
+  const maxAge = options.maxAge || "365d";
+  if (typeof maxAge === "string") {
+    try {
+      const milliseconds = ms(maxAge);
+      maxAgeInSeconds = typeof milliseconds === "number" ? milliseconds / 1e3 : 31536e3;
+    } catch (e) {
+      logger.warn(`Invalid maxAge format: ${maxAge}, using default 1 year (31536000 seconds)`);
+    }
+  } else {
+    maxAgeInSeconds = maxAge;
+  }
+  const cacheControl = `public, max-age=${maxAgeInSeconds}`;
+  const cacheControlImmutable = `${cacheControl}, immutable`;
   if (_resourceTypes?.length > 0) {
     resourceTypes = _resourceTypes.map((item) => {
       if (typeof item === "string") {
@@ -80,39 +132,40 @@ export const initStaticResourceMiddleware = ({
   return (req, res, next) => {
     const fileName = basename(req.path || req.url?.split("?")[0]);
     try {
-      const matchCanUseResourceItem = canUseResources.find((item) => {
-        const normalizedPath = join(item.dir, fileName);
-        if (!normalizedPath?.startsWith(item.dir)) {
-          return false;
-        }
-        if (!existsSync(normalizedPath)) {
-          return false;
-        }
-        const { whitelist, blacklist } = item;
-        if (whitelist?.length && !whitelist.some((ext) => fileName?.endsWith(ext))) {
-          return false;
+      const resource = resourcesMap.get(fileName);
+      if (resource) {
+        res.setHeader("Content-Type", resource.contentType);
+        res.setHeader("Content-Length", resource.size);
+        res.setHeader("Last-Modified", resource.mtime.toUTCString());
+        res.setHeader("Cache-Control", options.immutable === false ? cacheControl : cacheControlImmutable);
+        if (options.setHeaders && typeof options.setHeaders === "function") {
+          const statObj = { mtime: resource.mtime, size: resource.size };
+          options.setHeaders(res, resource.filePath, statObj);
         }
-        if (blacklist?.length && blacklist.some((ext) => fileName?.endsWith(ext))) {
-          return false;
+        const ifModifiedSince = req.headers["if-modified-since"];
+        if (ifModifiedSince) {
+          const ifModifiedSinceDate = new Date(ifModifiedSince);
+          if (resource.mtime <= ifModifiedSinceDate) {
+            res.statusCode = 304;
+            res.end();
+            return;
+          }
         }
-        return true;
-      });
-      if (matchCanUseResourceItem) {
-        express.static(matchCanUseResourceItem.dir, {
-          maxAge: "365d",
-          immutable: true,
-          index: false,
-          ...options
-        })(req, res, next);
+        const fileStream = createReadStream(resource.filePath);
+        fileStream.on("error", (error) => {
+          logger.error(`Error streaming file ${resource.filePath}:`, error);
+          next(error);
+        });
+        fileStream.pipe(res);
       } else {
         next();
       }
     } catch (error) {
+      logger.error("Error serving static file:", error);
       next();
     }
   };
 };
-export const getCanUseResources = () => canUseResources;
 export const initProxyToMediaKitUploadsMiddleware = ({ options, express } = {}) => {
   return async (req, res, next) => {
     if (!component.getComponentWebEndpoint(ImageBinDid)) {

package/lib/middlewares/static-resource.d.ts

@@ -6,6 +6,5 @@ type initStaticResourceMiddlewareOptions = {
     skipRunningCheck?: boolean;
 };
 export declare const initStaticResourceMiddleware: ({ options, resourceTypes: _resourceTypes, express, skipRunningCheck: _skipRunningCheck, }?: initStaticResourceMiddlewareOptions) => (req: any, res: any, next: Function) => void;
-export declare const getCanUseResources: () => any;
 export declare const initProxyToMediaKitUploadsMiddleware: ({ options, express }?: any) => (req: any, res: any, next: Function) => Promise<any>;
 export {};

package/lib/middlewares/static-resource.js

@@ -3,14 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mappingResource = exports.initStaticResourceMiddleware = exports.initProxyToMediaKitUploadsMiddleware = exports.getCanUseResources = void 0;
+exports.mappingResource = exports.initStaticResourceMiddleware = exports.initProxyToMediaKitUploadsMiddleware = void 0;
 var _fs = require("fs");
 var _path = require("path");
 var _config = _interopRequireDefault(require("@blocklet/sdk/lib/config"));
 var _component = _interopRequireWildcard(require("@blocklet/sdk/lib/component"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
+var _mimeTypes = _interopRequireDefault(require("mime-types"));
 var _utils = require("../utils");
 var _constants = require("../constants");
+var _ms = _interopRequireDefault(require("ms"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -22,13 +24,14 @@ let resourceTypes = [{
   folder: ""
   // can be string or string[]
 }];
-let canUseResources = [];
+let resourcesMap = /* @__PURE__ */new Map();
 const mappingResource = async () => {
   try {
     const resources = (0, _component.getResources)({
       types: resourceTypes,
       skipRunningCheck
     });
+    let canUseResources = [];
     canUseResources = resources.map(resource => {
       const originDir = resource.path;
       const resourceType = resourceTypes.find(({
@@ -46,9 +49,52 @@ const mappingResource = async () => {
         blacklist: resourceType.blacklist
       }));
     }).filter(Boolean).flat();
-    _utils.logger.info("Mapping can use resources count: ", canUseResources.length
-    // canUseResources
-    );
+    resourcesMap.clear();
+    for (const resource of canUseResources) {
+      const {
+        dir,
+        whitelist,
+        blacklist,
+        originDir,
+        blockletInfo
+      } = resource;
+      if ((0, _fs.existsSync)(dir)) {
+        try {
+          const files = (0, _fs.readdirSync)(dir);
+          for (const file of files) {
+            const filePath = (0, _path.join)(dir, file);
+            let stat;
+            try {
+              stat = (0, _fs.statSync)(filePath);
+              if (stat.isDirectory()) continue;
+            } catch (e) {
+              continue;
+            }
+            if (whitelist?.length && !whitelist.some(ext => file.endsWith(ext))) {
+              continue;
+            }
+            if (blacklist?.length && blacklist.some(ext => file.endsWith(ext))) {
+              continue;
+            }
+            const contentType = _mimeTypes.default.lookup(filePath) || "application/octet-stream";
+            resourcesMap.set(file, {
+              filePath,
+              dir,
+              originDir,
+              blockletInfo,
+              whitelist,
+              blacklist,
+              mtime: stat.mtime,
+              size: stat.size,
+              contentType
+            });
+          }
+        } catch (err) {
+          _utils.logger.error(`Error scanning directory ${dir}:`, err);
+        }
+      }
+    }
+    _utils.logger.info("Mapping resources: files count:", resourcesMap.size, "directories count:", canUseResources.length);
     return canUseResources;
   } catch (error) {
     _utils.logger.error(error);
@@ -66,12 +112,26 @@ events.on(Events.componentStarted, () => mappingResource());
 events.on(Events.componentStopped, () => mappingResource());
 events.on(Events.componentUpdated, () => mappingResource());
 const initStaticResourceMiddleware = ({
-  options,
+  options = {},
   resourceTypes: _resourceTypes = resourceTypes,
   express,
   skipRunningCheck: _skipRunningCheck
 } = {}) => {
   skipRunningCheck = !!_skipRunningCheck;
+  let maxAgeInSeconds = 31536e3;
+  const maxAge = options.maxAge || "365d";
+  if (typeof maxAge === "string") {
+    try {
+      const milliseconds = (0, _ms.default)(maxAge);
+      maxAgeInSeconds = typeof milliseconds === "number" ? milliseconds / 1e3 : 31536e3;
+    } catch (e) {
+      _utils.logger.warn(`Invalid maxAge format: ${maxAge}, using default 1 year (31536000 seconds)`);
+    }
+  } else {
+    maxAgeInSeconds = maxAge;
+  }
+  const cacheControl = `public, max-age=${maxAgeInSeconds}`;
+  const cacheControlImmutable = `${cacheControl}, immutable`;
   if (_resourceTypes?.length > 0) {
     resourceTypes = _resourceTypes.map(item => {
       if (typeof item === "string") {
@@ -90,44 +150,44 @@ const initStaticResourceMiddleware = ({
   return (req, res, next) => {
     const fileName = (0, _path.basename)(req.path || req.url?.split("?")[0]);
     try {
-      const matchCanUseResourceItem = canUseResources.find(item => {
-        const normalizedPath = (0, _path.join)(item.dir, fileName);
-        if (!normalizedPath?.startsWith(item.dir)) {
-          return false;
-        }
-        if (!(0, _fs.existsSync)(normalizedPath)) {
-          return false;
+      const resource = resourcesMap.get(fileName);
+      if (resource) {
+        res.setHeader("Content-Type", resource.contentType);
+        res.setHeader("Content-Length", resource.size);
+        res.setHeader("Last-Modified", resource.mtime.toUTCString());
+        res.setHeader("Cache-Control", options.immutable === false ? cacheControl : cacheControlImmutable);
+        if (options.setHeaders && typeof options.setHeaders === "function") {
+          const statObj = {
+            mtime: resource.mtime,
+            size: resource.size
+          };
+          options.setHeaders(res, resource.filePath, statObj);
         }
-        const {
-          whitelist,
-          blacklist
-        } = item;
-        if (whitelist?.length && !whitelist.some(ext => fileName?.endsWith(ext))) {
-          return false;
+        const ifModifiedSince = req.headers["if-modified-since"];
+        if (ifModifiedSince) {
+          const ifModifiedSinceDate = new Date(ifModifiedSince);
+          if (resource.mtime <= ifModifiedSinceDate) {
+            res.statusCode = 304;
+            res.end();
+            return;
+          }
         }
-        if (blacklist?.length && blacklist.some(ext => fileName?.endsWith(ext))) {
-          return false;
-        }
-        return true;
-      });
-      if (matchCanUseResourceItem) {
-        express.static(matchCanUseResourceItem.dir, {
-          maxAge: "365d",
-          immutable: true,
-          index: false,
-          ...options
-        })(req, res, next);
+        const fileStream = (0, _fs.createReadStream)(resource.filePath);
+        fileStream.on("error", error => {
+          _utils.logger.error(`Error streaming file ${resource.filePath}:`, error);
+          next(error);
+        });
+        fileStream.pipe(res);
       } else {
         next();
       }
     } catch (error) {
+      _utils.logger.error("Error serving static file:", error);
       next();
     }
   };
 };
 exports.initStaticResourceMiddleware = initStaticResourceMiddleware;
-const getCanUseResources = () => canUseResources;
-exports.getCanUseResources = getCanUseResources;
 const initProxyToMediaKitUploadsMiddleware = ({
   options,
   express

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/uploader-server",
-  "version": "0.1.90",
+  "version": "0.1.91",
   "description": "blocklet upload server",
   "publishConfig": {
     "access": "public"
@@ -61,6 +61,7 @@
     "express-session": "1.17.3",
     "isbot": "^5.1.17",
     "mime-types": "^2.1.35",
+    "ms": "^2.1.3",
     "p-queue": "6.6.2",
     "ufo": "^1.5.4",
     "url-join": "^4.0.1"