cgserver 13.3.0 → 13.3.1

package/README.md

@@ -1,4 +1,6 @@
 # 版本更新日志
+## v13.3.1
+- 解决潜在的内存泄漏
 ## v13.2.11
 - 增加统一日志模块，支持级别（debug/info/warn/error）、控制台与文件输出
 - 支持按日期或大小滚动日志与可配置的保留策略

package/dist/lib/Framework/Server/SocketServer/PacketParser.js

@@ -3,33 +3,51 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PacketParser = void 0;
 class PacketParser {
     buffer;
-    offset;
     constructor() {
         this.buffer = Buffer.alloc(0);
-        this.offset = 0;
     }
     push(chunk) {
-        const newBuffer = Buffer.alloc(this.buffer.length + chunk.length);
-        this.buffer.copy(newBuffer, 0);
-        chunk.copy(newBuffer, this.buffer.length);
-        this.buffer = newBuffer;
+        // Use Buffer.concat which is concise and optimized internally
+        this.buffer = Buffer.concat([this.buffer, chunk], this.buffer.length + chunk.length);
     }
     parse() {
+        // Need at least 4 bytes for length header
         if (this.buffer.length < 4)
             return null;
         // Read packet length (first 4 bytes)
         const length = this.buffer.readUInt32BE(0);
+        // Not enough data yet
         if (this.buffer.length < length + 4)
             return null;
-        // Extract packet
-        const packet = this.buffer.slice(4, length + 4);
-        // Remove parsed data from buffer
-        this.buffer = this.buffer.slice(length + 4);
+        const start = 4;
+        const end = 4 + length;
+        // Copy packet out so callers don't keep a view into the large backing buffer
+        const packet = Buffer.from(this.buffer.slice(start, end));
+        // Remove parsed data from buffer. We try to avoid keeping a large backing
+        // buffer alive by compacting the remainder when it's small relative to the
+        // previous buffer.
+        const remainderLen = this.buffer.length - end;
+        if (remainderLen <= 0) {
+            this.buffer = Buffer.alloc(0);
+        }
+        else {
+            const remainder = this.buffer.slice(end);
+            // If remainder is much smaller than the previous buffer, copy it to
+            // release the old backing store. Otherwise keep the slice to avoid
+            // an extra copy.
+            if (remainderLen < (this.buffer.length >> 1)) {
+                this.buffer = Buffer.from(remainder);
+            }
+            else {
+                this.buffer = remainder;
+            }
+        }
         return packet;
     }
     pack(data) {
         const length = data.length;
-        const packet = Buffer.alloc(length + 4);
+        // allocUnsafe for slight perf improvement; we write every byte below
+        const packet = Buffer.allocUnsafe(length + 4);
         // Write length header
         packet.writeUInt32BE(length, 0);
         // Write data

package/dist/types/Framework/Server/SocketServer/PacketParser.d.ts

@@ -1,6 +1,5 @@
 export declare class PacketParser {
     protected buffer: Buffer;
-    protected offset: number;
     constructor();
     push(chunk: Buffer): void;
     parse(): Buffer | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "13.3.0",
+  "version": "13.3.1",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",