@kenkaiiii/gg-core 5.70.0 → 5.72.0

package/dist/index.cjs

@@ -150,6 +150,12 @@ function getAppPaths() {
   };
 }
 
+// src/oauth/request-timeout.ts
+var OAUTH_REQUEST_TIMEOUT_MS = 3e4;
+function oauthRequestSignal() {
+  return AbortSignal.timeout(OAUTH_REQUEST_TIMEOUT_MS);
+}
+
 // src/oauth/kimi.ts
 var CLIENT_ID = "17e5f671-d194-4dfb-9706-5516cb48c098";
 var DEFAULT_OAUTH_HOST = "https://auth.kimi.com";
@@ -237,7 +243,8 @@ async function postForm(endpoint, params) {
       "Content-Type": "application/x-www-form-urlencoded",
       Accept: "application/json"
     },
-    body: new URLSearchParams(params).toString()
+    body: new URLSearchParams(params).toString(),
+    signal: oauthRequestSignal()
   });
   let data = {};
   try {
@@ -625,7 +632,12 @@ async function postTokenRequest(body, label) {
   for (const url of TOKEN_URLS) {
     let response;
     try {
-      response = await fetch(url, { method: "POST", headers, body: encoded });
+      response = await fetch(url, {
+        method: "POST",
+        headers,
+        body: encoded,
+        signal: oauthRequestSignal()
+      });
     } catch (err) {
       lastError = err instanceof Error ? err : new Error(String(err));
       continue;
@@ -874,7 +886,8 @@ async function exchangeOpenAICode(code, verifier) {
       code,
       redirect_uri: REDIRECT_URI2,
       code_verifier: verifier
-    })
+    }),
+    signal: oauthRequestSignal()
   });
   if (!response.ok) {
     const text = await response.text();
@@ -895,7 +908,8 @@ async function refreshOpenAIToken(refreshToken) {
       grant_type: "refresh_token",
       refresh_token: refreshToken,
       client_id: CLIENT_ID3
-    })
+    }),
+    signal: oauthRequestSignal()
   });
   if (!response.ok) {
     const text = await response.text();
@@ -1105,7 +1119,8 @@ async function postTokenRequest2(body) {
   const response = await fetch(TOKEN_URL2, {
     method: "POST",
     headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams(body)
+    body: new URLSearchParams(body),
+    signal: oauthRequestSignal()
   });
   if (!response.ok) {
     const text = await response.text();
@@ -1234,7 +1249,8 @@ async function codeAssistGet(accessToken, operationName) {
 async function codeAssistRequest(url, accessToken, label, init) {
   const response = await fetch(url, {
     ...init,
-    headers: codeAssistHeaders(accessToken)
+    headers: codeAssistHeaders(accessToken),
+    signal: oauthRequestSignal()
   });
   if (!response.ok) {
     const text = await response.text();
@@ -1320,7 +1336,8 @@ async function postForm2(endpoint, params) {
       Accept: "application/json",
       "User-Agent": `grok-cli/${grokCliVersion()}`
     },
-    body: new URLSearchParams(params).toString()
+    body: new URLSearchParams(params).toString(),
+    signal: oauthRequestSignal()
   });
   let data = {};
   try {
@@ -3361,12 +3378,16 @@ async function fetchSubscriptionUsage(provider, credentials, options = {}) {
 
 // src/telegram.ts
 var TELEGRAM_API = "https://api.telegram.org";
+var LONG_POLL_SECONDS = 30;
+var API_TIMEOUT_MS = 3e4;
 var MAX_MESSAGE_LENGTH = 4096;
 var TelegramBot = class {
   token;
   allowedUserId;
   offset = 0;
   running = false;
+  /** Aborts the in-flight long poll so stop() takes effect immediately. */
+  pollAbort = null;
   onMessage = null;
   onVoiceMessage = null;
   onCallback = null;
@@ -3419,6 +3440,7 @@ var TelegramBot = class {
   /** Stop long polling. */
   stop() {
     this.running = false;
+    this.pollAbort?.abort();
   }
   /** Send a text message to a specific chat. Converts markdown and splits long messages. */
   async send(chatId, text, buttons) {
@@ -3465,12 +3487,26 @@ var TelegramBot = class {
   }
   // ── Private ───────────────────────────────────────────
   async getUpdates() {
-    const result = await this.apiCall("getUpdates", {
-      offset: this.offset,
-      timeout: 30,
-      allowed_updates: ["message", "callback_query", "my_chat_member"]
-    });
-    if (!result.ok || !Array.isArray(result.result)) return [];
+    const poll = new AbortController();
+    this.pollAbort = poll;
+    let result;
+    try {
+      result = await this.apiCall(
+        "getUpdates",
+        {
+          offset: this.offset,
+          timeout: LONG_POLL_SECONDS,
+          allowed_updates: ["message", "callback_query", "my_chat_member"]
+        },
+        // A half-open socket would otherwise hang the poll forever.
+        AbortSignal.any([poll.signal, AbortSignal.timeout((LONG_POLL_SECONDS + 15) * 1e3)])
+      );
+    } finally {
+      if (this.pollAbort === poll) this.pollAbort = null;
+    }
+    if (!result.ok || !Array.isArray(result.result)) {
+      throw new Error(`getUpdates failed: ${JSON.stringify(result)}`);
+    }
     const updates = result.result;
     if (updates.length > 0) {
       this.offset = updates[updates.length - 1].update_id + 1;
@@ -3518,12 +3554,13 @@ var TelegramBot = class {
       }
     }
   }
-  async apiCall(method, body) {
+  async apiCall(method, body, signal = AbortSignal.timeout(API_TIMEOUT_MS)) {
     const url = `${TELEGRAM_API}/bot${this.token}/${method}`;
     const response = await fetch(url, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: body ? JSON.stringify(body) : void 0
+      body: body ? JSON.stringify(body) : void 0,
+      signal
     });
     if (!response.ok) {
       return { ok: false };
@@ -3656,7 +3693,7 @@ function isModelLoaded() {
   return transcriber !== null;
 }
 async function transcribeVoice(fileUrl) {
-  const response = await fetch(fileUrl);
+  const response = await fetch(fileUrl, { signal: AbortSignal.timeout(6e4) });
   if (!response.ok) throw new Error(`Failed to download voice file: ${response.status}`);
   const buffer = new Uint8Array(await response.arrayBuffer());
   const pcm = await decodeOggOpus(buffer);