@cloudpss/ubjson 0.4.6 → 0.4.8

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /** 编码为 UBJSON */
 export declare function encode(value: unknown): Uint8Array;
 /** 解码 UBJSON */
-export declare function decode(value: Uint8Array): unknown;
+export declare function decode(value: BinaryData): unknown;
 export { StringEncoder } from './common/string-encoder.js';
 export { StringDecoder } from './common/string-decoder.js';

package/dist/index.js

@@ -1,5 +1,6 @@
 import { Encoder } from './encoder.js';
 import { Decoder } from './decoder.js';
+import { toUint8Array } from './utils.js';
 /** 编码为 UBJSON */
 export function encode(value) {
     const encoder = new Encoder(value);
@@ -7,7 +8,7 @@ export function encode(value) {
 }
 /** 解码 UBJSON */
 export function decode(value) {
-    const decoder = new Decoder(value);
+    const decoder = new Decoder(toUint8Array(value));
     return decoder.decode();
 }
 export { StringEncoder } from './common/string-encoder.js';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,iBAAiB;AACjB,MAAM,UAAU,MAAM,CAAC,KAAc;IACjC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC;IACnC,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC;AAC5B,CAAC;AAED,gBAAgB;AAChB,MAAM,UAAU,MAAM,CAAC,KAAiB;IACpC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC;IACnC,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC;AAC5B,CAAC;AAED,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,iBAAiB;AACjB,MAAM,UAAU,MAAM,CAAC,KAAc;IACjC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC;IACnC,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC;AAC5B,CAAC;AAED,gBAAgB;AAChB,MAAM,UAAU,MAAM,CAAC,KAAiB;IACpC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IACjD,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC;AAC5B,CAAC;AAED,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC"}

package/dist/rxjs/decoder.d.ts

@@ -1,3 +1,3 @@
 import { OperatorFunction } from 'rxjs';
 /** 流式解码 UBJSON */
-export declare function decode(): OperatorFunction<Uint8Array, unknown>;
+export declare function decode(): OperatorFunction<BinaryData, unknown>;

package/dist/rxjs/decoder.js

@@ -1,5 +1,6 @@
 import { Observable } from 'rxjs';
 import { StreamDecoderHelper, UnexpectedEof } from '../stream-helper/decoder.js';
+import { toUint8Array } from '../utils.js';
 const DEFAULT_BUFFER_SIZE = 16 * 1024 * 1024; // 16 MiB
 const EMPTY_BUFFER = new Uint8Array(0);
 /** 流式解码 UBJSON */
@@ -12,17 +13,18 @@ export function decode() {
             let end = 0;
             return observable.subscribe({
                 next(value) {
-                    if (buffer.length >= end + value.length) {
-                        buffer.set(value, end);
-                        end += value.length;
+                    const data = toUint8Array(value);
+                    if (buffer.length >= end + data.length) {
+                        buffer.set(data, end);
+                        end += data.length;
                     }
                     else {
-                        chunkSize = Math.max(chunkSize, value.length * 2 + end - begin);
-                        const newBuffer = new Uint8Array(Math.max(chunkSize, value.length + end - begin));
+                        chunkSize = Math.max(chunkSize, data.length * 2 + end - begin);
+                        const newBuffer = new Uint8Array(Math.max(chunkSize, data.length + end - begin));
                         newBuffer.set(buffer.subarray(begin, end), 0);
-                        newBuffer.set(value, end - begin);
+                        newBuffer.set(data, end - begin);
                         buffer = newBuffer;
-                        end = end - begin + value.length;
+                        end = end - begin + data.length;
                         begin = 0;
                     }
                     while (end - begin > 0) {

package/dist/rxjs/decoder.js.map

@@ -1 +1 @@
-{"version":3,"file":"decoder.js","sourceRoot":"","sources":["../../src/rxjs/decoder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"decoder.js","sourceRoot":"","sources":["../../src/rxjs/decoder.ts"],"names":[],"mappings":"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"}

package/dist/utils.d.ts

@@ -0,0 +1,2 @@
+/** 支持的数据转为 Uint8Array */
+export declare function toUint8Array(data: BinaryData): Uint8Array;

package/dist/utils.js

@@ -0,0 +1,8 @@
+/** 支持的数据转为 Uint8Array */
+export function toUint8Array(data) {
+    if (ArrayBuffer.isView(data)) {
+        return new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+    }
+    return new Uint8Array(data, 0, data.byteLength);
+}
+//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,yBAAyB;AACzB,MAAM,UAAU,YAAY,CAAC,IAAgB;IACzC,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC1B,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;KACxE;IACD,OAAO,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;AACpD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudpss/ubjson",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "author": "CloudPSS",
   "license": "MIT",
   "keywords": [
@@ -31,6 +31,10 @@
     "./stream": {
       "types": "./dist/stream/index.d.ts",
       "default": "./dist/stream/index.js"
+    },
+    "./rxjs": {
+      "types": "./dist/rxjs/index.d.ts",
+      "default": "./dist/rxjs/index.js"
     }
   },
   "scripts": {
@@ -45,6 +49,6 @@
     "@msgpack/msgpack": "^2.8.0"
   },
   "dependencies": {
-    "rxjs": "^7.5.7"
+    "rxjs": "^7.8.0"
   }
 }

package/src/index.ts

@@ -1,5 +1,6 @@
 import { Encoder } from './encoder.js';
 import { Decoder } from './decoder.js';
+import { toUint8Array } from './utils.js';
 
 /** 编码为 UBJSON */
 export function encode(value: unknown): Uint8Array {
@@ -8,8 +9,8 @@ export function encode(value: unknown): Uint8Array {
 }
 
 /** 解码 UBJSON */
-export function decode(value: Uint8Array): unknown {
-    const decoder = new Decoder(value);
+export function decode(value: BinaryData): unknown {
+    const decoder = new Decoder(toUint8Array(value));
     return decoder.decode();
 }
 

package/src/rxjs/decoder.ts

@@ -1,11 +1,12 @@
 import { Observable, OperatorFunction } from 'rxjs';
 import { StreamDecoderHelper, UnexpectedEof } from '../stream-helper/decoder.js';
+import { toUint8Array } from '../utils.js';
 
 const DEFAULT_BUFFER_SIZE = 16 * 1024 * 1024; // 16 MiB
 const EMPTY_BUFFER = new Uint8Array(0);
 
 /** 流式解码 UBJSON */
-export function decode(): OperatorFunction<Uint8Array, unknown> {
+export function decode(): OperatorFunction<BinaryData, unknown> {
     return (observable) => {
         return new Observable<unknown>((subscriber) => {
             let chunkSize = DEFAULT_BUFFER_SIZE;
@@ -14,16 +15,17 @@ export function decode(): OperatorFunction<Uint8Array, unknown> {
             let end = 0;
             return observable.subscribe({
                 next(value) {
-                    if (buffer.length >= end + value.length) {
-                        buffer.set(value, end);
-                        end += value.length;
+                    const data = toUint8Array(value);
+                    if (buffer.length >= end + data.length) {
+                        buffer.set(data, end);
+                        end += data.length;
                     } else {
-                        chunkSize = Math.max(chunkSize, value.length * 2 + end - begin);
-                        const newBuffer = new Uint8Array(Math.max(chunkSize, value.length + end - begin));
+                        chunkSize = Math.max(chunkSize, data.length * 2 + end - begin);
+                        const newBuffer = new Uint8Array(Math.max(chunkSize, data.length + end - begin));
                         newBuffer.set(buffer.subarray(begin, end), 0);
-                        newBuffer.set(value, end - begin);
+                        newBuffer.set(data, end - begin);
                         buffer = newBuffer;
-                        end = end - begin + value.length;
+                        end = end - begin + data.length;
                         begin = 0;
                     }
                     while (end - begin > 0) {

package/src/stream/decoder.ts

@@ -9,7 +9,7 @@ export class StreamDecoder extends Transform {
             readableObjectMode: true,
             writableObjectMode: false,
         });
-        this.buffer = new Subject<Uint8Array>();
+        this.buffer = new Subject<BinaryData>();
         this.buffer.pipe(decode()).subscribe({
             next: (value) => {
                 // null is not allowed in a stream

package/src/utils.ts

@@ -0,0 +1,7 @@
+/** 支持的数据转为 Uint8Array */
+export function toUint8Array(data: BinaryData): Uint8Array {
+    if (ArrayBuffer.isView(data)) {
+        return new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+    }
+    return new Uint8Array(data, 0, data.byteLength);
+}

package/tests/e2e.js

@@ -351,3 +351,13 @@ test('encode/decode object with undefined values', () => {
     const obj = { a: 1, b: undefined, c: { d: 2, e: undefined, f: null } };
     expect(decode(encode(obj))).toEqual(obj);
 });
+
+test('decode ArrayBuffer', () => {
+    const obj = { a: 1, b: undefined, c: { d: 2, e: undefined, f: null } };
+    expect(decode(encode(obj).buffer)).toEqual(obj);
+});
+
+test('decode Int8Array', () => {
+    const obj = { a: 1, b: undefined, c: { d: 2, e: undefined, f: null } };
+    expect(decode(new Int8Array(encode(obj).buffer))).toEqual(obj);
+});