@nocobase/cli 1.6.0-alpha.1 → 1.6.0-alpha.10

package/package.json

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

package/src/commands/dev.js

@@ -30,10 +30,10 @@ 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;
@@ -89,16 +89,13 @@ module.exports = (cli) => {
 
       watcher
         .on('ready', () => {
-          console.log('Initial scan complete.');
           isReady = true;
         })
         .on('addDir', async (pathname) => {
-          console.log('addDir....', isReady);
           if (!isReady) return;
           restartClient();
         })
         .on('unlinkDir', async (pathname) => {
-          console.log('unlinkDir....', isReady);
           if (!isReady) return;
           restartClient();
         });

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',
@@ -121,7 +140,7 @@ class Package {
           .on('finish', resolve)
           .on('error', reject);
       });
-      console.log(chalk.greenBright(`Download success: ${this.packageName}@${version}`));
+      console.log(chalk.greenBright(`Downloaded: ${this.packageName}@${version}`));
     } catch (error) {
       console.log(chalk.redBright(`Download failed: ${this.packageName}`));
     }
@@ -170,21 +189,45 @@ class PackageManager {
       },
       responseType: 'json',
     });
-    return res.data.data;
+    return {
+      licensed_plugins: res.data?.data || [],
+      commercial_plugins: res.data?.meta?.commercial_plugins || [],
+    };
   }
 
   async getPackages() {
     const pkgs = await this.getProPackages();
+
+    if (Array.isArray(pkgs)) {
+      return {
+        commercial_plugins: pkgs,
+        licensed_plugins: pkgs,
+      };
+    }
     return pkgs;
   }
 
+  async removePackage(packageName) {
+    const dir = path.resolve(process.env.PLUGIN_STORAGE_PATH, packageName);
+    const r = await fs.exists(dir);
+    if (r) {
+      console.log(chalk.yellowBright(`Removed: ${packageName}`));
+      await fs.rm(dir, { force: true, recursive: true });
+    }
+  }
+
   async download(options = {}) {
     const { version } = options;
     if (!this.token) {
       return;
     }
-    const pkgs = await this.getPackages();
-    for (const pkg of pkgs) {
+    const { commercial_plugins, licensed_plugins } = await this.getPackages();
+    for (const pkg of commercial_plugins) {
+      if (!licensed_plugins.includes(pkg)) {
+        await this.removePackage(pkg);
+      }
+    }
+    for (const pkg of licensed_plugins) {
       await this.getPackage(pkg).download({ version });
     }
   }
@@ -200,8 +243,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

@@ -58,16 +58,13 @@ module.exports = (cli) => {
 
       watcher
         .on('ready', () => {
-          console.log('Initial scan complete.');
           isReady = true;
         })
         .on('addDir', async (pathname) => {
-          console.log('addDir....', isReady);
           if (!isReady) return;
           restart();
         })
         .on('unlinkDir', async (pathname) => {
-          console.log('unlinkDir....', isReady);
           if (!isReady) return;
           restart();
         });

package/src/util.js

@@ -164,6 +164,10 @@ exports.promptForTs = () => {
 };
 
 exports.downloadPro = async () => {
+  const { NOCOBASE_PKG_USERNAME, NOCOBASE_PKG_PASSWORD } = process.env;
+  if (!(NOCOBASE_PKG_USERNAME && NOCOBASE_PKG_PASSWORD)) {
+    return;
+  }
   await exports.run('yarn', ['nocobase', 'pkg', 'download-pro']);
 };
 
@@ -337,6 +341,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'),