chz-telegram-bot 0.5.1 → 0.5.2

package/dist/services/jsonFileStorage.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonFileStorage = void 0;
-const fs_1 = require("fs");
-const promises_1 = require("fs/promises");
-const async_sema_1 = require("async-sema");
-const mapUtils_1 = require("../helpers/mapUtils");
+import { existsSync, mkdirSync } from 'fs';
+import { readFile, writeFile } from 'fs/promises';
+import { Sema as Semaphore } from 'async-sema';
+import { getOrSetIfNotExists } from '../helpers/mapUtils';
 function buildPath(storagePath, botName, actionKey) {
     return `${storagePath}/${botName}/${actionKey.replaceAll(':', '/')}.json`;
 }
-class JsonFileStorage {
+export class JsonFileStorage {
     filePaths = new Map();
     locks = new Map();
     cache;
@@ -18,13 +15,13 @@ class JsonFileStorage {
         this.cache = new Map();
         this.botName = botName;
         this.storagePath = path ?? 'storage';
-        if (!(0, fs_1.existsSync)(`${this.storagePath}/${this.botName}/`)) {
-            (0, fs_1.mkdirSync)(`${this.storagePath}/${this.botName}/`, {
+        if (!existsSync(`${this.storagePath}/${this.botName}/`)) {
+            mkdirSync(`${this.storagePath}/${this.botName}/`, {
                 recursive: true
             });
         }
         for (const action of actions) {
-            this.locks.set(action.key, new async_sema_1.Sema(1));
+            this.locks.set(action.key, new Semaphore(1));
             this.filePaths.set(action.key, buildPath(this.storagePath, this.botName, action.key));
         }
     }
@@ -32,12 +29,12 @@ class JsonFileStorage {
         for (const [stringKey, value] of Object.entries(data)) {
             if (value)
                 continue;
-            data[parseInt(stringKey)] = action.stateConstructor();
+            data[Number.parseInt(stringKey)] = action.stateConstructor();
         }
         return true;
     }
     async lock(key, action) {
-        const lock = (0, mapUtils_1.getOrSetIfNotExists)(this.locks, key, new async_sema_1.Sema(1));
+        const lock = getOrSetIfNotExists(this.locks, key, new Semaphore(1));
         await lock.acquire();
         try {
             return await action();
@@ -50,8 +47,8 @@ class JsonFileStorage {
         return this.cache.get(key);
     }
     async loadFromFile(key) {
-        const targetPath = (0, mapUtils_1.getOrSetIfNotExists)(this.filePaths, key, buildPath(this.storagePath, this.botName, key));
-        const fileContent = await (0, promises_1.readFile)(targetPath, {
+        const targetPath = getOrSetIfNotExists(this.filePaths, key, buildPath(this.storagePath, this.botName, key));
+        const fileContent = await readFile(targetPath, {
             encoding: 'utf-8',
             flag: 'a+'
         });
@@ -63,8 +60,8 @@ class JsonFileStorage {
     }
     async updateCacheAndSaveToFile(data, key) {
         this.cache.set(key, data);
-        const targetPath = (0, mapUtils_1.getOrSetIfNotExists)(this.filePaths, key, buildPath(this.storagePath, this.botName, key));
-        await (0, promises_1.writeFile)(targetPath, JSON.stringify(data), { flag: 'w+' });
+        const targetPath = getOrSetIfNotExists(this.filePaths, key, buildPath(this.storagePath, this.botName, key));
+        await writeFile(targetPath, JSON.stringify(data), { flag: 'w+' });
     }
     async load(key) {
         return (this.tryGetFromCache(key) ??
@@ -74,7 +71,7 @@ class JsonFileStorage {
     }
     async saveMetadata(actions) {
         const targetPath = `${this.storagePath}/${this.botName}/Metadata-${this.botName}.json`;
-        await (0, promises_1.writeFile)(targetPath, JSON.stringify(actions), {
+        await writeFile(targetPath, JSON.stringify(actions), {
             flag: 'w+'
         });
     }
@@ -110,4 +107,3 @@ class JsonFileStorage {
         });
     }
 }
-exports.JsonFileStorage = JsonFileStorage;

package/dist/services/jsonLogger.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonLogger = void 0;
-class JsonLogger {
+export class JsonLogger {
     serializeError(error) {
         if (error instanceof Error) {
             const plainObject = {
@@ -67,4 +64,3 @@ class JsonLogger {
         console.error(`{"botName":"${botName}","traceId":"${traceId}","chatName":"${chatName}","error":${this.serializeError(errorObj)}${dataString}}`);
     }
 }
-exports.JsonLogger = JsonLogger;

package/dist/services/nodeTimeoutScheduler.js

@@ -1,35 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NodeTimeoutScheduler = void 0;
-const taskRecord_1 = require("../entities/taskRecord");
-const traceFactory_1 = require("../helpers/traceFactory");
-class NodeTimeoutScheduler {
+import { TaskRecord } from '../entities/taskRecord';
+import { createTrace } from '../helpers/traceFactory';
+export class NodeTimeoutScheduler {
     logger;
     activeTasks = [];
     constructor(logger) {
         this.logger = logger;
     }
     stopAll() {
-        this.activeTasks.forEach((task) => {
+        for (const task of this.activeTasks) {
             clearInterval(task.taskId);
-        });
+        }
     }
     createTask(name, action, interval, executeRightAway, ownerName) {
         const taskId = setInterval(action, interval);
-        const task = new taskRecord_1.TaskRecord(name, taskId, interval);
+        const task = new TaskRecord(name, taskId, interval);
         if (executeRightAway) {
             setImmediate(action);
         }
-        this.logger.logWithTraceId(ownerName, (0, traceFactory_1.createTrace)(this, ownerName, name), 'System', `Created task ${name}, that will run every ${interval}ms.`);
+        this.logger.logWithTraceId(ownerName, createTrace(this, ownerName, name), 'System', `Created task ${name}, that will run every ${interval}ms.`);
         this.activeTasks.push(task);
     }
     createOnetimeTask(name, action, delay, ownerName) {
         const actionWrapper = () => {
-            this.logger.logWithTraceId(ownerName, (0, traceFactory_1.createTrace)(this, ownerName, name), 'System', `Executing delayed oneshot ${name}`);
+            this.logger.logWithTraceId(ownerName, createTrace(this, ownerName, name), 'System', `Executing delayed oneshot ${name}`);
             action();
         };
         setTimeout(actionWrapper, delay);
-        this.logger.logWithTraceId(ownerName, (0, traceFactory_1.createTrace)(this, ownerName, name), 'System', `Created oneshot task ${name}, that will run in ${delay}ms.`);
+        this.logger.logWithTraceId(ownerName, createTrace(this, ownerName, name), 'System', `Created oneshot task ${name}, that will run in ${delay}ms.`);
     }
 }
-exports.NodeTimeoutScheduler = NodeTimeoutScheduler;

package/dist/services/responseProcessingQueue.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResponseProcessingQueue = void 0;
-const async_sema_1 = require("async-sema");
+import { RateLimit } from 'async-sema';
 function notEmpty(arr) {
     return arr.length > 0;
 }
 const TELEGRAM_RATELIMIT_DELAY = 35;
-class ResponseProcessingQueue {
-    rateLimiter = (0, async_sema_1.RateLimit)(1, { timeUnit: TELEGRAM_RATELIMIT_DELAY });
+export class ResponseProcessingQueue {
+    rateLimiter = RateLimit(1, { timeUnit: TELEGRAM_RATELIMIT_DELAY });
     items = [];
     isFlushing = false;
     enqueue(item) {
@@ -38,4 +35,3 @@ class ResponseProcessingQueue {
         this.isFlushing = false;
     }
 }
-exports.ResponseProcessingQueue = ResponseProcessingQueue;

package/dist/services/telegramApi.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TelegramApiService = exports.TELEGRAM_ERROR_QUOTE_INVALID = void 0;
-const responseProcessingQueue_1 = require("./responseProcessingQueue");
-exports.TELEGRAM_ERROR_QUOTE_INVALID = 'QUOTE_TEXT_INVALID';
-class TelegramApiService {
-    queue = new responseProcessingQueue_1.ResponseProcessingQueue();
+import { ResponseProcessingQueue } from './responseProcessingQueue';
+export const TELEGRAM_ERROR_QUOTE_INVALID = 'QUOTE_TEXT_INVALID';
+export class TelegramApiService {
+    queue = new ResponseProcessingQueue();
     telegram;
     storage;
     logger;
@@ -35,7 +32,7 @@ class TelegramApiService {
                     catch (error) {
                         if ('message' in error) {
                             const telegramResponse = error;
-                            if (telegramResponse.message.includes(exports.TELEGRAM_ERROR_QUOTE_INVALID)) {
+                            if (telegramResponse.message.includes(TELEGRAM_ERROR_QUOTE_INVALID)) {
                                 scopedLogger.logWithTraceId('Quote error recieved, retrying without quote');
                                 try {
                                     await this.processResponse(response, true);
@@ -134,4 +131,3 @@ class TelegramApiService {
         }
     }
 }
-exports.TelegramApiService = TelegramApiService;

package/dist/types/action.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/actionState.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/cachedValueAccessor.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/capture.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/commandCondition.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/commandTrigger.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/externalAliases.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/handlers.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/inputFile.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/logger.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/messageSendingOptions.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/messageTypes.js

@@ -1,21 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageType = exports.INTERNAL_MESSAGE_TYPE_PREFIX = void 0;
-exports.INTERNAL_MESSAGE_TYPE_PREFIX = `__msg:`;
-exports.MessageType = {
-    Any: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Any`,
-    Text: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Text`,
-    Sticker: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Sticker`,
-    Animation: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Animation`,
-    Document: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Document`,
-    Voice: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Voice`,
-    Audio: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Audio`,
-    LeftChatMember: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}LeftChatMember`,
-    NewChatMember: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}NewChatMember`,
-    Poll: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Poll`,
-    Location: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Location`,
-    Photo: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Photo`,
-    Forward: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Forward`,
-    Video: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Video`,
-    Unknown: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Unknown`
+export const INTERNAL_MESSAGE_TYPE_PREFIX = `__msg:`;
+export const MessageType = {
+    Any: `${INTERNAL_MESSAGE_TYPE_PREFIX}Any`,
+    Text: `${INTERNAL_MESSAGE_TYPE_PREFIX}Text`,
+    Sticker: `${INTERNAL_MESSAGE_TYPE_PREFIX}Sticker`,
+    Animation: `${INTERNAL_MESSAGE_TYPE_PREFIX}Animation`,
+    Document: `${INTERNAL_MESSAGE_TYPE_PREFIX}Document`,
+    Voice: `${INTERNAL_MESSAGE_TYPE_PREFIX}Voice`,
+    Audio: `${INTERNAL_MESSAGE_TYPE_PREFIX}Audio`,
+    LeftChatMember: `${INTERNAL_MESSAGE_TYPE_PREFIX}LeftChatMember`,
+    NewChatMember: `${INTERNAL_MESSAGE_TYPE_PREFIX}NewChatMember`,
+    Poll: `${INTERNAL_MESSAGE_TYPE_PREFIX}Poll`,
+    Location: `${INTERNAL_MESSAGE_TYPE_PREFIX}Location`,
+    Photo: `${INTERNAL_MESSAGE_TYPE_PREFIX}Photo`,
+    Forward: `${INTERNAL_MESSAGE_TYPE_PREFIX}Forward`,
+    Video: `${INTERNAL_MESSAGE_TYPE_PREFIX}Video`,
+    Unknown: `${INTERNAL_MESSAGE_TYPE_PREFIX}Unknown`
 };

package/dist/types/propertyProvider.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/response.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BotResponseTypes = void 0;
-exports.BotResponseTypes = {
+export const BotResponseTypes = {
     unpin: 'unpin',
     text: 'text',
     image: 'image',

package/dist/types/scheduler.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/storage.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/timeValues.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/trace.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/entities/botInstance.ts

@@ -93,6 +93,6 @@ export class BotInstance {
 
         this.scheduler.stopAll();
         await this.storage.close();
-        await this.actionProcessingService.stop();
+        this.actionProcessingService.stop();
     }
 }

package/entities/context/messageContext.ts

@@ -43,9 +43,9 @@ export class MessageContextInternal<
     private getQuotePart(quote: boolean | string) {
         if (typeof quote != 'boolean') return quote;
 
-        return this.matchResults.length != 0
-            ? this.matchResults[0][1]
-            : this.messageInfo.text;
+        return this.matchResults.length == 0
+            ? this.messageInfo.text
+            : this.matchResults[0][1];
     }
 
     private replyWithText(

package/entities/context/replyContext.ts

@@ -45,9 +45,9 @@ export class ReplyContextInternal<
     private getQuotePart(quote: boolean | string) {
         if (typeof quote != 'boolean') return quote;
 
-        return this.matchResults.length != 0
-            ? this.matchResults[0][1]
-            : this.messageInfo.text;
+        return this.matchResults.length == 0
+            ? this.messageInfo.text
+            : this.matchResults[0][1];
     }
 
     private replyWithText(

package/{eslint.config.js → eslint.config.ts}

@@ -3,18 +3,22 @@ import tseslint from 'typescript-eslint';
 import parser from '@typescript-eslint/parser';
 
 export default tseslint.config(
+    {
+        ignores: ['dist/**']
+    },
     eslint.configs.recommended,
     tseslint.configs.strictTypeChecked,
     {
         languageOptions: {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             parser,
             parserOptions: {
                 project: './tsconfig.json',
-                tsconfigRootDir: import.meta.dirname,
-                sourceType: 'module'
+                tsconfigRootDir: __dirname,
+                sourceType: 'module',
+                projectService: true
             }
         },
+        plugins: { '@typescript-eslint': tseslint.plugin },
         rules: {
             '@typescript-eslint/switch-exhaustiveness-check': 'error',
             '@typescript-eslint/no-unused-vars': [
@@ -48,7 +52,6 @@ export default tseslint.config(
                     ignoreStatic: true
                 }
             ]
-        },
-        ignores: ['dist/*']
+        }
     }
 );

package/index.ts

@@ -8,6 +8,9 @@ export * from './types/messageTypes';
 export * from './helpers/timeConvertions';
 export * from './types/action';
 export * from './types/externalAliases';
+export * from './types/storage';
+export * from './types/logger';
+export * from './types/scheduler';
 export { CommandAction } from './entities/actions/commandAction';
 export { InlineQueryAction } from './entities/actions/inlineQueryAction';
 export { ReplyCaptureAction } from './entities/actions/replyCaptureAction';

package/package.json

@@ -14,7 +14,7 @@
         "type": "git",
         "url": "https://github.com/AlexSolari/botFramework.git"
     },
-    "version": "0.5.1",
+    "version": "0.5.2",
     "type": "module",
     "dependencies": {
         "async-sema": "^3.1.1",
@@ -27,6 +27,7 @@
         "@eslint/js": "^9.29.0",
         "@types/node": "^22.5.5",
         "eslint": "^9.29.0",
+        "jiti": "^2.6.1",
         "typescript": "^5.9.0-beta",
         "typescript-eslint": "^8.34.1"
     },

package/services/actionProcessors/commandActionProcessor.ts

@@ -48,9 +48,8 @@ export class CommandActionProcessor extends BaseActionProcessor {
             if (msgType == MessageType.Text) {
                 this.commands[msgType] = commands.filter(
                     (cmd) =>
-                        cmd.triggers.find((x) => typeof x != 'string') !=
-                            undefined ||
-                        cmd.triggers.find(
+                        cmd.triggers.some((x) => typeof x != 'string') ||
+                        cmd.triggers.some(
                             (x) =>
                                 typeof x == 'string' &&
                                 !x.startsWith(INTERNAL_MESSAGE_TYPE_PREFIX)
@@ -161,9 +160,9 @@ export class CommandActionProcessor extends BaseActionProcessor {
 
         const commandsToCheck = new Set(this.commands[msg.type]);
         if (msg.type != MessageType.Text && msg.text != '') {
-            this.commands[MessageType.Text].forEach((x) =>
-                commandsToCheck.add(x)
-            );
+            for (const command of this.commands[MessageType.Text]) {
+                commandsToCheck.add(command);
+            }
         }
 
         for (const commandAction of commandsToCheck) {

package/services/jsonFileStorage.ts

@@ -48,7 +48,7 @@ export class JsonFileStorage implements IStorageClient {
         for (const [stringKey, value] of Object.entries(data)) {
             if (value) continue;
 
-            data[parseInt(stringKey)] = action.stateConstructor();
+            data[Number.parseInt(stringKey)] = action.stateConstructor();
         }
 
         return true;

package/services/nodeTimeoutScheduler.ts

@@ -13,9 +13,9 @@ export class NodeTimeoutScheduler implements IScheduler {
     }
 
     stopAll() {
-        this.activeTasks.forEach((task) => {
+        for (const task of this.activeTasks) {
             clearInterval(task.taskId);
-        });
+        }
     }
 
     createTask(

package/tsconfig.json

@@ -31,9 +31,9 @@
         // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
         /* Modules */
-        "module": "commonjs" /* Specify what module code is generated. */,
+        "module": "esnext" /* Specify what module code is generated. */,
         // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-        // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
+        "moduleResolution": "bundler" /* Specify how TypeScript looks up a file from a given module specifier. */,
         // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
         // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
         // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */