Dependencies and js wrapper update.

Author: programingjd

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "avif"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 
 [lib]
@@ -12,8 +12,10 @@ avif-serialize = "0.8"
 rav1e = { version = "0.6.6", default-features = false, features = ["wasm"] }
 
 [profile.release]
+debug = false
 opt-level = "s"
 lto = true
+#panic = "abort"
 
 [dev-dependencies]
 jpeg-decoder = "0.3"

avif.d.ts

@@ -0,0 +1,15 @@
+/* tslint:disable */
+/* eslint-disable */
+declare module 'avif' {
+  /**
+   * Encodes the supplied ImageData rgba array.
+   * @param {Uint8Array} bytes
+   * @param {number} width
+   * @param {number} height
+   * @param {number} [quality=50] (1 to 100)
+   * @param {number} [speed=6] (1 to 10)
+   * @return {Promise<Uint8Array>}
+   */
+  export function avif(bytes: Uint8Array, width: number, height: number, quality: number, speed: number): Uint8Array;
+  export default avif;
+}

avif.mjs

@@ -1,63 +1,39 @@
-const url=new URL('avif.wasm',import.meta.url);
-await (await fetch(url)).arrayBuffer();
-const src=()=>`(async()=>{
-  const mod=await WebAssembly.compileStreaming(await fetch('${url}',{cache:'force-cache'}));
-  const imports={
-    wbg:{
-      __wbg_log_d415f1170b035824: (p,n)=>{
-        console.log(
-          new TextDecoder().decode(new Uint8Array(wasm.memory.buffer).subarray(p,p+n))
-        )
-      }
+const url=new URL('./avif.wasm',import.meta.url);
+const imports={
+  wbg:{
+    __wbg_log_d415f1170b035824: (p,n)=>{
+      console.log(
+        new TextDecoder().decode(new Uint8Array(wasm.memory.buffer).subarray(p,p+n))
+      )
     }
-  };
-  const wasm=(await WebAssembly.instantiate(mod,imports)).exports;
-  const malloc=wasm.__wbindgen_malloc;
-  const free=wasm.__wbindgen_free;
-  const pointer=wasm.__wbindgen_add_to_stack_pointer;
-  const fn=({data,width,height,quality,speed})=>{
-    const n1=data.length;
-    const p1=malloc(n1,1);
-    const r=pointer(-16);
-    try{
-      new Uint8Array(wasm.memory.buffer).set(data,p1);
-      wasm.avif_from_imagedata(r,p1,n1,width,height,quality,speed);
-      const arr=new Int32Array(wasm.memory.buffer);
-      const p2=arr[r/4];const n2=arr[r/4+1];
-      const res=new Uint8Array(wasm.memory.buffer).subarray(p2,p2+n2).slice();
-      free(p2,n2);
-      return res;
-    }finally{pointer(16)}
-  };
-  onmessage=async msg=>postMessage(fn(msg.data));
-  postMessage('ready');
-})();`
-const worker=await new Promise(r=>{
-  const worker=new Worker(URL.createObjectURL(new Blob([src()],{type:'application/javascript'})),{type:'module'});
-  worker.onmessage=msg=>{
-    if(msg.data==='ready'){
-      worker.onmessage=null;
-      r(worker);
-    }
-  };
-});
+  }
+};
+const {instance:{exports:wasm}}=await WebAssembly.instantiateStreaming(await fetch(url,{cache:'force-cache'}),imports);
+const malloc=wasm.__wbindgen_malloc;
+const free=wasm.__wbindgen_free;
+const pointer=wasm.__wbindgen_add_to_stack_pointer;
 /**
  * Encodes the supplied ImageData rgba array.
- * @param {Uint8Array} data
+ * @param {Uint8Array} bytes
  * @param {number} width
  * @param {number} height
- * @param {number} quality
- * @param {number} speed
+ * @param {number} quality (1 to 100)
+ * @param {number} speed (1 to 10)
  * @return {Promise<Uint8Array>}
  */
-const avif=(data,width,height, quality=50,speed=6)=>new Promise(r=>{
-  worker.onmessage=msg=>{
-    worker.onmessage=null;
-    r(msg.data);
-  }
-  worker.postMessage({data,width,height,quality,speed});
-});
-
-export {
-  avif
+const avif=(bytes,width,height, quality=50,speed=6)=>{
+  const n1=bytes.length;
+  const p1=malloc(n1,1);
+  const r=pointer(-16);
+  try{
+    new Uint8Array(wasm.memory.buffer).set(bytes,p1);
+    wasm.avif_from_imagedata(r,p1,n1,width,height,quality,speed);
+    const arr=new Int32Array(wasm.memory.buffer);
+    const p2=arr[r/4];const n2=arr[r/4+1];
+    const res=new Uint8Array(wasm.memory.buffer).subarray(p2,p2+n2).slice();
+    free(p2,n2);
+    return res;
+  }finally{pointer(16)}
 };
+export {avif};
+export default avif;

avif.mjs.br

@@ -0,0 +1,29 @@
+const avif=(async()=>{
+  const imports={
+    wbg:{
+      __wbg_log_d415f1170b035824: (p,n)=>{
+        console.log(
+          new TextDecoder().decode(new Uint8Array(wasm.memory.buffer).subarray(p,p+n))
+        )
+      }
+    }
+  };
+  const {instance:{exports:wasm}}=await WebAssembly.instantiateStreaming(await fetch('./avif.wasm',{cache:'force-cache'}),imports);
+  const malloc=wasm.__wbindgen_malloc;
+  const free=wasm.__wbindgen_free;
+  const pointer=wasm.__wbindgen_add_to_stack_pointer;
+  return (it,width,height,quality=50,speed=6)=>{
+    const n1=it.length;
+    const p1=malloc(n1,1);
+    const r=pointer(-16);
+    try{
+      new Uint8Array(wasm.memory.buffer).set(data,p1);
+      wasm.avif_from_imagedata(r,p1,n1,width,height,quality,speed);
+      const arr=new Int32Array(wasm.memory.buffer);
+      const p2=arr[r/4];const n2=arr[r/4+1];
+      const res=new Uint8Array(wasm.memory.buffer).subarray(p2,p2+n2).slice();
+      free(p2,n2);
+      return res;
+    }finally{pointer(16)}
+  };
+})();

avif.wasm

@@ -0,0 +1,15 @@
+/* tslint:disable */
+/* eslint-disable */
+declare module 'avif_worker' {
+  /**
+   * Encodes the supplied ImageData rgba array.
+   * @param {Uint8Array} bytes
+   * @param {number} width
+   * @param {number} height
+   * @param {number} [quality=50] (1 to 100)
+   * @param {number} [speed=6] (1 to 10)
+   * @return {Promise<Uint8Array>}
+   */
+  export function avif(bytes: Uint8Array, width: number, height: number, quality: number, speed: number): Promise<Uint8Array>;
+  export default avif;
+}

avif.wasm.br

@@ -0,0 +1,32 @@
+const url=new URL('avif.wasm',import.meta.url);
+await (await fetch(url)).arrayBuffer();
+const worker=await new Promise(r=>{
+  // For browsers that don't support type: module on workers (firefox < 114, safari < 15)
+  // const worker=new Worker(new URL('./avif_worker_script.js',import.meta.url));
+  const worker=new Worker(new URL('./avif_worker_script.mjs',import.meta.url),{type:'module'});
+  worker.onmessage=msg=>{
+    if(msg.data==='ready'){
+      worker.onmessage=null;
+      r(worker);
+    }
+  };
+});
+/**
+ * Encodes the supplied ImageData rgba array.
+ * @param {Uint8Array} bytes
+ * @param {number} width
+ * @param {number} height
+ * @param {number} quality (1 to 100)
+ * @param {number} speed (1 to 10)
+ * @return {Promise<Uint8Array>}
+ */
+const avif=(bytes,width,height, quality=50,speed=6)=>new Promise(r=>{
+  worker.onmessage=msg=>{
+    worker.onmessage=null;
+    r(msg.data);
+  }
+  worker.postMessage({bytes,width,height,quality,speed});
+});
+
+export {avif};
+export default avif;

avif_for_importScripts.js

@@ -0,0 +1,8 @@
+importScripts('./avif_for_importScripts.js');
+(async()=>{
+  const fn=await avif;
+  onmessage=async msg=>{
+    postMessage(fn(msg.data.bytes,msg.data.width,msg.data.height,msg.data.quality,msg.data.speed));
+  }
+  postMessage('ready');
+})();

avif_worker.d.ts

@@ -0,0 +1,3 @@
+import {avif} from "./avif.mjs";
+onmessage=async({data:{bytes,width,height,quality,speed}})=>postMessage(avif(bytes,width,height,quality,speed));
+postMessage('ready');

avif_worker.mjs

@@ -22,7 +22,7 @@
 const context=canvas.getContext('2d');
 context.drawImage(image,0,0);
 const data=context.getImageData(0,0,canvas.width,canvas.height);
-const {avif}=await import('./avif.mjs');
+const {avif}=await import('./avif_worker.mjs');
 const rgba=new Uint8Array(data.data);
 const quality=50.0;
 for (const speed of [10,9,8,7,6,5,4,3,2,1]){