@mathrunet/masamune 2.8.3 → 2.8.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/CHANGELOG.md +19 -0
- package/dist/functions/scheduler.js +1 -1
- package/dist/functions/scheduler.js.map +1 -1
- package/dist/lib/functions/firestore.js +21 -0
- package/dist/lib/functions/firestore.js.map +1 -1
- package/dist/lib/functions/send_notification.js +13 -0
- package/dist/lib/functions/send_notification.js.map +1 -1
- package/dist/lib/src/firestore_triggered_process_function_base.d.ts +8 -2
- package/dist/lib/src/firestore_triggered_process_function_base.js +11 -2
- package/dist/lib/src/firestore_triggered_process_function_base.js.map +1 -1
- package/dist/lib/src/functions_base.d.ts +25 -0
- package/dist/lib/src/request_process_function_base.d.ts +2 -2
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,22 @@
|
|
|
1
|
+
## [2.8.5](https://github.com/mathrunet/node_masamune/compare/v2.8.4...v2.8.5) (2024-11-06)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### chore
|
|
5
|
+
|
|
6
|
+
* Debug. ([5c274fc](https://github.com/mathrunet/node_masamune/commit/5c274fc1e3d0f1e0f25c09904cb4aee960a27f48))
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
## [2.8.4](https://github.com/mathrunet/node_masamune/compare/v2.8.3...v2.8.4) (2024-10-09)
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### fix
|
|
14
|
+
|
|
15
|
+
* DatabaseId can be specified in FirestoreTriggeredProcessFunctionBase. ([44c56e4](https://github.com/mathrunet/node_masamune/commit/44c56e42de16b328b2639e41af68e256fa36e73f))
|
|
16
|
+
* Fix typo. ([a7a55bb](https://github.com/mathrunet/node_masamune/commit/a7a55bb4b3d3df021d192a9fa811c7506aa4bd81))
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
1
20
|
## [2.8.3](https://github.com/mathrunet/node_masamune/compare/v2.8.2...v2.8.3) (2024-09-13)
|
|
2
21
|
|
|
3
22
|
|
|
@@ -62,7 +62,7 @@ module.exports = (regions, options, data) => {
|
|
|
62
62
|
try {
|
|
63
63
|
const collectionPath = (_d = (_c = process.env.SCHEDULER_COLLECTION_PATH) !== null && _c !== void 0 ? _c : data["path"]) !== null && _d !== void 0 ? _d : "schedule";
|
|
64
64
|
const firestoreInstance = admin.firestore();
|
|
65
|
-
console.log(`Time: ${Date.now()}`);
|
|
65
|
+
console.log(`Time: ${Date.now()} @${collectionPath}`);
|
|
66
66
|
const collection = yield firestoreInstance.collection(collectionPath).where("_done", "==", false).where("_time", "<=", Date.now()).orderBy("_time", "asc").get();
|
|
67
67
|
console.log(`Length: ${collection.size}`);
|
|
68
68
|
for (var doc of collection.docs) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/functions/scheduler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AACnD,sDAAwC;AAExC,iEAA8D;AAC9D,mEAA+D;AAC/D,yEAAqE;AAErE;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,GAAG,CACb,OAAiB,EACjB,OAAkC,EAClC,IAA4B,EAC9B,EAAE;;IAAC,OAAA,SAAS,CAAC,SAAS,CAAC,UAAU,CAC/B;QACI,QAAQ,EAAE,MAAA,OAAO,CAAC,QAAQ,mCAAI,iBAAiB;QAC/C,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,OAAO,CAAC,CAAC,CAAC;QACpC,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,YAAY,EAAE,OAAO,CAAC,YAAY;KACrC,EACD,CAAO,KAAK,EAAE,EAAE;;QACZ,IAAI,CAAC;YACD,MAAM,cAAc,GAAG,MAAA,MAAA,OAAO,CAAC,GAAG,CAAC,yBAAyB,mCAAI,IAAI,CAAC,MAAM,CAAC,mCAAI,UAAU,CAAC;YAC3F,MAAM,iBAAiB,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/functions/scheduler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AACnD,sDAAwC;AAExC,iEAA8D;AAC9D,mEAA+D;AAC/D,yEAAqE;AAErE;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,GAAG,CACb,OAAiB,EACjB,OAAkC,EAClC,IAA4B,EAC9B,EAAE;;IAAC,OAAA,SAAS,CAAC,SAAS,CAAC,UAAU,CAC/B;QACI,QAAQ,EAAE,MAAA,OAAO,CAAC,QAAQ,mCAAI,iBAAiB;QAC/C,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,OAAO,CAAC,CAAC,CAAC;QACpC,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,YAAY,EAAE,OAAO,CAAC,YAAY;KACrC,EACD,CAAO,KAAK,EAAE,EAAE;;QACZ,IAAI,CAAC;YACD,MAAM,cAAc,GAAG,MAAA,MAAA,OAAO,CAAC,GAAG,CAAC,yBAAyB,mCAAI,IAAI,CAAC,MAAM,CAAC,mCAAI,UAAU,CAAC;YAC3F,MAAM,iBAAiB,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,EAAE,KAAK,cAAc,EAAE,CAAC,CAAC;YACtD,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;YACjK,OAAO,CAAC,GAAG,CAAC,WAAW,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;YAC1C,KAAK,IAAI,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;gBAC9B,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC5C,IAAI,GAAG,GAA2B,EAAE,CAAC;gBACrC,MAAM,OAAO,GAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAA4B,CAAC,UAAU,CAAC,CAAC;gBAC5E,MAAM,SAAS,GAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAA4B,CAAC,UAAU,CAA2B,CAAC;gBACxG,OAAO,CAAC,GAAG,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC;gBACnC,QAAQ,OAAO,EAAE,CAAC;oBACd,KAAK,cAAc,CAAC,CAAC,CAAC;wBAClB,GAAG,GAAG,MAAM,IAAA,2BAAY,EAAC;4BACrB,MAAM,EAAE,SAAS;4BACjB,SAAS,EAAE,iBAAiB;4BAC5B,GAAG,EAAE,GAAG;yBACX,CAAC,CAAC;wBACH,MAAM;oBACV,CAAC;oBACD,KAAK,eAAe,CAAC,CAAC,CAAC;wBACnB,GAAG,GAAG,MAAM,IAAA,4BAAY,EAAC;4BACrB,MAAM,EAAE,SAAS;4BACjB,SAAS,EAAE,iBAAiB;4BAC5B,GAAG,EAAE,GAAG;yBACX,CAAC,CAAC;wBACH,MAAM;oBACV,CAAC;oBACD,KAAK,kBAAkB;wBACnB,GAAG,GAAG,MAAM,IAAA,kCAAe,EAAC;4BACxB,MAAM,EAAE,SAAS;4BACjB,SAAS,EAAE,iBAAiB;4BAC5B,GAAG,EAAE,GAAG;yBACX,CAAC,CAAC;wBACH,MAAM;gBACd,CAAC;gBACD,IAAI,GAAG,KAAK,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBACjB,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,iBACb,OAAO,EAAE,IAAI,IACV,GAAG,GACP;wBACC,KAAK,EAAE,IAAI;qBACd,CAAC,CAAC;gBACP,CAAC;qBAAM,CAAC;oBACJ,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC;wBACd,OAAO,EAAE,IAAI;qBAChB,EAAE;wBACC,KAAK,EAAE,IAAI;qBACd,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC,CAAA,CACJ,CAAA;CAAA,CAAC"}
|
|
@@ -142,22 +142,30 @@ function hasMatch(_a) {
|
|
|
142
142
|
const type = c["type"];
|
|
143
143
|
const key = c["key"];
|
|
144
144
|
const value = c["value"];
|
|
145
|
+
console.log(`Match ${key} ${type} ${value}`);
|
|
145
146
|
if (key === undefined || key === null) {
|
|
146
147
|
continue;
|
|
147
148
|
}
|
|
148
149
|
const source = data[key];
|
|
150
|
+
console.log(`Source ${source}`);
|
|
149
151
|
if (source instanceof admin.firestore.DocumentReference) {
|
|
152
|
+
console.log(`Reference ${source}`);
|
|
150
153
|
const doc = yield source.get();
|
|
151
154
|
const data = doc.data();
|
|
155
|
+
console.log(`Reference data ${JSON.stringify(data)}`);
|
|
152
156
|
if (Array.isArray(value)) {
|
|
157
|
+
console.log(`Reference data value is array`);
|
|
153
158
|
const res = yield hasMatch({ data, conditions: value });
|
|
159
|
+
console.log(`Reference data value is array res: ${res}`);
|
|
154
160
|
if (!res) {
|
|
155
161
|
return false;
|
|
156
162
|
}
|
|
157
163
|
continue;
|
|
158
164
|
}
|
|
159
165
|
else if (_isObject(value)) {
|
|
166
|
+
console.log(`Reference data value is object`);
|
|
160
167
|
const res = yield hasMatch({ data, conditions: [value] });
|
|
168
|
+
console.log(`Reference data value is object res: ${res}`);
|
|
161
169
|
if (!res) {
|
|
162
170
|
return false;
|
|
163
171
|
}
|
|
@@ -169,6 +177,7 @@ function hasMatch(_a) {
|
|
|
169
177
|
}
|
|
170
178
|
switch (type) {
|
|
171
179
|
case "equalTo":
|
|
180
|
+
console.log(`equalTo ${source} ${value}`);
|
|
172
181
|
if (value === undefined || value === null) {
|
|
173
182
|
continue;
|
|
174
183
|
}
|
|
@@ -177,6 +186,7 @@ function hasMatch(_a) {
|
|
|
177
186
|
}
|
|
178
187
|
break;
|
|
179
188
|
case "notEqualTo":
|
|
189
|
+
console.log(`notequalTo ${source} ${value}`);
|
|
180
190
|
if (value === undefined || value === null) {
|
|
181
191
|
continue;
|
|
182
192
|
}
|
|
@@ -185,6 +195,7 @@ function hasMatch(_a) {
|
|
|
185
195
|
}
|
|
186
196
|
break;
|
|
187
197
|
case "lessThan":
|
|
198
|
+
console.log(`lessThan ${source} ${value}`);
|
|
188
199
|
if (value === undefined || value === null || typeof source !== "number" || typeof value !== "number") {
|
|
189
200
|
continue;
|
|
190
201
|
}
|
|
@@ -193,6 +204,7 @@ function hasMatch(_a) {
|
|
|
193
204
|
}
|
|
194
205
|
break;
|
|
195
206
|
case "greaterThan":
|
|
207
|
+
console.log(`greaterThan ${source} ${value}`);
|
|
196
208
|
if (value === undefined || value === null || typeof source !== "number" || typeof value !== "number") {
|
|
197
209
|
continue;
|
|
198
210
|
}
|
|
@@ -201,6 +213,7 @@ function hasMatch(_a) {
|
|
|
201
213
|
}
|
|
202
214
|
break;
|
|
203
215
|
case "lessThanOrEqualTo":
|
|
216
|
+
console.log(`lessThanOrEqualTo ${source} ${value}`);
|
|
204
217
|
if (value === undefined || value === null || typeof source !== "number" || typeof value !== "number") {
|
|
205
218
|
continue;
|
|
206
219
|
}
|
|
@@ -209,6 +222,7 @@ function hasMatch(_a) {
|
|
|
209
222
|
}
|
|
210
223
|
break;
|
|
211
224
|
case "greaterThanOrEqualTo":
|
|
225
|
+
console.log(`greaterThanOrEqualTo ${source} ${value}`);
|
|
212
226
|
if (value === undefined || value === null || typeof source !== "number" || typeof value !== "number") {
|
|
213
227
|
continue;
|
|
214
228
|
}
|
|
@@ -217,6 +231,7 @@ function hasMatch(_a) {
|
|
|
217
231
|
}
|
|
218
232
|
break;
|
|
219
233
|
case "arrayContains":
|
|
234
|
+
console.log(`arrayContains ${source} ${value}`);
|
|
220
235
|
if (value === undefined || value === null || !Array.isArray(source)) {
|
|
221
236
|
continue;
|
|
222
237
|
}
|
|
@@ -225,6 +240,7 @@ function hasMatch(_a) {
|
|
|
225
240
|
}
|
|
226
241
|
break;
|
|
227
242
|
case "arrayContainsAny":
|
|
243
|
+
console.log(`arrayContainsAny ${source} ${value}`);
|
|
228
244
|
if (value === undefined || value === null || !Array.isArray(source) || !Array.isArray(value)) {
|
|
229
245
|
continue;
|
|
230
246
|
}
|
|
@@ -233,6 +249,7 @@ function hasMatch(_a) {
|
|
|
233
249
|
}
|
|
234
250
|
break;
|
|
235
251
|
case "whereIn":
|
|
252
|
+
console.log(`whereIn ${source} ${value}`);
|
|
236
253
|
if (value === undefined || value === null || !Array.isArray(value)) {
|
|
237
254
|
continue;
|
|
238
255
|
}
|
|
@@ -241,6 +258,7 @@ function hasMatch(_a) {
|
|
|
241
258
|
}
|
|
242
259
|
break;
|
|
243
260
|
case "whereNotIn":
|
|
261
|
+
console.log(`whereNotIn ${source} ${value}`);
|
|
244
262
|
if (value === undefined || value === null || !Array.isArray(value)) {
|
|
245
263
|
continue;
|
|
246
264
|
}
|
|
@@ -249,11 +267,13 @@ function hasMatch(_a) {
|
|
|
249
267
|
}
|
|
250
268
|
break;
|
|
251
269
|
case "isNull":
|
|
270
|
+
console.log(`isNull ${source} ${value}`);
|
|
252
271
|
if (source !== undefined && source !== null) {
|
|
253
272
|
return false;
|
|
254
273
|
}
|
|
255
274
|
break;
|
|
256
275
|
case "isNotNull":
|
|
276
|
+
console.log(`isNotNull ${source} ${value}`);
|
|
257
277
|
if (!(source !== undefined && source !== null)) {
|
|
258
278
|
return false;
|
|
259
279
|
}
|
|
@@ -262,6 +282,7 @@ function hasMatch(_a) {
|
|
|
262
282
|
break;
|
|
263
283
|
}
|
|
264
284
|
}
|
|
285
|
+
console.log(`Result true`);
|
|
265
286
|
return true;
|
|
266
287
|
});
|
|
267
288
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firestore.js","sourceRoot":"","sources":["../../../src/lib/functions/firestore.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAwC;
|
|
1
|
+
{"version":3,"file":"firestore.js","sourceRoot":"","sources":["../../../src/lib/functions/firestore.ts"],"names":[],"mappings":"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"}
|
|
@@ -120,7 +120,9 @@ function sendNotification(_a) {
|
|
|
120
120
|
if ((targetToken === undefined || targetToken === null) && (targetTopic === undefined || targetTopic === null) && (targetCollectionPath === undefined || targetCollectionPath === null) && (targetDocumentPath === undefined || targetDocumentPath === null)) {
|
|
121
121
|
throw new functions.https.HttpsError("invalid-argument", "Either [token] or [topic], [targetCollectionPath], [targetDocumentPath] must be specified.");
|
|
122
122
|
}
|
|
123
|
+
// トークンによる通知
|
|
123
124
|
if (targetToken !== undefined && targetToken !== null) {
|
|
125
|
+
console.log(`Notification target token: ${targetToken}`);
|
|
124
126
|
if (typeof targetToken === "string") {
|
|
125
127
|
targetToken = [targetToken];
|
|
126
128
|
}
|
|
@@ -195,8 +197,10 @@ function sendNotification(_a) {
|
|
|
195
197
|
success: true,
|
|
196
198
|
results: res,
|
|
197
199
|
};
|
|
200
|
+
// トピックによる通知
|
|
198
201
|
}
|
|
199
202
|
else if (targetTopic !== undefined && targetTopic !== null) {
|
|
203
|
+
console.log(`Notification target topic: ${targetTopic}`);
|
|
200
204
|
if (responseTokenList) {
|
|
201
205
|
return {
|
|
202
206
|
success: true,
|
|
@@ -247,8 +251,10 @@ function sendNotification(_a) {
|
|
|
247
251
|
success: true,
|
|
248
252
|
results: res,
|
|
249
253
|
};
|
|
254
|
+
// コレクションパスによる通知
|
|
250
255
|
}
|
|
251
256
|
else if (targetCollectionPath !== undefined && targetCollectionPath !== null && targetTokenField != undefined && targetTokenField !== null) {
|
|
257
|
+
console.log(`Notification target collection path: ${targetCollectionPath}`);
|
|
252
258
|
const firestoreInstance = admin.firestore();
|
|
253
259
|
const collectionRef = firestore.where({
|
|
254
260
|
query: firestoreInstance.collection(targetCollectionPath),
|
|
@@ -260,12 +266,17 @@ function sendNotification(_a) {
|
|
|
260
266
|
let collection = null;
|
|
261
267
|
do {
|
|
262
268
|
collection = yield firestore.cursor({ query: collectionRef, limit: 500, cursor: cursor }).get();
|
|
269
|
+
console.log(`Got ${collection.docs.length} documents.`);
|
|
263
270
|
for (let doc of collection.docs) {
|
|
264
271
|
const docData = doc.data();
|
|
272
|
+
console.log(`Data of document: ${JSON.stringify(docData)}`);
|
|
273
|
+
console.log(`Conditions: ${JSON.stringify(targetConditions)}`);
|
|
265
274
|
if (!(yield firestore.hasMatch({ data: docData, conditions: targetConditions }))) {
|
|
266
275
|
continue;
|
|
267
276
|
}
|
|
277
|
+
console.log(`Get token`);
|
|
268
278
|
const token = yield firestore.get({ data: docData, field: targetTokenField });
|
|
279
|
+
console.log(`Got token ${token}`);
|
|
269
280
|
if (typeof token === "string") {
|
|
270
281
|
tokens.push(token);
|
|
271
282
|
}
|
|
@@ -295,8 +306,10 @@ function sendNotification(_a) {
|
|
|
295
306
|
results: results,
|
|
296
307
|
};
|
|
297
308
|
}
|
|
309
|
+
// ドキュメントパスによる通知
|
|
298
310
|
}
|
|
299
311
|
else if (targetDocumentPath !== undefined && targetDocumentPath !== null && targetTokenField != undefined && targetTokenField !== null) {
|
|
312
|
+
console.log(`Notification target document path: ${targetDocumentPath}`);
|
|
300
313
|
const firestoreInstance = admin.firestore();
|
|
301
314
|
const documentRef = firestoreInstance.doc(targetDocumentPath);
|
|
302
315
|
const results = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../../src/lib/functions/send_notification.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../../src/lib/functions/send_notification.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as functions from "firebase-functions/v2";
|
|
2
|
-
import {
|
|
2
|
+
import { DatabasePathFunctionsOptions, FunctionsBase } from "./functions_base";
|
|
3
3
|
/**
|
|
4
4
|
* Base class for defining Function data for Firestore triggers.
|
|
5
5
|
*
|
|
@@ -11,7 +11,7 @@ export declare abstract class FirestoreTriggeredProcessFunctionBase extends Func
|
|
|
11
11
|
*
|
|
12
12
|
* Firestoreのトリガー用のFunctionのデータを定義するためのベースクラス。
|
|
13
13
|
*/
|
|
14
|
-
constructor(options?:
|
|
14
|
+
constructor(options?: DatabasePathFunctionsOptions);
|
|
15
15
|
/**
|
|
16
16
|
* Specifies the path to be processed.
|
|
17
17
|
*
|
|
@@ -20,6 +20,12 @@ export declare abstract class FirestoreTriggeredProcessFunctionBase extends Func
|
|
|
20
20
|
* https://firebase.google.com/docs/functions/firestore-events
|
|
21
21
|
*/
|
|
22
22
|
abstract path: string;
|
|
23
|
+
/**
|
|
24
|
+
* Specifies the database.
|
|
25
|
+
*
|
|
26
|
+
* データベースを指定します。
|
|
27
|
+
*/
|
|
28
|
+
database: string | undefined | null;
|
|
23
29
|
/**
|
|
24
30
|
* Specify the actual contents of the process.
|
|
25
31
|
*
|
|
@@ -48,12 +48,21 @@ class FirestoreTriggeredProcessFunctionBase extends functions_base_1.FunctionsBa
|
|
|
48
48
|
*/
|
|
49
49
|
constructor(options = {}) {
|
|
50
50
|
super({ options: options });
|
|
51
|
+
/**
|
|
52
|
+
* Specifies the database.
|
|
53
|
+
*
|
|
54
|
+
* データベースを指定します。
|
|
55
|
+
*/
|
|
56
|
+
this.database = undefined;
|
|
51
57
|
this.data = {};
|
|
52
58
|
}
|
|
53
59
|
build(regions) {
|
|
54
|
-
var _a;
|
|
60
|
+
var _a, _b, _c;
|
|
55
61
|
const options = this.options;
|
|
56
|
-
return functions.firestore.onDocumentWritten(
|
|
62
|
+
return functions.firestore.onDocumentWritten({
|
|
63
|
+
document: (_a = options === null || options === void 0 ? void 0 : options.path) !== null && _a !== void 0 ? _a : this.path,
|
|
64
|
+
database: (_c = (_b = options === null || options === void 0 ? void 0 : options.database) !== null && _b !== void 0 ? _b : this.database) !== null && _c !== void 0 ? _c : undefined,
|
|
65
|
+
}, (event) => __awaiter(this, void 0, void 0, function* () {
|
|
57
66
|
return this.process(event);
|
|
58
67
|
}));
|
|
59
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firestore_triggered_process_function_base.js","sourceRoot":"","sources":["../../../src/lib/src/firestore_triggered_process_function_base.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"firestore_triggered_process_function_base.js","sourceRoot":"","sources":["../../../src/lib/src/firestore_triggered_process_function_base.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AACnD,qDAA+E;AAG/E;;;;GAIG;AACH,MAAsB,qCAAsC,SAAQ,8BAAa;IAC7E;;;;OAIG;IACH,YAAY,UAAwC,EAAE;QAClD,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAYhC;;;;WAIG;QACH,aAAQ,GAA8B,SAAS,CAAC;QAUhD,SAAI,GAA2B,EAAE,CAAC;IA1BlC,CAAC;IA2BD,KAAK,CAAC,OAAiB;;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,OAA0D,CAAC;QAChF,OAAO,SAAS,CAAC,SAAS,CAAC,iBAAiB,CACxC;YACI,QAAQ,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,mCAAI,IAAI,CAAC,IAAI;YACpC,QAAQ,EAAE,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,mCAAI,IAAI,CAAC,QAAQ,mCAAI,SAAS;SAC5D,EACD,CAAO,KAAK,EAAE,EAAE;YACZ,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAA,CACJ,CAAC;IACN,CAAC;CACJ;AA/CD,sFA+CC"}
|
|
@@ -109,6 +109,31 @@ export interface PathFunctionsOptions extends FunctionsOptions {
|
|
|
109
109
|
*/
|
|
110
110
|
region?: string | null;
|
|
111
111
|
}
|
|
112
|
+
/**
|
|
113
|
+
* Specifies the options for the process.
|
|
114
|
+
*
|
|
115
|
+
* 処理のオプションを指定します。
|
|
116
|
+
*/
|
|
117
|
+
export interface DatabasePathFunctionsOptions extends FunctionsOptions {
|
|
118
|
+
/**
|
|
119
|
+
* Specify the path to the target database.
|
|
120
|
+
*
|
|
121
|
+
* 対象のデータベースのパスを指定します。
|
|
122
|
+
*/
|
|
123
|
+
path?: string | undefined | null;
|
|
124
|
+
/**
|
|
125
|
+
* Specifies the database.
|
|
126
|
+
*
|
|
127
|
+
* データベースを指定します。
|
|
128
|
+
*/
|
|
129
|
+
database?: string | undefined | null;
|
|
130
|
+
/**
|
|
131
|
+
* Specifies an alternate region.
|
|
132
|
+
*
|
|
133
|
+
* 代替のリージョンを指定します。
|
|
134
|
+
*/
|
|
135
|
+
region?: string | null;
|
|
136
|
+
}
|
|
112
137
|
/**
|
|
113
138
|
* Specifies the options for the process.
|
|
114
139
|
*
|
|
@@ -20,7 +20,7 @@ export declare abstract class RequestProcessFunctionBase extends FunctionsBase {
|
|
|
20
20
|
*
|
|
21
21
|
* 実際の処理の中身を指定します。
|
|
22
22
|
*
|
|
23
|
-
* @param
|
|
23
|
+
* @param request
|
|
24
24
|
* Request passed to Functions.
|
|
25
25
|
*
|
|
26
26
|
* Functionsに渡されたRequest。
|
|
@@ -30,7 +30,7 @@ export declare abstract class RequestProcessFunctionBase extends FunctionsBase {
|
|
|
30
30
|
*
|
|
31
31
|
* Functionsに渡されたResponse。
|
|
32
32
|
*/
|
|
33
|
-
abstract process(
|
|
33
|
+
abstract process(request: functions.https.Request, response: express.Response<any>): Promise<void>;
|
|
34
34
|
abstract id: string;
|
|
35
35
|
data: {
|
|
36
36
|
[key: string]: any;
|