test cross-os

app/index.html

@@ -24,7 +24,7 @@
         <div id="openbuildslogosplash" style="display: none;">
           <!-- <img id="openbuildslogosplashImg" src="/img/openbuilds.png" onload="$('#openbuildslogosplash').fadeIn(800); setTimeout(function() { $('#splash').fadeOut(400); }, 2000)" width="200" /> -->
           <h1>OpenBuilds<sup>&reg;</sup>&nbsp;CONTROL</h1>
-          <img id="openbuildslogosplashImgX32" src="/img/x32splash.png" onload="$('#openbuildslogosplash').fadeIn(800); setTimeout(function() { $('#splash').fadeOut(400); }, 4000)" style="cursor:pointer" />
+          <img id="openbuildslogosplashImgX32" src="/img/x32splash.png" onload="setTimeout(function() {$('#openbuildslogosplash').fadeIn(800); setTimeout(function() { $('#splash').fadeOut(400); }, 4000)}, 500);" style="cursor:pointer" />
           <h3 style="cursor:pointer">Check out the all NEW OpenBuilds<sup>&reg;</sup>&nbsp;BlackBox&nbsp;X32</h3>
           <div class="waviy" style="cursor:pointer">
             <span style="--i:1">C</span>

index.js

@@ -361,6 +361,7 @@ var feedOverride = 100,
 var re = new RegExp("^[a-f0-9]{32}");
 
 var status = {
+  login: false,
   driver: {
     version: require('./package').version,
     ipaddress: ip.address(),
@@ -2841,7 +2842,7 @@ if (isElectron()) {
       }
     })
     // Create myWindow, load the rest of the app, etc...
-    app.on('ready', () => {
+    electronApp.on('ready', () => {
       if (process.platform == 'win32') {
         // Don't show window - sit in Tray
       } else {
@@ -3094,7 +3095,7 @@ if (isElectron()) {
     });
 
     // Autostart on Login
-    if (!process.platform == 'darwin') {
+    if (process.platform == 'win32') {
       electronApp.setLoginItemSettings({
         openAtLogin: true,
         args: []

package.json

@@ -1,13 +1,11 @@
 {
   "name": "OpenBuildsCONTROL",
-  "version": "1.0.355",
+  "version": "1.0.356",
   "license": "AGPL-3.0",
   "description": "OpenBuildsCONTROL CNC Machine Host Software",
   "author": "github.com/openbuilds <support@openbuilds.com>",
   "devDependencies": {
     "copyfiles": "^2.4.1",
-    "electron": "^23.1.1",
-    "electron-builder": "^v24.0.0-alpha.13",
     "electron-rebuild": "^3.2.9",
     "ncp": "^2.0.0",
     "node-gyp": "^9.3.1"
@@ -41,7 +39,14 @@
     "test": "echo \"Error: no test specified\" && exit 0",
     "release": "echo \"When you want to create a new release, follow these steps:\" && echo \"1) Update the version in your project's package.json file (e.g. 1.0.3xx)\" && echo \"2) Commit that change (git commit -am v1.0.3xx)\" && echo \"3) Push your changes to GitHub (git push)\"",
     "run-local": "electron .",
-    "postinstall": "electron-builder install-app-deps"
+    "postinstall": "cross-os install-electron-cross; electron-builder install-app-deps"
+  },
+  "cross-os": {
+    "install-electron-cross": {
+      "darwin": "yarn add electron@^19.0.17; yarn add electron-builder@23.3.3",
+      "win32": "yarn add electron@^19.0.17; yarn add electron-builder@23.3.3",
+      "linux": "yarn add electron@23.1.1; yarn add electron-builder@v24.0.0-alpha.13"
+    }
   },
   "keywords": [
     "usb"

yarn.lock

@@ -1147,6 +1147,11 @@ crc@^3.8.0, crc@~3.8.0:
   dependencies:
     buffer "^5.1.0"
 
+cross-os@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/cross-os/-/cross-os-1.5.0.tgz#7ffabbe9a12b4618336634db09c84ac925847e10"
+  integrity sha512-zjiZPGuzghQzjcymlI7oUh5iDCRlhfi9UBqkCmqxnnx/5B+K1+BgIm0YU+fua7GC+RoeywS0qsoEavRM+Kahxw==
+
 cross-spawn@^7.0.1, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -1402,10 +1407,10 @@ electron-updater@^5.2.1:
     semver "^7.3.5"
     typed-emitter "^2.1.0"
 
-electron@^23.1.0:
-  version "23.1.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-23.1.0.tgz#92c6a1480754bb83155d9d783bef6fec414cf2c8"
-  integrity sha512-LRgACMpVrmjfYWPgCSyJ+TFQ/FPeniOowpO57z0xUcTchfC7EH+5rUncgYN+uMvqePiYDce+ywZeCIFaO8x/Nw==
+electron@^23.1.1:
+  version "23.1.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-23.1.1.tgz#20b603e69919b263ef9e4a51b72a9615ce86dc5b"
+  integrity sha512-junV1NzPx5T8Mx9+o8fMWK1Q5WOtG5vggiM09PGYg/6zTcGDL3DjGVHeUa/97gx7ErXL37DrFnxNg6+ePWprDg==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^16.11.26"
@@ -3002,7 +3007,7 @@ serialize-error@^7.0.1:
   dependencies:
     type-fest "^0.13.1"
 
-serialport@^10.5.0:
+serialport@^10.4.0:
   version "10.5.0"
   resolved "https://registry.yarnpkg.com/serialport/-/serialport-10.5.0.tgz#b85f614def6e8914e5865c798b0555330903a0f8"
   integrity sha512-7OYLDsu5i6bbv3lU81pGy076xe0JwpK6b49G6RjNvGibstUqQkI+I3/X491yBGtf4gaqUdOgoU1/5KZ/XxL4dw==