build: src-node injection in elelectron dev stage

Author: abose

.gitignore

@@ -21,6 +21,7 @@ phoenix
 
 # Electron things
 src-electron/bin
+src-electron/src-node
 
 node_modules
 dist

package-lock.json

@@ -19,23 +19,19 @@
         "releaseDistDebug": "npm run _make_src-node && npm run _createDistReleaseConfig && tauri build --config ./src-tauri/tauri-local.conf.json --debug --verbose",
         "releaseDistTest": "npm run _make_src-node && npm run _createDistTestReleaseConfig && tauri build --config ./src-tauri/tauri-local.conf.json",
         "releaseDistTestDebug": "npm run _make_src-node && npm run _createDistTestReleaseConfig && tauri build --config ./src-tauri/tauri-local.conf.json --debug",
-        "_src-node_npm_install": "cd src-tauri/src-node && npm ci --production && cd ../../ && npm run _src-node_remove_unsupported_bin",
-        "_src-node_remove_unsupported_bin": "shx rm -f src-tauri/src-node/node_modules/@msgpackr-extract/msgpackr-extract-linux-*/*.musl.node src-tauri/src-node/node_modules/@lmdb/lmdb-linux-*/*.musl.node",
-        "_make_src-node": "shx rm -rf src-tauri/src-node && shx cp -r ../phoenix/src-node src-tauri/src-node && npm run _src-node_npm_install",
-        "_make_src-node_debug_dev": "npm run _make_src-node && shx rm -rf src-tauri/target/debug/src-node && shx cp -r src-tauri/src-node src-tauri/target/debug/src-node",
-        "_ci_make_src-node": "shx rm -rf src-tauri/src-node && shx cp -r phoenix/src-node src-tauri/src-node && npm run _src-node_npm_install",
+        "_make_src-node": "node ./src-build/makeSrcNode.js ../phoenix/src-node",
+        "_ci_make_src-node": "node ./src-build/makeSrcNode.js phoenix/src-node",
         "_servePhoenix": "echo -e \"\nEnsure to start phoenix server at http://localhost:8000 for development.\n Follow https://github.com/phcode-dev/phoenix#running-phoenix for instructions.\"",
         "_ci-clonePhoenixForTests": "npm run _ci-env-warn && node ./src-build/clonePhoenixForTests.js",
         "_ci-cloneAndBuildPhoenix": "npm run _ci-env-warn && node ./src-build/clonePhoenix.js && cd phoenix && npm ci && npm run build && cd ..",
         "_ci-release:dev": "npm run _ci-env-warn && npm run _ci-cloneAndBuildPhoenix && cd phoenix && npm run release:dev && cd .. && npm run _ci-createDistReleaseConfig && npm run _ci_make_src-node",
         "_ci-release:staging": "npm run _ci-env-warn && npm run _ci-cloneAndBuildPhoenix && cd phoenix && npm run release:staging && cd .. && npm run _ci-createDistReleaseConfig && npm run _ci_make_src-node",
         "_ci-release:prod": "npm run _ci-env-warn && npm run _ci-cloneAndBuildPhoenix && cd phoenix && npm run release:prod && cd .. && npm run _ci-createDistReleaseConfig && npm run _ci_make_src-node",
         "_ci-update-phcode-build": "node src-build/update-phcode-build.js",
-        "_watch_src-node": "chokidar '../phoenix/src-node/**/*' --ignore '../phoenix/src-node/node_modules/**/*' -c 'npm run _make_src-node_debug_dev'",
         "serve": "node src-build/serveForPlatform.js",
         "_serveTauri": "npm run _servePhoenix && npm run _make_src-node && tauri dev",
         "_serveElectron": "npm run _servePhoenix && npm run _make_src-node && ./src-electron/node_modules/.bin/electron src-electron/main.js",
-        "postinstall": "node ./src-build/downloadNodeBinary.js",
+        "postinstall": "node ./src-build/downloadNodeBinary.js && node ./src-build/setupElectron.js",
         "cleanNodeBinary": "node src-build/cleanNodeBinary.js",
         "installNodeArmDarwin": "node ./src-build/downloadNodeBinary.js '{\"platform\":\"darwin\",\"arch\":\"arm64\"}'",
         "getPackageVersion": "node ./src-build/getVersion.js"

package.json

@@ -0,0 +1,50 @@
+import { execSync } from 'child_process';
+import { fileURLToPath } from 'url';
+import { dirname, join } from 'path';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+// Get source path from command line argument
+const srcNodeSource = process.argv[2];
+if (!srcNodeSource) {
+    console.error('Usage: node makeSrcNode.js <src-node-path>');
+    console.error('Example: node makeSrcNode.js ../phoenix/src-node');
+    process.exit(1);
+}
+
+const targets = [
+    join(__dirname, '..', 'src-tauri', 'src-node'),
+    join(__dirname, '..', 'src-electron', 'src-node')
+];
+
+function setupTarget(srcPath, destPath) {
+    console.log(`\nSetting up ${destPath}...`);
+
+    // Remove existing and copy from source
+    execSync(`shx rm -rf ${destPath}`, { stdio: 'inherit' });
+    execSync(`shx cp -r ${srcPath} ${destPath}`, { stdio: 'inherit' });
+
+    // Install production dependencies
+    console.log('Installing production dependencies...');
+    execSync('npm ci --production', { cwd: destPath, stdio: 'inherit' });
+
+    // Remove unsupported musl binaries
+    console.log('Removing unsupported musl binaries...');
+    execSync(`shx rm -f ${destPath}/node_modules/@msgpackr-extract/msgpackr-extract-linux-*/*.musl.node`, { stdio: 'pipe' });
+    execSync(`shx rm -f ${destPath}/node_modules/@lmdb/lmdb-linux-*/*.musl.node`, { stdio: 'pipe' });
+
+    console.log(`${destPath} setup complete!`);
+}
+
+function main() {
+    const absoluteSrc = join(process.cwd(), srcNodeSource);
+
+    for (const target of targets) {
+        setupTarget(absoluteSrc, target);
+    }
+
+    console.log('\nAll targets setup successfully!');
+}
+
+main();

src-build/makeSrcNode.js

@@ -0,0 +1,12 @@
+import { execSync } from 'child_process';
+import { fileURLToPath } from 'url';
+import { dirname, join } from 'path';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const electronDir = join(__dirname, '..', 'src-electron');
+
+console.log('Installing src-electron dependencies...');
+execSync('npm ci', { cwd: electronDir, stdio: 'inherit' });
+console.log('src-electron dependencies installed successfully!');

src-build/setupElectron.js

@@ -2,7 +2,6 @@
     "$schema": "../node_modules/@tauri-apps/cli/schema.json",
     "build": {
         "beforeBuildCommand": "",
-        "beforeDevCommand": "npm run _watch_src-node",
         "devPath": "http://localhost:8000/src/",
         "distDir": "../src/",
         "withGlobalTauri": true
@@ -484,4 +483,4 @@
             }
         ]
     }
-}
+}