@nocobase/cli 0.18.0-alpha.9 → 0.19.0-alpha.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.18.0-alpha.9",
+  "version": "0.19.0-alpha.10",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "0.18.0-alpha.9",
+    "@nocobase/app": "0.19.0-alpha.10",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -21,15 +21,16 @@
     "pm2": "^5.2.0",
     "portfinder": "^1.0.28",
     "serve": "^13.0.2",
+    "tree-kill": "^1.2.2",
     "tsx": "^4.6.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.18.0-alpha.9"
+    "@nocobase/devtools": "0.19.0-alpha.10"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "34ca0df4eede2e83fc86297b0fe19eba970e2b1b"
+  "gitHead": "d09d81eba67339da36bcec27939a85b35d180770"
 }

package/src/commands/dev.js

@@ -106,7 +106,9 @@ module.exports = (cli) => {
           env: {
             PORT: clientPort,
             APP_ROOT: `${APP_PACKAGE_ROOT}/client`,
-            WEBSOCKET_URL: process.env.WEBSOCKET_URL || (serverPort ? `ws://localhost:${serverPort}/ws` : undefined),
+            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),
           },

package/src/commands/e2e.js

@@ -3,6 +3,9 @@ const { run, isPortReachable } = require('../util');
 const { execSync } = require('node:child_process');
 const axios = require('axios');
 const { pTest } = require('./p-test');
+const os = require('os');
+const treeKill = require('tree-kill');
+const chalk = require('chalk');
 
 /**
  * 检查服务是否启动成功
@@ -32,7 +35,7 @@ const checkServer = async (duration = 1000, max = 60 * 10) => {
           }
         })
         .catch((error) => {
-          console.error('Request error:', error.message);
+          console.error('Request error:', error?.response?.data?.error);
         });
     }, duration);
   });
@@ -90,6 +93,17 @@ async function runApp(options = {}) {
   run('nocobase', [process.env.APP_ENV === 'production' ? 'start' : 'dev'], options);
 }
 
+process.on('SIGINT', async () => {
+  treeKill(process.pid, (error) => {
+    if (error) {
+      console.error(error);
+    } else {
+      console.log(chalk.yellow('Force killing...'));
+    }
+    process.exit();
+  });
+});
+
 const commonConfig = {
   stdio: 'inherit',
 };
@@ -127,6 +141,12 @@ const filterArgv = () => {
     if (element === '--skip-reporter') {
       continue;
     }
+    if (element === '--build') {
+      continue;
+    }
+    if (element === '--production') {
+      continue;
+    }
     argv.push(element);
   }
   return argv;
@@ -143,12 +163,23 @@ module.exports = (cli) => {
       console.log('APP_BASE_URL:', process.env.APP_BASE_URL);
     }
   });
+
   e2e
     .command('test')
     .allowUnknownOption()
     .option('--url [url]')
     .option('--skip-reporter')
+    .option('--build')
+    .option('--production')
     .action(async (options) => {
+      process.env.__E2E__ = true;
+      if (options.production) {
+        process.env.APP_ENV = 'production';
+      }
+      if (options.build) {
+        process.env.APP_ENV = 'production';
+        await run('yarn', ['build']);
+      }
       if (options.skipReporter) {
         process.env.PLAYWRIGHT_SKIP_REPORTER = true;
       }
@@ -183,8 +214,13 @@ module.exports = (cli) => {
   e2e
     .command('start-app')
     .option('--production')
+    .option('--build')
     .option('--port [port]')
     .action(async (options) => {
+      process.env.__E2E__ = true;
+      if (options.build) {
+        await run('yarn', ['build']);
+      }
       if (options.production) {
         process.env.APP_ENV = 'production';
       }
@@ -205,8 +241,14 @@ module.exports = (cli) => {
   e2e
     .command('p-test')
     .option('--stop-on-error')
-    .option('--concurrency [concurrency]', '', 3)
-    .action(async (opts) => {
-      await pTest(opts);
+    .option('--build')
+    .option('--concurrency [concurrency]', '', os.cpus().length)
+    .action(async (options) => {
+      process.env.__E2E__ = true;
+      if (options.build) {
+        process.env.APP_ENV = 'production';
+        await run('yarn', ['build']);
+      }
+      await pTest({ ...options, concurrency: 1 * options.concurrency });
     });
 };

package/src/commands/p-test.js

@@ -3,7 +3,6 @@ const { resolve } = require('path');
 const pAll = require('p-all');
 const dotenv = require('dotenv');
 const fs = require('fs');
-const { Client } = require('pg');
 const glob = require('glob');
 const _ = require('lodash');
 
@@ -22,7 +21,7 @@ const config = {
 async function runApp(dir, index = 0) {
   // 一个进程需要占用两个端口? (一个是应用端口，一个是 socket 端口)
   index = index * 2;
-
+  const { Client } = require('pg');
   const database = `nocobase${index}`;
   const client = new Client({
     host: config['DB_HOST'],
@@ -35,7 +34,7 @@ async function runApp(dir, index = 0) {
   await client.query(`DROP DATABASE IF EXISTS "${database}"`);
   await client.query(`CREATE DATABASE "${database}";`);
   await client.end();
-  return execa('yarn', ['nocobase', 'e2e', 'test', dir, '-x', '--skip-reporter'], {
+  return execa('yarn', ['nocobase', 'e2e', 'test', dir, '--skip-reporter'], {
     shell: true,
     stdio: 'inherit',
     env: {
@@ -47,23 +46,29 @@ async function runApp(dir, index = 0) {
       APP_ENV: 'production',
       APP_PORT: 20000 + index,
       DB_DATABASE: `nocobase${index}`,
-      SOCKET_PATH: `storage/gateway-e2e-${index}.sock`,
-      PM2_HOME: resolve(process.cwd(), `storage/.pm2-${index}`),
+      SOCKET_PATH: `storage/e2e/gateway-e2e-${index}.sock`,
+      PM2_HOME: resolve(process.cwd(), `storage/e2e/.pm2-${index}`),
       PLAYWRIGHT_AUTH_FILE: resolve(process.cwd(), `storage/playwright/.auth/admin-${index}.json`),
     },
   });
 }
 
 exports.pTest = async (options) => {
+  const dir = resolve(process.cwd(), 'storage/e2e');
+
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+
   const files = glob.sync('packages/**/__e2e__/**/*.test.ts', {
     root: process.cwd(),
   });
 
-  const commands = splitArrayIntoParts(files, options.concurrency || 3).map((v, i) => {
+  const commands = splitArrayIntoParts(_.shuffle(files), options.concurrency || 4).map((v, i) => {
     return () => runApp(v.join(' '), i);
   });
 
-  await pAll(commands, { concurrency: 3, stopOnError: false, ...options });
+  await pAll(commands, { concurrency: 4, stopOnError: false, ...options });
 };
 
 function splitArrayIntoParts(array, parts) {

package/src/commands/postinstall.js

@@ -3,7 +3,7 @@ const { run, isDev, isPackageValid, generatePlaywrightPath } = require('../util'
 const { resolve } = require('path');
 const { existsSync } = require('fs');
 const { readFile, writeFile } = require('fs').promises;
-const { createStoragePluginsSymlink } = require('@nocobase/utils/plugin-symlink');
+const { createStoragePluginsSymlink, createDevPluginsSymlink } = require('@nocobase/utils/plugin-symlink');
 
 /**
  * @param {Command} cli
@@ -13,12 +13,14 @@ module.exports = (cli) => {
   cli
     .command('postinstall')
     .allowUnknownOption()
-    .action(async () => {
+    .option('--skip-umi')
+    .action(async (options) => {
       generatePlaywrightPath(true);
       await createStoragePluginsSymlink();
       if (!isDev()) {
         return;
       }
+      await createDevPluginsSymlink();
       const cwd = process.cwd();
       if (!existsSync(resolve(cwd, '.env')) && existsSync(resolve(cwd, '.env.example'))) {
         const content = await readFile(resolve(cwd, '.env.example'), 'utf-8');
@@ -31,11 +33,13 @@ module.exports = (cli) => {
       if (!isPackageValid('umi')) {
         return;
       }
-      run('umi', ['generate', 'tmp'], {
-        stdio: 'pipe',
-        env: {
-          APP_ROOT: `${APP_PACKAGE_ROOT}/client`,
-        },
-      });
+      if (!options.skipUmi) {
+        run('umi', ['generate', 'tmp'], {
+          stdio: 'pipe',
+          env: {
+            APP_ROOT: `${APP_PACKAGE_ROOT}/client`,
+          },
+        });
+      }
     });
 };

package/src/commands/test.js

@@ -36,26 +36,26 @@ function addTestCommand(name, cli) {
       if (!opts.watch && !opts.run) {
         process.argv.push('--run');
       }
+      const first = paths?.[0];
+      if (!process.env.TEST_ENV && first) {
+        const key = first.split(path.sep).join('/');
+        if (key.includes('/client/')) {
+          process.env.TEST_ENV = 'client-side';
+        } else {
+          process.env.TEST_ENV = 'server-side';
+        }
+      }
       if (process.env.TEST_ENV === 'server-side' && opts.singleThread !== 'false') {
         process.argv.push('--poolOptions.threads.singleThread=true');
       }
       if (opts.singleThread === 'false') {
         process.argv.splice(process.argv.indexOf('--single-thread=false'), 1);
       }
-      const cliArgs = ['--max_old_space_size=4096', './node_modules/.bin/vitest', ...process.argv.slice(3)];
+      const cliArgs = ['--max_old_space_size=14096', './node_modules/.bin/vitest', ...process.argv.slice(3)];
       if (process.argv.includes('-h') || process.argv.includes('--help')) {
         await run('node', cliArgs);
         return;
       }
-      const first = paths?.[0];
-      if (!process.env.TEST_ENV && first) {
-        const key = first.split(path.sep).join('/');
-        if (key.includes('/client/')) {
-          process.env.TEST_ENV = 'client-side';
-        } else {
-          process.env.TEST_ENV = 'server-side';
-        }
-      }
       if (process.env.TEST_ENV) {
         console.log('process.env.TEST_ENV', process.env.TEST_ENV, cliArgs);
         await run('node', cliArgs);

package/src/plugin-generator.js

@@ -29,9 +29,10 @@ async function getProjectVersion() {
 
 class PluginGenerator extends Generator {
   constructor(options) {
-    const { context = {}, ...opts } = options;
+    const { log, context = {}, ...opts } = options;
     super(opts);
     this.context = context;
+    this.log = log || console.log;
   }
 
   async getContext() {
@@ -51,20 +52,19 @@ class PluginGenerator extends Generator {
     const { name } = this.context;
     const target = resolve(process.cwd(), 'packages/plugins/', name);
     if (existsSync(target)) {
-      console.log(chalk.red(`[${name}] plugin already exists.`));
+      this.log(chalk.red(`[${name}] plugin already exists.`));
       return;
     }
-    console.log('Creating plugin');
+    this.log('Creating plugin');
     this.copyDirectory({
       target,
       context: await this.getContext(),
       path: join(__dirname, '../templates/plugin'),
     });
-    console.log('');
+    this.log('');
     genTsConfigPaths();
-    execa.sync('yarn', ['install'], { shell: true, stdio: 'inherit' });
-    // execa.sync('yarn', ['build', `plugins/${name}`], { shell: true, stdio: 'inherit' });
-    console.log(`The plugin folder is in ${chalk.green(`packages/plugins/${name}`)}`);
+    execa.sync('yarn', ['postinstall', '--skip-umi'], { shell: true, stdio: 'inherit' });
+    this.log(`The plugin folder is in ${chalk.green(`packages/plugins/${name}`)}`);
   }
 }
 

package/src/util.js

@@ -245,6 +245,18 @@ function generatePlaywrightPath(clean = false) {
 
 exports.generatePlaywrightPath = generatePlaywrightPath;
 
+function parseEnv(name) {
+  if (name === 'DB_UNDERSCORED') {
+    if (process.env.DB_UNDERSCORED === 'true') {
+      return 'true';
+    }
+    if (process.env.DB_UNDERSCORED) {
+      return 'true';
+    }
+    return 'false';
+  }
+}
+
 exports.initEnv = function initEnv() {
   const env = {
     APP_ENV: 'development',
@@ -254,15 +266,21 @@ exports.initEnv = function initEnv() {
     DB_DIALECT: 'sqlite',
     DB_STORAGE: 'storage/db/nocobase.sqlite',
     DB_TIMEZONE: '+00:00',
+    DB_UNDERSCORED: parseEnv('DB_UNDERSCORED'),
     DEFAULT_STORAGE_TYPE: 'local',
     LOCAL_STORAGE_DEST: 'storage/uploads',
     PLUGIN_STORAGE_PATH: resolve(process.cwd(), 'storage/plugins'),
     MFSU_AD: 'none',
+    WS_PATH: '/ws',
+    SOCKET_PATH: 'storage/gateway.sock',
     NODE_MODULES_PATH: resolve(process.cwd(), 'node_modules'),
     PM2_HOME: resolve(process.cwd(), './storage/.pm2'),
     PLUGIN_PACKAGE_PREFIX: '@nocobase/plugin-,@nocobase/plugin-sample-,@nocobase/preset-',
     SERVER_TSCONFIG_PATH: './tsconfig.server.json',
     PLAYWRIGHT_AUTH_FILE: resolve(process.cwd(), 'storage/playwright/.auth/admin.json'),
+    CACHE_DEFAULT_STORE: 'memory',
+    CACHE_MEMORY_MAX: 2000,
+    LOGGER_BASE_PATH: 'storage/logs',
   };
 
   if (

package/templates/plugin/src/server/plugin.ts.tpl

@@ -1,13 +1,13 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { Plugin } from '@nocobase/server';
 
 export class {{{pascalCaseName}}}Server extends Plugin {
-  afterAdd() {}
+  async afterAdd() {}
 
-  beforeLoad() {}
+  async beforeLoad() {}
 
   async load() {}
 
-  async install(options?: InstallOptions) {}
+  async install() {}
 
   async afterEnable() {}