@livequery/rest 1.0.22 → 1.0.86

package/build/RestTransporter.d.ts

@@ -6,6 +6,12 @@ export type RestTransporterConfig = {
     headers?: () => Promise<{
         [key: string]: string;
     }>;
+    onResponse?: (data: {
+        url: string;
+        headers: Headers;
+        body: any;
+        status: number;
+    }) => void;
 };
 export declare class RestTransporter implements Transporter {
     #private;

package/build/RestTransporter.js

@@ -1,48 +1,29 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _RestTransporter_instances, _RestTransporter_encode_query;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RestTransporter = void 0;
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const rxjs_2 = require("rxjs");
-const Socket_1 = require("./Socket");
-const query_string_1 = require("query-string");
-class RestTransporter {
+import { of } from 'rxjs';
+import { catchError, map, mergeMap } from 'rxjs/operators';
+import { merge, Subject } from 'rxjs';
+import { Socket } from './Socket.js';
+import { stringify } from 'query-string';
+export class RestTransporter {
+    config;
+    socket;
     constructor(config) {
         this.config = config;
-        _RestTransporter_instances.add(this);
-        config.websocket_url && (this.socket = new Socket_1.Socket(config.websocket_url));
+        config.websocket_url && (this.socket = new Socket(config.websocket_url));
     }
     query(ref, options) {
-        var _a;
-        const $on_reload = new rxjs_2.Subject();
-        const http_request = (0, rxjs_2.merge)((0, rxjs_1.of)(1), ((_a = this.socket) === null || _a === void 0 ? void 0 : _a.$reconnect) || (0, rxjs_1.of)(), $on_reload)
-            .pipe((0, operators_1.mergeMap)(() => this.call(ref, 'GET', options)), (0, operators_1.map)(({ data, error }) => {
-            var _a;
+        const $on_reload = new Subject();
+        const http_request = merge(of(1), this.socket?.$reconnect || of(), $on_reload)
+            .pipe(mergeMap(() => this.call(ref, 'GET', options)), map(({ data, error }) => {
             if (error)
                 throw error;
-            data.realtime_token && ((_a = this.socket) === null || _a === void 0 ? void 0 : _a.subscribe(data.realtime_token));
+            data.realtime_token && this.socket?.subscribe(data.realtime_token);
             // If collection
             const collection = data;
             if (collection.items) {
                 return {
                     data: {
                         changes: collection.items.map(data => ({ data, type: 'added', ref })),
-                        paging: Object.assign(Object.assign({}, collection.paging), { n: 0 })
+                        paging: { ...collection.paging, n: 0 }
                     }
                 };
             }
@@ -54,62 +35,72 @@ class RestTransporter {
                     paging: { n: 0 }
                 }
             };
-        }), (0, operators_1.catchError)(error => (0, rxjs_1.of)({ error })));
-        const websocket_sync = (!this.socket || options._cursor) ? (0, rxjs_1.of)() : (this.socket.listen(ref).pipe((0, operators_1.map)((change) => ({ data: { changes: [change] } }))));
-        return Object.assign((0, rxjs_2.merge)(http_request, websocket_sync), {
+        }), catchError(error => of({ error })));
+        const websocket_sync = (!this.socket || options._cursor) ? of() : (this.socket.listen(ref).pipe(map((change) => ({ data: { changes: [change] } }))));
+        return Object.assign(merge(http_request, websocket_sync), {
             reload: () => $on_reload.next()
         });
     }
-    call(url, method, query = {}, payload) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const headers = Object.assign(Object.assign(Object.assign({}, (yield ((_b = (_a = this.config).headers) === null || _b === void 0 ? void 0 : _b.call(_a))) || {}), payload ? {
+    #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 `?${stringify(encoded_query)}`;
+    }
+    async call(url, method, query = {}, payload) {
+        const headers = {
+            ...await this.config.headers?.() || {},
+            ...payload ? {
                 'Content-Type': 'application/json'
-            } : {}), this.socket ? { socket_id: this.socket.socket_session } : {});
+            } : {},
+            ...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 result = yield fetch(`${this.config.base_url()}/${url}${__classPrivateFieldGet(this, _RestTransporter_instances, "m", _RestTransporter_encode_query).call(this, query)}`, Object.assign({ method, headers: headers }, payload ? { body: JSON.stringify(payload) } : {})).then(r => r.text());
-                try {
-                    return JSON.parse(result);
-                }
-                catch (e) {
-                    return null;
-                }
+                const body = await response.json();
+                this.config.onResponse?.({
+                    body,
+                    headers: response.headers,
+                    status: response.status,
+                    url
+                });
+                return body;
             }
-            catch (error) {
-                throw error;
+            catch (e) {
+                this.config.onResponse?.({
+                    body: null,
+                    headers: response.headers,
+                    status: response.status,
+                    url
+                });
+                return null;
             }
-        });
+        }
+        catch (error) {
+            throw error;
+        }
     }
-    get(ref, query = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.call(ref, 'GET', query, null);
-        });
+    async get(ref, query = {}) {
+        return await this.call(ref, 'GET', query, null);
     }
-    add(ref, data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.call(ref, 'POST', {}, data);
-        });
+    async add(ref, data) {
+        return await this.call(ref, 'POST', {}, data);
     }
-    update(ref, data, method = 'PATCH') {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.call(ref, method, {}, data);
-        });
+    async update(ref, data, method = 'PATCH') {
+        return await this.call(ref, method, {}, data);
     }
-    remove(ref) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.call(ref, 'DELETE');
-        });
+    async remove(ref) {
+        return await this.call(ref, 'DELETE');
     }
-    trigger(ref, name, query, payload) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.call(`${ref}/~${name}`, 'POST', query, payload);
-        });
+    async trigger(ref, name, query, payload) {
+        return await this.call(`${ref}/~${name}`, 'POST', query, payload);
     }
 }
-exports.RestTransporter = RestTransporter;
-_RestTransporter_instances = new WeakSet(), _RestTransporter_encode_query = function _RestTransporter_encode_query(query) {
-    if (!query || Object.keys(query || {}).length == 0)
-        return '';
-    const encoded_query = Object.keys(query).reduce((o, key) => (Object.assign(Object.assign({}, o), { [key]: typeof query[key] == 'object' ? JSON.stringify(query[key]) : query[key] })), {});
-    return `?${(0, query_string_1.stringify)(encoded_query)}`;
-};

package/build/Socket.js

@@ -1,42 +1,55 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _Socket_instances, _Socket_init;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Socket = void 0;
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const uuid_1 = require("uuid");
-class Socket {
+import { firstValueFrom, fromEvent, Subject, merge, ReplaySubject } from "rxjs";
+import { finalize } from "rxjs/operators";
+import { v4 } from 'uuid';
+export class Socket {
+    ws_url_fatory;
+    topics = new Map();
+    $input = new ReplaySubject(1000);
+    $reconnect = new Subject();
+    socket_session = v4();
+    async #init() {
+        if (typeof WebSocket == 'undefined')
+            return;
+        for (let n = 0; true; n++) {
+            console.log('Connecting websocket .... ');
+            const ws = new WebSocket(await this.ws_url_fatory());
+            const messages_handler = fromEvent(ws, 'message').subscribe((evt) => {
+                const { data, event } = JSON.parse(evt.data);
+                this[`$${event}`]?.(data);
+            });
+            const data_sender = fromEvent(ws, 'open').subscribe(() => {
+                console.log(n == 0 ? 'Websocket connected' : 'Websocket re-connected');
+                ws.send(JSON.stringify({ event: 'start', data: { id: this.socket_session } }));
+                const subscription = this.$input.subscribe(data => ws.send(JSON.stringify(data)));
+                n > 0 && this.$reconnect.next();
+                return () => {
+                    subscription.unsubscribe();
+                    this.$input.complete();
+                };
+            });
+            await firstValueFrom(merge(fromEvent(ws, 'error'), fromEvent(ws, 'close'), fromEvent(ws, 'closed')));
+            this.$input = new ReplaySubject(1000);
+            data_sender.unsubscribe();
+            messages_handler.unsubscribe();
+            ws.close();
+            console.log(`Websocket connection dropped, reconnect in 1s ...`);
+            await new Promise(s => setTimeout(s, 1000));
+        }
+    }
     constructor(ws_url_fatory) {
         this.ws_url_fatory = ws_url_fatory;
-        _Socket_instances.add(this);
-        this.topics = new Map();
-        this.$input = new rxjs_1.ReplaySubject(1000);
-        this.$reconnect = new rxjs_1.Subject();
-        this.socket_session = (0, uuid_1.v4)();
-        __classPrivateFieldGet(this, _Socket_instances, "m", _Socket_init).call(this);
+        this.#init();
     }
     $sync(data) {
-        var _a, _b;
         for (const change of data.changes) {
             // Collection ref broadcast
-            (_a = this.topics.get(change.ref)) === null || _a === void 0 ? void 0 : _a.stream.next(change);
+            this.topics.get(change.ref)?.stream.next(change);
             // Document ref broadcast
             const ref = `${change.ref}/${change.data.id}`;
-            (_b = this.topics.get(ref)) === null || _b === void 0 ? void 0 : _b.stream.next(Object.assign(Object.assign({}, change), { ref }));
+            this.topics.get(ref)?.stream.next({
+                ...change,
+                ref
+            });
         }
     }
     subscribe(realtime_token) {
@@ -44,11 +57,11 @@ class Socket {
     }
     listen(ref) {
         if (!this.topics.has(ref)) {
-            const stream = new rxjs_1.Subject();
+            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((0, operators_1.finalize)(() => {
+        return this.topics.get(ref).stream.pipe(finalize(() => {
             this.topics.get(ref).listen_count--;
             setTimeout(() => {
                 if (this.topics.get(ref).listen_count == 0) {
@@ -58,36 +71,3 @@ class Socket {
         }));
     }
 }
-exports.Socket = Socket;
-_Socket_instances = new WeakSet(), _Socket_init = function _Socket_init() {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (typeof WebSocket == 'undefined')
-            return;
-        for (let n = 0; true; n++) {
-            console.log('Connecting websocket .... ');
-            const ws = new WebSocket(yield this.ws_url_fatory());
-            const messages_handler = (0, rxjs_1.fromEvent)(ws, 'message').subscribe((evt) => {
-                var _a;
-                const { data, event } = JSON.parse(evt.data);
-                (_a = this[`$${event}`]) === null || _a === void 0 ? void 0 : _a.call(this, data);
-            });
-            const data_sender = (0, rxjs_1.fromEvent)(ws, 'open').subscribe(() => {
-                console.log(n == 0 ? 'Websocket connected' : 'Websocket re-connected');
-                ws.send(JSON.stringify({ event: 'start', data: { id: this.socket_session } }));
-                const subscription = this.$input.subscribe(data => ws.send(JSON.stringify(data)));
-                n > 0 && this.$reconnect.next();
-                return () => {
-                    subscription.unsubscribe();
-                    this.$input.complete();
-                };
-            });
-            yield (0, rxjs_1.firstValueFrom)((0, rxjs_1.merge)((0, rxjs_1.fromEvent)(ws, 'error'), (0, rxjs_1.fromEvent)(ws, 'close'), (0, rxjs_1.fromEvent)(ws, 'closed')));
-            this.$input = new rxjs_1.ReplaySubject(1000);
-            data_sender.unsubscribe();
-            messages_handler.unsubscribe();
-            ws.close();
-            console.log(`Websocket connection dropped, reconnect in 1s ...`);
-            yield new Promise(s => setTimeout(s, 1000));
-        }
-    });
-};

package/build/index.d.ts

@@ -1,2 +1,2 @@
-export { RestTransporter } from './RestTransporter';
-export { Socket } from './Socket';
+export { RestTransporter } from './RestTransporter.js';
+export { Socket } from './Socket.js';

package/build/index.js

@@ -1,7 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Socket = exports.RestTransporter = void 0;
-var RestTransporter_1 = require("./RestTransporter");
-Object.defineProperty(exports, "RestTransporter", { enumerable: true, get: function () { return RestTransporter_1.RestTransporter; } });
-var Socket_1 = require("./Socket");
-Object.defineProperty(exports, "Socket", { enumerable: true, get: function () { return Socket_1.Socket; } });
+export { RestTransporter } from './RestTransporter.js';
+export { Socket } from './Socket.js';

package/package.json

@@ -3,7 +3,8 @@
     "repository": {
         "url": "https://github.com/livequery/rest"
     },
-    "version": "1.0.22",
+    "version": "1.0.86",
+    "type": "module",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",
@@ -18,7 +19,7 @@
         "uuid": "^8.3.2"
     },
     "devDependencies": {
-        "@livequery/types": "1.0.37"
+        "@livequery/types": "1.0.82"
     },
     "peerDependencies": {},
     "scripts": {