remult 0.20.0-exp.13 → 0.20.0-exp.15

package/esm/remult-express.js

@@ -13,7 +13,8 @@ export function remultExpress(options) {
         app.use(express.urlencoded({ extended: true, limit: options.bodySizeLimit }));
     }
     const server = createRemultServer(options, {
-        buildGenericRequest: req => req
+        buildGenericRequestInfo: req => req,
+        getRequestBody: async (req) => req.body
     });
     server.registerRouter(app);
     return Object.assign(app, {

package/esm/remult-fastify.js

@@ -30,7 +30,8 @@ export function remultFastify(options) {
         return response;
     }
     const api = createRemultServer(options, {
-        buildGenericRequest: req => req
+        buildGenericRequestInfo: req => req,
+        getRequestBody: async (req) => req.body
     });
     const pluginFunction = async (instance, op) => {
         //@ts-ignore

package/esm/remult-fresh.js

@@ -1,23 +1,13 @@
 import { createRemultServerCore } from "./server/expressBridge";
 export function remultFresh(options, response) {
     const server = createRemultServerCore(options, {
-        buildGenericRequest: r => r
+        buildGenericRequestInfo: r => r,
+        getRequestBody: req => req.json()
     });
     return {
         getRemult: r => server.getRemult(r),
         openApiDoc: x => server.openApiDoc(x),
         handle: async (req, ctx) => {
-            const theReq = {
-                method: req.method,
-                url: req.url,
-                body: undefined
-            };
-            switch (req.method.toLocaleLowerCase()) {
-                case "put":
-                case "post":
-                    theReq.body = await req.json();
-                    break;
-            }
             let init = {};
             const res = await server.handle(req);
             if (res) {

package/esm/remult-next.js

@@ -1,7 +1,8 @@
 import { createRemultServer } from "./server";
 export function remultNext(options) {
     let result = createRemultServer(options, {
-        buildGenericRequest: req => req
+        buildGenericRequestInfo: req => req,
+        getRequestBody: async (req) => req.body
     });
     return Object.assign((req, res) => result.handle(req, res).then(() => { }), result, {
         getRemult: (...args) => result.getRemult(...args),

package/esm/remult-sveltekit.js

@@ -1,28 +1,19 @@
 import { createRemultServer } from './server';
 export function remultSveltekit(options) {
     let result = createRemultServer(options, {
-        buildGenericRequest: event => ({
+        buildGenericRequestInfo: event => ({
             url: event.request.url,
             method: event.request.method,
-            body: event.locals["_tempJson"],
             on: (e, do1) => {
                 if (e === 'close') {
                     event.locals["_tempOnClose"] = do1;
                 }
             }
-        })
+        }),
+        getRequestBody: event => event.request.json()
     });
     const handler = async ({ event, resolve }) => {
         if (event.url.pathname.startsWith(options.rootPath)) {
-            let json = {};
-            try {
-                if (event.request.method == 'POST' || event.request.method == 'PUT') {
-                    json = await event.request.json();
-                }
-            }
-            catch (error) {
-                console.log(error);
-            }
             let sseResponse = undefined;
             event.locals["_tempOnClose"] = () => { };
             const response = {
@@ -57,7 +48,6 @@ export function remultSveltekit(options) {
                     }
                 }
             };
-            event.locals["_tempJson"] = json;
             const responseFromRemultHandler = await result.handle(event, response);
             if (sseResponse !== undefined) {
                 return sseResponse;

package/esm/server/core.d.ts

@@ -1,4 +1,4 @@
-export { queuedJobInfo, QueueStorage, GenericRequest, GenericRequestHandler, GenericResponse, GenericRouter, createRemultServerCore, RemultServerOptions, SpecificRoute, RemultServer } from './expressBridge';
+export { queuedJobInfo, QueueStorage, GenericRequestInfo, GenericRequestHandler, GenericResponse, GenericRouter, createRemultServerCore, RemultServerOptions, SpecificRoute, RemultServer } from './expressBridge';
 export { JsonEntityFileStorage, JsonFileDataProvider } from './JsonEntityFileStorage';
 export { SseSubscriptionServer } from '../SseSubscriptionServer';
 export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-query-storage';

package/esm/server/expressBridge.d.ts

@@ -54,7 +54,7 @@ export interface InitRequestOptions {
     readonly remult: Remult;
 }
 export declare function createRemultServerCore<RequestType>(options: RemultServerOptions<RequestType>, serverCoreOptions: ServerCoreOptions<RequestType>): RemultServer<RequestType>;
-export declare type GenericRequestHandler = (req: GenericRequest, res: GenericResponse, next: VoidFunction) => void;
+export declare type GenericRequestHandler = (req: GenericRequestInfo, res: GenericResponse, next: VoidFunction) => void;
 export interface ServerHandleResponse {
     data?: any;
     statusCode: number;
@@ -78,10 +78,9 @@ export declare type SpecificRoute = {
     post(handler: GenericRequestHandler): SpecificRoute;
     delete(handler: GenericRequestHandler): SpecificRoute;
 };
-export interface GenericRequest {
+export interface GenericRequestInfo {
     url?: string;
     method?: any;
-    body?: any;
     query?: any;
     params?: any;
 }
@@ -129,5 +128,6 @@ export declare class JobsInQueueEntity extends IdEntity {
     progress: number;
 }
 export interface ServerCoreOptions<RequestType> {
-    buildGenericRequest(req: RequestType): GenericRequest;
+    buildGenericRequestInfo(req: RequestType): GenericRequestInfo;
+    getRequestBody(req: RequestType): Promise<any>;
 }

package/esm/server/expressBridge.js

@@ -196,15 +196,15 @@ export class RemultServerImplementation {
                 r.route(streamPath).get(this.process(async (remult, req, res, origReq, origRes) => {
                     remult.subscriptionServer.openHttpServerStream(origReq, origRes);
                 }));
-                r.route(streamPath + '/subscribe').post(this.process(async (remult, req, res, origReq, origRes) => {
-                    remult.subscriptionServer.subscribeToChannel(origReq.body, res, remult);
+                r.route(streamPath + '/subscribe').post(this.process(async (remult, req, res, reqInfo, origRes, origReq) => {
+                    const body = remult.subscriptionServer.subscribeToChannel(await this.coreOptions.getRequestBody(origReq), res, remult);
                 }));
-                r.route(streamPath + '/unsubscribe').post(this.process(async (remult, req, res, origReq, origRes) => {
-                    remult.subscriptionServer.subscribeToChannel(origReq.body, res, remult, true);
+                r.route(streamPath + '/unsubscribe').post(this.process(async (remult, req, res, reqInfo, origRes, origReq) => {
+                    remult.subscriptionServer.subscribeToChannel(await this.coreOptions.getRequestBody(origReq), res, remult, true);
                 }));
             }
-            r.route(this.options.rootPath + '/' + liveQueryKeepAliveRoute).post(this.process(async (remult, req, res, origReq, origRes) => {
-                res.success(await remult.liveQueryStorage.keepAliveAndReturnUnknownQueryIds(origReq.body));
+            r.route(this.options.rootPath + '/' + liveQueryKeepAliveRoute).post(this.process(async (remult, req, res, reqInfo, origRes, origReq) => {
+                res.success(await remult.liveQueryStorage.keepAliveAndReturnUnknownQueryIds(await this.coreOptions.getRequestBody(origReq)));
             }));
         }
         this.options.entities.forEach(e => {
@@ -230,14 +230,14 @@ export class RemultServerImplementation {
         if (this.options.logApiEndPoints)
             console.info("[remult] " + myRoute);
         r.route(myRoute)
-            .get(this.process((c, req, res, orig) => dataApiFactory(c).httpGet(res, req, () => this.serializeContext(c)))).put(this.process(async (c, req, res, orig) => dataApiFactory(c).put(res, '', orig.body)))
+            .get(this.process((c, req, res, orig) => dataApiFactory(c).httpGet(res, req, () => this.serializeContext(c)))).put(this.process(async (c, req, res, _, __, orig) => dataApiFactory(c).put(res, '', await this.coreOptions.getRequestBody(orig))))
             .delete(this.process(async (c, req, res, orig) => dataApiFactory(c).delete(res, '')))
-            .post(this.process(async (c, req, res, orig) => dataApiFactory(c).httpPost(res, req, orig.body, () => this.serializeContext(c))));
+            .post(this.process(async (c, req, res, _, __, orig) => dataApiFactory(c).httpPost(res, req, await this.coreOptions.getRequestBody(orig), () => this.serializeContext(c))));
         r.route(myRoute + '/:id')
             //@ts-ignore
             .get(this.process(async (c, req, res, orig) => dataApiFactory(c).get(res, orig.params.id)))
             //@ts-ignore
-            .put(this.process(async (c, req, res, orig) => dataApiFactory(c).put(res, orig.params.id, orig.body)))
+            .put(this.process(async (c, req, res, reqInfo, _, orig) => dataApiFactory(c).put(res, reqInfo.params.id, await this.coreOptions.getRequestBody(orig))))
             //@ts-ignore
             .delete(this.process(async (c, req, res, orig) => dataApiFactory(c).delete(res, orig.params.id)));
     }
@@ -255,7 +255,7 @@ export class RemultServerImplementation {
     }
     process(what) {
         return async (req, origRes) => {
-            const genReq = this.coreOptions.buildGenericRequest(req);
+            const genReq = this.coreOptions.buildGenericRequestInfo(req);
             if (!genReq.query) {
                 genReq.query = req["_tempQuery"];
             }
@@ -291,7 +291,7 @@ export class RemultServerImplementation {
                         });
                     }
                 }
-                await what(remult, myReq, myRes, genReq, origRes);
+                await what(remult, myReq, myRes, genReq, origRes, req);
             });
         };
     }
@@ -320,15 +320,15 @@ export class RemultServerImplementation {
                 this.hasQueue = true;
                 this.queue.mapQueuedAction(myUrl, what);
             }
-            r.route(myUrl).post(this.process(async (remult, req, res, orig) => {
+            r.route(myUrl).post(this.process(async (remult, req, res, _, __, orig) => {
                 if (queue) {
                     let r = {
-                        queuedJobId: await this.queue.submitJob(myUrl, remult, orig.body)
+                        queuedJobId: await this.queue.submitJob(myUrl, remult, await this.coreOptions.getRequestBody(orig))
                     };
                     res.success(r);
                 }
                 else
-                    return what(orig.body, remult, res);
+                    return what(await this.coreOptions.getRequestBody(orig), remult, res);
             }));
         });
     }
@@ -857,7 +857,7 @@ class RouteImplementation {
         });
     }
     middleware(origReq, res, next) {
-        const req = this.coreOptions.buildGenericRequest(origReq);
+        const req = this.coreOptions.buildGenericRequestInfo(origReq);
         let theUrl = req.url;
         if (theUrl.startsWith('/')) //next sends a partial url '/api/tasks' and not the full url
             theUrl = 'http://stam' + theUrl;

package/esm/server/index.d.ts

@@ -1,5 +1,5 @@
 import { RemultServer, RemultServerOptions, ServerCoreOptions } from './expressBridge';
-export { queuedJobInfo, QueueStorage, GenericRequest, GenericRequestHandler, GenericResponse, GenericRouter, RemultServerOptions, SpecificRoute, RemultServer, InitRequestOptions } from './expressBridge';
+export { queuedJobInfo, QueueStorage, GenericRequestInfo, GenericRequestHandler, GenericResponse, GenericRouter, RemultServerOptions, SpecificRoute, RemultServer, InitRequestOptions } from './expressBridge';
 export { JsonEntityFileStorage, JsonFileDataProvider } from './JsonEntityFileStorage';
 export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-query-storage';
 export { SseSubscriptionServer } from '../SseSubscriptionServer';

package/esm/server/index.js

@@ -5,5 +5,5 @@ export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-q
 export { SseSubscriptionServer } from '../SseSubscriptionServer';
 export function createRemultServer(options, serverCoreOptions) {
     initAsyncHooks();
-    return createRemultServerCore(options, serverCoreOptions || { buildGenericRequest: req => req });
+    return createRemultServerCore(options, serverCoreOptions || { buildGenericRequestInfo: req => req, getRequestBody: async (req) => req.body });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.20.0-exp.13",
+    "version": "0.20.0-exp.15",
     "description": "A CRUD framework for full-stack TypeScript",
     "main": "index.js",
     "types": "index.d.ts",

package/remult-express.js

@@ -5,6 +5,7 @@ var tslib_1 = require("tslib");
 var express = tslib_1.__importStar(require("express"));
 var index_1 = require("./server/index");
 function remultExpress(options) {
+    var _this = this;
     var app = express.Router();
     if (!options) {
         options = {};
@@ -17,7 +18,10 @@ function remultExpress(options) {
         app.use(express.urlencoded({ extended: true, limit: options.bodySizeLimit }));
     }
     var server = index_1.createRemultServer(options, {
-        buildGenericRequest: function (req) { return req; }
+        buildGenericRequestInfo: function (req) { return req; },
+        getRequestBody: function (req) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/, req.body];
+        }); }); }
     });
     server.registerRouter(app);
     return Object.assign(app, {

package/remult-fastify.js

@@ -35,7 +35,10 @@ function remultFastify(options) {
         return response;
     }
     var api = index_1.createRemultServer(options, {
-        buildGenericRequest: function (req) { return req; }
+        buildGenericRequestInfo: function (req) { return req; },
+        getRequestBody: function (req) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/, req.body];
+        }); }); }
     });
     var pluginFunction = function (instance, op) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
         var fastifyRouter;

package/remult-fresh.js

@@ -6,38 +6,21 @@ var expressBridge_1 = require("./server/expressBridge");
 function remultFresh(options, response) {
     var _this = this;
     var server = expressBridge_1.createRemultServerCore(options, {
-        buildGenericRequest: function (r) { return r; }
+        buildGenericRequestInfo: function (r) { return r; },
+        getRequestBody: function (req) { return req.json(); }
     });
     return {
         getRemult: function (r) { return server.getRemult(r); },
         openApiDoc: function (x) { return server.openApiDoc(x); },
         handle: function (req, ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var theReq, _a, _b, init, res;
-            return tslib_1.__generator(this, function (_c) {
-                switch (_c.label) {
+            var init, res;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        theReq = {
-                            method: req.method,
-                            url: req.url,
-                            body: undefined
-                        };
-                        _a = req.method.toLocaleLowerCase();
-                        switch (_a) {
-                            case "put": return [3 /*break*/, 1];
-                            case "post": return [3 /*break*/, 1];
-                        }
-                        return [3 /*break*/, 3];
-                    case 1:
-                        _b = theReq;
-                        return [4 /*yield*/, req.json()];
-                    case 2:
-                        _b.body = _c.sent();
-                        return [3 /*break*/, 3];
-                    case 3:
                         init = {};
                         return [4 /*yield*/, server.handle(req)];
-                    case 4:
-                        res = _c.sent();
+                    case 1:
+                        res = _a.sent();
                         if (res) {
                             init.status = res.statusCode;
                             if (res.data) {

package/remult-next.js

@@ -6,7 +6,10 @@ var server_1 = require("./server");
 function remultNext(options) {
     var _this = this;
     var result = server_1.createRemultServer(options, {
-        buildGenericRequest: function (req) { return req; }
+        buildGenericRequestInfo: function (req) { return req; },
+        getRequestBody: function (req) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/, req.body];
+        }); }); }
     });
     return Object.assign(function (req, res) { return result.handle(req, res).then(function () { }); }, result, {
         getRemult: function () {

package/remult-sveltekit.js

@@ -6,43 +6,27 @@ var server_1 = require("./server");
 function remultSveltekit(options) {
     var _this = this;
     var result = server_1.createRemultServer(options, {
-        buildGenericRequest: function (event) {
+        buildGenericRequestInfo: function (event) {
             return ({
                 url: event.request.url,
                 method: event.request.method,
-                body: event.locals["_tempJson"],
                 on: function (e, do1) {
                     if (e === 'close') {
                         event.locals["_tempOnClose"] = do1;
                     }
                 }
             });
-        }
+        }, getRequestBody: function (event) { return event.request.json(); }
     });
     var handler = function (_a) {
         var event = _a.event, resolve = _a.resolve;
         return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var json, error_1, sseResponse_1, response_1, responseFromRemultHandler;
+            var sseResponse_1, response_1, responseFromRemultHandler;
             var _this = this;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (!event.url.pathname.startsWith(options.rootPath)) return [3 /*break*/, 7];
-                        json = {};
-                        _b.label = 1;
-                    case 1:
-                        _b.trys.push([1, 4, , 5]);
-                        if (!(event.request.method == 'POST' || event.request.method == 'PUT')) return [3 /*break*/, 3];
-                        return [4 /*yield*/, event.request.json()];
-                    case 2:
-                        json = _b.sent();
-                        _b.label = 3;
-                    case 3: return [3 /*break*/, 5];
-                    case 4:
-                        error_1 = _b.sent();
-                        console.log(error_1);
-                        return [3 /*break*/, 5];
-                    case 5:
+                        if (!event.url.pathname.startsWith(options.rootPath)) return [3 /*break*/, 2];
                         sseResponse_1 = undefined;
                         event.locals["_tempOnClose"] = function () { };
                         response_1 = {
@@ -88,9 +72,8 @@ function remultSveltekit(options) {
                                 }
                             }
                         };
-                        event.locals["_tempJson"] = json;
                         return [4 /*yield*/, result.handle(event, response_1)];
-                    case 6:
+                    case 1:
                         responseFromRemultHandler = _b.sent();
                         if (sseResponse_1 !== undefined) {
                             return [2 /*return*/, sseResponse_1];
@@ -100,8 +83,8 @@ function remultSveltekit(options) {
                                     status: responseFromRemultHandler.statusCode
                                 })];
                         }
-                        _b.label = 7;
-                    case 7: return [2 /*return*/, new Promise(function (res) {
+                        _b.label = 2;
+                    case 2: return [2 /*return*/, new Promise(function (res) {
                             result.withRemult(event, undefined, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                                 var _a;
                                 return tslib_1.__generator(this, function (_b) {

package/server/core.d.ts

@@ -1,4 +1,4 @@
-export { queuedJobInfo, QueueStorage, GenericRequest, GenericRequestHandler, GenericResponse, GenericRouter, createRemultServerCore, RemultServerOptions, SpecificRoute, RemultServer } from './expressBridge';
+export { queuedJobInfo, QueueStorage, GenericRequestInfo, GenericRequestHandler, GenericResponse, GenericRouter, createRemultServerCore, RemultServerOptions, SpecificRoute, RemultServer } from './expressBridge';
 export { JsonEntityFileStorage, JsonFileDataProvider } from './JsonEntityFileStorage';
 export { SseSubscriptionServer } from '../SseSubscriptionServer';
 export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-query-storage';

package/server/expressBridge.d.ts

@@ -54,7 +54,7 @@ export interface InitRequestOptions {
     readonly remult: Remult;
 }
 export declare function createRemultServerCore<RequestType>(options: RemultServerOptions<RequestType>, serverCoreOptions: ServerCoreOptions<RequestType>): RemultServer<RequestType>;
-export declare type GenericRequestHandler = (req: GenericRequest, res: GenericResponse, next: VoidFunction) => void;
+export declare type GenericRequestHandler = (req: GenericRequestInfo, res: GenericResponse, next: VoidFunction) => void;
 export interface ServerHandleResponse {
     data?: any;
     statusCode: number;
@@ -78,10 +78,9 @@ export declare type SpecificRoute = {
     post(handler: GenericRequestHandler): SpecificRoute;
     delete(handler: GenericRequestHandler): SpecificRoute;
 };
-export interface GenericRequest {
+export interface GenericRequestInfo {
     url?: string;
     method?: any;
-    body?: any;
     query?: any;
     params?: any;
 }
@@ -129,5 +128,6 @@ export declare class JobsInQueueEntity extends IdEntity {
     progress: number;
 }
 export interface ServerCoreOptions<RequestType> {
-    buildGenericRequest(req: RequestType): GenericRequest;
+    buildGenericRequestInfo(req: RequestType): GenericRequestInfo;
+    getRequestBody(req: RequestType): Promise<any>;
 }

package/server/expressBridge.js

@@ -342,28 +342,44 @@ var RemultServerImplementation = /** @class */ (function () {
                         return [2 /*return*/];
                     });
                 }); }));
-                r.route(streamPath + '/subscribe').post(this.process(function (remult, req, res, origReq, origRes) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                    return tslib_1.__generator(this, function (_a) {
-                        remult.subscriptionServer.subscribeToChannel(origReq.body, res, remult);
-                        return [2 /*return*/];
+                r.route(streamPath + '/subscribe').post(this.process(function (remult, req, res, reqInfo, origRes, origReq) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                    var body, _a, _b;
+                    return tslib_1.__generator(this, function (_c) {
+                        switch (_c.label) {
+                            case 0:
+                                _b = (_a = remult.subscriptionServer).subscribeToChannel;
+                                return [4 /*yield*/, this.coreOptions.getRequestBody(origReq)];
+                            case 1:
+                                body = _b.apply(_a, [_c.sent(), res, remult]);
+                                return [2 /*return*/];
+                        }
                     });
                 }); }));
-                r.route(streamPath + '/unsubscribe').post(this.process(function (remult, req, res, origReq, origRes) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                    return tslib_1.__generator(this, function (_a) {
-                        remult.subscriptionServer.subscribeToChannel(origReq.body, res, remult, true);
-                        return [2 /*return*/];
+                r.route(streamPath + '/unsubscribe').post(this.process(function (remult, req, res, reqInfo, origRes, origReq) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                    var _a, _b;
+                    return tslib_1.__generator(this, function (_c) {
+                        switch (_c.label) {
+                            case 0:
+                                _b = (_a = remult.subscriptionServer).subscribeToChannel;
+                                return [4 /*yield*/, this.coreOptions.getRequestBody(origReq)];
+                            case 1:
+                                _b.apply(_a, [_c.sent(), res, remult, true]);
+                                return [2 /*return*/];
+                        }
                     });
                 }); }));
             }
-            r.route(this.options.rootPath + '/' + SubscriptionChannel_1.liveQueryKeepAliveRoute).post(this.process(function (remult, req, res, origReq, origRes) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var _a, _b;
-                return tslib_1.__generator(this, function (_c) {
-                    switch (_c.label) {
+            r.route(this.options.rootPath + '/' + SubscriptionChannel_1.liveQueryKeepAliveRoute).post(this.process(function (remult, req, res, reqInfo, origRes, origReq) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                var _a, _b, _c, _d;
+                return tslib_1.__generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             _b = (_a = res).success;
-                            return [4 /*yield*/, remult.liveQueryStorage.keepAliveAndReturnUnknownQueryIds(origReq.body)];
-                        case 1:
-                            _b.apply(_a, [_c.sent()]);
+                            _d = (_c = remult.liveQueryStorage).keepAliveAndReturnUnknownQueryIds;
+                            return [4 /*yield*/, this.coreOptions.getRequestBody(origReq)];
+                        case 1: return [4 /*yield*/, _d.apply(_c, [_e.sent()])];
+                        case 2:
+                            _b.apply(_a, [_e.sent()]);
                             return [2 /*return*/];
                     }
                 });
@@ -406,16 +422,29 @@ var RemultServerImplementation = /** @class */ (function () {
         r.route(myRoute)
             .get(this.process(function (c, req, res, orig) {
             return dataApiFactory(c).httpGet(res, req, function () { return _this.serializeContext(c); });
-        })).put(this.process(function (c, req, res, orig) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
-            return [2 /*return*/, dataApiFactory(c).put(res, '', orig.body)];
+        })).put(this.process(function (c, req, res, _, __, orig) { return tslib_1.__awaiter(_this, void 0, void 0, function () { var _a, _b, _c; return tslib_1.__generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _b = (_a = dataApiFactory(c)).put;
+                    _c = [res, ''];
+                    return [4 /*yield*/, this.coreOptions.getRequestBody(orig)];
+                case 1: return [2 /*return*/, _b.apply(_a, _c.concat([_d.sent()]))];
+            }
         }); }); }))
             .delete(this.process(function (c, req, res, orig) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             return [2 /*return*/, dataApiFactory(c).delete(res, '')];
         }); }); }))
-            .post(this.process(function (c, req, res, orig) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            .post(this.process(function (c, req, res, _, __, orig) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var _a, _b, _c;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, dataApiFactory(c).httpPost(res, req, orig.body, function () { return _this.serializeContext(c); })];
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        _b = (_a = dataApiFactory(c)).httpPost;
+                        _c = [res, req];
+                        return [4 /*yield*/, this.coreOptions.getRequestBody(orig)];
+                    case 1: return [2 /*return*/, _b.apply(_a, _c.concat([_d.sent(), function () { return _this.serializeContext(c); }]))];
+                }
             });
         }); }));
         r.route(myRoute + '/:id')
@@ -424,8 +453,14 @@ var RemultServerImplementation = /** @class */ (function () {
             return [2 /*return*/, dataApiFactory(c).get(res, orig.params.id)];
         }); }); }))
             //@ts-ignore
-            .put(this.process(function (c, req, res, orig) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
-            return [2 /*return*/, dataApiFactory(c).put(res, orig.params.id, orig.body)];
+            .put(this.process(function (c, req, res, reqInfo, _, orig) { return tslib_1.__awaiter(_this, void 0, void 0, function () { var _a, _b, _c; return tslib_1.__generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _b = (_a = dataApiFactory(c)).put;
+                    _c = [res, reqInfo.params.id];
+                    return [4 /*yield*/, this.coreOptions.getRequestBody(orig)];
+                case 1: return [2 /*return*/, _b.apply(_a, _c.concat([_d.sent()]))];
+            }
         }); }); }))
             //@ts-ignore
             .delete(this.process(function (c, req, res, orig) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
@@ -477,7 +512,7 @@ var RemultServerImplementation = /** @class */ (function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        genReq = this.coreOptions.buildGenericRequest(req);
+                        genReq = this.coreOptions.buildGenericRequestInfo(req);
                         if (!genReq.query) {
                             genReq.query = req["_tempQuery"];
                         }
@@ -525,7 +560,7 @@ var RemultServerImplementation = /** @class */ (function () {
                                         case 5:
                                             _b.sent();
                                             _b.label = 6;
-                                        case 6: return [4 /*yield*/, what(remult, myReq, myRes, genReq, origRes)];
+                                        case 6: return [4 /*yield*/, what(remult, myReq, myRes, genReq, origRes, req)];
                                         case 7:
                                             _b.sent();
                                             return [2 /*return*/];
@@ -577,22 +612,28 @@ var RemultServerImplementation = /** @class */ (function () {
                 _this.hasQueue = true;
                 _this.queue.mapQueuedAction(myUrl, what);
             }
-            r.route(myUrl).post(_this.process(function (remult, req, res, orig) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var r_1;
-                var _a;
-                return tslib_1.__generator(this, function (_b) {
-                    switch (_b.label) {
+            r.route(myUrl).post(_this.process(function (remult, req, res, _, __, orig) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                var r_1, _a, _b, _c, _d;
+                var _e;
+                return tslib_1.__generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0:
-                            if (!queue) return [3 /*break*/, 2];
-                            _a = {};
-                            return [4 /*yield*/, this.queue.submitJob(myUrl, remult, orig.body)];
-                        case 1:
-                            r_1 = (_a.queuedJobId = _b.sent(),
-                                _a);
+                            if (!queue) return [3 /*break*/, 3];
+                            _e = {};
+                            _b = (_a = this.queue).submitJob;
+                            _c = [myUrl, remult];
+                            return [4 /*yield*/, this.coreOptions.getRequestBody(orig)];
+                        case 1: return [4 /*yield*/, _b.apply(_a, _c.concat([_f.sent()]))];
+                        case 2:
+                            r_1 = (_e.queuedJobId = _f.sent(),
+                                _e);
                             res.success(r_1);
-                            return [3 /*break*/, 3];
-                        case 2: return [2 /*return*/, what(orig.body, remult, res)];
-                        case 3: return [2 /*return*/];
+                            return [3 /*break*/, 5];
+                        case 3:
+                            _d = what;
+                            return [4 /*yield*/, this.coreOptions.getRequestBody(orig)];
+                        case 4: return [2 /*return*/, _d.apply(void 0, [_f.sent(), remult, res])];
+                        case 5: return [2 /*return*/];
                     }
                 });
             }); }));
@@ -1231,7 +1272,7 @@ var RouteImplementation = /** @class */ (function () {
         });
     };
     RouteImplementation.prototype.middleware = function (origReq, res, next) {
-        var req = this.coreOptions.buildGenericRequest(origReq);
+        var req = this.coreOptions.buildGenericRequestInfo(origReq);
         var theUrl = req.url;
         if (theUrl.startsWith('/')) //next sends a partial url '/api/tasks' and not the full url
             theUrl = 'http://stam' + theUrl;

package/server/index.d.ts

@@ -1,5 +1,5 @@
 import { RemultServer, RemultServerOptions, ServerCoreOptions } from './expressBridge';
-export { queuedJobInfo, QueueStorage, GenericRequest, GenericRequestHandler, GenericResponse, GenericRouter, RemultServerOptions, SpecificRoute, RemultServer, InitRequestOptions } from './expressBridge';
+export { queuedJobInfo, QueueStorage, GenericRequestInfo, GenericRequestHandler, GenericResponse, GenericRouter, RemultServerOptions, SpecificRoute, RemultServer, InitRequestOptions } from './expressBridge';
 export { JsonEntityFileStorage, JsonFileDataProvider } from './JsonEntityFileStorage';
 export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-query-storage';
 export { SseSubscriptionServer } from '../SseSubscriptionServer';

package/server/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRemultServer = exports.SseSubscriptionServer = exports.DataProviderLiveQueryStorage = exports.JsonFileDataProvider = exports.JsonEntityFileStorage = void 0;
+var tslib_1 = require("tslib");
 var expressBridge_1 = require("./expressBridge");
 var initAsyncHooks_1 = require("./initAsyncHooks");
 var JsonEntityFileStorage_1 = require("./JsonEntityFileStorage");
@@ -11,7 +12,10 @@ Object.defineProperty(exports, "DataProviderLiveQueryStorage", { enumerable: tru
 var SseSubscriptionServer_1 = require("../SseSubscriptionServer");
 Object.defineProperty(exports, "SseSubscriptionServer", { enumerable: true, get: function () { return SseSubscriptionServer_1.SseSubscriptionServer; } });
 function createRemultServer(options, serverCoreOptions) {
+    var _this = this;
     initAsyncHooks_1.initAsyncHooks();
-    return expressBridge_1.createRemultServerCore(options, serverCoreOptions || { buildGenericRequest: function (req) { return req; } });
+    return expressBridge_1.createRemultServerCore(options, serverCoreOptions || { buildGenericRequestInfo: function (req) { return req; }, getRequestBody: function (req) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/, req.body];
+        }); }); } });
 }
 exports.createRemultServer = createRemultServer;