@songsid/agend 2.1.12-beta.9 → 2.2.0-alpha.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/README.md +2 -2
- package/README.zh-TW.md +2 -2
- package/dist/auth/one-time-code.d.ts +19 -0
- package/dist/auth/one-time-code.js +49 -0
- package/dist/auth/one-time-code.js.map +1 -0
- package/dist/auth-api.d.ts +52 -0
- package/dist/auth-api.js +346 -0
- package/dist/auth-api.js.map +1 -0
- package/dist/backend/claude-code.d.ts +4 -0
- package/dist/backend/claude-code.js +97 -0
- package/dist/backend/claude-code.js.map +1 -1
- package/dist/backend/codex.js +59 -30
- package/dist/backend/codex.js.map +1 -1
- package/dist/backend/kiro-agent.d.ts +66 -0
- package/dist/backend/kiro-agent.js +302 -0
- package/dist/backend/kiro-agent.js.map +1 -0
- package/dist/backend/kiro-identity.d.ts +80 -0
- package/dist/backend/kiro-identity.js +537 -0
- package/dist/backend/kiro-identity.js.map +1 -0
- package/dist/backend/kiro-v2-store-worker.d.ts +1 -0
- package/dist/backend/kiro-v2-store-worker.js +87 -0
- package/dist/backend/kiro-v2-store-worker.js.map +1 -0
- package/dist/backend/kiro-v2-store.d.ts +54 -0
- package/dist/backend/kiro-v2-store.js +131 -0
- package/dist/backend/kiro-v2-store.js.map +1 -0
- package/dist/backend/kiro-v3-identity.d.ts +5 -0
- package/dist/backend/kiro-v3-identity.js +22 -0
- package/dist/backend/kiro-v3-identity.js.map +1 -1
- package/dist/backend/kiro.d.ts +83 -7
- package/dist/backend/kiro.js +418 -91
- package/dist/backend/kiro.js.map +1 -1
- package/dist/backend/types.d.ts +45 -3
- package/dist/backend/types.js.map +1 -1
- package/dist/channel/adapters/discord.d.ts +1 -0
- package/dist/channel/adapters/discord.js +29 -10
- package/dist/channel/adapters/discord.js.map +1 -1
- package/dist/channel/adapters/telegram.d.ts +1 -0
- package/dist/channel/adapters/telegram.js +13 -1
- package/dist/channel/adapters/telegram.js.map +1 -1
- package/dist/channel/types.d.ts +9 -1
- package/dist/classic-channel-manager.d.ts +18 -10
- package/dist/classic-channel-manager.js +45 -18
- package/dist/classic-channel-manager.js.map +1 -1
- package/dist/cli.js +225 -127
- package/dist/cli.js.map +1 -1
- package/dist/command-table.d.ts +5 -3
- package/dist/command-table.js +29 -27
- package/dist/command-table.js.map +1 -1
- package/dist/config-validator.js +46 -0
- package/dist/config-validator.js.map +1 -1
- package/dist/config.js +12 -0
- package/dist/config.js.map +1 -1
- package/dist/connection-secrets.d.ts +6 -0
- package/dist/connection-secrets.js +4 -0
- package/dist/connection-secrets.js.map +1 -1
- package/dist/daemon.d.ts +89 -4
- package/dist/daemon.js +661 -77
- package/dist/daemon.js.map +1 -1
- package/dist/darwin-memory.d.ts +6 -1
- package/dist/darwin-memory.js +17 -6
- package/dist/darwin-memory.js.map +1 -1
- package/dist/delivery-consumed-watch.d.ts +85 -0
- package/dist/delivery-consumed-watch.js +244 -0
- package/dist/delivery-consumed-watch.js.map +1 -0
- package/dist/delivery-outbox.d.ts +61 -0
- package/dist/delivery-outbox.js +120 -2
- package/dist/delivery-outbox.js.map +1 -1
- package/dist/delivery-reconciliation.d.ts +14 -5
- package/dist/delivery-reconciliation.js +27 -4
- package/dist/delivery-reconciliation.js.map +1 -1
- package/dist/delivery-reconciliation.test.js +35 -1
- package/dist/delivery-reconciliation.test.js.map +1 -1
- package/dist/event-loop-watch.d.ts +28 -0
- package/dist/event-loop-watch.js +75 -3
- package/dist/event-loop-watch.js.map +1 -1
- package/dist/fleet-context.d.ts +22 -2
- package/dist/fleet-level-config.d.ts +2 -2
- package/dist/fleet-level-config.js +6 -1
- package/dist/fleet-level-config.js.map +1 -1
- package/dist/fleet-manager.d.ts +293 -12
- package/dist/fleet-manager.js +2364 -449
- package/dist/fleet-manager.js.map +1 -1
- package/dist/host-memory.d.ts +4 -0
- package/dist/host-memory.js.map +1 -1
- package/dist/instance-config-impact.js +5 -0
- package/dist/instance-config-impact.js.map +1 -1
- package/dist/instance-lifecycle.d.ts +10 -5
- package/dist/instance-lifecycle.js +162 -53
- package/dist/instance-lifecycle.js.map +1 -1
- package/dist/locale.js +150 -16
- package/dist/locale.js.map +1 -1
- package/dist/login-controller.d.ts +2 -0
- package/dist/login-controller.js +17 -5
- package/dist/login-controller.js.map +1 -1
- package/dist/memory-pressure.d.ts +7 -8
- package/dist/memory-pressure.js +76 -15
- package/dist/memory-pressure.js.map +1 -1
- package/dist/monotonic-budget.d.ts +2 -0
- package/dist/monotonic-budget.js +28 -0
- package/dist/monotonic-budget.js.map +1 -0
- package/dist/needs-you-hub.d.ts +114 -0
- package/dist/needs-you-hub.js +370 -0
- package/dist/needs-you-hub.js.map +1 -0
- package/dist/needs-you-live.d.ts +116 -0
- package/dist/needs-you-live.js +228 -0
- package/dist/needs-you-live.js.map +1 -0
- package/dist/needs-you.d.ts +132 -0
- package/dist/needs-you.js +164 -0
- package/dist/needs-you.js.map +1 -0
- package/dist/node-version-guard.d.ts +30 -0
- package/dist/node-version-guard.js +50 -0
- package/dist/node-version-guard.js.map +1 -0
- package/dist/operator-control-paths.d.ts +4 -0
- package/dist/operator-control-paths.js +24 -0
- package/dist/operator-control-paths.js.map +1 -0
- package/dist/outbound-handlers.d.ts +2 -0
- package/dist/outbound-handlers.js +9 -2
- package/dist/outbound-handlers.js.map +1 -1
- package/dist/outbound-schemas.d.ts +5 -5
- package/dist/profile-control.js +4 -20
- package/dist/profile-control.js.map +1 -1
- package/dist/public-web-gateway.d.ts +18 -0
- package/dist/public-web-gateway.js +141 -0
- package/dist/public-web-gateway.js.map +1 -0
- package/dist/public-web-link.d.ts +53 -0
- package/dist/public-web-link.js +175 -0
- package/dist/public-web-link.js.map +1 -0
- package/dist/quickstart-api.d.ts +8 -1
- package/dist/quickstart-api.js +86 -48
- package/dist/quickstart-api.js.map +1 -1
- package/dist/quickstart.d.ts +1 -0
- package/dist/quickstart.js +6 -2
- package/dist/quickstart.js.map +1 -1
- package/dist/scheduler/db.d.ts +7 -1
- package/dist/scheduler/db.js +38 -0
- package/dist/scheduler/db.js.map +1 -1
- package/dist/scheduler/index.d.ts +1 -1
- package/dist/scheduler/retry-label.d.ts +11 -0
- package/dist/scheduler/retry-label.js +24 -0
- package/dist/scheduler/retry-label.js.map +1 -0
- package/dist/scheduler/scheduler.d.ts +55 -2
- package/dist/scheduler/scheduler.js +220 -8
- package/dist/scheduler/scheduler.js.map +1 -1
- package/dist/scheduler/types.d.ts +22 -0
- package/dist/scheduler/types.js.map +1 -1
- package/dist/secret-store.d.ts +5 -0
- package/dist/secret-store.js +20 -0
- package/dist/secret-store.js.map +1 -1
- package/dist/service-activation.d.ts +110 -0
- package/dist/service-activation.js +302 -0
- package/dist/service-activation.js.map +1 -0
- package/dist/service-installer.d.ts +7 -0
- package/dist/service-installer.js +7 -4
- package/dist/service-installer.js.map +1 -1
- package/dist/service-restart-selection.d.ts +6 -5
- package/dist/service-restart-selection.js +6 -5
- package/dist/service-restart-selection.js.map +1 -1
- package/dist/settings-api.d.ts +10 -2
- package/dist/settings-api.js +175 -72
- package/dist/settings-api.js.map +1 -1
- package/dist/settings-baseline.d.ts +20 -0
- package/dist/settings-baseline.js +104 -0
- package/dist/settings-baseline.js.map +1 -0
- package/dist/settings-change.d.ts +21 -0
- package/dist/settings-change.js +133 -0
- package/dist/settings-change.js.map +1 -0
- package/dist/settings-confirmation.d.ts +105 -0
- package/dist/settings-confirmation.js +232 -0
- package/dist/settings-confirmation.js.map +1 -0
- package/dist/settings-control.d.ts +41 -0
- package/dist/settings-control.js +294 -0
- package/dist/settings-control.js.map +1 -0
- package/dist/settings-effect.d.ts +24 -0
- package/dist/settings-effect.js +169 -0
- package/dist/settings-effect.js.map +1 -0
- package/dist/settings-http-confirmation.d.ts +29 -0
- package/dist/settings-http-confirmation.js +123 -0
- package/dist/settings-http-confirmation.js.map +1 -0
- package/dist/settings-instance-patch.d.ts +4 -0
- package/dist/settings-instance-patch.js +26 -0
- package/dist/settings-instance-patch.js.map +1 -0
- package/dist/settings-request-capability.d.ts +16 -0
- package/dist/settings-request-capability.js +32 -0
- package/dist/settings-request-capability.js.map +1 -0
- package/dist/settings-transaction.d.ts +65 -0
- package/dist/settings-transaction.js +223 -0
- package/dist/settings-transaction.js.map +1 -0
- package/dist/setup-auth.d.ts +10 -18
- package/dist/setup-auth.js +14 -38
- package/dist/setup-auth.js.map +1 -1
- package/dist/setup-form.d.ts +1 -1
- package/dist/setup-form.js +75 -18
- package/dist/setup-form.js.map +1 -1
- package/dist/setup-guide.d.ts +13 -0
- package/dist/setup-guide.js +25 -0
- package/dist/setup-guide.js.map +1 -0
- package/dist/setup-host.d.ts +16 -0
- package/dist/setup-host.js +197 -32
- package/dist/setup-host.js.map +1 -1
- package/dist/setup-wizard.js +3 -0
- package/dist/setup-wizard.js.map +1 -1
- package/dist/slash-authz.d.ts +17 -3
- package/dist/slash-authz.js +5 -0
- package/dist/slash-authz.js.map +1 -1
- package/dist/spawn-gate.js +3 -3
- package/dist/spawn-gate.js.map +1 -1
- package/dist/statusline-watcher.d.ts +5 -0
- package/dist/statusline-watcher.js +2 -0
- package/dist/statusline-watcher.js.map +1 -1
- package/dist/steer-capability.d.ts +6 -0
- package/dist/steer-capability.js +8 -0
- package/dist/steer-capability.js.map +1 -1
- package/dist/sync-work-attribution.d.ts +14 -0
- package/dist/sync-work-attribution.js +43 -8
- package/dist/sync-work-attribution.js.map +1 -1
- package/dist/tips.js +10 -5
- package/dist/tips.js.map +1 -1
- package/dist/tmux-control.d.ts +35 -5
- package/dist/tmux-control.js +291 -57
- package/dist/tmux-control.js.map +1 -1
- package/dist/tmux-manager.d.ts +20 -6
- package/dist/tmux-manager.js +90 -47
- package/dist/tmux-manager.js.map +1 -1
- package/dist/tmux-read.d.ts +59 -0
- package/dist/tmux-read.js +213 -0
- package/dist/tmux-read.js.map +1 -0
- package/dist/topic-commands.d.ts +21 -10
- package/dist/topic-commands.js +191 -58
- package/dist/topic-commands.js.map +1 -1
- package/dist/transcript-delta-reader.js +2 -1
- package/dist/transcript-delta-reader.js.map +1 -1
- package/dist/tunnel/cloudflared-install.d.ts +2 -0
- package/dist/tunnel/cloudflared-install.js +1 -1
- package/dist/tunnel/cloudflared-install.js.map +1 -1
- package/dist/tunnel/purpose-lane.d.ts +14 -0
- package/dist/tunnel/purpose-lane.js +43 -0
- package/dist/tunnel/purpose-lane.js.map +1 -0
- package/dist/turn-reply-guard.d.ts +2 -0
- package/dist/turn-reply-guard.js +10 -1
- package/dist/turn-reply-guard.js.map +1 -1
- package/dist/types.d.ts +33 -0
- package/dist/ui/app.html +18 -0
- package/dist/ui/chat-render.js +478 -0
- package/dist/ui/chat-store.js +289 -0
- package/dist/ui/chat-strings.js +69 -0
- package/dist/ui/chat-thread.js +209 -0
- package/dist/ui/chat-tour.js +116 -0
- package/dist/ui/fleet-org.js +142 -0
- package/dist/ui/panel-chat.js +418 -0
- package/dist/ui/panel-fleet.js +413 -0
- package/dist/ui/panel-needs.js +202 -0
- package/dist/ui/panel-settings.js +750 -0
- package/dist/ui/preview.js +266 -0
- package/dist/ui/settings-apply.js +239 -0
- package/dist/ui/settings-confirm.js +186 -0
- package/dist/ui/settings-dialogs.js +546 -0
- package/dist/ui/settings-model.js +277 -0
- package/dist/ui/settings-strings.js +652 -0
- package/dist/ui/settings-wizard.js +140 -0
- package/dist/ui/shared/agend-auth.js +93 -0
- package/dist/ui/shared/app-ctx.js +80 -0
- package/dist/ui/shared/app-html.js +9 -0
- package/dist/ui/shared/app-i18n.js +95 -0
- package/dist/ui/shared/app-nav.js +73 -0
- package/dist/ui/shared/app-needs.js +114 -0
- package/dist/ui/shared/app-route.js +73 -0
- package/dist/ui/shared/app-session.js +66 -0
- package/dist/ui/shared/app-shell.js +344 -0
- package/dist/ui/shared/app-store.js +51 -0
- package/dist/ui/shared/app-stream.js +201 -0
- package/dist/ui/shared/app.css +676 -0
- package/dist/ui/shared/app.js +88 -0
- package/dist/ui/shared/fonts/OFL.txt +92 -0
- package/dist/ui/shared/fonts/README.md +21 -0
- package/dist/ui/shared/fonts/inter.woff2 +0 -0
- package/dist/ui/shared/htm.module.js +1 -0
- package/dist/ui/shared/panel-view.js +655 -0
- package/dist/ui/shared/preact-hooks.module.js +2 -0
- package/dist/ui/shared/preact.module.js +2 -0
- package/dist/ui/shared/signin.js +130 -0
- package/dist/ui/shared/theme.js +29 -0
- package/dist/ui/shared/tokens.css +153 -0
- package/dist/ui/shared/ui-confirm.js +43 -0
- package/dist/ui/shared/ui-dialog.js +45 -0
- package/dist/ui/shared/ui-icons.js +61 -0
- package/dist/ui/shared/ui-menu.js +39 -0
- package/dist/ui/shared/ui-states.js +20 -0
- package/dist/ui/shared/ui-toast.js +18 -0
- package/dist/ui/shared/vendor/htm.LICENSE +202 -0
- package/dist/ui/shared/vendor/preact.LICENSE +21 -0
- package/dist/ui/shared/vendor/vendor.json +39 -0
- package/dist/ui/shared/view-strings.js +309 -0
- package/dist/ui/signin.html +51 -0
- package/dist/update-check.d.ts +6 -2
- package/dist/update-check.js +12 -3
- package/dist/update-check.js.map +1 -1
- package/dist/update-install.d.ts +71 -0
- package/dist/update-install.js +162 -0
- package/dist/update-install.js.map +1 -0
- package/dist/upgrade-notices.d.ts +17 -0
- package/dist/upgrade-notices.js +93 -0
- package/dist/upgrade-notices.js.map +1 -0
- package/dist/usage/statusline-usage.d.ts +2 -0
- package/dist/usage/statusline-usage.js +14 -10
- package/dist/usage/statusline-usage.js.map +1 -1
- package/dist/view-api.d.ts +6 -1
- package/dist/view-api.js +62 -51
- package/dist/view-api.js.map +1 -1
- package/dist/web-api.d.ts +71 -14
- package/dist/web-api.js +492 -77
- package/dist/web-api.js.map +1 -1
- package/dist/web-auth.d.ts +71 -27
- package/dist/web-auth.js +169 -69
- package/dist/web-auth.js.map +1 -1
- package/dist/web-body.d.ts +3 -0
- package/dist/web-body.js +55 -0
- package/dist/web-body.js.map +1 -0
- package/dist/web-channel-echo.d.ts +9 -0
- package/dist/web-channel-echo.js +55 -0
- package/dist/web-channel-echo.js.map +1 -0
- package/dist/web-chat-history.d.ts +125 -0
- package/dist/web-chat-history.js +184 -0
- package/dist/web-chat-history.js.map +1 -0
- package/dist/web-continuation.d.ts +7 -0
- package/dist/web-continuation.js +22 -0
- package/dist/web-continuation.js.map +1 -0
- package/dist/web-host-guard.d.ts +34 -0
- package/dist/web-host-guard.js +57 -1
- package/dist/web-host-guard.js.map +1 -1
- package/dist/web-login.d.ts +72 -0
- package/dist/web-login.js +132 -0
- package/dist/web-login.js.map +1 -0
- package/dist/web-org.d.ts +55 -0
- package/dist/web-org.js +67 -0
- package/dist/web-org.js.map +1 -0
- package/dist/web-preview.d.ts +77 -0
- package/dist/web-preview.js +240 -0
- package/dist/web-preview.js.map +1 -0
- package/dist/web-request-context.d.ts +10 -0
- package/dist/web-request-context.js +13 -0
- package/dist/web-request-context.js.map +1 -0
- package/dist/web-session.d.ts +167 -0
- package/dist/web-session.js +389 -0
- package/dist/web-session.js.map +1 -0
- package/dist/web-shell-routes.d.ts +59 -0
- package/dist/web-shell-routes.js +96 -0
- package/dist/web-shell-routes.js.map +1 -0
- package/dist/web-upload.d.ts +183 -0
- package/dist/web-upload.js +468 -0
- package/dist/web-upload.js.map +1 -0
- package/dist/website-tips-renderer.d.ts +2 -2
- package/dist/website-tips-renderer.js +3 -3
- package/dist/website-tips-renderer.js.map +1 -1
- package/package.json +8 -5
- package/scripts/preinstall-guard.cjs +36 -0
- package/dist/ui/dashboard.html +0 -774
- package/dist/ui/settings.html +0 -2165
- package/dist/ui/view.html +0 -1139
|
@@ -3,6 +3,12 @@ import { randomUUID } from "node:crypto";
|
|
|
3
3
|
import { SchedulerDb } from "./db.js";
|
|
4
4
|
import { validateTimezone } from "../config.js";
|
|
5
5
|
export class Scheduler {
|
|
6
|
+
/** #1426: an attempt waiting for a reset time gives the window this long to settle before it looks again. */
|
|
7
|
+
static RETRY_RESET_GRACE_MS = 60_000;
|
|
8
|
+
/** #1426: with no reset time to wait for, the retry looks again this often. */
|
|
9
|
+
static RETRY_POLL_MS = 15 * 60_000;
|
|
10
|
+
/** #1426: a 5h window resets within 5h; past this a retry is given up even if no next occurrence comes first. */
|
|
11
|
+
static RETRY_MAX_WAIT_MS = 5 * 60 * 60_000 + 15 * 60_000;
|
|
6
12
|
/** Cap how far back we look for missed fires on init. Avoids dumping
|
|
7
13
|
* dozens of "morning standup" pings on the user after a long outage,
|
|
8
14
|
* while still recovering from short crashes/restarts. */
|
|
@@ -14,20 +20,30 @@ export class Scheduler {
|
|
|
14
20
|
db;
|
|
15
21
|
jobs = new Map();
|
|
16
22
|
oneShotTimers = new Map();
|
|
23
|
+
/** #1426: the timer of each schedule's pending retry. */
|
|
24
|
+
retryTimers = new Map();
|
|
25
|
+
/** #1426: schedules whose in-flight run is a retry, and a regular occurrence held until that run settles. */
|
|
26
|
+
runningRetry = new Set();
|
|
27
|
+
heldBehindRetry = new Map();
|
|
28
|
+
/** Set by shutdown: a callback settling afterwards must not touch the closed database. */
|
|
29
|
+
stopped = false;
|
|
30
|
+
onRetryDropped;
|
|
17
31
|
onTrigger;
|
|
18
32
|
config;
|
|
19
33
|
isValidInstance;
|
|
20
34
|
/** IDs of schedules whose onTrigger is currently in flight; guards against
|
|
21
35
|
* a manual trigger and a cron firing (or two cron fires) overlapping. */
|
|
22
36
|
executing = new Set();
|
|
23
|
-
constructor(dbPath, onTrigger, config, isValidInstance) {
|
|
37
|
+
constructor(dbPath, onTrigger, config, isValidInstance, onRetryDropped = () => { }) {
|
|
24
38
|
this.db = new SchedulerDb(dbPath);
|
|
25
39
|
this.onTrigger = onTrigger;
|
|
26
40
|
this.config = config;
|
|
27
41
|
this.isValidInstance = isValidInstance;
|
|
42
|
+
this.onRetryDropped = onRetryDropped;
|
|
28
43
|
}
|
|
29
44
|
init() {
|
|
30
45
|
this.db.pruneOldRuns();
|
|
46
|
+
// Catch-up first: an occurrence missed while the fleet was down supersedes the retry of an older one.
|
|
31
47
|
this.runCatchUp();
|
|
32
48
|
this.registerAllJobs();
|
|
33
49
|
}
|
|
@@ -83,6 +99,7 @@ export class Scheduler {
|
|
|
83
99
|
this.registerAllJobs();
|
|
84
100
|
}
|
|
85
101
|
shutdown() {
|
|
102
|
+
this.stopped = true;
|
|
86
103
|
this.stopAllJobs();
|
|
87
104
|
this.db.close();
|
|
88
105
|
}
|
|
@@ -134,7 +151,12 @@ export class Scheduler {
|
|
|
134
151
|
}
|
|
135
152
|
delete(id) {
|
|
136
153
|
this.stopJob(id);
|
|
137
|
-
this.
|
|
154
|
+
const retryTimer = this.retryTimers.get(id);
|
|
155
|
+
if (retryTimer) {
|
|
156
|
+
clearTimeout(retryTimer);
|
|
157
|
+
this.retryTimers.delete(id);
|
|
158
|
+
}
|
|
159
|
+
this.db.delete(id); // its pending retry goes with it (ON DELETE CASCADE)
|
|
138
160
|
}
|
|
139
161
|
trigger(id) {
|
|
140
162
|
const schedule = this.db.get(id);
|
|
@@ -147,10 +169,42 @@ export class Scheduler {
|
|
|
147
169
|
}
|
|
148
170
|
/** Invoke onTrigger while holding the per-schedule lock. Cleans up when
|
|
149
171
|
* the callback returns synchronously, throws, or settles a returned Promise. */
|
|
150
|
-
runWithLock(schedule, runId = randomUUID()) {
|
|
172
|
+
runWithLock(schedule, runId = randomUUID(), retry) {
|
|
173
|
+
// #1426: any other run of the schedule — its next occurrence, a catch-up, a manual trigger — supersedes a pending
|
|
174
|
+
// retry of an earlier occurrence: never run twice.
|
|
175
|
+
if (!retry) {
|
|
176
|
+
// …but the occurrence a pending retry already owns is not run again unlabelled: a one-shot timer after a restart,
|
|
177
|
+
// or croner re-firing it after the wall clock was set back across it (#1433 review). The retry runs it.
|
|
178
|
+
if (this.db.getRetry(schedule.id)?.run_id === runId)
|
|
179
|
+
return;
|
|
180
|
+
this.supersedeRetry(schedule, runId);
|
|
181
|
+
}
|
|
151
182
|
this.executing.add(schedule.id);
|
|
183
|
+
if (retry)
|
|
184
|
+
this.runningRetry.add(schedule.id);
|
|
152
185
|
const finish = (consumeOneShot = true) => {
|
|
153
186
|
this.executing.delete(schedule.id);
|
|
187
|
+
this.runningRetry.delete(schedule.id);
|
|
188
|
+
// A callback settling after shutdown touches nothing: the database is closed (#1433 review).
|
|
189
|
+
if (this.stopped)
|
|
190
|
+
return;
|
|
191
|
+
// #1426: a regular occurrence that came due while this retry was still running was held for it — it runs now.
|
|
192
|
+
const held = this.heldBehindRetry.get(schedule.id);
|
|
193
|
+
if (held !== undefined) {
|
|
194
|
+
this.heldBehindRetry.delete(schedule.id);
|
|
195
|
+
// The row is read in the callback itself, right before the run: a delete, disable or edit landing between this
|
|
196
|
+
// finish and the callback is honoured, never run from a stale copy (#1433 review).
|
|
197
|
+
queueMicrotask(() => {
|
|
198
|
+
if (this.stopped || this.executing.has(schedule.id))
|
|
199
|
+
return;
|
|
200
|
+
const current = this.db.get(schedule.id);
|
|
201
|
+
if (current?.enabled)
|
|
202
|
+
this.runWithLock(current, held);
|
|
203
|
+
});
|
|
204
|
+
}
|
|
205
|
+
// #1426: a one-shot whose run was deferred stays until its retry has run or been given up.
|
|
206
|
+
if (schedule.at && this.db.getRetry(schedule.id))
|
|
207
|
+
return;
|
|
154
208
|
if (schedule.at) {
|
|
155
209
|
// A one-shot is consumed after the delivery attempt settles, so
|
|
156
210
|
// onTrigger can still record its run while the parent row exists. If
|
|
@@ -181,7 +235,7 @@ export class Scheduler {
|
|
|
181
235
|
};
|
|
182
236
|
let result;
|
|
183
237
|
try {
|
|
184
|
-
result = this.onTrigger(schedule, runId);
|
|
238
|
+
result = this.onTrigger(schedule, runId, retry);
|
|
185
239
|
}
|
|
186
240
|
catch (err) {
|
|
187
241
|
finish(!schedule.silent);
|
|
@@ -207,15 +261,166 @@ export class Scheduler {
|
|
|
207
261
|
getRuns(scheduleId, limit) {
|
|
208
262
|
return this.db.getRuns(scheduleId, limit);
|
|
209
263
|
}
|
|
264
|
+
// ── #1426: the one retry of a rate-limit-deferred occurrence ──
|
|
265
|
+
getRetry(scheduleId) {
|
|
266
|
+
return this.db.getRetry(scheduleId);
|
|
267
|
+
}
|
|
268
|
+
/**
|
|
269
|
+
* Arrange the one retry of an occurrence the rate limit deferred: due at the window's reset (plus a grace) when the
|
|
270
|
+
* statusline gave one, else after RETRY_POLL_MS. It must come before its deadline — the schedule's next occurrence
|
|
271
|
+
* after this one, or RETRY_MAX_WAIT_MS — or there is no retry: the deadline's kind says why.
|
|
272
|
+
*/
|
|
273
|
+
deferForRetry(schedule, runId, deferral) {
|
|
274
|
+
const nowMs = deferral.nowMs ?? Date.now();
|
|
275
|
+
const next = this.nextOccurrenceAfter(schedule, runId, nowMs);
|
|
276
|
+
const cap = nowMs + Scheduler.RETRY_MAX_WAIT_MS;
|
|
277
|
+
const retry = {
|
|
278
|
+
schedule_id: schedule.id,
|
|
279
|
+
run_id: runId,
|
|
280
|
+
deferred_at_ms: nowMs,
|
|
281
|
+
deferred_pct: deferral.deferredPct,
|
|
282
|
+
resets_at_ms: deferral.resetsAtMs,
|
|
283
|
+
due_at_ms: this.retryDueAt(deferral.resetsAtMs, nowMs),
|
|
284
|
+
deadline_ms: next !== null && next < cap ? next : cap,
|
|
285
|
+
deadline_kind: next !== null && next < cap ? "next_occurrence" : "cap",
|
|
286
|
+
};
|
|
287
|
+
if (retry.due_at_ms >= retry.deadline_ms)
|
|
288
|
+
return { dropped: this.deadlineDrop(retry), retry };
|
|
289
|
+
this.db.putRetry(retry);
|
|
290
|
+
this.armRetry(retry);
|
|
291
|
+
return retry;
|
|
292
|
+
}
|
|
293
|
+
/**
|
|
294
|
+
* The retry found the limit still in force and must look again later (reset time unknown, or a new one learnt): the
|
|
295
|
+
* same retry, re-armed — unless that would reach its deadline, which ends it.
|
|
296
|
+
*/
|
|
297
|
+
postponeRetry(retry, resetsAtMs, nowMs = Date.now()) {
|
|
298
|
+
const next = { ...retry, resets_at_ms: resetsAtMs, due_at_ms: this.retryDueAt(resetsAtMs, nowMs) };
|
|
299
|
+
if (next.due_at_ms >= next.deadline_ms) {
|
|
300
|
+
this.endRetry(retry);
|
|
301
|
+
return { dropped: this.deadlineDrop(next), retry: next };
|
|
302
|
+
}
|
|
303
|
+
this.db.putRetry(next);
|
|
304
|
+
this.armRetry(next);
|
|
305
|
+
return next;
|
|
306
|
+
}
|
|
307
|
+
/**
|
|
308
|
+
* The retry is running now (or was given up by the caller): remove it, first — a crash after this loses the retry
|
|
309
|
+
* rather than running the occurrence twice. True when this call removed it. A one-shot it kept alive is consumed.
|
|
310
|
+
*/
|
|
311
|
+
endRetry(retry) {
|
|
312
|
+
const timer = this.retryTimers.get(retry.schedule_id);
|
|
313
|
+
if (timer) {
|
|
314
|
+
clearTimeout(timer);
|
|
315
|
+
this.retryTimers.delete(retry.schedule_id);
|
|
316
|
+
}
|
|
317
|
+
// A one-shot it kept alive is NOT consumed here: the run in progress (its finish) or the drop path does that, after
|
|
318
|
+
// its own bookkeeping — a parent row deleted first fails the run record's foreign key (#1433 review).
|
|
319
|
+
return this.db.deleteRetry(retry.schedule_id, retry.run_id);
|
|
320
|
+
}
|
|
321
|
+
retryDueAt(resetsAtMs, nowMs) {
|
|
322
|
+
return resetsAtMs !== null && resetsAtMs > nowMs ? resetsAtMs + Scheduler.RETRY_RESET_GRACE_MS : nowMs + Scheduler.RETRY_POLL_MS;
|
|
323
|
+
}
|
|
324
|
+
deadlineDrop(retry) {
|
|
325
|
+
return retry.deadline_kind === "next_occurrence" ? "superseded" : "expired";
|
|
326
|
+
}
|
|
327
|
+
/** The schedule's first regular occurrence after `runId` (a cron instant), at or after now; null for a one-shot. */
|
|
328
|
+
nextOccurrenceAfter(schedule, runId, nowMs) {
|
|
329
|
+
if (!schedule.cron)
|
|
330
|
+
return null;
|
|
331
|
+
try {
|
|
332
|
+
const cron = new Cron(schedule.cron, { timezone: schedule.timezone });
|
|
333
|
+
// From the deferred occurrence's own instant (its run id), not from now: a catch-up of 13:00 at 14:20 still has
|
|
334
|
+
// 14:00 as its boundary — already past, so no retry (#1433 review). A manual trigger's id is not an instant.
|
|
335
|
+
const fromMs = Date.parse(runId);
|
|
336
|
+
return cron.nextRun(new Date(Number.isFinite(fromMs) ? fromMs : nowMs))?.getTime() ?? null;
|
|
337
|
+
}
|
|
338
|
+
catch {
|
|
339
|
+
return null;
|
|
340
|
+
}
|
|
341
|
+
}
|
|
342
|
+
/** Another run of the schedule is starting: a pending retry of an earlier occurrence is superseded by it. */
|
|
343
|
+
supersedeRetry(schedule, runId) {
|
|
344
|
+
const pending = this.db.getRetry(schedule.id);
|
|
345
|
+
if (!pending || pending.run_id === runId)
|
|
346
|
+
return;
|
|
347
|
+
if (!this.endRetry(pending))
|
|
348
|
+
return;
|
|
349
|
+
// The run about to start keeps a one-shot's row until it settles; the bookkeeping below can still record into it.
|
|
350
|
+
this.reportDropped(schedule, pending, "superseded");
|
|
351
|
+
}
|
|
352
|
+
reportDropped(schedule, retry, reason) {
|
|
353
|
+
try {
|
|
354
|
+
this.onRetryDropped(schedule, retry, reason);
|
|
355
|
+
}
|
|
356
|
+
catch { /* the drop is already persisted; a failed notice must not break the timer or the run */ }
|
|
357
|
+
}
|
|
358
|
+
consumeOneShotAfterRetry(scheduleId) {
|
|
359
|
+
const schedule = this.db.get(scheduleId);
|
|
360
|
+
if (!schedule?.at || this.executing.has(scheduleId))
|
|
361
|
+
return;
|
|
362
|
+
this.stopJob(scheduleId);
|
|
363
|
+
try {
|
|
364
|
+
this.db.delete(scheduleId);
|
|
365
|
+
}
|
|
366
|
+
catch { /* scheduler may be shutting down */ }
|
|
367
|
+
}
|
|
368
|
+
armRetry(retry) {
|
|
369
|
+
const existing = this.retryTimers.get(retry.schedule_id);
|
|
370
|
+
if (existing)
|
|
371
|
+
clearTimeout(existing);
|
|
372
|
+
const delay = Math.max(0, retry.due_at_ms - Date.now());
|
|
373
|
+
const timer = setTimeout(() => {
|
|
374
|
+
this.retryTimers.delete(retry.schedule_id);
|
|
375
|
+
if (delay > Scheduler.MAX_TIMEOUT_MS) {
|
|
376
|
+
this.armRetry(retry);
|
|
377
|
+
return;
|
|
378
|
+
} // a long wait, in chunks
|
|
379
|
+
this.fireRetry(retry.schedule_id, retry.run_id);
|
|
380
|
+
}, Math.min(delay, Scheduler.MAX_TIMEOUT_MS));
|
|
381
|
+
this.retryTimers.set(retry.schedule_id, timer);
|
|
382
|
+
}
|
|
383
|
+
fireRetry(scheduleId, runId) {
|
|
384
|
+
const retry = this.db.getRetry(scheduleId);
|
|
385
|
+
if (!retry || retry.run_id !== runId)
|
|
386
|
+
return; // superseded or replaced meanwhile
|
|
387
|
+
const schedule = this.db.get(scheduleId);
|
|
388
|
+
if (!schedule || !schedule.enabled) {
|
|
389
|
+
this.endRetry(retry);
|
|
390
|
+
return;
|
|
391
|
+
}
|
|
392
|
+
if (Date.now() >= retry.deadline_ms) {
|
|
393
|
+
// A deadline reached while waiting (a clock jump, a long suspend): never run at or after it.
|
|
394
|
+
if (this.endRetry(retry)) {
|
|
395
|
+
this.reportDropped(schedule, retry, this.deadlineDrop(retry));
|
|
396
|
+
this.consumeOneShotAfterRetry(scheduleId);
|
|
397
|
+
}
|
|
398
|
+
return;
|
|
399
|
+
}
|
|
400
|
+
// The timer is monotonic, the due time wall clock: after the wall clock was set back, it is not due yet (#1433).
|
|
401
|
+
if (Date.now() < retry.due_at_ms) {
|
|
402
|
+
this.armRetry(retry);
|
|
403
|
+
return;
|
|
404
|
+
}
|
|
405
|
+
if (this.executing.has(scheduleId)) {
|
|
406
|
+
this.armRetry({ ...retry, due_at_ms: Date.now() + Scheduler.ONE_SHOT_FAILURE_RETRY_MS });
|
|
407
|
+
return;
|
|
408
|
+
}
|
|
409
|
+
this.runWithLock(schedule, retry.run_id, retry);
|
|
410
|
+
}
|
|
210
411
|
registerAllJobs() {
|
|
211
412
|
for (const schedule of this.db.list()) {
|
|
212
413
|
if (schedule.enabled) {
|
|
213
414
|
this.registerJob(schedule);
|
|
214
415
|
}
|
|
215
416
|
}
|
|
417
|
+
// #1426: pending retries survive a restart (and a reload): re-armed from what was persisted.
|
|
418
|
+
for (const retry of this.db.listRetries())
|
|
419
|
+
this.armRetry(retry);
|
|
216
420
|
}
|
|
217
421
|
registerJob(schedule) {
|
|
218
422
|
if (schedule.at) {
|
|
423
|
+
// (#1426: if its one occurrence was deferred, the pending retry owns it — runWithLock skips this timer's run.)
|
|
219
424
|
this.registerOneShot(schedule);
|
|
220
425
|
return;
|
|
221
426
|
}
|
|
@@ -225,14 +430,18 @@ export class Scheduler {
|
|
|
225
430
|
const current = this.db.get(schedule.id);
|
|
226
431
|
if (!current || !current.enabled)
|
|
227
432
|
return;
|
|
228
|
-
// Skip if a previous fire (or manual trigger) is still in flight —
|
|
229
|
-
// avoids overlapping runs of the same schedule.
|
|
230
|
-
if (this.executing.has(current.id))
|
|
231
|
-
return;
|
|
232
433
|
// currentRun() is callback wall-clock time, not the cron occurrence. A
|
|
233
434
|
// delayed callback must still use the scheduled instant so restart
|
|
234
435
|
// catch-up derives the same durable outbox key.
|
|
235
436
|
const runId = this.cronRunAtOrBefore(currentJob, new Date())?.toISOString() ?? null;
|
|
437
|
+
// Skip if a previous fire (or manual trigger) is still in flight —
|
|
438
|
+
// avoids overlapping runs of the same schedule. A RETRY in flight is not a reason to lose this occurrence
|
|
439
|
+
// (#1426): it is held and runs as soon as the retry settles (the retry stops at this occurrence, its deadline).
|
|
440
|
+
if (this.executing.has(current.id)) {
|
|
441
|
+
if (runId && this.runningRetry.has(current.id))
|
|
442
|
+
this.heldBehindRetry.set(current.id, runId);
|
|
443
|
+
return;
|
|
444
|
+
}
|
|
236
445
|
if (runId)
|
|
237
446
|
this.runWithLock(current, runId);
|
|
238
447
|
});
|
|
@@ -267,6 +476,9 @@ export class Scheduler {
|
|
|
267
476
|
for (const timer of this.oneShotTimers.values())
|
|
268
477
|
clearTimeout(timer);
|
|
269
478
|
this.oneShotTimers.clear();
|
|
479
|
+
for (const timer of this.retryTimers.values())
|
|
480
|
+
clearTimeout(timer);
|
|
481
|
+
this.retryTimers.clear();
|
|
270
482
|
}
|
|
271
483
|
registerOneShot(schedule, retryDelayMs = 0) {
|
|
272
484
|
const atMs = this.parseAt(schedule.at);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/scheduler/scheduler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/scheduler/scheduler.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,28 @@ export interface Schedule {
|
|
|
18
18
|
last_triggered_at: string | null;
|
|
19
19
|
last_status: string | null;
|
|
20
20
|
}
|
|
21
|
+
/**
|
|
22
|
+
* The one retry of an occurrence the 5h rate limit deferred (#1426), persisted so it survives a fleet restart. Times
|
|
23
|
+
* are wall clock (epoch ms): they must mean the same thing after a restart, and the cron occurrences they are compared
|
|
24
|
+
* with are wall-clock times too. The in-process wait to `due_at_ms` is a timer, i.e. monotonic.
|
|
25
|
+
*/
|
|
26
|
+
export interface ScheduleRetry {
|
|
27
|
+
schedule_id: string;
|
|
28
|
+
/** The deferred occurrence's stable run id (its scheduled instant): the retry delivers under the same id. */
|
|
29
|
+
run_id: string;
|
|
30
|
+
deferred_at_ms: number;
|
|
31
|
+
/** The 5h usage when it was deferred, for the label the agent sees. */
|
|
32
|
+
deferred_pct: number;
|
|
33
|
+
/** When the window that deferred it resets, when the statusline said; null = unknown (poll instead). */
|
|
34
|
+
resets_at_ms: number | null;
|
|
35
|
+
/** When the next attempt is due. */
|
|
36
|
+
due_at_ms: number;
|
|
37
|
+
/** It never runs at or after this: the next regular occurrence, or the wait cap when that comes first. */
|
|
38
|
+
deadline_ms: number;
|
|
39
|
+
/** Which of the two the deadline is. */
|
|
40
|
+
deadline_kind: "next_occurrence" | "cap";
|
|
41
|
+
}
|
|
42
|
+
export type ScheduleRetryDrop = "superseded" | "expired" | "deferred_again";
|
|
21
43
|
export interface ScheduleRun {
|
|
22
44
|
id: number;
|
|
23
45
|
schedule_id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/scheduler/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/scheduler/types.ts"],"names":[],"mappings":"AAqFA,MAAM,CAAC,MAAM,wBAAwB,GAAoB;IACvD,aAAa,EAAE,GAAG;IAClB,gBAAgB,EAAE,aAAa;IAC/B,WAAW,EAAE,CAAC;IACd,iBAAiB,EAAE,MAAM;CAC1B,CAAC"}
|
package/dist/secret-store.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ export interface SecretSnapshot {
|
|
|
4
4
|
content: string;
|
|
5
5
|
}
|
|
6
6
|
export interface SecretStoreOptions {
|
|
7
|
+
owner?: symbol;
|
|
7
8
|
/** A test seam; production uses fsync and atomic rename below. */
|
|
8
9
|
fsync?: (fd: number) => void;
|
|
9
10
|
}
|
|
@@ -12,7 +13,9 @@ export declare function upsertSecretEnvLine(existing: string, key: string, value
|
|
|
12
13
|
export declare class SecretStore {
|
|
13
14
|
readonly path: string;
|
|
14
15
|
private readonly allowedKeys;
|
|
16
|
+
private readonly owner?;
|
|
15
17
|
private readonly fsync;
|
|
18
|
+
private lastWrite?;
|
|
16
19
|
constructor(path: string, allowedKeys?: ReadonlySet<string>, opts?: SecretStoreOptions);
|
|
17
20
|
private rejectSymlink;
|
|
18
21
|
private validateKey;
|
|
@@ -21,5 +24,7 @@ export declare class SecretStore {
|
|
|
21
24
|
replace(content: string): void;
|
|
22
25
|
private fsyncDirectory;
|
|
23
26
|
restore(snapshot: SecretSnapshot): void;
|
|
27
|
+
/** Never compensate over a later in-process or independent host write. */
|
|
28
|
+
restoreIfCurrent(snapshot: SecretSnapshot): void;
|
|
24
29
|
write(key: string, value: string): SecretSnapshot;
|
|
25
30
|
}
|
package/dist/secret-store.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { assertSettingsLease, settingsFileResource, noteSettingsWrite, settingsFingerprint, settingsRevision } from "./settings-transaction.js";
|
|
1
2
|
/**
|
|
2
3
|
* Small, deliberately boring secret store for the running Settings API.
|
|
3
4
|
*
|
|
@@ -43,10 +44,14 @@ export function upsertSecretEnvLine(existing, key, value) {
|
|
|
43
44
|
export class SecretStore {
|
|
44
45
|
path;
|
|
45
46
|
allowedKeys;
|
|
47
|
+
owner;
|
|
46
48
|
fsync;
|
|
49
|
+
lastWrite;
|
|
47
50
|
constructor(path, allowedKeys = new Set(), opts = {}) {
|
|
48
51
|
this.path = path;
|
|
49
52
|
this.allowedKeys = allowedKeys;
|
|
53
|
+
this.owner = opts.owner;
|
|
54
|
+
assertSettingsLease(settingsFileResource(path), this.owner);
|
|
50
55
|
this.fsync = opts.fsync ?? fsyncSync;
|
|
51
56
|
mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
|
|
52
57
|
this.rejectSymlink(path);
|
|
@@ -80,6 +85,9 @@ export class SecretStore {
|
|
|
80
85
|
}
|
|
81
86
|
/** Atomic replacement; callers should retain snapshot() for rollback. */
|
|
82
87
|
replace(content) {
|
|
88
|
+
assertSettingsLease(settingsFileResource(this.path), this.owner);
|
|
89
|
+
const prior = this.snapshot();
|
|
90
|
+
noteSettingsWrite(this.path, prior.content, content);
|
|
83
91
|
this.rejectSymlink(this.path);
|
|
84
92
|
const dir = dirname(this.path);
|
|
85
93
|
const temp = join(dir, `.${this.path.split(/[\\/]/).pop() ?? "env"}.${process.pid}.${randomBytes(8).toString("hex")}.tmp`);
|
|
@@ -96,6 +104,7 @@ export class SecretStore {
|
|
|
96
104
|
this.rejectSymlink(temp);
|
|
97
105
|
renameSync(temp, this.path);
|
|
98
106
|
this.fsyncDirectory(dir);
|
|
107
|
+
this.lastWrite = { fingerprint: settingsFingerprint(this.snapshot()), revision: settingsRevision(this.path) };
|
|
99
108
|
}
|
|
100
109
|
catch (err) {
|
|
101
110
|
if (fd !== undefined) {
|
|
@@ -122,10 +131,12 @@ export class SecretStore {
|
|
|
122
131
|
}
|
|
123
132
|
}
|
|
124
133
|
restore(snapshot) {
|
|
134
|
+
assertSettingsLease(settingsFileResource(this.path), this.owner);
|
|
125
135
|
if (snapshot.exists)
|
|
126
136
|
this.replace(snapshot.content);
|
|
127
137
|
else {
|
|
128
138
|
this.rejectSymlink(this.path);
|
|
139
|
+
noteSettingsWrite(this.path, this.snapshot().content, undefined);
|
|
129
140
|
try {
|
|
130
141
|
unlinkSync(this.path);
|
|
131
142
|
}
|
|
@@ -141,7 +152,16 @@ export class SecretStore {
|
|
|
141
152
|
}
|
|
142
153
|
}
|
|
143
154
|
}
|
|
155
|
+
/** Never compensate over a later in-process or independent host write. */
|
|
156
|
+
restoreIfCurrent(snapshot) {
|
|
157
|
+
assertSettingsLease(settingsFileResource(this.path), this.owner);
|
|
158
|
+
if (!this.lastWrite || this.lastWrite.revision !== settingsRevision(this.path)
|
|
159
|
+
|| this.lastWrite.fingerprint !== settingsFingerprint(this.snapshot()))
|
|
160
|
+
throw new Error("secret rollback conflict");
|
|
161
|
+
this.restore(snapshot);
|
|
162
|
+
}
|
|
144
163
|
write(key, value) {
|
|
164
|
+
assertSettingsLease(settingsFileResource(this.path), this.owner);
|
|
145
165
|
this.validateKey(key);
|
|
146
166
|
if (!value || /[\r\n\0]/.test(value))
|
|
147
167
|
throw new Error("secret value is invalid");
|
package/dist/secret-store.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secret-store.js","sourceRoot":"","sources":["../src/secret-store.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EACL,SAAS,EAET,SAAS,EACT,SAAS,EACT,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,UAAU,EACV,SAAS,EACT,SAAS,GACV,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,CAAC,MAAM,cAAc,GAAG,gCAAgC,CAAC;AAC/D,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC;IAChC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY;CAChF,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"secret-store.js","sourceRoot":"","sources":["../src/secret-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Activating a verified install through its service manager (#1449 review r3).
|
|
3
|
+
*
|
|
4
|
+
* The update has proven an exact installed package: its bin target, and the Node that bin's shebang resolves to in the
|
|
5
|
+
* install environment (where the native probe ran). Before anything is stopped, the service manager's EFFECTIVE
|
|
6
|
+
* definition — what systemd has loaded (drop-ins and a failed reload included), what launchd has loaded — must start
|
|
7
|
+
* that exact bin, with `fleet start`, on that exact interpreter, with no environment that changes how Node runs. The
|
|
8
|
+
* disk file alone proves nothing: a drop-in can override `ExecStart`, a reload can fail, launchd keeps its cached job.
|
|
9
|
+
*
|
|
10
|
+
* Every manager command goes through an injected runner, so the sequences are testable without systemd or launchd.
|
|
11
|
+
*/
|
|
12
|
+
import type { CommandResult } from "./update-install.js";
|
|
13
|
+
/** What a manager would execute: the program, its full argv (argv[0] included), and the environment it sets. */
|
|
14
|
+
export interface ActivationTuple {
|
|
15
|
+
program: string;
|
|
16
|
+
argv: string[];
|
|
17
|
+
env: Record<string, string>;
|
|
18
|
+
}
|
|
19
|
+
/** The proven install. `bin` and `node` are realpaths. */
|
|
20
|
+
export interface VerifiedTarget {
|
|
21
|
+
bin: string;
|
|
22
|
+
node: string;
|
|
23
|
+
dir: string;
|
|
24
|
+
}
|
|
25
|
+
export interface TupleDeps {
|
|
26
|
+
realpath(path: string): string | null;
|
|
27
|
+
/** First line of a file, or null. */
|
|
28
|
+
readFirstLine(path: string): string | null;
|
|
29
|
+
/** Is `path` an executable regular file? */
|
|
30
|
+
isExecutable(path: string): boolean;
|
|
31
|
+
}
|
|
32
|
+
/** systemd's PATH when a unit sets none (systemd.exec, "Environment variables in spawned processes"). */
|
|
33
|
+
export declare const SYSTEMD_DEFAULT_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
|
|
34
|
+
/** launchd's PATH when a job sets none. */
|
|
35
|
+
export declare const LAUNCHD_DEFAULT_PATH = "/usr/bin:/bin:/usr/sbin:/sbin";
|
|
36
|
+
export interface LoadedUnit {
|
|
37
|
+
/** The one ExecStart, argv exactly as systemd holds it (lossless: D-Bus `as`, not `systemctl show`'s joined text). */
|
|
38
|
+
tuple: ActivationTuple;
|
|
39
|
+
needDaemonReload: boolean;
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* What systemd will execute for `unit`, read over D-Bus with `busctl --json=short` (#1449 review r4: `systemctl show`
|
|
43
|
+
* joins argv with spaces, so `"fleet start"` and `fleet start` print alike). The effective environment is the
|
|
44
|
+
* manager's environment, then the unit's `Environment=`, then `UnsetEnvironment=`. A unit that also reads
|
|
45
|
+
* `EnvironmentFile=` or uses `PassEnvironment=` cannot be proven from here: refused, never guessed.
|
|
46
|
+
*/
|
|
47
|
+
export declare function readLoadedUnit(run: (command: string, args: string[]) => CommandResult, user: boolean, unit: string): {
|
|
48
|
+
ok: true;
|
|
49
|
+
unit: LoadedUnit;
|
|
50
|
+
} | {
|
|
51
|
+
ok: false;
|
|
52
|
+
reason: string;
|
|
53
|
+
};
|
|
54
|
+
/** A launchd plist on disk → the tuple it would run (ProgramArguments; EnvironmentVariables). */
|
|
55
|
+
export declare function parsePlist(xml: string): ActivationTuple | null;
|
|
56
|
+
/** `launchctl print gui/<uid>/<label>` → the loaded tuple, its pid and state. */
|
|
57
|
+
export declare function parseLaunchctlPrint(text: string): {
|
|
58
|
+
tuple: ActivationTuple | null;
|
|
59
|
+
pid: number | null;
|
|
60
|
+
state: string | null;
|
|
61
|
+
};
|
|
62
|
+
/**
|
|
63
|
+
* Does this effective tuple start exactly the verified install? Two shapes are accepted:
|
|
64
|
+
* - the bin script itself (`<bin> fleet start`, what `agend install` writes today): its realpath is the verified bin,
|
|
65
|
+
* and the interpreter its shebang resolves to on the definition's PATH is the verified Node;
|
|
66
|
+
* - the interpreter explicitly (`<node> <bin> fleet start`, the private runtime's format): both realpaths verified.
|
|
67
|
+
* Anything else — another entry inside the same package, another checkout, extra arguments, NODE_OPTIONS — is not.
|
|
68
|
+
*/
|
|
69
|
+
export declare function tupleStartsVerified(tuple: ActivationTuple, verified: VerifiedTarget, _defaultPath: string, deps: TupleDeps): {
|
|
70
|
+
ok: true;
|
|
71
|
+
} | {
|
|
72
|
+
ok: false;
|
|
73
|
+
reason: string;
|
|
74
|
+
};
|
|
75
|
+
export type ServiceManager = {
|
|
76
|
+
kind: "systemd";
|
|
77
|
+
unit: string;
|
|
78
|
+
user: boolean;
|
|
79
|
+
} | {
|
|
80
|
+
kind: "launchd";
|
|
81
|
+
label: string;
|
|
82
|
+
plistPath: string;
|
|
83
|
+
domain: string;
|
|
84
|
+
} | {
|
|
85
|
+
kind: "detached";
|
|
86
|
+
};
|
|
87
|
+
export interface ActivationDeps extends TupleDeps {
|
|
88
|
+
run(command: string, args: string[]): CommandResult;
|
|
89
|
+
readFile(path: string): string | null;
|
|
90
|
+
writeFile(path: string, content: string): void;
|
|
91
|
+
/** `agend install --no-activate` through the verified binary. */
|
|
92
|
+
refresh(): CommandResult;
|
|
93
|
+
/** `agend restart` through the verified binary (systemd, detached). Returns its exit status. */
|
|
94
|
+
restart(): void;
|
|
95
|
+
log(message: string): void;
|
|
96
|
+
}
|
|
97
|
+
export type ActivationOutcome = {
|
|
98
|
+
ok: true;
|
|
99
|
+
via: "restart" | "launchd-activation";
|
|
100
|
+
} | {
|
|
101
|
+
ok: false;
|
|
102
|
+
message: string;
|
|
103
|
+
stopped: boolean;
|
|
104
|
+
};
|
|
105
|
+
/**
|
|
106
|
+
* Refresh, prove, activate. Nothing is stopped before the effective definition is proven, except where the manager's
|
|
107
|
+
* reload IS the activation (launchd: bootout + bootstrap of a RunAtLoad/KeepAlive job), which is done once, then
|
|
108
|
+
* proven, and rolled back to the preimage job if the proof fails.
|
|
109
|
+
*/
|
|
110
|
+
export declare function activateService(manager: ServiceManager, verified: VerifiedTarget, deps: ActivationDeps): ActivationOutcome;
|