build fixes: enable __dirname, fix native extension loading, turn off npm-rebuild

remove unused, work on cleanup on shutdown

Author: ikreymer

build/extra_prebuilds/darwin-arm64/node.napi.node

@@ -22,8 +22,8 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
     "@shoelace-style/shoelace": "~2.15.1",
-    "@webrecorder/wabac": "^2.23.2",
     "@types/webtorrent": "^0.110.0",
+    "@webrecorder/wabac": "^2.23.2",
     "bulma": "^0.9.3",
     "create-torrent": "^6.1.0",
     "electron-log": "^4.4.1",
@@ -43,7 +43,7 @@
     "split.js": "^1.6.4",
     "stream-browserify": "^3.0.0",
     "tsconfig-paths-webpack-plugin": "^4.1.0",
-    "webtorrent": "^2.6.7"
+    "webtorrent": "^2.6.8"
   },
   "devDependencies": {
     "@playwright/test": "^1.52.0",
@@ -76,7 +76,7 @@
     "ts-lit-plugin": "^2.0.0-pre.1",
     "ts-loader": "^9.4.4",
     "typescript": "^5.2.2",
-    "webpack": "^5.91.0",
+    "webpack": "^5.99.9",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.0.4",
     "webpack-merge": "^5.10.0"
@@ -123,10 +123,11 @@
     "extraMetadata": {
       "main": "dist/electron.js"
     },
+    "npmRebuild": false,
     "files": [
-      "!**/node_modules/**/*",
+      "!**node_modules/**/*",
       "dist/*.js",
-      "dist/prebuilds/${platform}-${arch}/*",
+      "!dist/node_modules*.js",
       "dist/build/*",
       "ui.js",
       "sw.js",
@@ -160,7 +161,7 @@
       "extraResources": [
         "plugins-mac"
       ],
-      "singleArchFiles": "{dist/prebuilds,dist/prebuilds/**}"
+      "singleArchFiles": "{dist/prebuilds,dist/prebuilds/**,node_modules/**/prebuilds/**}"
     },
     "linux": {
       "category": "Archiving;Utility;",

package.json

@@ -303,7 +303,7 @@ export class Chooser extends LitElement {
                   type="text"
                   name="filename"
                   id="filename"
-                  pattern="((file|http|https|ipfs|s3)://.*.(warc|warc.gz|zip|wacz|wacz.zip|har|json|cdx|cdxj)([?#].*)?)|(googledrive://.+)|(ssb://.+)"
+                  pattern="((file|http|https|ipfs|s3)://.*.(warc|warc.gz|zip|wacz|wacz.zip|har|json|cdx|cdxj)([?#].*)?)|(googledrive://.+)|(ssb://.+)|(magnet:.+)"
                   .value="${this.fileDisplayName}"
                   @input="${this.onInput}"
                   autocomplete="off"

src/chooser.ts

@@ -90,7 +90,7 @@ class ElectronReplayApp {
   get mainWindowWebPreferences() {
     return {
       plugins: true,
-      preload: path.join(__dirname, "preload.js"),
+      preload: path.join(this.appPath, "preload.js"),
       nativeWindowOpen: true,
       contextIsolation: true,
       enableRemoteModule: false,
@@ -120,7 +120,6 @@ class ElectronReplayApp {
     }
 
     console.log("app path", this.appPath);
-    console.log("dir name", __dirname);
     console.log("proj path", this.projPath);
 
     console.log("app data", app.getPath("appData"));
@@ -180,10 +179,31 @@ class ElectronReplayApp {
     void app.whenReady().then(() => this.onAppReady());
 
     // Quit when all windows are closed.
-    app.on("window-all-closed", function () {
-      // On macOS it is common for applications and their menu bar
-      // to stay active until the user quits explicitly with Cmd + Q
-      //if (process.platform !== 'darwin')
+    app.on("window-all-closed", async () => {
+      if (this.client) {
+        //console.log("closing all torrents", this.client.torrents.length);
+        // try {
+        //   await Promise.allSettled(
+        //     this.client.torrents.map(
+        //       async (x) =>
+        //         new Promise<void>(
+        //           (resolve) => () => x.destroy({}, () => resolve()),
+        //         ),
+        //     ),
+        //   );
+        // } catch (e) {
+        //   // ignore
+        // }
+        // await Promise.race([
+        //   new Promise((resolve) => setTimeout(resolve, 10000)),
+        //   new Promise<void>((resolve) => () => {
+        //     this.client!.destroy(() => {
+        //       console.log("wt closed!");
+        //       resolve();
+        //     });
+        //   }),
+        // ]);
+      }
       app.quit();
     });
   }
@@ -488,7 +508,16 @@ class ElectronReplayApp {
 
   async doHandleBT(request: Request) {
     if (!this.client) {
-      this.client = new WebTorrent({ peerId, utp: false });
+      const downloads = path.join(app.getPath("downloads"), "rwp-torrents");
+      console.log("downloads", downloads);
+      this.client = new WebTorrent({
+        peerId,
+        //@ts-expect-error destoryStoreOnDestory not in type
+        destroyStoreOnDestroy: true,
+        path: downloads,
+      });
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      console.log((this.client as any).utp);
     }
 
     // special ping from wabac.js to ensure the scheme works

src/electron-replay-app.ts

@@ -65,26 +65,15 @@ const electronMainConfig = (/*env, argv*/) => {
       filename: "[name].js",
     },
     node: {
-      __dirname: false,
-      __filename: false,
+      __dirname: true,
+      __filename: true,
     },
     plugins: [
       new webpack.DefinePlugin({
         __HELPER_PROXY__: JSON.stringify(HELPER_PROXY),
       }),
       new webpack.BannerPlugin(BANNER_TEXT),
-      new CopyPlugin({
-        patterns: [{ from: "build/extra_prebuilds/", to: "prebuilds" }],
-      }),
     ],
-    resolve: {
-      alias: {
-        bufferutil: path.join(
-          __dirname,
-          "./node_modules/bufferutil/fallback.js",
-        ),
-      },
-    },
   };
   return merge(tsConfig, config);
 };