ddbot.js-0374 4.0.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;
@@ -44,7 +52,14 @@ export declare class Bot extends EventEmitter {
     options: Types.SnapshotItemTypes.iOptions;
     identity: Types.SnapshotItemTypes.Identity;
     status: BotStatus;
+    /**
+     *
+     * @param identity Bot identity
+     * @param options Options for teeworlds.Client
+     * @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

@@ -18,6 +18,12 @@ export class Bot extends EventEmitter {
         addr: null,
         port: null,
     };
+    /**
+     *
+     * @param identity Bot identity
+     * @param options Options for teeworlds.Client
+     * @param CustomTeeworlds Custom teeworlds
+     */
     constructor(identity, options = {}, CustomTeeworlds = Teeworlds) {
         super();
         this.teeworlds = CustomTeeworlds;
@@ -26,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
      */
@@ -35,8 +45,9 @@ export class Bot extends EventEmitter {
     /**
      * Create new Teeworlds client instance
      */
-    create_client(addr, port) {
-        this.disconnect();
+    async create_client(addr, port) {
+        if (this.client)
+            await this.client.Disconnect();
         this.clean(true);
         this.client = new this.teeworlds.Client(addr, port, this.identity.name, {
             ...this.options,
@@ -59,7 +70,7 @@ export class Bot extends EventEmitter {
             }
         }
         catch (e) {
-            console.error('Error during clean:', e);
+            this.error('Error during clean:', e);
         }
     }
     /**
@@ -69,7 +80,7 @@ export class Bot extends EventEmitter {
      * @param timeout - Connection timeout in ms (default: 5000)
      * @returns Promise with connection info
      */
-    connect(addr, port = 8303, timeout = 5000) {
+    async connect(addr, port = 8303, timeout = 5000) {
         if (typeof addr !== 'string' || typeof port !== 'number') {
             return Promise.reject(new Error('Invalid address or port'));
         }
@@ -82,8 +93,8 @@ export class Bot extends EventEmitter {
         this.status.connect.connecting = true;
         this.status.addr = addr;
         this.status.port = port;
+        await this.create_client(addr, port);
         return new Promise((resolve, reject) => {
-            this.create_client(addr, port);
             let settled = false;
             const cleanup = () => {
                 this.off('connect', onConnect);
@@ -118,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();
         });
     }
@@ -133,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 };
@@ -180,7 +195,7 @@ export class Bot extends EventEmitter {
         this.client.on('disconnect', (reason = null) => {
             this.status.connect.connected = false;
             this.clean(true);
-            if (reason) {
+            if (!!reason) {
                 this.emit('disconnect', reason, { addr: this.status.addr, port: this.status.port });
             }
         });
@@ -191,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));
@@ -201,9 +217,10 @@ 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();
         this.client.SnapshotUnpacker.on('spawn', (msg) => this.emit('spawn', msg));
         this.client.SnapshotUnpacker.on('death', (msg) => this.emit('death', msg));
         this.client.SnapshotUnpacker.on('hammerhit', (msg) => this.emit('hammerhit', msg));

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) {
@@ -92,6 +87,7 @@ class Chat extends BaseModule {
     _stop() {
         this.bot.off('message', this.chatlistener);
         this.chatset.clear();
+        this.queue.length = 0;
         if (this.chatinterval) {
             clearInterval(this.chatinterval);
             this.chatinterval = null;
@@ -101,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

@@ -1,10 +1,18 @@
 import BaseModule from '../core/module.js';
 import type { Bot } from '../core/core.js';
-declare class Reconnect extends BaseModule {
+import * as Types from '../types.js';
+export interface ReconnectingInfo {
+    attempt: number;
+    delay: number;
+    reason: string | null;
+    ConnectionInfo: Types.ConnectionInfo;
+}
+declare class Reconnect extends BaseModule<[maxAttempts?: number, randomDelay?: boolean]> {
     private maxAttempts;
     private randomDelay;
     private currentAttempts;
     private reconnecting;
+    private reconnectTimer;
     constructor(bot: Bot);
     protected _start(maxAttempts?: number, randomDelay?: boolean): void;
     private handleDisconnect;

package/lib/modules/reconnect.js

@@ -5,6 +5,7 @@ class Reconnect extends BaseModule {
     randomDelay = true;
     currentAttempts = 0;
     reconnecting = false;
+    reconnectTimer = null;
     constructor(bot) {
         super(bot, { moduleName: 'Reconnect', offonDisconnect: false });
     }
@@ -33,10 +34,9 @@ class Reconnect extends BaseModule {
             attempt: this.currentAttempts,
             delay,
             reason,
-            addr: connectionInfo.addr,
-            port: connectionInfo.port,
+            ConnectionInfo: connectionInfo
         });
-        setTimeout(async () => {
+        this.reconnectTimer = setTimeout(async () => {
             try {
                 await this.bot.connect(connectionInfo.addr, connectionInfo.port);
                 this.currentAttempts = 0;
@@ -76,6 +76,10 @@ class Reconnect extends BaseModule {
         this.bot.off('disconnect', this.handleDisconnect);
         this.reconnecting = false;
         this.currentAttempts = 0;
+        if (this.reconnectTimer) {
+            clearTimeout(this.reconnectTimer);
+            this.reconnectTimer = null;
+        }
     }
 }
 export default Reconnect;

package/lib/modules/snap.d.ts

@@ -2,8 +2,10 @@ import BaseModule from '../core/module.js';
 import type { Bot } from '../core/core.js';
 import * as Types from '../types.js';
 declare class Snap extends BaseModule {
+    private _isFrozen;
     private readonly hammerHitlistener;
     private readonly firelistener;
+    private readonly snapslistener;
     constructor(bot: Bot);
     private static areWithinTile;
     private static whoareWithinTile;
@@ -11,6 +13,7 @@ declare class Snap extends BaseModule {
         x: number;
         y: number;
     } | null;
+    get isFrozen(): boolean;
     protected _start(): void;
     protected _stop(): void;
 }

package/lib/modules/snap.js

@@ -1,6 +1,7 @@
 import BaseModule from '../core/module.js';
 import * as Types from '../types.js';
 class Snap extends BaseModule {
+    _isFrozen = false;
     hammerHitlistener = (hit) => {
         if (this.bot.OwnID === undefined)
             return;
@@ -17,6 +18,21 @@ class Snap extends BaseModule {
             this.emit('fire', { common: sound.common }, Snap.whoareWithinTile(sound.common.x, sound.common.y, list));
         }
     };
+    snapslistener = () => {
+        const ffs = () => {
+            if (this.bot.OwnID === undefined || !this.bot.bot_client?.SnapshotUnpacker)
+                return;
+            const myDDNetChar = this.bot.bot_client.SnapshotUnpacker.getObjExDDNetCharacter(this.bot.OwnID);
+            if (myDDNetChar) {
+                const wasFrozen = this._isFrozen;
+                this._isFrozen = myDDNetChar.m_FreezeEnd !== 0;
+                if (wasFrozen !== this._isFrozen) {
+                    this.emit(this._isFrozen ? 'frozen' : 'unfrozen');
+                }
+            }
+        };
+        ffs(); // in future snapshot can be biger, so we just make new functions.    блять идите нахуй со своим англиским, я не знаю но я стараюсь идите нахуй
+    };
     constructor(bot) {
         super(bot, { moduleName: 'Snap', offonDisconnect: false });
     }
@@ -26,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)
@@ -49,11 +65,16 @@ class Snap extends BaseModule {
             y: Math.sin(angleRad) * 256,
         };
     }
+    get isFrozen() {
+        return this._isFrozen;
+    }
     _start() {
+        this.bot.on('snapshot', this.snapslistener);
         this.bot.on('hammerhit', this.hammerHitlistener);
         this.bot.on('sound_world', this.firelistener);
     }
     _stop() {
+        this.bot.off('snapshot', this.snapslistener);
         this.bot.off('hammerhit', this.hammerHitlistener);
         this.bot.off('sound_world', this.firelistener);
     }

package/package.json

@@ -3,10 +3,13 @@
     "teeworlds": "^2.5.11"
   },
   "name": "ddbot.js-0374",
-  "version": "4.0.0",
+  "version": "4.2.0",
   "description": "ddbot.js — это Node.js проект для автоматизации и управления ботами.",
   "main": "./index.js",
-  "scripts": {},
+  "scripts": {
+    "build": "tsc && tsc index.ts --outDir . --skipLibCheck",
+    "prepublishOnly": "npm run build"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/0374flop/ddbot.js.git"