@intuitionrobotics/push-pub-sub 0.45.3 → 0.46.0

package/app-backend/api/_push.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const backend_1 = require("@intuitionrobotics/thunderstorm/backend");
-module.exports = new backend_1.RouteResolver(require, __dirname);
+const HttpServer_1 = require("@intuitionrobotics/thunderstorm/app-backend/modules/server/HttpServer");
+module.exports = new HttpServer_1.RouteResolver(require, __dirname);
 //# sourceMappingURL=_push.js.map

package/app-backend/api/_push.js.map

@@ -1 +1 @@
-{"version":3,"file":"_push.js","sourceRoot":"","sources":["../../../src/main/app-backend/api/_push.ts"],"names":[],"mappings":";;AAAA,qEAAsE;AAEtE,MAAM,CAAC,OAAO,GAAG,IAAI,uBAAa,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC"}
+{"version":3,"file":"_push.js","sourceRoot":"","sources":["../../../src/main/app-backend/api/_push.ts"],"names":[],"mappings":";;AAAA,sGAAoG;AAEpG,MAAM,CAAC,OAAO,GAAG,IAAI,0BAAa,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC"}

package/app-backend/api/v1/push/read.js

@@ -9,12 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const backend_1 = require("@intuitionrobotics/thunderstorm/backend");
-const thunderstorm_1 = require("@intuitionrobotics/thunderstorm");
 const PushPubSubModule_1 = require("../../../modules/PushPubSubModule");
-class ServerApi_PushRead extends backend_1.ServerApi {
+const server_api_1 = require("@intuitionrobotics/thunderstorm/app-backend/modules/server/server-api");
+const types_1 = require("@intuitionrobotics/thunderstorm/shared/types");
+class ServerApi_PushRead extends server_api_1.ServerApi {
     constructor() {
-        super(thunderstorm_1.HttpMethod.POST, "read");
+        super(types_1.HttpMethod.POST, "read");
     }
     process(request, response, queryParams, body) {
         return __awaiter(this, void 0, void 0, function* () {

package/app-backend/api/v1/push/read.js.map

@@ -1 +1 @@
-{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/main/app-backend/api/v1/push/read.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,qEAIiD;AAGjD,kEAA2D;AAC3D,wEAAmE;AAMnE,MAAM,kBACL,SAAQ,mBAAiC;IAEzC;QACC,KAAK,CAAC,yBAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAe,EAAE,IAAsB;;YAC9G,4DAA4D;YAC5D,OAAO,MAAM,mCAAgB,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACrE,CAAC;KAAA;CACD;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/main/app-backend/api/v1/push/read.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,wEAAmE;AACnE,sGAA6G;AAC7G,wEAAwE;AAIxE,MAAM,kBACF,SAAQ,sBAAiC;IAEzC;QACI,KAAK,CAAC,kBAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAe,EAAE,IAAsB;;YAC3G,4DAA4D;YAC5D,OAAO,MAAM,mCAAgB,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACxE,CAAC;KAAA;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,kBAAkB,EAAE,CAAC"}

package/app-backend/api/v1/push/register.js

@@ -9,16 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const backend_1 = require("@intuitionrobotics/thunderstorm/backend");
-const thunderstorm_1 = require("@intuitionrobotics/thunderstorm");
 const PushPubSubModule_1 = require("../../../modules/PushPubSubModule");
-class ServerApi_PushRegister extends backend_1.ServerApi {
+const server_api_1 = require("@intuitionrobotics/thunderstorm/app-backend/modules/server/server-api");
+const types_1 = require("@intuitionrobotics/thunderstorm/shared/types");
+class ServerApi_PushRegister extends server_api_1.ServerApi {
     constructor() {
-        super(thunderstorm_1.HttpMethod.POST, "register");
+        super(types_1.HttpMethod.POST, "register");
     }
     process(request, response, queryParams, body) {
         return __awaiter(this, void 0, void 0, function* () {
-            // const user = await KasperoProxy.validateSession(request);
             return yield PushPubSubModule_1.PushPubSubModule.register(body, request);
         });
     }

package/app-backend/api/v1/push/register.js.map

@@ -1 +1 @@
-{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../src/main/app-backend/api/v1/push/register.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,qEAIiD;AAGjD,kEAA2D;AAC3D,wEAAmE;AAMnE,MAAM,sBACL,SAAQ,mBAA+B;IAEvC;QACC,KAAK,CAAC,yBAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACpC,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAe,EAAE,IAA0B;;YAClH,4DAA4D;YAC5D,OAAO,MAAM,mCAAgB,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvD,CAAC;KAAA;CACD;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../src/main/app-backend/api/v1/push/register.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,wEAAmE;AACnE,sGAA6G;AAC7G,wEAAwE;AAMxE,MAAM,sBACF,SAAQ,sBAA+B;IAEvC;QACI,KAAK,CAAC,kBAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACvC,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAe,EAAE,IAA0B;;YAC/G,OAAO,MAAM,mCAAgB,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1D,CAAC;KAAA;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,sBAAsB,EAAE,CAAC"}

package/app-backend/core/module-pack.d.ts

@@ -1,4 +1 @@
 export declare const Backend_ModulePack_PushPubSub: (import("../modules/PushPubSubModule").PushPubSubModule_Class | import("../modules/ScheduledPushCleanup").ScheduledCleanup_Class)[];
-export * from "../modules/PushPubSubModule";
-export * from "../modules/ScheduledPushCleanup";
-export * from "../modules/PushKey";

package/app-backend/core/module-pack.js

@@ -1,32 +1,4 @@
 "use strict";
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * Copyright (C) 2020 Intuition Robotics
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Backend_ModulePack_PushPubSub = void 0;
 const PushPubSubModule_1 = require("../modules/PushPubSubModule");
@@ -35,7 +7,4 @@ exports.Backend_ModulePack_PushPubSub = [
     PushPubSubModule_1.PushPubSubModule,
     ScheduledPushCleanup_1.ScheduledCleanup
 ];
-__exportStar(require("../modules/PushPubSubModule"), exports);
-__exportStar(require("../modules/ScheduledPushCleanup"), exports);
-__exportStar(require("../modules/PushKey"), exports);
 //# sourceMappingURL=module-pack.js.map

package/app-backend/core/module-pack.js.map

@@ -1 +1 @@
-{"version":3,"file":"module-pack.js","sourceRoot":"","sources":["../../../src/main/app-backend/core/module-pack.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;AAEH,kEAA6D;AAC7D,0EAAiE;AAEpD,QAAA,6BAA6B,GAAG;IAC5C,mCAAgB;IAChB,uCAAgB;CAChB,CAAC;AAEF,8DAA2C;AAC3C,kEAA+C;AAC/C,qDAAkC"}
+{"version":3,"file":"module-pack.js","sourceRoot":"","sources":["../../../src/main/app-backend/core/module-pack.ts"],"names":[],"mappings":";;;AAAA,kEAA6D;AAC7D,0EAAiE;AAEpD,QAAA,6BAA6B,GAAG;IACzC,mCAAgB;IAChB,uCAAgB;CACnB,CAAC"}

package/app-backend/modules/PushKey.d.ts

@@ -1,5 +1,5 @@
-import { ObjectTS } from "@intuitionrobotics/ts-common";
-import { SubscribeProps } from "./_imports";
+import { SubscribeProps } from "../../shared/types";
+import { ObjectTS } from "@intuitionrobotics/ts-common/utils/types";
 export declare class PushKey<K extends string, P extends SubscribeProps, D extends ObjectTS> {
     private readonly key;
     private readonly persist;

package/app-backend/modules/PushKey.js

@@ -1,22 +1,4 @@
 "use strict";
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * Copyright (C) 2020 Intuition Robotics
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {

package/app-backend/modules/PushKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"PushKey.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PushKey.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;AAGH,yDAAoD;AAGpD,MAAa,OAAO;IAKnB,YAAY,GAAM,EAAE,OAAO,GAAG,KAAK;QAClC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAEK,IAAI,CAAC,IAAO,EAAE,KAAS;;YAC5B,OAAO,mCAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACxE,CAAC;KAAA;IAAA,CAAC;CACF;AAbD,0BAaC"}
+{"version":3,"file":"PushKey.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PushKey.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAoD;AAIpD,MAAa,OAAO;IAKhB,YAAY,GAAM,EAAE,OAAO,GAAG,KAAK;QAC/B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEK,IAAI,CAAC,IAAO,EAAE,KAAS;;YACzB,OAAO,mCAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3E,CAAC;KAAA;IAAA,CAAC;CACL;AAbD,0BAaC"}

package/app-backend/modules/PushPubSubModule.d.ts

@@ -1,7 +1,8 @@
-import { Module } from "@intuitionrobotics/ts-common";
-import { FirebaseType_BatchResponse, FirebaseType_Message, FirestoreTransaction } from "@intuitionrobotics/firebase/backend";
-import { DB_Notifications, IFP, ISP, ITP, MessageType, Request_PushRegister, SubscribeProps } from "../../index";
-import { ExpressRequest } from "@intuitionrobotics/thunderstorm/backend";
+import { DB_Notifications, IFP, ISP, ITP, MessageType, Request_PushRegister, SubscribeProps } from "../../shared/types";
+import { Module } from "@intuitionrobotics/ts-common/core/module";
+import { ExpressRequest } from "@intuitionrobotics/thunderstorm/app-backend/utils/types";
+import { FirestoreTransaction } from "@intuitionrobotics/firebase/app-backend/firestore/FirestoreTransaction";
+import { FirebaseType_BatchResponse, FirebaseType_Message } from "@intuitionrobotics/firebase/app-backend/push/types";
 declare type Config = {
     notificationsCleanupTime?: number;
     sessionsCleanupTime?: number;

package/app-backend/modules/PushPubSubModule.js

@@ -1,22 +1,4 @@
 "use strict";
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * Copyright (C) 2020 Intuition Robotics
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -28,16 +10,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PushPubSubModule = exports.PushPubSubModule_Class = void 0;
-const ts_common_1 = require("@intuitionrobotics/ts-common");
-const backend_1 = require("@intuitionrobotics/firebase/backend");
-const backend_2 = require("@intuitionrobotics/thunderstorm/backend");
-class PushPubSubModule_Class extends ts_common_1.Module {
+const module_1 = require("@intuitionrobotics/ts-common/core/module");
+const FirebaseModule_1 = require("@intuitionrobotics/firebase/app-backend/FirebaseModule");
+const types_1 = require("@intuitionrobotics/thunderstorm/app-backend/utils/types");
+const date_time_tools_1 = require("@intuitionrobotics/ts-common/utils/date-time-tools");
+const array_tools_1 = require("@intuitionrobotics/ts-common/utils/array-tools");
+const object_tools_1 = require("@intuitionrobotics/ts-common/utils/object-tools");
+const random_tools_1 = require("@intuitionrobotics/ts-common/utils/random-tools");
+const tools_1 = require("@intuitionrobotics/ts-common/utils/tools");
+class PushPubSubModule_Class extends module_1.Module {
     constructor() {
         super("PushPubSubModule");
         this.buildNotification = (pushkey, persistent, data, props, user) => {
             const notification = {
-                _id: ts_common_1.generateHex(16),
-                timestamp: ts_common_1.currentTimeMillies(),
+                _id: random_tools_1.generateHex(16),
+                timestamp: date_time_tools_1.currentTimeMillies(),
                 read: false,
                 pushKey: pushkey,
                 persistent
@@ -51,7 +38,10 @@ class PushPubSubModule_Class extends ts_common_1.Module {
             return notification;
         };
         this.sendMessage = (persistent, _messages) => __awaiter(this, void 0, void 0, function* () {
-            const messages = Object.keys(_messages).map(token => ({ token, data: { messages: ts_common_1.__stringify(_messages[token]) } }));
+            const messages = Object.keys(_messages).map(token => ({
+                token,
+                data: { messages: tools_1.__stringify(_messages[token]) }
+            }));
             if (messages.length === 0)
                 return;
             console.log("sending a message to \n" + Object.keys(_messages).join("\n"));
@@ -64,11 +54,11 @@ class PushPubSubModule_Class extends ts_common_1.Module {
         });
         this.scheduledCleanup = () => __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const sessionsCleanupTime = ((_a = this.config) === null || _a === void 0 ? void 0 : _a.sessionsCleanupTime) || ts_common_1.Hour;
-            const notificationsCleanupTime = ((_b = this.config) === null || _b === void 0 ? void 0 : _b.notificationsCleanupTime) || 7 * ts_common_1.Day;
-            const docs = yield this.pushSessions.query({ where: { timestamp: { $lt: ts_common_1.currentTimeMillies() - sessionsCleanupTime } } });
+            const sessionsCleanupTime = ((_a = this.config) === null || _a === void 0 ? void 0 : _a.sessionsCleanupTime) || date_time_tools_1.Hour;
+            const notificationsCleanupTime = ((_b = this.config) === null || _b === void 0 ? void 0 : _b.notificationsCleanupTime) || 7 * date_time_tools_1.Day;
+            const docs = yield this.pushSessions.query({ where: { timestamp: { $lt: date_time_tools_1.currentTimeMillies() - sessionsCleanupTime } } });
             yield Promise.all([
-                this.notifications.delete({ where: { timestamp: { $lt: ts_common_1.currentTimeMillies() - notificationsCleanupTime } } }),
+                this.notifications.delete({ where: { timestamp: { $lt: date_time_tools_1.currentTimeMillies() - notificationsCleanupTime } } }),
                 this.cleanUpImpl(docs.map(d => d.firebaseToken))
             ]);
         });
@@ -86,7 +76,7 @@ class PushPubSubModule_Class extends ts_common_1.Module {
         });
     }
     init() {
-        const session = backend_1.FirebaseModule.createAdminSession();
+        const session = FirebaseModule_1.FirebaseModule.createAdminSession();
         const firestore = session.getFirestore();
         this.pushSessions = firestore.getCollection("push-sessions", ["pushSessionId"]);
         this.pushKeys = firestore.getCollection("push-keys");
@@ -96,14 +86,14 @@ class PushPubSubModule_Class extends ts_common_1.Module {
     register(body, request) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const resp = yield backend_2.dispatch_queryRequestInfo.dispatchModuleAsync([request]);
+            const resp = yield types_1.dispatch_queryRequestInfo.dispatchModuleAsync([request]);
             const userId = ((_b = (_a = resp.find(e => e.key === "AccountsModule")) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b._id) || ((_c = resp.find(e => e.key === "RemoteProxy")) === null || _c === void 0 ? void 0 : _c.data);
             // if (!userId)
             // 	throw new ImplementationMissingException("Missing user from accounts Module");
             const session = {
                 firebaseToken: body.firebaseToken,
                 pushSessionId: body.pushSessionId,
-                timestamp: ts_common_1.currentTimeMillies()
+                timestamp: date_time_tools_1.currentTimeMillies()
             };
             if (userId)
                 session.userId = userId;
@@ -119,12 +109,12 @@ class PushPubSubModule_Class extends ts_common_1.Module {
             return this.pushSessions.runInTransaction((transaction) => __awaiter(this, void 0, void 0, function* () {
                 const pushKeys = subscriptions.map(_sub => _sub.pushKey);
                 let subscriptionNotifications = pushKeys.length !== 0 ?
-                    yield ts_common_1.batchAction(pushKeys, 10, (elements) => __awaiter(this, void 0, void 0, function* () { return transaction.query(this.notifications, { where: { pushKey: { $in: elements } } }); })) : [];
+                    yield array_tools_1.batchAction(pushKeys, 10, (elements) => __awaiter(this, void 0, void 0, function* () { return transaction.query(this.notifications, { where: { pushKey: { $in: elements } } }); })) : [];
                 if (subscriptionNotifications.length > 0)
                     subscriptionNotifications = subscriptionNotifications.filter(_notification => {
                         var _a;
                         const x = (_a = subscriptions.find(_sub => _sub.pushKey === _notification.pushKey)) === null || _a === void 0 ? void 0 : _a.props;
-                        return ts_common_1.compare(x, _notification.props) || _notification.userId;
+                        return object_tools_1.compare(x, _notification.props) || _notification.userId;
                     });
                 const userNotifications = userId ? yield transaction.query(this.notifications, { where: { userId } }) : [];
                 const notifications = userNotifications.concat(subscriptionNotifications);
@@ -132,7 +122,7 @@ class PushPubSubModule_Class extends ts_common_1.Module {
                 const write = yield transaction.delete_Read(this.pushKeys, { where: { pushSessionId: body.pushSessionId } });
                 yield transaction.insertAll(this.pushKeys, subscriptions);
                 yield Promise.all([write(), writePush()]);
-                return ts_common_1.filterDuplicates(notifications);
+                return array_tools_1.filterDuplicates(notifications);
             }));
         });
     }
@@ -142,7 +132,7 @@ class PushPubSubModule_Class extends ts_common_1.Module {
                 console.log("i am pushing to key...", key, props, data);
                 let docs = yield _transaction.query(this.pushKeys, { where: { pushKey: key } });
                 if (props)
-                    docs = docs.filter(doc => !doc.props || ts_common_1.compare(doc.props, props));
+                    docs = docs.filter(doc => !doc.props || object_tools_1.compare(doc.props, props));
                 const notification = this.buildNotification(key, persistent, data, props);
                 // If we need to do read and write for a transaction move this to a callback and rename to pushToKey_Read
                 if (persistent) {
@@ -152,7 +142,7 @@ class PushPubSubModule_Class extends ts_common_1.Module {
                     return;
                 const sessionsIds = docs.map(d => d.pushSessionId);
                 // I get the tokens relative to those sessions (query)
-                const sessions = yield ts_common_1.batchAction(sessionsIds, 10, (elements) => __awaiter(this, void 0, void 0, function* () { return _transaction.query(this.pushSessions, { where: { pushSessionId: { $in: elements } } }); }));
+                const sessions = yield array_tools_1.batchAction(sessionsIds, 10, (elements) => __awaiter(this, void 0, void 0, function* () { return _transaction.query(this.pushSessions, { where: { pushSessionId: { $in: elements } } }); }));
                 const _messages = docs.reduce((carry, db_pushKey) => {
                     const session = sessions.find(s => s.pushSessionId === db_pushKey.pushSessionId);
                     if (!session)
@@ -185,7 +175,7 @@ class PushPubSubModule_Class extends ts_common_1.Module {
             if (docs.length === 0)
                 return;
             const sessionsIds = docs.map(d => d.pushSessionId);
-            const sessions = yield ts_common_1.batchAction(sessionsIds, 10, (elements) => __awaiter(this, void 0, void 0, function* () { return this.pushSessions.query({ where: { pushSessionId: { $in: elements } } }); }));
+            const sessions = yield array_tools_1.batchAction(sessionsIds, 10, (elements) => __awaiter(this, void 0, void 0, function* () { return this.pushSessions.query({ where: { pushSessionId: { $in: elements } } }); }));
             const _messages = docs.reduce((carry, db_pushKey) => {
                 const session = sessions.find(s => s.pushSessionId === db_pushKey.pushSessionId);
                 if (!session)
@@ -200,12 +190,12 @@ class PushPubSubModule_Class extends ts_common_1.Module {
         return __awaiter(this, void 0, void 0, function* () {
             if (_toDelete.length === 0)
                 return;
-            const toDelete = ts_common_1.filterDuplicates(_toDelete);
-            const _sessions = yield ts_common_1.batchActionParallel(toDelete, 10, (elements) => __awaiter(this, void 0, void 0, function* () { return this.pushSessions.query({ where: { firebaseToken: { $in: elements } } }); }));
-            const sessions = ts_common_1.filterDuplicates(_sessions.map(s => s.pushSessionId));
+            const toDelete = array_tools_1.filterDuplicates(_toDelete);
+            const _sessions = yield array_tools_1.batchActionParallel(toDelete, 10, (elements) => __awaiter(this, void 0, void 0, function* () { return this.pushSessions.query({ where: { firebaseToken: { $in: elements } } }); }));
+            const sessions = array_tools_1.filterDuplicates(_sessions.map(s => s.pushSessionId));
             const async = [
-                ts_common_1.batchActionParallel(toDelete, 10, (elements) => __awaiter(this, void 0, void 0, function* () { return this.pushSessions.delete({ where: { firebaseToken: { $in: elements } } }); })),
-                ts_common_1.batchActionParallel(sessions, 10, (elements) => __awaiter(this, void 0, void 0, function* () { return this.pushKeys.delete({ where: { pushSessionId: { $in: elements } } }); }))
+                array_tools_1.batchActionParallel(toDelete, 10, (elements) => __awaiter(this, void 0, void 0, function* () { return this.pushSessions.delete({ where: { firebaseToken: { $in: elements } } }); })),
+                array_tools_1.batchActionParallel(sessions, 10, (elements) => __awaiter(this, void 0, void 0, function* () { return this.pushKeys.delete({ where: { pushSessionId: { $in: elements } } }); }))
             ];
             yield Promise.all(async);
         });

package/app-backend/modules/PushPubSubModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"PushPubSubModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PushPubSubModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PushPubSubModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PushPubSubModule.ts"],"names":[],"mappings":"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"}

package/app-backend/modules/ScheduledPushCleanup.d.ts

@@ -1,4 +1,4 @@
-import { FirebaseScheduledFunction } from "@intuitionrobotics/firebase/backend-functions";
+import { FirebaseScheduledFunction } from "@intuitionrobotics/firebase/app-backend/functions/firebase-function";
 export declare class ScheduledCleanup_Class extends FirebaseScheduledFunction {
     constructor();
     onScheduledEvent: () => Promise<any>;

package/app-backend/modules/ScheduledPushCleanup.js

@@ -1,22 +1,4 @@
 "use strict";
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * Copyright (C) 2020 Intuition Robotics
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -28,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScheduledCleanup = exports.ScheduledCleanup_Class = void 0;
-const backend_functions_1 = require("@intuitionrobotics/firebase/backend-functions");
+const firebase_function_1 = require("@intuitionrobotics/firebase/app-backend/functions/firebase-function");
 const PushPubSubModule_1 = require("./PushPubSubModule");
-class ScheduledCleanup_Class extends backend_functions_1.FirebaseScheduledFunction {
+class ScheduledCleanup_Class extends firebase_function_1.FirebaseScheduledFunction {
     constructor() {
         super("ScheduledCleanup");
         this.onScheduledEvent = () => __awaiter(this, void 0, void 0, function* () {

package/app-backend/modules/ScheduledPushCleanup.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScheduledPushCleanup.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/ScheduledPushCleanup.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;AAEH,qFAAwF;AACxF,yDAAoD;AAEpD,MAAa,sBACZ,SAAQ,6CAAyB;IAEjC;QACC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAI3B,qBAAgB,GAAG,GAAuB,EAAE;YAC3C,OAAO,mCAAgB,CAAC,gBAAgB,EAAE,CAAA;QAC3C,CAAC,CAAA,CAAC;QALD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IACnC,CAAC;CAKD;AAXD,wDAWC;AAEY,QAAA,gBAAgB,GAAG,IAAI,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"ScheduledPushCleanup.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/ScheduledPushCleanup.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2GAA8G;AAC9G,yDAAoD;AAEpD,MAAa,sBACT,SAAQ,6CAAyB;IAEjC;QACI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAI9B,qBAAgB,GAAG,GAAuB,EAAE;YACxC,OAAO,mCAAgB,CAAC,gBAAgB,EAAE,CAAA;QAC9C,CAAC,CAAA,CAAC;QALE,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IACtC,CAAC;CAKJ;AAXD,wDAWC;AAEY,QAAA,gBAAgB,GAAG,IAAI,sBAAsB,EAAE,CAAC"}

package/app-backend/modules/{_imports.d.ts → consts.d.ts}

@@ -1,3 +1,2 @@
-export * from "../../shared/types";
 export declare const CollectionName_PushSubscribers = "push-pub-sub--subscribers";
 export declare const CollectionName_Tabs = "push-pub-sub--tabs";

package/app-backend/modules/consts.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CollectionName_Tabs = exports.CollectionName_PushSubscribers = void 0;
+exports.CollectionName_PushSubscribers = "push-pub-sub--subscribers";
+exports.CollectionName_Tabs = "push-pub-sub--tabs";
+//# sourceMappingURL=consts.js.map

package/app-backend/modules/consts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/consts.ts"],"names":[],"mappings":";;;AAAa,QAAA,8BAA8B,GAAG,2BAA2B,CAAC;AAC7D,QAAA,mBAAmB,GAAG,oBAAoB,CAAC"}

package/app-frontend/core/module-pack.d.ts

@@ -1,3 +1 @@
-export declare const Frontend_ModulePack_PushPubSub: (import("@intuitionrobotics/firebase/frontend").FirebaseModule_Class | import("../modules/NotificationModule").NotificationsModule_Class | import("../modules/PushPubSubModule").PushPubSubModule_Class)[];
-export * from "../modules/PushPubSubModule";
-export * from "../modules/NotificationModule";
+export declare const Frontend_ModulePack_PushPubSub: (import("../modules/NotificationModule").NotificationsModule_Class | import("@intuitionrobotics/firebase/app-frontend/FirebaseModule").FirebaseModule_Class | import("../modules/PushPubSubModule").PushPubSubModule_Class)[];

package/app-frontend/core/module-pack.js

@@ -1,42 +1,12 @@
 "use strict";
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * Copyright (C) 2020 Intuition Robotics
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Frontend_ModulePack_PushPubSub = void 0;
 const PushPubSubModule_1 = require("../modules/PushPubSubModule");
-const frontend_1 = require("@intuitionrobotics/firebase/frontend");
+const FirebaseModule_1 = require("@intuitionrobotics/firebase/app-frontend/FirebaseModule");
 const NotificationModule_1 = require("../modules/NotificationModule");
 exports.Frontend_ModulePack_PushPubSub = [
-    frontend_1.FirebaseModule,
+    FirebaseModule_1.FirebaseModule,
     PushPubSubModule_1.PushPubSubModule,
     NotificationModule_1.NotificationsModule
 ];
-__exportStar(require("../modules/PushPubSubModule"), exports);
-__exportStar(require("../modules/NotificationModule"), exports);
 //# sourceMappingURL=module-pack.js.map

package/app-frontend/core/module-pack.js.map

@@ -1 +1 @@
-{"version":3,"file":"module-pack.js","sourceRoot":"","sources":["../../../src/main/app-frontend/core/module-pack.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;AAEH,kEAA6D;AAC7D,mEAAoE;AACpE,sEAAkE;AAErD,QAAA,8BAA8B,GAAG;IAC7C,yBAAc;IACd,mCAAgB;IAChB,wCAAmB;CACnB,CAAC;AAEF,8DAA4C;AAC5C,gEAA8C"}
+{"version":3,"file":"module-pack.js","sourceRoot":"","sources":["../../../src/main/app-frontend/core/module-pack.ts"],"names":[],"mappings":";;;AAAA,kEAA6D;AAC7D,4FAAuF;AACvF,sEAAkE;AAErD,QAAA,8BAA8B,GAAG;IAC1C,+BAAc;IACd,mCAAgB;IAChB,wCAAmB;CACtB,CAAC"}

package/app-frontend/modules/NotificationModule.d.ts

@@ -1,6 +1,6 @@
 import { ThunderDispatcher } from "@intuitionrobotics/thunderstorm/app-frontend/core/thunder-dispatcher";
-import { Module } from "@intuitionrobotics/ts-common";
-import { DB_Notifications } from "../..";
+import { Module } from "@intuitionrobotics/ts-common/core/module";
+import { DB_Notifications } from "../../shared/types";
 export interface OnNotificationsUpdated {
     __onNotificationsUpdated(): void;
 }

package/app-frontend/modules/NotificationModule.js

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotificationsModule = exports.NotificationsModule_Class = exports.dispatch_NotificationsUpdated = void 0;
 const thunder_dispatcher_1 = require("@intuitionrobotics/thunderstorm/app-frontend/core/thunder-dispatcher");
-const ts_common_1 = require("@intuitionrobotics/ts-common");
-const frontend_1 = require("@intuitionrobotics/thunderstorm/frontend");
-const thunderstorm_1 = require("@intuitionrobotics/thunderstorm");
+const module_1 = require("@intuitionrobotics/ts-common/core/module");
+const array_tools_1 = require("@intuitionrobotics/ts-common/utils/array-tools");
+const types_1 = require("@intuitionrobotics/thunderstorm/shared/types");
+const date_time_tools_1 = require("@intuitionrobotics/ts-common/utils/date-time-tools");
+const XhrHttpModule_1 = require("@intuitionrobotics/thunderstorm/app-frontend/modules/http/XhrHttpModule");
 exports.dispatch_NotificationsUpdated = new thunder_dispatcher_1.ThunderDispatcher('__onNotificationsUpdated');
-class NotificationsModule_Class extends ts_common_1.Module {
+class NotificationsModule_Class extends module_1.Module {
     constructor() {
         super("NotificationsModule");
         this.notifications = [];
@@ -26,12 +28,12 @@ class NotificationsModule_Class extends ts_common_1.Module {
                 _id: id,
                 read
             };
-            frontend_1.XhrHttpModule
-                .createRequest(thunderstorm_1.HttpMethod.POST, 'read-notification')
+            XhrHttpModule_1.XhrHttpModule
+                .createRequest(types_1.HttpMethod.POST, 'read-notification')
                 .setRelativeUrl("/v1/push/read")
                 .setJsonBody(body)
                 .setOnError('Something went wrong while reading your notification')
-                .setTimeout(ts_common_1.Minute)
+                .setTimeout(date_time_tools_1.Minute)
                 .execute(() => {
                 exports.dispatch_NotificationsUpdated.dispatchUI([]);
             });
@@ -45,7 +47,7 @@ class NotificationsModule_Class extends ts_common_1.Module {
         exports.dispatch_NotificationsUpdated.dispatchUI([]);
     }
     removeNotification(notification) {
-        ts_common_1.removeItemFromArray(this.notifications, notification);
+        array_tools_1.removeItemFromArray(this.notifications, notification);
         exports.dispatch_NotificationsUpdated.dispatchUI([]);
         return notification._id;
     }

package/app-frontend/modules/NotificationModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationModule.js","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/NotificationModule.ts"],"names":[],"mappings":";;;AAAA,6GAAuG;AACvG,4DAIsC;AAKtC,uEAAuE;AACvE,kEAA2D;AAM9C,QAAA,6BAA6B,GAAG,IAAI,sCAAiB,CAAqD,0BAA0B,CAAC,CAAC;AAGnJ,MAAa,yBACZ,SAAQ,kBAAM;IAEd;QACC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAGtB,kBAAa,GAAuB,EAAE,CAAC;QAM/C,wBAAmB,GAAG,CAAC,aAAiC,EAAE,EAAE;YAC3D,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;YACnC,qCAA6B,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC9C,CAAC,CAAC;QAaF,SAAI,GAAG,CAAC,YAA8B,EAAE,IAAa,EAAE,EAAE;YACxD,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,GAAG,KAAK,YAAY,CAAC,GAAG,CAAC,CAAC;YAC1G,IAAI,CAAC,gBAAgB,IAAI,CAAC,gBAAgB,CAAC,UAAU;gBACpD,OAAO;YAER,gBAAgB,CAAC,IAAI,GAAG,IAAI,CAAC;YAC7B,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC/C,CAAC,CAAC;QAEF,qBAAgB,GAAG,CAAC,EAAU,EAAE,IAAa,EAAE,EAAE;YAChD,MAAM,IAAI,GAAG;gBACZ,GAAG,EAAE,EAAE;gBACP,IAAI;aACJ,CAAC;YAEF,wBAAa;iBACX,aAAa,CAAyB,yBAAU,CAAC,IAAI,EAAE,mBAAmB,CAAC;iBAC3E,cAAc,CAAC,eAAe,CAAC;iBAC/B,WAAW,CAAC,IAAI,CAAC;iBACjB,UAAU,CAAC,sDAAsD,CAAC;iBAClE,UAAU,CAAC,kBAAM,CAAC;iBAClB,OAAO,CAAC,GAAG,EAAE;gBACb,qCAA6B,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;IAhDF,CAAC;IAID,gBAAgB;QACf,OAAO,IAAI,CAAC,aAAa,CAAC;IAC3B,CAAC;IAOD,eAAe,CAAC,eAAiC;QAChD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACzC,qCAA6B,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,kBAAkB,CAAC,YAA8B;QAChD,+BAAmB,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;QACtD,qCAA6B,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC7C,OAAO,YAAY,CAAC,GAAG,CAAC;IACzB,CAAC;CA4BD;AAvDD,8DAuDC;AAEY,QAAA,mBAAmB,GAAG,IAAI,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"NotificationModule.js","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/NotificationModule.ts"],"names":[],"mappings":";;;AAAA,6GAAuG;AACvG,qEAAgE;AAChE,gFAAmF;AAGnF,wEAAwE;AACxE,wFAA0E;AAC1E,2GAAsG;AAMzF,QAAA,6BAA6B,GAAG,IAAI,sCAAiB,CAAqD,0BAA0B,CAAC,CAAC;AAGnJ,MAAa,yBACT,SAAQ,eAAM;IAEd;QACI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAGzB,kBAAa,GAAuB,EAAE,CAAC;QAM/C,wBAAmB,GAAG,CAAC,aAAiC,EAAE,EAAE;YACxD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;YACnC,qCAA6B,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACjD,CAAC,CAAC;QAaF,SAAI,GAAG,CAAC,YAA8B,EAAE,IAAa,EAAE,EAAE;YACrD,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,GAAG,KAAK,YAAY,CAAC,GAAG,CAAC,CAAC;YAC1G,IAAI,CAAC,gBAAgB,IAAI,CAAC,gBAAgB,CAAC,UAAU;gBACjD,OAAO;YAEX,gBAAgB,CAAC,IAAI,GAAG,IAAI,CAAC;YAC7B,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAClD,CAAC,CAAC;QAEF,qBAAgB,GAAG,CAAC,EAAU,EAAE,IAAa,EAAE,EAAE;YAC7C,MAAM,IAAI,GAAG;gBACT,GAAG,EAAE,EAAE;gBACP,IAAI;aACP,CAAC;YAEF,6BAAa;iBACR,aAAa,CAAyB,kBAAU,CAAC,IAAI,EAAE,mBAAmB,CAAC;iBAC3E,cAAc,CAAC,eAAe,CAAC;iBAC/B,WAAW,CAAC,IAAI,CAAC;iBACjB,UAAU,CAAC,sDAAsD,CAAC;iBAClE,UAAU,CAAC,wBAAM,CAAC;iBAClB,OAAO,CAAC,GAAG,EAAE;gBACV,qCAA6B,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACjD,CAAC,CAAC,CAAC;QACX,CAAC,CAAC;IAhDF,CAAC;IAID,gBAAgB;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAOD,eAAe,CAAC,eAAiC;QAC7C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACzC,qCAA6B,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,kBAAkB,CAAC,YAA8B;QAC7C,iCAAmB,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;QACtD,qCAA6B,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC7C,OAAO,YAAY,CAAC,GAAG,CAAC;IAC5B,CAAC;CA4BJ;AAvDD,8DAuDC;AAEY,QAAA,mBAAmB,GAAG,IAAI,yBAAyB,EAAE,CAAC"}

package/app-frontend/modules/PushPubSubModule.d.ts

@@ -1,5 +1,5 @@
-import { Module } from "@intuitionrobotics/ts-common";
-import { BaseSubscriptionData, DB_Notifications, IFP, ISP, ITP, MessageType, SubscribeProps } from "../../index";
+import { Module } from "@intuitionrobotics/ts-common/core/module";
+import { BaseSubscriptionData, DB_Notifications, IFP, ISP, ITP, MessageType, SubscribeProps } from "../../shared/types";
 export declare const Command_SwToApp = "SwToApp";
 export interface OnPushMessageReceived<M extends MessageType<any, any, any> = never, S extends string = IFP<M>, P extends SubscribeProps = ISP<M>, D = ITP<M>> {
     __onMessageReceived(notification: DB_Notifications): void;

package/app-frontend/modules/PushPubSubModule.js

@@ -1,21 +1,4 @@
 "use strict";
-/*
- * A typescript & react boilerplate with api call example
- *
- * Copyright (C) 2018  Intuition Robotics
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -27,19 +10,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PushPubSubModule = exports.PushPubSubModule_Class = exports.pushSessionIdKey = exports.Command_SwToApp = void 0;
-const ts_common_1 = require("@intuitionrobotics/ts-common");
-const frontend_1 = require("@intuitionrobotics/thunderstorm/frontend");
-const thunderstorm_1 = require("@intuitionrobotics/thunderstorm");
-const frontend_2 = require("@intuitionrobotics/firebase/frontend");
+const thunder_dispatcher_1 = require("@intuitionrobotics/thunderstorm/app-frontend/core/thunder-dispatcher");
+const module_1 = require("@intuitionrobotics/ts-common/core/module");
+const array_tools_1 = require("@intuitionrobotics/ts-common/utils/array-tools");
+const types_1 = require("@intuitionrobotics/thunderstorm/shared/types");
+const XhrHttpModule_1 = require("@intuitionrobotics/thunderstorm/app-frontend/modules/http/XhrHttpModule");
 const NotificationModule_1 = require("./NotificationModule");
+const random_tools_1 = require("@intuitionrobotics/ts-common/utils/random-tools");
+const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
+const FirebaseModule_1 = require("@intuitionrobotics/firebase/app-frontend/FirebaseModule");
+const object_tools_1 = require("@intuitionrobotics/ts-common/utils/object-tools");
+const tools_1 = require("@intuitionrobotics/ts-common/utils/tools");
+const StorageModule_1 = require("@intuitionrobotics/thunderstorm/app-frontend/modules/StorageModule");
 exports.Command_SwToApp = "SwToApp";
 exports.pushSessionIdKey = "x-push-session-id";
-const pushSessionId = new frontend_1.StorageKey(exports.pushSessionIdKey, false);
-class PushPubSubModule_Class extends ts_common_1.Module {
+const pushSessionId = new StorageModule_1.StorageKey(exports.pushSessionIdKey, false);
+class PushPubSubModule_Class extends module_1.Module {
     constructor() {
         super("PushPubSubModule");
         this.subscriptions = [];
-        this.dispatch_pushMessage = new frontend_1.ThunderDispatcher("__onMessageReceived");
+        this.dispatch_pushMessage = new thunder_dispatcher_1.ThunderDispatcher("__onMessageReceived");
         this.timeout = 800;
         this.registerServiceWorker = () => __awaiter(this, void 0, void 0, function* () {
             console.log("Registering service worker...");
@@ -48,12 +38,12 @@ class PushPubSubModule_Class extends ts_common_1.Module {
         this.initApp = () => {
             var _a;
             if (!((_a = this.config) === null || _a === void 0 ? void 0 : _a.publicKeyBase64))
-                throw new ts_common_1.ImplementationMissingException(`Please specify the right config for the 'PushPubSubModule'`);
+                throw new exceptions_1.ImplementationMissingException(`Please specify the right config for the 'PushPubSubModule'`);
             this.runAsync("Initializing Firebase SDK and registering SW", () => __awaiter(this, void 0, void 0, function* () {
                 if ("serviceWorker" in navigator) {
                     const asyncs = [
                         this.registerServiceWorker(),
-                        frontend_2.FirebaseModule.createSession()
+                        FirebaseModule_1.FirebaseModule.createSession()
                     ];
                     const { 0: registration, 1: app } = yield Promise.all(asyncs);
                     yield registration.update();
@@ -82,7 +72,7 @@ class PushPubSubModule_Class extends ts_common_1.Module {
                 if (permission !== "granted")
                     return;
                 if (!this.messaging)
-                    throw new ts_common_1.BadImplementationException("I literally just set this!");
+                    throw new exceptions_1.BadImplementationException("I literally just set this!");
                 this.firebaseToken = yield this.messaging.getToken(options);
                 if (!this.firebaseToken)
                     return;
@@ -126,7 +116,7 @@ class PushPubSubModule_Class extends ts_common_1.Module {
             return this.register();
         };
         this.unsubscribe = (subscription) => {
-            ts_common_1.removeFromArray(this.subscriptions, d => d.pushKey === subscription.pushKey && ts_common_1.compare(subscription.props, d.props));
+            array_tools_1.removeFromArray(this.subscriptions, d => d.pushKey === subscription.pushKey && object_tools_1.compare(subscription.props, d.props));
             return this.register();
         };
         this.register = () => {
@@ -141,10 +131,10 @@ class PushPubSubModule_Class extends ts_common_1.Module {
                 };
                 this.logDebug("Registering subscriptions");
                 for (const sub of this.subscriptions) {
-                    this.logDebug(`${sub.pushKey} => ${sub.props ? ts_common_1.__stringify(sub.props) : "no props"}`);
+                    this.logDebug(`${sub.pushKey} => ${sub.props ? tools_1.__stringify(sub.props) : "no props"}`);
                 }
-                frontend_1.XhrHttpModule
-                    .createRequest(thunderstorm_1.HttpMethod.POST, "register-pub-sub-tab")
+                XhrHttpModule_1.XhrHttpModule
+                    .createRequest(types_1.HttpMethod.POST, "register-pub-sub-tab")
                     .setRelativeUrl("/v1/push/register")
                     .setJsonBody(body)
                     .setOnError("Failed to register for push")
@@ -154,7 +144,7 @@ class PushPubSubModule_Class extends ts_common_1.Module {
                 });
             }, "debounce-register", this.timeout);
         };
-        window.name = window.name || ts_common_1.generateHex(32);
+        window.name = window.name || random_tools_1.generateHex(32);
         this.pushSessionId = pushSessionId.set(window.name);
     }
     init() {
@@ -167,9 +157,9 @@ class PushPubSubModule_Class extends ts_common_1.Module {
         return this.pushSessionId;
     }
     subscribeImpl(subscription) {
-        if (this.subscriptions.find(d => d.pushKey === subscription.pushKey && ts_common_1.compare(subscription.props, d.props)))
+        if (this.subscriptions.find(d => d.pushKey === subscription.pushKey && object_tools_1.compare(subscription.props, d.props)))
             return;
-        ts_common_1.addItemToArray(this.subscriptions, subscription);
+        array_tools_1.addItemToArray(this.subscriptions, subscription);
     }
 }
 exports.PushPubSubModule_Class = PushPubSubModule_Class;

package/app-frontend/modules/PushPubSubModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"PushPubSubModule.js","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/PushPubSubModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PushPubSubModule.js","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/PushPubSubModule.ts"],"names":[],"mappings":"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"}

package/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./shared/api";
-export * from "./shared/types";

package/index.js

@@ -1,15 +1,2 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./shared/api"), exports);
-__exportStar(require("./shared/types"), exports);
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/main/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA6B;AAC7B,iDAA+B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/main/index.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuitionrobotics/push-pub-sub",
-  "version": "0.45.3",
+  "version": "0.46.00",
   "description": "push-pub-sub",
   "keywords": [
     "IR",
@@ -23,12 +23,12 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@intuitionrobotics/firebase": "~0.45.0",
-    "@intuitionrobotics/thunderstorm": "~0.45.0",
-    "@intuitionrobotics/ts-common": "~0.45.0"
+    "@intuitionrobotics/firebase": "~0.46.0",
+    "@intuitionrobotics/thunderstorm": "~0.46.0",
+    "@intuitionrobotics/ts-common": "~0.46.0"
   },
   "devDependencies": {
-    "@intuitionrobotics/testelot": "~0.45.0",
+    "@intuitionrobotics/testelot": "~0.46.0",
     "@types/node": "^16.0.0",
     "ts-node": "^8.6.2",
     "tslint": "^5.16.0",

package/shared/api.d.ts

@@ -1,4 +1,4 @@
-import { ApiWithBody } from "@intuitionrobotics/thunderstorm";
+import { ApiWithBody } from "@intuitionrobotics/thunderstorm/shared/types";
 import { Request_PushRegister, Request_ReadPush, Response_PushRegister } from "./types";
 export declare type PubSubRegisterClient = ApiWithBody<'/v1/push/register', Request_PushRegister, Response_PushRegister>;
 export declare type PubSubReadNotification = ApiWithBody<'/v1/push/read', Request_ReadPush, void>;

package/shared/types.d.ts

@@ -1,4 +1,4 @@
-import { DB_Object } from "@intuitionrobotics/ts-common";
+import { DB_Object } from "@intuitionrobotics/ts-common/utils/types";
 export declare type SubscribeProps = {
     [prop: string]: string | number;
 };

package/app-backend/modules/_imports.js

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CollectionName_Tabs = exports.CollectionName_PushSubscribers = void 0;
-__exportStar(require("../../shared/types"), exports);
-exports.CollectionName_PushSubscribers = "push-pub-sub--subscribers";
-exports.CollectionName_Tabs = "push-pub-sub--tabs";
-//# sourceMappingURL=_imports.js.map

package/app-backend/modules/_imports.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"_imports.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/_imports.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qDAAmC;AAEtB,QAAA,8BAA8B,GAAG,2BAA2B,CAAC;AAC7D,QAAA,mBAAmB,GAAG,oBAAoB,CAAC"}

package/backend.d.ts

@@ -1 +0,0 @@
-export * from "./app-backend/core/module-pack";

package/backend.js

@@ -1,14 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./app-backend/core/module-pack"), exports);
-//# sourceMappingURL=backend.js.map

package/backend.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"backend.js","sourceRoot":"","sources":["../src/main/backend.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8C"}

package/frontend.d.ts

@@ -1,3 +0,0 @@
-export * from './app-frontend/modules/PushPubSubModule';
-export * from './app-frontend/modules/NotificationModule';
-export * from './app-frontend/core/module-pack';

package/frontend.js

@@ -1,16 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./app-frontend/modules/PushPubSubModule"), exports);
-__exportStar(require("./app-frontend/modules/NotificationModule"), exports);
-__exportStar(require("./app-frontend/core/module-pack"), exports);
-//# sourceMappingURL=frontend.js.map

package/frontend.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"frontend.js","sourceRoot":"","sources":["../src/main/frontend.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0EAAwD;AACxD,4EAAyD;AACzD,kEAAgD"}