openxiangda 1.0.145 → 1.0.146

package/lib/cli.js

@@ -4682,7 +4682,8 @@ async function runtime(args) {
       '  openxiangda runtime releases --profile <name>',
       '说明:',
       '  - deploy 上传当前工作区 dist/ 并激活 React SPA runtime release。',
-      '  - 默认 --upload-mode auto；multipart 上传遇到 403 时自动切换到阿里 OSS 直传。',
+      '  - 默认 --upload-mode auto；multipart 上传遇到 403 时自动切换到平台内置对象存储直传。',
+      '  - --upload-mode oss-direct 是兼容参数名，实际 provider 由平台内置存储配置决定。',
       '  - 如果平台服务较旧不支持分片上传，可临时使用 --upload-mode legacy-json。',
       '  - runtime 只发布前端产物；表单、流程、通知等资源仍走 resource publish。',
     ].join('\n'));
@@ -4752,8 +4753,12 @@ async function runtime(args) {
           assetBaseUrl = plan.assetBaseUrl;
           if (uploadMode === 'auto') {
             effectiveUploadMode = 'oss-direct';
+            const storageProvider = resolveRuntimeStorageProvider(
+              plan.storageProvider,
+              plan.provider
+            );
             printRuntimeProgress(
-              `runtime builtin OSS available; using OSS direct upload traceId=${traceId}`
+              `runtime builtin storage available; using ${formatRuntimeStorageProvider(storageProvider)} direct upload traceId=${traceId}`
             );
           }
         }
@@ -4764,7 +4769,7 @@ async function runtime(args) {
         effectiveUploadMode = 'auto';
         assetBaseUrl = gatewayAssetBaseUrl;
         printRuntimeProgress(
-          `runtime builtin OSS preflight unavailable; using staged upload first traceId=${traceId}`
+          `runtime builtin storage preflight unavailable; using staged upload first traceId=${traceId}`
         );
       }
     }
@@ -4821,7 +4826,7 @@ async function runtime(args) {
         }
         effectiveUploadMode = 'oss-direct';
         printRuntimeProgress(
-          `runtime staged upload blocked by HTTP 403; fallback to OSS direct upload traceId=${traceId}`
+          `runtime staged upload blocked by HTTP 403; fallback to builtin storage direct upload traceId=${traceId}`
         );
         releaseFiles = await uploadRuntimeDistFilesOssDirect({
           config,
@@ -4863,6 +4868,10 @@ async function runtime(args) {
       assetBaseUrl: releaseAssetBaseUrl,
       activated: !flags['no-activate'],
       uploadMode: effectiveUploadMode,
+      storageProvider:
+        data?.storageProvider ||
+        releaseFiles.find(file => file.storageProvider)?.storageProvider ||
+        null,
       traceId,
     };
     if (flags.json) return writeJson(result);
@@ -5019,6 +5028,10 @@ async function uploadRuntimeDistFilesOssDirect(options) {
   );
   const uploadFiles = Array.isArray(plan?.files) ? plan.files : [];
   const uploadByPath = new Map(uploadFiles.map(file => [file.path, file]));
+  const planStorageProvider = resolveRuntimeStorageProvider(
+    plan?.storageProvider,
+    plan?.provider
+  );
   let completed = 0;
   const results = await runWithConcurrency(
     files,
@@ -5026,14 +5039,19 @@ async function uploadRuntimeDistFilesOssDirect(options) {
     async file => {
       const uploadInfo = uploadByPath.get(file.path);
       if (!uploadInfo?.uploadUrl) {
-        fail(`runtime OSS 上传计划缺少文件: ${file.path}`);
+        fail(`runtime 内置对象存储上传计划缺少文件: ${file.path}`);
       }
+      const storageProvider = resolveRuntimeStorageProvider(
+        uploadInfo.storageProvider,
+        uploadInfo.provider,
+        planStorageProvider
+      );
       const uploaded = await uploadRuntimeDistFileToSignedUrl(options, file, uploadInfo);
       completed += 1;
       printRuntimeProgress(
-        `runtime OSS file uploaded [${completed}/${files.length}] ${file.path} ${formatBytes(file.size)} traceId=${options.traceId}`
+        `runtime ${formatRuntimeStorageProvider(storageProvider)} file uploaded [${completed}/${files.length}] ${file.path} ${formatBytes(file.size)} traceId=${options.traceId}`
       );
-      return uploaded;
+      return { ...uploaded, storageProvider };
     }
   );
   return results.map(file => ({
@@ -5041,7 +5059,7 @@ async function uploadRuntimeDistFilesOssDirect(options) {
     size: file.size,
     sha256: file.sha256,
     contentType: file.contentType,
-    storageProvider: 'oss',
+    storageProvider: resolveRuntimeStorageProvider(file.storageProvider),
     objectName: file.objectName,
     bucketName: file.bucketName,
   }));
@@ -5061,16 +5079,16 @@ async function uploadRuntimeDistFileToSignedUrl(options, file, uploadInfo) {
     });
   } catch (error) {
     if (isAbortError(error)) {
-      throw new Error(`runtime OSS 文件上传超时: ${file.path}, timeout=${timeoutMs}ms`);
+      throw new Error(`runtime 内置对象存储文件上传超时: ${file.path}, timeout=${timeoutMs}ms`);
     }
-    throw new Error(formatFetchError(error, `runtime OSS upload ${file.path}`));
+    throw new Error(formatFetchError(error, `runtime builtin storage upload ${file.path}`));
   } finally {
     clearTimeout(timer);
   }
   if (!response.ok) {
     const text = await response.text().catch(() => '');
     throw new Error(
-      `runtime OSS 文件上传失败: ${file.path}, HTTP ${response.status}: ${
+      `runtime 内置对象存储文件上传失败: ${file.path}, HTTP ${response.status}: ${
         text || response.statusText || 'request failed'
       }`
     );
@@ -5152,6 +5170,21 @@ function normalizeRuntimeUploadMode(value) {
   fail(`--upload-mode 只支持 auto、staged、oss-direct 或 legacy-json，当前: ${value}`);
 }
 
+function resolveRuntimeStorageProvider(...values) {
+  for (const value of values) {
+    const provider = String(value || '').trim().toLowerCase();
+    if (provider) return provider;
+  }
+  return 'oss';
+}
+
+function formatRuntimeStorageProvider(value) {
+  const provider = resolveRuntimeStorageProvider(value);
+  if (provider === 'oss') return 'OSS';
+  if (provider === 'cos') return 'COS';
+  return provider.toUpperCase();
+}
+
 function isRuntimeStagedUploadBlocked(error) {
   return /^HTTP 403\b/.test(String(error?.message || ''));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda",
-  "version": "1.0.145",
+  "version": "1.0.146",
   "description": "OpenXiangda CLI, workspace build tools, runtime SDK, and form components.",
   "private": false,
   "bin": {