@livequery/rest 2.0.27 → 2.0.62

package/package.json

@@ -3,30 +3,38 @@
     "repository": {
         "url": "https://github.com/livequery/rest"
     },
-    "version": "2.0.27",
+    "version": "2.0.62",
     "type": "module",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",
+    "exports": {
+        ".": {
+            "types": "./dist/index.d.ts",
+            "import": "./dist/index.js",
+            "default": "./dist/index.js"
+        }
+    },
     "files": [
         "build/**/*"
     ],
     "dependencies": {
-        "query-string": "^7.0.1",
-        "uuid": "^8.3.2"
+        "rxjs": "^7.8.1",
+        "uuid": "^13.0.0"
     },
     "devDependencies": {
-        "rxjs": "^7.8.1",
-        "typescript": "5.6.3",
-        "@types/uuid": "^8.3.0",
-        "@livequery/types": "2.0.15"
+        "@livequery/new": "2.0.61",
+        "typescript": "5.6.3"
     },
     "peerDependencies": {},
     "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1",
-        "build": "rm -rf build; tsc -b .",
-        "deploy": "yarn build; git add .; git commit -m \"Update\"; git push origin master; npm publish --access public"
+        "clean": "rm -rf dist",
+        "build:js": "bun build ./src/index.ts --outdir ./dist --target browser --format esm --sourcemap",
+        "build:types": "bunx tsc -p tsconfig.build.json",
+        "build": "bun run clean && bun run build:js && bun run build:types",
+        "build:watch": "bun build ./src/index.ts --outdir ./dist --target browser --format esm --watch",
+        "prepublishOnly": "bun run build"
     },
     "author": "",
     "license": "ISC"
-}
+}

package/build/RestTransporter.d.ts

@@ -1,29 +0,0 @@
-import { Transporter, QueryOption, QueryStream, Response as ApiResponse, TransporterHook } from '@livequery/types';
-type MaybePromise<T> = T | Promise<T>;
-export type ApiRequest = {
-    url: RequestInfo | URL | string;
-    options?: RequestInit;
-};
-export type RestTransporterConfig = {
-    base_url: () => MaybePromise<string>;
-    websocket_url?: () => MaybePromise<string>;
-};
-export declare class RestTransporter implements Transporter {
-    #private;
-    private config;
-    private socket;
-    constructor(config: RestTransporterConfig);
-    hook(hook: TransporterHook): RestTransporter;
-    query<T extends {
-        id: string;
-    }>(ref: string, options?: Partial<QueryOption<T>>): import("rxjs").Observable<QueryStream<T> | {
-        error: any;
-    }>;
-    private call;
-    get<T>(ref: string, query?: any): Promise<T>;
-    add<T extends {} = {}>(ref: string, data: Partial<T>): Promise<any>;
-    update<T extends {} = {}>(ref: string, data: Partial<T>, method?: 'PATCH' | 'PUT'): Promise<any>;
-    remove<T>(ref: string): Promise<T>;
-    trigger<T extends {}>(ref: string, name: string, payload?: any, query?: any): Promise<ApiResponse<T>>;
-}
-export {};

package/build/RestTransporter.js

@@ -1,132 +0,0 @@
-import { of, firstValueFrom } from 'rxjs';
-import { catchError, map, mergeMap } from 'rxjs/operators';
-import { merge, pipe } from 'rxjs';
-import { Socket } from './Socket.js';
-import qs from 'query-string';
-export class RestTransporter {
-    config;
-    socket;
-    constructor(config) {
-        this.config = config;
-        config.websocket_url && (this.socket = new Socket(config.websocket_url));
-    }
-    hook(hook) {
-        return {
-            ...this,
-            hook: (next_hook) => {
-                return this.hook(next => pipe(hook(() => next_hook(next))));
-            },
-            get: (ref, query = {}) => {
-                return this.call(ref, 'GET', null, query, hook);
-            },
-            add: (ref, data) => {
-                return this.call(ref, 'POST', data, {}, hook);
-            },
-            update: (ref, data, method = 'PATCH') => {
-                return this.call(ref, method, data, {}, hook);
-            },
-            remove: (ref) => {
-                return this.call(ref, 'DELETE', {}, {}, hook);
-            },
-            trigger: (ref, name, payload, query) => {
-                return this.call(`${ref}/~${name}`, 'POST', payload, query, hook);
-            },
-            query: (ref, options) => {
-                return this.#query(ref, options, hook);
-            },
-        };
-    }
-    query(ref, options) {
-        return this.#query(ref, options);
-    }
-    #query(ref, options, hook) {
-        const http_request = merge(this.socket?.$reconnect || of(1))
-            .pipe(mergeMap(() => this.call(ref, 'GET', undefined, options, hook)), map(({ data, error }) => {
-            if (error)
-                throw error;
-            data.subscription_token && this.socket?.subscribe(data.subscription_token);
-            const collection = data;
-            // If collection
-            if (collection.items) {
-                return {
-                    data: {
-                        summary: collection.summary,
-                        changes: collection.items.map(data => ({ data, type: 'added', ref })),
-                        paging: { ...collection, n: 0 }
-                    }
-                };
-            }
-            // If document  
-            const document = data;
-            return {
-                data: {
-                    summary: collection.summary,
-                    changes: [{ data: document.item, type: 'added', ref }],
-                    paging: { ...collection, n: 0 }
-                }
-            };
-        }), catchError(error => of({ error })));
-        const websocket_sync = (!this.socket || options[':after'] || options[':before'] || options[':around']) ? of() : (this.socket.listen(ref).pipe(map((change) => ({ data: { changes: [change] } }))));
-        return merge(http_request, websocket_sync);
-    }
-    async call(url, method, payload, query = {}, hook) {
-        function encode_query(query) {
-            if (!query || Object.keys(query || {}).length == 0)
-                return '';
-            const encoded_query = Object.keys(query).reduce((o, key) => ({
-                ...o,
-                [key]: typeof query[key] == 'object' ? JSON.stringify(query[key]) : query[key]
-            }), {});
-            return `?${qs.stringify(encoded_query)}`;
-        }
-        const headers = {
-            ...payload ? {
-                'Content-Type': 'application/json'
-            } : {},
-            ...this.socket ? {
-                socket_id: this.socket.client_id,
-                'x-lcid': this.socket.client_id,
-                'x-lgid': await firstValueFrom(this.socket.$gateway.pipe(map(g => g.id)))
-            } : {}
-        };
-        try {
-            const request = {
-                url: `${this.config.base_url()}/${url}${encode_query(query)}`,
-                options: {
-                    method,
-                    headers,
-                    ...payload ? { body: JSON.stringify(payload) } : {},
-                }
-            };
-            const next = () => pipe(mergeMap(async (mapped) => {
-                const response = await fetch(mapped.url, mapped.options).then(r => r.json());
-                return {
-                    ...response,
-                    __request: mapped
-                };
-            }));
-            const body = await firstValueFrom(of(request).pipe(hook ? hook(next) : next()));
-            if (body.error)
-                throw body.error;
-            return body;
-        }
-        catch (error) {
-            throw error;
-        }
-    }
-    get(ref, query = {}) {
-        return this.call(ref, 'GET', null, query);
-    }
-    add(ref, data) {
-        return this.call(ref, 'POST', data, {});
-    }
-    update(ref, data, method = 'PATCH') {
-        return this.call(ref, method, data, {});
-    }
-    remove(ref) {
-        return this.call(ref, 'DELETE');
-    }
-    trigger(ref, name, payload, query) {
-        return this.call(`${ref}/~${name}`, 'POST', payload, query);
-    }
-}

package/build/Socket.d.ts

@@ -1,19 +0,0 @@
-import { UpdatedData } from "@livequery/types";
-import { Observable, BehaviorSubject } from "rxjs";
-export declare class Socket {
-    #private;
-    private ws_url_fatory;
-    readonly client_id: string;
-    readonly $gateway: BehaviorSubject<{
-        id: string;
-    }>;
-    readonly $reconnect: BehaviorSubject<number>;
-    constructor(ws_url_fatory: () => string | Promise<string>);
-    stop(): void;
-    private $sync;
-    $hello(e: {
-        gid: string;
-    }): void;
-    subscribe(realtime_token: string): void;
-    listen(ref: string): Observable<UpdatedData>;
-}

package/build/Socket.js

@@ -1,64 +0,0 @@
-import { fromEvent, Subject, BehaviorSubject, merge, ReplaySubject, of, interval } from "rxjs";
-import { delay, finalize, map, mergeMap, retry, switchMap, tap } from "rxjs/operators";
-import { v4 } from 'uuid';
-export class Socket {
-    ws_url_fatory;
-    client_id = v4();
-    $gateway = new BehaviorSubject(undefined);
-    $reconnect = new BehaviorSubject(0);
-    #topics = new Map();
-    #$input = new ReplaySubject(1000);
-    #running;
-    #init() {
-        if (typeof WebSocket == 'undefined')
-            return;
-        return of(1).pipe(mergeMap(() => this.ws_url_fatory()), map(url => new WebSocket(url)), switchMap(ws => merge(fromEvent(ws, 'closed').pipe(map(e => { throw e; })), fromEvent(ws, 'close').pipe(map(e => { throw e; })), fromEvent(ws, 'error').pipe(map(e => { throw e; })), fromEvent(ws, 'open').pipe(switchMap(() => interval(60000)), tap(() => ws.send(JSON.stringify({ event: 'ping' })))), fromEvent(ws, 'open').pipe(tap(() => {
-            console.log(this.$reconnect.getValue() == 0 ? 'Websocket connected' : `Websocket re-connected (${this.$reconnect.getValue()})`);
-            this.$reconnect.next(this.$reconnect.getValue() + 1);
-            ws.send(JSON.stringify({ event: 'start', data: { id: this.client_id } }));
-        }), delay(1000), tap(() => !this.$gateway.getValue() && this.$gateway.next({ id: '' })), mergeMap(() => this.#$input), tap(data => ws.send(JSON.stringify(data)))), fromEvent(ws, 'message').pipe(tap((evt) => {
-            const e = JSON.parse(evt.data);
-            this[`$${e.event}`]?.(e);
-        }))).pipe(finalize(() => ws.close()))), retry({ delay: 1000 })).subscribe();
-    }
-    constructor(ws_url_fatory) {
-        this.ws_url_fatory = ws_url_fatory;
-        this.#running = this.#init();
-    }
-    stop() {
-        this.#running?.unsubscribe();
-    }
-    $sync(e) {
-        for (const change of e.data.changes) {
-            // Collection ref broadcast
-            this.#topics.get(change.ref)?.stream.next(change);
-            // Document ref broadcast
-            const ref = `${change.ref}/${change.data.id}`;
-            this.#topics.get(ref)?.stream.next({
-                ...change,
-                ref
-            });
-        }
-    }
-    $hello(e) {
-        this.$gateway.next({ id: e.gid });
-    }
-    subscribe(realtime_token) {
-        this.#$input.next({ event: 'subscribe', data: { realtime_token } });
-    }
-    listen(ref) {
-        if (!this.#topics.has(ref)) {
-            const stream = new Subject();
-            this.#topics.set(ref, { stream, listen_count: 0 });
-        }
-        this.#topics.get(ref).listen_count++;
-        return this.#topics.get(ref).stream.pipe(finalize(() => {
-            this.#topics.get(ref).listen_count--;
-            setTimeout(() => {
-                if (this.#topics.get(ref).listen_count == 0) {
-                    this.#$input.next({ event: 'unsubscribe', data: { ref } });
-                }
-            }, 2000);
-        }));
-    }
-}

package/build/hooks/AddHeadersHook.d.ts

@@ -1,3 +0,0 @@
-import { Observable } from "rxjs";
-import { ApiRequest } from "../RestTransporter";
-export declare const AddHeadersHook: (get_headers: any) => (next: any) => import("rxjs").UnaryFunction<Observable<ApiRequest>, unknown>;

package/build/hooks/AddHeadersHook.js

@@ -1,16 +0,0 @@
-import { pipe, mergeMap, firstValueFrom, Observable } from "rxjs";
-export const AddHeadersHook = (get_headers) => {
-    return next => pipe(mergeMap(async (r) => {
-        const headers = typeof get_headers == 'function' ? await firstValueFrom(get_headers()) : (get_headers instanceof Observable ? await firstValueFrom(get_headers) : get_headers);
-        return {
-            ...r,
-            options: {
-                ...r.options || {},
-                headers: {
-                    ...r.options?.headers || {},
-                    ...headers
-                }
-            }
-        };
-    }), next());
-};

package/build/hooks/Deduplicate.d.ts

@@ -1,2 +0,0 @@
-import { ApiRequest } from "../RestTransporter";
-export declare const Deduplicate: (ms?: number) => (next: any) => import("rxjs").UnaryFunction<import("rxjs").Observable<ApiRequest>, import("rxjs").Observable<any>>;

package/build/hooks/Deduplicate.js

@@ -1,25 +0,0 @@
-import { pipe, mergeMap, BehaviorSubject, tap, of, filter, first } from "rxjs";
-const requests = new Map();
-export const Deduplicate = (ms = 1000) => next => {
-    return pipe(mergeMap(async (r) => {
-        if (r.options.method != 'GET')
-            return of(r).pipe(next());
-        const url = r.url.toString();
-        const cached = requests.get(url);
-        if (cached) {
-            if (cached.time > Date.now() - ms) {
-                return cached.response.pipe(filter(Boolean), first());
-            }
-            else {
-                requests.delete(url);
-            }
-        }
-        requests.set(url, {
-            response: new BehaviorSubject(undefined),
-            time: Date.now()
-        });
-        return of(r).pipe(next(), tap(response => {
-            requests.get(url)?.response.next(response);
-        }));
-    }), mergeMap($ => $));
-};

package/build/index.d.ts

@@ -1,4 +0,0 @@
-export { Deduplicate } from './hooks/Deduplicate.js';
-export { RestTransporter, ApiRequest } from './RestTransporter.js';
-export { Socket } from './Socket.js';
-export { AddHeadersHook } from './hooks/AddHeadersHook.js';

package/build/index.js

@@ -1,4 +0,0 @@
-export { Deduplicate } from './hooks/Deduplicate.js';
-export { RestTransporter } from './RestTransporter.js';
-export { Socket } from './Socket.js';
-export { AddHeadersHook } from './hooks/AddHeadersHook.js';

package/build/tsconfig.tsbuildinfo

@@ -1 +0,0 @@
-{"root":["../src/index.ts","../src/resttransporter.ts","../src/socket.ts","../src/hooks/addheadershook.ts","../src/hooks/deduplicate.ts"],"version":"5.6.3"}