@netless/app-presentation 0.1.13-beta.2 → 0.1.13-beta.3

package/dist/index.mjs

@@ -1150,6 +1150,7 @@ var _Preload = class _Preload {
     // 暂停后不再创建预加载链接（app 失焦降级时调用）；已插入的 link 会被移除，
     // 挂起的 idle 回调重新进入 touch() 时也会被跳过
     this.paused = false;
+    this.disposed = false;
     this.preloadMap = new Map(pages.map((e, index) => [index, {
       src: e.src,
       state: 0 /* unloaded */
@@ -1164,13 +1165,13 @@ var _Preload = class _Preload {
     this.destroySomeLink();
   }
   resume(index) {
-    if (!this.paused)
+    if (!this.paused || this.disposed)
       return;
     this.paused = false;
     this.touch(index != null ? index : this.touchIndex, true);
   }
   touch(index, force = false) {
-    if (this.paused)
+    if (this.paused || this.disposed)
       return;
     if (index >= this.preloadSize) {
       this.touchIndex = 0;
@@ -1178,11 +1179,11 @@ var _Preload = class _Preload {
       this.touchIndex = index;
     }
     const value = this.preloadMap.get(this.touchIndex);
-    if (value && value.state === 0 /* unloaded */) {
+    if (value && (value.state === 0 /* unloaded */ || force && value.state === 2 /* error */)) {
       this.createLink(this.touchIndex, force);
     }
     if (this.loadingLinks.size < _Preload.maxLinks) {
-      const willLoad = [...this.preloadMap.entries()].find(([i, e]) => i > this.touchIndex && e.state !== 1 /* loaded */);
+      const willLoad = [...this.preloadMap.entries()].find(([i, e]) => i > this.touchIndex && e.state === 0 /* unloaded */);
       if (willLoad) {
         this.requestAsyncCallBack(() => {
           this.touch(willLoad[0], false);
@@ -1215,21 +1216,27 @@ var _Preload = class _Preload {
       linkDom.as = "image";
       linkDom.href = value.src;
       linkDom.dataset.order = index + "";
-      document.head.appendChild(linkDom);
       linkDom.onload = () => {
+        var _a;
+        if (((_a = this.loadingLinks.get(index)) == null ? void 0 : _a.link) !== linkDom)
+          return;
         const value2 = this.preloadMap.get(index);
         if (value2) {
           value2.state = 1 /* loaded */;
           this.preloadMap.set(index, value2);
-          document.head.contains(linkDom) && document.head.removeChild(linkDom);
-          this.loadingLinks.delete(index);
+          this.removeLink(index, linkDom);
           this.touch(this.touchIndex + 1, false);
         }
       };
       linkDom.onerror = () => {
+        var _a;
+        if (((_a = this.loadingLinks.get(index)) == null ? void 0 : _a.link) !== linkDom)
+          return;
         const value2 = this.preloadMap.get(index);
-        if (value2 == null ? void 0 : value2.src) {
-          linkDom.href = value2.src;
+        if (value2) {
+          value2.state = 2 /* error */;
+          this.removeLink(index, linkDom);
+          this.touch(this.touchIndex + 1, false);
         }
       };
       this.loadingLinks.set(index, {
@@ -1238,17 +1245,23 @@ var _Preload = class _Preload {
       });
       value.state = 0 /* unloaded */;
       this.preloadMap.set(index, value);
+      document.head.appendChild(linkDom);
       return 0 /* unloaded */;
     }
     return 2 /* error */;
   }
+  removeLink(index, link) {
+    link.onload = null;
+    link.onerror = null;
+    document.head.contains(link) && document.head.removeChild(link);
+    this.loadingLinks.delete(index);
+  }
   destroySomeLink(excludeIndex) {
     for (const [index, { link }] of this.loadingLinks) {
       if (excludeIndex !== void 0 && index === excludeIndex) {
         continue;
       }
-      document.head.contains(link) && document.head.removeChild(link);
-      this.loadingLinks.delete(index);
+      this.removeLink(index, link);
     }
   }
   async requestAsyncCallBack(callBack, timeout) {
@@ -1266,6 +1279,7 @@ var _Preload = class _Preload {
     callBack();
   }
   dispose() {
+    this.disposed = true;
     this.destroySomeLink();
     this.preloadMap.clear();
   }
@@ -1978,19 +1992,62 @@ function cameraToSharedViewport(camera, viewSize, referenceSize) {
 var createPresentationRuntimeTeardown = (box, dispose2) => {
   let tornDown = false;
   return () => {
+    var _a, _b, _c;
     if (tornDown)
       return;
     tornDown = true;
     try {
       dispose2();
     } finally {
-      box.unmountContent();
-      box.unmountFooter();
-      box.unmountStyles();
+      try {
+        (_a = box.unmountContent) == null ? void 0 : _a.call(box);
+      } finally {
+        try {
+          (_b = box.unmountFooter) == null ? void 0 : _b.call(box);
+        } finally {
+          (_c = box.unmountStyles) == null ? void 0 : _c.call(box);
+        }
+      }
     }
   };
 };
 
+// src/setup-ready.ts
+var waitForCurrentPageImage = (getImage, timeoutMs, isDisposed) => {
+  return new Promise((resolve) => {
+    let settled = false;
+    let pollTimer;
+    const settle = (result) => {
+      if (settled)
+        return;
+      settled = true;
+      window.clearTimeout(timeoutTimer);
+      if (pollTimer !== void 0)
+        window.clearInterval(pollTimer);
+      resolve(result);
+    };
+    const timeoutTimer = window.setTimeout(() => settle("timeout"), timeoutMs);
+    const check = () => {
+      var _a, _b;
+      if (isDisposed()) {
+        settle("disposed");
+        return;
+      }
+      const img = getImage();
+      if (img == null ? void 0 : img.complete) {
+        if (img.naturalWidth > 0) {
+          settle("loaded");
+        } else if (img.currentSrc || ((_a = img.getAttribute("src")) == null ? void 0 : _a.trim()) || ((_b = img.getAttribute("srcset")) == null ? void 0 : _b.trim())) {
+          settle("error");
+        }
+      }
+    };
+    check();
+    if (!settled)
+      pollTimer = window.setInterval(check, 100);
+  });
+};
+
 // src/app-presentation.ts
 var import_debounce2 = __toESM(require_debounce());
 var emptySceneName = "$$empty$$";
@@ -2019,36 +2076,6 @@ var isBlurDegradationAllowed = (context) => {
   return boxState !== void 0 && boxState !== "normal";
 };
 var DEFAULT_SETUP_READY_TIMEOUT = 5e3;
-var waitForCurrentPageImage = (view, timeoutMs, isDisposed) => {
-  return new Promise((resolve) => {
-    let settled = false;
-    let pollTimer;
-    const settle = (loaded) => {
-      if (settled)
-        return;
-      settled = true;
-      window.clearTimeout(timeoutTimer);
-      if (pollTimer !== void 0)
-        window.clearInterval(pollTimer);
-      resolve(loaded);
-    };
-    const timeoutTimer = window.setTimeout(() => settle(false), timeoutMs);
-    const check = () => {
-      if (isDisposed()) {
-        settle(false);
-        return;
-      }
-      const img = findBackgroundImage(view);
-      if (img && img.complete && img.naturalWidth > 0) {
-        settle(true);
-      }
-    };
-    check();
-    if (!settled) {
-      pollTimer = window.setInterval(check, 100);
-    }
-  });
-};
 var resolveImageUrl = (url) => {
   try {
     return new URL(url, window.location.href).href;
@@ -2626,7 +2653,7 @@ var NetlessAppPresentation = {
         options.useClipView
       )
     );
-    app.contentDOM.dataset.appPresentationVersion = "0.1.13-beta.2";
+    app.contentDOM.dataset.appPresentationVersion = "0.1.13-beta.3";
     app.scaleDocsToFit = scaleDocsToFit;
     app.log = log;
     app.warn = warn;
@@ -3095,9 +3122,15 @@ var NetlessAppPresentation = {
     );
     const setupReadyTimeout = (_d = options.setupReadyTimeout) != null ? _d : DEFAULT_SETUP_READY_TIMEOUT;
     return prepareScenesPromise.then(async () => {
-      const loaded = await waitForCurrentPageImage(view, setupReadyTimeout, () => disposed);
-      if (!loaded && !disposed) {
+      const result = await waitForCurrentPageImage(
+        () => findBackgroundImage(view),
+        setupReadyTimeout,
+        () => disposed
+      );
+      if (result === "timeout" && !disposed) {
         warn(`[Presentation] setup ready wait timed out after ${setupReadyTimeout}ms`);
+      } else if (result === "error" && !disposed) {
+        warn("[Presentation] setup page image failed to load; continuing setup");
       }
       return controller;
     });
@@ -3186,7 +3219,7 @@ var install = (register, options = {}) => {
 };
 
 // src/index.ts
-var version = "0.1.13-beta.2";
+var version = "0.1.13-beta.3";
 
 export { NetlessAppPresentation, Presentation, Scrollbar, NetlessAppPresentation as default, install, setupBlurThumbnailDegradation, version };
 //# sourceMappingURL=index.mjs.map