support guest mode

codebam · codebam · commit 779bf40a6420 · 2026-05-08T15:05:47.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
 	},
 	"version": "",
 	"dependencies": {
-		"@eslint/eslintrc": "^3.3.3"
+		"@eslint/eslintrc": "^3.3.3",
+		"wrangler": "^4.90.0"
 	}
 }
diff --git a/packages/main/src/main.ts b/packages/main/src/main.ts
@@ -9,6 +9,7 @@ import TelegramUser from './types/TelegramUser.js';
 import TelegramMessageEntity from './types/TelegramMessageEntity.js';
 import TelegramPhotoSize from './types/TelegramPhotoSize.js';
 import TelegramMessage from './types/TelegramMessage.js';
+import TelegramGuestMessage from './types/TelegramGuestMessage.js';
 import TelegramInputMessageContent from './types/TelegramInputMessageContent.js';
 import TelegramInlineQuery from './types/TelegramInlineQuery.js';
 import TelegramUpdate from './types/TelegramUpdate.js';
@@ -32,6 +33,7 @@ export {
 	TelegramMessageEntity,
 	TelegramPhotoSize,
 	TelegramMessage,
+	TelegramGuestMessage,
 	TelegramInputMessageContent,
 	TelegramInlineQuery,
 	TelegramUpdate,
diff --git a/packages/main/src/telegram_api.ts b/packages/main/src/telegram_api.ts
@@ -69,6 +69,12 @@ interface AnswerInlineParams {
   next_offset?: string;
 }
 
+/** Interface for guest query parameters */
+interface AnswerGuestParams {
+  guest_query_id: string;
+  result: TelegramInlineQueryResultArticle | TelegramInlineQueryResultPhoto | TelegramInlineQueryResultVideo;
+}
+
 /** Type for all possible API parameters */
 type TelegramApiParams =
   | SendMessageParams
@@ -77,6 +83,7 @@ type TelegramApiParams =
   | SendChatActionParams
   | AnswerCallbackParams
   | AnswerInlineParams
+  | AnswerGuestParams
   | Record<string, unknown>;
 
 /** Class representing the Telegram API and all its methods */
@@ -206,6 +213,17 @@ export default class TelegramApi {
     return await fetch(url);
   }
 
+  /**
+   * Send a guest response to a given botApi
+   * @param botApi - full URL to the telegram API without slug
+   * @param data - data to append to the request
+   * @returns Promise with the API response
+   */
+  async answerGuestQuery(botApi: string, data: AnswerGuestParams): Promise<Response> {
+    const url = this.getApiUrl(botApi, 'answerGuestQuery', data);
+    return await fetch(url);
+  }
+
   /**
    * Delete a message
    * @param botApi - full URL to the telegram API without slug
diff --git a/packages/main/src/telegram_bot.ts b/packages/main/src/telegram_bot.ts
@@ -74,6 +74,8 @@ export default class TelegramBot {
         return ':callback' in this.commands ? ':callback' : this.defaultCommand;
       case 'inline':
         return ':inline' in this.commands ? ':inline' : this.defaultCommand;
+      case 'guest_message':
+        return ':guest_message' in this.commands ? ':guest_message' : this.defaultCommand;
     }
 
     // Then check if it's a command starting with /
@@ -94,7 +96,8 @@ export default class TelegramBot {
     switch (ctx.update_type) {
       case 'message':
       case 'business_message':
-        return this.update.message?.text?.split(' ') ?? [];
+      case 'guest_message':
+        return (this.update.message?.text ?? this.update.guest_message?.text)?.split(' ') ?? [];
       case 'inline':
         return this.update.inline_query?.query.split(' ') ?? [];
       default:
diff --git a/packages/main/src/telegram_execution_context.ts b/packages/main/src/telegram_execution_context.ts
@@ -45,6 +45,8 @@ export default class TelegramExecutionContext {
       return 'callback';
     } else if (this.update.business_message) {
       return 'business_message';
+    } else if (this.update.guest_message) {
+      return 'guest_message';
     }
     return '';
   }
@@ -58,6 +60,8 @@ export default class TelegramExecutionContext {
       return this.update.message.chat.id.toString();
     } else if (this.update.business_message?.chat.id) {
       return this.update.business_message.chat.id.toString();
+    } else if (this.update.guest_message?.chat.id) {
+      return this.update.guest_message.chat.id.toString();
     }
     return '';
   }
@@ -67,7 +71,12 @@ export default class TelegramExecutionContext {
    * @returns The message ID as a string or empty string if not available
    */
   private getMessageId(): string {
-    return this.update.message?.message_id.toString() ?? '';
+    if (this.update.message?.message_id) {
+      return this.update.message.message_id.toString();
+    } else if (this.update.guest_message?.message_id) {
+      return this.update.guest_message.message_id.toString();
+    }
+    return '';
   }
 
   /**
@@ -79,6 +88,7 @@ export default class TelegramExecutionContext {
   async replyVideo(video: string, options: Record<string, number | string | boolean> = {}) {
     switch (this.update_type) {
       case 'message':
+      case 'guest_message':
         return await this.api.sendVideo(this.bot.api.toString(), {
           ...options,
           chat_id: this.getChatId(),
@@ -117,6 +127,7 @@ export default class TelegramExecutionContext {
     switch (this.update_type) {
       case 'photo':
       case 'message':
+      case 'guest_message':
         return await this.api.sendPhoto(this.bot.api.toString(), {
           ...options,
           chat_id: this.getChatId(),
@@ -144,6 +155,7 @@ export default class TelegramExecutionContext {
       case 'message':
       case 'photo':
       case 'document':
+      case 'guest_message':
         return await this.api.sendChatAction(this.bot.api.toString(), {
           chat_id: this.getChatId(),
           action: 'typing',
@@ -176,6 +188,19 @@ export default class TelegramExecutionContext {
     return null;
   }
 
+  /**
+   * Answer a guest query
+   * @param message - text to reply with
+   * @param parse_mode - one of HTML, MarkdownV2, Markdown, or an empty string for ascii
+   * @returns Promise with the API response
+   */
+  async answerGuestQuery(message: string, parse_mode = '') {
+    return await this.api.answerGuestQuery(this.bot.api.toString(), {
+      guest_query_id: this.update.guest_message?.guest_query_id ?? '',
+      result: new TelegramInlineQueryResultArticle({ content: message, title: 'Response', parse_mode }),
+    });
+  }
+
 
   /**
    * Reply to the last message with a stream of text
@@ -206,6 +231,10 @@ export default class TelegramExecutionContext {
       case 'message':
       case 'photo':
       case 'document':
+      case 'guest_message':
+        if (this.update_type === 'guest_message') {
+          return await this.answerGuestQuery(message, parse_mode);
+        }
         if (reply) {
           return await this.api.sendMessage(this.bot.api.toString(), {
             ...options,
diff --git a/packages/main/src/types/PartialTelegramUpdate.ts b/packages/main/src/types/PartialTelegramUpdate.ts
@@ -1,6 +1,7 @@
 import TelegramBusinessMessage from './TelegramBusinessMessage.js';
 import TelegramInlineQuery from './TelegramInlineQuery.js';
 import TelegramMessage from './TelegramMessage.js';
+import TelegramGuestMessage from './TelegramGuestMessage.js';
 
 interface PartialTelegramUpdate {
 	update_id?: number;
@@ -10,5 +11,6 @@ interface PartialTelegramUpdate {
 	edited_channel_post?: TelegramMessage;
 	inline_query?: TelegramInlineQuery;
 	business_message?: TelegramBusinessMessage;
+	guest_message?: TelegramGuestMessage;
 }
 export default PartialTelegramUpdate;
diff --git a/packages/main/src/types/TelegramGuestMessage.ts b/packages/main/src/types/TelegramGuestMessage.ts
@@ -0,0 +1,5 @@
+import TelegramMessage from "./TelegramMessage.js";
+
+export default interface TelegramGuestMessage extends TelegramMessage {
+  guest_query_id: string;
+}
diff --git a/packages/main/src/types/TelegramMessage.ts b/packages/main/src/types/TelegramMessage.ts
@@ -57,5 +57,8 @@ interface TelegramMessage {
 	// invoice?: TelegramInvoice;
 	// successful_payment?: TelegramSuccessfulPayment;
 	connected_website?: string;
+	guest_bot_caller_user?: TelegramUser;
+	guest_bot_caller_chat?: TelegramChat;
+	guest_query_id?: string;
 }
 export default TelegramMessage;
diff --git a/packages/main/src/types/TelegramUpdate.ts b/packages/main/src/types/TelegramUpdate.ts
@@ -3,6 +3,7 @@ import TelegramMessage from './TelegramMessage.js';
 import PartialTelegramUpdate from './PartialTelegramUpdate.js';
 import TelegramCallbackQuery from './TelegramCallbackQuery.js';
 import TelegramBusinessMessage from './TelegramBusinessMessage.js';
+import TelegramGuestMessage from './TelegramGuestMessage.js';
 
 export default class TelegramUpdate {
 	update_id: number;
@@ -14,6 +15,7 @@ export default class TelegramUpdate {
 	// chosen_inline_result?: TelegramChosenInlineResult;
 	callback_query?: TelegramCallbackQuery;
 	business_message?: TelegramBusinessMessage;
+	guest_message?: TelegramGuestMessage;
 	// shipping_query?: TelegramShippingQuery;
 	// pre_checkout_query?: TelegramPreCheckoutQuery;
 	// poll?: TelegramPoll;
@@ -29,6 +31,7 @@ export default class TelegramUpdate {
 		this.edited_channel_post = update.edited_channel_post;
 		this.inline_query = update.inline_query;
 		this.business_message = update.business_message;
+		this.guest_message = update.guest_message;
 		// chosen_inline_result = update.chosen_inline_result;
 		// callback_query = update.callback_query;
 		// shipping_query = update.shipping_query;
diff --git a/packages/main/src/types/TelegramUser.ts b/packages/main/src/types/TelegramUser.ts
@@ -8,5 +8,6 @@ interface TelegramUser {
 	can_join_groups?: boolean;
 	can_read_all_group_messages?: boolean;
 	supports_inline_queries: boolean;
+	supports_guest_queries: boolean;
 }
 export default TelegramUser;
diff --git a/packages/main/src/webhook.ts b/packages/main/src/webhook.ts
@@ -34,8 +34,8 @@ export default class Webhook {
     const params = new URLSearchParams({
       url: this.webhook.toString(),
       max_connections: '100',
-      allowed_updates: JSON.stringify(['message', 'inline_query', 'business_message', 'business_connection']),
-      drop_pending_updates: 'true',
+      // allowed_updates: JSON.stringify(['message', 'inline_query', 'guest_message', 'business_message', 'business_connection']),
+      // drop_pending_updates: 'true',
     });
 
     try {
diff --git a/packages/main/test/telegram_bot.spec.ts b/packages/main/test/telegram_bot.spec.ts
@@ -27,4 +27,17 @@ describe('telegram bot', () => {
     expect(await (await bot.handle(request)).text()).toBe('ok');
     expect(bot.currentContext.update_type).toBe('message');
   });
+
+  // Test for guest message handling
+  it('guest message response', async () => {
+    const bot = new TelegramBot('123456789').on(':guest_message', async () => {
+      return Promise.resolve(new Response('ok'));
+    });
+    const request = new Request('http://example.com/123456789', {
+      method: 'POST',
+      body: JSON.stringify({ guest_message: { text: 'hello', guest_query_id: 'guest123', chat: { id: 123, type: 'private' } } }),
+    });
+    expect(await (await bot.handle(request)).text()).toBe('ok');
+    expect(bot.currentContext.update_type).toBe('guest_message');
+  });
 });
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
@@ -41,60 +41,6 @@ async function markdownToHtml(s: string): Promise<string> {
 	return parsedString.replace(tagPattern, '');
 }
 
-/**
- * Stream AI response and send periodic updates via bot.streamReply
- * @param bot - the telegram execution context
- * @param env - the environment
- * @param model - the AI model to use
- * @param messages - the messages to send
- * @returns the full response string
- */
-async function streamAiResponse(
-	bot: TelegramExecutionContext,
-	env: Environment,
-	model: string,
-	messages: { role: string; content: string }[],
-): Promise<string> {
-	// @ts-expect-error broken bindings
-	const response = (await env.AI.run(model, {
-		messages,
-		stream: true,
-	}));
-
-	const reader = response.getReader();
-	const decoder = new TextDecoder();
-	const draft_id = Math.floor(Math.random() * 1000000) + 1;
-	let fullResponse = '';
-	let lastUpdate = 0;
-
-	for (;;) {
-		const result = (await reader.read()) as ReadableStreamReadResult<Uint8Array>;
-		if (result.done) break;
-
-		const chunk = decoder.decode(result.value);
-		const lines = chunk.split('\n');
-
-		for (const line of lines) {
-			if (line.startsWith('data: ') && line !== 'data: [DONE]') {
-				try {
-					const data = JSON.parse(line.slice(6)) as { response: string | undefined };
-					if (data.response) {
-						fullResponse += data.response;
-
-						if (Date.now() - lastUpdate > 1000) {
-							await bot.streamReply(await markdownToHtml(fullResponse), draft_id, 'HTML');
-							lastUpdate = Date.now();
-						}
-					}
-				} catch (e) {
-					console.error('Error parsing AI stream:', e);
-				}
-			}
-		}
-	}
-	return fullResponse;
-}
-
 async function streamAiResponseGemma(
 	bot: TelegramExecutionContext,
 	env: Environment,
@@ -385,6 +331,31 @@ export default {
 							break;
 						}
 
+						case 'guest_message': {
+							const prompt = bot.update.guest_message?.text?.toString() ?? '';
+							const messages = [
+								{ role: 'system', content: SYSTEM_PROMPTS.TUX_ROBOT },
+								{ role: 'user', content: prompt },
+							];
+
+							try {
+								await bot.sendTyping();
+								// @ts-expect-error broken bindings
+								const response = await env.AI.run(AI_MODELS.GEMMA, { messages });
+
+								// @ts-expect-error broken bindings
+								const content = response.choices?.[0]?.message?.content ?? response.response ?? '';
+
+								if (content) {
+									await bot.reply(await markdownToHtml(content), 'HTML');
+								}
+							} catch (e) {
+								console.error('Error in guest message handler:', e);
+								await bot.reply(`Error: ${e as string}`);
+							}
+							break;
+						}
+
 						case 'business_message': {
 							await bot.sendTyping();
 							const photo = bot.update.business_message?.photo;
@@ -438,6 +409,14 @@ export default {
 							}
 							break;
 						}
+						default:
+							try {
+								console.log(JSON.stringify(bot.update));
+							}
+							catch {
+								console.log("couldn't json.stringify update...", `${bot.update}`)
+							}
+							break;
 					}
 					return new Response('ok');
 				})

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`},`
`24`	`24`	`"version": "",`
`25`	`25`	`"dependencies": {`
`26`		`- "@eslint/eslintrc": "^3.3.3"`
	`26`	`+ "@eslint/eslintrc": "^3.3.3",`
	`27`	`+ "wrangler": "^4.90.0"`
`27`	`28`	`}`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,8 @@ interface TelegramMessage {`
`57`	`57`	`// invoice?: TelegramInvoice;`
`58`	`58`	`// successful_payment?: TelegramSuccessfulPayment;`
`59`	`59`	`connected_website?: string;`
	`60`	`+ guest_bot_caller_user?: TelegramUser;`
	`61`	`+ guest_bot_caller_chat?: TelegramChat;`
	`62`	`+ guest_query_id?: string;`
`60`	`63`	`}`
`61`	`64`	`export default TelegramMessage;`