hw-weapp-compiler 1.0.25 → 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');
@@ -104,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);
 
@@ -125,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);
-      }
     },
   };
 }
@@ -150,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;
       }
@@ -158,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);
@@ -226,10 +207,10 @@ function waitForObsClientReady(client) {
         return;
       }
 
-      setImmediate(checkReady);
+      setTimeout(checkReady, 10);
     };
 
-    setImmediate(checkReady);
+    setTimeout(checkReady, 0);
   });
 }
 
@@ -314,7 +295,7 @@ async function getObsStat(file) {
         } else if (status < 300) {
           finish(null, result);
         } else {
-          finish(result, null, 'miss');
+          finish(result);
         }
       },
     );
@@ -372,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';
@@ -440,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.25",
+  "version": "1.0.26",
   "description": "基于 webpack5 的小程序构建工具，兼容 Node.js 14~24",
   "main": "index.js",
   "bin": {

package/test/upload-async-client.js

@@ -4,9 +4,11 @@ const Module = require('module');
 const os = require('os');
 const path = require('path');
 
+let metadataCalledBeforeReady = false;
+let metadataCallCount = 0;
+
 class AsyncOBSClient {
   constructor(config) {
-    this.config = config;
     this.util = {
       server: null,
       signatureContext: null,
@@ -20,7 +22,10 @@ class AsyncOBSClient {
   }
 
   getObjectMetadata(_params, callback) {
-    assert(this.util.signatureContext, 'request started before OBS client initialization');
+    metadataCallCount += 1;
+    if (!this.util.signatureContext) {
+      metadataCalledBeforeReady = true;
+    }
     callback(null, { CommonMsg: { Status: 200 } });
   }
 }
@@ -56,6 +61,8 @@ async function run() {
     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));