@based/server 6.9.0 → 7.0.1

package/dist/incoming/http/index.js

@@ -1,59 +1,24 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.httpHandler = void 0;
-const functions_1 = require("@based/functions");
-const function_1 = require("./function");
-const streamFunction_1 = require("./streamFunction");
-const query_1 = require("./query");
-const readBody_1 = require("./readBody");
-const error_1 = require("../../error");
-const sendError_1 = require("../../sendError");
-const security_1 = require("../../security");
-const parseQuery_1 = __importDefault(require("./parseQuery"));
-const auth_1 = require("../../auth");
-const authorize_1 = require("../../authorize");
-const sendHttpResponse_1 = require("../../sendHttpResponse");
-const publish_1 = require("./publish");
+import { isBasedRoute } from '@based/functions';
+import { httpFunction } from './function.js';
+import { httpStreamFunction } from './streamFunction/index.js';
+import { httpGet } from './query.js';
+import { BasedErrorCode } from '../../error/index.js';
+import { sendError } from '../../sendError.js';
+import { blockIncomingRequest, rateLimitRequest, endRateLimitHttp, } from '../../security.js';
+import { parseAuthState, parseJSONAuthState } from '../../auth/index.js';
+import { authorize } from '../../authorize.js';
+import { end } from '../../sendHttpResponse.js';
+import { httpPublish } from './publish.js';
+import { handleRequest } from './handleRequest.js';
 let clientId = 0;
-const handleRequest = (server, method, ctx, route, ready) => {
-    if (method === 'post') {
-        (0, readBody_1.readBody)(server, ctx, ready, route);
-    }
-    else {
-        ready((0, parseQuery_1.default)(ctx));
-    }
-};
-const getQuery = (req) => {
-    const obj = {};
-    const string = req.getQuery();
-    let index = 0;
-    let index2;
-    let index3;
-    do {
-        index2 = string.indexOf('=', index);
-        if (index2 === -1) {
-            index2 = string.length;
-        }
-        index3 = string.indexOf('&', index2 + 1);
-        if (index3 === -1) {
-            index3 = string.length;
-        }
-        obj[string.slice(index, index2)] = string.slice(index2 + 1, index3);
-        index = index3 + 1;
-    } while (index3 !== string.length);
-    return obj;
-};
-const httpHandler = (server, req, res) => {
+export const httpHandler = (server, req, res) => {
     res.onAborted(() => {
         ctx.session.res = null;
         ctx.session.req = null;
         ctx.session = null;
     });
     const ip = server.getIp(res, req);
-    if ((0, security_1.blockIncomingRequest)(server, ip, res, req, server.rateLimit.http, 1)) {
+    if (blockIncomingRequest(server, ip, res, req, server.rateLimit.http, 1)) {
         return;
     }
     const method = req.getMethod();
@@ -61,7 +26,7 @@ const httpHandler = (server, req, res) => {
     const path = url.split('/');
     const route = server.functions.route(path[1], url);
     if (route === null || route.internalOnly === true) {
-        (0, sendError_1.sendError)(server, {
+        sendError(server, {
             session: {
                 url,
                 origin: req.getHeader('origin'),
@@ -74,7 +39,7 @@ const httpHandler = (server, req, res) => {
                 res,
                 req,
             },
-        }, error_1.BasedErrorCode.FunctionNotFound, path[1]
+        }, BasedErrorCode.FunctionNotFound, path[1]
             ? { route: { name: path[1], type: 'function' } }
             : { route: { name: '', path: url, type: 'function' } });
         return;
@@ -82,37 +47,31 @@ const httpHandler = (server, req, res) => {
     let authState = {};
     if (route.public !== true) {
         let authorization = req.getHeader('authorization');
-        if (!authorization && req.getQuery()) {
-            const query = getQuery(req);
-            if (query.authorization) {
-                authorization = query.authorization;
-            }
-        }
-        if (authorization.length > 5e3) {
-            (0, sendError_1.sendError)(server, {
-                session: {
-                    url,
-                    ua: req.getHeader('user-agent'),
-                    ip,
-                    method,
-                    origin: req.getHeader('origin'),
-                    id: ++clientId,
-                    headers: {},
-                    authState: {},
-                    res,
-                    req,
-                },
-            }, error_1.BasedErrorCode.PayloadTooLarge, { route: { name: 'authorize', type: 'function' } });
-            return;
-        }
         if (authorization) {
-            authState = (0, auth_1.parseAuthState)(authorization);
+            if (authorization.length > 5e3) {
+                sendError(server, {
+                    session: {
+                        url,
+                        ua: req.getHeader('user-agent'),
+                        ip,
+                        method,
+                        origin: req.getHeader('origin'),
+                        id: ++clientId,
+                        headers: {},
+                        authState: {},
+                        res,
+                        req,
+                    },
+                }, BasedErrorCode.PayloadTooLarge, { route: { name: 'authorize', type: 'function' } });
+                return;
+            }
+            authState = parseAuthState(authorization);
         }
         else {
             // TODO: remove this when c++ client can encode
             const authorization = req.getHeader('json-authorization');
             if (authorization) {
-                authState = (0, auth_1.parseJSONAuthState)(authorization);
+                authState = parseJSONAuthState(authorization);
             }
         }
     }
@@ -159,8 +118,8 @@ const httpHandler = (server, req, res) => {
             ctx.session.headers[header] = req.getHeader(header);
         }
     }
-    if ((0, security_1.rateLimitRequest)(server, ctx, route.rateLimitTokens, server.rateLimit.http)) {
-        (0, security_1.endRateLimitHttp)(res);
+    if (rateLimitRequest(server, ctx, route.rateLimitTokens, server.rateLimit.http)) {
+        endRateLimitHttp(res);
         return;
     }
     const query = req.getQuery();
@@ -175,7 +134,7 @@ const httpHandler = (server, req, res) => {
     if (method === 'post' &&
         ctx.session.headers['content-length'] === undefined) {
         // Zero allowed, but not for streams
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.LengthRequired, route);
+        sendError(server, ctx, BasedErrorCode.LengthRequired, route);
         return;
     }
     if (route.headers) {
@@ -186,56 +145,55 @@ const httpHandler = (server, req, res) => {
             }
         }
     }
-    if ((0, functions_1.isBasedRoute)('query', route)) {
+    if (isBasedRoute('query', route)) {
         // Handle HEAD
         if (method !== 'post' && method !== 'get') {
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.MethodNotAllowed, route);
+            sendError(server, ctx, BasedErrorCode.MethodNotAllowed, route);
             return;
         }
         const checksumRaw = req.getHeader('if-none-match');
         const checksumNum = Number(checksumRaw);
         const checksum = !isNaN(checksumNum) ? checksumNum : 0;
         handleRequest(server, method, ctx, route, (payload) => {
-            (0, query_1.httpGet)(route, payload, ctx, server, checksum);
+            httpGet(route, payload, ctx, server, checksum);
         });
         return;
     }
-    if ((0, functions_1.isBasedRoute)('stream', route)) {
+    if (isBasedRoute('stream', route)) {
         if (method === 'options') {
-            (0, sendHttpResponse_1.end)(ctx);
+            end(ctx);
             return;
         }
         if (method !== 'post') {
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.MethodNotAllowed, route);
+            sendError(server, ctx, BasedErrorCode.MethodNotAllowed, route);
             return;
         }
         if (ctx.session.headers['content-length'] === 0) {
             // Zero is also not allowed for streams
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.LengthRequired, route);
+            sendError(server, ctx, BasedErrorCode.LengthRequired, route);
             return;
         }
-        (0, streamFunction_1.httpStreamFunction)(server, ctx, route);
+        httpStreamFunction(server, ctx, route);
         return;
     }
-    if ((0, functions_1.isBasedRoute)('channel', route)) {
+    if (isBasedRoute('channel', route)) {
         if (method !== 'post' && method !== 'get') {
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.MethodNotAllowed, route);
+            sendError(server, ctx, BasedErrorCode.MethodNotAllowed, route);
             return;
         }
         handleRequest(server, method, ctx, route, (payload) => {
-            (0, authorize_1.authorize)(route, server, ctx, payload, publish_1.httpPublish, undefined, undefined, route.publicPublisher || route.public);
+            authorize(route, server, ctx, payload, httpPublish, undefined, undefined, route.publicPublisher || route.public);
         });
         return;
     }
-    if ((0, functions_1.isBasedRoute)('function', route)) {
+    if (isBasedRoute('function', route)) {
         if (method !== 'post' && method !== 'get') {
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.MethodNotAllowed, route);
+            sendError(server, ctx, BasedErrorCode.MethodNotAllowed, route);
             return;
         }
         handleRequest(server, method, ctx, route, (payload) => {
-            (0, authorize_1.authorize)(route, server, ctx, payload, function_1.httpFunction);
+            authorize(route, server, ctx, payload, httpFunction);
         });
     }
 };
-exports.httpHandler = httpHandler;
 //# sourceMappingURL=index.js.map

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

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

package/dist/incoming/http/parseQuery.d.ts

@@ -1,5 +1,4 @@
-import { Context, HttpSession } from '@based/functions';
+import { BasedRoute, Context, HttpSession } from '@based/functions';
 import { parseQuery } from '@saulx/utils';
-declare const _default: (ctx: Context<HttpSession>) => ReturnType<typeof parseQuery>;
+declare const _default: (ctx: Context<HttpSession>, route: BasedRoute) => ReturnType<typeof parseQuery>;
 export default _default;
-//# sourceMappingURL=parseQuery.d.ts.map

package/dist/incoming/http/parseQuery.js

@@ -1,8 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("@saulx/utils");
-const auth_1 = require("../../auth");
-exports.default = (ctx) => {
+import { parseQuery } from '@saulx/utils';
+import { parseAuthState } from '../../auth/index.js';
+export default (ctx, route) => {
     if (!('query' in ctx.session)) {
         return;
     }
@@ -10,13 +8,16 @@ exports.default = (ctx) => {
         return ctx.session.parsedQuery;
     }
     try {
-        ctx.session.parsedQuery = (0, utils_1.parseQuery)(ctx.session.query);
-        // TODO chekc if this is a good idea (can also call it 'autState')
+        ctx.session.parsedQuery = parseQuery(ctx.session.query);
+        // TODO check if this is a good idea (can also call it 'authState')
         if (!ctx.session.authState.token &&
             !ctx.session.authState.refreshToken &&
             ctx.session.parsedQuery &&
             'token' in ctx.session.parsedQuery) {
-            ctx.session.authState = (0, auth_1.parseAuthState)(ctx.session.parsedQuery.token);
+            ctx.session.authState = parseAuthState(ctx.session.parsedQuery.token);
+            if (route.type === 'query') {
+                delete ctx.session.parsedQuery.token;
+            }
         }
         return ctx.session.parsedQuery;
     }

package/dist/incoming/http/parseQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseQuery.js","sourceRoot":"","sources":["../../../src/incoming/http/parseQuery.ts"],"names":[],"mappings":";;AACA,wCAAyC;AACzC,qCAA2C;AAE3C,kBAAe,CAAC,GAAyB,EAAiC,EAAE;IAC1E,IAAI,CAAC,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE;QAC7B,OAAM;KACP;IACD,IAAI,aAAa,IAAI,GAAG,CAAC,OAAO,EAAE;QAChC,OAAO,GAAG,CAAC,OAAO,CAAC,WAAW,CAAA;KAC/B;IACD,IAAI;QACF,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,IAAA,kBAAU,EAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAEvD,kEAAkE;QAClE,IACE,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK;YAC5B,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY;YACnC,GAAG,CAAC,OAAO,CAAC,WAAW;YACvB,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,WAAW,EAClC;YACA,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,IAAA,qBAAc,EAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;SACtE;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,WAAW,CAAA;KAC/B;IAAC,OAAO,GAAG,EAAE;QACZ,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,SAAS,CAAA;KACpC;AACH,CAAC,CAAA"}
+{"version":3,"file":"parseQuery.js","sourceRoot":"","sources":["../../../src/incoming/http/parseQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,eAAe,CACb,GAAyB,EACzB,KAAiB,EACc,EAAE;IACjC,IAAI,CAAC,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE;QAC7B,OAAM;KACP;IACD,IAAI,aAAa,IAAI,GAAG,CAAC,OAAO,EAAE;QAChC,OAAO,GAAG,CAAC,OAAO,CAAC,WAAW,CAAA;KAC/B;IACD,IAAI;QACF,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACvD,mEAAmE;QACnE,IACE,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK;YAC5B,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY;YACnC,GAAG,CAAC,OAAO,CAAC,WAAW;YACvB,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,WAAW,EAClC;YACA,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;YACrE,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC1B,OAAO,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAA;aACrC;SACF;QACD,OAAO,GAAG,CAAC,OAAO,CAAC,WAAW,CAAA;KAC/B;IAAC,OAAO,GAAG,EAAE;QACZ,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,SAAS,CAAA;KACpC;AACH,CAAC,CAAA"}

package/dist/incoming/http/publish.d.ts

@@ -1,4 +1,3 @@
 import { HttpSession } from '@based/functions';
-import { IsAuthorizedHandler } from '../../authorize';
+import { IsAuthorizedHandler } from '../../authorize.js';
 export declare const httpPublish: IsAuthorizedHandler<HttpSession>;
-//# sourceMappingURL=publish.d.ts.map

package/dist/incoming/http/publish.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.httpPublish = void 0;
-const sendHttpResponse_1 = require("../../sendHttpResponse");
-const error_1 = require("../../error");
-const sendError_1 = require("../../sendError");
-const installFn_1 = require("../../installFn");
-const query_1 = require("../../query");
-const channel_1 = require("../../channel");
-const httpPublish = async (route, spec, server, ctx, payload) => {
+import { sendHttpResponse } from '../../sendHttpResponse.js';
+import { BasedErrorCode } from '../../error/index.js';
+import { sendError } from '../../sendError.js';
+import { installFn } from '../../installFn.js';
+import { genObservableId } from '../../query/index.js';
+import { hasChannel, createChannel, destroyChannel, extendChannel, } from '../../channel/index.js';
+export const httpPublish = async (route, _spec, server, ctx, payload) => {
     // parse channel payload / msg
     let msg;
     let channelPayload;
@@ -43,23 +40,23 @@ const httpPublish = async (route, spec, server, ctx, payload) => {
         }
     }
     const name = route.name;
-    const id = (0, query_1.genObservableId)(name, channelPayload);
-    (0, installFn_1.installFn)(server, ctx, route).then(async (spec) => {
+    const id = genObservableId(name, channelPayload);
+    installFn(server, ctx, route).then(async (spec) => {
         if (spec === null) {
             return;
         }
-        if (!(0, channel_1.hasChannel)(server, id)) {
-            (0, channel_1.createChannel)(server, name, id, channelPayload, true);
-            (0, channel_1.destroyChannel)(server, id);
+        if (!hasChannel(server, id)) {
+            createChannel(server, name, id, channelPayload, true);
+            destroyChannel(server, id);
         }
         else {
-            (0, channel_1.extendChannel)(server, server.activeChannelsById.get(id));
+            extendChannel(server, server.activeChannelsById.get(id));
         }
         try {
             spec.publisher(server.client, channelPayload, msg, id, ctx);
             if (spec.httpResponse) {
                 const send = (responseData, headers, status) => {
-                    (0, sendHttpResponse_1.sendHttpResponse)(ctx, responseData, headers, status !== undefined
+                    sendHttpResponse(ctx, responseData, headers, status !== undefined
                         ? typeof status === 'string'
                             ? status
                             : String(status)
@@ -68,15 +65,14 @@ const httpPublish = async (route, spec, server, ctx, payload) => {
                 await spec.httpResponse(server.client, payload, undefined, send, ctx);
                 return;
             }
-            (0, sendHttpResponse_1.sendHttpResponse)(ctx, undefined);
+            sendHttpResponse(ctx, undefined);
         }
         catch (err) {
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionError, {
+            sendError(server, ctx, BasedErrorCode.FunctionError, {
                 err,
                 route,
             });
         }
     });
 };
-exports.httpPublish = httpPublish;
 //# sourceMappingURL=publish.js.map

package/dist/incoming/http/publish.js.map

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

package/dist/incoming/http/query.d.ts

@@ -1,4 +1,3 @@
-import { BasedServer } from '../../server';
+import { BasedServer } from '../../server.js';
 import { HttpSession, Context, BasedRoute } from '@based/functions';
 export declare const httpGet: (route: BasedRoute<'query'>, payload: any, ctx: Context<HttpSession>, server: BasedServer, checksum: number) => void;
-//# sourceMappingURL=query.d.ts.map

package/dist/incoming/http/query.js

@@ -1,73 +1,66 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.httpGet = void 0;
-const sendHttpResponse_1 = require("../../sendHttpResponse");
-const compress_1 = require("../../compress");
-const query_1 = require("../../query");
-const node_zlib_1 = __importDefault(require("node:zlib"));
-const utils_1 = require("@saulx/utils");
-const error_1 = require("../../error");
-const sendError_1 = require("../../sendError");
-const node_util_1 = require("node:util");
-const authorize_1 = require("../../authorize");
-const inflate = (0, node_util_1.promisify)(node_zlib_1.default.inflateRaw);
+import { end, sendHeaders } from '../../sendHttpResponse.js';
+import { compress } from '../../compress.js';
+import { createObs, destroyObs, getObsAndStopRemove, hasObs, sendObsGetError, subscribeNext, start, genObservableId, } from '../../query/index.js';
+import zlib from 'node:zlib';
+import { BasedErrorCode } from '../../error/index.js';
+import { sendError } from '../../sendError.js';
+import { promisify } from 'node:util';
+import { authorize } from '../../authorize.js';
+const inflate = promisify(zlib.inflateRaw);
 const sendCacheSwapEncoding = async (server, route, ctx, buffer, checksum, headers, status = '200 OK') => {
     try {
         const inflated = await inflate(buffer.slice(20));
-        const { payload, encoding } = await (0, compress_1.compress)(inflated, ctx.session.headers.encoding);
+        const { payload, encoding } = await compress(inflated, ctx.session.headers.encoding);
         if (!ctx.session.res) {
             return;
         }
         ctx.session.res.cork(() => {
             if (headers) {
-                (0, sendHttpResponse_1.sendHeaders)(ctx, headers);
+                sendHeaders(ctx, headers);
             }
             ctx.session.res.writeStatus(status);
             if (encoding) {
                 ctx.session.res.writeHeader('Content-Encoding', encoding);
             }
             ctx.session.res.writeHeader('ETag', String(checksum));
-            (0, sendHttpResponse_1.end)(ctx, payload);
+            end(ctx, payload);
         });
     }
     catch (err) {
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.UnsupportedContentEncoding, route);
+        sendError(server, ctx, BasedErrorCode.UnsupportedContentEncoding, route);
     }
 };
 const sendCache = (ctx, buffer, checksum, isDeflate, headers, status = '200 OK') => {
     ctx.session.res.cork(() => {
         if (headers) {
-            (0, sendHttpResponse_1.sendHeaders)(ctx, headers);
+            sendHeaders(ctx, headers);
         }
         ctx.session.res.writeStatus(status);
         ctx.session.res.writeHeader('ETag', String(checksum));
         if (isDeflate) {
             ctx.session.res.writeHeader('Content-Encoding', 'deflate');
         }
-        (0, sendHttpResponse_1.end)(ctx, buffer.slice(20));
+        end(ctx, buffer.slice(20));
     });
 };
 const sendNotModified = (ctx, headers, status = '304 Not Modified') => {
     ctx.session.res.cork(() => {
         if (headers) {
-            (0, sendHttpResponse_1.sendHeaders)(ctx, headers);
+            sendHeaders(ctx, headers);
         }
         ctx.session.res.writeStatus(status);
-        (0, sendHttpResponse_1.end)(ctx);
+        end(ctx);
     });
 };
 const sendGetResponseInternal = (route, server, id, obs, checksum, ctx, headers, status) => {
     if (!ctx.session) {
-        (0, query_1.destroyObs)(server, id);
+        destroyObs(server, id);
         return;
     }
     const encoding = ctx.session.headers.encoding;
     if (checksum === 0 || checksum !== obs.checksum) {
         if (!obs.cache) {
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.NoOservableCacheAvailable, {
+            sendError(server, ctx, BasedErrorCode.NoOservableCacheAvailable, {
                 observableId: id,
                 route: { name: obs.name, type: 'query' },
             });
@@ -87,12 +80,12 @@ const sendGetResponseInternal = (route, server, id, obs, checksum, ctx, headers,
     else {
         sendNotModified(ctx);
     }
-    (0, query_1.destroyObs)(server, id);
+    destroyObs(server, id);
 };
 const sendGetResponse = (route, spec, server, id, obs, checksum, ctx) => {
     if ('httpResponse' in spec) {
         // response data does not work for query responses
-        const send = (responseData, headers, status) => {
+        const send = (_responseData, headers, status) => {
             sendGetResponseInternal(route, server, id, obs, checksum, ctx, headers, typeof status === 'string' ? status : String(status));
         };
         spec.httpResponse(server.client, obs.payload, obs.cache, send, ctx);
@@ -101,24 +94,24 @@ const sendGetResponse = (route, spec, server, id, obs, checksum, ctx) => {
     sendGetResponseInternal(route, server, id, obs, checksum, ctx);
 };
 const getFromExisting = (server, id, ctx, route, spec, checksum) => {
-    const obs = (0, query_1.getObsAndStopRemove)(server, id);
+    const obs = getObsAndStopRemove(server, id);
     if (server.queryEvents) {
         server.queryEvents.get(obs, ctx);
     }
     if (obs.error) {
-        (0, query_1.sendObsGetError)(server, ctx, obs.id, obs.error);
+        sendObsGetError(server, ctx, obs.id, obs.error);
         return;
     }
     if (obs.cache) {
         sendGetResponse(route, spec, server, id, obs, checksum, ctx);
         return;
     }
-    (0, query_1.subscribeNext)(obs, (err) => {
+    subscribeNext(obs, (err) => {
         if (!ctx.session) {
             return;
         }
         if (err) {
-            (0, query_1.sendObsGetError)(server, ctx, obs.id, err);
+            sendObsGetError(server, ctx, obs.id, err);
         }
         else {
             sendGetResponse(route, spec, server, id, obs, checksum, ctx);
@@ -127,35 +120,28 @@ const getFromExisting = (server, id, ctx, route, spec, checksum) => {
 };
 const isAuthorized = (route, spec, server, ctx, payload, id, checksum) => {
     const name = route.name;
-    if ((0, query_1.hasObs)(server, id)) {
+    if (hasObs(server, id)) {
         getFromExisting(server, id, ctx, route, spec, checksum);
         return;
     }
-    const obs = (0, query_1.createObs)(server, name, id, payload, true);
+    const obs = createObs(server, name, id, payload, true);
     if (server.queryEvents) {
         server.queryEvents.get(obs, ctx);
     }
-    (0, query_1.subscribeNext)(obs, (err) => {
+    subscribeNext(obs, (err) => {
         if (err) {
-            (0, query_1.sendObsGetError)(server, ctx, obs.id, err);
+            sendObsGetError(server, ctx, obs.id, err);
         }
         else {
             sendGetResponse(route, spec, server, id, obs, checksum, ctx);
         }
     });
-    (0, query_1.start)(server, id);
+    start(server, id);
 };
-const httpGet = (route, payload, ctx, server, checksum) => {
+export const httpGet = (route, payload, ctx, server, checksum) => {
     if (!ctx.session) {
         return;
     }
-    if (payload === undefined && 'query' in ctx.session) {
-        try {
-            payload = (0, utils_1.parseQuery)(decodeURIComponent(ctx.session.query));
-        }
-        catch (err) { }
-    }
-    (0, authorize_1.authorize)(route, server, ctx, payload, isAuthorized, (0, query_1.genObservableId)(route.name, payload), checksum);
+    authorize(route, server, ctx, payload, isAuthorized, genObservableId(route.name, payload), checksum);
 };
-exports.httpGet = httpGet;
 //# sourceMappingURL=query.js.map