remult 0.18.1-exp.26 → 0.18.1-exp.28

package/SseSubscriptionServer.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.clientConnection = exports.SseSubscriptionServer = void 0;
 var tslib_1 = require("tslib");
 var uuid_1 = require("uuid");
+var SseSubscriptionClient_1 = require("./src/live-query/SseSubscriptionClient");
 var SseSubscriptionServer = /** @class */ (function () {
     function SseSubscriptionServer(canUserConnectToChannel) {
         this.canUserConnectToChannel = canUserConnectToChannel;
@@ -49,7 +50,7 @@ var SseSubscriptionServer = /** @class */ (function () {
             }
             finally { if (e_1) throw e_1.error; }
         }
-        res.error({ message: "client connection not found" });
+        res.success(SseSubscriptionClient_1.ConnectionNotFoundError);
     };
     SseSubscriptionServer.prototype.publishMessage = function (channel, message) {
         var e_2, _a;

package/esm/SseSubscriptionServer.js

@@ -1,4 +1,5 @@
 import { v4 as uuid } from 'uuid';
+import { ConnectionNotFoundError } from './src/live-query/SseSubscriptionClient';
 export class SseSubscriptionServer {
     constructor(canUserConnectToChannel) {
         this.canUserConnectToChannel = canUserConnectToChannel;
@@ -32,7 +33,7 @@ export class SseSubscriptionServer {
                 }
             }
         }
-        res.error({ message: "client connection not found" });
+        res.success(ConnectionNotFoundError);
     }
     publishMessage(channel, message) {
         const data = JSON.stringify({ channel, data: message });

package/esm/myLog.d.ts

@@ -0,0 +1 @@
+export declare function writeToLog(what: any): Promise<void>;

package/esm/myLog.js

@@ -0,0 +1,5 @@
+export async function writeToLog(what) {
+    if (typeof what !== "string")
+        what = JSON.stringify(what, undefined, 2);
+    (await (import('fs'))).appendFileSync('./tmp/test.log', what + '\n');
+}

package/esm/server/expressBridge.js

@@ -194,10 +194,10 @@ export class RemultServerImplementation {
                 r.route(streamPath + '/unsubscribe').post(this.process(async (remult, req, res, origReq, origRes) => {
                     remult.subscriptionServer.subscribeToChannel(origReq.body, 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, origReq, origRes) => {
+                res.success(await remult.liveQueryStorage.keepAliveAndReturnUnknownQueryIds(origReq.body));
+            }));
         }
         this.options.entities.forEach(e => {
             let key = getEntityKey(e);

package/esm/src/context.js

@@ -196,13 +196,16 @@ export class EventSource {
     }
 }
 export async function doTransaction(remult, what) {
-    return await remult.dataProvider.transaction(async (ds) => {
+    const trans = new transactionLiveQueryPublisher(remult.liveQueryPublisher);
+    let ok = true;
+    const result = await remult.dataProvider.transaction(async (ds) => {
         remult.dataProvider = (ds);
-        const trans = new transactionLiveQueryPublisher(remult.liveQueryPublisher);
         remult.liveQueryPublisher = trans;
         await what();
-        trans.flush();
+        ok = true;
     });
+    if (ok)
+        trans.flush();
 }
 class transactionLiveQueryPublisher {
     constructor(orig) {

package/esm/src/data-providers/rest-data-provider.d.ts

@@ -36,4 +36,4 @@ export declare class RestDataProviderHttpProviderUsingFetch implements RestDataP
     }): Promise<any>;
 }
 export declare function addFilterToUrlAndReturnTrueIfSuccessful(filter: any, url: UrlBuilder): boolean;
-export declare const liveQueryAction = "liveQuery|";
+export declare const liveQueryAction = "liveQuery-";

package/esm/src/data-providers/rest-data-provider.js

@@ -239,4 +239,4 @@ export function addFilterToUrlAndReturnTrueIfSuccessful(filter, url) {
     }
     return true;
 }
-export const liveQueryAction = "liveQuery|";
+export const liveQueryAction = "liveQuery-";

package/esm/src/live-query/SseSubscriptionClient.d.ts

@@ -2,3 +2,4 @@ import { SubscriptionClient, SubscriptionClientConnection } from "./Subscription
 export declare class SseSubscriptionClient implements SubscriptionClient {
     openConnection(onReconnect: VoidFunction): Promise<SubscriptionClientConnection>;
 }
+export declare const ConnectionNotFoundError = "client connection not found";

package/esm/src/live-query/SseSubscriptionClient.js

@@ -32,7 +32,7 @@ export class SseSubscriptionClient {
                 };
             },
         };
-        return new Promise((res) => {
+        const createConnectionPromise = () => new Promise((res) => {
             createConnection();
             function createConnection() {
                 if (source)
@@ -69,11 +69,18 @@ export class SseSubscriptionClient {
                 });
             }
         });
+        return createConnectionPromise();
         async function subscribeToChannel(channel) {
-            return actionInfo.runActionWithoutBlockingUI(() => provider.post(remult.apiClient.url + '/' + streamUrl + '/subscribe', {
-                channel: channel,
-                clientId: connectionId
-            }));
+            const result = await actionInfo.runActionWithoutBlockingUI(() => {
+                return provider.post(remult.apiClient.url + '/' + streamUrl + '/subscribe', {
+                    channel: channel,
+                    clientId: connectionId
+                });
+            });
+            if (result === ConnectionNotFoundError) {
+                await createConnectionPromise();
+            }
         }
     }
 }
+export const ConnectionNotFoundError = "client connection not found";

package/myLog.d.ts

@@ -0,0 +1 @@
+export declare function writeToLog(what: any): Promise<void>;

package/myLog.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeToLog = void 0;
+var tslib_1 = require("tslib");
+function writeToLog(what) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (typeof what !== "string")
+                        what = JSON.stringify(what, undefined, 2);
+                    return [4 /*yield*/, (Promise.resolve().then(function () { return tslib_1.__importStar(require('fs')); }))];
+                case 1:
+                    (_a.sent()).appendFileSync('./tmp/test.log', what + '\n');
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+exports.writeToLog = writeToLog;

package/package.json

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

package/server/expressBridge.js

@@ -323,20 +323,20 @@ var RemultServerImplementation = /** @class */ (function () {
                         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) {
-                            case 0:
-                                _b = (_a = res).success;
-                                return [4 /*yield*/, remult.liveQueryStorage.keepAliveAndReturnUnknownQueryIds(origReq.body)];
-                            case 1:
-                                _b.apply(_a, [_c.sent()]);
-                                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) {
+                        case 0:
+                            _b = (_a = res).success;
+                            return [4 /*yield*/, remult.liveQueryStorage.keepAliveAndReturnUnknownQueryIds(origReq.body)];
+                        case 1:
+                            _b.apply(_a, [_c.sent()]);
+                            return [2 /*return*/];
+                    }
+                });
+            }); }));
         }
         this.options.entities.forEach(function (e) {
             var key = remult3_1.getEntityKey(e);

package/src/context.js

@@ -286,26 +286,32 @@ var EventSource = /** @class */ (function () {
 exports.EventSource = EventSource;
 function doTransaction(remult, what) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var trans, ok, result;
         var _this = this;
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, remult.dataProvider.transaction(function (ds) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                        var trans;
-                        return tslib_1.__generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    remult.dataProvider = (ds);
-                                    trans = new transactionLiveQueryPublisher(remult.liveQueryPublisher);
-                                    remult.liveQueryPublisher = trans;
-                                    return [4 /*yield*/, what()];
-                                case 1:
-                                    _a.sent();
-                                    trans.flush();
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); })];
-                case 1: return [2 /*return*/, _a.sent()];
+                case 0:
+                    trans = new transactionLiveQueryPublisher(remult.liveQueryPublisher);
+                    ok = true;
+                    return [4 /*yield*/, remult.dataProvider.transaction(function (ds) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            return tslib_1.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        remult.dataProvider = (ds);
+                                        remult.liveQueryPublisher = trans;
+                                        return [4 /*yield*/, what()];
+                                    case 1:
+                                        _a.sent();
+                                        ok = true;
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                case 1:
+                    result = _a.sent();
+                    if (ok)
+                        trans.flush();
+                    return [2 /*return*/];
             }
         });
     });

package/src/data-providers/rest-data-provider.d.ts

@@ -36,4 +36,4 @@ export declare class RestDataProviderHttpProviderUsingFetch implements RestDataP
     }): Promise<any>;
 }
 export declare function addFilterToUrlAndReturnTrueIfSuccessful(filter: any, url: UrlBuilder): boolean;
-export declare const liveQueryAction = "liveQuery|";
+export declare const liveQueryAction = "liveQuery-";

package/src/data-providers/rest-data-provider.js

@@ -364,4 +364,4 @@ function addFilterToUrlAndReturnTrueIfSuccessful(filter, url) {
     return true;
 }
 exports.addFilterToUrlAndReturnTrueIfSuccessful = addFilterToUrlAndReturnTrueIfSuccessful;
-exports.liveQueryAction = "liveQuery|";
+exports.liveQueryAction = "liveQuery-";

package/src/live-query/SseSubscriptionClient.d.ts

@@ -2,3 +2,4 @@ import { SubscriptionClient, SubscriptionClientConnection } from "./Subscription
 export declare class SseSubscriptionClient implements SubscriptionClient {
     openConnection(onReconnect: VoidFunction): Promise<SubscriptionClientConnection>;
 }
+export declare const ConnectionNotFoundError = "client connection not found";

package/src/live-query/SseSubscriptionClient.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SseSubscriptionClient = void 0;
+exports.ConnectionNotFoundError = exports.SseSubscriptionClient = void 0;
 var tslib_1 = require("tslib");
 var buildRestDataProvider_1 = require("../buildRestDataProvider");
 var remult_proxy_1 = require("../remult-proxy");
@@ -49,7 +49,7 @@ var SseSubscriptionClient = /** @class */ (function () {
                 });
             },
         };
-        return new Promise(function (res) {
+        var createConnectionPromise = function () { return new Promise(function (res) {
             createConnection();
             function createConnection() {
                 var _this = this;
@@ -118,14 +118,28 @@ var SseSubscriptionClient = /** @class */ (function () {
                     });
                 }); });
             }
-        });
+        }); };
+        return createConnectionPromise();
         function subscribeToChannel(channel) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
+                var result;
                 return tslib_1.__generator(this, function (_a) {
-                    return [2 /*return*/, server_action_1.actionInfo.runActionWithoutBlockingUI(function () { return provider.post(remult_proxy_1.remult.apiClient.url + '/' + SubscriptionChannel_1.streamUrl + '/subscribe', {
-                            channel: channel,
-                            clientId: connectionId
-                        }); })];
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, server_action_1.actionInfo.runActionWithoutBlockingUI(function () {
+                                return provider.post(remult_proxy_1.remult.apiClient.url + '/' + SubscriptionChannel_1.streamUrl + '/subscribe', {
+                                    channel: channel,
+                                    clientId: connectionId
+                                });
+                            })];
+                        case 1:
+                            result = _a.sent();
+                            if (!(result === exports.ConnectionNotFoundError)) return [3 /*break*/, 3];
+                            return [4 /*yield*/, createConnectionPromise()];
+                        case 2:
+                            _a.sent();
+                            _a.label = 3;
+                        case 3: return [2 /*return*/];
+                    }
                 });
             });
         }
@@ -133,3 +147,4 @@ var SseSubscriptionClient = /** @class */ (function () {
     return SseSubscriptionClient;
 }());
 exports.SseSubscriptionClient = SseSubscriptionClient;
+exports.ConnectionNotFoundError = "client connection not found";