@gadicc/loom 1.18.0 → 1.19.0

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.
Files changed (57) hide show
  1. package/README.md +60 -2
  2. package/esm/src/cli/mod.d.ts.map +1 -1
  3. package/esm/src/cli/mod.js +10 -1
  4. package/esm/src/jobs/controller.d.ts +14 -1
  5. package/esm/src/jobs/controller.d.ts.map +1 -1
  6. package/esm/src/jobs/controller.js +54 -3
  7. package/esm/src/jobs/events.d.ts +9 -1
  8. package/esm/src/jobs/events.d.ts.map +1 -1
  9. package/esm/src/jobs/events.js +15 -2
  10. package/esm/src/jobs/mod.d.ts +1 -0
  11. package/esm/src/jobs/mod.d.ts.map +1 -1
  12. package/esm/src/jobs/mod.js +1 -0
  13. package/esm/src/jobs/run.d.ts +20 -1
  14. package/esm/src/jobs/run.d.ts.map +1 -1
  15. package/esm/src/jobs/run.js +29 -4
  16. package/esm/src/jobs/sanitize.d.ts +30 -0
  17. package/esm/src/jobs/sanitize.d.ts.map +1 -0
  18. package/esm/src/jobs/sanitize.js +91 -0
  19. package/esm/src/mail/postal.d.ts.map +1 -1
  20. package/esm/src/mail/postal.js +25 -20
  21. package/esm/src/mail/sender.d.ts +5 -0
  22. package/esm/src/mail/sender.d.ts.map +1 -0
  23. package/esm/src/mail/sender.js +48 -0
  24. package/esm/src/mail/service.d.ts.map +1 -1
  25. package/esm/src/mail/service.js +7 -5
  26. package/esm/src/next/jobs/route.d.ts.map +1 -1
  27. package/esm/src/next/jobs/route.js +1 -1
  28. package/package.json +2 -2
  29. package/script/src/cli/mod.d.ts.map +1 -1
  30. package/script/src/cli/mod.js +10 -1
  31. package/script/src/jobs/controller.d.ts +14 -1
  32. package/script/src/jobs/controller.d.ts.map +1 -1
  33. package/script/src/jobs/controller.js +54 -3
  34. package/script/src/jobs/events.d.ts +9 -1
  35. package/script/src/jobs/events.d.ts.map +1 -1
  36. package/script/src/jobs/events.js +15 -2
  37. package/script/src/jobs/mod.d.ts +1 -0
  38. package/script/src/jobs/mod.d.ts.map +1 -1
  39. package/script/src/jobs/mod.js +1 -0
  40. package/script/src/jobs/run.d.ts +20 -1
  41. package/script/src/jobs/run.d.ts.map +1 -1
  42. package/script/src/jobs/run.js +29 -4
  43. package/script/src/jobs/sanitize.d.ts +30 -0
  44. package/script/src/jobs/sanitize.d.ts.map +1 -0
  45. package/script/src/jobs/sanitize.js +97 -0
  46. package/script/src/mail/postal.d.ts.map +1 -1
  47. package/script/src/mail/postal.js +25 -20
  48. package/script/src/mail/sender.d.ts +5 -0
  49. package/script/src/mail/sender.d.ts.map +1 -0
  50. package/script/src/mail/sender.js +52 -0
  51. package/script/src/mail/service.d.ts.map +1 -1
  52. package/script/src/mail/service.js +7 -5
  53. package/script/src/next/jobs/route.d.ts.map +1 -1
  54. package/script/src/next/jobs/route.js +1 -1
  55. package/skills/loom/SKILL.md +4 -1
  56. package/skills/loom-jobs/SKILL.md +27 -0
  57. package/skills/loom-mail/SKILL.md +14 -3
@@ -1,5 +1,6 @@
1
1
  import "../../_dnt.polyfills.js";
2
2
  import { LoomMailError, LoomMailTransportError } from "./errors.js";
3
+ import { normalizeLoomMailFromEmail, normalizeLoomMailFromName, } from "./sender.js";
3
4
  export class LoomPostalWebhookError extends LoomMailError {
4
5
  constructor(message, options) {
5
6
  super(message, { code: options.code });
@@ -26,9 +27,12 @@ function postalBaseUrl(host) {
26
27
  : `https://${normalized}`;
27
28
  }
28
29
  function fromAddress(message) {
29
- return message.fromName
30
- ? `${message.fromName} <${message.fromEmail}>`
31
- : message.fromEmail;
30
+ const email = normalizeLoomMailFromEmail(message.fromEmail);
31
+ const name = normalizeLoomMailFromName(message.fromName);
32
+ if (!name)
33
+ return email;
34
+ const quotedName = name.replaceAll("\\", "\\\\").replaceAll('"', '\\"');
35
+ return `"${quotedName}" <${email}>`;
32
36
  }
33
37
  function retryableHttpStatus(status) {
34
38
  return status === 408 || status === 429 || status >= 500;
@@ -67,26 +71,27 @@ export function createPostalMailTransport(options) {
67
71
  if (!options.apiKey.trim()) {
68
72
  throw new LoomMailTransportError("Postal API key is not configured.", { code: "postal_not_configured", retryable: false });
69
73
  }
74
+ const requestBody = {
75
+ attachments: message.attachments.map((attachment) => ({
76
+ content_type: attachment.contentType ?? undefined,
77
+ data: attachment.data,
78
+ name: attachment.name,
79
+ })),
80
+ bcc: message.bcc,
81
+ cc: message.cc,
82
+ from: fromAddress(message),
83
+ headers: message.headers,
84
+ html_body: message.htmlBody ?? undefined,
85
+ plain_body: message.plainBody ?? undefined,
86
+ reply_to: message.replyTo ?? undefined,
87
+ subject: message.subject,
88
+ tag: message.tag ?? undefined,
89
+ to: message.to,
90
+ };
70
91
  let response;
71
92
  try {
72
93
  response = await fetchImpl(new URL("/api/v1/send/message", postalBaseUrl(options.host)), {
73
- body: JSON.stringify({
74
- attachments: message.attachments.map((attachment) => ({
75
- content_type: attachment.contentType ?? undefined,
76
- data: attachment.data,
77
- name: attachment.name,
78
- })),
79
- bcc: message.bcc,
80
- cc: message.cc,
81
- from: fromAddress(message),
82
- headers: message.headers,
83
- html_body: message.htmlBody ?? undefined,
84
- plain_body: message.plainBody ?? undefined,
85
- reply_to: message.replyTo ?? undefined,
86
- subject: message.subject,
87
- tag: message.tag ?? undefined,
88
- to: message.to,
89
- }),
94
+ body: JSON.stringify(requestBody),
90
95
  headers: {
91
96
  "Content-Type": "application/json",
92
97
  "X-Server-API-Key": options.apiKey,
@@ -0,0 +1,5 @@
1
+ /** Normalizes a bare sender address without attempting full addr-spec parsing. */
2
+ export declare function normalizeLoomMailFromEmail(value: string): string;
3
+ /** Normalizes an optional sender display name and rejects header controls. */
4
+ export declare function normalizeLoomMailFromName(value?: string | null): string | null;
5
+ //# sourceMappingURL=sender.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sender.d.ts","sourceRoot":"","sources":["../../../src/src/mail/sender.ts"],"names":[],"mappings":"AAmCA,kFAAkF;AAClF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,UAYvD;AAED,8EAA8E;AAC9E,wBAAgB,yBAAyB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,iBAK9D"}
@@ -0,0 +1,48 @@
1
+ import { LoomMailValidationError } from "./errors.js";
2
+ const CONTROL_CHARACTER = /\p{Cc}/u;
3
+ function assertNoHeaderControlCharacters(value, field) {
4
+ if (CONTROL_CHARACTER.test(value)) {
5
+ throw new LoomMailValidationError(`${field} must not contain control characters.`);
6
+ }
7
+ }
8
+ function hasUnquotedAngleBracket(value) {
9
+ let escaped = false;
10
+ let quoted = false;
11
+ for (const character of value) {
12
+ if (quoted && escaped) {
13
+ escaped = false;
14
+ continue;
15
+ }
16
+ if (quoted && character === "\\") {
17
+ escaped = true;
18
+ continue;
19
+ }
20
+ if (character === '"') {
21
+ quoted = !quoted;
22
+ continue;
23
+ }
24
+ if (!quoted && (character === "<" || character === ">"))
25
+ return true;
26
+ }
27
+ return false;
28
+ }
29
+ /** Normalizes a bare sender address without attempting full addr-spec parsing. */
30
+ export function normalizeLoomMailFromEmail(value) {
31
+ assertNoHeaderControlCharacters(value, "fromEmail");
32
+ const normalized = value.trim();
33
+ if (!normalized) {
34
+ throw new LoomMailValidationError("A From address is required.");
35
+ }
36
+ if (hasUnquotedAngleBracket(normalized)) {
37
+ throw new LoomMailValidationError("fromEmail must be a bare email address; pass the display name through fromName instead.");
38
+ }
39
+ return normalized;
40
+ }
41
+ /** Normalizes an optional sender display name and rejects header controls. */
42
+ export function normalizeLoomMailFromName(value) {
43
+ if (value === undefined || value === null)
44
+ return null;
45
+ assertNoHeaderControlCharacters(value, "fromName");
46
+ const normalized = value.trim();
47
+ return normalized || null;
48
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/src/mail/service.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAEV,oBAAoB,EAEpB,aAAa,EACb,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,4BAA4B,CAC3C,QAAQ,SAAS,qBAAqB,GAAG,qBAAqB;IAE9D,gBAAgB,CAAC,EAAE,MAAM,MAAM,CAAC;IAChC,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;IACjB,UAAU,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACzC,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAClC,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAsCD,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE;IACR,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB,GACA,oBAAoB,CA0BtB;AAWD;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,SAAS,qBAAqB,GAAG,qBAAqB,EAC9D,OAAO,EAAE,4BAA4B,CAAC,QAAQ,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,CA2H5E"}
1
+ {"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/src/mail/service.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAEV,oBAAoB,EAEpB,aAAa,EACb,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,4BAA4B,CAC3C,QAAQ,SAAS,qBAAqB,GAAG,qBAAqB;IAE9D,gBAAgB,CAAC,EAAE,MAAM,MAAM,CAAC;IAChC,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;IACjB,UAAU,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACzC,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAClC,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAmCD,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE;IACR,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB,GACA,oBAAoB,CA8BtB;AAWD;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,SAAS,qBAAqB,GAAG,qBAAqB,EAC9D,OAAO,EAAE,4BAA4B,CAAC,QAAQ,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,CA2H5E"}
@@ -1,5 +1,6 @@
1
1
  import { LoomMailDeliveryError, LoomMailLeaseLostError, LoomMailTransportError, LoomMailValidationError, } from "./errors.js";
2
2
  import { createExponentialMailRetryPolicy } from "./retry.js";
3
+ import { normalizeLoomMailFromEmail, normalizeLoomMailFromName, } from "./sender.js";
3
4
  function recipients(value) {
4
5
  if (!value)
5
6
  return [];
@@ -12,9 +13,6 @@ function nullableText(value) {
12
13
  return normalized ? normalized : null;
13
14
  }
14
15
  function assertMailInput(input, normalized) {
15
- if (!normalized.fromEmail) {
16
- throw new LoomMailValidationError("A From address is required.");
17
- }
18
16
  if (!input.subject.trim()) {
19
17
  throw new LoomMailValidationError("A subject is required.");
20
18
  }
@@ -26,10 +24,14 @@ function assertMailInput(input, normalized) {
26
24
  }
27
25
  }
28
26
  export function normalizeLoomMailInput(input, defaults) {
27
+ const overrideFromEmail = input.fromEmail === undefined
28
+ ? undefined
29
+ : normalizeLoomMailFromEmail(input.fromEmail);
29
30
  const normalized = {
30
31
  bcc: recipients(input.bcc),
31
32
  cc: recipients(input.cc),
32
- fromEmail: input.fromEmail?.trim() || defaults.fromEmail.trim(),
33
+ fromEmail: overrideFromEmail ||
34
+ normalizeLoomMailFromEmail(defaults.fromEmail),
33
35
  to: recipients(input.to),
34
36
  };
35
37
  assertMailInput(input, normalized);
@@ -40,7 +42,7 @@ export function normalizeLoomMailInput(input, defaults) {
40
42
  name: attachment.name,
41
43
  })),
42
44
  ...normalized,
43
- fromName: nullableText(input.fromName ?? defaults.fromName),
45
+ fromName: normalizeLoomMailFromName(input.fromName ?? defaults.fromName),
44
46
  headers: { ...input.headers },
45
47
  htmlBody: nullableText(input.htmlBody),
46
48
  metadata: { ...input.metadata },
@@ -1 +1 @@
1
- {"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../src/src/next/jobs/route.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,wBAAwB,EAG7B,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,eAAe,EAErB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,cAAe,SAAQ,OAAO;IAC7C,OAAO,CAAC,EAAE,GAAG,CAAC;CACf;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,OAAO,CAAC;QACd,EAAE,CAAC,EAAE,MAAM,CAAC;KACb,CAAC,CAAC;CACJ;AAED,MAAM,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;AAE/E,MAAM,WAAW,6BAA6B;IAC5C,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,cAAc,CAAC;QAC1B,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,cAAc,CAAC;CACzB;AAED,MAAM,WAAW,2BAA2B,CAAC,cAAc;IACzD,aAAa,EAAE,cAAc,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,cAAc,CAAC;IACxB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,MAAM,WAAW,6BAA6B,CAC5C,IAAI,SAAS,aAAa,EAC1B,cAAc,GAAG,OAAO,CACxB,SAAQ,IAAI,CAAC,wBAAwB,EAAE,QAAQ,GAAG,kBAAkB,CAAC;IACrE,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAC1B,SAAS,CAAC,EAAE,CACV,KAAK,EAAE,6BAA6B,KACjC,OAAO,CAAC,QAAQ,GAAG,cAAc,CAAC,GAAG,QAAQ,GAAG,cAAc,CAAC;IACpE,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClE,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,aAAa,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC5C,oBAAoB,CAAC,EAAE,CACrB,KAAK,EAAE,2BAA2B,CAAC,cAAc,CAAC,KAC/C,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,QAAQ,GAAG,IAAI,CAAC;IAChD,oBAAoB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,4BAA4B,CAC3C,IAAI,SAAS,aAAa,EAC1B,cAAc,GAAG,OAAO,CACxB,SACA,IAAI,CACF,6BAA6B,CAAC,IAAI,EAAE,cAAc,CAAC,EACnD,SAAS,CACV;IACD,0DAA0D;IAC1D,GAAG,EAAE,IAAI,CAAC;CACX;AAmBD,wBAAgB,sBAAsB,CACpC,IAAI,SAAS,aAAa,EAC1B,cAAc,GAAG,OAAO,EAExB,OAAO,EAAE,6BAA6B,CAAC,IAAI,EAAE,cAAc,CAAC,IAU1D,SAAS,cAAc,EACvB,SAAS,mBAAmB,kBAuF/B;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,SAAS,aAAa,EAC1B,cAAc,GAAG,OAAO,EAExB,OAAO,EAAE,4BAA4B,CAAC,IAAI,EAAE,cAAc,CAAC,IAQnD,SAAS,cAAc,kBAIhC"}
1
+ {"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../src/src/next/jobs/route.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,wBAAwB,EAG7B,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,eAAe,EAErB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,cAAe,SAAQ,OAAO;IAC7C,OAAO,CAAC,EAAE,GAAG,CAAC;CACf;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,OAAO,CAAC;QACd,EAAE,CAAC,EAAE,MAAM,CAAC;KACb,CAAC,CAAC;CACJ;AAED,MAAM,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;AAE/E,MAAM,WAAW,6BAA6B;IAC5C,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,cAAc,CAAC;QAC1B,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,cAAc,CAAC;CACzB;AAED,MAAM,WAAW,2BAA2B,CAAC,cAAc;IACzD,aAAa,EAAE,cAAc,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,cAAc,CAAC;IACxB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,MAAM,WAAW,6BAA6B,CAC5C,IAAI,SAAS,aAAa,EAC1B,cAAc,GAAG,OAAO,CACxB,SAAQ,IAAI,CAAC,wBAAwB,EAAE,QAAQ,GAAG,kBAAkB,CAAC;IACrE,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAC1B,SAAS,CAAC,EAAE,CACV,KAAK,EAAE,6BAA6B,KACjC,OAAO,CAAC,QAAQ,GAAG,cAAc,CAAC,GAAG,QAAQ,GAAG,cAAc,CAAC;IACpE,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClE,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,aAAa,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC5C,oBAAoB,CAAC,EAAE,CACrB,KAAK,EAAE,2BAA2B,CAAC,cAAc,CAAC,KAC/C,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,QAAQ,GAAG,IAAI,CAAC;IAChD,oBAAoB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,4BAA4B,CAC3C,IAAI,SAAS,aAAa,EAC1B,cAAc,GAAG,OAAO,CACxB,SACA,IAAI,CACF,6BAA6B,CAAC,IAAI,EAAE,cAAc,CAAC,EACnD,SAAS,CACV;IACD,0DAA0D;IAC1D,GAAG,EAAE,IAAI,CAAC;CACX;AAmBD,wBAAgB,sBAAsB,CACpC,IAAI,SAAS,aAAa,EAC1B,cAAc,GAAG,OAAO,EAExB,OAAO,EAAE,6BAA6B,CAAC,IAAI,EAAE,cAAc,CAAC,IAU1D,SAAS,cAAc,EACvB,SAAS,mBAAmB,kBAyF/B;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,SAAS,aAAa,EAC1B,cAAc,GAAG,OAAO,EAExB,OAAO,EAAE,4BAA4B,CAAC,IAAI,EAAE,cAAc,CAAC,IAQnD,SAAS,cAAc,kBAIhC"}
@@ -77,7 +77,7 @@ export function createJobsRouteHandler(options) {
77
77
  if (deferredTasks === "after" && options.after) {
78
78
  options.after(async () => {
79
79
  const result = await execution.result;
80
- await result.controller.runDeferredTasks();
80
+ await result.controller.runDeferredTasks(options.deferredTaskErrorHandler);
81
81
  });
82
82
  }
83
83
  return await finishResponse(response);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gadicc/loom",
3
- "version": "1.18.0",
3
+ "version": "1.19.0",
4
4
  "description": "Deno-first shared helpers for extracting common Next.js app code.",
5
5
  "homepage": "https://github.com/gadicc/loom#readme",
6
6
  "repository": {
@@ -225,7 +225,7 @@
225
225
  },
226
226
  "scripts": {},
227
227
  "loom": {
228
- "gitCommit": "fde1b69c5e2c77c8f2aa8439655a3d40d9097275"
228
+ "gitCommit": "8a9f7427a837b39e6ff03a877a23be02f898730b"
229
229
  },
230
230
  "bin": {
231
231
  "loom": "script/bin/loom.js"
@@ -1 +1 @@
1
- {"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../src/src/cli/mod.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../src/src/cli/mod.ts"],"names":[],"mappings":"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"}
@@ -4561,6 +4561,11 @@ export function getDefaultMailFromEmail() {
4561
4561
  return requireEnv("POSTAL_FROM_EMAIL");
4562
4562
  }
4563
4563
 
4564
+ /** Reads the optional default sender display name from the app environment. */
4565
+ export function getDefaultMailFromName() {
4566
+ return process.env.POSTAL_FROM_NAME?.trim() || undefined;
4567
+ }
4568
+
4564
4569
  export function getPostalWebhookPublicKeys(): PostalWebhookPublicKey[] {
4565
4570
  const raw = process.env.POSTAL_WEBHOOK_PUBLIC_KEYS?.trim();
4566
4571
  if (!raw) throw new Error("POSTAL_WEBHOOK_PUBLIC_KEYS is not set.");
@@ -4586,6 +4591,7 @@ function mailServiceTemplate(config) {
4586
4591
  import { mailRepository } from "${toAliasImportPath(config.modules.repositoryModule)}";
4587
4592
  import {
4588
4593
  getDefaultMailFromEmail,
4594
+ getDefaultMailFromName,
4589
4595
  mailTransport,
4590
4596
  } from "${toAliasImportPath(config.modules.transportModule)}";
4591
4597
 
@@ -4593,6 +4599,9 @@ export const mailService = createLoomMailService({
4593
4599
  get defaultFromEmail() {
4594
4600
  return getDefaultMailFromEmail();
4595
4601
  },
4602
+ get defaultFromName() {
4603
+ return getDefaultMailFromName();
4604
+ },
4596
4605
  repository: mailRepository,
4597
4606
  transport: mailTransport,
4598
4607
  });
@@ -7588,7 +7597,7 @@ async function applyMailFeature(cwd, framework, manifest, activate) {
7588
7597
  changedFiles.push(...materialized.changedFiles);
7589
7598
  notes.push(...materialized.notes);
7590
7599
  config.schema = materialized.schema;
7591
- notes.push("No migration was generated. Review the mail schema diff, then create and apply the app-local migration deliberately.", "Configure POSTAL_API_KEY, POSTAL_HOST, POSTAL_FROM_EMAIL, and POSTAL_WEBHOOK_PUBLIC_KEYS before sending mail or receiving webhooks.");
7600
+ notes.push("No migration was generated. Review the mail schema diff, then create and apply the app-local migration deliberately.", "Configure POSTAL_API_KEY, POSTAL_HOST, and POSTAL_WEBHOOK_PUBLIC_KEYS before sending mail or receiving webhooks.", "Set POSTAL_FROM_EMAIL=noreply@example.com to a bare default sender address; optionally set POSTAL_FROM_NAME=Example App.");
7592
7601
  }
7593
7602
  const scaffolds = [
7594
7603
  [config.modules.accessModule, mailAccessTemplate(), "admin access policy"],
@@ -1,9 +1,15 @@
1
+ import { type JobOutputSanitizer } from "./sanitize.js";
1
2
  import type { DeferredTask } from "./types.js";
2
3
  export interface DeferredTaskErrorContext {
4
+ controller: JobController;
3
5
  deferred: DeferredTask;
4
6
  error: unknown;
5
7
  }
6
8
  export type DeferredTaskErrorHandler = (context: DeferredTaskErrorContext) => void;
9
+ /** Aggregate result for one pass over a controller's deferred tasks. */
10
+ export interface DeferredTaskRunResult {
11
+ failureCount: number;
12
+ }
7
13
  export declare function defaultDeferredTaskErrorHandler(context: DeferredTaskErrorContext): void;
8
14
  export declare class JobController {
9
15
  static readonly _logLevels: readonly ["fatal", "error", "warn", "info", "log", "debug", "trace"];
@@ -12,8 +18,13 @@ export declare class JobController {
12
18
  _cancelled: boolean;
13
19
  _deferred: DeferredTask[];
14
20
  _maxLogLevel: number;
15
- constructor(controller: ReadableStreamDefaultController<string>, maxLogLevel?: number);
21
+ _outputSanitationFailed: boolean;
22
+ _outputSanitationFailureEmitted: boolean;
23
+ _outputSanitizer?: JobOutputSanitizer;
24
+ constructor(controller: ReadableStreamDefaultController<string>, maxLogLevel?: number, outputSanitizer?: JobOutputSanitizer);
16
25
  json<T>(obj: T): void;
26
+ /** @internal Emit one fixed failure event without invoking a failed policy. */
27
+ _emitOutputSanitationFailure(): void;
17
28
  _log(levelInt: number, args: unknown[]): void;
18
29
  fatal(...args: unknown[]): void;
19
30
  error(...args: unknown[]): void;
@@ -24,5 +35,7 @@ export declare class JobController {
24
35
  trace(...args: unknown[]): void;
25
36
  defer(task: () => Promise<void> | void, label?: string): void;
26
37
  runDeferredTasks(onError?: DeferredTaskErrorHandler): Promise<void>;
38
+ /** Run deferred tasks while reporting an additive aggregate failure count. */
39
+ runDeferredTasksWithResult(onError?: DeferredTaskErrorHandler): Promise<DeferredTaskRunResult>;
27
40
  }
28
41
  //# sourceMappingURL=controller.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/src/jobs/controller.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,MAAM,wBAAwB,GAAG,CACrC,OAAO,EAAE,wBAAwB,KAC9B,IAAI,CAAC;AAEV,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,wBAAwB,QAYlC;AAED,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,UAAU,uEAAkB;IAC5C,MAAM,CAAC,QAAQ,CAAC,aAAa,4FAAwB;IAErD,WAAW,EAAE,+BAA+B,CAAC,MAAM,CAAC,CAAC;IACrD,UAAU,UAAS;IACnB,SAAS,EAAE,YAAY,EAAE,CAAM;IAC/B,YAAY,SAA6B;gBAGvC,UAAU,EAAE,+BAA+B,CAAC,MAAM,CAAC,EACnD,WAAW,CAAC,EAAE,MAAM;IAQtB,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC;IAId,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;IAMtC,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAIxB,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAIxB,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAIvB,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAIvB,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAItB,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAIxB,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAIxB,KAAK,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,EAAE,MAAM;IAIhD,gBAAgB,CACpB,OAAO,GAAE,wBAA0D;CAUtE"}
1
+ {"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/src/jobs/controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,KAAK,kBAAkB,EACxB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,aAAa,CAAC;IAC1B,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,MAAM,wBAAwB,GAAG,CACrC,OAAO,EAAE,wBAAwB,KAC9B,IAAI,CAAC;AAEV,wEAAwE;AACxE,MAAM,WAAW,qBAAqB;IACpC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,wBAAwB,QAYlC;AAED,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,UAAU,uEAAkB;IAC5C,MAAM,CAAC,QAAQ,CAAC,aAAa,4FAAwB;IAErD,WAAW,EAAE,+BAA+B,CAAC,MAAM,CAAC,CAAC;IACrD,UAAU,UAAS;IACnB,SAAS,EAAE,YAAY,EAAE,CAAM;IAC/B,YAAY,SAA6B;IACzC,uBAAuB,UAAS;IAChC,+BAA+B,UAAS;IACxC,gBAAgB,CAAC,EAAE,kBAAkB,CAAC;gBAGpC,UAAU,EAAE,+BAA+B,CAAC,MAAM,CAAC,EACnD,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,kBAAkB;IAStC,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC;IAed,+EAA+E;IAC/E,4BAA4B;IAc5B,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;IAMtC,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAIxB,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAIxB,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAIvB,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAIvB,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAItB,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAIxB,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAIxB,KAAK,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,EAAE,MAAM;IAIhD,gBAAgB,CACpB,OAAO,GAAE,wBAA0D,GAClE,OAAO,CAAC,IAAI,CAAC;IAIhB,8EAA8E;IACxE,0BAA0B,CAC9B,OAAO,GAAE,wBAA0D,GAClE,OAAO,CAAC,qBAAqB,CAAC;CAYlC"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.JobController = void 0;
4
4
  exports.defaultDeferredTaskErrorHandler = defaultDeferredTaskErrorHandler;
5
5
  const events_js_1 = require("./events.js");
6
+ const sanitize_js_1 = require("./sanitize.js");
6
7
  function defaultDeferredTaskErrorHandler(context) {
7
8
  const prefix = context.deferred.label
8
9
  ? `Deferred task "${context.deferred.label}" failed`
@@ -12,7 +13,7 @@ function defaultDeferredTaskErrorHandler(context) {
12
13
  : context.error);
13
14
  }
14
15
  class JobController {
15
- constructor(controller, maxLogLevel) {
16
+ constructor(controller, maxLogLevel, outputSanitizer) {
16
17
  Object.defineProperty(this, "_controller", {
17
18
  enumerable: true,
18
19
  configurable: true,
@@ -37,13 +38,56 @@ class JobController {
37
38
  writable: true,
38
39
  value: events_js_1.JOB_LOG_LEVELS.length - 1
39
40
  });
41
+ Object.defineProperty(this, "_outputSanitationFailed", {
42
+ enumerable: true,
43
+ configurable: true,
44
+ writable: true,
45
+ value: false
46
+ });
47
+ Object.defineProperty(this, "_outputSanitationFailureEmitted", {
48
+ enumerable: true,
49
+ configurable: true,
50
+ writable: true,
51
+ value: false
52
+ });
53
+ Object.defineProperty(this, "_outputSanitizer", {
54
+ enumerable: true,
55
+ configurable: true,
56
+ writable: true,
57
+ value: void 0
58
+ });
40
59
  this._controller = controller;
41
60
  if (typeof maxLogLevel === "number") {
42
61
  this._maxLogLevel = maxLogLevel;
43
62
  }
63
+ this._outputSanitizer = outputSanitizer;
44
64
  }
45
65
  json(obj) {
46
- this._controller.enqueue((0, events_js_1.serializeJobEvent)(obj));
66
+ if (this._outputSanitationFailed) {
67
+ throw new sanitize_js_1.JobOutputSanitationError();
68
+ }
69
+ try {
70
+ this._controller.enqueue((0, events_js_1.serializeJobEvent)(obj, this._outputSanitizer));
71
+ }
72
+ catch (error) {
73
+ if (error instanceof sanitize_js_1.JobOutputSanitationError) {
74
+ this._outputSanitationFailed = true;
75
+ }
76
+ throw error;
77
+ }
78
+ }
79
+ /** @internal Emit one fixed failure event without invoking a failed policy. */
80
+ _emitOutputSanitationFailure() {
81
+ if (this._outputSanitationFailureEmitted)
82
+ return;
83
+ this._outputSanitationFailureEmitted = true;
84
+ this._controller.enqueue((0, events_js_1.serializeJobEvent)({
85
+ _log: [
86
+ Date.now(),
87
+ JobController._logLevelsInt.fatal,
88
+ sanitize_js_1.JOB_OUTPUT_SANITATION_FAILURE_MESSAGE,
89
+ ],
90
+ }));
47
91
  }
48
92
  _log(levelInt, args) {
49
93
  if (levelInt <= this._maxLogLevel) {
@@ -75,14 +119,21 @@ class JobController {
75
119
  this._deferred.push({ label, task });
76
120
  }
77
121
  async runDeferredTasks(onError = defaultDeferredTaskErrorHandler) {
122
+ await this.runDeferredTasksWithResult(onError);
123
+ }
124
+ /** Run deferred tasks while reporting an additive aggregate failure count. */
125
+ async runDeferredTasksWithResult(onError = defaultDeferredTaskErrorHandler) {
126
+ let failureCount = 0;
78
127
  for (const deferred of this._deferred) {
79
128
  try {
80
129
  await deferred.task();
81
130
  }
82
131
  catch (error) {
83
- onError({ deferred, error });
132
+ failureCount++;
133
+ onError({ controller: this, deferred, error });
84
134
  }
85
135
  }
136
+ return { failureCount };
86
137
  }
87
138
  }
88
139
  exports.JobController = JobController;
@@ -1,3 +1,4 @@
1
+ import { type JobOutputSanitizer } from "./sanitize.js";
1
2
  export declare const JOB_LOG_LEVELS: readonly ["fatal", "error", "warn", "info", "log", "debug", "trace"];
2
3
  export type JobLogLevel = (typeof JOB_LOG_LEVELS)[number];
3
4
  export declare const JOB_LOG_LEVEL_TO_INT: Readonly<Record<JobLogLevel, number>>;
@@ -8,7 +9,14 @@ export interface JobLogEvent {
8
9
  _log: [timestamp: number, levelInt: number, ...args: unknown[]];
9
10
  }
10
11
  export type JobStreamEvent = JobLifecycleEvent | JobLogEvent | Record<string, unknown>;
11
- export declare function serializeJobEvent(event: JobStreamEvent): string;
12
+ /**
13
+ * Serialize one job event, optionally sanitizing every string value.
14
+ *
15
+ * JSON's replacer traversal preserves its normal handling of arrays, objects,
16
+ * dates, primitives, `toJSON`, omitted object values, and array holes without
17
+ * mutating the input value.
18
+ */
19
+ export declare function serializeJobEvent(event: unknown, outputSanitizer?: JobOutputSanitizer): string;
12
20
  export declare function parseJobEvent(line: string): JobStreamEvent;
13
21
  export declare function isJobLifecycleEvent(event: JobStreamEvent): event is JobLifecycleEvent;
14
22
  export declare function isJobLogEvent(event: JobStreamEvent): event is JobLogEvent;
@@ -1 +1 @@
1
- {"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/src/jobs/events.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,sEAQjB,CAAC;AAEX,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1D,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAQtE,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;CACjE;AAED,MAAM,MAAM,cAAc,GACtB,iBAAiB,GACjB,WAAW,GACX,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE5B,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAE/D;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAE1D;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,cAAc,GACpB,KAAK,IAAI,iBAAiB,CAE5B;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,GAAG,KAAK,IAAI,WAAW,CAEzE"}
1
+ {"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/src/jobs/events.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAExB,MAAM,eAAe,CAAC;AAEvB,eAAO,MAAM,cAAc,sEAQjB,CAAC;AAEX,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1D,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAQtE,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;CACjE;AAED,MAAM,MAAM,cAAc,GACtB,iBAAiB,GACjB,WAAW,GACX,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE5B;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,OAAO,EACd,eAAe,CAAC,EAAE,kBAAkB,GACnC,MAAM,CAWR;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAE1D;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,cAAc,GACpB,KAAK,IAAI,iBAAiB,CAE5B;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,GAAG,KAAK,IAAI,WAAW,CAEzE"}
@@ -5,6 +5,7 @@ exports.serializeJobEvent = serializeJobEvent;
5
5
  exports.parseJobEvent = parseJobEvent;
6
6
  exports.isJobLifecycleEvent = isJobLifecycleEvent;
7
7
  exports.isJobLogEvent = isJobLogEvent;
8
+ const sanitize_js_1 = require("./sanitize.js");
8
9
  exports.JOB_LOG_LEVELS = [
9
10
  "fatal",
10
11
  "error",
@@ -23,8 +24,20 @@ exports.JOB_LOG_LEVEL_TO_INT = {
23
24
  debug: 5,
24
25
  trace: 6,
25
26
  };
26
- function serializeJobEvent(event) {
27
- return `${JSON.stringify(event)}\n`;
27
+ /**
28
+ * Serialize one job event, optionally sanitizing every string value.
29
+ *
30
+ * JSON's replacer traversal preserves its normal handling of arrays, objects,
31
+ * dates, primitives, `toJSON`, omitted object values, and array holes without
32
+ * mutating the input value.
33
+ */
34
+ function serializeJobEvent(event, outputSanitizer) {
35
+ const serialized = outputSanitizer
36
+ ? JSON.stringify(event, (_key, value) => typeof value === "string"
37
+ ? (0, sanitize_js_1.sanitizeJobOutputString)(outputSanitizer, value)
38
+ : value)
39
+ : JSON.stringify(event);
40
+ return `${serialized}\n`;
28
41
  }
29
42
  function parseJobEvent(line) {
30
43
  return JSON.parse(line);
@@ -6,5 +6,6 @@ export * from "./format.js";
6
6
  export * from "./http.js";
7
7
  export * from "./log.js";
8
8
  export * from "./run.js";
9
+ export * from "./sanitize.js";
9
10
  export * from "./types.js";
10
11
  //# sourceMappingURL=mod.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../src/src/jobs/mod.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC"}
1
+ {"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../src/src/jobs/mod.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC"}
@@ -22,4 +22,5 @@ __exportStar(require("./format.js"), exports);
22
22
  __exportStar(require("./http.js"), exports);
23
23
  __exportStar(require("./log.js"), exports);
24
24
  __exportStar(require("./run.js"), exports);
25
+ __exportStar(require("./sanitize.js"), exports);
25
26
  __exportStar(require("./types.js"), exports);
@@ -1,7 +1,10 @@
1
- import { JobController } from "./controller.js";
1
+ import { type DeferredTaskErrorHandler, JobController } from "./controller.js";
2
+ import { type JobOutputSanitizer } from "./sanitize.js";
2
3
  import type { JobDefinition, JobParams } from "./types.js";
3
4
  export interface JobRunResult<TJob extends JobDefinition = JobDefinition> {
4
5
  controller: JobController;
6
+ /** Present on Loom-created executions; optional for legacy result adapters. */
7
+ deferredTaskFailureCount?: number;
5
8
  error: unknown | null;
6
9
  job: TJob;
7
10
  params: JobParams;
@@ -12,8 +15,24 @@ export interface JobExecution<TJob extends JobDefinition = JobDefinition> {
12
15
  getController: () => JobController | null;
13
16
  }
14
17
  export interface CreateJobExecutionOptions {
18
+ /**
19
+ * Message deliberately emitted when the job handler throws. Omit it to keep
20
+ * Loom's legacy full-stack output behavior.
21
+ */
22
+ handlerErrorMessage?: string;
23
+ /** Maximum log level included in the event stream. */
15
24
  maxLogLevel?: number;
25
+ /** Sanitize every string value emitted through the job controller. */
26
+ outputSanitizer?: JobOutputSanitizer;
27
+ /** Run deferred tasks before the end event instead of leaving them pending. */
16
28
  runDeferredTasks?: boolean;
29
+ /** Handle deferred-task errors independently from handler error disclosure. */
30
+ deferredTaskErrorHandler?: DeferredTaskErrorHandler;
31
+ /**
32
+ * Message emitted when a consumer cancels the stream. Set to `false` to keep
33
+ * cancellation silent. Omit it to preserve the legacy "Job cancelled" log.
34
+ */
35
+ cancellationMessage?: string | false;
17
36
  }
18
37
  export declare function formatJobError(error: unknown): string;
19
38
  export declare function createJobExecution<TJob extends JobDefinition>(job: TJob, params?: JobParams, options?: CreateJobExecutionOptions): JobExecution<TJob>;
@@ -1 +1 @@
1
- {"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/src/jobs/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE3D,MAAM,WAAW,YAAY,CAAC,IAAI,SAAS,aAAa,GAAG,aAAa;IACtE,UAAU,EAAE,aAAa,CAAC;IAC1B,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IACtB,GAAG,EAAE,IAAI,CAAC;IACV,MAAM,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,WAAW,YAAY,CAAC,IAAI,SAAS,aAAa,GAAG,aAAa;IACtE,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAC/B,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,aAAa,EAAE,MAAM,aAAa,GAAG,IAAI,CAAC;CAC3C;AAED,MAAM,WAAW,yBAAyB;IACxC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAUrD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,SAAS,aAAa,EAC3D,GAAG,EAAE,IAAI,EACT,MAAM,GAAE,SAAc,EACtB,OAAO,GAAE,yBAA8B,GACtC,YAAY,CAAC,IAAI,CAAC,CAiDpB"}
1
+ {"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/src/jobs/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,wBAAwB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE/E,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE3D,MAAM,WAAW,YAAY,CAAC,IAAI,SAAS,aAAa,GAAG,aAAa;IACtE,UAAU,EAAE,aAAa,CAAC;IAC1B,+EAA+E;IAC/E,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IACtB,GAAG,EAAE,IAAI,CAAC;IACV,MAAM,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,WAAW,YAAY,CAAC,IAAI,SAAS,aAAa,GAAG,aAAa;IACtE,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAC/B,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,aAAa,EAAE,MAAM,aAAa,GAAG,IAAI,CAAC;CAC3C;AAED,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,sDAAsD;IACtD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sEAAsE;IACtE,eAAe,CAAC,EAAE,kBAAkB,CAAC;IACrC,+EAA+E;IAC/E,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,+EAA+E;IAC/E,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CACtC;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAUrD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,SAAS,aAAa,EAC3D,GAAG,EAAE,IAAI,EACT,MAAM,GAAE,SAAc,EACtB,OAAO,GAAE,yBAA8B,GACtC,YAAY,CAAC,IAAI,CAAC,CAgFpB"}
@@ -4,6 +4,7 @@ exports.formatJobError = formatJobError;
4
4
  exports.createJobExecution = createJobExecution;
5
5
  const controller_js_1 = require("./controller.js");
6
6
  const events_js_1 = require("./events.js");
7
+ const sanitize_js_1 = require("./sanitize.js");
7
8
  function formatJobError(error) {
8
9
  if (error instanceof Error) {
9
10
  return error.stack ?? error.toString();
@@ -24,22 +25,44 @@ function createJobExecution(job, params = {}, options = {}) {
24
25
  const stream = new ReadableStream({
25
26
  async start(controller) {
26
27
  controller.enqueue((0, events_js_1.serializeJobEvent)({ _job: "start" }));
27
- jobController = new controller_js_1.JobController(controller, options.maxLogLevel);
28
+ jobController = new controller_js_1.JobController(controller, options.maxLogLevel, options.outputSanitizer);
28
29
  let error = null;
30
+ let deferredTaskFailureCount = 0;
29
31
  try {
30
32
  await job.handler(jobController, params);
33
+ if (jobController._outputSanitationFailed) {
34
+ throw new sanitize_js_1.JobOutputSanitationError();
35
+ }
31
36
  if (options.runDeferredTasks) {
32
- await jobController.runDeferredTasks();
37
+ const deferredResult = await jobController.runDeferredTasksWithResult(options.deferredTaskErrorHandler);
38
+ deferredTaskFailureCount = deferredResult.failureCount;
33
39
  }
34
40
  }
35
41
  catch (caught) {
36
42
  error = caught;
37
- jobController.fatal(formatJobError(caught));
43
+ if (caught instanceof sanitize_js_1.JobOutputSanitationError ||
44
+ jobController._outputSanitationFailed) {
45
+ jobController._emitOutputSanitationFailure();
46
+ }
47
+ else {
48
+ try {
49
+ jobController.fatal(options.handlerErrorMessage ?? formatJobError(caught));
50
+ }
51
+ catch (reportingError) {
52
+ if (reportingError instanceof sanitize_js_1.JobOutputSanitationError) {
53
+ jobController._emitOutputSanitationFailure();
54
+ }
55
+ else {
56
+ throw reportingError;
57
+ }
58
+ }
59
+ }
38
60
  }
39
61
  controller.enqueue((0, events_js_1.serializeJobEvent)({ _job: "end" }));
40
62
  controller.close();
41
63
  resolveResult({
42
64
  controller: jobController,
65
+ deferredTaskFailureCount,
43
66
  error,
44
67
  job,
45
68
  params,
@@ -49,7 +72,9 @@ function createJobExecution(job, params = {}, options = {}) {
49
72
  if (!jobController) {
50
73
  throw new Error("Job cancelled but job controller not set.");
51
74
  }
52
- jobController.log("Job cancelled");
75
+ if (options.cancellationMessage !== false) {
76
+ jobController.log(options.cancellationMessage ?? "Job cancelled");
77
+ }
53
78
  jobController._cancelled = true;
54
79
  },
55
80
  });