@nocobase/cli 1.8.0-alpha.1 → 1.8.0-alpha.11

package/package.json

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

package/src/commands/pkg.js

@@ -15,7 +15,7 @@ const tar = require('tar');
 const path = require('path');
 const { createStoragePluginsSymlink } = require('@nocobase/utils/plugin-symlink');
 const chalk = require('chalk');
-const { getAccessKeyPair } = require('../util');
+const { getAccessKeyPair, showLicenseInfo, LicenseKeyError } = require('../util');
 
 class Package {
   data;
@@ -175,6 +175,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}`));
     }
   }
@@ -249,7 +252,7 @@ module.exports = (cli) => {
         NOCOBASE_PKG_USERNAME,
         NOCOBASE_PKG_PASSWORD,
       } = process.env;
-      const { accessKeyId, accessKeySecret } = getAccessKeyPair();
+      const { accessKeyId, accessKeySecret } = await getAccessKeyPair();
       if (!(NOCOBASE_PKG_USERNAME && NOCOBASE_PKG_PASSWORD) && !(accessKeyId && accessKeySecret)) {
         return;
       }

package/src/util.js

@@ -18,7 +18,8 @@ const dotenv = require('dotenv');
 const fs = require('fs-extra');
 const os = require('os');
 const moment = require('moment-timezone');
-const { keyDecrypt } = require('@nocobase/license-kit');
+const { keyDecrypt, getEnvAsync } = require('@nocobase/license-kit');
+const _ = require('lodash');
 
 exports.isPackageValid = (pkg) => {
   try {
@@ -115,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);
   }
 };
@@ -490,20 +491,75 @@ exports.generatePlugins = function () {
   }
 };
 
-exports.getAccessKeyPair = function () {
+exports.getAccessKeyPair = async function () {
   const keyFile = resolve(process.cwd(), 'storage/.license/license-key');
   if (!fs.existsSync(keyFile)) {
-    console.log(chalk.yellow('license-key file not found', keyFile));
+    // showLicenseInfo(LicenseKeyError.notExist);
     return {};
   }
+
+  let keyData = {};
   try {
     const str = fs.readFileSync(keyFile, 'utf-8');
     const keyDataStr = keyDecrypt(str);
-    const keyData = JSON.parse(keyDataStr);
-    const { accessKeyId, accessKeySecret } = keyData;
-    return { accessKeyId, accessKeySecret };
+    keyData = JSON.parse(keyDataStr);
   } catch (error) {
-    console.log(chalk.yellow('Key parse failed, please check your key'));
+    showLicenseInfo(LicenseKeyError.parseFailed);
+    return {};
+  }
+
+  const currentEnv = await getEnvAsync();
+  if (!_.isEqual(_.omit(keyData?.instanceData, ['timestamp']), _.omit(currentEnv, ['timestamp']))) {
+    showLicenseInfo(LicenseKeyError.notMatch);
     return {};
   }
+
+  const { accessKeyId, accessKeySecret } = keyData;
+  return { accessKeyId, accessKeySecret };
+};
+
+const LicenseKeyError = {
+  notExist: {
+    title: 'License key not exist',
+    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: 'License key parse failed',
+    content: 'Please check your license key, or regenerate the license key on the service platform.',
+  },
+  notMatch: {
+    title: 'License key not matched',
+    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: 'License key not valid',
+    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;