@naturalcycles/nodejs-lib 15.66.0 → 15.67.1

package/dist/zip/zip.util.d.ts

@@ -1,4 +1,10 @@
 import type { ZlibOptions, ZstdOptions } from 'node:zlib';
+export declare function decompressZstdOrInflateToString(buf: Buffer): Promise<string>;
+/**
+ * Detects if Buffer is zstd-compressed.
+ * Otherwise attempts to Inflate.
+ */
+export declare function decompressZstdOrInflate(buf: Buffer): Promise<Buffer<ArrayBuffer>>;
 /**
  * deflateBuffer uses `deflate`.
  * It's 9 bytes shorter than `gzip`.
@@ -26,3 +32,5 @@ export declare function gunzipToString(buf: Buffer, options?: ZlibOptions): Prom
 export declare function zstdCompress(input: Buffer | string, options?: ZstdOptions): Promise<Buffer<ArrayBuffer>>;
 export declare function zstdDecompressToString(input: Buffer, options?: ZstdOptions): Promise<string>;
 export declare function zstdDecompress(input: Buffer, options?: ZstdOptions): Promise<Buffer<ArrayBuffer>>;
+export declare function isZstdBuffer(input: Buffer): boolean;
+export declare function isGzipBuffer(input: Buffer): boolean;

package/dist/zip/zip.util.js

@@ -6,6 +6,19 @@ const gzip = promisify(zlib.gzip.bind(zlib));
 const gunzip = promisify(zlib.gunzip.bind(zlib));
 const zstdCompressAsync = promisify(zlib.zstdCompress.bind(zlib));
 const zstdDecompressAsync = promisify(zlib.zstdDecompress.bind(zlib));
+export async function decompressZstdOrInflateToString(buf) {
+    return (await decompressZstdOrInflate(buf)).toString();
+}
+/**
+ * Detects if Buffer is zstd-compressed.
+ * Otherwise attempts to Inflate.
+ */
+export async function decompressZstdOrInflate(buf) {
+    if (isZstdBuffer(buf)) {
+        return await zstdDecompressAsync(buf);
+    }
+    return await inflate(buf);
+}
 /**
  * deflateBuffer uses `deflate`.
  * It's 9 bytes shorter than `gzip`.
@@ -21,7 +34,7 @@ export async function inflateBuffer(buf, options = {}) {
  * It's 9 bytes shorter than `gzip`.
  */
 export async function deflateString(s, options) {
-    return await deflateBuffer(Buffer.from(s), options);
+    return await deflate(s, options);
 }
 export async function inflateToString(buf, options) {
     return (await inflateBuffer(buf, options)).toString();
@@ -41,7 +54,7 @@ export async function gunzipBuffer(buf, options = {}) {
  * It's 9 bytes longer than `deflate`.
  */
 export async function gzipString(s, options) {
-    return await gzipBuffer(Buffer.from(s), options);
+    return await gzip(s, options);
 }
 export async function gunzipToString(buf, options) {
     return (await gunzipBuffer(buf, options)).toString();
@@ -55,3 +68,10 @@ export async function zstdDecompressToString(input, options = {}) {
 export async function zstdDecompress(input, options = {}) {
     return await zstdDecompressAsync(input, options);
 }
+const ZSTD_MAGIC_NUMBER = 0xfd2fb528;
+export function isZstdBuffer(input) {
+    return input.readUInt32LE(0) === ZSTD_MAGIC_NUMBER;
+}
+export function isGzipBuffer(input) {
+    return input[0] === 0x1f && input[1] === 0x8b;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.66.0",
+  "version": "15.67.1",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",

package/src/zip/zip.util.ts

@@ -9,6 +9,21 @@ const gunzip = promisify(zlib.gunzip.bind(zlib))
 const zstdCompressAsync = promisify(zlib.zstdCompress.bind(zlib))
 const zstdDecompressAsync = promisify(zlib.zstdDecompress.bind(zlib))
 
+export async function decompressZstdOrInflateToString(buf: Buffer): Promise<string> {
+  return (await decompressZstdOrInflate(buf)).toString()
+}
+
+/**
+ * Detects if Buffer is zstd-compressed.
+ * Otherwise attempts to Inflate.
+ */
+export async function decompressZstdOrInflate(buf: Buffer): Promise<Buffer<ArrayBuffer>> {
+  if (isZstdBuffer(buf)) {
+    return await zstdDecompressAsync(buf)
+  }
+  return await inflate(buf)
+}
+
 /**
  * deflateBuffer uses `deflate`.
  * It's 9 bytes shorter than `gzip`.
@@ -35,7 +50,7 @@ export async function deflateString(
   s: string,
   options?: ZlibOptions,
 ): Promise<Buffer<ArrayBuffer>> {
-  return await deflateBuffer(Buffer.from(s), options)
+  return await deflate(s, options)
 }
 
 export async function inflateToString(buf: Buffer, options?: ZlibOptions): Promise<string> {
@@ -65,7 +80,7 @@ export async function gunzipBuffer(
  * It's 9 bytes longer than `deflate`.
  */
 export async function gzipString(s: string, options?: ZlibOptions): Promise<Buffer<ArrayBuffer>> {
-  return await gzipBuffer(Buffer.from(s), options)
+  return await gzip(s, options)
 }
 
 export async function gunzipToString(buf: Buffer, options?: ZlibOptions): Promise<string> {
@@ -92,3 +107,13 @@ export async function zstdDecompress(
 ): Promise<Buffer<ArrayBuffer>> {
   return await zstdDecompressAsync(input, options)
 }
+
+const ZSTD_MAGIC_NUMBER = 0xfd2fb528
+
+export function isZstdBuffer(input: Buffer): boolean {
+  return input.readUInt32LE(0) === ZSTD_MAGIC_NUMBER
+}
+
+export function isGzipBuffer(input: Buffer): boolean {
+  return input[0] === 0x1f && input[1] === 0x8b
+}