@dereekb/firebase-server 12.6.2 → 12.6.6
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 +16 -0
- package/mailgun/package.json +1 -1
- package/model/package.json +1 -1
- package/model/src/lib/notification/notification.task.subtask.handler.d.ts +11 -3
- package/model/src/lib/notification/notification.task.subtask.handler.js +3 -3
- package/model/src/lib/notification/notification.task.subtask.handler.js.map +1 -1
- package/model/src/lib/storagefile/storagefile.task.service.handler.d.ts +1 -0
- package/model/src/lib/storagefile/storagefile.task.service.handler.js +13 -10
- package/model/src/lib/storagefile/storagefile.task.service.handler.js.map +1 -1
- package/model/src/lib/storagefile/storagefile.upload.service.initializer.d.ts +1 -3
- package/model/src/lib/storagefile/storagefile.upload.service.initializer.js +2 -1
- package/model/src/lib/storagefile/storagefile.upload.service.initializer.js.map +1 -1
- package/package.json +1 -1
- package/src/lib/function/assert.d.ts +8 -0
- package/src/lib/function/assert.js +14 -3
- package/src/lib/function/assert.js.map +1 -1
- package/test/package.json +1 -1
- package/zoho/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,22 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
## [12.6.6](https://github.com/dereekb/dbx-components/compare/v12.6.5-dev...v12.6.6) (2025-12-31)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
## [12.6.5](https://github.com/dereekb/dbx-components/compare/v12.6.4-dev...v12.6.5) (2025-12-30)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
## [12.6.4](https://github.com/dereekb/dbx-components/compare/v12.6.3-dev...v12.6.4) (2025-12-16)
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [12.6.3](https://github.com/dereekb/dbx-components/compare/v12.6.2-dev...v12.6.3) (2025-12-16)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
5
21
|
## [12.6.2](https://github.com/dereekb/dbx-components/compare/v12.6.1-dev...v12.6.2) (2025-12-08)
|
|
6
22
|
|
|
7
23
|
|
package/mailgun/package.json
CHANGED
package/model/package.json
CHANGED
|
@@ -72,9 +72,17 @@ export interface NotificationTaskSubtaskCleanupInstructions {
|
|
|
72
72
|
/**
|
|
73
73
|
* Cleanup function for a NotificationTaskSubtask.
|
|
74
74
|
*
|
|
75
|
-
* This is called during the cleanup step.
|
|
75
|
+
* This is called during the cleanup step. It is called even when the processor or target is unknown.
|
|
76
76
|
*/
|
|
77
|
-
export type NotificationTaskSubtaskCleanupInstructionsFunction<I extends NotificationTaskSubtaskInput<D, M, S>, CUI extends NotificationTaskSubtaskCleanupInstructions, D extends NotificationTaskSubtaskData<M, S>, M extends NotificationTaskSubtaskMetadata = any, S extends NotificationTaskSubtaskCheckpointString = NotificationTaskSubtaskCheckpointString> = (input: NotificationTaskSubtaskCleanupFunctionInput<I, D, M, S>) => CUI
|
|
77
|
+
export type NotificationTaskSubtaskCleanupInstructionsFunction<I extends NotificationTaskSubtaskInput<D, M, S>, CUI extends NotificationTaskSubtaskCleanupInstructions, D extends NotificationTaskSubtaskData<M, S>, M extends NotificationTaskSubtaskMetadata = any, S extends NotificationTaskSubtaskCheckpointString = NotificationTaskSubtaskCheckpointString> = (input: NotificationTaskSubtaskCleanupFunctionInput<I, D, M, S>) => PromiseOrValue<CUI>;
|
|
78
|
+
/**
|
|
79
|
+
* Optional cleanup override function for a NotificationTaskSubtask processor.
|
|
80
|
+
*
|
|
81
|
+
* The input has more parameters available to the input compared to NotificationTaskSubtaskCleanupInstructionsFunction. Can also call the configured default cleanup instructions function.
|
|
82
|
+
*
|
|
83
|
+
* If this function returns null/undefined, then the default cleanup instructions will be used.
|
|
84
|
+
*/
|
|
85
|
+
export type NotificationTaskSubtaskProcessorCleanupInstructionsFunction<I extends NotificationTaskSubtaskInput<D, M, S>, CUI extends NotificationTaskSubtaskCleanupInstructions, D extends NotificationTaskSubtaskData<M, S>, M extends NotificationTaskSubtaskMetadata = any, S extends NotificationTaskSubtaskCheckpointString = NotificationTaskSubtaskCheckpointString> = (input: I, defaultCleanupInstructions: NotificationTaskSubtaskCleanupInstructionsFunction<I, CUI, D, M, S>) => Maybe<PromiseOrValue<Maybe<CUI>>>;
|
|
78
86
|
/**
|
|
79
87
|
* The actual cleanup function to execute using the input and instructions.
|
|
80
88
|
*/
|
|
@@ -104,7 +112,7 @@ export interface NotificationTaskSubtaskProcessorConfig<I extends NotificationTa
|
|
|
104
112
|
*
|
|
105
113
|
* If not provided, the default cleanup actions will take place.
|
|
106
114
|
*/
|
|
107
|
-
readonly cleanup?:
|
|
115
|
+
readonly cleanup?: NotificationTaskSubtaskProcessorCleanupInstructionsFunction<I, CUI, D, M, S>;
|
|
108
116
|
/**
|
|
109
117
|
* If true, then results returned by this processor will set "canRunNextCheckpoint" to true if it is undefined.
|
|
110
118
|
*/
|
|
@@ -210,17 +210,17 @@ function notificationTaskSubtaskNotificationTaskHandlerFactory(factoryConfig) {
|
|
|
210
210
|
target,
|
|
211
211
|
subtaskData
|
|
212
212
|
};
|
|
213
|
-
cleanupInstructions = await processor.cleanup(input);
|
|
213
|
+
cleanupInstructions = (await processor.cleanup(input, defaultCleanup)) ?? (await defaultCleanup(cleanupFunctionInput));
|
|
214
214
|
cleanupFunctionInput = input;
|
|
215
215
|
}
|
|
216
216
|
else {
|
|
217
217
|
// processor is unknown. Complete the task.
|
|
218
|
-
cleanupInstructions = defaultCleanup(cleanupFunctionInput);
|
|
218
|
+
cleanupInstructions = await defaultCleanup(cleanupFunctionInput);
|
|
219
219
|
}
|
|
220
220
|
}
|
|
221
221
|
else {
|
|
222
222
|
// target is unknown. Complete the task.
|
|
223
|
-
cleanupInstructions = defaultCleanup(cleanupFunctionInput);
|
|
223
|
+
cleanupInstructions = await defaultCleanup(cleanupFunctionInput);
|
|
224
224
|
}
|
|
225
225
|
if (cleanupInstructions.cleanupSuccess === false && notificationTask.currentCheckpointSendAttempts <= maxCleanupRetryAttempts) {
|
|
226
226
|
result = (0, firebase_1.notificationTaskDelayRetry)(cleanupInstructions.delayRetryUntil ?? cleanupRetryDelay);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.task.subtask.handler.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/model/src/lib/notification/notification.task.subtask.handler.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"notification.task.subtask.handler.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/model/src/lib/notification/notification.task.subtask.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -98,6 +98,7 @@ export interface StorageFileProcessingNotificationTaskHandlerConfig extends Omit
|
|
|
98
98
|
*/
|
|
99
99
|
readonly storageAccessor: FirebaseStorageAccessor;
|
|
100
100
|
}
|
|
101
|
+
export declare const storageFileProcessingNotificationTaskHandlerDefaultCleanup: () => StorageFileProcessingPurposeSubtaskCleanupOutput;
|
|
101
102
|
/**
|
|
102
103
|
* Creates a NotificationTaskServiceTaskHandlerConfig that handles the StorageFileProcessingNotificationTask.
|
|
103
104
|
*/
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.storageFileProcessingNotificationTaskHandlerDefaultCleanup = void 0;
|
|
3
4
|
exports.storageFileProcessingNotificationTaskHandler = storageFileProcessingNotificationTaskHandler;
|
|
4
5
|
exports.allStorageFileGroupStorageFileProcessingPurposeSubtaskProcessors = allStorageFileGroupStorageFileProcessingPurposeSubtaskProcessors;
|
|
5
6
|
exports.storageFileGroupZipStorageFileProcessingPurposeSubtaskProcessor = storageFileGroupZipStorageFileProcessingPurposeSubtaskProcessor;
|
|
@@ -8,6 +9,14 @@ const util_1 = require("@dereekb/util");
|
|
|
8
9
|
const storagefile_util_1 = require("./storagefile.util");
|
|
9
10
|
const notification_task_subtask_handler_1 = require("../notification/notification.task.subtask.handler");
|
|
10
11
|
const archiver = require("archiver");
|
|
12
|
+
const storageFileProcessingNotificationTaskHandlerDefaultCleanup = () => {
|
|
13
|
+
return {
|
|
14
|
+
cleanupSuccess: true,
|
|
15
|
+
nextProcessingState: firebase_1.StorageFileProcessingState.SUCCESS,
|
|
16
|
+
queueForDelete: false // do not queue for delete automatically
|
|
17
|
+
};
|
|
18
|
+
};
|
|
19
|
+
exports.storageFileProcessingNotificationTaskHandlerDefaultCleanup = storageFileProcessingNotificationTaskHandlerDefaultCleanup;
|
|
11
20
|
/**
|
|
12
21
|
* Creates a NotificationTaskServiceTaskHandlerConfig that handles the StorageFileProcessingNotificationTask.
|
|
13
22
|
*/
|
|
@@ -26,13 +35,7 @@ function storageFileProcessingNotificationTaskHandler(config) {
|
|
|
26
35
|
}
|
|
27
36
|
}
|
|
28
37
|
});
|
|
29
|
-
|
|
30
|
-
return {
|
|
31
|
-
cleanupSuccess: true,
|
|
32
|
-
nextProcessingState: firebase_1.StorageFileProcessingState.SUCCESS,
|
|
33
|
-
queueForDelete: false // do not queue for delete automatically
|
|
34
|
-
};
|
|
35
|
-
}
|
|
38
|
+
const defaultCleanup = exports.storageFileProcessingNotificationTaskHandlerDefaultCleanup;
|
|
36
39
|
const processors = [...inputProcessors];
|
|
37
40
|
if (allStorageFileGroupProcessorConfig !== false) {
|
|
38
41
|
const storageFileGroupProcessors = allStorageFileGroupStorageFileProcessingPurposeSubtaskProcessors({
|
|
@@ -57,7 +60,7 @@ function storageFileProcessingNotificationTaskHandler(config) {
|
|
|
57
60
|
let purpose = data?.p;
|
|
58
61
|
if (!purpose) {
|
|
59
62
|
// attempt to load the purpose from the storage file, if it exists.
|
|
60
|
-
purpose = await loadStorageFile().then((x) => x.p);
|
|
63
|
+
purpose = (await loadStorageFile().then((x) => x.p));
|
|
61
64
|
}
|
|
62
65
|
let storagePath;
|
|
63
66
|
if (data.storagePath) {
|
|
@@ -69,7 +72,7 @@ function storageFileProcessingNotificationTaskHandler(config) {
|
|
|
69
72
|
const file = storageAccessor.file(storagePath);
|
|
70
73
|
const fileDetailsAccessor = makeFileDetailsAccessor(file);
|
|
71
74
|
const input = {
|
|
72
|
-
purpose
|
|
75
|
+
purpose,
|
|
73
76
|
target: purpose,
|
|
74
77
|
loadStorageFile,
|
|
75
78
|
fileDetailsAccessor,
|
|
@@ -144,7 +147,7 @@ function storageFileGroupZipStorageFileProcessingPurposeSubtaskProcessor(config)
|
|
|
144
147
|
let result;
|
|
145
148
|
async function flagStorageFileForDeletion() {
|
|
146
149
|
await storageFileDocument.update((0, storagefile_util_1.markStorageFileForDeleteTemplate)());
|
|
147
|
-
return (0, firebase_1.notificationTaskComplete)();
|
|
150
|
+
return (0, firebase_1.notificationTaskComplete)(); // skip cleanup step
|
|
148
151
|
}
|
|
149
152
|
if (storageFileGroupId) {
|
|
150
153
|
const storageFileGroupDocument = storageFileGroupCollection.documentAccessor().loadDocumentForId(storageFileGroupId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storagefile.task.service.handler.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/model/src/lib/storagefile/storagefile.task.service.handler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"storagefile.task.service.handler.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/model/src/lib/storagefile/storagefile.task.service.handler.ts"],"names":[],"mappings":";;;AAwJA,oGAiHC;AAYD,4IAUC;AAuDD,0IAwLC;AA9gBD,gDA8B2B;AAE3B,wCAAyO;AACzO,yDAA0G;AAC1G,yGAAwb;AACxb,qCAAqC;AA0G9B,MAAM,0DAA0D,GAAG,GAAqD,EAAE;IAC/H,OAAO;QACL,cAAc,EAAE,IAAI;QACpB,mBAAmB,EAAE,qCAA0B,CAAC,OAAO;QACvD,cAAc,EAAE,KAAK,CAAC,wCAAwC;KAC/D,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,0DAA0D,8DAMrE;AAEF;;GAEG;AACH,SAAgB,4CAA4C,CAAC,MAA0D;IACrH,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,eAAe,EAAE,+BAA+B,EAAE,kCAAkC,EAAE,GAAG,MAAM,CAAC;IACrI,MAAM,2BAA2B,GAAG,+BAA+B,CAAC,qBAAqB,CAAC,gBAAgB,EAAE,CAAC;IAC7G,MAAM,uBAAuB,GAAG,IAAA,kCAAuB,GAAE,CAAC;IAE1D,iFAAiF;IACjF,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,IAAI,CAAE,CAAS,CAAC,MAAM,EAAE,CAAC;YACvB,IAAK,CAAS,CAAC,OAAO,EAAE,CAAC;gBACtB,CAAS,CAAC,MAAM,GAAI,CAAS,CAAC,OAAO,CAAC;YACzC,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,mFAAmF,CAAC,CAAC;YACvG,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,kEAA0D,CAAC;IAClF,MAAM,UAAU,GAAG,CAAC,GAAG,eAAe,CAAuI,CAAC;IAE9K,IAAI,kCAAkC,KAAK,KAAK,EAAE,CAAC;QACjD,MAAM,0BAA0B,GAAG,gEAAgE,CAAC;YAClG,GAAG,kCAAkC;YACrC,+BAA+B;YAC/B,eAAe;SAChB,CAAC,CAAC;QACH,IAAA,8BAAuB,EAAC,UAAU,EAAE,0BAA0B,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,IAAA,yFAAqD,EAA4M;QACtQ,QAAQ,EAAE,yDAA8C;QACxD,0BAA0B,EAAE,8CAA8C;QAC1E,aAAa,EAAE,KAAK,EAAE,IAA+C,EAAE,EAAE;YACvE,MAAM,mBAAmB,GAAG,MAAM,2BAA2B,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAElG,MAAM,eAAe,GAAG,IAAA,mBAAY,EAAC,KAAK,IAAI,EAAE;gBAC9C,MAAM,WAAW,GAAG,MAAM,IAAA,kCAAuB,EAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;gBAE7E,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,MAAM,IAAA,yFAAqD,GAAE,CAAC;gBAChE,CAAC;gBAED,OAAO,WAAW,CAAC;YACrB,CAAC,CAAC,CAAC;YAEH,IAAI,OAAO,GAAG,IAAI,EAAE,CAAC,CAAC;YAEtB,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,mEAAmE;gBACnE,OAAO,GAAG,CAAC,MAAM,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAW,CAAC;YACjE,CAAC;YAED,IAAI,WAAwB,CAAC;YAE7B,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACrB,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YACjC,CAAC;iBAAM,CAAC;gBACN,WAAW,GAAG,MAAM,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YAC1G,CAAC;YAED,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC/C,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;YAE1D,MAAM,KAAK,GAAG;gBACZ,OAAO;gBACP,MAAM,EAAE,OAAO;gBACf,eAAe;gBACf,mBAAmB;gBACnB,mBAAmB;aACpB,CAAC;YAEF,OAAO,KAAK,CAAC;QACf,CAAC;QACD,mBAAmB,EAAE,CAAC,kBAAkB,EAAE,KAAK,EAAE,EAAE;YACjD,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;YAE1B,OAAO;gBACL,GAAG,kBAAkB;gBACrB,sGAAsG;gBACtG,CAAC,EAAE,OAAO;gBACV,WAAW,EAAE,IAAA,0BAAe,EAAC,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC;aAC9D,CAAC;QACJ,CAAC;QACD,cAAc;QACd,eAAe,EAAE,KAAK,WAAW,KAAK,EAAE,mBAAqE;YAC3G,MAAM,EAAE,mBAAmB,EAAE,GAAG,KAAK,CAAC;YACtC,MAAM,EAAE,mBAAmB,EAAE,cAAc,EAAE,+BAA+B,EAAE,yBAAyB,EAAE,GAAG,mBAAmB,CAAC;YAEhI,IAAI,cAAc,GAAyB;gBACzC,EAAE,EAAE,mBAAmB,IAAI,qCAA0B,CAAC,OAAO;gBAC7D,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,kCAAkC;gBACpD,EAAE,EAAE,IAAI,CAAC,kBAAkB;aAC5B,CAAC;YAEF,MAAM,oBAAoB,GAAG,cAAc,IAAI,IAAI,IAAI,cAAc,KAAK,KAAK,CAAC;YAEhF,IAAI,oBAAoB,EAAE,CAAC;gBACzB,cAAc,GAAG;oBACf,GAAG,cAAc;oBACjB,GAAG,IAAA,mDAAgC,EAAC,cAAc,CAAC;iBACpD,CAAC;YACJ,CAAC;iBAAM,IAAI,yBAAyB,EAAE,CAAC;gBACrC,kCAAkC;gBAClC,cAAc,CAAC,EAAE,GAAG,IAAI,CAAC;YAC3B,CAAC;YAED,MAAM,mBAAmB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YAEjD,OAAO,IAAA,mCAAwB,GAAE,CAAC;QACpC,CAAC;KACF,CAAC,CAAC;QACD,GAAG,MAAM;QACT,UAAU;KACX,CAAC,CAAC;AACL,CAAC;AAYD,SAAgB,gEAAgE,CAAC,MAA8E;IAC7J,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC;IAExC,MAAM,UAAU,GAAmE,EAAE,CAAC;IAEtF,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,UAAU,CAAC,IAAI,CAAC,+DAA+D,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3F,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAuDD,SAAgB,+DAA+D,CAAC,MAA2E;IACzJ,MAAM,EAAE,+BAA+B,EAAE,eAAe,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;IACzE,MAAM,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,GAAG,+BAA+B,CAAC;IAC9F,MAAM,EAAE,+BAA+B,EAAE,oCAAoC,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,gCAAgC,EAAE,kBAAkB,EAAE,GAAG,GAAG,IAAI,EAAE,CAAC;IAEhO,MAAM,+BAA+B,GAAG,oCAAoC,IAAI,CAAC,CAAC;IAClF,MAAM,iBAAiB,GAAG,yBAAyB,KAAK,KAAK,CAAC;IAC9D,MAAM,2BAA2B,GAAG,gCAAgC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IACzG,MAAM,oBAAoB,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,mBAAY,CAAC;IAEzG,MAAM,kCAAkC,GAAiK;QACvM,MAAM,EAAE,sDAA2C;QACnD,OAAO,EAAE,GAAG,EAAE,OAAO;QACrB,IAAI,EAAE;YACJ;gBACE,OAAO,EAAE,yEAA8D;gBACvE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;oBAClB,MAAM,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,GAAG,KAAK,CAAC;oBAE3D,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,CAAC;oBAClD,MAAM,mBAAmB,GAAG,WAAW,CAAC,CAA2C,CAAC;oBACpF,MAAM,kBAAkB,GAAG,mBAAmB,EAAE,GAAG,CAAC;oBAEpD,IAAI,MAA+I,CAAC;oBAEpJ,KAAK,UAAU,0BAA0B;wBACvC,MAAM,mBAAmB,CAAC,MAAM,CAAC,IAAA,mDAAgC,GAAE,CAAC,CAAC;wBACrE,OAAO,IAAA,mCAAwB,GAAE,CAAC,CAAC,oBAAoB;oBACzD,CAAC;oBAED,IAAI,kBAAkB,EAAE,CAAC;wBACvB,MAAM,wBAAwB,GAAG,0BAA0B,CAAC,gBAAgB,EAAE,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;wBACrH,MAAM,gBAAgB,GAAG,MAAM,wBAAwB,CAAC,YAAY,EAAE,CAAC;wBAEvE,IAAI,gBAAgB,EAAE,CAAC;4BACrB,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;4BAC/D,MAAM,iBAAiB,GAAG,IAAA,8BAAmB,EAAC,qBAAqB,CAAC,gBAAgB,EAAE,EAAE,mBAAmB,CAAC,CAAC;4BAC7G,MAAM,yBAAyB,GAAG,MAAM,IAAA,uCAA4B,EAAC,iBAAiB,CAAC,CAAC;4BAExF,IAAI,yBAAyB,GAAmB,SAAS,CAAC;4BAE1D,oBAAoB;4BACpB,MAAM,eAAe,GAAG,eAAe,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;4BAExE,IAAI,eAAe,CAAC,YAAY,IAAI,eAAe,CAAC,SAAS,EAAE,CAAC;gCAC9D,MAAM,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;oCAChD,WAAW,EAAE,yBAAkB;iCAChC,CAAC,CAAC;gCAEH,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;gCAC7B,MAAM,eAAe,GAAG,MAAM,2BAA2B,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,CAAC;gCACvF,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;gCAEpD,wCAAwC;gCACxC,UAAU,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;gCAE7C,0CAA0C;gCAC1C,MAAM,IAAA,wBAAiB,EACrB,yBAAyB,EACzB,KAAK,EAAE,mBAAmB,EAAE,EAAE;oCAC5B,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,mBAAmB,CAAC;oCAElD,IAAI,WAAW,EAAE,CAAC;wCAChB,iDAAiD;wCACjD,MAAM,0BAA0B,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,kBAAkB,CAAC,CAAC;wCAEvF,IAAI,0BAA0B,EAAE,CAAC;4CAC/B,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;4CACvD,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;4CAEpE,IAAI,QAAQ,EAAE,CAAC;gDACb,MAAM,oBAAoB,GAAG,IAAA,uBAAgB,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gDAC7D,IAAI,IAAY,CAAC;gDAEjB,IAAI,oBAAoB,CAAC,SAAS,EAAE,CAAC;oDACnC,IAAI,GAAG,oBAAoB,CAAC,SAAS,CAAC;gDACxC,CAAC;qDAAM,CAAC;oDACN,MAAM,WAAW,GAAG,oBAAoB,CAAC,QAAQ,IAAI,MAAM,WAAW,CAAC,EAAE,EAAE,CAAC;oDAE5E,wEAAwE;oDACxE,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;wDACzB,MAAM,SAAS,GAAG,IAAA,uCAAgC,EAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;wDACzE,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,WAAW,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;oDACjE,CAAC;yDAAM,CAAC;wDACN,IAAI,GAAG,WAAW,CAAC;oDACrB,CAAC;gDACH,CAAC;gDAED,MAAM,UAAU,GAAG,YAAY,CAAC,SAAU,EAAE,CAAC;gDAE7C,MAAM,IAAA,kBAAW,EAAC,CAAC,CAAC,EAAE,EAAE;oDACtB,iCAAiC;oDACjC,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE;wDAC5B,IAAI;qDACL,CAAC,CAAC;oDAEH,kCAAkC;oDAClC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oDAEpC,sCAAsC;oDACtC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gDACrC,CAAC,CAAC,CAAC;4CACL,CAAC;iDAAM,CAAC;gDACN,yBAAyB,GAAG,IAAI,CAAC;4CACnC,CAAC;wCACH,CAAC;6CAAM,CAAC;4CACN,yBAAyB,GAAG,IAAI,CAAC;wCACnC,CAAC;oCACH,CAAC;gCACH,CAAC,EACD;oCACE,gBAAgB,EAAE,+BAA+B;iCAClD,CACF,CAAC;gCAEF,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;gCAE9B,4BAA4B;gCAC5B,IAAI,iBAAiB,EAAE,CAAC;oCACtB,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC;wCAC1C,GAAG,EAAE,kBAAkB;wCACvB,EAAE,EAAE,mBAAmB;wCACvB,CAAC,EAAE,SAAS,CAAC,WAAW,EAAE;wCAC1B,CAAC,EAAE,UAAU,CAAC,WAAW,EAAE;qCAC5B,CAAC,CAAC;oCAEH,IAAI,cAAkC,CAAC;oCAEvC,IAAI,CAAC;wCACH,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;oCAC5C,CAAC;oCAAC,OAAO,CAAC,EAAE,CAAC;wCACX,OAAO,CAAC,KAAK,CAAC,iKAAiK,EAAE,CAAC,CAAC,CAAC;oCACtL,CAAC;oCAED,IAAI,cAAc,EAAE,CAAC;wCACnB,UAAU,CAAC,MAAM,CAAC,cAAc,EAAE;4CAChC,IAAI,EAAE,qDAA0C;yCACjD,CAAC,CAAC;oCACL,CAAC;gCACH,CAAC;gCAED,gDAAgD;gCAChD,IAAI,kBAAkB,EAAE,CAAC;oCACvB,MAAM,kBAAkB,CAAC;wCACvB,KAAK;wCACL,gBAAgB;wCAChB,OAAO,EAAE,UAAU;qCACpB,CAAC,CAAC;gCACL,CAAC;gCAED,uBAAuB;gCACvB,MAAM,UAAU,CAAC,QAAQ,EAAE,CAAC;gCAE5B,8BAA8B;gCAC9B,MAAM,wBAAwB,CAAC,MAAM,CAAC;oCACpC,GAAG,EAAE,UAAU;oCACf,CAAC,EAAE,yBAAyB;iCAC7B,CAAC,CAAC;gCAEH,gCAAgC;gCAChC,MAAM,GAAG,IAAA,sCAA2B,EAAC;oCACnC,oBAAoB,EAAE,IAAI;iCAC3B,CAAC,CAAC;4BACL,CAAC;iCAAM,CAAC;gCACN,qEAAqE;gCACrE,OAAO,CAAC,IAAI,CAAC,4IAA4I,CAAC,CAAC;gCAC3J,MAAM,GAAG,IAAA,qCAA0B,EAAC,iBAAU,CAAC,CAAC;4BAClD,CAAC;wBACH,CAAC;6BAAM,CAAC;4BACN,0EAA0E;4BAC1E,MAAM,GAAG,MAAM,0BAA0B,EAAE,CAAC;wBAC9C,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,sFAAsF;wBACtF,MAAM,GAAG,MAAM,0BAA0B,EAAE,CAAC;oBAC9C,CAAC;oBAED,OAAO,MAAM,CAAC;gBAChB,CAAC;aACF;SACF;KACF,CAAC;IAEF,OAAO,kCAAkC,CAAC;AAC5C,CAAC"}
|
|
@@ -37,7 +37,7 @@ export interface StorageFileInitializeFromUploadServiceInitializerCreateStorageF
|
|
|
37
37
|
/**
|
|
38
38
|
* If set, the initializer will query existing StorageFiles for the user and purpose and flag them for deletion.
|
|
39
39
|
*
|
|
40
|
-
* If true, createStorageFileResult will be used.
|
|
40
|
+
* If true, createStorageFileResult will be used to retrieve the purpose/user. If the result has a purposeSubgroup, it will be used as well.
|
|
41
41
|
*/
|
|
42
42
|
readonly flagPreviousForDelete?: Maybe<boolean | StorageFilePurposeAndUserQueryInput>;
|
|
43
43
|
}
|
|
@@ -52,8 +52,6 @@ export interface StorageFileInitializeFromUploadServiceInitializerStorageFileDoc
|
|
|
52
52
|
readonly createdFile: StoragePathRef;
|
|
53
53
|
/**
|
|
54
54
|
* If set, the initializer will query existing StorageFiles for the user and purpose and flag them for deletion.
|
|
55
|
-
*
|
|
56
|
-
* If true, createStorageFileResult will be used.
|
|
57
55
|
*/
|
|
58
56
|
readonly flagPreviousForDelete?: Maybe<StorageFilePurposeAndUserQueryInput>;
|
|
59
57
|
}
|
|
@@ -103,12 +103,13 @@ function storageFileInitializeFromUploadService(config) {
|
|
|
103
103
|
flagPreviousForDelete = flagPreviousForDeleteResult;
|
|
104
104
|
}
|
|
105
105
|
else {
|
|
106
|
-
const { p, u } = createStorageFileResult.storageFile;
|
|
106
|
+
const { p, pg, u } = createStorageFileResult.storageFile;
|
|
107
107
|
if (!p || !u) {
|
|
108
108
|
throw new Error('initializeFromUpload(): flagPreviousForDelete=true requires that the created StorageFile have a purpose (p) and user (u).');
|
|
109
109
|
}
|
|
110
110
|
flagPreviousForDelete = {
|
|
111
111
|
purpose: p,
|
|
112
|
+
purposeSubgroup: pg,
|
|
112
113
|
user: u
|
|
113
114
|
};
|
|
114
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storagefile.upload.service.initializer.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/model/src/lib/storagefile/storagefile.upload.service.initializer.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"storagefile.upload.service.initializer.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/model/src/lib/storagefile/storagefile.upload.service.initializer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -25,3 +25,11 @@ export declare function assertSnapshotDataWithKey<D extends FirestoreDocument<an
|
|
|
25
25
|
* @returns
|
|
26
26
|
*/
|
|
27
27
|
export declare function assertDocumentExists<D extends FirestoreDocument<any>>(document: D, message?: string): Promise<void>;
|
|
28
|
+
/**
|
|
29
|
+
* Error thrown by assertDocumentExists().
|
|
30
|
+
*
|
|
31
|
+
* @param document
|
|
32
|
+
* @param message
|
|
33
|
+
* @returns
|
|
34
|
+
*/
|
|
35
|
+
export declare function documentModelNotAvailableError(document: Pick<FirestoreDocument<any>, 'modelType'>, message?: string): import("firebase-functions/lib/common/providers/https").HttpsError;
|
|
@@ -4,6 +4,7 @@ exports.assertContextHasAuth = assertContextHasAuth;
|
|
|
4
4
|
exports.assertSnapshotData = assertSnapshotData;
|
|
5
5
|
exports.assertSnapshotDataWithKey = assertSnapshotDataWithKey;
|
|
6
6
|
exports.assertDocumentExists = assertDocumentExists;
|
|
7
|
+
exports.documentModelNotAvailableError = documentModelNotAvailableError;
|
|
7
8
|
const firebase_1 = require("@dereekb/firebase");
|
|
8
9
|
const context_1 = require("./context");
|
|
9
10
|
const error_1 = require("./error");
|
|
@@ -49,9 +50,19 @@ async function assertSnapshotDataWithKey(document, message) {
|
|
|
49
50
|
async function assertDocumentExists(document, message) {
|
|
50
51
|
const exists = await document.exists();
|
|
51
52
|
if (!exists) {
|
|
52
|
-
throw (
|
|
53
|
-
message: message ?? `The ${document.modelType} was unavailable.`
|
|
54
|
-
});
|
|
53
|
+
throw documentModelNotAvailableError(document, message);
|
|
55
54
|
}
|
|
56
55
|
}
|
|
56
|
+
/**
|
|
57
|
+
* Error thrown by assertDocumentExists().
|
|
58
|
+
*
|
|
59
|
+
* @param document
|
|
60
|
+
* @param message
|
|
61
|
+
* @returns
|
|
62
|
+
*/
|
|
63
|
+
function documentModelNotAvailableError(document, message) {
|
|
64
|
+
return (0, error_1.modelNotAvailableError)({
|
|
65
|
+
message: message ?? `The ${document.modelType} was unavailable.`
|
|
66
|
+
});
|
|
67
|
+
}
|
|
57
68
|
//# sourceMappingURL=assert.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assert.js","sourceRoot":"","sources":["../../../../../../packages/firebase-server/src/lib/function/assert.ts"],"names":[],"mappings":";;AAKA,oDAIC;AASD,gDAUC;AASD,8DAGC;AASD,
|
|
1
|
+
{"version":3,"file":"assert.js","sourceRoot":"","sources":["../../../../../../packages/firebase-server/src/lib/function/assert.ts"],"names":[],"mappings":";;AAKA,oDAIC;AASD,gDAUC;AASD,8DAGC;AASD,oDAMC;AASD,wEAIC;AApED,gDAA6J;AAC7J,uCAAkD;AAClD,mCAAsF;AAGtF,SAAgB,oBAAoB,CAAC,OAAwB;IAC3D,IAAI,CAAC,IAAA,+BAAqB,EAAC,OAAO,CAAC,EAAE,CAAC;QACpC,MAAM,IAAA,2CAAmC,GAAE,CAAC;IAC9C,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,kBAAkB,CAAmC,QAAW,EAAE,OAAgB;IACtG,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,YAAY,EAAE,CAAC;IAE3C,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACjB,MAAM,IAAA,8BAAsB,EAAC;YAC3B,OAAO,EAAE,OAAO,IAAI,OAAO,QAAQ,CAAC,SAAS,mBAAmB;SACjE,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,yBAAyB,CAAmC,QAAW,EAAE,OAAgB;IAC7G,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACzD,OAAO,IAAA,gDAAqC,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAC/D,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,oBAAoB,CAAmC,QAAW,EAAE,OAAgB;IACxG,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC;IAEvC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,8BAA8B,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,8BAA8B,CAAC,QAAmD,EAAE,OAAgB;IAClH,OAAO,IAAA,8BAAsB,EAAC;QAC5B,OAAO,EAAE,OAAO,IAAI,OAAO,QAAQ,CAAC,SAAS,mBAAmB;KACjE,CAAC,CAAC;AACL,CAAC"}
|
package/test/package.json
CHANGED