zlib-streams 1.0.3 → 1.0.5

package/Makefile

@@ -129,7 +129,7 @@ ci:
 # -----------------------------------------------------------------------------
 EMCC ?= emsdk/upstream/emscripten/emcc
 
-WASM_SRCS = src/wasm/inflate9_stream_wasm.c src/wasm/inflate_stream_wasm.c src/wasm/deflate_stream_wasm.c src/wasm/allocator.c src/inflate9.c \
+WASM_SRCS = src/wasm/inflate9_stream_wasm.c src/wasm/inflate_stream_wasm.c src/wasm/deflate_stream_wasm.c src/wasm/wasm_stream_common.c src/wasm/allocator.c src/inflate9.c \
 	src/zlib/contrib/infback9/inftree9.c \
 	src/zlib/inffast.c src/zlib/inflate.c src/zlib/inftrees.c src/zlib/zutil.c \
 	src/zlib/crc32.c src/zlib/adler32.c src/zlib/trees.c src/zlib/deflate.c

package/build/debug/src/inflate9.d

@@ -0,0 +1,9 @@
+build/debug/src/inflate9.o: src/inflate9.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/contrib/infback9/inftree9.h \
+  src/zlib/inflate.h src/zlib/inffixed.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/contrib/infback9/inftree9.h:
+src/zlib/inflate.h:
+src/zlib/inffixed.h:

package/build/debug/src/zlib/adler32.d

@@ -0,0 +1,5 @@
+build/debug/src/zlib/adler32.o: src/zlib/adler32.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:

package/build/debug/src/zlib/contrib/infback9/infback9.d

@@ -0,0 +1,13 @@
+build/debug/src/zlib/contrib/infback9/infback9.o: \
+  src/zlib/contrib/infback9/infback9.c src/zlib/zutil.h src/zlib/zlib.h \
+  src/zlib/zconf.h src/zlib/contrib/infback9/infback9.h \
+  src/zlib/contrib/infback9/inftree9.h \
+  src/zlib/contrib/infback9/inflate9.h \
+  src/zlib/contrib/infback9/inffix9.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/contrib/infback9/infback9.h:
+src/zlib/contrib/infback9/inftree9.h:
+src/zlib/contrib/infback9/inflate9.h:
+src/zlib/contrib/infback9/inffix9.h:

package/build/debug/src/zlib/contrib/infback9/inftree9.d

@@ -0,0 +1,7 @@
+build/debug/src/zlib/contrib/infback9/inftree9.o: \
+  src/zlib/contrib/infback9/inftree9.c src/zlib/zutil.h src/zlib/zlib.h \
+  src/zlib/zconf.h src/zlib/contrib/infback9/inftree9.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/contrib/infback9/inftree9.h:

package/build/debug/src/zlib/crc32.d

@@ -0,0 +1,6 @@
+build/debug/src/zlib/crc32.o: src/zlib/crc32.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/crc32.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/crc32.h:

package/build/debug/src/zlib/infback.d

@@ -0,0 +1,10 @@
+build/debug/src/zlib/infback.o: src/zlib/infback.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h \
+  src/zlib/inflate.h src/zlib/inffast.h src/zlib/inffixed.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:
+src/zlib/inflate.h:
+src/zlib/inffast.h:
+src/zlib/inffixed.h:

package/build/debug/src/zlib/inffast.d

@@ -0,0 +1,9 @@
+build/debug/src/zlib/inffast.o: src/zlib/inffast.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h \
+  src/zlib/inflate.h src/zlib/inffast.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:
+src/zlib/inflate.h:
+src/zlib/inffast.h:

package/build/debug/src/zlib/inflate.d

@@ -0,0 +1,10 @@
+build/debug/src/zlib/inflate.o: src/zlib/inflate.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h \
+  src/zlib/inflate.h src/zlib/inffast.h src/zlib/inffixed.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:
+src/zlib/inflate.h:
+src/zlib/inffast.h:
+src/zlib/inffixed.h:

package/build/debug/src/zlib/inftrees.d

@@ -0,0 +1,6 @@
+build/debug/src/zlib/inftrees.o: src/zlib/inftrees.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:

package/build/debug/src/zlib/trees.d

@@ -0,0 +1,7 @@
+build/debug/src/zlib/trees.o: src/zlib/trees.c src/zlib/deflate.h \
+  src/zlib/zutil.h src/zlib/zlib.h src/zlib/zconf.h src/zlib/trees.h
+src/zlib/deflate.h:
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/trees.h:

package/build/debug/src/zlib/zutil.d

@@ -0,0 +1,6 @@
+build/debug/src/zlib/zutil.o: src/zlib/zutil.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/gzguts.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/gzguts.h:

package/build/src/inflate9.d

@@ -0,0 +1,9 @@
+build/src/inflate9.o: src/inflate9.c src/zlib/zutil.h src/zlib/zlib.h \
+  src/zlib/zconf.h src/zlib/contrib/infback9/inftree9.h \
+  src/zlib/inflate.h src/zlib/inffixed.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/contrib/infback9/inftree9.h:
+src/zlib/inflate.h:
+src/zlib/inffixed.h:

package/build/src/zlib/adler32.d

@@ -0,0 +1,5 @@
+build/src/zlib/adler32.o: src/zlib/adler32.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:

package/build/src/zlib/contrib/infback9/infback9.d

@@ -0,0 +1,13 @@
+build/src/zlib/contrib/infback9/infback9.o: \
+  src/zlib/contrib/infback9/infback9.c src/zlib/zutil.h src/zlib/zlib.h \
+  src/zlib/zconf.h src/zlib/contrib/infback9/infback9.h \
+  src/zlib/contrib/infback9/inftree9.h \
+  src/zlib/contrib/infback9/inflate9.h \
+  src/zlib/contrib/infback9/inffix9.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/contrib/infback9/infback9.h:
+src/zlib/contrib/infback9/inftree9.h:
+src/zlib/contrib/infback9/inflate9.h:
+src/zlib/contrib/infback9/inffix9.h:

package/build/src/zlib/contrib/infback9/inftree9.d

@@ -0,0 +1,7 @@
+build/src/zlib/contrib/infback9/inftree9.o: \
+  src/zlib/contrib/infback9/inftree9.c src/zlib/zutil.h src/zlib/zlib.h \
+  src/zlib/zconf.h src/zlib/contrib/infback9/inftree9.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/contrib/infback9/inftree9.h:

package/build/src/zlib/crc32.d

@@ -0,0 +1,6 @@
+build/src/zlib/crc32.o: src/zlib/crc32.c src/zlib/zutil.h src/zlib/zlib.h \
+  src/zlib/zconf.h src/zlib/crc32.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/crc32.h:

package/build/src/zlib/infback.d

@@ -0,0 +1,10 @@
+build/src/zlib/infback.o: src/zlib/infback.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h \
+  src/zlib/inflate.h src/zlib/inffast.h src/zlib/inffixed.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:
+src/zlib/inflate.h:
+src/zlib/inffast.h:
+src/zlib/inffixed.h:

package/build/src/zlib/inffast.d

@@ -0,0 +1,9 @@
+build/src/zlib/inffast.o: src/zlib/inffast.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h \
+  src/zlib/inflate.h src/zlib/inffast.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:
+src/zlib/inflate.h:
+src/zlib/inffast.h:

package/build/src/zlib/inflate.d

@@ -0,0 +1,10 @@
+build/src/zlib/inflate.o: src/zlib/inflate.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h \
+  src/zlib/inflate.h src/zlib/inffast.h src/zlib/inffixed.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:
+src/zlib/inflate.h:
+src/zlib/inffast.h:
+src/zlib/inffixed.h:

package/build/src/zlib/inftrees.d

@@ -0,0 +1,6 @@
+build/src/zlib/inftrees.o: src/zlib/inftrees.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:

package/build/src/zlib/trees.d

@@ -0,0 +1,7 @@
+build/src/zlib/trees.o: src/zlib/trees.c src/zlib/deflate.h \
+  src/zlib/zutil.h src/zlib/zlib.h src/zlib/zconf.h src/zlib/trees.h
+src/zlib/deflate.h:
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/trees.h:

package/build/src/zlib/zutil.d

@@ -0,0 +1,6 @@
+build/src/zlib/zutil.o: src/zlib/zutil.c src/zlib/zutil.h src/zlib/zlib.h \
+  src/zlib/zconf.h src/zlib/gzguts.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/gzguts.h:

package/dist/zlib-streams.js

@@ -6,6 +6,10 @@ let wasm, malloc, free, memory;
 export function setWasmExports(wasmAPI) {
 	wasm = wasmAPI;
 	({ malloc, free, memory } = wasm);
+	if (typeof malloc !== "function" || typeof free !== "function" || !memory) {
+		wasm = malloc = free = memory = null;
+		throw new Error("Invalid WASM module");
+	}
 }
 
 function _make(isCompress, type, options = {}) {
@@ -77,14 +81,18 @@ function _make(isCompress, type, options = {}) {
 					}
 					heap.set(buffer.subarray(offset, offset + toRead), this.in);
 					const result = process(this.streamHandle, this.in, toRead, out, outBufferSize, 0);
-					if (!isCompress && result < 0) {
-						throw new Error("process error:" + result);
-					}
 					const prod = result & 0x00ffffff;
 					if (prod) {
 						scratch.set(heap.subarray(out, out + prod), 0);
 						controller.enqueue(scratch.slice(0, prod));
 					}
+					if (!isCompress) {
+						const code = (result >> 24) & 0xff;
+						const signedCode = (code & 0x80) ? code - 256 : code;
+						if (signedCode < 0) {
+							throw new Error("process error:" + signedCode);
+						}
+					}
 					const consumed = last_consumed(this.streamHandle);
 					if (consumed === 0) {
 						break;
@@ -112,11 +120,14 @@ function _make(isCompress, type, options = {}) {
 				const scratch = this._scratch;
 				while (true) {
 					const result = process(this.streamHandle, 0, 0, out, outBufferSize, 4);
-					if (!isCompress && result < 0) {
-						throw new Error("process error:" + result);
-					}
 					const produced = result & 0x00ffffff;
 					const code = (result >> 24) & 0xff;
+					if (!isCompress) {
+						const signedCode = (code & 0x80) ? code - 256 : code;
+						if (signedCode < 0) {
+							throw new Error("process error:" + signedCode);
+						}
+					}
 					if (produced) {
 						scratch.set(heap.subarray(out, out + produced), 0);
 						controller.enqueue(scratch.slice(0, produced));

package/package.json

@@ -3,7 +3,7 @@
   "description": "WASM-based Compression Streams API implementation using zlib, with support for deflate64 decompression.",
   "author": "Gildas Lormeau",
   "license": "BSD-3-Clause",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "type": "module",
   "keywords": [
     "deflate",

package/src/README.md

@@ -0,0 +1 @@
+See https://github.com/gildas-lormeau/inflate9.c

package/src/inflate9.c

@@ -6,7 +6,6 @@
 #include "zutil.h"
 #include "inftree9.h"
 #include "inflate.h"
-#include "infback9.h"
 
 #ifdef MAKEFIXED
 #ifndef BUILDFIXED
@@ -691,7 +690,7 @@ int ZEXPORT inflate9(z_streamp strm, int flush) {
         state->mode = BAD;
         break;
       }
-      state->extra = (unsigned)(here.op) & 15;
+      state->extra = (unsigned)(here.op) & 31;
       state->mode = LENEXT;
       /* fallthrough */
     case LENEXT:
@@ -765,7 +764,7 @@ int ZEXPORT inflate9(z_streamp strm, int flush) {
             break;
           }
 #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-          Trace((stderr, "inflate.c too far\n"));
+          Trace((stderr, "inflate9.c too far\n"));
           copy -= state->whave;
           if (copy > state->length)
             copy = state->length;
@@ -846,4 +845,15 @@ inf_leave:
   return ret;
 }
 
-int ZEXPORT inflate9End(z_streamp strm) { return inflateEnd(strm); }
+int ZEXPORT inflate9End(z_streamp strm) {
+  struct inflate_state FAR *state;
+  if (inflateStateCheck(strm))
+    return Z_STREAM_ERROR;
+  state = (struct inflate_state FAR *)strm->state;
+  if (state->window != Z_NULL)
+    ZFREE(strm, state->window);
+  ZFREE(strm, strm->state);
+  strm->state = Z_NULL;
+  Tracev((stderr, "inflate: end\n"));
+  return Z_OK;
+}

package/src/inflate9.h

@@ -1,9 +1,4 @@
-#ifndef ZLIB_INFLATE9_H_COMPAT
-#define ZLIB_INFLATE9_H_COMPAT
-
 #include "zutil.h"
-#include "inftree9.h"
-#include "inflate.h"
 
 int ZEXPORT inflate9Init(z_streamp strm);
 int ZEXPORT inflate9(z_streamp strm, int flush);
@@ -11,6 +6,4 @@ int ZEXPORT inflate9End(z_streamp strm);
 int ZEXPORT inflate9Init_(z_streamp strm, const char *version, int stream_size);
 int ZEXPORT inflate9Init2_(z_streamp strm, int windowBits, const char *version,
                            int stream_size);
-int ZEXPORT inflate9Reset2(z_streamp strm, int windowBits);
-
-#endif /* ZLIB_INFLATE9_H_COMPAT */
+int ZEXPORT inflate9Reset2(z_streamp strm, int windowBits);

package/src/wasm/api/zlib-streams.js

@@ -6,6 +6,10 @@ let wasm, malloc, free, memory;
 export function setWasmExports(wasmAPI) {
 	wasm = wasmAPI;
 	({ malloc, free, memory } = wasm);
+	if (typeof malloc !== "function" || typeof free !== "function" || !memory) {
+		wasm = malloc = free = memory = null;
+		throw new Error("Invalid WASM module");
+	}
 }
 
 function _make(isCompress, type, options = {}) {
@@ -77,14 +81,18 @@ function _make(isCompress, type, options = {}) {
 					}
 					heap.set(buffer.subarray(offset, offset + toRead), this.in);
 					const result = process(this.streamHandle, this.in, toRead, out, outBufferSize, 0);
-					if (!isCompress && result < 0) {
-						throw new Error("process error:" + result);
-					}
 					const prod = result & 0x00ffffff;
 					if (prod) {
 						scratch.set(heap.subarray(out, out + prod), 0);
 						controller.enqueue(scratch.slice(0, prod));
 					}
+					if (!isCompress) {
+						const code = (result >> 24) & 0xff;
+						const signedCode = (code & 0x80) ? code - 256 : code;
+						if (signedCode < 0) {
+							throw new Error("process error:" + signedCode);
+						}
+					}
 					const consumed = last_consumed(this.streamHandle);
 					if (consumed === 0) {
 						break;
@@ -112,11 +120,14 @@ function _make(isCompress, type, options = {}) {
 				const scratch = this._scratch;
 				while (true) {
 					const result = process(this.streamHandle, 0, 0, out, outBufferSize, 4);
-					if (!isCompress && result < 0) {
-						throw new Error("process error:" + result);
-					}
 					const produced = result & 0x00ffffff;
 					const code = (result >> 24) & 0xff;
+					if (!isCompress) {
+						const signedCode = (code & 0x80) ? code - 256 : code;
+						if (signedCode < 0) {
+							throw new Error("process error:" + signedCode);
+						}
+					}
 					if (produced) {
 						scratch.set(heap.subarray(out, out + produced), 0);
 						controller.enqueue(scratch.slice(0, produced));

package/src/wasm/deflate_stream_wasm.c

@@ -3,6 +3,7 @@
 #include <stdint.h>
 #include "zlib.h"
 #include "allocator.h"
+#include "wasm_stream_common.h"
 
 #ifndef RAW_WBITS
 #if defined(MAX_WBITS)
@@ -13,24 +14,10 @@
 #endif
 
 struct wasm_deflate_ctx {
-  z_stream strm;
-  unsigned char *inbuf;
-  unsigned inbuf_sz;
-  unsigned last_consumed;
+  WASM_STREAM_COMMON_FIELDS
 };
 
-unsigned deflate_new(void) {
-  struct wasm_deflate_ctx *c = (struct wasm_deflate_ctx *)malloc(sizeof(*c));
-  if (!c)
-    return 0;
-  memset(c, 0, sizeof(*c));
-  c->strm.zalloc = my_zalloc;
-  c->strm.zfree = my_zfree;
-  c->strm.opaque = Z_NULL;
-  c->inbuf = NULL;
-  c->inbuf_sz = 0;
-  return (unsigned)(uintptr_t)c;
-}
+unsigned deflate_new(void) { return wasm_stream_new(); }
 
 int deflate_init(unsigned zptr, int level) {
   struct wasm_deflate_ctx *c = (struct wasm_deflate_ctx *)(uintptr_t)zptr;
@@ -63,27 +50,8 @@ int deflate_init_gzip(unsigned zptr, int level) {
 
 int deflate_process(unsigned zptr, unsigned in_ptr, unsigned in_len,
                     unsigned out_ptr, unsigned out_len, int flush) {
-  struct wasm_deflate_ctx *c = (struct wasm_deflate_ctx *)(uintptr_t)zptr;
-  if (!c)
-    return Z_STREAM_ERROR;
-  if (in_len > c->inbuf_sz) {
-    unsigned char *nb = (unsigned char *)realloc(c->inbuf, in_len);
-    if (!nb)
-      return Z_MEM_ERROR;
-    c->inbuf = nb;
-    c->inbuf_sz = in_len;
-  }
-  memcpy(c->inbuf, (unsigned char *)(uintptr_t)in_ptr, in_len);
-  c->strm.next_in = c->inbuf;
-  c->strm.avail_in = in_len;
-  c->strm.next_out = (unsigned char *)(uintptr_t)out_ptr;
-  c->strm.avail_out = out_len;
-
-  int ret = deflate(&c->strm, flush);
-  int produced = (int)(out_len - c->strm.avail_out);
-  c->last_consumed = (unsigned)(in_len - c->strm.avail_in);
-  int code = ret & 0xff;
-  return (produced & 0x00ffffff) | ((code & 0xff) << 24);
+  return wasm_stream_process_common(zptr, in_ptr, in_len, out_ptr, out_len,
+                                    flush, deflate);
 }
 
 int deflate_end(unsigned zptr) {
@@ -97,8 +65,5 @@ int deflate_end(unsigned zptr) {
 }
 
 unsigned deflate_last_consumed(unsigned zptr) {
-  struct wasm_deflate_ctx *c = (struct wasm_deflate_ctx *)(uintptr_t)zptr;
-  if (!c)
-    return 0;
-  return c->last_consumed;
+  return wasm_stream_last_consumed(zptr);
 }