ddmaster 2.6.1 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddmaster",
-  "version": "2.6.1",
+  "version": "3.1.0",
   "description": "Позволяет опрашивать мастер-сервер дднета",
   "main": "index.js",
   "scripts": {
@@ -13,7 +13,8 @@
   "author": "0374flop",
   "license": "MIT",
   "type": "commonjs",
-  "dependencies": {
-    "loger0374": "^0.2.0"
+  "bin": "./bin.js",
+  "devDependencies": {
+    "@types/node": "^25.2.3"
   }
 }

package/src/bin.ts

@@ -0,0 +1,44 @@
+#!/usr/bin/env node
+
+const ddmaster = require('./index.js');
+
+
+const [command, ...args] = process.argv.slice(2);
+
+if (command === "find") {
+    ddmaster.findDDNetPlayerByName(args.join(" ")).then(async (servers: import('./types').DDNetServer[]) => {
+        if (servers.length === 0) {
+            console.log("Player not found on any server.");
+            return;
+        }
+
+        console.log(`Count of servers: ${servers.length}`);
+        console.log((await ddmaster.getDDNetServers(servers)).join("\n"));
+    }).catch((err: Error) => {
+        console.error('Error:', err);
+    });
+} else if (command === "list") {
+    ddmaster.getDDNetServers().then((servers: string[]) => {
+        console.log(servers.join("\n"));
+    }).catch((err: Error) => {
+        console.error('Error:', err);
+    });
+} else if (command === "raw") {
+    ddmaster.getrawDDNetServers().then((servers: import('./types').DDNetServer[]) => {
+        console.log(JSON.stringify(servers, null, 2));
+    }).catch((err: Error) => {
+        console.error('Error:', err);
+    });
+} else if (command === "info") {
+    ddmaster.getinfoserver(args[0]).then((server: import('./types').DDNetServer) => {
+        console.log(JSON.stringify(server, null, 2));
+    }).catch((err: Error) => {
+        console.error('Error:', err);
+    });
+} else {
+    console.log("Usage:");
+    console.log("  find <playerName> - Найти сервера с игроком");
+    console.log("  list - Получить список всех серверов");
+    console.log("  raw - Получить сырые данные серверов");
+    console.log("  info <address> - Получить информацию о сервере по адресу");
+}

package/{index.js → src/index.ts}

@@ -1,8 +1,7 @@
 /**
  * ddmaster
  */
-const lib = require('./serverlist');
-// по моему такое декларирование не работает.
+const lib = require('./serverlist.js');
 
 module.exports = lib;
 

package/{serverlist.js → src/serverlist.ts}

@@ -3,34 +3,29 @@
 
 "use strict";
 
-const DebugLoger = require('loger0374');
-const loger = new DebugLoger('ddmaster', false, true, null, true);
-
 if (typeof fetch === 'undefined') {
     try {
         require.resolve('node-fetch');
-        loger.log('Using node-fetch polyfill');
     } catch (e) {
         throw new Error('Node.js <18, npm install node-fetch');
     }
 
     const nodeFetch = require('node-fetch');
     global.fetch = nodeFetch.default || nodeFetch;
-    loger.log('Polyfilled fetch with node-fetch');
 }
 
 /**
  * Делает запрос на мастер сервер ДДНета.
  * @returns Сервера ДДНета но в сыром виде.
  */
-async function getrawDDNetServers() {
+async function getrawDDNetServers(): Promise<{ servers: import('./types').DDNetServer[] } | null> {
     try {
         const response = await fetch('https://master1.ddnet.org/ddnet/15/servers.json');
         if (!response.ok) throw new Error(`Ошибка при запросе: ${response.status}`);
         const data = await response.json();
         return data;
     } catch (error) {
-        loger.error(error);
+        console.error(error);
         return null;
     }
 }
@@ -40,10 +35,9 @@ async function getrawDDNetServers() {
  * @param {string} addr - берёт примерно такое "tw-0.7+udp://152.89.254.27:8310"
  * @returns {string|null} 152.89.254.27:8310 возвращает чистый адрес (если addr не валидный то null)
  */
-function convertudptw(addr) {
+function convertudptw(addr: string) {
     if (typeof addr !== 'string') return null;
     const match = addr.match(/(\d{1,3}(\.\d{1,3}){3}:\d+)/);
-    loger.log('convertudptw', addr, '->', match ? match[1] : null);
     return match ? match[1] : null;
 }
 
@@ -54,16 +48,15 @@ function convertudptw(addr) {
  */
 async function getDDNetServers(data = null) {
     try {
-        const servers = data || (await getrawDDNetServers()).servers;
+        const servers = data || (await getrawDDNetServers())?.servers;
         if (!servers) {
-            loger.error('Нет серверов в данных');
             return [];
         }
 
-        const ipv4WithPorts = [];
+        const ipv4WithPorts: string[] = [];
 
         for (const server of servers) {
-            server.addresses.forEach(addr => {
+            server.addresses.forEach((addr: string) => {
 				const converted = convertudptw(addr);
 				if (converted == null) return;
                 ipv4WithPorts.push(converted);
@@ -71,7 +64,7 @@ async function getDDNetServers(data = null) {
         }
         return [...new Set(ipv4WithPorts)];
     } catch (err) {
-        loger.error('Ошибка getDDNetServers:', err.message);
+        console.error(err);
         return [];
     }
 }
@@ -86,7 +79,7 @@ async function getDDNetServers(data = null) {
  * @returns {Promise<Array>} Массив серверов (как в getrawDDNetServers().servers),
  * на которых найден игрок.
  */
-async function findDDNetPlayerByName(playerName, data = null) {
+async function findDDNetPlayerByName(playerName: string, data = null) {
     if (typeof playerName !== 'string') {
         throw new TypeError('playerName должен быть строкой');
     }
@@ -94,7 +87,6 @@ async function findDDNetPlayerByName(playerName, data = null) {
     try {
         const raw = data || await getrawDDNetServers();
         if (!raw || !Array.isArray(raw.servers)) {
-            loger.error('Некорректные данные серверов');
             return [];
         }
 
@@ -104,36 +96,37 @@ async function findDDNetPlayerByName(playerName, data = null) {
             const info = server.info;
             if (!info || !Array.isArray(info.clients)) continue;
 
-            const hasPlayer = info.clients.some(client => client.name === playerName);
+            const hasPlayer = info.clients.some((client: import('./types').ServerClient) => client.name === playerName);
             if (hasPlayer) {
                 resultServers.push(server);
             }
         }
         return resultServers;
     } catch (err) {
-        loger.error('Ошибка при поиске игрока:', err);
+        console.error(err);
         return [];
     }
 }
 
-function filterbycommunity(servers, community) {
+function filterbycommunity(servers: import('./types').DDNetServer[], community: string) {
     return servers.filter(server => server.community === community);
 }
 
-function filterbylocation(servers, location) {
+function filterbylocation(servers: import('./types').DDNetServer[], location: string) {
     return servers.filter(server => server.location?.toLowerCase() === location?.toLowerCase());
 }
 
-function filterbylocationincludes(servers, location) {
+function filterbylocationincludes(servers: import('./types').DDNetServer[], location: string) {
     return servers.filter(server => server.location?.toLowerCase().includes(location?.toLowerCase()));
 }
 
-async function getinfoserver(address) {
+async function getinfoserver(address: string) {
     const servers = await getrawDDNetServers();
-    const server = servers.servers.find(server => 
-        convertudptw(server.addresses[0]) === address
-    );
+    const server = servers?.servers.find((server: import('./types').DDNetServer) => {
+        if (server.addresses) return false;
+        return convertudptw(server.addresses[0]) === address;
+    });
     return server;
 }
 
-module.exports = { getDDNetServers, getrawDDNetServers, convertudptw, findDDNetPlayerByName, filterbycommunity, filterbylocation, filterbylocationincludes, loger, getinfoserver };
+module.exports = { getDDNetServers, getrawDDNetServers, convertudptw, findDDNetPlayerByName, filterbycommunity, filterbylocation, filterbylocationincludes, getinfoserver };

package/src/types.ts

@@ -0,0 +1,43 @@
+export interface DDNetServer {
+    addresses: string[];
+    community: string;
+    location: string;
+    info: ServerInfo;
+}
+
+export interface ServerInfo {
+    max_clients: number;
+    max_players: number;
+    passworded: boolean;
+    game_type: string;
+    flag: number;
+    name: string;
+    map: ServerMap;
+    version: string;
+    client_score_kind: string;
+    requires_login: boolean;
+    clients: ServerClient[];
+}
+
+export interface ServerMap {
+    name: string;
+    sha256: string;
+    size: number;
+}
+
+export interface ServerClient {
+    name: string;
+    clan: string;
+    country: number;
+    score: number;
+    is_player: boolean;
+    skin: ClientSkin;
+    afk: boolean;
+    team: number;
+}
+
+export interface ClientSkin {
+    name: string;
+    color_body?: number;
+    color_feet?: number;
+}

package/tsconfig.json

@@ -0,0 +1,43 @@
+{
+  // Visit https://aka.ms/tsconfig to read more about this file
+  "compilerOptions": {
+    // File Layout
+    "rootDir": "./src",
+    "outDir": "./lib",
+
+    // Environment Settings
+    // See also https://aka.ms/tsconfig/module
+    "module": "nodenext",
+    "target": "esnext",
+    "types": ["node"],
+    // For nodejs:
+    // "lib": ["esnext"],
+    // "types": ["node"],
+    // and npm install -D @types/node
+
+    // Other Outputs
+    "sourceMap": false,
+    "declaration": true,
+    "declarationMap": false,
+
+    // Stricter Typechecking Options
+    "noUncheckedIndexedAccess": true,
+    "exactOptionalPropertyTypes": true,
+
+    // Style Options
+    // "noImplicitReturns": true,
+    // "noImplicitOverride": true,
+    // "noUnusedLocals": true,
+    // "noUnusedParameters": true,
+    // "noFallthroughCasesInSwitch": true,
+    // "noPropertyAccessFromIndexSignature": true,
+
+    // Recommended Options
+    "strict": true,
+    "verbatimModuleSyntax": true,
+    "isolatedModules": true,
+    "noUncheckedSideEffectImports": true,
+    "moduleDetection": "force",
+    "skipLibCheck": true,
+  }
+}