hw-weapp-compiler 1.0.24 → 1.0.25

package/build/utils/upload.js

@@ -23,6 +23,7 @@ const OBS_PENDING_WARNING_MS = 15 * 1000;
 const OBS_TIMEOUT_BUFFER_MS = 5 * 1000;
 
 let obsClient;
+let obsClientReady;
 let ossClient;
 let progress;
 let uploadQueue = {};
@@ -201,6 +202,37 @@ function runObsRequest(operation, file, key, request) {
   });
 }
 
+function waitForObsClientReady(client) {
+  if (client.util && client.util.signatureContext && client.util.server) {
+    return Promise.resolve(client);
+  }
+
+  const { operationTimeoutMs } = getObsRuntimeOptions();
+  const startedAt = Date.now();
+
+  return new Promise((resolve, reject) => {
+    const checkReady = () => {
+      if (client.util && client.util.signatureContext && client.util.server) {
+        resolve(client);
+        return;
+      }
+
+      if (Date.now() - startedAt >= operationTimeoutMs) {
+        const error = new Error(
+          `OBS client initialization timed out after ${operationTimeoutMs / 1000}s`,
+        );
+        error.code = 'OBS_CLIENT_INIT_TIMEOUT';
+        reject(error);
+        return;
+      }
+
+      setImmediate(checkReady);
+    };
+
+    setImmediate(checkReady);
+  });
+}
+
 function getObsClient() {
   if (!obsClient) {
     const { timeoutSeconds, maxRetryCount } = getObsRuntimeOptions();
@@ -209,8 +241,11 @@ function getObsClient() {
       timeout: timeoutSeconds,
       max_retry_count: maxRetryCount,
     });
+    // esdk-obs-nodejs 3.26.8 将 initFactory 改成了 async，但构造函数没有等待它。
+    // 立即请求会在 signatureContext 尚未赋值时破坏 SDK 的 bucket 协商锁。
+    obsClientReady = waitForObsClientReady(obsClient);
   }
-  return obsClient;
+  return obsClientReady;
 }
 
 function getOssClient() {
@@ -233,10 +268,11 @@ function getOssStat(file) {
   return getOssClient().head(getRemoteKey(ossConfig, file));
 }
 
-function doObsUpload(file) {
+async function doObsUpload(file) {
   const key = getRemoteKey(obsConfig, file);
+  const client = await getObsClient();
   return runObsRequest('upload', file, key, (finish, reportProgress, registerRequest) => {
-    getObsClient().putObject(
+    client.putObject(
       {
         Bucket: obsConfig.bucket,
         Key: key,
@@ -261,8 +297,9 @@ function doObsUpload(file) {
 }
 async function getObsStat(file) {
   const key = getRemoteKey(obsConfig, file);
+  const client = await getObsClient();
   return runObsRequest('metadata check', file, key, (finish, _reportProgress, registerRequest) => {
-    getObsClient().getObjectMetadata(
+    client.getObjectMetadata(
       {
         Bucket: obsConfig.bucket,
         Key: key,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hw-weapp-compiler",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "description": "基于 webpack5 的小程序构建工具，兼容 Node.js 14~24",
   "main": "index.js",
   "bin": {
@@ -53,6 +53,6 @@
     "build": "node ./index.js build",
     "dev": "nodemon --inspect --trace-deprecation --watch build ./index.js dev",
     "simulation": "node ./index.js build -s",
-    "test": "node ./test/upload.js"
+    "test": "node ./test/upload.js && node ./test/upload-async-client.js"
   }
 }

package/test/upload-async-client.js

@@ -0,0 +1,72 @@
+const assert = require('assert');
+const fs = require('fs');
+const Module = require('module');
+const os = require('os');
+const path = require('path');
+
+class AsyncOBSClient {
+  constructor(config) {
+    this.config = config;
+    this.util = {
+      server: null,
+      signatureContext: null,
+    };
+
+    // 模拟 esdk-obs-nodejs 3.26.8：initFactory 在第一次 await 后才完成赋值。
+    Promise.resolve().then(() => {
+      this.util.server = config.server;
+      this.util.signatureContext = { signature: 'obs' };
+    });
+  }
+
+  getObjectMetadata(_params, callback) {
+    assert(this.util.signatureContext, 'request started before OBS client initialization');
+    callback(null, { CommonMsg: { Status: 200 } });
+  }
+}
+
+async function run() {
+  const projectDir = fs.mkdtempSync(path.join(os.tmpdir(), 'hw-upload-async-client-test-'));
+  const originalCwd = process.cwd();
+  const originalLoad = Module._load;
+
+  try {
+    fs.mkdirSync(path.join(projectDir, 'dist/assets'), { recursive: true });
+    fs.writeFileSync(path.join(projectDir, 'dist/assets/ready.png'), 'ready');
+    fs.writeFileSync(
+      path.join(projectDir, '.weapp.js'),
+      `module.exports = { obsConfig: ${JSON.stringify({
+        access_key_id: 'test-ak',
+        secret_access_key: 'test-sk',
+        server: 'http://obs.example.com',
+        bucket: 'test-bucket',
+        dir: 'test-dir',
+        operation_timeout: 1,
+      })} };`,
+    );
+
+    Module._load = function load(request, parent, isMain) {
+      if (request === 'esdk-obs-nodejs') {
+        return AsyncOBSClient;
+      }
+      return originalLoad.call(this, request, parent, isMain);
+    };
+
+    process.chdir(projectDir);
+    const uploadModule = path.resolve(originalCwd, 'build/utils/upload.js');
+    const { addToUploadQueue } = require(uploadModule);
+    await addToUploadQueue(['assets/ready.png']);
+
+    // 等待 storage.js 的防抖写入结束后再清理测试目录。
+    await new Promise((resolve) => setTimeout(resolve, 400));
+  } finally {
+    Module._load = originalLoad;
+    process.chdir(originalCwd);
+    fs.rmSync(projectDir, { recursive: true, force: true });
+  }
+}
+
+run().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});