@nocobase/cli 2.0.0-beta.7 → 2.0.0-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0-beta.9",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "2.0.0-beta.7",
+    "@nocobase/app": "2.0.0-beta.9",
     "@nocobase/license-kit": "^0.3.5",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
@@ -27,12 +27,12 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "2.0.0-beta.7"
+    "@nocobase/devtools": "2.0.0-beta.9"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "17b6e4042a4814e38b256c7b3ae34e6d0b08fd57"
+  "gitHead": "36ef50291e22fe1024c819b8748d51a59a5ea4f8"
 }

package/src/commands/client.js

@@ -0,0 +1,166 @@
+/**
+ * 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 fs = require('fs-extra');
+const { resolve } = require('path');
+
+/**
+ * 复制主应用客户端文件
+ * @param {string} source - 源目录路径
+ * @param {string} target - 目标目录路径
+ */
+async function copyMainClient(source, target) {
+  if (!(await fs.exists(source))) {
+    console.log(chalk.yellow(`Source directory does not exist: ${source}`));
+    return;
+  }
+  // 确保目标目录存在且为空
+  await fs.ensureDir(target);
+  await fs.emptyDir(target);
+  await fs.copy(source, target, { recursive: true });
+  console.log(chalk.green(`Copied main client files from ${source} to ${target}`));
+}
+
+/**
+ * 复制插件客户端文件
+ * @param {string} pluginsBaseDir - 插件基础目录路径
+ * @param {string} namespace - 命名空间（如 '@nocobase' 或 '@nocobase-example'）
+ * @param {string} target - 目标目录
+ */
+async function copyPluginClients(pluginsBaseDir, namespace, target) {
+  const pluginsDir = resolve(process.cwd(), pluginsBaseDir, namespace);
+  if (await fs.exists(pluginsDir)) {
+    const pluginNames = await fs.readdir(pluginsDir);
+    for (const pluginName of pluginNames) {
+      const pluginPath = resolve(pluginsDir, pluginName);
+      const pluginDistClient = resolve(pluginPath, 'dist/client');
+      if (await fs.exists(pluginDistClient)) {
+        const pluginTarget = resolve(target, 'static/plugins', namespace, pluginName, 'dist/client');
+        await fs.mkdir(resolve(pluginTarget, '..'), { recursive: true });
+        await fs.copy(pluginDistClient, pluginTarget, { recursive: true });
+        console.log(chalk.green(`Copied ${namespace}/${pluginName} client files`));
+      }
+    }
+  }
+}
+
+/**
+ * 递归上传目录到 OSS
+ * @param {Client} client - OSS 客户端实例
+ * @param {string} localDir - 本地目录路径
+ * @param {string} ossPrefix - OSS 对象前缀（目录路径）
+ */
+async function uploadDirectoryToOSS(client, localDir, ossPrefix = '') {
+  if (!(await fs.exists(localDir))) {
+    console.log(chalk.yellow(`Directory does not exist: ${localDir}`));
+    return;
+  }
+
+  const stats = await fs.stat(localDir);
+  if (!stats.isDirectory()) {
+    throw new Error(`${localDir} is not a directory`);
+  }
+
+  const files = await fs.readdir(localDir);
+  let uploadedCount = 0;
+
+  for (const file of files) {
+    const filePath = resolve(localDir, file);
+    const fileStats = await fs.stat(filePath);
+
+    if (fileStats.isDirectory()) {
+      // 递归处理子目录
+      const subOssPrefix = ossPrefix ? `${ossPrefix}/${file}` : file;
+      const subCount = await uploadDirectoryToOSS(client, filePath, subOssPrefix);
+      uploadedCount += subCount;
+    } else {
+      // 上传文件
+      const ossKey = ossPrefix ? `${ossPrefix}/${file}` : file;
+      try {
+        await client.put(ossKey, filePath);
+        // console.log(chalk.green(`Uploaded: ${ossKey}`));
+        uploadedCount++;
+      } catch (error) {
+        console.error(chalk.red(`Failed to upload ${ossKey}:`), error.message);
+        throw error;
+      }
+    }
+  }
+
+  return uploadedCount;
+}
+
+/**
+ *
+ * @param {Command} cli
+ */
+module.exports = (cli) => {
+  cli
+    .command('client:extract')
+    .allowUnknownOption()
+    .action(async () => {
+      const version = require('../../package.json').version;
+      const target = resolve(process.cwd(), 'storage/dist-client', version);
+      const mainClientSource = resolve(process.cwd(), 'node_modules/@nocobase/app/dist/client');
+      await copyMainClient(mainClientSource, target);
+      await copyPluginClients('packages/plugins', '@nocobase', target);
+      await copyPluginClients('packages/plugins', '@nocobase-example', target);
+      await copyPluginClients('packages/pro-plugins', '@nocobase', target);
+    });
+
+  cli
+    .command('client:upload')
+    .allowUnknownOption()
+    .action(async () => {
+      const version = require('../../package.json').version;
+      const target = resolve(process.cwd(), 'storage/dist-client', version);
+
+      // 检查必要的环境变量
+      if (
+        !process.env.CDN_ALI_OSS_ACCESS_KEY_ID ||
+        !process.env.CDN_ALI_OSS_ACCESS_KEY_SECRET ||
+        !process.env.CDN_ALI_OSS_BUCKET ||
+        !process.env.CDN_ALI_OSS_REGION
+      ) {
+        console.error(
+          chalk.red(
+            'Missing required environment variables: CDN_ALI_OSS_ACCESS_KEY_ID, CDN_ALI_OSS_ACCESS_KEY_SECRET, CDN_ALI_OSS_BUCKET, CDN_ALI_OSS_REGION',
+          ),
+        );
+        process.exit(1);
+      }
+
+      const Client = require('ali-oss');
+
+      const client = new Client({
+        accessKeyId: process.env.CDN_ALI_OSS_ACCESS_KEY_ID,
+        accessKeySecret: process.env.CDN_ALI_OSS_ACCESS_KEY_SECRET,
+        bucket: process.env.CDN_ALI_OSS_BUCKET,
+        region: process.env.CDN_ALI_OSS_REGION,
+      });
+
+      if (!(await fs.exists(target))) {
+        console.error(chalk.red(`Target directory does not exist: ${target}`));
+        console.log(chalk.yellow('Please run "client:extract" first to generate the client files.'));
+        process.exit(1);
+      }
+
+      console.log(chalk.blue(`Uploading directory ${target} to OSS...`));
+      const ossPrefix = `${version}`;
+      try {
+        const uploadedCount = await uploadDirectoryToOSS(client, target, ossPrefix);
+        console.log(chalk.green(`Successfully uploaded ${uploadedCount} files to OSS`));
+      } catch (error) {
+        console.error(chalk.red('Upload failed:'), error);
+        process.exit(1);
+      }
+    });
+};

package/src/commands/index.js

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

package/src/util.js

@@ -295,7 +295,8 @@ function buildIndexHtml(force = false) {
     fs.copyFileSync(file, tpl);
   }
   const data = fs.readFileSync(tpl, 'utf-8');
-  const replacedData = data
+  let replacedData = data
+    .replace(/\{\{env.CDN_BASE_URL\}\}/g, process.env.CDN_BASE_URL)
     .replace(/\{\{env.APP_PUBLIC_PATH\}\}/g, process.env.APP_PUBLIC_PATH)
     .replace(/\{\{env.API_CLIENT_SHARE_TOKEN\}\}/g, process.env.API_CLIENT_SHARE_TOKEN || 'false')
     .replace(/\{\{env.API_CLIENT_STORAGE_TYPE\}\}/g, process.env.API_CLIENT_STORAGE_TYPE)
@@ -304,6 +305,14 @@ function buildIndexHtml(force = false) {
     .replace(/\{\{env.WS_URL\}\}/g, process.env.WEBSOCKET_URL || '')
     .replace(/\{\{env.WS_PATH\}\}/g, process.env.WS_PATH)
     .replace('src="/umi.', `src="${process.env.APP_PUBLIC_PATH}umi.`);
+
+  if (process.env.CDN_BASE_URL) {
+    const appBaseUrl = process.env.CDN_BASE_URL.replace(/\/+$/, '');
+    const appPublicPath = process.env.APP_PUBLIC_PATH.replace(/\/+$/, '');
+    const re1 = new RegExp(`src="${appPublicPath}/`, 'g');
+    const re2 = new RegExp(`href="${appPublicPath}/`, 'g');
+    replacedData = replacedData.replace(re1, `src="${appBaseUrl}/`).replace(re2, `href="${appBaseUrl}/`);
+  }
   fs.writeFileSync(file, replacedData, 'utf-8');
 }
 
@@ -385,6 +394,8 @@ exports.initEnv = function initEnv() {
     PLUGIN_STATICS_PATH: '/static/plugins/',
     LOGGER_BASE_PATH: 'storage/logs',
     APP_SERVER_BASE_URL: '',
+    APP_BASE_URL: '',
+    CDN_BASE_URL: '',
     APP_PUBLIC_PATH: '/',
     WATCH_FILE: resolve(process.cwd(), 'storage/app.watch.ts'),
   };
@@ -440,6 +451,16 @@ exports.initEnv = function initEnv() {
     process.env.__env_modified__ = true;
   }
 
+  if (!process.env.CDN_BASE_URL && process.env.APP_PUBLIC_PATH !== '/') {
+    process.env.CDN_BASE_URL = process.env.APP_PUBLIC_PATH;
+  }
+
+  if (process.env.CDN_BASE_URL.includes('http') && process.env.CDN_VERSION === 'auto') {
+    const version = require('../package.json').version;
+    process.env.CDN_BASE_URL = process.env.CDN_BASE_URL.replace(/\/+$/, '') + '/' + version + '/';
+    process.env.CDN_VERSION = '';
+  }
+
   if (!process.env.TZ) {
     const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
     process.env.TZ = getTimezonesByOffset(process.env.DB_TIMEZONE || timeZone);