@mxpicture/gcp-functions-backend 1.3.26 → 1.3.27
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/firebase/FirebaseTaskHandler.js +2 -2
- package/dist/firebase/firebase.tasks.d.ts +8 -5
- package/dist/firebase/firebase.tasks.d.ts.map +1 -1
- package/dist/firebase/firebase.tasks.js +13 -2
- package/dist/firebase/firebase.tasks.js.map +1 -1
- package/dist/types/types.tasks.d.ts +9 -3
- package/dist/types/types.tasks.d.ts.map +1 -1
- package/package.json +2 -2
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { CloudTasksClient } from "@google-cloud/tasks";
|
|
2
2
|
import { FirebaseTaskQueueHandler } from "./FirebaseTaskQueueHandler.js";
|
|
3
|
-
import {
|
|
3
|
+
import { fromTaskName } from "./firebase.tasks.js";
|
|
4
4
|
/**
|
|
5
5
|
* Client wrapper around Google Cloud Tasks for scheduling, retrieving, and managing HTTP-targeted tasks.
|
|
6
6
|
*
|
|
@@ -157,7 +157,7 @@ export class FirebaseTaskHandler {
|
|
|
157
157
|
const cloned = structuredClone(task);
|
|
158
158
|
if (!cloned.name)
|
|
159
159
|
return cloned;
|
|
160
|
-
const parts =
|
|
160
|
+
const parts = fromTaskName(cloned.name);
|
|
161
161
|
if (parts)
|
|
162
162
|
cloned.nameParts = parts;
|
|
163
163
|
return cloned;
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { FirebaseQueueFqName, FirebaseTaskDurationParams, FirebaseTaskFqName, FirebaseTaskName, FirebaseTaskTimestamp } from "../types/types.tasks.js";
|
|
2
|
+
export declare const taskPathRegex: RegExp;
|
|
3
|
+
export declare const queuePathRegex: RegExp;
|
|
4
|
+
export declare const taskNameRegex: RegExp;
|
|
2
5
|
/**
|
|
3
6
|
* Compute a Cloud Tasks schedule timestamp from a duration specification or an absolute `Date`.
|
|
4
7
|
*
|
|
@@ -13,20 +16,20 @@ import type { FirebaseQueueNameParts, FirebaseTaskDurationParams, FirebaseTaskNa
|
|
|
13
16
|
* @returns A {@link FirebaseTaskTimestamp} containing the computed `seconds` value.
|
|
14
17
|
*/
|
|
15
18
|
export declare const taskScheduleTimestamp: (duration_date: FirebaseTaskDurationParams | Date) => FirebaseTaskTimestamp;
|
|
16
|
-
export declare const taskPathRegex: RegExp;
|
|
17
|
-
export declare const queuePathRegex: RegExp;
|
|
18
19
|
/**
|
|
19
20
|
* Parse a fully-qualified task resource path into its constituent parts.
|
|
20
21
|
*
|
|
21
22
|
* @param path - The task resource path to parse.
|
|
22
23
|
* @returns The parsed parts, or `null` if the path does not match the expected format.
|
|
23
24
|
*/
|
|
24
|
-
export declare const fromTaskPath: (path: string) =>
|
|
25
|
+
export declare const fromTaskPath: (path: string) => FirebaseTaskFqName | null;
|
|
25
26
|
/**
|
|
26
27
|
* Parse a fully-qualified queue resource path into its constituent parts.
|
|
27
28
|
*
|
|
28
29
|
* @param path - The queue resource path to parse.
|
|
29
30
|
* @returns The parsed parts, or `null` if the path does not match the expected format.
|
|
30
31
|
*/
|
|
31
|
-
export declare const fromQueuePath: (path: string) =>
|
|
32
|
+
export declare const fromQueuePath: (path: string) => FirebaseQueueFqName | null;
|
|
33
|
+
export declare const fromTaskName: (name: string) => FirebaseTaskName | null;
|
|
34
|
+
export declare const toTaskName: (name: FirebaseTaskName) => string;
|
|
32
35
|
//# sourceMappingURL=firebase.tasks.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firebase.tasks.d.ts","sourceRoot":"","sources":["../../src/firebase/firebase.tasks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,
|
|
1
|
+
{"version":3,"file":"firebase.tasks.d.ts","sourceRoot":"","sources":["../../src/firebase/firebase.tasks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,mBAAmB,EACnB,0BAA0B,EAC1B,kBAAkB,EAClB,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,yBAAyB,CAAC;AAEjC,eAAO,MAAM,aAAa,QACsF,CAAC;AAEjH,eAAO,MAAM,cAAc,QAC4D,CAAC;AAExF,eAAO,MAAM,aAAa,QAAsC,CAAC;AAEjE;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,qBAAqB,GAChC,eAAe,0BAA0B,GAAG,IAAI,KAC/C,qBAuBF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,KAAG,kBAAkB,GAAG,IAShE,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,KAAG,mBAAmB,GAAG,IAQlE,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,KAAG,gBAAgB,GAAG,IAO9D,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,MAAM,gBAAgB,KAAG,MAClB,CAAC"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import { computeScheduleTimeUtc } from "@mxpicture/gcp-functions-common/helper";
|
|
2
|
+
export const taskPathRegex = /^projects\/([a-zA-Z0-9-_]+)\/locations\/([a-zA-Z0-9-_]+)\/queues\/([a-zA-Z0-9-_]+)\/tasks\/([a-zA-Z0-9-_]+)$/;
|
|
3
|
+
export const queuePathRegex = /^projects\/([a-zA-Z0-9-_]+)\/locations\/([a-zA-Z0-9-_]+)\/queues\/([a-zA-Z0-9-_]+)$/;
|
|
4
|
+
export const taskNameRegex = /^([a-zA-Z0-9_]+)-([a-zA-Z0-9_]+)$/;
|
|
2
5
|
/**
|
|
3
6
|
* Compute a Cloud Tasks schedule timestamp from a duration specification or an absolute `Date`.
|
|
4
7
|
*
|
|
@@ -30,8 +33,6 @@ export const taskScheduleTimestamp = (duration_date) => {
|
|
|
30
33
|
}
|
|
31
34
|
return { seconds: Math.floor(targetAt.getTime() / 1000) };
|
|
32
35
|
};
|
|
33
|
-
export const taskPathRegex = /^projects\/([a-zA-Z0-9-_]+)\/locations\/([a-zA-Z0-9-_]+)\/queues\/([a-zA-Z0-9-_]+)\/tasks\/([a-zA-Z0-9-_]+)$/;
|
|
34
|
-
export const queuePathRegex = /^projects\/([a-zA-Z0-9-_]+)\/locations\/([a-zA-Z0-9-_]+)\/queues\/([a-zA-Z0-9-_]+)$/;
|
|
35
36
|
/**
|
|
36
37
|
* Parse a fully-qualified task resource path into its constituent parts.
|
|
37
38
|
*
|
|
@@ -65,4 +66,14 @@ export const fromQueuePath = (path) => {
|
|
|
65
66
|
queueId: found[3],
|
|
66
67
|
};
|
|
67
68
|
};
|
|
69
|
+
export const fromTaskName = (name) => {
|
|
70
|
+
const found = name.match(taskNameRegex);
|
|
71
|
+
if (!found)
|
|
72
|
+
return null;
|
|
73
|
+
return {
|
|
74
|
+
queueId: found[1],
|
|
75
|
+
taskId: found[2],
|
|
76
|
+
};
|
|
77
|
+
};
|
|
78
|
+
export const toTaskName = (name) => `${name.queueId}-${name.taskId}`;
|
|
68
79
|
//# sourceMappingURL=firebase.tasks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firebase.tasks.js","sourceRoot":"","sources":["../../src/firebase/firebase.tasks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"firebase.tasks.js","sourceRoot":"","sources":["../../src/firebase/firebase.tasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,15 +33,21 @@ export interface FirebaseTaskDurationParams {
|
|
|
33
33
|
targetHoursTo?: number;
|
|
34
34
|
}
|
|
35
35
|
/** Parsed components of a fully-qualified Cloud Tasks task resource path. */
|
|
36
|
-
export interface
|
|
36
|
+
export interface FirebaseTaskFqName extends FirebaseQueueFqName {
|
|
37
37
|
taskId: string;
|
|
38
38
|
}
|
|
39
39
|
/** Parsed components of a fully-qualified Cloud Tasks queue resource path. */
|
|
40
|
-
export interface
|
|
40
|
+
export interface FirebaseQueueFqName {
|
|
41
41
|
projectId: string;
|
|
42
42
|
region: string;
|
|
43
43
|
queueId: string;
|
|
44
44
|
}
|
|
45
|
+
export interface FirebaseTaskName extends FirebaseQueueName {
|
|
46
|
+
taskId: string;
|
|
47
|
+
}
|
|
48
|
+
export interface FirebaseQueueName {
|
|
49
|
+
queueId: string;
|
|
50
|
+
}
|
|
45
51
|
/**
|
|
46
52
|
* Represents a Cloud Task as returned by the Cloud Tasks API.
|
|
47
53
|
*
|
|
@@ -49,7 +55,7 @@ export interface FirebaseQueueNameParts {
|
|
|
49
55
|
* Field shapes are adapted from the `@google-cloud/tasks` protobuf definitions.
|
|
50
56
|
*/
|
|
51
57
|
export interface FirebaseTask {
|
|
52
|
-
nameParts?:
|
|
58
|
+
nameParts?: FirebaseTaskName | null;
|
|
53
59
|
/** Task name */
|
|
54
60
|
name?: string | null;
|
|
55
61
|
/** Task scheduleTime */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.tasks.d.ts","sourceRoot":"","sources":["../../src/types/types.tasks.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,qDAAqD;IACrD,MAAM,EAAE,MAAM,CAAC;IACf,6DAA6D;IAC7D,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,4DAA4D;AAC5D,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,mEAAmE;AACnE,MAAM,WAAW,0BAA0B;IACzC,iFAAiF;IACjF,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED,6EAA6E;AAC7E,MAAM,WAAW,0BAA0B;IACzC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAMD,6EAA6E;AAC7E,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"types.tasks.d.ts","sourceRoot":"","sources":["../../src/types/types.tasks.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mxpicture/gcp-functions-backend",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.27",
|
|
4
4
|
"description": "Utils for google cloud functions, publishing both CommonJS and ESM builds",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"author": "MXPicture",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
56
|
"@google-cloud/tasks": "^6.2.1",
|
|
57
|
-
"@mxpicture/gcp-functions-common": "^1.3.
|
|
57
|
+
"@mxpicture/gcp-functions-common": "^1.3.27",
|
|
58
58
|
"express": "^5.2.1",
|
|
59
59
|
"firebase-admin": "^13.7.0",
|
|
60
60
|
"firebase-functions": "^7.0.6",
|