@osolmaz/pi-workflows 0.13.1 → 0.13.3
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 +9 -7
- package/dist/builtins/autodoc.workflow.d.ts +5 -5
- package/dist/builtins/autoimplement.workflow.d.ts +69 -61
- package/dist/builtins/autoimplement.workflow.js +47 -8
- package/dist/builtins/autoimplement.workflow.js.map +1 -1
- package/dist/builtins/autoplan.workflow.d.ts +11 -5
- package/dist/builtins/autoplan.workflow.js +68 -32
- package/dist/builtins/autoplan.workflow.js.map +1 -1
- package/dist/builtins/catalog.js +4 -4
- package/dist/builtins/change-verification.workflow.d.ts +1 -1
- package/dist/builtins/plain-summary.workflow.d.ts +1 -1
- package/dist/builtins/plain-summary.workflow.js +35 -24
- package/dist/builtins/plain-summary.workflow.js.map +1 -1
- package/dist/builtins/plan-approval.workflow.d.ts +1 -1
- package/dist/builtins/plan-change.workflow.d.ts +25 -23
- package/dist/builtins/sanity-check.workflow.d.ts +3 -3
- package/dist/builtins/sanity-check.workflow.js +19 -22
- package/dist/builtins/sanity-check.workflow.js.map +1 -1
- package/dist/builtins/workspace-preparation.workflow.d.ts +1 -1
- package/dist/controllers/index.d.ts +2 -2
- package/dist/controllers/index.js.map +1 -1
- package/dist/controllers/sqlite.js +88 -61
- package/dist/controllers/sqlite.js.map +1 -1
- package/dist/controllers/types.d.ts +34 -0
- package/dist/controllers/workflow-engine-scheduler.d.ts +5 -1
- package/dist/controllers/workflow-engine-scheduler.js +83 -1
- package/dist/controllers/workflow-engine-scheduler.js.map +1 -1
- package/dist/controllers/workflows.d.ts +8 -1
- package/dist/controllers/workflows.js +36 -0
- package/dist/controllers/workflows.js.map +1 -1
- package/dist/extension/controller-host.d.ts +2 -1
- package/dist/extension/controller-host.js +1 -1
- package/dist/extension/controller-host.js.map +1 -1
- package/dist/extension/decision-channels.js +45 -7
- package/dist/extension/decision-channels.js.map +1 -1
- package/dist/extension/follow-up-coordinator.d.ts +27 -0
- package/dist/extension/follow-up-coordinator.js +131 -0
- package/dist/extension/follow-up-coordinator.js.map +1 -0
- package/dist/extension/index.d.ts +9 -0
- package/dist/extension/index.js +462 -76
- package/dist/extension/index.js.map +1 -1
- package/dist/extension/recorder.d.ts +1 -1
- package/dist/extension/recorder.js +8 -8
- package/dist/extension/recorder.js.map +1 -1
- package/dist/extension/session-events.d.ts +2 -3
- package/dist/extension/session-events.js +11 -10
- package/dist/extension/session-events.js.map +1 -1
- package/dist/extension/widget.js +9 -0
- package/dist/extension/widget.js.map +1 -1
- package/dist/state/database.d.ts +2 -1
- package/dist/state/database.js +11 -13
- package/dist/state/database.js.map +1 -1
- package/dist/state/json.js +6 -1
- package/dist/state/json.js.map +1 -1
- package/dist/state/mutation.d.ts +1 -1
- package/dist/state/mutation.js.map +1 -1
- package/dist/state/prune.d.ts +18 -0
- package/dist/state/prune.js +373 -0
- package/dist/state/prune.js.map +1 -0
- package/dist/state/schema.d.ts +1 -1
- package/dist/state/schema.js +130 -13
- package/dist/state/schema.js.map +1 -1
- package/dist/viewer/cli.d.ts +3 -1
- package/dist/viewer/cli.js +55 -4
- package/dist/viewer/cli.js.map +1 -1
- package/dist/viewer/render.js +19 -1
- package/dist/viewer/render.js.map +1 -1
- package/dist/viewer/session-reducer.d.ts +0 -1
- package/dist/viewer/session-reducer.js +2 -24
- package/dist/viewer/session-reducer.js.map +1 -1
- package/dist/workflows/composition.d.ts +2 -0
- package/dist/workflows/composition.js +15 -0
- package/dist/workflows/composition.js.map +1 -1
- package/dist/workflows/definition.d.ts +6 -3
- package/dist/workflows/definition.js +3 -0
- package/dist/workflows/definition.js.map +1 -1
- package/dist/workflows/engine.d.ts +6 -1
- package/dist/workflows/engine.js +303 -36
- package/dist/workflows/engine.js.map +1 -1
- package/dist/workflows/human-decision.d.ts +1 -0
- package/dist/workflows/human-decision.js +25 -9
- package/dist/workflows/human-decision.js.map +1 -1
- package/dist/workflows/index.d.ts +3 -1
- package/dist/workflows/index.js +2 -0
- package/dist/workflows/index.js.map +1 -1
- package/dist/workflows/json-patch.d.ts +47 -0
- package/dist/workflows/json-patch.js +298 -0
- package/dist/workflows/json-patch.js.map +1 -0
- package/dist/workflows/schema.js +29 -1
- package/dist/workflows/schema.js.map +1 -1
- package/dist/workflows/settings.d.ts +128 -0
- package/dist/workflows/settings.js +199 -0
- package/dist/workflows/settings.js.map +1 -0
- package/dist/workflows/store.d.ts +81 -3
- package/dist/workflows/store.js +1563 -50
- package/dist/workflows/store.js.map +1 -1
- package/dist/workflows/tool-input.d.ts +22 -0
- package/dist/workflows/tool-input.js +43 -0
- package/dist/workflows/tool-input.js.map +1 -1
- package/dist/workflows/types.d.ts +41 -6
- package/docs/2026-08-25-workflow-follow-ups.md +132 -0
- package/docs/2026-08-25-workflow-settings.md +169 -0
- package/docs/DEFERRED_TURNS.md +6 -0
- package/docs/DESIGN_PHILOSOPHY.md +2 -0
- package/docs/SQLITE_STATE.md +36 -17
- package/docs/WORKFLOW_COMPOSITION.md +15 -0
- package/docs/WORKFLOW_STEP_MESSAGES.md +4 -2
- package/docs/plans/2026-08-25-autoplan-user-intent-capture-plan.md +107 -0
- package/docs/plans/2026-08-25-live-workflow-settings-plan.md +532 -0
- package/docs/plans/2026-08-25-workflow-run-storage-plan.md +67 -0
- package/docs/session-event-journal.md +2 -3
- package/docs/tui-viewer.md +7 -6
- package/docs/workflows.md +58 -10
- package/examples/workflows/live-settings.workflow.ts +93 -0
- package/herdr-plugin.toml +1 -1
- package/package.json +1 -1
- package/src/builtins/autoimplement.workflow.ts +56 -8
- package/src/builtins/autoplan.workflow.ts +80 -32
- package/src/builtins/catalog.ts +4 -4
- package/src/builtins/plain-summary.workflow.ts +38 -40
- package/src/builtins/sanity-check.workflow.ts +19 -22
- package/src/controllers/index.ts +6 -0
- package/src/controllers/sqlite.ts +132 -72
- package/src/controllers/types.ts +40 -0
- package/src/controllers/workflow-engine-scheduler.ts +103 -1
- package/src/controllers/workflows.ts +68 -0
- package/src/extension/controller-host.ts +6 -1
- package/src/extension/decision-channels.ts +47 -7
- package/src/extension/follow-up-coordinator.ts +151 -0
- package/src/extension/index.ts +540 -89
- package/src/extension/recorder.ts +10 -8
- package/src/extension/session-events.ts +15 -13
- package/src/extension/widget.ts +8 -0
- package/src/state/database.ts +12 -12
- package/src/state/json.ts +6 -1
- package/src/state/mutation.ts +4 -1
- package/src/state/prune.ts +502 -0
- package/src/state/schema.ts +130 -13
- package/src/viewer/cli.ts +52 -5
- package/src/viewer/render.ts +43 -1
- package/src/viewer/session-reducer.ts +2 -29
- package/src/workflows/composition.ts +19 -0
- package/src/workflows/definition.ts +19 -5
- package/src/workflows/engine.ts +365 -36
- package/src/workflows/human-decision.ts +41 -11
- package/src/workflows/index.ts +43 -0
- package/src/workflows/json-patch.ts +375 -0
- package/src/workflows/schema.ts +31 -1
- package/src/workflows/settings.ts +430 -0
- package/src/workflows/store.ts +2268 -121
- package/src/workflows/tool-input.ts +58 -0
- package/src/workflows/types.ts +43 -5
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { WorkflowEngine } from "../workflows/engine.js";
|
|
2
2
|
import type { WorkflowRunStore } from "../workflows/store.js";
|
|
3
3
|
import type { WorkflowDefinition, WorkflowSource } from "../workflows/types.js";
|
|
4
|
-
import type {
|
|
4
|
+
import type { ControllerFollowUpResult, ControllerQueueFollowUpRequest, ControllerRemoveFollowUpRequest, ControllerSettingsChangeRequest, ControllerSettingsChangeResult } from "./types.js";
|
|
5
|
+
import type { ControllerWorkflowControlRequest, ControllerWorkflowScheduler, WorkflowSchedulerRequest, WorkflowSchedulerResult } from "./workflows.js";
|
|
5
6
|
export type ResolvedChildWorkflow = {
|
|
6
7
|
workflow: WorkflowDefinition;
|
|
7
8
|
workflowSource?: WorkflowSource;
|
|
@@ -21,5 +22,8 @@ export declare class WorkflowEngineScheduler implements ControllerWorkflowSchedu
|
|
|
21
22
|
private readonly active;
|
|
22
23
|
constructor(options: WorkflowEngineSchedulerOptions);
|
|
23
24
|
ensure(request: WorkflowSchedulerRequest, signal: AbortSignal, onComplete: (result: WorkflowSchedulerResult) => void): Promise<WorkflowSchedulerResult>;
|
|
25
|
+
changeSettings(request: ControllerWorkflowControlRequest<ControllerSettingsChangeRequest>, signal: AbortSignal): Promise<ControllerSettingsChangeResult>;
|
|
26
|
+
queueFollowUp(request: ControllerWorkflowControlRequest<ControllerQueueFollowUpRequest>, signal: AbortSignal): Promise<ControllerFollowUpResult>;
|
|
27
|
+
removeFollowUp(request: ControllerWorkflowControlRequest<ControllerRemoveFollowUpRequest>, signal: AbortSignal): Promise<ControllerFollowUpResult>;
|
|
24
28
|
waitForIdle(): Promise<void>;
|
|
25
29
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { compositionMetadata } from "../workflows/composition.js";
|
|
2
|
+
import { WorkflowEngine, workflowIdentityMismatch } from "../workflows/engine.js";
|
|
2
3
|
export class WorkflowEngineScheduler {
|
|
3
4
|
options;
|
|
4
5
|
active = new Map();
|
|
@@ -55,6 +56,87 @@ export class WorkflowEngineScheduler {
|
|
|
55
56
|
this.active.set(activeKey, { runId, promise });
|
|
56
57
|
return { state: "running", runId };
|
|
57
58
|
}
|
|
59
|
+
async changeSettings(request, signal) {
|
|
60
|
+
signal.throwIfAborted();
|
|
61
|
+
const bundle = this.options.store.readRun(request.runId);
|
|
62
|
+
if (bundle === null)
|
|
63
|
+
throw new Error(`Workflow run not found: ${request.runId}`);
|
|
64
|
+
const resolved = await this.options.resolveWorkflow(bundle.state.workflowName);
|
|
65
|
+
signal.throwIfAborted();
|
|
66
|
+
if (workflowIdentityMismatch(bundle.state, resolved.workflow, resolved.workflowSource)) {
|
|
67
|
+
throw new Error(`Workflow source changed since run ${request.runId} started`);
|
|
68
|
+
}
|
|
69
|
+
const scopes = this.options.store.listSettingsScopes(request.runId);
|
|
70
|
+
const scopeId = request.scopeId ?? (scopes.length === 1 ? scopes[0]?.scopeId : undefined);
|
|
71
|
+
if (scopeId === undefined) {
|
|
72
|
+
throw new Error("Controller settings changes require scopeId when several scopes exist");
|
|
73
|
+
}
|
|
74
|
+
const scope = this.options.store.getSettingsScope(scopeId);
|
|
75
|
+
if (scope === undefined || scope.activeRunId !== request.runId) {
|
|
76
|
+
throw new Error(`Workflow settings scope not found: ${scopeId}`);
|
|
77
|
+
}
|
|
78
|
+
const definition = scope.mountPath === ""
|
|
79
|
+
? resolved.workflow.settings
|
|
80
|
+
: compositionMetadata(resolved.workflow)?.scopes[scope.mountPath]?.settings;
|
|
81
|
+
if (definition === undefined) {
|
|
82
|
+
throw new Error(`Workflow scope ${scopeId} does not declare editable settings`);
|
|
83
|
+
}
|
|
84
|
+
const result = await this.options.store.changeSettings(definition, {
|
|
85
|
+
runId: request.runId,
|
|
86
|
+
scopeId,
|
|
87
|
+
requestId: request.actorRequestKey,
|
|
88
|
+
...(request.expectedChangeNumber !== undefined
|
|
89
|
+
? { expectedChangeNumber: request.expectedChangeNumber }
|
|
90
|
+
: {}),
|
|
91
|
+
actor: { type: "controller", id: request.controllerResourceUid },
|
|
92
|
+
source: "controller-request",
|
|
93
|
+
patch: request.patch,
|
|
94
|
+
});
|
|
95
|
+
return {
|
|
96
|
+
runId: request.runId,
|
|
97
|
+
scopeId,
|
|
98
|
+
changeNumber: result.scope.changeNumber,
|
|
99
|
+
adopted: result.adopted,
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
async queueFollowUp(request, signal) {
|
|
103
|
+
signal.throwIfAborted();
|
|
104
|
+
const targetSessionId = this.options.store.originSessionId(request.runId);
|
|
105
|
+
if (targetSessionId === undefined) {
|
|
106
|
+
throw new Error("Controller follow-up requires a workflow run with an origin Pi session");
|
|
107
|
+
}
|
|
108
|
+
const result = this.options.store.queueFollowUp({
|
|
109
|
+
runId: request.runId,
|
|
110
|
+
requestId: request.actorRequestKey,
|
|
111
|
+
targetSessionId,
|
|
112
|
+
actor: { type: "controller", id: request.controllerResourceUid },
|
|
113
|
+
source: "controller-request",
|
|
114
|
+
prompt: request.prompt,
|
|
115
|
+
});
|
|
116
|
+
return {
|
|
117
|
+
runId: request.runId,
|
|
118
|
+
followUpId: result.followUp.followUpId,
|
|
119
|
+
order: result.followUp.order,
|
|
120
|
+
state: result.followUp.state,
|
|
121
|
+
adopted: result.adopted,
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
async removeFollowUp(request, signal) {
|
|
125
|
+
signal.throwIfAborted();
|
|
126
|
+
const result = this.options.store.removeFollowUp({
|
|
127
|
+
runId: request.runId,
|
|
128
|
+
followUpId: request.followUpId,
|
|
129
|
+
actor: { type: "controller", id: request.controllerResourceUid },
|
|
130
|
+
source: "controller-request",
|
|
131
|
+
});
|
|
132
|
+
return {
|
|
133
|
+
runId: request.runId,
|
|
134
|
+
followUpId: result.followUpId,
|
|
135
|
+
order: result.order,
|
|
136
|
+
state: result.state,
|
|
137
|
+
adopted: false,
|
|
138
|
+
};
|
|
139
|
+
}
|
|
58
140
|
async waitForIdle() {
|
|
59
141
|
await Promise.all([...this.active.values()].map((entry) => entry.promise));
|
|
60
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-engine-scheduler.js","sourceRoot":"","sources":["../../src/controllers/workflow-engine-scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"workflow-engine-scheduler.js","sourceRoot":"","sources":["../../src/controllers/workflow-engine-scheduler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ControllerStore } from "./store.js";
|
|
2
|
-
import type { ChildWorkflowRecord, ChildWorkflowState, ControllerQueueClaim, ControllerResource, ControllerWorkflows } from "./types.js";
|
|
2
|
+
import type { ChildWorkflowRecord, ChildWorkflowState, ControllerFollowUpResult, ControllerQueueClaim, ControllerQueueFollowUpRequest, ControllerRemoveFollowUpRequest, ControllerResource, ControllerSettingsChangeRequest, ControllerSettingsChangeResult, ControllerWorkflows } from "./types.js";
|
|
3
3
|
export type WorkflowSchedulerRequest = {
|
|
4
4
|
requestId: string;
|
|
5
5
|
attempt: number;
|
|
@@ -12,8 +12,15 @@ export type WorkflowSchedulerResult = {
|
|
|
12
12
|
runId?: string;
|
|
13
13
|
error?: string;
|
|
14
14
|
};
|
|
15
|
+
export type ControllerWorkflowControlRequest<TRequest> = TRequest & {
|
|
16
|
+
controllerResourceUid: string;
|
|
17
|
+
actorRequestKey: string;
|
|
18
|
+
};
|
|
15
19
|
export interface ControllerWorkflowScheduler {
|
|
16
20
|
ensure(request: WorkflowSchedulerRequest, signal: AbortSignal, onComplete: (result: WorkflowSchedulerResult) => void): Promise<WorkflowSchedulerResult>;
|
|
21
|
+
changeSettings?(request: ControllerWorkflowControlRequest<ControllerSettingsChangeRequest>, signal: AbortSignal): Promise<ControllerSettingsChangeResult>;
|
|
22
|
+
queueFollowUp?(request: ControllerWorkflowControlRequest<ControllerQueueFollowUpRequest>, signal: AbortSignal): Promise<ControllerFollowUpResult>;
|
|
23
|
+
removeFollowUp?(request: ControllerWorkflowControlRequest<ControllerRemoveFollowUpRequest>, signal: AbortSignal): Promise<ControllerFollowUpResult>;
|
|
17
24
|
}
|
|
18
25
|
export declare class ControllerWorkflowCoordinator {
|
|
19
26
|
private readonly store;
|
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import { createRunId } from "../workflows/store.js";
|
|
2
2
|
import { jsonFingerprint } from "./json.js";
|
|
3
|
+
function controllerRequestKey(resource, requestKey) {
|
|
4
|
+
if (requestKey.trim().length === 0) {
|
|
5
|
+
throw new Error("Controller workflow requestKey must not be empty");
|
|
6
|
+
}
|
|
7
|
+
return `controller:${resource.metadata.uid}:${requestKey}`;
|
|
8
|
+
}
|
|
3
9
|
export class ControllerWorkflowCoordinator {
|
|
4
10
|
store;
|
|
5
11
|
scheduler;
|
|
@@ -10,6 +16,36 @@ export class ControllerWorkflowCoordinator {
|
|
|
10
16
|
forResource(resource, claim, signal) {
|
|
11
17
|
return {
|
|
12
18
|
ensure: async (request) => await this.ensure(resource, claim, request, signal),
|
|
19
|
+
changeSettings: async (request) => {
|
|
20
|
+
if (this.scheduler?.changeSettings === undefined) {
|
|
21
|
+
throw new Error("This controller host does not support workflow settings changes");
|
|
22
|
+
}
|
|
23
|
+
return await this.scheduler.changeSettings({
|
|
24
|
+
...request,
|
|
25
|
+
controllerResourceUid: resource.metadata.uid,
|
|
26
|
+
actorRequestKey: controllerRequestKey(resource, request.requestKey),
|
|
27
|
+
}, signal);
|
|
28
|
+
},
|
|
29
|
+
queueFollowUp: async (request) => {
|
|
30
|
+
if (this.scheduler?.queueFollowUp === undefined) {
|
|
31
|
+
throw new Error("This controller host does not support workflow follow-ups");
|
|
32
|
+
}
|
|
33
|
+
return await this.scheduler.queueFollowUp({
|
|
34
|
+
...request,
|
|
35
|
+
controllerResourceUid: resource.metadata.uid,
|
|
36
|
+
actorRequestKey: controllerRequestKey(resource, request.requestKey),
|
|
37
|
+
}, signal);
|
|
38
|
+
},
|
|
39
|
+
removeFollowUp: async (request) => {
|
|
40
|
+
if (this.scheduler?.removeFollowUp === undefined) {
|
|
41
|
+
throw new Error("This controller host does not support workflow follow-ups");
|
|
42
|
+
}
|
|
43
|
+
return await this.scheduler.removeFollowUp({
|
|
44
|
+
...request,
|
|
45
|
+
controllerResourceUid: resource.metadata.uid,
|
|
46
|
+
actorRequestKey: controllerRequestKey(resource, request.requestKey),
|
|
47
|
+
}, signal);
|
|
48
|
+
},
|
|
13
49
|
};
|
|
14
50
|
}
|
|
15
51
|
complete(requestId, result) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflows.js","sourceRoot":"","sources":["../../src/controllers/workflows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"workflows.js","sourceRoot":"","sources":["../../src/controllers/workflows.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ControllerManager, SqliteControllerStore, type AnyControllerDefinition, type ControllerResource, type WorkflowSchedulerRequest, type WorkflowSchedulerResult } from "../controllers/index.js";
|
|
1
|
+
import { ControllerManager, SqliteControllerStore, type AnyControllerDefinition, type ControllerResource, type ControllerWorkflowScheduler, type WorkflowSchedulerRequest, type WorkflowSchedulerResult } from "../controllers/index.js";
|
|
2
2
|
export type ParsedControllerArgs = {
|
|
3
3
|
kind: "list";
|
|
4
4
|
} | {
|
|
@@ -34,6 +34,7 @@ export declare class PiControllerHost {
|
|
|
34
34
|
static create(options: {
|
|
35
35
|
cwd: string;
|
|
36
36
|
startChild: PiChildWorkflowStarter;
|
|
37
|
+
workflowControls?: Pick<ControllerWorkflowScheduler, "changeSettings" | "queueFollowUp" | "removeFollowUp">;
|
|
37
38
|
}): Promise<PiControllerHost | undefined>;
|
|
38
39
|
start(): void;
|
|
39
40
|
stop(): Promise<void>;
|
|
@@ -52,7 +52,7 @@ export class PiControllerHost {
|
|
|
52
52
|
const manager = new ControllerManager({
|
|
53
53
|
store,
|
|
54
54
|
controllers: definitions,
|
|
55
|
-
workflowScheduler: { ensure: options.startChild },
|
|
55
|
+
workflowScheduler: { ensure: options.startChild, ...options.workflowControls },
|
|
56
56
|
});
|
|
57
57
|
return new PiControllerHost(definitions, store, manager);
|
|
58
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-host.js","sourceRoot":"","sources":["../../src/extension/controller-host.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACrB,yBAAyB,
|
|
1
|
+
{"version":3,"file":"controller-host.js","sourceRoot":"","sources":["../../src/extension/controller-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const TELEGRAM_TEXT_LIMIT = 4_096;
|
|
|
10
10
|
const PI_PRESENTATION_WINDOW_LINES = 18;
|
|
11
11
|
const DEFAULT_API_BASE = "https://api.telegram.org";
|
|
12
12
|
const LEASE_TTL_MS = 60_000;
|
|
13
|
+
const LEASE_RENEW_WINDOW_MS = 20_000;
|
|
13
14
|
const LEASE_RETRY_MS = 5_000;
|
|
14
15
|
const POLL_BACKOFF_MS = 1_000;
|
|
15
16
|
const MAX_SETTLEMENT_ATTEMPTS = 3;
|
|
@@ -259,6 +260,20 @@ class TelegramProjection {
|
|
|
259
260
|
}
|
|
260
261
|
}
|
|
261
262
|
acquire(now = Date.now()) {
|
|
263
|
+
const observed = this.lease();
|
|
264
|
+
const observedToken = tokenHash(this.token);
|
|
265
|
+
const ownedByThis = observed.ownerId === this.owner &&
|
|
266
|
+
observed.tokenHash !== null &&
|
|
267
|
+
observed.tokenHash.equals(observedToken) &&
|
|
268
|
+
observed.expiresAt !== null &&
|
|
269
|
+
observed.expiresAt > now;
|
|
270
|
+
if (ownedByThis) {
|
|
271
|
+
this.generation = observed.generation;
|
|
272
|
+
return true;
|
|
273
|
+
}
|
|
274
|
+
if (observed.ownerId !== null && observed.expiresAt !== null && observed.expiresAt > now) {
|
|
275
|
+
return false;
|
|
276
|
+
}
|
|
262
277
|
return this.state.transaction(() => {
|
|
263
278
|
const lease = this.lease();
|
|
264
279
|
if (lease.ownerId !== null &&
|
|
@@ -267,13 +282,16 @@ class TelegramProjection {
|
|
|
267
282
|
lease.expiresAt > now) {
|
|
268
283
|
return false;
|
|
269
284
|
}
|
|
270
|
-
const
|
|
285
|
+
const sameToken = lease.ownerId === this.owner &&
|
|
286
|
+
lease.tokenHash !== null &&
|
|
287
|
+
lease.tokenHash.equals(observedToken);
|
|
288
|
+
const generation = sameToken ? lease.generation : lease.generation + 1;
|
|
271
289
|
const result = this.state.connection
|
|
272
290
|
.prepare(`UPDATE leases
|
|
273
291
|
SET generation = ?, owner_type = 'channel', owner_id = ?, token_hash = ?,
|
|
274
292
|
acquired_at = COALESCE(acquired_at, ?), heartbeat_at = ?, expires_at = ?
|
|
275
293
|
WHERE resource_id = ? AND generation = ?`)
|
|
276
|
-
.run(generation, this.owner,
|
|
294
|
+
.run(generation, this.owner, observedToken, now, now, now + LEASE_TTL_MS, this.resourceId, lease.generation);
|
|
277
295
|
/* istanbul ignore if -- impossible after exact schema and transaction checks */
|
|
278
296
|
if (result.changes !== 1)
|
|
279
297
|
return false;
|
|
@@ -283,6 +301,17 @@ class TelegramProjection {
|
|
|
283
301
|
});
|
|
284
302
|
}
|
|
285
303
|
renew(now = Date.now()) {
|
|
304
|
+
const lease = this.lease();
|
|
305
|
+
if (lease.ownerId !== this.owner ||
|
|
306
|
+
lease.generation !== this.generation ||
|
|
307
|
+
lease.tokenHash === null ||
|
|
308
|
+
!lease.tokenHash.equals(tokenHash(this.token)) ||
|
|
309
|
+
lease.expiresAt === null ||
|
|
310
|
+
lease.expiresAt <= now) {
|
|
311
|
+
return false;
|
|
312
|
+
}
|
|
313
|
+
if (lease.expiresAt - now > LEASE_RENEW_WINDOW_MS)
|
|
314
|
+
return true;
|
|
286
315
|
return (this.state.connection
|
|
287
316
|
.prepare(`UPDATE leases SET heartbeat_at = ?, expires_at = ?
|
|
288
317
|
WHERE resource_id = ? AND owner_id = ? AND token_hash = ? AND generation = ?`)
|
|
@@ -807,11 +836,11 @@ export class TelegramDecisionChannel {
|
|
|
807
836
|
}
|
|
808
837
|
async poll(signal) {
|
|
809
838
|
while (this.running && !signal.aborted) {
|
|
810
|
-
if (!this.projection.acquire()) {
|
|
811
|
-
await wait(LEASE_RETRY_MS, signal);
|
|
812
|
-
continue;
|
|
813
|
-
}
|
|
814
839
|
try {
|
|
840
|
+
if (!this.projection.acquire()) {
|
|
841
|
+
await wait(leaseRetryDelay(), signal);
|
|
842
|
+
continue;
|
|
843
|
+
}
|
|
815
844
|
await this.deliverPendingRequests();
|
|
816
845
|
const result = await this.call("getUpdates", {
|
|
817
846
|
offset: this.projection.offset(),
|
|
@@ -831,7 +860,13 @@ export class TelegramDecisionChannel {
|
|
|
831
860
|
catch {
|
|
832
861
|
if (signal.aborted)
|
|
833
862
|
return;
|
|
834
|
-
|
|
863
|
+
try {
|
|
864
|
+
await wait(POLL_BACKOFF_MS, signal);
|
|
865
|
+
}
|
|
866
|
+
catch {
|
|
867
|
+
if (signal.aborted)
|
|
868
|
+
return;
|
|
869
|
+
}
|
|
835
870
|
}
|
|
836
871
|
}
|
|
837
872
|
}
|
|
@@ -1253,6 +1288,9 @@ async function writePrivateJson(filePath, value) {
|
|
|
1253
1288
|
await fsp.rename(temporary, filePath);
|
|
1254
1289
|
await fsp.chmod(filePath, 0o600);
|
|
1255
1290
|
}
|
|
1291
|
+
function leaseRetryDelay() {
|
|
1292
|
+
return LEASE_RETRY_MS + Math.floor(Math.random() * 1_000);
|
|
1293
|
+
}
|
|
1256
1294
|
async function wait(milliseconds, signal) {
|
|
1257
1295
|
await new Promise((resolve) => {
|
|
1258
1296
|
const timer = setTimeout(resolve, milliseconds);
|