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

package/package.json

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

package/src/commands/pkg.js

@@ -143,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}`));
     }
   }
@@ -252,7 +263,13 @@ module.exports = (cli) => {
         NOCOBASE_PKG_USERNAME,
         NOCOBASE_PKG_PASSWORD,
       } = process.env;
-      const { accessKeyId, accessKeySecret } = await getAccessKeyPair();
+      let accessKeyId;
+      let accessKeySecret;
+      try {
+        ({ accessKeyId, accessKeySecret } = await getAccessKeyPair());
+      } catch (e) {
+        return;
+      }
       if (!(NOCOBASE_PKG_USERNAME && NOCOBASE_PKG_PASSWORD) && !(accessKeyId && accessKeySecret)) {
         return;
       }

package/src/util.js

@@ -19,7 +19,7 @@ const fs = require('fs-extra');
 const os = require('os');
 const moment = require('moment-timezone');
 const { keyDecrypt, getEnvAsync } = require('@nocobase/license-kit');
-const _ = require('lodash');
+const omit = require('lodash/omit');
 
 exports.isPackageValid = (pkg) => {
   try {
@@ -491,10 +491,20 @@ exports.generatePlugins = function () {
   }
 };
 
+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)) {
-    // showLicenseInfo(LicenseKeyError.notExist);
     return {};
   }
 
@@ -505,13 +515,13 @@ exports.getAccessKeyPair = async function () {
     keyData = JSON.parse(keyDataStr);
   } catch (error) {
     showLicenseInfo(LicenseKeyError.parseFailed);
-    return {};
+    throw new Error(LicenseKeyError.parseFailed.title);
   }
 
-  const currentEnv = await getEnvAsync();
-  if (!_.isEqual(_.omit(keyData?.instanceData, ['timestamp']), _.omit(currentEnv, ['timestamp']))) {
+  const isEnvMatched = await isEnvMatch(keyData);
+  if (!isEnvMatched) {
     showLicenseInfo(LicenseKeyError.notMatch);
-    return {};
+    throw new Error(LicenseKeyError.notMatch.title);
   }
 
   const { accessKeyId, accessKeySecret } = keyData;
@@ -520,21 +530,21 @@ exports.getAccessKeyPair = async function () {
 
 const LicenseKeyError = {
   notExist: {
-    title: 'License key not exist',
+    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: 'License key parse failed',
+    title: 'Invalid license key format',
     content: 'Please check your license key, or regenerate the license key on the service platform.',
   },
   notMatch: {
-    title: 'License key not matched',
+    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: 'License key not valid',
+    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.',
   },