@usejunior/email-core 0.5.0 → 0.5.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/dist/actions/compose-helpers.d.ts +29 -4
- package/dist/actions/compose-helpers.d.ts.map +1 -1
- package/dist/actions/compose-helpers.js +128 -9
- package/dist/actions/compose-helpers.js.map +1 -1
- package/dist/actions/draft-eligibility.d.ts +9 -0
- package/dist/actions/draft-eligibility.d.ts.map +1 -0
- package/dist/actions/draft-eligibility.js +38 -0
- package/dist/actions/draft-eligibility.js.map +1 -0
- package/dist/actions/draft.d.ts.map +1 -1
- package/dist/actions/draft.js +68 -66
- package/dist/actions/draft.js.map +1 -1
- package/dist/actions/registry.d.ts +20 -3
- package/dist/actions/registry.d.ts.map +1 -1
- package/dist/actions/registry.js.map +1 -1
- package/dist/actions/reply.d.ts +4 -0
- package/dist/actions/reply.d.ts.map +1 -1
- package/dist/actions/reply.js +8 -12
- package/dist/actions/reply.js.map +1 -1
- package/dist/actions/scheduling.js +2 -2
- package/dist/actions/scheduling.js.map +1 -1
- package/dist/actions/send.d.ts +4 -0
- package/dist/actions/send.d.ts.map +1 -1
- package/dist/actions/send.js +11 -20
- package/dist/actions/send.js.map +1 -1
- package/dist/content/outlook-list-hazards.d.ts +9 -0
- package/dist/content/outlook-list-hazards.d.ts.map +1 -0
- package/dist/content/outlook-list-hazards.js +140 -0
- package/dist/content/outlook-list-hazards.js.map +1 -0
- package/dist/content/outlook-lists.d.ts +5 -3
- package/dist/content/outlook-lists.d.ts.map +1 -1
- package/dist/content/outlook-lists.js +89 -7
- package/dist/content/outlook-lists.js.map +1 -1
- package/dist/index.d.ts +10 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/providers/provider.d.ts +22 -2
- package/dist/providers/provider.d.ts.map +1 -1
- package/dist/providers/provider.js +71 -16
- package/dist/providers/provider.js.map +1 -1
- package/dist/scheduled-workflow.d.ts +18 -0
- package/dist/scheduled-workflow.d.ts.map +1 -0
- package/dist/scheduled-workflow.js +40 -0
- package/dist/scheduled-workflow.js.map +1 -0
- package/dist/security/allowlist-policy.d.ts +15 -0
- package/dist/security/allowlist-policy.d.ts.map +1 -0
- package/dist/security/allowlist-policy.js +26 -0
- package/dist/security/allowlist-policy.js.map +1 -0
- package/dist/security/rate-reservation.d.ts +8 -0
- package/dist/security/rate-reservation.d.ts.map +1 -0
- package/dist/security/rate-reservation.js +25 -0
- package/dist/security/rate-reservation.js.map +1 -0
- package/dist/security/receive-allowlist.d.ts +3 -1
- package/dist/security/receive-allowlist.d.ts.map +1 -1
- package/dist/security/receive-allowlist.js +9 -12
- package/dist/security/receive-allowlist.js.map +1 -1
- package/dist/security/send-allowlist.d.ts +13 -5
- package/dist/security/send-allowlist.d.ts.map +1 -1
- package/dist/security/send-allowlist.js +51 -21
- package/dist/security/send-allowlist.js.map +1 -1
- package/dist/security/send-ledger.d.ts +14 -8
- package/dist/security/send-ledger.d.ts.map +1 -1
- package/dist/security/send-ledger.js +38 -16
- package/dist/security/send-ledger.js.map +1 -1
- package/dist/security/watched-allowlist.d.ts +18 -9
- package/dist/security/watched-allowlist.d.ts.map +1 -1
- package/dist/security/watched-allowlist.js +88 -72
- package/dist/security/watched-allowlist.js.map +1 -1
- package/dist/testing/mock-provider.d.ts +3 -1
- package/dist/testing/mock-provider.d.ts.map +1 -1
- package/dist/testing/mock-provider.js +26 -0
- package/dist/testing/mock-provider.js.map +1 -1
- package/dist/types.d.ts +38 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +2 -1
|
@@ -3,6 +3,8 @@
|
|
|
3
3
|
// Loaded at startup from config. No MCP tool to modify.
|
|
4
4
|
import { join } from 'node:path';
|
|
5
5
|
import { homedir } from 'node:os';
|
|
6
|
+
import { asAllowlistPolicy, loadAllowlistPolicy } from './allowlist-policy.js';
|
|
7
|
+
import { terminalRateReservation } from './rate-reservation.js';
|
|
6
8
|
function getAgentEmailHome() {
|
|
7
9
|
return process.env['EMAIL_AGENT_MCP_HOME']
|
|
8
10
|
?? join(homedir(), '.email-agent-mcp');
|
|
@@ -10,7 +12,9 @@ function getAgentEmailHome() {
|
|
|
10
12
|
/**
|
|
11
13
|
* Check if a recipient email address is allowed by the send allowlist.
|
|
12
14
|
*/
|
|
13
|
-
export function isAllowedRecipient(email,
|
|
15
|
+
export function isAllowedRecipient(email, input) {
|
|
16
|
+
const policy = asAllowlistPolicy(input);
|
|
17
|
+
const allowlist = policy.status === 'valid' ? policy.config : undefined;
|
|
14
18
|
if (!allowlist || allowlist.entries.length === 0) {
|
|
15
19
|
return false;
|
|
16
20
|
}
|
|
@@ -36,19 +40,11 @@ export function isAllowedRecipient(email, allowlist) {
|
|
|
36
40
|
}
|
|
37
41
|
/**
|
|
38
42
|
* Load send allowlist from a JSON file path.
|
|
43
|
+
* @deprecated Use loadAllowlistPolicy to distinguish absence from invalid policy.
|
|
39
44
|
*/
|
|
40
45
|
export async function loadSendAllowlist(filePath) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
try {
|
|
44
|
-
const { readFile } = await import('node:fs/promises');
|
|
45
|
-
const content = await readFile(filePath, 'utf-8');
|
|
46
|
-
const data = JSON.parse(content);
|
|
47
|
-
return { entries: data.entries ?? [] };
|
|
48
|
-
}
|
|
49
|
-
catch {
|
|
50
|
-
return undefined;
|
|
51
|
-
}
|
|
46
|
+
const policy = await loadAllowlistPolicy(filePath);
|
|
47
|
+
return policy.status === 'valid' ? policy.config : undefined;
|
|
52
48
|
}
|
|
53
49
|
/**
|
|
54
50
|
* Get the send allowlist file path from environment or config.
|
|
@@ -61,7 +57,11 @@ export function getSendAllowlistPath() {
|
|
|
61
57
|
* Validate all recipients against the send allowlist.
|
|
62
58
|
* Returns an error message if any recipient is blocked, or undefined if all are allowed.
|
|
63
59
|
*/
|
|
64
|
-
export function checkSendAllowlist(recipients,
|
|
60
|
+
export function checkSendAllowlist(recipients, input) {
|
|
61
|
+
const policy = asAllowlistPolicy(input);
|
|
62
|
+
if (policy.status === 'invalid')
|
|
63
|
+
return `Send allowlist invalid — all outbound email is disabled: ${policy.reason}`;
|
|
64
|
+
const allowlist = policy.status === 'valid' ? policy.config : undefined;
|
|
65
65
|
if (!allowlist || allowlist.entries.length === 0) {
|
|
66
66
|
return 'Send allowlist not configured — all outbound email is disabled';
|
|
67
67
|
}
|
|
@@ -74,28 +74,58 @@ export function checkSendAllowlist(recipients, allowlist) {
|
|
|
74
74
|
}
|
|
75
75
|
// Rate limiter implementation
|
|
76
76
|
export class SendRateLimiter {
|
|
77
|
-
|
|
77
|
+
now;
|
|
78
|
+
entries = new Set();
|
|
78
79
|
maxPerWindow;
|
|
79
80
|
windowMs;
|
|
80
|
-
|
|
81
|
+
// performance.now is monotonic: wall-clock corrections cannot reset quota.
|
|
82
|
+
// Injected clocks must also report monotonic elapsed milliseconds.
|
|
83
|
+
constructor(maxPerWindow = 50, windowMs = 3600000, now = () => performance.now()) {
|
|
84
|
+
this.now = now;
|
|
85
|
+
if (!Number.isSafeInteger(maxPerWindow) || maxPerWindow < 0)
|
|
86
|
+
throw new RangeError('Invalid rate capacity');
|
|
87
|
+
if (!Number.isFinite(windowMs) || windowMs <= 0)
|
|
88
|
+
throw new RangeError('Invalid rate window');
|
|
81
89
|
this.maxPerWindow = maxPerWindow;
|
|
82
90
|
this.windowMs = windowMs;
|
|
83
91
|
}
|
|
92
|
+
/** Atomically includes live reservations across every action on this instance. */
|
|
93
|
+
tryReserve(action) {
|
|
94
|
+
const check = this.checkLimit(action);
|
|
95
|
+
if (!check.allowed)
|
|
96
|
+
return { allowed: false, retryAfter: check.retryAfter };
|
|
97
|
+
const entry = {};
|
|
98
|
+
this.entries.add(entry);
|
|
99
|
+
return {
|
|
100
|
+
allowed: true,
|
|
101
|
+
lease: terminalRateReservation(() => { this.entries.delete(entry); }, () => { entry.consumedAt = this.now(); }),
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
/** @deprecated Observation only; use tryReserve to prevent check/record races. */
|
|
84
105
|
checkLimit(_action) {
|
|
85
106
|
this.cleanup();
|
|
86
|
-
if (this.
|
|
87
|
-
|
|
88
|
-
|
|
107
|
+
if (this.entries.size >= this.maxPerWindow) {
|
|
108
|
+
// Live reservations never expire. The window is polling guidance when
|
|
109
|
+
// capacity is zero or held entirely by unsettled requests.
|
|
110
|
+
let oldest = Infinity;
|
|
111
|
+
for (const entry of this.entries)
|
|
112
|
+
oldest = Math.min(oldest, entry.consumedAt ?? Infinity);
|
|
113
|
+
const retryAfter = Math.max(1, Math.ceil((Number.isFinite(oldest) ? oldest + this.windowMs - this.now() : this.windowMs) / 1000));
|
|
89
114
|
return { allowed: false, retryAfter };
|
|
90
115
|
}
|
|
91
116
|
return { allowed: true };
|
|
92
117
|
}
|
|
118
|
+
/** @deprecated Unconditional legacy accounting; prefer a reservation lease. */
|
|
93
119
|
recordUsage(_action) {
|
|
94
|
-
this.
|
|
120
|
+
this.cleanup();
|
|
121
|
+
this.entries.add({ consumedAt: this.now() });
|
|
95
122
|
}
|
|
96
123
|
cleanup() {
|
|
97
|
-
const cutoff =
|
|
98
|
-
|
|
124
|
+
const cutoff = this.now() - this.windowMs;
|
|
125
|
+
for (const entry of this.entries) {
|
|
126
|
+
if (entry.consumedAt !== undefined && entry.consumedAt <= cutoff)
|
|
127
|
+
this.entries.delete(entry);
|
|
128
|
+
}
|
|
99
129
|
}
|
|
100
130
|
}
|
|
101
131
|
//# sourceMappingURL=send-allowlist.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-allowlist.js","sourceRoot":"","sources":["../../src/security/send-allowlist.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAChE,mEAAmE;AACnE,wDAAwD;AAExD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"send-allowlist.js","sourceRoot":"","sources":["../../src/security/send-allowlist.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ export declare const DUPLICATE_SEND_WINDOW_ENV = "AGENT_EMAIL_DUPLICATE_SEND_WIN
|
|
|
10
10
|
* `allow_duplicate`.
|
|
11
11
|
*/
|
|
12
12
|
export declare const DEFAULT_DUPLICATE_SEND_WINDOW_MS: number;
|
|
13
|
-
/**
|
|
13
|
+
/** Soft ledger size cap. Oldest settled entries are evicted; pending leases stay. */
|
|
14
14
|
export declare const MAX_SEND_LEDGER_ENTRIES = 512;
|
|
15
15
|
export declare const DUPLICATE_SEND_IN_FLIGHT = "DUPLICATE_SEND_IN_FLIGHT";
|
|
16
16
|
export declare const DUPLICATE_SEND_BLOCKED = "DUPLICATE_SEND_BLOCKED";
|
|
@@ -33,6 +33,7 @@ export declare const DELIVERY_PROVEN_UNSENT_CODES: ReadonlySet<string>;
|
|
|
33
33
|
/** Whether a failure code proves nothing was delivered. */
|
|
34
34
|
export declare function isDeliveryProvenUnsent(code: string | undefined): boolean;
|
|
35
35
|
export type SendAttemptState = 'in-flight' | 'delivered' | 'unresolved';
|
|
36
|
+
export type SendLeaseState = 'reserved' | 'dispatched' | 'settled' | 'released';
|
|
36
37
|
export interface SendAttempt {
|
|
37
38
|
state: SendAttemptState;
|
|
38
39
|
/** Epoch ms when the attempt was claimed. */
|
|
@@ -47,11 +48,17 @@ export interface SendOutcome {
|
|
|
47
48
|
messageId?: string;
|
|
48
49
|
errorCode?: string;
|
|
49
50
|
}
|
|
50
|
-
/** A
|
|
51
|
+
/** A process-local lease. Terminal callbacks are idempotent: first terminal wins. */
|
|
51
52
|
export interface SendClaim {
|
|
52
53
|
ok: true;
|
|
53
54
|
fingerprint: string;
|
|
54
|
-
|
|
55
|
+
readonly leaseState: SendLeaseState;
|
|
56
|
+
/** Advance immediately before invoking the delivery/scheduling provider. */
|
|
57
|
+
markDispatched: () => void;
|
|
58
|
+
/**
|
|
59
|
+
* Record the terminal outcome, removing this attempt if proven unsent.
|
|
60
|
+
* Legacy adapter: a reserved claim can settle without markDispatched.
|
|
61
|
+
*/
|
|
55
62
|
settle: (outcome: SendOutcome) => void;
|
|
56
63
|
/**
|
|
57
64
|
* Drop the reservation without recording an attempt.
|
|
@@ -161,10 +168,9 @@ export declare class SendLedger {
|
|
|
161
168
|
/**
|
|
162
169
|
* Drop attempts past the window.
|
|
163
170
|
*
|
|
164
|
-
*
|
|
165
|
-
*
|
|
166
|
-
*
|
|
167
|
-
* direction: a throw after dispatch is precisely the ambiguous case.
|
|
171
|
+
* Live leases never age out: elapsed time cannot prove a provider request
|
|
172
|
+
* (or a preflight read) finished. Actions must release preflight failures and
|
|
173
|
+
* settle dispatch outcomes. Only settled evidence uses the retention window.
|
|
168
174
|
*/
|
|
169
175
|
private prune;
|
|
170
176
|
/**
|
|
@@ -175,7 +181,7 @@ export declare class SendLedger {
|
|
|
175
181
|
* single worst thing this module can do; and refusing a new claim because
|
|
176
182
|
* the ledger is full would block first-ever sends, which is worse still.
|
|
177
183
|
* So a burst of concurrent sends may briefly carry the map past the cap, and
|
|
178
|
-
*
|
|
184
|
+
* settled entries then age out on the ordinary TTL.
|
|
179
185
|
*/
|
|
180
186
|
private evictOverflow;
|
|
181
187
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-ledger.d.ts","sourceRoot":"","sources":["../../src/security/send-ledger.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEpE,eAAO,MAAM,yBAAyB,yCAAyC,CAAC;AAEhF;;;;;;;;GAQG;AACH,eAAO,MAAM,gCAAgC,QAAiB,CAAC;AAE/D,
|
|
1
|
+
{"version":3,"file":"send-ledger.d.ts","sourceRoot":"","sources":["../../src/security/send-ledger.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ export const DUPLICATE_SEND_WINDOW_ENV = 'AGENT_EMAIL_DUPLICATE_SEND_WINDOW_MS';
|
|
|
27
27
|
* `allow_duplicate`.
|
|
28
28
|
*/
|
|
29
29
|
export const DEFAULT_DUPLICATE_SEND_WINDOW_MS = 15 * 60 * 1000;
|
|
30
|
-
/**
|
|
30
|
+
/** Soft ledger size cap. Oldest settled entries are evicted; pending leases stay. */
|
|
31
31
|
export const MAX_SEND_LEDGER_ENTRIES = 512;
|
|
32
32
|
export const DUPLICATE_SEND_IN_FLIGHT = 'DUPLICATE_SEND_IN_FLIGHT';
|
|
33
33
|
export const DUPLICATE_SEND_BLOCKED = 'DUPLICATE_SEND_BLOCKED';
|
|
@@ -167,7 +167,17 @@ export class SendLedger {
|
|
|
167
167
|
*/
|
|
168
168
|
claim(fingerprint, opts = {}) {
|
|
169
169
|
if (!this.enabled) {
|
|
170
|
-
|
|
170
|
+
let state = 'reserved';
|
|
171
|
+
return {
|
|
172
|
+
ok: true, fingerprint,
|
|
173
|
+
get leaseState() { return state; },
|
|
174
|
+
markDispatched: () => { if (state === 'reserved')
|
|
175
|
+
state = 'dispatched'; },
|
|
176
|
+
settle: () => { if (state === 'reserved' || state === 'dispatched')
|
|
177
|
+
state = 'settled'; },
|
|
178
|
+
release: () => { if (state === 'reserved')
|
|
179
|
+
state = 'released'; },
|
|
180
|
+
};
|
|
171
181
|
}
|
|
172
182
|
this.prune();
|
|
173
183
|
if (!opts.force) {
|
|
@@ -175,12 +185,19 @@ export class SendLedger {
|
|
|
175
185
|
if (prior)
|
|
176
186
|
return { ok: false, fingerprint, prior };
|
|
177
187
|
}
|
|
178
|
-
const entry = {
|
|
188
|
+
const entry = {
|
|
189
|
+
id: this.nextId++, state: 'in-flight', leaseState: 'reserved', startedAt: this.now(),
|
|
190
|
+
};
|
|
179
191
|
this.insert(fingerprint, entry);
|
|
180
192
|
this.evictOverflow();
|
|
181
193
|
return {
|
|
182
194
|
ok: true,
|
|
183
195
|
fingerprint,
|
|
196
|
+
get leaseState() { return entry.leaseState; },
|
|
197
|
+
markDispatched: () => {
|
|
198
|
+
if (entry.leaseState === 'reserved')
|
|
199
|
+
entry.leaseState = 'dispatched';
|
|
200
|
+
},
|
|
184
201
|
settle: (outcome) => this.settle(fingerprint, entry, outcome),
|
|
185
202
|
release: () => this.release(fingerprint, entry),
|
|
186
203
|
};
|
|
@@ -243,7 +260,12 @@ export class SendLedger {
|
|
|
243
260
|
this.attempts.delete(fingerprint);
|
|
244
261
|
}
|
|
245
262
|
settle(fingerprint, entry, outcome) {
|
|
246
|
-
if (
|
|
263
|
+
if (entry.leaseState === 'settled' || entry.leaseState === 'released')
|
|
264
|
+
return;
|
|
265
|
+
// Compatibility adapter: legacy callers may settle without markDispatched.
|
|
266
|
+
// New delivery actions explicitly advance before invoking the provider.
|
|
267
|
+
entry.leaseState = 'settled';
|
|
268
|
+
if (!outcome.success && isDeliveryProvenUnsent(outcome.errorCode)) {
|
|
247
269
|
// Provably not delivered — this attempt stops blocking. Siblings are
|
|
248
270
|
// untouched: a rejected override must not clear the delivery it overrode.
|
|
249
271
|
this.remove(fingerprint, entry);
|
|
@@ -258,9 +280,8 @@ export class SendLedger {
|
|
|
258
280
|
else {
|
|
259
281
|
entry.state = 'unresolved';
|
|
260
282
|
}
|
|
261
|
-
//
|
|
262
|
-
//
|
|
263
|
-
// back rather than dropping it; its window now runs from settlement.
|
|
283
|
+
// clear() may have removed the entry while it was in flight. Its first
|
|
284
|
+
// terminal outcome is still evidence, retained from settlement time.
|
|
264
285
|
const entries = this.attempts.get(fingerprint);
|
|
265
286
|
if (!entries || !entries.includes(entry))
|
|
266
287
|
this.insert(fingerprint, entry);
|
|
@@ -269,21 +290,22 @@ export class SendLedger {
|
|
|
269
290
|
// Only a reservation that never reached the provider may be withdrawn. A
|
|
270
291
|
// settled attempt is real history, and a late release would hand a replay
|
|
271
292
|
// the delivery it was meant to be refused.
|
|
272
|
-
if (entry.
|
|
273
|
-
|
|
293
|
+
if (entry.leaseState !== 'reserved')
|
|
294
|
+
return;
|
|
295
|
+
entry.leaseState = 'released';
|
|
296
|
+
this.remove(fingerprint, entry);
|
|
274
297
|
}
|
|
275
298
|
/**
|
|
276
299
|
* Drop attempts past the window.
|
|
277
300
|
*
|
|
278
|
-
*
|
|
279
|
-
*
|
|
280
|
-
*
|
|
281
|
-
* direction: a throw after dispatch is precisely the ambiguous case.
|
|
301
|
+
* Live leases never age out: elapsed time cannot prove a provider request
|
|
302
|
+
* (or a preflight read) finished. Actions must release preflight failures and
|
|
303
|
+
* settle dispatch outcomes. Only settled evidence uses the retention window.
|
|
282
304
|
*/
|
|
283
305
|
prune() {
|
|
284
306
|
const cutoff = this.now() - this.windowMs;
|
|
285
307
|
for (const [fingerprint, entries] of this.attempts) {
|
|
286
|
-
const live = entries.filter(e =>
|
|
308
|
+
const live = entries.filter(e => e.leaseState !== 'settled' || e.settledAt > cutoff);
|
|
287
309
|
if (live.length === 0)
|
|
288
310
|
this.attempts.delete(fingerprint);
|
|
289
311
|
else if (live.length !== entries.length)
|
|
@@ -298,7 +320,7 @@ export class SendLedger {
|
|
|
298
320
|
* single worst thing this module can do; and refusing a new claim because
|
|
299
321
|
* the ledger is full would block first-ever sends, which is worse still.
|
|
300
322
|
* So a burst of concurrent sends may briefly carry the map past the cap, and
|
|
301
|
-
*
|
|
323
|
+
* settled entries then age out on the ordinary TTL.
|
|
302
324
|
*/
|
|
303
325
|
evictOverflow() {
|
|
304
326
|
while (this.size() > this.maxEntries) {
|
|
@@ -306,7 +328,7 @@ export class SendLedger {
|
|
|
306
328
|
let oldest;
|
|
307
329
|
for (const [fingerprint, entries] of this.attempts) {
|
|
308
330
|
for (const entry of entries) {
|
|
309
|
-
if (entry.
|
|
331
|
+
if (entry.leaseState !== 'settled')
|
|
310
332
|
continue;
|
|
311
333
|
if (!oldest || (entry.settledAt ?? entry.startedAt) < (oldest.settledAt ?? oldest.startedAt)) {
|
|
312
334
|
oldest = entry;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-ledger.js","sourceRoot":"","sources":["../../src/security/send-ledger.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,EAAE;AACF,8EAA8E;AAC9E,4EAA4E;AAC5E,4EAA4E;AAC5E,+EAA+E;AAC/E,yEAAyE;AACzE,0EAA0E;AAC1E,EAAE;AACF,+EAA+E;AAC/E,gFAAgF;AAChF,mEAAmE;AACnE,EAAE;AACF,0EAA0E;AAC1E,8EAA8E;AAC9E,6EAA6E;AAC7E,6EAA6E;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,MAAM,CAAC,MAAM,yBAAyB,GAAG,sCAAsC,CAAC;AAEhF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,gCAAgC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAE/D,
|
|
1
|
+
{"version":3,"file":"send-ledger.js","sourceRoot":"","sources":["../../src/security/send-ledger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,25 +1,34 @@
|
|
|
1
1
|
import { watch } from 'node:fs';
|
|
2
2
|
import type { AllowlistConfig } from '../actions/registry.js';
|
|
3
|
+
import { type AllowlistPolicy } from './allowlist-policy.js';
|
|
4
|
+
export type AllowlistLifecycle = 'unstarted' | 'starting' | 'active' | 'degraded' | 'closed';
|
|
5
|
+
type Loader = (path: string) => Promise<AllowlistPolicy | AllowlistConfig | undefined>;
|
|
3
6
|
export declare class WatchedAllowlist {
|
|
4
7
|
private readonly filePath;
|
|
5
8
|
private readonly loader;
|
|
6
9
|
private readonly debounceMs;
|
|
7
10
|
private readonly watchFactory;
|
|
8
|
-
private
|
|
11
|
+
private _policy;
|
|
12
|
+
private _lifecycle;
|
|
9
13
|
private _watcher;
|
|
10
14
|
private _debounceTimer;
|
|
11
|
-
|
|
12
|
-
|
|
15
|
+
private startPromise;
|
|
16
|
+
private reads;
|
|
17
|
+
private generation;
|
|
18
|
+
constructor(filePath: string, loader?: Loader, debounceMs?: number, watchFactory?: typeof watch);
|
|
19
|
+
get lifecycle(): AllowlistLifecycle;
|
|
20
|
+
get policy(): AllowlistPolicy;
|
|
21
|
+
/** @deprecated Permission checks must use policy to distinguish invalid from absent. */
|
|
13
22
|
get config(): AllowlistConfig | undefined;
|
|
14
|
-
/**
|
|
15
|
-
* Load initial config and start watching for changes.
|
|
16
|
-
* Startup order: mkdir → arm watch → load (eliminates race window).
|
|
17
|
-
*/
|
|
23
|
+
/** Concurrent callers share startup; closed watchers cannot restart. */
|
|
18
24
|
start(): Promise<void>;
|
|
19
|
-
|
|
25
|
+
private isCurrent;
|
|
26
|
+
private initialize;
|
|
20
27
|
close(): void;
|
|
28
|
+
private clearTimer;
|
|
21
29
|
private scheduleReload;
|
|
22
|
-
private
|
|
30
|
+
private enqueueRead;
|
|
23
31
|
private disableWatching;
|
|
24
32
|
}
|
|
33
|
+
export {};
|
|
25
34
|
//# sourceMappingURL=watched-allowlist.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watched-allowlist.d.ts","sourceRoot":"","sources":["../../src/security/watched-allowlist.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"watched-allowlist.d.ts","sourceRoot":"","sources":["../../src/security/watched-allowlist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAkB,MAAM,SAAS,CAAC;AAGhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAA0C,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAErG,MAAM,MAAM,kBAAkB,GAAG,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;AAC7F,KAAK,MAAM,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,eAAe,GAAG,eAAe,GAAG,SAAS,CAAC,CAAC;AAEvF,qBAAa,gBAAgB;IAUzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAEzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAb/B,OAAO,CAAC,OAAO,CAA0E;IACzF,OAAO,CAAC,UAAU,CAAmC;IACrD,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,cAAc,CAA4C;IAClE,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,KAAK,CAAoC;IACjD,OAAO,CAAC,UAAU,CAAK;gBAGJ,QAAQ,EAAE,MAAM,EAEhB,MAAM,GAAE,MAA4B,EACpC,UAAU,SAAM,EAChB,YAAY,GAAE,OAAO,KAAa;IAGrD,IAAI,SAAS,IAAI,kBAAkB,CAA4B;IAC/D,IAAI,MAAM,IAAI,eAAe,CAAyB;IAEtD,wFAAwF;IACxF,IAAI,MAAM,IAAI,eAAe,GAAG,SAAS,CAExC;IAED,wEAAwE;IACxE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAQtB,OAAO,CAAC,SAAS;YAIH,UAAU;IAqBxB,KAAK,IAAI,IAAI;IASb,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,WAAW;IAsBnB,OAAO,CAAC,eAAe;CAQxB"}
|