@nocobase/cli 1.5.0-beta.2 → 1.5.0-beta.21

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-beta.2",
+  "version": "1.5.0-beta.21",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.5.0-beta.2",
+    "@nocobase/app": "1.5.0-beta.21",
     "@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-beta.2"
+    "@nocobase/devtools": "1.5.0-beta.21"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "8a9c29fdac5c6295dcc7abf00c3fa81bd9e01a36"
+  "gitHead": "6a2c545d9e5e4f073592c810e704e6b0fe9aa096"
 }

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

@@ -140,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}`));
     }
@@ -189,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 });
     }
   }

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'),