ddbot.js-0374 4.4.0 → 4.4.2

package/README.md

@@ -23,29 +23,28 @@ const ddbot = require('ddbot.js-0374');
 ```ts
 import * as ddbot from '../lib/index.js';
 
-    const bot = new ddbot.Bot(/* identity, options, custom teeworlds */);
-    // if no identity is provided, it will be default 'nameless tee' with default skin
-
-    bot.on('connect', () => {
-        console.log('Connected to server!');
-    });
-
-    bot.on('disconnect', () => {
-        console.log('Disconnected from server!');
+const bot = new ddbot.Bot(/* identity, options, custom teeworlds */);
+// if no identity is provided, it will be default 'nameless tee' with default skin
+
+bot.on('connect', () => {
+    console.log('Connected to server!');
+});
+
+bot.on('disconnect', () => {
+    console.log('Disconnected from server!');
+});
+
+(async () => {
+    await bot.connect('45.141.57.22', 8303, 20000); // IP, port, timeout (IP is of ddnet server)
+    bot.bot_client?.game.Say('DDNet!'); // from teeworlds
+    setTimeout(async () => {
+        await bot.disconnect();
+        process.exit(0);
+    }, 5000); // 5 sec
+    process.on('SIGINT', async () => { // on Ctrl+C
+        await bot.disconnect();
+        process.exit(0);
     });
-
-    (async () => {
-        await bot.connect('45.141.57.22', 8303, 20000); // IP, port, timeout (IP is of ddnet server)
-        bot.bot_client?.game.Say('DDNet!'); // from teeworlds
-        setTimeout(async () => {
-            await bot.disconnect();
-            process.exit(0);
-        }, 5000); // 5 sec
-
-        process.on('SIGINT', async () => { // on Ctrl+C
-            await bot.disconnect();
-            process.exit(0);
-        });
 })();
 ```
 

package/lib/core/core.d.ts

@@ -3,6 +3,7 @@ import { EventEmitter } from 'events';
 import * as Types from '../types.js';
 interface BotEvents {
     error: (...args: any[]) => void;
+    destroy: () => void;
     connect: (info: Types.ConnectionInfo) => void;
     disconnect: (reason: string | null, info: Types.ConnectionInfo) => void;
     rawconnect: (info: Types.ConnectionInfo) => void;

package/lib/core/core.js

@@ -36,17 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bot = void 0;
 const Teeworlds = __importStar(require("teeworlds"));
 const events_1 = require("events");
-function DefaultIdentity(name = 'nameless tee') {
-    return {
-        name: name,
-        clan: "",
-        skin: "default",
-        use_custom_color: 0,
-        color_body: 0,
-        color_feet: 0,
-        country: 0
-    };
-}
+const ddutils_js_1 = require("../ddutils.js");
 class Bot extends events_1.EventEmitter {
     teeworlds;
     client = null;
@@ -71,7 +61,7 @@ class Bot extends events_1.EventEmitter {
         super();
         this.teeworlds = CustomTeeworlds;
         this.options = options;
-        this.identity = identity ? identity : DefaultIdentity('nameless tee');
+        this.identity = identity ? identity : (0, ddutils_js_1.DefaultIdentity)('nameless tee');
     }
     error(...err) {
         //console.error(err);
@@ -206,7 +196,7 @@ class Bot extends events_1.EventEmitter {
         this.identity =
             typeof identity === 'object' && identity !== null
                 ? { ...this.identity, ...identity }
-                : DefaultIdentity(this.identity.name);
+                : (0, ddutils_js_1.DefaultIdentity)(this.identity.name);
         if (this.client && this.status.connect.connected) {
             this.client.game.ChangePlayerInfo(this.identity);
         }
@@ -320,6 +310,7 @@ class Bot extends events_1.EventEmitter {
         await this.disconnect();
         this.removeAllListeners();
         this._clientProxy = null;
+        this.emit('destroy');
     }
     on(event, listener) {
         return super.on(event, listener);

package/lib/core/module.js

@@ -18,6 +18,7 @@ class BaseModule extends events_1.EventEmitter {
         if (options.offonDisconnect !== false) {
             this.bot.on('disconnect', this._onDisconnect);
         }
+        this.bot.on('destroy', () => this.destroy());
     }
     /**
      * Запускает модуль, если он ещё не запущен

package/lib/modules/playerlist.d.ts

@@ -8,6 +8,22 @@ interface PlayerData {
     character: Types.SnapshotItemTypes.Character | null;
     DDNetCharacter: Types.SnapshotItemTypes.DDNetCharacter | null;
 }
+interface PlayerJoinedInfo {
+    client_id: number;
+    name: string;
+    playerData: PlayerData;
+}
+interface PlayerLeftInfo {
+    client_id: number;
+    name: string;
+    playerData: PlayerData;
+}
+interface PlayerListEvents {
+    /** Игрок появился в снапшоте (зашёл на сервер) */
+    player_joined: (info: PlayerJoinedInfo) => void;
+    /** Игрок пропал из снапшота (вышел с сервера) */
+    player_left: (info: PlayerLeftInfo) => void;
+}
 declare class PlayerList extends BaseModule<[maxclients?: number]> {
     constructor(bot: Bot);
     private client;
@@ -29,5 +45,9 @@ declare class PlayerList extends BaseModule<[maxclients?: number]> {
     getPlayerCount(): number;
     protected _start(maxclients?: number): void;
     protected _stop(): void;
+    on<K extends keyof PlayerListEvents>(event: K, listener: PlayerListEvents[K]): this;
+    once<K extends keyof PlayerListEvents>(event: K, listener: PlayerListEvents[K]): this;
+    emit<K extends keyof PlayerListEvents>(event: K, ...args: Parameters<PlayerListEvents[K]>): boolean;
+    off<K extends keyof PlayerListEvents>(event: K, listener: PlayerListEvents[K]): this;
 }
 export default PlayerList;

package/lib/modules/playerlist.js

@@ -79,5 +79,17 @@ class PlayerList extends module_js_1.default {
         this.playermap.clear();
         this.previousMap.clear();
     }
+    on(event, listener) {
+        return super.on(event, listener);
+    }
+    once(event, listener) {
+        return super.once(event, listener);
+    }
+    emit(event, ...args) {
+        return super.emit(event, ...args);
+    }
+    off(event, listener) {
+        return super.off(event, listener);
+    }
 }
 exports.default = PlayerList;

package/lib/modules/reconnect.d.ts

@@ -7,6 +7,17 @@ export interface ReconnectingInfo {
     reason: string | null;
     ConnectionInfo: Types.ConnectionInfo;
 }
+interface ReconnectEvents {
+    /** Начинается попытка переподключения */
+    reconnecting: (info: ReconnectingInfo) => void;
+    /** Успешно переподключились */
+    reconnected: (info: {
+        addr: string;
+        port: number;
+    }) => void;
+    /** Переподключение не удалось (исчерпаны попытки или нет данных о сервере) */
+    reconnect_failed: (reason: string | number | unknown) => void;
+}
 declare class Reconnect extends BaseModule<[maxAttempts?: number, randomDelay?: boolean]> {
     private maxAttempts;
     private randomDelay;
@@ -18,5 +29,9 @@ declare class Reconnect extends BaseModule<[maxAttempts?: number, randomDelay?:
     private handleDisconnect;
     private calculateDelay;
     protected _stop(): void;
+    on<K extends keyof ReconnectEvents>(event: K, listener: ReconnectEvents[K]): this;
+    once<K extends keyof ReconnectEvents>(event: K, listener: ReconnectEvents[K]): this;
+    emit<K extends keyof ReconnectEvents>(event: K, ...args: Parameters<ReconnectEvents[K]>): boolean;
+    off<K extends keyof ReconnectEvents>(event: K, listener: ReconnectEvents[K]): this;
 }
 export default Reconnect;

package/lib/modules/reconnect.js

@@ -72,7 +72,7 @@ class Reconnect extends module_js_1.default {
             baseDelay = 500;
         }
         if (this.randomDelay) {
-            return baseDelay + Math.random() * 1000;
+            return baseDelay + Math.random() * 5000;
         }
         return baseDelay;
     }
@@ -85,5 +85,17 @@ class Reconnect extends module_js_1.default {
             this.reconnectTimer = null;
         }
     }
+    on(event, listener) {
+        return super.on(event, listener);
+    }
+    once(event, listener) {
+        return super.once(event, listener);
+    }
+    emit(event, ...args) {
+        return super.emit(event, ...args);
+    }
+    off(event, listener) {
+        return super.off(event, listener);
+    }
 }
 exports.default = Reconnect;

package/lib/modules/snap.d.ts

@@ -1,6 +1,28 @@
 import BaseModule from '../core/module.js';
 import type { Bot } from '../core/core.js';
 import * as Types from '../types.js';
+interface HammerHit {
+    common: {
+        x: number;
+        y: number;
+    };
+    [key: string]: any;
+}
+interface SnapEvents {
+    /** Бота ударили молотком (hammer hit попал в тайл персонажа) */
+    hammerhitme: (hit: HammerHit, attackerId: number | null) => void;
+    /** Кто-то выстрелил рядом (sound_id === 0) */
+    fire: (common: {
+        common: {
+            x: number;
+            y: number;
+        };
+    }, nearestClient: number | null) => void;
+    /** Персонаж заморожен */
+    frozen: () => void;
+    /** Персонаж разморожен */
+    unfrozen: () => void;
+}
 declare class Snap extends BaseModule {
     private _isFrozen;
     private readonly hammerHitlistener;
@@ -16,5 +38,9 @@ declare class Snap extends BaseModule {
     get isFrozen(): boolean;
     protected _start(): void;
     protected _stop(): void;
+    on<K extends keyof SnapEvents>(event: K, listener: SnapEvents[K]): this;
+    once<K extends keyof SnapEvents>(event: K, listener: SnapEvents[K]): this;
+    emit<K extends keyof SnapEvents>(event: K, ...args: Parameters<SnapEvents[K]>): boolean;
+    off<K extends keyof SnapEvents>(event: K, listener: SnapEvents[K]): this;
 }
 export default Snap;

package/lib/modules/snap.js

@@ -82,5 +82,17 @@ class Snap extends module_js_1.default {
         this.bot.off('hammerhit', this.hammerHitlistener);
         this.bot.off('sound_world', this.firelistener);
     }
+    on(event, listener) {
+        return super.on(event, listener);
+    }
+    once(event, listener) {
+        return super.once(event, listener);
+    }
+    emit(event, ...args) {
+        return super.emit(event, ...args);
+    }
+    off(event, listener) {
+        return super.off(event, listener);
+    }
 }
 exports.default = Snap;

package/package.json

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