@gadicc/loom 1.17.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.
- package/README.md +120 -43
- package/deno.json +3 -0
- package/esm/src/cli/mod.d.ts +3 -1
- package/esm/src/cli/mod.d.ts.map +1 -1
- package/esm/src/cli/mod.js +968 -342
- package/esm/src/cli/projectTooling.d.ts +138 -0
- package/esm/src/cli/projectTooling.d.ts.map +1 -0
- package/esm/src/cli/projectTooling.js +614 -0
- package/esm/src/jobs/controller.d.ts +14 -1
- package/esm/src/jobs/controller.d.ts.map +1 -1
- package/esm/src/jobs/controller.js +54 -3
- package/esm/src/jobs/events.d.ts +9 -1
- package/esm/src/jobs/events.d.ts.map +1 -1
- package/esm/src/jobs/events.js +15 -2
- package/esm/src/jobs/mod.d.ts +1 -0
- package/esm/src/jobs/mod.d.ts.map +1 -1
- package/esm/src/jobs/mod.js +1 -0
- package/esm/src/jobs/run.d.ts +20 -1
- package/esm/src/jobs/run.d.ts.map +1 -1
- package/esm/src/jobs/run.js +29 -4
- package/esm/src/jobs/sanitize.d.ts +30 -0
- package/esm/src/jobs/sanitize.d.ts.map +1 -0
- package/esm/src/jobs/sanitize.js +91 -0
- package/esm/src/mail/postal.d.ts.map +1 -1
- package/esm/src/mail/postal.js +25 -20
- package/esm/src/mail/sender.d.ts +5 -0
- package/esm/src/mail/sender.d.ts.map +1 -0
- package/esm/src/mail/sender.js +48 -0
- package/esm/src/mail/service.d.ts.map +1 -1
- package/esm/src/mail/service.js +7 -5
- package/esm/src/next/jobs/route.d.ts.map +1 -1
- package/esm/src/next/jobs/route.js +1 -1
- package/package.json +3 -2
- package/script/src/cli/mod.d.ts +3 -1
- package/script/src/cli/mod.d.ts.map +1 -1
- package/script/src/cli/mod.js +968 -342
- package/script/src/cli/projectTooling.d.ts +138 -0
- package/script/src/cli/projectTooling.d.ts.map +1 -0
- package/script/src/cli/projectTooling.js +634 -0
- package/script/src/jobs/controller.d.ts +14 -1
- package/script/src/jobs/controller.d.ts.map +1 -1
- package/script/src/jobs/controller.js +54 -3
- package/script/src/jobs/events.d.ts +9 -1
- package/script/src/jobs/events.d.ts.map +1 -1
- package/script/src/jobs/events.js +15 -2
- package/script/src/jobs/mod.d.ts +1 -0
- package/script/src/jobs/mod.d.ts.map +1 -1
- package/script/src/jobs/mod.js +1 -0
- package/script/src/jobs/run.d.ts +20 -1
- package/script/src/jobs/run.d.ts.map +1 -1
- package/script/src/jobs/run.js +29 -4
- package/script/src/jobs/sanitize.d.ts +30 -0
- package/script/src/jobs/sanitize.d.ts.map +1 -0
- package/script/src/jobs/sanitize.js +97 -0
- package/script/src/mail/postal.d.ts.map +1 -1
- package/script/src/mail/postal.js +25 -20
- package/script/src/mail/sender.d.ts +5 -0
- package/script/src/mail/sender.d.ts.map +1 -0
- package/script/src/mail/sender.js +52 -0
- package/script/src/mail/service.d.ts.map +1 -1
- package/script/src/mail/service.js +7 -5
- package/script/src/next/jobs/route.d.ts.map +1 -1
- package/script/src/next/jobs/route.js +1 -1
- package/skills/loom/SKILL.md +38 -23
- package/skills/loom-db/SKILL.md +9 -7
- package/skills/loom-db/references/db-stack.md +2 -1
- package/skills/loom-jobs/SKILL.md +36 -6
- package/skills/loom-lingui/SKILL.md +38 -0
- package/skills/loom-lingui/agents/openai.yaml +4 -0
- package/skills/loom-mail/SKILL.md +14 -3
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { JOB_LOG_LEVEL_TO_INT, JOB_LOG_LEVELS, serializeJobEvent, } from "./events.js";
|
|
2
|
+
import { JOB_OUTPUT_SANITATION_FAILURE_MESSAGE, JobOutputSanitationError, } from "./sanitize.js";
|
|
2
3
|
export function defaultDeferredTaskErrorHandler(context) {
|
|
3
4
|
const prefix = context.deferred.label
|
|
4
5
|
? `Deferred task "${context.deferred.label}" failed`
|
|
@@ -8,7 +9,7 @@ export function defaultDeferredTaskErrorHandler(context) {
|
|
|
8
9
|
: context.error);
|
|
9
10
|
}
|
|
10
11
|
export class JobController {
|
|
11
|
-
constructor(controller, maxLogLevel) {
|
|
12
|
+
constructor(controller, maxLogLevel, outputSanitizer) {
|
|
12
13
|
Object.defineProperty(this, "_controller", {
|
|
13
14
|
enumerable: true,
|
|
14
15
|
configurable: true,
|
|
@@ -33,13 +34,56 @@ export class JobController {
|
|
|
33
34
|
writable: true,
|
|
34
35
|
value: JOB_LOG_LEVELS.length - 1
|
|
35
36
|
});
|
|
37
|
+
Object.defineProperty(this, "_outputSanitationFailed", {
|
|
38
|
+
enumerable: true,
|
|
39
|
+
configurable: true,
|
|
40
|
+
writable: true,
|
|
41
|
+
value: false
|
|
42
|
+
});
|
|
43
|
+
Object.defineProperty(this, "_outputSanitationFailureEmitted", {
|
|
44
|
+
enumerable: true,
|
|
45
|
+
configurable: true,
|
|
46
|
+
writable: true,
|
|
47
|
+
value: false
|
|
48
|
+
});
|
|
49
|
+
Object.defineProperty(this, "_outputSanitizer", {
|
|
50
|
+
enumerable: true,
|
|
51
|
+
configurable: true,
|
|
52
|
+
writable: true,
|
|
53
|
+
value: void 0
|
|
54
|
+
});
|
|
36
55
|
this._controller = controller;
|
|
37
56
|
if (typeof maxLogLevel === "number") {
|
|
38
57
|
this._maxLogLevel = maxLogLevel;
|
|
39
58
|
}
|
|
59
|
+
this._outputSanitizer = outputSanitizer;
|
|
40
60
|
}
|
|
41
61
|
json(obj) {
|
|
42
|
-
this.
|
|
62
|
+
if (this._outputSanitationFailed) {
|
|
63
|
+
throw new JobOutputSanitationError();
|
|
64
|
+
}
|
|
65
|
+
try {
|
|
66
|
+
this._controller.enqueue(serializeJobEvent(obj, this._outputSanitizer));
|
|
67
|
+
}
|
|
68
|
+
catch (error) {
|
|
69
|
+
if (error instanceof JobOutputSanitationError) {
|
|
70
|
+
this._outputSanitationFailed = true;
|
|
71
|
+
}
|
|
72
|
+
throw error;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
/** @internal Emit one fixed failure event without invoking a failed policy. */
|
|
76
|
+
_emitOutputSanitationFailure() {
|
|
77
|
+
if (this._outputSanitationFailureEmitted)
|
|
78
|
+
return;
|
|
79
|
+
this._outputSanitationFailureEmitted = true;
|
|
80
|
+
this._controller.enqueue(serializeJobEvent({
|
|
81
|
+
_log: [
|
|
82
|
+
Date.now(),
|
|
83
|
+
JobController._logLevelsInt.fatal,
|
|
84
|
+
JOB_OUTPUT_SANITATION_FAILURE_MESSAGE,
|
|
85
|
+
],
|
|
86
|
+
}));
|
|
43
87
|
}
|
|
44
88
|
_log(levelInt, args) {
|
|
45
89
|
if (levelInt <= this._maxLogLevel) {
|
|
@@ -71,14 +115,21 @@ export class JobController {
|
|
|
71
115
|
this._deferred.push({ label, task });
|
|
72
116
|
}
|
|
73
117
|
async runDeferredTasks(onError = defaultDeferredTaskErrorHandler) {
|
|
118
|
+
await this.runDeferredTasksWithResult(onError);
|
|
119
|
+
}
|
|
120
|
+
/** Run deferred tasks while reporting an additive aggregate failure count. */
|
|
121
|
+
async runDeferredTasksWithResult(onError = defaultDeferredTaskErrorHandler) {
|
|
122
|
+
let failureCount = 0;
|
|
74
123
|
for (const deferred of this._deferred) {
|
|
75
124
|
try {
|
|
76
125
|
await deferred.task();
|
|
77
126
|
}
|
|
78
127
|
catch (error) {
|
|
79
|
-
|
|
128
|
+
failureCount++;
|
|
129
|
+
onError({ controller: this, deferred, error });
|
|
80
130
|
}
|
|
81
131
|
}
|
|
132
|
+
return { failureCount };
|
|
82
133
|
}
|
|
83
134
|
}
|
|
84
135
|
Object.defineProperty(JobController, "_logLevels", {
|
package/esm/src/jobs/events.d.ts
CHANGED
|
@@ -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
|
-
|
|
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,
|
|
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"}
|
package/esm/src/jobs/events.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { sanitizeJobOutputString, } from "./sanitize.js";
|
|
1
2
|
export const JOB_LOG_LEVELS = [
|
|
2
3
|
"fatal",
|
|
3
4
|
"error",
|
|
@@ -16,8 +17,20 @@ export const JOB_LOG_LEVEL_TO_INT = {
|
|
|
16
17
|
debug: 5,
|
|
17
18
|
trace: 6,
|
|
18
19
|
};
|
|
19
|
-
|
|
20
|
-
|
|
20
|
+
/**
|
|
21
|
+
* Serialize one job event, optionally sanitizing every string value.
|
|
22
|
+
*
|
|
23
|
+
* JSON's replacer traversal preserves its normal handling of arrays, objects,
|
|
24
|
+
* dates, primitives, `toJSON`, omitted object values, and array holes without
|
|
25
|
+
* mutating the input value.
|
|
26
|
+
*/
|
|
27
|
+
export function serializeJobEvent(event, outputSanitizer) {
|
|
28
|
+
const serialized = outputSanitizer
|
|
29
|
+
? JSON.stringify(event, (_key, value) => typeof value === "string"
|
|
30
|
+
? sanitizeJobOutputString(outputSanitizer, value)
|
|
31
|
+
: value)
|
|
32
|
+
: JSON.stringify(event);
|
|
33
|
+
return `${serialized}\n`;
|
|
21
34
|
}
|
|
22
35
|
export function parseJobEvent(line) {
|
|
23
36
|
return JSON.parse(line);
|
package/esm/src/jobs/mod.d.ts
CHANGED
|
@@ -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"}
|
package/esm/src/jobs/mod.js
CHANGED
package/esm/src/jobs/run.d.ts
CHANGED
|
@@ -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;
|
|
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"}
|
package/esm/src/jobs/run.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { JobController } from "./controller.js";
|
|
2
2
|
import { serializeJobEvent } from "./events.js";
|
|
3
|
+
import { JobOutputSanitationError, } from "./sanitize.js";
|
|
3
4
|
export function formatJobError(error) {
|
|
4
5
|
if (error instanceof Error) {
|
|
5
6
|
return error.stack ?? error.toString();
|
|
@@ -20,22 +21,44 @@ export function createJobExecution(job, params = {}, options = {}) {
|
|
|
20
21
|
const stream = new ReadableStream({
|
|
21
22
|
async start(controller) {
|
|
22
23
|
controller.enqueue(serializeJobEvent({ _job: "start" }));
|
|
23
|
-
jobController = new JobController(controller, options.maxLogLevel);
|
|
24
|
+
jobController = new JobController(controller, options.maxLogLevel, options.outputSanitizer);
|
|
24
25
|
let error = null;
|
|
26
|
+
let deferredTaskFailureCount = 0;
|
|
25
27
|
try {
|
|
26
28
|
await job.handler(jobController, params);
|
|
29
|
+
if (jobController._outputSanitationFailed) {
|
|
30
|
+
throw new JobOutputSanitationError();
|
|
31
|
+
}
|
|
27
32
|
if (options.runDeferredTasks) {
|
|
28
|
-
await jobController.
|
|
33
|
+
const deferredResult = await jobController.runDeferredTasksWithResult(options.deferredTaskErrorHandler);
|
|
34
|
+
deferredTaskFailureCount = deferredResult.failureCount;
|
|
29
35
|
}
|
|
30
36
|
}
|
|
31
37
|
catch (caught) {
|
|
32
38
|
error = caught;
|
|
33
|
-
|
|
39
|
+
if (caught instanceof JobOutputSanitationError ||
|
|
40
|
+
jobController._outputSanitationFailed) {
|
|
41
|
+
jobController._emitOutputSanitationFailure();
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
try {
|
|
45
|
+
jobController.fatal(options.handlerErrorMessage ?? formatJobError(caught));
|
|
46
|
+
}
|
|
47
|
+
catch (reportingError) {
|
|
48
|
+
if (reportingError instanceof JobOutputSanitationError) {
|
|
49
|
+
jobController._emitOutputSanitationFailure();
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
throw reportingError;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
34
56
|
}
|
|
35
57
|
controller.enqueue(serializeJobEvent({ _job: "end" }));
|
|
36
58
|
controller.close();
|
|
37
59
|
resolveResult({
|
|
38
60
|
controller: jobController,
|
|
61
|
+
deferredTaskFailureCount,
|
|
39
62
|
error,
|
|
40
63
|
job,
|
|
41
64
|
params,
|
|
@@ -45,7 +68,9 @@ export function createJobExecution(job, params = {}, options = {}) {
|
|
|
45
68
|
if (!jobController) {
|
|
46
69
|
throw new Error("Job cancelled but job controller not set.");
|
|
47
70
|
}
|
|
48
|
-
|
|
71
|
+
if (options.cancellationMessage !== false) {
|
|
72
|
+
jobController.log(options.cancellationMessage ?? "Job cancelled");
|
|
73
|
+
}
|
|
49
74
|
jobController._cancelled = true;
|
|
50
75
|
},
|
|
51
76
|
});
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/** Default literal used when a redaction rule has `true` as its replacement. */
|
|
2
|
+
export declare const DEFAULT_JOB_OUTPUT_REDACTION = "[REDACTED]";
|
|
3
|
+
/** Safe event text emitted when a configured output sanitizer cannot run. */
|
|
4
|
+
export declare const JOB_OUTPUT_SANITATION_FAILURE_MESSAGE = "Job output sanitation failed.";
|
|
5
|
+
/** Transform one string value before it enters a serialized job event. */
|
|
6
|
+
export type JobOutputSanitizer = (value: string) => string;
|
|
7
|
+
/** Ordered exact-string and regular-expression output redaction rules. */
|
|
8
|
+
export type JobOutputRedactionRules = ReadonlyMap<string | RegExp, true | string>;
|
|
9
|
+
/**
|
|
10
|
+
* Fixed, input-independent error raised when output sanitation fails.
|
|
11
|
+
*
|
|
12
|
+
* The original sanitizer error is deliberately not attached because its
|
|
13
|
+
* message or cause may include the value that was being sanitized.
|
|
14
|
+
*/
|
|
15
|
+
export declare class JobOutputSanitationError extends Error {
|
|
16
|
+
constructor();
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Create a deterministic string redactor from ordered exact and RegExp rules.
|
|
20
|
+
*
|
|
21
|
+
* Rules run in map insertion order and each rule receives the result of the
|
|
22
|
+
* previous rule. Exact strings are replaced everywhere. RegExp rules replace
|
|
23
|
+
* every match regardless of their original `g`, `y`, or `lastIndex` state.
|
|
24
|
+
* Replacement strings are always literal, so `$&`, `$1`, and `$$` have no
|
|
25
|
+
* special meaning. The rules are snapshotted when this function is called.
|
|
26
|
+
*/
|
|
27
|
+
export declare function createJobOutputRedactor(rules: JobOutputRedactionRules): JobOutputSanitizer;
|
|
28
|
+
/** @internal Apply a sanitizer while replacing all failures with a safe error. */
|
|
29
|
+
export declare function sanitizeJobOutputString(sanitizer: JobOutputSanitizer, value: string): string;
|
|
30
|
+
//# sourceMappingURL=sanitize.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sanitize.d.ts","sourceRoot":"","sources":["../../../src/src/jobs/sanitize.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,eAAO,MAAM,4BAA4B,eAAe,CAAC;AAEzD,6EAA6E;AAC7E,eAAO,MAAM,qCAAqC,kCACjB,CAAC;AAElC,0EAA0E;AAC1E,MAAM,MAAM,kBAAkB,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;AAE3D,0EAA0E;AAC1E,MAAM,MAAM,uBAAuB,GAAG,WAAW,CAC/C,MAAM,GAAG,MAAM,EACf,IAAI,GAAG,MAAM,CACd,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,wBAAyB,SAAQ,KAAK;;CAKlD;AAuBD;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,uBAAuB,GAC7B,kBAAkB,CA+DpB;AAED,kFAAkF;AAClF,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,kBAAkB,EAC7B,KAAK,EAAE,MAAM,GACZ,MAAM,CAUR"}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
/** Default literal used when a redaction rule has `true` as its replacement. */
|
|
2
|
+
export const DEFAULT_JOB_OUTPUT_REDACTION = "[REDACTED]";
|
|
3
|
+
/** Safe event text emitted when a configured output sanitizer cannot run. */
|
|
4
|
+
export const JOB_OUTPUT_SANITATION_FAILURE_MESSAGE = "Job output sanitation failed.";
|
|
5
|
+
/**
|
|
6
|
+
* Fixed, input-independent error raised when output sanitation fails.
|
|
7
|
+
*
|
|
8
|
+
* The original sanitizer error is deliberately not attached because its
|
|
9
|
+
* message or cause may include the value that was being sanitized.
|
|
10
|
+
*/
|
|
11
|
+
export class JobOutputSanitationError extends Error {
|
|
12
|
+
constructor() {
|
|
13
|
+
super(JOB_OUTPUT_SANITATION_FAILURE_MESSAGE);
|
|
14
|
+
this.name = "JobOutputSanitationError";
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
function compileRegExpFlags(flags) {
|
|
18
|
+
// A redaction rule always scans the full string. `lastIndex`, `g`, and `y`
|
|
19
|
+
// therefore cannot make matching depend on prior calls or an initial offset.
|
|
20
|
+
return `${flags.replaceAll("g", "").replaceAll("y", "")}g`;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Create a deterministic string redactor from ordered exact and RegExp rules.
|
|
24
|
+
*
|
|
25
|
+
* Rules run in map insertion order and each rule receives the result of the
|
|
26
|
+
* previous rule. Exact strings are replaced everywhere. RegExp rules replace
|
|
27
|
+
* every match regardless of their original `g`, `y`, or `lastIndex` state.
|
|
28
|
+
* Replacement strings are always literal, so `$&`, `$1`, and `$$` have no
|
|
29
|
+
* special meaning. The rules are snapshotted when this function is called.
|
|
30
|
+
*/
|
|
31
|
+
export function createJobOutputRedactor(rules) {
|
|
32
|
+
const compiled = [];
|
|
33
|
+
let index = 0;
|
|
34
|
+
for (const [matcher, configuredReplacement] of rules) {
|
|
35
|
+
index++;
|
|
36
|
+
const replacement = configuredReplacement === true
|
|
37
|
+
? DEFAULT_JOB_OUTPUT_REDACTION
|
|
38
|
+
: configuredReplacement;
|
|
39
|
+
if (typeof replacement !== "string") {
|
|
40
|
+
throw new TypeError(`Job output redaction rule ${index} has an invalid replacement.`);
|
|
41
|
+
}
|
|
42
|
+
if (typeof matcher === "string") {
|
|
43
|
+
if (matcher.length === 0) {
|
|
44
|
+
throw new TypeError(`Job output redaction rule ${index} has an empty exact-string matcher.`);
|
|
45
|
+
}
|
|
46
|
+
compiled.push({ kind: "exact", replacement, search: matcher });
|
|
47
|
+
continue;
|
|
48
|
+
}
|
|
49
|
+
if (!(matcher instanceof RegExp)) {
|
|
50
|
+
throw new TypeError(`Job output redaction rule ${index} has an invalid matcher.`);
|
|
51
|
+
}
|
|
52
|
+
try {
|
|
53
|
+
compiled.push({
|
|
54
|
+
flags: compileRegExpFlags(matcher.flags),
|
|
55
|
+
kind: "regexp",
|
|
56
|
+
replacement,
|
|
57
|
+
source: matcher.source,
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
catch {
|
|
61
|
+
throw new TypeError(`Job output redaction rule ${index} has an invalid regular expression.`);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
return (value) => {
|
|
65
|
+
let sanitized = value;
|
|
66
|
+
for (const rule of compiled) {
|
|
67
|
+
if (rule.kind === "exact") {
|
|
68
|
+
sanitized = sanitized.split(rule.search).join(rule.replacement);
|
|
69
|
+
continue;
|
|
70
|
+
}
|
|
71
|
+
// Create a fresh matcher per application so no RegExp state can cross
|
|
72
|
+
// values, rules, executions, or concurrent consumers.
|
|
73
|
+
const matcher = new RegExp(rule.source, rule.flags);
|
|
74
|
+
sanitized = sanitized.replace(matcher, () => rule.replacement);
|
|
75
|
+
}
|
|
76
|
+
return sanitized;
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
/** @internal Apply a sanitizer while replacing all failures with a safe error. */
|
|
80
|
+
export function sanitizeJobOutputString(sanitizer, value) {
|
|
81
|
+
try {
|
|
82
|
+
const sanitized = sanitizer(value);
|
|
83
|
+
if (typeof sanitized !== "string") {
|
|
84
|
+
throw new JobOutputSanitationError();
|
|
85
|
+
}
|
|
86
|
+
return sanitized;
|
|
87
|
+
}
|
|
88
|
+
catch {
|
|
89
|
+
throw new JobOutputSanitationError();
|
|
90
|
+
}
|
|
91
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postal.d.ts","sourceRoot":"","sources":["../../../src/src/mail/postal.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AACjC,OAAO,EAAE,aAAa,EAA0B,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"postal.d.ts","sourceRoot":"","sources":["../../../src/src/mail/postal.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AACjC,OAAO,EAAE,aAAa,EAA0B,MAAM,aAAa,CAAC;AAKpE,OAAO,KAAK,EAEV,qBAAqB,EACrB,iBAAiB,EAElB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,CAAC,EAAE;QACL,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CACf,MAAM,EACN;YAAE,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAC;YAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;SAAE,CACjE,CAAC;QACF,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,KAAK,CAAC,EAAE;QACN,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,sBAAuB,SAAQ,UAAU;IACxD,GAAG,EAAE,MAAM,CAAC;CACb;AAED,qBAAa,sBAAuB,SAAQ,aAAa;IACvD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEZ,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;CAKxE;AAyDD,8EAA8E;AAC9E,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,0BAA0B,GAClC,iBAAiB,CAgFnB;AAoBD,0EAA0E;AAC1E,wBAAsB,4BAA4B,CAAC,OAAO,EAAE;IAC1D,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,SAAS,sBAAsB,EAAE,CAAC;CAC/C;;GAsDA;AA2DD,iFAAiF;AACjF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,qBAAqB,CA0BtE"}
|
package/esm/src/mail/postal.js
CHANGED
|
@@ -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
|
-
|
|
30
|
-
|
|
31
|
-
|
|
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":"
|
|
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"}
|
package/esm/src/mail/service.js
CHANGED
|
@@ -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:
|
|
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:
|
|
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,
|
|
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.
|
|
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": "
|
|
228
|
+
"gitCommit": "8a9f7427a837b39e6ff03a877a23be02f898730b"
|
|
229
229
|
},
|
|
230
230
|
"bin": {
|
|
231
231
|
"loom": "script/bin/loom.js"
|
|
@@ -324,6 +324,7 @@
|
|
|
324
324
|
"dependencies": {
|
|
325
325
|
"@mui/material": "9.2.0",
|
|
326
326
|
"@next/env": "^16.2.10",
|
|
327
|
+
"jsonc-parser": "^3.3.1",
|
|
327
328
|
"react": "19.2.7",
|
|
328
329
|
"react-dom": "19.2.7",
|
|
329
330
|
"tsx": "^4.23.1",
|