@based/client 4.8.9 → 5.0.0-alpha.1

package/dist/{index.js → src/index.js}

@@ -1,79 +1,20 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BasedClient = exports.BasedQuery = void 0;
-const websocket_1 = __importDefault(require("./websocket"));
-const Emitter_1 = __importDefault(require("./Emitter"));
-const outgoing_1 = require("./outgoing");
-const incoming_1 = require("./incoming");
-const query_1 = require("./query");
-Object.defineProperty(exports, "BasedQuery", { enumerable: true, get: function () { return query_1.BasedQuery; } });
-const stream_1 = __importDefault(require("./stream"));
-const persistentStorage_1 = require("./persistentStorage");
-const channel_1 = require("./channel");
-const hash_1 = require("@saulx/hash");
-const opts_1 = __importDefault(require("@based/opts"));
-const utils_1 = require("@saulx/utils");
-__exportStar(require("./authState/parseAuthState"), exports);
-__exportStar(require("./types/error"), exports);
-class BasedClient extends Emitter_1.default {
+import connectWebsocket from './websocket/index.js';
+import Emitter from './Emitter.js';
+import { addChannelPublishIdentifier, addChannelSubscribeToQueue, addObsToQueue, addToFunctionQueue, drainQueue, sendAuth, } from './outgoing/index.js';
+import { incoming } from './incoming/index.js';
+import { BasedQuery } from './query/index.js';
+import startStream from './stream/index.js';
+import { initStorage, clearStorage, updateStorage, } from './persistentStorage/index.js';
+import { BasedChannel } from './channel/index.js';
+import { hashObjectIgnoreKeyOrder } from '@saulx/hash';
+import { deepEqual } from '@saulx/utils';
+import parseOpts from '@based/opts';
+export * from './authState/parseAuthState.js';
+export * from './types/error.js';
+export { BasedQuery };
+export class BasedClient extends Emitter {
     constructor(opts, settings) {
         super();
-        // --------- Persistent Storage
-        this.storageSize = 0;
-        this.maxStorageSize = 5e6 - 500; // ~5mb
-        this.storageEnvKey = 0;
-        this.connected = false;
-        // --------- Stream
-        this.outgoingStreams = new Map();
-        this.isDrainingStreams = false;
-        // --------- Queue
-        this.maxPublishQueue = 1000;
-        this.publishQueue = [];
-        this.functionQueue = [];
-        this.observeQueue = new Map();
-        this.channelQueue = new Map();
-        this.getObserveQueue = new Map();
-        this.drainInProgress = false;
-        // --------- Cache State
-        this.localStorage = false;
-        this.maxCacheSize = 4e6; // in bytes
-        this.cache = new Map();
-        // --------- Function State
-        this.functionResponseListeners = new Map();
-        this.requestId = 0; // max 3 bytes (0 to 16777215)
-        // --------- Channel State
-        this.channelState = new Map();
-        this.channelCleanupCycle = 30e3;
-        // --------- Observe State
-        this.observeState = new Map();
-        // --------- Get State
-        this.getState = new Map();
-        // -------- Auth state
-        this.authState = {};
-        this.authRequest = {
-            authState: null,
-            promise: null,
-            resolve: null,
-            reject: null,
-            inProgress: false,
-        };
         if (settings?.persistentStorage) {
             this.storagePath = settings.persistentStorage;
         }
@@ -85,13 +26,61 @@ class BasedClient extends Emitter_1.default {
             this.connect(opts);
         }
     }
+    // --------- Persistent Storage
+    storageSize = 0;
+    maxStorageSize = 5e6 - 500; // ~5mb
+    storageEnvKey = 0;
+    storagePath;
+    storageBeingWritten;
+    // --------- Connection State
+    opts;
+    connected = false;
+    connection;
+    url;
+    // --------- Stream
+    outgoingStreams = new Map();
+    isDrainingStreams = false;
+    // --------- Queue
+    maxPublishQueue = 1000;
+    pQ = [];
+    fQ = [];
+    oQ = new Map();
+    cQ = new Map();
+    gQ = new Map();
+    drainInProgress = false;
+    drainTimeout;
+    idlePing;
+    // --------- Cache State
+    localStorage = false;
+    maxCacheSize = 4e6; // in bytes
+    cache = new Map();
+    // --------- Function State
+    functionResponseListeners = new Map();
+    requestId = 0; // max 3 bytes (0 to 16777215)
+    // --------- Channel State
+    channelState = new Map();
+    channelCleanTimeout;
+    channelCleanupCycle = 30e3;
+    // --------- Observe State
+    observeState = new Map();
+    // --------- Get State
+    getState = new Map();
+    // -------- Auth state
+    authState = {};
+    authRequest = {
+        authState: null,
+        promise: null,
+        resolve: null,
+        reject: null,
+        inProgress: false,
+    };
     // --------- Internal Events
     onClose() {
         this.connected = false;
         // Rare edge case where server got dc'ed while sending the queue - before recieving result)
-        if (this.functionResponseListeners.size > this.functionQueue.length) {
+        if (this.functionResponseListeners.size > this.fQ.length) {
             this.functionResponseListeners.forEach((p, k) => {
-                if (!this.functionQueue.find(([id]) => {
+                if (!this.fQ.find(([id]) => {
                     if (id === k) {
                         return true;
                     }
@@ -113,26 +102,26 @@ class BasedClient extends Emitter_1.default {
         this.emit('connect', true);
         // Resend all subscriptions
         for (const [id, obs] of this.observeState) {
-            if (!this.observeQueue.has(id)) {
+            if (!this.oQ.has(id)) {
                 const cachedData = this.cache.get(id);
-                (0, outgoing_1.addObsToQueue)(this, obs.name, id, obs.payload, cachedData?.checksum || 0);
+                addObsToQueue(this, obs.name, id, obs.payload, cachedData?.c || 0);
             }
         }
         // Resend all channels
         for (const [id, channel] of this.channelState) {
-            if (!this.channelQueue.has(id)) {
+            if (!this.cQ.has(id)) {
                 if (channel.subscribers.size) {
-                    (0, outgoing_1.addChannelSubscribeToQueue)(this, channel.name, id, channel.payload);
+                    addChannelSubscribeToQueue(this, channel.name, id, channel.payload);
                 }
                 else {
-                    (0, outgoing_1.addChannelPublishIdentifier)(this, channel.name, id, channel.payload);
+                    addChannelPublishIdentifier(this, channel.name, id, channel.payload);
                 }
             }
         }
-        (0, outgoing_1.drainQueue)(this);
+        drainQueue(this);
     }
     onData(data) {
-        (0, incoming_1.incoming)(this, data);
+        incoming(this, data);
     }
     // --------- Connect
     /**
@@ -155,22 +144,22 @@ class BasedClient extends Emitter_1.default {
     async connect(opts) {
         if (opts && Object.keys(opts).length > 0) {
             if (this.opts) {
-                if ((0, utils_1.deepEqual)(this.opts, opts)) {
+                if (deepEqual(this.opts, opts)) {
                     return;
                 }
                 this.disconnect();
             }
             this.opts = opts;
-            this.url = () => (0, opts_1.default)(opts);
-            this.storageEnvKey = (0, hash_1.hashObjectIgnoreKeyOrder)(opts);
-            (0, persistentStorage_1.initStorage)(this);
+            this.url = () => parseOpts(opts);
+            this.storageEnvKey = hashObjectIgnoreKeyOrder(opts);
+            initStorage(this);
         }
         if (!this.opts) {
             console.error('Configure opts to connect');
             return;
         }
         if (this.url && !this.connection) {
-            this.connection = (0, websocket_1.default)(this, this.url);
+            this.connection = connectWebsocket(this, this.url);
         }
     }
     /**
@@ -196,6 +185,8 @@ class BasedClient extends Emitter_1.default {
         clearTimeout(this.idlePing);
         this.connected = false;
     }
+    // ---------- Destroy
+    isDestroyed;
     /**
     Destroy the client, will remove all internals and cannot be resued,
     will update localStorage with the all `persistent` queries in memory
@@ -209,7 +200,7 @@ class BasedClient extends Emitter_1.default {
      */
     async destroy(noStorage) {
         if (!noStorage) {
-            await (0, persistentStorage_1.updateStorage)(this);
+            await updateStorage(this, true);
         }
         clearTimeout(this.storageBeingWritten);
         clearTimeout(this.channelCleanTimeout);
@@ -232,7 +223,7 @@ class BasedClient extends Emitter_1.default {
     ```
      */
     channel(name, payload) {
-        return new channel_1.BasedChannel(this, name, payload);
+        return new BasedChannel(this, name, payload);
     }
     // ---------- Query
     /**
@@ -260,7 +251,7 @@ class BasedClient extends Emitter_1.default {
     ```
     */
     query(name, payload, opts) {
-        return new query_1.BasedQuery(this, name, payload, opts);
+        return new BasedQuery(this, name, payload, opts);
     }
     // -------- Function
     /**
@@ -278,21 +269,21 @@ class BasedClient extends Emitter_1.default {
                     if (typeof newTime === 'number' && !isNaN(newTime)) {
                         time = newTime;
                         if (newTime === 0) {
-                            (0, outgoing_1.addToFunctionQueue)(this, payload, name, resolve, retryReject);
+                            addToFunctionQueue(this, payload, name, resolve, retryReject);
                         }
                         else {
                             setTimeout(() => {
-                                (0, outgoing_1.addToFunctionQueue)(this, payload, name, resolve, retryReject);
+                                addToFunctionQueue(this, payload, name, resolve, retryReject);
                             }, newTime);
                         }
                     }
                 };
-                return (0, outgoing_1.addToFunctionQueue)(this, payload, name, resolve, retryReject);
+                return addToFunctionQueue(this, payload, name, resolve, retryReject);
             });
         }
         else {
             return new Promise((resolve, reject) => {
-                return (0, outgoing_1.addToFunctionQueue)(this, payload, name, resolve, reject);
+                return addToFunctionQueue(this, payload, name, resolve, reject);
             });
         }
     }
@@ -305,7 +296,7 @@ class BasedClient extends Emitter_1.default {
     ```
     */
     stream(name, stream, progressListener) {
-        return (0, stream_1.default)(this, name, stream, progressListener);
+        return startStream(this, name, stream, progressListener);
     }
     // -------- Auth
     /**
@@ -318,7 +309,7 @@ class BasedClient extends Emitter_1.default {
     */
     setAuthState(authState) {
         if (typeof authState === 'object') {
-            return (0, outgoing_1.sendAuth)(this, authState);
+            return sendAuth(this, authState);
         }
         else {
             throw new Error('Invalid auth() arguments');
@@ -332,7 +323,7 @@ class BasedClient extends Emitter_1.default {
     ```
     */
     clearAuthState() {
-        return (0, outgoing_1.sendAuth)(this, {});
+        return sendAuth(this, {});
     }
     // -------- Storage layer
     /**
@@ -343,7 +334,7 @@ class BasedClient extends Emitter_1.default {
     ```
     */
     clearStorage() {
-        return (0, persistentStorage_1.clearStorage)(this);
+        return clearStorage(this);
     }
     /**
     Save current state of all cached query functions that have `persistent` set to true
@@ -353,10 +344,9 @@ class BasedClient extends Emitter_1.default {
     ```
     */
     saveStorage() {
-        return (0, persistentStorage_1.updateStorage)(this);
+        return updateStorage(this);
     }
 }
-exports.BasedClient = BasedClient;
 /**
   Creates a based client
   
@@ -374,8 +364,7 @@ exports.BasedClient = BasedClient;
   })
   ```
 */
-function based(opts, settings) {
+export default function based(opts, settings) {
     return new BasedClient(opts, settings);
 }
-exports.default = based;
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/dist/{index_original.d.ts → src/index_original.d.ts}

@@ -1,14 +1,11 @@
-import { BasedOpts, AuthState, FunctionResponseListeners, Settings, FunctionQueue, ObserveState, ObserveQueue, Cache, GetObserveQueue } from './types';
-import { GetState } from './types/observe';
-import { Connection } from './websocket/types';
-import Emitter from './Emitter';
-import { BasedQuery } from './query';
-import { StreamFunctionOpts } from './stream/types';
-import { BasedChannel } from './channel';
-import { ChannelQueue, ChannelPublishQueue, ChannelState } from './types/channel';
-import { CallOptions, QueryOptions } from './types';
-export * from './authState/parseAuthState';
-export * from './types/error';
+import { BasedOpts, AuthState, FunctionResponseListeners, Settings, FunctionQueue, ObserveState, ObserveQueue, Cache, GetObserveQueue, GetState, ChannelQueue, ChannelPublishQueue, ChannelState, CallOptions, QueryOptions } from './types/index.js';
+import { Connection } from './websocket/types.js';
+import Emitter from './Emitter.js';
+import { BasedQuery } from './query/index.js';
+import { StreamFunctionOpts } from './stream/types.js';
+import { BasedChannel } from './channel/index.js';
+export * from './authState/parseAuthState.js';
+export * from './types/error.js';
 export { AuthState, BasedQuery };
 export declare class BasedClient extends Emitter {
     constructor(opts?: BasedOpts, settings?: Settings);
@@ -17,10 +14,10 @@ export declare class BasedClient extends Emitter {
     storageEnvKey: number;
     storagePath?: string;
     storageBeingWritten?: ReturnType<typeof setTimeout>;
-    opts: BasedOpts;
+    opts?: BasedOpts;
     connected: boolean;
-    connection: Connection;
-    url: () => Promise<string>;
+    connection?: Connection;
+    url?: () => Promise<string>;
     outgoingStreams: Map<string, {
         stream: any;
         resolve: (result: any) => void;
@@ -28,30 +25,30 @@ export declare class BasedClient extends Emitter {
     }[]>;
     isDrainingStreams: boolean;
     maxPublishQueue: number;
-    publishQueue: ChannelPublishQueue;
-    functionQueue: FunctionQueue;
-    observeQueue: ObserveQueue;
-    channelQueue: ChannelQueue;
-    getObserveQueue: GetObserveQueue;
+    pQ: ChannelPublishQueue;
+    fQ: FunctionQueue;
+    oQ: ObserveQueue;
+    cQ: ChannelQueue;
+    gQ: GetObserveQueue;
     drainInProgress: boolean;
-    drainTimeout: ReturnType<typeof setTimeout>;
-    idlePing: ReturnType<typeof setTimeout>;
+    drainTimeout?: ReturnType<typeof setTimeout>;
+    idlePing?: ReturnType<typeof setTimeout>;
     localStorage: boolean;
     maxCacheSize: number;
     cache: Cache;
     functionResponseListeners: FunctionResponseListeners;
     requestId: number;
     channelState: ChannelState;
-    channelCleanTimeout?: ReturnType<typeof setTimeout>;
+    channelCleanTimeout?: ReturnType<typeof setTimeout> | null;
     channelCleanupCycle: number;
     observeState: ObserveState;
     getState: GetState;
     authState: AuthState;
     authRequest: {
-        authState: AuthState;
-        promise: Promise<AuthState>;
-        resolve: (result: AuthState) => void;
-        reject: (err: Error) => void;
+        authState: AuthState | null;
+        promise: Promise<AuthState> | null;
+        resolve: ((result: AuthState) => void) | null;
+        reject: ((err: Error) => void) | null;
         inProgress: boolean;
     };
     onClose(): void;
@@ -200,9 +197,12 @@ export { BasedOpts };
 */
 export default function based(opts: BasedOpts, settings?: Settings): BasedClient;
 export type QueryMap = {
+    db: {
+        payload: any;
+        result: any;
+    };
     [key: string]: {
         payload: any;
         result: any;
     };
 };
-//# sourceMappingURL=index.d.ts.map

package/dist/{outgoing → src/outgoing}/index.d.ts

@@ -1,5 +1,5 @@
-import { BasedClient } from '..';
-import { AuthState, GenericObject } from '../types';
+import { BasedClient } from '../index.js';
+import { AuthState, GenericObject } from '../types/index.js';
 export declare const idleTimeout: (client: BasedClient) => void;
 export declare const drainQueue: (client: BasedClient) => void;
 export declare const stopDrainQueue: (client: BasedClient) => void;
@@ -12,4 +12,3 @@ export declare const addObsCloseToQueue: (client: BasedClient, id: number) => vo
 export declare const addObsToQueue: (client: BasedClient, name: string, id: number, payload: GenericObject, checksum?: number) => void;
 export declare const addGetToQueue: (client: BasedClient, name: string, id: number, payload: GenericObject, checksum?: number) => void;
 export declare const sendAuth: (client: BasedClient, authState: AuthState) => Promise<AuthState>;
-//# sourceMappingURL=index.d.ts.map

package/dist/src/outgoing/index.js

@@ -0,0 +1,197 @@
+import { updateAuthState } from '../authState/updateAuthState.js';
+import { encodeAuthMessage, encodeFunctionMessage, encodeGetObserveMessage, encodeObserveMessage, encodePublishMessage, encodeSubscribeChannelMessage, } from './protocol.js';
+import { deepEqual } from '@saulx/utils';
+const PING = new Uint8Array(0);
+export const idleTimeout = (client) => {
+    const updateTime = 60 * 1e3;
+    clearTimeout(client.idlePing);
+    client.idlePing = setTimeout(() => {
+        if (client.connection &&
+            client.connected &&
+            !client.connection.disconnected) {
+            client.connection.ws.send(PING);
+        }
+    }, updateTime);
+};
+const hasQueue = (client) => {
+    return !!(client.fQ.length ||
+        client.oQ.size ||
+        client.gQ.size ||
+        client.cQ.size ||
+        client.pQ.length);
+};
+export const drainQueue = (client) => {
+    if (client.connected && !client.drainInProgress && hasQueue(client)) {
+        client.drainInProgress = true;
+        const drainOutgoing = () => {
+            client.drainInProgress = false;
+            if (!client.connected) {
+                return;
+            }
+            if (hasQueue(client)) {
+                const channel = client.cQ;
+                const publish = client.pQ;
+                const fn = client.fQ;
+                const obs = client.oQ;
+                const get = client.gQ;
+                const buffs = [];
+                let l = 0;
+                // ------- Channel
+                for (const [id, o] of channel) {
+                    const { buffers, len } = encodeSubscribeChannelMessage(id, o);
+                    buffs.push(...buffers);
+                    l += len;
+                }
+                // ------- GetObserve
+                for (const [id, o] of get) {
+                    const { buffers, len } = encodeGetObserveMessage(id, o);
+                    buffs.push(...buffers);
+                    l += len;
+                }
+                // ------- Observe
+                for (const [id, o] of obs) {
+                    const { buffers, len } = encodeObserveMessage(id, o);
+                    buffs.push(...buffers);
+                    l += len;
+                }
+                // ------- Function
+                for (const f of fn) {
+                    const { buffers, len } = encodeFunctionMessage(f);
+                    buffs.push(...buffers);
+                    l += len;
+                }
+                // ------- Publish
+                for (const f of publish) {
+                    const { buffers, len } = encodePublishMessage(f);
+                    buffs.push(...buffers);
+                    l += len;
+                }
+                const n = new Uint8Array(l);
+                let c = 0;
+                for (const b of buffs) {
+                    n.set(b, c);
+                    c += b.length;
+                }
+                client.fQ = [];
+                client.pQ = [];
+                client.oQ.clear();
+                client.gQ.clear();
+                client.cQ.clear();
+                client.connection.ws.send(n);
+                idleTimeout(client);
+            }
+        };
+        client.drainTimeout = setTimeout(drainOutgoing, 0);
+    }
+};
+export const stopDrainQueue = (client) => {
+    if (client.drainInProgress) {
+        clearTimeout(client.drainTimeout);
+        client.drainInProgress = false;
+    }
+};
+// ------------ Function ---------------
+export const addToFunctionQueue = (client, payload, name, resolve, reject) => {
+    client.requestId++;
+    // 3 bytes
+    if (client.requestId > 16777215) {
+        client.requestId = 0;
+    }
+    const id = client.requestId;
+    // TODO: When node env is not "production" | or when dev
+    const s = Error().stack.split(/BasedClient\.function.+:\d\d\)/)[1];
+    client.functionResponseListeners.set(id, [resolve, reject, s]);
+    client.fQ.push([id, name, payload]);
+    drainQueue(client);
+};
+// ------------ Channel ---------------
+export const addChannelCloseToQueue = (client, id) => {
+    const type = client.cQ.get(id)?.[0];
+    if (type === 7) {
+        return;
+    }
+    client.cQ.set(id, [7]);
+    drainQueue(client);
+};
+export const addChannelSubscribeToQueue = (client, name, id, payload) => {
+    const type = client.cQ.get(id)?.[0];
+    if (type === 5) {
+        return;
+    }
+    client.cQ.set(id, [5, name, payload]);
+    drainQueue(client);
+};
+export const addChannelPublishIdentifier = (client, name, id, payload) => {
+    const type = client.cQ.get(id)?.[0];
+    if (type === 5 || type === 6) {
+        return;
+    }
+    // if (type === 7) {
+    // unsupported
+    // console.warn(10)
+    // }
+    client.cQ.set(id, [6, name, payload]);
+    drainQueue(client);
+};
+export const addToPublishQueue = (client, id, payload) => {
+    // TODO: make this configurable at some point
+    if (client.pQ.length > client.maxPublishQueue) {
+        client.pQ.shift();
+    }
+    client.pQ.push([id, payload]);
+    drainQueue(client);
+};
+// ------------ Observable ---------------
+export const addObsCloseToQueue = (client, id) => {
+    const type = client.oQ.get(id)?.[0];
+    if (type === 2) {
+        return;
+    }
+    client.oQ.set(id, [2]);
+    drainQueue(client);
+};
+export const addObsToQueue = (client, name, id, payload, checksum = 0) => {
+    const type = client.oQ.get(id)?.[0];
+    if (type === 1) {
+        return;
+    }
+    client.oQ.set(id, [1, name, checksum, payload]);
+    drainQueue(client);
+};
+export const addGetToQueue = (client, name, id, payload, checksum = 0) => {
+    if (client.gQ.has(id)) {
+        return;
+    }
+    client.gQ.set(id, [3, name, checksum, payload]);
+    drainQueue(client);
+};
+// ------------ Auth ---------------
+export const sendAuth = async (client, authState) => {
+    if (deepEqual(authState, client.authState)) {
+        console.warn('[Based] Trying to send the same authState twice', client.authState);
+        return client.authRequest.inProgress
+            ? client.authRequest.promise
+            : new Promise((resolve) => resolve({}));
+    }
+    if (client.authRequest.inProgress) {
+        console.warn('[Based] Authentication still in progress - waiting until done');
+        await client.authRequest.promise;
+    }
+    updateAuthState(client, authState);
+    client.emit('authstate-change', client.authState);
+    if (client.connected) {
+        client.connection.ws.send(encodeAuthMessage(authState));
+    }
+    client.authRequest.promise = new Promise((resolve, reject) => {
+        client.authRequest.inProgress = true;
+        client.authRequest.resolve = resolve;
+        client.authRequest.reject = reject;
+        // Gets send in the upgrade header of the websocket
+    }).finally(() => {
+        client.authRequest.resolve = null;
+        client.authRequest.reject = null;
+        client.authRequest.inProgress = false;
+    });
+    return client.authRequest.promise;
+};
+//# sourceMappingURL=index.js.map