From 9c36be182f4da3462c7871a7d882da91689e7a14 Mon Sep 17 00:00:00 2001 From: "Richard T. Carback III" <rick.carback@gmail.com> Date: Thu, 8 Feb 2024 21:22:00 +0000 Subject: [PATCH] Use fixed relative paths. I believe this will work the way we load it, but if it does not we will leverage the global xxdk_base_path to set it explicitly --- assets/jsutils/channelsIndexedDbWorker.js | 6 ++++-- assets/jsutils/dmIndexedDbWorker.js | 6 ++++-- assets/jsutils/logFileWorker.js | 6 ++++-- assets/jsutils/stateIndexedDbWorker.js | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/assets/jsutils/channelsIndexedDbWorker.js b/assets/jsutils/channelsIndexedDbWorker.js index 4ca8fa6c..f37ab6a4 100644 --- a/assets/jsutils/channelsIndexedDbWorker.js +++ b/assets/jsutils/channelsIndexedDbWorker.js @@ -5,7 +5,10 @@ // LICENSE file. // //////////////////////////////////////////////////////////////////////////////// +// NOTE: wasm_exec.js must always be in the same directory as this script. importScripts('wasm_exec.js'); +// NOTE: This relative path must be preserved in distribution. +const binPath = '../wasm/xxdk-channelsIndexedDkWorker.wasm' const isReady = new Promise((resolve) => { self.onWasmInitialized = resolve; @@ -16,10 +19,9 @@ go.argv = [ '--logLevel=2', '--threadLogLevel=2', ] -const binPath = 'xxdk-channelsIndexedDkWorker.wasm' WebAssembly.instantiateStreaming(fetch(binPath), go.importObject).then(async (result) => { go.run(result.instance); await isReady; }).catch((err) => { console.error(err); -}); \ No newline at end of file +}); diff --git a/assets/jsutils/dmIndexedDbWorker.js b/assets/jsutils/dmIndexedDbWorker.js index 41a5492f..5605dba7 100644 --- a/assets/jsutils/dmIndexedDbWorker.js +++ b/assets/jsutils/dmIndexedDbWorker.js @@ -5,7 +5,10 @@ // LICENSE file. // //////////////////////////////////////////////////////////////////////////////// +// NOTE: wasm_exec.js must always be in the same directory as this script. importScripts('wasm_exec.js'); +// NOTE: This relative path must be preserved in distribution. +const binPath = '../wasm/xxdk-dmIndexedDkWorker.wasm' const isReady = new Promise((resolve) => { self.onWasmInitialized = resolve; @@ -16,10 +19,9 @@ go.argv = [ '--logLevel=2', '--threadLogLevel=2', ] -const binPath = 'xxdk-dmIndexedDkWorker.wasm' WebAssembly.instantiateStreaming(fetch(binPath), go.importObject).then(async (result) => { go.run(result.instance); await isReady; }).catch((err) => { console.error(err); -}); \ No newline at end of file +}); diff --git a/assets/jsutils/logFileWorker.js b/assets/jsutils/logFileWorker.js index ed246f62..1ef114bb 100644 --- a/assets/jsutils/logFileWorker.js +++ b/assets/jsutils/logFileWorker.js @@ -5,17 +5,19 @@ // LICENSE file. // //////////////////////////////////////////////////////////////////////////////// +// NOTE: wasm_exec.js must always be in the same directory as this script. importScripts('wasm_exec.js'); +// NOTE: This relative path must be preserved in distribution. +const binPath = '../wasm/xxdk-logFileWorker.wasm' const isReady = new Promise((resolve) => { self.onWasmInitialized = resolve; }); const go = new Go(); -const binPath = 'xxdk-logFileWorker.wasm' WebAssembly.instantiateStreaming(fetch(binPath), go.importObject).then(async (result) => { go.run(result.instance); await isReady; }).catch((err) => { console.error(err); -}); \ No newline at end of file +}); diff --git a/assets/jsutils/stateIndexedDbWorker.js b/assets/jsutils/stateIndexedDbWorker.js index cff3e34a..b4009ef3 100644 --- a/assets/jsutils/stateIndexedDbWorker.js +++ b/assets/jsutils/stateIndexedDbWorker.js @@ -5,7 +5,10 @@ // LICENSE file. // //////////////////////////////////////////////////////////////////////////////// +// NOTE: wasm_exec.js must always be in the same directory as this script. importScripts('wasm_exec.js'); +// NOTE: This relative path must be preserved in distribution. +const binPath = '../wasm/xxdk-stateIndexedDkWorker.wasm' const isReady = new Promise((resolve) => { self.onWasmInitialized = resolve; @@ -16,10 +19,9 @@ go.argv = [ '--logLevel=2', '--threadLogLevel=2', ] -const binPath = 'xxdk-stateIndexedDkWorker.wasm' WebAssembly.instantiateStreaming(fetch(binPath), go.importObject).then(async (result) => { go.run(result.instance); await isReady; }).catch((err) => { console.error(err); -}); \ No newline at end of file +}); -- GitLab