chz-telegram-bot 0.0.17 → 0.0.19

package/dist/services/jsonFileStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsonFileStorage.d.ts","sourceRoot":"","sources":["../../services/jsonFileStorage.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,qBAAa,eAAgB,YAAW,cAAc;IAClD,SAAS,YAAoB;IAC7B,OAAO,CAAC,KAAK,CAA4C;IACzD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAAS;gBAEZ,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;YAY5B,IAAI;YAUJ,YAAY;YAmBZ,IAAI;IAalB,OAAO,CAAC,eAAe;IAOjB,IAAI,CAAC,YAAY,SAAS,YAAY,EAAE,GAAG,EAAE,MAAM;IAMnD,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,MAAM;IAUzD,cAAc,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM;IASZ,yBAAyB,CAC3B,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,qBAAqB;IAYtC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,cAAc,CAAC,YAAY,SAAS,YAAY,EAClD,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC;CAWrD"}
+{"version":3,"file":"jsonFileStorage.d.ts","sourceRoot":"","sources":["../../services/jsonFileStorage.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,qBAAa,eAAgB,YAAW,cAAc;IAClD,SAAS,YAAoB;IAC7B,OAAO,CAAC,KAAK,CAA4C;IACzD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAAS;gBAEZ,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;YAY5B,IAAI;YAUJ,YAAY;YAmBZ,IAAI;IAalB,OAAO,CAAC,eAAe;IAOjB,IAAI,CAAC,YAAY,SAAS,YAAY,EAAE,GAAG,EAAE,MAAM;IAMnD,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,MAAM;IAUzD,cAAc,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM;IAYZ,yBAAyB,CAC3B,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,qBAAqB;IAYtC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,cAAc,CAAC,YAAY,SAAS,YAAY,EAClD,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC;CAcrD"}

package/dist/services/jsonFileStorage.js

@@ -5,6 +5,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const promises_1 = require("fs/promises");
 const async_sema_1 = require("async-sema");
+const actionStateBase_1 = require("../entities/states/actionStateBase");
 class JsonFileStorage {
     constructor(botName, path) {
         this.semaphore = new async_sema_1.Sema(1);
@@ -68,7 +69,7 @@ class JsonFileStorage {
     async getActionState(entity, chatId) {
         return await this.lock(async () => {
             const data = await this.loadInternal(entity.key);
-            return data[chatId] ?? entity.stateConstructor();
+            return Object.assign(entity.stateConstructor(), data[chatId]);
         });
     }
     async saveActionExecutionResult(action, chatId, transactionResult) {
@@ -86,7 +87,7 @@ class JsonFileStorage {
     async updateStateFor(sourceActionKey, chatId, update) {
         await this.lock(async () => {
             const data = await this.loadInternal(sourceActionKey);
-            const state = data[chatId];
+            const state = Object.assign(new actionStateBase_1.ActionStateBase(), data[chatId]);
             await update(state);
             await this.save(data, sourceActionKey);
         });

package/dist/services/logger.d.ts

@@ -1,6 +1,7 @@
 declare class JsonLogger {
+    private serializeError;
     logWithTraceId(botName: string, traceId: string | number, chatName: string, text: string): void;
-    errorWithTraceId<TData>(botName: string, traceId: string | number, chatName: string, errorObj: string | Error, extraData?: TData | undefined): void;
+    errorWithTraceId<TData>(botName: string, traceId: string | number, chatName: string, errorObj: unknown, extraData?: TData | undefined): void;
 }
 export declare const Logger: JsonLogger;
 export {};

package/dist/services/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../services/logger.ts"],"names":[],"mappings":"AAAA,cAAM,UAAU;IACZ,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM;IAKhB,gBAAgB,CAAC,KAAK,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GAAG,KAAK,EACxB,SAAS,CAAC,EAAE,KAAK,GAAG,SAAS;CAYpC;AAED,eAAO,MAAM,MAAM,YAAmB,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../services/logger.ts"],"names":[],"mappings":"AAAA,cAAM,UAAU;IAEZ,OAAO,CAAC,cAAc;IAQtB,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM;IAKhB,gBAAgB,CAAC,KAAK,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,KAAK,GAAG,SAAS;CAYpC;AAED,eAAO,MAAM,MAAM,YAAmB,CAAC"}

package/dist/services/logger.js

@@ -2,6 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Logger = void 0;
 class JsonLogger {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    serializeError(error) {
+        const plainObject = {};
+        Object.getOwnPropertyNames(error).forEach(function (key) {
+            plainObject[key] = error[key];
+        });
+        return JSON.stringify(plainObject);
+    }
     logWithTraceId(botName, traceId, chatName, text) {
         console.log(JSON.stringify({ botName, traceId, chatName, text }));
     }
@@ -10,7 +18,7 @@ class JsonLogger {
             botName,
             traceId,
             chatName,
-            errorObj,
+            error: this.serializeError(errorObj),
             extraData
         }));
     }

package/entities/botInstance.ts

@@ -128,7 +128,7 @@ export class BotInstance {
                         ctx.botName,
                         ctx.traceId,
                         chatName,
-                        error as string | Error,
+                        error,
                         ctx
                     );
                 }
@@ -149,7 +149,7 @@ export class BotInstance {
                     ctx.botName,
                     ctx.traceId,
                     ctx.chatName,
-                    error as string | Error,
+                    error,
                     ctx
                 );
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chz-telegram-bot",
-    "version": "0.0.17",
+    "version": "0.0.19",
     "type": "module",
     "dependencies": {
         "async-sema": "^3.1.1",

package/services/jsonFileStorage.ts

@@ -98,7 +98,10 @@ export class JsonFileStorage implements IStorageClient {
         return await this.lock(async () => {
             const data = await this.loadInternal(entity.key);
 
-            return (data[chatId] as TActionState) ?? entity.stateConstructor();
+            return Object.assign(
+                entity.stateConstructor(),
+                data[chatId]
+            ) as TActionState;
         });
     }
 
@@ -128,7 +131,10 @@ export class JsonFileStorage implements IStorageClient {
     ) {
         await this.lock(async () => {
             const data = await this.loadInternal(sourceActionKey);
-            const state = data[chatId] as TActionState;
+            const state = Object.assign(
+                new ActionStateBase(),
+                data[chatId]
+            ) as TActionState;
 
             await update(state);
 

package/services/logger.ts

@@ -1,4 +1,13 @@
 class JsonLogger {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    private serializeError(error: any) {
+        const plainObject: Record<string, unknown> = {};
+        Object.getOwnPropertyNames(error).forEach(function (key) {
+            plainObject[key] = error[key];
+        });
+        return JSON.stringify(plainObject);
+    }
+
     logWithTraceId(
         botName: string,
         traceId: string | number,
@@ -12,7 +21,7 @@ class JsonLogger {
         botName: string,
         traceId: string | number,
         chatName: string,
-        errorObj: string | Error,
+        errorObj: unknown,
         extraData?: TData | undefined
     ) {
         console.error(
@@ -20,7 +29,7 @@ class JsonLogger {
                 botName,
                 traceId,
                 chatName,
-                errorObj,
+                error: this.serializeError(errorObj),
                 extraData
             })
         );

package/services/telegramApi.ts

@@ -56,7 +56,7 @@ export class TelegramApiService {
                 this.botName,
                 message.traceId,
                 this.chats.get(message.chatId)!,
-                error as string | Error,
+                error,
                 message
             );
         }

package/types/daysOfTheWeek.ts

@@ -1,9 +0,0 @@
-export enum Day {
-    Sunday = 0,
-    Monday = 1,
-    Tuesday = 2,
-    Wednesday = 3,
-    Thursday = 4,
-    Friday = 5,
-    Saturday = 6
-}