hw-weapp-compiler 1.0.24 → 1.0.26

package/build/utils/upload.js

@@ -5,6 +5,7 @@
  * 通过增量检测避免重复上传，并展示上传进度。
  */
 const path = require('path');
+const chalk = require('chalk');
 const OBSClient = require('esdk-obs-nodejs');
 const OSSClient = require('ali-oss');
 const Progress = require('progress');
@@ -23,6 +24,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 = {};
@@ -103,18 +105,12 @@ function getObsRuntimeOptions() {
 }
 
 function createObsRequestLogger(operation, file, key) {
-  const startedAt = Date.now();
-  const { timeoutSeconds, maxRetryCount, operationTimeoutMs } = getObsRuntimeOptions();
   const displayFile = getDisplayFile(file);
 
-  console.log(`[OBS] ${operation} started: key=${key}, file=${displayFile}`);
-
   const pendingTimer = setTimeout(() => {
     console.warn(
-      `[OBS] ${operation} is still pending after ${OBS_PENDING_WARNING_MS / 1000}s: key=${key}, ` +
-        `server=${obsConfig.server}, bucket=${obsConfig.bucket}, ` +
-        `sdkTimeout=${timeoutSeconds}s, maxRetryCount=${maxRetryCount}, ` +
-        `operationTimeout=${operationTimeoutMs / 1000}s`,
+      `[OBS] ${operation} pending (${OBS_PENDING_WARNING_MS / 1000}s): ` +
+        `file=${displayFile}, key=${key}`,
     );
   }, OBS_PENDING_WARNING_MS);
 
@@ -124,19 +120,8 @@ function createObsRequestLogger(operation, file, key) {
   }
 
   return {
-    finish(outcome, detail) {
+    finish() {
       clearTimeout(pendingTimer);
-      const elapsed = Date.now() - startedAt;
-      const suffix = detail ? `, ${detail}` : '';
-      const message = `[OBS] ${operation} ${outcome} in ${elapsed}ms: key=${key}${suffix}`;
-
-      if (outcome === 'failed') {
-        console.error(message);
-      } else if (outcome === 'miss') {
-        console.warn(message);
-      } else {
-        console.log(message);
-      }
     },
   };
 }
@@ -149,7 +134,7 @@ function runObsRequest(operation, file, key, request) {
     let operationTimer;
     let activeRequest;
 
-    const finish = (error, result, outcome) => {
+    const finish = (error, result) => {
       if (settled) {
         return;
       }
@@ -157,10 +142,7 @@ function runObsRequest(operation, file, key, request) {
       settled = true;
       clearTimeout(operationTimer);
       activeRequest = null;
-      requestLogger.finish(
-        outcome || (error ? 'failed' : 'completed'),
-        formatObsError(error || result),
-      );
+      requestLogger.finish();
 
       if (error) {
         reject(error);
@@ -201,6 +183,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;
+      }
+
+      setTimeout(checkReady, 10);
+    };
+
+    setTimeout(checkReady, 0);
+  });
+}
+
 function getObsClient() {
   if (!obsClient) {
     const { timeoutSeconds, maxRetryCount } = getObsRuntimeOptions();
@@ -209,8 +222,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 +249,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 +278,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,
@@ -277,7 +295,7 @@ async function getObsStat(file) {
         } else if (status < 300) {
           finish(null, result);
         } else {
-          finish(result, null, 'miss');
+          finish(result);
         }
       },
     );
@@ -335,9 +353,18 @@ async function uploadFile(file) {
       await doUpload(file);
       setStorage(file, true);
     } catch (uploadError) {
-      console.error(
-        `[assets] upload failed: file=${getDisplayFile(file)}, ${formatObsError(uploadError)}`,
-      );
+      const detail = `file=${getDisplayFile(file)}, ${formatObsError(uploadError)}`;
+
+      if (ossConfig) {
+        console.error(`[assets] upload failed: ${detail}`);
+      } else {
+        const message = chalk.red(`[OBS] upload failed: ${detail}`);
+        if (progress && progress.stream && progress.stream.isTTY) {
+          progress.interrupt(message);
+        } else {
+          console.error(message);
+        }
+      }
     }
   } finally {
     uploadQueue[file] = 'completed';
@@ -403,10 +430,13 @@ function addToUploadQueue(assets) {
     }
   });
 
-  console.log(
-    `[assets] upload queue: provider=${ossConfig ? 'OSS' : 'OBS'}, total=${assets.length}, ` +
-      `cached=${cachedCount}, pending=${pendingCount}`,
-  );
+  if (ossConfig) {
+    console.log(
+      `[assets] upload queue: provider=OSS, total=${assets.length}, ` +
+        `cached=${cachedCount}, pending=${pendingCount}`,
+    );
+  }
+
   return pendingCount ? checkUpload() : Promise.resolve();
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hw-weapp-compiler",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "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,79 @@
+const assert = require('assert');
+const fs = require('fs');
+const Module = require('module');
+const os = require('os');
+const path = require('path');
+
+let metadataCalledBeforeReady = false;
+let metadataCallCount = 0;
+
+class AsyncOBSClient {
+  constructor(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) {
+    metadataCallCount += 1;
+    if (!this.util.signatureContext) {
+      metadataCalledBeforeReady = true;
+    }
+    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']);
+    assert.strictEqual(metadataCalledBeforeReady, false, 'request started before client was ready');
+    assert.strictEqual(metadataCallCount, 1, 'metadata request should run exactly once');
+
+    // 等待 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;
+});