ddbot.js-0374 4.3.1 → 4.4.1

package/README.md

@@ -11,7 +11,7 @@
 npm i ddbot.js-0374
 ```
 
-експорт
+импорт
 ```ts
 import * as ddbot from 'ddbot.js-0374';
 ```
@@ -250,9 +250,5 @@ myModule.start();
 
 **DDUtils.DefaultIdentity(name?)** - возвращает дефолтный identity `Identity`, если имени нет, то 'nameless tee'
 
-**DDUtils.connectionInfo()** - возвращает дефолтный `ConnectionInfo`,
-'ConnectionInfo = {
-    addr: 'string', port: 8303
-}'
 
 **DDUtils.reconstructPlayerInput(char, ddnetChar?, tick?)** - реконструирует инпут игрока из snapshot. NOT FULL. `Types.SnapshotItemTypes.PlayerInput`

package/docs/{test.ts → test.mts}

@@ -7,12 +7,12 @@ bot.on('connect', () => {
     console.log('Connected to server!');
 });
 
-bot.on('disconnect', () => {
-    console.log('Disconnected from server!');
+bot.on('disconnect', (reason) => {
+    console.log('Disconnected from server!', reason);
 });
 
 (async () => {
-    await bot.connect('45.141.57.22', 8303, 20000); // IP, port, timeout (IP is of ddnet server)
+    await bot.connect('26.230.124.233', 8303, 20000); // IP, port, timeout (IP is of ddnet server)
     bot.bot_client?.game.Say('DDNet!'); // from teeworlds
     setTimeout(async () => {
         await bot.disconnect();

package/lib/core/core.d.ts

@@ -3,8 +3,11 @@ 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;
+    rawdisconnect: (reason: string, info: Types.ConnectionInfo) => void;
     broadcast: (message: string) => void;
     capabilities: (message: {
         ChatTimeoutCode: boolean;

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);
         }
@@ -229,17 +219,28 @@ class Bot extends events_1.EventEmitter {
             return;
         // Connection events
         this.client.on('connected', () => {
-            this.status.connect.connected = true;
-            this.emit('connect', { addr: this.status.addr, port: this.status.port });
-            this.setup_snapshot_events();
+            if (this.status.connect.connected) {
+                this.error('connection received when already connected');
+            }
+            else {
+                this.status.connect.connected = true;
+                this.emit('connect', { addr: this.status.addr, port: this.status.port });
+                this.setup_snapshot_events();
+            }
         });
-        this.client.on('disconnect', (reason = null) => {
+        this.client.on('disconnect', (reason) => {
             this.status.connect.connected = false;
             this.clean(true);
             if (!!reason) {
                 this.emit('disconnect', reason, { addr: this.status.addr, port: this.status.port });
             }
         });
+        this.client.on('connected', () => {
+            this.emit('rawconnect', { addr: this.status.addr, port: this.status.port });
+        });
+        this.client.on('disconnect', (reason) => {
+            this.emit('rawdisconnect', reason, { addr: this.status.addr, port: this.status.port });
+        });
         // Game events
         this.client.on('broadcast', (msg) => this.emit('broadcast', msg));
         this.client.on('capabilities', (msg) => this.emit('capabilities', msg));
@@ -283,8 +284,6 @@ class Bot extends events_1.EventEmitter {
      * Get proxied client instance for safe access
      */
     get bot_client() {
-        if (!this.client)
-            return null;
         if (!this._clientProxy) {
             const self = this;
             this._clientProxy = new Proxy({}, {
@@ -311,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/ddutils.d.ts

@@ -1,6 +1,5 @@
 import type * as Types from './types.js';
 export declare function DefaultIdentity(name?: string): Types.SnapshotItemTypes.Identity;
-export declare function connectionInfo(): Types.ConnectionInfo;
 /**
  * NOT FULL. baze.
  */

package/lib/ddutils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultIdentity = DefaultIdentity;
-exports.connectionInfo = connectionInfo;
 exports.reconstructPlayerInput = reconstructPlayerInput;
 function DefaultIdentity(name = 'nameless tee') {
     return {
@@ -14,12 +13,6 @@ function DefaultIdentity(name = 'nameless tee') {
         country: 0
     };
 }
-function connectionInfo() {
-    return {
-        addr: 'string',
-        port: 8303
-    };
-}
 /**
  * NOT FULL. baze.
  */

package/package.json

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