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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interpret.js","sourceRoot":"","sources":["../../../../src/worker/pipeline/interpret.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAoB5D,MAAM,cAAc,GAA6C;IAC/D,YAAY,EAAE,oBAAoB;IAClC,WAAW,EAAE,mBAAmB;IAChC,OAAO,EAAE,gBAAgB;IACzB,SAAS,EAAE,kBAAkB;IAC7B,UAAU,EAAE,mBAAmB;IAC/B,YAAY,EAAE,qBAAqB;IACnC,OAAO,EAAE,gBAAgB;CAC1B,CAAC;
|
|
1
|
+
{"version":3,"file":"interpret.js","sourceRoot":"","sources":["../../../../src/worker/pipeline/interpret.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAoB5D,MAAM,cAAc,GAA6C;IAC/D,YAAY,EAAE,oBAAoB;IAClC,WAAW,EAAE,mBAAmB;IAChC,OAAO,EAAE,gBAAgB;IACzB,SAAS,EAAE,kBAAkB;IAC7B,UAAU,EAAE,mBAAmB;IAC/B,YAAY,EAAE,qBAAqB;IACnC,OAAO,EAAE,gBAAgB;CAC1B,CAAC;AAYF,KAAK,UAAU,SAAS,CAAC,eAAoE,EAAE,KAAsC,EAAE,OAA2C;IAChL,MAAM,mBAAmB,GAAkD,cAAc,CAAC,eAAe,CAAC,CAAC;IAE3G,IAAI,mBAAmB,KAAK,SAAS,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,wBAAwB,eAAe,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,iBAAiB,GAAgD,MAAM,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAEjH,IAAI,iBAAiB,KAAK,IAAI,EAAE,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC/G,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,OAAO,EACL,SAAS,EACT,cAAc,GACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../../src/worker/pipeline/parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAUV,mCAAmC,EACnC,mCAAmC,EACnC,6BAA6B,EAE9B,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../../src/worker/pipeline/parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAUV,mCAAmC,EACnC,mCAAmC,EACnC,6BAA6B,EAE9B,MAAM,wCAAwC,CAAC;AAYhD,iBAAS,KAAK,CAAC,OAAO,EAAE,mCAAmC,EAAE,OAAO,EAAE,mCAAmC,GAAG,6BAA6B,CAoFxI;AAED,OAAO,EACL,KAAK,GACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../../../src/worker/pipeline/parse.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../../../src/worker/pipeline/parse.ts"],"names":[],"mappings":"AA0BA,SAAS,KAAK,CAAC,OAA4C,EAAE,OAA4C;IAEvG,IAAI,OAAO,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC7B,CAAC;IAED,MAAM,WAAW,GAAsC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;IACzF,MAAM,eAAe,GAA0C,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACzF,MAAM,eAAe,GAA0C,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAG7H,MAAM,mBAAmB,GAA8C,CACrE,eAAe,KAAK,0BAA0B;WAC3C,eAAe,CAAC,UAAU,CAAC,QAAQ,CAAC;WACpC,eAAe,CAAC,UAAU,CAAC,QAAQ,CAAC;WACpC,eAAe,CAAC,UAAU,CAAC,QAAQ,CAAC,CACxC,CAAC;IAEF,IAAI,mBAAmB,KAAK,IAAI,EAAE,CAAC;QACjC,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO;SAChB,CAAC;IACJ,CAAC;IAGD,MAAM,KAAK,GAAgC,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;IAEnE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YACnB,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,OAAO;aAChB,CAAC;QACJ,CAAC;IACH,CAAC;IAGD,IAAI,IAAI,GAA+B,SAAS,CAAC;IAEjD,IAAI,CAAC;QACH,MAAM,OAAO,GAAkC,IAAI,WAAW,CAAC,OAAO,EAAE;YACtE,KAAK,EAAE,IAAI;YACX,SAAS,EAAE,KAAK;SACjB,CAAC,CAAC;QAEH,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO;SAChB,CAAC;IACJ,CAAC;IAGD,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC;QACrC,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO;SAChB,CAAC;IACJ,CAAC;IAGD,MAAM,iBAAiB,GAA4C,eAAe,KAAK,kBAAkB,CAAC;IAC1G,MAAM,aAAa,GAAwC,IAAI,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;IAElJ,IAAI,iBAAiB,KAAK,IAAI,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;QACzD,IAAI,CAAC;YACH,MAAM,IAAI,GAA+B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAE1D,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,IAAI;aACL,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;QAET,CAAC;IACH,CAAC;IAGD,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,IAAI;KACL,CAAC;AACJ,CAAC;AAED,OAAO,EACL,KAAK,GACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receive.d.ts","sourceRoot":"","sources":["../../../../src/worker/pipeline/receive.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kCAAkC,EAalC,+BAA+B,EAC/B,+BAA+B,EAEhC,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"receive.d.ts","sourceRoot":"","sources":["../../../../src/worker/pipeline/receive.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kCAAkC,EAalC,+BAA+B,EAC/B,+BAA+B,EAEhC,MAAM,0CAA0C,CAAC;AAYlD,iBAAe,OAAO,CAAC,OAAO,EAAE,+BAA+B,EAAE,UAAU,EAAE,kCAAkC,GAAG,+BAA+B,CA8DhJ;AAED,OAAO,EACL,OAAO,GACR,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../../../src/worker/pipeline/receive.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../../../src/worker/pipeline/receive.ts"],"names":[],"mappings":"AA6BA,KAAK,UAAU,OAAO,CAAC,OAAwC,EAAE,UAA8C;IAC7G,MAAM,MAAM,GAAmC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjE,MAAM,SAAS,GAA8C,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IACrF,MAAM,QAAQ,GAAqC,SAAS,CAAC,QAAQ,CAAC;IACtE,MAAM,QAAQ,GAAqC,SAAS,CAAC,QAAQ,CAAC;IACtE,MAAM,GAAG,GAAgC,OAAO,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,OAAO,GAAoC,OAAO,CAAC,SAAS,CAAC,CAAC;IAGpE,MAAM,kBAAkB,GAA+C,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAErG,IACE,QAAQ,KAAK,OAAO;WACjB,QAAQ,KAAK,WAAW;WACxB,kBAAkB,KAAK,IAAI,EAC9B,CAAC;QACD,MAAM,QAAQ,GAAqC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAEjG,OAAO;YACL,MAAM;YACN,QAAQ;YACR,GAAG;YACH,OAAO;YACP,OAAO,EAAE,IAAI,WAAW,CAAC,CAAC,CAAC;YAC3B,KAAK,EAAE,MAAM,KAAK,KAAK;YACvB,QAAQ;SACT,CAAC;IACJ,CAAC;IAGD,IACE,MAAM,KAAK,KAAK;WACb,MAAM,KAAK,MAAM;WACjB,MAAM,KAAK,KAAK,EACnB,CAAC;QACD,OAAO;YACL,MAAM;YACN,QAAQ;YACR,GAAG;YACH,OAAO;YACP,OAAO,EAAE,IAAI,WAAW,CAAC,CAAC,CAAC;YAC3B,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,uBAAuB,MAAM,EAAE;SACvC,CAAC;IACJ,CAAC;IAGD,MAAM,OAAO,GAAoC,CAAC,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;IAC5I,MAAM,KAAK,GAAkC,MAAM,KAAK,KAAK,CAAC;IAC9D,MAAM,gBAAgB,GAA6C,OAAO,CAAC;IAC3E,MAAM,eAAe,GAA4C,gBAA2D,CAAC;IAC7H,MAAM,YAAY,GAAyC,eAAe,CAAC,IAAI,CAAyC,CAAC;IAEzH,OAAO;QACL,MAAM;QACN,QAAQ;QACR,GAAG;QACH,OAAO;QACP,OAAO;QACP,KAAK;QACL,GAAG,CAAC,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC1D,CAAC;AACJ,CAAC;AAED,OAAO,EACL,OAAO,GACR,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Worker_Pipeline_Respond_Options, Worker_Pipeline_Respond_Returns
|
|
2
|
-
declare function respond(
|
|
1
|
+
import type { Worker_Pipeline_Respond_DeliveryResult, Worker_Pipeline_Respond_Options, Worker_Pipeline_Respond_Returns } from '../../types/worker/pipeline/respond.d.ts';
|
|
2
|
+
declare function respond(deliveryResult: Worker_Pipeline_Respond_DeliveryResult, options: Worker_Pipeline_Respond_Options): Worker_Pipeline_Respond_Returns;
|
|
3
3
|
export { respond, };
|
|
4
4
|
//# sourceMappingURL=respond.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"respond.d.ts","sourceRoot":"","sources":["../../../../src/worker/pipeline/respond.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"respond.d.ts","sourceRoot":"","sources":["../../../../src/worker/pipeline/respond.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAMV,sCAAsC,EAKtC,+BAA+B,EAS/B,+BAA+B,EAGhC,MAAM,0CAA0C,CAAC;AAYlD,iBAAS,OAAO,CAAC,cAAc,EAAE,sCAAsC,EAAE,OAAO,EAAE,+BAA+B,GAAG,+BAA+B,CAgFlJ;AAED,OAAO,EACL,OAAO,GACR,CAAC"}
|
|
@@ -1,4 +1,25 @@
|
|
|
1
|
-
function respond(
|
|
1
|
+
function respond(deliveryResult, options) {
|
|
2
|
+
if (deliveryResult['state'] === 'queued') {
|
|
3
|
+
const queuedBody = {
|
|
4
|
+
status: 'queued',
|
|
5
|
+
};
|
|
6
|
+
if (options['showResponseOutput'] === true) {
|
|
7
|
+
Reflect.set(queuedBody, 'context', options['contextName']);
|
|
8
|
+
Reflect.set(queuedBody, 'interpreter', options['interpreterName']);
|
|
9
|
+
Reflect.set(queuedBody, 'delivery_id', deliveryResult['deliveryId']);
|
|
10
|
+
Reflect.set(queuedBody, 'pending', deliveryResult['pending']);
|
|
11
|
+
}
|
|
12
|
+
return new Response(JSON.stringify(queuedBody, null, 2), {
|
|
13
|
+
status: 202,
|
|
14
|
+
headers: {
|
|
15
|
+
'Content-Type': 'application/json',
|
|
16
|
+
},
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
const sendResult = deliveryResult['sendResult'] ?? {
|
|
20
|
+
results: [],
|
|
21
|
+
fallbackUsed: false,
|
|
22
|
+
};
|
|
2
23
|
const results = sendResult['results'];
|
|
3
24
|
const fallbackNote = sendResult['fallbackNote'];
|
|
4
25
|
const showResponseOutput = options['showResponseOutput'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"respond.js","sourceRoot":"","sources":["../../../../src/worker/pipeline/respond.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"respond.js","sourceRoot":"","sources":["../../../../src/worker/pipeline/respond.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../src/worker/pipeline/route.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../src/worker/pipeline/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,4BAA4B,EAE5B,gCAAgC,EAEhC,6BAA6B,EAG7B,+BAA+B,EAChC,MAAM,wCAAwC,CAAC;AAYhD,iBAAS,KAAK,CAAC,SAAS,EAAE,+BAA+B,EAAE,UAAU,EAAE,gCAAgC,EAAE,MAAM,EAAE,4BAA4B,GAAG,6BAA6B,CA0B5K;AAED,OAAO,EACL,KAAK,GACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../src/worker/pipeline/route.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../src/worker/pipeline/route.ts"],"names":[],"mappings":"AAqBA,SAAS,KAAK,CAAC,SAA0C,EAAE,UAA4C,EAAE,MAAoC;IAC3I,MAAM,OAAO,GAAkC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,UAAU,CAAC,CAAC;IAEvI,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO;YACL,OAAO,EAAE,SAAS;YAClB,eAAe,EAAE,SAAS;YAC1B,aAAa,EAAE,SAAS;YACxB,KAAK,EAAE,wBAAwB,SAAS,gBAAgB,UAAU,EAAE;SACrE,CAAC;IACJ,CAAC;IAED,MAAM,eAAe,GAAgD,OAAO,CAAC,SAAS,CAAC;SACpF,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,UAAU,CAAC,CAAC;SACtF,MAAM,CAAC,CAAC,MAAM,EAA0D,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC;IAEpG,MAAM,aAAa,GAAwC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAC/E,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,gBAAgB,CAAC,CACzD,CAAC;IAEF,OAAO;QACL,OAAO;QACP,eAAe;QACf,aAAa;QACb,KAAK,EAAE,SAAS;KACjB,CAAC;AACJ,CAAC;AAED,OAAO,EACL,KAAK,GACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../../../src/worker/pipeline/send.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../../../src/worker/pipeline/send.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAaV,4BAA4B,EAI5B,4BAA4B,EA2C7B,MAAM,uCAAuC,CAAC;AA0M/C,iBAAe,IAAI,CAAC,OAAO,EAAE,4BAA4B,GAAG,4BAA4B,CAkHvF;AAED,OAAO,EACL,IAAI,GACL,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { REGEX_TITLE_PART_SUFFIX } from '../../lib/regex.js';
|
|
2
2
|
const MAX_BYTES = 4000;
|
|
3
|
-
async function sendToServer(server, messages, topic, visitorIp, attachment, filename, attachmentHeaders) {
|
|
3
|
+
async function sendToServer(server, messages, topic, visitorIp, attachment, filename, attachmentHeaders, deliveryId, completedStages, onStageSuccess) {
|
|
4
4
|
const stages = [];
|
|
5
5
|
const url = `${server['server']}/${topic}`;
|
|
6
6
|
let lastStatus = 0;
|
|
@@ -8,10 +8,21 @@ async function sendToServer(server, messages, topic, visitorIp, attachment, file
|
|
|
8
8
|
let partIndex = 0;
|
|
9
9
|
for (const message of messages) {
|
|
10
10
|
const partLabel = (totalParts > 1) ? `stage-1 (${String(partIndex + 1)}/${String(totalParts)})` : 'stage-1';
|
|
11
|
+
const stageKey = `message:${String(partIndex)}`;
|
|
12
|
+
const stageCompleted = completedStages !== undefined && (completedStages[server['name']] ?? []).includes(stageKey);
|
|
13
|
+
if (stageCompleted === true) {
|
|
14
|
+
stages.push(`${partLabel}: already delivered`);
|
|
15
|
+
lastStatus = 200;
|
|
16
|
+
partIndex += 1;
|
|
17
|
+
continue;
|
|
18
|
+
}
|
|
11
19
|
const headers = {
|
|
12
20
|
...message['headers'],
|
|
13
21
|
Authorization: `Bearer ${server['token']}`,
|
|
14
22
|
};
|
|
23
|
+
if (deliveryId !== undefined) {
|
|
24
|
+
Reflect.set(headers, 'X-Sequence-ID', `${deliveryId}-message-${String(partIndex + 1)}`);
|
|
25
|
+
}
|
|
15
26
|
if (visitorIp !== undefined) {
|
|
16
27
|
Reflect.set(headers, 'X-Forwarded-For', visitorIp);
|
|
17
28
|
}
|
|
@@ -32,6 +43,9 @@ async function sendToServer(server, messages, topic, visitorIp, attachment, file
|
|
|
32
43
|
error: `HTTP ${String(response['status'])}`,
|
|
33
44
|
};
|
|
34
45
|
}
|
|
46
|
+
if (onStageSuccess !== undefined) {
|
|
47
|
+
await onStageSuccess(server['name'], stageKey);
|
|
48
|
+
}
|
|
35
49
|
stages.push(`${partLabel}: ok`);
|
|
36
50
|
}
|
|
37
51
|
catch (err) {
|
|
@@ -48,10 +62,24 @@ async function sendToServer(server, messages, topic, visitorIp, attachment, file
|
|
|
48
62
|
partIndex += 1;
|
|
49
63
|
}
|
|
50
64
|
if (attachment !== undefined) {
|
|
65
|
+
const attachmentStageKey = 'attachment';
|
|
66
|
+
const attachmentStageCompleted = completedStages !== undefined && (completedStages[server['name']] ?? []).includes(attachmentStageKey);
|
|
67
|
+
if (attachmentStageCompleted === true) {
|
|
68
|
+
stages.push('stage-2: already delivered');
|
|
69
|
+
return {
|
|
70
|
+
name: server['name'],
|
|
71
|
+
success: true,
|
|
72
|
+
status: (lastStatus === 0) ? 200 : lastStatus,
|
|
73
|
+
stages,
|
|
74
|
+
};
|
|
75
|
+
}
|
|
51
76
|
const attachmentRequestHeaders = {
|
|
52
77
|
Authorization: `Bearer ${server['token']}`,
|
|
53
78
|
...attachmentHeaders,
|
|
54
79
|
};
|
|
80
|
+
if (deliveryId !== undefined) {
|
|
81
|
+
Reflect.set(attachmentRequestHeaders, 'X-Sequence-ID', `${deliveryId}-attachment`);
|
|
82
|
+
}
|
|
55
83
|
if (visitorIp !== undefined) {
|
|
56
84
|
Reflect.set(attachmentRequestHeaders, 'X-Forwarded-For', visitorIp);
|
|
57
85
|
}
|
|
@@ -75,6 +103,9 @@ async function sendToServer(server, messages, topic, visitorIp, attachment, file
|
|
|
75
103
|
error: `HTTP ${String(attachmentResponse['status'])}`,
|
|
76
104
|
};
|
|
77
105
|
}
|
|
106
|
+
if (onStageSuccess !== undefined) {
|
|
107
|
+
await onStageSuccess(server['name'], attachmentStageKey);
|
|
108
|
+
}
|
|
78
109
|
stages.push('stage-2: ok');
|
|
79
110
|
}
|
|
80
111
|
catch (err) {
|
|
@@ -106,8 +137,11 @@ async function send(options) {
|
|
|
106
137
|
const attachment = options['attachment'];
|
|
107
138
|
const filename = options['filename'];
|
|
108
139
|
const attachmentHeaders = options['attachmentHeaders'];
|
|
140
|
+
const deliveryId = options['deliveryId'];
|
|
141
|
+
const completedStages = options['completedStages'];
|
|
142
|
+
const onStageSuccess = options['onStageSuccess'];
|
|
109
143
|
if (mode === 'send-all') {
|
|
110
|
-
const results = await Promise.all(servers.map((server) => sendToServer(server, messages, topic, visitorIp, attachment, filename, attachmentHeaders)));
|
|
144
|
+
const results = await Promise.all(servers.map((server) => sendToServer(server, messages, topic, visitorIp, attachment, filename, attachmentHeaders, deliveryId, completedStages, onStageSuccess)));
|
|
111
145
|
return {
|
|
112
146
|
results,
|
|
113
147
|
fallbackUsed: false,
|
|
@@ -175,7 +209,7 @@ async function send(options) {
|
|
|
175
209
|
];
|
|
176
210
|
}
|
|
177
211
|
}
|
|
178
|
-
const serverResult = await sendToServer(server, messagesToSend, topic, visitorIp, attachment, filename, attachmentHeaders);
|
|
212
|
+
const serverResult = await sendToServer(server, messagesToSend, topic, visitorIp, attachment, filename, attachmentHeaders, deliveryId, completedStages, onStageSuccess);
|
|
179
213
|
fallbackResults.push(serverResult);
|
|
180
214
|
if (serverResult['success'] === true) {
|
|
181
215
|
const fallbackDeliveryNote = `Delivered via fallback server "${server['name']}"`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../../src/worker/pipeline/send.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../../src/worker/pipeline/send.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"split.d.ts","sourceRoot":"","sources":["../../../../src/worker/pipeline/split.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,6BAA6B,EAE7B,gCAAgC,EAMhC,mCAAmC,EAGpC,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"split.d.ts","sourceRoot":"","sources":["../../../../src/worker/pipeline/split.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,6BAA6B,EAE7B,gCAAgC,EAMhC,mCAAmC,EAGpC,MAAM,wCAAwC,CAAC;AAsBhD,iBAAS,KAAK,CAAC,IAAI,EAAE,gCAAgC,EAAE,OAAO,EAAE,mCAAmC,GAAG,6BAA6B,CA6ClI;AAED,OAAO,EACL,KAAK,GACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"split.js","sourceRoot":"","sources":["../../../../src/worker/pipeline/split.ts"],"names":[],"mappings":"AAsBA,MAAM,SAAS,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"split.js","sourceRoot":"","sources":["../../../../src/worker/pipeline/split.ts"],"names":[],"mappings":"AAsBA,MAAM,SAAS,GAAG,IAAI,CAAC;AAYvB,SAAS,KAAK,CAAC,IAAsC,EAAE,OAA4C;IACjG,MAAM,OAAO,GAAwC,IAAI,WAAW,EAAE,CAAC;IAEvE,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;QAC7C,OAAO,CAAC;gBACN,IAAI;gBACJ,OAAO;aACR,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAuC,EAAE,CAAC;IACtD,IAAI,YAAY,GAA6C,EAAE,CAAC;IAChE,IAAI,YAAY,GAA6C,CAAC,CAAC;IAE/D,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,SAAS,GAA0C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;QAErF,IAAI,YAAY,GAAG,SAAS,GAAG,SAAS,EAAE,CAAC;YACzC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC1B,YAAY,GAAG,IAAI,CAAC;YACpB,YAAY,GAAG,SAAS,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,YAAY,IAAI,IAAI,CAAC;YACrB,YAAY,IAAI,SAAS,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC5B,CAAC;IAED,MAAM,KAAK,GAAsC,MAAM,CAAC,MAAM,CAAC;IAC/D,MAAM,SAAS,GAA0C,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC;IAEzF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;QACrC,MAAM,WAAW,GAA4C;YAC3D,GAAG,OAAO;YACV,SAAS,EAAE,GAAG,SAAS,KAAK,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG;SAClD,CAAC;QAEF,OAAO;YACL,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,WAAW;SACrB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,OAAO,EACL,KAAK,GACN,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ntfy-reverse-proxy",
|
|
3
|
-
"version": "2.1
|
|
3
|
+
"version": "2.2.1",
|
|
4
4
|
"description": "Notification gateway on Cloudflare Workers that routes webhooks and emails to ntfy with automatic server failover",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"ntfy",
|
|
@@ -51,9 +51,9 @@
|
|
|
51
51
|
},
|
|
52
52
|
"private": false,
|
|
53
53
|
"scripts": {
|
|
54
|
-
"dev": "nova utility run-scripts --parallel --node-env development
|
|
54
|
+
"dev": "nova utility run-scripts --parallel --node-env development \"dev:*\"",
|
|
55
55
|
"dev:worker": "node ../../scripts/dev-worker.mjs",
|
|
56
|
-
"check": "nova utility run-scripts --sequential
|
|
56
|
+
"check": "nova utility run-scripts --sequential \"check:*\"",
|
|
57
57
|
"check:generate-types": "node ../../scripts/generate-wrangler-types.mjs",
|
|
58
58
|
"check:lint": "eslint ./ --max-warnings=0",
|
|
59
59
|
"check:types-cli": "nova utility type-check --project tsconfig.cli.json",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"check:types-config": "nova utility type-check --project tsconfig.config.json",
|
|
62
62
|
"check:types-tests": "nova utility type-check --project tsconfig.tests.json",
|
|
63
63
|
"check:test": "vitest run",
|
|
64
|
-
"build": "nova utility run-scripts --sequential --node-env production
|
|
64
|
+
"build": "nova utility run-scripts --sequential --node-env production \"build:*\"",
|
|
65
65
|
"build:generate-types": "node ../../scripts/generate-wrangler-types.mjs",
|
|
66
66
|
"build:transpile-cli": "nova utility transpile --project tsconfig.cli.json",
|
|
67
67
|
"build:transpile-worker": "nova utility transpile --project tsconfig.worker.json",
|
|
@@ -69,9 +69,9 @@
|
|
|
69
69
|
"build:copy-config": "shx cp ../../config.sample.json ./build/config.sample.json",
|
|
70
70
|
"build:fix-perms": "shx chmod +x ./build/src/cli/index.js",
|
|
71
71
|
"build:verify-package": "node ../../scripts/verify-package.mjs",
|
|
72
|
-
"deploy": "nova utility run-scripts --sequential --node-env production
|
|
72
|
+
"deploy": "nova utility run-scripts --sequential --node-env production \"deploy:*\"",
|
|
73
73
|
"deploy:worker": "node build/src/cli/index.js deploy",
|
|
74
|
-
"clean": "nova utility run-scripts --parallel
|
|
74
|
+
"clean": "nova utility run-scripts --parallel \"clean:*\"",
|
|
75
75
|
"clean:build": "shx rm -rf ./build",
|
|
76
76
|
"manage": "tsx src/cli/index.ts"
|
|
77
77
|
},
|
|
@@ -79,16 +79,16 @@
|
|
|
79
79
|
"node": "^22 || ^24"
|
|
80
80
|
},
|
|
81
81
|
"dependencies": {
|
|
82
|
-
"@cbnventures/nova": "0.
|
|
82
|
+
"@cbnventures/nova": "0.33.0",
|
|
83
83
|
"chalk": "6.0.0",
|
|
84
84
|
"commander": "15.0.0",
|
|
85
85
|
"prompts": "2.4.2",
|
|
86
|
-
"wrangler": "4.
|
|
86
|
+
"wrangler": "4.151.0",
|
|
87
87
|
"zod": "4.4.3"
|
|
88
88
|
},
|
|
89
89
|
"devDependencies": {
|
|
90
90
|
"@cloudflare/vitest-pool-workers": "0.22.0",
|
|
91
|
-
"@cloudflare/workers-types": "5.
|
|
91
|
+
"@cloudflare/workers-types": "5.20261015.1",
|
|
92
92
|
"@types/node": "24.9.1",
|
|
93
93
|
"@types/prompts": "2.4.9",
|
|
94
94
|
"eslint": "9.39.5",
|