@xtsea/tgcore-ts 0.1.11 → 0.1.13

package/README.md

@@ -34,16 +34,30 @@ npm install @xtsea/tgcore-ts
 ## Getting started
 
 ```ts
-import { tgcore } from "@xtsea/tgcore-ts"
+import { tgcore, KeyboardBuilder } from "@xtsea/tgcore-ts"
 
 // old version: 0.1.9 new Client({})
 
-const tg = tgcore({ api_key: "fw_live_xxx" }) // version: 0.1.10
+const tg = tgcore({ api_key: "fw_live_xxx" }) // latest version
 
 await tg.raw.sendMessage({
   chat_id: -1001234567890,
   text: "Hello from tgcore-ts"
 })
+
+
+const keyboard = KeyboardBuilder
+  .inline()
+  .callback("Yes", "yes")
+  .callback("No", "no")
+  .build()
+
+await tg.calls
+  .sendMessage()
+  .chatId(123)
+  .text("Confirm?")
+  .replyMarkup(keyboard)
+  .execute()
 ```
 
 ## Why TGCore?

package/dist/index.cjs

@@ -31,17 +31,17 @@ var Http = class {
   constructor(opts) {
     this.opts = opts;
   }
-  async post(path, body) {
+  async post(ctx) {
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), this.opts.timeout_ms);
     try {
-      const res = await fetch(this.opts.base_url + path, {
+      const res = await fetch(this.opts.base_url + ctx.path, {
         method: "POST",
         headers: {
           "content-type": "application/json",
           "x-api-key": this.opts.api_key
         },
-        body: JSON.stringify(body ?? {}),
+        body: JSON.stringify(ctx.body ?? {}),
         signal: controller.signal
       });
       const json = await res.json().catch(() => null);
@@ -61,18 +61,25 @@ var RawMethods = class {
     this.http = http;
   }
   sendMessage(params) {
-    return this.http.post("/api/v2/sendMessage", params);
+    return this.http.post({
+      path: "/api/v2/sendMessage",
+      body: params
+    });
   }
   getMe() {
-    return this.http.post("/api/v2/getMe", {});
+    return this.http.post({
+      path: "/api/v2/getMe",
+      body: {}
+    });
   }
 };
 
 // src/calls/base.ts
 var BaseCallBuilder = class {
-  constructor(http, path) {
-    this.http = http;
+  constructor(client, path, method = "POST") {
+    this.client = client;
     this.path = path;
+    this.method = method;
     this.params = {};
   }
   set(key, value) {
@@ -82,7 +89,7 @@ var BaseCallBuilder = class {
     return this;
   }
   async execute() {
-    return this.http.post(this.path, this.params);
+    return this.client.request(this.path, this.params);
   }
   async throw() {
     const res = await this.execute();
@@ -148,18 +155,18 @@ var SendPhotoBuilder = class extends BaseCallBuilder {
 
 // src/calls/index.ts
 var CallMethods = class {
-  constructor(http) {
-    this.http = http;
+  constructor(client) {
+    this.client = client;
   }
   sendMessage() {
     return new SendMessageBuilder(
-      this.http,
+      this.client,
       "/api/v2/sendMessage"
     );
   }
   sendPhoto() {
     return new SendPhotoBuilder(
-      this.http,
+      this.client,
       "/api/v2/sendPhoto"
     );
   }
@@ -171,6 +178,7 @@ function tgcore(options) {
 }
 var Client = class {
   constructor(opts) {
+    this.middlewares = [];
     if (!opts?.api_key) {
       throw new Error("tgcore-ts: api_key is required");
     }
@@ -182,6 +190,13 @@ var Client = class {
     this.calls = new CallMethods(this.http);
     this.raw = new RawMethods(this.http);
   }
+  use(mw) {
+    this.middlewares.push(mw);
+    return this;
+  }
+  async request(path, body) {
+    return this.http.post({ path, body });
+  }
 };
 
 // src/builders/keyboard.ts
@@ -232,6 +247,12 @@ var KeyboardBuilder = class _KeyboardBuilder {
     this.currentRow().push(btn);
     return this;
   }
+  callbackJson(text, obj) {
+    return this.callback(text, JSON.stringify(obj));
+  }
+  button(btn) {
+    return this.push(btn);
+  }
   url(text, url) {
     return this.push({ text, url });
   }

package/dist/index.d.cts

@@ -3,10 +3,14 @@ type HttpOptions = {
     base_url: string;
     timeout_ms: number;
 };
+type HttpContext = {
+    path: string;
+    body?: any;
+};
 declare class Http {
     private opts;
     constructor(opts: HttpOptions);
-    post(path: string, body: any): Promise<any>;
+    post(ctx: HttpContext): Promise<any>;
 }
 
 declare class RawMethods {
@@ -22,10 +26,11 @@ declare class RawMethods {
 }
 
 declare abstract class BaseCallBuilder<T = any> {
-    protected http: any;
+    protected client: any;
     protected path: string;
+    protected method: "POST" | "GET";
     protected params: Record<string, any>;
-    constructor(http: any, path: string);
+    constructor(client: any, path: string, method?: "POST" | "GET");
     protected set(key: string, value: any): this;
     execute(): Promise<T>;
     throw(): Promise<T>;
@@ -53,8 +58,8 @@ declare class SendPhotoBuilder extends BaseCallBuilder {
 }
 
 declare class CallMethods {
-    private http;
-    constructor(http: any);
+    private client;
+    constructor(client: any);
     sendMessage(): SendMessageBuilder;
     sendPhoto(): SendPhotoBuilder;
 }
@@ -64,11 +69,21 @@ type ClientOptions = {
     base_url?: string;
     timeout_ms?: number;
 };
+
+type MiddlewareContext = {
+    method: string;
+    payload?: any;
+};
+type Middleware = (ctx: MiddlewareContext, next: () => Promise<any>) => Promise<any>;
+
 declare function tgcore(options: ClientOptions): Client;
 declare class Client {
     private http;
+    private middlewares;
     raw: RawMethods;
     calls: CallMethods;
+    use(mw: Middleware): this;
+    request(path: string, body?: any): Promise<any>;
     constructor(opts: ClientOptions);
 }
 
@@ -99,9 +114,11 @@ type InlineKeyboardButton = {
         text: string;
     };
 };
+
 type InlineKeyboardMarkup = {
     inline_keyboard: InlineKeyboardButton[][];
 };
+
 declare class KeyboardBuilder {
     private keyboard;
     private _maxPerRow;
@@ -110,6 +127,8 @@ declare class KeyboardBuilder {
     private currentRow;
     row(): this;
     private push;
+    callbackJson(text: string, obj: any): this;
+    button(btn: InlineKeyboardButton): this;
     url(text: string, url: string): this;
     style(text: string, style: string, url: string): this;
     callback(text: string, data: string): this;

package/dist/index.d.ts

@@ -3,10 +3,14 @@ type HttpOptions = {
     base_url: string;
     timeout_ms: number;
 };
+type HttpContext = {
+    path: string;
+    body?: any;
+};
 declare class Http {
     private opts;
     constructor(opts: HttpOptions);
-    post(path: string, body: any): Promise<any>;
+    post(ctx: HttpContext): Promise<any>;
 }
 
 declare class RawMethods {
@@ -22,10 +26,11 @@ declare class RawMethods {
 }
 
 declare abstract class BaseCallBuilder<T = any> {
-    protected http: any;
+    protected client: any;
     protected path: string;
+    protected method: "POST" | "GET";
     protected params: Record<string, any>;
-    constructor(http: any, path: string);
+    constructor(client: any, path: string, method?: "POST" | "GET");
     protected set(key: string, value: any): this;
     execute(): Promise<T>;
     throw(): Promise<T>;
@@ -53,8 +58,8 @@ declare class SendPhotoBuilder extends BaseCallBuilder {
 }
 
 declare class CallMethods {
-    private http;
-    constructor(http: any);
+    private client;
+    constructor(client: any);
     sendMessage(): SendMessageBuilder;
     sendPhoto(): SendPhotoBuilder;
 }
@@ -64,11 +69,21 @@ type ClientOptions = {
     base_url?: string;
     timeout_ms?: number;
 };
+
+type MiddlewareContext = {
+    method: string;
+    payload?: any;
+};
+type Middleware = (ctx: MiddlewareContext, next: () => Promise<any>) => Promise<any>;
+
 declare function tgcore(options: ClientOptions): Client;
 declare class Client {
     private http;
+    private middlewares;
     raw: RawMethods;
     calls: CallMethods;
+    use(mw: Middleware): this;
+    request(path: string, body?: any): Promise<any>;
     constructor(opts: ClientOptions);
 }
 
@@ -99,9 +114,11 @@ type InlineKeyboardButton = {
         text: string;
     };
 };
+
 type InlineKeyboardMarkup = {
     inline_keyboard: InlineKeyboardButton[][];
 };
+
 declare class KeyboardBuilder {
     private keyboard;
     private _maxPerRow;
@@ -110,6 +127,8 @@ declare class KeyboardBuilder {
     private currentRow;
     row(): this;
     private push;
+    callbackJson(text: string, obj: any): this;
+    button(btn: InlineKeyboardButton): this;
     url(text: string, url: string): this;
     style(text: string, style: string, url: string): this;
     callback(text: string, data: string): this;

package/dist/index.js

@@ -3,17 +3,17 @@ var Http = class {
   constructor(opts) {
     this.opts = opts;
   }
-  async post(path, body) {
+  async post(ctx) {
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), this.opts.timeout_ms);
     try {
-      const res = await fetch(this.opts.base_url + path, {
+      const res = await fetch(this.opts.base_url + ctx.path, {
         method: "POST",
         headers: {
           "content-type": "application/json",
           "x-api-key": this.opts.api_key
         },
-        body: JSON.stringify(body ?? {}),
+        body: JSON.stringify(ctx.body ?? {}),
         signal: controller.signal
       });
       const json = await res.json().catch(() => null);
@@ -33,18 +33,25 @@ var RawMethods = class {
     this.http = http;
   }
   sendMessage(params) {
-    return this.http.post("/api/v2/sendMessage", params);
+    return this.http.post({
+      path: "/api/v2/sendMessage",
+      body: params
+    });
   }
   getMe() {
-    return this.http.post("/api/v2/getMe", {});
+    return this.http.post({
+      path: "/api/v2/getMe",
+      body: {}
+    });
   }
 };
 
 // src/calls/base.ts
 var BaseCallBuilder = class {
-  constructor(http, path) {
-    this.http = http;
+  constructor(client, path, method = "POST") {
+    this.client = client;
     this.path = path;
+    this.method = method;
     this.params = {};
   }
   set(key, value) {
@@ -54,7 +61,7 @@ var BaseCallBuilder = class {
     return this;
   }
   async execute() {
-    return this.http.post(this.path, this.params);
+    return this.client.request(this.path, this.params);
   }
   async throw() {
     const res = await this.execute();
@@ -120,18 +127,18 @@ var SendPhotoBuilder = class extends BaseCallBuilder {
 
 // src/calls/index.ts
 var CallMethods = class {
-  constructor(http) {
-    this.http = http;
+  constructor(client) {
+    this.client = client;
   }
   sendMessage() {
     return new SendMessageBuilder(
-      this.http,
+      this.client,
       "/api/v2/sendMessage"
     );
   }
   sendPhoto() {
     return new SendPhotoBuilder(
-      this.http,
+      this.client,
       "/api/v2/sendPhoto"
     );
   }
@@ -143,6 +150,7 @@ function tgcore(options) {
 }
 var Client = class {
   constructor(opts) {
+    this.middlewares = [];
     if (!opts?.api_key) {
       throw new Error("tgcore-ts: api_key is required");
     }
@@ -154,6 +162,13 @@ var Client = class {
     this.calls = new CallMethods(this.http);
     this.raw = new RawMethods(this.http);
   }
+  use(mw) {
+    this.middlewares.push(mw);
+    return this;
+  }
+  async request(path, body) {
+    return this.http.post({ path, body });
+  }
 };
 
 // src/builders/keyboard.ts
@@ -204,6 +219,12 @@ var KeyboardBuilder = class _KeyboardBuilder {
     this.currentRow().push(btn);
     return this;
   }
+  callbackJson(text, obj) {
+    return this.callback(text, JSON.stringify(obj));
+  }
+  button(btn) {
+    return this.push(btn);
+  }
   url(text, url) {
     return this.push({ text, url });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xtsea/tgcore-ts",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "tgcore TypeScript SDK • Telegram Engine Client",
   "type": "module",
   "main": "./dist/index.cjs",