Apple silicon support (M1)

ci/notarize.js

@@ -15,6 +15,10 @@ exports.default = async function notarizing(context) {
     if (electronPlatformName !== "darwin") {
         return
     }
+    if (process.env.CSC_IDENTITY_AUTO_DISCOVERY === "false") {
+        console.log("CSC_IDENTITY_AUTO_DISCOVERY is set to false, skipping notarization")
+        return
+    }
 
     const appName = context.packager.appInfo.productFilename
 

package.json

@@ -11,12 +11,12 @@
   },
   "license": "MIT",
   "scripts": {
-    "postinstall": "shx rm -rf static/bin && shx cp -r node_modules/@mysteriumnetwork/node/bin static/bin",
     "dev": "electron-webpack dev",
     "lint": "eslint src",
     "clean": "shx rm -rf dist",
     "build": "electron-webpack",
-    "bundle": "yarn build && electron-builder"
+    "bundle": "yarn build && electron-builder",
+    "bundle-dev": "yarn build && CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder"
   },
   "engines": {
     "node": ">=16"
@@ -26,7 +26,7 @@
     "@fortawesome/free-brands-svg-icons": "^5.15.3",
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/react-fontawesome": "^0.1.14",
-    "@mysteriumnetwork/node": "1.9.3",
+    "@mysteriumnetwork/node": "1.9.5-p3",
     "@mysteriumnetwork/terms": "0.0.41",
     "@sentry/electron": "^3.0.7",
     "@use-it/interval": "^1.0.0",
@@ -84,8 +84,8 @@
     "@types/webpack-env": "^1.16.3",
     "@typescript-eslint/eslint-plugin": "^5.23.0",
     "@typescript-eslint/parser": "^5.23.0",
-    "electron": "^19.0.5",
-    "electron-builder": "^23.0.3",
+    "electron": "^19.0.8",
+    "electron-builder": "^23.1.0",
     "electron-devtools-installer": "^3.2.0",
     "electron-download": "^4.1.1",
     "electron-notarize": "^1.2.1",
@@ -124,15 +124,25 @@
       "buildResources": "build",
       "output": "dist"
     },
+    "files": [
+      "!**/node_modules/@mysteriumnetwork/node/bin/**",
+      "**/node_modules/@mysteriumnetwork/node/bin/${platform}/${arch}/**"
+    ],
     "mac": {
-      "target": [
-        "dmg",
-        "zip"
-      ],
+      "target": {
+        "target": "default",
+        "arch": "universal"
+      },
+      "singleArchFiles": "**/node_modules/@mysteriumnetwork/node/bin/**",
       "icon": "static/logo.icns",
       "hardenedRuntime": true,
       "entitlements": "build/entitlements.mac.plist",
-      "entitlementsInherit": "build/entitlements.mac.plist"
+      "entitlementsInherit": "build/entitlements.mac.plist",
+      "category": "public.app-category.productivity"
+    },
+    "dmg": {
+      "background": "build/background.tiff",
+      "iconTextSize": 14
     },
     "win": {
       "target": [

src/main/node/mysteriumNode.ts

@@ -4,27 +4,22 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { platform } from "os"
 import { ChildProcess } from "child_process"
 
 import { NodeHealthcheck, TequilapiClientFactory } from "mysterium-vpn-js"
 import { BrowserWindow, dialog, ipcMain, IpcMainInvokeEvent } from "electron"
+import { mysteriumNodeBin } from "@mysteriumnetwork/node"
 
 import { spawnProcess } from "../../utils/spawn"
 import { log, logErrorMessage } from "../../shared/log/log"
 import { TEQUILAPI_PORT } from "../../app/tequilapi"
-import { staticAssetPath } from "../../utils/paths"
 import { IpcResponse, MainIpcListenChannels } from "../../shared/ipc"
 import { isProduction } from "../../utils/env"
 import { ExportIdentityOpts, ImportIdentityOpts } from "../../shared/node/mysteriumNodeIPC"
 import { parseError } from "../../shared/errors/parseError"
 
 const mystBin = (): string => {
-    let mystBinaryName = "bin/myst"
-    if (platform() === "win32") {
-        mystBinaryName += ".exe"
-    }
-    return staticAssetPath(mystBinaryName)
+    return mysteriumNodeBin(process.platform, process.arch).replace("app.asar", "app.asar.unpacked")
 }
 
 const parseCLIError = (message: string): string => {

src/main/node/supervisor.ts

@@ -10,9 +10,8 @@ import { platform } from "os"
 
 import semver from "semver"
 import { ipcMain } from "electron"
+import { mysteriumSupervisorBin, nodeVersion } from "@mysteriumnetwork/node"
 
-import * as packageJson from "../../../package.json"
-import { staticAssetPath } from "../../utils/paths"
 import { log } from "../../shared/log/log"
 import { sudoExec } from "../../utils/sudo"
 import { uid } from "../../utils/user"
@@ -28,11 +27,7 @@ function mystSockPath(): string {
 }
 
 const supervisorBin = (): string => {
-    let supervisorBinaryName = "bin/myst_supervisor"
-    if (isWin) {
-        supervisorBinaryName += ".exe"
-    }
-    return staticAssetPath(supervisorBinaryName)
+    return mysteriumSupervisorBin(process.platform, process.arch).replace("app.asar", "app.asar.unpacked")
 }
 
 export class Supervisor {
@@ -99,7 +94,7 @@ export class Supervisor {
     }
 
     async upgrade(): Promise<void> {
-        const bundledVersion = packageJson.dependencies["@mysteriumnetwork/node"]
+        const bundledVersion = nodeVersion()
 
         let runningVersion = ""
         try {