@based/server 4.0.0 → 4.0.2

package/dist/incoming/ws/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/incoming/ws/index.ts"],"names":[],"mappings":";;;AACA,6CAAwD;AACxD,yCAA4C;AAC5C,6CAAmE;AACnE,iCAAoC;AACpC,+BAAkC;AAElC,uCAAyD;AAEzD,MAAM,MAAM,GAAG,CACb,MAAmB,EACnB,GAA8B,EAC9B,GAAe,EACf,KAAa,EACL,EAAE;IACV,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAA,uBAAY,EAAC,IAAA,oBAAS,EAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IACvE,MAAM,IAAI,GAAG,GAAG,GAAG,KAAK,CAAA;IAExB,oBAAoB;IACpB,IAAI,IAAI,KAAK,CAAC,IAAI,IAAA,0BAAe,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE;QAC1E,OAAO,IAAI,CAAA;KACZ;IAED,qBAAqB;IACrB,IAAI,IAAI,KAAK,CAAC,IAAI,IAAA,6BAAgB,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE;QAC3E,OAAO,IAAI,CAAA;KACZ;IAED,uBAAuB;IACvB,IAAI,IAAI,KAAK,CAAC,IAAI,IAAA,+BAAkB,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE;QAC7D,OAAO,IAAI,CAAA;KACZ;IAED,eAAe;IACf,IAAI,IAAI,KAAK,CAAC,IAAI,IAAA,gBAAU,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE;QACrE,OAAO,IAAI,CAAA;KACZ;IAED,gBAAgB;IAChB,IAAI,IAAI,KAAK,CAAC,IAAI,IAAA,kBAAW,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE;QACtE,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAEM,MAAM,OAAO,GAAG,CACrB,MAAmB,EACnB,GAA8B,EAC9B,GAAgB,EAChB,QAAiB,EACjB,EAAE;IACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,gBAAgB,EAAE;YACxD,MAAM,EAAE,GAAG;SACZ,CAAC,CAAA;QACF,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;QACnB,OAAM;KACP;IAED,iDAAiD;IACjD,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAA;IACrC,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAA;IAC5B,IAAI,IAAI,GAAG,CAAC,CAAA;IACZ,OAAO,IAAI,GAAG,GAAG,EAAE;QACjB,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;QAC9C,IAAI,CAAC,KAAK,SAAS,EAAE;YACnB,8DAA8D;YAC9D,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;YACnB,OAAM;SACP;QACD,IAAI,GAAG,CAAC,CAAA;KACT;AACH,CAAC,CAAA;AA9BY,QAAA,OAAO,WA8BnB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/incoming/ws/index.ts"],"names":[],"mappings":";;;AACA,6CAAwD;AACxD,yCAA4C;AAC5C,6CAAmE;AACnE,iCAAoC;AACpC,+BAAkC;AAElC,uCAAyD;AAEzD,MAAM,MAAM,GAAG,CACb,MAAmB,EACnB,GAA8B,EAC9B,GAAe,EACf,KAAa,EACL,EAAE;IACV,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAA,uBAAY,EAAC,IAAA,oBAAS,EAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IACvE,MAAM,IAAI,GAAG,GAAG,GAAG,KAAK,CAAA;IAExB,oBAAoB;IACpB,IAAI,IAAI,KAAK,CAAC,IAAI,IAAA,0BAAe,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE;QAC1E,OAAO,IAAI,CAAA;KACZ;IAED,qBAAqB;IACrB,IAAI,IAAI,KAAK,CAAC,IAAI,IAAA,6BAAgB,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE;QAC3E,OAAO,IAAI,CAAA;KACZ;IAED,uBAAuB;IACvB,IACE,IAAI,KAAK,CAAC;QACV,IAAA,+BAAkB,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAC3D;QACA,OAAO,IAAI,CAAA;KACZ;IAED,eAAe;IACf,IAAI,IAAI,KAAK,CAAC,IAAI,IAAA,gBAAU,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE;QACrE,OAAO,IAAI,CAAA;KACZ;IAED,gBAAgB;IAChB,IAAI,IAAI,KAAK,CAAC,IAAI,IAAA,kBAAW,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE;QACtE,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAEM,MAAM,OAAO,GAAG,CACrB,MAAmB,EACnB,GAA8B,EAC9B,GAAgB,EAChB,QAAiB,EACjB,EAAE;IACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,gBAAgB,EAAE;YACxD,MAAM,EAAE,GAAG;SACZ,CAAC,CAAA;QACF,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;QACnB,OAAM;KACP;IAED,iDAAiD;IACjD,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAA;IACrC,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAA;IAC5B,IAAI,IAAI,GAAG,CAAC,CAAA;IACZ,OAAO,IAAI,GAAG,GAAG,EAAE;QACjB,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;QAC9C,IAAI,CAAC,KAAK,SAAS,EAAE;YACnB,8DAA8D;YAC9D,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;YACnB,OAAM;SACP;QACD,IAAI,GAAG,CAAC,CAAA;KACT;AACH,CAAC,CAAA;AA9BY,QAAA,OAAO,WA8BnB"}

package/dist/incoming/ws/observable.d.ts

@@ -1,6 +1,7 @@
-import { BasedServer } from '../../server';
-import { WebSocketSession, Context } from '../../context';
-import { BasedFunctionRoute } from '../../functions';
-export declare const enableSubscribe: (server: BasedServer, ctx: Context<WebSocketSession>, id: number, checksum: number, name: string, payload: any, route: BasedFunctionRoute) => void;
-export declare const subscribeMessage: (arr: Uint8Array, start: number, len: number, isDeflate: boolean, ctx: Context<WebSocketSession>, server: BasedServer) => boolean;
-export declare const unsubscribeMessage: (arr: Uint8Array, start: number, ctx: Context<WebSocketSession>, server: BasedServer) => boolean;
+import { WebSocketSession } from '@based/functions';
+import { BasedQueryFunctionRoute } from '../../functions';
+import { IsAuthorizedHandler } from '../../authorize';
+import { BinaryMessageHandler } from './types';
+export declare const enableSubscribe: IsAuthorizedHandler<WebSocketSession, BasedQueryFunctionRoute>;
+export declare const subscribeMessage: BinaryMessageHandler;
+export declare const unsubscribeMessage: BinaryMessageHandler;

package/dist/incoming/ws/observable.js

@@ -6,31 +6,35 @@ const observable_1 = require("../../observable");
 const error_1 = require("../../error");
 const sendError_1 = require("../../sendError");
 const security_1 = require("../../security");
-const enableSubscribe = (server, ctx, id, checksum, name, payload, route) => {
+const verifyRoute_1 = require("../../verifyRoute");
+const installFn_1 = require("../../installFn");
+const authorize_1 = require("../../authorize");
+const enableSubscribe = (route, server, ctx, payload, id, checksum) => {
     if ((0, observable_1.hasObs)(server, id)) {
         (0, observable_1.subscribeWs)(server, id, checksum, ctx);
         return;
     }
-    server.functions
-        .install(name)
-        .then((spec) => {
-        if (!(0, observable_1.verifyRoute)(server, name, spec, ctx)) {
-            return;
-        }
-        if (!ctx.session?.obs.has(id)) {
+    // TODO: big perf optmization possible here (only return a promise if its not there)
+    (0, installFn_1.installFn)(server, ctx, route, id).then((spec) => {
+        if (spec === null || !ctx.session.obs.has(id)) {
             return;
         }
         if (!(0, observable_1.hasObs)(server, id)) {
-            (0, observable_1.createObs)(server, name, id, payload);
+            (0, observable_1.createObs)(server, route.name, id, payload);
         }
         ctx.session.subscribe(String(id));
         (0, observable_1.subscribeWs)(server, id, checksum, ctx);
-    })
-        .catch(() => {
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, route);
     });
 };
 exports.enableSubscribe = enableSubscribe;
+const isNotAuthorized = (route, server, ctx, payload, id, checksum) => {
+    ctx.session.unauthorizedObs.add({
+        id,
+        checksum,
+        name: route.name,
+        payload,
+    });
+};
 const subscribeMessage = (arr, start, len, isDeflate, ctx, server) => {
     // | 4 header | 8 id | 8 checksum | 1 name length | * name | * payload |
     const nameLen = arr[start + 20];
@@ -40,9 +44,9 @@ const subscribeMessage = (arr, start, len, isDeflate, ctx, server) => {
     if (!name || !id) {
         return false;
     }
-    const route = (0, observable_1.verifyRoute)(server, name, server.functions.route(name), ctx);
+    const route = (0, verifyRoute_1.verifyRoute)(server, ctx, 'query', server.functions.route(name), name, id);
     // TODO: add strictness setting - if strict return false here
-    if (!route) {
+    if (route === null) {
         return true;
     }
     if ((0, security_1.rateLimitRequest)(server, ctx, route.rateLimitTokens, server.rateLimit.ws)) {
@@ -50,51 +54,23 @@ const subscribeMessage = (arr, start, len, isDeflate, ctx, server) => {
         return false;
     }
     if (route.maxPayloadSize !== -1 && len > route.maxPayloadSize) {
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, route);
+        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, {
+            route,
+            observableId: id,
+        });
         return true;
     }
     if (ctx.session?.obs.has(id)) {
         // allready subscribed to this id
         return true;
     }
-    const payload = (0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 21 + nameLen, start + len)), isDeflate);
+    const payload = (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 21 + nameLen, start + len)), isDeflate));
     ctx.session.obs.add(id);
-    if (route.public === true) {
-        (0, exports.enableSubscribe)(server, ctx, id, checksum, name, payload, route);
-        return true;
-    }
-    server.auth
-        .authorize(ctx, name, payload)
-        .then((ok) => {
-        if (!ctx.session?.obs.has(id)) {
-            return;
-        }
-        if (!ok) {
-            ctx.session.unauthorizedObs.add({
-                id,
-                checksum,
-                name,
-                payload,
-            });
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.AuthorizeRejectedError, {
-                route,
-                observableId: id,
-            });
-            return;
-        }
-        (0, exports.enableSubscribe)(server, ctx, id, checksum, name, payload, route);
-    })
-        .catch((err) => {
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.AuthorizeFunctionError, {
-            route,
-            observableId: id,
-            err,
-        });
-    });
+    (0, authorize_1.authorize)(route, server, ctx, payload, exports.enableSubscribe, id, checksum, isNotAuthorized);
     return true;
 };
 exports.subscribeMessage = subscribeMessage;
-const unsubscribeMessage = (arr, start, ctx, server) => {
+const unsubscribeMessage = (arr, start, len, isDeflate, ctx, server) => {
     // | 4 header | 8 id |
     if (!ctx.session) {
         return false;

package/dist/incoming/ws/observable.js.map

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

package/dist/incoming/ws/types.d.ts

@@ -0,0 +1,3 @@
+import { BasedServer } from '../../server';
+import { WebSocketSession, Context } from '@based/functions';
+export declare type BinaryMessageHandler = (arr: Uint8Array, start: number, len: number, isDeflate: boolean, ctx: Context<WebSocketSession>, server: BasedServer) => boolean;

package/dist/{auth → incoming/ws}/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/auth/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/incoming/ws/types.ts"],"names":[],"mappings":""}

package/dist/index.d.ts

@@ -5,7 +5,8 @@ export default createServer;
 export { compress } from './compress';
 export { sendHttpResponse } from './sendHttpResponse';
 export { sendError } from './sendError';
-export * from './auth/types';
+export { createSimpleServer } from './createSimpleServer';
 export * from './functions/types';
 export * from './error';
-export * from './api';
+export * from './functionApi';
+export * from './observable/types';

package/dist/index.js

@@ -14,7 +14,7 @@ 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);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendError = exports.sendHttpResponse = exports.compress = exports.BasedServer = void 0;
+exports.createSimpleServer = exports.sendError = exports.sendHttpResponse = exports.compress = exports.BasedServer = void 0;
 const server_1 = require("./server");
 Object.defineProperty(exports, "BasedServer", { enumerable: true, get: function () { return server_1.BasedServer; } });
 const createServer = async (props, sharedSocket) => {
@@ -29,8 +29,10 @@ var sendHttpResponse_1 = require("./sendHttpResponse");
 Object.defineProperty(exports, "sendHttpResponse", { enumerable: true, get: function () { return sendHttpResponse_1.sendHttpResponse; } });
 var sendError_1 = require("./sendError");
 Object.defineProperty(exports, "sendError", { enumerable: true, get: function () { return sendError_1.sendError; } });
-__exportStar(require("./auth/types"), exports);
+var createSimpleServer_1 = require("./createSimpleServer");
+Object.defineProperty(exports, "createSimpleServer", { enumerable: true, get: function () { return createSimpleServer_1.createSimpleServer; } });
 __exportStar(require("./functions/types"), exports);
 __exportStar(require("./error"), exports);
-__exportStar(require("./api"), exports);
+__exportStar(require("./functionApi"), exports);
+__exportStar(require("./observable/types"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qCAAqD;AAU5C,4FAVA,oBAAW,OAUA;AARpB,MAAM,YAAY,GAAG,KAAK,EACxB,KAAoB,EACpB,YAAsB,EACA,EAAE;IACxB,MAAM,WAAW,GAAG,IAAI,oBAAW,CAAC,KAAK,CAAC,CAAA;IAC1C,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;AAC/E,CAAC,CAAA;AAID,kBAAe,YAAY,CAAA;AAE3B,uBAAuB;AACvB,uCAAqC;AAA5B,oGAAA,QAAQ,OAAA;AACjB,uDAAqD;AAA5C,oHAAA,gBAAgB,OAAA;AACzB,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAElB,+CAA4B;AAC5B,oDAAiC;AACjC,0CAAuB;AACvB,wCAAqB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qCAAqD;AAU5C,4FAVA,oBAAW,OAUA;AARpB,MAAM,YAAY,GAAG,KAAK,EACxB,KAAoB,EACpB,YAAsB,EACA,EAAE;IACxB,MAAM,WAAW,GAAG,IAAI,oBAAW,CAAC,KAAK,CAAC,CAAA;IAC1C,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;AAC/E,CAAC,CAAA;AAID,kBAAe,YAAY,CAAA;AAE3B,uBAAuB;AACvB,uCAAqC;AAA5B,oGAAA,QAAQ,OAAA;AACjB,uDAAqD;AAA5C,oHAAA,gBAAgB,OAAA;AACzB,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,2DAAyD;AAAhD,wHAAA,kBAAkB,OAAA;AAE3B,oDAAiC;AACjC,0CAAuB;AACvB,gDAA6B;AAC7B,qDAAkC"}

package/dist/installFn.d.ts

@@ -0,0 +1,4 @@
+import { BasedRoute, BasedSpec } from './functions';
+import { BasedServer } from './server';
+import { Context } from '@based/functions';
+export declare const installFn: <R extends BasedRoute>(server: BasedServer, ctx: Context, route: R, id?: number) => Promise<BasedSpec<R>>;

package/dist/installFn.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.installFn = void 0;
+const functions_1 = require("./functions");
+const functions_2 = require("@based/functions");
+const sendError_1 = require("./sendError");
+const error_1 = require("./error");
+const functionNotFound = (server, ctx, route, isQuery, id) => {
+    if (!(0, functions_2.isClientContext)(ctx)) {
+        return;
+    }
+    if (isQuery) {
+        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, {
+            route,
+            requestId: id,
+        });
+        return;
+    }
+    (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, {
+        route,
+        requestId: id,
+    });
+};
+const installFn = async (server, ctx, route, id) => {
+    const isQuery = (0, functions_1.isQueryFunctionRoute)(route);
+    const isStream = !isQuery && (0, functions_1.isStreamFunctionRoute)(route);
+    try {
+        const spec = await server.functions.install(route.name);
+        if (!ctx.session) {
+            return null;
+        }
+        if (spec === null) {
+            functionNotFound(server, ctx, route, isQuery, id);
+            return null;
+        }
+        if (isQuery && !(0, functions_1.isQueryFunctionSpec)(spec)) {
+            if (!(0, functions_2.isClientContext)(ctx)) {
+                return null;
+            }
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsNotObservable, {
+                route,
+                observableId: id,
+            });
+            return null;
+        }
+        if (isStream && !(0, functions_1.isStreamFunctionSpec)(spec)) {
+            if (!(0, functions_2.isClientContext)(ctx)) {
+                return null;
+            }
+            if ((0, functions_1.isQueryFunctionSpec)(spec)) {
+                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.CannotStreamToObservableFunction, {
+                    route,
+                    requestId: id,
+                });
+                return null;
+            }
+            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsNotStream, {
+                route,
+                requestId: id,
+            });
+            return null;
+        }
+        if (!isStream && !isQuery) {
+            if ((0, functions_1.isQueryFunctionSpec)(spec)) {
+                if (!(0, functions_2.isClientContext)(ctx)) {
+                    return null;
+                }
+                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsObservable, {
+                    route,
+                    requestId: id,
+                });
+                return null;
+            }
+            if ((0, functions_1.isStreamFunctionSpec)(spec)) {
+                if (!(0, functions_2.isClientContext)(ctx)) {
+                    return null;
+                }
+                (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsStream, {
+                    route,
+                    requestId: id,
+                });
+                return null;
+            }
+        }
+        // @ts-ignore fixed by chekcing the specs
+        return spec;
+    }
+    catch (err) {
+        functionNotFound(server, ctx, route, isQuery, id);
+    }
+    return null;
+};
+exports.installFn = installFn;
+//# sourceMappingURL=installFn.js.map

package/dist/installFn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"installFn.js","sourceRoot":"","sources":["../src/installFn.ts"],"names":[],"mappings":";;;AAAA,2CAOoB;AAEpB,gDAA2D;AAC3D,2CAAuC;AACvC,mCAAwC;AAExC,MAAM,gBAAgB,GAAG,CACvB,MAAmB,EACnB,GAAY,EACZ,KAAiB,EACjB,OAAgB,EAChB,EAAW,EACX,EAAE;IACF,IAAI,CAAC,IAAA,2BAAe,EAAC,GAAG,CAAC,EAAE;QACzB,OAAM;KACP;IACD,IAAI,OAAO,EAAE;QACX,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,gBAAgB,EAAE;YACtD,KAAK;YACL,SAAS,EAAE,EAAE;SACd,CAAC,CAAA;QACF,OAAM;KACP;IACD,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,gBAAgB,EAAE;QACtD,KAAK;QACL,SAAS,EAAE,EAAE;KACd,CAAC,CAAA;AACJ,CAAC,CAAA;AAEM,MAAM,SAAS,GAAG,KAAK,EAC5B,MAAmB,EACnB,GAAY,EACZ,KAAQ,EACR,EAAW,EACmB,EAAE;IAChC,MAAM,OAAO,GAAG,IAAA,gCAAoB,EAAC,KAAK,CAAC,CAAA;IAC3C,MAAM,QAAQ,GAAG,CAAC,OAAO,IAAI,IAAA,iCAAqB,EAAC,KAAK,CAAC,CAAA;IACzD,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACvD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAChB,OAAO,IAAI,CAAA;SACZ;QACD,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;YACjD,OAAO,IAAI,CAAA;SACZ;QAED,IAAI,OAAO,IAAI,CAAC,IAAA,+BAAmB,EAAC,IAAI,CAAC,EAAE;YACzC,IAAI,CAAC,IAAA,2BAAe,EAAC,GAAG,CAAC,EAAE;gBACzB,OAAO,IAAI,CAAA;aACZ;YACD,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,uBAAuB,EAAE;gBAC7D,KAAK;gBACL,YAAY,EAAE,EAAE;aACjB,CAAC,CAAA;YACF,OAAO,IAAI,CAAA;SACZ;QACD,IAAI,QAAQ,IAAI,CAAC,IAAA,gCAAoB,EAAC,IAAI,CAAC,EAAE;YAC3C,IAAI,CAAC,IAAA,2BAAe,EAAC,GAAG,CAAC,EAAE;gBACzB,OAAO,IAAI,CAAA;aACZ;YACD,IAAI,IAAA,+BAAmB,EAAC,IAAI,CAAC,EAAE;gBAC7B,IAAA,qBAAS,EACP,MAAM,EACN,GAAG,EACH,sBAAc,CAAC,gCAAgC,EAC/C;oBACE,KAAK;oBACL,SAAS,EAAE,EAAE;iBACd,CACF,CAAA;gBACD,OAAO,IAAI,CAAA;aACZ;YACD,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,mBAAmB,EAAE;gBACzD,KAAK;gBACL,SAAS,EAAE,EAAE;aACd,CAAC,CAAA;YACF,OAAO,IAAI,CAAA;SACZ;QACD,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,EAAE;YACzB,IAAI,IAAA,+BAAmB,EAAC,IAAI,CAAC,EAAE;gBAC7B,IAAI,CAAC,IAAA,2BAAe,EAAC,GAAG,CAAC,EAAE;oBACzB,OAAO,IAAI,CAAA;iBACZ;gBACD,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,oBAAoB,EAAE;oBAC1D,KAAK;oBACL,SAAS,EAAE,EAAE;iBACd,CAAC,CAAA;gBACF,OAAO,IAAI,CAAA;aACZ;YACD,IAAI,IAAA,gCAAoB,EAAC,IAAI,CAAC,EAAE;gBAC9B,IAAI,CAAC,IAAA,2BAAe,EAAC,GAAG,CAAC,EAAE;oBACzB,OAAO,IAAI,CAAA;iBACZ;gBACD,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,gBAAgB,EAAE;oBACtD,KAAK;oBACL,SAAS,EAAE,EAAE;iBACd,CAAC,CAAA;gBACF,OAAO,IAAI,CAAA;aACZ;SACF;QACD,yCAAyC;QACzC,OAAO,IAAI,CAAA;KACZ;IAAC,OAAO,GAAG,EAAE;QACZ,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;KAClD;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AA9EY,QAAA,SAAS,aA8ErB"}

package/dist/observable/create.d.ts

@@ -1,3 +1,3 @@
 import { BasedServer } from '../server';
 import { ActiveObservable } from './types';
-export declare const createObs: (server: BasedServer, name: string, id: number, payload: any) => ActiveObservable;
+export declare const createObs: (server: BasedServer, name: string, id: number, payload: any, noStart?: boolean) => ActiveObservable;

package/dist/observable/create.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createObs = void 0;
 const start_1 = require("./start");
 const get_1 = require("./get");
-const createObs = (server, name, id, payload) => {
+const createObs = (server, name, id, payload, noStart) => {
     if ((0, get_1.hasObs)(server, id)) {
         const msg = `Allready has observable ${name} ${id}`;
         console.error(msg);
@@ -17,12 +17,16 @@ const createObs = (server, name, id, payload) => {
         id,
         name,
         isDestroyed: false,
+        startId: 0,
     };
     if (!server.activeObservables[name]) {
         server.activeObservables[name] = new Map();
     }
     server.activeObservables[name].set(id, obs);
     server.activeObservablesById.set(id, obs);
+    if (noStart) {
+        return obs;
+    }
     (0, start_1.start)(server, id);
     return obs;
 };

package/dist/observable/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/observable/create.ts"],"names":[],"mappings":";;;AAEA,mCAA+B;AAC/B,+BAA8B;AAEvB,MAAM,SAAS,GAAG,CACvB,MAAmB,EACnB,IAAY,EACZ,EAAU,EACV,OAAY,EACM,EAAE;IACpB,IAAI,IAAA,YAAM,EAAC,MAAM,EAAE,EAAE,CAAC,EAAE;QACtB,MAAM,GAAG,GAAG,2BAA2B,IAAI,IAAI,EAAE,EAAE,CAAA;QACnD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAClB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;KACrB;IAED,MAAM,GAAG,GAAqB;QAC5B,OAAO;QACP,WAAW,EAAE,KAAK;QAClB,OAAO,EAAE,IAAI,GAAG,EAAE;QAClB,sBAAsB,EAAE,IAAI,GAAG,EAAE;QACjC,EAAE;QACF,IAAI;QACJ,WAAW,EAAE,KAAK;KACnB,CAAA;IAED,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE;QACnC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,EAAE,CAAA;KAC3C;IAED,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;IAC3C,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;IAEzC,IAAA,aAAK,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAEjB,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAhCY,QAAA,SAAS,aAgCrB"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/observable/create.ts"],"names":[],"mappings":";;;AAEA,mCAA+B;AAC/B,+BAA8B;AAEvB,MAAM,SAAS,GAAG,CACvB,MAAmB,EACnB,IAAY,EACZ,EAAU,EACV,OAAY,EACZ,OAAiB,EACC,EAAE;IACpB,IAAI,IAAA,YAAM,EAAC,MAAM,EAAE,EAAE,CAAC,EAAE;QACtB,MAAM,GAAG,GAAG,2BAA2B,IAAI,IAAI,EAAE,EAAE,CAAA;QACnD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAClB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;KACrB;IAED,MAAM,GAAG,GAAqB;QAC5B,OAAO;QACP,WAAW,EAAE,KAAK;QAClB,OAAO,EAAE,IAAI,GAAG,EAAE;QAClB,sBAAsB,EAAE,IAAI,GAAG,EAAE;QACjC,EAAE;QACF,IAAI;QACJ,WAAW,EAAE,KAAK;QAClB,OAAO,EAAE,CAAC;KACX,CAAA;IAED,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE;QACnC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,EAAE,CAAA;KAC3C;IAED,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;IAC3C,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;IAEzC,IAAI,OAAO,EAAE;QACX,OAAO,GAAG,CAAA;KACX;IAED,IAAA,aAAK,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACjB,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AArCY,QAAA,SAAS,aAqCrB"}

package/dist/observable/destroy.js

@@ -21,7 +21,7 @@ const destroyObs = (server, id) => {
         return;
     }
     const spec = server.functions.specs[obs.name];
-    if (!spec || !(0, functions_1.isObservableFunctionSpec)(spec)) {
+    if (!spec || !(0, functions_1.isQueryFunctionSpec)(spec)) {
         console.warn('Cannot find observable function spec!', obs.name);
         return;
     }

package/dist/observable/destroy.js.map

@@ -1 +1 @@
-{"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../src/observable/destroy.ts"],"names":[],"mappings":";;;AAAA,4CAAuD;AAGhD,MAAM,UAAU,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAE,EAAE;IAC5D,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEhD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,EAAE,iBAAiB,CAAC,CAAA;QAClD,OAAM;KACP;IAED,IAAI,GAAG,CAAC,WAAW,EAAE;QACnB,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QACjD,OAAM;KACP;IAED,IACE,GAAG,CAAC,OAAO,CAAC,IAAI;QAChB,GAAG,CAAC,sBAAsB,CAAC,IAAI;QAC/B,GAAG,CAAC,UAAU,EAAE,IAAI,EACpB;QACA,IAAI,GAAG,CAAC,cAAc,EAAE;YACtB,OAAO,CAAC,IAAI,CACV,sEAAsE,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE,EAAE,EAC1F,GAAG,CAAC,OAAO,CACZ,CAAA;SACF;QACD,OAAM;KACP;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAE7C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,oCAAwB,EAAC,IAAI,CAAC,EAAE;QAC5C,OAAO,CAAC,IAAI,CAAC,uCAAuC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QAC/D,OAAM;KACP;IAED,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE;QACvB,MAAM,eAAe,GACnB,IAAI,CAAC,eAAe,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAA;QAEjE,GAAG,CAAC,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE;YACnC,2EAA2E;YAC3E,GAAG,CAAC,cAAc,GAAG,IAAI,CAAA;YACzB,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBACvC,OAAO,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAA;gBAC/D,MAAM,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;gBACvC,OAAM;aACP;YACD,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YAC7C,IAAI,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,EAAE;gBACjD,OAAO,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;aAC1C;YACD,MAAM,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACvC,GAAG,CAAC,WAAW,GAAG,IAAI,CAAA;YACtB,IAAI,GAAG,CAAC,aAAa,EAAE;gBACrB,GAAG,CAAC,aAAa,EAAE,CAAA;aACpB;QACH,CAAC,EAAE,eAAe,CAAC,CAAA;KACpB;AACH,CAAC,CAAA;AAzDY,QAAA,UAAU,cAyDtB"}
+{"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../src/observable/destroy.ts"],"names":[],"mappings":";;;AAAA,4CAAkD;AAG3C,MAAM,UAAU,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAE,EAAE;IAC5D,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEhD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,EAAE,iBAAiB,CAAC,CAAA;QAClD,OAAM;KACP;IAED,IAAI,GAAG,CAAC,WAAW,EAAE;QACnB,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QACjD,OAAM;KACP;IAED,IACE,GAAG,CAAC,OAAO,CAAC,IAAI;QAChB,GAAG,CAAC,sBAAsB,CAAC,IAAI;QAC/B,GAAG,CAAC,UAAU,EAAE,IAAI,EACpB;QACA,IAAI,GAAG,CAAC,cAAc,EAAE;YACtB,OAAO,CAAC,IAAI,CACV,sEAAsE,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE,EAAE,EAC1F,GAAG,CAAC,OAAO,CACZ,CAAA;SACF;QACD,OAAM;KACP;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAE7C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,+BAAmB,EAAC,IAAI,CAAC,EAAE;QACvC,OAAO,CAAC,IAAI,CAAC,uCAAuC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QAC/D,OAAM;KACP;IAED,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE;QACvB,MAAM,eAAe,GACnB,IAAI,CAAC,eAAe,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAA;QAEjE,GAAG,CAAC,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE;YACnC,2EAA2E;YAC3E,GAAG,CAAC,cAAc,GAAG,IAAI,CAAA;YACzB,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBACvC,OAAO,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAA;gBAC/D,MAAM,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;gBACvC,OAAM;aACP;YACD,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YAC7C,IAAI,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,EAAE;gBACjD,OAAO,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;aAC1C;YACD,MAAM,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACvC,GAAG,CAAC,WAAW,GAAG,IAAI,CAAA;YACtB,IAAI,GAAG,CAAC,aAAa,EAAE;gBACrB,GAAG,CAAC,aAAa,EAAE,CAAA;aACpB;QACH,CAAC,EAAE,eAAe,CAAC,CAAA;KACpB;AACH,CAAC,CAAA;AAzDY,QAAA,UAAU,cAyDtB"}

package/dist/observable/error.d.ts

@@ -1,4 +1,4 @@
 import { BasedServer } from '../server';
-import { Context, WebSocketSession, HttpSession } from '../context';
+import { Context, WebSocketSession, HttpSession } from '@based/functions';
 import { BasedErrorCode, BasedError } from '../error';
 export declare const sendObsGetError: (server: BasedServer, ctx: Context<WebSocketSession | HttpSession>, id: number, name: string, err: BasedError<BasedErrorCode.ObservableFunctionError>) => void;

package/dist/observable/index.d.ts

@@ -4,7 +4,6 @@ export * from './destroy';
 export * from './create';
 export * from './extendCache';
 export * from './start';
-export * from './verify';
 export * from './send';
 export * from './get';
 export * from './types';

package/dist/observable/index.js

@@ -20,7 +20,6 @@ __exportStar(require("./destroy"), exports);
 __exportStar(require("./create"), exports);
 __exportStar(require("./extendCache"), exports);
 __exportStar(require("./start"), exports);
-__exportStar(require("./verify"), exports);
 __exportStar(require("./send"), exports);
 __exportStar(require("./get"), exports);
 __exportStar(require("./types"), exports);

package/dist/observable/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/observable/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA2B;AAC3B,0CAAuB;AACvB,4CAAyB;AACzB,2CAAwB;AACxB,gDAA6B;AAC7B,0CAAuB;AACvB,2CAAwB;AACxB,yCAAsB;AACtB,wCAAqB;AACrB,0CAAuB;AACvB,oDAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/observable/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA2B;AAC3B,0CAAuB;AACvB,4CAAyB;AACzB,2CAAwB;AACxB,gDAA6B;AAC7B,0CAAuB;AACvB,yCAAsB;AACtB,wCAAqB;AACrB,0CAAuB;AACvB,oDAAiC"}

package/dist/observable/send.d.ts

@@ -1,6 +1,6 @@
-import { Context, WebSocketSession, HttpSession } from '../context';
+import { Context, WebSocketSession, HttpSession } from '@based/functions';
 import { BasedServer } from '../server';
-import { BasedErrorCode, BasedError } from '../error';
+import { BasedErrorCode, BasedErrorData } from '../error';
 import { ActiveObservable } from './types';
 export declare const sendObsWs: (ctx: Context<WebSocketSession>, buffer: Uint8Array, obs: ActiveObservable) => void;
-export declare const sendObsGetError: (server: BasedServer, ctx: Context<WebSocketSession | HttpSession>, id: number, name: string, err: BasedError<BasedErrorCode.ObservableFunctionError>) => void;
+export declare const sendObsGetError: (server: BasedServer, ctx: Context<WebSocketSession | HttpSession>, id: number, err: BasedErrorData<BasedErrorCode.ObservableFunctionError>) => void;

package/dist/observable/send.js

@@ -18,14 +18,8 @@ const sendObsWs = (ctx, buffer, obs) => {
     }
 };
 exports.sendObsWs = sendObsWs;
-const sendObsGetError = (server, ctx, id, name, err) => {
-    (0, sendError_1.sendError)(server, ctx, err.code, {
-        observableId: id,
-        route: {
-            name,
-        },
-        err: err,
-    });
+const sendObsGetError = (server, ctx, id, err) => {
+    (0, sendError_1.sendErrorData)(ctx, err);
     (0, destroy_1.destroyObs)(server, id);
 };
 exports.sendObsGetError = sendObsGetError;

package/dist/observable/send.js.map

@@ -1 +1 @@
-{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/observable/send.ts"],"names":[],"mappings":";;;AACA,0CAAsC;AAEtC,uCAAsC;AAEtC,4CAAwC;AAGjC,MAAM,SAAS,GAAG,CACvB,GAA8B,EAC9B,MAAkB,EAClB,GAAqB,EACrB,EAAE;IACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,GAAG,CAAC,WAAW,EAAE;QACnB,MAAM,MAAM,GAAG,IAAA,mBAAQ,EAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAA;QACvC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;QACrC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;KACtB;SAAM;QACL,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;KACtC;AACH,CAAC,CAAA;AAfY,QAAA,SAAS,aAerB;AAEM,MAAM,eAAe,GAAG,CAC7B,MAAmB,EACnB,GAA4C,EAC5C,EAAU,EACV,IAAY,EACZ,GAAuD,EACvD,EAAE;IACF,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE;QAC/B,YAAY,EAAE,EAAE;QAChB,KAAK,EAAE;YACL,IAAI;SACL;QACD,GAAG,EAAE,GAAG;KACT,CAAC,CAAA;IACF,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA;AAfY,QAAA,eAAe,mBAe3B"}
+{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/observable/send.ts"],"names":[],"mappings":";;;AACA,0CAAsC;AAEtC,uCAAsC;AAEtC,4CAA4C;AAGrC,MAAM,SAAS,GAAG,CACvB,GAA8B,EAC9B,MAAkB,EAClB,GAAqB,EACrB,EAAE;IACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,GAAG,CAAC,WAAW,EAAE;QACnB,MAAM,MAAM,GAAG,IAAA,mBAAQ,EAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAA;QACvC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;QACrC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;KACtB;SAAM;QACL,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;KACtC;AACH,CAAC,CAAA;AAfY,QAAA,SAAS,aAerB;AAEM,MAAM,eAAe,GAAG,CAC7B,MAAmB,EACnB,GAA4C,EAC5C,EAAU,EACV,GAA2D,EAC3D,EAAE;IACF,IAAA,yBAAa,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACvB,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA;AARY,QAAA,eAAe,mBAQ3B"}

package/dist/observable/start/error.d.ts

@@ -1,3 +1,4 @@
 import { ActiveObservable } from '../types';
 import { BasedServer } from '../../server';
-export declare const errorListener: (server: BasedServer, obs: ActiveObservable, err: any) => void;
+import { BasedErrorCode, BasedErrorData } from '../../error';
+export declare const errorListener: (server: BasedServer, obs: ActiveObservable, err: Error | BasedErrorData<BasedErrorCode.ObservableFunctionError>) => void;

package/dist/observable/start/error.js

@@ -4,32 +4,34 @@ exports.errorListener = void 0;
 const error_1 = require("../../error");
 const protocol_1 = require("../../protocol");
 const errorListener = (server, obs, err) => {
-    obs.error = err;
     delete obs.cache;
     delete obs.diffCache;
     delete obs.checksum;
     delete obs.previousChecksum;
     obs.isDeflate = false;
     obs.reusedCache = false;
-    const errorData = (0, error_1.createError)(server, { session: { id: obs.id, name: obs.name } }, err.code || error_1.BasedErrorCode.ObservableFunctionError, {
-        err,
-        observableId: obs.id,
-        route: {
-            name: obs.name,
-        },
-    });
+    obs.error =
+        err instanceof Error
+            ? (0, error_1.createError)(server, { session: { type: 'query', id: obs.id, name: obs.name } }, error_1.BasedErrorCode.ObservableFunctionError, {
+                err,
+                observableId: obs.id,
+                route: {
+                    name: obs.name,
+                },
+            })
+            : err;
     if (obs.clients.size) {
-        server.uwsApp.publish(String(obs.id), (0, protocol_1.encodeErrorResponse)((0, protocol_1.valueToBuffer)(errorData)), true, false);
+        server.uwsApp.publish(String(obs.id), (0, protocol_1.encodeErrorResponse)((0, protocol_1.valueToBuffer)(obs.error)), true, false);
     }
     if (obs.functionObserveClients.size) {
         obs.functionObserveClients.forEach((fnUpdate) => {
-            fnUpdate(obs.cache, obs.checksum, obs.diffCache, obs.previousChecksum, obs.isDeflate, obs.rawData, errorData);
+            fnUpdate(obs.cache, obs.checksum, obs.diffCache, obs.previousChecksum, obs.isDeflate, obs.rawData, obs.error);
         });
     }
     if (obs.onNextData) {
         const onNextData = obs.onNextData;
         delete obs.onNextData;
-        onNextData.forEach((fn) => fn(err));
+        onNextData.forEach((fn) => fn(obs.error));
     }
 };
 exports.errorListener = errorListener;

package/dist/observable/start/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/observable/start/error.ts"],"names":[],"mappings":";;;AAEA,uCAAyD;AACzD,6CAAmE;AAE5D,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,GAAqB,EACrB,GAAG,EACH,EAAE;IACF,GAAG,CAAC,KAAK,GAAG,GAAG,CAAA;IACf,OAAO,GAAG,CAAC,KAAK,CAAA;IAChB,OAAO,GAAG,CAAC,SAAS,CAAA;IACpB,OAAO,GAAG,CAAC,QAAQ,CAAA;IACnB,OAAO,GAAG,CAAC,gBAAgB,CAAA;IAE3B,GAAG,CAAC,SAAS,GAAG,KAAK,CAAA;IACrB,GAAG,CAAC,WAAW,GAAG,KAAK,CAAA;IAEvB,MAAM,SAAS,GAAG,IAAA,mBAAW,EAC3B,MAAM,EACN,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,EAC3C,GAAG,CAAC,IAAI,IAAI,sBAAc,CAAC,uBAAuB,EAClD;QACE,GAAG;QACH,YAAY,EAAE,GAAG,CAAC,EAAE;QACpB,KAAK,EAAE;YACL,IAAI,EAAE,GAAG,CAAC,IAAI;SACf;KACF,CACF,CAAA;IAED,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;QACpB,MAAM,CAAC,MAAM,CAAC,OAAO,CACnB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EACd,IAAA,8BAAmB,EAAC,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,EAC7C,IAAI,EACJ,KAAK,CACN,CAAA;KACF;IAED,IAAI,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE;QACnC,GAAG,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC9C,QAAQ,CACN,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,OAAO,EACX,SAAS,CACV,CAAA;QACH,CAAC,CAAC,CAAA;KACH;IAED,IAAI,GAAG,CAAC,UAAU,EAAE;QAClB,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAA;QACjC,OAAO,GAAG,CAAC,UAAU,CAAA;QACrB,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;KACpC;AACH,CAAC,CAAA;AAvDY,QAAA,aAAa,iBAuDzB"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/observable/start/error.ts"],"names":[],"mappings":";;;AAEA,uCAAyE;AACzE,6CAAmE;AAE5D,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,GAAqB,EACrB,GAAmE,EACnE,EAAE;IACF,OAAO,GAAG,CAAC,KAAK,CAAA;IAChB,OAAO,GAAG,CAAC,SAAS,CAAA;IACpB,OAAO,GAAG,CAAC,QAAQ,CAAA;IACnB,OAAO,GAAG,CAAC,gBAAgB,CAAA;IAE3B,GAAG,CAAC,SAAS,GAAG,KAAK,CAAA;IACrB,GAAG,CAAC,WAAW,GAAG,KAAK,CAAA;IAEvB,GAAG,CAAC,KAAK;QACP,GAAG,YAAY,KAAK;YAClB,CAAC,CAAC,IAAA,mBAAW,EACT,MAAM,EACN,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,EAC1D,sBAAc,CAAC,uBAAuB,EACtC;gBACE,GAAG;gBACH,YAAY,EAAE,GAAG,CAAC,EAAE;gBACpB,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;iBACf;aACF,CACF;YACH,CAAC,CAAC,GAAG,CAAA;IAET,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;QACpB,MAAM,CAAC,MAAM,CAAC,OAAO,CACnB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EACd,IAAA,8BAAmB,EAAC,IAAA,wBAAa,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAC7C,IAAI,EACJ,KAAK,CACN,CAAA;KACF;IAED,IAAI,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE;QACnC,GAAG,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC9C,QAAQ,CACN,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,KAAK,CACV,CAAA;QACH,CAAC,CAAC,CAAA;KACH;IAED,IAAI,GAAG,CAAC,UAAU,EAAE;QAClB,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAA;QACjC,OAAO,GAAG,CAAC,UAAU,CAAA;QACrB,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;KAC1C;AACH,CAAC,CAAA;AAzDY,QAAA,aAAa,iBAyDzB"}

package/dist/observable/start/index.js

@@ -5,33 +5,40 @@ const functions_1 = require("../../functions");
 const update_1 = require("./update");
 const error_1 = require("./error");
 const start = (server, id) => {
-    // TODO: install here - if fn is not available is ok - just wait until start gets called again
     const obs = server.activeObservablesById.get(id);
     if (obs.closeFunction) {
         obs.closeFunction();
         delete obs.closeFunction;
     }
     const spec = server.functions.specs[obs.name];
-    if (!spec || !(0, functions_1.isObservableFunctionSpec)(spec)) {
+    if (!spec || !(0, functions_1.isQueryFunctionSpec)(spec)) {
         console.warn('Cannot find observable function spec!', obs.name);
         return;
     }
     const payload = obs.payload;
-    const update = (data, checksum, diff, fromChecksum, isDeflate, rawData) => (0, update_1.updateListener)(server, obs, data, checksum, diff, fromChecksum, isDeflate, rawData);
+    const update = (data, checksum, diff, fromChecksum, isDeflate, rawData, err) => {
+        if (err) {
+            (0, error_1.errorListener)(server, obs, err);
+            return;
+        }
+        (0, update_1.updateListener)(server, obs, data, checksum, diff, fromChecksum, isDeflate, rawData);
+    };
     update.__internalObs__ = true;
+    const startId = ++obs.startId;
     try {
-        // TODO: make these functions receive server and obs (as last args) - every fn that you dont need is WIN
-        const r = spec.function(payload, update);
+        const r = spec.function(server.client, payload, update);
         if (r instanceof Promise) {
             r.then((close) => {
-                if (obs.isDestroyed) {
+                if (obs.isDestroyed || startId !== obs.startId) {
                     close();
                 }
                 else {
                     obs.closeFunction = close;
                 }
             }).catch((err) => {
-                (0, error_1.errorListener)(server, obs, err);
+                if (!(obs.isDestroyed || startId !== obs.startId)) {
+                    (0, error_1.errorListener)(server, obs, err);
+                }
             });
         }
         else {
@@ -39,7 +46,9 @@ const start = (server, id) => {
         }
     }
     catch (err) {
-        (0, error_1.errorListener)(server, obs, err);
+        if (!(obs.isDestroyed || startId !== obs.startId)) {
+            (0, error_1.errorListener)(server, obs, err);
+        }
     }
 };
 exports.start = start;

package/dist/observable/start/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/observable/start/index.ts"],"names":[],"mappings":";;;AACA,+CAA0D;AAC1D,qCAAyC;AACzC,mCAAuC;AAGhC,MAAM,KAAK,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAE,EAAE;IACvD,8FAA8F;IAE9F,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEhD,IAAI,GAAG,CAAC,aAAa,EAAE;QACrB,GAAG,CAAC,aAAa,EAAE,CAAA;QACnB,OAAO,GAAG,CAAC,aAAa,CAAA;KACzB;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAE7C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,oCAAwB,EAAC,IAAI,CAAC,EAAE;QAC5C,OAAO,CAAC,IAAI,CAAC,uCAAuC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QAC/D,OAAM;KACP;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAE3B,MAAM,MAAM,GAA6B,CACvC,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,OAAO,EACP,EAAE,CACF,IAAA,uBAAc,EACZ,MAAM,EACN,GAAG,EACH,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,OAAO,CACR,CAAA;IAEH,MAAM,CAAC,eAAe,GAAG,IAAI,CAAA;IAE7B,IAAI;QACF,wGAAwG;QACxG,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAExC,IAAI,CAAC,YAAY,OAAO,EAAE;YACxB,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,GAAG,CAAC,WAAW,EAAE;oBACnB,KAAK,EAAE,CAAA;iBACR;qBAAM;oBACL,GAAG,CAAC,aAAa,GAAG,KAAK,CAAA;iBAC1B;YACH,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACf,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;YACjC,CAAC,CAAC,CAAA;SACH;aAAM;YACL,GAAG,CAAC,aAAa,GAAG,CAAC,CAAA;SACtB;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;KAChC;AACH,CAAC,CAAA;AA5DY,QAAA,KAAK,SA4DjB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/observable/start/index.ts"],"names":[],"mappings":";;;AACA,+CAAqD;AACrD,qCAAyC;AACzC,mCAAuC;AAGhC,MAAM,KAAK,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAE,EAAE;IACvD,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEhD,IAAI,GAAG,CAAC,aAAa,EAAE;QACrB,GAAG,CAAC,aAAa,EAAE,CAAA;QACnB,OAAO,GAAG,CAAC,aAAa,CAAA;KACzB;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAE7C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,+BAAmB,EAAC,IAAI,CAAC,EAAE;QACvC,OAAO,CAAC,IAAI,CAAC,uCAAuC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QAC/D,OAAM;KACP;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAE3B,MAAM,MAAM,GAA6B,CACvC,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,OAAO,EACP,GAAG,EACH,EAAE;QACF,IAAI,GAAG,EAAE;YACP,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;YAC/B,OAAM;SACP;QACD,IAAA,uBAAc,EACZ,MAAM,EACN,GAAG,EACH,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,OAAO,CACR,CAAA;IACH,CAAC,CAAA;IAED,MAAM,CAAC,eAAe,GAAG,IAAI,CAAA;IAC7B,MAAM,OAAO,GAAG,EAAE,GAAG,CAAC,OAAO,CAAA;IAE7B,IAAI;QACF,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;QACvD,IAAI,CAAC,YAAY,OAAO,EAAE;YACxB,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,EAAE;oBAC9C,KAAK,EAAE,CAAA;iBACR;qBAAM;oBACL,GAAG,CAAC,aAAa,GAAG,KAAK,CAAA;iBAC1B;YACH,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACf,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,EAAE;oBACjD,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;iBAChC;YACH,CAAC,CAAC,CAAA;SACH;aAAM;YACL,GAAG,CAAC,aAAa,GAAG,CAAC,CAAA;SACtB;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,EAAE;YACjD,IAAA,qBAAa,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;SAChC;KACF;AACH,CAAC,CAAA;AAnEY,QAAA,KAAK,SAmEjB"}

package/dist/observable/subscribe.d.ts

@@ -1,7 +1,7 @@
 import { BasedServer } from '../server';
 import { ActiveObservable, ObservableUpdateFunction } from './types';
-import { BasedError, BasedErrorCode } from '../error';
-import { WebSocketSession, Context } from '../context';
+import { BasedErrorCode, BasedErrorData } from '../error';
+import { WebSocketSession, Context } from '@based/functions';
 export declare const subscribeWs: (server: BasedServer, id: number, checksum: number, ctx: Context<WebSocketSession>) => void;
 export declare const subscribeFunction: (server: BasedServer, id: number, update: ObservableUpdateFunction) => void;
-export declare const subscribeNext: (obs: ActiveObservable, onNext: (err?: BasedError<BasedErrorCode.ObservableFunctionError>) => void) => void;
+export declare const subscribeNext: (obs: ActiveObservable, onNext: (err?: BasedErrorData<BasedErrorCode.ObservableFunctionError>) => void) => void;