workers-rcon 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workers-rcon",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "author": "fjk-dev",
   "repository": {
     "type": "git",

package/src/index.ts

@@ -1,6 +1,5 @@
 import { connect } from 'cloudflare:sockets';
 
-// Типы пакетов RCON
 const SERVERDATA_AUTH = 3;
 const SERVERDATA_EXECCOMMAND = 2;
 const SERVERDATA_RESPONSE_VALUE = 0;
@@ -12,11 +11,18 @@ export interface RCONConfig {
   password: string;
 }
 
+interface RCONPacket {
+  id: number;
+  type: number;
+  body: string;
+}
+
 export class MinecraftRCON {
   private host: string;
   private port: number;
   private password: string;
   private requestId = 1;
+  private readBuffer = new Uint8Array(0);
 
   constructor(config: RCONConfig) {
     this.host = config.host;
@@ -30,36 +36,40 @@ export class MinecraftRCON {
     const reader = socket.readable.getReader();
 
     try {
-      // 1. Авторизация
       await this.writePacket(writer, SERVERDATA_AUTH, this.password);
       
-      // Читаем ответ авторизации
-      let authRes = await this.readPacket(reader);
-      if (authRes.id === -1) {
+      let authRes1 = await this.readPacket(reader);
+      let authRes2: RCONPacket | null = null;
+      
+      if (authRes1.type === SERVERDATA_RESPONSE_VALUE) {
+        authRes2 = await this.readPacket(reader);
+      }
+
+      const finalAuth = authRes2 || authRes1;
+      if (finalAuth.id === -1) {
         throw new Error('RCON Authentication failed: Invalid password');
       }
 
-      // 2. Выполнение команды
       await this.writePacket(writer, SERVERDATA_EXECCOMMAND, command);
       const cmdRes = await this.readPacket(reader);
-
+      
       return cmdRes.body;
     } finally {
-      await writer.close();
-      socket.close();
+      writer.releaseLock();
+      reader.releaseLock();
+      await socket.close();
     }
   }
 
   private async writePacket(writer: WritableStreamDefaultWriter, type: number, body: string) {
     const encoder = new TextEncoder();
     const bodyBytes = encoder.encode(body);
-    // Длина: 4(id) + 4(type) + body + 2(null terminators)
     const packetLength = 10 + bodyBytes.length;
     
-    const buffer = new ArrayBuffer(packetLength + 4); // +4 для самого поля длины
+    const buffer = new ArrayBuffer(packetLength + 4);
     const view = new DataView(buffer);
-
-    view.setInt32(0, packetLength, true); 
+    
+    view.setInt32(0, packetLength, true);
     view.setInt32(4, this.requestId, true);
     view.setInt32(8, type, true);
     
@@ -67,22 +77,43 @@ export class MinecraftRCON {
     uint8.set(bodyBytes, 12);
     uint8[buffer.byteLength - 2] = 0;
     uint8[buffer.byteLength - 1] = 0;
-
+    
     await writer.write(buffer);
   }
 
-  private async readPacket(reader: ReadableStreamDefaultReader) {
-    const { value, done } = await reader.read();
-    if (done || !value) throw new Error('Connection closed by server');
+  private async readPacket(reader: ReadableStreamDefaultReader<Uint8Array>): Promise<RCONPacket> {
+    const decoder = new TextDecoder();
 
-    const view = new DataView(value.buffer, value.byteOffset, value.byteLength);
-    const length = view.getInt32(0, true);
-    const id = view.getInt32(4, true);
-    const type = view.getInt32(8, true);
-    
-    const bodyBytes = value.slice(12, 12 + (length - 10));
-    const body = new TextDecoder().decode(bodyBytes);
+    while (true) {
+      if (this.readBuffer.length >= 4) {
+        const view = new DataView(this.readBuffer.buffer, this.readBuffer.byteOffset, this.readBuffer.byteLength);
+        const length = view.getInt32(0, true);
+        const totalPacketLength = length + 4;
+
+        if (this.readBuffer.length >= totalPacketLength) {
+          const id = view.getInt32(4, true);
+          const type = view.getInt32(8, true);
+          
+          const bodyBytes = this.readBuffer.subarray(12, totalPacketLength - 2);
+          const body = decoder.decode(bodyBytes);
+
+          this.readBuffer = this.readBuffer.slice(totalPacketLength);
+
+          return { id, type, body };
+        }
+      }
 
-    return { id, type, body };
+      const { value, done } = await reader.read();
+      if (done) {
+        throw new Error('Connection closed by RCON server unexpectedly');
+      }
+
+      if (value) {
+        const newBuffer = new Uint8Array(this.readBuffer.length + value.length);
+        newBuffer.set(this.readBuffer);
+        newBuffer.set(value, this.readBuffer.length);
+        this.readBuffer = newBuffer;
+      }
+    }
   }
-}
+}

package/dist/index.d.ts

@@ -1,15 +0,0 @@
-export interface RCONConfig {
-    host: string;
-    port: number;
-    password: string;
-}
-export declare class MinecraftRCON {
-    private host;
-    private port;
-    private password;
-    private requestId;
-    constructor(config: RCONConfig);
-    run(command: string): Promise<string>;
-    private writePacket;
-    private readPacket;
-}

package/dist/index.js

@@ -1,67 +0,0 @@
-import { connect } from 'cloudflare:sockets';
-// Типы пакетов RCON
-const SERVERDATA_AUTH = 3;
-const SERVERDATA_EXECCOMMAND = 2;
-const SERVERDATA_RESPONSE_VALUE = 0;
-const SERVERDATA_AUTH_RESPONSE = 2;
-export class MinecraftRCON {
-    host;
-    port;
-    password;
-    requestId = 1;
-    constructor(config) {
-        this.host = config.host;
-        this.port = config.port;
-        this.password = config.password;
-    }
-    async run(command) {
-        const socket = connect({ hostname: this.host, port: this.port });
-        const writer = socket.writable.getWriter();
-        const reader = socket.readable.getReader();
-        try {
-            // 1. Авторизация
-            await this.writePacket(writer, SERVERDATA_AUTH, this.password);
-            // Читаем ответ авторизации
-            let authRes = await this.readPacket(reader);
-            if (authRes.id === -1) {
-                throw new Error('RCON Authentication failed: Invalid password');
-            }
-            // 2. Выполнение команды
-            await this.writePacket(writer, SERVERDATA_EXECCOMMAND, command);
-            const cmdRes = await this.readPacket(reader);
-            return cmdRes.body;
-        }
-        finally {
-            await writer.close();
-            socket.close();
-        }
-    }
-    async writePacket(writer, type, body) {
-        const encoder = new TextEncoder();
-        const bodyBytes = encoder.encode(body);
-        // Длина: 4(id) + 4(type) + body + 2(null terminators)
-        const packetLength = 10 + bodyBytes.length;
-        const buffer = new ArrayBuffer(packetLength + 4); // +4 для самого поля длины
-        const view = new DataView(buffer);
-        view.setInt32(0, packetLength, true);
-        view.setInt32(4, this.requestId, true);
-        view.setInt32(8, type, true);
-        const uint8 = new Uint8Array(buffer);
-        uint8.set(bodyBytes, 12);
-        uint8[buffer.byteLength - 2] = 0;
-        uint8[buffer.byteLength - 1] = 0;
-        await writer.write(buffer);
-    }
-    async readPacket(reader) {
-        const { value, done } = await reader.read();
-        if (done || !value)
-            throw new Error('Connection closed by server');
-        const view = new DataView(value.buffer, value.byteOffset, value.byteLength);
-        const length = view.getInt32(0, true);
-        const id = view.getInt32(4, true);
-        const type = view.getInt32(8, true);
-        const bodyBytes = value.slice(12, 12 + (length - 10));
-        const body = new TextDecoder().decode(bodyBytes);
-        return { id, type, body };
-    }
-}