teh-bot 1.0.0 → 1.0.2

package/index.js

@@ -19,10 +19,6 @@ const DEFAULT_OPTIONS = {
   baseApiUrl: "https://api.telegram.org",
 }
 
-/**
- * Modern, High-Performance Telegram Bot API Module
- * Inspired by Baileys simplified API and Telegraf's robust system
- */
 class TelegramBot extends EventEmitter {
   constructor(token, options = {}) {
     super()
@@ -121,50 +117,13 @@ class TelegramBot extends EventEmitter {
     if (!mediaType) return this.request("sendMessage", { chat_id: chatId, text: content.text, ...options })
 
     const method = `send${mediaType.charAt(0).toUpperCase() + mediaType.slice(1)}`
-    const formData = { chat_id: chatId, caption, ...rest }
-
-    if (
-      mediaSource instanceof Stream ||
-      Buffer.isBuffer(mediaSource) ||
-      (typeof mediaSource === "string" && !mediaSource.startsWith("http"))
-    ) {
-      formData[mediaType] = await this._prepareFile(mediaSource, mediaType)
-      return this.request(method, {}, formData)
-    }
+    const formData = { chat_id: chatId, caption, [mediaType]: await this._prepareFile(mediaSource, mediaType), ...rest }
 
-    formData[mediaType] = mediaSource
-    return this.request(method, formData)
+    return this.request(method, {}, formData)
   }
 
   async sendPhoto(chatId, photo, options = {}) {
-    if (typeof photo === "string" && (photo.startsWith("http") || photo.startsWith("/"))) {
-      if (photo.startsWith("http")) {
-        return this.request("sendPhoto", {
-          chat_id: chatId,
-          photo,
-          ...options,
-        })
-      } else {
-        const fileData = await this._readFileSync(photo)
-        const formData = {
-          chat_id: chatId,
-          photo: {
-            stream: true,
-            filename: basename(photo),
-            contentType: "image/jpeg",
-            data: fileData,
-          },
-          ...this._flattenOptions(options),
-        }
-        return this.request("sendPhoto", {}, formData)
-      }
-    } else {
-      return this.request("sendPhoto", {
-        chat_id: chatId,
-        photo,
-        ...options,
-      })
-    }
+    return this._sendFile("sendPhoto", chatId, photo, "photo", options)
   }
 
   async sendAudio(chatId, audio, options = {}) {
@@ -636,8 +595,25 @@ class TelegramBot extends EventEmitter {
 
   _createContext(update) {
     const message = update.message || update.edited_message || update.channel_post || update.callback_query?.message
-    const chat = message?.chat || update.my_chat_member?.chat || update.chat_member?.chat
-    const from = message?.from || update.callback_query?.from || update.inline_query?.from
+
+    // Fallback logic for chat extraction from various update types
+    let chat =
+      message?.chat || update.my_chat_member?.chat || update.chat_member?.chat || update.chat_join_request?.chat
+
+    // Explicit extraction for callback_query which might not have a message (inline buttons)
+    if (!chat && update.callback_query) {
+      chat = update.callback_query.message?.chat
+    }
+
+    const from =
+      message?.from ||
+      update.callback_query?.from ||
+      update.inline_query?.from ||
+      update.chosen_inline_result?.from ||
+      update.shipping_query?.from ||
+      update.pre_checkout_query?.from ||
+      update.poll_answer?.user ||
+      update.my_chat_member?.from
 
     const ctx = {
       update,
@@ -656,17 +632,20 @@ class TelegramBot extends EventEmitter {
 
     // Baileys-style simplified response
     ctx.send = (content, opts) => {
-      if (!ctx.chat?.id) {
+      const chatId = ctx.chat?.id || update.callback_query?.from?.id || update.inline_query?.from?.id
+      if (!chatId) {
+        console.error("[v0] Context update without chat_id:", JSON.stringify(update))
         throw new Error("[Teh] Cannot send message: chat_id is not available in this context")
       }
-      return this.sendMessage(ctx.chat.id, content, opts)
+      return this.sendMessage(chatId, content, opts)
     }
 
     ctx.reply = (text, opts) => {
-      if (!ctx.chat?.id) {
+      const chatId = ctx.chat?.id || update.callback_query?.from?.id
+      if (!chatId) {
         throw new Error("[Teh] Cannot reply: chat_id is not available in this context")
       }
-      return this.sendMessage(ctx.chat.id, text, {
+      return this.sendMessage(chatId, text, {
         reply_to_message_id: ctx.message?.message_id,
         ...opts,
       })
@@ -758,7 +737,28 @@ class TelegramBot extends EventEmitter {
   async _prepareFile(source, type) {
     if (source instanceof Stream) return { data: source, contentType: this._getMime(type) }
     if (Buffer.isBuffer(source)) return { data: source, contentType: this._getMime(type) }
+
     if (typeof source === "string") {
+      if (source.startsWith("http")) {
+        // Fetch remote URL and return as stream
+        return new Promise((resolve, reject) => {
+          const client = source.startsWith("https") ? https : http
+          client
+            .get(source, (res) => {
+              if (res.statusCode !== 200) {
+                return reject(new Error(`Failed to fetch remote file: ${res.statusCode}`))
+              }
+              resolve({
+                data: res,
+                filename: basename(new URL(source).pathname) || `file_${Date.now()}`,
+                contentType: res.headers["content-type"] || this._getMime(type),
+              })
+            })
+            .on("error", reject)
+        })
+      }
+
+      // Local file
       return {
         data: createReadStream(source),
         filename: basename(source),
@@ -780,6 +780,18 @@ class TelegramBot extends EventEmitter {
     return mimes[ext] || "application/octet-stream"
   }
 
+  _flattenOptions(options) {
+    const flat = {}
+    for (const [key, value] of Object.entries(options)) {
+      if (typeof value === "object" && value !== null) {
+        flat[key] = JSON.stringify(value)
+      } else {
+        flat[key] = value
+      }
+    }
+    return flat
+  }
+
   _formatError(resp) {
     const err = new Error(resp.description || "Unknown Telegram Error")
     err.code = resp.error_code
@@ -803,6 +815,24 @@ class TelegramBot extends EventEmitter {
   async getWebhookInfo() {
     return this.request("getWebhookInfo")
   }
+
+  static InlineKeyboard() {
+    return new InlineKeyboardBuilder()
+  }
+
+  static ReplyKeyboard() {
+    return new ReplyKeyboardBuilder()
+  }
+
+  static RemoveKeyboard(selective = false) {
+    return { remove_keyboard: true, selective }
+  }
+
+  static ForceReply(selective = false, placeholder = "") {
+    const obj = { force_reply: true, selective }
+    if (placeholder) obj.input_field_placeholder = placeholder
+    return obj
+  }
 }
 
 class InlineKeyboardBuilder {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teh-bot",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Lightweight, high-performance Telegram Bot API module with zero dependencies",
   "keywords": [
     "telegram",