replaywebpage 1.5.9 → 1.6.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "replaywebpage",
   "productName": "ReplayWeb.page",
-  "version": "1.5.9",
+  "version": "1.6.0",
   "description": "Serverless Web Archive Replay",
   "repository": "https://github.com/webrecorder/replayweb.page",
   "homepage": "https://replayweb.page/",
@@ -9,7 +9,7 @@
   "license": "AGPL-3.0-or-later",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
-    "@webrecorder/wabac": "^2.10.2",
+    "@webrecorder/wabac": "^2.12.0",
     "bulma": "^0.9.3",
     "electron-log": "^4.4.1",
     "electron-updater": "^4.3.9",
@@ -18,7 +18,7 @@
     "ipfs-core": "^0.10.8",
     "keyword-mark-element": "^0.2.0",
     "lit": "^2.1.1",
-    "marked": "^3.0.3",
+    "marked": "^4.0.10",
     "mime-types": "^2.1.32",
     "minimist": "^1.2.5",
     "pretty-bytes": "^5.6.0",
@@ -31,8 +31,8 @@
   "devDependencies": {
     "copy-webpack-plugin": "^9.0.1",
     "css-loader": "^6.2.0",
-    "electron": "^16.0.6",
-    "electron-builder": "^22.14.2",
+    "electron": "^19.0.4",
+    "electron-builder": "^23.0.3",
     "electron-notarize": "^1.1.1",
     "http-server": "^13.0.2",
     "mini-css-extract-plugin": "^2.3.0",
@@ -115,7 +115,8 @@
       ],
       "extraResources": [
         "plugins-mac"
-      ]
+      ],
+      "singleArchFiles": "dist/prebuilds/**/*"
     },
     "linux": {
       "category": "Archiving;Utility;",

package/src/appmain.js

@@ -379,6 +379,13 @@ class ReplayWebApp extends LitElement
       this.loadInfo.customColl = this.pageParams.get("customColl");
     }
 
+    if (this.pageParams.get("noWebWorker") === "1") {
+      if (!this.loadInfo) {
+        this.loadInfo = {};
+      }
+      this.loadInfo.noWebWorker = true;
+    }
+
     if (IS_APP && this.sourceUrl.startsWith("file://")) {
       // eslint-disable-next-line no-undef
       const url = new URL(__APP_FILE_SERVE_PREFIX__);

package/src/chooser.js

@@ -194,7 +194,7 @@ class Chooser extends LitElement
               <p class="control is-expanded">
                 <input class="file-name input" type="text"
                 name="filename" id="filename"
-                pattern="((file|http|https|ipfs|s3):\/\/.*\.(warc|warc.gz|zip|wacz|har|wbn|json))|(googledrive:\/\/.+)"
+                pattern="((file|http|https|ipfs|s3):\/\/.*\.(warc|warc.gz|zip|wacz|har|wbn|json))|(googledrive:\/\/.+)|(ssb:\/\/.+)"
                 .value="${this.fileDisplayName}"
                 @input="${this.onInput}"
                 autocomplete="off"

package/src/embed.js

@@ -29,6 +29,7 @@ class Embed extends LitElement
     this.embed = null;
     this.reloadCount = 0;
     this.noSandbox = false;
+    this.noWebWorker = false;
   }
 
   static get properties() {
@@ -56,6 +57,7 @@ class Embed extends LitElement
 
       deepLink: { type: Boolean },
       noSandbox: { type: Boolean },
+      noWebWorker: { type: Boolean },
 
       errorMessage: { type: String }
     };
@@ -126,13 +128,19 @@ class Embed extends LitElement
 
       const source = new URL(this.source, document.baseURI);
 
-      this.paramString = new URLSearchParams({
+      const params = {
         source,
         customColl: this.coll,
         config: this.config,
         basePageUrl: window.location.href.split("#")[0],
         embed: this.embed,
-      }).toString();
+      };
+
+      if (this.noWebWorker) {
+        params.noWebWorker = "1";
+      }
+
+      this.paramString = new URLSearchParams(params).toString();
 
       this.hashString = new URLSearchParams({
         url: this.url,

package/src/loader.js

@@ -27,7 +27,9 @@ class Loader extends LitElement
 
     this.errorAllowRetry = false;
 
-    this.pingInterval = "";
+    this.pingInterval = 0;
+
+    this.noWebWorker = false;
   }
 
   static get properties() {
@@ -56,11 +58,18 @@ class Loader extends LitElement
   }
 
   initMessages() {
-    // if (!navigator.serviceWorker) {
-    //   return;
-    // }
-    // eslint-disable-next-line no-undef
-    this.worker = new Worker(__SW_NAME__);
+    this.noWebWorker = this.loadInfo && this.loadInfo.noWebWorker;
+
+    if (!this.noWebWorker) {
+      // eslint-disable-next-line no-undef
+      this.worker = new Worker(__SW_NAME__);
+    } else {
+      if (!navigator.serviceWorker) {
+        return;
+      }
+
+      this.worker = navigator.serviceWorker;
+    }
 
     this.worker.addEventListener("message", (event) => {
       switch (event.data.msg_type) {
@@ -94,11 +103,16 @@ class Loader extends LitElement
           }
           this.progress = this.total;
           this.percent = 100;
-          if (this.pingInterval) {
-            clearInterval(this.pingInterval);
-          }
           this.dispatchEvent(new CustomEvent("coll-loaded", {detail: event.data}));
-          this.worker.terminate();
+
+          if (!this.noWebWorker) {
+            this.worker.terminate();
+          } else {
+            if (this.pingInterval) {
+              clearInterval(this.pingInterval);
+            }
+          }
+          this.worker = null;
         }
         break;
       }
@@ -187,15 +201,19 @@ You can select a file to upload from the main page by clicking the 'Choose File.
       });
     }
 
-    this.worker.postMessage(msg);
-
-    //navigator.serviceWorker.controller.postMessage(msg);
+    if (this.worker) {
+      if (!this.noWebWorker) {
+        this.worker.postMessage(msg);
+      } else {
+        navigator.serviceWorker.controller.postMessage(msg);
 
-    // ping service worker with messages to avoid shutdown while loading
-    // (mostly for Firefox)
-    // this.pingInterval = setInterval(() => {
-    //   navigator.serviceWorker.controller.postMessage({"msg_type": "ping"});
-    // }, 15000);
+        // ping service worker with messages to avoid shutdown while loading
+        // (mostly for Firefox)
+        this.pingInterval = setInterval(() => {
+          navigator.serviceWorker.controller.postMessage({"msg_type": "ping"});
+        }, 15000);
+      }
+    }
   }
 
   googledriveInit() {
@@ -213,12 +231,22 @@ You can select a file to upload from the main page by clicking the 'Choose File.
   }
 
   onCancel() {
-    //if (navigator.serviceWorker && navigator.serviceWorker.controller) {
-    if (this.worker) {
-      this.worker.postMessage({"msg_type": "cancelLoad", "name": this.coll});
-      // if (this.pingInterval) {
-      //   clearInterval(this.pingInterval);
-      // }
+    if (!this.worker) {
+      return;
+    }
+
+    const msg = {"msg_type": "cancelLoad", "name": this.coll};
+
+    if (!this.noWebWorker) {
+      this.worker.postMessage(msg);
+      return;
+    }
+
+    if (navigator.serviceWorker && navigator.serviceWorker.controller) {
+      navigator.serviceWorker.controller.postMessage(msg);
+      if (this.pingInterval) {
+        clearInterval(this.pingInterval);
+      }
     }
   }
 

package/src/pageutils.js

@@ -34,17 +34,6 @@ Please try a different browser.
   return p;
 }
 
-// ===========================================================================
-let dbworker = null;
-
-function initDBWorker() {
-  if (dbworker === null) {
-    // eslint-disable-next-line no-undef
-    dbworker = new Worker(__SW_NAME__);
-  }
-  return dbworker;
-}
-
 
 // ===========================================================================
 async function digestMessage(message, hashtype) {
@@ -148,4 +137,4 @@ function parseURLSchemeHostPath(url) {
 
 
 export { digestMessage, tsToDate, getTS, getPageDateTS, getReplayLink, sourceToId, parseURLSchemeHostPath,
-  registerSW, initDBWorker };
+  registerSW };