@nopeek/agent-bridge 0.7.21 → 0.7.22
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/bot.d.ts +9 -0
- package/dist/bot.js +72 -1
- package/dist/bridge.d.ts +1 -1
- package/dist/bridge.js +1 -1
- package/package.json +1 -1
package/dist/bot.d.ts
CHANGED
|
@@ -64,6 +64,8 @@ export declare class BotRunner {
|
|
|
64
64
|
/** Fire-and-forget: runs the connect loop in the background, isolated. */
|
|
65
65
|
start(): void;
|
|
66
66
|
stop(): void;
|
|
67
|
+
/** Crash/restart must not leave Hermes running against a dead socket. */
|
|
68
|
+
private abortLiveTurns;
|
|
67
69
|
private mintSession;
|
|
68
70
|
/** Fetch (or refresh) the set of users allowed to talk to this bot. Called on
|
|
69
71
|
* connect and whenever a grant changes. Best-effort: on failure we keep the
|
|
@@ -96,6 +98,13 @@ export declare class BotRunner {
|
|
|
96
98
|
private ownerIsChannelMember;
|
|
97
99
|
private run;
|
|
98
100
|
private connectOnce;
|
|
101
|
+
/**
|
|
102
|
+
* A bridge restart mid-stream leaves `{streaming:true}` bubbles with a live
|
|
103
|
+
* caret forever. On connect, finalize our own orphan streams and tell the
|
|
104
|
+
* human we got cut off — Telegram never sits on a typing caret for hours.
|
|
105
|
+
*/
|
|
106
|
+
private settleAllOrphans;
|
|
107
|
+
private settleOrphanStreams;
|
|
99
108
|
/** Runtime sessions expire; reconnect with a fresh one shortly before that. */
|
|
100
109
|
private scheduleRefresh;
|
|
101
110
|
private reconnect;
|
package/dist/bot.js
CHANGED
|
@@ -8,7 +8,7 @@ import { FALLBACK_REPLY, resolveBrain } from "./brain.js";
|
|
|
8
8
|
import { beginTurn, finishTurn, lastTurnFor } from "./last-turn.js";
|
|
9
9
|
import { FileStore } from "./storage.js";
|
|
10
10
|
import { TurnPublisher } from "./tool-progress.js";
|
|
11
|
-
import { ChannelTurn, coalesceFollowups, isBotEcho, isStopRequest, wrapInterruptedFollowup, } from "./mid-turn.js";
|
|
11
|
+
import { ChannelTurn, coalesceFollowups, isBotEcho, isPlaceholderText, isStopRequest, wrapInterruptedFollowup, } from "./mid-turn.js";
|
|
12
12
|
import { buildInboundPrompt, describeStructured, hasInboundWork, isControlType, parseAttachments, saveInboundFiles, } from "./inbound-files.js";
|
|
13
13
|
const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
|
|
14
14
|
const MAX_BACKOFF_MS = 60_000;
|
|
@@ -116,6 +116,7 @@ export class BotRunner {
|
|
|
116
116
|
if (this.stopped)
|
|
117
117
|
return; // truly stopped (unpair) — never resurrect
|
|
118
118
|
this.lastForcedRestart = Date.now();
|
|
119
|
+
this.abortLiveTurns();
|
|
119
120
|
if (this.refreshTimer)
|
|
120
121
|
clearTimeout(this.refreshTimer);
|
|
121
122
|
this.refreshTimer = null;
|
|
@@ -143,6 +144,7 @@ export class BotRunner {
|
|
|
143
144
|
}
|
|
144
145
|
stop() {
|
|
145
146
|
this.stopped = true;
|
|
147
|
+
this.abortLiveTurns();
|
|
146
148
|
if (this.refreshTimer)
|
|
147
149
|
clearTimeout(this.refreshTimer);
|
|
148
150
|
try {
|
|
@@ -154,6 +156,13 @@ export class BotRunner {
|
|
|
154
156
|
this.np = null;
|
|
155
157
|
this.connected = false;
|
|
156
158
|
}
|
|
159
|
+
/** Crash/restart must not leave Hermes running against a dead socket. */
|
|
160
|
+
abortLiveTurns() {
|
|
161
|
+
for (const turn of this.turns.values()) {
|
|
162
|
+
if (turn.active)
|
|
163
|
+
turn.abort.abort();
|
|
164
|
+
}
|
|
165
|
+
}
|
|
157
166
|
async mintSession() {
|
|
158
167
|
const res = await fetch(`${this.pairing.apiUrl}/v1/apps/${this.pairing.appId}/bots/${this.info.userId}/runtime-session`, {
|
|
159
168
|
method: "POST",
|
|
@@ -401,6 +410,68 @@ export class BotRunner {
|
|
|
401
410
|
}));
|
|
402
411
|
await this.refreshAccess(); // load the allow list before we answer anyone
|
|
403
412
|
this.scheduleRefresh(session.expiresAt);
|
|
413
|
+
void this.settleAllOrphans();
|
|
414
|
+
}
|
|
415
|
+
/**
|
|
416
|
+
* A bridge restart mid-stream leaves `{streaming:true}` bubbles with a live
|
|
417
|
+
* caret forever. On connect, finalize our own orphan streams and tell the
|
|
418
|
+
* human we got cut off — Telegram never sits on a typing caret for hours.
|
|
419
|
+
*/
|
|
420
|
+
async settleAllOrphans() {
|
|
421
|
+
if (!this.np || this.stopped)
|
|
422
|
+
return;
|
|
423
|
+
let channels;
|
|
424
|
+
try {
|
|
425
|
+
channels = await this.np.channels.list();
|
|
426
|
+
}
|
|
427
|
+
catch (err) {
|
|
428
|
+
this.logErr(`orphan scan list failed: ${err.message}`);
|
|
429
|
+
return;
|
|
430
|
+
}
|
|
431
|
+
for (const ch of channels) {
|
|
432
|
+
if (this.stopped)
|
|
433
|
+
return;
|
|
434
|
+
if (this.turns.get(ch.channelId)?.active)
|
|
435
|
+
continue;
|
|
436
|
+
try {
|
|
437
|
+
const n = await this.settleOrphanStreams(ch);
|
|
438
|
+
if (n > 0) {
|
|
439
|
+
this.log(`${ch.channelId} finalized ${n} orphan stream(s)`);
|
|
440
|
+
await ch.send({
|
|
441
|
+
text: "I got cut off mid-turn. Send another message and I'll pick up.",
|
|
442
|
+
}).catch((err) => this.notePostFailure(ch.channelId, err));
|
|
443
|
+
}
|
|
444
|
+
}
|
|
445
|
+
catch (err) {
|
|
446
|
+
this.logErr(`orphan settle ${ch.channelId}: ${err.message}`);
|
|
447
|
+
}
|
|
448
|
+
}
|
|
449
|
+
}
|
|
450
|
+
async settleOrphanStreams(ch) {
|
|
451
|
+
try {
|
|
452
|
+
await ch.ensureKey();
|
|
453
|
+
}
|
|
454
|
+
catch {
|
|
455
|
+
return 0;
|
|
456
|
+
}
|
|
457
|
+
const recent = await ch.history({ limit: 40 });
|
|
458
|
+
let n = 0;
|
|
459
|
+
for (const m of recent) {
|
|
460
|
+
if (m.senderUserId !== this.info.userId)
|
|
461
|
+
continue;
|
|
462
|
+
const body = m.body;
|
|
463
|
+
if (!body || body.streaming !== true)
|
|
464
|
+
continue;
|
|
465
|
+
const text = typeof body.text === "string" ? body.text : "";
|
|
466
|
+
if (!text.trim() || isPlaceholderText(text)) {
|
|
467
|
+
await ch.recall(m.messageId).catch(() => { });
|
|
468
|
+
}
|
|
469
|
+
else {
|
|
470
|
+
await ch.edit(m.messageId, { text, streaming: false }).catch(() => { });
|
|
471
|
+
}
|
|
472
|
+
n += 1;
|
|
473
|
+
}
|
|
474
|
+
return n;
|
|
404
475
|
}
|
|
405
476
|
/** Runtime sessions expire; reconnect with a fresh one shortly before that. */
|
|
406
477
|
scheduleRefresh(expiresAt) {
|
package/dist/bridge.d.ts
CHANGED
package/dist/bridge.js
CHANGED
|
@@ -19,7 +19,7 @@ import { reportCapabilities } from "./capabilities.js";
|
|
|
19
19
|
import { lastHermesApiHealth, probeHermesApi } from "./hermes-http.js";
|
|
20
20
|
import { lastTurnGlobal, turnSnapshot } from "./last-turn.js";
|
|
21
21
|
import { isBrainBackend } from "./config.js";
|
|
22
|
-
export const VERSION = "0.7.
|
|
22
|
+
export const VERSION = "0.7.22";
|
|
23
23
|
function hermesApiStatus(cfg) {
|
|
24
24
|
const api = lastHermesApiHealth();
|
|
25
25
|
return {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nopeek/agent-bridge",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.22",
|
|
4
4
|
"description": "Run your own agents as E2EE NoPeek bots. Pairs with one-time codes (multiple accounts per computer), runs every bot each account owns, and pipes messages to any command or webhook.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|