@narumitw/pi-herdr 0.3.1 → 0.3.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.
@@ -108,7 +108,8 @@ export function createHerdrAgentStateExtension(options: HerdrAgentStateOptions =
108
108
  let metadataDrainTask: Promise<void> | undefined;
109
109
  let lastMetadataSnapshot: HerdrMetadataSnapshot | undefined;
110
110
  let metadataRefreshTimer: ReturnType<typeof setTimeout> | undefined;
111
- let shutdownClearController: AbortController | undefined;
111
+ const sessionReportTasks = new Set<Promise<void>>();
112
+ let shutdownController: AbortController | undefined;
112
113
  let shutdownSession: ExtensionContext["sessionManager"] | undefined;
113
114
  let shutdownTask: Promise<void> | undefined;
114
115
 
@@ -154,7 +155,7 @@ export function createHerdrAgentStateExtension(options: HerdrAgentStateOptions =
154
155
  function reportSession(sessionStartSource?: string): Promise<void> {
155
156
  const sessionRef = currentSessionRef();
156
157
  if (!sessionRef) return Promise.resolve();
157
- return safeSend(
158
+ const task = safeSend(
158
159
  {
159
160
  id: requestId("session"),
160
161
  method: "pane.report_agent_session",
@@ -169,6 +170,9 @@ export function createHerdrAgentStateExtension(options: HerdrAgentStateOptions =
169
170
  },
170
171
  sessionController.signal,
171
172
  );
173
+ sessionReportTasks.add(task);
174
+ void task.finally(() => sessionReportTasks.delete(task));
175
+ return task;
172
176
  }
173
177
 
174
178
  function stateRequest(state: QueuedState): HerdrRequest {
@@ -331,8 +335,10 @@ export function createHerdrAgentStateExtension(options: HerdrAgentStateOptions =
331
335
  const generation = ++sessionGeneration;
332
336
  const replaced = new DOMException("Herdr session replaced", "AbortError");
333
337
  sessionController.abort(replaced);
334
- shutdownClearController?.abort(replaced);
335
- shutdownClearController = undefined;
338
+ shutdownController?.abort(replaced);
339
+ shutdownController = undefined;
340
+ shutdownTask = undefined;
341
+ shutdownSession = undefined;
336
342
  if (metadataRefreshTimer) clearTimeout(metadataRefreshTimer);
337
343
  metadataRefreshTimer = undefined;
338
344
  queuedMetadata = undefined;
@@ -355,7 +361,12 @@ export function createHerdrAgentStateExtension(options: HerdrAgentStateOptions =
355
361
  const sessionReport = reportSession(event.reason);
356
362
  publishMetadata(ctx);
357
363
  await Promise.all([sessionReport, widgetStart]);
358
- if (generation !== sessionGeneration || sessionController.signal.aborted || !rootSession) {
364
+ if (
365
+ generation !== sessionGeneration ||
366
+ activeSession !== ctx.sessionManager ||
367
+ sessionController.signal.aborted ||
368
+ !rootSession
369
+ ) {
359
370
  return;
360
371
  }
361
372
  agentActive = !ctx.isIdle();
@@ -403,24 +414,30 @@ export function createHerdrAgentStateExtension(options: HerdrAgentStateOptions =
403
414
  sessionController.abort(new DOMException("Herdr session shut down", "AbortError"));
404
415
  queuedState = undefined;
405
416
  queuedMetadata = undefined;
406
- await Promise.allSettled([drainTask, metadataDrainTask, widget.shutdown(ctx)]);
407
- const stillOwnsShutdown = shutdownGeneration === sessionGeneration && activeSession === session && !rootSession;
408
- if (shouldClearMetadata && stillOwnsShutdown) {
417
+ await Promise.allSettled([...sessionReportTasks, drainTask, metadataDrainTask, widget.shutdown(ctx)]);
418
+ const stillOwnsShutdown = () =>
419
+ shutdownGeneration === sessionGeneration && activeSession === session && !rootSession;
420
+ if (shouldClearMetadata && stillOwnsShutdown()) {
409
421
  const controller = new AbortController();
410
- shutdownClearController = controller;
411
- await safeSend(
412
- createHerdrMetadataRequest({
413
- id: requestId(),
414
- paneId: environment.paneId,
415
- source: SOURCE,
416
- seq: nextReportSeq(),
417
- snapshot: createHerdrMetadataClearSnapshot(),
418
- }),
419
- controller.signal,
420
- );
421
- if (shutdownClearController === controller) shutdownClearController = undefined;
422
+ shutdownController = controller;
423
+ try {
424
+ await safeSend(
425
+ createHerdrMetadataRequest({
426
+ id: requestId(),
427
+ paneId: environment.paneId,
428
+ source: SOURCE,
429
+ seq: nextReportSeq(),
430
+ snapshot: createHerdrMetadataClearSnapshot(),
431
+ }),
432
+ controller.signal,
433
+ );
434
+ // Native identity and restore remain Herdr-owned. Official-source
435
+ // release is a no-op; clearing authority would delete restore data.
436
+ } finally {
437
+ if (shutdownController === controller) shutdownController = undefined;
438
+ }
422
439
  }
423
- if (shutdownGeneration !== sessionGeneration || activeSession !== session || rootSession) {
440
+ if (!stillOwnsShutdown()) {
424
441
  return;
425
442
  }
426
443
  lastMetadataSnapshot = undefined;
@@ -39,6 +39,9 @@ class NdjsonFrames {
39
39
  throw new Error("Herdr returned invalid JSON");
40
40
  }
41
41
  }
42
+ if (this.buffer.length > MAX_HERDR_FRAME_BYTES) {
43
+ throw new Error("Herdr response frame exceeded the size limit");
44
+ }
42
45
  return frames;
43
46
  }
44
47
  }
@@ -51,51 +54,33 @@ function abortReason(signal: AbortSignal): Error {
51
54
  return signal.reason instanceof Error ? signal.reason : new DOMException("Herdr request aborted", "AbortError");
52
55
  }
53
56
 
54
- function responseError(frame: Record<string, unknown>): Error | undefined {
55
- if (!isRecord(frame.error)) return undefined;
56
- const message = typeof frame.error.message === "string" ? frame.error.message : "request failed";
57
- return new Error(`Herdr ${message}`);
58
- }
59
-
60
- function sendRequestAttempt(
61
- socketEndpoint: string,
62
- request: HerdrRequest,
63
- timeoutMs: number,
64
- signal: AbortSignal,
65
- ): Promise<boolean> {
66
- if (signal.aborted) return Promise.resolve(false);
67
-
68
- return new Promise((resolve) => {
69
- let finished = false;
70
- let timeout: ReturnType<typeof setTimeout> | undefined;
71
- const socket = net.createConnection(socketEndpoint);
57
+ class HerdrApiError extends Error {
58
+ readonly code: string | undefined;
72
59
 
73
- const finish = (delivered: boolean) => {
74
- if (finished) return;
75
- finished = true;
76
- if (timeout) clearTimeout(timeout);
77
- signal.removeEventListener("abort", abort);
78
- socket.destroy();
79
- resolve(delivered);
80
- };
81
- const abort = () => finish(false);
60
+ constructor(error: Record<string, unknown>) {
61
+ super(`Herdr ${typeof error.message === "string" ? error.message : "request failed"}`);
62
+ this.code = typeof error.code === "string" ? error.code : undefined;
63
+ }
64
+ }
82
65
 
83
- signal.addEventListener("abort", abort, { once: true });
84
- socket.on("error", () => finish(false));
85
- socket.on("connect", () => socket.write(`${JSON.stringify(request)}\n`));
86
- socket.on("data", () => finish(true));
87
- socket.on("end", () => finish(false));
88
- socket.on("close", () => finish(false));
89
- timeout = setTimeout(() => finish(false), timeoutMs);
90
- timeout.unref?.();
91
- });
66
+ function responseError(frame: Record<string, unknown>): Error | undefined {
67
+ if (!("error" in frame)) return undefined;
68
+ if (!isRecord(frame.error)) return new Error("Herdr returned an invalid error response");
69
+ return new HerdrApiError(frame.error);
92
70
  }
93
71
 
94
72
  export function createBestEffortSender(socketEndpoint: string) {
95
73
  return async (request: HerdrRequest, signal: AbortSignal): Promise<void> => {
96
- if (await sendRequestAttempt(socketEndpoint, request, 500, signal)) return;
97
- if (signal.aborted) return;
98
- await sendRequestAttempt(socketEndpoint, request, 1500, signal);
74
+ for (const timeoutMs of [500, 1500]) {
75
+ if (signal.aborted) return;
76
+ try {
77
+ const result = await requestHerdr(socketEndpoint, request, signal, timeoutMs);
78
+ if (isRecord(result) && result.type === "ok") return;
79
+ } catch (error) {
80
+ // API rejection is not a transport outage. Do not repeat a rejected report.
81
+ if (signal.aborted || error instanceof HerdrApiError) return;
82
+ }
83
+ }
99
84
  };
100
85
  }
101
86
 
@@ -108,6 +93,7 @@ export function requestHerdr(
108
93
  if (signal.aborted) return Promise.reject(abortReason(signal));
109
94
 
110
95
  return new Promise((resolve, reject) => {
96
+ const payload = `${JSON.stringify(request)}\n`;
111
97
  const socket = net.createConnection(socketEndpoint);
112
98
  const parser = new NdjsonFrames();
113
99
  let finished = false;
@@ -129,11 +115,14 @@ export function requestHerdr(
129
115
  const abort = () => finish(abortReason(signal));
130
116
 
131
117
  signal.addEventListener("abort", abort, { once: true });
132
- socket.on("connect", () => socket.write(`${JSON.stringify(request)}\n`));
118
+ socket.on("connect", () => {
119
+ if (!finished) socket.write(payload);
120
+ });
133
121
  socket.on("error", (error) => finish(error));
134
122
  socket.on("end", () => finish(new Error("Herdr closed the request before responding")));
135
123
  socket.on("close", () => finish(new Error("Herdr request socket closed")));
136
124
  socket.on("data", (chunk: Buffer) => {
125
+ if (finished) return;
137
126
  try {
138
127
  for (const value of parser.push(chunk)) {
139
128
  if (!isRecord(value)) continue;
@@ -171,6 +160,7 @@ export async function openHerdrSubscription(
171
160
  ): Promise<HerdrSubscription> {
172
161
  if (signal.aborted) throw abortReason(signal);
173
162
 
163
+ const payload = `${JSON.stringify(request)}\n`;
174
164
  const socket = net.createConnection(socketEndpoint);
175
165
  const parser = new NdjsonFrames();
176
166
  const pendingEvents: unknown[] = [];
@@ -212,6 +202,7 @@ export async function openHerdrSubscription(
212
202
  else resolveClosed();
213
203
  };
214
204
  const deliver = (frame: unknown) => {
205
+ if (finished) return;
215
206
  try {
216
207
  onEvent(frame);
217
208
  } catch (error) {
@@ -224,27 +215,27 @@ export async function openHerdrSubscription(
224
215
  };
225
216
 
226
217
  signal.addEventListener("abort", abort, { once: true });
227
- socket.on("connect", () => socket.write(`${JSON.stringify(request)}\n`));
218
+ socket.on("connect", () => {
219
+ if (!finished) socket.write(payload);
220
+ });
228
221
  socket.on("error", (error) => finish(error));
229
222
  socket.on("end", () => finish(new Error("Herdr subscription closed")));
230
223
  socket.on("close", () => finish(new Error("Herdr subscription socket closed")));
231
224
  socket.on("data", (chunk: Buffer) => {
225
+ if (finished) return;
232
226
  try {
233
227
  for (const value of parser.push(chunk)) {
234
- if (!ready) {
235
- if (isRecord(value)) {
236
- const uncorrelatedError = responseError(value);
237
- if (uncorrelatedError && (value.id === "" || value.id === undefined)) {
238
- finish(uncorrelatedError);
239
- return;
240
- }
228
+ if (finished) return;
229
+ if (isRecord(value)) {
230
+ const error = responseError(value);
231
+ if (error && (value.id === request.id || value.id === "" || value.id === undefined)) {
232
+ finish(error);
233
+ return;
241
234
  }
235
+ if ("id" in value && value.id !== request.id) continue;
236
+ }
237
+ if (!ready) {
242
238
  if (isRecord(value) && value.id === request.id) {
243
- const error = responseError(value);
244
- if (error) {
245
- finish(error);
246
- return;
247
- }
248
239
  if (!isRecord(value.result) || value.result.type !== "subscription_started") {
249
240
  finish(new Error("Herdr returned an invalid subscription acknowledgement"));
250
241
  return;