ntfy-reverse-proxy 2.1.8 → 2.2.1
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/build/config.sample.json +6 -6
- package/build/src/cli/commands/config-io.d.ts.map +1 -1
- package/build/src/cli/commands/config-io.js.map +1 -1
- package/build/src/cli/commands/context.d.ts.map +1 -1
- package/build/src/cli/commands/context.js.map +1 -1
- package/build/src/cli/commands/deploy.d.ts.map +1 -1
- package/build/src/cli/commands/deploy.js.map +1 -1
- package/build/src/cli/commands/generate.d.ts.map +1 -1
- package/build/src/cli/commands/generate.js +11 -0
- package/build/src/cli/commands/generate.js.map +1 -1
- package/build/src/cli/commands/server.d.ts.map +1 -1
- package/build/src/cli/commands/server.js.map +1 -1
- package/build/src/cli/commands/settings.d.ts.map +1 -1
- package/build/src/cli/commands/settings.js.map +1 -1
- package/build/src/cli/commands/validate.d.ts.map +1 -1
- package/build/src/cli/commands/validate.js.map +1 -1
- package/build/src/cli/index.d.ts.map +1 -1
- package/build/src/cli/index.js.map +1 -1
- package/build/src/cli/menu/interactive.d.ts.map +1 -1
- package/build/src/cli/menu/interactive.js.map +1 -1
- package/build/src/types/cli/commands/deploy.d.ts +12 -12
- package/build/src/types/lib/schema.d.ts +6 -6
- package/build/src/types/shared.d.ts +2 -2
- package/build/src/types/tests/cli/commands/generate.test.d.ts +7 -0
- package/build/src/types/tests/worker/index.test.d.ts +6 -0
- package/build/src/types/tests/worker/pipeline/deliver.test.d.ts +21 -0
- package/build/src/types/tests/worker/pipeline/drain-fifo.test.d.ts +58 -0
- package/build/src/types/tests/worker/pipeline/interpret.test.d.ts +7 -90
- package/build/src/types/tests/worker/pipeline/parse.test.d.ts +62 -24
- package/build/src/types/tests/worker/pipeline/respond.test.d.ts +9 -0
- package/build/src/types/tests/worker/pipeline/send.test.d.ts +22 -1
- package/build/src/types/worker/durable-objects/delivery-outbox.d.ts +394 -0
- package/build/src/types/worker/handlers.d.ts +10 -3
- package/build/src/types/worker/index.d.ts +9 -4
- package/build/src/types/worker/interpreters/ntfy-json.d.ts +2 -2
- package/build/src/types/worker/interpreters/pfsense.d.ts +5 -5
- package/build/src/types/worker/interpreters/plain-text.d.ts +2 -2
- package/build/src/types/worker/interpreters/seerr.d.ts +5 -5
- package/build/src/types/worker/interpreters/statuspage.d.ts +2 -2
- package/build/src/types/worker/interpreters/synology.d.ts +4 -4
- package/build/src/types/worker/interpreters/unifi.d.ts +5 -5
- package/build/src/types/worker/pipeline/authenticate.d.ts +4 -4
- package/build/src/types/worker/pipeline/deliver.d.ts +80 -0
- package/build/src/types/worker/pipeline/drain-fifo.d.ts +45 -0
- package/build/src/types/worker/pipeline/interpret.d.ts +18 -16
- package/build/src/types/worker/pipeline/respond.d.ts +43 -10
- package/build/src/types/worker/pipeline/route.d.ts +2 -0
- package/build/src/types/worker/pipeline/send.d.ts +47 -0
- package/build/src/worker/durable-objects/delivery-outbox.d.ts +9 -0
- package/build/src/worker/durable-objects/delivery-outbox.d.ts.map +1 -0
- package/build/src/worker/durable-objects/delivery-outbox.js +202 -0
- package/build/src/worker/durable-objects/delivery-outbox.js.map +1 -0
- package/build/src/worker/handlers.d.ts +3 -3
- package/build/src/worker/handlers.d.ts.map +1 -1
- package/build/src/worker/handlers.js +13 -11
- package/build/src/worker/handlers.js.map +1 -1
- package/build/src/worker/index.d.ts +2 -0
- package/build/src/worker/index.d.ts.map +1 -1
- package/build/src/worker/index.js +6 -2
- package/build/src/worker/index.js.map +1 -1
- package/build/src/worker/interpreters/ntfy-json.d.ts.map +1 -1
- package/build/src/worker/interpreters/ntfy-json.js.map +1 -1
- package/build/src/worker/interpreters/pfsense.js.map +1 -1
- package/build/src/worker/interpreters/plain-text.d.ts.map +1 -1
- package/build/src/worker/interpreters/plain-text.js.map +1 -1
- package/build/src/worker/interpreters/seerr.js.map +1 -1
- package/build/src/worker/interpreters/synology.js.map +1 -1
- package/build/src/worker/interpreters/unifi.js.map +1 -1
- package/build/src/worker/pipeline/authenticate.d.ts.map +1 -1
- package/build/src/worker/pipeline/authenticate.js.map +1 -1
- package/build/src/worker/pipeline/deliver.d.ts +4 -0
- package/build/src/worker/pipeline/deliver.d.ts.map +1 -0
- package/build/src/worker/pipeline/deliver.js +18 -0
- package/build/src/worker/pipeline/deliver.js.map +1 -0
- package/build/src/worker/pipeline/drain-fifo.d.ts +4 -0
- package/build/src/worker/pipeline/drain-fifo.d.ts.map +1 -0
- package/build/src/worker/pipeline/drain-fifo.js +25 -0
- package/build/src/worker/pipeline/drain-fifo.js.map +1 -0
- package/build/src/worker/pipeline/email.d.ts.map +1 -1
- package/build/src/worker/pipeline/email.js.map +1 -1
- package/build/src/worker/pipeline/format.d.ts.map +1 -1
- package/build/src/worker/pipeline/format.js.map +1 -1
- package/build/src/worker/pipeline/interpret.d.ts.map +1 -1
- package/build/src/worker/pipeline/interpret.js.map +1 -1
- package/build/src/worker/pipeline/parse.d.ts.map +1 -1
- package/build/src/worker/pipeline/parse.js.map +1 -1
- package/build/src/worker/pipeline/receive.d.ts.map +1 -1
- package/build/src/worker/pipeline/receive.js.map +1 -1
- package/build/src/worker/pipeline/respond.d.ts +2 -2
- package/build/src/worker/pipeline/respond.d.ts.map +1 -1
- package/build/src/worker/pipeline/respond.js +22 -1
- package/build/src/worker/pipeline/respond.js.map +1 -1
- package/build/src/worker/pipeline/route.d.ts.map +1 -1
- package/build/src/worker/pipeline/route.js.map +1 -1
- package/build/src/worker/pipeline/send.d.ts.map +1 -1
- package/build/src/worker/pipeline/send.js +37 -3
- package/build/src/worker/pipeline/send.js.map +1 -1
- package/build/src/worker/pipeline/split.d.ts.map +1 -1
- package/build/src/worker/pipeline/split.js.map +1 -1
- package/package.json +9 -9
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type {
|
|
2
2
|
Worker_Pipeline_Interpret_Input,
|
|
3
|
-
|
|
3
|
+
Worker_Pipeline_Interpret_Priority,
|
|
4
4
|
Worker_Pipeline_Interpret_Result,
|
|
5
5
|
} from '../pipeline/interpret.d.ts';
|
|
6
6
|
|
|
@@ -11,9 +11,9 @@ import type {
|
|
|
11
11
|
*/
|
|
12
12
|
export type Worker_Interpreters_Unifi_Input = Worker_Pipeline_Interpret_Input;
|
|
13
13
|
|
|
14
|
-
export type
|
|
14
|
+
export type Worker_Interpreters_Unifi_Returns = Worker_Pipeline_Interpret_Result;
|
|
15
15
|
|
|
16
|
-
export type Worker_Interpreters_Unifi_UnifiInterpreter = (input: Worker_Interpreters_Unifi_Input) =>
|
|
16
|
+
export type Worker_Interpreters_Unifi_UnifiInterpreter = (input: Worker_Interpreters_Unifi_Input) => Worker_Interpreters_Unifi_Returns;
|
|
17
17
|
|
|
18
18
|
/**
|
|
19
19
|
* Worker - Interpreters - Unifi - Extract Device Tags.
|
|
@@ -35,7 +35,7 @@ export type Worker_Interpreters_Unifi_ExtractDeviceTags_Tags = string[];
|
|
|
35
35
|
*/
|
|
36
36
|
export type Worker_Interpreters_Unifi_MapEventToPriority_Text = string;
|
|
37
37
|
|
|
38
|
-
export type Worker_Interpreters_Unifi_MapEventToPriority_Returns =
|
|
38
|
+
export type Worker_Interpreters_Unifi_MapEventToPriority_Returns = Worker_Pipeline_Interpret_Priority;
|
|
39
39
|
|
|
40
40
|
export type Worker_Interpreters_Unifi_MapEventToPriority_Lower = string;
|
|
41
41
|
|
|
@@ -44,7 +44,7 @@ export type Worker_Interpreters_Unifi_MapEventToPriority_Lower = string;
|
|
|
44
44
|
*
|
|
45
45
|
* @since 2.0.0
|
|
46
46
|
*/
|
|
47
|
-
export type Worker_Interpreters_Unifi_MapPriorityToEmojiTag_Priority =
|
|
47
|
+
export type Worker_Interpreters_Unifi_MapPriorityToEmojiTag_Priority = Worker_Pipeline_Interpret_Priority;
|
|
48
48
|
|
|
49
49
|
export type Worker_Interpreters_Unifi_MapPriorityToEmojiTag_Returns = string;
|
|
50
50
|
|
|
@@ -3,14 +3,14 @@
|
|
|
3
3
|
*
|
|
4
4
|
* @since 2.0.0
|
|
5
5
|
*/
|
|
6
|
-
export type Worker_Pipeline_Authenticate_AuthConfigToken = string;
|
|
7
|
-
|
|
8
|
-
export type Worker_Pipeline_Authenticate_AuthConfigAllowedFrom = string;
|
|
9
|
-
|
|
10
6
|
export type Worker_Pipeline_Authenticate_AuthConfigTypeHttp = 'http';
|
|
11
7
|
|
|
8
|
+
export type Worker_Pipeline_Authenticate_AuthConfigToken = string;
|
|
9
|
+
|
|
12
10
|
export type Worker_Pipeline_Authenticate_AuthConfigTypeEmail = 'email';
|
|
13
11
|
|
|
12
|
+
export type Worker_Pipeline_Authenticate_AuthConfigAllowedFrom = string;
|
|
13
|
+
|
|
14
14
|
export type Worker_Pipeline_Authenticate_AuthConfig = {
|
|
15
15
|
type: Worker_Pipeline_Authenticate_AuthConfigTypeHttp;
|
|
16
16
|
token?: Worker_Pipeline_Authenticate_AuthConfigToken;
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import type { Worker_Pipeline_Send_Options, Worker_Pipeline_Send_Result } from './send.d.ts';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Worker - Pipeline - Deliver.
|
|
5
|
+
*
|
|
6
|
+
* @since 2.2.1
|
|
7
|
+
*/
|
|
8
|
+
export type Worker_Pipeline_Deliver_ContextId = string;
|
|
9
|
+
|
|
10
|
+
export type Worker_Pipeline_Deliver_Outbox = Worker_Pipeline_Deliver_Namespace;
|
|
11
|
+
|
|
12
|
+
export type Worker_Pipeline_Deliver_Options = Worker_Pipeline_Send_Options;
|
|
13
|
+
|
|
14
|
+
export type Worker_Pipeline_Deliver_Returns = Promise<Worker_Pipeline_Deliver_Result>;
|
|
15
|
+
|
|
16
|
+
export type Worker_Pipeline_Deliver_EnqueueOptionsMessages = Worker_Pipeline_Send_Options['messages'];
|
|
17
|
+
|
|
18
|
+
export type Worker_Pipeline_Deliver_EnqueueOptionsServerNames = string[];
|
|
19
|
+
|
|
20
|
+
export type Worker_Pipeline_Deliver_EnqueueOptionsPrimaryServerName = string;
|
|
21
|
+
|
|
22
|
+
export type Worker_Pipeline_Deliver_EnqueueOptionsTopic = Worker_Pipeline_Send_Options['topic'];
|
|
23
|
+
|
|
24
|
+
export type Worker_Pipeline_Deliver_EnqueueOptionsMode = Worker_Pipeline_Send_Options['mode'];
|
|
25
|
+
|
|
26
|
+
export type Worker_Pipeline_Deliver_EnqueueOptionsVisitorIp = Worker_Pipeline_Send_Options['visitorIp'];
|
|
27
|
+
|
|
28
|
+
export type Worker_Pipeline_Deliver_EnqueueOptionsAttachment = Worker_Pipeline_Send_Options['attachment'];
|
|
29
|
+
|
|
30
|
+
export type Worker_Pipeline_Deliver_EnqueueOptionsFilename = Worker_Pipeline_Send_Options['filename'];
|
|
31
|
+
|
|
32
|
+
export type Worker_Pipeline_Deliver_EnqueueOptionsAttachmentHeaders = Worker_Pipeline_Send_Options['attachmentHeaders'];
|
|
33
|
+
|
|
34
|
+
export type Worker_Pipeline_Deliver_EnqueueOptions = {
|
|
35
|
+
messages: Worker_Pipeline_Deliver_EnqueueOptionsMessages;
|
|
36
|
+
serverNames: Worker_Pipeline_Deliver_EnqueueOptionsServerNames;
|
|
37
|
+
primaryServerName: Worker_Pipeline_Deliver_EnqueueOptionsPrimaryServerName;
|
|
38
|
+
topic: Worker_Pipeline_Deliver_EnqueueOptionsTopic;
|
|
39
|
+
mode: Worker_Pipeline_Deliver_EnqueueOptionsMode;
|
|
40
|
+
visitorIp?: Worker_Pipeline_Deliver_EnqueueOptionsVisitorIp;
|
|
41
|
+
attachment?: Worker_Pipeline_Deliver_EnqueueOptionsAttachment;
|
|
42
|
+
filename?: Worker_Pipeline_Deliver_EnqueueOptionsFilename;
|
|
43
|
+
attachmentHeaders?: Worker_Pipeline_Deliver_EnqueueOptionsAttachmentHeaders;
|
|
44
|
+
};
|
|
45
|
+
|
|
46
|
+
export type Worker_Pipeline_Deliver_ResultDeliveryId = string;
|
|
47
|
+
|
|
48
|
+
export type Worker_Pipeline_Deliver_ResultState = 'delivered' | 'queued';
|
|
49
|
+
|
|
50
|
+
export type Worker_Pipeline_Deliver_ResultPending = number;
|
|
51
|
+
|
|
52
|
+
export type Worker_Pipeline_Deliver_ResultSendResult = Worker_Pipeline_Send_Result | undefined;
|
|
53
|
+
|
|
54
|
+
export type Worker_Pipeline_Deliver_Result = {
|
|
55
|
+
deliveryId: Worker_Pipeline_Deliver_ResultDeliveryId;
|
|
56
|
+
state: Worker_Pipeline_Deliver_ResultState;
|
|
57
|
+
pending: Worker_Pipeline_Deliver_ResultPending;
|
|
58
|
+
sendResult?: Worker_Pipeline_Deliver_ResultSendResult;
|
|
59
|
+
};
|
|
60
|
+
|
|
61
|
+
export type Worker_Pipeline_Deliver_StubEnqueue = (options: Worker_Pipeline_Deliver_EnqueueOptions) => Promise<Worker_Pipeline_Deliver_Result>;
|
|
62
|
+
|
|
63
|
+
export type Worker_Pipeline_Deliver_Stub = {
|
|
64
|
+
enqueue: Worker_Pipeline_Deliver_StubEnqueue;
|
|
65
|
+
};
|
|
66
|
+
|
|
67
|
+
export type Worker_Pipeline_Deliver_NamespaceGetByName = (name: string) => Worker_Pipeline_Deliver_Stub;
|
|
68
|
+
|
|
69
|
+
export type Worker_Pipeline_Deliver_Namespace = {
|
|
70
|
+
getByName: Worker_Pipeline_Deliver_NamespaceGetByName;
|
|
71
|
+
};
|
|
72
|
+
|
|
73
|
+
export type Worker_Pipeline_Deliver_EnqueueInput = Worker_Pipeline_Deliver_EnqueueOptions;
|
|
74
|
+
|
|
75
|
+
/**
|
|
76
|
+
* Worker - Pipeline - Deliver - Deliver.
|
|
77
|
+
*
|
|
78
|
+
* @since 2.2.1
|
|
79
|
+
*/
|
|
80
|
+
export type Worker_Pipeline_Deliver_Deliver_ServerNames = string[];
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Worker - Pipeline - Drain Fifo.
|
|
3
|
+
*
|
|
4
|
+
* @since 2.2.1
|
|
5
|
+
*/
|
|
6
|
+
export type Worker_Pipeline_DrainFifo_ItemDeliveryId = string;
|
|
7
|
+
|
|
8
|
+
export type Worker_Pipeline_DrainFifo_Item = {
|
|
9
|
+
deliveryId: Worker_Pipeline_DrainFifo_ItemDeliveryId;
|
|
10
|
+
};
|
|
11
|
+
|
|
12
|
+
export type Worker_Pipeline_DrainFifo_MaybePromise<Value> = Promise<Value> | Value;
|
|
13
|
+
|
|
14
|
+
export type Worker_Pipeline_DrainFifo_OptionsPeek<Item extends Worker_Pipeline_DrainFifo_Item> = () => Worker_Pipeline_DrainFifo_MaybePromise<Item | undefined>;
|
|
15
|
+
|
|
16
|
+
export type Worker_Pipeline_DrainFifo_OptionsAttempt<Item extends Worker_Pipeline_DrainFifo_Item, Result> = (item: Item) => Promise<Result>;
|
|
17
|
+
|
|
18
|
+
export type Worker_Pipeline_DrainFifo_OptionsSucceeded<Item extends Worker_Pipeline_DrainFifo_Item, Result> = (item: Item, result: Result) => boolean;
|
|
19
|
+
|
|
20
|
+
export type Worker_Pipeline_DrainFifo_OptionsRemove<Item extends Worker_Pipeline_DrainFifo_Item> = (item: Item) => Worker_Pipeline_DrainFifo_MaybePromise<void>;
|
|
21
|
+
|
|
22
|
+
export type Worker_Pipeline_DrainFifo_OptionsOnError<Item extends Worker_Pipeline_DrainFifo_Item> = (item: Item, error: unknown) => Worker_Pipeline_DrainFifo_MaybePromise<void>;
|
|
23
|
+
|
|
24
|
+
export type Worker_Pipeline_DrainFifo_Options<Item extends Worker_Pipeline_DrainFifo_Item, Result> = {
|
|
25
|
+
peek: Worker_Pipeline_DrainFifo_OptionsPeek<Item>;
|
|
26
|
+
attempt: Worker_Pipeline_DrainFifo_OptionsAttempt<Item, Result>;
|
|
27
|
+
succeeded: Worker_Pipeline_DrainFifo_OptionsSucceeded<Item, Result>;
|
|
28
|
+
remove: Worker_Pipeline_DrainFifo_OptionsRemove<Item>;
|
|
29
|
+
onError: Worker_Pipeline_DrainFifo_OptionsOnError<Item>;
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
export type Worker_Pipeline_DrainFifo_Returns<Result> = Promise<Map<string, Result>>;
|
|
33
|
+
|
|
34
|
+
export type Worker_Pipeline_DrainFifo_Results<Result> = Map<string, Result>;
|
|
35
|
+
|
|
36
|
+
export type Worker_Pipeline_DrainFifo_DrainFifo_Item<Item extends Worker_Pipeline_DrainFifo_Item> = Item | undefined;
|
|
37
|
+
|
|
38
|
+
export type Worker_Pipeline_DrainFifo_DrainFifo_Result<Result> = Result;
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* Worker - Pipeline - Drain Fifo.
|
|
42
|
+
*
|
|
43
|
+
* @since 2.2.1
|
|
44
|
+
*/
|
|
45
|
+
export type Worker_Pipeline_DrainFifo_DrainFifo_Succeeded = boolean;
|
|
@@ -3,34 +3,36 @@
|
|
|
3
3
|
*
|
|
4
4
|
* @since 2.0.0
|
|
5
5
|
*/
|
|
6
|
-
export type Worker_Pipeline_Interpret_NotificationObjectTitle = string;
|
|
6
|
+
export type Worker_Pipeline_Interpret_NotificationObjectTitle = string | undefined;
|
|
7
7
|
|
|
8
8
|
export type Worker_Pipeline_Interpret_NotificationObjectBody = string;
|
|
9
9
|
|
|
10
|
-
export type
|
|
10
|
+
export type Worker_Pipeline_Interpret_Priority = 1 | 2 | 3 | 4 | 5;
|
|
11
11
|
|
|
12
|
-
export type
|
|
12
|
+
export type Worker_Pipeline_Interpret_NotificationObjectPriority = Worker_Pipeline_Interpret_Priority | undefined;
|
|
13
13
|
|
|
14
|
-
export type
|
|
14
|
+
export type Worker_Pipeline_Interpret_NotificationObjectTags = string[] | undefined;
|
|
15
15
|
|
|
16
|
-
export type
|
|
16
|
+
export type Worker_Pipeline_Interpret_NotificationObjectIcon = string | undefined;
|
|
17
17
|
|
|
18
|
-
export type
|
|
18
|
+
export type Worker_Pipeline_Interpret_NotificationObjectActions = string | undefined;
|
|
19
19
|
|
|
20
|
-
export type
|
|
20
|
+
export type Worker_Pipeline_Interpret_NotificationObjectAttach = string | undefined;
|
|
21
21
|
|
|
22
|
-
export type
|
|
22
|
+
export type Worker_Pipeline_Interpret_NotificationObjectFilename = string | undefined;
|
|
23
|
+
|
|
24
|
+
export type Worker_Pipeline_Interpret_NotificationObjectMarkdown = boolean | undefined;
|
|
23
25
|
|
|
24
26
|
export type Worker_Pipeline_Interpret_NotificationObject = {
|
|
25
|
-
title?: Worker_Pipeline_Interpret_NotificationObjectTitle
|
|
27
|
+
title?: Worker_Pipeline_Interpret_NotificationObjectTitle;
|
|
26
28
|
body: Worker_Pipeline_Interpret_NotificationObjectBody;
|
|
27
|
-
priority?: Worker_Pipeline_Interpret_NotificationObjectPriority
|
|
28
|
-
tags?: Worker_Pipeline_Interpret_NotificationObjectTags
|
|
29
|
-
icon?: Worker_Pipeline_Interpret_NotificationObjectIcon
|
|
30
|
-
actions?: Worker_Pipeline_Interpret_NotificationObjectActions
|
|
31
|
-
attach?: Worker_Pipeline_Interpret_NotificationObjectAttach
|
|
32
|
-
filename?: Worker_Pipeline_Interpret_NotificationObjectFilename
|
|
33
|
-
markdown?: Worker_Pipeline_Interpret_NotificationObjectMarkdown
|
|
29
|
+
priority?: Worker_Pipeline_Interpret_NotificationObjectPriority;
|
|
30
|
+
tags?: Worker_Pipeline_Interpret_NotificationObjectTags;
|
|
31
|
+
icon?: Worker_Pipeline_Interpret_NotificationObjectIcon;
|
|
32
|
+
actions?: Worker_Pipeline_Interpret_NotificationObjectActions;
|
|
33
|
+
attach?: Worker_Pipeline_Interpret_NotificationObjectAttach;
|
|
34
|
+
filename?: Worker_Pipeline_Interpret_NotificationObjectFilename;
|
|
35
|
+
markdown?: Worker_Pipeline_Interpret_NotificationObjectMarkdown;
|
|
34
36
|
};
|
|
35
37
|
|
|
36
38
|
export type Worker_Pipeline_Interpret_ResultNotification = Worker_Pipeline_Interpret_NotificationObject;
|
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
import type {
|
|
2
|
+
Worker_Pipeline_Deliver_Result,
|
|
3
|
+
Worker_Pipeline_Deliver_ResultDeliveryId,
|
|
4
|
+
Worker_Pipeline_Deliver_ResultPending,
|
|
5
|
+
} from './deliver.d.ts';
|
|
1
6
|
import type {
|
|
2
7
|
Worker_Pipeline_Send_Result,
|
|
3
8
|
Worker_Pipeline_Send_ResultFallbackNote,
|
|
@@ -33,6 +38,8 @@ export type Worker_Pipeline_Respond_Options = {
|
|
|
33
38
|
hasAttachment?: Worker_Pipeline_Respond_OptionsHasAttachment;
|
|
34
39
|
};
|
|
35
40
|
|
|
41
|
+
export type Worker_Pipeline_Respond_DeliveryResult = Worker_Pipeline_Deliver_Result;
|
|
42
|
+
|
|
36
43
|
export type Worker_Pipeline_Respond_SendResult = Worker_Pipeline_Send_Result;
|
|
37
44
|
|
|
38
45
|
export type Worker_Pipeline_Respond_Returns = Response;
|
|
@@ -59,7 +66,7 @@ export type Worker_Pipeline_Respond_AnySuccess = boolean;
|
|
|
59
66
|
|
|
60
67
|
export type Worker_Pipeline_Respond_AllSuccess = boolean;
|
|
61
68
|
|
|
62
|
-
export type Worker_Pipeline_Respond_Status = 'success' | 'partial' | 'failed';
|
|
69
|
+
export type Worker_Pipeline_Respond_Status = 'success' | 'partial' | 'failed' | 'queued';
|
|
63
70
|
|
|
64
71
|
export type Worker_Pipeline_Respond_HttpStatus = number;
|
|
65
72
|
|
|
@@ -71,14 +78,9 @@ export type Worker_Pipeline_Respond_BodyContext = string | undefined;
|
|
|
71
78
|
|
|
72
79
|
export type Worker_Pipeline_Respond_BodyInterpreter = string | undefined;
|
|
73
80
|
|
|
74
|
-
export type
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
context?: Worker_Pipeline_Respond_BodyContext;
|
|
78
|
-
interpreter?: Worker_Pipeline_Respond_BodyInterpreter;
|
|
79
|
-
servers?: Worker_Pipeline_Respond_BodyServers;
|
|
80
|
-
message?: Worker_Pipeline_Respond_BodyMessage;
|
|
81
|
-
};
|
|
81
|
+
export type Worker_Pipeline_Respond_BodyDeliveryId = Worker_Pipeline_Deliver_ResultDeliveryId | undefined;
|
|
82
|
+
|
|
83
|
+
export type Worker_Pipeline_Respond_BodyPending = Worker_Pipeline_Deliver_ResultPending | undefined;
|
|
82
84
|
|
|
83
85
|
export type Worker_Pipeline_Respond_BodyServersItemName = string;
|
|
84
86
|
|
|
@@ -112,6 +114,37 @@ export type Worker_Pipeline_Respond_BodyMessage = {
|
|
|
112
114
|
has_attachment: Worker_Pipeline_Respond_BodyMessageHasAttachment;
|
|
113
115
|
};
|
|
114
116
|
|
|
117
|
+
export type Worker_Pipeline_Respond_Body = {
|
|
118
|
+
status: Worker_Pipeline_Respond_BodyStatus;
|
|
119
|
+
fallback_note?: Worker_Pipeline_Respond_BodyFallbackNote;
|
|
120
|
+
context?: Worker_Pipeline_Respond_BodyContext;
|
|
121
|
+
interpreter?: Worker_Pipeline_Respond_BodyInterpreter;
|
|
122
|
+
delivery_id?: Worker_Pipeline_Respond_BodyDeliveryId;
|
|
123
|
+
pending?: Worker_Pipeline_Respond_BodyPending;
|
|
124
|
+
servers?: Worker_Pipeline_Respond_BodyServers;
|
|
125
|
+
message?: Worker_Pipeline_Respond_BodyMessage;
|
|
126
|
+
};
|
|
127
|
+
|
|
128
|
+
export type Worker_Pipeline_Respond_Respond_QueuedBodyStatus = 'queued';
|
|
129
|
+
|
|
130
|
+
export type Worker_Pipeline_Respond_Respond_QueuedBodyDeliveryId = Worker_Pipeline_Deliver_ResultDeliveryId | undefined;
|
|
131
|
+
|
|
132
|
+
export type Worker_Pipeline_Respond_Respond_QueuedBodyPending = Worker_Pipeline_Deliver_ResultPending | undefined;
|
|
133
|
+
|
|
134
|
+
export type Worker_Pipeline_Respond_Respond_QueuedBodyContext = string | undefined;
|
|
135
|
+
|
|
136
|
+
export type Worker_Pipeline_Respond_Respond_QueuedBodyInterpreter = string | undefined;
|
|
137
|
+
|
|
138
|
+
export type Worker_Pipeline_Respond_Respond_QueuedBody = {
|
|
139
|
+
status: Worker_Pipeline_Respond_Respond_QueuedBodyStatus;
|
|
140
|
+
delivery_id?: Worker_Pipeline_Respond_Respond_QueuedBodyDeliveryId;
|
|
141
|
+
pending?: Worker_Pipeline_Respond_Respond_QueuedBodyPending;
|
|
142
|
+
context?: Worker_Pipeline_Respond_Respond_QueuedBodyContext;
|
|
143
|
+
interpreter?: Worker_Pipeline_Respond_Respond_QueuedBodyInterpreter;
|
|
144
|
+
};
|
|
145
|
+
|
|
146
|
+
export type Worker_Pipeline_Respond_Respond_SendResult = Worker_Pipeline_Send_Result & {};
|
|
147
|
+
|
|
115
148
|
export type Worker_Pipeline_Respond_Respond_ResultsItemName = string;
|
|
116
149
|
|
|
117
150
|
export type Worker_Pipeline_Respond_Respond_ResultsItemSuccess = boolean;
|
|
@@ -134,7 +167,7 @@ export type Worker_Pipeline_Respond_Respond_Results = Worker_Pipeline_Respond_Re
|
|
|
134
167
|
|
|
135
168
|
export type Worker_Pipeline_Respond_Respond_FallbackNote = string | undefined;
|
|
136
169
|
|
|
137
|
-
export type Worker_Pipeline_Respond_Respond_PartialStatus = '
|
|
170
|
+
export type Worker_Pipeline_Respond_Respond_PartialStatus = 'partial' | 'failed';
|
|
138
171
|
|
|
139
172
|
export type Worker_Pipeline_Respond_Respond_ServersItemName = string;
|
|
140
173
|
|
|
@@ -49,3 +49,5 @@ export type Worker_Pipeline_Route_Route_ResolvedServersItem = {
|
|
|
49
49
|
};
|
|
50
50
|
|
|
51
51
|
export type Worker_Pipeline_Route_Route_ResolvedServers = Worker_Pipeline_Route_Route_ResolvedServersItem[];
|
|
52
|
+
|
|
53
|
+
export type Worker_Pipeline_Route_Route_Filter_TypeGuard = Lib_Schema_ServerConfig;
|
|
@@ -56,6 +56,21 @@ export type Worker_Pipeline_Send_OptionsFilename = string | undefined;
|
|
|
56
56
|
|
|
57
57
|
export type Worker_Pipeline_Send_OptionsAttachmentHeaders = Record<string, string> | undefined;
|
|
58
58
|
|
|
59
|
+
export type Worker_Pipeline_Send_OptionsDeliveryId = string | undefined;
|
|
60
|
+
|
|
61
|
+
export type Worker_Pipeline_Send_OptionsCompletedStages = Record<string, string[]> | undefined;
|
|
62
|
+
|
|
63
|
+
export type Worker_Pipeline_Send_OptionsOnStageSuccess_ServerName = string;
|
|
64
|
+
|
|
65
|
+
export type Worker_Pipeline_Send_OptionsOnStageSuccess_Stage = string;
|
|
66
|
+
|
|
67
|
+
export type Worker_Pipeline_Send_OptionsOnStageSuccess_Returns = Promise<void> | void;
|
|
68
|
+
|
|
69
|
+
export type Worker_Pipeline_Send_OptionsOnStageSuccess = (
|
|
70
|
+
serverName: Worker_Pipeline_Send_OptionsOnStageSuccess_ServerName,
|
|
71
|
+
stage: Worker_Pipeline_Send_OptionsOnStageSuccess_Stage,
|
|
72
|
+
) => Worker_Pipeline_Send_OptionsOnStageSuccess_Returns;
|
|
73
|
+
|
|
59
74
|
export type Worker_Pipeline_Send_Options = {
|
|
60
75
|
messages: Worker_Pipeline_Send_OptionsMessages;
|
|
61
76
|
servers: Worker_Pipeline_Send_OptionsServers;
|
|
@@ -66,6 +81,9 @@ export type Worker_Pipeline_Send_Options = {
|
|
|
66
81
|
attachment?: Worker_Pipeline_Send_OptionsAttachment;
|
|
67
82
|
filename?: Worker_Pipeline_Send_OptionsFilename;
|
|
68
83
|
attachmentHeaders?: Worker_Pipeline_Send_OptionsAttachmentHeaders;
|
|
84
|
+
deliveryId?: Worker_Pipeline_Send_OptionsDeliveryId;
|
|
85
|
+
completedStages?: Worker_Pipeline_Send_OptionsCompletedStages;
|
|
86
|
+
onStageSuccess?: Worker_Pipeline_Send_OptionsOnStageSuccess;
|
|
69
87
|
};
|
|
70
88
|
|
|
71
89
|
export type Worker_Pipeline_Send_Returns = Promise<Worker_Pipeline_Send_Result>;
|
|
@@ -88,6 +106,12 @@ export type Worker_Pipeline_Send_Filename = Worker_Pipeline_Send_OptionsFilename
|
|
|
88
106
|
|
|
89
107
|
export type Worker_Pipeline_Send_AttachmentHeaders = Worker_Pipeline_Send_OptionsAttachmentHeaders;
|
|
90
108
|
|
|
109
|
+
export type Worker_Pipeline_Send_DeliveryId = Worker_Pipeline_Send_OptionsDeliveryId;
|
|
110
|
+
|
|
111
|
+
export type Worker_Pipeline_Send_CompletedStages = Worker_Pipeline_Send_OptionsCompletedStages;
|
|
112
|
+
|
|
113
|
+
export type Worker_Pipeline_Send_OnStageSuccess = Worker_Pipeline_Send_OptionsOnStageSuccess | undefined;
|
|
114
|
+
|
|
91
115
|
export type Worker_Pipeline_Send_Results = Worker_Pipeline_Send_ServerResult[];
|
|
92
116
|
|
|
93
117
|
export type Worker_Pipeline_Send_OrderedServers = Worker_Pipeline_Send_OptionsServers;
|
|
@@ -153,6 +177,21 @@ export type Worker_Pipeline_Send_SendToServer_Filename = string | undefined;
|
|
|
153
177
|
|
|
154
178
|
export type Worker_Pipeline_Send_SendToServer_AttachmentHeaders = Record<string, string> | undefined;
|
|
155
179
|
|
|
180
|
+
export type Worker_Pipeline_Send_SendToServer_DeliveryId = string | undefined;
|
|
181
|
+
|
|
182
|
+
export type Worker_Pipeline_Send_SendToServer_CompletedStages = Record<string, string[]> | undefined;
|
|
183
|
+
|
|
184
|
+
export type Worker_Pipeline_Send_SendToServer_OnStageSuccess_ServerName = string;
|
|
185
|
+
|
|
186
|
+
export type Worker_Pipeline_Send_SendToServer_OnStageSuccess_Stage = string;
|
|
187
|
+
|
|
188
|
+
export type Worker_Pipeline_Send_SendToServer_OnStageSuccess_Returns = Promise<void> | void;
|
|
189
|
+
|
|
190
|
+
export type Worker_Pipeline_Send_SendToServer_OnStageSuccess = ((
|
|
191
|
+
serverName: Worker_Pipeline_Send_SendToServer_OnStageSuccess_ServerName,
|
|
192
|
+
stage: Worker_Pipeline_Send_SendToServer_OnStageSuccess_Stage,
|
|
193
|
+
) => Worker_Pipeline_Send_SendToServer_OnStageSuccess_Returns) | undefined;
|
|
194
|
+
|
|
156
195
|
export type Worker_Pipeline_Send_SendToServer_Stage = string;
|
|
157
196
|
|
|
158
197
|
export type Worker_Pipeline_Send_SendToServer_Stages = Worker_Pipeline_Send_SendToServer_Stage[];
|
|
@@ -167,12 +206,20 @@ export type Worker_Pipeline_Send_SendToServer_PartIndex = number;
|
|
|
167
206
|
|
|
168
207
|
export type Worker_Pipeline_Send_SendToServer_PartLabel = string;
|
|
169
208
|
|
|
209
|
+
export type Worker_Pipeline_Send_SendToServer_StageKey = string;
|
|
210
|
+
|
|
211
|
+
export type Worker_Pipeline_Send_SendToServer_StageCompleted = boolean;
|
|
212
|
+
|
|
170
213
|
export type Worker_Pipeline_Send_SendToServer_Headers = Record<string, string>;
|
|
171
214
|
|
|
172
215
|
export type Worker_Pipeline_Send_SendToServer_Response = Response;
|
|
173
216
|
|
|
174
217
|
export type Worker_Pipeline_Send_SendToServer_ErrorMessage = string;
|
|
175
218
|
|
|
219
|
+
export type Worker_Pipeline_Send_SendToServer_AttachmentStageKey = string;
|
|
220
|
+
|
|
221
|
+
export type Worker_Pipeline_Send_SendToServer_AttachmentStageCompleted = boolean;
|
|
222
|
+
|
|
176
223
|
export type Worker_Pipeline_Send_SendToServer_AttachmentRequestHeaders = Record<string, string>;
|
|
177
224
|
|
|
178
225
|
export type Worker_Pipeline_Send_SendToServer_AttachmentResponse = Response;
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { DurableObject } from 'cloudflare:workers';
|
|
2
|
+
import type { Worker_DurableObjects_DeliveryOutbox_Runner_Constructor_Ctx, Worker_DurableObjects_DeliveryOutbox_Runner_Constructor_Env, Worker_DurableObjects_DeliveryOutbox_Runner_Enqueue_Options, Worker_DurableObjects_DeliveryOutbox_Runner_Enqueue_Returns, Worker_DurableObjects_DeliveryOutbox_Runner_Env } from '../../types/worker/durable-objects/delivery-outbox.d.ts';
|
|
3
|
+
declare class Runner extends DurableObject<Worker_DurableObjects_DeliveryOutbox_Runner_Env> {
|
|
4
|
+
#private;
|
|
5
|
+
constructor(ctx: Worker_DurableObjects_DeliveryOutbox_Runner_Constructor_Ctx, env: Worker_DurableObjects_DeliveryOutbox_Runner_Constructor_Env);
|
|
6
|
+
enqueue(options: Worker_DurableObjects_DeliveryOutbox_Runner_Enqueue_Options): Worker_DurableObjects_DeliveryOutbox_Runner_Enqueue_Returns;
|
|
7
|
+
}
|
|
8
|
+
export { Runner, };
|
|
9
|
+
//# sourceMappingURL=delivery-outbox.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"delivery-outbox.d.ts","sourceRoot":"","sources":["../../../../src/worker/durable-objects/delivery-outbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAMnD,OAAO,KAAK,EAeV,2DAA2D,EAC3D,2DAA2D,EAW3D,2DAA2D,EAK3D,2DAA2D,EAG3D,+CAA+C,EAoChD,MAAM,yDAAyD,CAAC;AAyCjE,cAAM,MAAO,SAAQ,aAAa,CAAC,+CAA+C,CAAC;;gBAqB9D,GAAG,EAAE,2DAA2D,EAAE,GAAG,EAAE,2DAA2D;IA+CxI,OAAO,CAAC,OAAO,EAAE,2DAA2D,GAAG,2DAA2D;CAoWxJ;AAED,OAAO,EACL,MAAM,GACP,CAAC"}
|
|
@@ -0,0 +1,202 @@
|
|
|
1
|
+
import { DurableObject } from 'cloudflare:workers';
|
|
2
|
+
import { serverSchema } from '../../lib/schema.js';
|
|
3
|
+
import { drainFifo } from '../pipeline/drain-fifo.js';
|
|
4
|
+
import { send } from '../pipeline/send.js';
|
|
5
|
+
const attachmentChunkBytes = 1024 * 1024;
|
|
6
|
+
function deliverySucceeded(mode, sendResult) {
|
|
7
|
+
if (mode === 'send-all') {
|
|
8
|
+
return sendResult['results'].length > 0 && sendResult['results'].every((result) => result['success'] === true);
|
|
9
|
+
}
|
|
10
|
+
return sendResult['results'].some((result) => result['success'] === true);
|
|
11
|
+
}
|
|
12
|
+
class Runner extends DurableObject {
|
|
13
|
+
#drainPromise;
|
|
14
|
+
constructor(ctx, env) {
|
|
15
|
+
super(ctx, env);
|
|
16
|
+
this.#drainPromise = undefined;
|
|
17
|
+
this['ctx']['storage']['sql'].exec([
|
|
18
|
+
'CREATE TABLE IF NOT EXISTS notifications (',
|
|
19
|
+
'position INTEGER PRIMARY KEY AUTOINCREMENT,',
|
|
20
|
+
'delivery_id TEXT UNIQUE NOT NULL,',
|
|
21
|
+
'payload TEXT NOT NULL,',
|
|
22
|
+
'created_at INTEGER NOT NULL',
|
|
23
|
+
')',
|
|
24
|
+
].join('\n'));
|
|
25
|
+
this['ctx']['storage']['sql'].exec([
|
|
26
|
+
'CREATE TABLE IF NOT EXISTS attachment_chunks (',
|
|
27
|
+
'delivery_id TEXT NOT NULL,',
|
|
28
|
+
'chunk_index INTEGER NOT NULL,',
|
|
29
|
+
'content BLOB NOT NULL,',
|
|
30
|
+
'PRIMARY KEY (delivery_id, chunk_index)',
|
|
31
|
+
')',
|
|
32
|
+
].join('\n'));
|
|
33
|
+
this['ctx']['storage']['sql'].exec([
|
|
34
|
+
'CREATE TABLE IF NOT EXISTS delivery_progress (',
|
|
35
|
+
'delivery_id TEXT NOT NULL,',
|
|
36
|
+
'server_name TEXT NOT NULL,',
|
|
37
|
+
'stage TEXT NOT NULL,',
|
|
38
|
+
'PRIMARY KEY (delivery_id, server_name, stage)',
|
|
39
|
+
')',
|
|
40
|
+
].join('\n'));
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
async enqueue(options) {
|
|
44
|
+
const deliveryId = crypto.randomUUID();
|
|
45
|
+
const payload = {
|
|
46
|
+
messages: options['messages'],
|
|
47
|
+
serverNames: options['serverNames'],
|
|
48
|
+
primaryServerName: options['primaryServerName'],
|
|
49
|
+
topic: options['topic'],
|
|
50
|
+
mode: options['mode'],
|
|
51
|
+
...((options['visitorIp'] !== undefined) ? { visitorIp: options['visitorIp'] } : {}),
|
|
52
|
+
...((options['filename'] !== undefined) ? { filename: options['filename'] } : {}),
|
|
53
|
+
...((options['attachmentHeaders'] !== undefined) ? { attachmentHeaders: options['attachmentHeaders'] } : {}),
|
|
54
|
+
hasAttachment: options['attachment'] !== undefined,
|
|
55
|
+
};
|
|
56
|
+
const payloadJson = JSON.stringify(payload);
|
|
57
|
+
const attachmentBytes = (options['attachment'] === undefined) ? undefined : new Uint8Array(options['attachment']);
|
|
58
|
+
this['ctx']['storage'].transactionSync(() => {
|
|
59
|
+
this['ctx']['storage']['sql'].exec('INSERT INTO notifications (delivery_id, payload, created_at) VALUES (?, ?, ?)', deliveryId, payloadJson, Date.now());
|
|
60
|
+
if (attachmentBytes !== undefined) {
|
|
61
|
+
let chunkIndex = 0;
|
|
62
|
+
for (let offset = 0; offset < attachmentBytes.length; offset += attachmentChunkBytes) {
|
|
63
|
+
const chunk = attachmentBytes.slice(offset, offset + attachmentChunkBytes).buffer;
|
|
64
|
+
this['ctx']['storage']['sql'].exec('INSERT INTO attachment_chunks (delivery_id, chunk_index, content) VALUES (?, ?, ?)', deliveryId, chunkIndex, chunk);
|
|
65
|
+
chunkIndex += 1;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
return;
|
|
69
|
+
});
|
|
70
|
+
const startedDrain = (this.#drainPromise === undefined) ? this.#drain() : this.#drainPromise.then(() => this.#drain());
|
|
71
|
+
this.#drainPromise = startedDrain;
|
|
72
|
+
try {
|
|
73
|
+
const attemptResults = await startedDrain;
|
|
74
|
+
const pendingRow = this['ctx']['storage']['sql'].exec('SELECT COUNT(*) AS pending FROM notifications').one();
|
|
75
|
+
const queuedRow = this['ctx']['storage']['sql'].exec('SELECT COUNT(*) AS queued FROM notifications WHERE delivery_id = ?', deliveryId).one();
|
|
76
|
+
const sendResult = attemptResults.get(deliveryId);
|
|
77
|
+
return {
|
|
78
|
+
deliveryId,
|
|
79
|
+
state: (queuedRow['queued'] > 0) ? 'queued' : 'delivered',
|
|
80
|
+
pending: pendingRow['pending'],
|
|
81
|
+
...((sendResult !== undefined) ? { sendResult } : {}),
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
finally {
|
|
85
|
+
if (this.#drainPromise === startedDrain) {
|
|
86
|
+
this.#drainPromise = undefined;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
#readAttachment(deliveryId, hasAttachment) {
|
|
91
|
+
if (hasAttachment === false) {
|
|
92
|
+
return undefined;
|
|
93
|
+
}
|
|
94
|
+
const rows = this['ctx']['storage']['sql'].exec('SELECT content FROM attachment_chunks WHERE delivery_id = ? ORDER BY chunk_index ASC', deliveryId).toArray();
|
|
95
|
+
const totalBytes = rows.reduce((total, row) => total + row['content'].byteLength, 0);
|
|
96
|
+
const bytes = new Uint8Array(totalBytes);
|
|
97
|
+
let offset = 0;
|
|
98
|
+
for (const row of rows) {
|
|
99
|
+
const chunkBytes = new Uint8Array(row['content']);
|
|
100
|
+
bytes.set(chunkBytes, offset);
|
|
101
|
+
offset += chunkBytes.length;
|
|
102
|
+
}
|
|
103
|
+
return bytes.buffer;
|
|
104
|
+
}
|
|
105
|
+
#readCompletedStages(deliveryId) {
|
|
106
|
+
const rows = this['ctx']['storage']['sql'].exec('SELECT server_name, stage FROM delivery_progress WHERE delivery_id = ? ORDER BY server_name ASC, stage ASC', deliveryId).toArray();
|
|
107
|
+
const completedStages = {};
|
|
108
|
+
for (const row of rows) {
|
|
109
|
+
const serverStages = completedStages[row['server_name']] ?? [];
|
|
110
|
+
serverStages.push(row['stage']);
|
|
111
|
+
Reflect.set(completedStages, row['server_name'], serverStages);
|
|
112
|
+
}
|
|
113
|
+
return completedStages;
|
|
114
|
+
}
|
|
115
|
+
#resolveServers(payload) {
|
|
116
|
+
const serversJson = this['env']['SERVERS'] ?? '[]';
|
|
117
|
+
const servers = serverSchema.array().parse(JSON.parse(serversJson));
|
|
118
|
+
const resolvedServers = payload['serverNames'].map((serverName) => {
|
|
119
|
+
const server = servers.find((configuredServer) => configuredServer['name'] === serverName);
|
|
120
|
+
if (server === undefined) {
|
|
121
|
+
throw new Error(`Configured ntfy server "${serverName}" is unavailable`);
|
|
122
|
+
}
|
|
123
|
+
return server;
|
|
124
|
+
});
|
|
125
|
+
const primaryServer = resolvedServers.find((server) => server['name'] === payload['primaryServerName']);
|
|
126
|
+
if (primaryServer === undefined) {
|
|
127
|
+
throw new Error(`Primary ntfy server "${payload['primaryServerName']}" is unavailable`);
|
|
128
|
+
}
|
|
129
|
+
return {
|
|
130
|
+
servers: resolvedServers,
|
|
131
|
+
primaryServer,
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
#checkpoint(deliveryId, serverName, stage) {
|
|
135
|
+
this['ctx']['storage']['sql'].exec('INSERT OR IGNORE INTO delivery_progress (delivery_id, server_name, stage) VALUES (?, ?, ?)', deliveryId, serverName, stage);
|
|
136
|
+
return;
|
|
137
|
+
}
|
|
138
|
+
#delete(deliveryId) {
|
|
139
|
+
this['ctx']['storage'].transactionSync(() => {
|
|
140
|
+
this['ctx']['storage']['sql'].exec('DELETE FROM delivery_progress WHERE delivery_id = ?', deliveryId);
|
|
141
|
+
this['ctx']['storage']['sql'].exec('DELETE FROM attachment_chunks WHERE delivery_id = ?', deliveryId);
|
|
142
|
+
this['ctx']['storage']['sql'].exec('DELETE FROM notifications WHERE delivery_id = ?', deliveryId);
|
|
143
|
+
return;
|
|
144
|
+
});
|
|
145
|
+
return;
|
|
146
|
+
}
|
|
147
|
+
#peek() {
|
|
148
|
+
const rows = this['ctx']['storage']['sql'].exec('SELECT position, delivery_id AS deliveryId, payload FROM notifications ORDER BY position ASC LIMIT 1').toArray();
|
|
149
|
+
return rows[0];
|
|
150
|
+
}
|
|
151
|
+
async #attempt(notification) {
|
|
152
|
+
const payload = JSON.parse(notification['payload']);
|
|
153
|
+
const attachment = this.#readAttachment(notification['deliveryId'], payload['hasAttachment']);
|
|
154
|
+
const completedStages = this.#readCompletedStages(notification['deliveryId']);
|
|
155
|
+
const resolved = this.#resolveServers(payload);
|
|
156
|
+
return await send({
|
|
157
|
+
messages: payload['messages'],
|
|
158
|
+
servers: resolved['servers'],
|
|
159
|
+
primaryServer: resolved['primaryServer'],
|
|
160
|
+
topic: payload['topic'],
|
|
161
|
+
mode: payload['mode'],
|
|
162
|
+
...((payload['visitorIp'] !== undefined) ? { visitorIp: payload['visitorIp'] } : {}),
|
|
163
|
+
...((attachment !== undefined) ? { attachment } : {}),
|
|
164
|
+
...((payload['filename'] !== undefined) ? { filename: payload['filename'] } : {}),
|
|
165
|
+
...((payload['attachmentHeaders'] !== undefined) ? { attachmentHeaders: payload['attachmentHeaders'] } : {}),
|
|
166
|
+
deliveryId: notification['deliveryId'],
|
|
167
|
+
completedStages,
|
|
168
|
+
onStageSuccess: (serverName, stage) => {
|
|
169
|
+
this.#checkpoint(notification['deliveryId'], serverName, stage);
|
|
170
|
+
return;
|
|
171
|
+
},
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
#succeeded(notification, sendResult) {
|
|
175
|
+
const payload = JSON.parse(notification['payload']);
|
|
176
|
+
return deliverySucceeded(payload['mode'], sendResult);
|
|
177
|
+
}
|
|
178
|
+
#remove(notification) {
|
|
179
|
+
this.#delete(notification['deliveryId']);
|
|
180
|
+
return;
|
|
181
|
+
}
|
|
182
|
+
#handleError(notification, err) {
|
|
183
|
+
const errorMessage = (err instanceof Error) ? err.message : 'Unknown delivery outbox error';
|
|
184
|
+
console.info(JSON.stringify({
|
|
185
|
+
debug: 'delivery_outbox_error',
|
|
186
|
+
deliveryId: notification['deliveryId'],
|
|
187
|
+
error: errorMessage,
|
|
188
|
+
}));
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
191
|
+
#drain() {
|
|
192
|
+
return drainFifo({
|
|
193
|
+
peek: this.#peek.bind(this),
|
|
194
|
+
attempt: this.#attempt.bind(this),
|
|
195
|
+
succeeded: this.#succeeded.bind(this),
|
|
196
|
+
remove: this.#remove.bind(this),
|
|
197
|
+
onError: this.#handleError.bind(this),
|
|
198
|
+
});
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
export { Runner, };
|
|
202
|
+
//# sourceMappingURL=delivery-outbox.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"delivery-outbox.js","sourceRoot":"","sources":["../../../../src/worker/durable-objects/delivery-outbox.ts"],"names":[],"mappings":"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"}
|