pw-buffer 3.0.2 → 3.1.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Sality
+Copyright (c) 2025 mvcbox
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -1,4 +1,4 @@
-[![npm version](https://badge.fury.io/js/pw-buffer.svg?flush_cache=v3_0_2)](https://badge.fury.io/js/pw-buffer)
+[![npm version](https://badge.fury.io/js/pw-buffer.svg)](https://badge.fury.io/js/pw-buffer)
 
 # Perfect World binary utils
 
@@ -81,6 +81,8 @@ export { MppcDecompressorTransform } from './MppcDecompressorTransform';
 
 - `capacity?: number` – initial capacity (bytes)
 - `capacityStep?: number` – resize step (bytes)
+- `nativeAllocSlow?: boolean` – using Buffer.allocUnsafeSlow() when initializing
+- `nativeReallocSlow?: boolean` – using Buffer.allocUnsafeSlow() for further reallocations
 
 Example:
 

package/dist/MppcCompressorTransform.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="node" />
 import { MppcCompressor } from './mppc';
 import { Transform, TransformOptions } from 'stream';
 export declare class MppcCompressorTransform extends Transform {
     protected readonly _mppcCompressor: MppcCompressor;
     constructor(transformOptions?: TransformOptions);
-    _transform(chunk: Buffer, encoding: string, callback: Function): void;
+    _transform(chunk: Buffer | string, encoding: string, callback: Function): void;
 }

package/dist/MppcCompressorTransform.js

@@ -14,7 +14,12 @@ class MppcCompressorTransform extends stream_1.Transform {
     _transform(chunk, encoding, callback) {
         try {
             if (chunk instanceof Buffer) {
-                callback(null, this._mppcCompressor.update(chunk));
+                this.push(this._mppcCompressor.update(chunk));
+                callback();
+            }
+            else if (typeof chunk === 'string') {
+                this.push(this._mppcCompressor.update(Buffer.from(chunk, encoding)));
+                callback();
             }
             else {
                 callback(new errors_1.PwBufferTypeError('INVALID_CHUNK_TYPE'));

package/dist/MppcDecompressorTransform.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="node" />
 import { MppcDecompressor } from './mppc';
 import { Transform, TransformOptions } from 'stream';
 export declare class MppcDecompressorTransform extends Transform {
     protected readonly _mppcDecompressor: MppcDecompressor;
     constructor(transformOptions?: TransformOptions);
-    _transform(chunk: Buffer, encoding: string, callback: Function): void;
+    _transform(chunk: Buffer | string, encoding: string, callback: Function): void;
 }

package/dist/MppcDecompressorTransform.js

@@ -14,7 +14,12 @@ class MppcDecompressorTransform extends stream_1.Transform {
     _transform(chunk, encoding, callback) {
         try {
             if (chunk instanceof Buffer) {
-                callback(null, this._mppcDecompressor.update(chunk));
+                this.push(this._mppcDecompressor.update(chunk));
+                callback();
+            }
+            else if (typeof chunk === 'string') {
+                this.push(this._mppcDecompressor.update(Buffer.from(chunk, encoding)));
+                callback();
             }
             else {
                 callback(new errors_1.PwBufferTypeError('INVALID_CHUNK_TYPE'));

package/dist/PwBuffer.d.ts

@@ -1,13 +1,11 @@
-/// <reference types="node" />
-import { ExtendedBuffer } from 'extended-buffer';
 import type { PwBufferOptions } from './PwBufferOptions';
-export declare class PwBuffer extends ExtendedBuffer {
-    protected createInstance(options?: PwBufferOptions): this;
+import { ExtendedBuffer, ExtendedBufferOptions } from 'extended-buffer';
+export declare class PwBuffer<PBO extends PwBufferOptions = PwBufferOptions> extends ExtendedBuffer<PBO> {
     isReadableCUInt(): boolean;
     readCUInt(): number;
     writeCUInt(value: number, unshift?: boolean): this;
     readPwString(): string;
     writePwString(string: string, unshift?: boolean): this;
     readPwOctets(): this;
-    writePwOctets(octets: ExtendedBuffer | Buffer, unshift?: boolean): this;
+    writePwOctets(octets: ExtendedBuffer<ExtendedBufferOptions> | Buffer, unshift?: boolean): this;
 }

package/dist/PwBuffer.js

@@ -1,14 +1,43 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PwBuffer = void 0;
 const buffer_1 = require("buffer");
-const utils = require("./utils");
+const utils = __importStar(require("./utils"));
 const extended_buffer_1 = require("extended-buffer");
 class PwBuffer extends extended_buffer_1.ExtendedBuffer {
-    createInstance(options) {
-        const ThisClass = this.constructor;
-        return new ThisClass(options);
-    }
     isReadableCUInt() {
         if (!this.isReadable(1)) {
             return false;
@@ -27,54 +56,72 @@ class PwBuffer extends extended_buffer_1.ExtendedBuffer {
         return true;
     }
     readCUInt() {
-        let value = this.readUIntBE(1);
-        switch (value & 0xE0) {
-            case 0xE0: {
-                try {
+        const savedPointer = this.getPointer();
+        try {
+            const value = this.readUIntBE(1);
+            switch (value & 0xE0) {
+                case 0xE0: {
                     return this.readUIntBE(4);
                 }
-                catch (e) {
+                case 0xC0: {
                     this._pointer--;
+                    return this.readUIntBE(4) & 0x1FFFFFFF;
+                }
+                case 0x80:
+                case 0xA0: {
+                    this._pointer--;
+                    return this.readUIntBE(2) & 0x3FFF;
                 }
             }
-            case 0xC0: {
-                this._pointer--;
-                return this.readUIntBE(4) & 0x1FFFFFFF;
-            }
-            case 0x80:
-            case 0xA0: {
-                this._pointer--;
-                return this.readUIntBE(2) & 0x3FFF;
-            }
+            return value;
+        }
+        catch (e) {
+            this.setPointer(savedPointer);
+            throw e;
         }
-        return value;
     }
     writeCUInt(value, unshift) {
-        utils.writeCUIntToPwBuffer(this, value, unshift);
-        return this;
+        const data = new PwBuffer({
+            capacity: 5,
+            capacityStep: 0
+        });
+        utils.writeCUIntToPwBuffer(data, value);
+        return this.writeNativeBuffer(data.nativeBufferView, unshift);
     }
     readPwString() {
-        return this.readString(this.readCUInt(), 'utf16le');
+        const savedPointer = this.getPointer();
+        try {
+            return this.readString(this.readCUInt(), 'utf16le');
+        }
+        catch (e) {
+            this.setPointer(savedPointer);
+            throw e;
+        }
     }
     writePwString(string, unshift) {
-        const bytes = buffer_1.Buffer.from(string, 'utf16le');
-        if (unshift) {
-            return this.writeNativeBuffer(bytes, true).writeCUInt(bytes.length, true);
-        }
-        return this.writeCUInt(bytes.length).writeNativeBuffer(bytes);
+        const octets = buffer_1.Buffer.from(string, 'utf16le');
+        return this.writePwOctets(octets, unshift);
     }
     readPwOctets() {
-        let byteLength = this.readCUInt();
-        return this.readBuffer(byteLength, false, {
-            capacity: byteLength,
-            capacityStep: 0
-        });
+        const savedPointer = this.getPointer();
+        try {
+            const byteLength = this.readCUInt();
+            return this.readBuffer(byteLength, false, {
+                capacity: byteLength,
+                capacityStep: 0
+            });
+        }
+        catch (e) {
+            this.setPointer(savedPointer);
+            throw e;
+        }
     }
     writePwOctets(octets, unshift) {
-        if (unshift) {
-            return this.writeBuffer(octets, true).writeCUInt(octets.length, true);
-        }
-        return this.writeCUInt(octets.length).writeBuffer(octets);
+        const data = (new PwBuffer({
+            capacity: octets.length + 5,
+            capacityStep: 0
+        })).writeCUInt(octets.length).writeBuffer(octets);
+        return this.writeNativeBuffer(data.nativeBufferView, unshift);
     }
 }
 exports.PwBuffer = PwBuffer;

package/dist/errors/PwBufferError.d.ts

@@ -1,2 +1,4 @@
-export declare class PwBufferError extends Error {
+import { ExtendedBufferError } from 'extended-buffer';
+export declare class PwBufferError extends ExtendedBufferError {
+    constructor(message?: string);
 }

package/dist/errors/PwBufferError.js

@@ -1,6 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PwBufferError = void 0;
-class PwBufferError extends Error {
+const extended_buffer_1 = require("extended-buffer");
+class PwBufferError extends extended_buffer_1.ExtendedBufferError {
+    constructor(message) {
+        super(message);
+        this.name = new.target.name;
+        if (Error.captureStackTrace) {
+            Error.captureStackTrace(this, new.target);
+        }
+    }
 }
 exports.PwBufferError = PwBufferError;

package/dist/errors/PwBufferRangeError.d.ts

@@ -0,0 +1,3 @@
+import { PwBufferError } from './PwBufferError';
+export declare class PwBufferRangeError extends PwBufferError {
+}

package/dist/errors/PwBufferRangeError.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PwBufferRangeError = void 0;
+const PwBufferError_1 = require("./PwBufferError");
+class PwBufferRangeError extends PwBufferError_1.PwBufferError {
+}
+exports.PwBufferRangeError = PwBufferRangeError;

package/dist/errors/index.d.ts

@@ -1,2 +1,3 @@
 export { PwBufferError } from './PwBufferError';
 export { PwBufferTypeError } from './PwBufferTypeError';
+export { PwBufferRangeError } from './PwBufferRangeError';

package/dist/errors/index.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PwBufferTypeError = exports.PwBufferError = void 0;
+exports.PwBufferRangeError = exports.PwBufferTypeError = exports.PwBufferError = void 0;
 var PwBufferError_1 = require("./PwBufferError");
 Object.defineProperty(exports, "PwBufferError", { enumerable: true, get: function () { return PwBufferError_1.PwBufferError; } });
 var PwBufferTypeError_1 = require("./PwBufferTypeError");
 Object.defineProperty(exports, "PwBufferTypeError", { enumerable: true, get: function () { return PwBufferTypeError_1.PwBufferTypeError; } });
+var PwBufferRangeError_1 = require("./PwBufferRangeError");
+Object.defineProperty(exports, "PwBufferRangeError", { enumerable: true, get: function () { return PwBufferRangeError_1.PwBufferRangeError; } });

package/dist/mppc.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export declare class MppcDecompressor {
     private history;
     private histPtr;

package/dist/mppc.js

@@ -61,7 +61,7 @@ class BitWriter {
 }
 class MppcDecompressor {
     constructor() {
-        this.history = new Uint8Array(MPPC_HIST_LEN);
+        this.history = buffer_1.Buffer.alloc(MPPC_HIST_LEN);
         this.histPtr = 0;
         this.bitOffset = 0;
         this.legacy = buffer_1.Buffer.alloc(0);
@@ -125,7 +125,7 @@ class MppcDecompressor {
                         }
                     }
                     if (this.histPtr > histHead) {
-                        outParts.push(buffer_1.Buffer.from(this.history.subarray(histHead, this.histPtr)));
+                        outParts.push(buffer_1.Buffer.from((0, extended_buffer_1.nativeBufferSubarray)(this.history, histHead, this.histPtr)));
                     }
                     if (this.histPtr === MPPC_HIST_LEN) {
                         this.histPtr = 0;
@@ -236,7 +236,7 @@ class MppcDecompressor {
             this.histPtr = dstEnd;
         }
         if (this.histPtr > histHead) {
-            outParts.push(buffer_1.Buffer.from(this.history.subarray(histHead, this.histPtr)));
+            outParts.push(buffer_1.Buffer.from((0, extended_buffer_1.nativeBufferSubarray)(this.history, histHead, this.histPtr)));
         }
         this.legacy = (0, extended_buffer_1.nativeBufferSubarray)(this.legacy, rptr);
         this.bitOffset = bitShift;
@@ -246,7 +246,7 @@ class MppcDecompressor {
 exports.MppcDecompressor = MppcDecompressor;
 class MppcCompressor {
     constructor() {
-        this.history = new Uint8Array(MPPC_HIST_LEN);
+        this.history = buffer_1.Buffer.alloc(MPPC_HIST_LEN);
         this.histPtr = 0;
         this.bw = new BitWriter();
         this.dict = new Map();

package/dist/utils/write-cuint-to-pw-buffer.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeCUIntToPwBuffer = void 0;
+exports.writeCUIntToPwBuffer = writeCUIntToPwBuffer;
+const errors_1 = require("../errors");
 const extended_buffer_1 = require("extended-buffer");
 function writeCUIntToPwBuffer(buffer, value, unshift) {
     (0, extended_buffer_1.assertInteger)(value);
     if (value < 0 || value > 0xFFFFFFFF) {
-        throw new extended_buffer_1.ExtendedBufferRangeError('CUINT_VALUE_OUT_OF_RANGE');
+        throw new errors_1.PwBufferRangeError('CUINT_VALUE_OUT_OF_RANGE');
     }
     if (value < 0x80) {
         buffer.writeUIntBE(value & 0xFF, 1, unshift);
@@ -17,19 +18,11 @@ function writeCUIntToPwBuffer(buffer, value, unshift) {
         buffer.writeUIntBE((value | 0xC0000000) >>> 0, 4, unshift);
     }
     else {
-        const savedPointer = buffer.getPointer();
-        try {
-            if (unshift) {
-                buffer.allocStart(5).writeUIntBE(value >>> 0, 4, true).writeUIntBE(0xE0, 1, true);
-            }
-            else {
-                buffer.allocEnd(5).writeUIntBE(0xE0, 1).writeUIntBE(value >>> 0, 4);
-            }
+        if (unshift) {
+            buffer.allocStart(5).writeUIntBE(value >>> 0, 4, true).writeUIntBE(0xE0, 1, true);
         }
-        catch (e) {
-            buffer.setPointer(savedPointer);
-            throw e;
+        else {
+            buffer.allocEnd(5).writeUIntBE(0xE0, 1).writeUIntBE(value >>> 0, 4);
         }
     }
 }
-exports.writeCUIntToPwBuffer = writeCUIntToPwBuffer;

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "pw-buffer",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "description": "PW Buffer, Perfect World, Beijing Perfect World",
+  "type": "commonjs",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "require": "./dist/index.js",
+      "import": "./dist/index.js",
       "default": "./dist/index.js"
     }
   },
@@ -47,10 +49,10 @@
     "README.md"
   ],
   "dependencies": {
-    "extended-buffer": "^7.0.2"
+    "extended-buffer": "^7.3.0"
   },
   "devDependencies": {
     "@types/node": "^6.14.13",
-    "typescript": "^4.7.2"
+    "typescript": "^5.9.3"
   }
 }