remult 0.18.1-exp.32 → 0.18.1-exp.34

package/ably.d.ts

@@ -0,0 +1,13 @@
+import type * as Ably from '../../node_modules/ably';
+import type { SubscriptionServer } from './src/live-query/SubscriptionServer';
+import type { SubscriptionClient, SubscriptionClientConnection } from './src/live-query/SubscriptionChannel';
+export declare class AblySubscriptionClient implements SubscriptionClient {
+    private ably;
+    constructor(ably: Ably.Types.RealtimePromise);
+    openConnection(onReconnect: VoidFunction): Promise<SubscriptionClientConnection>;
+}
+export declare class AblySubscriptionServer implements SubscriptionServer {
+    private ably;
+    constructor(ably: Ably.Types.RestPromise);
+    publishMessage<T>(channel: string, message: T): Promise<void>;
+}

package/ably.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AblySubscriptionServer = exports.AblySubscriptionClient = void 0;
+var tslib_1 = require("tslib");
+var AblySubscriptionClient = /** @class */ (function () {
+    function AblySubscriptionClient(ably) {
+        this.ably = ably;
+    }
+    AblySubscriptionClient.prototype.openConnection = function (onReconnect) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                return [2 /*return*/, {
+                        close: function () {
+                            // Since we did not open the connection, we do not close it
+                        },
+                        subscribe: function (channel, handler) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            var myHandler;
+                            var _this = this;
+                            return tslib_1.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        myHandler = function (y) { return handler(y.data); };
+                                        return [4 /*yield*/, this.ably.channels.get(channel).subscribe(function (y) { return myHandler(y); })];
+                                    case 1:
+                                        _a.sent();
+                                        return [2 /*return*/, function () {
+                                                myHandler = function () { };
+                                                _this.ably.channels.get(channel).unsubscribe();
+                                            }];
+                                }
+                            });
+                        }); }
+                    }];
+            });
+        });
+    };
+    return AblySubscriptionClient;
+}());
+exports.AblySubscriptionClient = AblySubscriptionClient;
+var AblySubscriptionServer = /** @class */ (function () {
+    function AblySubscriptionServer(ably) {
+        this.ably = ably;
+    }
+    AblySubscriptionServer.prototype.publishMessage = function (channel, message) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.ably.channels.get(channel).publish({ data: message })];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return AblySubscriptionServer;
+}());
+exports.AblySubscriptionServer = AblySubscriptionServer;

package/esm/ably.d.ts

@@ -0,0 +1,13 @@
+import type * as Ably from '../../node_modules/ably';
+import type { SubscriptionServer } from './src/live-query/SubscriptionServer';
+import type { SubscriptionClient, SubscriptionClientConnection } from './src/live-query/SubscriptionChannel';
+export declare class AblySubscriptionClient implements SubscriptionClient {
+    private ably;
+    constructor(ably: Ably.Types.RealtimePromise);
+    openConnection(onReconnect: VoidFunction): Promise<SubscriptionClientConnection>;
+}
+export declare class AblySubscriptionServer implements SubscriptionServer {
+    private ably;
+    constructor(ably: Ably.Types.RestPromise);
+    publishMessage<T>(channel: string, message: T): Promise<void>;
+}

package/esm/ably.js

@@ -0,0 +1,28 @@
+export class AblySubscriptionClient {
+    constructor(ably) {
+        this.ably = ably;
+    }
+    async openConnection(onReconnect) {
+        return {
+            close: () => {
+                // Since we did not open the connection, we do not close it
+            },
+            subscribe: async (channel, handler) => {
+                let myHandler = (y) => handler(y.data);
+                await this.ably.channels.get(channel).subscribe(y => myHandler(y));
+                return () => {
+                    myHandler = () => { };
+                    this.ably.channels.get(channel).unsubscribe();
+                };
+            }
+        };
+    }
+}
+export class AblySubscriptionServer {
+    constructor(ably) {
+        this.ably = ably;
+    }
+    async publishMessage(channel, message) {
+        await this.ably.channels.get(channel).publish({ data: message });
+    }
+}

package/esm/index.d.ts

@@ -26,4 +26,3 @@ export { ValueConverters } from './src/valueConverters';
 export { remult } from './src/remult-proxy';
 export { SubscriptionServer, LiveQueryStorage, StoredQuery, InMemoryLiveQueryStorage } from "./src/live-query/SubscriptionServer";
 export { SubscriptionListener, SubscriptionClientConnection, SubscriptionClient, SubscriptionChannel, LiveQueryChange, Unsubscribe } from './src/live-query/SubscriptionChannel';
-export { DataProviderLiveQueryStorage } from './live-query/data-provider-live-query-storage';

package/esm/index.js

@@ -24,4 +24,3 @@ export { remult } from './src/remult-proxy';
 //export { getId } from './src/remult3/getId';
 export { InMemoryLiveQueryStorage } from "./src/live-query/SubscriptionServer";
 export { SubscriptionChannel } from './src/live-query/SubscriptionChannel';
-export { DataProviderLiveQueryStorage } from './live-query/data-provider-live-query-storage';

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

@@ -1,21 +1,21 @@
 import { Remult } from "../src/context";
 import { CanEnsureSchema, DataProvider } from "../src/data-interfaces";
 import { LiveQueryStorage, StoredQuery } from "../src/live-query/SubscriptionServer";
-import { Repository } from "../src/remult3";
+import { EntityBase, Repository } from "../src/remult3";
 export declare class DataProviderLiveQueryStorage implements LiveQueryStorage, CanEnsureSchema {
     repo: Promise<Repository<LiveQueryStorageEntity>>;
     dataProvider: Promise<DataProvider>;
     constructor(dataProvider: DataProvider | Promise<DataProvider> | (() => Promise<DataProvider | undefined>));
     ensureSchema(remult: Remult): Promise<void>;
-    add({ id, entityKey, data }: StoredQuery): void;
-    remove(queryId: string): void;
+    add({ id, entityKey, data }: StoredQuery): Promise<void>;
+    remove(queryId: string): Promise<void>;
     forEach(entityKey: string, callback: (args: {
         query: StoredQuery;
         setData(data: any): Promise<void>;
     }) => Promise<void>): Promise<void>;
     keepAliveAndReturnUnknownQueryIds(queryIds: string[]): Promise<string[]>;
 }
-declare class LiveQueryStorageEntity {
+declare class LiveQueryStorageEntity extends EntityBase {
     id: string;
     entityKey: string;
     data: any;

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

@@ -1,7 +1,7 @@
 import { __decorate, __metadata } from "tslib";
 import { initDataProvider } from "../server/initDataProvider";
 import { Remult } from "../src/context";
-import { Entity, Fields } from "../src/remult3";
+import { Entity, EntityBase, Fields } from "../src/remult3";
 export class DataProviderLiveQueryStorage {
     constructor(dataProvider) {
         this.dataProvider = initDataProvider(dataProvider);
@@ -10,14 +10,15 @@ export class DataProviderLiveQueryStorage {
     async ensureSchema(remult) {
         await (await this.dataProvider).ensureSchema([(await this.repo).metadata], "Live query storage");
     }
-    add({ id, entityKey, data }) {
-        this.repo.then(async (repo) => {
+    async add({ id, entityKey, data }) {
+        await this.repo.then(async (repo) => {
+            //TODO - talk to yoni about how this fails with non entity ref - since repo save here makes a wrong decision, since an item returns
             const q = await repo.findId(id, { createIfNotFound: true });
-            await repo.save({ ...q, entityKey, data });
+            await q.assign({ entityKey, data }).save();
         });
     }
-    remove(queryId) {
-        this.repo.then(repo => repo.delete(queryId)).catch(() => { });
+    async remove(queryId) {
+        await this.repo.then(repo => repo.delete(queryId)).catch(() => { });
     }
     async forEach(entityKey, callback) {
         const repo = await this.repo;
@@ -47,8 +48,9 @@ export class DataProviderLiveQueryStorage {
         return queryIds;
     }
 }
-let LiveQueryStorageEntity = class LiveQueryStorageEntity {
+let LiveQueryStorageEntity = class LiveQueryStorageEntity extends EntityBase {
     constructor() {
+        super(...arguments);
         this.id = '';
         this.entityKey = '';
         this.lastUsedIso = new Date().toISOString();

package/esm/server/core.d.ts

@@ -1,3 +1,4 @@
 export { queuedJobInfo, QueueStorage, GenericRequest, 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/core.js

@@ -1,3 +1,4 @@
 export { createRemultServerCore } from './expressBridge';
 export { JsonEntityFileStorage, JsonFileDataProvider } from './JsonEntityFileStorage';
 export { SseSubscriptionServer } from '../SseSubscriptionServer';
+export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-query-storage';

package/esm/src/data-api.js

@@ -20,7 +20,7 @@ export class DataApi {
         }
         return this.getArray(res, req, undefined);
     }
-    httpPost(res, req, body, serializeRequest) {
+    async httpPost(res, req, body, serializeRequest) {
         const action = req?.get("__action");
         if (action?.startsWith(liveQueryAction))
             return this.liveQuery(res, req, undefined, serializeRequest, getLiveQueryChannel(action.substring(liveQueryAction.length), this.remult.user?.id));
@@ -30,7 +30,7 @@ export class DataApi {
             case "count":
                 return this.count(res, req, body);
             case "endLiveQuery":
-                this.remult.liveQueryStorage.remove(getLiveQueryChannel(body.id, this.remult.user?.id));
+                await this.remult.liveQueryStorage.remove(getLiveQueryChannel(body.id, this.remult.user?.id));
                 res.success("ok");
                 return;
             default:
@@ -133,7 +133,7 @@ export class DataApi {
                 findOptionsJson: findOptionsToJson(r.findOptions, this.repository.metadata),
                 lastIds: r.r.map(y => getId(this.repository.metadata, y))
             };
-            this.remult.liveQueryStorage.add({
+            await this.remult.liveQueryStorage.add({
                 entityKey: this.repository.metadata.key,
                 id: queryChannel,
                 data

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

@@ -2,8 +2,8 @@ export interface SubscriptionServer {
     publishMessage<T>(channel: string, message: T): Promise<void>;
 }
 export interface LiveQueryStorage {
-    add(query: StoredQuery): void;
-    remove(queryId: string): void;
+    add(query: StoredQuery): Promise<void>;
+    remove(queryId: string): Promise<void>;
     forEach(entityKey: string, callback: (args: {
         query: StoredQuery;
         setData(data: any): Promise<void>;
@@ -18,9 +18,9 @@ export declare class InMemoryLiveQueryStorage implements LiveQueryStorage {
         lastUsed: string;
     })[];
     constructor();
-    add(query: StoredQuery): void;
+    add(query: StoredQuery): Promise<void>;
     removeCountForTesting: number;
-    remove(id: any): void;
+    remove(id: any): Promise<void>;
     forEach(entityKey: string, handle: (args: {
         query: StoredQuery;
         setData(data: any): Promise<void>;

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

@@ -82,11 +82,11 @@ export class InMemoryLiveQueryStorage {
         this.debug();
         return result;
     }
-    add(query) {
+    async add(query) {
         this.queries.push({ ...query, lastUsed: new Date().toISOString() });
         this.debug();
     }
-    remove(id) {
+    async remove(id) {
         this.queries = this.queries.filter(q => q.id !== id);
         this.removeCountForTesting++;
         this.debug();

package/esm/src/shared-tests/db-tests.db-tests.js

@@ -19,6 +19,8 @@ import { Validators } from "../validators";
 import { Status } from "../tests/testModel/models";
 import { IdEntity } from "../id-entity";
 import { describeClass } from "../remult3/DecoratorReplacer";
+import { DataProviderLiveQueryStorage } from "../../live-query/data-provider-live-query-storage";
+import { v4 as uuid } from 'uuid';
 testAll("what", async ({ remult, createEntity }) => {
     await (await createEntity(stam)).create({ id: 1, title: 'noam' }).save();
     expect(await remult.repo(stam).count()).toBe(1);
@@ -767,3 +769,14 @@ testAll("test date", async ({ createEntity }) => {
     let item = await r.findFirst();
     expect(item.d.getFullYear()).toBe(1976);
 }, false);
+testAll("test live query storage", async ({ db, remult }) => {
+    var x = new DataProviderLiveQueryStorage(db);
+    if (db.ensureSchema)
+        await x.ensureSchema(remult);
+    const id = uuid();
+    await x.add({ id, entityKey: 'x', data: "noam" });
+    await x.forEach("x", async (args) => {
+        expect(args.query.data).toBe("noam");
+    });
+    expect((await x.keepAliveAndReturnUnknownQueryIds([id]))).toEqual([]);
+});

package/index.d.ts

@@ -26,4 +26,3 @@ export { ValueConverters } from './src/valueConverters';
 export { remult } from './src/remult-proxy';
 export { SubscriptionServer, LiveQueryStorage, StoredQuery, InMemoryLiveQueryStorage } from "./src/live-query/SubscriptionServer";
 export { SubscriptionListener, SubscriptionClientConnection, SubscriptionClient, SubscriptionChannel, LiveQueryChange, Unsubscribe } from './src/live-query/SubscriptionChannel';
-export { DataProviderLiveQueryStorage } from './live-query/data-provider-live-query-storage';

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataProviderLiveQueryStorage = exports.SubscriptionChannel = exports.InMemoryLiveQueryStorage = exports.remult = exports.ValueConverters = exports.Validators = exports.UrlBuilder = exports.Filter = exports.CompoundIdField = exports.OneToMany = exports.Sort = exports.IdEntity = exports.EventSource = exports.isBackend = exports.Remult = exports.Allow = exports.ProgressListener = exports.BackendMethod = exports.Controller = exports.JsonDataProvider = exports.dbNamesOf = exports.CustomSqlFilterBuilder = exports.SqlDatabase = exports.WebSqlDataProvider = exports.ArrayEntityDataProvider = exports.InMemoryDataProvider = exports.RestDataProvider = exports.describeClass = exports.CaptionTransformer = exports.ValueListInfo = exports.getValueList = exports.ValueListFieldType = exports.getEntityRef = exports.getFields = exports.FieldType = exports.ControllerBase = exports.EntityBase = exports.Entity = exports.Fields = exports.Field = void 0;
+exports.SubscriptionChannel = exports.InMemoryLiveQueryStorage = exports.remult = exports.ValueConverters = exports.Validators = exports.UrlBuilder = exports.Filter = exports.CompoundIdField = exports.OneToMany = exports.Sort = exports.IdEntity = exports.EventSource = exports.isBackend = exports.Remult = exports.Allow = exports.ProgressListener = exports.BackendMethod = exports.Controller = exports.JsonDataProvider = exports.dbNamesOf = exports.CustomSqlFilterBuilder = exports.SqlDatabase = exports.WebSqlDataProvider = exports.ArrayEntityDataProvider = exports.InMemoryDataProvider = exports.RestDataProvider = exports.describeClass = exports.CaptionTransformer = exports.ValueListInfo = exports.getValueList = exports.ValueListFieldType = exports.getEntityRef = exports.getFields = exports.FieldType = exports.ControllerBase = exports.EntityBase = exports.Entity = exports.Fields = exports.Field = void 0;
 /*
  * Public API Surface of remult
  */
@@ -66,5 +66,3 @@ var SubscriptionServer_1 = require("./src/live-query/SubscriptionServer");
 Object.defineProperty(exports, "InMemoryLiveQueryStorage", { enumerable: true, get: function () { return SubscriptionServer_1.InMemoryLiveQueryStorage; } });
 var SubscriptionChannel_1 = require("./src/live-query/SubscriptionChannel");
 Object.defineProperty(exports, "SubscriptionChannel", { enumerable: true, get: function () { return SubscriptionChannel_1.SubscriptionChannel; } });
-var data_provider_live_query_storage_1 = require("./live-query/data-provider-live-query-storage");
-Object.defineProperty(exports, "DataProviderLiveQueryStorage", { enumerable: true, get: function () { return data_provider_live_query_storage_1.DataProviderLiveQueryStorage; } });

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

@@ -1,21 +1,21 @@
 import { Remult } from "../src/context";
 import { CanEnsureSchema, DataProvider } from "../src/data-interfaces";
 import { LiveQueryStorage, StoredQuery } from "../src/live-query/SubscriptionServer";
-import { Repository } from "../src/remult3";
+import { EntityBase, Repository } from "../src/remult3";
 export declare class DataProviderLiveQueryStorage implements LiveQueryStorage, CanEnsureSchema {
     repo: Promise<Repository<LiveQueryStorageEntity>>;
     dataProvider: Promise<DataProvider>;
     constructor(dataProvider: DataProvider | Promise<DataProvider> | (() => Promise<DataProvider | undefined>));
     ensureSchema(remult: Remult): Promise<void>;
-    add({ id, entityKey, data }: StoredQuery): void;
-    remove(queryId: string): void;
+    add({ id, entityKey, data }: StoredQuery): Promise<void>;
+    remove(queryId: string): Promise<void>;
     forEach(entityKey: string, callback: (args: {
         query: StoredQuery;
         setData(data: any): Promise<void>;
     }) => Promise<void>): Promise<void>;
     keepAliveAndReturnUnknownQueryIds(queryIds: string[]): Promise<string[]>;
 }
-declare class LiveQueryStorageEntity {
+declare class LiveQueryStorageEntity extends EntityBase {
     id: string;
     entityKey: string;
     data: any;

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

@@ -30,25 +30,43 @@ var DataProviderLiveQueryStorage = /** @class */ (function () {
         });
     };
     DataProviderLiveQueryStorage.prototype.add = function (_a) {
-        var _this = this;
         var id = _a.id, entityKey = _a.entityKey, data = _a.data;
-        this.repo.then(function (repo) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var q;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, this.repo.then(function (repo) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            var q;
+                            return tslib_1.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, repo.findId(id, { createIfNotFound: true })];
+                                    case 1:
+                                        q = _a.sent();
+                                        return [4 /*yield*/, q.assign({ entityKey: entityKey, data: data }).save()];
+                                    case 2:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                    case 1:
+                        _b.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    DataProviderLiveQueryStorage.prototype.remove = function (queryId) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, repo.findId(id, { createIfNotFound: true })];
+                    case 0: return [4 /*yield*/, this.repo.then(function (repo) { return repo.delete(queryId); }).catch(function () { })];
                     case 1:
-                        q = _a.sent();
-                        return [4 /*yield*/, repo.save(tslib_1.__assign(tslib_1.__assign({}, q), { entityKey: entityKey, data: data }))];
-                    case 2:
                         _a.sent();
                         return [2 /*return*/];
                 }
             });
-        }); });
-    };
-    DataProviderLiveQueryStorage.prototype.remove = function (queryId) {
-        this.repo.then(function (repo) { return repo.delete(queryId); }).catch(function () { });
+        });
     };
     DataProviderLiveQueryStorage.prototype.forEach = function (entityKey, callback) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -184,11 +202,14 @@ var DataProviderLiveQueryStorage = /** @class */ (function () {
     return DataProviderLiveQueryStorage;
 }());
 exports.DataProviderLiveQueryStorage = DataProviderLiveQueryStorage;
-var LiveQueryStorageEntity = /** @class */ (function () {
+var LiveQueryStorageEntity = /** @class */ (function (_super) {
+    tslib_1.__extends(LiveQueryStorageEntity, _super);
     function LiveQueryStorageEntity() {
-        this.id = '';
-        this.entityKey = '';
-        this.lastUsedIso = new Date().toISOString();
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.id = '';
+        _this.entityKey = '';
+        _this.lastUsedIso = new Date().toISOString();
+        return _this;
     }
     tslib_1.__decorate([
         remult3_1.Fields.string(),
@@ -212,4 +233,4 @@ var LiveQueryStorageEntity = /** @class */ (function () {
         })
     ], LiveQueryStorageEntity);
     return LiveQueryStorageEntity;
-}());
+}(remult3_1.EntityBase));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.18.1-exp.32",
+    "version": "0.18.1-exp.34",
     "description": "A CRUD framework for full-stack TypeScript",
     "main": "index.js",
     "types": "index.d.ts",
@@ -111,12 +111,12 @@
             "import": "./esm/remult-mongo.js"
         },
         "./ably": {
-            "require": "./live-query/ably.js",
+            "require": "./ably.js",
             "node": {
-                "require": "./live-query/ably.js",
-                "import": "./live-query/ably.js"
+                "require": "./ably.js",
+                "import": "./ably.js"
             },
-            "import": "./esm/live-query/ably.js"
+            "import": "./esm/ably.js"
         },
         "./graphql": {
             "require": "./graphql.js",

package/server/core.d.ts

@@ -1,3 +1,4 @@
 export { queuedJobInfo, QueueStorage, GenericRequest, 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/core.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SseSubscriptionServer = exports.JsonFileDataProvider = exports.JsonEntityFileStorage = exports.createRemultServerCore = void 0;
+exports.DataProviderLiveQueryStorage = exports.SseSubscriptionServer = exports.JsonFileDataProvider = exports.JsonEntityFileStorage = exports.createRemultServerCore = void 0;
 var expressBridge_1 = require("./expressBridge");
 Object.defineProperty(exports, "createRemultServerCore", { enumerable: true, get: function () { return expressBridge_1.createRemultServerCore; } });
 var JsonEntityFileStorage_1 = require("./JsonEntityFileStorage");
@@ -8,3 +8,5 @@ Object.defineProperty(exports, "JsonEntityFileStorage", { enumerable: true, get:
 Object.defineProperty(exports, "JsonFileDataProvider", { enumerable: true, get: function () { return JsonEntityFileStorage_1.JsonFileDataProvider; } });
 var SseSubscriptionServer_1 = require("../SseSubscriptionServer");
 Object.defineProperty(exports, "SseSubscriptionServer", { enumerable: true, get: function () { return SseSubscriptionServer_1.SseSubscriptionServer; } });
+var data_provider_live_query_storage_1 = require("../live-query/data-provider-live-query-storage");
+Object.defineProperty(exports, "DataProviderLiveQueryStorage", { enumerable: true, get: function () { return data_provider_live_query_storage_1.DataProviderLiveQueryStorage; } });

package/src/data-api.js

@@ -27,21 +27,32 @@ var DataApi = /** @class */ (function () {
     };
     DataApi.prototype.httpPost = function (res, req, body, serializeRequest) {
         var _a, _b;
-        var action = req === null || req === void 0 ? void 0 : req.get("__action");
-        if (action === null || action === void 0 ? void 0 : action.startsWith(rest_data_provider_1.liveQueryAction))
-            return this.liveQuery(res, req, undefined, serializeRequest, getLiveQueryChannel(action.substring(rest_data_provider_1.liveQueryAction.length), (_a = this.remult.user) === null || _a === void 0 ? void 0 : _a.id));
-        switch (action) {
-            case "get":
-                return this.getArray(res, req, body);
-            case "count":
-                return this.count(res, req, body);
-            case "endLiveQuery":
-                this.remult.liveQueryStorage.remove(getLiveQueryChannel(body.id, (_b = this.remult.user) === null || _b === void 0 ? void 0 : _b.id));
-                res.success("ok");
-                return;
-            default:
-                return this.post(res, body);
-        }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var action, _c;
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        action = req === null || req === void 0 ? void 0 : req.get("__action");
+                        if (action === null || action === void 0 ? void 0 : action.startsWith(rest_data_provider_1.liveQueryAction))
+                            return [2 /*return*/, this.liveQuery(res, req, undefined, serializeRequest, getLiveQueryChannel(action.substring(rest_data_provider_1.liveQueryAction.length), (_a = this.remult.user) === null || _a === void 0 ? void 0 : _a.id))];
+                        _c = action;
+                        switch (_c) {
+                            case "get": return [3 /*break*/, 1];
+                            case "count": return [3 /*break*/, 2];
+                            case "endLiveQuery": return [3 /*break*/, 3];
+                        }
+                        return [3 /*break*/, 5];
+                    case 1: return [2 /*return*/, this.getArray(res, req, body)];
+                    case 2: return [2 /*return*/, this.count(res, req, body)];
+                    case 3: return [4 /*yield*/, this.remult.liveQueryStorage.remove(getLiveQueryChannel(body.id, (_b = this.remult.user) === null || _b === void 0 ? void 0 : _b.id))];
+                    case 4:
+                        _d.sent();
+                        res.success("ok");
+                        return [2 /*return*/];
+                    case 5: return [2 /*return*/, this.post(res, body)];
+                }
+            });
+        });
     };
     DataApi.prototype.get = function (response, id) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -210,7 +221,7 @@ var DataApi = /** @class */ (function () {
                         }
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
+                        _a.trys.push([1, 4, , 5]);
                         return [4 /*yield*/, this.getArrayImpl(response, request, filterBody)];
                     case 2:
                         r = _a.sent();
@@ -219,21 +230,23 @@ var DataApi = /** @class */ (function () {
                             findOptionsJson: rest_data_provider_1.findOptionsToJson(r.findOptions, this.repository.metadata),
                             lastIds: r.r.map(function (y) { return getId_1.getId(_this.repository.metadata, y); })
                         };
-                        this.remult.liveQueryStorage.add({
-                            entityKey: this.repository.metadata.key,
-                            id: queryChannel,
-                            data: data
-                        });
-                        response.success(r.r);
-                        return [3 /*break*/, 4];
+                        return [4 /*yield*/, this.remult.liveQueryStorage.add({
+                                entityKey: this.repository.metadata.key,
+                                id: queryChannel,
+                                data: data
+                            })];
                     case 3:
+                        _a.sent();
+                        response.success(r.r);
+                        return [3 /*break*/, 5];
+                    case 4:
                         err_3 = _a.sent();
                         if (err_3.isForbiddenError)
                             response.forbidden();
                         else
                             response.error(err_3);
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
+                        return [3 /*break*/, 5];
+                    case 5: return [2 /*return*/];
                 }
             });
         });

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

@@ -2,8 +2,8 @@ export interface SubscriptionServer {
     publishMessage<T>(channel: string, message: T): Promise<void>;
 }
 export interface LiveQueryStorage {
-    add(query: StoredQuery): void;
-    remove(queryId: string): void;
+    add(query: StoredQuery): Promise<void>;
+    remove(queryId: string): Promise<void>;
     forEach(entityKey: string, callback: (args: {
         query: StoredQuery;
         setData(data: any): Promise<void>;
@@ -18,9 +18,9 @@ export declare class InMemoryLiveQueryStorage implements LiveQueryStorage {
         lastUsed: string;
     })[];
     constructor();
-    add(query: StoredQuery): void;
+    add(query: StoredQuery): Promise<void>;
     removeCountForTesting: number;
-    remove(id: any): void;
+    remove(id: any): Promise<void>;
     forEach(entityKey: string, handle: (args: {
         query: StoredQuery;
         setData(data: any): Promise<void>;

package/src/live-query/SubscriptionServer.js

@@ -172,13 +172,23 @@ var InMemoryLiveQueryStorage = /** @class */ (function () {
         });
     };
     InMemoryLiveQueryStorage.prototype.add = function (query) {
-        this.queries.push(tslib_1.__assign(tslib_1.__assign({}, query), { lastUsed: new Date().toISOString() }));
-        this.debug();
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                this.queries.push(tslib_1.__assign(tslib_1.__assign({}, query), { lastUsed: new Date().toISOString() }));
+                this.debug();
+                return [2 /*return*/];
+            });
+        });
     };
     InMemoryLiveQueryStorage.prototype.remove = function (id) {
-        this.queries = this.queries.filter(function (q) { return q.id !== id; });
-        this.removeCountForTesting++;
-        this.debug();
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                this.queries = this.queries.filter(function (q) { return q.id !== id; });
+                this.removeCountForTesting++;
+                this.debug();
+                return [2 /*return*/];
+            });
+        });
     };
     InMemoryLiveQueryStorage.prototype.forEach = function (entityKey, handle) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {

package/src/shared-tests/db-tests.db-tests.js

@@ -22,6 +22,8 @@ var validators_1 = require("../validators");
 var models_1 = require("../tests/testModel/models");
 var id_entity_1 = require("../id-entity");
 var DecoratorReplacer_1 = require("../remult3/DecoratorReplacer");
+var data_provider_live_query_storage_1 = require("../../live-query/data-provider-live-query-storage");
+var uuid_1 = require("uuid");
 db_tests_setup_1.testAll("what", function (_a) {
     var remult = _a.remult, createEntity = _a.createEntity;
     return tslib_1.__awaiter(void 0, void 0, void 0, function () {
@@ -1720,3 +1722,38 @@ db_tests_setup_1.testAll("test date", function (_a) {
         });
     });
 }, false);
+db_tests_setup_1.testAll("test live query storage", function (_a) {
+    var db = _a.db, remult = _a.remult;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var x, id, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    x = new data_provider_live_query_storage_1.DataProviderLiveQueryStorage(db);
+                    if (!db.ensureSchema) return [3 /*break*/, 2];
+                    return [4 /*yield*/, x.ensureSchema(remult)];
+                case 1:
+                    _c.sent();
+                    _c.label = 2;
+                case 2:
+                    id = uuid_1.v4();
+                    return [4 /*yield*/, x.add({ id: id, entityKey: 'x', data: "noam" })];
+                case 3:
+                    _c.sent();
+                    return [4 /*yield*/, x.forEach("x", function (args) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                            return tslib_1.__generator(this, function (_a) {
+                                expect(args.query.data).toBe("noam");
+                                return [2 /*return*/];
+                            });
+                        }); })];
+                case 4:
+                    _c.sent();
+                    _b = expect;
+                    return [4 /*yield*/, x.keepAliveAndReturnUnknownQueryIds([id])];
+                case 5:
+                    _b.apply(void 0, [(_c.sent())]).toEqual([]);
+                    return [2 /*return*/];
+            }
+        });
+    });
+});