@cloudpss/compress 0.4.15 → 0.4.17

package/benchmark.js

@@ -7,13 +7,15 @@ import cppzst from '@xingrz/cppzst';
 import * as myZstdWasm from '@cloudpss/zstd/wasm';
 import * as myZstdNapi from '@cloudpss/zstd';
 import pako from 'pako';
+import * as fflate from 'fflate';
+import * as fzstd from 'fzstd';
 import files from '../../benchmark-files/index.js';
 import { createRequire } from 'node:module';
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 const brotli = createRequire(import.meta.url)('brotli-wasm');
 
-const t = (/** @type {number} */ time) => time.toFixed(2) + 'ms';
+const t = (/** @type {number} */ time) => (time.toFixed(2) + 'ms').padStart(8);
 const pb = (/** @type {number} */ size) => prettyBytes(size, { binary: true });
 
 await bokuwebZstd.init();
@@ -42,14 +44,17 @@ const tests = [
     createTest('gzip -d (wasm)', wasmFlate.gzip_encode_raw, wasmFlate.gzip_decode_raw),
     createTest('gzip -d (node)', zlib.gzipSync, zlib.gunzipSync),
     createTest('gzip -d (pako)', pako.gzip, pako.ungzip),
+    createTest('gzip -d (fflate)', fflate.gzipSync, fflate.gunzipSync),
     createTest('zstd -3 (Oz,wasm)', (buf) => bokuwebZstd.compress(buf, 3), bokuwebZstd.decompress),
     createTest('zstd -3 (O3,wasm)', (buf) => myZstdWasm.compress(buf, 3), myZstdWasm.decompress),
     createTest('zstd -4 (O3,wasm)', (buf) => myZstdWasm.compress(buf, 4), myZstdWasm.decompress),
     createTest('zstd -4 (cppzst)', (buf) => cppzst.compressSync(buf, { level: 4 }), cppzst.decompressSync),
     createTest('zstd -4 (napi)', (buf) => myZstdNapi.compress(buf, 4), myZstdNapi.decompress),
+    createTest('zstd -4 (fzstd)', (buf) => myZstdNapi.compress(buf, 4), fzstd.decompress),
     createTest('zstd -10 (O3,wasm)', (buf) => myZstdWasm.compress(buf, 10), myZstdWasm.decompress),
     createTest('zstd -10 (cppzst)', (buf) => cppzst.compressSync(buf, { level: 10 }), cppzst.decompressSync),
     createTest('zstd -10 (napi)', (buf) => myZstdNapi.compress(buf, 10), myZstdNapi.decompress),
+    createTest('zstd -10 (fzstd)', (buf) => myZstdNapi.compress(buf, 10), fzstd.decompress),
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-argument
     createTest('br -1 (wasm)', (buf) => brotli.compress(buf, { quality: 1 }), brotli.decompress),
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-argument
@@ -86,7 +91,7 @@ for await (const { file, data } of files()) {
         const compressed = result.compressed.length;
         const ratio = (data.length / result.compressed.length).toFixed(2);
         console.log(
-            `  ${test.name}: \t${ratio}(${pb(compressed)}) \t${t(result.compressTime)} \t${t(result.decompressTime)}`,
+            `  ${test.name.padEnd(20)}: ${ratio.padStart(6)} (${pb(compressed).padStart(8)}) \t${t(result.compressTime)} \t${t(result.decompressTime)}`,
         );
     }
 }

package/dist/gzip/index-browser.js

@@ -1,10 +1,10 @@
-import { gzip, ungzip } from 'pako';
+import { gzipSync, gunzipSync } from 'fflate';
 /** 压缩 */
 export function compress(data) {
-    return gzip(data);
+    return gzipSync(data);
 }
 /** 解压 */
 export function decompress(data) {
-    return ungzip(data);
+    return gunzipSync(data);
 }
 //# sourceMappingURL=index-browser.js.map

package/dist/gzip/index-browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"index-browser.js","sourceRoot":"","sources":["../../src/gzip/index-browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,SAAS;AACT,MAAM,UAAU,QAAQ,CAAC,IAAgB;IACrC,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC;AACtB,CAAC;AAED,SAAS;AACT,MAAM,UAAU,UAAU,CAAC,IAAgB;IACvC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC"}
+{"version":3,"file":"index-browser.js","sourceRoot":"","sources":["../../src/gzip/index-browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAE9C,SAAS;AACT,MAAM,UAAU,QAAQ,CAAC,IAAgB;IACrC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS;AACT,MAAM,UAAU,UAAU,CAAC,IAAgB;IACvC,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}

package/dist/gzip/index.js

@@ -1,4 +1,4 @@
-import { gzip, gunzip } from 'zlib';
+import { gzip, gunzip } from 'node:zlib';
 /** 压缩 */
 export function compress(data) {
     return new Promise((resolve, reject) => {

package/dist/gzip/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/gzip/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,SAAS;AACT,MAAM,UAAU,QAAQ,CAAC,IAAgB;IACrC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YACvB,IAAI,GAAG,IAAI,CAAC,MAAM;gBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;YAChC,OAAO,CAAC,MAAM,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS;AACT,MAAM,UAAU,UAAU,CAAC,IAAgB;IACvC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,MAAM,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YACzB,IAAI,GAAG,IAAI,CAAC,MAAM;gBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;YAChC,OAAO,CAAC,MAAM,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/gzip/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEzC,SAAS;AACT,MAAM,UAAU,QAAQ,CAAC,IAAgB;IACrC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YACvB,IAAI,GAAG,IAAI,CAAC,MAAM;gBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;YAChC,OAAO,CAAC,MAAM,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS;AACT,MAAM,UAAU,UAAU,CAAC,IAAgB;IACvC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,MAAM,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YACzB,IAAI,GAAG,IAAI,CAAC,MAAM;gBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;YAChC,OAAO,CAAC,MAAM,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/index.d.ts

@@ -1,17 +1,25 @@
 /** 可用的压缩算法 */
 export type CompressionAlgorithm = 'zstd' | 'gzip' | 'none';
 /** 压缩算法的魔数 */
-export declare const MAGIC_NUMBERS: {
-    zstd: number[];
-    gzip: number[];
-};
+export declare const CompressionAlgorithms: Readonly<{
+    zstd: Readonly<{
+        algorithm: "zstd";
+        magicNumber: readonly number[];
+        minSize: 8;
+    }>;
+    gzip: Readonly<{
+        algorithm: "gzip";
+        magicNumber: readonly number[];
+        minSize: 18;
+    }>;
+}>;
 /** 使用指定算法压缩 */
-export declare function compress(data: Uint8Array, algorithm?: CompressionAlgorithm): CompressionResult;
+export declare function compress(data: BinaryData, algorithm?: CompressionAlgorithm): CompressionResult;
 /** 压缩/解压缩结果 */
 export type CompressionResult = Promise<Uint8Array> & {
     algorithm: CompressionAlgorithm;
 };
 /** 探测压缩算法 */
-export declare function detectCompression(data: Uint8Array): CompressionAlgorithm;
+export declare function detectCompression(data: BinaryData): CompressionAlgorithm;
 /** 探测压缩算法并解压缩 */
-export declare function decompress(data: Uint8Array): CompressionResult;
+export declare function decompress(data: BinaryData): CompressionResult;

package/dist/index.js

@@ -1,8 +1,16 @@
 /** 压缩算法的魔数 */
-export const MAGIC_NUMBERS = {
-    zstd: [0x28, 0xb5, 0x2f, 0xfd],
-    gzip: [0x1f, 0x8b],
-};
+export const CompressionAlgorithms = Object.freeze({
+    zstd: Object.freeze({
+        algorithm: 'zstd',
+        magicNumber: Object.freeze([0x28, 0xb5, 0x2f, 0xfd]),
+        minSize: 8,
+    }),
+    gzip: Object.freeze({
+        algorithm: 'gzip',
+        magicNumber: Object.freeze([0x1f, 0x8b]),
+        minSize: 18,
+    }),
+});
 const modules = {
     zstd: () => import('@cloudpss/zstd'),
     gzip: () => import('./gzip/index.js'),
@@ -13,46 +21,62 @@ function loadLib(algorithm) {
         throw new Error(`Unknown compression algorithm: ${algorithm}`);
     return modules[algorithm]();
 }
+/** 支持的数据转为 Uint8Array */
+function toUint8Array(data) {
+    if (data == null || typeof data != 'object' || typeof data.byteLength != 'number') {
+        throw new TypeError('Invalid data');
+    }
+    if (ArrayBuffer.isView(data)) {
+        return new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+    }
+    return new Uint8Array(data, 0, data.byteLength);
+}
 /** 使用指定算法压缩 */
 export function compress(data, algorithm = 'zstd') {
+    const d = toUint8Array(data);
     if (algorithm === 'none') {
-        const ret = Promise.resolve(data);
+        const ret = Promise.resolve(d);
         ret.algorithm = 'none';
         return ret;
     }
-    const ret = loadLib(algorithm).then((lib) => lib.compress(data));
+    const ret = loadLib(algorithm).then((lib) => lib.compress(d));
     ret.algorithm = algorithm;
     return ret;
 }
 /** 探测压缩算法 */
-export function detectCompression(data) {
-    for (const key in MAGIC_NUMBERS) {
-        const k = key;
-        const magicNumber = MAGIC_NUMBERS[k];
-        if (data.length <= magicNumber.length)
+function detectCompressionImpl(data) {
+    for (const key in CompressionAlgorithms) {
+        const info = CompressionAlgorithms[key];
+        if (data.length < info.minSize)
             continue;
         let match = true;
-        for (let i = 0; i < magicNumber.length; i++) {
-            if (data[i] !== magicNumber[i]) {
+        for (let i = 0; i < info.magicNumber.length; i++) {
+            if (data[i] !== info.magicNumber[i]) {
                 match = false;
                 break;
             }
         }
         if (match)
-            return k;
+            return info.algorithm;
     }
     return 'none';
 }
+/** 探测压缩算法 */
+export function detectCompression(data) {
+    const d = toUint8Array(data);
+    return detectCompressionImpl(d);
+}
 /** 探测压缩算法并解压缩 */
 export function decompress(data) {
-    const algorithm = detectCompression(data);
+    const d = toUint8Array(data);
+    const algorithm = detectCompressionImpl(d);
     if (algorithm === 'none') {
         // 不是压缩数据
-        const result = Promise.resolve(data);
+        const result = Promise.resolve(d);
         result.algorithm = 'none';
         return result;
     }
-    const result = loadLib(algorithm).then(({ decompress }) => decompress(data));
+    const result = loadLib(algorithm).then(({ decompress }) => decompress(d));
     result.algorithm = algorithm;
     return result;
 }

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,cAAc;AACd,MAAM,CAAC,MAAM,aAAa,GAAG;IACzB,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;IAC9B,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;CACrB,CAAC;AAEF,MAAM,OAAO,GAAG;IACZ,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC;IACpC,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC;CACxC,CAAC;AAEF,YAAY;AACZ,SAAS,OAAO,CAAC,SAAgD;IAC7D,IAAI,CAAC,CAAC,SAAS,IAAI,OAAO,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,SAAS,EAAE,CAAC,CAAC;IAC5F,OAAO,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;AAChC,CAAC;AAED,eAAe;AACf,MAAM,UAAU,QAAQ,CAAC,IAAgB,EAAE,YAAkC,MAAM;IAC/E,IAAI,SAAS,KAAK,MAAM,EAAE;QACtB,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAsB,CAAC;QACvD,GAAG,CAAC,SAAS,GAAG,MAAM,CAAC;QACvB,OAAO,GAAG,CAAC;KACd;IACD,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAsB,CAAC;IACtF,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC;IAC1B,OAAO,GAAG,CAAC;AACf,CAAC;AAKD,aAAa;AACb,MAAM,UAAU,iBAAiB,CAAC,IAAgB;IAC9C,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;QAC7B,MAAM,CAAC,GAAG,GAAiC,CAAC;QAC5C,MAAM,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,MAAM;YAAE,SAAS;QAChD,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACzC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE;gBAC5B,KAAK,GAAG,KAAK,CAAC;gBACd,MAAM;aACT;SACJ;QACD,IAAI,KAAK;YAAE,OAAO,CAAC,CAAC;KACvB;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,iBAAiB;AACjB,MAAM,UAAU,UAAU,CAAC,IAAgB;IACvC,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAE1C,IAAI,SAAS,KAAK,MAAM,EAAE;QACtB,SAAS;QACT,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAsB,CAAC;QAC1D,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC;QAC1B,OAAO,MAAM,CAAC;KACjB;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAsB,CAAC;IAClG,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,OAAO,MAAM,CAAC;AAClB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc;AACd,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/C,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;QAChB,SAAS,EAAE,MAAe;QAC1B,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACpD,OAAO,EAAE,CAAC;KACb,CAAC;IACF,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;QAChB,SAAS,EAAE,MAAe;QAC1B,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACxC,OAAO,EAAE,EAAE;KACd,CAAC;CACqC,CAAC,CAAC;AAE7C,MAAM,OAAO,GAAG;IACZ,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC;IACpC,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC;CACxC,CAAC;AAEF,YAAY;AACZ,SAAS,OAAO,CAAC,SAAgD;IAC7D,IAAI,CAAC,CAAC,SAAS,IAAI,OAAO,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,SAAS,EAAE,CAAC,CAAC;IAC5F,OAAO,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;AAChC,CAAC;AAED,yBAAyB;AACzB,SAAS,YAAY,CAAC,IAAgB;IAClC,IAAI,IAAI,IAAI,IAAI,IAAI,OAAO,IAAI,IAAI,QAAQ,IAAI,OAAO,IAAI,CAAC,UAAU,IAAI,QAAQ,EAAE;QAC/E,MAAM,IAAI,SAAS,CAAC,cAAc,CAAC,CAAC;KACvC;IACD,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;AAED,eAAe;AACf,MAAM,UAAU,QAAQ,CAAC,IAAgB,EAAE,YAAkC,MAAM;IAC/E,MAAM,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,SAAS,KAAK,MAAM,EAAE;QACtB,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAsB,CAAC;QACpD,GAAG,CAAC,SAAS,GAAG,MAAM,CAAC;QACvB,OAAO,GAAG,CAAC;KACd;IACD,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAsB,CAAC;IACnF,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC;IAC1B,OAAO,GAAG,CAAC;AACf,CAAC;AAKD,aAAa;AACb,SAAS,qBAAqB,CAAC,IAAgB;IAC3C,KAAK,MAAM,GAAG,IAAI,qBAAqB,EAAE;QACrC,MAAM,IAAI,GAAG,qBAAqB,CAAC,GAAyC,CAAC,CAAC;QAC9E,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO;YAAE,SAAS;QACzC,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC9C,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;gBACjC,KAAK,GAAG,KAAK,CAAC;gBACd,MAAM;aACT;SACJ;QACD,IAAI,KAAK;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC;KACpC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,aAAa;AACb,MAAM,UAAU,iBAAiB,CAAC,IAAgB;IAC9C,MAAM,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,OAAO,qBAAqB,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,iBAAiB;AACjB,MAAM,UAAU,UAAU,CAAC,IAAgB;IACvC,MAAM,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,SAAS,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAE3C,IAAI,SAAS,KAAK,MAAM,EAAE;QACtB,SAAS;QACT,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAsB,CAAC;QACvD,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC;QAC1B,OAAO,MAAM,CAAC;KACjB;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAsB,CAAC;IAC/F,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,OAAO,MAAM,CAAC;AAClB,CAAC"}

package/jest.config.js

@@ -0,0 +1,3 @@
+import { config } from '../../jest.config.js';
+
+export default { ...config };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudpss/compress",
-  "version": "0.4.15",
+  "version": "0.4.17",
   "author": "CloudPSS",
   "license": "MIT",
   "type": "module",
@@ -18,22 +18,25 @@
   "scripts": {
     "start": "yarn clean && tsc --watch",
     "build": "yarn clean && tsc",
+    "test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest",
     "prepublishOnly": "yarn build",
     "clean": "rimraf dist",
     "benchmark": "node ./benchmark"
   },
   "dependencies": {
     "@cloudpss/zstd": "^0.2.0",
-    "pako": "^2.1.0"
+    "fflate": "^0.7.4"
   },
   "devDependencies": {
     "@bokuweb/zstd-wasm": "^0.0.20",
-    "@types/node": "^18.15.12",
+    "@types/node": "^18.16.1",
     "@types/pako": "^2.0.0",
     "@xingrz/cppzst": "^2.1.0-alpha.8",
     "brotli-wasm": "^1.3.1",
+    "fzstd": "^0.1.0",
+    "pako": "^2.1.0",
     "pretty-bytes": "^6.1.0",
-    "type-fest": "^3.8.0",
+    "type-fest": "^3.9.0",
     "wasm-flate": "1.0.2"
   }
 }

package/src/gzip/index-browser.ts

@@ -1,11 +1,11 @@
-import { gzip, ungzip } from 'pako';
+import { gzipSync, gunzipSync } from 'fflate';
 
 /** 压缩 */
 export function compress(data: Uint8Array): Uint8Array {
-    return gzip(data);
+    return gzipSync(data);
 }
 
 /** 解压 */
 export function decompress(data: Uint8Array): Uint8Array {
-    return ungzip(data);
+    return gunzipSync(data);
 }

package/src/gzip/index.ts

@@ -1,4 +1,4 @@
-import { gzip, gunzip } from 'zlib';
+import { gzip, gunzip } from 'node:zlib';
 
 /** 压缩 */
 export function compress(data: Uint8Array): Promise<Uint8Array> {

package/src/index.ts

@@ -1,11 +1,29 @@
 /** 可用的压缩算法 */
 export type CompressionAlgorithm = 'zstd' | 'gzip' | 'none';
 
+/** 压缩算法的信息 */
+interface CompressionInfo {
+    /** 算法 */
+    readonly algorithm: CompressionAlgorithm;
+    /** 压缩算法的魔数 */
+    readonly magicNumber: readonly number[];
+    /** 压缩算法的最小结果大小 */
+    readonly minSize: number;
+}
+
 /** 压缩算法的魔数 */
-export const MAGIC_NUMBERS = {
-    zstd: [0x28, 0xb5, 0x2f, 0xfd],
-    gzip: [0x1f, 0x8b],
-};
+export const CompressionAlgorithms = Object.freeze({
+    zstd: Object.freeze({
+        algorithm: 'zstd' as const,
+        magicNumber: Object.freeze([0x28, 0xb5, 0x2f, 0xfd]),
+        minSize: 8,
+    }),
+    gzip: Object.freeze({
+        algorithm: 'gzip' as const,
+        magicNumber: Object.freeze([0x1f, 0x8b]),
+        minSize: 18,
+    }),
+} satisfies Record<string, CompressionInfo>);
 
 const modules = {
     zstd: () => import('@cloudpss/zstd'),
@@ -18,14 +36,26 @@ function loadLib(algorithm: Exclude<CompressionAlgorithm, 'none'>): ReturnType<(
     return modules[algorithm]();
 }
 
+/** 支持的数据转为 Uint8Array */
+function toUint8Array(data: BinaryData): Uint8Array {
+    if (data == null || typeof data != 'object' || typeof data.byteLength != 'number') {
+        throw new TypeError('Invalid data');
+    }
+    if (ArrayBuffer.isView(data)) {
+        return new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+    }
+    return new Uint8Array(data, 0, data.byteLength);
+}
+
 /** 使用指定算法压缩 */
-export function compress(data: Uint8Array, algorithm: CompressionAlgorithm = 'zstd'): CompressionResult {
+export function compress(data: BinaryData, algorithm: CompressionAlgorithm = 'zstd'): CompressionResult {
+    const d = toUint8Array(data);
     if (algorithm === 'none') {
-        const ret = Promise.resolve(data) as CompressionResult;
+        const ret = Promise.resolve(d) as CompressionResult;
         ret.algorithm = 'none';
         return ret;
     }
-    const ret = loadLib(algorithm).then((lib) => lib.compress(data)) as CompressionResult;
+    const ret = loadLib(algorithm).then((lib) => lib.compress(d)) as CompressionResult;
     ret.algorithm = algorithm;
     return ret;
 }
@@ -34,35 +64,41 @@ export function compress(data: Uint8Array, algorithm: CompressionAlgorithm = 'zs
 export type CompressionResult = Promise<Uint8Array> & { algorithm: CompressionAlgorithm };
 
 /** 探测压缩算法 */
-export function detectCompression(data: Uint8Array): CompressionAlgorithm {
-    for (const key in MAGIC_NUMBERS) {
-        const k = key as keyof typeof MAGIC_NUMBERS;
-        const magicNumber = MAGIC_NUMBERS[k];
-        if (data.length <= magicNumber.length) continue;
+function detectCompressionImpl(data: Uint8Array): CompressionAlgorithm {
+    for (const key in CompressionAlgorithms) {
+        const info = CompressionAlgorithms[key as keyof typeof CompressionAlgorithms];
+        if (data.length < info.minSize) continue;
         let match = true;
-        for (let i = 0; i < magicNumber.length; i++) {
-            if (data[i] !== magicNumber[i]) {
+        for (let i = 0; i < info.magicNumber.length; i++) {
+            if (data[i] !== info.magicNumber[i]) {
                 match = false;
                 break;
             }
         }
-        if (match) return k;
+        if (match) return info.algorithm;
     }
     return 'none';
 }
 
+/** 探测压缩算法 */
+export function detectCompression(data: BinaryData): CompressionAlgorithm {
+    const d = toUint8Array(data);
+    return detectCompressionImpl(d);
+}
+
 /** 探测压缩算法并解压缩 */
-export function decompress(data: Uint8Array): CompressionResult {
-    const algorithm = detectCompression(data);
+export function decompress(data: BinaryData): CompressionResult {
+    const d = toUint8Array(data);
+    const algorithm = detectCompressionImpl(d);
 
     if (algorithm === 'none') {
         // 不是压缩数据
-        const result = Promise.resolve(data) as CompressionResult;
+        const result = Promise.resolve(d) as CompressionResult;
         result.algorithm = 'none';
         return result;
     }
 
-    const result = loadLib(algorithm).then(({ decompress }) => decompress(data)) as CompressionResult;
+    const result = loadLib(algorithm).then(({ decompress }) => decompress(d)) as CompressionResult;
     result.algorithm = algorithm;
     return result;
 }

package/tests/e2e.js

@@ -0,0 +1,132 @@
+import { compress, decompress, detectCompression } from '@cloudpss/compress';
+import { randomFillSync } from 'node:crypto';
+
+describe('compress/decompress', () => {
+    const data = Buffer.from('hello world');
+    it('default', async () => {
+        const compressed = await compress(data);
+        expect(detectCompression(compressed)).toBe('zstd');
+        const decompressing = decompress(compressed);
+        const decompressed = await decompressing;
+        expect(Buffer.compare(decompressed, data)).toBe(0);
+        expect(decompressing.algorithm).toBe('zstd');
+    });
+    it('zstd', async () => {
+        const compressed = await compress(data, 'zstd');
+        expect(detectCompression(compressed)).toBe('zstd');
+        const decompressing = decompress(compressed);
+        const decompressed = await decompressing;
+        expect(Buffer.compare(decompressed, data)).toBe(0);
+        expect(decompressing.algorithm).toBe('zstd');
+    });
+    it('gzip', async () => {
+        const compressed = await compress(data, 'gzip');
+        expect(detectCompression(compressed)).toBe('gzip');
+        const decompressing = decompress(compressed);
+        const decompressed = await decompressing;
+        expect(Buffer.compare(decompressed, data)).toBe(0);
+        expect(decompressing.algorithm).toBe('gzip');
+    });
+    it('none', async () => {
+        const compressed = await compress(data, 'none');
+        expect(detectCompression(compressed)).toBe('none');
+        const decompressing = decompress(compressed);
+        const decompressed = await decompressing;
+        expect(Buffer.compare(compressed, data)).toBe(0);
+        expect(Buffer.compare(decompressed, data)).toBe(0);
+        expect(decompressing.algorithm).toBe('none');
+    });
+});
+
+describe('compress/decompress empty', () => {
+    const data = Buffer.alloc(0);
+    it('default', async () => {
+        const compressed = await compress(data);
+        expect(detectCompression(compressed)).toBe('zstd');
+        const decompressing = decompress(compressed);
+        const decompressed = await decompressing;
+        expect(decompressed.length).toBe(0);
+        expect(decompressing.algorithm).toBe('zstd');
+    });
+    it('zstd', async () => {
+        const compressed = await compress(data, 'zstd');
+        expect(detectCompression(compressed)).toBe('zstd');
+        const decompressing = decompress(compressed);
+        const decompressed = await decompressing;
+        expect(decompressed.length).toBe(0);
+        expect(decompressing.algorithm).toBe('zstd');
+    });
+    it('gzip', async () => {
+        const compressed = await compress(data, 'gzip');
+        expect(detectCompression(compressed)).toBe('gzip');
+        const decompressing = decompress(compressed);
+        const decompressed = await decompressing;
+        expect(decompressed.length).toBe(0);
+        expect(decompressing.algorithm).toBe('gzip');
+    });
+    it('none', async () => {
+        const compressed = await compress(data, 'none');
+        expect(detectCompression(compressed)).toBe('none');
+        const decompressing = decompress(compressed);
+        const decompressed = await decompressing;
+        expect(compressed.length).toBe(0);
+        expect(decompressed.length).toBe(0);
+        expect(decompressing.algorithm).toBe('none');
+    });
+});
+
+describe(`other data types`, () => {
+    it('ArrayBuffer', async () => {
+        const data = new ArrayBuffer(10);
+        randomFillSync(Buffer.from(data), 0, 10);
+        const compressed = await compress(data);
+        const decompressing = decompress(compressed);
+        const decompressed = await decompressing;
+        expect(Buffer.compare(decompressed, Buffer.from(data))).toBe(0);
+        expect(decompressing.algorithm).toBe('zstd');
+    });
+
+    it(`DataView`, async () => {
+        const data = new ArrayBuffer(10);
+        randomFillSync(Buffer.from(data), 0, 10);
+        const compressed = await compress(new DataView(data));
+        const decompressing = decompress(compressed);
+        const decompressed = await decompressing;
+        expect(Buffer.compare(decompressed, Buffer.from(data))).toBe(0);
+        expect(decompressing.algorithm).toBe('zstd');
+    });
+});
+
+describe('rejects bad input', () => {
+    it('compress', () => {
+        // @ts-expect-error test
+        expect(() => compress(123)).toThrow();
+        // @ts-expect-error test
+        expect(() => compress([1, 2, 3])).toThrow();
+        // @ts-expect-error test
+        expect(() => compress(Buffer.alloc(10), 'xxx')).toThrow();
+    });
+    it('decompress', () => {
+        // @ts-expect-error test
+        expect(() => decompress(123)).toThrow();
+    });
+});
+
+describe('detectCompression', () => {
+    it('detects zstd', () => {
+        const compressed = Buffer.from('28b52ffd00000000', 'hex');
+        expect(detectCompression(compressed)).toBe('zstd');
+    });
+    it('detects gzip', () => {
+        const compressed = Buffer.from('1f8b08000000000000000000000000000000', 'hex');
+        expect(detectCompression(compressed)).toBe('gzip');
+    });
+    it('detects none', () => {
+        const compressed = Buffer.from('00000000000000000000', 'hex');
+        expect(detectCompression(compressed)).toBe('none');
+        const compressed2 = Buffer.from('28b52ffd000000', 'hex');
+        expect(detectCompression(compressed2)).toBe('none');
+        const compressed3 = Buffer.from('1f8b080000000000000000000000000000', 'hex');
+        expect(detectCompression(compressed3)).toBe('none');
+    });
+});

package/tests/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig",
+  "include": ["./"],
+  "compilerOptions": {
+    "checkJs": true,
+    "noEmit": true,
+    "rootDir": "."
+  }
+}

package/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig",
+  "include": ["./src/"],
+  "compilerOptions": {
+    "outDir": "./dist"
+  }
+}