Update server for assorted small bugfixes

Includes a fix to workaround node-gyp bug that includes build-tool
symlinks in the server node_modules, which is rejected by Mac code
signing. I'm going to fix this in the server too, and hopefully it'll
get fixed in node-gyp eventually as well, but this quick fix should let
us use the existing server build regardless.

Once this is fixed somewhere upstream, we can drop this workaround here.

Author: pimterry

package.json

@@ -8,19 +8,20 @@
   "main": "build/index.js",
   "scripts": {
     "postinstall": "electron-builder install-app-deps",
+    "server:setup": "ts-node ./setup-server.ts",
     "build": "npm run build:src && npm run build:electron",
     "build:src": "tsc",
-    "build:electron": "ts-node ./setup-server.ts && electron-builder build",
-    "build:dir-only": "ts-node ./setup-server.ts && electron-builder --dir",
-    "start": "ts-node ./setup-server.ts && npm run start:app",
+    "build:electron": "npm run server:setup && electron-builder build",
+    "build:dir-only": "npm run server:setup && electron-builder --dir",
+    "start": "npm run server:setup && npm run start:app",
     "start:dev": "ts-node ./skip-server.ts && cross-env HTK_DEV=true APP_URL='http://local.httptoolkit.tech:8080' npm run start:app",
     "start:app": "tsc-watch --onSuccess 'electron .'"
   },
   "keywords": [],
   "author": "Tim Perry",
   "license": "AGPL-3.0-or-later",
   "config": {
-    "httptoolkit-server-version": "1.10.0"
+    "httptoolkit-server-version": "1.10.1"
   },
   "build": {
     "appId": "tech.httptoolkit.desktop",

setup-server.ts

@@ -10,6 +10,7 @@ import * as semver from 'semver';
 import fetch from 'node-fetch';
 import * as rimraf from 'rimraf';
 import * as targz from 'targz';
+import { execSync } from 'child_process';
 
 const extractTarGz = promisify(targz.decompress);
 const deleteFile = promisify(fs.unlink);
@@ -33,6 +34,14 @@ async function setUpLocalEnv() {
     } else {
         console.log('Correct server already downloaded.');
     }
+
+    if (os.platform() !== 'win32') {
+        // To work around https://github.com/nodejs/node-gyp/issues/2713,
+        // caused by https://github.com/nodejs/node-gyp/commit/b9ddcd5bbd93b05b03674836b6ebdae2c2e74c8c,
+        // we manually remove node_gyp_bins subdirectories. Done by shell just
+        // because it's a quick easy fix:
+        execSync('find httptoolkit-server/node_modules -type d -name node_gyp_bins -prune -exec rm -r {} \\;');
+    }
 }
 
 /*