openxiangda 1.0.128 → 1.0.129

package/lib/cli.js

@@ -155,7 +155,7 @@ Usage:
   openxiangda permission form-group-list|form-group-create|form-group-update|form-group-delete|form-group-bind
   openxiangda settings get|save|indexes|indexes-save|data-management|data-management-save|public-access
   openxiangda resource validate|plan|publish|pull|typegen|explain [--profile name] [--json] [--dry-run]
-  openxiangda runtime deploy [--profile name] [--dist dist] [--build-id id] [--upload-mode staged|legacy-json] [--upload-timeout-ms ms] [--no-build] [--no-activate] [--json]
+  openxiangda runtime deploy [--profile name] [--dist dist] [--build-id id] [--upload-mode auto|staged|oss-direct|legacy-json] [--upload-timeout-ms ms] [--no-build] [--no-activate] [--json]
   openxiangda runtime releases [--profile name] [--json]
   openxiangda runtime activate <releaseId> [--profile name] [--json]
   openxiangda inspect app|form|workflow|automation|permissions
@@ -3902,10 +3902,42 @@ async function runtime(args) {
   if (subcommand === 'deploy') {
     const buildId = normalizeRuntimeBuildId(flags['build-id'] || createRuntimeBuildId());
     const distDir = path.resolve(process.cwd(), flags.dist || 'dist');
-    const assetBaseUrl = buildRuntimeAssetBaseUrl(target.appType, buildId);
     const uploadMode = normalizeRuntimeUploadMode(flags['upload-mode']);
     const uploadTimeoutMs = normalizeRuntimeUploadTimeoutMs(flags['upload-timeout-ms']);
     const traceId = createRuntimeTraceId();
+    const gatewayAssetBaseUrl = buildRuntimeAssetBaseUrl(target.appType, buildId);
+    let assetBaseUrl = gatewayAssetBaseUrl;
+    let effectiveUploadMode = uploadMode;
+    if (uploadMode === 'auto' || uploadMode === 'oss-direct') {
+      try {
+        const plan = await createRuntimeOssUploadBasePlan({
+          config,
+          profileName: target.profileName,
+          appType: target.appType,
+          buildId,
+          traceId,
+          timeoutMs: uploadTimeoutMs,
+        });
+        if (plan?.assetBaseUrl) {
+          assetBaseUrl = plan.assetBaseUrl;
+          if (uploadMode === 'auto') {
+            effectiveUploadMode = 'oss-direct';
+            printRuntimeProgress(
+              `runtime builtin OSS available; using OSS direct upload traceId=${traceId}`
+            );
+          }
+        }
+      } catch (error) {
+        if (uploadMode === 'oss-direct') {
+          throw error;
+        }
+        effectiveUploadMode = 'auto';
+        assetBaseUrl = gatewayAssetBaseUrl;
+        printRuntimeProgress(
+          `runtime builtin OSS preflight unavailable; using staged upload first traceId=${traceId}`
+        );
+      }
+    }
     if (!flags['no-build']) {
       runRuntimeBuild({
         buildId,
@@ -3920,9 +3952,8 @@ async function runtime(args) {
     });
     const totalBytes = files.reduce((sum, file) => sum + file.size, 0);
     printRuntimeProgress(
-      `runtime release upload: mode=${uploadMode} traceId=${traceId} files=${files.length} size=${formatBytes(totalBytes)} timeout=${uploadTimeoutMs}ms`
+      `runtime release upload: mode=${effectiveUploadMode} traceId=${traceId} files=${files.length} size=${formatBytes(totalBytes)} timeout=${uploadTimeoutMs}ms`
     );
-    let effectiveUploadMode = uploadMode;
     let releaseFiles;
     if (uploadMode === 'legacy-json') {
       releaseFiles = files.map(file => ({
@@ -3932,7 +3963,8 @@ async function runtime(args) {
         contentType: file.contentType,
         contentBase64: file.buffer.toString('base64'),
       }));
-    } else if (uploadMode === 'oss-direct') {
+      effectiveUploadMode = 'legacy-json';
+    } else if (effectiveUploadMode === 'oss-direct') {
       releaseFiles = await uploadRuntimeDistFilesOssDirect({
         config,
         profileName: target.profileName,
@@ -3990,6 +4022,7 @@ async function runtime(args) {
       }
     );
     saveRuntimeReleaseState(target, data);
+    const releaseAssetBaseUrl = data?.assetBaseUrl || assetBaseUrl;
     const result = {
       appType: target.appType,
       buildId,
@@ -3997,7 +4030,7 @@ async function runtime(args) {
       distDir,
       fileCount: files.length,
       totalBytes,
-      assetBaseUrl,
+      assetBaseUrl: releaseAssetBaseUrl,
       activated: !flags['no-activate'],
       uploadMode: effectiveUploadMode,
       traceId,
@@ -4010,7 +4043,7 @@ async function runtime(args) {
         `files: ${files.length} (${formatBytes(totalBytes)})`,
         `upload: ${effectiveUploadMode}`,
         `traceId: ${traceId}`,
-        `assetBase: ${assetBaseUrl}`,
+        `assetBase: ${releaseAssetBaseUrl}`,
         `active: ${result.activated ? 'yes' : 'no'}`,
       ].join('\n')
     );
@@ -4020,6 +4053,24 @@ async function runtime(args) {
   fail('用法: openxiangda runtime deploy|releases|activate [--profile name]');
 }
 
+async function createRuntimeOssUploadBasePlan(options) {
+  return await requestWithAuth(
+    options.config,
+    options.profileName,
+    `/openxiangda-api/v1/apps/${encodeURIComponent(options.appType)}/runtime/releases/oss-upload-plan`,
+    {
+      method: 'POST',
+      timeoutMs: options.timeoutMs,
+      headers: { 'x-openxiangda-trace-id': options.traceId },
+      body: {
+        buildId: options.buildId,
+        planOnly: true,
+        files: [],
+      },
+    }
+  );
+}
+
 function runRuntimeBuild(options) {
   const command = options.command || defaultRuntimeBuildCommand();
   if (options.jsonOutput) {

package/package.json

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