@heybox/hb-sdk 0.9.0-alpha.1 → 0.9.0-alpha.3

package/dist/cli-chunks/{remote-9-tyxq6l.cjs → remote-DyGb3YBA.cjs}

@@ -1,18 +1,18 @@
 'use strict';
 
-var runtimePermissionEnv = require('./runtime-permission-env-B-GwDDT7.cjs');
-var context = require('./context-D_L2-Hla.cjs');
+var runtimePermissionEnv = require('./runtime-permission-env-DdWYFrFT.cjs');
+var context = require('./context-mt_ERryB.cjs');
 var promises = require('node:readline/promises');
-var index = require('./index-d1cUUoR9.cjs');
-var session = require('./session-mMVA3395.cjs');
+var index = require('./index-BtqxUixL.cjs');
+var session = require('./session-CWCq-oeW.cjs');
 var childProcess = require('node:child_process');
 var fs = require('node:fs');
 var fs$1 = require('node:fs/promises');
 var path = require('node:path');
 var node_crypto = require('node:crypto');
 require('node:zlib');
-var runtimeGate = require('./runtime-gate-BfAGMrE2.cjs');
-require('./version-hsUgRL0I.cjs');
+var runtimeGate = require('./runtime-gate-CWUZK4aE.cjs');
+require('./version-4zRtvcVD.cjs');
 require('node:async_hooks');
 require('sharp');
 require('node:module');
@@ -68,6 +68,14 @@ async function postHeyboxApi(pathWithQuery, body, session$1, runtime) {
 
 const CREATE_USER_MINIPROGRAM_UPLOAD_SESSION_API_PATH = '/mall/developer/user_miniprogram/version/upload_session/create';
 const RECORD_USER_MINIPROGRAM_UPLOAD_RESULT_API_PATH = '/mall/developer/user_miniprogram/version/upload_session/record';
+const COMPANION_FINALIZATION_TIMEOUT_MS = 30 * 60_000;
+async function authorizeCompanionUpload(options, runtime = {}) {
+    const result = await postUserMiniprogramVersionForm('/mall/developer/user_miniprogram/version/upload_session/companion_authorization', options, { version: options.version, session_id: options.sessionId, relative_paths: options.relativePaths.join(','), artifact_protocol_version: '2' }, runtime);
+    if (!result.bucket || !result.region || !Array.isArray(result.keys) || !result.tmp_secret_id || !result.tmp_secret_key || !result.session_token || !(result.expired_time > result.start_time)) {
+        throw new Error('Companion 上传凭证响应不完整');
+    }
+    return result;
+}
 async function precheckUserMiniprogramVersion(options, runtime = {}) {
     return postUserMiniprogramVersionForm(runtimePermissionEnv.PRECHECK_USER_MINIPROGRAM_VERSION_API_PATH, options, {
         // 构建前轻预检不携带独立资料；权威准入读取构建 Manifest。
@@ -78,11 +86,12 @@ async function precheckUserMiniprogramVersion(options, runtime = {}) {
     }, runtime);
 }
 async function submitUserMiniprogramAudit(options, runtime = {}) {
-    return postUserMiniprogramVersionForm(runtimePermissionEnv.SUBMIT_USER_MINIPROGRAM_AUDIT_API_PATH, options, { session_id: options.sessionId, preflight_token: options.preflightToken }, runtime);
+    return postUserMiniprogramVersionForm(runtimePermissionEnv.SUBMIT_USER_MINIPROGRAM_AUDIT_API_PATH, options, { session_id: options.sessionId, preflight_token: options.preflightToken, artifact_protocol_version: '2' }, runtime);
 }
 async function createUserMiniprogramUploadSession(options, runtime = {}) {
     return postUserMiniprogramVersionForm(CREATE_USER_MINIPROGRAM_UPLOAD_SESSION_API_PATH, options, {
         version: options.version,
+        artifact_protocol_version: '2',
         artifact_signature: options.artifactSignature,
         files: JSON.stringify(options.files),
         manifest: JSON.stringify(options.manifest),
@@ -91,11 +100,27 @@ async function createUserMiniprogramUploadSession(options, runtime = {}) {
     }, runtime);
 }
 async function recordUserMiniprogramUploadResult(options, runtime = {}) {
-    await postUserMiniprogramVersionForm(RECORD_USER_MINIPROGRAM_UPLOAD_RESULT_API_PATH, options, {
+    const fields = {
         version: options.version,
+        artifact_protocol_version: '2',
         session_id: options.sessionId,
         files: JSON.stringify(options.files),
-    }, runtime);
+    };
+    const deadline = Date.now() + COMPANION_FINALIZATION_TIMEOUT_MS;
+    for (;;) {
+        const result = await postUserMiniprogramVersionForm(RECORD_USER_MINIPROGRAM_UPLOAD_RESULT_API_PATH, options, fields, runtime);
+        if (result.artifact_protocol_version !== 2 || !Array.isArray(result.companion_files)) {
+            throw new Error('服务端未返回产物协议 v2 Finalize 状态');
+        }
+        const failed = result.companion_files.find((file) => file.state === 'failed');
+        if (failed)
+            throw new Error(failed.error || `Companion 归档验证失败：${failed.relative_path}`);
+        if (result.complete)
+            return;
+        if (Date.now() >= deadline)
+            throw new Error('Companion 归档验证超时，请稍后重试');
+        await new Promise((resolve) => setTimeout(resolve, Math.max(250, Math.min(result.retry_after_ms || 1000, 5000))));
+    }
 }
 async function postUserMiniprogramVersionForm(path, options, fields, runtime) {
     const fetchImpl = runtime.fetchImpl ?? fetch;
@@ -134,17 +159,21 @@ async function runUpload(options, runtime = {}) {
         createCosClient = ({ uploadToken }) => createDefaultCosClient(uploadToken, COS);
     }
     const orderedFiles = runtimePermissionEnv.prepareMiniappArtifactFiles(options.files);
-    const batches = chunkUploadFiles(orderedFiles, runtimePermissionEnv.MINIAPP_UPLOAD_BATCH_SIZE);
+    const batches = [false, true].flatMap(companion => chunkUploadFiles(orderedFiles.filter(file => file.relativePath.startsWith('companions/') === companion), runtimePermissionEnv.MINIAPP_UPLOAD_BATCH_SIZE));
     await logger.task(`正在上传 ${orderedFiles.length} 个文件`, async (taskContext) => {
         logger.debug(`上传并发数: ${concurrency}`);
         logger.debug(`上传批次数: ${batches.length}`);
         let completed = 0;
         for (let batchIndex = 0; batchIndex < batches.length; batchIndex += 1) {
             const batch = batches[batchIndex];
+            const companion = batch[0].relativePath.startsWith('companions/');
+            const grant = companion ? await (runtime.authorizeCompanionUpload ?? authorizeCompanionUpload)({
+                session: options.session, miniProgramId: options.miniProgramId, version: options.version, sessionId: options.uploadSessionId, relativePaths: batch.map(file => file.relativePath),
+            }, { baseUrl: runtime.baseUrl, fetchImpl }) : undefined;
             logger.debug(`正在处理上传批次 ${batchIndex + 1}/${batches.length}，文件数: ${batch.length}`);
             logger.debug('正在获取 CDN 上传信息');
             const fileInfos = createUploadFileInfos(batch);
-            const uploadInfo = await getCDNUploadInfo$1({
+            const uploadInfo = grant ?? await getCDNUploadInfo$1({
                 session: options.session,
                 scope: runtimePermissionEnv.MINIAPP_UPLOAD_SCOPE,
                 fileInfos,
@@ -157,7 +186,10 @@ async function runUpload(options, runtime = {}) {
             logger.debug('正在获取本批 CDN 上传凭证');
             let uploadToken;
             try {
-                uploadToken = await getCDNUploadToken$1({
+                uploadToken = grant ? {
+                    credentials: { tmpSecretId: grant.tmp_secret_id, tmpSecretKey: grant.tmp_secret_key, sessionToken: grant.session_token },
+                    startTime: grant.start_time, expiredTime: grant.expired_time,
+                } : await getCDNUploadToken$1({
                     session: options.session,
                     bucket: uploadInfo.bucket,
                     keys: indexedFiles.map(item => item.key),
@@ -186,6 +218,11 @@ async function runUpload(options, runtime = {}) {
                             Body: createReadStream(uploadTask.file.absolutePath),
                             ContentLength: uploadTask.file.size,
                             ContentType: uploadTask.file.mimeType,
+                            ...(companion ? { Headers: { 'x-cos-forbid-overwrite': 'true' } } : {}),
+                        }).catch(error => {
+                            if (companion && isExistingCompanionObject(error))
+                                return;
+                            throw error;
                         });
                         successfulKeys.push(uploadTask.key);
                         completed += 1;
@@ -203,7 +240,8 @@ async function runUpload(options, runtime = {}) {
             await Promise.all(workers);
             if (successfulKeys.length > 0) {
                 logger.debug('正在确认 CDN 上传结果');
-                await postCDNUploadCallback$1({ session: options.session, keys: successfulKeys, isFinished: true }, { baseUrl: runtime.baseUrl, fetchImpl });
+                if (!companion)
+                    await postCDNUploadCallback$1({ session: options.session, keys: successfulKeys, isFinished: true }, { baseUrl: runtime.baseUrl, fetchImpl });
                 await recordUserMiniprogramUploadResult$1({
                     session: options.session,
                     miniProgramId: options.miniProgramId,
@@ -227,6 +265,12 @@ function chunkUploadFiles(files, batchSize) {
     }
     return batches;
 }
+function isExistingCompanionObject(error) {
+    if (!error || typeof error !== 'object')
+        return false;
+    const value = error;
+    return Number(value.statusCode) === 409 && value.code === 'ObjectAlreadyExists';
+}
 function createUploadFileInfos(files) {
     return files.map((file) => ({
         name: file.relativePath.split('/').pop() ?? file.relativePath,
@@ -264,7 +308,7 @@ function createDefaultCosClient(uploadToken, COS) {
             return new Promise((resolve, reject) => {
                 cos.putObject(params, (err, result) => {
                     if (err) {
-                        reject(err instanceof Error ? err : new Error(readErrorMessage(err)));
+                        reject(err);
                         return;
                     }
                     resolve(result);
@@ -274,7 +318,7 @@ function createDefaultCosClient(uploadToken, COS) {
     };
 }
 async function loadCosConstructor() {
-    const cosModule = await Promise.resolve().then(function () { return require('./index-CakUTosC.cjs'); }).then(function (n) { return n.index; });
+    const cosModule = await Promise.resolve().then(function () { return require('./index-DVALw2rx.cjs'); }).then(function (n) { return n.index; });
     return cosModule.default;
 }
 function formatSize(bytes) {
@@ -519,6 +563,9 @@ const MIME_BY_EXT = {
     '.woff': 'font/woff',
     '.woff2': 'font/woff2',
 };
+function formatDeployBytes(bytes) {
+    return `${(bytes / (1024 * 1024)).toFixed(2)} MiB`;
+}
 async function runDeployCommand(options, runtime = {}) {
     const logger = runtime.logger ?? index.createCliLogger();
     const cwd = runtime.cwd ?? process.cwd();
@@ -691,24 +738,43 @@ async function runDeployCommand(options, runtime = {}) {
                 }
                 if (!result.preflight_token)
                     throw new Error('服务端未返回 preflight_token，请先升级服务端');
+                if (result.artifact_protocol_version !== 2) {
+                    throw new Error('创建上传会话失败：服务端不支持产物协议 v2，请升级服务端后重试');
+                }
                 if (result.file_receipt_version !== 1) {
                     throw new Error('创建上传会话失败：服务端不支持文件完整性 receipt v1，请升级服务端后重试');
                 }
-                const resolved = runtimePermissionEnv.resolveMiniappUploadSessionFiles(artifactReceipt.files, Array.isArray(result.files) ? result.files : [], Array.isArray(result.uploaded_keys) ? result.uploaded_keys : []);
+                if (!Array.isArray(result.files) || !Array.isArray(result.uploaded_keys) || !Array.isArray(result.reused_companion_files)) {
+                    throw new Error('创建上传会话失败：服务端返回的产物协议 v2 文件清单不完整');
+                }
+                const resolved = runtimePermissionEnv.resolveMiniappUploadSessionFiles(artifactReceipt.files, result.files, result.uploaded_keys, result.reused_companion_files);
                 return {
                     preflightToken: result.preflight_token,
                     sessionId: result.session_id.trim(),
                     files: resolved.files,
                     missingFiles: resolved.missingFiles,
+                    reusedCompanionFiles: resolved.reusedCompanionFiles,
                 };
             }, { successText: '上传会话已就绪' });
             uploadSessionId = createdUploadSession.sessionId;
             preflightToken = createdUploadSession.preflightToken;
             const uploadedCount = createdUploadSession.files.length - createdUploadSession.missingFiles.length;
             if (uploadedCount > 0) {
-                logger.debug(`复用已上传文件: ${uploadedCount}/${createdUploadSession.files.length}`);
+                logger.debug(`会话内已上传文件: ${uploadedCount}/${createdUploadSession.files.length}`);
             }
+            const reusedBytes = createdUploadSession.reusedCompanionFiles.reduce((sum, file) => sum + file.size, 0);
+            const uploadBytes = createdUploadSession.missingFiles.reduce((sum, { file }) => sum + file.size, 0);
+            logger.info(`Companion Blob 复用: ${createdUploadSession.reusedCompanionFiles.length} 个，免上传 ${formatDeployBytes(reusedBytes)}；实际待上传 ${formatDeployBytes(uploadBytes)}`);
             try {
+                const missingKeys = new Set(createdUploadSession.missingFiles.map(item => item.key));
+                const uploadedCompanions = createdUploadSession.files.filter(item => item.file.relativePath.startsWith('companions/') && !missingKeys.has(item.key));
+                for (let index = 0; index < uploadedCompanions.length; index += runtimePermissionEnv.MINIAPP_UPLOAD_BATCH_SIZE) {
+                    await (runtime.recordUserMiniprogramUploadResult ?? recordUserMiniprogramUploadResult)({
+                        session: session$1, miniProgramId, version, sessionId: uploadSessionId,
+                        files: uploadedCompanions.slice(index, index + runtimePermissionEnv.MINIAPP_UPLOAD_BATCH_SIZE)
+                            .map(({ file }) => ({ path: file.relativePath, size: file.size, sha256: file.sha256 })),
+                    }, { baseUrl: apiBaseUrl, fetchImpl: runtime.fetchImpl });
+                }
                 if (createdUploadSession.missingFiles.length > 0) {
                     await assertDeployUploadFilesStillMatchSignature({
                         computeMiniappArtifactReceipt: runtime.computeMiniappArtifactReceipt ?? computeMiniappArtifactReceipt,

package/dist/cli-chunks/{runtime-gate-BfAGMrE2.cjs → runtime-gate-CWUZK4aE.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var runtimePermissionEnv = require('./runtime-permission-env-B-GwDDT7.cjs');
+var runtimePermissionEnv = require('./runtime-permission-env-DdWYFrFT.cjs');
 
 // Shorthands
 /**

package/dist/cli-chunks/{runtime-permission-env-B-GwDDT7.cjs → runtime-permission-env-DdWYFrFT.cjs}

@@ -2,7 +2,7 @@
 
 var fs = require('node:fs');
 var path = require('node:path');
-var version = require('./version-hsUgRL0I.cjs');
+var version = require('./version-4zRtvcVD.cjs');
 require('node:crypto');
 var node_async_hooks = require('node:async_hooks');
 
@@ -3608,6 +3608,7 @@ function validateGeneratedCompanions(value) {
         return undefined;
     if (!isRecord$2(value) || Object.keys(value).length === 0)
         throw new Error('manifest.companions 必须是非空对象');
+    let descriptorCount = 0;
     for (const [alias, definition] of Object.entries(value)) {
         if (!/^[a-z][a-z0-9-]{0,31}$/.test(alias) ||
             !isRecord$2(definition) ||
@@ -3621,6 +3622,9 @@ function validateGeneratedCompanions(value) {
             Object.keys(definition.targets).length === 0)
             throw new Error(`manifest.companions.${alias} 不合法`);
         for (const [target, artifact] of Object.entries(definition.targets)) {
+            descriptorCount += 1;
+            if (descriptorCount > 64)
+                throw new Error('manifest.companions 最多允许 64 个 target 描述符');
             if (isRecord$2(artifact) && artifact.elevation === 'required') {
                 throw new Error(`manifest.companions.${alias}.targets.${target}.elevation V1 仅支持 none，暂不支持管理员权限启动`);
             }
@@ -12469,8 +12473,9 @@ function createMiniappArtifactFileHeader(file) {
  * 校验服务端 session 文件映射，并计算仍需上传的文件。
  *
  * @param localFiles - 本地构建产物 receipt；除 `relativePath` 和 `size` 外，每项必须包含 64 位小写十六进制 `sha256`。
- * @param serverFiles - 服务端签发的文件映射；数量、路径、大小和 SHA-256 必须与本地产物一一一致。
+ * @param serverFiles - 服务端签发的会话文件映射；与复用的 Companion 合起来必须覆盖本地产物。
  * @param uploadedKeys - 服务端已确认上传成功的 key；每个值都必须属于当前会话，重复值会被去重。
+ * @param reusedCompanionFiles - 已验证 Blob 引用；仅允许当前产物中的 Companion 文件。
  * @returns
  * 包含三个字段的对象：`files` 是按路径 UTF-8 字节序排列的全部 `{ file, key }` 映射，
  * `missingFiles` 是其中尚未确认上传的映射，`uploadedKeys` 是去重后的已上传 key。
@@ -12486,15 +12491,38 @@ function createMiniappArtifactFileHeader(file) {
  *     sha256: 'a'.repeat(64),
  *   }],
  *   [],
+ *   [],
  * );
  *
  * console.log(resolved.missingFiles.length); // 1
  * ```
  */
-function resolveMiniappUploadSessionFiles(localFiles, serverFiles, uploadedKeys) {
+function resolveMiniappUploadSessionFiles(localFiles, serverFiles, uploadedKeys, reusedCompanionFiles) {
     const preparedFiles = prepareMiniappArtifactFiles(localFiles);
-    if (serverFiles.length !== preparedFiles.length) {
-        throw new Error(`上传会话文件数量异常：期望 ${preparedFiles.length}，实际 ${serverFiles.length}`);
+    if (serverFiles.length + reusedCompanionFiles.length !== preparedFiles.length) {
+        throw new Error(`上传会话文件数量异常：期望 ${preparedFiles.length}，实际 ${serverFiles.length + reusedCompanionFiles.length}`);
+    }
+    const localByPath = new Map(preparedFiles.map((file) => [file.relativePath, file]));
+    const reused = new Map();
+    for (const reference of reusedCompanionFiles) {
+        const relativePath = normalizeMiniappArtifactRelativePath(reference.relative_path);
+        const local = localByPath.get(relativePath);
+        if (!relativePath.startsWith('companions/') || !local) {
+            throw new Error(`上传会话返回了不属于当前 Companion 产物的 Blob 引用：${relativePath}`);
+        }
+        if (reused.has(relativePath)) {
+            throw new Error(`上传会话返回重复 Blob 引用：${relativePath}`);
+        }
+        if (!Number.isSafeInteger(reference.size) || reference.size < 0 || reference.size !== local.size) {
+            throw new Error(`上传会话 Blob 文件大小与本地构建不一致：${relativePath}`);
+        }
+        if (!('sha256' in local) || !/^[a-f0-9]{64}$/.test(reference.sha256) || reference.sha256 !== local.sha256) {
+            throw new Error(`上传会话 Blob 文件 SHA-256 与本地构建不一致：${relativePath}`);
+        }
+        if (typeof reference.blob_id !== 'string' || !reference.blob_id.trim()) {
+            throw new Error(`上传会话 Blob 引用 ID 无效：${relativePath}`);
+        }
+        reused.set(relativePath, reference);
     }
     const mappings = new Map();
     const serverSizes = new Map();
@@ -12505,6 +12533,9 @@ function resolveMiniappUploadSessionFiles(localFiles, serverFiles, uploadedKeys)
         if (mappings.has(relativePath)) {
             throw new Error(`上传会话返回重复文件路径：${relativePath}`);
         }
+        if (reused.has(relativePath)) {
+            throw new Error(`上传会话同时返回文件 key 和 Blob 引用：${relativePath}`);
+        }
         const key = String(serverFile.key || '');
         if (!key) {
             throw new Error(`上传会话未返回文件 key：${relativePath}`);
@@ -12525,7 +12556,8 @@ function resolveMiniappUploadSessionFiles(localFiles, serverFiles, uploadedKeys)
         serverHashes.set(relativePath, sha256);
         knownKeys.add(key);
     }
-    const files = preparedFiles.map((file) => {
+    const sessionFiles = preparedFiles.filter((file) => !reused.has(file.relativePath));
+    const files = sessionFiles.map((file) => {
         const key = mappings.get(file.relativePath);
         if (!key) {
             throw new Error(`上传会话缺少文件映射：${file.relativePath}`);
@@ -12550,6 +12582,7 @@ function resolveMiniappUploadSessionFiles(localFiles, serverFiles, uploadedKeys)
         files,
         missingFiles: files.filter((file) => !completed.has(file.key)),
         uploadedKeys: [...completed],
+        reusedCompanionFiles: [...reused.values()],
     };
 }
 /**

package/dist/cli-chunks/{session-mMVA3395.cjs → session-CWCq-oeW.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-d1cUUoR9.cjs');
+var index = require('./index-BtqxUixL.cjs');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
 var require$$0$2 = require('fs');

package/dist/cli-chunks/{skill-BhUlKvyY.cjs → skill-DQzR5fMS.cjs}

@@ -1,10 +1,10 @@
 'use strict';
 
-var version = require('./version-hsUgRL0I.cjs');
+var version = require('./version-4zRtvcVD.cjs');
 var fs = require('node:fs/promises');
 var path = require('node:path');
 var childProcess = require('node:child_process');
-var index = require('./index-d1cUUoR9.cjs');
+var index = require('./index-BtqxUixL.cjs');
 require('node:module');
 require('node:fs');
 require('path');

package/dist/cli-chunks/{version-hsUgRL0I.cjs → version-4zRtvcVD.cjs}

@@ -3,6 +3,6 @@
 /** 构建时替换为当前发布包的实际版本。 */
 const HB_SDK_VERSION = typeof undefined === 'string'
     ? undefined
-    : '0.9.0-alpha.1';
+    : '0.9.0-alpha.3';
 
 exports.HB_SDK_VERSION = HB_SDK_VERSION;

package/dist/cli.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./cli-chunks/index-d1cUUoR9.cjs');
+var index = require('./cli-chunks/index-BtqxUixL.cjs');
 require('node:module');
 require('node:fs');
 require('node:fs/promises');