@livequery/rest 2.0.0 → 2.0.6

package/build/RestTransporter.d.ts

@@ -1,17 +1,17 @@
 import { Transporter, QueryOption, QueryStream, Response } from '@livequery/types';
+import { Observable } from 'rxjs';
 type MaybePromise<T> = T | Promise<T>;
+export type Request = {
+    url: RequestInfo | URL | string;
+    options?: RequestInit;
+};
 export type RestTransporterConfig = {
     websocket_url: () => MaybePromise<string>;
     base_url: () => MaybePromise<string>;
     headers?: () => Promise<{
         [key: string]: string;
     }>;
-    onResponse?: (data: {
-        url: string;
-        headers: Headers;
-        body: any;
-        status: number;
-    }) => void;
+    hooks?: (o: Observable<Request>) => Observable<Request>;
 };
 export declare class RestTransporter implements Transporter {
     #private;
@@ -20,7 +20,7 @@ export declare class RestTransporter implements Transporter {
     constructor(config: RestTransporterConfig);
     query<T extends {
         id: string;
-    }>(ref: string, options?: Partial<QueryOption<T>>): import("rxjs").Observable<QueryStream<T> | {
+    }>(ref: string, options?: Partial<QueryOption<T>>): Observable<QueryStream<T> | {
         error: any;
     }> & {
         reload: () => void;

package/build/RestTransporter.js

@@ -1,6 +1,6 @@
-import { of } from 'rxjs';
+import { of, lastValueFrom } from 'rxjs';
 import { catchError, map, mergeMap } from 'rxjs/operators';
-import { merge, Subject } from 'rxjs';
+import { merge, Subject, BehaviorSubject } from 'rxjs';
 import { Socket } from './Socket.js';
 import qs from 'query-string';
 export class RestTransporter {
@@ -59,30 +59,20 @@ export class RestTransporter {
             ...this.socket ? { socket_id: this.socket.socket_session } : {}
         };
         try {
-            const response = await fetch(`${this.config.base_url()}/${url}${this.#encode_query(query)}`, {
-                method,
-                headers: headers,
-                ...payload ? { body: JSON.stringify(payload) } : {},
-            });
-            try {
-                const body = await response.json();
-                this.config.onResponse?.({
-                    body,
-                    headers: response.headers,
-                    status: response.status,
-                    url
-                });
-                return body;
-            }
-            catch (e) {
-                this.config.onResponse?.({
-                    body: null,
-                    headers: response.headers,
-                    status: response.status,
-                    url
-                });
-                return null;
-            }
+            const request = {
+                url: `${this.config.base_url()}/${url}${this.#encode_query(query)}`,
+                options: {
+                    method,
+                    headers: headers,
+                    ...payload ? { body: JSON.stringify(payload) } : {},
+                }
+            };
+            const mapped = this.config.hooks ? await lastValueFrom(this.config.hooks(new BehaviorSubject(request))) : request;
+            const response = await fetch(mapped.url, mapped.options);
+            const body = await response.json();
+            if (body.error)
+                throw body.error;
+            return body;
         }
         catch (error) {
             throw error;

package/package.json

@@ -3,7 +3,7 @@
     "repository": {
         "url": "https://github.com/livequery/rest"
     },
-    "version": "2.0.0",
+    "version": "2.0.6",
     "type": "module",
     "description": "",
     "main": "build/index.js",