@file-viewer/core 2.0.7 → 2.0.8

package/dist/platform/assets.d.ts

@@ -8,6 +8,8 @@ export declare const DEFAULT_FILE_VIEWER_CAD_WORKER_PATH = "wasm/cad/dwg-worker.
 export declare const DEFAULT_FILE_VIEWER_CAD_DWF_WASM_PATH = "wasm/cad/dwfv-render.wasm";
 export declare const DEFAULT_FILE_VIEWER_TYPST_COMPILER_WASM_URL = "wasm/typst/typst_ts_web_compiler_bg.wasm";
 export declare const DEFAULT_FILE_VIEWER_TYPST_RENDERER_WASM_URL = "wasm/typst/typst_ts_renderer_bg.wasm";
+export declare const FALLBACK_FILE_VIEWER_TYPST_COMPILER_WASM_URL = "https://cdn.jsdelivr.net/npm/@myriaddreamin/typst-ts-web-compiler@0.7.0/pkg/typst_ts_web_compiler_bg.wasm";
+export declare const FALLBACK_FILE_VIEWER_TYPST_RENDERER_WASM_URL = "https://cdn.jsdelivr.net/npm/@myriaddreamin/typst-ts-renderer@0.7.0/pkg/typst_ts_renderer_bg.wasm";
 export declare const DEFAULT_FILE_VIEWER_TYPST_COMPILER_WASM_PACKAGE_PATH = "@myriaddreamin/typst-ts-web-compiler/pkg/typst_ts_web_compiler_bg.wasm";
 export declare const DEFAULT_FILE_VIEWER_TYPST_RENDERER_WASM_PACKAGE_PATH = "@myriaddreamin/typst-ts-renderer/pkg/typst_ts_renderer_bg.wasm";
 export declare const DEFAULT_FILE_VIEWER_DATA_SQL_WASM_URL = "wasm/data/sql-wasm.wasm";

package/dist/platform/assets.js

@@ -7,6 +7,8 @@ export const DEFAULT_FILE_VIEWER_CAD_WORKER_PATH = 'wasm/cad/dwg-worker.js';
 export const DEFAULT_FILE_VIEWER_CAD_DWF_WASM_PATH = 'wasm/cad/dwfv-render.wasm';
 export const DEFAULT_FILE_VIEWER_TYPST_COMPILER_WASM_URL = 'wasm/typst/typst_ts_web_compiler_bg.wasm';
 export const DEFAULT_FILE_VIEWER_TYPST_RENDERER_WASM_URL = 'wasm/typst/typst_ts_renderer_bg.wasm';
+export const FALLBACK_FILE_VIEWER_TYPST_COMPILER_WASM_URL = 'https://cdn.jsdelivr.net/npm/@myriaddreamin/typst-ts-web-compiler@0.7.0/pkg/typst_ts_web_compiler_bg.wasm';
+export const FALLBACK_FILE_VIEWER_TYPST_RENDERER_WASM_URL = 'https://cdn.jsdelivr.net/npm/@myriaddreamin/typst-ts-renderer@0.7.0/pkg/typst_ts_renderer_bg.wasm';
 export const DEFAULT_FILE_VIEWER_TYPST_COMPILER_WASM_PACKAGE_PATH = '@myriaddreamin/typst-ts-web-compiler/pkg/typst_ts_web_compiler_bg.wasm';
 export const DEFAULT_FILE_VIEWER_TYPST_RENDERER_WASM_PACKAGE_PATH = '@myriaddreamin/typst-ts-renderer/pkg/typst_ts_renderer_bg.wasm';
 export const DEFAULT_FILE_VIEWER_DATA_SQL_WASM_URL = 'wasm/data/sql-wasm.wasm';

package/dist/renderers/typst.js

@@ -1,5 +1,5 @@
 import { $typst } from '@myriaddreamin/typst.ts';
-import { resolveFileViewerTypstCompilerWasmUrl, resolveFileViewerTypstRendererWasmUrl, } from '../platform/assets.js';
+import { FALLBACK_FILE_VIEWER_TYPST_COMPILER_WASM_URL, FALLBACK_FILE_VIEWER_TYPST_RENDERER_WASM_URL, resolveFileViewerTypstCompilerWasmUrl, resolveFileViewerTypstRendererWasmUrl, } from '../platform/assets.js';
 import { registerFileViewerZoomProvider, unregisterFileViewerZoomProvider, } from '../features/document/dom/index.js';
 import { createFileViewerZoomChangeEmitter } from '../features/document/zoom.js';
 import { formatCssPixels } from '../output/printLayout.js';
@@ -70,15 +70,7 @@ const getWindowOverride = (key) => {
     }
     return window[key];
 };
-const configureTypstEngine = (context, documentBaseUrl) => {
-    var _a;
-    const typstOptions = (_a = context === null || context === void 0 ? void 0 : context.options) === null || _a === void 0 ? void 0 : _a.typst;
-    const compilerWasmUrl = resolveFileViewerTypstCompilerWasmUrl(typstOptions, [
-        getWindowOverride('__FLYFISH_TYPST_COMPILER_WASM_URL__'),
-    ], documentBaseUrl);
-    const rendererWasmUrl = resolveFileViewerTypstRendererWasmUrl(typstOptions, [
-        getWindowOverride('__FLYFISH_TYPST_RENDERER_WASM_URL__'),
-    ], documentBaseUrl);
+const configureTypstEngine = (compilerWasmUrl, rendererWasmUrl) => {
     const configKey = `${compilerWasmUrl}\n${rendererWasmUrl}`;
     if (typstEngineConfigKey === configKey) {
         return;
@@ -91,6 +83,69 @@ const configureTypstEngine = (context, documentBaseUrl) => {
     });
     typstEngineConfigKey = configKey;
 };
+const pushUniqueTypstCandidate = (candidates, candidate) => {
+    if (candidates.some(item => item.compilerWasmUrl === candidate.compilerWasmUrl &&
+        item.rendererWasmUrl === candidate.rendererWasmUrl)) {
+        return;
+    }
+    candidates.push(candidate);
+};
+const resolveTypstEngineCandidates = (context, documentBaseUrl) => {
+    var _a;
+    const typstOptions = (_a = context === null || context === void 0 ? void 0 : context.options) === null || _a === void 0 ? void 0 : _a.typst;
+    const compilerOverride = getWindowOverride('__FLYFISH_TYPST_COMPILER_WASM_URL__');
+    const rendererOverride = getWindowOverride('__FLYFISH_TYPST_RENDERER_WASM_URL__');
+    const compilerWasmUrl = resolveFileViewerTypstCompilerWasmUrl(typstOptions, [
+        compilerOverride,
+    ], documentBaseUrl);
+    const rendererWasmUrl = resolveFileViewerTypstRendererWasmUrl(typstOptions, [
+        rendererOverride,
+    ], documentBaseUrl);
+    const hasConfiguredAsset = Boolean((typstOptions === null || typstOptions === void 0 ? void 0 : typstOptions.compilerWasmUrl) ||
+        (typstOptions === null || typstOptions === void 0 ? void 0 : typstOptions.rendererWasmUrl) ||
+        compilerOverride ||
+        rendererOverride);
+    const candidates = [];
+    pushUniqueTypstCandidate(candidates, {
+        compilerWasmUrl,
+        rendererWasmUrl,
+        source: hasConfiguredAsset ? 'configured' : 'local',
+        preflight: !hasConfiguredAsset,
+    });
+    // Static hosts such as Cloudflare Pages reject files larger than 25 MiB.
+    // Keep the package self-contained, but let hosted demos fall back gracefully
+    // when the local compiler WASM was intentionally omitted from deployment.
+    pushUniqueTypstCandidate(candidates, {
+        compilerWasmUrl: FALLBACK_FILE_VIEWER_TYPST_COMPILER_WASM_URL,
+        rendererWasmUrl: FALLBACK_FILE_VIEWER_TYPST_RENDERER_WASM_URL,
+        source: 'cdn',
+        preflight: false,
+    });
+    return candidates;
+};
+const isHttpUrl = (url) => /^https?:\/\//i.test(url);
+const isKnownMissingWasmUrl = async (url) => {
+    if (typeof fetch !== 'function' || !isHttpUrl(url)) {
+        return false;
+    }
+    try {
+        const response = await fetch(url, {
+            cache: 'force-cache',
+            method: 'HEAD',
+        });
+        return response.status === 404 || response.status === 410;
+    }
+    catch {
+        return false;
+    }
+};
+const isTypstAssetLoadError = (error) => {
+    if (Array.isArray(error)) {
+        return false;
+    }
+    const message = error instanceof Error ? error.message : String(error);
+    return /wasm|webassembly|fetch|module|instantiate|compile|network|404|410/i.test(message);
+};
 const escapeAttribute = (value) => {
     return value.replace(/[&<>"']/g, char => {
         const entities = {
@@ -426,8 +481,39 @@ export default async function renderTypst(buffer, target, _type, context) {
             renderPages();
         }
     };
+    const renderTypstSvg = async () => {
+        var _a, _b;
+        const candidates = resolveTypstEngineCandidates(context, documentRef.baseURI);
+        const timeoutMs = normalizeRenderTimeoutMs((_b = (_a = context === null || context === void 0 ? void 0 : context.options) === null || _a === void 0 ? void 0 : _a.typst) === null || _b === void 0 ? void 0 : _b.renderTimeoutMs);
+        let lastError;
+        for (const candidate of candidates) {
+            if (candidate.preflight && await isKnownMissingWasmUrl(candidate.compilerWasmUrl)) {
+                lastError = new Error(`Typst compiler WASM missing: ${candidate.compilerWasmUrl}`);
+                continue;
+            }
+            try {
+                configureTypstEngine(candidate.compilerWasmUrl, candidate.rendererWasmUrl);
+                return await withRenderTimeout($typst.svg({
+                    mainContent: source,
+                    data_selection: {
+                        body: true,
+                        defs: true,
+                        css: true,
+                        js: false,
+                    },
+                }), timeoutMs);
+            }
+            catch (error) {
+                lastError = error;
+                if (error instanceof TypstRenderTimeoutError || !isTypstAssetLoadError(error)) {
+                    throw error;
+                }
+            }
+        }
+        throw lastError instanceof Error ? lastError : new Error('Typst WASM 加载失败');
+    };
     const render = async () => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         const token = ++renderToken;
         state = 'loading';
         errorMessage = '';
@@ -436,16 +522,7 @@ export default async function renderTypst(buffer, target, _type, context) {
         (_a = context === null || context === void 0 ? void 0 : context.registerExportAdapter) === null || _a === void 0 ? void 0 : _a.call(context, null);
         syncUi();
         try {
-            configureTypstEngine(context, documentRef.baseURI);
-            const svg = await withRenderTimeout($typst.svg({
-                mainContent: source,
-                data_selection: {
-                    body: true,
-                    defs: true,
-                    css: true,
-                    js: false,
-                },
-            }), normalizeRenderTimeoutMs((_c = (_b = context === null || context === void 0 ? void 0 : context.options) === null || _b === void 0 ? void 0 : _b.typst) === null || _c === void 0 ? void 0 : _c.renderTimeoutMs));
+            const svg = await renderTypstSvg();
             if (disposed || token !== renderToken) {
                 return;
             }
@@ -453,7 +530,7 @@ export default async function renderTypst(buffer, target, _type, context) {
             state = 'ready';
             syncUi();
             registerExportAdapter();
-            (_d = context === null || context === void 0 ? void 0 : context.onProgressiveRender) === null || _d === void 0 ? void 0 : _d.call(context);
+            (_b = context === null || context === void 0 ? void 0 : context.onProgressiveRender) === null || _b === void 0 ? void 0 : _b.call(context);
         }
         catch (error) {
             if (disposed || token !== renderToken) {
@@ -463,7 +540,7 @@ export default async function renderTypst(buffer, target, _type, context) {
                 sourceFallbackMessage = error.message;
                 state = 'source';
                 syncUi();
-                (_e = context === null || context === void 0 ? void 0 : context.onProgressiveRender) === null || _e === void 0 ? void 0 : _e.call(context);
+                (_c = context === null || context === void 0 ? void 0 : context.onProgressiveRender) === null || _c === void 0 ? void 0 : _c.call(context);
                 return;
             }
             errorMessage = formatTypstError(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/core",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "private": false,
   "type": "module",
   "description": "Framework-neutral TypeScript core for Flyfish File Viewer",
@@ -58,7 +58,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@file-viewer/pptx": "^2.0.7",
+    "@file-viewer/pptx": "^2.0.8",
     "@flyfish-dev/cad-viewer": "^0.6.4",
     "@excalidraw/excalidraw": "^0.18.1",
     "@kenjiuno/msgreader": "^1.28.0",