@netless/app-presentation 0.1.13-beta.4 → 0.1.14

package/dist/index.mjs

@@ -1301,6 +1301,7 @@ var Presentation = class {
     var _a;
     this.pages = config.pages;
     this.preload = new Preload(this.pages);
+    this.onThumbnailError = config.onThumbnailError;
     if (config.thumbnail)
       this.thumbnail = config.thumbnail;
     this.dispose.add(this.preload);
@@ -1516,12 +1517,16 @@ var Presentation = class {
   }
   /** Returns a modified URL that points to the thumbnail image. */
   thumbnail(src) {
+    var _a;
     try {
       const url = new URL(src);
       url.searchParams.set("x-oss-process", "image/resize,l_50");
       return url.toString();
     } catch (err) {
-      console.error(err);
+      try {
+        (_a = this.onThumbnailError) == null ? void 0 : _a.call(this, err);
+      } catch (e) {
+      }
       return src;
     }
   }
@@ -2116,7 +2121,8 @@ var setupBlurThumbnailDegradation = (config) => {
   const box = context.getBox();
   const boxBlurClass = box.wrapClassName("blur");
   let blurEpisode = false;
-  let reDegradeEnabled = false;
+  let failedThumbnailPageIndex = null;
+  const canReDegrade = () => blurEpisode && failedThumbnailPageIndex !== pageIndex$.value;
   let previewSuspended = false;
   let appliedFocusState = true;
   let logicalFocused = true;
@@ -2173,15 +2179,16 @@ var setupBlurThumbnailDegradation = (config) => {
       app.suspendPreviewResources();
     }
     const page = pages[pageIndex$.value];
-    if (!page || !hasUsableThumbnail(page) || reDegradeEnabled) {
+    if (!page || !hasUsableThumbnail(page) || canReDegrade()) {
       degrade();
     }
   };
   const restoreFocusedResources = () => {
+    appliedFocusState = true;
     if (!blurEpisode)
       return;
     blurEpisode = false;
-    reDegradeEnabled = false;
+    failedThumbnailPageIndex = null;
     previewSuspended = false;
     restore2();
     app.preload.resume(pageIndex$.value);
@@ -2200,18 +2207,22 @@ var setupBlurThumbnailDegradation = (config) => {
     return !!(el && el.contains(target));
   };
   const onImgLoad = (ev) => {
-    if (!blurEpisode || !reDegradeEnabled)
+    if (!canReDegrade())
       return;
     if (!ownsTarget(ev.target))
       return;
     degrade();
   };
   const onImgError = (ev) => {
-    if (!blurEpisode || !reDegradeEnabled)
+    var _a;
+    if (!canReDegrade())
       return;
     if (!ownsTarget(ev.target))
       return;
-    reDegradeEnabled = false;
+    const thumbnailURL = (_a = pages[pageIndex$.value]) == null ? void 0 : _a.thumbnail;
+    if (thumbnailURL && resolveImageUrl(ev.target.src) === resolveImageUrl(thumbnailURL)) {
+      failedThumbnailPageIndex = pageIndex$.value;
+    }
   };
   const applyActivity = () => {
     var _a;
@@ -2225,7 +2236,7 @@ var setupBlurThumbnailDegradation = (config) => {
       restoreFocusedResources();
     } else {
       blurEpisode = true;
-      reDegradeEnabled = true;
+      failedThumbnailPageIndex = null;
       degrade();
       app.preload.pause();
       suspendCachedResources();
@@ -2272,26 +2283,21 @@ var setupBlurThumbnailDegradation = (config) => {
     document.removeEventListener("error", onImgError, true);
   });
 };
-var createLogger = (room) => {
-  if (room && room.logger) {
-    return (...args) => room.logger.info(...args);
-  } else {
-    return (...args) => console.log(...args);
-  }
+var getLogger = (context) => {
+  var _a, _b, _c;
+  return (_c = (_a = context.getWindowManager()) == null ? void 0 : _a.Logger) != null ? _c : (_b = context.getRoom()) == null ? void 0 : _b.logger;
+};
+var createLogger = (context) => {
+  return (...args) => {
+    var _a, _b;
+    return (_b = (_a = getLogger(context)) == null ? void 0 : _a.info) == null ? void 0 : _b.call(_a, ...args);
+  };
 };
 var createDiagnosticLogger = (context) => {
-  var _a;
-  const createAppLogger = context.createLogger;
-  if (typeof createAppLogger === "function") {
-    return createAppLogger.call(context, "camera", {
-      debounceTime: 300,
-      maxWaitTime: 2e3
-    });
-  }
-  const roomLogger = (_a = context.getRoom()) == null ? void 0 : _a.logger;
   const prefix = `[Presentation][${context.appId}][camera]`;
   const emit = (level, event, ...data) => {
     try {
+      const roomLogger = getLogger(context);
       const printer = roomLogger == null ? void 0 : roomLogger[level];
       if (typeof printer === "function")
         printer.call(roomLogger, `${prefix}[${event}]`, ...data);
@@ -2356,9 +2362,11 @@ var NetlessAppPresentation = {
       );
     const options = context.getAppOptions() || {};
     const room = context.getRoom();
-    const log = options.log || createLogger(room);
-    const roomLogger = room == null ? void 0 : room.logger;
-    const warn = (...data) => (roomLogger == null ? void 0 : roomLogger.warn) ? roomLogger.warn(...data) : log(...data);
+    const log = options.log || createLogger(context);
+    const warn = (...data) => {
+      var _a2, _b2;
+      return (_b2 = (_a2 = getLogger(context)) == null ? void 0 : _a2.warn) == null ? void 0 : _b2.call(_a2, ...data);
+    };
     const configuredOriginSize = context.storage.state.originSize;
     const originSize = isValidSize(configuredOriginSize) ? {
       width: configuredOriginSize.width,
@@ -2690,10 +2698,14 @@ var NetlessAppPresentation = {
         pageIndex$,
         view,
         options.thumbnail,
-        options.useClipView
+        options.useClipView,
+        (error) => {
+          var _a2, _b2;
+          return (_b2 = (_a2 = getLogger(context)) == null ? void 0 : _a2.error) == null ? void 0 : _b2.call(_a2, "[Presentation] thumbnail URL parsing failed", context.appId, error);
+        }
       )
     );
-    app.contentDOM.dataset.appPresentationVersion = "0.1.13-beta.4";
+    app.contentDOM.dataset.appPresentationVersion = "0.1.14";
     app.scaleDocsToFit = scaleDocsToFit;
     app.log = log;
     app.warn = warn;
@@ -3173,10 +3185,7 @@ var NetlessAppPresentation = {
       );
       if (disposed)
         throw new Error("[Presentation] disposed before setup ready");
-      if (result === "error" && context.waitForActualSetupReady) {
-        throw new Error("[Presentation] setup page image failed to load");
-      }
-      if (result === "error" && !disposed) {
+      if (result === "error") {
         warn("[Presentation] setup page image failed to load; continuing setup");
       }
       return controller;
@@ -3212,13 +3221,14 @@ var AppPresentation = class extends Presentation {
     }
   }
 };
-function createPresentation(box, pages, jumpPage, pageIndex$, view, thumbnail, useClipView) {
+function createPresentation(box, pages, jumpPage, pageIndex$, view, thumbnail, useClipView, onThumbnailError) {
   box.mountStyles(style_default);
   const app = new AppPresentation({
     pages,
     readonly: box.readonly,
     jumpPage,
-    thumbnail
+    thumbnail,
+    onThumbnailError
   });
   app.box = box;
   box.mountContent(app.contentDOM);
@@ -3266,7 +3276,7 @@ var install = (register, options = {}) => {
 };
 
 // src/index.ts
-var version = "0.1.13-beta.4";
+var version = "0.1.14";
 
-export { NetlessAppPresentation, Presentation, Scrollbar, NetlessAppPresentation as default, install, setupBlurThumbnailDegradation, version };
+export { NetlessAppPresentation, Presentation, Scrollbar, createDiagnosticLogger, NetlessAppPresentation as default, install, setupBlurThumbnailDegradation, version };
 //# sourceMappingURL=index.mjs.map