ee-bin 1.1.0-beta.1 → 1.2.0-beta.1

package/index.js

@@ -50,4 +50,16 @@ program
     iconGen.run();
   });
 
+/**
+ * dev
+ */
+program
+  .command('dev')
+  .description('create frontend-server and electron-server')
+  .option('--config <folder>', 'config file', './electron/config/bin.js')
+  .action(function() {
+    const frontend = require('./tools/frontend');
+    frontend.serve(this.opts());
+  });
+
 program.parse();

package/lib/utils.js

@@ -0,0 +1,30 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const chalk = require('chalk');
+const is = require('is-type-of');
+
+const _basePath = process.cwd();
+
+function loadConfig(prop) {
+  const configFile = prop || './electron/config/bin.js';
+  const filepath = path.join(_basePath, configFile);
+  if (!fs.existsSync(filepath)) {
+    const errorTips = 'config file ' + chalk.blue(`${filepath}`) + ' does not exist !';
+    throw new Error(errorTips)
+  }
+  const obj = require(filepath);
+  if (!obj) return obj;
+
+  let ret = obj;
+  if (is.function(obj) && !is.class(obj)) {
+    ret = obj();
+  }
+
+  return ret || {};
+};
+
+module.exports = {
+  loadConfig
+}

package/package.json

@@ -1,23 +1,23 @@
-{
-  "name": "ee-bin",
-  "version": "1.1.0-beta.1",
-  "description": "ee bin",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "bin": {
-    "ee-bin": "index.js"
-  },
-  "dependencies": {
-    "bytenode": "^1.3.6",
-    "chalk": "^4.1.2",
-    "commander": "^11.0.0",
-    "fs-extra": "^10.0.0",
-    "globby": "^10.0.0",
-    "is-type-of": "^1.2.1",
-    "javascript-obfuscator": "^4.0.2"
-  }
-}
+{
+  "name": "ee-bin",
+  "version": "1.2.0-beta.1",
+  "description": "ee bin",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "bin": {
+    "ee-bin": "index.js"
+  },
+  "dependencies": {
+    "bytenode": "^1.3.6",
+    "chalk": "^4.1.2",
+    "commander": "^11.0.0",
+    "fs-extra": "^10.0.0",
+    "globby": "^10.0.0",
+    "is-type-of": "^1.2.1",
+    "javascript-obfuscator": "^4.0.2"
+  }
+}

package/tools/frontend.js

@@ -0,0 +1,100 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const { spawn, spawnSync, exec, execFile } = require('child_process');
+const Utils = require('../lib/utils');
+const is = require('is-type-of');
+
+module.exports = {
+
+  electronServer: undefined,
+
+  frontendServer: undefined,
+
+  /**
+   * 启动前端、主进程服务
+   */  
+  serve(options = {}) {
+    const { config } = options;
+    const cfg = Utils.loadConfig(config);
+
+    const { frontend, main } = cfg;
+    console.log('frontend:', frontend);
+    console.log('main:', main);
+
+    // const frontendDir = path.join(process.cwd(), frontend.directory);
+    // const frontendArgs = is.string(frontend.args) ? [frontend.args] : frontend.args;
+    // console.log('frontendDir:', frontendDir);
+    // console.log('frontendArgs:', frontendArgs);
+
+    //['--host --port 8080'], ['--host', '--port 8080'],
+    this.frontendServer = spawnSync(
+      'vite',
+      ['--host', '--port=8080'],
+      {
+        stdio: 'inherit', 
+        cwd: path.join(process.cwd(), 'frontend'),
+        shell: true,
+      }
+    );
+    console.log('this.frontendServer:', this.frontendServer);
+    // todo execSync衍生了shell无法找到cmd
+    // this.frontendServer = execSync(frontend.exec, {stdio: 'inherit', cwd: frontendDir});
+    // spawnSync(
+    //   frontend.cmd,
+    //   frontendArgs,
+    //   {
+    //     stdio: 'inherit', 
+    //     cwd: frontendDir
+    //   }
+    // );
+    
+    const mainDir = path.join(process.cwd(), main.directory);
+    const mainArgs = is.string(main.args) ? [main.args] : main.args;
+    const electronPath = this._getElectronPath();
+    this.electronServer = spawn(electronPath, mainArgs, { stdio: 'inherit' });
+    
+    this._init();
+  },
+
+  _getElectronPath() {
+    let electronExecPath = ''
+    const electronModulePath = path.dirname(require.resolve('electron'))
+    const pathFile = path.join(electronModulePath, 'path.txt')
+    let executablePath
+    if (fs.existsSync(pathFile)) {
+      executablePath = fs.readFileSync(pathFile, 'utf-8')
+    }
+    if (executablePath) {
+      electronExecPath = path.join(electronModulePath, 'dist', executablePath)
+    } else {
+      throw new Error('Electron uninstall')
+    }
+    return electronExecPath
+  },
+
+  /**
+   * 事件监听
+   */
+  _init() {
+    // this.frontendServer.on('data', (data) => {
+    //   console.log(`[ee-bin] [serve] frontend-server data:${data}`);
+    // });
+    // this.frontendServer.on('exit', (code, signal) => {
+    //   console.log(`[ee-bin] [serve] frontend-server code:${code}, signal:${signal}`);
+    // });
+
+    // this.frontendServer.on('error', (err) => {
+    //   console.log(`[ee-bin] [serve] frontendServer error: ${err}`);
+    // });
+
+    // this.electronServer.on('exit', (code, signal) => {
+    //   console.log(`[ee-bin] [serve] electronServer code:${code}, signal:${signal}`);
+    // });
+
+    // this.electronServer.on('error', (err) => {
+    //   console.log(`[ee-bin] [serve] electronServer error: ${err}`);
+    // });
+  }  
+}