@based/client 0.2.1 → 0.5.0

package/dist/token.js

@@ -6,10 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("./types");
 const idleTimeout_1 = __importDefault(require("./idleTimeout"));
 const subscriptions_1 = require("./subscriptions");
-const sendToken = (client, token) => {
+const notUndefinedOrNull = (v) => typeof v !== 'undefined' && v !== null;
+const sendToken = (client, token, options) => {
     client.beingAuth = true;
     if (token) {
         client.token = token;
+        client.sendTokenOptions = options;
     }
     else {
         for (const id in client.cache) {
@@ -18,10 +20,13 @@ const sendToken = (client, token) => {
             }
         }
         delete client.token;
+        delete client.sendTokenOptions;
     }
     if (client.connected) {
-        // console.info(token)
-        client.connection.ws.send(JSON.stringify(token ? [types_1.RequestTypes.Token, token] : [types_1.RequestTypes.Token]));
+        const message = token
+            ? [types_1.RequestTypes.Token, token, options].filter(notUndefinedOrNull)
+            : [types_1.RequestTypes.Token];
+        client.connection.ws.send(JSON.stringify(message));
         (0, idleTimeout_1.default)(client);
         (0, subscriptions_1.sendAllSubscriptions)(client, true);
     }

package/dist/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sourceRoot":"","sources":["../src/token.ts"],"names":[],"mappings":";;;;;AACA,mCAAsC;AACtC,gEAAuC;AAEvC,mDAAsD;AAEtD,MAAM,SAAS,GAAG,CAAC,MAAmB,EAAE,KAAc,EAAE,EAAE;IACxD,MAAM,CAAC,SAAS,GAAG,IAAI,CAAA;IACvB,IAAI,KAAK,EAAE;QACT,MAAM,CAAC,KAAK,GAAG,KAAK,CAAA;KACrB;SAAM;QACL,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,KAAK,EAAE;YAC7B,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,EAAE;gBAC7B,OAAO,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;aACxB;SACF;QACD,OAAO,MAAM,CAAC,KAAK,CAAA;KACpB;IACD,IAAI,MAAM,CAAC,SAAS,EAAE;QACpB,sBAAsB;QAEtB,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CACvB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,oBAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAY,CAAC,KAAK,CAAC,CAAC,CAC3E,CAAA;QACD,IAAA,qBAAW,EAAC,MAAM,CAAC,CAAA;QACnB,IAAA,oCAAoB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;KACnC;AACH,CAAC,CAAA;AAED,kBAAe,SAAS,CAAA"}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../src/token.ts"],"names":[],"mappings":";;;;;AACA,mCAAwD;AACxD,gEAAuC;AAEvC,mDAAsD;AAEtD,MAAM,kBAAkB,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,WAAW,IAAI,CAAC,KAAK,IAAI,CAAA;AAE7E,MAAM,SAAS,GAAG,CAChB,MAAmB,EACnB,KAAc,EACd,OAA0B,EAC1B,EAAE;IACF,MAAM,CAAC,SAAS,GAAG,IAAI,CAAA;IACvB,IAAI,KAAK,EAAE;QACT,MAAM,CAAC,KAAK,GAAG,KAAK,CAAA;QACpB,MAAM,CAAC,gBAAgB,GAAG,OAAO,CAAA;KAClC;SAAM;QACL,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,KAAK,EAAE;YAC7B,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,EAAE;gBAC7B,OAAO,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;aACxB;SACF;QACD,OAAO,MAAM,CAAC,KAAK,CAAA;QACnB,OAAO,MAAM,CAAC,gBAAgB,CAAA;KAC/B;IACD,IAAI,MAAM,CAAC,SAAS,EAAE;QACpB,MAAM,OAAO,GAAG,KAAK;YACnB,CAAC,CAAC,CAAC,oBAAY,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC;YACjE,CAAC,CAAC,CAAC,oBAAY,CAAC,KAAK,CAAC,CAAA;QACxB,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;QAClD,IAAA,qBAAW,EAAC,MAAM,CAAC,CAAA;QACnB,IAAA,oCAAoB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;KACnC;AACH,CAAC,CAAA;AAED,kBAAe,SAAS,CAAA"}

package/dist/track.d.ts

@@ -0,0 +1,8 @@
+import { BasedClient, TrackOpts } from '.';
+export declare const genKey: (type: string, params?: {
+    [key: string]: string | number | boolean;
+}) => string;
+declare const _default: (client: BasedClient, type: string, params?: {
+    [key: string]: string | number | boolean;
+}, untrack?: boolean, event?: boolean, opts?: TrackOpts, del?: boolean) => void;
+export default _default;

package/dist/track.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.genKey = void 0;
+const queue_1 = require("./queue");
+const types_1 = require("./types");
+const hash_1 = require("@saulx/hash");
+const notUnique = new Set();
+const isUnique = (x) => {
+    if (typeof window !== 'undefined') {
+        if (notUnique.has(x)) {
+            return false;
+        }
+        notUnique.add(x);
+        try {
+            const name = '_ba:' + (0, hash_1.hashCompact)(x);
+            if (localStorage.getItem(name)) {
+                return false;
+            }
+            localStorage.setItem(name, '1');
+            return true;
+        }
+        catch (err) {
+            return false;
+        }
+    }
+    return false;
+};
+const genKey = (type, params) => {
+    if (params) {
+        let str = `${type}`;
+        const keys = Object.keys(params).sort();
+        for (const k of keys) {
+            str += '_' + k + '_' + params[k];
+        }
+        return str;
+    }
+    else {
+        return type;
+    }
+};
+exports.genKey = genKey;
+exports.default = (client, type, params, untrack, event, opts, del) => {
+    const k = (0, exports.genKey)(type, params);
+    const payload = { t: k };
+    if (del) {
+        payload.r = 1;
+    }
+    if (event) {
+        payload.e = 1;
+        if (opts) {
+            payload.o = opts;
+        }
+    }
+    if (untrack) {
+        payload.s = 1;
+        client.tracking.delete(k);
+    }
+    else {
+        if (!event) {
+            if (!client.tracking) {
+                client.tracking = new Set();
+            }
+            client.tracking.add(k);
+        }
+        if (isUnique(k)) {
+            payload.u = 1;
+        }
+    }
+    (0, queue_1.addToQueue)(client, [types_1.RequestTypes.Track, payload]);
+};
+//# sourceMappingURL=track.js.map

package/dist/track.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"track.js","sourceRoot":"","sources":["../src/track.ts"],"names":[],"mappings":";;;AACA,mCAAoC;AACpC,mCAAsC;AACtC,sCAAyC;AAEzC,MAAM,SAAS,GAAgB,IAAI,GAAG,EAAE,CAAA;AAExC,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAW,EAAE;IACtC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;QACjC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACpB,OAAO,KAAK,CAAA;SACb;QACD,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QAChB,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,GAAG,IAAA,kBAAW,EAAC,CAAC,CAAC,CAAA;YACpC,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC9B,OAAO,KAAK,CAAA;aACb;YACD,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;YAC/B,OAAO,IAAI,CAAA;SACZ;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,KAAK,CAAA;SACb;KACF;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAEM,MAAM,MAAM,GAAG,CACpB,IAAY,EACZ,MAAqD,EAC7C,EAAE;IACV,IAAI,MAAM,EAAE;QACV,IAAI,GAAG,GAAG,GAAG,IAAI,EAAE,CAAA;QACnB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;QACvC,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;YACpB,GAAG,IAAI,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;SACjC;QACD,OAAO,GAAG,CAAA;KACX;SAAM;QACL,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAdY,QAAA,MAAM,UAclB;AAED,kBAAe,CACb,MAAmB,EACnB,IAAY,EACZ,MAAqD,EACrD,OAAiB,EACjB,KAAe,EACf,IAAgB,EAChB,GAAa,EACb,EAAE;IACF,MAAM,CAAC,GAAG,IAAA,cAAM,EAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAC9B,MAAM,OAAO,GAAiB,EAAE,CAAC,EAAE,CAAC,EAAE,CAAA;IACtC,IAAI,GAAG,EAAE;QACP,OAAO,CAAC,CAAC,GAAG,CAAC,CAAA;KACd;IACD,IAAI,KAAK,EAAE;QACT,OAAO,CAAC,CAAC,GAAG,CAAC,CAAA;QACb,IAAI,IAAI,EAAE;YACR,OAAO,CAAC,CAAC,GAAG,IAAI,CAAA;SACjB;KACF;IACD,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,CAAC,GAAG,CAAC,CAAA;QACb,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;KAC1B;SAAM;QACL,IAAI,CAAC,KAAK,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;gBACpB,MAAM,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAA;aAC5B;YACD,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;SACvB;QAED,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE;YACf,OAAO,CAAC,CAAC,GAAG,CAAC,CAAA;SACd;KACF;IACD,IAAA,kBAAU,EAAC,MAAM,EAAE,CAAC,oBAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAA;AACnD,CAAC,CAAA"}

package/dist/types.d.ts

@@ -17,7 +17,8 @@ export declare enum RequestTypes {
     Delete = 11,
     Copy = 12,
     Digest = 13,
-    Token = 14
+    Token = 14,
+    Track = 15
 }
 export declare type Configuration = {
     schema: {
@@ -45,12 +46,13 @@ export declare type ErrorObject = {
     auth?: boolean;
 };
 export declare type FunctionCallMessage = [RequestTypes.Call, string, number, any?];
+export declare type TrackMessage = [RequestTypes.Track, TrackPayload];
 export declare type RequestMessage<T = GenericObject> = [
     (RequestTypes.Set | RequestTypes.Get | RequestTypes.Configuration | RequestTypes.GetConfiguration | RequestTypes.Delete | RequestTypes.Copy | RequestTypes.Digest),
     number,
     T
 ];
-export declare type TokenMessage = [RequestTypes.Token, string?];
+export declare type TokenMessage = [RequestTypes.Token, string?, boolean?];
 export declare type SubscribeMessage = [
     RequestTypes.Subscription,
     number,
@@ -101,3 +103,17 @@ export declare type RequestData = [
 ];
 export declare type AuthorizedData = [RequestTypes.Token, number[], boolean?];
 export declare type ResponseData = SubscriptionDiffData | SubscriptionData | RequestData | AuthorizedData;
+export declare type TrackPayload = {
+    t: string;
+    u?: 1;
+    s?: 1;
+    e?: 1;
+    r?: 1;
+    o?: TrackOpts;
+};
+export declare type TrackOpts = {
+    amount?: number;
+};
+export declare type SendTokenOptions = {
+    isBasedUser?: boolean;
+};

package/dist/types.js

@@ -32,5 +32,7 @@ var RequestTypes;
     RequestTypes[RequestTypes["Digest"] = 13] = "Digest";
     // eslint-disable-next-line
     RequestTypes[RequestTypes["Token"] = 14] = "Token";
+    // eslint-disable-next-line
+    RequestTypes[RequestTypes["Track"] = 15] = "Track";
 })(RequestTypes = exports.RequestTypes || (exports.RequestTypes = {}));
 //# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAQA,2BAA2B;AAC3B,IAAY,YA6BX;AA7BD,WAAY,YAAY;IACtB,2BAA2B;IAC3B,+DAAgB,CAAA;IAChB,2BAA2B;IAC3B,uEAAoB,CAAA;IACpB,2BAA2B;IAC3B,+EAAwB,CAAA;IACxB,2BAA2B;IAC3B,6DAAe,CAAA;IACf,2BAA2B;IAC3B,6CAAO,CAAA;IACP,2BAA2B;IAC3B,6CAAO,CAAA;IACP,2BAA2B;IAC3B,iEAAiB,CAAA;IACjB,2BAA2B;IAC3B,uEAAoB,CAAA;IACpB,2BAA2B;IAC3B,+CAAQ,CAAA;IACR,2BAA2B;IAC3B,sEAAoB,CAAA;IACpB,2BAA2B;IAC3B,oDAAW,CAAA;IACX,2BAA2B;IAC3B,gDAAS,CAAA;IACT,2BAA2B;IAC3B,oDAAW,CAAA;IACX,2BAA2B;IAC3B,kDAAU,CAAA;AACZ,CAAC,EA7BW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QA6BvB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAQA,2BAA2B;AAC3B,IAAY,YA+BX;AA/BD,WAAY,YAAY;IACtB,2BAA2B;IAC3B,+DAAgB,CAAA;IAChB,2BAA2B;IAC3B,uEAAoB,CAAA;IACpB,2BAA2B;IAC3B,+EAAwB,CAAA;IACxB,2BAA2B;IAC3B,6DAAe,CAAA;IACf,2BAA2B;IAC3B,6CAAO,CAAA;IACP,2BAA2B;IAC3B,6CAAO,CAAA;IACP,2BAA2B;IAC3B,iEAAiB,CAAA;IACjB,2BAA2B;IAC3B,uEAAoB,CAAA;IACpB,2BAA2B;IAC3B,+CAAQ,CAAA;IACR,2BAA2B;IAC3B,sEAAoB,CAAA;IACpB,2BAA2B;IAC3B,oDAAW,CAAA;IACX,2BAA2B;IAC3B,gDAAS,CAAA;IACT,2BAA2B;IAC3B,oDAAW,CAAA;IACX,2BAA2B;IAC3B,kDAAU,CAAA;IACV,2BAA2B;IAC3B,kDAAU,CAAA;AACZ,CAAC,EA/BW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QA+BvB"}

package/dist/websocket/index.js

@@ -5,31 +5,74 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const urlLoader_1 = __importDefault(require("./urlLoader"));
 const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
-const connect = (client, url, connection = {}, time = 0, reconnect = false) => {
+const activityListeners = new Map();
+let activeTimer;
+if (typeof window !== 'undefined') {
+    document.addEventListener('visibilitychange', function (event) {
+        clearTimeout(activeTimer);
+        if (document.hidden) {
+            activeTimer = setTimeout(() => {
+                activityListeners.forEach((fn) => {
+                    fn(false);
+                });
+            }, 30e3);
+        }
+        else {
+            activityListeners.forEach((fn) => {
+                fn(true);
+            });
+        }
+    });
+}
+const connect = (client, url, connection = {
+    destroy: () => {
+        console.info('remove');
+        activityListeners.delete(connection);
+    },
+}, time = 0, reconnect = false) => {
     (0, urlLoader_1.default)(url, (realUrl) => {
         setTimeout(() => {
             if (connection.disconnected) {
                 return;
             }
+            let isActive = true;
+            activityListeners.set(connection, (active) => {
+                if (!connection.disconnected) {
+                    if (!active && isActive) {
+                        console.warn('Send to background - close connection');
+                        isActive = false;
+                        client.onClose();
+                        ws.close();
+                    }
+                    else if (!isActive && active) {
+                        activityListeners.delete(connection);
+                        connect(client, url, connection, 0, true);
+                    }
+                }
+            });
             const ws = (connection.ws = new isomorphic_ws_1.default(realUrl));
             ws.onerror = () => { };
             ws.onmessage = (d) => client.onData(d);
             ws.onopen = () => {
-                if (connection.disconnected) {
-                    return;
-                }
-                time = 100;
-                if (reconnect) {
-                    client.onReconnect();
+                if (isActive) {
+                    if (connection.disconnected) {
+                        return;
+                    }
+                    time = 100;
+                    if (reconnect) {
+                        client.onReconnect();
+                    }
+                    client.onOpen();
                 }
-                client.onOpen();
             };
             ws.onclose = () => {
-                if (connection.disconnected) {
-                    return;
+                if (isActive) {
+                    if (connection.disconnected) {
+                        return;
+                    }
+                    client.onClose();
+                    connect(client, url, connection, Math.min(1250, Math.min(time + 500)), true);
                 }
-                client.onClose();
-                connect(client, url, connection, Math.min(1250, Math.min(time + 500)), true);
             };
         }, time);
     });

package/dist/websocket/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/websocket/index.ts"],"names":[],"mappings":";;;;;AAAA,4DAAmC;AAGnC,kEAAqC;AAErC,MAAM,OAAO,GAAG,CACd,MAAmB,EACnB,GAAqC,EACrC,aAAyB,EAAE,EAC3B,IAAI,GAAG,CAAC,EACR,SAAS,GAAG,KAAK,EACL,EAAE;IACd,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE;QACzB,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,UAAU,CAAC,YAAY,EAAE;gBAC3B,OAAM;aACP;YACD,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,EAAE,GAAG,IAAI,uBAAS,CAAC,OAAO,CAAC,CAAC,CAAA;YACnD,EAAE,CAAC,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,CAAA;YACrB,EAAE,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;YACtC,EAAE,CAAC,MAAM,GAAG,GAAG,EAAE;gBACf,IAAI,UAAU,CAAC,YAAY,EAAE;oBAC3B,OAAM;iBACP;gBACD,IAAI,GAAG,GAAG,CAAA;gBACV,IAAI,SAAS,EAAE;oBACb,MAAM,CAAC,WAAW,EAAE,CAAA;iBACrB;gBACD,MAAM,CAAC,MAAM,EAAE,CAAA;YACjB,CAAC,CAAA;YACD,EAAE,CAAC,OAAO,GAAG,GAAG,EAAE;gBAChB,IAAI,UAAU,CAAC,YAAY,EAAE;oBAC3B,OAAM;iBACP;gBACD,MAAM,CAAC,OAAO,EAAE,CAAA;gBAChB,OAAO,CACL,MAAM,EACN,GAAG,EACH,UAAU,EACV,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,EACpC,IAAI,CACL,CAAA;YACH,CAAC,CAAA;QACH,CAAC,EAAE,IAAI,CAAC,CAAA;IACV,CAAC,CAAC,CAAA;IACF,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAED,kBAAe,OAAO,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/websocket/index.ts"],"names":[],"mappings":"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"}

package/dist/websocket/types.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="ws" />
 import WebSocket from 'isomorphic-ws';
-export declare type Connection = {
+export declare class Connection {
     ws?: WebSocket;
     disconnected?: boolean;
-};
+    destroy: () => void;
+}

package/dist/websocket/types.js

@@ -1,3 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Connection = void 0;
+class Connection {
+}
+exports.Connection = Connection;
 //# sourceMappingURL=types.js.map

package/dist/websocket/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/websocket/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/websocket/types.ts"],"names":[],"mappings":";;;AAEA,MAAa,UAAU;CAItB;AAJD,gCAIC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/client",
-  "version": "0.2.1",
+  "version": "0.5.0",
   "main": "dist/index.js",
   "scripts": {
     "build": "yarn tsconfig && tsc -b",
@@ -8,8 +8,9 @@
     "test": "ava --timeout 1m --verbose",
     "watchTest": "ava --color --watch --verbose"
   },
+  "sideEffects": false,
   "dependencies": {
-    "@saulx/diff": "^1.0.4",
+    "@saulx/diff": "^1.1.3",
     "@saulx/hash": "^1.1.0",
     "@saulx/utils": "^2.0.1",
     "cross-fetch": "^3.1.4",
@@ -18,7 +19,7 @@
   },
   "ava": {
     "files": [
-      "test/**/*.ts"
+      "test/*.ts"
     ],
     "concurrency": 1,
     "extensions": [
@@ -32,8 +33,7 @@
     "@based/server": "*",
     "@based/tsconfig": "*",
     "@saulx/hash": "^1.1.0",
-    "@saulx/selva": "8.0.0",
-    "@saulx/selva-server": "8.0.0",
+    "@saulx/selva": "9.1.3",
     "@saulx/utils": "^2.0.1",
     "@types/node": "^16.3.1",
     "@types/ws": "^7.4.6",

package/dist/ index.d.ts

@@ -1,27 +0,0 @@
-import Emitter from './Emitter';
-declare type Subscription = {
-    type: 'subscribe';
-    query: any;
-    subscriptionId: number;
-    checksum?: number;
-};
-export declare class Connection extends Emitter {
-    currentUrl: string;
-    subscriptions: {
-        [subscriptionId: string]: (val: any) => void;
-    };
-    queue: Subscription[];
-    connect(): void;
-    disconnect(): void;
-    subscribe(): void;
-    unsubscribe(): void;
-    send(): void;
-    on(): void;
-    once(): void;
-    resendAllSubscriptions(): void;
-    addToQueue(): void;
-    drainQueue(): void;
-    clearQueue(): void;
-    idleTimeout(): void;
-}
-export {};

package/dist/ index.js

@@ -1,26 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Connection = void 0;
-const Emitter_1 = __importDefault(require("./Emitter"));
-// ---------------------------------------------
-class Connection extends Emitter_1.default {
-    // connect changes the url
-    connect() { }
-    disconnect() { }
-    subscribe() { }
-    unsubscribe() { }
-    send() { }
-    on() { }
-    once() { }
-    // internals
-    resendAllSubscriptions() { }
-    addToQueue() { }
-    drainQueue() { }
-    clearQueue() { }
-    idleTimeout() { }
-}
-exports.Connection = Connection;
-//# sourceMappingURL=%20index.js.map

package/dist/ index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":" index.js","sourceRoot":"","sources":["../src/ index.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA+B;AAgD/B,gDAAgD;AAEhD,MAAa,UAAW,SAAQ,iBAAO;IAOrC,0BAA0B;IAC1B,OAAO,KAAI,CAAC;IAEZ,UAAU,KAAI,CAAC;IAEf,SAAS,KAAI,CAAC;IAEd,WAAW,KAAI,CAAC;IAEhB,IAAI,KAAI,CAAC;IAET,EAAE,KAAI,CAAC;IAEP,IAAI,KAAI,CAAC;IAET,YAAY;IAEZ,sBAAsB,KAAI,CAAC;IAE3B,UAAU,KAAI,CAAC;IAEf,UAAU,KAAI,CAAC;IAEf,UAAU,KAAI,CAAC;IAEf,WAAW,KAAI,CAAC;CACjB;AAjCD,gCAiCC"}

package/dist/connection/ index.d.ts

@@ -1,27 +0,0 @@
-import Emitter from './Emitter';
-declare type Subscription = {
-    type: 'subscribe';
-    query: any;
-    subscriptionId: number;
-    checksum?: number;
-};
-export declare class Connection extends Emitter {
-    currentUrl: string;
-    subscriptions: {
-        [subscriptionId: string]: (val: any) => void;
-    };
-    queue: Subscription[];
-    connect(): void;
-    disconnect(): void;
-    subscribe(): void;
-    unsubscribe(): void;
-    send(): void;
-    on(): void;
-    once(): void;
-    resendAllSubscriptions(): void;
-    addToQueue(): void;
-    drainQueue(): void;
-    clearQueue(): void;
-    idleTimeout(): void;
-}
-export {};

package/dist/connection/ index.js

@@ -1,26 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Connection = void 0;
-const Emitter_1 = __importDefault(require("./Emitter"));
-// ---------------------------------------------
-class Connection extends Emitter_1.default {
-    // connect changes the url
-    connect() { }
-    disconnect() { }
-    subscribe() { }
-    unsubscribe() { }
-    send() { }
-    on() { }
-    once() { }
-    // internals
-    resendAllSubscriptions() { }
-    addToQueue() { }
-    drainQueue() { }
-    clearQueue() { }
-    idleTimeout() { }
-}
-exports.Connection = Connection;
-//# sourceMappingURL=%20index.js.map

package/dist/connection/ index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":" index.js","sourceRoot":"","sources":["../../src/connection/ index.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA+B;AAgD/B,gDAAgD;AAEhD,MAAa,UAAW,SAAQ,iBAAO;IAOrC,0BAA0B;IAC1B,OAAO,KAAI,CAAC;IAEZ,UAAU,KAAI,CAAC;IAEf,SAAS,KAAI,CAAC;IAEd,WAAW,KAAI,CAAC;IAEhB,IAAI,KAAI,CAAC;IAET,EAAE,KAAI,CAAC;IAEP,IAAI,KAAI,CAAC;IAET,YAAY;IAEZ,sBAAsB,KAAI,CAAC;IAE3B,UAAU,KAAI,CAAC;IAEf,UAAU,KAAI,CAAC;IAEf,UAAU,KAAI,CAAC;IAEf,WAAW,KAAI,CAAC;CACjB;AAjCD,gCAiCC"}

package/dist/connection/emitter.d.ts

@@ -1,9 +0,0 @@
-declare class Emitter {
-    listeners: {};
-    emit(type: string, val: any): void;
-    on(type: string, fn: (val: any) => void): void;
-    removeAllListeners(type?: string): void;
-    once(type: string, fn: (val: any) => void): void;
-    removeListener(type: string, fn: (val: any) => void): void;
-}
-export default Emitter;

package/dist/connection/emitter.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class Emitter {
-    constructor() {
-        this.listeners = {};
-    }
-    emit(type, val) {
-        if (this.listeners[type]) {
-            this.listeners[type].forEach((fn) => fn(val));
-        }
-    }
-    on(type, fn) {
-        if (!this.listeners[type]) {
-            this.listeners[type] = [];
-        }
-        this.listeners[type].push(fn);
-    }
-    removeAllListeners(type) { }
-    once(type, fn) { }
-    removeListener(type, fn) {
-        const listeners = this.listeners[type];
-        if (listeners) {
-            if (!fn) {
-                delete this.listeners[type];
-            }
-            else {
-                for (let i = 0, len = listeners.length; i < len; i++) {
-                    if (listeners[i] === fn) {
-                        listeners.splice(i, 1);
-                        break;
-                    }
-                }
-            }
-        }
-    }
-}
-exports.default = Emitter;
-//# sourceMappingURL=Emitter.js.map

package/dist/connection/emitter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Emitter.js","sourceRoot":"","sources":["../../src/connection/Emitter.ts"],"names":[],"mappings":";;AAAA,MAAM,OAAO;IAAb;QACE,cAAS,GAAG,EAAE,CAAA;IAkChB,CAAC;IAhCC,IAAI,CAAC,IAAY,EAAE,GAAQ;QACzB,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YACxB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;SAC9C;IACH,CAAC;IAED,EAAE,CAAC,IAAY,EAAE,EAAsB;QACrC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YACzB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;SAC1B;QACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAC/B,CAAC;IAED,kBAAkB,CAAC,IAAa,IAAG,CAAC;IAEpC,IAAI,CAAC,IAAY,EAAE,EAAsB,IAAG,CAAC;IAE7C,cAAc,CAAC,IAAY,EAAE,EAAsB;QACjD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,SAAS,EAAE;YACb,IAAI,CAAC,EAAE,EAAE;gBACP,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;aAC5B;iBAAM;gBACL,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;oBACpD,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE;wBACvB,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;wBACtB,MAAK;qBACN;iBACF;aACF;SACF;IACH,CAAC;CACF;AAED,kBAAe,OAAO,CAAA"}

package/dist/connection/index.d.ts

@@ -1 +0,0 @@
-export declare const connect: (hub: any, url: any) => void;

package/dist/connection/index.js

@@ -1,37 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.connect = void 0;
-const socket_1 = __importDefault(require("./socket"));
-// const isConnected = hub => {
-//   const socket = hub.socket
-//   const isConnected = new Promise(resolve => {
-//     if (hub.socket.connected) {
-//       resolve(true)
-//     } else {
-//       const isConnected = () => {
-//         resolve(true)
-//         socket.removeListener('open', isConnected)
-//       }
-//       socket.on('open', isConnected)
-//     }
-//   })
-//   return isConnected
-// }
-const connect = (hub, url) => {
-    if (hub.socket) {
-        // change url does not work well - let mak it work ;)
-        if (url !== hub.socket.url && hub._url !== url) {
-            hub.socket.changeUrl(url);
-        }
-    }
-    else {
-        hub.socket = new socket_1.default(hub, url);
-    }
-    hub._url = url;
-    // return isConnected(hub)
-};
-exports.connect = connect;
-//# sourceMappingURL=index.js.map

package/dist/connection/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/connection/index.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAE7B,+BAA+B;AAC/B,8BAA8B;AAC9B,iDAAiD;AACjD,kCAAkC;AAClC,sBAAsB;AACtB,eAAe;AACf,oCAAoC;AACpC,wBAAwB;AACxB,qDAAqD;AACrD,UAAU;AACV,uCAAuC;AACvC,QAAQ;AACR,OAAO;AACP,uBAAuB;AACvB,IAAI;AAEG,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAClC,IAAI,GAAG,CAAC,MAAM,EAAE;QACd,qDAAqD;QACrD,IAAI,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE;YAC9C,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;SAC1B;KACF;SAAM;QACL,GAAG,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;KAClC;IACD,GAAG,CAAC,IAAI,GAAG,GAAG,CAAA;IACd,0BAA0B;AAC5B,CAAC,CAAA;AAXY,QAAA,OAAO,WAWnB"}

package/dist/connection/messages.d.ts

@@ -1,34 +0,0 @@
-declare type Subscription = {
-    type: 'subscribe';
-    query: any;
-    subscriptionId: number;
-    checksum?: number;
-};
-declare type UnSubscribe = {
-    type: 'unsubscribe';
-    subscriptionId: number;
-};
-declare type ResendSubscriptionChecksum = {
-    subscriptionId: number;
-    checksum?: number;
-};
-declare type Set = {
-    type: 'set';
-    payload: {};
-    reqId: number;
-};
-declare type Get = {
-    type: 'get';
-    query: any;
-    getId: number;
-};
-declare type UpdateSchema = {
-    type: 'updateSchema';
-    payload: {};
-    reqId: number;
-};
-declare type GetSchema = {
-    type: 'getSchema';
-    reqId: number;
-};
-declare type Ping = '1';

package/dist/connection/messages.js

@@ -1,2 +0,0 @@
-// ---------------------------------------------
-//# sourceMappingURL=messages.js.map

package/dist/connection/messages.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/connection/messages.ts"],"names":[],"mappings":"AA2CA,gDAAgD"}

package/dist/connection/socket.js

@@ -1 +0,0 @@
-//# sourceMappingURL=socket.js.map

package/dist/connection/socket.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../src/connection/socket.ts"],"names":[],"mappings":""}

package/dist/connection/websocket/browser.d.ts

@@ -1,3 +0,0 @@
-declare const maxReconnectionTime = 3000;
-declare const urlLoader: any;
-declare const connect: (holder: any, socket: any, url: any, time?: number, reconnect?: boolean) => any;