ddmaster 3.0.0 → 3.1.1

package/index.js

@@ -1,19 +1,2 @@
-/**
- * ddmaster
- */
-const lib = require('./serverlist');
-
-module.exports = lib;
-
-if (require.main === module) (async () =>{
-    console.log(
-        JSON.stringify(
-            await lib.getDDNetServers(
-                await lib.findDDNetPlayerByName('0374_bober')
-            ),
-            null,
-            1
-        )
-    ); // тестовый вызов
-    // console.log(await lib.getrawDDNetServers());
-})();
+const ddmaster = require('./lib/index.js');
+module.exports = ddmaster;

package/package.json

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

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

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
 
-const ddmaster = require('./index');
+const ddmaster = require('./index.js');
+
 
 const [command, ...args] = process.argv.slice(2);
 
 if (command === "find") {
-    ddmaster.findDDNetPlayerByName(args.join(" ")).then(async servers => {
+    ddmaster.findDDNetPlayerByName(args.join(" ")).then(async (servers: import('./types').DDNetServer[]) => {
         if (servers.length === 0) {
             console.log("Player not found on any server.");
             return;
@@ -13,25 +14,25 @@ if (command === "find") {
 
         console.log(`Count of servers: ${servers.length}`);
         console.log((await ddmaster.getDDNetServers(servers)).join("\n"));
-    }).catch(err => {
+    }).catch((err: Error) => {
         console.error('Error:', err);
     });
 } else if (command === "list") {
-    ddmaster.getDDNetServers().then(servers => {
+    ddmaster.getDDNetServers().then((servers: string[]) => {
         console.log(servers.join("\n"));
-    }).catch(err => {
+    }).catch((err: Error) => {
         console.error('Error:', err);
     });
 } else if (command === "raw") {
-    ddmaster.getrawDDNetServers().then(servers => {
+    ddmaster.getrawDDNetServers().then((servers: import('./types').DDNetServer[]) => {
         console.log(JSON.stringify(servers, null, 2));
-    }).catch(err => {
+    }).catch((err: Error) => {
         console.error('Error:', err);
     });
 } else if (command === "info") {
-    ddmaster.getinfoserver(args[0]).then(server => {
+    ddmaster.getinfoserver(args[0]).then((server: import('./types').DDNetServer) => {
         console.log(JSON.stringify(server, null, 2));
-    }).catch(err => {
+    }).catch((err: Error) => {
         console.error('Error:', err);
     });
 } else {

package/src/index.ts

@@ -0,0 +1,19 @@
+/**
+ * ddmaster
+ */
+const lib = require('./serverlist.js');
+
+module.exports = lib;
+
+if (require.main === module) (async () =>{
+    console.log(
+        JSON.stringify(
+            await lib.getDDNetServers(
+                await lib.findDDNetPlayerByName('0374_bober')
+            ),
+            null,
+            1
+        )
+    ); // тестовый вызов
+    // console.log(await lib.getrawDDNetServers());
+})();

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

@@ -18,7 +18,7 @@ if (typeof fetch === 'undefined') {
  * Делает запрос на мастер сервер ДДНета.
  * @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}`);
@@ -35,7 +35,7 @@ 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+)/);
     return match ? match[1] : null;
@@ -48,15 +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) {
             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);
@@ -79,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 должен быть строкой');
     }
@@ -96,7 +96,7 @@ 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);
             }
@@ -108,23 +108,24 @@ async function findDDNetPlayerByName(playerName, data = null) {
     }
 }
 
-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;
 }
 

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,
+  }
+}