@abtnode/util 1.16.43-beta-20250424-125523-08a65a5c → 1.16.43-beta-20250425-130658-8da18f4d

package/lib/get-origin.js

@@ -2,11 +2,11 @@ const defaultLogger = {
   error: console.error,
 };
 
-async function getOrigin({ req }, { printError = defaultLogger.error } = {}) {
+async function getOrigin({ req, blockletInfo }, { printError = defaultLogger.error } = {}) {
   try {
     if (req.getBlockletInfo) {
-      const blockletInfo = await req.getBlockletInfo();
-      return blockletInfo.appUrl;
+      const _blockletInfo = blockletInfo || (await req.getBlockletInfo());
+      return _blockletInfo.appUrl;
     }
     const host = req.get('host');
     return `https://${host}`;

package/lib/single-flight-lru-cache.js

@@ -0,0 +1,80 @@
+const { LRUCache } = require('lru-cache');
+const pWaitFor = require('p-wait-for');
+
+const PADDING_VALUE = '__padding__';
+
+// Single flight lru cache
+// ref: https://www.codingexplorations.com/blog/understanding-singleflight-in-golang-a-solution-for-eliminating-redundant-work
+class SingleFlightLRUCache extends LRUCache {
+  paddingInterval = 100;
+
+  paddingTimeout = 10 * 1000;
+
+  setPadding(key) {
+    this.set(key, PADDING_VALUE);
+  }
+
+  isPadding(key) {
+    return this.get(key) === PADDING_VALUE;
+  }
+
+  async waitPending(key) {
+    if (this.get(key) === PADDING_VALUE) {
+      try {
+        await pWaitFor(() => this.get(key) !== PADDING_VALUE, {
+          interval: this.paddingInterval,
+          timeout: this.paddingTimeout,
+        });
+      } catch (_) {
+        if (this.get(key) === PADDING_VALUE) {
+          this.delete(key);
+        }
+      }
+    }
+    return this.get(key);
+  }
+
+  async wrapPending(key, fn) {
+    if (!key) {
+      return Promise.resolve(fn());
+    }
+    const old = this.get(key);
+    if (old) {
+      if (old === PADDING_VALUE) {
+        const result = await this.waitPending(key);
+        if (result && result !== PADDING_VALUE) {
+          return result;
+        }
+      } else {
+        return old;
+      }
+    }
+    this.setPadding(key);
+    try {
+      const result = await Promise.resolve(fn());
+      return result;
+    } finally {
+      if (this.get(key) === PADDING_VALUE) {
+        this.delete(key);
+      }
+    }
+  }
+
+  /**
+   * autoCache will set the result to the cache if the key is not null
+   * if the key is null, it will return the result of the function
+   * if the key is not null, it will return the cached result
+   * if padding, it will wait for the padding to finish
+   * if the key is not in the cache, it will set the result to the cache
+   * if the key is in the cache, it will return the cached result
+   */
+  async autoCache(key, fn) {
+    const result = await this.wrapPending(key, fn);
+    if (key) {
+      this.set(key, result);
+    }
+    return result;
+  }
+}
+
+module.exports = SingleFlightLRUCache;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.43-beta-20250424-125523-08a65a5c",
+  "version": "1.16.43-beta-20250425-130658-8da18f4d",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,11 +18,11 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.43-beta-20250424-125523-08a65a5c",
+    "@abtnode/constant": "1.16.43-beta-20250425-130658-8da18f4d",
     "@arcblock/did": "^1.20.2",
     "@arcblock/pm2": "^5.4.0",
-    "@blocklet/constant": "1.16.43-beta-20250424-125523-08a65a5c",
-    "@blocklet/meta": "1.16.43-beta-20250424-125523-08a65a5c",
+    "@blocklet/constant": "1.16.43-beta-20250425-130658-8da18f4d",
+    "@blocklet/meta": "1.16.43-beta-20250425-130658-8da18f4d",
     "@ocap/client": "1.20.2",
     "@ocap/mcrypto": "1.20.2",
     "@ocap/util": "1.20.2",
@@ -53,10 +53,12 @@
     "is-url": "^1.2.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
+    "lru-cache": "^11.0.2",
     "minimatch": "^10.0.1",
     "multiformats": "9.9.0",
     "npm-packlist": "^7.0.4",
     "p-retry": "^4.6.2",
+    "p-wait-for": "^3.2.0",
     "parallel-transform": "^1.2.0",
     "public-ip": "^4.0.4",
     "pump": "^3.0.0",
@@ -84,5 +86,5 @@
     "fs-extra": "^11.2.0",
     "jest": "^29.7.0"
   },
-  "gitHead": "499de9f28770298a819122ba16a7f2b3cc78c7ee"
+  "gitHead": "b5195a0290d5ced00bb716a709548b1a56356134"
 }