@abtnode/util 1.16.54-beta-20251024-030947-6f2889bf → 1.16.54-beta-20251027-105624-dfa978f8

package/lib/download-file.js

@@ -7,6 +7,7 @@ const streamToPromise = require('stream-to-promise');
 const { version } = require('../package.json');
 const tryWithTimeout = require('./try-with-timeout');
 const axios = require('./axios');
+const sleep = require('./sleep');
 
 const CANCEL = '__cancel__';
 
@@ -66,11 +67,13 @@ const downloadFile = async (
     // eslint-disable-next-line no-promise-executor-return
     checkCanceled = () => new Promise((resolve) => resolve(false)),
     onProgress,
+    delayTime = 0,
   } = {},
   context = {}
 ) => {
   const CONNECTION_TIMEOUT = 20 * 1000;
   const source = CancelToken.source();
+  let isCancelled = false;
 
   try {
     return await tryWithTimeout(async () => {
@@ -79,8 +82,8 @@ const downloadFile = async (
       }, CONNECTION_TIMEOUT);
 
       let fileStream;
-
       const cancelDownload = () => {
+        isCancelled = true;
         clearTimeout(timer);
         source.cancel('Manual cancel');
         if (fileStream) {
@@ -89,6 +92,14 @@ const downloadFile = async (
         }
       };
 
+      await sleep(delayTime);
+      if (await checkCanceled()) {
+        if (fs.existsSync(dest)) {
+          fs.truncateSync(dest, 0);
+          fs.rmSync(dest, { force: true });
+        }
+        return CANCEL;
+      }
       const response = await axios({
         url,
         headers: merge(context?.headers || {}, {
@@ -111,8 +122,8 @@ const downloadFile = async (
           // 每 2 秒检查一次, db-cache 里是否标记了取消, 如果有, 则取消下载
           if (Date.now() - t > 2000) {
             t = Date.now();
-            checkCanceled().then((isCancelled) => {
-              if (isCancelled) {
+            checkCanceled().then((cancelled) => {
+              if (cancelled) {
                 cancelDownload();
               }
             });
@@ -141,6 +152,10 @@ const downloadFile = async (
         throw new Error('download incomplete');
       }
 
+      if (isCancelled) {
+        return CANCEL;
+      }
+
       return dest;
     }, timeout);
   } catch (err) {

package/lib/ensure-endpoint-healthy.js

@@ -161,7 +161,11 @@ module.exports = async ({
       }
     }
   };
-  return tryWithTimeout(fn, timeout);
+  try {
+    return await tryWithTimeout(fn, timeout);
+  } catch (error) {
+    throw new Error(`service not ready within ${Math.ceil(timeout / ONE_SECOND)} seconds, error: ${error?.message}`);
+  }
 };
 
 module.exports.dial = dial;

package/lib/get-ip.js

@@ -38,9 +38,15 @@ const ensureFormat = ({ internal, external, internalV6, externalV6 }) => ({
  *  externalV6: string,
  * }>}
  */
-const getIP = async ({ includeV6 = false, timeout = 5000, includeExternal = true } = {}) => {
+const getIP = async ({
+  includeV6 = false,
+  timeout = 5000,
+  includeExternal = true,
+  checkIsEC2 = isEC2,
+  checkIsGCP = gcp.isInGCP,
+} = {}) => {
   try {
-    const [inEc2, inGCP] = await Promise.all([isEC2(), gcp.isInGCP()]);
+    const [inEc2, inGCP] = await Promise.all([checkIsEC2(), checkIsGCP()]);
     debug('check env', { inEc2, inGCP });
 
     if (process.env.ABT_NODE_HOST) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.54-beta-20251024-030947-6f2889bf",
+  "version": "1.16.54-beta-20251027-105624-dfa978f8",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,14 +18,14 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@abtnode/db-cache": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/constant": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@abtnode/db-cache": "1.16.54-beta-20251027-105624-dfa978f8",
     "@arcblock/did": "^1.26.3",
     "@arcblock/event-hub": "^1.26.3",
     "@arcblock/pm2": "^6.0.12",
-    "@blocklet/constant": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@blocklet/constant": "1.16.54-beta-20251027-105624-dfa978f8",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@blocklet/meta": "1.16.54-beta-20251027-105624-dfa978f8",
     "@blocklet/xss": "^0.2.12",
     "@ocap/client": "^1.26.3",
     "@ocap/mcrypto": "^1.26.3",
@@ -88,8 +88,7 @@
     "cookie-signature": "^1.2.2",
     "detect-port": "^1.5.1",
     "express": "^4.18.2",
-    "fs-extra": "^11.2.0",
-    "jest": "^29.7.0"
+    "fs-extra": "^11.2.0"
   },
-  "gitHead": "73e5a3a80b82a2a7c62d42fdc08207b28e67633e"
+  "gitHead": "03b0bb26807c6c427ca700f48566ecc913f1353e"
 }