keq 2.8.13 → 2.8.14

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.8.14](https://github.com/keq-request/keq/compare/v2.8.13...v2.8.14) (2026-01-20)
+
+
+### Bug Fixes
+
+* resolve pnpm singleton trap ([89eed47](https://github.com/keq-request/keq/commit/89eed475346262d5cad371a1aa39cf257bf2a42f))
+
 ### [2.8.13](https://github.com/keq-request/keq/compare/v2.8.12...v2.8.13) (2026-01-14)
 
 

package/dist/esm/src/util/create-response-proxy.js

@@ -1,6 +1,6 @@
 import { fork } from './fork.js';
-const JsonCachePropertyKey = Symbol('KeqResponseProxyJsonCachePropertyKey');
-const TextCachePropertyKey = Symbol('KeqResponseProxyTextCachePropertyKey');
+const JsonCachePropertyKey = '__KeqProtectedProperty(response.proxy.cache.json)__';
+const TextCachePropertyKey = '__KeqProtectedProperty(response.proxy.cache.text)__';
 export function createResponseProxy(response) {
     return new Proxy(response, {
         get(res, prop) {

package/dist/esm/src/util/fork.js

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 import { klona } from 'klona/json';
-const UnWrapPropertyKey = Symbol('UnWrapPropertyKey');
+const ForkedObjectBrandPropertyKey = '__KeqProtectedProperty(forked.object.brand)__';
 const ARRAY_MUTATORS = new Set([
     'push',
     'pop',
@@ -35,7 +35,7 @@ export function fork(original) {
         return new Proxy(getTarget(), {
             get(target, prop) {
                 const realTarget = getTarget();
-                if (prop === UnWrapPropertyKey)
+                if (prop === ForkedObjectBrandPropertyKey)
                     return realTarget;
                 const value = realTarget[prop];
                 // return value directly if already copied
@@ -81,5 +81,5 @@ export function fork(original) {
     return createProxy();
 }
 export function unwrap(proxy) {
-    return proxy && proxy[UnWrapPropertyKey] ? proxy[UnWrapPropertyKey] : proxy;
+    return proxy && proxy[ForkedObjectBrandPropertyKey] ? proxy[ForkedObjectBrandPropertyKey] : proxy;
 }

package/dist/umd/src/util/create-response-proxy.js

@@ -11,8 +11,8 @@
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.createResponseProxy = void 0;
     const fork_js_1 = require("./fork.js");
-    const JsonCachePropertyKey = Symbol('KeqResponseProxyJsonCachePropertyKey');
-    const TextCachePropertyKey = Symbol('KeqResponseProxyTextCachePropertyKey');
+    const JsonCachePropertyKey = '__KeqProtectedProperty(response.proxy.cache.json)__';
+    const TextCachePropertyKey = '__KeqProtectedProperty(response.proxy.cache.text)__';
     function createResponseProxy(response) {
         return new Proxy(response, {
             get(res, prop) {

package/dist/umd/src/util/fork.js

@@ -12,7 +12,7 @@
     exports.unwrap = exports.fork = void 0;
     /* eslint-disable @typescript-eslint/no-unsafe-return */
     const json_1 = require("klona/json");
-    const UnWrapPropertyKey = Symbol('UnWrapPropertyKey');
+    const ForkedObjectBrandPropertyKey = '__KeqProtectedProperty(forked.object.brand)__';
     const ARRAY_MUTATORS = new Set([
         'push',
         'pop',
@@ -47,7 +47,7 @@
             return new Proxy(getTarget(), {
                 get(target, prop) {
                     const realTarget = getTarget();
-                    if (prop === UnWrapPropertyKey)
+                    if (prop === ForkedObjectBrandPropertyKey)
                         return realTarget;
                     const value = realTarget[prop];
                     // return value directly if already copied
@@ -94,7 +94,7 @@
     }
     exports.fork = fork;
     function unwrap(proxy) {
-        return proxy && proxy[UnWrapPropertyKey] ? proxy[UnWrapPropertyKey] : proxy;
+        return proxy && proxy[ForkedObjectBrandPropertyKey] ? proxy[ForkedObjectBrandPropertyKey] : proxy;
     }
     exports.unwrap = unwrap;
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keq",
-  "version": "2.8.13",
+  "version": "2.8.14",
   "description": "Request API write by Typescript for flexibility, readability, and a low learning curve.",
   "keywords": [
     "request",

package/packages/cache/.turbo/turbo-build.log

@@ -11,9 +11,4 @@
 CLI Cleaning output folder
 CJS Build start
 ESM Build start
-CJS dist/index.js     43.02 KB
-CJS dist/index.js.map 77.81 KB
-CJS ⚡️ Build success in 194ms
-ESM dist/index.mjs     41.10 KB
-ESM dist/index.mjs.map 77.05 KB
-ESM ⚡️ Build success in 194ms
+ ELIFECYCLE  Command failed.

package/packages/cache/dist/cache-entry/cache-entry.d.ts

@@ -12,6 +12,6 @@ export declare class CacheEntry {
     constructor(options: CacheEntryOptions);
     static build(options: CacheEntryBuildOptions): Promise<CacheEntry>;
     clone(): CacheEntry;
-    assign(another: CacheEntry): CacheEntry;
+    assignResponseHeaders(headers: Headers): void;
 }
 //# sourceMappingURL=cache-entry.d.ts.map

package/packages/cache/dist/cache-entry/cache-entry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache-entry.d.ts","sourceRoot":"","sources":["../../src/cache-entry/cache-entry.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAA;AAI7E,qBAAa,UAAU;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,QAAQ,CAAA;IAElB;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ,SAAS,EAAE,IAAI,CAAA;gBAEH,OAAO,EAAE,iBAAiB;WAOzB,KAAK,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC;IAgBxE,KAAK,IAAI,UAAU;IAUnB,MAAM,CAAC,OAAO,EAAE,UAAU,GAAG,UAAU;CAOxC"}
+{"version":3,"file":"cache-entry.d.ts","sourceRoot":"","sources":["../../src/cache-entry/cache-entry.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAA;AAI7E,qBAAa,UAAU;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,QAAQ,CAAA;IAElB;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ,SAAS,EAAE,IAAI,CAAA;gBAEH,OAAO,EAAE,iBAAiB;WAOzB,KAAK,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC;IAgBxE,KAAK,IAAI,UAAU;IASnB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAO9C"}

package/packages/cache/dist/cache.d.ts

@@ -1,4 +1,5 @@
-import type { Keq, KeqMiddleware, KeqContext } from 'keq';
+import type { queueAsPromised } from 'fastq';
+import type { Keq, KeqMiddleware, KeqContext, KeqNext } from 'keq';
 import { KeqCacheStorage } from './storage/keq-cache-storage.js';
 import { KeqCacheKeyFactory, KeqCacheRule, RequestCacheOptions } from './types/index.js';
 export interface KeqCacheOptions extends Pick<RequestCacheOptions, 'serverTiming'> {
@@ -33,6 +34,11 @@ declare module 'keq' {
             context: KeqContext;
         };
     }
+    interface KeqGlobalCore {
+        cache?: Record<string, queueAsPromised<{
+            next: KeqNext;
+        }, void>>;
+    }
 }
 export declare function cache(options: KeqCacheOptions): KeqMiddleware;
 //# sourceMappingURL=cache.d.ts.map

package/packages/cache/dist/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAEhE,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAGxF,MAAM,WAAW,eAAgB,SAAQ,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC;IAChF,OAAO,EAAE,eAAe,CAAA;IAExB;;OAEG;IACH,UAAU,CAAC,EAAE,kBAAkB,CAAA;IAE/B,KAAK,CAAC,EAAE,YAAY,EAAE,CAAA;CACvB;AAGD,OAAO,QAAQ,KAAK,CAAC;IACnB,UAAiB,oBAAoB,CAAC,EAAE;QACtC;;WAEG;QACH,KAAK,CAAC,MAAM,EAAE,mBAAmB,GAAG,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC,CAAA;KACpD;IAED,UAAiB,SAAS;QACxB,WAAW,EAAE;YACX,GAAG,EAAE,MAAM,CAAA;YACX,QAAQ,EAAE,QAAQ,CAAA;YAClB,OAAO,EAAE,UAAU,CAAA;SACpB,CAAA;QAED,YAAY,EAAE;YACZ,GAAG,EAAE,MAAM,CAAA;YACX,OAAO,EAAE,UAAU,CAAA;SACpB,CAAA;QAED,cAAc,EAAE;YACd,GAAG,EAAE,MAAM,CAAA;YACX,WAAW,CAAC,EAAE,QAAQ,CAAA;YACtB,WAAW,EAAE,QAAQ,CAAA;YACrB,OAAO,EAAE,UAAU,CAAA;SACpB,CAAA;KACF;CACF;AAGD,wBAAgB,KAAK,CAAC,OAAO,EAAE,eAAe,GAAG,aAAa,CA4C7D"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAA;AAC5C,OAAO,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,KAAK,CAAA;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAEhE,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAGxF,MAAM,WAAW,eAAgB,SAAQ,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC;IAChF,OAAO,EAAE,eAAe,CAAA;IAExB;;OAEG;IACH,UAAU,CAAC,EAAE,kBAAkB,CAAA;IAE/B,KAAK,CAAC,EAAE,YAAY,EAAE,CAAA;CACvB;AAGD,OAAO,QAAQ,KAAK,CAAC;IACnB,UAAiB,oBAAoB,CAAC,EAAE;QACtC;;WAEG;QACH,KAAK,CAAC,MAAM,EAAE,mBAAmB,GAAG,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC,CAAA;KACpD;IAED,UAAiB,SAAS;QACxB,WAAW,EAAE;YACX,GAAG,EAAE,MAAM,CAAA;YACX,QAAQ,EAAE,QAAQ,CAAA;YAClB,OAAO,EAAE,UAAU,CAAA;SACpB,CAAA;QAED,YAAY,EAAE;YACZ,GAAG,EAAE,MAAM,CAAA;YACX,OAAO,EAAE,UAAU,CAAA;SACpB,CAAA;QAED,cAAc,EAAE;YACd,GAAG,EAAE,MAAM,CAAA;YACX,WAAW,CAAC,EAAE,QAAQ,CAAA;YACtB,WAAW,EAAE,QAAQ,CAAA;YACrB,OAAO,EAAE,UAAU,CAAA;SACpB,CAAA;KACF;IAED,UAAiB,aAAa;QAC5B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;YAAE,IAAI,EAAE,OAAO,CAAA;SAAE,EAAE,IAAI,CAAC,CAAC,CAAA;KACjE;CACF;AAGD,wBAAgB,KAAK,CAAC,OAAO,EAAE,eAAe,GAAG,aAAa,CAgE7D"}

package/packages/cache/dist/index.js

@@ -46,6 +46,7 @@ module.exports = __toCommonJS(index_exports);
 
 // src/cache.ts
 var R2 = __toESM(require("ramda"));
+var fastq = __toESM(require("fastq"));
 
 // src/request-cache-handler/request-cache-handler.ts
 var R = __toESM(require("ramda"));
@@ -306,12 +307,12 @@ var CacheEntry = class _CacheEntry {
       expiredAt: this.expiredAt
     });
   }
-  assign(another) {
-    this.key = another.key;
-    this.response = another.response.clone();
-    this.size = another.size;
-    this.expiredAt = another.expiredAt;
-    return this;
+  assignResponseHeaders(headers) {
+    this.response = new Response(this.response.body, {
+      status: this.response.status,
+      statusText: this.response.statusText,
+      headers
+    });
   }
 };
 
@@ -341,7 +342,9 @@ var RequestCacheHandler = class {
       const entry = await this.storage.get(key);
       if (entry) {
         const dur = (/* @__PURE__ */ new Date()).getTime() - startAt.getTime();
-        entry.response.headers.append("Server-Timing", "keq-cache; dur=".concat(dur, '; desc="HIT"'));
+        const HeadersWithServerTiming = new Headers(entry.response.headers);
+        HeadersWithServerTiming.set("Server-Timing", "keq-cache; dur=".concat(dur, '; desc="HIT"'));
+        entry.assignResponseHeaders(HeadersWithServerTiming);
       }
       return [key, entry];
     }
@@ -396,7 +399,24 @@ function cache(options) {
     }
     const handler = new RequestCacheHandler(storage, requestCacheOptions);
     const strategy = requestCacheOptions.strategy;
-    await strategy(handler, ctx, next);
+    if (requestCacheOptions.concurrent) {
+      await strategy(handler, ctx, next);
+    } else {
+      if (!ctx.global.core) ctx.global.core = {};
+      if (!ctx.global.core.cache) ctx.global.core.cache = {};
+      const cacheKey = handler.getRequestCacheKey(ctx);
+      if (!ctx.global.core.cache[cacheKey]) {
+        ctx.global.core.cache[cacheKey] = fastq.promise(async ({ next: next2 }) => {
+          await next2();
+        }, 1);
+      }
+      const queue = ctx.global.core.cache[cacheKey];
+      await queue.push({
+        next: async () => {
+          await strategy(handler, ctx, next);
+        }
+      });
+    }
   };
 }