opcjs-base 0.1.7 → 0.1.10

package/dist/index.cjs

@@ -1551,12 +1551,12 @@ var BinaryReader = class _BinaryReader {
       }
       case 1 /* Binary */: {
         const reader = new _BinaryReader(this.readByteString());
-        data = decoder.decodeWithTypeId(typeId.identifier, reader);
+        data = decoder.decodeWithEncodingId(typeId.identifier, reader);
         break;
       }
       case 2 /* Xml */: {
         const reader = new XmlReader(this.readString());
-        data = decoder.decodeWithTypeId(typeId.identifier, reader);
+        data = decoder.decodeWithEncodingId(typeId.identifier, reader);
         break;
       }
     }
@@ -1879,7 +1879,9 @@ var VariantMask2 = {
 };
 var BinaryWriter = class {
   buffer;
+  view;
   position;
+  growthFactor = 2;
   getData() {
     return this.buffer.subarray(0, this.position);
   }
@@ -1923,23 +1925,25 @@ var BinaryWriter = class {
     if (!Number.isInteger(value) || value < 0 || value > 4294967295) {
       throw new CodecError(`UInt32 value ${value} out of range [0, 4294967295]`);
     }
-    this.buffer.writeUInt32LE(value, offset);
+    this.view.setUint32(offset, value, true);
   }
   /**
    * Ensure buffer has enough capacity, growing if necessary.
    */
   ensureCapacity(additionalBytes) {
-    const required = this.position + additionalBytes;
-    if (required > this.buffer.length) {
-      const newSize = Math.max(required, this.buffer.length * 2);
-      const newBuffer = Buffer.allocUnsafe(newSize);
-      this.buffer.copy(newBuffer, 0, 0, this.position);
+    const requiredSize = this.position + additionalBytes;
+    if (requiredSize > this.buffer.length) {
+      const newSize = Math.max(this.buffer.length * this.growthFactor, requiredSize);
+      const newBuffer = new Uint8Array(newSize);
+      newBuffer.set(this.buffer.subarray(0, this.position), 0);
       this.buffer = newBuffer;
+      this.view = new DataView(newBuffer.buffer, newBuffer.byteOffset, newBuffer.byteLength);
+      console.log(`BufferWriter: resized buffer to ${newSize} bytes`);
     }
   }
   writeBoolean(value) {
     this.ensureCapacity(1);
-    this.buffer.writeUInt8(value ? 1 : 0, this.position);
+    this.view.setUint8(this.position, value ? 1 : 0);
     this.position += 1;
   }
   writeByte(value) {
@@ -1947,7 +1951,7 @@ var BinaryWriter = class {
       throw new CodecError(`Byte value ${value} out of range [0, 255]`);
     }
     this.ensureCapacity(1);
-    this.buffer.writeUInt8(value, this.position);
+    this.view.setUint8(this.position, value);
     this.position += 1;
   }
   writeSByte(value) {
@@ -1955,7 +1959,7 @@ var BinaryWriter = class {
       throw new CodecError(`SByte value ${value} out of range [-128, 127]`);
     }
     this.ensureCapacity(1);
-    this.buffer.writeInt8(value, this.position);
+    this.view.setInt8(this.position, value);
     this.position += 1;
   }
   writeInt16(value) {
@@ -1963,7 +1967,7 @@ var BinaryWriter = class {
       throw new CodecError(`Int16 value ${value} out of range [-32768, 32767]`);
     }
     this.ensureCapacity(2);
-    this.buffer.writeInt16LE(value, this.position);
+    this.view.setInt16(this.position, value, true);
     this.position += 2;
   }
   writeUInt16(value) {
@@ -1971,7 +1975,7 @@ var BinaryWriter = class {
       throw new CodecError(`UInt16 value ${value} out of range [0, 65535]`);
     }
     this.ensureCapacity(2);
-    this.buffer.writeUInt16LE(value, this.position);
+    this.view.setUint16(this.position, value, true);
     this.position += 2;
   }
   writeInt32(value) {
@@ -1979,7 +1983,7 @@ var BinaryWriter = class {
       throw new CodecError(`Int32 value ${value} out of range [-2147483648, 2147483647]`);
     }
     this.ensureCapacity(4);
-    this.buffer.writeInt32LE(value, this.position);
+    this.view.setInt32(this.position, value, true);
     this.position += 4;
   }
   writeUInt32(value) {
@@ -1987,46 +1991,35 @@ var BinaryWriter = class {
       throw new CodecError(`UInt32 value ${value} out of range [0, 4294967295]`);
     }
     this.ensureCapacity(4);
-    this.buffer.writeUInt32LE(value, this.position);
+    this.view.setUint32(this.position, value, true);
     this.position += 4;
   }
   writeInt64(value) {
     this.ensureCapacity(8);
-    this.buffer.writeBigInt64LE(value, this.position);
+    this.view.setBigInt64(this.position, value, true);
     this.position += 8;
   }
   writeUInt64(value) {
     this.ensureCapacity(8);
-    this.buffer.writeBigUInt64LE(value, this.position);
+    this.view.setBigUint64(this.position, value, true);
     this.position += 8;
   }
   writeFloat(value) {
     this.ensureCapacity(4);
-    this.buffer.writeFloatLE(value, this.position);
+    this.view.setFloat32(this.position, value, true);
     this.position += 4;
   }
   writeDouble(value) {
     this.ensureCapacity(8);
-    this.buffer.writeDoubleLE(value, this.position);
+    this.view.setFloat64(this.position, value, true);
     this.position += 8;
   }
   writeString(value) {
-    if (value == null) {
-      this.writeInt32(-1);
-      return;
-    }
-    const utf8Bytes = Buffer.from(value, "utf8");
-    const length = utf8Bytes.length;
-    if (length > 16777216) {
-      throw new CodecError(
-        `String length ${length} exceeds maximum allowed length of 16,777,216 bytes`,
-        { format: "Binary", suggestedAction: "Reduce string length" }
-      );
+    let encoded = void 0;
+    if (value && value !== "") {
+      encoded = new TextEncoder().encode(value);
     }
-    this.writeInt32(length);
-    this.ensureCapacity(length);
-    utf8Bytes.copy(this.buffer, this.position);
-    this.position += length;
+    this.writeByteString(encoded);
   }
   writeDateTime(value) {
     const jsTimestamp = BigInt(value.getTime());
@@ -2040,19 +2033,19 @@ var BinaryWriter = class {
     }
     this.ensureCapacity(16);
     const data1 = parseInt(hex.substr(0, 8), 16);
-    this.buffer.writeUInt32LE(data1, this.position);
+    this.view.setUint32(this.position, data1, true);
     const data2 = parseInt(hex.substr(8, 4), 16);
-    this.buffer.writeUInt16LE(data2, this.position + 4);
+    this.view.setUint16(this.position + 4, data2, true);
     const data3 = parseInt(hex.substr(12, 4), 16);
-    this.buffer.writeUInt16LE(data3, this.position + 6);
+    this.view.setUint16(this.position + 6, data3, true);
     for (let i = 0; i < 8; i++) {
       const byte = parseInt(hex.substr(16 + i * 2, 2), 16);
-      this.buffer.writeUInt8(byte, this.position + 8 + i);
+      this.view.setUint8(this.position + 8 + i, byte);
     }
     this.position += 16;
   }
   writeByteString(value) {
-    if (value == null) {
+    if (!value) {
       this.writeInt32(-1);
       return;
     }
@@ -2063,14 +2056,8 @@ var BinaryWriter = class {
         { format: "Binary", suggestedAction: "Reduce ByteString length" }
       );
     }
-    this.writeInt32(length);
-    this.ensureCapacity(length);
-    if (Buffer.isBuffer(value)) {
-      value.copy(this.buffer, this.position);
-    } else {
-      this.buffer.set(value, this.position);
-    }
-    this.position += length;
+    this.writeInt32(value.length);
+    this.writeBytes(value);
   }
   writeXmlElement(value) {
     this.writeString(value);
@@ -2138,8 +2125,7 @@ var BinaryWriter = class {
         this.writeByte(5 /* ByteString */);
         this.writeUInt16(value.namespace);
         const ident = value.identifier;
-        const buf = ident instanceof Uint8Array && !(ident instanceof Buffer) ? Buffer.from(ident) : ident;
-        this.writeByteString(buf);
+        this.writeByteString(ident);
         break;
       }
       default:
@@ -2218,20 +2204,22 @@ var BinaryWriter = class {
     switch (value.encoding) {
       case 0 /* None */:
         break;
-      case 1 /* Binary */:
+      case 1 /* Binary */: {
         if (!value.data) {
           throw new CodecError("ExtensionObject with Binary encoding must have data");
         }
         const binaryData = encoder.encodeWithoutId(value.data, "binary");
         this.writeByteString(binaryData);
         break;
-      case 2 /* Xml */:
+      }
+      case 2 /* Xml */: {
         if (!value.data) {
           throw new CodecError("ExtensionObject with Xml encoding must have data");
         }
         const xmlString = encoder.encodeWithoutId(value.data, "xml");
         this.writeXmlElement(xmlString);
         break;
+      }
       default:
         throw new CodecError(`Invalid ExtensionObject encoding: ${value.encoding}`);
     }
@@ -2449,7 +2437,9 @@ var BinaryWriter = class {
     }
   }
   constructor(initialSize = 1024) {
-    this.buffer = Buffer.allocUnsafe(initialSize);
+    const data = new Uint8Array(initialSize);
+    this.buffer = data;
+    this.view = new DataView(data.buffer, data.byteOffset, data.byteLength);
     this.position = 0;
   }
 };