@intuitionrobotics/push-pub-sub 2.4.4 → 2.4.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/app-backend/api/routes.d.ts.map +1 -1
- package/dist/app-backend/api/routes.js +0 -2
- package/dist/app-backend/api/routes.js.map +1 -1
- package/dist/app-backend/modules/PushKey.d.ts +1 -2
- package/dist/app-backend/modules/PushKey.d.ts.map +1 -1
- package/dist/app-backend/modules/PushKey.js +2 -4
- package/dist/app-backend/modules/PushKey.js.map +1 -1
- package/dist/app-backend/modules/PushPubSubModule.d.ts +7 -11
- package/dist/app-backend/modules/PushPubSubModule.d.ts.map +1 -1
- package/dist/app-backend/modules/PushPubSubModule.js +18 -52
- package/dist/app-backend/modules/PushPubSubModule.js.map +1 -1
- package/dist/app-frontend/core/module-pack.d.ts +1 -2
- package/dist/app-frontend/core/module-pack.d.ts.map +1 -1
- package/dist/app-frontend/core/module-pack.js +1 -4
- package/dist/app-frontend/core/module-pack.js.map +1 -1
- package/dist/app-frontend/modules/PushPubSubModule.d.ts.map +1 -1
- package/dist/app-frontend/modules/PushPubSubModule.js +1 -7
- package/dist/app-frontend/modules/PushPubSubModule.js.map +1 -1
- package/dist/frontend.d.ts +0 -1
- package/dist/frontend.d.ts.map +1 -1
- package/dist/frontend.js +0 -1
- package/dist/frontend.js.map +1 -1
- package/dist/shared/api.d.ts +2 -3
- package/dist/shared/api.d.ts.map +1 -1
- package/dist/shared/api.js.map +1 -1
- package/dist/shared/types.d.ts +2 -7
- package/dist/shared/types.d.ts.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -5
- package/dist/app-backend/api/v1/push/read.d.ts +0 -4
- package/dist/app-backend/api/v1/push/read.d.ts.map +0 -1
- package/dist/app-backend/api/v1/push/read.js +0 -8
- package/dist/app-backend/api/v1/push/read.js.map +0 -1
- package/dist/app-frontend/modules/NotificationModule.d.ts +0 -19
- package/dist/app-frontend/modules/NotificationModule.d.ts.map +0 -1
- package/dist/app-frontend/modules/NotificationModule.js +0 -52
- package/dist/app-frontend/modules/NotificationModule.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../src/main/app-backend/api/routes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../src/main/app-backend/api/routes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAW/B,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
// Hand-wired handler(fn) routes for the push-pub-sub lib.
|
|
2
2
|
import { Router } from "express";
|
|
3
3
|
import { handler } from "@intuitionrobotics/thunderstorm/backend";
|
|
4
|
-
import { read } from "./v1/push/read.js";
|
|
5
4
|
import { register } from "./v1/push/register.js";
|
|
6
5
|
const push = Router();
|
|
7
|
-
push.post("/read", handler(read));
|
|
8
6
|
push.post("/register", handler(register));
|
|
9
7
|
const v1 = Router();
|
|
10
8
|
v1.use("/push", push);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../src/main/app-backend/api/routes.ts"],"names":[],"mappings":"AAAA,0DAA0D;AAE1D,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAC,OAAO,EAAC,MAAM,yCAAyC,CAAC;AAEhE,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../src/main/app-backend/api/routes.ts"],"names":[],"mappings":"AAAA,0DAA0D;AAE1D,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAC,OAAO,EAAC,MAAM,yCAAyC,CAAC;AAEhE,OAAO,EAAC,QAAQ,EAAC,MAAM,uBAAuB,CAAC;AAE/C,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC;AACtB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;AAE1C,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;AACpB,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AAEtB,MAAM,CAAC,MAAM,gBAAgB,GAAW,MAAM,EAAE,CAAC;AACjD,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC"}
|
|
@@ -2,8 +2,7 @@ import { type ObjectTS } from "@intuitionrobotics/ts-common";
|
|
|
2
2
|
import { type SubscribeProps } from "./_imports.js";
|
|
3
3
|
export declare class PushKey<K extends string, P extends SubscribeProps, D extends ObjectTS> {
|
|
4
4
|
private readonly key;
|
|
5
|
-
|
|
6
|
-
constructor(key: K, persist?: boolean);
|
|
5
|
+
constructor(key: K);
|
|
7
6
|
push(data: D, props?: P): Promise<void>;
|
|
8
7
|
}
|
|
9
8
|
//# sourceMappingURL=PushKey.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PushKey.d.ts","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PushKey.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,QAAQ,EAAC,MAAM,8BAA8B,CAAC;AAE3D,OAAO,EAAC,KAAK,cAAc,EAAC,MAAM,eAAe,CAAC;AAElD,qBAAa,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,QAAQ;IAElF,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAI;
|
|
1
|
+
{"version":3,"file":"PushKey.d.ts","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PushKey.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,QAAQ,EAAC,MAAM,8BAA8B,CAAC;AAE3D,OAAO,EAAC,KAAK,cAAc,EAAC,MAAM,eAAe,CAAC;AAElD,qBAAa,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,QAAQ;IAElF,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAI;gBAEZ,GAAG,EAAE,CAAC;IAIZ,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;CAG7B"}
|
|
@@ -3,13 +3,11 @@ import { PushPubSubModule } from "./PushPubSubModule.js";
|
|
|
3
3
|
import {} from "./_imports.js";
|
|
4
4
|
export class PushKey {
|
|
5
5
|
key;
|
|
6
|
-
|
|
7
|
-
constructor(key, persist = false) {
|
|
6
|
+
constructor(key) {
|
|
8
7
|
this.key = key;
|
|
9
|
-
this.persist = persist;
|
|
10
8
|
}
|
|
11
9
|
async push(data, props) {
|
|
12
|
-
return PushPubSubModule.pushToKey(this.key, props, data
|
|
10
|
+
return PushPubSubModule.pushToKey(this.key, props, data);
|
|
13
11
|
}
|
|
14
12
|
;
|
|
15
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PushKey.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PushKey.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAqB,MAAM,eAAe,CAAC;AAElD,MAAM,OAAO,OAAO;IAEF,GAAG,CAAI;
|
|
1
|
+
{"version":3,"file":"PushKey.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PushKey.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAqB,MAAM,eAAe,CAAC;AAElD,MAAM,OAAO,OAAO;IAEF,GAAG,CAAI;IAExB,YAAY,GAAM;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAO,EAAE,KAAS;QAC5B,OAAO,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAC1D,CAAC;IAAA,CAAC;CACF"}
|
|
@@ -1,34 +1,30 @@
|
|
|
1
1
|
import { Module } from "@intuitionrobotics/ts-common";
|
|
2
2
|
import { type FirebaseType_BatchResponse, type FirebaseType_Message, FirestoreTransaction } from "@intuitionrobotics/firebase/backend";
|
|
3
|
-
import { type
|
|
3
|
+
import { type PushMessage, type IFP, type ISP, type ITP, type MessageType, type Request_PushRegister, type SubscribeProps } from "../../index.js";
|
|
4
4
|
import { type ExpressRequest } from "@intuitionrobotics/thunderstorm/backend";
|
|
5
5
|
type Config = {
|
|
6
|
-
notificationsCleanupTime?: number;
|
|
7
6
|
sessionsCleanupTime?: number;
|
|
8
7
|
};
|
|
9
8
|
type TempMessages = {
|
|
10
|
-
[token: string]:
|
|
9
|
+
[token: string]: PushMessage[];
|
|
11
10
|
};
|
|
12
11
|
export declare class PushPubSubModule_Class extends Module<Config> {
|
|
13
12
|
constructor();
|
|
14
13
|
private _pushSessions?;
|
|
15
14
|
private _pushKeys?;
|
|
16
|
-
private _notifications?;
|
|
17
15
|
private _messaging?;
|
|
18
16
|
private get session();
|
|
19
17
|
private get pushSessions();
|
|
20
18
|
private get pushKeys();
|
|
21
|
-
private get notifications();
|
|
22
19
|
private get messaging();
|
|
23
|
-
register(body: Request_PushRegister, request: ExpressRequest): Promise<
|
|
24
|
-
pushToKey<M extends MessageType<any, any, any> = never, S extends string = IFP<M>, P extends SubscribeProps = ISP<M>, D = ITP<M>>(key: S, props?: P, data?: D,
|
|
25
|
-
pushToUser<M extends MessageType<any, any, any> = never, _S extends string = IFP<M>, P extends SubscribeProps = ISP<M>, D = ITP<M>>(user: string, key: string, props?: P, data?: D
|
|
26
|
-
private
|
|
27
|
-
sendMessage: (
|
|
20
|
+
register(body: Request_PushRegister, request: ExpressRequest): Promise<void>;
|
|
21
|
+
pushToKey<M extends MessageType<any, any, any> = never, S extends string = IFP<M>, P extends SubscribeProps = ISP<M>, D = ITP<M>>(key: S, props?: P, data?: D, transaction?: FirestoreTransaction): Promise<void>;
|
|
22
|
+
pushToUser<M extends MessageType<any, any, any> = never, _S extends string = IFP<M>, P extends SubscribeProps = ISP<M>, D = ITP<M>>(user: string, key: string, props?: P, data?: D): Promise<void>;
|
|
23
|
+
private buildMessage;
|
|
24
|
+
sendMessage: (_messages: TempMessages) => Promise<{
|
|
28
25
|
response: FirebaseType_BatchResponse;
|
|
29
26
|
messages: FirebaseType_Message[];
|
|
30
27
|
} | undefined>;
|
|
31
|
-
readNotification: (id: string, read: boolean) => Promise<void>;
|
|
32
28
|
scheduledCleanup: () => Promise<void>;
|
|
33
29
|
cleanUp: (response: FirebaseType_BatchResponse, messages: FirebaseType_Message[]) => Promise<void>;
|
|
34
30
|
private cleanUpImpl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PushPubSubModule.d.ts","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PushPubSubModule.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"PushPubSubModule.d.ts","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PushPubSubModule.ts"],"names":[],"mappings":"AAAA,OAAO,EASH,MAAM,EACT,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAEH,KAAK,0BAA0B,EAC/B,KAAK,oBAAoB,EAEzB,oBAAoB,EAEvB,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EACH,KAAK,WAAW,EAGhB,KAAK,GAAG,EACR,KAAK,GAAG,EACR,KAAK,GAAG,EACR,KAAK,WAAW,EAChB,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAA4B,KAAK,cAAc,EAAC,MAAM,yCAAyC,CAAC;AAEvG,KAAK,MAAM,GAAG;IACV,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAC/B,CAAC;AAEF,KAAK,YAAY,GAAG;IAChB,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;CACjC,CAAC;AAEF,qBAAa,sBACT,SAAQ,MAAM,CAAC,MAAM,CAAC;;IAQtB,OAAO,CAAC,aAAa,CAAC,CAAsC;IAC5D,OAAO,CAAC,SAAS,CAAC,CAAmC;IACrD,OAAO,CAAC,UAAU,CAAC,CAAsB;IAEzC,OAAO,KAAK,OAAO,GAElB;IAED,OAAO,KAAK,YAAY,GAEvB;IAED,OAAO,KAAK,QAAQ,GAEnB;IAED,OAAO,KAAK,SAAS,GAEpB;IAEK,QAAQ,CAAC,IAAI,EAAE,oBAAoB,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC5E,SAAS,CAAC,CAAC,SAAS,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,KAAK,EACxD,CAAC,SAAS,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,EACzB,CAAC,SAAS,cAAc,GAAG,GAAG,CAAC,CAAC,CAAC,EACjC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,oBAAoB;IAsCzE,UAAU,CAAC,CAAC,SAAS,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,KAAK,EACzD,EAAE,SAAS,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,EAC1B,CAAC,SAAS,cAAc,GAAG,GAAG,CAAC,CAAC,CAAC,EACjC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;IA0B9D,OAAO,CAAC,YAAY,CAiBlB;IAEF,WAAW,GAAU,WAAW,YAAY,KAAG,OAAO,CAAC;QACnD,QAAQ,EAAE,0BAA0B,CAAC;QACrC,QAAQ,EAAE,oBAAoB,EAAE,CAAA;KACnC,GAAG,SAAS,CAAC,CAYZ;IAEF,gBAAgB,sBAKd;IAEF,OAAO,GAAU,UAAU,0BAA0B,EAAE,UAAU,oBAAoB,EAAE,mBAcrF;YAEY,WAAW;CAc5B;AAED,eAAO,MAAM,gBAAgB,wBAA+B,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { __stringify, batchAction, batchActionParallel, compare, currentTimeMillies,
|
|
1
|
+
import { __stringify, batchAction, batchActionParallel, compare, currentTimeMillies, filterDuplicates, generateHex, Hour, Module } from "@intuitionrobotics/ts-common";
|
|
2
2
|
import { FirebaseModule, FirestoreCollection, FirestoreTransaction, PushMessagesWrapper } from "@intuitionrobotics/firebase/backend";
|
|
3
3
|
// noinspection TypeScriptPreferShortImport
|
|
4
4
|
import {} from "../../index.js";
|
|
@@ -11,7 +11,6 @@ export class PushPubSubModule_Class extends Module {
|
|
|
11
11
|
// never creates the admin session, the collections or the messaging client.
|
|
12
12
|
_pushSessions;
|
|
13
13
|
_pushKeys;
|
|
14
|
-
_notifications;
|
|
15
14
|
_messaging;
|
|
16
15
|
get session() {
|
|
17
16
|
return FirebaseModule.createAdminSession();
|
|
@@ -22,9 +21,6 @@ export class PushPubSubModule_Class extends Module {
|
|
|
22
21
|
get pushKeys() {
|
|
23
22
|
return this._pushKeys ??= this.session.getFirestore().getCollection("push-keys");
|
|
24
23
|
}
|
|
25
|
-
get notifications() {
|
|
26
|
-
return this._notifications ??= this.session.getFirestore().getCollection("notifications", ["_id"]);
|
|
27
|
-
}
|
|
28
24
|
get messaging() {
|
|
29
25
|
return this._messaging ??= this.session.getMessaging();
|
|
30
26
|
}
|
|
@@ -52,34 +48,19 @@ export class PushPubSubModule_Class extends Module {
|
|
|
52
48
|
return sub;
|
|
53
49
|
});
|
|
54
50
|
return this.pushSessions.runInTransaction(async (transaction) => {
|
|
55
|
-
const pushKeys = subscriptions.map(_sub => _sub.pushKey);
|
|
56
|
-
let subscriptionNotifications = pushKeys.length !== 0 ?
|
|
57
|
-
await batchAction(pushKeys, 10, async (elements) => transaction.query(this.notifications, { where: { pushKey: { $in: elements } } })) : [];
|
|
58
|
-
if (subscriptionNotifications.length > 0)
|
|
59
|
-
subscriptionNotifications = subscriptionNotifications.filter(_notification => {
|
|
60
|
-
const x = subscriptions.find(_sub => _sub.pushKey === _notification.pushKey)?.props;
|
|
61
|
-
return compare(x, _notification.props) || _notification.userId;
|
|
62
|
-
});
|
|
63
|
-
const userNotifications = userId ? await transaction.query(this.notifications, { where: { userId } }) : [];
|
|
64
|
-
const notifications = userNotifications.concat(subscriptionNotifications);
|
|
65
51
|
const writePush = await transaction.upsert_Read(this.pushSessions, session);
|
|
66
52
|
const write = await transaction.delete_Read(this.pushKeys, { where: { pushSessionId: body.pushSessionId } });
|
|
67
53
|
await transaction.insertAll(this.pushKeys, subscriptions);
|
|
68
54
|
await Promise.all([write(), writePush()]);
|
|
69
|
-
return filterDuplicates(notifications);
|
|
70
55
|
});
|
|
71
56
|
}
|
|
72
|
-
async pushToKey(key, props, data,
|
|
57
|
+
async pushToKey(key, props, data, transaction) {
|
|
73
58
|
const processor = async (_transaction) => {
|
|
74
59
|
console.log("i am pushing to key...", key, props, data);
|
|
75
60
|
let docs = await _transaction.query(this.pushKeys, { where: { pushKey: key } });
|
|
76
61
|
if (props)
|
|
77
62
|
docs = docs.filter(doc => !doc.props || compare(doc.props, props));
|
|
78
|
-
const
|
|
79
|
-
// If we need to do read and write for a transaction move this to a callback and rename to pushToKey_Read
|
|
80
|
-
if (persistent) {
|
|
81
|
-
await this.notifications.insertAll([notification]);
|
|
82
|
-
}
|
|
63
|
+
const message = this.buildMessage(key, data, props);
|
|
83
64
|
if (docs.length === 0)
|
|
84
65
|
return;
|
|
85
66
|
const sessionsIds = docs.map(d => d.pushSessionId);
|
|
@@ -89,10 +70,10 @@ export class PushPubSubModule_Class extends Module {
|
|
|
89
70
|
const session = sessions.find(s => s.pushSessionId === db_pushKey.pushSessionId);
|
|
90
71
|
if (!session)
|
|
91
72
|
return carry;
|
|
92
|
-
carry[session.firebaseToken] = [
|
|
73
|
+
carry[session.firebaseToken] = [message];
|
|
93
74
|
return carry;
|
|
94
75
|
}, {});
|
|
95
|
-
const resp = await this.sendMessage(
|
|
76
|
+
const resp = await this.sendMessage(_messages);
|
|
96
77
|
if (!resp)
|
|
97
78
|
return this.logInfo('No messages to send. Empty subscriptions');
|
|
98
79
|
const { response, messages } = resp;
|
|
@@ -103,14 +84,9 @@ export class PushPubSubModule_Class extends Module {
|
|
|
103
84
|
return processor(transaction);
|
|
104
85
|
return this.pushKeys.runInTransaction(processor);
|
|
105
86
|
}
|
|
106
|
-
async pushToUser(user, key, props, data
|
|
87
|
+
async pushToUser(user, key, props, data) {
|
|
107
88
|
console.log("i am pushing to user...", user, props);
|
|
108
|
-
const
|
|
109
|
-
const notifications = [];
|
|
110
|
-
if (persistent) {
|
|
111
|
-
notifications.push(notification);
|
|
112
|
-
await this.notifications.insertAll(notifications);
|
|
113
|
-
}
|
|
89
|
+
const message = this.buildMessage(key, data, props, user);
|
|
114
90
|
const docs = await this.pushSessions.query({ where: { userId: user } });
|
|
115
91
|
if (docs.length === 0)
|
|
116
92
|
return;
|
|
@@ -120,28 +96,26 @@ export class PushPubSubModule_Class extends Module {
|
|
|
120
96
|
const session = sessions.find(s => s.pushSessionId === db_pushKey.pushSessionId);
|
|
121
97
|
if (!session)
|
|
122
98
|
return carry;
|
|
123
|
-
carry[session.firebaseToken] = [
|
|
99
|
+
carry[session.firebaseToken] = [message];
|
|
124
100
|
return carry;
|
|
125
101
|
}, {});
|
|
126
|
-
await this.sendMessage(
|
|
102
|
+
await this.sendMessage(_messages);
|
|
127
103
|
}
|
|
128
|
-
|
|
129
|
-
const
|
|
104
|
+
buildMessage = (pushkey, data, props, user) => {
|
|
105
|
+
const message = {
|
|
130
106
|
_id: generateHex(16),
|
|
131
107
|
timestamp: currentTimeMillies(),
|
|
132
|
-
|
|
133
|
-
pushKey: pushkey,
|
|
134
|
-
persistent
|
|
108
|
+
pushKey: pushkey
|
|
135
109
|
};
|
|
136
110
|
if (data)
|
|
137
|
-
|
|
111
|
+
message.data = data;
|
|
138
112
|
if (props)
|
|
139
|
-
|
|
113
|
+
message.props = props;
|
|
140
114
|
if (user)
|
|
141
|
-
|
|
142
|
-
return
|
|
115
|
+
message.userId = user;
|
|
116
|
+
return message;
|
|
143
117
|
};
|
|
144
|
-
sendMessage = async (
|
|
118
|
+
sendMessage = async (_messages) => {
|
|
145
119
|
const messages = Object.keys(_messages).map(token => ({
|
|
146
120
|
token,
|
|
147
121
|
data: { messages: __stringify(_messages[token]) }
|
|
@@ -153,17 +127,10 @@ export class PushPubSubModule_Class extends Module {
|
|
|
153
127
|
console.log("and this is the response: " + response.responses.map(_response => _response.success));
|
|
154
128
|
return { response, messages };
|
|
155
129
|
};
|
|
156
|
-
readNotification = async (id, read) => {
|
|
157
|
-
await this.notifications.patch({ _id: id, read });
|
|
158
|
-
};
|
|
159
130
|
scheduledCleanup = async () => {
|
|
160
131
|
const sessionsCleanupTime = this.config?.sessionsCleanupTime || Hour;
|
|
161
|
-
const notificationsCleanupTime = this.config?.notificationsCleanupTime || 7 * Day;
|
|
162
132
|
const docs = await this.pushSessions.query({ where: { timestamp: { $lt: currentTimeMillies() - sessionsCleanupTime } } });
|
|
163
|
-
await
|
|
164
|
-
this.notifications.delete({ where: { timestamp: { $lt: currentTimeMillies() - notificationsCleanupTime } } }),
|
|
165
|
-
this.cleanUpImpl(docs.map(d => d.firebaseToken))
|
|
166
|
-
]);
|
|
133
|
+
await this.cleanUpImpl(docs.map(d => d.firebaseToken));
|
|
167
134
|
};
|
|
168
135
|
cleanUp = async (response, messages) => {
|
|
169
136
|
this.logInfo(`${response.successCount} sent, ${response.failureCount} failed`);
|
|
@@ -174,7 +141,6 @@ export class PushPubSubModule_Class extends Module {
|
|
|
174
141
|
carry.push(messages[i].token);
|
|
175
142
|
return carry;
|
|
176
143
|
}, []);
|
|
177
|
-
//TODO: delete notifications for the user that are older than X
|
|
178
144
|
return this.cleanUpImpl(toDelete);
|
|
179
145
|
};
|
|
180
146
|
async cleanUpImpl(_toDelete) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PushPubSubModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PushPubSubModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,WAAW,EACX,WAAW,EACX,mBAAmB,EACnB,OAAO,EACP,kBAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"PushPubSubModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PushPubSubModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,WAAW,EACX,WAAW,EACX,mBAAmB,EACnB,OAAO,EACP,kBAAkB,EAClB,gBAAgB,EAChB,WAAW,EACX,IAAI,EACJ,MAAM,EACT,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACH,cAAc,EAGd,mBAAmB,EACnB,oBAAoB,EACpB,mBAAmB,EACtB,MAAM,qCAAqC,CAAC;AAC7C,2CAA2C;AAC3C,OAAO,EAUN,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,yBAAyB,EAAsB,MAAM,yCAAyC,CAAC;AAUvG,MAAM,OAAO,sBACT,SAAQ,MAAc;IAEtB;QACI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAC9B,CAAC;IAED,4EAA4E;IAC5E,4EAA4E;IACpE,aAAa,CAAuC;IACpD,SAAS,CAAoC;IAC7C,UAAU,CAAuB;IAEzC,IAAY,OAAO;QACf,OAAO,cAAc,CAAC,kBAAkB,EAAE,CAAC;IAC/C,CAAC;IAED,IAAY,YAAY;QACpB,OAAO,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,aAAa,CAAiB,eAAe,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAChI,CAAC;IAED,IAAY,QAAQ;QAChB,OAAO,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,aAAa,CAAc,WAAW,CAAC,CAAC;IAClG,CAAC;IAED,IAAY,SAAS;QACjB,OAAO,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAA0B,EAAE,OAAuB;QAC9D,MAAM,IAAI,GAAG,MAAM,yBAAyB,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC1E,MAAM,MAAM,GAAuB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,gBAAgB,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,aAAa,CAAC,EAAE,IAAI,CAAC;QAC1I,eAAe;QACf,kFAAkF;QAElF,MAAM,OAAO,GAAmB;YAC5B,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,SAAS,EAAE,kBAAkB,EAAE;SAClC,CAAC;QAEF,IAAI,IAAI,CAAC,QAAQ;YACb,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAErC,IAAI,MAAM;YACN,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;QAE5B,MAAM,aAAa,GAAkB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAe,EAAE;YAC3E,MAAM,GAAG,GAAgB;gBACrB,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,OAAO,EAAE,CAAC,CAAC,OAAO;aACrB,CAAC;YACF,IAAI,CAAC,CAAC,KAAK;gBACP,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;YAExB,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,KAAK,EAAC,WAAW,EAAC,EAAE;YAC1D,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YAE5E,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAC,KAAK,EAAE,EAAC,aAAa,EAAE,IAAI,CAAC,aAAa,EAAC,EAAC,CAAC,CAAC;YACzG,MAAM,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;YAC1D,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,SAAS,CAGC,GAAM,EAAE,KAAS,EAAE,IAAQ,EAAE,WAAkC;QAC3E,MAAM,SAAS,GAAG,KAAK,EAAE,YAAkC,EAAE,EAAE;YAC3D,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YACxD,IAAI,IAAI,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAC,KAAK,EAAE,EAAC,OAAO,EAAE,GAAG,EAAC,EAAC,CAAC,CAAC;YAC5E,IAAI,KAAK;gBACL,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;YAEvE,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YAEpD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;gBACjB,OAAO;YAEX,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;YACnD,sDAAsD;YACtD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE,EAAE,EAAE,KAAK,EAAC,QAAQ,EAAC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,EAAC,KAAK,EAAE,EAAC,aAAa,EAAE,EAAC,GAAG,EAAE,QAAQ,EAAC,EAAC,EAAC,CAAC,CAAC,CAAC;YACxJ,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,KAAmB,EAAE,UAAuB,EAAE,EAAE;gBAC3E,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,UAAU,CAAC,aAAa,CAAC,CAAC;gBACjF,IAAI,CAAC,OAAO;oBACR,OAAO,KAAK,CAAC;gBAEjB,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAEzC,OAAO,KAAK,CAAC;YACjB,CAAC,EAAE,EAAkB,CAAC,CAAC;YACvB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAC/C,IAAI,CAAC,IAAI;gBACL,OAAO,IAAI,CAAC,OAAO,CAAC,0CAA0C,CAAC,CAAC;YAEpE,MAAM,EAAC,QAAQ,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC;YAClC,IAAI,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,YAAY,UAAU,QAAQ,CAAC,YAAY,SAAS,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;YACrG,2CAA2C;QAC/C,CAAC,CAAC;QACF,IAAI,WAAW;YACX,OAAO,SAAS,CAAC,WAAW,CAAC,CAAC;QAElC,OAAO,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,UAAU,CAGA,IAAY,EAAE,GAAW,EAAE,KAAS,EAAE,IAAQ;QAC1D,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAEpD,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAE1D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAC,KAAK,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,EAAC,CAAC,CAAC;QACpE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YACjB,OAAO;QAEX,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE,EAAE,EAAE,KAAK,EAAC,QAAQ,EAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAC,KAAK,EAAE,EAAC,aAAa,EAAE,EAAC,GAAG,EAAE,QAAQ,EAAC,EAAC,EAAC,CAAC,CAAC,CAAC;QAE1I,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,KAAmB,EAAE,UAA0B,EAAE,EAAE;YAC9E,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,UAAU,CAAC,aAAa,CAAC,CAAC;YACjF,IAAI,CAAC,OAAO;gBACR,OAAO,KAAK,CAAC;YAEjB,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAGzC,OAAO,KAAK,CAAC;QACjB,CAAC,EAAE,EAAkB,CAAC,CAAC;QAEvB,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;IAEO,YAAY,GAAG,CAAC,OAAe,EAAE,IAAU,EAAE,KAAW,EAAE,IAAa,EAAE,EAAE;QAC/E,MAAM,OAAO,GAAgB;YACzB,GAAG,EAAE,WAAW,CAAC,EAAE,CAAC;YACpB,SAAS,EAAE,kBAAkB,EAAE;YAC/B,OAAO,EAAE,OAAO;SACnB,CAAC;QAEF,IAAI,IAAI;YACJ,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QAExB,IAAI,KAAK;YACL,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;QAE1B,IAAI,IAAI;YACJ,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;QAE1B,OAAO,OAAO,CAAC;IACnB,CAAC,CAAC;IAEF,WAAW,GAAG,KAAK,EAAE,SAAuB,EAG7B,EAAE;QACb,MAAM,QAAQ,GAA2B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC1E,KAAK;YACL,IAAI,EAAE,EAAC,QAAQ,EAAE,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAC;SAClD,CAAC,CAAC,CAAC;QACJ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YACrB,OAAO;QAEX,OAAO,CAAC,GAAG,CAAC,yBAAyB,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAA+B,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACpF,OAAO,CAAC,GAAG,CAAC,4BAA4B,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACnG,OAAO,EAAC,QAAQ,EAAE,QAAQ,EAAC,CAAC;IAChC,CAAC,CAAC;IAEF,gBAAgB,GAAG,KAAK,IAAI,EAAE;QAC1B,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,EAAE,mBAAmB,IAAI,IAAI,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAC,KAAK,EAAE,EAAC,SAAS,EAAE,EAAC,GAAG,EAAE,kBAAkB,EAAE,GAAG,mBAAmB,EAAC,EAAC,EAAC,CAAC,CAAC;QAEpH,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC;IAEF,OAAO,GAAG,KAAK,EAAE,QAAoC,EAAE,QAAgC,EAAE,EAAE;QACvF,IAAI,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,YAAY,UAAU,QAAQ,CAAC,YAAY,SAAS,CAAC,CAAC;QAE/E,IAAI,QAAQ,CAAC,YAAY,GAAG,CAAC;YACzB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAE7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE;YAC1D,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,QAAQ,CAAC,CAAC,CAAC;gBAC5B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAElC,OAAO,KAAK,CAAC;QACjB,CAAC,EAAE,EAAc,CAAC,CAAC;QAEnB,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,SAAmB;QACzC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YACtB,OAAO;QAEX,MAAM,QAAQ,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAC,QAAQ,EAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAC,KAAK,EAAE,EAAC,aAAa,EAAE,EAAC,GAAG,EAAE,QAAQ,EAAC,EAAC,EAAC,CAAC,CAAC,CAAA;QAC/I,MAAM,QAAQ,GAAG,gBAAgB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;QACvE,MAAM,KAAK,GAAmB;YAC1B,mBAAmB,CAAC,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAC,QAAQ,EAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAC,KAAK,EAAE,EAAC,aAAa,EAAE,EAAC,GAAG,EAAE,QAAQ,EAAC,EAAC,EAAC,CAAC,CAAC;YACxH,mBAAmB,CAAC,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAC,QAAQ,EAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAC,KAAK,EAAE,EAAC,aAAa,EAAE,EAAC,GAAG,EAAE,QAAQ,EAAC,EAAC,EAAC,CAAC,CAAC;SACvH,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;CACJ;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,sBAAsB,EAAE,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
export declare const Frontend_ModulePack_PushPubSub: (import("../modules/
|
|
1
|
+
export declare const Frontend_ModulePack_PushPubSub: (import("../modules/PushPubSubModule.js").PushPubSubModule_Class | import("@intuitionrobotics/firebase/app-frontend/FirebaseModule").FirebaseModule_Class)[];
|
|
2
2
|
export * from "../modules/PushPubSubModule.js";
|
|
3
|
-
export * from "../modules/NotificationModule.js";
|
|
4
3
|
//# sourceMappingURL=module-pack.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-pack.d.ts","sourceRoot":"","sources":["../../../src/main/app-frontend/core/module-pack.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"module-pack.d.ts","sourceRoot":"","sources":["../../../src/main/app-frontend/core/module-pack.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,8BAA8B,8JAG1C,CAAC;AAEF,cAAc,gCAAgC,CAAC"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
import { PushPubSubModule } from "../modules/PushPubSubModule.js";
|
|
2
2
|
import { FirebaseModule } from "@intuitionrobotics/firebase/app-frontend/FirebaseModule";
|
|
3
|
-
import { NotificationsModule } from "../modules/NotificationModule.js";
|
|
4
3
|
export const Frontend_ModulePack_PushPubSub = [
|
|
5
4
|
FirebaseModule,
|
|
6
|
-
PushPubSubModule
|
|
7
|
-
NotificationsModule
|
|
5
|
+
PushPubSubModule
|
|
8
6
|
];
|
|
9
7
|
export * from "../modules/PushPubSubModule.js";
|
|
10
|
-
export * from "../modules/NotificationModule.js";
|
|
11
8
|
//# sourceMappingURL=module-pack.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-pack.js","sourceRoot":"","sources":["../../../src/main/app-frontend/core/module-pack.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAC,cAAc,EAAC,MAAM,yDAAyD,CAAC;
|
|
1
|
+
{"version":3,"file":"module-pack.js","sourceRoot":"","sources":["../../../src/main/app-frontend/core/module-pack.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAC,cAAc,EAAC,MAAM,yDAAyD,CAAC;AAEvF,MAAM,CAAC,MAAM,8BAA8B,GAAG;IAC7C,cAAc;IACd,gBAAgB;CAChB,CAAC;AAEF,cAAc,gCAAgC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PushPubSubModule.d.ts","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/PushPubSubModule.ts"],"names":[],"mappings":"AAkBA,OAAO,EAMH,MAAM,EAET,MAAM,8BAA8B,CAAC;AAItC,OAAO,EACH,KAAK,oBAAoB,EAIzB,KAAK,4BAA4B,EACpC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"PushPubSubModule.d.ts","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/PushPubSubModule.ts"],"names":[],"mappings":"AAkBA,OAAO,EAMH,MAAM,EAET,MAAM,8BAA8B,CAAC;AAItC,OAAO,EACH,KAAK,oBAAoB,EAIzB,KAAK,4BAA4B,EACpC,MAAM,gBAAgB,CAAC;AAMxB,eAAO,MAAM,eAAe,YAAY,CAAC;AAEzC,KAAK,cAAc,GAAG;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,iBAAiB,EAAE,MAAM,CAAA;IACzB,WAAW,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC3B,MAAM,CAAC,EAAE,cAAc,CAAA;IACvB,eAAe,EAAE,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,gBAAgB,sBAAsB,CAAC;AAGpD,qBAAa,sBACT,SAAQ,MAAM,CAAC,gBAAgB,CAAC;IAEhC,OAAO,CAAC,aAAa,CAAsC;IAC3D,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,SAAS,CAAC,CAAmB;IAErC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAO;;IAQhC,IAAI;IAOJ,gBAAgB;IAIhB,OAAO,CAAC,qBAAqB,CAG3B;IAEF,OAAO,aA6BL;IAIK,QAAQ,GAAU,UAAU;QAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,yBAAyB,CAAC,EAAE,yBAAyB,CAAC;KACzD,mBAkCC;IAEF,OAAO,CAAC,oBAAoB,CAM1B;IAEF,OAAO,CAAC,cAAc,CAQpB;IAEF,SAAS,GAAI,cAAc,4BAA4B,UAGrD;IAEF,OAAO,CAAC,aAAa,CAQnB;IAEF,cAAc,GAAI,eAAe,4BAA4B,EAAE,UAG7D;IAEF,WAAW,GAAI,cAAc,oBAAoB,UAO/C;IAEF,OAAO,CAAC,QAAQ,CA0Bd;CACL;AAED,eAAO,MAAM,gBAAgB,wBAA+B,CAAC"}
|
|
@@ -21,7 +21,6 @@ import { StorageKey, XhrHttpModule } from "@intuitionrobotics/thunderstorm/front
|
|
|
21
21
|
import {} from "../../index.js";
|
|
22
22
|
import { HttpMethod } from "@intuitionrobotics/thunderstorm";
|
|
23
23
|
import { FirebaseModule } from "@intuitionrobotics/firebase/app-frontend/FirebaseModule";
|
|
24
|
-
import { NotificationsModule } from "./NotificationModule.js";
|
|
25
24
|
export const Command_SwToApp = "SwToApp";
|
|
26
25
|
export const pushSessionIdKey = "x-push-session-id";
|
|
27
26
|
const pushSessionId = new StorageKey(pushSessionIdKey, false);
|
|
@@ -115,8 +114,6 @@ export class PushPubSubModule_Class extends Module {
|
|
|
115
114
|
this.logInfo("process message", data);
|
|
116
115
|
const arr = JSON.parse(data.messages);
|
|
117
116
|
arr.forEach(s => {
|
|
118
|
-
if (s.persistent)
|
|
119
|
-
NotificationsModule.addNotification(s);
|
|
120
117
|
this.subscriptions
|
|
121
118
|
.filter(d => d.pushKey === s.pushKey && compare(s.props, d.props))
|
|
122
119
|
.forEach(d => d.callBack(s.data));
|
|
@@ -164,10 +161,7 @@ export class PushPubSubModule_Class extends Module {
|
|
|
164
161
|
.setRelativeUrl("/v1/push/register")
|
|
165
162
|
.setJsonBody(body)
|
|
166
163
|
.setOnError("Failed to register for push")
|
|
167
|
-
.execute((
|
|
168
|
-
NotificationsModule.setNotificationList(response);
|
|
169
|
-
this.logVerbose("Finished register PubSub");
|
|
170
|
-
});
|
|
164
|
+
.execute(() => this.logVerbose("Finished register PubSub"));
|
|
171
165
|
}, "debounce-register", this.timeout);
|
|
172
166
|
};
|
|
173
167
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PushPubSubModule.js","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/PushPubSubModule.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACH,WAAW,EACX,0BAA0B,EAC1B,OAAO,EACP,WAAW,EACX,8BAA8B,EAC9B,MAAM,EAET,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,0CAA0C,CAAC;AACnF,2CAA2C;AAC3C,OAAO,EAMN,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAC,cAAc,EAAC,MAAM,yDAAyD,CAAC;
|
|
1
|
+
{"version":3,"file":"PushPubSubModule.js","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/PushPubSubModule.ts"],"names":[],"mappings":"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"}
|
package/dist/frontend.d.ts
CHANGED
package/dist/frontend.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frontend.d.ts","sourceRoot":"","sources":["../src/main/frontend.ts"],"names":[],"mappings":"AAGA,cAAc,4CAA4C,CAAC;AAC3D,cAAc,
|
|
1
|
+
{"version":3,"file":"frontend.d.ts","sourceRoot":"","sources":["../src/main/frontend.ts"],"names":[],"mappings":"AAGA,cAAc,4CAA4C,CAAC;AAC3D,cAAc,oCAAoC,CAAC"}
|
package/dist/frontend.js
CHANGED
|
@@ -2,6 +2,5 @@
|
|
|
2
2
|
// Heavy firebase wiring is reached via module-pack which imports
|
|
3
3
|
// FirebaseModule via the explicit subpath, not the firebase barrel.
|
|
4
4
|
export * from './app-frontend/modules/PushPubSubModule.js';
|
|
5
|
-
export * from './app-frontend/modules/NotificationModule.js';
|
|
6
5
|
export * from './app-frontend/core/module-pack.js';
|
|
7
6
|
//# sourceMappingURL=frontend.js.map
|
package/dist/frontend.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frontend.js","sourceRoot":"","sources":["../src/main/frontend.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,iEAAiE;AACjE,oEAAoE;AACpE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,
|
|
1
|
+
{"version":3,"file":"frontend.js","sourceRoot":"","sources":["../src/main/frontend.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,iEAAiE;AACjE,oEAAoE;AACpE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,oCAAoC,CAAC"}
|
package/dist/shared/api.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { type ApiWithBody } from "@intuitionrobotics/thunderstorm";
|
|
2
|
-
import { type Request_PushRegister
|
|
3
|
-
export type PubSubRegisterClient = ApiWithBody<'/v1/push/register', Request_PushRegister,
|
|
4
|
-
export type PubSubReadNotification = ApiWithBody<'/v1/push/read', Request_ReadPush, void>;
|
|
2
|
+
import { type Request_PushRegister } from "./types.js";
|
|
3
|
+
export type PubSubRegisterClient = ApiWithBody<'/v1/push/register', Request_PushRegister, void>;
|
|
5
4
|
//# sourceMappingURL=api.d.ts.map
|
package/dist/shared/api.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/main/shared/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,WAAW,EAAC,MAAM,iCAAiC,CAAC;AACjE,OAAO,
|
|
1
|
+
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/main/shared/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,WAAW,EAAC,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAC,KAAK,oBAAoB,EAAC,MAAM,YAAY,CAAC;AAErD,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAAC,mBAAmB,EAAE,oBAAoB,EAAE,IAAI,CAAC,CAAA"}
|
package/dist/shared/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/main/shared/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,MAAM,iCAAiC,CAAC;AACjE,OAAO,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/main/shared/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAA2B,MAAM,YAAY,CAAC"}
|
package/dist/shared/types.d.ts
CHANGED
|
@@ -18,19 +18,14 @@ export type Language = {
|
|
|
18
18
|
export type Request_PushRegister = FirebaseToken & PushSessionId & Language & {
|
|
19
19
|
subscriptions: BaseSubscriptionData[];
|
|
20
20
|
};
|
|
21
|
-
export type Request_ReadPush = DB_Object & {
|
|
22
|
-
read: boolean;
|
|
23
|
-
};
|
|
24
|
-
export type Response_PushRegister = DB_Notifications[];
|
|
25
21
|
export type DB_PushSession = FirebaseToken & PushSessionId & Language & {
|
|
26
22
|
timestamp: number;
|
|
27
23
|
userId?: string;
|
|
28
24
|
};
|
|
29
|
-
|
|
25
|
+
/** What a client actually receives over FCM - not stored anywhere. */
|
|
26
|
+
export type PushMessage = DB_Object & SubscriptionData & {
|
|
30
27
|
userId?: string;
|
|
31
28
|
timestamp: number;
|
|
32
|
-
read: boolean;
|
|
33
|
-
persistent?: boolean;
|
|
34
29
|
};
|
|
35
30
|
export type DB_PushKeys = PushSessionId & BaseSubscriptionData;
|
|
36
31
|
export type FirebaseToken = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/main/shared/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,SAAS,EAAC,MAAM,8BAA8B,CAAC;AAE5D,MAAM,MAAM,cAAc,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAEjE,MAAM,MAAM,oBAAoB,GAAG;IAC/B,KAAK,CAAC,EAAE,cAAc,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,4BAA4B,CAAC,CAAC,GAAG,GAAG,IAAI,oBAAoB,GAAG;IACvE,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,CAAA;CAC/B,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG;IAClD,IAAI,CAAC,EAAE,GAAG,CAAA;CACb,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG,aAAa,GAAG,QAAQ,GAAG;IAC1E,aAAa,EAAE,oBAAoB,EAAE,CAAA;CACxC,CAAA;AAED,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/main/shared/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,SAAS,EAAC,MAAM,8BAA8B,CAAC;AAE5D,MAAM,MAAM,cAAc,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAEjE,MAAM,MAAM,oBAAoB,GAAG;IAC/B,KAAK,CAAC,EAAE,cAAc,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,4BAA4B,CAAC,CAAC,GAAG,GAAG,IAAI,oBAAoB,GAAG;IACvE,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,CAAA;CAC/B,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG;IAClD,IAAI,CAAC,EAAE,GAAG,CAAA;CACb,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG,aAAa,GAAG,QAAQ,GAAG;IAC1E,aAAa,EAAE,oBAAoB,EAAE,CAAA;CACxC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,aAAa,GAAG,aAAa,GAAG,QAAQ,GAAG;IACpE,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,sEAAsE;AACtE,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,gBAAgB,GAAG;IACrD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG,oBAAoB,CAAA;AAE9D,MAAM,MAAM,aAAa,GAAG;IACxB,aAAa,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IACxB,aAAa,EAAE,MAAM,CAAA;CACxB,CAAA;AAOD,MAAM,MAAM,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,EAAE,SAAS,cAAc,EAAE,EAAE,IAAI,EAAE,CAAA;AAC9E,MAAM,MAAM,GAAG,CAAC,MAAM,SAAS,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,SAAS,WAAW,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS,MAAM,GAAG,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC;AAClJ,MAAM,MAAM,GAAG,CAAC,MAAM,SAAS,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,SAAS,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS,cAAc,GAAG,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC;AAC1J,MAAM,MAAM,GAAG,CAAC,MAAM,SAAS,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,SAAS,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC"}
|