@nocobase/cli-v1 2.3.0-beta.2 → 2.3.0-beta.21

package/nocobase.conf.tpl

@@ -22,6 +22,11 @@ map $http_host $final_host {
     ""      $host;
 }
 
+map $request_uri $legacy_file_app {
+    default "";
+    ~[?&]__appName=(?<legacy_file_app_name>[A-Za-z0-9_-]+)(?:&|$) $legacy_file_app_name;
+}
+
 server {
     listen 80;
     server_name _;
@@ -36,9 +41,25 @@ server {
     gzip on;
     gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
 
+    location = /_nocobase_legacy_file_auth {
+        internal;
+        proxy_pass http://127.0.0.1:{{apiPort}}{{publicPath}}api/auth:checkLegacyFileAccess;
+        proxy_pass_request_body off;
+        proxy_set_header Content-Length "";
+        proxy_set_header Cookie $http_cookie;
+        proxy_set_header Authorization $http_authorization;
+        proxy_set_header X-App $legacy_file_app;
+        proxy_set_header X-Original-URI $request_uri;
+        proxy_set_header Host $final_host;
+        proxy_set_header X-Forwarded-Proto $upstream_x_forwarded_proto;
+    }
+
     location ~* ^{{publicPath}}storage/uploads/(.*\.(?:htm|html|pdf|svg|svgz|xht|xhtml|xml|xsl|xslt))$ {
         alias {{cwd}}/storage/uploads/$1;
-        add_header Cache-Control "public";
+        auth_request /_nocobase_legacy_file_auth;
+        auth_request_set $legacy_auth_set_cookie $upstream_http_set_cookie;
+        add_header Cache-Control "private, no-store" always;
+        add_header Set-Cookie $legacy_auth_set_cookie always;
         add_header Content-Disposition "attachment" always;
         add_header Content-Security-Policy "sandbox" always;
         add_header X-Content-Type-Options "nosniff" always;
@@ -48,7 +69,10 @@ server {
 
     location {{publicPath}}storage/uploads/ {
         alias {{cwd}}/storage/uploads/;
-        add_header Cache-Control "public";
+        auth_request /_nocobase_legacy_file_auth;
+        auth_request_set $legacy_auth_set_cookie $upstream_http_set_cookie;
+        add_header Cache-Control "private, no-store" always;
+        add_header Set-Cookie $legacy_auth_set_cookie always;
         add_header Content-Security-Policy "sandbox" always;
         add_header X-Content-Type-Options "nosniff" always;
         access_log off;
@@ -57,6 +81,8 @@ server {
         location ~* \.md$ {
             default_type text/markdown;
             add_header Content-Disposition "inline";
+            add_header Cache-Control "private, no-store" always;
+            add_header Set-Cookie $legacy_auth_set_cookie always;
             add_header Content-Security-Policy "sandbox" always;
             add_header X-Content-Type-Options "nosniff" always;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli-v1",
-  "version": "2.3.0-beta.2",
+  "version": "2.3.0-beta.21",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -9,10 +9,11 @@
     "nocobase-v1": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/cli": "2.3.0-beta.2",
+    "@nocobase/cli": "2.3.0-beta.21",
     "@nocobase/license-kit": "^0.3.8",
-    "@nocobase/utils": "2.3.0-beta.2",
+    "@nocobase/utils": "2.3.0-beta.21",
     "chalk": "^4.1.1",
+    "chokidar": "3.6.0",
     "commander": "^9.2.0",
     "deepmerge": "^4.3.1",
     "dotenv": "^16.0.0",
@@ -20,7 +21,7 @@
     "fast-glob": "^3.3.1",
     "fs-extra": "^11.1.1",
     "p-all": "3.0.0",
-    "pm2": "^6.0.5",
+    "pm2": "^7.0.0",
     "portfinder": "^1.0.28",
     "tar": "^7.4.3",
     "tree-kill": "^1.2.2"
@@ -33,5 +34,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "2e5b43a39d3f3e7cff58cb5e5a36a8c8e599dfb5"
+  "gitHead": "a2bdd27cc7bc8ced9ad395b3a7468fc1850eef4a"
 }

package/src/__tests__/client-upload.test.js

@@ -0,0 +1,60 @@
+/**
+ * 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.
+ */
+
+/* eslint-env jest */
+/* global vi */
+
+const { putWithRetry, OSS_TIMEOUT, OSS_MAX_ATTEMPTS } = require('../commands/client')._test;
+
+describe('cli-v1 client:upload', () => {
+  let warn;
+
+  beforeEach(() => {
+    warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+  });
+
+  afterEach(() => {
+    warn.mockRestore();
+  });
+
+  it('should raise the ali-oss response timeout above its 60s default', () => {
+    expect(OSS_TIMEOUT).toBeGreaterThan(60000);
+  });
+
+  it('should return the result without retrying when the upload succeeds', async () => {
+    const put = vi.fn().mockResolvedValue({ name: 'a.js' });
+
+    await expect(putWithRetry({ put }, 'a.js', '/tmp/a.js')).resolves.toEqual({ name: 'a.js' });
+
+    expect(put).toHaveBeenCalledTimes(1);
+    expect(put).toHaveBeenCalledWith('a.js', '/tmp/a.js');
+    expect(warn).not.toHaveBeenCalled();
+  });
+
+  it('should retry a transient timeout and resolve', async () => {
+    const put = vi
+      .fn()
+      .mockRejectedValueOnce(new Error('Response timeout for 60000ms'))
+      .mockResolvedValue({ name: 'a.js' });
+
+    await expect(putWithRetry({ put }, 'a.js', '/tmp/a.js')).resolves.toEqual({ name: 'a.js' });
+
+    expect(put).toHaveBeenCalledTimes(2);
+    expect(warn).toHaveBeenCalledTimes(1);
+  });
+
+  it('should give up and rethrow after the attempt limit', async () => {
+    const error = new Error('Response timeout for 60000ms');
+    const put = vi.fn().mockRejectedValue(error);
+
+    await expect(putWithRetry({ put }, 'a.js', '/tmp/a.js')).rejects.toThrow(error);
+
+    expect(put).toHaveBeenCalledTimes(OSS_MAX_ATTEMPTS);
+  });
+});

package/src/__tests__/runtime-dependencies.test.ts

@@ -0,0 +1,47 @@
+/**
+ * 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.
+ */
+
+import { mkdtempSync, mkdirSync, rmSync } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import chokidar from 'chokidar';
+import { describe, expect, test } from 'vitest';
+import packageJson from '../../package.json';
+
+describe('cli-v1 runtime dependencies', () => {
+  test('declares chokidar directly for production command initialization', () => {
+    expect(packageJson.dependencies.chokidar).toBe('3.6.0');
+    expect(packageJson.devDependencies).not.toHaveProperty('chokidar');
+  });
+
+  test('keeps glob-based plugin directory watching compatible', async () => {
+    const directory = mkdtempSync(path.join(os.tmpdir(), 'nocobase-cli-watch-'));
+    const pluginDirectory = path.join(directory, 'plugins');
+    mkdirSync(pluginDirectory);
+    const watcher = chokidar.watch(`${pluginDirectory}/**/*`, { ignoreInitial: true });
+
+    try {
+      await new Promise<void>((resolve, reject) => {
+        watcher.once('ready', resolve);
+        watcher.once('error', reject);
+      });
+      const added = new Promise<string>((resolve, reject) => {
+        watcher.once('addDir', resolve);
+        watcher.once('error', reject);
+      });
+      const addedDirectory = path.join(pluginDirectory, 'example-plugin');
+      mkdirSync(addedDirectory);
+
+      expect(path.resolve(await added)).toBe(addedDirectory);
+    } finally {
+      await watcher.close();
+      rmSync(directory, { recursive: true, force: true });
+    }
+  }, 10000);
+});

package/src/commands/client.js

@@ -63,6 +63,31 @@ async function writeActiveVersion(version) {
   return activeVersionFile;
 }
 
+// 客户端资源里有体积较大的 bundle，ali-oss 默认的 60s 响应超时在 CI 上不够用。
+const OSS_TIMEOUT = 300000;
+// 单个文件偶发超时不应该让整次上传前功尽弃，做有限重试。
+const OSS_MAX_ATTEMPTS = 3;
+
+/**
+ * 上传单个文件，对偶发失败重试
+ * @param {Client} client - OSS 客户端实例
+ * @param {string} ossKey - OSS 对象名
+ * @param {string} filePath - 本地文件路径
+ */
+async function putWithRetry(client, ossKey, filePath) {
+  for (let attempt = 1; ; attempt++) {
+    try {
+      return await client.put(ossKey, filePath);
+    } catch (error) {
+      if (attempt >= OSS_MAX_ATTEMPTS) {
+        throw error;
+      }
+      console.warn(chalk.yellow(`Retrying ${ossKey} (${attempt}/${OSS_MAX_ATTEMPTS - 1}): ${error.message}`));
+      await new Promise((_resolve) => setTimeout(_resolve, attempt * 2000));
+    }
+  }
+}
+
 /**
  * 递归上传目录到 OSS
  * @param {Client} client - OSS 客户端实例
@@ -96,7 +121,7 @@ async function uploadDirectoryToOSS(client, localDir, ossPrefix = '') {
       // 上传文件
       const ossKey = ossPrefix ? `${ossPrefix}/${file}` : file;
       try {
-        await client.put(ossKey, filePath);
+        await putWithRetry(client, ossKey, filePath);
         // console.log(chalk.green(`Uploaded: ${ossKey}`));
         uploadedCount++;
       } catch (error) {
@@ -179,6 +204,7 @@ module.exports = (cli) => {
         accessKeySecret: process.env.CDN_ALI_OSS_ACCESS_KEY_SECRET,
         bucket: process.env.CDN_ALI_OSS_BUCKET,
         region: process.env.CDN_ALI_OSS_REGION,
+        timeout: OSS_TIMEOUT,
       });
 
       if (!(await fs.exists(target))) {
@@ -198,3 +224,9 @@ module.exports = (cli) => {
       }
     });
 };
+
+module.exports._test = {
+  putWithRetry,
+  OSS_TIMEOUT,
+  OSS_MAX_ATTEMPTS,
+};