web-background 0.0.10 → 0.0.12

package/README.md

@@ -9,8 +9,8 @@ In most cases, You don't have to use it
 Recommended for long task  
 대부분의 경우 이 모듈을 사용할 필요는 없으나, long task를 처리해야 할 경우 사용할 것을 추천합니다. 
 
-Most WebAPIs including DOM APIs are cannot be used Becuase they are run in Web Worker.  
-WebWorker에서 실행되므로 DOM API를 포함한 대부분의 WebAPI를 사용하지 못합니다.  
+Most WebAPIs including DOM APIs are cannot be used.  
+DOM API를 포함한 대부분의 WebAPI를 사용하지 못합니다.  
 [Read More](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API)
 
 ## Example

package/dist/background.d.ts

@@ -1,3 +1,3 @@
-type Result<Payload, ReturnValue> = Payload extends void ? () => ReturnValue : (payload: Payload) => ReturnValue;
-export declare function background<Payload = void, ReturnValue = void>(fn: (payload: Payload) => ReturnValue): Result<Payload, ReturnValue>;
+type Result<Payload, ReturnValue> = Payload extends any[] ? (...payloads: Payload) => ReturnValue : (payload: Payload) => ReturnValue;
+export declare function background<Payload extends any[], ReturnValue = void>(fn: (...payloads: Payload) => ReturnValue): Result<Payload, ReturnValue>;
 export {};

package/dist/index.js

@@ -1,37 +1,3 @@
-class TypedWorker extends Worker {
-    postMessage(payload) {
-        super.postMessage(payload);
-    }
-    addEventListener(type, observer) {
-        super.addEventListener(type, observer);
-    }
-}
-
-class UtilWorker extends TypedWorker {
-    constructor(scriptURL, options) {
-        super(scriptURL, options);
-    }
-    subscribe(observer) {
-        const onMessage = (event) => {
-            observer(event.data);
-        };
-        this.addEventListener('message', onMessage);
-        return () => {
-            this.removeEventListener('message', onMessage);
-        };
-    }
-    request(payload) {
-        return new Promise(resolve => {
-            const onMessage = ({ data }) => {
-                resolve(data);
-                this.removeEventListener('message', onMessage);
-            };
-            this.postMessage(payload);
-            this.addEventListener('message', onMessage);
-        });
-    }
-}
-
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -61,39 +27,98 @@ function __rest(s, e) {
     return t;
 }
 
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
 typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
     var e = new Error(message);
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
+class TypedWorker extends Worker {
+    postMessage(payload) {
+        super.postMessage(payload);
+    }
+    addEventListener(type, observer) {
+        super.addEventListener(type, observer);
+    }
+}
+
+class UtilWorker extends TypedWorker {
+    constructor(scriptURL, options) {
+        super(scriptURL, options);
+    }
+    subscribe(observer) {
+        const onMessage = (event) => {
+            observer(event.data);
+        };
+        this.addEventListener('message', onMessage);
+        return () => {
+            this.removeEventListener('message', onMessage);
+        };
+    }
+    request(...payloads) {
+        return new Promise(resolve => {
+            const onMessage = ({ data }) => {
+                resolve(data);
+                this.removeEventListener('message', onMessage);
+            };
+            this.postMessage(payloads);
+            this.addEventListener('message', onMessage);
+        });
+    }
+}
+
 class WorkerBuilder {
     static fromModule(Worker, _a) {
         var { module } = _a, options = __rest(_a, ["module"]);
         const code = `
         self.addEventListener('message', event => {
-          const result = (${module.toString()})(event.data);
+          const result = (${module.toString()})(${module.length > 1 ? '...event.data' : 'event.data'});
           
           self.postMessage(result);
         });
       `.trim();
         const blob = new Blob([code]);
-        return new Worker(URL.createObjectURL(blob), options);
+        const url = URL.createObjectURL(blob);
+        const worker = new Worker(url, options);
+        const originTerminate = worker.terminate;
+        worker.terminate = () => {
+            originTerminate.call(worker);
+            URL.revokeObjectURL(url);
+        };
+        return worker;
     }
 }
 
+const workerCleanupRegistry = new FinalizationRegistry((heldWorker) => heldWorker.terminate());
+
 function background(fn) {
     function createWorker() {
         return WorkerBuilder.fromModule((UtilWorker), { module: fn });
     }
     if (typeof window === 'undefined') {
-        function runWithCreatingWorker(payload) {
-            const worker = createWorker();
-            return worker.request.call(worker, payload);
+        function runWithCreatingWorker(...payload) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const worker = createWorker();
+                const result = yield worker.request.call(worker, ...payload);
+                worker.terminate();
+                return result;
+            });
         }
         return runWithCreatingWorker;
     }
     const worker = createWorker();
-    return worker.request.bind(worker);
+    const result = worker.request.bind(worker);
+    workerCleanupRegistry.register(result, worker);
+    return result;
 }
 
 export { background };

package/dist/modules/UtilWorker.d.ts

@@ -2,6 +2,5 @@ import { TypedWorker } from "./TypedWorker";
 export declare class UtilWorker<Payload = never, Result = void> extends TypedWorker<Payload, Result> {
     constructor(scriptURL: string | URL, options?: WorkerOptions);
     subscribe(observer: (response: Result) => void): () => void;
-    request(): Promise<Result>;
-    request(payload: Payload): Promise<Result>;
+    request(...payloads: Payload[]): Promise<Result>;
 }

package/dist/modules/workerCleanupRegistry.d.ts

@@ -0,0 +1 @@
+export declare const workerCleanupRegistry: FinalizationRegistry<Worker>;

package/package.json

@@ -7,7 +7,7 @@
     "Background",
     "Web Background"
   ],
-  "version": "0.0.10",
+  "version": "0.0.12",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "type": "module",