Merge pull request #501 from DJ2LS/ls-github

work on universal builds for macOS - possibly not working yet

gui/electron-builder.json5

@@ -13,11 +13,7 @@
   "files": [
     "dist",
     "dist-electron",
-  ],
-
-
-    "extraResources": [
-      {
+    {
         "from": "../modem/dist/modem/",
         "to": "modem",
         "filter": [
@@ -25,7 +21,9 @@
           "!**/.git"
         ]
       }
-    ],
+  ],
+
+
 
 
   "mac": {
@@ -41,7 +39,8 @@
       "entitlements": "build/entitlements.plist",
       "entitlementsInherit": "build/entitlements.plist",
       "gatekeeperAssess": false,
-      "mergeASARs": true,
+      "mergeASARs": false,
+      "x64ArchFiles": "**/*",
       "artifactName": "${productName}-Mac-${version}.${ext}"
   },
   "win": {

gui/electron/main/index.ts

@@ -105,12 +105,12 @@ app.whenReady().then(() => {
   switch (platform().toLowerCase()) {
     case "darwin":
     case "linux":
-      daemonPath = join(process.resourcesPath, "modem", "freedata-daemon");
+      daemonPath = join(__dirname, "modem", "freedata-daemon");
 
       break;
     case "win32":
     case "win64":
-      daemonPath = join(process.resourcesPath, "modem", "freedata-daemon.exe");
+      daemonPath = join(__dirname, "modem", "freedata-daemon.exe");
       break;
     default:
       console.log("Unhandled OS Platform: ", platform());

gui/package.json

@@ -2,7 +2,7 @@
   "name": "FreeDATA",
   "description": "FreeDATA",
   "private": true,
-  "version": "0.11.0-alpha.8",
+  "version": "0.11.0-alpha.9",
   "main": "dist-electron/main/index.js",
   "scripts": {
     "start": "vite",
@@ -32,6 +32,7 @@
   "homepage": "https://freedata.app",
   "dependencies": {
     "@electron/notarize": "^2.1.0",
+    "@electron/universal": "^1.4.2",
     "@popperjs/core": "^2.11.8",
     "@vueuse/electron": "^10.4.1",
     "blob-util": "^2.0.2",

modem/static.py

@@ -134,7 +134,7 @@ class TCIParam:
 
 @dataclass 
 class Modem:
-    version = "0.11.0-alpha.8"
+    version = "0.11.0-alpha.9"
     host: str = "0.0.0.0"
     port: int = 3000
     SOCKET_TIMEOUT: int = 1  # seconds