@effect-ak/tg-bot 1.2.0 → 1.2.1

package/dist/index.cjs

@@ -29,6 +29,7 @@ __export(index_exports, {
   BotUpdateHandlersTag: () => BotUpdateHandlersTag,
   HandleUpdateError: () => HandleUpdateError,
   createBotContext: () => createBotContext,
+  createWebhookHandler: () => createWebhookHandler,
   defineBot: () => defineBot,
   extractUpdate: () => extractUpdate,
   handleEntireBatch: () => handleEntireBatch,
@@ -3961,6 +3962,91 @@ var defineBot = (input) => {
     console.warn("No handlers are defined for bot");
   return input;
 };
+
+// src/webhook.ts
+var import_tg_bot_client3 = require("@effect-ak/tg-bot-client");
+var isGuardedHandler2 = (handler) => typeof handler === "object" && handler !== null && "handle" in handler;
+var executeSingleGuard2 = async (guard, update, ctx) => {
+  const input = { update, ctx };
+  if (guard.match) {
+    const matched = await guard.match(input);
+    if (!matched) return null;
+  }
+  return await guard.handle(input);
+};
+var executeGuards2 = async (guards, update, ctx) => {
+  for (const guard of guards) {
+    const result = await executeSingleGuard2(guard, update, ctx);
+    if (result !== null) return result;
+  }
+  return BotResponse.ignore;
+};
+var executeHandler2 = async (handler, update, ctx) => {
+  if (typeof handler === "function") {
+    return await handler(update);
+  }
+  if (Array.isArray(handler)) {
+    return await executeGuards2(handler, update, ctx);
+  }
+  if (isGuardedHandler2(handler)) {
+    const result = await executeSingleGuard2(handler, update, ctx);
+    return result ?? BotResponse.ignore;
+  }
+  return BotResponse.ignore;
+};
+var extractUpdate2 = (input) => {
+  for (const [field, value] of Object.entries(input)) {
+    if (field === "update_id") continue;
+    return { type: field, ...value };
+  }
+  return void 0;
+};
+var processUpdate = async (updateObject, handlers, client) => {
+  const update = extractUpdate2(updateObject);
+  if (!update) {
+    console.warn("Unknown update format", updateObject);
+    return;
+  }
+  const handlerKey = `on_${update.type}`;
+  const handler = handlers[handlerKey];
+  if (!handler) {
+    return;
+  }
+  const ctx = createBotContext(update);
+  try {
+    const result = await executeHandler2(handler, update, ctx);
+    if (result.response && "chat" in update) {
+      const responsePayload = result.response;
+      await client.execute(`send_${responsePayload.type}`, {
+        ...responsePayload,
+        chat_id: update.chat.id
+      });
+    }
+  } catch (error) {
+    console.error("Error handling update", {
+      updateId: updateObject.update_id,
+      error: error instanceof Error ? error.message : error
+    });
+  }
+};
+var createWebhookHandler = (config) => {
+  const client = (0, import_tg_bot_client3.makeTgBotClient)({ bot_token: config.bot_token });
+  const handleUpdate = async (update) => {
+    await processUpdate(update, config, client);
+  };
+  const handler = async (request) => {
+    try {
+      const update = await request.json();
+      await handleUpdate(update);
+      return new Response("ok", { status: 200 });
+    } catch (error) {
+      console.error("Webhook error", error);
+      return new Response("error", { status: 500 });
+    }
+  };
+  handler.handleUpdate = handleUpdate;
+  return handler;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BatchUpdateResult,
@@ -3972,6 +4058,7 @@ var defineBot = (input) => {
   BotUpdateHandlersTag,
   HandleUpdateError,
   createBotContext,
+  createWebhookHandler,
   defineBot,
   extractUpdate,
   handleEntireBatch,

package/dist/index.d.ts

@@ -137,4 +137,13 @@ declare const runTgChatBot: (input: RunBotInput) => Promise<{
 }>;
 declare const defineBot: (input: BotUpdatesHandlers) => BotUpdatesHandlers;
 
-export { type AvailableUpdateTypes, BatchUpdateResult, type BotBatchMode, type BotContext, type BotInstance, type BotMode, BotPollSettings, BotPollSettingsTag, BotResponse, BotRunService, type BotSingleMode, BotTgClientTag, BotUpdateHandlersTag, type BotUpdatesHandlers, type ExtractedUpdate, type GuardedHandler, type HandleBatchUpdateFunction, HandleUpdateError, type HandleUpdateFunction, type HandlerInput, type PollSettings, type RunBotInput, type RunBotInputBatch, type RunBotInputSingle, type UpdateHandler, createBotContext, defineBot, extractUpdate, handleEntireBatch, handleOneByOne, handleOneUpdate, handleUpdates, launchBot, runTgChatBot };
+interface WebhookBotConfig extends BotUpdatesHandlers {
+    bot_token: string;
+}
+interface WebhookHandler {
+    (request: Request): Promise<Response>;
+    handleUpdate: (update: Update) => Promise<void>;
+}
+declare const createWebhookHandler: (config: WebhookBotConfig) => WebhookHandler;
+
+export { type AvailableUpdateTypes, BatchUpdateResult, type BotBatchMode, type BotContext, type BotInstance, type BotMode, BotPollSettings, BotPollSettingsTag, BotResponse, BotRunService, type BotSingleMode, BotTgClientTag, BotUpdateHandlersTag, type BotUpdatesHandlers, type ExtractedUpdate, type GuardedHandler, type HandleBatchUpdateFunction, HandleUpdateError, type HandleUpdateFunction, type HandlerInput, type PollSettings, type RunBotInput, type RunBotInputBatch, type RunBotInputSingle, type UpdateHandler, type WebhookBotConfig, type WebhookHandler, createBotContext, createWebhookHandler, defineBot, extractUpdate, handleEntireBatch, handleOneByOne, handleOneUpdate, handleUpdates, launchBot, runTgChatBot };

package/dist/index.js

@@ -3919,6 +3919,91 @@ var defineBot = (input) => {
     console.warn("No handlers are defined for bot");
   return input;
 };
+
+// src/webhook.ts
+import { makeTgBotClient as makeTgBotClient2 } from "@effect-ak/tg-bot-client";
+var isGuardedHandler2 = (handler) => typeof handler === "object" && handler !== null && "handle" in handler;
+var executeSingleGuard2 = async (guard, update, ctx) => {
+  const input = { update, ctx };
+  if (guard.match) {
+    const matched = await guard.match(input);
+    if (!matched) return null;
+  }
+  return await guard.handle(input);
+};
+var executeGuards2 = async (guards, update, ctx) => {
+  for (const guard of guards) {
+    const result = await executeSingleGuard2(guard, update, ctx);
+    if (result !== null) return result;
+  }
+  return BotResponse.ignore;
+};
+var executeHandler2 = async (handler, update, ctx) => {
+  if (typeof handler === "function") {
+    return await handler(update);
+  }
+  if (Array.isArray(handler)) {
+    return await executeGuards2(handler, update, ctx);
+  }
+  if (isGuardedHandler2(handler)) {
+    const result = await executeSingleGuard2(handler, update, ctx);
+    return result ?? BotResponse.ignore;
+  }
+  return BotResponse.ignore;
+};
+var extractUpdate2 = (input) => {
+  for (const [field, value] of Object.entries(input)) {
+    if (field === "update_id") continue;
+    return { type: field, ...value };
+  }
+  return void 0;
+};
+var processUpdate = async (updateObject, handlers, client) => {
+  const update = extractUpdate2(updateObject);
+  if (!update) {
+    console.warn("Unknown update format", updateObject);
+    return;
+  }
+  const handlerKey = `on_${update.type}`;
+  const handler = handlers[handlerKey];
+  if (!handler) {
+    return;
+  }
+  const ctx = createBotContext(update);
+  try {
+    const result = await executeHandler2(handler, update, ctx);
+    if (result.response && "chat" in update) {
+      const responsePayload = result.response;
+      await client.execute(`send_${responsePayload.type}`, {
+        ...responsePayload,
+        chat_id: update.chat.id
+      });
+    }
+  } catch (error) {
+    console.error("Error handling update", {
+      updateId: updateObject.update_id,
+      error: error instanceof Error ? error.message : error
+    });
+  }
+};
+var createWebhookHandler = (config) => {
+  const client = makeTgBotClient2({ bot_token: config.bot_token });
+  const handleUpdate = async (update) => {
+    await processUpdate(update, config, client);
+  };
+  const handler = async (request) => {
+    try {
+      const update = await request.json();
+      await handleUpdate(update);
+      return new Response("ok", { status: 200 });
+    } catch (error) {
+      console.error("Webhook error", error);
+      return new Response("error", { status: 500 });
+    }
+  };
+  handler.handleUpdate = handleUpdate;
+  return handler;
+};
 export {
   BatchUpdateResult,
   BotPollSettings,
@@ -3929,6 +4014,7 @@ export {
   BotUpdateHandlersTag,
   HandleUpdateError,
   createBotContext,
+  createWebhookHandler,
   defineBot,
   extractUpdate,
   handleEntireBatch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-ak/tg-bot",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "type": "module",
   "description": "Telegram Bot runner",
   "license": "MIT",
@@ -34,8 +34,8 @@
     "dist/*.d.ts"
   ],
   "dependencies": {
-    "@effect-ak/tg-bot-client": "^1.1.0",
-    "@effect-ak/tg-bot-api": "0.9.2"
+    "@effect-ak/tg-bot-client": "^1.3.1",
+    "@effect-ak/tg-bot-api": "^1.0.0"
   },
   "peerDependencies": {
     "effect": "^3.12.7"