@agentshouse/kit 0.1.0-alpha.2 → 0.1.0-alpha.21

package/src/telegram.js

@@ -863,20 +863,21 @@ async function onePass(gateway, activity, work) {
   try {
     await work(gateway);
   } catch (error) {
-    if (cancelled(error) || !(error instanceof KitRefusal)) throw error;
+    if (cancelled(error) || !(error instanceof KitRefusal) || error.code === "kit_update_draining") throw error;
     gateway.summary.failures.push({ activity, item: null, code: error.code });
   }
 }
 
 async function paceActivity(gateway, stopping, activity, work) {
   try {
-    for (let index = 0; index < gateway.passes; index += 1) {
+    for (let index = 0; index < gateway.passes && !gateway.draining; index += 1) {
       if (gateway.signal?.aborted === true) throw new KitRefusal("kit_command_cancelled");
       await onePass(gateway, activity, work);
       if (index + 1 < gateway.passes) await gateway.wait(TELEGRAM_GATEWAY_POLL_MS, gateway.signal);
     }
   } catch (error) {
-    stopping.abort();
+    if (error.code === "kit_update_draining") gateway.draining = true;
+    else stopping.abort();
     throw error;
   }
 }
@@ -955,22 +956,31 @@ async function proveOwner(gateway, token, telegramBotUserId) {
   throw new KitRefusal("telegram_owner_not_proven");
 }
 
-function gatewayContext(session, options, dependencies, signal, summary = emptySummary()) {
+function gatewayContext(session, options, signal, summary = emptySummary()) {
   return {
     session,
     directory: options.directory,
-    dependencies,
+    dependencies: session.dependencies,
     signal,
     gate: rateGate(() => session.now().getTime()),
-    wait: dependencies.wait ?? pause,
+    wait: session.dependencies.wait ?? pause,
     passes: options.passes ?? Number.POSITIVE_INFINITY,
+    draining: false,
     summary,
   };
 }
 
 export async function connectPersonalBot(options, dependencies = {}) {
   const session = await openSession(options, dependencies);
-  const gateway = gatewayContext(session, options, dependencies, options.signal);
+  return maintainControl(
+    session,
+    (signal) => connectBot(session, options, dependencies, signal),
+    options.signal,
+  );
+}
+
+async function connectBot(session, options, dependencies, signal) {
+  const gateway = gatewayContext(session, options, signal);
   const ask = dependencies.prompt ?? (() => askForToken(dependencies));
   const token = (await ask()).trim();
   if (token.length === 0) throw new KitRefusal("telegram_bot_token_required");
@@ -989,7 +999,7 @@ export async function connectPersonalBot(options, dependencies = {}) {
     owner_telegram_user_id: await proveOwner(gateway, token, identity.telegramBotUserId),
     has_topics_enabled: true,
   };
-  await writeOwned(tokenPath(options.directory), `${token}\n`, options.signal);
+  await writeOwned(tokenPath(options.directory), `${token}\n`, signal);
   try {
     await houseCall(gateway, "personal-bot", setup);
   } catch (error) {
@@ -1001,7 +1011,15 @@ export async function connectPersonalBot(options, dependencies = {}) {
 
 export async function disconnectPersonalBot(options, dependencies = {}) {
   const session = await openSession(options, dependencies);
-  const gateway = gatewayContext(session, options, dependencies, options.signal);
+  return maintainControl(
+    session,
+    (signal) => disconnectBot(session, options, signal),
+    options.signal,
+  );
+}
+
+async function disconnectBot(session, options, signal) {
+  const gateway = gatewayContext(session, options, signal);
   const directory = options.directory;
   const marked = await disconnecting(directory);
   let token = null;
@@ -1010,7 +1028,7 @@ export async function disconnectPersonalBot(options, dependencies = {}) {
   } catch (error) {
     if (!marked) throw error;
   }
-  if (!marked) await writeOwned(disconnectPath(directory), "{}\n", options.signal);
+  if (!marked) await writeOwned(disconnectPath(directory), "{}\n", signal);
   if (token !== null) {
     await telegramCall(gateway, token, "deleteWebhook", { drop_pending_updates: false });
     await Promise.all([
@@ -1032,7 +1050,7 @@ export async function serveTelegramGateway(options, dependencies = {}) {
       async (signal) => {
         const stopping = new AbortController();
         const shared = AbortSignal.any([signal, stopping.signal]);
-        const gateway = gatewayContext(session, options, dependencies, shared, summary);
+        const gateway = gatewayContext(session, options, shared, summary);
         summary.abandoned = abandonedOf(await houseCall(gateway, "deliveries/abandoned"));
         await serveActivities(gateway, stopping);
       },