@nocobase/plugin-file-manager 2.1.0-beta.37 → 2.1.0-beta.38

package/dist/server/storages/s3.js

@@ -173,6 +173,32 @@ class s3_default extends import__.StorageType {
       Deleted
     };
   }
+  async exists(record) {
+    try {
+      await this.client.send(
+        new import_client_s3.HeadObjectCommand({
+          Bucket: this.storage.options.bucket,
+          Key: this.getFileKey(record)
+        })
+      );
+      return true;
+    } catch (error) {
+      if (["NotFound", "NoSuchKey", "NoSuchBucket"].includes(error.name)) {
+        return false;
+      }
+      throw error;
+    }
+  }
+  async copy(source, target) {
+    const sourceKey = this.getFileKey(source);
+    await this.client.send(
+      new import_client_s3.CopyObjectCommand({
+        Bucket: this.storage.options.bucket,
+        Key: this.getFileKey(target),
+        CopySource: `${this.storage.options.bucket}/${sourceKey.split("/").map((segment) => encodeURIComponent(segment)).join("/")}`
+      })
+    );
+  }
   async delete(records) {
     const { Deleted } = await this.deleteS3Objects(
       this.storage.options.bucket,

package/dist/server/storages/tx-cos.d.ts

@@ -36,6 +36,8 @@ export default class extends StorageType {
     };
     static filenameKey: string;
     make(): TxCosStorage;
+    exists(record: AttachmentModel): Promise<boolean>;
+    copy(source: AttachmentModel, target: AttachmentModel): Promise<void>;
     delete(records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
 }
 export {};

package/dist/server/storages/tx-cos.js

@@ -160,6 +160,33 @@ class tx_cos_default extends import__.StorageType {
       filename: (0, import_utils.cloudFilenameGetter)(this.storage)
     });
   }
+  async exists(record) {
+    const { cos } = this.make();
+    try {
+      await (0, import_util.promisify)(cos.headObject).call(cos, {
+        Region: this.storage.options.Region,
+        Bucket: this.storage.options.Bucket,
+        Key: (0, import_utils.getFileKey)(record)
+      });
+      return true;
+    } catch (error) {
+      if (["NoSuchKey", "NotFound"].includes(error.name)) {
+        return false;
+      }
+      throw error;
+    }
+  }
+  async copy(source, target) {
+    const { cos } = this.make();
+    const sourceKey = (0, import_utils.getFileKey)(source);
+    const copySource = `${this.storage.options.Bucket}.cos.${this.storage.options.Region}.myqcloud.com/${sourceKey.split("/").map((segment) => encodeURIComponent(segment)).join("/")}`;
+    await (0, import_util.promisify)(cos.putObjectCopy).call(cos, {
+      Region: this.storage.options.Region,
+      Bucket: this.storage.options.Bucket,
+      Key: (0, import_utils.getFileKey)(target),
+      CopySource: copySource
+    });
+  }
   async delete(records) {
     const { cos } = this.make();
     const { Deleted } = await (0, import_util.promisify)(cos.deleteMultipleObject).call(cos, {

package/dist/server/utils.js

@@ -49,6 +49,13 @@ var import_utils = require("@nocobase/utils");
 var import_crypto = __toESM(require("crypto"));
 var import_path = __toESM(require("path"));
 var import_url_join = __toESM(require("url-join"));
+const INVALID_FILENAME_CHARS = /* @__PURE__ */ new Set(["<", ">", "?", "*", "|", ":", '"', "\\", "/"]);
+function sanitizeFilename(value) {
+  return Array.from(value).map((char) => {
+    const code = char.charCodeAt(0);
+    return code < 32 || code === 127 || INVALID_FILENAME_CHARS.has(char) ? "-" : char;
+  }).join("");
+}
 function normalizeOriginalname(file) {
   const originalname = file == null ? void 0 : file.originalname;
   if (!originalname) {
@@ -57,6 +64,9 @@ function normalizeOriginalname(file) {
   if (Buffer.isBuffer(originalname)) {
     return originalname.toString("utf8");
   }
+  if (Array.from(originalname).some((char) => char.charCodeAt(0) > 255)) {
+    return originalname;
+  }
   const decoded = Buffer.from(originalname, "binary").toString("utf8");
   if (decoded.includes("\uFFFD")) {
     return originalname;
@@ -65,13 +75,13 @@ function normalizeOriginalname(file) {
 }
 function getFilename(req, file, cb) {
   const originalname = normalizeOriginalname(file);
-  const baseName = import_path.default.basename(originalname.replace(/[<>?*|:"\\/]/g, "-"), import_path.default.extname(originalname));
+  const baseName = import_path.default.basename(sanitizeFilename(originalname), import_path.default.extname(originalname));
   cb(null, `${baseName}-${(0, import_utils.uid)(6)}${import_path.default.extname(originalname)}`);
 }
 function getOriginalFilename(file) {
   const originalname = normalizeOriginalname(file);
   const extname = import_path.default.extname(originalname);
-  const baseName = import_path.default.basename(originalname.replace(/[<>?*|:"\\/]/g, "-"), extname);
+  const baseName = import_path.default.basename(sanitizeFilename(originalname), extname);
   return `${baseName}${extname}`;
 }
 const cloudFilenameGetter = (storage) => (req, file, cb) => {

package/dist/shared/previewer/filePreviewTypes.d.ts

@@ -40,4 +40,7 @@ export declare const getDownloadFileName: (file: any, url?: string) => string;
 export declare const getFallbackIcon: (file: any, url?: string) => string;
 export declare const getPreviewThumbnailUrl: (file: any) => string;
 export declare const wrapWithModalPreviewer: (Previewer: React.ComponentType<FilePreviewerProps>) => (props: FilePreviewerProps) => React.JSX.Element;
+type PdfPreviewErrorCode = 'resources' | 'file' | 'document';
+export declare const getPdfPreviewErrorCode: (error: unknown) => PdfPreviewErrorCode;
 export declare const FilePreviewRenderer: (props: FilePreviewerProps) => React.JSX.Element;
+export {};

package/dist/shared/previewer/filePreviewTypes.js

@@ -44,6 +44,7 @@ __export(filePreviewTypes_exports, {
   getFileExt: () => getFileExt,
   getFileName: () => getFileName,
   getFileUrl: () => getFileUrl,
+  getPdfPreviewErrorCode: () => getPdfPreviewErrorCode,
   getPreviewFileUrl: () => getPreviewFileUrl,
   getPreviewThumbnailUrl: () => getPreviewThumbnailUrl,
   isActiveContentFile: () => isActiveContentFile,
@@ -374,6 +375,22 @@ const IframePreviewer = ({ file }) => {
   return /* @__PURE__ */ import_react.default.createElement("iframe", { src, width: "100%", height: "100%", style: { border: "none" } });
 };
 let pdfjsPromise = null;
+class PdfPreviewError extends Error {
+  code;
+  cause;
+  constructor(code, message, cause) {
+    super(message);
+    this.name = "PdfPreviewError";
+    this.code = code;
+    this.cause = cause;
+  }
+}
+const getPdfPreviewErrorCode = (error) => {
+  if (error instanceof PdfPreviewError) {
+    return error.code;
+  }
+  return "document";
+};
 const loadPdfJs = async () => {
   if (!pdfjsPromise) {
     pdfjsPromise = import("pdfjs-dist/build/pdf.mjs");
@@ -381,13 +398,18 @@ const loadPdfJs = async () => {
   return pdfjsPromise;
 };
 const PDF_SCALE = 1.4;
+const PDF_PREVIEW_ERROR_MESSAGES = {
+  resources: "PDF preview resources failed to load. Please refresh the page and check whether plugin static files are deployed correctly.",
+  file: "PDF preview failed to load the file. If the file is stored on another domain, configure CORS for the external storage to allow this site to read the file.",
+  document: "PDF preview failed. Please download the file to preview it."
+};
 const PdfPreviewer = ({ file }) => {
-  const { t } = (0, import_react_i18next.useTranslation)();
+  const { t } = (0, import_react_i18next.useTranslation)(import_locale.NAMESPACE);
   const src = getFileUrl(file);
   const pageElsRef = import_react.default.useRef(/* @__PURE__ */ new Map());
   const sessionRef = import_react.default.useRef(null);
   const [meta, setMeta] = import_react.default.useState(null);
-  const [error, setError] = import_react.default.useState(false);
+  const [errorCode, setErrorCode] = import_react.default.useState(null);
   import_react.default.useEffect(() => {
     if (!src) {
       return;
@@ -402,29 +424,55 @@ const PdfPreviewer = ({ file }) => {
     };
     sessionRef.current = session;
     setMeta(null);
-    setError(false);
+    setErrorCode(null);
     const init = async () => {
-      const pdfjs = await loadPdfJs();
+      let pdfjs;
+      try {
+        pdfjs = await loadPdfJs();
+      } catch (error) {
+        throw new PdfPreviewError("resources", "Failed to load PDF.js resources.", error);
+      }
       if (session.cancelled) {
         return;
       }
       session.pdfjs = pdfjs;
-      const url = new URL(src, location.href);
-      const response = await fetch(url, {
-        credentials: url.origin === location.origin ? "include" : "omit",
-        signal: session.abortController.signal
-      });
+      let url;
+      try {
+        url = new URL(src, location.href);
+      } catch (error) {
+        throw new PdfPreviewError("file", "Invalid PDF file URL.", error);
+      }
+      let response;
+      try {
+        response = await fetch(url, {
+          credentials: url.origin === location.origin ? "include" : "omit",
+          signal: session.abortController.signal
+        });
+      } catch (error) {
+        throw new PdfPreviewError("file", "Failed to fetch PDF file.", error);
+      }
       if (!response.ok) {
-        throw new Error(`Failed to load PDF: ${response.status}`);
+        throw new PdfPreviewError("file", `Failed to fetch PDF file: ${response.status}`);
+      }
+      let data;
+      try {
+        data = new Uint8Array(await response.arrayBuffer());
+      } catch (error) {
+        throw new PdfPreviewError("file", "Failed to read PDF file response.", error);
       }
-      const data = new Uint8Array(await response.arrayBuffer());
       if (session.cancelled) {
         return;
       }
       session.data = data;
-      session.worker = pdfjs.PDFWorker.create({
-        port: new Worker(new URL("pdfjs-dist/build/pdf.worker.min.mjs", import_meta.url), { type: "module" })
-      });
+      try {
+        pdfjs.GlobalWorkerOptions.workerSrc = new URL(
+          "pdfjs-dist/build/pdf.worker.min.mjs",
+          import_meta.url
+        ).toString();
+        session.worker = pdfjs.PDFWorker.create({});
+      } catch (error) {
+        throw new PdfPreviewError("resources", "Failed to load PDF.js worker.", error);
+      }
       const metaTask = pdfjs.getDocument({
         data: data.slice(0),
         isEvalSupported: false,
@@ -433,7 +481,12 @@ const PdfPreviewer = ({ file }) => {
         worker: session.worker
       });
       session.loadingTasks.push(metaTask);
-      const metaPdf = await metaTask.promise;
+      let metaPdf;
+      try {
+        metaPdf = await metaTask.promise;
+      } catch (error) {
+        throw new PdfPreviewError("document", "Failed to parse PDF file.", error);
+      }
       if (session.cancelled) {
         return;
       }
@@ -444,9 +497,15 @@ const PdfPreviewer = ({ file }) => {
       }
       setMeta({ numPages: metaPdf.numPages, width: viewport.width, height: viewport.height });
     };
-    init().catch(() => {
+    init().catch((error) => {
       if (!session.cancelled) {
-        setError(true);
+        const code = getPdfPreviewErrorCode(error);
+        console.warn("[file-manager] PDF preview failed", {
+          code,
+          src,
+          error
+        });
+        setErrorCode(code);
       }
     });
     return () => {
@@ -528,6 +587,13 @@ const PdfPreviewer = ({ file }) => {
         session.rendered.add(pageNumber);
         (_a = session.observer) == null ? void 0 : _a.unobserve(wrapper);
       } catch (renderError) {
+        if (!session.cancelled) {
+          console.warn("[file-manager] PDF page render failed", {
+            pageNumber,
+            src,
+            error: renderError
+          });
+        }
       } finally {
         task == null ? void 0 : task.destroy();
         session.inFlight.delete(pageNumber);
@@ -551,18 +617,11 @@ const PdfPreviewer = ({ file }) => {
         session.observer = void 0;
       }
     };
-  }, [meta]);
+  }, [meta, src]);
   if (!src) {
     return null;
   }
-  return /* @__PURE__ */ import_react.default.createElement("div", { style: { width: "100%", minHeight: "100%", padding: 16 } }, error ? /* @__PURE__ */ import_react.default.createElement(
-    import_antd.Alert,
-    {
-      type: "warning",
-      showIcon: true,
-      message: t("File type is not supported for previewing, please download it to preview.")
-    }
-  ) : null, !meta && !error ? /* @__PURE__ */ import_react.default.createElement("div", { style: { display: "flex", justifyContent: "center", padding: 48 } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, null)) : null, meta ? Array.from({ length: meta.numPages }, (_, index) => index + 1).map((pageNumber) => /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { style: { width: "100%", minHeight: "100%", padding: 16 } }, errorCode ? /* @__PURE__ */ import_react.default.createElement(import_antd.Alert, { type: "warning", showIcon: true, message: t(PDF_PREVIEW_ERROR_MESSAGES[errorCode]) }) : null, !meta && !errorCode ? /* @__PURE__ */ import_react.default.createElement("div", { style: { display: "flex", justifyContent: "center", padding: 48 } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, null)) : null, meta ? Array.from({ length: meta.numPages }, (_, index) => index + 1).map((pageNumber) => /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       key: pageNumber,
@@ -681,6 +740,7 @@ const FilePreviewRenderer = (props) => {
   getFileExt,
   getFileName,
   getFileUrl,
+  getPdfPreviewErrorCode,
   getPreviewFileUrl,
   getPreviewThumbnailUrl,
   isActiveContentFile,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "2.1.0-beta.37",
+  "version": "2.1.0-beta.38",
   "displayName": "File manager",
   "displayName.ru-RU": "Менеджер файлов",
   "displayName.zh-CN": "文件管理器",
@@ -27,7 +27,6 @@
     "antd": "5.x",
     "axios": "^1.7.0",
     "cos-nodejs-sdk-v5": "^2.11.14",
-    "file-type": "^21.0.0",
     "koa-static": "^5.0.0",
     "mime-match": "^1.0.2",
     "mime-types": "^3.0.1",
@@ -41,6 +40,9 @@
     "supertest": "^6.1.6",
     "url-join": "4.0.1"
   },
+  "dependencies": {
+    "file-type": "^21.0.0"
+  },
   "peerDependencies": {
     "@nocobase/actions": "2.x",
     "@nocobase/client": "2.x",
@@ -57,5 +59,5 @@
     "Collections",
     "Collection fields"
   ],
-  "gitHead": "7132e5b83ecc0e42b54715eaf1429c72bcef34ae"
+  "gitHead": "d1c585108ff6e51c17b0b52bacb1a2d621d9c119"
 }