replaywebpage 1.7.7 → 1.7.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "replaywebpage",
   "productName": "ReplayWeb.page",
-  "version": "1.7.7",
+  "version": "1.7.8",
   "description": "Serverless Web Archive Replay",
   "repository": "https://github.com/webrecorder/replayweb.page",
   "homepage": "https://replayweb.page/",
@@ -9,11 +9,10 @@
   "license": "AGPL-3.0-or-later",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
-    "@webrecorder/wabac": "^2.13.14",
-    "auto-js-ipfs": "^1.5.1",
+    "@webrecorder/wabac": "^2.13.15",
     "bulma": "^0.9.3",
     "electron-log": "^4.4.1",
-    "electron-updater": "^4.3.9",
+    "electron-updater": "^5.3.0",
     "fetch-ndjson": "^1.1.6",
     "flexsearch": "^0.7.21",
     "keyword-mark-element": "^0.2.0",
@@ -21,6 +20,7 @@
     "marked": "^4.0.10",
     "mime-types": "^2.1.32",
     "minimist": "^1.2.5",
+    "node-fetch": "^3.3.0",
     "pretty-bytes": "^5.6.0",
     "process": "^0.11.10",
     "querystring-es3": "^0.2.1",
@@ -31,7 +31,7 @@
   "devDependencies": {
     "copy-webpack-plugin": "^9.0.1",
     "css-loader": "^6.2.0",
-    "electron": "^21.3.1",
+    "electron": "^22.0.0",
     "electron-builder": "^23.0.3",
     "electron-notarize": "^1.1.1",
     "eslint": "^8.23.1",
@@ -42,9 +42,10 @@
     "sass-loader": "^12.1.0",
     "style-loader": "^3.2.1",
     "svg-inline-loader": "^0.8.2",
-    "webpack": "^5.74.0",
-    "webpack-cli": "^4.8.0",
-    "webpack-dev-server": "^4.2.1"
+    "url": "^0.11.0",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.1",
+    "webpack-dev-server": "^4.11.1"
   },
   "files": [
     "/assets",

package/src/appmain.js

@@ -401,12 +401,9 @@ class ReplayWebApp extends LitElement
     }
 
     if (IS_APP && this.sourceUrl.startsWith("file://")) {
-      // eslint-disable-next-line no-undef
-      const url = new URL(__APP_FILE_SERVE_PREFIX__);
-      url.searchParams.set("filename", this.sourceUrl.slice("file://".length));
       this.loadInfo = {
         sourceUrl: this.sourceUrl,
-        loadUrl: url.href,
+        loadUrl: this.sourceUrl.replace("file://", "file2://")
       };
     }
   }

package/src/chooser.js

@@ -79,9 +79,7 @@ class Chooser extends LitElement
       // file.path only available in electron app
       if (this.file.path) {
         // eslint-disable-next-line no-undef
-        const url = new URL(__APP_FILE_SERVE_PREFIX__);
-        url.searchParams.set("filename", this.file.path);
-        loadInfo.loadUrl = url.href;
+        loadInfo.loadUrl = "file2://" + this.file.path;
         loadInfo.noCache = true;
       } else if (this.fileHandle) {
         loadInfo.loadUrl = this.fileDisplayName;

package/src/electron-replay-app.js

@@ -3,13 +3,12 @@
 import fetch from "node-fetch";
 import { Headers } from "node-fetch";
 
-import {app, session, BrowserWindow, ipcMain, screen, shell } from "electron";
+import {app, session, BrowserWindow, ipcMain, protocol, screen, shell } from "electron";
 
 import path from "path";
 import fs from "fs";
 
 import { ArchiveResponse, Rewriter } from "@webrecorder/wabac/src/rewrite";
-import {create as createIPFS} from "auto-js-ipfs";
 
 import { PassThrough, Readable } from "stream";
 
@@ -17,6 +16,7 @@ import { autoUpdater } from "electron-updater";
 import log from "electron-log";
 
 import mime from "mime-types";
+import url from "url";
 
 global.Headers = Headers;
 global.fetch = fetch;
@@ -25,6 +25,8 @@ const STATIC_PREFIX = "http://localhost:5471/";
 
 const REPLAY_PREFIX = STATIC_PREFIX + "w/";
 
+const FILE_PROTO = "file2";
+
 const URL_RX = /([^/]+)\/([\d]+)(?:\w\w_)?\/(.*)$/;
 
 // ============================================================================
@@ -50,7 +52,7 @@ class ElectronReplayApp
 
     this.screenSize = {width: 1024, height: 768};
 
-    this.ipfsClient = null;
+    this.origUA = null;
   }
 
   get mainWindowWebPreferences() {
@@ -69,7 +71,7 @@ class ElectronReplayApp
     return "index.html";
   }
 
-  init(includePlugins = false) {
+  init() {
     // Single instance check
     const gotTheLock = app.requestSingleInstanceLock();
 
@@ -83,36 +85,10 @@ class ElectronReplayApp
       });
     }
 
-    if (includePlugins) {
-      switch (process.platform) {
-      case "win32":
-        this.pluginPath = path.join(this.projPath, "plugins-win", `pepflashplayer-x86${process.arch === "x64" ? "_64" : ""}.dll`);
-        break;
-    
-      case "darwin":
-        this.pluginPath = path.join(this.projPath, "plugins-mac", "PepperFlashPlayer.plugin");
-        break;
-    
-      case "linux":
-        this.pluginPath = path.join(this.projPath, "plugins-mac", "libpepflashplayer.so");
-        break;
-    
-      default:
-        console.log("platform unsupported: " + process.platform);
-        break;
-      }
-
-      app.commandLine.appendSwitch("ppapi-flash-path", this.pluginPath);
-    }
-
     console.log("app path", this.appPath);
     console.log("dir name", __dirname);
     console.log("proj path", this.projPath);
 
-    if (includePlugins) {
-      console.log("plugin path", this.pluginPath);
-    }
-
     console.log("app data", app.getPath("appData"));
     console.log("user data", app.getPath("userData"));
 
@@ -120,6 +96,19 @@ class ElectronReplayApp
       app.setPath("userData", path.join(app.getPath("appData"), this.profileName));
     }
 
+    protocol.registerSchemesAsPrivileged([{
+      scheme: FILE_PROTO,
+      privileges: {
+        standard: false,
+        secure: true,
+        bypassCSP: true,
+        allowServiceWorkers: true,
+        supportFetchAPI: true,
+        corsEnabled: true,
+        stream: true
+      }
+    }]);
+
     app.on("will-finish-launching", () => {
       app.on("open-file", (event, filePath) => {
         this.openNextFile = filePath;
@@ -155,9 +144,6 @@ class ElectronReplayApp
   }
 
   onAppReady() {
-    const ipfsRepoPath = path.join(app.getPath("userData"), "js-ipfs");
-    console.log("ipfs path", ipfsRepoPath);
-
     this.checkUpdates();
 
     this.screenSize = screen.getPrimaryDisplay().workAreaSize;
@@ -184,9 +170,48 @@ class ElectronReplayApp
 
     sesh.protocol.interceptStreamProtocol("http", (request, callback) => this.doIntercept(request, callback));
 
+    protocol.registerStreamProtocol(FILE_PROTO, (request, callback) => this.doHandleFile(request, callback));
+
+    this.origUA = sesh.getUserAgent();
+
     this.mainWindow = this.createMainWindow(process.argv);
   }
 
+  async doHandleFile(request, callback) {
+    //const parsedUrl = new URL(request.url);
+    //const filename = parsedUrl.searchParams.get("filename");
+
+    if (request.url === FILE_PROTO + "://localhost") {
+      callback({statusCode: 200, data: null});
+      return;
+    }
+
+    const filename = url.fileURLToPath(request.url.replace(FILE_PROTO, "file"));
+
+    const headers = {"Content-Type": "application/octet-stream"};
+    const reqHeaders = new Headers(request.headers);
+
+    if (filename) {
+      const stat = await fs.promises.lstat(filename);
+
+      if (!stat.isFile()) {
+        return this.notFound(filename, callback);
+      }
+
+      const size = stat.size;
+
+      const {statusCode, start, end} = this.parseRange(reqHeaders, headers, size);
+
+      const data = request.method === "HEAD" ? null : fs.createReadStream(filename, {start, end});
+
+      callback({statusCode, headers, data});
+      return;
+
+    } else {
+      return this.notFound("No Resource Specified", callback);
+    }
+  }
+
   _bufferToStream(data) {
     const rv = new PassThrough();
     rv.push(data);
@@ -243,73 +268,6 @@ class ElectronReplayApp
       return this.notFound(request.url, callback);
     }
 
-    // eslint-disable-next-line no-undef
-    if (request.url.startsWith(__APP_FILE_SERVE_PREFIX__)) {
-      const parsedUrl = new URL(request.url);
-
-      const filename = parsedUrl.searchParams.get("filename");
-      const ipfsCID = parsedUrl.searchParams.get("ipfs");
-
-      const headers = {"Content-Type": "application/octet-stream"};
-      const reqHeaders = new Headers(request.headers);
-
-      if (filename) {
-        console.log("file serve:", filename);
-
-        const stat = await fs.promises.lstat(filename);
-
-        if (!stat.isFile()) {
-          return this.notFound(filename, callback);
-        }
-
-        const size = stat.size;
-
-        const {statusCode, start, end} = this.parseRange(reqHeaders, headers, size);
-
-        const data = request.method === "HEAD" ? null : fs.createReadStream(filename, {start, end});
-
-        callback({statusCode, headers, data});
-        return;
-
-      } else if (ipfsCID) {
-        const ipfsURL = `ipfs://${ipfsCID}}`;
-
-        console.log("ipfs serve:", ipfsCID);
-
-        // TODO: Pass in config?
-        this.ipfsClient = await createIPFS();
-
-        console.log("inited");
-
-        let size = await this.ipfsClient.getSize(ipfsURL);
-
-        console.log("got size", size);
-
-        if (size === null) {
-          return this.notFound(ipfsCID, callback);
-        }
-
-        const {statusCode, start, end} = this.parseRange(reqHeaders, headers, size);
-
-        let data = null;
-
-        if (request.method === "GET") {
-          const offset = start || 0;
-          const length = end ? end - start + 1 : size;
-          data = Readable.from(await this.ipfsClient.get(ipfsURL, {
-            start: offset,
-            end: offset +length
-          }));
-        }
-
-        callback({statusCode, headers, data});
-        return;
-
-      } else {
-        return this.notFound("No Resource Specified", callback);
-      }
-    }
-
     // possible 'live leak' attempt, return archived version, if any
     if (request.referrer && request.referrer.startsWith(REPLAY_PREFIX)) {
       return await this.resolveArchiveResponse(request, callback);
@@ -320,9 +278,24 @@ class ElectronReplayApp
 
   async proxyLive(request, callback) {
     let headers = request.headers;
+    const {method, url, uploadData} = request;
+
+    const body = uploadData ? Readable.from(readBody(uploadData, session.defaultSession)) : null;
 
-    const method = request.method;
-    const response = await fetch(request.url, {method, headers});
+    if (this.origUA) {
+      // pass UA if origUA is set
+      headers["User-Agent"] = this.origUA;
+    }
+
+    let response;
+
+    try {
+      response = await fetch(url, {method, headers, body});
+    } catch (e) {
+      console.warn("fetch failed for: " + url);
+      callback({statusCode: 502, headers: {}, data: null});
+      return;
+    }
     const data = method === "HEAD" ? null : response.body;
     const statusCode = response.status;
 
@@ -478,4 +451,14 @@ class ElectronReplayApp
   }
 }
 
+async function * readBody (body, session) {
+  for (const chunk of body) {
+    if (chunk.bytes) {
+      yield await Promise.resolve(chunk.bytes);
+    } else if (chunk.blobUUID) {
+      yield await session.getBlobData(chunk.blobUUID);
+    }
+  }
+}
+
 export { ElectronReplayApp, STATIC_PREFIX };