@toapi/client 1.3.3 → 1.4.0

package/dist/build-observable.d.ts

@@ -1,4 +1,4 @@
-import type { Observable } from "@toapi/common";
+import type { Logger, Observable } from "@toapi/common";
 import type { PubSub } from "./pub-sub.js";
 import type { Cache } from "./cache.js";
 interface Options {
@@ -7,6 +7,7 @@ interface Options {
     init: RequestInit;
     pubSub: PubSub;
     cache: Cache;
+    logger?: Logger;
 }
 export declare function buildObservable(options: Options): Observable<unknown> & Promise<unknown>;
 export {};

package/dist/build-observable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-observable.d.ts","sourceRoot":"","sources":["../src/build-observable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAGxC,UAAU,OAAO;IACf,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACzD,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;CACd;AAMD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,GACf,UAAU,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAmBxC"}
+{"version":3,"file":"build-observable.d.ts","sourceRoot":"","sources":["../src/build-observable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAgB,MAAM,eAAe,CAAC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAGxC,UAAU,OAAO;IACf,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACzD,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,GACf,UAAU,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAwBxC"}

package/dist/build-observable.js

@@ -1,6 +1,6 @@
 import { request } from "./request.js";
 export function buildObservable(options) {
-    const { url, pubSub } = options;
+    const { url, pubSub, logger } = options;
     const { data } = request(options);
     function subscribe(callback) {
         const { data } = request(options);
@@ -8,7 +8,13 @@ export function buildObservable(options) {
         return pubSub.subscribe(async (invalidUrls) => {
             if (invalidUrls.has(url)) {
                 const { data } = request(options);
-                callback(data);
+                // TODO in major release pass the finished data, not the promise here so subscribers don't need to bother with races.
+                try {
+                    await callback(data);
+                }
+                catch (error) {
+                    logger?.error?.(error);
+                }
             }
         });
     }

package/dist/cache.d.ts

@@ -22,8 +22,8 @@ export declare class Cache {
     constructor(options: Options);
     set(url: string, entry: CacheEntry): void;
     get(url: string): CacheEntry | undefined;
-    invalidateUrl(url: string): Promise<void>;
-    invalidateTags(tags: string[]): Promise<void>;
+    invalidateUrl(url: string, force: boolean): Promise<void>;
+    invalidateTags(tags: string[], force: boolean): Promise<void>;
     invalidateAll(): Promise<void>;
 }
 export {};

package/dist/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC5B,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxB,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;CACxB;AAED,UAAU,OAAO;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAID,qBAAa,KAAK;IAChB,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAA2C;IAC3D,OAAO,CAAC,MAAM,CAAS;gBAEX,OAAO,EAAE,OAAO;IAOrB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IA8ClC,GAAG,CAAC,GAAG,EAAE,MAAM;IAIf,aAAa,CAAC,GAAG,EAAE,MAAM;IAKzB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE;IAiB7B,aAAa;CAMrB"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC5B,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxB,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;CACxB;AAED,UAAU,OAAO;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAID,qBAAa,KAAK;IAChB,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAA2C;IAC3D,OAAO,CAAC,MAAM,CAAS;IAEvB,YAAY,OAAO,EAAE,OAAO,EAK3B;IAEM,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,QA4CxC;IAEM,GAAG,CAAC,GAAG,EAAE,MAAM,0BAErB;IAEM,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,iBAG/C;IAEM,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,iBAenD;IAEM,aAAa,kBAKnB;CACF"}

package/dist/cache.js

@@ -49,7 +49,7 @@ export class Cache {
                 if (cached !== entry)
                     return;
                 this.storage.delete(url);
-                this.pubSub.publish(new Set([url]));
+                this.pubSub.publish(new Set([url]), false);
             }, Math.max(0, timeUntilRevalidation));
         })
             .catch(() => { });
@@ -57,11 +57,11 @@ export class Cache {
     get(url) {
         return this.storage.get(url);
     }
-    invalidateUrl(url) {
+    invalidateUrl(url, force) {
         this.storage.delete(url);
-        return this.pubSub.publish(new Set([url]));
+        return this.pubSub.publish(new Set([url]), force);
     }
-    invalidateTags(tags) {
+    invalidateTags(tags, force) {
         const urls = new Set();
         for (const tag of tags) {
             const taggedUrls = this.tagIndex.get(tag);
@@ -77,12 +77,12 @@ export class Cache {
                 urls.add(url);
             }
         }
-        return this.pubSub.publish(urls);
+        return this.pubSub.publish(urls, force);
     }
     invalidateAll() {
         const urls = new Set(this.storage.keys());
         this.storage.clear();
         this.tagIndex.clear();
-        return this.pubSub.publish(urls);
+        return this.pubSub.publish(urls, false);
     }
 }

package/dist/create-fetch-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-fetch-client.d.ts","sourceRoot":"","sources":["../src/create-fetch-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,IAAI,QAAQ,EAChB,SAAS,EACT,MAAM,EACN,YAAY,EACb,MAAM,eAAe,CAAC;AAIvB,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,mBAAmB,CAAC;AAO9D,UAAU,OAAO;IACf,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CACnC;AAID,wBAAgB,iBAAiB,CAC/B,MAAM,SAAS,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC,EACxD,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,OAAY,GAoGpB,MAAM,CAAC,MAAM,CAAC,CAChC"}
+{"version":3,"file":"create-fetch-client.d.ts","sourceRoot":"","sources":["../src/create-fetch-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,IAAI,QAAQ,EAChB,SAAS,EACT,MAAM,EACN,YAAY,EACb,MAAM,eAAe,CAAC;AAIvB,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,mBAAmB,CAAC;AAO9D,UAAU,OAAO;IACf,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CACnC;AAID,wBAAgB,iBAAiB,CAC/B,MAAM,SAAS,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC,EACxD,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,OAAY,GAwGpB,MAAM,CAAC,MAAM,CAAC,CAChC"}

package/dist/create-fetch-client.js

@@ -23,7 +23,7 @@ export function createFetchClient(apiUrl, options = {}) {
         : (options.invalidationsUrl ?? apiUrl + INVALIDATIONS_ROUTE);
     listenForInvalidations({
         fetch,
-        onInvalidate: (tags) => cache.invalidateTags(tags),
+        onInvalidate: (tags) => cache.invalidateTags(tags, false),
         onConnect: () => cache.invalidateAll(),
         logger: options.logger,
         invalidationsUrl,
@@ -38,10 +38,11 @@ export function createFetchClient(apiUrl, options = {}) {
             },
             pubSub,
             cache,
+            logger: options.logger,
         });
     }
     async function revalidate(url) {
-        await cache.invalidateUrl(url);
+        await cache.invalidateUrl(url, true);
     }
     function mutate(method, url, data, init = {}) {
         const headers = new Headers(init.headers);
@@ -62,7 +63,7 @@ export function createFetchClient(apiUrl, options = {}) {
             await options?.logger?.error?.(error);
             throw error;
         });
-        const revalidated = response.then((res) => cache.invalidateTags(res.headers.get(TAGS_HEADER)?.split(" ") ?? []));
+        const revalidated = response.then((res) => cache.invalidateTags(res.headers.get(TAGS_HEADER)?.split(" ") ?? [], true));
         return Object.defineProperty(body, "revalidated", {
             get: async () => {
                 const [data] = await Promise.all([body, revalidated]);

package/dist/pub-sub.d.ts

@@ -9,7 +9,7 @@ export declare class PubSub {
     private minTTL;
     constructor(options: Options);
     subscribe(callback: Subscription): () => void;
-    publish(urls: Set<string>): Promise<void>;
+    publish(urls: Set<string>, force: boolean): Promise<void>;
 }
 export {};
 //# sourceMappingURL=pub-sub.d.ts.map

package/dist/pub-sub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pub-sub.d.ts","sourceRoot":"","sources":["../src/pub-sub.ts"],"names":[],"mappings":"AAAA,KAAK,YAAY,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEzD,UAAU,OAAO;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,gBAAgB,CAAoD;IAC5E,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,MAAM,CAAS;gBAEX,OAAO,EAAE,OAAO;IAI5B,SAAS,CAAC,QAAQ,EAAE,YAAY;IAO1B,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC;CA6BhC"}
+{"version":3,"file":"pub-sub.d.ts","sourceRoot":"","sources":["../src/pub-sub.ts"],"names":[],"mappings":"AAAA,KAAK,YAAY,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEzD,UAAU,OAAO;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,gBAAgB,CAAoD;IAC5E,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,MAAM,CAAS;IAEvB,YAAY,OAAO,EAAE,OAAO,EAE3B;IAED,SAAS,CAAC,QAAQ,EAAE,YAAY,cAK/B;IAEK,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,iBAwC9C;CACF"}

package/dist/pub-sub.js

@@ -12,7 +12,16 @@ export class PubSub {
             this.subscriptions.delete(callback);
         };
     }
-    async publish(urls) {
+    async publish(urls, force) {
+        if (force) {
+            for (const url of urls) {
+                const timeout = this.debounceTimeouts.get(url);
+                clearTimeout(timeout);
+                this.debounceTimeouts.delete(url);
+            }
+            await Promise.all(this.subscriptions.values().map((callback) => callback(urls)));
+            return;
+        }
         for (const url of urls) {
             if (this.debounceTimeouts.has(url)) {
                 // debounced, mark as requested and ignore now
@@ -30,7 +39,7 @@ export class PubSub {
             }
             // Consume pending invalidations and unlock the entire batch before replay.
             if (pendingUrls.size)
-                return this.publish(pendingUrls);
+                return this.publish(pendingUrls, false);
         }, this.minTTL);
         for (const url of urls) {
             this.debounceTimeouts.set(url, timeout);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toapi/client",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "author": {
     "name": "Michel Smola",
     "email": "michel.smola@farbenmeer.de"
@@ -20,13 +20,13 @@
     }
   },
   "dependencies": {
-    "@toapi/common": "^1.3.3"
+    "@toapi/common": "^1.4.0"
   },
   "devDependencies": {
     "@types/node": "^25.0.3",
     "vitest": "^5.0.0",
     "zod": "^4.0.17",
-    "@toapi/server": "^1.3.3"
+    "@toapi/server": "^1.4.0"
   },
   "peerDependencies": {
     "typescript": "^5 || ^6.0.0 || ^7.0.0",