@cloudpss/compress 0.3.0-alpha.14 → 0.3.0-alpha.22

package/README.md

@@ -6,10 +6,11 @@ Be carful when handling binary files since their data might be confusing with ma
 
 ## Algorithms
 
-| Algorithm | Magic number                                | Filename extension | Mime type        |
-| --------- | ------------------------------------------- | ------------------ | ---------------- |
-| gzip      | `␟ (\x1F)` `� (\x8B)`                       | .gz                | application/gzip |
-| Zstandard | `( (\x28)` `� (\xB5)` `/ (\x2F)` `� (\xFD)` | .zst               | application/zstd |
+| Algorithm               | Magic number                                | Filename extension | Mime type          |
+| ----------------------- | ------------------------------------------- | ------------------ | ------------------ |
+| gzip                    | `␟ (\x1F)` `� (\x8B)`                       | .gz                | application/gzip   |
+| Zstandard               | `( (\x28)` `� (\xB5)` `/ (\x2F)` `� (\xFD)` | .zst               | application/zstd   |
+| brotli (benchmark only) | None (any data might be brotli)             | .br                | application/brotli |
 
 ## Benchmarks
 
@@ -18,14 +19,31 @@ Be carful when handling binary files since their data might be confusing with ma
 yarn run v1.22.15
 $ node ./benchmark
 File: 四川-PSS独立-直流等值机_Main.cproj        Raw: 12.1 MiB
-  gzip(wasm):   13.03(953 kiB)  363.24ms        191.96ms
-  gzip(node):   12.65(981 kiB)  112.65ms        16.88ms
-  gzip(pako):   12.65(981 kiB)  386.88ms        125.07ms
-  zstd(wasm):   17.40(713 kiB)  49.05ms         23.30ms
+  gzip -d (wasm):       13.03(953 kiB)  371.84ms        193.38ms
+  gzip -d (node):       12.65(981 kiB)  115.73ms        17.17ms
+  gzip -d (pako):       12.65(981 kiB)  381.96ms        113.91ms
+  zstd -4 (node):       17.37(714 kiB)  25.31ms         15.97ms
+  zstd -3 (Oz,wasm):    17.40(713 kiB)  53.01ms         24.49ms
+  zstd -3 (O3,wasm):    17.40(713 kiB)  30.39ms         16.01ms
+  br -3 (node):         18.32(677 kiB)  49.92ms         18.48ms
+  br -1 (wasm):         3.90(3.11 MiB)  450.04ms        171.55ms
+File: 电磁暂态方案 1_参数方案 1 (2).cjob        Raw: 8.76 MiB
+  gzip -d (wasm):       3.69(2.37 MiB)  661.18ms        182.66ms
+  gzip -d (node):       3.68(2.38 MiB)  197.01ms        18.04ms
+  gzip -d (pako):       3.68(2.38 MiB)  456.53ms        101.31ms
+  zstd -4 (node):       3.45(2.54 MiB)  66.06ms         15.66ms
+  zstd -3 (Oz,wasm):    3.47(2.52 MiB)  119.57ms        36.27ms
+  zstd -3 (O3,wasm):    3.47(2.52 MiB)  66.22ms         18.07ms
+  br -3 (node):         3.63(2.41 MiB)  84.41ms         24.57ms
+  br -1 (wasm):         2.92(3 MiB)     396.91ms        168.17ms
 File: 电磁暂态方案 1_参数方案 1.cjob    Raw: 24.1 MiB
-  gzip(wasm):   4.18(5.77 MiB)  1298.46ms       464.68ms
-  gzip(node):   4.17(5.79 MiB)  257.35ms        47.90ms
-  gzip(pako):   4.17(5.79 MiB)  720.57ms        173.34ms
-  zstd(wasm):   4.26(5.65 MiB)  227.07ms        59.85ms
-Done in 5.20s.
+  gzip -d (wasm):       4.18(5.77 MiB)  1314.32ms       455.43ms
+  gzip -d (node):       4.17(5.79 MiB)  254.84ms        47.28ms
+  gzip -d (pako):       4.17(5.79 MiB)  793.62ms        204.64ms
+  zstd -4 (node):       4.29(5.62 MiB)  232.69ms        38.53ms
+  zstd -3 (Oz,wasm):    4.26(5.65 MiB)  230.65ms        60.13ms
+  zstd -3 (O3,wasm):    4.26(5.65 MiB)  155.36ms        29.62ms
+  br -3 (node):         4.25(5.67 MiB)  167.06ms        52.79ms
+  br -1 (wasm):         3.05(7.91 MiB)  981.26ms        391.41ms
+Done in 11.43s.
 ```

package/benchmark.js

@@ -0,0 +1,62 @@
+import prettyBytes from 'pretty-bytes';
+import wasmFlate from 'wasm-flate';
+import zlib from 'zlib';
+import zstd from '@bokuweb/zstd-wasm';
+import * as myZstd from './dist/zstd/index-browser.js';
+import cppzst from '@xingrz/cppzst';
+import pako from 'pako';
+import brotli from 'brotli-wasm';
+import files from '../../benchmark-files/index.js';
+
+const pb = (size) => prettyBytes(size, { binary: true });
+const t = (time) => time.toFixed(2) + 'ms';
+
+/* eslint-disable no-console */
+(async function () {
+    await zstd.init();
+
+    function createTest(name, compressor, decompressor) {
+        function fn(data) {
+            let start = performance.now();
+            const compressed = compressor(data);
+            const compressTime = performance.now() - start;
+            start = performance.now();
+            const decompressed = decompressor(compressed);
+            const decompressTime = performance.now() - start;
+            console.assert(data.equals(decompressed), name, `unmatched`);
+            return { compressed, compressTime, decompressTime };
+        }
+        Object.defineProperty(fn, 'name', { value: name });
+        return fn;
+    }
+    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('zstd -4 (node)', (buf) => cppzst.compressSync(buf, { level: 4 }), cppzst.decompressSync),
+        createTest('zstd -3 (Oz,wasm)', (buf) => zstd.compress(buf, 3), zstd.decompress),
+        createTest('zstd -3 (O3,wasm)', (buf) => myZstd.compress(buf, 3), myZstd.decompress),
+        createTest(
+            'br -3 (node)',
+            (buf) =>
+                zlib.brotliCompressSync(buf, {
+                    params: { [zlib.constants.BROTLI_PARAM_QUALITY]: 3 },
+                }),
+            zlib.brotliDecompressSync,
+        ),
+        createTest('br -1 (wasm)', (buf) => brotli.compress(buf, { quality: 1 }), brotli.decompress),
+    ];
+    for await (const { file, data } of files()) {
+        console.log(`File: ${file} \tRaw: ${pb(data.length)}`);
+        for (const test of tests) {
+            const result = test(data);
+            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,
+                )}`,
+            );
+        }
+    }
+})();

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

@@ -0,0 +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"}

package/dist/gzip/index.js.map

@@ -0,0 +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,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAC7E,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,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAC7E,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/{cjs/index.d.ts → index.d.ts}

@@ -11,6 +11,8 @@ export declare function compress(data: Uint8Array, algorithm?: Algorithm): Promi
 declare type DecompressResult = Promise<Uint8Array> & {
     algorithm: Algorithm;
 };
+/** 探测压缩算法 */
+export declare function detectCompression(data: Uint8Array): Algorithm;
 /** 探测压缩算法并解压缩 */
 export declare function decompress(data: Uint8Array): DecompressResult;
 export {};

package/dist/index.js

@@ -0,0 +1,55 @@
+/** 压缩算法的魔数 */
+export const MAGIC_NUMBERS = {
+    zstd: [0x28, 0xb5, 0x2f, 0xfd],
+    gzip: [0x1f, 0x8b],
+};
+const modules = {
+    zstd: () => import('./zstd/index.js'),
+    gzip: () => import('./gzip/index.js'),
+};
+/** 加载相关库 */
+function loadLib(algorithm) {
+    if (!(algorithm in modules))
+        throw new Error();
+    return modules[algorithm]();
+}
+/** 使用指定算法压缩 */
+export async function compress(data, algorithm = 'zstd') {
+    if (algorithm === 'none')
+        return data;
+    const lib = await loadLib(algorithm);
+    return await lib.compress(data);
+}
+/** 探测压缩算法 */
+export function detectCompression(data) {
+    for (const key in MAGIC_NUMBERS) {
+        const k = key;
+        const magicNumber = MAGIC_NUMBERS[k];
+        if (data.length <= magicNumber.length)
+            continue;
+        let match = true;
+        for (let i = 0; i < magicNumber.length; i++) {
+            if (data[i] !== magicNumber[i]) {
+                match = false;
+                break;
+            }
+        }
+        if (match)
+            return k;
+    }
+    return 'none';
+}
+/** 探测压缩算法并解压缩 */
+export function decompress(data) {
+    const algorithm = detectCompression(data);
+    if (algorithm === 'none') {
+        // 不是压缩数据
+        const result = Promise.resolve(data);
+        result.algorithm = 'none';
+        return result;
+    }
+    const result = loadLib(algorithm).then(({ decompress }) => decompress(data));
+    result.algorithm = algorithm;
+    return result;
+}
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +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,iBAAiB,CAAC;IACrC,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC;CACxC,CAAC;AAEF,YAAY;AACZ,SAAS,OAAO,CAAC,SAAoB;IACjC,IAAI,CAAC,CAAC,SAAS,IAAI,OAAO,CAAC;QAAE,MAAM,IAAI,KAAK,EAAE,CAAC;IAC/C,OAAO,OAAO,CAAC,SAAiC,CAAC,EAAE,CAAC;AACxD,CAAC;AAED,eAAe;AACf,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,IAAgB,EAAE,YAAuB,MAAM;IAC1E,IAAI,SAAS,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACtC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC;IACrC,OAAO,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACpC,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,CAAqB,CAAC;QACzD,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,CAAqB,CAAC;IACjG,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,OAAO,MAAM,CAAC;AAClB,CAAC"}

package/dist/zstd/index-browser.d.ts

@@ -0,0 +1,2 @@
+export { decompress } from './wasm/decompress.js';
+export { compress } from './wasm/compress.js';

package/dist/zstd/index-browser.js

@@ -0,0 +1,3 @@
+export { decompress } from './wasm/decompress.js';
+export { compress } from './wasm/compress.js';
+//# sourceMappingURL=index-browser.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index-browser.js","sourceRoot":"","sources":["../../src/zstd/index-browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC"}

package/dist/zstd/index.js

@@ -0,0 +1,14 @@
+import { compress as c, decompress as d } from '@xingrz/cppzst';
+/** 压缩 */
+export async function compress(data) {
+    const buf = Buffer.from(data.buffer, data.byteOffset, data.length);
+    const result = await c(buf, { level: 4 });
+    return new Uint8Array(result.buffer, result.byteOffset, result.length);
+}
+/** 解压 */
+export async function decompress(data) {
+    const buf = Buffer.from(data.buffer, data.byteOffset, data.length);
+    const result = await d(buf);
+    return new Uint8Array(result.buffer, result.byteOffset, result.length);
+}
+//# sourceMappingURL=index.js.map

package/dist/zstd/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/zstd/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,CAAC,EAAE,UAAU,IAAI,CAAC,EAAE,MAAM,gBAAgB,CAAC;AAEhE,SAAS;AACT,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,IAAgB;IAC3C,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IAC1C,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAC3E,CAAC;AAED,SAAS;AACT,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAgB;IAC7C,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;IAC5B,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAC3E,CAAC"}

package/dist/zstd/wasm/compress.d.ts

@@ -0,0 +1,2 @@
+/** 压缩 */
+export declare function compress(buf: Uint8Array, level?: number): Uint8Array;

package/dist/zstd/wasm/compress.js

@@ -0,0 +1,28 @@
+import { Module } from './module.js';
+/** 压缩 */
+export function compress(buf, level = 3) {
+    const bound = Module._ZSTD_compressBound(buf.byteLength);
+    const compressed = Module._malloc(bound);
+    const src = Module._malloc(buf.byteLength);
+    Module.HEAPU8.set(buf, src);
+    try {
+        /*
+      @See https://zstd.docsforge.com/dev/api/ZSTD_compress/
+      size_t ZSTD_compress( void* dst, size_t dstCapacity, const void* src, size_t srcSize, int compressionLevel);
+      Compresses `src` content as a single zstd compressed frame into already allocated `dst`.
+      Hint : compression runs faster if `dstCapacity` >=  `ZSTD_compressBound(srcSize)`.
+      @return : compressed size written into `dst` (<= `dstCapacity),
+                or an error code if it fails (which can be tested using ZSTD_isError()).
+    */
+        const sizeOrError = Module._ZSTD_compress(compressed, bound, src, buf.byteLength, level);
+        if (Module._ZSTD_isError(sizeOrError)) {
+            throw new Error(`Failed to compress with code ${sizeOrError}`);
+        }
+        return new Uint8Array(Module.HEAPU8.buffer, compressed, sizeOrError).slice();
+    }
+    finally {
+        Module._free(compressed);
+        Module._free(src);
+    }
+}
+//# sourceMappingURL=compress.js.map

package/dist/zstd/wasm/compress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compress.js","sourceRoot":"","sources":["../../../src/zstd/wasm/compress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,SAAS;AACT,MAAM,UAAU,QAAQ,CAAC,GAAe,EAAE,KAAK,GAAG,CAAC;IAC/C,MAAM,KAAK,GAAG,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC3C,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI;QACA;;;;;;;MAOF;QACE,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACzF,IAAI,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,gCAAgC,WAAW,EAAE,CAAC,CAAC;SAClE;QACD,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC,KAAK,EAAE,CAAC;KAChF;YAAS;QACN,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACzB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KACrB;AACL,CAAC"}

package/dist/zstd/wasm/decompress.d.ts

@@ -0,0 +1,6 @@
+/** DecompressOption */
+export declare type DecompressOption = {
+    defaultHeapSize: number;
+};
+/** 解压 */
+export declare function decompress(buf: Uint8Array, opts?: DecompressOption): Uint8Array;

package/dist/zstd/wasm/decompress.js

@@ -0,0 +1,30 @@
+import { Module } from './module.js';
+/** 解压 */
+export function decompress(buf, opts = { defaultHeapSize: 1024 * 1024 }) {
+    const src = Module._malloc(buf.byteLength);
+    Module.HEAP8.set(buf, src);
+    const contentSize = Module._ZSTD_getFrameContentSize(src, buf.byteLength);
+    const size = contentSize === -1 ? opts.defaultHeapSize ?? 1024 * 1024 : contentSize;
+    const heap = Module._malloc(size);
+    try {
+        /*
+      @See https://zstd.docsforge.com/dev/api/ZSTD_decompress/
+      compressedSize : must be the exact size of some number of compressed and/or skippable frames.
+      dstCapacity is an upper bound of originalSize to regenerate.
+      If user cannot imply a maximum upper bound, it's better to use streaming mode to decompress data.
+      @return: the number of bytes decompressed into dst (<= dstCapacity), or an errorCode if it fails (which can be tested using ZSTD_isError()).
+    */
+        const sizeOrError = Module._ZSTD_decompress(heap, size, src, buf.byteLength);
+        if (Module._ZSTD_isError(sizeOrError)) {
+            throw new Error(`Failed to compress with code ${sizeOrError}`);
+        }
+        // Copy buffer
+        // Uint8Array.prototype.slice() return copied buffer.
+        return new Uint8Array(Module.HEAPU8.buffer, heap, sizeOrError).slice();
+    }
+    finally {
+        Module._free(heap);
+        Module._free(src);
+    }
+}
+//# sourceMappingURL=decompress.js.map

package/dist/zstd/wasm/decompress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"decompress.js","sourceRoot":"","sources":["../../../src/zstd/wasm/decompress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAOrC,SAAS;AACT,MAAM,UAAU,UAAU,CACtB,GAAe,EACf,OAAyB,EAAE,eAAe,EAAE,IAAI,GAAG,IAAI,EAAE;IAEzD,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC3C,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3B,MAAM,WAAW,GAAG,MAAM,CAAC,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;IAC1E,MAAM,IAAI,GAAG,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,IAAI,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IACpF,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI;QACA;;;;;;MAMF;QACE,MAAM,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;QAC7E,IAAI,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,gCAAgC,WAAW,EAAE,CAAC,CAAC;SAClE;QACD,cAAc;QACd,qDAAqD;QACrD,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,KAAK,EAAE,CAAC;KAC1E;YAAS;QACN,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACnB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KACrB;AACL,CAAC"}

package/dist/zstd/wasm/module.d.ts

@@ -0,0 +1,2 @@
+declare const Module: import("../../../wasm/zstd.g.js").Module;
+export { Module };

package/dist/zstd/wasm/module.js

@@ -0,0 +1,4 @@
+import createModule from '../../../wasm/zstd.g.js';
+const Module = await createModule();
+export { Module };
+//# sourceMappingURL=module.js.map

package/dist/zstd/wasm/module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/zstd/wasm/module.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,yBAAyB,CAAC;AAEnD,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,CAAC"}

package/package.json

@@ -1,38 +1,38 @@
 {
   "name": "@cloudpss/compress",
-  "version": "0.3.0-alpha.14",
+  "version": "0.3.0-alpha.22",
   "author": "CloudPSS",
   "license": "MIT",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/esm/index.d.ts",
+  "type": "module",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
   "exports": {
-    "types": "./dist/esm/index.d.ts",
-    "require": "./dist/cjs/index.js",
-    "import": "./dist/esm/index.js"
+    "types": "./dist/index.d.ts",
+    "default": "./dist/index.js"
   },
   "browser": {
-    "./dist/esm/gzip/index.js": "./dist/esm/gzip/index-browser.js",
-    "./dist/cjs/gzip/index.js": "./dist/cjs/gzip/index-browser.js"
+    "./dist/gzip/index.js": "./dist/gzip/index-browser.js",
+    "./dist/zstd/index.js": "./dist/zstd/index-browser.js"
   },
   "scripts": {
-    "postinstall": "pwsh ./update-zstd.ps1",
     "start": "yarn clean && tsc --watch",
-    "build": "yarn clean && yarn build:cjs && yarn build:esm",
+    "build": "yarn clean && tsc",
     "prepublishOnly": "yarn build",
-    "build:cjs": "tsc",
-    "build:esm": "tsc --outDir dist/esm --module ESNext",
     "clean": "rimraf dist",
     "benchmark": "node ./benchmark"
   },
   "dependencies": {
+    "@xingrz/cppzst": "^2.1.0-alpha.6",
     "pako": "^2.0.4"
   },
   "devDependencies": {
     "@bokuweb/zstd-wasm": "^0.0.14",
     "@types/node": "^16.11.6",
     "@types/pako": "^1.0.2",
+    "brotli-wasm": "^1.1.0",
     "pretty-bytes": "^5.6.0",
+    "type-fest": "^2.5.2",
     "wasm-flate": "1.0.2"
   }
 }

package/src/index.ts

@@ -8,39 +8,56 @@ export const MAGIC_NUMBERS = {
 };
 
 const modules = {
-    zstd: () => import('./zstd'),
-    gzip: () => import('./gzip'),
+    zstd: () => import('./zstd/index.js'),
+    gzip: () => import('./gzip/index.js'),
 };
 
+/** 加载相关库 */
+function loadLib(algorithm: Algorithm): ReturnType<typeof modules[keyof typeof modules]> {
+    if (!(algorithm in modules)) throw new Error();
+    return modules[algorithm as keyof typeof modules]();
+}
+
 /** 使用指定算法压缩 */
 export async function compress(data: Uint8Array, algorithm: Algorithm = 'zstd'): Promise<Uint8Array> {
     if (algorithm === 'none') return data;
-    const lib = await modules[algorithm]();
+    const lib = await loadLib(algorithm);
     return await lib.compress(data);
 }
 
 /** 解压缩结果 */
 type DecompressResult = Promise<Uint8Array> & { algorithm: Algorithm };
 
-/** 探测压缩算法并解压缩 */
-export function decompress(data: Uint8Array): DecompressResult {
-    let result: DecompressResult | undefined;
+/** 探测压缩算法 */
+export function detectCompression(data: Uint8Array): Algorithm {
     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;
+        let match = true;
         for (let i = 0; i < magicNumber.length; i++) {
-            if (data[i] !== magicNumber[i]) continue;
+            if (data[i] !== magicNumber[i]) {
+                match = false;
+                break;
+            }
         }
-        // 确定压缩类型
-        result = modules[k]().then(({ decompress }) => decompress(data)) as DecompressResult;
-        result.algorithm = k;
-        break;
+        if (match) return k;
     }
-    if (result == null) {
+    return 'none';
+}
+
+/** 探测压缩算法并解压缩 */
+export function decompress(data: Uint8Array): DecompressResult {
+    const algorithm = detectCompression(data);
+
+    if (algorithm === 'none') {
         // 不是压缩数据
-        result = Promise.resolve(data) as DecompressResult;
+        const result = Promise.resolve(data) as DecompressResult;
         result.algorithm = 'none';
+        return result;
     }
+
+    const result = loadLib(algorithm).then(({ decompress }) => decompress(data)) as DecompressResult;
+    result.algorithm = algorithm;
     return result;
 }

package/src/zstd/index-browser.ts

@@ -0,0 +1,2 @@
+export { decompress } from './wasm/decompress.js';
+export { compress } from './wasm/compress.js';

package/src/zstd/index.ts

@@ -1,26 +1,15 @@
-import { decompress as d } from './lib/simple/decompress';
-import { compress as c } from './lib/simple/compress';
-import { Module, waitInitialized } from './lib/module';
-import { data } from './lib/wasm/zstd.wasm.js';
-
-let wasm;
-if (typeof Buffer !== 'undefined') {
-    wasm = Buffer.from(data, 'base64');
-} else {
-    wasm = 'data:application/wasm;base64,' + data;
-}
-
-(Module as { init: (wasm: string | Uint8Array) => void }).init(wasm);
-const init = waitInitialized();
+import { compress as c, decompress as d } from '@xingrz/cppzst';
 
 /** 压缩 */
 export async function compress(data: Uint8Array): Promise<Uint8Array> {
-    await init;
-    return c(data);
+    const buf = Buffer.from(data.buffer, data.byteOffset, data.length);
+    const result = await c(buf, { level: 4 });
+    return new Uint8Array(result.buffer, result.byteOffset, result.length);
 }
 
 /** 解压 */
 export async function decompress(data: Uint8Array): Promise<Uint8Array> {
-    await init;
-    return d(data) as Uint8Array;
+    const buf = Buffer.from(data.buffer, data.byteOffset, data.length);
+    const result = await d(buf);
+    return new Uint8Array(result.buffer, result.byteOffset, result.length);
 }

package/src/zstd/wasm/compress.ts

@@ -0,0 +1,27 @@
+import { Module } from './module.js';
+
+/** 压缩 */
+export function compress(buf: Uint8Array, level = 3): Uint8Array {
+    const bound = Module._ZSTD_compressBound(buf.byteLength);
+    const compressed = Module._malloc(bound);
+    const src = Module._malloc(buf.byteLength);
+    Module.HEAPU8.set(buf, src);
+    try {
+        /*
+      @See https://zstd.docsforge.com/dev/api/ZSTD_compress/
+      size_t ZSTD_compress( void* dst, size_t dstCapacity, const void* src, size_t srcSize, int compressionLevel);
+      Compresses `src` content as a single zstd compressed frame into already allocated `dst`.
+      Hint : compression runs faster if `dstCapacity` >=  `ZSTD_compressBound(srcSize)`.
+      @return : compressed size written into `dst` (<= `dstCapacity),
+                or an error code if it fails (which can be tested using ZSTD_isError()).
+    */
+        const sizeOrError = Module._ZSTD_compress(compressed, bound, src, buf.byteLength, level);
+        if (Module._ZSTD_isError(sizeOrError)) {
+            throw new Error(`Failed to compress with code ${sizeOrError}`);
+        }
+        return new Uint8Array(Module.HEAPU8.buffer, compressed, sizeOrError).slice();
+    } finally {
+        Module._free(compressed);
+        Module._free(src);
+    }
+}

package/src/zstd/wasm/decompress.ts

@@ -0,0 +1,37 @@
+import { Module } from './module.js';
+
+/** DecompressOption */
+export type DecompressOption = {
+    defaultHeapSize: number;
+};
+
+/** 解压 */
+export function decompress(
+    buf: Uint8Array,
+    opts: DecompressOption = { defaultHeapSize: 1024 * 1024 }, // Use 1MB on default if it is failed to get content size.
+): Uint8Array {
+    const src = Module._malloc(buf.byteLength);
+    Module.HEAP8.set(buf, src);
+    const contentSize = Module._ZSTD_getFrameContentSize(src, buf.byteLength);
+    const size = contentSize === -1 ? opts.defaultHeapSize ?? 1024 * 1024 : contentSize;
+    const heap = Module._malloc(size);
+    try {
+        /*
+      @See https://zstd.docsforge.com/dev/api/ZSTD_decompress/
+      compressedSize : must be the exact size of some number of compressed and/or skippable frames.
+      dstCapacity is an upper bound of originalSize to regenerate.
+      If user cannot imply a maximum upper bound, it's better to use streaming mode to decompress data.
+      @return: the number of bytes decompressed into dst (<= dstCapacity), or an errorCode if it fails (which can be tested using ZSTD_isError()).
+    */
+        const sizeOrError = Module._ZSTD_decompress(heap, size, src, buf.byteLength);
+        if (Module._ZSTD_isError(sizeOrError)) {
+            throw new Error(`Failed to compress with code ${sizeOrError}`);
+        }
+        // Copy buffer
+        // Uint8Array.prototype.slice() return copied buffer.
+        return new Uint8Array(Module.HEAPU8.buffer, heap, sizeOrError).slice();
+    } finally {
+        Module._free(heap);
+        Module._free(src);
+    }
+}

package/src/zstd/wasm/module.ts

@@ -0,0 +1,5 @@
+import createModule from '../../../wasm/zstd.g.js';
+
+const Module = await createModule();
+
+export { Module };

package/tsconfig.json

@@ -2,7 +2,6 @@
   "extends": "../../tsconfig",
   "include": ["./src/"],
   "compilerOptions": {
-    "outDir": "./dist/cjs",
-    "allowJs": true
+    "outDir": "./dist"
   }
 }

package/wasm/zstd.g.d.ts

@@ -0,0 +1,16 @@
+/* eslint-disable jsdoc/require-jsdoc */
+import { Opaque } from 'type-fest';
+type Ptr = Opaque<number, 'void*'>;
+type Module = {
+    readonly HEAP8: Int8Array;
+    readonly HEAPU8: Uint8Array;
+
+    _ZSTD_isError(code: number): number;
+    _ZSTD_compressBound(size: number): number;
+    _ZSTD_compress(outPtr: number, outSize: number, inPtr: number, inSize: number, level: number): number;
+    _ZSTD_getFrameContentSize(src: number, size: number): number;
+    _ZSTD_decompress(outPtr: number, outSize: number, inPtr: number, inSize: number): number;
+    _malloc(size: number): Ptr;
+    _free(ptr: Ptr): void;
+};
+export default function createModule(): Promise<Module>;