@effect-ak/tg-bot-client 0.2.1 → 0.2.2

package/dist/index.mjs

@@ -0,0 +1,418 @@
+// src/client/_client.ts
+import * as Micro5 from "effect/Micro";
+
+// src/client/config.ts
+import * as Context from "effect/Context";
+
+// src/const.ts
+var defaultBaseUrl = "https://api.telegram.org";
+var MESSAGE_EFFECTS = {
+  "\u{1F525}": "5104841245755180586",
+  "\u{1F44D}": "5107584321108051014",
+  "\u{1F44E}": "5104858069142078462",
+  "\u2764\uFE0F": "5159385139981059251",
+  "\u{1F389}": "5046509860389126442",
+  "\u{1F4A9}": "5046589136895476101"
+};
+var messageEffectIdCodes = Object.keys(MESSAGE_EFFECTS);
+var isMessageEffect = (input) => {
+  return typeof input === "string" && input in MESSAGE_EFFECTS;
+};
+
+// src/client/config.ts
+var makeTgBotClientConfig = (input) => TgBotClientConfig.of({
+  ...input,
+  ["base-url"]: input["base-url"] ?? defaultBaseUrl
+});
+var TgBotClientConfig = class extends Context.Tag("TgBotClientConfig")() {
+};
+
+// src/client/execute-request/_service.ts
+import * as Micro2 from "effect/Micro";
+import * as Context2 from "effect/Context";
+
+// src/client/execute-request/execute.ts
+import * as Micro from "effect/Micro";
+import * as String from "effect/String";
+
+// src/client/errors.ts
+import * as Data from "effect/Data";
+var TgBotClientError = class _TgBotClientError extends Data.TaggedError("TgBotClientError") {
+  static missingSuccess = new _TgBotClientError({
+    reason: {
+      type: "ClientInternalError",
+      cause: "Expected 'success' to be defined"
+    }
+  });
+};
+
+// src/client/guards.ts
+var isFileContent = (input) => typeof input == "object" && input != null && ("file_content" in input && input.file_content instanceof Uint8Array) && ("file_name" in input && typeof input.file_name == "string");
+var isTgBotApiResponse = (input) => typeof input == "object" && input != null && ("ok" in input && typeof input.ok == "boolean");
+var isTgBotClientSettingsInput = (input) => typeof input == "object" && input != null && ("bot-token" in input && typeof input["bot-token"] == "string");
+
+// src/client/execute-request/payload.ts
+var makePayload = (body) => {
+  const entries = Object.entries(body);
+  if (entries.length == 0) return void 0;
+  const result = new FormData();
+  for (const [key, value] of entries) {
+    if (!value) continue;
+    if (typeof value != "object") {
+      result.append(key, `${value}`);
+    } else if (isFileContent(value)) {
+      result.append(key, new Blob([value.file_content]), value.file_name);
+    } else {
+      result.append(key, JSON.stringify(value));
+    }
+  }
+  return result;
+};
+
+// src/client/execute-request/execute.ts
+var execute = (config, method, input) => Micro.gen(function* () {
+  const httpResponse = yield* Micro.tryPromise({
+    try: () => fetch(
+      `${config["base-url"]}/bot${config["bot-token"]}/${String.snakeToCamel(method)}`,
+      {
+        body: makePayload(input) ?? null,
+        method: "POST"
+      }
+    ),
+    catch: (cause) => new TgBotClientError({
+      reason: { type: "ClientInternalError", cause }
+    })
+  });
+  const response = yield* Micro.tryPromise({
+    try: () => httpResponse.json(),
+    catch: () => new TgBotClientError({
+      reason: { type: "UnexpectedResponse", response: httpResponse }
+    })
+  });
+  if (!isTgBotApiResponse(response)) {
+    return yield* Micro.fail(new TgBotClientError({
+      reason: { type: "UnexpectedResponse", response }
+    }));
+  }
+  if (!httpResponse.ok) {
+    return yield* Micro.fail(new TgBotClientError({
+      reason: {
+        type: "NotOkResponse",
+        ...response.error_code ? { errorCode: response.error_code } : void 0,
+        ...response.description ? { details: response.description } : void 0
+      }
+    }));
+  }
+  return response.result;
+});
+
+// src/client/execute-request/_service.ts
+var ClientExecuteRequestService = class extends Context2.Tag("ClientExecuteRequestService")() {
+};
+var ClientExecuteRequestServiceDefault = Micro2.gen(function* () {
+  const config = yield* Micro2.service(TgBotClientConfig);
+  return {
+    execute: (method, input) => execute(config, method, input)
+  };
+});
+
+// src/client/file/_service.ts
+import * as Micro4 from "effect/Micro";
+import * as Context3 from "effect/Context";
+
+// src/client/file/get-file.ts
+import * as Micro3 from "effect/Micro";
+var getFile = (fileId, config, execute2) => Micro3.gen(function* () {
+  const response = yield* execute2.execute("get_file", { file_id: fileId });
+  const file_path = response.file_path;
+  if (!file_path || file_path.length == 0) {
+    return yield* Micro3.fail(
+      new TgBotClientError({
+        reason: {
+          type: "UnableToGetFile",
+          cause: "File path not defined"
+        }
+      })
+    );
+  }
+  const file_name = file_path.replaceAll("/", "-");
+  const url = `${config["base-url"]}/file/bot${config["bot-token"]}/${file_path}`;
+  const fileContent = yield* Micro3.tryPromise({
+    try: () => fetch(url).then((_) => _.arrayBuffer()),
+    catch: (cause) => new TgBotClientError({
+      reason: { type: "UnableToGetFile", cause }
+    })
+  });
+  const file = new File([new Uint8Array(fileContent)], file_name);
+  return file;
+});
+
+// src/client/file/_service.ts
+var ClientFileService = class extends Context3.Tag("ClientFileService")() {
+};
+var ClientFileServiceDefault = Micro4.gen(function* () {
+  const config = yield* Micro4.service(TgBotClientConfig);
+  const execute2 = yield* Micro4.service(ClientExecuteRequestService);
+  return {
+    getFile: (input) => getFile(input.file_id, config, execute2)
+  };
+}).pipe(
+  Micro4.provideServiceEffect(ClientExecuteRequestService, ClientExecuteRequestServiceDefault)
+);
+
+// src/client/_client.ts
+var makeTgBotClient = (input) => {
+  const config = makeTgBotClientConfig(input);
+  const client = Micro5.gen(function* () {
+    const execute2 = yield* Micro5.service(ClientExecuteRequestService);
+    const file = yield* Micro5.service(ClientFileService);
+    return {
+      execute: (method, input2) => execute2.execute(method, input2).pipe(Micro5.runPromise),
+      getFile: (input2) => file.getFile(input2).pipe(Micro5.runPromise)
+    };
+  }).pipe(
+    Micro5.provideServiceEffect(ClientExecuteRequestService, ClientExecuteRequestServiceDefault),
+    Micro5.provideServiceEffect(ClientFileService, ClientFileServiceDefault),
+    Micro5.provideService(TgBotClientConfig, config),
+    Micro5.runSync
+  );
+  return client;
+};
+
+// src/bot/run.ts
+import * as Micro12 from "effect/Micro";
+
+// src/bot/factory/_service.ts
+import * as Micro11 from "effect/Micro";
+import * as Context5 from "effect/Context";
+
+// src/bot/factory/client-config.ts
+import * as Micro6 from "effect/Micro";
+var makeClientConfigFrom = (input) => Micro6.gen(function* () {
+  if (input.type == "config") {
+    return makeTgBotClientConfig(input);
+  }
+  const config = yield* Micro6.tryPromise({
+    try: async () => {
+      const { readFile } = await import("fs/promises");
+      return JSON.parse(await readFile("config.json", "utf-8"));
+    },
+    catch: (error) => {
+      console.warn(error);
+      return "ReadingConfigError";
+    }
+  });
+  if (!isTgBotClientSettingsInput(config)) {
+    return yield* Micro6.fail("InvalidConfig");
+  }
+  return makeTgBotClientConfig(config);
+});
+
+// src/bot/factory/make-bot.ts
+import * as Micro10 from "effect/Micro";
+
+// src/bot/update-poller/_service.ts
+import * as Micro9 from "effect/Micro";
+import * as Context4 from "effect/Context";
+
+// src/bot/update-poller/poll-and-handle.ts
+import * as Micro8 from "effect/Micro";
+
+// src/bot/update-poller/settings.ts
+var makeSettingsFrom = (input) => {
+  let limit = input.batch_size ?? 10;
+  let timeout = input.timeout ?? 10;
+  let max_empty_responses = input.max_empty_responses;
+  if (limit < 10 || limit > 100) {
+    console.warn("Wrong limit, must be in [10..100], using 10 instead");
+    limit = 10;
+  }
+  if (timeout < 2 || timeout > 10) {
+    console.warn("Wrong timeout, must be in [2..10], using 2 instead");
+    limit = 10;
+  }
+  if (max_empty_responses && max_empty_responses < 2) {
+    console.warn("Wrong max_empty_responses, must be in [2..infinity], using infinity");
+    max_empty_responses = void 0;
+  }
+  return {
+    limit,
+    timeout,
+    max_empty_responses
+  };
+};
+
+// src/bot/update-poller/fetch-updates.ts
+import * as Micro7 from "effect/Micro";
+
+// src/bot/message-handler/utils.ts
+var extractUpdate = (input) => {
+  for (const [field, value] of Object.entries(input)) {
+    if (field == "update_id") {
+      continue;
+    }
+    return {
+      type: field,
+      ...value
+    };
+  }
+  return void 0;
+};
+
+// src/bot/update-poller/fetch-updates.ts
+var fetchUpdates = ({ state, settings, execute: execute2, handlers }) => Micro7.gen(function* () {
+  const updateId = state.lastUpdateId;
+  console.info("getting updates", state);
+  const updates = yield* execute2("get_updates", {
+    ...settings,
+    ...updateId ? { offset: updateId } : void 0
+  }).pipe(
+    Micro7.andThen((_) => _.sort((_2) => _2.update_id))
+  );
+  let lastSuccessId = void 0;
+  let hasError = false;
+  for (const updateObject of updates) {
+    const update = extractUpdate(updateObject);
+    if (!update) {
+      console.warn("Unknown update", update);
+      hasError = true;
+      break;
+    }
+    const handler = handlers[`on_${update.type}`];
+    if (!handler) {
+      console.warn("Handler for update not defined", update);
+      hasError = true;
+      break;
+    }
+    const handleResult = handler(update);
+    if ("chat" in update) {
+      const response = yield* execute2(`send_${handleResult.type}`, {
+        ...handleResult,
+        chat_id: update.chat.id
+      });
+      console.log("bot response", response);
+    }
+    if (!handleResult) {
+      hasError = true;
+      console.log(handleResult);
+      break;
+    }
+    ;
+    lastSuccessId = updateObject.update_id;
+  }
+  if (hasError && lastSuccessId) {
+    const resp = (
+      //commit successfully handled messages
+      yield* execute2("get_updates", {
+        offset: lastSuccessId,
+        limit: 0
+      })
+    );
+  }
+  return { updates, lastSuccessId, hasError };
+});
+
+// src/bot/update-poller/poll-and-handle.ts
+var pollAndHandle = (input) => {
+  const state = {
+    lastUpdateId: void 0,
+    emptyResponses: 0
+  };
+  const settings = makeSettingsFrom(input.settings);
+  return Micro8.delay(1e3)(
+    fetchUpdates({
+      state,
+      settings,
+      execute: input.execute,
+      handlers: input.settings
+    })
+  ).pipe(
+    Micro8.repeat({
+      while: ({ updates, lastSuccessId, hasError }) => {
+        if (hasError) {
+          console.warn("error in handler, quitting");
+          return false;
+        }
+        if (updates.length == 0) {
+          state.emptyResponses += 1;
+          if (settings.max_empty_responses && state.emptyResponses > settings.max_empty_responses) {
+            console.info("too many empty responses, quitting");
+            return false;
+          }
+        } else {
+          state.emptyResponses = 0;
+        }
+        ;
+        if (lastSuccessId) {
+          state.lastUpdateId = lastSuccessId + 1;
+        }
+        return true;
+      }
+    })
+  );
+};
+
+// src/bot/update-poller/_service.ts
+var BotUpdatePollerService = class extends Context4.Tag("BotUpdatePollerService")() {
+};
+var BotUpdatesPollerServiceDefault = Micro9.gen(function* () {
+  const state = {
+    isActive: false
+  };
+  const client = yield* Micro9.service(ClientExecuteRequestService);
+  const runBot = (messageHandler) => Micro9.gen(function* () {
+    if (state.isActive) {
+      return yield* Micro9.fail("AlreadyRunning");
+    }
+    const fiber = yield* pollAndHandle({
+      settings: messageHandler,
+      execute: client.execute
+    }).pipe(Micro9.forkDaemon);
+    fiber.addObserver((exit) => {
+      console.log("bot's fiber has been closed", exit);
+      state.isActive = false;
+    });
+    console.log("Reading bot's updates...");
+    return fiber;
+  });
+  return {
+    runBot
+  };
+}).pipe(
+  Micro9.provideServiceEffect(ClientExecuteRequestService, ClientExecuteRequestServiceDefault)
+);
+
+// src/bot/factory/make-bot.ts
+var makeBot = (messageHandler) => Micro10.gen(function* () {
+  const { runBot } = yield* Micro10.service(BotUpdatePollerService);
+  return yield* runBot(messageHandler);
+}).pipe(
+  Micro10.provideServiceEffect(BotUpdatePollerService, BotUpdatesPollerServiceDefault),
+  Micro10.tapError((error) => {
+    console.error(error);
+    return Micro10.void;
+  })
+);
+
+// src/bot/factory/_service.ts
+var BotFactoryService = class extends Context5.Tag("BotFactoryService")() {
+};
+var BotFactoryServiceDefault = {
+  makeBot,
+  runBot: (input) => makeBot(input).pipe(
+    Micro11.provideServiceEffect(TgBotClientConfig, makeClientConfigFrom(input))
+  )
+};
+
+// src/bot/run.ts
+var runTgChatBot = (input) => BotFactoryServiceDefault.runBot(input).pipe(Micro12.runPromiseExit);
+export {
+  BotFactoryService,
+  BotFactoryServiceDefault,
+  MESSAGE_EFFECTS,
+  defaultBaseUrl,
+  isMessageEffect,
+  makeTgBotClient,
+  messageEffectIdCodes,
+  runTgChatBot
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-ak/tg-bot-client",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "homepage": "https://effect-ak.github.io/telegram-bot-client",
   "author": {
     "name": "Aleksandr Kondaurov",
@@ -11,7 +11,9 @@
   },
   "description": "Telegram bot client",
   "files": [
-    "dist"
+    "dist/index.js",
+    "dist/index.mjs",
+    "dist/index.d.ts"
   ],
   "keywords": [
     "telegram",
@@ -21,21 +23,23 @@
     "url": "https://github.com/effect-ak/tg-bot-client"
   },
   "license": "MIT",
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "types": "./dist/dts/index.d.ts",
+  "types": "./dist/index.d.ts",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs"
+    }
+  },
   "devDependencies": {
-    "@babel/cli": "^7.26.4",
-    "@babel/core": "^7.26.0",
-    "@babel/plugin-transform-export-namespace-from": "^7.25.9",
-    "@babel/plugin-transform-modules-commonjs": "^7.26.3",
     "@types/node": "^22.10.1",
     "@types/js-yaml": "^4.0.9",
     "js-yaml": "^4.1.0",
     "node-html-parser": "^6.1.13",
     "openapi-types": "^12.1.3",
     "ts-morph": "^24.0.0",
-    "tsc-alias": "^1.8.10",
     "tsx": "^4.19.2",
     "typescript": "^5.7.2",
     "vite-tsconfig-paths": "^5.1.4",
@@ -45,11 +49,7 @@
     "effect": "^3.4.0"
   },
   "scripts": {
-    "docgen": "docgen",
     "gen": "tsx ./codegen/main",
-    "run-bot": "tsx ./src/bot/run",
-    "build": "pnpm build-esm && pnpm build-cjs",
-    "build-esm": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json",
-    "build-cjs": "babel dist/esm --out-dir dist/cjs"
+    "echo-bot": "tsx ./example/echo-bot.ts"
   }
 }

package/readme.md

@@ -69,7 +69,7 @@ await client.execute("send_document", {
   chat_id: "???", // replace ??? with the chat number
   message_effect_id: MESSAGE_EFFECTS["🎉"],
   document: {
-    file_content: Buffer.from("Hello!"),
+    file_content: new TextEncoder().encode("Hello!"),
     file_name: "hello.txt"
   },
   caption: "simple text file"

package/dist/cjs/bot/factory/_service.js

@@ -1,59 +0,0 @@
-"use strict";
-
-var __createBinding = void 0 && (void 0).__createBinding || (Object.create ? function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  var desc = Object.getOwnPropertyDescriptor(m, k);
-  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-    desc = {
-      enumerable: true,
-      get: function () {
-        return m[k];
-      }
-    };
-  }
-  Object.defineProperty(o, k2, desc);
-} : function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  o[k2] = m[k];
-});
-var __setModuleDefault = void 0 && (void 0).__setModuleDefault || (Object.create ? function (o, v) {
-  Object.defineProperty(o, "default", {
-    enumerable: true,
-    value: v
-  });
-} : function (o, v) {
-  o["default"] = v;
-});
-var __importStar = void 0 && (void 0).__importStar || function () {
-  var ownKeys = function (o) {
-    ownKeys = Object.getOwnPropertyNames || function (o) {
-      var ar = [];
-      for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-      return ar;
-    };
-    return ownKeys(o);
-  };
-  return function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-    __setModuleDefault(result, mod);
-    return result;
-  };
-}();
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.BotFactoryServiceDefault = exports.BotFactoryService = void 0;
-const Micro = __importStar(require("effect/Micro"));
-const Context = __importStar(require("effect/Context"));
-const config_js_1 = require("../../client/config.js");
-const client_config_js_1 = require("./client-config.js");
-const make_bot_js_1 = require("./make-bot.js");
-class BotFactoryService extends Context.Tag("BotFactoryService")() {}
-exports.BotFactoryService = BotFactoryService;
-;
-exports.BotFactoryServiceDefault = {
-  makeBot: make_bot_js_1.makeBot,
-  runBot: input => (0, make_bot_js_1.makeBot)(input).pipe(Micro.provideServiceEffect(config_js_1.TgBotClientConfig, (0, client_config_js_1.makeClientConfigFrom)(input)))
-};

package/dist/cjs/bot/factory/client-config.js

@@ -1,68 +0,0 @@
-"use strict";
-
-var __createBinding = void 0 && (void 0).__createBinding || (Object.create ? function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  var desc = Object.getOwnPropertyDescriptor(m, k);
-  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-    desc = {
-      enumerable: true,
-      get: function () {
-        return m[k];
-      }
-    };
-  }
-  Object.defineProperty(o, k2, desc);
-} : function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  o[k2] = m[k];
-});
-var __setModuleDefault = void 0 && (void 0).__setModuleDefault || (Object.create ? function (o, v) {
-  Object.defineProperty(o, "default", {
-    enumerable: true,
-    value: v
-  });
-} : function (o, v) {
-  o["default"] = v;
-});
-var __importStar = void 0 && (void 0).__importStar || function () {
-  var ownKeys = function (o) {
-    ownKeys = Object.getOwnPropertyNames || function (o) {
-      var ar = [];
-      for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-      return ar;
-    };
-    return ownKeys(o);
-  };
-  return function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-    __setModuleDefault(result, mod);
-    return result;
-  };
-}();
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.makeClientConfigFrom = void 0;
-const Micro = __importStar(require("effect/Micro"));
-const fs_1 = require("fs");
-const config_js_1 = require("../../client/config.js");
-const guards_js_1 = require("../../client/guards.js");
-const makeClientConfigFrom = input => Micro.gen(function* () {
-  if (input.type == "config") {
-    return (0, config_js_1.makeTgBotClientConfig)(input);
-  }
-  const config = yield* Micro.try({
-    try: () => JSON.parse((0, fs_1.readFileSync)("config.json").toString("utf-8")),
-    catch: error => {
-      console.warn(error);
-      return "ReadingConfigError";
-    }
-  });
-  if (!(0, guards_js_1.isTgBotClientSettingsInput)(config)) {
-    return yield* Micro.fail("InvalidConfig");
-  }
-  return (0, config_js_1.makeTgBotClientConfig)(config);
-});
-exports.makeClientConfigFrom = makeClientConfigFrom;

package/dist/cjs/bot/factory/make-bot.js

@@ -1,59 +0,0 @@
-"use strict";
-
-var __createBinding = void 0 && (void 0).__createBinding || (Object.create ? function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  var desc = Object.getOwnPropertyDescriptor(m, k);
-  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-    desc = {
-      enumerable: true,
-      get: function () {
-        return m[k];
-      }
-    };
-  }
-  Object.defineProperty(o, k2, desc);
-} : function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  o[k2] = m[k];
-});
-var __setModuleDefault = void 0 && (void 0).__setModuleDefault || (Object.create ? function (o, v) {
-  Object.defineProperty(o, "default", {
-    enumerable: true,
-    value: v
-  });
-} : function (o, v) {
-  o["default"] = v;
-});
-var __importStar = void 0 && (void 0).__importStar || function () {
-  var ownKeys = function (o) {
-    ownKeys = Object.getOwnPropertyNames || function (o) {
-      var ar = [];
-      for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-      return ar;
-    };
-    return ownKeys(o);
-  };
-  return function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-    __setModuleDefault(result, mod);
-    return result;
-  };
-}();
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.makeBot = void 0;
-const Micro = __importStar(require("effect/Micro"));
-const _service_js_1 = require("../../bot/update-poller/_service.js");
-const makeBot = messageHandler => Micro.gen(function* () {
-  const {
-    runBot
-  } = yield* Micro.service(_service_js_1.BotUpdatePollerService);
-  return yield* runBot(messageHandler);
-}).pipe(Micro.provideServiceEffect(_service_js_1.BotUpdatePollerService, _service_js_1.BotUpdatesPollerServiceDefault), Micro.tapError(error => {
-  console.error(error);
-  return Micro.void;
-}));
-exports.makeBot = makeBot;