add check port and change process

.gitignore

@@ -13,3 +13,5 @@ cache-file
 
 logs
 root/
+
+release/*.tgz

assistant-module/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/assistant-module",
-  "version": "0.0.3",
+  "version": "0.0.4-beta.2",
   "description": "assistant module",
   "main": "dist/assistant-module.mjs",
   "types": "dist/assistant-module.d.ts",

assistant-module/src/https/create-sign.ts

@@ -0,0 +1,18 @@
+import { createCert } from '@kevisual/router/sign';
+import { writeFileSync } from 'fs';
+import path from 'path';
+const pemDir = path.join(process.cwd(), 'router-app', 'pem');
+
+const { key, cert } = createCert([
+  {
+    name: 'commonName',
+    value: 'localhost',
+  },
+  {
+    name: 'organizationName',
+    value: 'kevisual',
+  },
+]);
+
+writeFileSync(path.join(pemDir, 'https-key.pem'), key);
+writeFileSync(path.join(pemDir, 'https-cert.pem'), cert);

assistant-module/src/process/index.ts

@@ -1,32 +1,40 @@
-import { ChildProcess, fork } from 'child_process';
-
-export const runProcess = (appPath: string) => {
-  const process = fork(appPath);
-  process.on('exit', (code) => {
-    console.log(`Process exited with code ${code}`);
-  });
-
-  process.on('message', (message) => {
-    console.log('Message from child:', message);
-  });
-
-  // Example of sending a message to the child process
-  // process.send({ hello: 'world' });
-};
+import { ChildProcess, fork, ForkOptions } from 'child_process';
 class BaseProcess {
   private process: ChildProcess;
   status: 'running' | 'stopped' | 'error' = 'stopped';
   appPath: string;
-  constructor(appPath: string) {
+  args: any[] = [];
+  opts: ForkOptions = {};
+  /*
+   * 重启次数, 默认0， TODO, 错误检测，当重启次数超过一定次数，则认为进程已崩溃
+   */
+  restartCount: number = 0;
+  constructor(appPath?: string, args?: any[], opts?: ForkOptions) {
     this.appPath = appPath;
+    this.args = args || [];
+    this.opts = opts || {};
     // this.createProcess(appPath);
   }
-  createProcess(appPath: string = this.appPath) {
+  createProcess(appPath: string = this.appPath, args: any[] = [], opts: ForkOptions = {}) {
     if (this.process) {
       this.process.kill();
     }
-    this.appPath = appPath;
-    this.process = fork(appPath);
+    this.appPath = appPath || this.appPath;
+    this.args = args || this.args;
+    this.opts = {
+      ...this.opts,
+      ...opts,
+    };
+
+    this.process = fork(appPath, args, {
+      stdio: 'inherit',
+      ...this.opts,
+      env: {
+        ...process.env,
+        NODE_ENV_PARENT: 'fork',
+        ...this.opts?.env,
+      },
+    });
     return this;
   }
   kill(signal?: NodeJS.Signals | number) {
@@ -62,6 +70,10 @@ class BaseProcess {
   public onDisconnect(callback: () => void) {
     this.process.on('disconnect', callback);
   }
+  restart() {
+    this.kill();
+    this.createProcess();
+  }
 }
 export class AssistantProcess extends BaseProcess {
   constructor(appPath: string) {

assistant-module/src/proxy/api-proxy.ts

@@ -14,11 +14,11 @@ export const defaultApiProxy = [
 ];
 /**
  * 创建api代理
- * @param api 
+ * @param api
  * @param paths ['/api/router', '/v1' ]
- * @returns 
+ * @returns
  */
-export const createApiProxy = (api: string, paths: string[] = ['/api/router', '/v1']) => {
+export const createApiProxy = (api: string, paths: string[] = ['/api/router', '/v1', '/resources']) => {
   const pathList = paths.map((item) => {
     return {
       path: item,

package.json

@@ -9,7 +9,8 @@
     "type": "system-app",
     "files": [
       "dist",
-      "pem"
+      "pem",
+      "root"
     ]
   },
   "scripts": {
@@ -28,9 +29,9 @@
   "type": "module",
   "types": "types/index.d.ts",
   "files": [
-    "types",
     "dist",
-    "src"
+    "pem",
+    "root"
   ],
   "dependencies": {
     "@kevisual/code-center-module": "0.0.13",
@@ -39,6 +40,7 @@
     "cookie": "^1.0.2",
     "dayjs": "^1.11.13",
     "formidable": "^3.5.2",
+    "get-port": "^7.1.0",
     "json5": "^2.2.3",
     "lodash-es": "^4.17.21",
     "ws": "^8.18.1"

release/release.mjs

@@ -0,0 +1 @@
+console.log('release');

rollup.config.mjs

@@ -8,7 +8,7 @@ import replace from '@rollup/plugin-replace';
 import pkgs from './package.json' with {type: 'json'};
 
 const isDev = process.env.NODE_ENV === 'development';
-const input = isDev ? './src/dev.ts' : './src/index.ts';
+const input = isDev ? './src/dev.ts' : './src/main.ts';
 /**
  * @type {import('rollup').RollupOptions}
  */
@@ -64,8 +64,8 @@ const config = {
     json(),
   ],
   external: [
-    /@kevisual\/router(\/.*)?/, //, // 路由
-    /@kevisual\/use-config(\/.*)?/, //
+    // /@kevisual\/router(\/.*)?/, //, // 路由
+    // /@kevisual\/use-config(\/.*)?/, //
 
     // 'sequelize', // 数据库 orm
     // 'ioredis', // redis

src/dev.ts

@@ -11,7 +11,7 @@ app
   .addTo(app);
 
 console.log('httpsConfig', `https://localhost:51015/client/router?path=demo`);
-app.listen(51015, () => {
+app.listen(51016, () => {
   console.log('Router App is running on https://localhost:51015');
 });
 

src/main.ts

@@ -0,0 +1,26 @@
+import { app } from './index.ts';
+import { proxyRoute } from './proxy-route/index.ts';
+import getPort, { portNumbers } from 'get-port';
+console.log('httpsConfig', `https://localhost:51015/client/router?path=demo`);
+// 检车端口可用性
+const isPortAvailable = await getPort({ port: portNumbers(51015, 52000) });
+if (!isPortAvailable) {
+  console.log(`Port ${isPortAvailable} is not available`);
+  process.exit(1);
+}
+
+app.listen(isPortAvailable, () => {
+  console.log('Router App is running on https://localhost:51015');
+});
+
+app.server.on(proxyRoute);
+
+// 如果是被fork启动的，向父进程发送消息
+if (process.env.NODE_ENV_PARENT === 'fork') {
+  process.send({
+    type: 'fork',
+    data: {
+      port: isPortAvailable,
+    },
+  });
+}

src/modules/install.ts

@@ -118,7 +118,20 @@ export const installApp = async (app: Package) => {
     };
   }
 };
-
+export const addCacheAssistantConfig = (config: any) => {
+  const cacheAssistantConfig = getCacheAssistantConfig();
+  let proxy = cacheAssistantConfig.proxy || [];
+  const index = proxy.findIndex((item: any) => item.user === config.user && item.key === config.key);
+  if (index !== -1) {
+    proxy[index] = config;
+  } else {
+    proxy.push(config);
+  }
+  setConfig({
+    ...cacheAssistantConfig,
+    proxy,
+  });
+};
 export const uninstallApp = async (app: Package) => {
   try {
     const { user, key } = app;

src/scripts/port-get.ts

@@ -0,0 +1,10 @@
+import getPort from 'get-port';
+
+const port = 51015;
+const isPortAvailable = await getPort({ port: [51015, 51030] });
+if (!isPortAvailable) {
+  console.log(`Port ${port} is not available`);
+  process.exit(1);
+}
+console.log(`Port ${isPortAvailable} is available`);
+process.exit(0);