@nocobase/cli 1.8.0-alpha.9 → 1.8.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "1.8.0-alpha.9",
+  "version": "1.8.0-beta.10",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,8 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.8.0-alpha.9",
-    "@nocobase/license-kit": "^0.2.3",
+    "@nocobase/app": "1.8.0-beta.10",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -27,12 +26,12 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "1.8.0-alpha.9"
+    "@nocobase/devtools": "1.8.0-beta.10"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "7f133b8d44fddf24d61e8f06c79613c8e5c22028"
+  "gitHead": "09fe854edfc44f45422fa983093dd34694416c5a"
 }

package/src/commands/index.js

@@ -35,8 +35,6 @@ module.exports = (cli) => {
   require('./upgrade')(cli);
   require('./postinstall')(cli);
   require('./pkg')(cli);
-  require('./instance-id')(cli);
-  require('./view-license-key')(cli);
   if (isPackageValid('@umijs/utils')) {
     require('./create-plugin')(cli);
   }

package/src/commands/pkg.js

@@ -15,7 +15,6 @@ const tar = require('tar');
 const path = require('path');
 const { createStoragePluginsSymlink } = require('@nocobase/utils/plugin-symlink');
 const chalk = require('chalk');
-const { getAccessKeyPair } = require('../util');
 
 class Package {
   data;
@@ -249,13 +248,10 @@ module.exports = (cli) => {
         NOCOBASE_PKG_USERNAME,
         NOCOBASE_PKG_PASSWORD,
       } = process.env;
-      const { accessKeyId, accessKeySecret } = getAccessKeyPair();
-      if (!(NOCOBASE_PKG_USERNAME && NOCOBASE_PKG_PASSWORD) && !(accessKeyId && accessKeySecret)) {
+      if (!(NOCOBASE_PKG_USERNAME && NOCOBASE_PKG_PASSWORD)) {
         return;
       }
-      const credentials = accessKeyId
-        ? { username: accessKeyId, password: accessKeySecret }
-        : { username: NOCOBASE_PKG_USERNAME, password: NOCOBASE_PKG_PASSWORD };
+      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');

package/src/util.js

@@ -18,7 +18,6 @@ const dotenv = require('dotenv');
 const fs = require('fs-extra');
 const os = require('os');
 const moment = require('moment-timezone');
-const { keyDecrypt } = require('@nocobase/license-kit');
 
 exports.isPackageValid = (pkg) => {
   try {
@@ -166,11 +165,10 @@ exports.promptForTs = () => {
 };
 
 exports.downloadPro = async () => {
-  // 此处不再判定，由pkgg命令处理
-  // const { NOCOBASE_PKG_USERNAME, NOCOBASE_PKG_PASSWORD } = process.env;
-  // if (!(NOCOBASE_PKG_USERNAME && NOCOBASE_PKG_PASSWORD)) {
-  //   return;
-  // }
+  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']);
 };
 
@@ -489,21 +487,3 @@ exports.generatePlugins = function () {
     return;
   }
 };
-
-exports.getAccessKeyPair = function () {
-  const keyFile = resolve(process.cwd(), 'storage/.license/license-key');
-  if (!fs.existsSync(keyFile)) {
-    console.log(chalk.yellow('license-key file not found', keyFile));
-    return {};
-  }
-  try {
-    const str = fs.readFileSync(keyFile, 'utf-8');
-    const keyDataStr = keyDecrypt(str);
-    const keyData = JSON.parse(keyDataStr);
-    const { accessKeyId, accessKeySecret } = keyData;
-    return { accessKeyId, accessKeySecret };
-  } catch (error) {
-    console.log(chalk.yellow('Key parse failed, please check your key'));
-    return {};
-  }
-};

package/src/commands/instance-id.js

@@ -1,46 +0,0 @@
-/**
- * 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 chalk = require('chalk');
-const { Command } = require('commander');
-const { run, isDev } = require('../util');
-const { getInstanceIdAsync } = require('@nocobase/license-kit');
-const path = require('path');
-const fs = require('fs');
-
-/**
- *
- * @param {Command} cli
- */
-module.exports = (cli) => {
-  cli
-    .command('generate-instance-id')
-    .description('Generate InstanceID')
-    .option('--force', 'Force generate InstanceID')
-    .action(async (options) => {
-      console.log('Generating InstanceID...');
-      const dir = path.resolve(process.cwd(), 'storage/.license');
-      const filePath = path.resolve(dir, 'instance-id');
-      if (fs.existsSync(filePath) && !options.force) {
-        console.log('InstanceID already exists at ' + filePath);
-        return;
-      } else {
-        if (!fs.existsSync(dir)) {
-          fs.mkdirSync(dir, { recursive: true });
-        }
-        try {
-          const instanceId = await getInstanceIdAsync();
-          fs.writeFileSync(filePath, instanceId + '\n');
-          console.log(chalk.greenBright(`InstanceID saved to ${filePath}`));
-        } catch (e) {
-          console.log(e);
-        }
-      }
-    });
-};

package/src/commands/view-license-key.js

@@ -1,44 +0,0 @@
-/**
- * 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 chalk = require('chalk');
-const { Command } = require('commander');
-const { keyDecrypt } = require('@nocobase/license-kit');
-const path = require('path');
-const fs = require('fs');
-
-/**
- *
- * @param {Command} cli
- */
-module.exports = (cli) => {
-  cli
-    .command('view-license-key')
-    .description('View License Key')
-    .action(async (options) => {
-      const dir = path.resolve(process.cwd(), 'storage/.license');
-      const filePath = path.resolve(dir, 'license-key');
-      if (!fs.existsSync(filePath)) {
-        console.log('License key not found at ' + filePath);
-        return;
-      }
-      const key = fs.readFileSync(filePath, 'utf-8');
-      let keyDataStr;
-      try {
-        keyDataStr = keyDecrypt(key);
-      } catch (e) {
-        console.log('License key decrypt failed', e);
-        return;
-      }
-      const keyData = JSON.parse(keyDataStr);
-      const { accessKeyId, accessKeySecret } = keyData;
-      console.log(chalk.greenBright(`Access Key ID: ${accessKeyId}`));
-      console.log(chalk.greenBright(`Access Key Secret: ${accessKeySecret}`));
-    });
-};