@nocobase/cli 1.5.0-alpha.5 → 1.5.0-beta.10

package/nocobase.conf.tpl

@@ -70,6 +70,7 @@ server {
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection 'upgrade';
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Host $host;
         add_header Cache-Control 'no-cache, no-store';
         proxy_cache_bypass $http_upgrade;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "1.5.0-alpha.5",
+  "version": "1.5.0-beta.10",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.5.0-alpha.5",
+    "@nocobase/app": "1.5.0-beta.10",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -25,12 +25,12 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "1.5.0-alpha.5"
+    "@nocobase/devtools": "1.5.0-beta.10"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "8d24e8d2c0f3f57ceaa271438fd93db2b4150011"
+  "gitHead": "379133b1104f8c609d7c5ac5bee23f9ba93934d5"
 }

package/src/commands/dev.js

@@ -6,16 +6,21 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-
-const chalk = require('chalk');
+const _ = require('lodash');
 const { Command } = require('commander');
-const { generatePlugins, run, postCheck, nodeCheck, promptForTs } = require('../util');
+const { generatePlugins, run, postCheck, nodeCheck, promptForTs, isPortReachable } = require('../util');
 const { getPortPromise } = require('portfinder');
 const chokidar = require('chokidar');
 const { uid } = require('@formily/shared');
 const path = require('path');
 const fs = require('fs');
 
+function sleep(ms = 1000) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}
+
 /**
  *
  * @param {Command} cli
@@ -25,12 +30,30 @@ module.exports = (cli) => {
   cli
     .command('dev')
     .option('-p, --port [port]')
-    .option('--client')
-    .option('--server')
+    .option('-c, --client')
+    .option('-s, --server')
     .option('--db-sync')
-    .option('--inspect [port]')
+    .option('-i, --inspect [port]')
     .allowUnknownOption()
     .action(async (opts) => {
+      let subprocess;
+      const runDevClient = () => {
+        console.log('starting client', 1 * clientPort);
+        subprocess = run('umi', ['dev'], {
+          env: {
+            ...process.env,
+            stdio: 'inherit',
+            shell: true,
+            PORT: clientPort,
+            APP_ROOT: `${APP_PACKAGE_ROOT}/client`,
+            WEBSOCKET_URL:
+              process.env.WEBSOCKET_URL ||
+              (serverPort ? `ws://localhost:${serverPort}${process.env.WS_PATH}` : undefined),
+            PROXY_TARGET_URL:
+              process.env.PROXY_TARGET_URL || (serverPort ? `http://127.0.0.1:${serverPort}` : undefined),
+          },
+        });
+      };
       const watcher = chokidar.watch('./storage/plugins/**/*', {
         cwd: process.cwd(),
         ignored: /(^|[\/\\])\../, // 忽略隐藏文件
@@ -39,15 +62,42 @@ module.exports = (cli) => {
       });
 
       await fs.promises.mkdir(path.dirname(process.env.WATCH_FILE), { recursive: true });
+      let isReady = false;
+
+      const restartClient = _.debounce(async () => {
+        if (!isReady) return;
+        generatePlugins();
+        if (subprocess) {
+          console.log('client restarting...');
+          subprocess.cancel();
+          let i = 0;
+          while (true) {
+            ++i;
+            const result = await isPortReachable(clientPort);
+            if (!result) {
+              break;
+            }
+            await sleep(500);
+            if (i > 10) {
+              break;
+            }
+          }
+          runDevClient();
+          await fs.promises.writeFile(process.env.WATCH_FILE, `export const watchId = '${uid()}';`, 'utf-8');
+        }
+      }, 500);
 
       watcher
+        .on('ready', () => {
+          isReady = true;
+        })
         .on('addDir', async (pathname) => {
-          generatePlugins();
-          await fs.promises.writeFile(process.env.WATCH_FILE, `export const watchId = '${uid()}';`, 'utf-8');
+          if (!isReady) return;
+          restartClient();
         })
         .on('unlinkDir', async (pathname) => {
-          generatePlugins();
-          await fs.promises.writeFile(process.env.WATCH_FILE, `export const watchId = '${uid()}';`, 'utf-8');
+          if (!isReady) return;
+          restartClient();
         });
 
       promptForTs();
@@ -133,18 +183,7 @@ module.exports = (cli) => {
       }
 
       if (client || !server) {
-        console.log('starting client', 1 * clientPort);
-        run('umi', ['dev'], {
-          env: {
-            PORT: clientPort,
-            APP_ROOT: `${APP_PACKAGE_ROOT}/client`,
-            WEBSOCKET_URL:
-              process.env.WEBSOCKET_URL ||
-              (serverPort ? `ws://localhost:${serverPort}${process.env.WS_PATH}` : undefined),
-            PROXY_TARGET_URL:
-              process.env.PROXY_TARGET_URL || (serverPort ? `http://127.0.0.1:${serverPort}` : undefined),
-          },
-        });
+        runDevClient();
       }
     });
 };

package/src/commands/pkg.js

@@ -58,14 +58,16 @@ class Package {
       return [version, this.data.versions[version].dist.tarball];
     }
 
-    if (version.includes('beta')) {
-      version = version.split('beta')[0] + 'beta';
-    } else if (version.includes('alpha')) {
-      const prefix = (version = version.split('alpha')[0]);
-      version = Object.keys(this.data.versions)
-        .filter((ver) => ver.startsWith(`${prefix}alpha`))
-        .sort()
-        .pop();
+    const keys = version.split('.');
+    const length = keys.length;
+
+    if (version.includes('rc')) {
+      version = version.split('-').shift();
+    }
+
+    if (length === 5) {
+      keys.pop();
+      version = keys.join('.');
     }
 
     if (version === 'latest') {
@@ -93,11 +95,25 @@ class Package {
     return false;
   }
 
+  async isDownloaded(version) {
+    const packageFile = path.resolve(process.env.PLUGIN_STORAGE_PATH, this.packageName, 'package.json');
+    if (await fs.exists(packageFile)) {
+      const json = await fs.readJson(packageFile);
+      if (json.version === version) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   async download(options = {}) {
     if (await this.isDevPackage()) {
       console.log(chalk.yellowBright(`Skipped: ${this.packageName} is dev package`));
       return;
     }
+    if (await this.isDownloaded(options.version)) {
+      return;
+    }
     await this.getInfo();
     if (!this.data) {
       console.log(chalk.redBright(`Download failed: ${this.packageName} package does not exist`));
@@ -105,6 +121,9 @@ class Package {
     }
     try {
       const [version, url] = this.getTarball(options.version);
+      if (await this.isDownloaded(version)) {
+        return;
+      }
       const response = await axios({
         url,
         responseType: 'stream',
@@ -200,8 +219,12 @@ module.exports = (cli) => {
     .command('download-pro')
     .option('-V, --version [version]')
     .action(async () => {
-      const { NOCOBASE_PKG_URL, NOCOBASE_PKG_USERNAME, NOCOBASE_PKG_PASSWORD } = process.env;
-      if (!(NOCOBASE_PKG_URL && NOCOBASE_PKG_USERNAME && NOCOBASE_PKG_PASSWORD)) {
+      const {
+        NOCOBASE_PKG_URL = 'https://pkg.nocobase.com/',
+        NOCOBASE_PKG_USERNAME,
+        NOCOBASE_PKG_PASSWORD,
+      } = process.env;
+      if (!(NOCOBASE_PKG_USERNAME && NOCOBASE_PKG_PASSWORD)) {
         return;
       }
       const credentials = { username: NOCOBASE_PKG_USERNAME, password: NOCOBASE_PKG_PASSWORD };

package/src/commands/start.js

@@ -6,7 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-
+const _ = require('lodash');
 const { Command } = require('commander');
 const { isDev, run, postCheck, downloadPro, promptForTs } = require('../util');
 const { existsSync, rmSync } = require('fs');
@@ -51,10 +51,23 @@ module.exports = (cli) => {
         depth: 1, // 只监听第一层目录
       });
 
-      watcher.on('addDir', async (pathname) => {
-        console.log('pathname', pathname);
+      const restart = _.debounce(async () => {
+        console.log('restarting...');
         await run('yarn', ['nocobase', 'pm2-restart']);
-      });
+      }, 500);
+
+      watcher
+        .on('ready', () => {
+          isReady = true;
+        })
+        .on('addDir', async (pathname) => {
+          if (!isReady) return;
+          restart();
+        })
+        .on('unlinkDir', async (pathname) => {
+          if (!isReady) return;
+          restart();
+        });
 
       if (opts.port) {
         process.env.APP_PORT = opts.port;
@@ -79,11 +92,20 @@ module.exports = (cli) => {
         return;
       }
       await postCheck(opts);
-      deleteSockFiles();
+      if (!opts.daemon) {
+        deleteSockFiles();
+      }
       const instances = opts.instances || process.env.CLUSTER_MODE;
       const instancesArgs = instances ? ['-i', instances] : [];
       if (opts.daemon) {
-        run('pm2', ['start', ...instancesArgs, `${APP_PACKAGE_ROOT}/lib/index.js`, '--', ...process.argv.slice(2)]);
+        await run('pm2', [
+          'start',
+          ...instancesArgs,
+          `${APP_PACKAGE_ROOT}/lib/index.js`,
+          '--',
+          ...process.argv.slice(2),
+        ]);
+        process.exit();
       } else {
         run(
           'pm2-runtime',

package/src/util.js

@@ -337,6 +337,7 @@ exports.initEnv = function initEnv() {
     LOCAL_STORAGE_DEST: 'storage/uploads',
     PLUGIN_STORAGE_PATH: resolve(process.cwd(), 'storage/plugins'),
     MFSU_AD: 'none',
+    MAKO_AD: 'none',
     WS_PATH: '/ws',
     SOCKET_PATH: 'storage/gateway.sock',
     NODE_MODULES_PATH: resolve(process.cwd(), 'node_modules'),
@@ -346,6 +347,7 @@ exports.initEnv = function initEnv() {
     PLAYWRIGHT_AUTH_FILE: resolve(process.cwd(), 'storage/playwright/.auth/admin.json'),
     CACHE_DEFAULT_STORE: 'memory',
     CACHE_MEMORY_MAX: 2000,
+    BROWSERSLIST_IGNORE_OLD_DATA: true,
     PLUGIN_STATICS_PATH: '/static/plugins/',
     LOGGER_BASE_PATH: 'storage/logs',
     APP_SERVER_BASE_URL: '',