@nocobase/cli 1.3.44-beta → 1.4.0-alpha.0

package/bin/index.js

@@ -11,6 +11,14 @@ if (require('semver').satisfies(process.version, '<16')) {
   process.exit(1);
 }
 
+if (__dirname.includes(' ')) {
+  console.error(chalk.red(`[nocobase cli]: PathError: Invalid path "${process.cwd()}"`));
+  console.error(
+    chalk.red('[nocobase cli]: PathError: The path cannot contain spaces. Please modify the path and try again.'),
+  );
+  process.exit(1);
+}
+
 // if (require('semver').satisfies(process.version, '>16') && !process.env.UNSET_NODE_OPTIONS) {
 //   if (process.env.NODE_OPTIONS) {
 //     let opts = process.env.NODE_OPTIONS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "1.3.44-beta",
+  "version": "1.4.0-alpha.0",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.3.44-beta",
+    "@nocobase/app": "1.4.0-alpha.0",
     "@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.3.44-beta"
+    "@nocobase/devtools": "1.4.0-alpha.0"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "1d5666123ac1e2997e434e38defef963ba0d9f90"
+  "gitHead": "8ffa7b54bbaf720c0c9857da4b19a99110dffc4b"
 }

package/src/commands/dev.js

@@ -9,8 +9,12 @@
 
 const chalk = require('chalk');
 const { Command } = require('commander');
-const { runAppCommand, runInstall, run, postCheck, nodeCheck, promptForTs } = require('../util');
+const { generatePlugins, run, postCheck, nodeCheck, promptForTs } = require('../util');
 const { getPortPromise } = require('portfinder');
+const chokidar = require('chokidar');
+const { uid } = require('@formily/shared');
+const path = require('path');
+const fs = require('fs');
 
 /**
  *
@@ -27,6 +31,25 @@ module.exports = (cli) => {
     .option('--inspect [port]')
     .allowUnknownOption()
     .action(async (opts) => {
+      const watcher = chokidar.watch('./storage/plugins/**/*', {
+        cwd: process.cwd(),
+        ignored: /(^|[\/\\])\../, // 忽略隐藏文件
+        persistent: true,
+        depth: 1, // 只监听第一层目录
+      });
+
+      await fs.promises.mkdir(path.dirname(process.env.WATCH_FILE), { recursive: true });
+
+      watcher
+        .on('addDir', async (pathname) => {
+          generatePlugins();
+          await fs.promises.writeFile(process.env.WATCH_FILE, `export const watchId = '${uid()}';`, 'utf-8');
+        })
+        .on('unlinkDir', async (pathname) => {
+          generatePlugins();
+          await fs.promises.writeFile(process.env.WATCH_FILE, `export const watchId = '${uid()}';`, 'utf-8');
+        });
+
       promptForTs();
       const { SERVER_TSCONFIG_PATH } = process.env;
       process.env.IS_DEV_CMD = true;

package/src/commands/global.js

@@ -8,7 +8,7 @@
  */
 
 const { Command } = require('commander');
-const { run, isDev, isProd, promptForTs } = require('../util');
+const { run, isDev, isProd, promptForTs, downloadPro } = require('../util');
 
 /**
  *
@@ -20,10 +20,14 @@ module.exports = (cli) => {
     .allowUnknownOption()
     .option('-h, --help')
     .option('--ts-node-dev')
-    .action((options) => {
+    .action(async (options) => {
+      const cmd = process.argv.slice(2)?.[0];
+      if (cmd === 'install') {
+        await downloadPro();
+      }
       if (isDev()) {
         promptForTs();
-        run('tsx', [
+        await run('tsx', [
           '--tsconfig',
           SERVER_TSCONFIG_PATH,
           '-r',
@@ -32,7 +36,7 @@ module.exports = (cli) => {
           ...process.argv.slice(2),
         ]);
       } else if (isProd()) {
-        run('node', [`${APP_PACKAGE_ROOT}/lib/index.js`, ...process.argv.slice(2)]);
+        await run('node', [`${APP_PACKAGE_ROOT}/lib/index.js`, ...process.argv.slice(2)]);
       }
     });
 };

package/src/commands/index.js

@@ -31,6 +31,7 @@ module.exports = (cli) => {
   require('./umi')(cli);
   require('./upgrade')(cli);
   require('./postinstall')(cli);
+  require('./pkg')(cli);
   if (isPackageValid('@umijs/utils')) {
     require('./create-plugin')(cli);
   }

package/src/commands/pkg.js

@@ -0,0 +1,218 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * 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 { Command } = require('commander');
+const axios = require('axios');
+const fs = require('fs-extra');
+const zlib = require('zlib');
+const tar = require('tar');
+const path = require('path');
+const { createStoragePluginsSymlink } = require('@nocobase/utils/plugin-symlink');
+const chalk = require('chalk');
+
+class Package {
+  data;
+  constructor(packageName, packageManager) {
+    this.packageName = packageName;
+    this.packageManager = packageManager;
+    this.outputDir = path.resolve(process.cwd(), `storage/plugins/${this.packageName}`);
+  }
+
+  get token() {
+    return this.packageManager.getToken();
+  }
+
+  url(path) {
+    return this.packageManager.url(path);
+  }
+
+  async mkdir() {
+    if (await fs.exists(this.outputDir)) {
+      await fs.rm(this.outputDir, { recursive: true, force: true });
+    }
+    await fs.mkdirp(this.outputDir);
+  }
+
+  async getInfo() {
+    try {
+      const res = await axios.get(this.url(this.packageName), {
+        headers: {
+          Authorization: `Bearer ${this.token}`,
+        },
+        responseType: 'json',
+      });
+      this.data = res.data;
+    } catch (error) {
+      return;
+    }
+  }
+
+  getTarball(version = 'latest') {
+    if (this.data.versions[version]) {
+      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();
+    }
+
+    if (version === 'latest') {
+      version = this.data['dist-tags']['latest'];
+    } else if (version === 'next') {
+      version = this.data['dist-tags']['next'];
+    }
+
+    if (!this.data.versions[version]) {
+      console.log(chalk.redBright(`Download failed: ${this.packageName}@${version} package does not exist`));
+    }
+
+    return [version, this.data.versions[version].dist.tarball];
+  }
+
+  async isDevPackage() {
+    let file = path.resolve(process.cwd(), 'packages/plugins', this.packageName, 'package.json');
+    if (await fs.exists(file)) {
+      return true;
+    }
+    file = path.resolve(process.cwd(), 'packages/pro-plugins', this.packageName, 'package.json');
+    if (await fs.exists(file)) {
+      return true;
+    }
+    return false;
+  }
+
+  async download(options = {}) {
+    if (await this.isDevPackage()) {
+      console.log(chalk.yellowBright(`Skipped: ${this.packageName} is dev package`));
+      return;
+    }
+    await this.getInfo();
+    if (!this.data) {
+      console.log(chalk.redBright(`Download failed: ${this.packageName} package does not exist`));
+      return;
+    }
+    try {
+      const [version, url] = this.getTarball(options.version);
+      const response = await axios({
+        url,
+        responseType: 'stream',
+        method: 'GET',
+        headers: {
+          Authorization: `Bearer ${this.token}`,
+        },
+      });
+      await this.mkdir();
+      await new Promise((resolve, reject) => {
+        response.data
+          .pipe(zlib.createGunzip()) // 解压 gzip
+          .pipe(tar.extract({ cwd: this.outputDir, strip: 1 })) // 解压 tar
+          .on('finish', resolve)
+          .on('error', reject);
+      });
+      console.log(chalk.greenBright(`Download success: ${this.packageName}@${version}`));
+    } catch (error) {
+      console.log(chalk.redBright(`Download failed: ${this.packageName}`));
+    }
+  }
+}
+
+class PackageManager {
+  token;
+  baseURL;
+
+  constructor({ baseURL }) {
+    this.baseURL = baseURL;
+  }
+
+  getToken() {
+    return this.token;
+  }
+
+  getBaseURL() {
+    return this.baseURL;
+  }
+
+  url(path) {
+    return this.baseURL + path;
+  }
+
+  async login(credentials) {
+    try {
+      const res1 = await axios.post(`${this.baseURL}-/verdaccio/sec/login`, credentials, {
+        responseType: 'json',
+      });
+      this.token = res1.data.token;
+    } catch (error) {
+      console.error(chalk.redBright(`Login failed: ${this.baseURL}`));
+    }
+  }
+
+  getPackage(packageName) {
+    return new Package(packageName, this);
+  }
+
+  async getProPackages() {
+    const res = await axios.get(this.url('pro-packages'), {
+      headers: {
+        Authorization: `Bearer ${this.token}`,
+      },
+      responseType: 'json',
+    });
+    return res.data.data;
+  }
+
+  async getPackages() {
+    const pkgs = await this.getProPackages();
+    return pkgs;
+  }
+
+  async download(options = {}) {
+    const { version } = options;
+    if (!this.token) {
+      return;
+    }
+    const pkgs = await this.getPackages();
+    for (const pkg of pkgs) {
+      await this.getPackage(pkg).download({ version });
+    }
+  }
+}
+
+/**
+ *
+ * @param {Command} cli
+ */
+module.exports = (cli) => {
+  const pkg = cli.command('pkg');
+  pkg
+    .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)) {
+        return;
+      }
+      const credentials = { username: NOCOBASE_PKG_USERNAME, password: NOCOBASE_PKG_PASSWORD };
+      const pm = new PackageManager({ baseURL: NOCOBASE_PKG_URL });
+      await pm.login(credentials);
+      const file = path.resolve(__dirname, '../../package.json');
+      const json = await fs.readJson(file);
+      await pm.download({ version: json.version });
+      await createStoragePluginsSymlink();
+    });
+  pkg.command('export-all').action(async () => {
+    console.log('Todo...');
+  });
+};

package/src/commands/postinstall.js

@@ -8,7 +8,7 @@
  */
 
 const { Command } = require('commander');
-const { run, isDev, isPackageValid, generatePlaywrightPath } = require('../util');
+const { run, isDev, isPackageValid, generatePlaywrightPath, generatePlugins } = require('../util');
 const { dirname, resolve } = require('path');
 const { existsSync, mkdirSync, readFileSync, appendFileSync } = require('fs');
 const { readFile, writeFile } = require('fs').promises;
@@ -48,7 +48,7 @@ module.exports = (cli) => {
     .option('--skip-umi')
     .action(async (options) => {
       writeToExclude();
-
+      generatePlugins();
       generatePlaywrightPath(true);
       await createStoragePluginsSymlink();
       if (!isDev()) {

package/src/commands/start.js

@@ -8,10 +8,11 @@
  */
 
 const { Command } = require('commander');
-const { isDev, run, postCheck, runInstall, promptForTs } = require('../util');
+const { isDev, run, postCheck, downloadPro, promptForTs } = require('../util');
 const { existsSync, rmSync } = require('fs');
 const { resolve } = require('path');
 const chalk = require('chalk');
+const chokidar = require('chokidar');
 
 function deleteSockFiles() {
   const { SOCKET_PATH, PM2_HOME } = process.env;
@@ -38,6 +39,23 @@ module.exports = (cli) => {
     .option('--quickstart')
     .allowUnknownOption()
     .action(async (opts) => {
+      if (opts.quickstart) {
+        await downloadPro();
+      }
+
+      const watcher = chokidar.watch('./storage/plugins/**/*', {
+        cwd: process.cwd(),
+        ignoreInitial: true,
+        ignored: /(^|[\/\\])\../, // 忽略隐藏文件
+        persistent: true,
+        depth: 1, // 只监听第一层目录
+      });
+
+      watcher.on('addDir', async (pathname) => {
+        console.log('pathname', pathname);
+        await run('yarn', ['nocobase', 'pm2-restart']);
+      });
+
       if (opts.port) {
         process.env.APP_PORT = opts.port;
       }

package/src/commands/upgrade.js

@@ -10,7 +10,7 @@
 const chalk = require('chalk');
 const { Command } = require('commander');
 const { resolve } = require('path');
-const { run, promptForTs, runAppCommand, hasCorePackages, updateJsonFile, hasTsNode } = require('../util');
+const { run, promptForTs, runAppCommand, hasCorePackages, downloadPro, hasTsNode } = require('../util');
 const { existsSync, rmSync } = require('fs');
 
 /**
@@ -29,15 +29,18 @@ module.exports = (cli) => {
       if (hasTsNode()) promptForTs();
       if (hasCorePackages()) {
         // await run('yarn', ['install']);
+        await downloadPro();
         await runAppCommand('upgrade');
         return;
       }
       if (options.skipCodeUpdate) {
+        await downloadPro();
         await runAppCommand('upgrade');
         return;
       }
       // await runAppCommand('upgrade');
       if (!hasTsNode()) {
+        await downloadPro();
         await runAppCommand('upgrade');
         return;
       }
@@ -54,8 +57,9 @@ module.exports = (cli) => {
         stdio: 'pipe',
       });
       if (pkg.version === stdout) {
+        await downloadPro();
         await runAppCommand('upgrade');
-        rmAppDir();
+        await rmAppDir();
         return;
       }
       const currentY = 1 * pkg.version.split('.')[1];
@@ -66,7 +70,8 @@ module.exports = (cli) => {
         await run('yarn', ['add', '@nocobase/cli', '@nocobase/devtools', '-W']);
       }
       await run('yarn', ['install']);
+      await downloadPro();
       await runAppCommand('upgrade');
-      rmAppDir();
+      await rmAppDir();
     });
 };

package/src/plugin-generator.js

@@ -72,7 +72,7 @@ class PluginGenerator extends Generator {
     });
     this.log('');
     genTsConfigPaths();
-    execa.sync('yarn', ['postinstall', '--skip-umi'], { shell: true, stdio: 'inherit' });
+    execa.sync('yarn', ['postinstall'], { shell: true, stdio: 'inherit' });
     this.log(`The plugin folder is in ${chalk.green(`packages/plugins/${name}`)}`);
   }
 }

package/src/util.js

@@ -163,6 +163,10 @@ exports.promptForTs = () => {
   console.log(chalk.green('WAIT: ') + 'TypeScript compiling...');
 };
 
+exports.downloadPro = async () => {
+  await exports.run('yarn', ['nocobase', 'pkg', 'download-pro']);
+};
+
 exports.updateJsonFile = async (target, fn) => {
   const content = await readFile(target, 'utf-8');
   const json = JSON.parse(content);
@@ -287,6 +291,7 @@ function buildIndexHtml(force = false) {
   const data = fs.readFileSync(tpl, 'utf-8');
   const replacedData = data
     .replace(/\{\{env.APP_PUBLIC_PATH\}\}/g, process.env.APP_PUBLIC_PATH)
+    .replace(/\{\{env.API_CLIENT_STORAGE_TYPE\}\}/g, process.env.API_CLIENT_STORAGE_TYPE)
     .replace(/\{\{env.API_CLIENT_STORAGE_PREFIX\}\}/g, process.env.API_CLIENT_STORAGE_PREFIX)
     .replace(/\{\{env.API_BASE_URL\}\}/g, process.env.API_BASE_URL || process.env.API_BASE_PATH)
     .replace(/\{\{env.WS_URL\}\}/g, process.env.WEBSOCKET_URL || '')
@@ -323,6 +328,7 @@ exports.initEnv = function initEnv() {
     APP_PORT: 13000,
     API_BASE_PATH: '/api/',
     API_CLIENT_STORAGE_PREFIX: 'NOCOBASE_',
+    API_CLIENT_STORAGE_TYPE: 'localStorage',
     DB_DIALECT: 'sqlite',
     DB_STORAGE: 'storage/db/nocobase.sqlite',
     // DB_TIMEZONE: '+00:00',
@@ -344,6 +350,7 @@ exports.initEnv = function initEnv() {
     LOGGER_BASE_PATH: 'storage/logs',
     APP_SERVER_BASE_URL: '',
     APP_PUBLIC_PATH: '/',
+    WATCH_FILE: resolve(process.cwd(), 'storage/app.watch.ts'),
   };
 
   if (
@@ -416,3 +423,13 @@ exports.initEnv = function initEnv() {
     );
   }
 };
+
+exports.generatePlugins = function () {
+  try {
+    require.resolve('@nocobase/devtools/umiConfig');
+    const { generatePlugins } = require('@nocobase/devtools/umiConfig');
+    generatePlugins();
+  } catch (error) {
+    return;
+  }
+};