ddbot.js-0374 4.1.0 → 4.2.0

package/lib/core/core.d.ts

@@ -2,6 +2,7 @@ import { Client } from 'teeworlds';
 import { EventEmitter } from 'events';
 import * as Types from '../types.js';
 interface BotEvents {
+    error: (...args: any[]) => void;
     connect: (info: Types.ConnectionInfo) => void;
     disconnect: (reason: string | null, info: Types.ConnectionInfo) => void;
     broadcast: (message: string) => void;
@@ -16,6 +17,13 @@ interface BotEvents {
     kill: (kill: Types.SnapshotItemTypes.iKillMsg) => void;
     snapshot: (items: Types.DeltaItem[]) => void;
     map_change: (message: Types.SnapshotItemTypes.iMapChange) => void;
+    map_details: (message: {
+        map_name: string;
+        map_sha256: Buffer;
+        map_crc: number;
+        map_size: number;
+        map_url: string;
+    }) => void;
     motd: (message: string) => void;
     message: (message: Types.SnapshotItemTypes.iMessage) => void;
     teams: (teams: Array<number>) => void;
@@ -51,6 +59,7 @@ export declare class Bot extends EventEmitter {
      * @param CustomTeeworlds Custom teeworlds
      */
     constructor(identity?: Types.SnapshotItemTypes.Identity, options?: Types.SnapshotItemTypes.iOptions, CustomTeeworlds?: typeof import('teeworlds'));
+    private error;
     /**
      * Get bot identity
      */

package/lib/core/core.js

@@ -32,6 +32,10 @@ export class Bot extends EventEmitter {
             ? identity
             : DDUtils.DefaultIdentity('nameless tee');
     }
+    error(...err) {
+        //console.error(err);
+        this.emit('error', ...err);
+    }
     /**
      * Get bot identity
      */
@@ -66,7 +70,7 @@ export class Bot extends EventEmitter {
             }
         }
         catch (e) {
-            console.error('Error during clean:', e);
+            this.error('Error during clean:', e);
         }
     }
     /**
@@ -125,6 +129,10 @@ export class Bot extends EventEmitter {
             }, timeout);
             this.once('connect', onConnect);
             this.once('disconnect', onDisconnect);
+            if (!this.client) {
+                reject(new Error('Client not created'));
+                return;
+            }
             this.client.connect();
         });
     }
@@ -140,7 +148,7 @@ export class Bot extends EventEmitter {
                 await this.client.Disconnect();
             }
             catch (e) {
-                console.error('Error during disconnect:', e);
+                this.error('Error during disconnect:', e);
             }
             this.status.connect.connected = false;
             info = { addr: this.status.addr, port: this.status.port };
@@ -198,6 +206,7 @@ export class Bot extends EventEmitter {
         this.client.on('kill', (msg) => this.emit('kill', msg));
         this.client.on('snapshot', (msg) => this.emit('snapshot', msg));
         this.client.on('map_change', (msg) => this.emit('map_change', msg));
+        this.client.on('map_details', (msg) => this.emit('map_details', msg));
         this.client.on('motd', (msg) => this.emit('motd', msg));
         this.client.on('message', (msg) => this.emit('message', msg));
         this.client.on('teams', (msg) => this.emit('teams', msg));
@@ -208,7 +217,7 @@ export class Bot extends EventEmitter {
      */
     setup_snapshot_events() {
         if (!this.client?.SnapshotUnpacker) {
-            console.warn('SnapshotUnpacker not available yet');
+            this.error('SnapshotUnpacker not available yet');
             return;
         }
         this.client.SnapshotUnpacker.removeAllListeners();

package/lib/core/ddutils.d.ts

@@ -30,4 +30,7 @@ export declare function IsValidInput(input: unknown): input is Input;
 export declare function random(min: number, max: number): number;
 export declare function connectionInfo(): ConnectionInfo;
 import type { SnapshotItemTypes } from '../types.js';
+/**
+ * NOT FULL. baze.
+ */
 export declare function reconstructPlayerInput(char: SnapshotItemTypes.Character, ddnetChar?: SnapshotItemTypes.DDNetCharacter | null, tick?: number | null): SnapshotItemTypes.PlayerInput;

package/lib/core/ddutils.js

@@ -109,6 +109,9 @@ export function connectionInfo() {
         port: 8303
     };
 }
+/**
+ * NOT FULL. baze.
+ */
 export function reconstructPlayerInput(char, ddnetChar = null, tick = null) {
     const input = {
         direction: char.character_core.direction,

package/lib/core/module.d.ts

@@ -4,7 +4,7 @@ interface BaseModuleOptions {
     moduleName?: string;
     offonDisconnect?: boolean;
 }
-declare class BaseModule extends EventEmitter {
+declare class BaseModule<TStartArgs extends unknown[] = []> extends EventEmitter {
     protected readonly bot: Bot;
     readonly moduleName: string;
     isRunning: boolean;
@@ -14,7 +14,7 @@ declare class BaseModule extends EventEmitter {
      * Запускает модуль, если он ещё не запущен
      * @param args — аргументы, которые будут переданы в _start
      */
-    start(...args: unknown[]): void;
+    start(...args: TStartArgs): void;
     /**
      * Останавливает модуль, если он запущен
      */
@@ -23,7 +23,7 @@ declare class BaseModule extends EventEmitter {
      * Метод, который нужно переопределить в наследниках
      * Здесь происходит основная логика запуска
      */
-    protected _start(...args: unknown[]): void;
+    protected _start(...args: TStartArgs): void;
     /**
      * Метод, который нужно переопределить в наследниках
      * Здесь происходит очистка при остановке

package/lib/modules/chat.d.ts

@@ -16,7 +16,7 @@ interface ChatEvents {
         queueSize: number;
     }) => void;
 }
-declare class Chat extends BaseModule {
+declare class Chat extends BaseModule<[interval?: number, cooldown?: number]> {
     private chatinterval;
     private sendinterval;
     private readonly chatset;
@@ -37,7 +37,6 @@ declare class Chat extends BaseModule {
     private _processQueue;
     protected _start(interval?: number, cooldown?: number): void;
     protected _stop(): void;
-    destroy(): void;
     on<K extends keyof ChatEvents>(event: K, listener: ChatEvents[K]): this;
     once<K extends keyof ChatEvents>(event: K, listener: ChatEvents[K]): this;
     emit<K extends keyof ChatEvents>(event: K, ...args: Parameters<ChatEvents[K]>): boolean;

package/lib/modules/chat.js

@@ -8,26 +8,21 @@ class Chat extends BaseModule {
     lastSentTime = 0;
     cooldown = 1000;
     chatlistener = (msg) => {
-        try {
-            const msgraw = msg;
-            const text = String(msgraw?.message ?? '');
-            const client_id = msgraw.client_id ?? -1;
-            const team = msgraw.team ?? 0;
-            const autormsg = msgraw?.author?.ClientInfo?.name ?? null;
-            const key = `${client_id}:${text}:${team}`;
-            if (this.chatset.has(key))
-                return;
-            this.chatset.add(key);
-            this.emit('anychat', msgraw, autormsg, text, team, client_id);
-            if (autormsg) {
-                this.emit('chat', msgraw, autormsg, text, team, client_id);
-            }
-            else {
-                this.emit('systemchat', msgraw, text);
-            }
+        const msgraw = msg;
+        const text = String(msgraw?.message ?? '');
+        const client_id = msgraw.client_id ?? -1;
+        const team = msgraw.team ?? 0;
+        const autormsg = msgraw?.author?.ClientInfo?.name ?? null;
+        const key = `${client_id}:${text}:${team}`;
+        if (this.chatset.has(key))
+            return;
+        this.chatset.add(key);
+        this.emit('anychat', msgraw, autormsg, text, team, client_id);
+        if (autormsg) {
+            this.emit('chat', msgraw, autormsg, text, team, client_id);
         }
-        catch (e) {
-            console.error(`[${this.moduleName}] chat listener error:`, e);
+        else {
+            this.emit('systemchat', msgraw, text);
         }
     };
     constructor(bot) {
@@ -102,9 +97,6 @@ class Chat extends BaseModule {
             this.sendinterval = null;
         }
     }
-    destroy() {
-        super.destroy();
-    }
     on(event, listener) {
         return super.on(event, listener);
     }

package/lib/modules/playerlist.d.ts

@@ -8,7 +8,7 @@ interface PlayerData {
     character: Types.SnapshotItemTypes.Character | null;
     DDNetCharacter: Types.SnapshotItemTypes.DDNetCharacter | null;
 }
-declare class PlayerList extends BaseModule {
+declare class PlayerList extends BaseModule<[maxclients?: number]> {
     constructor(bot: Bot);
     private client;
     private maxclients;

package/lib/modules/reconnect.d.ts

@@ -7,7 +7,7 @@ export interface ReconnectingInfo {
     reason: string | null;
     ConnectionInfo: Types.ConnectionInfo;
 }
-declare class Reconnect extends BaseModule {
+declare class Reconnect extends BaseModule<[maxAttempts?: number, randomDelay?: boolean]> {
     private maxAttempts;
     private randomDelay;
     private currentAttempts;

package/lib/modules/snap.js

@@ -31,7 +31,7 @@ class Snap extends BaseModule {
                 }
             }
         };
-        ffs();
+        ffs(); // in future snapshot can be biger, so we just make new functions.    блять идите нахуй со своим англиским, я не знаю но я стараюсь идите нахуй
     };
     constructor(bot) {
         super(bot, { moduleName: 'Snap', offonDisconnect: false });
@@ -42,7 +42,7 @@ class Snap extends BaseModule {
         const distanceY = Math.abs(y1 - y2);
         return distanceX <= TILE && distanceY <= TILE;
     }
-    static whoareWithinTile(x, y, list, ignoreClients = []) {
+    static whoareWithinTile(x, y, list = [], ignoreClients = []) {
         for (const character of list) {
             const character_core = character?.character_core;
             if (!character_core)
@@ -69,8 +69,6 @@ class Snap extends BaseModule {
         return this._isFrozen;
     }
     _start() {
-        if (!this.bot.status.connect.connected)
-            return;
         this.bot.on('snapshot', this.snapslistener);
         this.bot.on('hammerhit', this.hammerHitlistener);
         this.bot.on('sound_world', this.firelistener);

package/package.json

@@ -3,7 +3,7 @@
     "teeworlds": "^2.5.11"
   },
   "name": "ddbot.js-0374",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "ddbot.js — это Node.js проект для автоматизации и управления ботами.",
   "main": "./index.js",
   "scripts": {