remult 0.14.31 → 0.14.32

package/server/expressBridge.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JobsInQueueEntity = exports.EntityQueueStorage = exports.ExpressRequestBridgeToDataApiRequest = exports.SiteArea = exports.buildRemultServer = void 0;
+exports.JobsInQueueEntity = exports.EntityQueueStorage = exports.ExpressRequestBridgeToDataApiRequest = exports.buildRemultServer = void 0;
 var tslib_1 = require("tslib");
-var register_actions_on_server_1 = require("./register-actions-on-server");
-var register_entities_on_server_1 = require("./register-entities-on-server");
 var JsonEntityFileStorage_1 = require("./JsonEntityFileStorage");
 var server_action_1 = require("../src/server-action");
 var data_api_1 = require("../src/data-api");
@@ -11,7 +9,7 @@ var context_1 = require("../src/context");
 var remult3_1 = require("../src/remult3");
 var json_data_provider_1 = require("../src/data-providers/json-data-provider");
 var id_entity_1 = require("../src/id-entity");
-function buildRemultServer(app, options) {
+function buildRemultServer(options) {
     var _this = this;
     if (!options) {
         options = {};
@@ -49,37 +47,248 @@ function buildRemultServer(app, options) {
             });
         }); });
     }
-    var bridge = new ExpressBridge(app, new inProcessQueueHandler(options.queueStorage), options, dataProvider);
-    if (options.logApiEndPoints !== undefined)
-        bridge.logApiEndPoints = options.logApiEndPoints;
-    if (options.rootPath === undefined)
-        options.rootPath = context_1.Remult.apiBaseUrl;
-    var apiArea = bridge.addArea(options.rootPath);
-    if (!options.disableAutoApi) {
-        var actions = [];
+    {
+        var allControllers = [];
+        if (!options.entities)
+            options.entities = tslib_1.__spread(context_1.allEntities);
         if (options.entities)
-            actions.push.apply(actions, tslib_1.__spread(options.entities));
+            allControllers.push.apply(allControllers, tslib_1.__spread(options.entities));
         if (options.controllers)
-            actions.push.apply(actions, tslib_1.__spread(options.controllers));
-        register_actions_on_server_1.registerActionsOnServer(apiArea, actions);
-        register_entities_on_server_1.registerEntitiesOnServer(apiArea, options.entities);
+            allControllers.push.apply(allControllers, tslib_1.__spread(options.controllers));
+        options.controllers = allControllers;
     }
+    if (options.rootPath === undefined)
+        options.rootPath = context_1.Remult.apiBaseUrl;
+    server_action_1.actionInfo.runningOnServer = true;
+    var bridge = new RemultServerImplementation(new inProcessQueueHandler(options.queueStorage), options, dataProvider);
     return bridge;
 }
 exports.buildRemultServer = buildRemultServer;
 ;
-var ExpressBridge = /** @class */ (function () {
-    function ExpressBridge(app, queue, options, dataProvider) {
-        this.app = app;
+var RemultServerImplementation = /** @class */ (function () {
+    function RemultServerImplementation(queue, options, dataProvider) {
         this.queue = queue;
         this.options = options;
         this.dataProvider = dataProvider;
+        this.registeredRouter = false;
+        this.hasQueue = false;
         /* internal */
         this.backendMethodsOpenApi = [];
-        this.logApiEndPoints = true;
     }
-    ExpressBridge.prototype.openApiDoc = function (options) {
+    RemultServerImplementation.prototype.handle = function (req, gRes) {
+        if (!this.routeImpl) {
+            this.routeImpl = new RouteImplementation();
+            this.registerRouter(this.routeImpl);
+        }
+        return this.routeImpl.handle(req, gRes);
+    };
+    RemultServerImplementation.prototype.registerRouter = function (r) {
         var e_1, _a, e_2, _b;
+        var _this = this;
+        if (this.registeredRouter)
+            throw "Router already registered";
+        this.registeredRouter = true;
+        {
+            try {
+                for (var _c = tslib_1.__values(this.options.controllers), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var c = _d.value;
+                    var z = c[server_action_1.classBackendMethodsArray];
+                    if (z)
+                        try {
+                            for (var z_1 = (e_2 = void 0, tslib_1.__values(z)), z_1_1 = z_1.next(); !z_1_1.done; z_1_1 = z_1.next()) {
+                                var a = z_1_1.value;
+                                var x = a[server_action_1.serverActionField];
+                                if (!x) {
+                                    throw 'failed to set server action, did you forget the BackendMethod Decorator?';
+                                }
+                                this.addAction(x, r);
+                            }
+                        }
+                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                        finally {
+                            try {
+                                if (z_1_1 && !z_1_1.done && (_b = z_1.return)) _b.call(z_1);
+                            }
+                            finally { if (e_2) throw e_2.error; }
+                        }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            if (this.hasQueue)
+                this.addAction({
+                    __register: function (x) {
+                        x(server_action_1.Action.apiUrlForJobStatus, false, function () { return true; }, function (data, req, res) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            var job, userId;
+                            return tslib_1.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.queue.getJobInfo(data.queuedJobId)];
+                                    case 1:
+                                        job = _a.sent();
+                                        userId = undefined;
+                                        if (req === null || req === void 0 ? void 0 : req.user)
+                                            userId = req.user.id;
+                                        if (job.userId == '')
+                                            job.userId = undefined;
+                                        if (userId != job.userId)
+                                            res.forbidden();
+                                        else
+                                            res.success(job.info);
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); });
+                    }
+                }, r);
+        }
+        this.options.entities.forEach(function (e) {
+            var key = remult3_1.getEntityKey(e);
+            if (key != undefined)
+                _this.add(key, function (c) {
+                    return new data_api_1.DataApi(c.repo(e), c);
+                }, r);
+        });
+    };
+    RemultServerImplementation.prototype.add = function (key, dataApiFactory, r) {
+        var _this = this;
+        var myRoute = this.options.rootPath + '/' + key;
+        if (this.options.logApiEndPoints)
+            console.log(myRoute);
+        r.route(myRoute)
+            .get(this.process(function (c, req, res) {
+            return dataApiFactory(c).httpGet(res, req);
+        })).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)];
+        }); }); }))
+            .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 () { return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/, dataApiFactory(c).httpPost(res, req, orig.body)];
+        }); }); }));
+        r.route(myRoute + '/:id')
+            //@ts-ignore
+            .get(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).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)];
+        }); }); }))
+            //@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) {
+            return [2 /*return*/, dataApiFactory(c).delete(res, orig.params.id)];
+        }); }); }));
+    };
+    RemultServerImplementation.prototype.process = function (what) {
+        var _this = this;
+        return function (req, res) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var myReq, myRes, remult, _a, _b, user;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        myReq = new ExpressRequestBridgeToDataApiRequest(req);
+                        myRes = new ExpressResponseBridgeToDataApiResponse(res, req);
+                        remult = new context_1.Remult();
+                        _b = (_a = remult).setDataProvider;
+                        return [4 /*yield*/, this.dataProvider];
+                    case 1:
+                        _b.apply(_a, [_c.sent()]);
+                        if (!req) return [3 /*break*/, 5];
+                        user = void 0;
+                        if (!this.options.getUser) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.options.getUser(req)];
+                    case 2:
+                        user = _c.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        user = req['user'];
+                        if (!user)
+                            user = req['auth'];
+                        _c.label = 4;
+                    case 4:
+                        if (user)
+                            remult.setUser(user);
+                        _c.label = 5;
+                    case 5:
+                        if (!this.options.initRequest) return [3 /*break*/, 7];
+                        return [4 /*yield*/, this.options.initRequest(remult, req)];
+                    case 6:
+                        _c.sent();
+                        _c.label = 7;
+                    case 7:
+                        what(remult, myReq, myRes, req);
+                        return [2 /*return*/];
+                }
+            });
+        }); };
+    };
+    ;
+    RemultServerImplementation.prototype.getRemult = function (req) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var remult;
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.process(function (c) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            return tslib_1.__generator(this, function (_a) {
+                                remult = c;
+                                return [2 /*return*/];
+                            });
+                        }); })(req, undefined)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/, remult];
+                }
+            });
+        });
+    };
+    RemultServerImplementation.prototype.addAction = function (action, r) {
+        var _this = this;
+        action.__register(function (url, queue, allowed, what) {
+            var myUrl = _this.options.rootPath + '/' + url;
+            var tag = (function () {
+                var split = url.split('/');
+                if (split.length == 1)
+                    return 'Static Backend Methods';
+                else
+                    return split[0];
+            })();
+            _this.backendMethodsOpenApi.push({ path: myUrl, allowed: allowed, tag: tag });
+            if (_this.options.logApiEndPoints)
+                console.log(myUrl);
+            if (queue) {
+                _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) {
+                        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);
+                            res.success(r_1);
+                            return [3 /*break*/, 3];
+                        case 2: return [2 /*return*/, what(orig.body, remult, res)];
+                        case 3: return [2 /*return*/];
+                    }
+                });
+            }); }));
+        });
+    };
+    RemultServerImplementation.prototype.openApiDoc = function (options) {
+        var e_3, _a, e_4, _b;
         var r = new context_1.Remult();
         if (!options.version)
             options.version = "1.0.0";
@@ -130,14 +339,14 @@ var ExpressBridge = /** @class */ (function () {
             }
         };
         var _loop_1 = function (e) {
-            var e_3, _a;
+            var e_5, _a;
             var meta = r.repo(e).metadata;
             var key = remult3_1.getEntityKey(e);
             var parameters = [];
             if (key) {
                 var properties = {};
                 try {
-                    for (var _b = (e_3 = void 0, tslib_1.__values(meta.fields)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    for (var _b = (e_5 = void 0, tslib_1.__values(meta.fields)), _c = _b.next(); !_c.done; _c = _b.next()) {
                         var f = _c.value;
                         var type = f.valueType == String ? "string" :
                             f.valueType == Boolean ? "boolean" :
@@ -165,12 +374,12 @@ var ExpressBridge = /** @class */ (function () {
                         });
                     }
                 }
-                catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
                 finally {
                     try {
                         if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                     }
-                    finally { if (e_3) throw e_3.error; }
+                    finally { if (e_5) throw e_5.error; }
                 }
                 spec.components.schemas[key] = {
                     type: "object",
@@ -308,21 +517,21 @@ var ExpressBridge = /** @class */ (function () {
             }
         };
         try {
-            for (var allEntities_1 = tslib_1.__values(context_1.allEntities), allEntities_1_1 = allEntities_1.next(); !allEntities_1_1.done; allEntities_1_1 = allEntities_1.next()) {
-                var e = allEntities_1_1.value;
+            for (var _c = tslib_1.__values(this.options.entities), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var e = _d.value;
                 _loop_1(e);
             }
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
-                if (allEntities_1_1 && !allEntities_1_1.done && (_a = allEntities_1.return)) _a.call(allEntities_1);
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_1) throw e_1.error; }
+            finally { if (e_3) throw e_3.error; }
         }
         try {
-            for (var _c = tslib_1.__values(this.backendMethodsOpenApi), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var b = _d.value;
+            for (var _e = tslib_1.__values(this.backendMethodsOpenApi), _f = _e.next(); !_f.done; _f = _e.next()) {
+                var b = _f.value;
                 spec.paths[b.path] = {
                     post: secureBase(b.allowed, false, {
                         "produces": ["application/json"],
@@ -361,12 +570,12 @@ var ExpressBridge = /** @class */ (function () {
                 };
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
         finally {
             try {
-                if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_4) throw e_4.error; }
         }
         spec.components.schemas["InvalidResponse"] = {
             "type": "object",
@@ -381,193 +590,8 @@ var ExpressBridge = /** @class */ (function () {
         };
         return spec;
     };
-    ExpressBridge.prototype.addArea = function (rootUrl) {
-        var r = new SiteArea(this, this.app, rootUrl, this.logApiEndPoints);
-        if (!this.firstArea) {
-            this.firstArea = r;
-        }
-        return r;
-    };
-    ExpressBridge.prototype.getRemult = function (req) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.firstArea.getRemult(req)];
-            });
-        });
-    };
-    return ExpressBridge;
+    return RemultServerImplementation;
 }());
-var SiteArea = /** @class */ (function () {
-    function SiteArea(bridge, app, rootUrl, logApiEndpoints) {
-        this.bridge = bridge;
-        this.app = app;
-        this.rootUrl = rootUrl;
-        this.logApiEndpoints = logApiEndpoints;
-    }
-    SiteArea.prototype.add = function (key, dataApiFactory) {
-        var _this = this;
-        var myRoute = this.rootUrl + '/' + key;
-        if (this.logApiEndpoints)
-            console.log(myRoute);
-        this.app.route(myRoute)
-            .get(this.process(function (c, req, res) {
-            return dataApiFactory(c).httpGet(res, req);
-        })).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)];
-        }); }); }))
-            .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 () { return tslib_1.__generator(this, function (_a) {
-            return [2 /*return*/, dataApiFactory(c).httpPost(res, req, orig.body)];
-        }); }); }));
-        this.app.route(myRoute + '/:id')
-            //@ts-ignore
-            .get(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).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)];
-        }); }); }))
-            //@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) {
-            return [2 /*return*/, dataApiFactory(c).delete(res, orig.params.id)];
-        }); }); }));
-    };
-    SiteArea.prototype.process = function (what) {
-        var _this = this;
-        return function (req, res) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var myReq, myRes, remult, _a, _b, user;
-            return tslib_1.__generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        myReq = new ExpressRequestBridgeToDataApiRequest(req);
-                        myRes = new ExpressResponseBridgeToDataApiResponse(res, req);
-                        remult = new context_1.Remult();
-                        _b = (_a = remult).setDataProvider;
-                        return [4 /*yield*/, this.bridge.dataProvider];
-                    case 1:
-                        _b.apply(_a, [_c.sent()]);
-                        if (!req) return [3 /*break*/, 5];
-                        user = void 0;
-                        if (!this.bridge.options.getUser) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.bridge.options.getUser(req)];
-                    case 2:
-                        user = _c.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        user = req['user'];
-                        if (!user)
-                            user = req['auth'];
-                        _c.label = 4;
-                    case 4:
-                        if (user)
-                            remult.setUser(user);
-                        _c.label = 5;
-                    case 5:
-                        if (!this.bridge.options.initRequest) return [3 /*break*/, 7];
-                        return [4 /*yield*/, this.bridge.options.initRequest(remult, req)];
-                    case 6:
-                        _c.sent();
-                        _c.label = 7;
-                    case 7:
-                        what(remult, myReq, myRes, req);
-                        return [2 /*return*/];
-                }
-            });
-        }); };
-    };
-    ;
-    SiteArea.prototype.getRemult = function (req) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var remult;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.process(function (c) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                            return tslib_1.__generator(this, function (_a) {
-                                remult = c;
-                                return [2 /*return*/];
-                            });
-                        }); })(req, undefined)];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/, remult];
-                }
-            });
-        });
-    };
-    SiteArea.prototype.initQueue = function () {
-        var _this = this;
-        this.addAction({
-            __register: function (x) {
-                x(server_action_1.Action.apiUrlForJobStatus, false, function () { return true; }, function (data, req, res) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                    var job, userId;
-                    return tslib_1.__generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, this.bridge.queue.getJobInfo(data.queuedJobId)];
-                            case 1:
-                                job = _a.sent();
-                                userId = undefined;
-                                if (req === null || req === void 0 ? void 0 : req.user)
-                                    userId = req.user.id;
-                                if (job.userId == '')
-                                    job.userId = undefined;
-                                if (userId != job.userId)
-                                    res.forbidden();
-                                else
-                                    res.success(job.info);
-                                return [2 /*return*/];
-                        }
-                    });
-                }); });
-            }
-        });
-        this.initQueue = function () { };
-    };
-    SiteArea.prototype.addAction = function (action) {
-        var _this = this;
-        action.__register(function (url, queue, allowed, what) {
-            var myUrl = _this.rootUrl + '/' + url;
-            var tag = (function () {
-                var split = url.split('/');
-                if (split.length == 1)
-                    return 'Static Backend Methods';
-                else
-                    return split[0];
-            })();
-            _this.bridge.backendMethodsOpenApi.push({ path: myUrl, allowed: allowed, tag: tag });
-            if (_this.logApiEndpoints)
-                console.log(myUrl);
-            if (queue) {
-                _this.initQueue();
-                _this.bridge.queue.mapQueuedAction(myUrl, what);
-            }
-            _this.app.route(myUrl).post(_this.process(function (remult, req, res, orig) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var r;
-                var _a;
-                return tslib_1.__generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            if (!queue) return [3 /*break*/, 2];
-                            _a = {};
-                            return [4 /*yield*/, this.bridge.queue.submitJob(myUrl, remult, orig.body)];
-                        case 1:
-                            r = (_a.queuedJobId = _b.sent(),
-                                _a);
-                            res.success(r);
-                            return [3 /*break*/, 3];
-                        case 2: return [2 /*return*/, what(orig.body, remult, res)];
-                        case 3: return [2 /*return*/];
-                    }
-                });
-            }); }));
-        });
-    };
-    return SiteArea;
-}());
-exports.SiteArea = SiteArea;
 var ExpressRequestBridgeToDataApiRequest = /** @class */ (function () {
     function ExpressRequestBridgeToDataApiRequest(r) {
         this.r = r;
@@ -815,6 +839,121 @@ var EntityQueueStorage = /** @class */ (function () {
     return EntityQueueStorage;
 }());
 exports.EntityQueueStorage = EntityQueueStorage;
+var RouteImplementation = /** @class */ (function () {
+    function RouteImplementation() {
+        this.map = new Map();
+    }
+    RouteImplementation.prototype.route = function (path) {
+        //consider using:
+        //* https://raw.githubusercontent.com/cmorten/opine/main/src/utils/pathToRegex.ts
+        //* https://github.com/pillarjs/path-to-regexp
+        var r = path.toLowerCase();
+        var m = new Map();
+        this.map.set(r, m);
+        var route = {
+            get: function (h) {
+                m.set("get", h);
+                return route;
+            },
+            put: function (h) {
+                m.set("put", h);
+                return route;
+            },
+            post: function (h) {
+                m.set("post", h);
+                return route;
+            },
+            delete: function (h) {
+                m.set("delete", h);
+                return route;
+            }
+        };
+        return route;
+    };
+    RouteImplementation.prototype.handle = function (req, gRes) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                return [2 /*return*/, new Promise(function (res) {
+                        var response = new /** @class */ (function () {
+                            function class_1() {
+                                this.statusCode = 200;
+                            }
+                            class_1.prototype.json = function (data) {
+                                if (gRes !== undefined)
+                                    gRes.json(data);
+                                res({ statusCode: this.statusCode, data: data });
+                            };
+                            class_1.prototype.status = function (statusCode) {
+                                if (gRes !== undefined)
+                                    gRes.status(statusCode);
+                                this.statusCode = statusCode;
+                                return this;
+                            };
+                            class_1.prototype.end = function () {
+                                if (gRes !== undefined)
+                                    gRes.end();
+                                res({
+                                    statusCode: this.statusCode
+                                });
+                            };
+                            return class_1;
+                        }());
+                        _this.middleware(req, response, function () { return res(undefined); });
+                    })];
+            });
+        });
+    };
+    RouteImplementation.prototype.middleware = function (req, res, next) {
+        var theUrl = req.url;
+        if (theUrl.startsWith('/')) //next sends a partial url '/api/tasks' and not the full url
+            theUrl = 'http://stam' + theUrl;
+        var url = new URL(theUrl);
+        var path = url.pathname;
+        if (!req.query) {
+            var query_1 = {};
+            url.searchParams.forEach(function (val, key) {
+                var current = query_1[key];
+                if (!current) {
+                    query_1[key] = val;
+                    return;
+                }
+                if (Array.isArray(current)) {
+                    current.push(val);
+                    return;
+                }
+                query_1[key] = [current, val];
+            });
+            req.query = query_1;
+        }
+        var lowerPath = path.toLowerCase();
+        var m = this.map.get(lowerPath);
+        if (m) {
+            var h = m.get(req.method.toLowerCase());
+            if (h) {
+                h(req, res, next);
+                return;
+            }
+        }
+        var idPosition = path.lastIndexOf('/');
+        if (idPosition >= 0) {
+            lowerPath = path.substring(0, idPosition) + '/:id';
+            m = this.map.get(lowerPath);
+            if (m) {
+                var h = m.get(req.method.toLowerCase());
+                if (h) {
+                    if (!req.params)
+                        req.params = {};
+                    req.params.id = path.substring(idPosition + 1);
+                    h(req, res, next);
+                    return;
+                }
+            }
+        }
+        next();
+    };
+    return RouteImplementation;
+}());
 var JobsInQueueEntity = /** @class */ (function (_super) {
     tslib_1.__extends(JobsInQueueEntity, _super);
     function JobsInQueueEntity() {

package/server/index.d.ts

@@ -1,4 +1,2 @@
 export { JsonEntityFileStorage } from './JsonEntityFileStorage';
-export { SiteArea, queuedJobInfo, QueueStorage } from './expressBridge';
-export { registerEntitiesOnServer } from './register-entities-on-server';
-export { registerActionsOnServer } from './register-actions-on-server';
+export { queuedJobInfo, QueueStorage, GenericRequest, GenericRequestHandler, GenericResponse, GenericRouter, buildRemultServer, RemultServerOptions, SpecificRoute, RemultServer } from './expressBridge';