@effect-ak/tg-bot-client 0.0.4 → 0.0.7

package/dist/esm/client/_client.js

@@ -9,7 +9,7 @@ export const makeTgBotClient = (inputConfig) => {
     const execute = makeExecute(config);
     const file = makeDownloadFile(config, execute);
     return {
-        execute,
+        ...execute,
         ...file
     };
 };

package/dist/esm/client/download-file.js

@@ -1,15 +1,34 @@
+import { TgBotClientError } from "./errors.js";
 export const makeDownloadFile = (config, execute) => {
     const getFile = async (input) => {
-        const response = await execute("get_file", input);
-        response.result?.file_path;
-        const file_path = response.result?.file_path;
-        if (!file_path || file_path.length == 0)
-            throw new Error("NoFilePath", { cause: response });
+        const response = await execute.execute("get_file", input);
+        if (response.error)
+            return { error: response.error };
+        const file_path = response.success?.file_path;
+        if (!file_path || file_path.length == 0) {
+            return {
+                error: new TgBotClientError({
+                    type: "UnableToGetFile",
+                    cause: "File path not defined"
+                })
+            };
+        }
         const file_name = file_path.replaceAll("/", "-");
         const url = `${config.baseUrl}/file/bot${config.token}/${file_path}`;
-        const fileContent = await fetch(url).then(_ => _.arrayBuffer());
-        const file = new File([new Uint8Array(fileContent)], file_name);
-        return file;
+        try {
+            const fileContent = await fetch(url).then(_ => _.arrayBuffer());
+            const file = new File([new Uint8Array(fileContent)], file_name);
+            return {
+                success: file
+            };
+        }
+        catch (cause) {
+            return {
+                error: new TgBotClientError({
+                    type: "UnableToGetFile", cause
+                })
+            };
+        }
     };
     return {
         getFile

package/dist/esm/client/errors.js

@@ -0,0 +1,12 @@
+export class TgBotClientError extends Error {
+    reason;
+    _tag = "TgBotClientError";
+    constructor(reason) {
+        super();
+        this.reason = reason;
+    }
+    static missingSuccess = new TgBotClientError({
+        type: "ClientInternalError",
+        cause: "Expected 'success' to be defined"
+    });
+}

package/dist/esm/client/execute-request.js

@@ -1,21 +1,54 @@
 import { makePayload } from "./request.js";
 import { isTgBotApiResponse } from "./response.js";
+import { TgBotClientError } from "./errors.js";
 export const makeExecute = (config) => {
     const execute = async (method, input) => {
-        const httpResponse = await fetch(`${config.baseUrl}/bot${config.token}/${snakeToCamel(method)}`, {
-            body: makePayload(input) ?? null,
-            method: "POST"
-        }).then(_ => _.json());
-        if (!isTgBotApiResponse(httpResponse))
-            throw new Error("Not valid response", {
-                cause: httpResponse
+        try {
+            const httpResponse = await fetch(`${config.baseUrl}/bot${config.token}/${snakeToCamel(method)}`, {
+                body: makePayload(input) ?? null,
+                method: "POST",
             });
-        if (httpResponse.ok == false) {
-            console.warn(httpResponse);
+            const response = await httpResponse.json();
+            if (!isTgBotApiResponse(response)) {
+                return {
+                    error: new TgBotClientError({
+                        type: "UnexpectedResponse",
+                        response
+                    })
+                };
+            }
+            if (!httpResponse.ok) {
+                return {
+                    error: new TgBotClientError({
+                        type: "NotOkResponse",
+                        ...(response.error_code ? { errorCode: response.error_code } : undefined),
+                        ...(response.description ? { details: response.description } : undefined)
+                    })
+                };
+            }
+            return {
+                success: response.result
+            };
         }
-        return httpResponse;
+        catch (cause) {
+            return {
+                error: new TgBotClientError({
+                    type: "ClientInternalError", cause
+                })
+            };
+        }
+    };
+    const unsafeExecute = async (method, input) => {
+        const result = await execute(method, input);
+        if (result.error)
+            throw result.error;
+        if (!("success" in result))
+            throw TgBotClientError.missingSuccess;
+        return result.success;
+    };
+    return {
+        execute, unsafeExecute
     };
-    return execute;
 };
 const snakeToCamel = (methodName) => methodName
     .split("_")

package/dist/esm/client/response.js

@@ -1,6 +1,15 @@
 export const isTgBotApiResponse = (input) => {
-    return (("ok" in input && typeof input.ok == "boolean") &&
-        (typeof input.error_code === 'undefined' || typeof input.error_code === 'number') &&
-        (typeof input.description === 'undefined' || typeof input.description === 'string') &&
-        (typeof input.result === 'undefined' || typeof input.result === 'object'));
+    if (typeof input !== "object" || input == null) {
+        return false;
+    }
+    if (!("ok" in input && typeof input.ok == "boolean")) {
+        return false;
+    }
+    if ("error_code" in input && typeof input.error_code != "number") {
+        return false;
+    }
+    if ("description" in input && typeof input.description != "string") {
+        return false;
+    }
+    return true;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-ak/tg-bot-client",
-  "version": "0.0.4",
+  "version": "0.0.7",
   "type": "module",
   "author": {
     "name": "Aleksandr Kondaurov",
@@ -40,6 +40,7 @@
     "vitest": "^2.1.8"
   },
   "scripts": {
+    "gen": "bun run codegen/main",
     "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"

package/readme.md

@@ -23,14 +23,23 @@ They only provide documentation in the form of a massive HTML page, which is ver
 #### Creating a Client
 
 ```typescript
-import { makeTgBotClient } from "effect-ak/tg-bot-client"
+import { makeTgBotClient } from "@effect-ak/tg-bot-client"
 
 const client = makeTgBotClient({
   token: "" //your token from bot father
 });
 ```
 
-Now, `client` is an object that has an `execute` method. This method takes two arguments: the first is the API method, and the second is an object containing the arguments for that method.
+#### Executing api methods, typesafety
+
+`client` has an `execute` method which requires two arguments
+
+- the first is the API method, e.g. `send_message`
+- the second is an object containing the arguments for that method, e.g. `text`
+
+`execute` never returns failed promise, instead, it gives an object with two fields, `success`, `error`.
+
+if you want, you can use unsafe alternative, `unsafeExecute`, which gives you the result of method or throws an Error
 
 #### 1. Sending a Message with an Effect
 

package/dist/cjs/client/factory.js

@@ -1,29 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.makeTgBotClient = void 0;
-var _request = require("./request.js");
-var _response = require("./response.js");
-const defaultBaseUrl = "https://api.telegram.org";
-const makeTgBotClient = options => {
-  const baseUrl = options.baseUrl ?? defaultBaseUrl;
-  const execute = async (method, input) => {
-    const httpResponse = await fetch(`${baseUrl}/bot${options.token}/${(0, _request.methodPath)(method)}`, {
-      body: (0, _request.makePayload)(input) ?? null,
-      method: "POST"
-    }).then(_ => _.json());
-    if (!(0, _response.isTgBotApiResponse)(httpResponse)) throw new Error("Not valid response", {
-      cause: httpResponse
-    });
-    if (httpResponse.ok == false) {
-      console.warn(httpResponse);
-    }
-    return httpResponse;
-  };
-  return {
-    execute
-  };
-};
-exports.makeTgBotClient = makeTgBotClient;

package/dist/dts/client/factory.d.ts

@@ -1,9 +0,0 @@
-import type { Api } from "../specification/api.js";
-import { TgBotApiResponse } from "./response.js";
-export type TgBotClient = ReturnType<typeof makeTgBotClient>;
-export declare const makeTgBotClient: (options: {
-    token: string;
-    baseUrl?: string;
-}) => {
-    readonly execute: <M extends keyof Api>(method: M, input: Parameters<Api[M]>[0]) => Promise<TgBotApiResponse<ReturnType<Api[M]>>>;
-};

package/dist/esm/client/factory.js

@@ -1,23 +0,0 @@
-import { makePayload, methodPath } from "./request.js";
-import { isTgBotApiResponse } from "./response.js";
-const defaultBaseUrl = "https://api.telegram.org";
-export const makeTgBotClient = (options) => {
-    const baseUrl = options.baseUrl ?? defaultBaseUrl;
-    const execute = async (method, input) => {
-        const httpResponse = await fetch(`${baseUrl}/bot${options.token}/${methodPath(method)}`, {
-            body: makePayload(input) ?? null,
-            method: "POST"
-        }).then(_ => _.json());
-        if (!isTgBotApiResponse(httpResponse))
-            throw new Error("Not valid response", {
-                cause: httpResponse
-            });
-        if (httpResponse.ok == false) {
-            console.warn(httpResponse);
-        }
-        return httpResponse;
-    };
-    return {
-        execute
-    };
-};