@loaders.gl/terrain
Advanced tools
Comparing version 4.0.1 to 4.0.2
@@ -44,3 +44,3 @@ "use strict"; | ||
// ../worker-utils/src/lib/worker-farm/worker-body.ts | ||
function getParentPort() { | ||
async function getParentPort() { | ||
let parentPort; | ||
@@ -51,2 +51,9 @@ try { | ||
} catch { | ||
try { | ||
eval("globalThis.workerThreadsPromise = import('worker_threads')"); | ||
const workerThreads = await globalThis.workerThreadsPromise; | ||
parentPort = workerThreads.parentPort; | ||
} catch (error) { | ||
console.error(error.message); | ||
} | ||
} | ||
@@ -58,4 +65,4 @@ return parentPort; | ||
/** Check that we are actually in a worker thread */ | ||
static inWorkerThread() { | ||
return typeof self !== "undefined" || Boolean(getParentPort()); | ||
static async inWorkerThread() { | ||
return typeof self !== "undefined" || Boolean(await getParentPort()); | ||
} | ||
@@ -66,23 +73,24 @@ /* | ||
static set onmessage(onMessage) { | ||
function handleMessage(message) { | ||
const parentPort3 = getParentPort(); | ||
const { type, payload } = parentPort3 ? message : message.data; | ||
async function handleMessage(message) { | ||
const parentPort2 = await getParentPort(); | ||
const { type, payload } = parentPort2 ? message : message.data; | ||
onMessage(type, payload); | ||
} | ||
const parentPort2 = getParentPort(); | ||
if (parentPort2) { | ||
parentPort2.on("message", handleMessage); | ||
parentPort2.on("exit", () => console.debug("Node worker closing")); | ||
} else { | ||
globalThis.onmessage = handleMessage; | ||
} | ||
getParentPort().then((parentPort2) => { | ||
if (parentPort2) { | ||
parentPort2.on("message", handleMessage); | ||
parentPort2.on("exit", () => console.debug("Node worker closing")); | ||
} else { | ||
globalThis.onmessage = handleMessage; | ||
} | ||
}); | ||
} | ||
static addEventListener(onMessage) { | ||
static async addEventListener(onMessage) { | ||
let onMessageWrapper = onMessageWrapperMap.get(onMessage); | ||
if (!onMessageWrapper) { | ||
onMessageWrapper = (message) => { | ||
onMessageWrapper = async (message) => { | ||
if (!isKnownMessage(message)) { | ||
return; | ||
} | ||
const parentPort3 = getParentPort(); | ||
const parentPort3 = await getParentPort(); | ||
const { type, payload } = parentPort3 ? message : message.data; | ||
@@ -92,3 +100,3 @@ onMessage(type, payload); | ||
} | ||
const parentPort2 = getParentPort(); | ||
const parentPort2 = await getParentPort(); | ||
if (parentPort2) { | ||
@@ -100,6 +108,6 @@ console.error("not implemented"); | ||
} | ||
static removeEventListener(onMessage) { | ||
static async removeEventListener(onMessage) { | ||
const onMessageWrapper = onMessageWrapperMap.get(onMessage); | ||
onMessageWrapperMap.delete(onMessage); | ||
const parentPort2 = getParentPort(); | ||
const parentPort2 = await getParentPort(); | ||
if (parentPort2) { | ||
@@ -116,6 +124,6 @@ console.error("not implemented"); | ||
*/ | ||
static postMessage(type, payload) { | ||
static async postMessage(type, payload) { | ||
const data = { source: "loaders.gl", type, payload }; | ||
const transferList = getTransferList(payload); | ||
const parentPort2 = getParentPort(); | ||
const parentPort2 = await getParentPort(); | ||
if (parentPort2) { | ||
@@ -135,4 +143,4 @@ parentPort2.postMessage(data, transferList); | ||
var requestId = 0; | ||
function createLoaderWorker(loader) { | ||
if (!WorkerBody.inWorkerThread()) { | ||
async function createLoaderWorker(loader) { | ||
if (!await WorkerBody.inWorkerThread()) { | ||
return; | ||
@@ -1304,3 +1312,3 @@ } | ||
// src/lib/utils/version.ts | ||
var VERSION = true ? "4.0.1" : "latest"; | ||
var VERSION = true ? "4.0.2" : "latest"; | ||
@@ -1307,0 +1315,0 @@ // src/terrain-loader.ts |
@@ -44,3 +44,3 @@ "use strict"; | ||
// ../worker-utils/src/lib/worker-farm/worker-body.ts | ||
function getParentPort() { | ||
async function getParentPort() { | ||
let parentPort; | ||
@@ -51,2 +51,9 @@ try { | ||
} catch { | ||
try { | ||
eval("globalThis.workerThreadsPromise = import('worker_threads')"); | ||
const workerThreads = await globalThis.workerThreadsPromise; | ||
parentPort = workerThreads.parentPort; | ||
} catch (error) { | ||
console.error(error.message); | ||
} | ||
} | ||
@@ -58,4 +65,4 @@ return parentPort; | ||
/** Check that we are actually in a worker thread */ | ||
static inWorkerThread() { | ||
return typeof self !== "undefined" || Boolean(getParentPort()); | ||
static async inWorkerThread() { | ||
return typeof self !== "undefined" || Boolean(await getParentPort()); | ||
} | ||
@@ -66,23 +73,24 @@ /* | ||
static set onmessage(onMessage) { | ||
function handleMessage(message) { | ||
const parentPort3 = getParentPort(); | ||
const { type, payload } = parentPort3 ? message : message.data; | ||
async function handleMessage(message) { | ||
const parentPort2 = await getParentPort(); | ||
const { type, payload } = parentPort2 ? message : message.data; | ||
onMessage(type, payload); | ||
} | ||
const parentPort2 = getParentPort(); | ||
if (parentPort2) { | ||
parentPort2.on("message", handleMessage); | ||
parentPort2.on("exit", () => console.debug("Node worker closing")); | ||
} else { | ||
globalThis.onmessage = handleMessage; | ||
} | ||
getParentPort().then((parentPort2) => { | ||
if (parentPort2) { | ||
parentPort2.on("message", handleMessage); | ||
parentPort2.on("exit", () => console.debug("Node worker closing")); | ||
} else { | ||
globalThis.onmessage = handleMessage; | ||
} | ||
}); | ||
} | ||
static addEventListener(onMessage) { | ||
static async addEventListener(onMessage) { | ||
let onMessageWrapper = onMessageWrapperMap.get(onMessage); | ||
if (!onMessageWrapper) { | ||
onMessageWrapper = (message) => { | ||
onMessageWrapper = async (message) => { | ||
if (!isKnownMessage(message)) { | ||
return; | ||
} | ||
const parentPort3 = getParentPort(); | ||
const parentPort3 = await getParentPort(); | ||
const { type, payload } = parentPort3 ? message : message.data; | ||
@@ -92,3 +100,3 @@ onMessage(type, payload); | ||
} | ||
const parentPort2 = getParentPort(); | ||
const parentPort2 = await getParentPort(); | ||
if (parentPort2) { | ||
@@ -100,6 +108,6 @@ console.error("not implemented"); | ||
} | ||
static removeEventListener(onMessage) { | ||
static async removeEventListener(onMessage) { | ||
const onMessageWrapper = onMessageWrapperMap.get(onMessage); | ||
onMessageWrapperMap.delete(onMessage); | ||
const parentPort2 = getParentPort(); | ||
const parentPort2 = await getParentPort(); | ||
if (parentPort2) { | ||
@@ -116,6 +124,6 @@ console.error("not implemented"); | ||
*/ | ||
static postMessage(type, payload) { | ||
static async postMessage(type, payload) { | ||
const data = { source: "loaders.gl", type, payload }; | ||
const transferList = getTransferList(payload); | ||
const parentPort2 = getParentPort(); | ||
const parentPort2 = await getParentPort(); | ||
if (parentPort2) { | ||
@@ -135,4 +143,4 @@ parentPort2.postMessage(data, transferList); | ||
var requestId = 0; | ||
function createLoaderWorker(loader) { | ||
if (!WorkerBody.inWorkerThread()) { | ||
async function createLoaderWorker(loader) { | ||
if (!await WorkerBody.inWorkerThread()) { | ||
return; | ||
@@ -1304,3 +1312,3 @@ } | ||
// src/lib/utils/version.ts | ||
var VERSION = true ? "4.0.1" : "latest"; | ||
var VERSION = true ? "4.0.2" : "latest"; | ||
@@ -1307,0 +1315,0 @@ // src/terrain-loader.ts |
{ | ||
"name": "@loaders.gl/terrain", | ||
"version": "4.0.1", | ||
"version": "4.0.2", | ||
"description": "Framework-independent loader for terrain raster formats", | ||
@@ -46,8 +46,8 @@ "license": "MIT", | ||
"@babel/runtime": "^7.3.1", | ||
"@loaders.gl/images": "4.0.1", | ||
"@loaders.gl/loader-utils": "4.0.1", | ||
"@loaders.gl/schema": "4.0.1", | ||
"@loaders.gl/images": "4.0.2", | ||
"@loaders.gl/loader-utils": "4.0.2", | ||
"@loaders.gl/schema": "4.0.2", | ||
"@mapbox/martini": "^0.2.0" | ||
}, | ||
"gitHead": "765e5a26a6bf3f2cc02cabffc4a1e3665ec92a53" | ||
"gitHead": "471058d109d5652f28c32c1f296fd632f9a5c806" | ||
} |
347251
7323
+ Added@loaders.gl/images@4.0.2(transitive)
+ Added@loaders.gl/loader-utils@4.0.2(transitive)
+ Added@loaders.gl/schema@4.0.2(transitive)
+ Added@loaders.gl/worker-utils@4.0.2(transitive)
- Removed@loaders.gl/images@4.0.1(transitive)
- Removed@loaders.gl/loader-utils@4.0.1(transitive)
- Removed@loaders.gl/schema@4.0.1(transitive)
- Removed@loaders.gl/worker-utils@4.0.1(transitive)
Updated@loaders.gl/images@4.0.2
Updated@loaders.gl/schema@4.0.2