@loaders.gl/terrain 4.0.1 → 4.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/quantized-mesh-worker.js +32 -24
  2. package/dist/terrain-worker.js +32 -24
  3. package/package.json +5 -5
package/dist/quantized-mesh-worker.js CHANGED
@@ -41,61 +41,69 @@
41
41
  }
42
42
 
43
43
  // ../worker-utils/src/lib/worker-farm/worker-body.ts
44
- function getParentPort() {
44
+ async function getParentPort() {
45
45
  let parentPort;
46
46
  try {
47
47
  eval("globalThis.parentPort = require('worker_threads').parentPort");
48
48
  parentPort = globalThis.parentPort;
49
49
  } catch {
50
+ try {
51
+ eval("globalThis.workerThreadsPromise = import('worker_threads')");
52
+ const workerThreads = await globalThis.workerThreadsPromise;
53
+ parentPort = workerThreads.parentPort;
54
+ } catch (error) {
55
+ console.error(error.message);
56
+ }
50
57
  }
51
58
  return parentPort;
52
59
  }
53
60
  var onMessageWrapperMap = /* @__PURE__ */ new Map();
54
61
  var WorkerBody = class {
55
62
  /** Check that we are actually in a worker thread */
56
- static inWorkerThread() {
57
- return typeof self !== "undefined" || Boolean(getParentPort());
63
+ static async inWorkerThread() {
64
+ return typeof self !== "undefined" || Boolean(await getParentPort());
58
65
  }
59
66
  /*
60
67
  * (type: WorkerMessageType, payload: WorkerMessagePayload) => any
61
68
  */
62
69
  static set onmessage(onMessage) {
63
- function handleMessage(message) {
64
- const parentPort3 = getParentPort();
65
- const { type, payload } = parentPort3 ? message : message.data;
70
+ async function handleMessage(message) {
71
+ const parentPort2 = await getParentPort();
72
+ const { type, payload } = parentPort2 ? message : message.data;
66
73
  onMessage(type, payload);
67
74
  }
68
- const parentPort2 = getParentPort();
69
- if (parentPort2) {
70
- parentPort2.on("message", handleMessage);
71
- parentPort2.on("exit", () => console.debug("Node worker closing"));
72
- } else {
73
- globalThis.onmessage = handleMessage;
74
- }
75
+ getParentPort().then((parentPort2) => {
76
+ if (parentPort2) {
77
+ parentPort2.on("message", handleMessage);
78
+ parentPort2.on("exit", () => console.debug("Node worker closing"));
79
+ } else {
80
+ globalThis.onmessage = handleMessage;
81
+ }
82
+ });
75
83
  }
76
- static addEventListener(onMessage) {
84
+ static async addEventListener(onMessage) {
77
85
  let onMessageWrapper = onMessageWrapperMap.get(onMessage);
78
86
  if (!onMessageWrapper) {
79
- onMessageWrapper = (message) => {
87
+ onMessageWrapper = async (message) => {
80
88
  if (!isKnownMessage(message)) {
81
89
  return;
82
90
  }
83
- const parentPort3 = getParentPort();
91
+ const parentPort3 = await getParentPort();
84
92
  const { type, payload } = parentPort3 ? message : message.data;
85
93
  onMessage(type, payload);
86
94
  };
87
95
  }
88
- const parentPort2 = getParentPort();
96
+ const parentPort2 = await getParentPort();
89
97
  if (parentPort2) {
90
98
  console.error("not implemented");
91
99
  } else {
92
100
  globalThis.addEventListener("message", onMessageWrapper);
93
101
  }
94
102
  }
95
- static removeEventListener(onMessage) {
103
+ static async removeEventListener(onMessage) {
96
104
  const onMessageWrapper = onMessageWrapperMap.get(onMessage);
97
105
  onMessageWrapperMap.delete(onMessage);
98
- const parentPort2 = getParentPort();
106
+ const parentPort2 = await getParentPort();
99
107
  if (parentPort2) {
100
108
  console.error("not implemented");
101
109
  } else {
@@ -107,10 +115,10 @@
107
115
  * @param type
108
116
  * @param payload
109
117
  */
110
- static postMessage(type, payload) {
118
+ static async postMessage(type, payload) {
111
119
  const data = { source: "loaders.gl", type, payload };
112
120
  const transferList = getTransferList(payload);
113
- const parentPort2 = getParentPort();
121
+ const parentPort2 = await getParentPort();
114
122
  if (parentPort2) {
115
123
  parentPort2.postMessage(data, transferList);
116
124
  } else {
@@ -125,8 +133,8 @@
125
133
 
126
134
  // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
127
135
  var requestId = 0;
128
- function createLoaderWorker(loader) {
129
- if (!WorkerBody.inWorkerThread()) {
136
+ async function createLoaderWorker(loader) {
137
+ if (!await WorkerBody.inWorkerThread()) {
130
138
  return;
131
139
  }
132
140
  WorkerBody.onmessage = async (type, payload) => {
@@ -1293,7 +1301,7 @@
1293
1301
  }
1294
1302
 
1295
1303
  // src/lib/utils/version.ts
1296
- var VERSION = true ? "4.0.1" : "latest";
1304
+ var VERSION = true ? "4.0.2" : "latest";
1297
1305
 
1298
1306
  // src/terrain-loader.ts
1299
1307
  var TerrainLoader = {
package/dist/terrain-worker.js CHANGED
@@ -41,61 +41,69 @@
41
41
  }
42
42
 
43
43
  // ../worker-utils/src/lib/worker-farm/worker-body.ts
44
- function getParentPort() {
44
+ async function getParentPort() {
45
45
  let parentPort;
46
46
  try {
47
47
  eval("globalThis.parentPort = require('worker_threads').parentPort");
48
48
  parentPort = globalThis.parentPort;
49
49
  } catch {
50
+ try {
51
+ eval("globalThis.workerThreadsPromise = import('worker_threads')");
52
+ const workerThreads = await globalThis.workerThreadsPromise;
53
+ parentPort = workerThreads.parentPort;
54
+ } catch (error) {
55
+ console.error(error.message);
56
+ }
50
57
  }
51
58
  return parentPort;
52
59
  }
53
60
  var onMessageWrapperMap = /* @__PURE__ */ new Map();
54
61
  var WorkerBody = class {
55
62
  /** Check that we are actually in a worker thread */
56
- static inWorkerThread() {
57
- return typeof self !== "undefined" || Boolean(getParentPort());
63
+ static async inWorkerThread() {
64
+ return typeof self !== "undefined" || Boolean(await getParentPort());
58
65
  }
59
66
  /*
60
67
  * (type: WorkerMessageType, payload: WorkerMessagePayload) => any
61
68
  */
62
69
  static set onmessage(onMessage) {
63
- function handleMessage(message) {
64
- const parentPort3 = getParentPort();
65
- const { type, payload } = parentPort3 ? message : message.data;
70
+ async function handleMessage(message) {
71
+ const parentPort2 = await getParentPort();
72
+ const { type, payload } = parentPort2 ? message : message.data;
66
73
  onMessage(type, payload);
67
74
  }
68
- const parentPort2 = getParentPort();
69
- if (parentPort2) {
70
- parentPort2.on("message", handleMessage);
71
- parentPort2.on("exit", () => console.debug("Node worker closing"));
72
- } else {
73
- globalThis.onmessage = handleMessage;
74
- }
75
+ getParentPort().then((parentPort2) => {
76
+ if (parentPort2) {
77
+ parentPort2.on("message", handleMessage);
78
+ parentPort2.on("exit", () => console.debug("Node worker closing"));
79
+ } else {
80
+ globalThis.onmessage = handleMessage;
81
+ }
82
+ });
75
83
  }
76
- static addEventListener(onMessage) {
84
+ static async addEventListener(onMessage) {
77
85
  let onMessageWrapper = onMessageWrapperMap.get(onMessage);
78
86
  if (!onMessageWrapper) {
79
- onMessageWrapper = (message) => {
87
+ onMessageWrapper = async (message) => {
80
88
  if (!isKnownMessage(message)) {
81
89
  return;
82
90
  }
83
- const parentPort3 = getParentPort();
91
+ const parentPort3 = await getParentPort();
84
92
  const { type, payload } = parentPort3 ? message : message.data;
85
93
  onMessage(type, payload);
86
94
  };
87
95
  }
88
- const parentPort2 = getParentPort();
96
+ const parentPort2 = await getParentPort();
89
97
  if (parentPort2) {
90
98
  console.error("not implemented");
91
99
  } else {
92
100
  globalThis.addEventListener("message", onMessageWrapper);
93
101
  }
94
102
  }
95
- static removeEventListener(onMessage) {
103
+ static async removeEventListener(onMessage) {
96
104
  const onMessageWrapper = onMessageWrapperMap.get(onMessage);
97
105
  onMessageWrapperMap.delete(onMessage);
98
- const parentPort2 = getParentPort();
106
+ const parentPort2 = await getParentPort();
99
107
  if (parentPort2) {
100
108
  console.error("not implemented");
101
109
  } else {
@@ -107,10 +115,10 @@
107
115
  * @param type
108
116
  * @param payload
109
117
  */
110
- static postMessage(type, payload) {
118
+ static async postMessage(type, payload) {
111
119
  const data = { source: "loaders.gl", type, payload };
112
120
  const transferList = getTransferList(payload);
113
- const parentPort2 = getParentPort();
121
+ const parentPort2 = await getParentPort();
114
122
  if (parentPort2) {
115
123
  parentPort2.postMessage(data, transferList);
116
124
  } else {
@@ -125,8 +133,8 @@
125
133
 
126
134
  // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
127
135
  var requestId = 0;
128
- function createLoaderWorker(loader) {
129
- if (!WorkerBody.inWorkerThread()) {
136
+ async function createLoaderWorker(loader) {
137
+ if (!await WorkerBody.inWorkerThread()) {
130
138
  return;
131
139
  }
132
140
  WorkerBody.onmessage = async (type, payload) => {
@@ -1293,7 +1301,7 @@
1293
1301
  }
1294
1302
 
1295
1303
  // src/lib/utils/version.ts
1296
- var VERSION = true ? "4.0.1" : "latest";
1304
+ var VERSION = true ? "4.0.2" : "latest";
1297
1305
 
1298
1306
  // src/terrain-loader.ts
1299
1307
  var TerrainLoader = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@loaders.gl/terrain",
3
- "version": "4.0.1",
3
+ "version": "4.0.2",
4
4
  "description": "Framework-independent loader for terrain raster formats",
5
5
  "license": "MIT",
6
6
  "type": "module",
@@ -43,10 +43,10 @@
43
43
  },
44
44
  "dependencies": {
45
45
  "@babel/runtime": "^7.3.1",
46
- "@loaders.gl/images": "4.0.1",
47
- "@loaders.gl/loader-utils": "4.0.1",
48
- "@loaders.gl/schema": "4.0.1",
46
+ "@loaders.gl/images": "4.0.2",
47
+ "@loaders.gl/loader-utils": "4.0.2",
48
+ "@loaders.gl/schema": "4.0.2",
49
49
  "@mapbox/martini": "^0.2.0"
50
50
  },
51
- "gitHead": "765e5a26a6bf3f2cc02cabffc4a1e3665ec92a53"
51
+ "gitHead": "471058d109d5652f28c32c1f296fd632f9a5c806"
52
52
  }