Two workers & worker termination

codecs/mozjpeg_enc/mozjpeg_enc.d.ts

@@ -1,4 +1,4 @@
-import { EncodeOptions } from '../../src/codecs/mozjpeg/encoder';
+import { EncodeOptions } from '../../src/codecs/mozjpeg/encoder-meta';
 
 interface MozJPEGModule extends EmscriptenWasm.Module {
   encode(data: BufferSource, width: number, height: number, options: EncodeOptions): Uint8Array;

codecs/webp_enc/webp_enc.d.ts

@@ -1,4 +1,4 @@
-import { EncodeOptions } from '../../src/codecs/webp/encoder';
+import { EncodeOptions } from '../../src/codecs/webp/encoder-meta';
 
 interface WebPModule extends EmscriptenWasm.Module {
   encode(data: BufferSource, width: number, height: number, options: EncodeOptions): Uint8Array;

package.json

@@ -59,14 +59,12 @@
     "webpack-bundle-analyzer": "^2.13.1",
     "webpack-cli": "^2.1.5",
     "webpack-dev-server": "^3.1.5",
-    "webpack-plugin-replace": "^1.1.1"
-  },
-  "dependencies": {
+    "webpack-plugin-replace": "^1.1.1",
     "classnames": "^2.2.6",
     "comlink": "^3.0.3",
-    "comlink-loader": "^1.0.0",
-    "preact": "^8.3.1",
     "linkstate": "^1.1.1",
-    "pretty-bytes": "^5.1.0"
+    "preact": "^8.3.1",
+    "pretty-bytes": "^5.1.0",
+    "worker-plugin": "^1.1.1"
   }
 }

src/codecs/browser-bmp/encoder-meta.ts

@@ -0,0 +1,11 @@
+import { canvasEncodeTest } from '../generic/util';
+
+export interface EncodeOptions { }
+export interface EncoderState { type: typeof type; options: EncodeOptions; }
+
+export const type = 'browser-bmp';
+export const label = 'Browser BMP';
+export const mimeType = 'image/bmp';
+export const extension = 'bmp';
+export const defaultOptions: EncodeOptions = {};
+export const featureTest = () => canvasEncodeTest(mimeType);

src/codecs/browser-bmp/encoder.ts

@@ -1,16 +1,6 @@
+import { mimeType } from './encoder-meta';
 import { canvasEncode } from '../../lib/util';
-import { canvasEncodeTest } from '../generic/util';
 
-export interface EncodeOptions { }
-export interface EncoderState { type: typeof type; options: EncodeOptions; }
-
-export const type = 'browser-bmp';
-export const label = 'Browser BMP';
-export const mimeType = 'image/bmp';
-export const extension = 'bmp';
-export const defaultOptions: EncodeOptions = {};
-export const featureTest = () => canvasEncodeTest(mimeType);
-
-export function encode(data: ImageData, options: EncodeOptions) {
+export function encode(data: ImageData) {
   return canvasEncode(data, mimeType);
 }

src/codecs/browser-gif/encoder-meta.ts

@@ -0,0 +1,11 @@
+import { canvasEncodeTest } from '../generic/util';
+
+export interface EncodeOptions {}
+export interface EncoderState { type: typeof type; options: EncodeOptions; }
+
+export const type = 'browser-gif';
+export const label = 'Browser GIF';
+export const mimeType = 'image/gif';
+export const extension = 'gif';
+export const defaultOptions: EncodeOptions = {};
+export const featureTest = () => canvasEncodeTest(mimeType);

src/codecs/browser-gif/encoder.ts

@@ -1,16 +1,6 @@
+import { mimeType } from './encoder-meta';
 import { canvasEncode } from '../../lib/util';
-import { canvasEncodeTest } from '../generic/util';
 
-export interface EncodeOptions {}
-export interface EncoderState { type: typeof type; options: EncodeOptions; }
-
-export const type = 'browser-gif';
-export const label = 'Browser GIF';
-export const mimeType = 'image/gif';
-export const extension = 'gif';
-export const defaultOptions: EncodeOptions = {};
-export const featureTest = () => canvasEncodeTest(mimeType);
-
-export function encode(data: ImageData, options: EncodeOptions) {
+export function encode(data: ImageData) {
   return canvasEncode(data, mimeType);
 }

src/codecs/browser-jp2/encoder-meta.ts

@@ -0,0 +1,11 @@
+import { canvasEncodeTest } from '../generic/util';
+
+export interface EncodeOptions { }
+export interface EncoderState { type: typeof type; options: EncodeOptions; }
+
+export const type = 'browser-jp2';
+export const label = 'Browser JPEG 2000';
+export const mimeType = 'image/jp2';
+export const extension = 'jp2';
+export const defaultOptions: EncodeOptions = {};
+export const featureTest = () => canvasEncodeTest(mimeType);

src/codecs/browser-jp2/encoder.ts

@@ -1,16 +1,6 @@
+import { mimeType } from './encoder-meta';
 import { canvasEncode } from '../../lib/util';
-import { canvasEncodeTest } from '../generic/util';
 
-export interface EncodeOptions { }
-export interface EncoderState { type: typeof type; options: EncodeOptions; }
-
-export const type = 'browser-jp2';
-export const label = 'Browser JPEG 2000';
-export const mimeType = 'image/jp2';
-export const extension = 'jp2';
-export const defaultOptions: EncodeOptions = {};
-export const featureTest = () => canvasEncodeTest(mimeType);
-
-export function encode(data: ImageData, options: EncodeOptions) {
+export function encode(data: ImageData) {
   return canvasEncode(data, mimeType);
 }

src/codecs/browser-jpeg/encoder-meta.ts

@@ -0,0 +1,8 @@
+export interface EncodeOptions { quality: number; }
+export interface EncoderState { type: typeof type; options: EncodeOptions; }
+
+export const type = 'browser-jpeg';
+export const label = 'Browser JPEG';
+export const mimeType = 'image/jpeg';
+export const extension = 'jpg';
+export const defaultOptions: EncodeOptions = { quality: 0.5 };

src/codecs/browser-jpeg/encoder.ts

@@ -1,14 +1,6 @@
+import { EncodeOptions, mimeType } from './encoder-meta';
 import { canvasEncode } from '../../lib/util';
 
-export interface EncodeOptions { quality: number; }
-export interface EncoderState { type: typeof type; options: EncodeOptions; }
-
-export const type = 'browser-jpeg';
-export const label = 'Browser JPEG';
-export const mimeType = 'image/jpeg';
-export const extension = 'jpg';
-export const defaultOptions: EncodeOptions = { quality: 0.5 };
-
 export function encode(data: ImageData, { quality }: EncodeOptions) {
   return canvasEncode(data, mimeType, quality);
 }

src/codecs/browser-pdf/encoder-meta.ts

@@ -0,0 +1,11 @@
+import { canvasEncodeTest } from '../generic/util';
+
+export interface EncodeOptions { }
+export interface EncoderState { type: typeof type; options: EncodeOptions; }
+
+export const type = 'browser-pdf';
+export const label = 'Browser PDF';
+export const mimeType = 'application/pdf';
+export const extension = 'pdf';
+export const defaultOptions: EncodeOptions = {};
+export const featureTest = () => canvasEncodeTest(mimeType);

src/codecs/browser-pdf/encoder.ts

@@ -1,16 +1,6 @@
+import { mimeType } from './encoder-meta';
 import { canvasEncode } from '../../lib/util';
-import { canvasEncodeTest } from '../generic/util';
 
-export interface EncodeOptions { }
-export interface EncoderState { type: typeof type; options: EncodeOptions; }
-
-export const type = 'browser-pdf';
-export const label = 'Browser PDF';
-export const mimeType = 'application/pdf';
-export const extension = 'pdf';
-export const defaultOptions: EncodeOptions = {};
-export const featureTest = () => canvasEncodeTest(mimeType);
-
-export function encode(data: ImageData, options: EncodeOptions) {
+export function encode(data: ImageData) {
   return canvasEncode(data, mimeType);
 }

src/codecs/browser-png/encoder-meta.ts

@@ -0,0 +1,8 @@
+export interface EncodeOptions {}
+export interface EncoderState { type: typeof type; options: EncodeOptions; }
+
+export const type = 'browser-png';
+export const label = 'Browser PNG';
+export const mimeType = 'image/png';
+export const extension = 'png';
+export const defaultOptions: EncodeOptions = {};