@nocobase/cli 1.8.0-beta.9 → 1.9.0-alpha.1

package/package.json

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

package/src/commands/index.js

@@ -35,6 +35,8 @@ 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/instance-id.js

@@ -0,0 +1,46 @@
+/**
+ * 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/pkg.js

@@ -15,6 +15,7 @@ const tar = require('tar');
 const path = require('path');
 const { createStoragePluginsSymlink } = require('@nocobase/utils/plugin-symlink');
 const chalk = require('chalk');
+const { getAccessKeyPair, showLicenseInfo, LicenseKeyError } = require('../util');
 
 class Package {
   data;
@@ -142,6 +143,17 @@ class Package {
       });
       console.log(chalk.greenBright(`Downloaded: ${this.packageName}@${version}`));
     } catch (error) {
+      if (error?.response?.data && typeof error?.response?.data?.pipe === 'function') {
+        let errorMessageBuffer = '';
+        error.response.data.on?.('data', (chunk) => {
+          errorMessageBuffer += chunk.toString('utf8'); // 收集错误信息
+        });
+        error.response.data.on?.('end', () => {
+          if (error.response.status === 403) {
+            console.error(chalk.redBright('You do not have permission to download this package version.'));
+          }
+        });
+      }
       console.log(chalk.redBright(`Download failed: ${this.packageName}`));
     }
   }
@@ -174,6 +186,9 @@ class PackageManager {
       });
       this.token = res1.data.token;
     } catch (error) {
+      if (error?.response?.data?.error === 'license not valid') {
+        showLicenseInfo(LicenseKeyError.notValid);
+      }
       console.error(chalk.redBright(`Login failed: ${this.baseURL}`));
     }
   }
@@ -248,10 +263,19 @@ module.exports = (cli) => {
         NOCOBASE_PKG_USERNAME,
         NOCOBASE_PKG_PASSWORD,
       } = process.env;
-      if (!(NOCOBASE_PKG_USERNAME && NOCOBASE_PKG_PASSWORD)) {
+      let accessKeyId;
+      let accessKeySecret;
+      try {
+        ({ accessKeyId, accessKeySecret } = await getAccessKeyPair());
+      } catch (e) {
+        return;
+      }
+      if (!(NOCOBASE_PKG_USERNAME && NOCOBASE_PKG_PASSWORD) && !(accessKeyId && accessKeySecret)) {
         return;
       }
-      const credentials = { username: NOCOBASE_PKG_USERNAME, password: NOCOBASE_PKG_PASSWORD };
+      const credentials = accessKeyId
+        ? { username: accessKeyId, password: accessKeySecret }
+        : { 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/commands/view-license-key.js

@@ -0,0 +1,44 @@
+/**
+ * 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}`));
+    });
+};

package/src/util.js

@@ -18,6 +18,8 @@ const dotenv = require('dotenv');
 const fs = require('fs-extra');
 const os = require('os');
 const moment = require('moment-timezone');
+const { keyDecrypt, getEnvAsync } = require('@nocobase/license-kit');
+const omit = require('lodash/omit');
 
 exports.isPackageValid = (pkg) => {
   try {
@@ -114,7 +116,7 @@ exports.postCheck = async (opts) => {
   const port = opts.port || process.env.APP_PORT;
   const result = await exports.isPortReachable(port);
   if (result) {
-    console.error(chalk.red(`post already in use ${port}`));
+    console.error(chalk.red(`Port ${port} already in use`));
     process.exit(1);
   }
 };
@@ -165,10 +167,11 @@ exports.promptForTs = () => {
 };
 
 exports.downloadPro = async () => {
-  const { NOCOBASE_PKG_USERNAME, NOCOBASE_PKG_PASSWORD } = process.env;
-  if (!(NOCOBASE_PKG_USERNAME && NOCOBASE_PKG_PASSWORD)) {
-    return;
-  }
+  // 此处不再判定，由pkgg命令处理
+  // 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']);
 };
 
@@ -487,3 +490,86 @@ exports.generatePlugins = function () {
     return;
   }
 };
+
+async function isEnvMatch(keyData) {
+  const env = await getEnvAsync();
+  if (env?.container?.id && keyData?.instanceData?.container?.id) {
+    return (
+      JSON.stringify(omit(env, ['timestamp', 'container', 'hostname'])) ===
+      JSON.stringify(omit(keyData?.instanceData, ['timestamp', 'container', 'hostname']))
+    );
+  }
+  return JSON.stringify(omit(env, ['timestamp'])) === JSON.stringify(omit(keyData?.instanceData, ['timestamp']));
+}
+
+exports.getAccessKeyPair = async function () {
+  const keyFile = resolve(process.cwd(), 'storage/.license/license-key');
+  if (!fs.existsSync(keyFile)) {
+    return {};
+  }
+
+  let keyData = {};
+  try {
+    const str = fs.readFileSync(keyFile, 'utf-8');
+    const keyDataStr = keyDecrypt(str);
+    keyData = JSON.parse(keyDataStr);
+  } catch (error) {
+    showLicenseInfo(LicenseKeyError.parseFailed);
+    throw new Error(LicenseKeyError.parseFailed.title);
+  }
+
+  const isEnvMatched = await isEnvMatch(keyData);
+  if (!isEnvMatched) {
+    showLicenseInfo(LicenseKeyError.notMatch);
+    throw new Error(LicenseKeyError.notMatch.title);
+  }
+
+  const { accessKeyId, accessKeySecret } = keyData;
+  return { accessKeyId, accessKeySecret };
+};
+
+const LicenseKeyError = {
+  notExist: {
+    title: 'License key not found',
+    content:
+      'Please go to the license settings page to obtain the Instance ID for the current environment, and then generate the license key on the service platform.',
+  },
+  parseFailed: {
+    title: 'Invalid license key format',
+    content: 'Please check your license key, or regenerate the license key on the service platform.',
+  },
+  notMatch: {
+    title: 'License key mismatch',
+    content:
+      'Please go to the license settings page to obtain the Instance ID for the current environment, and then regenerate the license key on the service platform.',
+  },
+  notValid: {
+    title: 'Invalid license key',
+    content:
+      'Please go to the license settings page to obtain the Instance ID for the current environment, and then regenerate the license key on the service platform.',
+  },
+};
+
+exports.LicenseKeyError = LicenseKeyError;
+
+function showLicenseInfo({ title, content }) {
+  const rows = [];
+  const length = 80;
+  let row = '';
+  content.split(' ').forEach((word) => {
+    if (row.length + word.length > length) {
+      rows.push(row);
+      row = '';
+    }
+    row += word + ' ';
+  });
+  if (row) {
+    rows.push(row);
+  }
+  console.log(Array(length).fill('-').join(''));
+  console.log(chalk.yellow(title));
+  console.log(chalk.yellow(rows.join('\n')));
+  console.log(Array(length).fill('-').join(''));
+}
+
+exports.showLicenseInfo = showLicenseInfo;