remult 3.3.18 → 3.4.0-next.1

package/esm/src/remult3/remult3.js

@@ -16,6 +16,12 @@ const wnn = [
 ];
 export const flags = {
     error500RetryCount: 4,
+    /** Client treats SSE as dead if no event for this long */
+    sseStaleMs: 20_000,
+    /** HTTP keep-alive while SSE is healthy (touches lastUsed) */
+    liveQueryKeepAliveMs: 30_000,
+    /** Version poll while SSE is stale */
+    liveQueryPollWhenStaleMs: 1_000,
 };
 /*p1 - issues in https://stackblitz.com/edit/demo-allow-delete-based-on-other-entity:
   - don't like the ensure schema

package/live-query/data-provider-live-query-storage.d.ts

@@ -13,7 +13,10 @@ export declare class DataProviderLiveQueryStorage implements LiveQueryStorage, S
         query: StoredQuery;
         setData(data: any): Promise<void>;
     }) => Promise<void>): Promise<void>;
-    keepAliveAndReturnUnknownQueryIds(queryIds: string[]): Promise<string[]>;
+    keepAliveAndReturnUnknownQueryIds(queryIds: string[]): Promise<{
+        unknownQueryIds: string[];
+        versions: Record<string, number>;
+    }>;
 }
 export declare class LiveQueryStorageEntity extends EntityBase {
     id: string;

package/live-query/data-provider-live-query-storage.js

@@ -170,46 +170,49 @@ var DataProviderLiveQueryStorage = /** @class */ (function () {
     };
     DataProviderLiveQueryStorage.prototype.keepAliveAndReturnUnknownQueryIds = function (queryIds) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var repo, _loop_2, _a, _b, query, e_2_1;
+            var repo, versions, _loop_2, _a, _b, query, e_2_1;
             var e_2, _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+            var _d, _e;
+            return tslib_1.__generator(this, function (_f) {
+                switch (_f.label) {
                     case 0: return [4 /*yield*/, this.repo];
                     case 1:
-                        repo = _d.sent();
+                        repo = _f.sent();
+                        versions = {};
                         _loop_2 = function (query) {
-                            return tslib_1.__generator(this, function (_e) {
-                                switch (_e.label) {
+                            return tslib_1.__generator(this, function (_g) {
+                                switch (_g.label) {
                                     case 0:
                                         query.lastUsedIso = new Date().toISOString();
                                         return [4 /*yield*/, repo.save(query)];
                                     case 1:
-                                        _e.sent();
+                                        _g.sent();
+                                        versions[query.id] = (_e = (_d = query.data) === null || _d === void 0 ? void 0 : _d.version) !== null && _e !== void 0 ? _e : 0;
                                         queryIds = queryIds.filter(function (x) { return x !== query.id; });
                                         return [2 /*return*/];
                                 }
                             });
                         };
-                        _d.label = 2;
+                        _f.label = 2;
                     case 2:
-                        _d.trys.push([2, 8, 9, 10]);
+                        _f.trys.push([2, 8, 9, 10]);
                         return [4 /*yield*/, repo.find({ where: { id: queryIds } })];
                     case 3:
-                        _a = tslib_1.__values.apply(void 0, [_d.sent()]), _b = _a.next();
-                        _d.label = 4;
+                        _a = tslib_1.__values.apply(void 0, [_f.sent()]), _b = _a.next();
+                        _f.label = 4;
                     case 4:
                         if (!!_b.done) return [3 /*break*/, 7];
                         query = _b.value;
                         return [5 /*yield**/, _loop_2(query)];
                     case 5:
-                        _d.sent();
-                        _d.label = 6;
+                        _f.sent();
+                        _f.label = 6;
                     case 6:
                         _b = _a.next();
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_2_1 = _d.sent();
+                        e_2_1 = _f.sent();
                         e_2 = { error: e_2_1 };
                         return [3 /*break*/, 10];
                     case 9:
@@ -218,7 +221,7 @@ var DataProviderLiveQueryStorage = /** @class */ (function () {
                         }
                         finally { if (e_2) throw e_2.error; }
                         return [7 /*endfinally*/];
-                    case 10: return [2 /*return*/, queryIds];
+                    case 10: return [2 /*return*/, { unknownQueryIds: queryIds, versions: versions }];
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "3.3.18",
+    "version": "3.4.0-next.1",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/remult-knex/index.d.ts

@@ -20,12 +20,12 @@ export declare class KnexDataProvider implements DataProvider, HasWrapIdentifier
     static rawFilter(build: CustomKnexFilterBuilderFunction): EntityFilter<any>;
     static filterToRaw<entityType>(entity: RepositoryOverloads<entityType>, condition: EntityFilter<entityType>, wrapIdentifier?: (name: string) => string): Promise<(knex: Knex.QueryBuilder) => void>;
     isProxy?: boolean;
-    ensureSchema(entities: EntityMetadata<any>[]): Promise<void>;
+    ensureSchema(entities: EntityMetadata[]): Promise<void>;
 }
 export type CustomKnexFilterBuilderFunction = () => Promise<(builder: Knex.QueryBuilder) => void>;
 export declare class KnexSchemaBuilder {
     private knex;
-    ensureSchema(entities: EntityMetadata<any>[]): Promise<void>;
+    ensureSchema(entities: EntityMetadata[]): Promise<void>;
     createIfNotExist(entity: EntityMetadata): Promise<void>;
     createTableKnexCommand(entity: EntityMetadata, e: EntityDbNamesBase): Knex.SchemaBuilder;
     addColumnIfNotExist(entity: EntityMetadata, c: (e: EntityMetadata) => FieldMetadata): Promise<void>;

package/server/remult-api-server.js

@@ -482,16 +482,20 @@ var RemultServerImplementation = /** @class */ (function () {
                 }); }));
             }
             r.route(this.options.rootPath + '/' + SubscriptionChannel_js_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;
-                            _d = (_c = remult.liveQueryStorage).keepAliveAndReturnUnknownQueryIds;
-                            return [4 /*yield*/, this.coreOptions.getRequestBody(origReq)];
-                        case 1: return [4 /*yield*/, _d.apply(_c, [_e.sent()])];
+                var body, queryIds, result;
+                var _a;
+                return tslib_1.__generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.coreOptions.getRequestBody(origReq)];
+                        case 1:
+                            body = _b.sent();
+                            queryIds = Array.isArray(body)
+                                ? body
+                                : ((_a = body === null || body === void 0 ? void 0 : body.queryIds) !== null && _a !== void 0 ? _a : []);
+                            return [4 /*yield*/, remult.liveQueryStorage.keepAliveAndReturnUnknownQueryIds(queryIds)];
                         case 2:
-                            _b.apply(_a, [_e.sent()]);
+                            result = _b.sent();
+                            res.success(Array.isArray(body) ? result.unknownQueryIds : result);
                             return [2 /*return*/];
                     }
                 });

package/src/column-interfaces.d.ts

@@ -276,6 +276,7 @@ export interface ValueConverter<valueType> {
     toJson?(val: valueType): any;
     /**
      * Converts a value from the database format to the valueType.
+     * Defaults to `fromJson` when not provided.
      *
      * @param val The value to convert.
      * @returns The converted value.
@@ -286,6 +287,7 @@ export interface ValueConverter<valueType> {
     fromDb?(val: any): valueType;
     /**
      * Converts a value of valueType to the database format.
+     * Defaults to `toJson` when not provided.
      *
      * @param val The value to convert.
      * @returns The converted value.
@@ -297,6 +299,7 @@ export interface ValueConverter<valueType> {
     toDbSql?(val: string): string;
     /**
      * Converts a value of valueType to a string suitable for an HTML input element.
+     * Defaults to `toJson` when not provided.
      *
      * @param val The value to convert.
      * @param inputType The type of the input element (optional).
@@ -308,6 +311,7 @@ export interface ValueConverter<valueType> {
     toInput?(val: valueType, inputType?: string): string;
     /**
      * Converts a string from an HTML input element to the valueType.
+     * Defaults to `fromJson` when not provided.
      *
      * @param val The value to convert.
      * @param inputType The type of the input element (optional).

package/src/data-api.js

@@ -687,6 +687,7 @@ var DataApi = /** @class */ (function () {
                         data = (_a.requestJson = _b.sent(),
                             _a.findOptionsJson = (0, rest_data_provider_js_1.findOptionsToJson)(r.findOptions, this.repository.metadata),
                             _a.lastIds = r.r.map(function (y) { return _this.repository.metadata.idMetadata.getId(y); }),
+                            _a.version = 0,
                             _a);
                         return [4 /*yield*/, this.remult.liveQueryStorage.add({
                                 entityKey: this.repository.metadata.key,

package/src/live-query/LiveQueryClient.js

@@ -5,6 +5,7 @@ var tslib_1 = require("tslib");
 var buildRestDataProvider_js_1 = require("../buildRestDataProvider.js");
 var rest_data_provider_js_1 = require("../data-providers/rest-data-provider.js");
 var remult_static_js_1 = require("../remult-static.js");
+var remult3_js_1 = require("../remult3/remult3.js");
 var repository_internals_js_1 = require("../remult3/repository-internals.js");
 var SubscriptionChannel_js_1 = require("./SubscriptionChannel.js");
 /* @internal*/
@@ -14,6 +15,9 @@ var LiveQueryClient = /** @class */ (function () {
         this.getUserId = getUserId;
         this.queries = new Map();
         this.channels = new Map();
+        this.lastKeepAliveAt = 0;
+        this.keepAliveBackoffMs = remult3_js_1.flags.liveQueryPollWhenStaleMs;
+        this.detachForeground = function () { };
     }
     LiveQueryClient.prototype.wrapMessageHandling = function (handleMessage) {
         var x = this.apiProvider().wrapMessageHandling;
@@ -31,6 +35,7 @@ var LiveQueryClient = /** @class */ (function () {
     LiveQueryClient.prototype.close = function () {
         this.queries.clear();
         this.channels.clear();
+        this.detachForeground();
         this.closeIfNoListeners();
     };
     LiveQueryClient.prototype.subscribeChannel = function (key, onResult) {
@@ -88,13 +93,15 @@ var LiveQueryClient = /** @class */ (function () {
         });
     };
     LiveQueryClient.prototype.closeIfNoListeners = function () {
-        if (this.client)
-            if (this.queries.size === 0 && this.channels.size === 0) {
-                this.runPromise(this.client.then(function (x) { return x.close(); }));
-                this.client = undefined;
-                clearInterval(this.interval);
-                this.interval = undefined;
-            }
+        if (this.queries.size === 0 && this.channels.size === 0) {
+            if (this.client)
+                this.runPromise(this.client.then(function (x) { return x.close(); }).catch(function () { }));
+            this.client = undefined;
+            this.openedConnection = undefined;
+            this.detachForeground();
+            clearInterval(this.interval);
+            this.interval = undefined;
+        }
     };
     LiveQueryClient.prototype.subscribe = function (repo, options, listener) {
         var _this = this;
@@ -115,43 +122,56 @@ var LiveQueryClient = /** @class */ (function () {
             if (!q) {
                 _this.queries.set(eventTypeKey, (q = new SubscriptionChannel_js_1.LiveQuerySubscriber(repo, { entityKey: repo.metadata.key, options: options }, _this.getUserId())));
                 q.subscribeCode = function () {
-                    if (q.unsubscribe) {
-                        q.unsubscribe();
+                    q.unsubscribeChannel();
+                    var unsubscribeToChannel = function () { };
+                    q.unsubscribeChannel = function () {
+                        unsubscribeToChannel();
+                        unsubscribeToChannel = function () { };
+                    };
+                    q.unsubscribe = function () {
                         q.unsubscribe = function () { };
-                    }
+                        q.unsubscribeChannel();
+                        q.unsubscribeQuery();
+                    };
+                    var snapshotDone = false;
+                    var applySnapshot = function (r) {
+                        if (q.listeners.length === 0) {
+                            r.unsubscribe();
+                            return;
+                        }
+                        q.unsubscribeQuery = function () {
+                            _this.runPromise(r.unsubscribe());
+                        };
+                        snapshotDone = true;
+                        return _this.runPromise(q.setAllItems(r.result));
+                    };
                     _this.runPromise(_this.subscribeChannel(q.queryChannel, {
                         next: function (value) { return _this.runPromise(q.handle(value)); },
                         complete: function () { },
                         error: function (er) {
                             q.listeners.forEach(function (l) { return l.error(er); });
                         },
-                    }).then(function (unsubscribeToChannel) {
+                    })
+                        .then(function (unsub) {
                         if (q.listeners.length == 0) {
-                            unsubscribeToChannel();
+                            unsub();
                             return;
                         }
-                        _this.runPromise(subscribe(q.queryChannel)
-                            .then(function (r) {
-                            if (q.listeners.length === 0) {
-                                r.unsubscribe();
-                                unsubscribeToChannel();
-                                return;
-                            }
-                            _this.runPromise(q.setAllItems(r.result));
-                            q.unsubscribe = function () {
-                                q.unsubscribe = function () { };
-                                unsubscribeToChannel();
-                                _this.runPromise(r.unsubscribe());
-                            };
-                        })
-                            .catch(function (err) {
-                            q.listeners.forEach(function (l) { return l.error(err); });
-                            unsubscribeToChannel();
-                            _this.queries.delete(eventTypeKey);
-                        }));
-                    })).catch(function (err) {
+                        unsubscribeToChannel = unsub;
+                        if (snapshotDone)
+                            return _this.runPromise(_this.runKeepAlive({ checkVersions: true }));
+                    })
+                        .catch(function (err) {
+                        q.listeners.forEach(function (l) { return l.error(err); });
+                    }));
+                    _this.runPromise(subscribe(q.queryChannel)
+                        .then(applySnapshot)
+                        .catch(function (err) {
                         q.listeners.forEach(function (l) { return l.error(err); });
-                    });
+                        unsubscribeToChannel();
+                        _this.queries.delete(eventTypeKey);
+                        _this.closeIfNoListeners();
+                    }));
                 };
                 q.subscribeCode();
             }
@@ -176,84 +196,182 @@ var LiveQueryClient = /** @class */ (function () {
             onUnsubscribe();
         };
     };
-    LiveQueryClient.prototype.openIfNoOpened = function () {
-        var _this = this;
-        if (!this.client) {
-            this.interval = setInterval(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var ids, _a, _b, q, p_1, invalidIds, _c, invalidIds_1, invalidIds_1_1, id, _d, _e, q;
-                var e_1, _f, e_2, _g, e_3, _h;
-                return tslib_1.__generator(this, function (_j) {
-                    switch (_j.label) {
-                        case 0:
-                            ids = [];
+    LiveQueryClient.prototype.isSseStale = function () {
+        var conn = this.openedConnection;
+        if (!conn || conn.lastServerEvent === undefined)
+            return false;
+        return Date.now() - conn.lastServerEvent > remult3_js_1.flags.sseStaleMs;
+    };
+    LiveQueryClient.prototype.runKeepAlive = function (opts) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                if (this.keepAliveInFlight)
+                    return [2 /*return*/, this.keepAliveInFlight];
+                this.keepAliveInFlight = this.sendKeepAlive(opts).finally(function () {
+                    _this.keepAliveInFlight = undefined;
+                });
+                return [2 /*return*/, this.keepAliveInFlight];
+            });
+        });
+    };
+    LiveQueryClient.prototype.sendKeepAlive = function (opts) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var ids, _a, _b, q, p, raw, unknownIds, versions, stale, reloaded, _c, _d, q, serverVersion, unknown, mismatch;
+            var e_1, _e, e_2, _f;
+            var _g, _h;
+            return tslib_1.__generator(this, function (_j) {
+                switch (_j.label) {
+                    case 0:
+                        ids = [];
+                        try {
+                            for (_a = tslib_1.__values(this.queries.values()), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                q = _b.value;
+                                ids.push(q.queryChannel);
+                            }
+                        }
+                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                        finally {
                             try {
-                                for (_a = tslib_1.__values(this.queries.values()), _b = _a.next(); !_b.done; _b = _a.next()) {
-                                    q = _b.value;
-                                    ids.push(q.queryChannel);
-                                }
+                                if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                             }
-                            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                            finally {
-                                try {
-                                    if (_b && !_b.done && (_f = _a.return)) _f.call(_a);
+                            finally { if (e_1) throw e_1.error; }
+                        }
+                        if (ids.length === 0)
+                            return [2 /*return*/];
+                        p = this.apiProvider();
+                        return [4 /*yield*/, this.runPromise(remult_static_js_1.remultStatic.actionInfo.runActionWithoutBlockingUI(function () {
+                                return (0, buildRestDataProvider_js_1.buildRestDataProvider)(p.httpClient).post(p.url + '/' + SubscriptionChannel_js_1.liveQueryKeepAliveRoute, { queryIds: ids });
+                            }))];
+                    case 1:
+                        raw = _j.sent();
+                        unknownIds = Array.isArray(raw)
+                            ? raw
+                            : ((_g = raw === null || raw === void 0 ? void 0 : raw.unknownQueryIds) !== null && _g !== void 0 ? _g : []);
+                        versions = Array.isArray(raw)
+                            ? {}
+                            : ((_h = raw === null || raw === void 0 ? void 0 : raw.versions) !== null && _h !== void 0 ? _h : {});
+                        stale = (opts === null || opts === void 0 ? void 0 : opts.checkVersions) || this.isSseStale();
+                        reloaded = false;
+                        try {
+                            for (_c = tslib_1.__values(this.queries.values()), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                q = _d.value;
+                                serverVersion = versions[q.queryChannel];
+                                unknown = unknownIds.includes(q.queryChannel);
+                                mismatch = stale && serverVersion !== undefined && serverVersion !== q.version;
+                                if (unknown || mismatch) {
+                                    reloaded = true;
+                                    if (serverVersion !== undefined)
+                                        q.version = serverVersion;
+                                    q.subscribeCode();
                                 }
-                                finally { if (e_1) throw e_1.error; }
                             }
-                            if (!(ids.length > 0)) return [3 /*break*/, 3];
-                            p_1 = this.apiProvider();
-                            _c = this.runPromise;
-                            return [4 /*yield*/, remult_static_js_1.remultStatic.actionInfo.runActionWithoutBlockingUI(function () {
-                                    return (0, buildRestDataProvider_js_1.buildRestDataProvider)(p_1.httpClient).post(p_1.url + '/' + SubscriptionChannel_js_1.liveQueryKeepAliveRoute, ids);
-                                })];
-                        case 1: return [4 /*yield*/, _c.apply(this, [_j.sent()])];
-                        case 2:
-                            invalidIds = _j.sent();
+                        }
+                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                        finally {
                             try {
-                                for (invalidIds_1 = tslib_1.__values(invalidIds), invalidIds_1_1 = invalidIds_1.next(); !invalidIds_1_1.done; invalidIds_1_1 = invalidIds_1.next()) {
-                                    id = invalidIds_1_1.value;
-                                    try {
-                                        for (_d = (e_3 = void 0, tslib_1.__values(this.queries.values())), _e = _d.next(); !_e.done; _e = _d.next()) {
-                                            q = _e.value;
-                                            if (q.queryChannel === id)
-                                                q.subscribeCode();
-                                        }
-                                    }
-                                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
-                                    finally {
-                                        try {
-                                            if (_e && !_e.done && (_h = _d.return)) _h.call(_d);
-                                        }
-                                        finally { if (e_3) throw e_3.error; }
-                                    }
-                                }
-                            }
-                            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                            finally {
-                                try {
-                                    if (invalidIds_1_1 && !invalidIds_1_1.done && (_g = invalidIds_1.return)) _g.call(invalidIds_1);
-                                }
-                                finally { if (e_2) throw e_2.error; }
+                                if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
                             }
-                            _j.label = 3;
-                        case 3: return [2 /*return*/];
-                    }
-                });
-            }); }, 30000);
-            return this.runPromise((this.client = this.apiProvider().subscriptionClient.openConnection(function () {
-                var e_4, _a;
+                            finally { if (e_2) throw e_2.error; }
+                        }
+                        if (this.isSseStale()) {
+                            this.keepAliveBackoffMs = reloaded
+                                ? remult3_js_1.flags.liveQueryPollWhenStaleMs
+                                : Math.min(this.keepAliveBackoffMs * 2, remult3_js_1.flags.liveQueryKeepAliveMs);
+                        }
+                        else {
+                            this.keepAliveBackoffMs = remult3_js_1.flags.liveQueryPollWhenStaleMs;
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    LiveQueryClient.prototype.maybeKeepAlive = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var stale, interval;
+            var _a, _b;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        stale = this.isSseStale();
+                        if (!stale)
+                            this.keepAliveBackoffMs = remult3_js_1.flags.liveQueryPollWhenStaleMs;
+                        interval = stale
+                            ? this.keepAliveBackoffMs
+                            : remult3_js_1.flags.liveQueryKeepAliveMs;
+                        if (Date.now() - this.lastKeepAliveAt < interval)
+                            return [2 /*return*/];
+                        this.lastKeepAliveAt = Date.now();
+                        if (stale)
+                            (_b = (_a = this.openedConnection) === null || _a === void 0 ? void 0 : _a.resume) === null || _b === void 0 ? void 0 : _b.call(_a, true);
+                        return [4 /*yield*/, this.runKeepAlive()];
+                    case 1:
+                        _c.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    LiveQueryClient.prototype.attachForeground = function () {
+        var _this = this;
+        this.detachForeground();
+        var unsub = (0, SubscriptionChannel_js_1.onBrowserForeground)(function () {
+            var _a, _b;
+            (_b = (_a = _this.openedConnection) === null || _a === void 0 ? void 0 : _a.resume) === null || _b === void 0 ? void 0 : _b.call(_a);
+            if (_this.foregroundKeepAliveTimer !== undefined)
+                clearTimeout(_this.foregroundKeepAliveTimer);
+            _this.foregroundKeepAliveTimer = setTimeout(function () {
+                _this.foregroundKeepAliveTimer = undefined;
+                _this.keepAliveBackoffMs = remult3_js_1.flags.liveQueryPollWhenStaleMs;
+                _this.lastKeepAliveAt = 0;
+                _this.runPromise(_this.runKeepAlive({ checkVersions: true }));
+            }, 300);
+        });
+        this.detachForeground = function () {
+            unsub();
+            if (_this.foregroundKeepAliveTimer !== undefined) {
+                clearTimeout(_this.foregroundKeepAliveTimer);
+                _this.foregroundKeepAliveTimer = undefined;
+            }
+            _this.detachForeground = function () { };
+        };
+    };
+    LiveQueryClient.prototype.openIfNoOpened = function () {
+        var _this = this;
+        if (!this.client) {
+            this.lastKeepAliveAt = Date.now();
+            this.keepAliveBackoffMs = remult3_js_1.flags.liveQueryPollWhenStaleMs;
+            this.attachForeground();
+            this.interval = setInterval(function () {
+                _this.runPromise(_this.maybeKeepAlive());
+            }, Math.min(remult3_js_1.flags.liveQueryPollWhenStaleMs, remult3_js_1.flags.liveQueryKeepAliveMs));
+            return this.runPromise((this.client = this.apiProvider()
+                .subscriptionClient.openConnection(function () {
+                var e_3, _a;
                 try {
                     for (var _b = tslib_1.__values(_this.queries.values()), _c = _b.next(); !_c.done; _c = _b.next()) {
                         var q = _c.value;
                         q.subscribeCode();
                     }
                 }
-                catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                catch (e_3_1) { e_3 = { error: e_3_1 }; }
                 finally {
                     try {
                         if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                     }
-                    finally { if (e_4) throw e_4.error; }
+                    finally { if (e_3) throw e_3.error; }
                 }
+            })
+                .then(function (c) {
+                _this.openedConnection = c;
+                return c;
+            })
+                .catch(function (err) {
+                _this.client = undefined;
+                _this.openedConnection = undefined;
+                _this.closeIfNoListeners();
+                throw err;
             })));
         }
         return this.client;
@@ -269,7 +387,7 @@ var MessageChannel = /** @class */ (function () {
     MessageChannel.prototype.handle = function (message) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, _b, l;
-            var e_5, _c;
+            var e_4, _c;
             return tslib_1.__generator(this, function (_d) {
                 try {
                     for (_a = tslib_1.__values(this.listeners), _b = _a.next(); !_b.done; _b = _a.next()) {
@@ -277,12 +395,12 @@ var MessageChannel = /** @class */ (function () {
                         l.next(message);
                     }
                 }
-                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                catch (e_4_1) { e_4 = { error: e_4_1 }; }
                 finally {
                     try {
                         if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                     }
-                    finally { if (e_5) throw e_5.error; }
+                    finally { if (e_4) throw e_4.error; }
                 }
                 return [2 /*return*/];
             });