@mathrunet/masamune 1.2.6 → 1.2.8
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/CHANGELOG.md +18 -0
- package/dist/functions/scheduler.js +16 -10
- package/dist/functions/scheduler.js.map +1 -1
- package/dist/functions/send_notification.js.map +1 -1
- package/dist/lib/send_notification.d.ts +3 -3
- package/dist/lib/send_notification.js +5 -5
- package/dist/lib/send_notification.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
## [1.2.8](https://github.com/mathrunet/node_masamune/compare/v1.2.7...v1.2.8) (2023-09-29)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### fix
|
|
5
|
+
|
|
6
|
+
* Consider null in send_notification. ([643c800](https://github.com/mathrunet/node_masamune/commit/643c800cc565e1a6856ea8fd46854fe0d6841015))
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
## [1.2.7](https://github.com/mathrunet/node_masamune/compare/v1.2.6...v1.2.7) (2023-09-29)
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### fix
|
|
14
|
+
|
|
15
|
+
* Bug fixes. ([e01bedc](https://github.com/mathrunet/node_masamune/commit/e01bedc17a6d5b996c189184551bed77d5a81191))
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
1
19
|
## [1.2.6](https://github.com/mathrunet/node_masamune/compare/v1.2.5...v1.2.6) (2023-09-29)
|
|
2
20
|
|
|
3
21
|
|
|
@@ -51,18 +51,20 @@ module.exports = (regions, data) => {
|
|
|
51
51
|
try {
|
|
52
52
|
const collectionPath = functions.config().scheduler.collection_path;
|
|
53
53
|
const firestoreInstance = admin.firestore();
|
|
54
|
-
const collection = yield firestoreInstance.collection(collectionPath).where("_done", "==", false).where("
|
|
54
|
+
const collection = yield firestoreInstance.collection(collectionPath).where("_done", "==", false).where("_time", "<=", Date.now()).orderBy("_time", "asc").get();
|
|
55
55
|
for (var doc of collection.docs) {
|
|
56
56
|
const command = doc.get("#command")["@command"];
|
|
57
|
-
const
|
|
57
|
+
const priParams = doc.get("#command")["@private"];
|
|
58
|
+
console.log(doc.get("#command"));
|
|
59
|
+
console.log(priParams);
|
|
58
60
|
switch (command) {
|
|
59
61
|
case "notification":
|
|
60
|
-
const title =
|
|
61
|
-
const body =
|
|
62
|
-
const channelId =
|
|
63
|
-
const data =
|
|
64
|
-
const token =
|
|
65
|
-
const topic =
|
|
62
|
+
const title = priParams["title"];
|
|
63
|
+
const body = priParams["text"];
|
|
64
|
+
const channelId = priParams["channel"];
|
|
65
|
+
const data = priParams["data"];
|
|
66
|
+
const token = priParams["token"];
|
|
67
|
+
const topic = priParams["topic"];
|
|
66
68
|
yield (0, send_notification_1.sendNotification)({
|
|
67
69
|
title: title,
|
|
68
70
|
body: body,
|
|
@@ -73,8 +75,11 @@ module.exports = (regions, data) => {
|
|
|
73
75
|
});
|
|
74
76
|
break;
|
|
75
77
|
case "copy_document":
|
|
76
|
-
const path =
|
|
77
|
-
const
|
|
78
|
+
const path = priParams["path"];
|
|
79
|
+
const paths = path.split("/");
|
|
80
|
+
const id = paths[paths.length - 1];
|
|
81
|
+
console.log(path);
|
|
82
|
+
console.log(id);
|
|
78
83
|
const docData = doc.data();
|
|
79
84
|
const docKeys = Object.keys(docData);
|
|
80
85
|
const update = {};
|
|
@@ -85,6 +90,7 @@ module.exports = (regions, data) => {
|
|
|
85
90
|
update[key] = docData[key];
|
|
86
91
|
}
|
|
87
92
|
update["@uid"] = id;
|
|
93
|
+
console.log(update);
|
|
88
94
|
yield firestoreInstance.doc(path).set(update, {
|
|
89
95
|
merge: true
|
|
90
96
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/functions/scheduler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,sDAAwC;AACxC,gEAA4D;AAE5D;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,GAAG,CAAC,OAAiB,EAAE,IAA+B,EAAE,EAAE;;IAAC,OAAA,SAAS,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAA,IAAI,CAAC,UAAU,CAAC,mCAAI,iBAAiB,CAAC,CAAC,KAAK,CAC9J,CAAO,KAAK,EAAE,EAAE;QACZ,IAAI;YACA,MAAM,cAAc,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC;YACpE,MAAM,iBAAiB,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;YAC5C,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/functions/scheduler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../src/functions/send_notification.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAEhD,gEAA4D;AAE5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,CAAC,OAAO,GAAG,CAAC,OAAiB,EAAE,IAA+B,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAC9G,CAAO,KAAK,EAAE,EAAE;IACZ,IAAI;QACA,MAAM,KAAK,GAAG,KAAK,CAAC,KAAe,CAAC;QACpC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAc,CAAC;QAClC,MAAM,SAAS,GAAG,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../src/functions/send_notification.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAEhD,gEAA4D;AAE5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,CAAC,OAAO,GAAG,CAAC,OAAiB,EAAE,IAA+B,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAC9G,CAAO,KAAK,EAAE,EAAE;IACZ,IAAI;QACA,MAAM,KAAK,GAAG,KAAK,CAAC,KAAe,CAAC;QACpC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAc,CAAC;QAClC,MAAM,SAAS,GAAG,KAAK,CAAC,UAAuC,CAAC;QAChE,MAAM,IAAI,GAAG,KAAK,CAAC,IAA6C,CAAC;QACjE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAkC,CAAC;QACvD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAkC,CAAC;QACvD,MAAM,IAAA,oCAAgB,EAAC;YACnB,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,KAAK;SACf,CAAC,CAAC;KACN;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,MAAM,GAAG,CAAC;KACb;IACD,OAAO;QACH,OAAO,EAAE,IAAI;KAChB,CAAC;AACN,CAAC,CAAA,CACJ,CAAC"}
|
|
@@ -36,12 +36,12 @@
|
|
|
36
36
|
export declare function sendNotification({ title, body, data, channelId, token, topic, }: {
|
|
37
37
|
title: string;
|
|
38
38
|
body: string;
|
|
39
|
-
channelId: string | undefined;
|
|
39
|
+
channelId: string | undefined | null;
|
|
40
40
|
data: {
|
|
41
41
|
[key: string]: string;
|
|
42
42
|
} | undefined;
|
|
43
|
-
token: string | undefined;
|
|
44
|
-
topic: string | undefined;
|
|
43
|
+
token: string | undefined | null;
|
|
44
|
+
topic: string | undefined | null;
|
|
45
45
|
}): Promise<{
|
|
46
46
|
[key: string]: any;
|
|
47
47
|
}>;
|
|
@@ -73,10 +73,10 @@ const admin = __importStar(require("firebase-admin"));
|
|
|
73
73
|
function sendNotification({ title, body, data, channelId, token, topic, }) {
|
|
74
74
|
return __awaiter(this, void 0, void 0, function* () {
|
|
75
75
|
try {
|
|
76
|
-
if (token === undefined && topic === undefined) {
|
|
76
|
+
if (token === undefined && topic === undefined && topic === null && token === null) {
|
|
77
77
|
throw new functions.https.HttpsError("invalid-argument", "Either [token] or [topic] must be specified.");
|
|
78
78
|
}
|
|
79
|
-
if (token !== undefined) {
|
|
79
|
+
if (token !== undefined && token !== null) {
|
|
80
80
|
const res = yield admin.messaging().send({
|
|
81
81
|
notification: {
|
|
82
82
|
title: title,
|
|
@@ -88,7 +88,7 @@ function sendNotification({ title, body, data, channelId, token, topic, }) {
|
|
|
88
88
|
title: title,
|
|
89
89
|
body: body,
|
|
90
90
|
clickAction: "FLUTTER_NOTIFICATION_CLICK",
|
|
91
|
-
channelId: channelId,
|
|
91
|
+
channelId: channelId !== null && channelId !== void 0 ? channelId : undefined,
|
|
92
92
|
},
|
|
93
93
|
},
|
|
94
94
|
data: data,
|
|
@@ -99,7 +99,7 @@ function sendNotification({ title, body, data, channelId, token, topic, }) {
|
|
|
99
99
|
message_id: res,
|
|
100
100
|
};
|
|
101
101
|
}
|
|
102
|
-
else if (topic !== undefined) {
|
|
102
|
+
else if (topic !== undefined && topic !== null) {
|
|
103
103
|
const res = yield admin.messaging().send({
|
|
104
104
|
notification: {
|
|
105
105
|
title: title,
|
|
@@ -111,7 +111,7 @@ function sendNotification({ title, body, data, channelId, token, topic, }) {
|
|
|
111
111
|
title: title,
|
|
112
112
|
body: body,
|
|
113
113
|
clickAction: "FLUTTER_NOTIFICATION_CLICK",
|
|
114
|
-
channelId: channelId,
|
|
114
|
+
channelId: channelId !== null && channelId !== void 0 ? channelId : undefined,
|
|
115
115
|
},
|
|
116
116
|
},
|
|
117
117
|
data: data,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../src/lib/send_notification.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,sDAAwC;AAExC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,SAAsB,gBAAgB,CAAC,EACnC,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,SAAS,EACT,KAAK,EACL,KAAK,GAQJ;;QACD,IAAI;YACA,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE;
|
|
1
|
+
{"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../src/lib/send_notification.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,sDAAwC;AAExC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,SAAsB,gBAAgB,CAAC,EACnC,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,SAAS,EACT,KAAK,EACL,KAAK,GAQJ;;QACD,IAAI;YACA,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,EAAE;gBAChF,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,8CAA8C,CAAC,CAAC;aAC5G;YACD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE;gBACvC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC,IAAI,CACpC;oBACI,YAAY,EAAE;wBACV,KAAK,EAAE,KAAK;wBACZ,IAAI,EAAE,IAAI;qBACb;oBACD,OAAO,EAAE;wBACL,QAAQ,EAAE,MAAM;wBAChB,YAAY,EAAE;4BACV,KAAK,EAAE,KAAK;4BACZ,IAAI,EAAE,IAAI;4BACV,WAAW,EAAE,4BAA4B;4BACzC,SAAS,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,SAAS;yBACpC;qBACJ;oBACD,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,KAAK;iBACf,CACJ,CAAC;gBACF,OAAO;oBACH,OAAO,EAAE,IAAI;oBACb,UAAU,EAAE,GAAG;iBAClB,CAAC;aACL;iBAAM,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE;gBAC9C,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC,IAAI,CACpC;oBACI,YAAY,EAAE;wBACV,KAAK,EAAE,KAAK;wBACZ,IAAI,EAAE,IAAI;qBACb;oBACD,OAAO,EAAE;wBACL,QAAQ,EAAE,MAAM;wBAChB,YAAY,EAAE;4BACV,KAAK,EAAE,KAAK;4BACZ,IAAI,EAAE,IAAI;4BACV,WAAW,EAAE,4BAA4B;4BACzC,SAAS,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,SAAS;yBACpC;qBACJ;oBACD,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,KAAK;iBACf,CACJ,CAAC;gBACF,OAAO;oBACH,OAAO,EAAE,IAAI;oBACb,UAAU,EAAE,GAAG;iBAClB,CAAC;aACL;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAC;SACb;QACD,OAAO;YACH,OAAO,EAAE,IAAI;SAChB,CAAC;IAEN,CAAC;CAAA;AA3ED,4CA2EC"}
|