@woosh/meep-engine 2.119.102 → 2.119.104

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.119.102",
+  "version": "2.119.104",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/process/worker/WorkerBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/core/process/worker/WorkerBuilder.js"],"names":[],"mappings":";AAQA;IAEI;;;OAGG;IACH,SAFU,MAAM,EAAE,CAEL;IACb,YAAa;IACb;;;OAGG;IACH,WAFU;QAAC,CAAC,WAAU;QAAC,IAAI,EAAC,MAAM,CAAA;KAAC,EAAE,CAEtB;IACf,sBAA6B;IAE7B;;;OAGG;IACH,cAFW,MAAM,QAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,UACN,WAAS,MAAM,QAIzB;IAED;;;;;OAKG;IACH,6CAKC;IAED;;;OAGG;IACH,mBAFW,MAAM,QAMhB;IAED;;;OAGG;IACH,SAFa,WAAW,CAyGvB;CACJ;wBAzKuB,8BAA8B;wBAC9B,kBAAkB"}
+{"version":3,"file":"WorkerBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/core/process/worker/WorkerBuilder.js"],"names":[],"mappings":";AAQA;IAEI;;;OAGG;IACH,SAFU,MAAM,EAAE,CAEL;IACb,YAAa;IACb;;;OAGG;IACH,WAFU;QAAC,CAAC,WAAU;QAAC,IAAI,EAAC,MAAM,CAAA;KAAC,EAAE,CAEtB;IACf,sBAA6B;IAE7B;;;OAGG;IACH,cAFW,MAAM,QAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,UACN,WAAS,MAAM,QAIzB;IAED;;;;;OAKG;IACH,6CAKC;IAED;;;OAGG;IACH,mBAFW,MAAM,QAMhB;IAED;;;OAGG;IACH,SAFa,WAAW,CA2HvB;CACJ;wBA3LuB,8BAA8B;wBAC9B,kBAAkB"}

package/src/core/process/worker/WorkerBuilder.js

@@ -116,6 +116,7 @@ class WorkerBuilder {
 
         //api handler
         Array.prototype.push.apply(codeLines, [
+            //language=js
             `function extractTransferables(obj, result) {
                 if (typeof obj !== "object") {
                     return; //not an object, skip
@@ -133,35 +134,52 @@ class WorkerBuilder {
                     }
                 }
             }`,
-            'globalScope.onmessage = function(event){',
-            '   var eventData = event.data;',
-            '   var requestId = eventData.id',
-            '   var methodName = eventData.methodName;',
-            '   var parameters = eventData.parameters;',
-            '   var method = api[methodName];',
-
-            '   function sendResult(result){',
-            '       var transferables = [];',
-            '       extractTransferables(result, transferables);',
-            '       globalScope.postMessage({methodName: methodName, id: requestId, result: result}, transferables);',
-            '   }',
-
-            '   function sendError(error){',
-            '       let stack = "";',
-            '       try{stack = error.stack.split("\\n")}catch(e){}',
-            '       globalScope.postMessage({methodName: methodName, id: requestId, error: {message: error.message, stack: stack }});',
-            '   }',
-
-            '   if(method === undefined){',
-            '       sendError(new Error("API named \'"+methodName+"\' was not found."));',
-            '   }else{',
-            '       try{',
-            '           method.apply(null,parameters).then(sendResult, sendError);',
-            '       }catch(e){',
-            '           sendError(e);',
-            '       }',
-            '   }',
-            '};'
+            //language=js
+            `globalScope.onmessage = function (event) {
+                const eventData = event.data;
+                const requestId = eventData.id
+                const methodName = eventData.methodName;
+                const parameters = eventData.parameters;
+                const method = api[methodName];
+
+                function sendResult(result) {
+                    const transferables = [];
+                    extractTransferables(result, transferables);
+                    globalScope.postMessage({ methodName: methodName, id: requestId, result: result }, transferables);
+                }
+
+                function sendError(error) {
+                    let stack = "";
+                    try {
+                        stack = error.stack.split("\\n")
+                    } catch (e) {
+                    }
+                    globalScope.postMessage({
+                        methodName: methodName,
+                        id: requestId,
+                        error: { message: error.message, stack: stack }
+                    });
+                }
+
+                if (method === undefined) {
+                    sendError(new Error("API named \'" + methodName + "\' was not found."));
+                } else {
+                    try {
+                        const method_result = method.apply(null, parameters);
+                        
+                        if(typeof method_result.then === "function"){
+                            // thenable
+                            method_result.then(sendResult, sendError);
+                        }else{
+                            // straight value
+                            sendResult(method_result);
+                        }
+                        
+                    } catch (e) {
+                        sendError(e);
+                    }
+                }
+            };`
         ]);
 
         const code = codeLines.join("\n");

package/src/engine/asset/loaders/image/ImageRGBADataLoader.d.ts

@@ -1,5 +1,9 @@
 export class ImageRGBADataLoader extends AssetLoader<any, any> {
-    constructor();
+    /**
+     *
+     * @param {string} [worker_path] Path to decoder worker, allows flexibility in deployment
+     */
+    constructor({ worker_path }?: string);
     decoder: CodecWithFallback;
     link(assetManager: any, engine: any): Promise<void>;
     /**

package/src/engine/asset/loaders/image/ImageRGBADataLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ImageRGBADataLoader.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/asset/loaders/image/ImageRGBADataLoader.js"],"names":[],"mappings":"AAYA;IACI,cAOC;IAJG,2BAGC;IAGL,oDAOC;IAED;;;;;;OAMG;IACH,4BASC;IAED;;;;;;OAMG;IACH,mBAoBC;IAED,6EAiCC;CACJ;4BA5G2B,mBAAmB;kCACb,8BAA8B"}
+{"version":3,"file":"ImageRGBADataLoader.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/asset/loaders/image/ImageRGBADataLoader.js"],"names":[],"mappings":"AAYA;IACI;;;OAGG;IACH,8BAFW,MAAM,EAWhB;IAJG,2BAGC;IAGL,oDAOC;IAED;;;;;;OAMG;IACH,4BASC;IAED;;;;;;OAMG;IACH,mBAoBC;IAED,6EAiCC;CACJ;4BAlH2B,mBAAmB;kCACb,8BAA8B"}

package/src/engine/asset/loaders/image/ImageRGBADataLoader.js

@@ -11,11 +11,17 @@ import { ImageRGBADataAsset } from "./ImageRGBADataAsset.js";
 const ASSET_TYPE_ARRAY_BUFFER = "arraybuffer";
 
 export class ImageRGBADataLoader extends AssetLoader {
-    constructor() {
+    /**
+     *
+     * @param {string} [worker_path] Path to decoder worker, allows flexibility in deployment
+     */
+    constructor({
+                    worker_path
+                } = {}) {
         super();
 
         this.decoder = new CodecWithFallback(
-            new ThreadedImageDecoder(),
+            new ThreadedImageDecoder({ worker_path }),
             new NativeImageDecoder()
         );
     }

package/src/engine/asset/loaders/image/codec/ThreadedImageDecoder.d.ts

@@ -1,4 +1,9 @@
 export class ThreadedImageDecoder extends Codec {
+    /**
+     *
+     * @param {string} [worker_path]
+     */
+    constructor({ worker_path }?: string);
     /**
      *
      * @type {OnDemandWorkerManager}

package/src/engine/asset/loaders/image/codec/ThreadedImageDecoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThreadedImageDecoder.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/asset/loaders/image/codec/ThreadedImageDecoder.js"],"names":[],"mappings":"AAKA;IAYQ;;;OAGG;IACH,QAFU,qBAAqB,CAE+B;IAKlE,kCASC;IAED,gCAEC;CACJ;sBArCqB,YAAY;sCAHI,6DAA6D"}
+{"version":3,"file":"ThreadedImageDecoder.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/asset/loaders/image/codec/ThreadedImageDecoder.js"],"names":[],"mappings":"AAKA;IACI;;;OAGG;IACH,8BAFW,MAAM,EAuBhB;IAPG;;;OAGG;IACH,QAFU,qBAAqB,CAE+B;IAKlE,kCASC;IAED,gCAEC;CACJ;sBA5CqB,YAAY;sCAHI,6DAA6D"}

package/src/engine/asset/loaders/image/codec/ThreadedImageDecoder.js

@@ -4,12 +4,19 @@ import { PNG_HEADER_BYTES } from "../png/PNG_HEADER_BYTES.js";
 import { Codec } from "./Codec.js";
 
 export class ThreadedImageDecoder extends Codec {
-    constructor() {
+    /**
+     *
+     * @param {string} [worker_path]
+     */
+    constructor({
+                    worker_path = 'bundle-worker-image-decoder.js'
+                }={}) {
+
         super();
 
         const workerBuilder = new WorkerBuilder();
 
-        workerBuilder.importScript('bundle-worker-image-decoder.js');
+        workerBuilder.importScript(worker_path);
 
         workerBuilder.addMethod('decode', function (data, type) {
             return Lib.decode(data, type);