@saltcorn/data 1.5.0-beta.13 → 1.5.0-beta.14
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/db/state.d.ts +4 -0
- package/dist/db/state.d.ts.map +1 -1
- package/dist/db/state.js +40 -1
- package/dist/db/state.js.map +1 -1
- package/dist/mobile-mocks/npm/dockerode.d.ts +1 -0
- package/dist/mobile-mocks/npm/dockerode.d.ts.map +1 -0
- package/dist/mobile-mocks/npm/dockerode.js +2 -0
- package/dist/mobile-mocks/npm/dockerode.js.map +1 -0
- package/dist/models/config.d.ts.map +1 -1
- package/dist/models/config.js +36 -4
- package/dist/models/config.js.map +1 -1
- package/dist/models/field.d.ts +1 -1
- package/dist/models/field.d.ts.map +1 -1
- package/dist/models/field.js +6 -0
- package/dist/models/field.js.map +1 -1
- package/dist/models/form.d.ts.map +1 -1
- package/dist/models/form.js.map +1 -1
- package/dist/models/internal/push_message_helper.d.ts +42 -12
- package/dist/models/internal/push_message_helper.d.ts.map +1 -1
- package/dist/models/internal/push_message_helper.js +117 -50
- package/dist/models/internal/push_message_helper.js.map +1 -1
- package/dist/models/notification.d.ts.map +1 -1
- package/dist/models/notification.js +2 -5
- package/dist/models/notification.js.map +1 -1
- package/dist/models/table.d.ts.map +1 -1
- package/dist/models/table.js +9 -0
- package/dist/models/table.js.map +1 -1
- package/dist/models/workflow_step.js +1 -1
- package/dist/models/workflow_step.js.map +1 -1
- package/dist/tests/form.test.js +150 -71
- package/dist/tests/form.test.js.map +1 -1
- package/dist/tests/workflow.test.js +1 -1
- package/dist/tests/workflow.test.js.map +1 -1
- package/dist/utils.d.ts +7 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +26 -0
- package/dist/utils.js.map +1 -1
- package/package.json +10 -8
- package/webpack.config.js +3 -0
|
@@ -4,13 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.PushMessageHelper = void 0;
|
|
7
|
-
const state_1 = __importDefault(require("../../db/state"));
|
|
8
7
|
const db_1 = __importDefault(require("../../db"));
|
|
9
8
|
const web_push_1 = __importDefault(require("web-push"));
|
|
10
9
|
const firebase_admin_1 = __importDefault(require("firebase-admin"));
|
|
11
|
-
const file_1 = __importDefault(require("../file"));
|
|
12
10
|
const utils_1 = __importDefault(require("../../utils"));
|
|
13
|
-
const { getState } = state_1.default;
|
|
14
11
|
const { getSafeBaseUrl } = utils_1.default;
|
|
15
12
|
/**
|
|
16
13
|
* PushMessageHelper Class
|
|
@@ -19,49 +16,106 @@ const { getSafeBaseUrl } = utils_1.default;
|
|
|
19
16
|
* @subcategory models
|
|
20
17
|
*/
|
|
21
18
|
class PushMessageHelper {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
this.
|
|
28
|
-
this.
|
|
29
|
-
this.
|
|
30
|
-
this.
|
|
31
|
-
this.
|
|
32
|
-
this.
|
|
19
|
+
/**
|
|
20
|
+
* normal first init
|
|
21
|
+
* @param config - PushMessageHelper configuration
|
|
22
|
+
*/
|
|
23
|
+
constructor(config) {
|
|
24
|
+
this.vapidPublicKey = config.vapidPublicKey;
|
|
25
|
+
this.vapidPrivateKey = config.vapidPrivateKey;
|
|
26
|
+
this.vapidEmail = config.vapidEmail;
|
|
27
|
+
this.icon = config.pushNotificationIcon;
|
|
28
|
+
this.badge = config.pushNotificationBadge;
|
|
29
|
+
this.notificationSubs = config.notificationSubs || {};
|
|
30
|
+
this.syncSubs = config.syncSubs || {};
|
|
31
|
+
this.firebaseJsonPath = config.firebase.jsonPath;
|
|
32
|
+
this.firebaseJsonContent = config.firebase.jsonContent;
|
|
33
|
+
this.state = require("../../db/state").getState();
|
|
34
|
+
if (this.firebaseJsonContent)
|
|
35
|
+
this.initFCMApp();
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* will be used when a config changes (no complete re-init)
|
|
39
|
+
* @param {PushMessageHelperConfig} config - new configuration.
|
|
40
|
+
*/
|
|
41
|
+
updateConfig(config) {
|
|
42
|
+
this.vapidPublicKey = config.vapidPublicKey;
|
|
43
|
+
this.vapidPrivateKey = config.vapidPrivateKey;
|
|
44
|
+
this.vapidEmail = config.vapidEmail;
|
|
45
|
+
this.icon = config.pushNotificationIcon;
|
|
46
|
+
this.badge = config.pushNotificationBadge;
|
|
47
|
+
this.notificationSubs = config.notificationSubs || {};
|
|
48
|
+
this.syncSubs = config.syncSubs || {};
|
|
49
|
+
if (config.firebase.jsonPath !== this.firebaseJsonPath) {
|
|
50
|
+
this.firebaseJsonPath = config.firebase.jsonPath;
|
|
51
|
+
this.firebaseJsonContent = config.firebase.jsonContent;
|
|
52
|
+
if (this.firebaseJsonContent)
|
|
53
|
+
this.initFCMApp();
|
|
54
|
+
}
|
|
33
55
|
}
|
|
34
56
|
/**
|
|
35
57
|
* Sends a notification to all subscriptions.
|
|
36
58
|
* @param {Notification} notification - The notification to send.
|
|
37
59
|
*/
|
|
38
|
-
async
|
|
39
|
-
|
|
60
|
+
async pushNotification(notification) {
|
|
61
|
+
const usedDeviceIds = new Set();
|
|
62
|
+
for (const subscription of this.notificationSubs[notification.user_id] ||
|
|
63
|
+
[]) {
|
|
40
64
|
try {
|
|
41
65
|
switch (subscription.type) {
|
|
42
66
|
case "fcm-push": {
|
|
43
|
-
if (
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
67
|
+
if (usedDeviceIds.has(subscription.deviceId)) {
|
|
68
|
+
this.state.log(5, `Skipping FCM notification to device ${subscription.deviceId} as already used`);
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
await this.fcmPush(notification, subscription);
|
|
72
|
+
usedDeviceIds.add(subscription.deviceId);
|
|
73
|
+
}
|
|
47
74
|
break;
|
|
48
75
|
}
|
|
49
76
|
case "web-push":
|
|
50
77
|
default: {
|
|
51
|
-
|
|
52
|
-
throw new Error("VAPID not configured");
|
|
53
|
-
getState()?.log(5, `Sending web push notification to ${subscription.endpoint}`);
|
|
54
|
-
await this.sendWebPush(notification, subscription);
|
|
78
|
+
await this.webPush(notification, subscription);
|
|
55
79
|
break;
|
|
56
80
|
}
|
|
57
81
|
}
|
|
58
82
|
}
|
|
59
83
|
catch (error) {
|
|
60
|
-
|
|
84
|
+
this.state.log(5, `Error sending push notification: ${error}`);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
async pushSync(tableName) {
|
|
89
|
+
if (!this.firebaseApp) {
|
|
90
|
+
this.state.log(5, "Firebase app not initialized");
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
for (const userSubs of Object.values(this.syncSubs)) {
|
|
94
|
+
const pushedDeviceIds = new Set();
|
|
95
|
+
for (const userSub of userSubs) {
|
|
96
|
+
if (pushedDeviceIds.has(userSub.deviceId)) {
|
|
97
|
+
console.log(`Skipping push sync to device ${userSub.deviceId} as already pushed`);
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
try {
|
|
101
|
+
const messageId = await firebase_admin_1.default.messaging(this.firebaseApp).send({
|
|
102
|
+
token: userSub.token,
|
|
103
|
+
data: { type: "push_sync", table: tableName },
|
|
104
|
+
});
|
|
105
|
+
pushedDeviceIds.add(userSub.deviceId);
|
|
106
|
+
this.state.log(5, `Sync push sent successfully: ${messageId}`);
|
|
107
|
+
}
|
|
108
|
+
catch (error) {
|
|
109
|
+
this.state.log(5, `Error sending sync push: ${error}`);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
61
112
|
}
|
|
62
113
|
}
|
|
63
114
|
}
|
|
64
|
-
async
|
|
115
|
+
async webPush(notification, sub) {
|
|
116
|
+
this.state.log(5, `Sending web push notification to ${sub.endpoint}`);
|
|
117
|
+
if (!(this.vapidPublicKey && this.vapidPrivateKey && this.vapidEmail))
|
|
118
|
+
throw new Error("VAPID not configured");
|
|
65
119
|
const payload = {
|
|
66
120
|
title: notification.title,
|
|
67
121
|
body: notification.body,
|
|
@@ -78,36 +132,49 @@ class PushMessageHelper {
|
|
|
78
132
|
},
|
|
79
133
|
});
|
|
80
134
|
}
|
|
81
|
-
async
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
135
|
+
async fcmPush(notification, sub) {
|
|
136
|
+
this.state.log(5, "Sending FCM notification");
|
|
137
|
+
if (!this.firebaseJsonPath)
|
|
138
|
+
throw new Error("Firebase config file not set");
|
|
139
|
+
else if (!this.firebaseApp) {
|
|
140
|
+
throw new Error("Firebase app not initialized");
|
|
141
|
+
}
|
|
142
|
+
else {
|
|
143
|
+
const notificationData = {
|
|
144
|
+
title: notification.title,
|
|
145
|
+
body: notification.body,
|
|
146
|
+
};
|
|
147
|
+
if (this.icon) {
|
|
148
|
+
const baseUrl = getSafeBaseUrl();
|
|
149
|
+
if (baseUrl)
|
|
150
|
+
notificationData.imageUrl = `${baseUrl}/files/serve/${this.icon}`;
|
|
151
|
+
}
|
|
152
|
+
const data = {
|
|
153
|
+
type: "push_notification",
|
|
154
|
+
};
|
|
155
|
+
const messageId = await firebase_admin_1.default.messaging(this.firebaseApp).send({
|
|
156
|
+
token: sub.token,
|
|
157
|
+
notification: notificationData,
|
|
158
|
+
data: data,
|
|
159
|
+
});
|
|
160
|
+
this.state.log(5, `FCM notification sent successfully: ${messageId}`);
|
|
91
161
|
}
|
|
92
|
-
const messageId = await firebase_admin_1.default.messaging(app).send({
|
|
93
|
-
token: sub.token,
|
|
94
|
-
notification: notificationData,
|
|
95
|
-
});
|
|
96
|
-
getState()?.log(5, `FCM notification sent successfully: ${messageId}`);
|
|
97
162
|
}
|
|
98
|
-
async
|
|
163
|
+
async initFCMApp() {
|
|
99
164
|
const appName = `${db_1.default.getTenantSchema()}_fcm_app`;
|
|
100
165
|
try {
|
|
101
|
-
|
|
166
|
+
const existingApp = firebase_admin_1.default.app(appName);
|
|
167
|
+
await existingApp.delete();
|
|
168
|
+
this.state.log(5, `Deleted existing Firebase app: ${appName}`);
|
|
102
169
|
}
|
|
103
|
-
catch (
|
|
104
|
-
|
|
105
|
-
if (!fireBaseFile)
|
|
106
|
-
throw new Error(`Firebase configuration file ${this.firebaseJsonPath} not found`);
|
|
107
|
-
return firebase_admin_1.default.initializeApp({
|
|
108
|
-
credential: firebase_admin_1.default.credential.cert(require(fireBaseFile.absolutePath)),
|
|
109
|
-
}, appName);
|
|
170
|
+
catch (err) {
|
|
171
|
+
// app does not exist – safe to ignore
|
|
110
172
|
}
|
|
173
|
+
const app = firebase_admin_1.default.initializeApp({
|
|
174
|
+
credential: firebase_admin_1.default.credential.cert(this.firebaseJsonContent),
|
|
175
|
+
}, appName);
|
|
176
|
+
this.firebaseApp = app;
|
|
177
|
+
this.state.log(5, `Initialized Firebase app: ${appName}`);
|
|
111
178
|
}
|
|
112
179
|
}
|
|
113
180
|
exports.PushMessageHelper = PushMessageHelper;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push_message_helper.js","sourceRoot":"","sources":["../../../models/internal/push_message_helper.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"push_message_helper.js","sourceRoot":"","sources":["../../../models/internal/push_message_helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.d.ts","sourceRoot":"","sources":["../../models/notification.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,KAAK,EACL,aAAa,EAEb,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAUtC;;;GAGG;AAEH,cAAM,YAAY;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,IAAI,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAEjC;;;OAGG;gBACS,CAAC,EAAE,eAAe,GAAG,YAAY;IAU7C;;;;OAIG;WACU,IAAI,CACf,KAAK,EAAE,KAAK,EACZ,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CAAC,YAAY,EAAE,CAAC;IAK1B;;;OAGG;WACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC;WAK5C,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"notification.d.ts","sourceRoot":"","sources":["../../models/notification.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,KAAK,EACL,aAAa,EAEb,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAUtC;;;GAGG;AAEH,cAAM,YAAY;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,IAAI,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAEjC;;;OAGG;gBACS,CAAC,EAAE,eAAe,GAAG,YAAY;IAU7C;;;;OAIG;WACU,IAAI,CACf,KAAK,EAAE,KAAK,EACZ,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CAAC,YAAY,EAAE,CAAC;IAK1B;;;OAGG;WACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC;WAK5C,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;IAoC5D,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;WAItB,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;WAIhB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAI1C,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;CAGlD;AAED,KAAK,eAAe,GAAG,WAAW,CAAC,YAAY,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;AAEtE,SAAS,YAAY,CAAC"}
|
|
@@ -11,7 +11,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
11
11
|
const db_1 = __importDefault(require("../db"));
|
|
12
12
|
const user_1 = __importDefault(require("./user"));
|
|
13
13
|
const state_1 = __importDefault(require("../db/state"));
|
|
14
|
-
const push_message_helper_1 = require("./internal/push_message_helper");
|
|
15
14
|
const utils_1 = __importDefault(require("../utils"));
|
|
16
15
|
const mail_queue_1 = require("./internal/mail_queue");
|
|
17
16
|
const { getState } = state_1.default;
|
|
@@ -79,10 +78,8 @@ class Notification {
|
|
|
79
78
|
eval_js: "check_saltcorn_notifications()",
|
|
80
79
|
}, [user.id]);
|
|
81
80
|
}
|
|
82
|
-
if (isPushEnabled(user))
|
|
83
|
-
|
|
84
|
-
await pushHelper.send(o);
|
|
85
|
-
}
|
|
81
|
+
if (isPushEnabled(user) && state?.pushHelper)
|
|
82
|
+
state.pushHelper.pushNotification(o);
|
|
86
83
|
return o;
|
|
87
84
|
}
|
|
88
85
|
async mark_as_read() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.js","sourceRoot":"","sources":["../../models/notification.ts"],"names":[],"mappings":";;;;AAAA;;;;;GAKG;AACH,+CAAuB;AAOvB,kDAA0B;AAC1B,wDAAgC;
|
|
1
|
+
{"version":3,"file":"notification.js","sourceRoot":"","sources":["../../models/notification.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../models/table.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../models/table.ts"],"names":[],"mappings":"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"}
|
package/dist/models/table.js
CHANGED
|
@@ -907,6 +907,11 @@ class Table {
|
|
|
907
907
|
else
|
|
908
908
|
throw e;
|
|
909
909
|
});
|
|
910
|
+
if (this.has_sync_info) {
|
|
911
|
+
const state = require("../db/state").getState();
|
|
912
|
+
if (state.pushHelper)
|
|
913
|
+
state.pushHelper.pushSync(this.name);
|
|
914
|
+
}
|
|
910
915
|
}
|
|
911
916
|
/**
|
|
912
917
|
* Returns row with only fields that can be read from db (readFromDB flag)
|
|
@@ -1362,6 +1367,8 @@ class Table {
|
|
|
1362
1367
|
await this.updateSyncInfo(id, oldInfo.last_modified, syncTimestamp);
|
|
1363
1368
|
else
|
|
1364
1369
|
await this.insertSyncInfo(id, syncTimestamp);
|
|
1370
|
+
if (state.pushHelper)
|
|
1371
|
+
state.pushHelper.pushSync(this.name);
|
|
1365
1372
|
}
|
|
1366
1373
|
const newRow = { ...existing, ...v, [pk_name]: id };
|
|
1367
1374
|
if (really_changed_field_names.size > 0) {
|
|
@@ -1712,6 +1719,8 @@ class Table {
|
|
|
1712
1719
|
}, (e) => {
|
|
1713
1720
|
state.log(2, `Error inserting sync info for table ${this.name}: ${e.message}`);
|
|
1714
1721
|
});
|
|
1722
|
+
if (state.pushHelper)
|
|
1723
|
+
state.pushHelper.pushSync(this.name);
|
|
1715
1724
|
}
|
|
1716
1725
|
const newRow = { [pk_name]: id, ...v };
|
|
1717
1726
|
await this.auto_update_calc_aggregations(newRow);
|