@loaders.gl/loader-utils 3.3.0-alpha.1 → 3.3.0-alpha.11
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.
- package/dist/es5/index.js +97 -119
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/json-loader.js +2 -9
- package/dist/es5/json-loader.js.map +1 -1
- package/dist/es5/lib/binary-utils/array-buffer-utils.js +6 -26
- package/dist/es5/lib/binary-utils/array-buffer-utils.js.map +1 -1
- package/dist/es5/lib/binary-utils/binary-copy-utils.js +0 -4
- package/dist/es5/lib/binary-utils/binary-copy-utils.js.map +1 -1
- package/dist/es5/lib/binary-utils/buffer-utils.js +1 -9
- package/dist/es5/lib/binary-utils/buffer-utils.js.map +1 -1
- package/dist/es5/lib/binary-utils/encode-utils.js +2 -8
- package/dist/es5/lib/binary-utils/encode-utils.js.map +1 -1
- package/dist/es5/lib/binary-utils/get-first-characters.js +0 -7
- package/dist/es5/lib/binary-utils/get-first-characters.js.map +1 -1
- package/dist/es5/lib/binary-utils/memory-copy-utils.js +1 -4
- package/dist/es5/lib/binary-utils/memory-copy-utils.js.map +1 -1
- package/dist/es5/lib/env-utils/assert.js +0 -1
- package/dist/es5/lib/env-utils/assert.js.map +1 -1
- package/dist/es5/lib/env-utils/globals.js +5 -4
- package/dist/es5/lib/env-utils/globals.js.map +1 -1
- package/dist/es5/lib/filesystems/node-filesystem.js +2 -45
- package/dist/es5/lib/filesystems/node-filesystem.js.map +1 -1
- package/dist/es5/lib/iterators/async-iteration.js +57 -127
- package/dist/es5/lib/iterators/async-iteration.js.map +1 -1
- package/dist/es5/lib/iterators/text-iterators.js +127 -242
- package/dist/es5/lib/iterators/text-iterators.js.map +1 -1
- package/dist/es5/lib/node/buffer.js +0 -6
- package/dist/es5/lib/node/buffer.js.map +1 -1
- package/dist/es5/lib/node/fs.js +17 -24
- package/dist/es5/lib/node/fs.js.map +1 -1
- package/dist/es5/lib/node/util.js +20 -11
- package/dist/es5/lib/node/util.js.map +1 -1
- package/dist/es5/lib/parser-utils/parse-json.js +0 -2
- package/dist/es5/lib/parser-utils/parse-json.js.map +1 -1
- package/dist/es5/lib/path-utils/file-aliases.js +3 -4
- package/dist/es5/lib/path-utils/file-aliases.js.map +1 -1
- package/dist/es5/lib/path-utils/path.js +1 -4
- package/dist/es5/lib/path-utils/path.js.map +1 -1
- package/dist/es5/lib/request-utils/request-scheduler.js +24 -33
- package/dist/es5/lib/request-utils/request-scheduler.js.map +1 -1
- package/dist/es5/lib/worker-loader-utils/create-loader-worker.js +2 -36
- package/dist/es5/lib/worker-loader-utils/create-loader-worker.js.map +1 -1
- package/dist/es5/lib/worker-loader-utils/encode-with-worker.js +0 -4
- package/dist/es5/lib/worker-loader-utils/encode-with-worker.js.map +1 -1
- package/dist/es5/lib/worker-loader-utils/parse-with-worker.js +2 -23
- package/dist/es5/lib/worker-loader-utils/parse-with-worker.js.map +1 -1
- package/dist/es5/types.js.map +1 -1
- package/dist/es5/workers/json-worker.js +0 -2
- package/dist/es5/workers/json-worker.js.map +1 -1
- package/dist/esm/index.js +15 -3
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/json-loader.js +3 -2
- package/dist/esm/json-loader.js.map +1 -1
- package/dist/esm/lib/binary-utils/array-buffer-utils.js +16 -15
- package/dist/esm/lib/binary-utils/array-buffer-utils.js.map +1 -1
- package/dist/esm/lib/binary-utils/binary-copy-utils.js +2 -2
- package/dist/esm/lib/binary-utils/binary-copy-utils.js.map +1 -1
- package/dist/esm/lib/binary-utils/buffer-utils.js +3 -1
- package/dist/esm/lib/binary-utils/buffer-utils.js.map +1 -1
- package/dist/esm/lib/binary-utils/encode-utils.js +2 -4
- package/dist/esm/lib/binary-utils/encode-utils.js.map +1 -1
- package/dist/esm/lib/binary-utils/get-first-characters.js +2 -5
- package/dist/esm/lib/binary-utils/get-first-characters.js.map +1 -1
- package/dist/esm/lib/binary-utils/memory-copy-utils.js +5 -2
- package/dist/esm/lib/binary-utils/memory-copy-utils.js.map +1 -1
- package/dist/esm/lib/env-utils/assert.js +1 -0
- package/dist/esm/lib/env-utils/assert.js.map +1 -1
- package/dist/esm/lib/env-utils/globals.js +7 -1
- package/dist/esm/lib/env-utils/globals.js.map +1 -1
- package/dist/esm/lib/filesystems/node-filesystem.js +10 -16
- package/dist/esm/lib/filesystems/node-filesystem.js.map +1 -1
- package/dist/esm/lib/iterators/async-iteration.js +2 -7
- package/dist/esm/lib/iterators/async-iteration.js.map +1 -1
- package/dist/esm/lib/iterators/text-iterators.js +7 -7
- package/dist/esm/lib/iterators/text-iterators.js.map +1 -1
- package/dist/esm/lib/node/buffer.js +4 -5
- package/dist/esm/lib/node/buffer.js.map +1 -1
- package/dist/esm/lib/node/fs.js +16 -13
- package/dist/esm/lib/node/fs.js.map +1 -1
- package/dist/esm/lib/node/util.js +16 -2
- package/dist/esm/lib/node/util.js.map +1 -1
- package/dist/esm/lib/parser-utils/parse-json.js +1 -0
- package/dist/esm/lib/parser-utils/parse-json.js.map +1 -1
- package/dist/esm/lib/path-utils/file-aliases.js +6 -2
- package/dist/esm/lib/path-utils/file-aliases.js.map +1 -1
- package/dist/esm/lib/path-utils/path.js +8 -3
- package/dist/esm/lib/path-utils/path.js.map +1 -1
- package/dist/esm/lib/request-utils/request-scheduler.js +11 -21
- package/dist/esm/lib/request-utils/request-scheduler.js.map +1 -1
- package/dist/esm/lib/worker-loader-utils/create-loader-worker.js +19 -17
- package/dist/esm/lib/worker-loader-utils/create-loader-worker.js.map +1 -1
- package/dist/esm/lib/worker-loader-utils/encode-with-worker.js +1 -1
- package/dist/esm/lib/worker-loader-utils/encode-with-worker.js.map +1 -1
- package/dist/esm/lib/worker-loader-utils/parse-with-worker.js +6 -7
- package/dist/esm/lib/worker-loader-utils/parse-with-worker.js.map +1 -1
- package/dist/esm/types.js.map +1 -1
- package/dist/esm/workers/json-worker.js.map +1 -1
- package/dist/index.d.ts +1 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +10 -8
- package/dist/lib/binary-utils/buffer-utils.js +5 -1
- package/dist/lib/env-utils/globals.d.ts +1 -1
- package/dist/lib/env-utils/globals.d.ts.map +1 -1
- package/dist/lib/filesystems/node-filesystem.d.ts +3 -2
- package/dist/lib/filesystems/node-filesystem.d.ts.map +1 -1
- package/dist/lib/filesystems/node-filesystem.js +5 -1
- package/dist/lib/node/fs.js +8 -8
- package/dist/lib/node/util.d.ts +10 -3
- package/dist/lib/node/util.d.ts.map +1 -1
- package/dist/lib/node/util.js +24 -23
- package/dist/lib/request-utils/request-scheduler.d.ts +6 -6
- package/dist/lib/request-utils/request-scheduler.d.ts.map +1 -1
- package/dist/lib/worker-loader-utils/create-loader-worker.js +1 -1
- package/dist/types.d.ts +29 -29
- package/dist/types.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/index.ts +3 -6
- package/src/lib/node/fs.ts +9 -9
- package/src/lib/node/util.ts +28 -2
package/dist/esm/lib/node/fs.js
CHANGED
|
@@ -1,12 +1,15 @@
|
|
|
1
|
+
|
|
1
2
|
import fs from 'fs';
|
|
2
3
|
import { toArrayBuffer } from './buffer';
|
|
3
|
-
import {
|
|
4
|
+
import { promisify1, promisify2 } from './util';
|
|
4
5
|
export let readdir;
|
|
5
6
|
export let stat;
|
|
7
|
+
|
|
6
8
|
export let readFile;
|
|
7
9
|
export let readFileSync;
|
|
8
10
|
export let writeFile;
|
|
9
11
|
export let writeFileSync;
|
|
12
|
+
|
|
10
13
|
export let open;
|
|
11
14
|
export let close;
|
|
12
15
|
export let read;
|
|
@@ -14,29 +17,29 @@ export let fstat;
|
|
|
14
17
|
export let isSupported = Boolean(fs);
|
|
15
18
|
|
|
16
19
|
try {
|
|
17
|
-
readdir =
|
|
18
|
-
stat =
|
|
19
|
-
|
|
20
|
+
readdir = promisify1(fs.readdir);
|
|
21
|
+
stat = promisify1(fs.stat);
|
|
22
|
+
|
|
23
|
+
readFile = promisify1(fs.readFile);
|
|
20
24
|
readFileSync = fs.readFileSync;
|
|
21
|
-
writeFile =
|
|
25
|
+
writeFile = promisify2(fs.writeFile);
|
|
22
26
|
writeFileSync = fs.writeFileSync;
|
|
23
|
-
open = promisify(fs.open);
|
|
24
|
-
close = promisify(fs.close);
|
|
25
|
-
read = promisify(fs.read);
|
|
26
|
-
fstat = promisify(fs.fstat);
|
|
27
|
-
isSupported = Boolean(fs);
|
|
28
|
-
} catch {}
|
|
29
27
|
|
|
28
|
+
open = promisify1(fs.open);
|
|
29
|
+
close = promisify1(fs.close);
|
|
30
|
+
read = promisify1(fs.read);
|
|
31
|
+
fstat = promisify1(fs.fstat);
|
|
32
|
+
isSupported = Boolean(fs);
|
|
33
|
+
} catch {
|
|
34
|
+
}
|
|
30
35
|
export async function _readToArrayBuffer(fd, start, length) {
|
|
31
36
|
const buffer = Buffer.alloc(length);
|
|
32
37
|
const {
|
|
33
38
|
bytesRead
|
|
34
39
|
} = await read(fd, buffer, 0, length, start);
|
|
35
|
-
|
|
36
40
|
if (bytesRead !== length) {
|
|
37
41
|
throw new Error('fs.read failed');
|
|
38
42
|
}
|
|
39
|
-
|
|
40
43
|
return toArrayBuffer(buffer);
|
|
41
44
|
}
|
|
42
45
|
//# sourceMappingURL=fs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"fs.js","names":["fs","toArrayBuffer","promisify1","promisify2","readdir","stat","readFile","readFileSync","writeFile","writeFileSync","open","close","read","fstat","isSupported","Boolean","_readToArrayBuffer","fd","start","length","buffer","Buffer","alloc","bytesRead","Error"],"sources":["../../../../src/lib/node/fs.ts"],"sourcesContent":["// fs wrapper (promisified fs + avoids bundling fs in browsers)\nimport fs from 'fs';\nimport {toArrayBuffer} from './buffer';\nimport {promisify1, promisify2} from './util';\n\nexport type {Stats} from 'fs';\n\nexport let readdir;\n/** Wrapper for Node.js fs method */\nexport let stat;\n\n/** Wrapper for Node.js fs method */\nexport let readFile;\n/** Wrapper for Node.js fs method */\nexport let readFileSync;\n/** Wrapper for Node.js fs method */\nexport let writeFile;\n/** Wrapper for Node.js fs method */\nexport let writeFileSync;\n\n// file descriptors\n\n/** Wrapper for Node.js fs method */\nexport let open;\n/** Wrapper for Node.js fs method */\nexport let close;\n/** Wrapper for Node.js fs method */\nexport let read;\n/** Wrapper for Node.js fs method */\nexport let fstat;\n\nexport let isSupported = Boolean(fs);\n\n// paths\n\ntry {\n /** Wrapper for Node.js fs method */\n readdir = promisify1(fs.readdir);\n /** Wrapper for Node.js fs method */\n stat = promisify1(fs.stat);\n\n /** Wrapper for Node.js fs method */\n readFile = promisify1(fs.readFile);\n /** Wrapper for Node.js fs method */\n readFileSync = fs.readFileSync;\n /** Wrapper for Node.js fs method */\n writeFile = promisify2(fs.writeFile);\n /** Wrapper for Node.js fs method */\n writeFileSync = fs.writeFileSync;\n\n // file descriptors\n\n /** Wrapper for Node.js fs method */\n open = promisify1(fs.open);\n /** Wrapper for Node.js fs method */\n close = promisify1(fs.close);\n /** Wrapper for Node.js fs method */\n read = promisify1(fs.read);\n /** Wrapper for Node.js fs method */\n fstat = promisify1(fs.fstat);\n\n isSupported = Boolean(fs);\n} catch {\n // ignore\n}\n\nexport async function _readToArrayBuffer(fd: number, start: number, length: number) {\n const buffer = Buffer.alloc(length);\n const {bytesRead} = await read(fd, buffer, 0, length, start);\n if (bytesRead !== length) {\n throw new Error('fs.read failed');\n }\n return toArrayBuffer(buffer);\n}\n"],"mappings":";AACA,OAAOA,EAAE,MAAM,IAAI;AACnB,SAAQC,aAAa,QAAO,UAAU;AACtC,SAAQC,UAAU,EAAEC,UAAU,QAAO,QAAQ;AAI7C,OAAO,IAAIC,OAAO;AAElB,OAAO,IAAIC,IAAI;;AAGf,OAAO,IAAIC,QAAQ;AAEnB,OAAO,IAAIC,YAAY;AAEvB,OAAO,IAAIC,SAAS;AAEpB,OAAO,IAAIC,aAAa;;AAKxB,OAAO,IAAIC,IAAI;AAEf,OAAO,IAAIC,KAAK;AAEhB,OAAO,IAAIC,IAAI;AAEf,OAAO,IAAIC,KAAK;AAEhB,OAAO,IAAIC,WAAW,GAAGC,OAAO,CAACf,EAAE,CAAC;;AAIpC,IAAI;EAEFI,OAAO,GAAGF,UAAU,CAACF,EAAE,CAACI,OAAO,CAAC;EAEhCC,IAAI,GAAGH,UAAU,CAACF,EAAE,CAACK,IAAI,CAAC;;EAG1BC,QAAQ,GAAGJ,UAAU,CAACF,EAAE,CAACM,QAAQ,CAAC;EAElCC,YAAY,GAAGP,EAAE,CAACO,YAAY;EAE9BC,SAAS,GAAGL,UAAU,CAACH,EAAE,CAACQ,SAAS,CAAC;EAEpCC,aAAa,GAAGT,EAAE,CAACS,aAAa;;EAKhCC,IAAI,GAAGR,UAAU,CAACF,EAAE,CAACU,IAAI,CAAC;EAE1BC,KAAK,GAAGT,UAAU,CAACF,EAAE,CAACW,KAAK,CAAC;EAE5BC,IAAI,GAAGV,UAAU,CAACF,EAAE,CAACY,IAAI,CAAC;EAE1BC,KAAK,GAAGX,UAAU,CAACF,EAAE,CAACa,KAAK,CAAC;EAE5BC,WAAW,GAAGC,OAAO,CAACf,EAAE,CAAC;AAC3B,CAAC,CAAC,MAAM;AAER;AAEA,OAAO,eAAegB,kBAAkB,CAACC,EAAU,EAAEC,KAAa,EAAEC,MAAc,EAAE;EAClF,MAAMC,MAAM,GAAGC,MAAM,CAACC,KAAK,CAACH,MAAM,CAAC;EACnC,MAAM;IAACI;EAAS,CAAC,GAAG,MAAMX,IAAI,CAACK,EAAE,EAAEG,MAAM,EAAE,CAAC,EAAED,MAAM,EAAED,KAAK,CAAC;EAC5D,IAAIK,SAAS,KAAKJ,MAAM,EAAE;IACxB,MAAM,IAAIK,KAAK,CAAC,gBAAgB,CAAC;EACnC;EACA,OAAOvB,aAAa,CAACmB,MAAM,CAAC;AAC9B"}
|
|
@@ -1,3 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
|
|
2
|
+
|
|
3
|
+
export function promisify1(fn) {
|
|
4
|
+
return args => new Promise(resolve => {
|
|
5
|
+
fn(args, callbackArgs => {
|
|
6
|
+
resolve(callbackArgs);
|
|
7
|
+
});
|
|
8
|
+
});
|
|
9
|
+
}
|
|
10
|
+
export function promisify2(fn) {
|
|
11
|
+
return (arg1, arg2) => new Promise(resolve => {
|
|
12
|
+
fn(arg1, arg2, callbackArgs => {
|
|
13
|
+
resolve(callbackArgs);
|
|
14
|
+
});
|
|
15
|
+
});
|
|
16
|
+
}
|
|
3
17
|
//# sourceMappingURL=util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"util.js","names":["promisify1","fn","args","Promise","resolve","callbackArgs","promisify2","arg1","arg2"],"sources":["../../../../src/lib/node/util.ts"],"sourcesContent":["// @loaders.gl, MIT license\n\n/** Wrapper for Node.js promisify */\ntype Callback<A> = (args: A) => void;\n\n/**\n * Typesafe promisify implementation\n * @link https://dev.to/_gdelgado/implement-a-type-safe-version-of-node-s-promisify-in-7-lines-of-code-in-typescript-2j34\n * @param fn\n * @returns\n */\nexport function promisify1<T, A>(fn: (args: T, cb: Callback<A>) => void): (args: T) => Promise<A> {\n return (args: T) =>\n new Promise((resolve) => {\n fn(args, (callbackArgs) => {\n resolve(callbackArgs);\n });\n });\n}\n\nexport function promisify2<T1, T2, A>(\n fn: (arg1: T1, arg2: T2, cb: Callback<A>) => void\n): (arg1: T1, arg2: T2) => Promise<A> {\n return (arg1: T1, arg2: T2) =>\n new Promise((resolve) => {\n fn(arg1, arg2, (callbackArgs) => {\n resolve(callbackArgs);\n });\n });\n}\n"],"mappings":";;AAWA,OAAO,SAASA,UAAU,CAAOC,EAAsC,EAA2B;EAChG,OAAQC,IAAO,IACb,IAAIC,OAAO,CAAEC,OAAO,IAAK;IACvBH,EAAE,CAACC,IAAI,EAAGG,YAAY,IAAK;MACzBD,OAAO,CAACC,YAAY,CAAC;IACvB,CAAC,CAAC;EACJ,CAAC,CAAC;AACN;AAEA,OAAO,SAASC,UAAU,CACxBL,EAAiD,EACb;EACpC,OAAO,CAACM,IAAQ,EAAEC,IAAQ,KACxB,IAAIL,OAAO,CAAEC,OAAO,IAAK;IACvBH,EAAE,CAACM,IAAI,EAAEC,IAAI,EAAGH,YAAY,IAAK;MAC/BD,OAAO,CAACC,YAAY,CAAC;IACvB,CAAC,CAAC;EACJ,CAAC,CAAC;AACN"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"parse-json.js","names":["getFirstCharacters","parseJSON","string","JSON","parse","_","Error"],"sources":["../../../../src/lib/parser-utils/parse-json.ts"],"sourcesContent":["import {getFirstCharacters} from '../binary-utils/get-first-characters';\n\n/**\n * Minimal JSON parser that throws more meaningful error messages\n */\nexport function parseJSON(string: string): any {\n try {\n return JSON.parse(string);\n } catch (_) {\n throw new Error(`Failed to parse JSON from data starting with \"${getFirstCharacters(string)}\"`);\n }\n}\n"],"mappings":"AAAA,SAAQA,kBAAkB,QAAO,sCAAsC;;AAKvE,OAAO,SAASC,SAAS,CAACC,MAAc,EAAO;EAC7C,IAAI;IACF,OAAOC,IAAI,CAACC,KAAK,CAACF,MAAM,CAAC;EAC3B,CAAC,CAAC,OAAOG,CAAC,EAAE;IACV,MAAM,IAAIC,KAAK,0DAAkDN,kBAAkB,CAACE,MAAM,CAAC,QAAI;EACjG;AACF"}
|
|
@@ -1,14 +1,20 @@
|
|
|
1
|
+
|
|
2
|
+
|
|
1
3
|
let pathPrefix = '';
|
|
2
4
|
const fileAliases = {};
|
|
5
|
+
|
|
3
6
|
export function setPathPrefix(prefix) {
|
|
4
7
|
pathPrefix = prefix;
|
|
5
8
|
}
|
|
9
|
+
|
|
6
10
|
export function getPathPrefix() {
|
|
7
11
|
return pathPrefix;
|
|
8
12
|
}
|
|
13
|
+
|
|
9
14
|
export function addAliases(aliases) {
|
|
10
15
|
Object.assign(fileAliases, aliases);
|
|
11
16
|
}
|
|
17
|
+
|
|
12
18
|
export function resolvePath(filename) {
|
|
13
19
|
for (const alias in fileAliases) {
|
|
14
20
|
if (filename.startsWith(alias)) {
|
|
@@ -16,11 +22,9 @@ export function resolvePath(filename) {
|
|
|
16
22
|
filename = filename.replace(alias, replacement);
|
|
17
23
|
}
|
|
18
24
|
}
|
|
19
|
-
|
|
20
25
|
if (!filename.startsWith('http://') && !filename.startsWith('https://')) {
|
|
21
26
|
filename = "".concat(pathPrefix).concat(filename);
|
|
22
27
|
}
|
|
23
|
-
|
|
24
28
|
return filename;
|
|
25
29
|
}
|
|
26
30
|
//# sourceMappingURL=file-aliases.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"file-aliases.js","names":["pathPrefix","fileAliases","setPathPrefix","prefix","getPathPrefix","addAliases","aliases","Object","assign","resolvePath","filename","alias","startsWith","replacement","replace"],"sources":["../../../../src/lib/path-utils/file-aliases.ts"],"sourcesContent":["// Simple file alias mechanisms for tests.\n\nlet pathPrefix = '';\nconst fileAliases: {[aliasPath: string]: string} = {};\n\n/*\n * Set a relative path prefix\n */\nexport function setPathPrefix(prefix: string): void {\n pathPrefix = prefix;\n}\n\n/*\n * Get the relative path prefix\n */\nexport function getPathPrefix(): string {\n return pathPrefix;\n}\n\n/**\n *\n * @param aliases\n *\n * Note: addAliases are an experimental export, they are only for testing of loaders.gl loaders\n * not intended as a generic aliasing mechanism\n */\nexport function addAliases(aliases: {[aliasPath: string]: string}): void {\n Object.assign(fileAliases, aliases);\n}\n\n/**\n * Resolves aliases and adds path-prefix to paths\n */\nexport function resolvePath(filename: string): string {\n for (const alias in fileAliases) {\n if (filename.startsWith(alias)) {\n const replacement = fileAliases[alias];\n filename = filename.replace(alias, replacement);\n }\n }\n if (!filename.startsWith('http://') && !filename.startsWith('https://')) {\n filename = `${pathPrefix}${filename}`;\n }\n return filename;\n}\n"],"mappings":";;AAEA,IAAIA,UAAU,GAAG,EAAE;AACnB,MAAMC,WAA0C,GAAG,CAAC,CAAC;;AAKrD,OAAO,SAASC,aAAa,CAACC,MAAc,EAAQ;EAClDH,UAAU,GAAGG,MAAM;AACrB;;AAKA,OAAO,SAASC,aAAa,GAAW;EACtC,OAAOJ,UAAU;AACnB;;AASA,OAAO,SAASK,UAAU,CAACC,OAAsC,EAAQ;EACvEC,MAAM,CAACC,MAAM,CAACP,WAAW,EAAEK,OAAO,CAAC;AACrC;;AAKA,OAAO,SAASG,WAAW,CAACC,QAAgB,EAAU;EACpD,KAAK,MAAMC,KAAK,IAAIV,WAAW,EAAE;IAC/B,IAAIS,QAAQ,CAACE,UAAU,CAACD,KAAK,CAAC,EAAE;MAC9B,MAAME,WAAW,GAAGZ,WAAW,CAACU,KAAK,CAAC;MACtCD,QAAQ,GAAGA,QAAQ,CAACI,OAAO,CAACH,KAAK,EAAEE,WAAW,CAAC;IACjD;EACF;EACA,IAAI,CAACH,QAAQ,CAACE,UAAU,CAAC,SAAS,CAAC,IAAI,CAACF,QAAQ,CAACE,UAAU,CAAC,UAAU,CAAC,EAAE;IACvEF,QAAQ,aAAMV,UAAU,SAAGU,QAAQ,CAAE;EACvC;EACA,OAAOA,QAAQ;AACjB"}
|
|
@@ -1,22 +1,27 @@
|
|
|
1
|
+
|
|
2
|
+
|
|
1
3
|
export function filename(url) {
|
|
2
4
|
const slashIndex = url && url.lastIndexOf('/');
|
|
3
5
|
return slashIndex >= 0 ? url.substr(slashIndex + 1) : '';
|
|
4
6
|
}
|
|
7
|
+
|
|
5
8
|
export function dirname(url) {
|
|
6
9
|
const slashIndex = url && url.lastIndexOf('/');
|
|
7
10
|
return slashIndex >= 0 ? url.substr(0, slashIndex) : '';
|
|
8
11
|
}
|
|
9
|
-
|
|
12
|
+
|
|
13
|
+
export function join() {
|
|
14
|
+
for (var _len = arguments.length, parts = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
15
|
+
parts[_key] = arguments[_key];
|
|
16
|
+
}
|
|
10
17
|
const separator = '/';
|
|
11
18
|
parts = parts.map((part, index) => {
|
|
12
19
|
if (index) {
|
|
13
20
|
part = part.replace(new RegExp("^".concat(separator)), '');
|
|
14
21
|
}
|
|
15
|
-
|
|
16
22
|
if (index !== parts.length - 1) {
|
|
17
23
|
part = part.replace(new RegExp("".concat(separator, "$")), '');
|
|
18
24
|
}
|
|
19
|
-
|
|
20
25
|
return part;
|
|
21
26
|
});
|
|
22
27
|
return parts.join(separator);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"path.js","names":["filename","url","slashIndex","lastIndexOf","substr","dirname","join","parts","separator","map","part","index","replace","RegExp","length"],"sources":["../../../../src/lib/path-utils/path.ts"],"sourcesContent":["// Beginning of a minimal implementation of the Node.js path API, that doesn't pull in big polyfills.\n\n/**\n * Replacement for Node.js path.filename\n * @param url\n */\nexport function filename(url: string): string {\n const slashIndex = url && url.lastIndexOf('/');\n return slashIndex >= 0 ? url.substr((slashIndex as number) + 1) : '';\n}\n\n/**\n * Replacement for Node.js path.dirname\n * @param url\n */\nexport function dirname(url: string): string {\n const slashIndex = url && url.lastIndexOf('/');\n return slashIndex >= 0 ? url.substr(0, slashIndex as number) : '';\n}\n\n/**\n * Replacement for Node.js path.join\n * @param parts\n */\nexport function join(...parts: string[]): string {\n const separator = '/';\n parts = parts.map((part, index) => {\n if (index) {\n part = part.replace(new RegExp(`^${separator}`), '');\n }\n if (index !== parts.length - 1) {\n part = part.replace(new RegExp(`${separator}$`), '');\n }\n return part;\n });\n return parts.join(separator);\n}\n"],"mappings":";;AAMA,OAAO,SAASA,QAAQ,CAACC,GAAW,EAAU;EAC5C,MAAMC,UAAU,GAAGD,GAAG,IAAIA,GAAG,CAACE,WAAW,CAAC,GAAG,CAAC;EAC9C,OAAOD,UAAU,IAAI,CAAC,GAAGD,GAAG,CAACG,MAAM,CAAEF,UAAU,GAAc,CAAC,CAAC,GAAG,EAAE;AACtE;;AAMA,OAAO,SAASG,OAAO,CAACJ,GAAW,EAAU;EAC3C,MAAMC,UAAU,GAAGD,GAAG,IAAIA,GAAG,CAACE,WAAW,CAAC,GAAG,CAAC;EAC9C,OAAOD,UAAU,IAAI,CAAC,GAAGD,GAAG,CAACG,MAAM,CAAC,CAAC,EAAEF,UAAU,CAAW,GAAG,EAAE;AACnE;;AAMA,OAAO,SAASI,IAAI,GAA6B;EAAA,kCAAzBC,KAAK;IAALA,KAAK;EAAA;EAC3B,MAAMC,SAAS,GAAG,GAAG;EACrBD,KAAK,GAAGA,KAAK,CAACE,GAAG,CAAC,CAACC,IAAI,EAAEC,KAAK,KAAK;IACjC,IAAIA,KAAK,EAAE;MACTD,IAAI,GAAGA,IAAI,CAACE,OAAO,CAAC,IAAIC,MAAM,YAAKL,SAAS,EAAG,EAAE,EAAE,CAAC;IACtD;IACA,IAAIG,KAAK,KAAKJ,KAAK,CAACO,MAAM,GAAG,CAAC,EAAE;MAC9BJ,IAAI,GAAGA,IAAI,CAACE,OAAO,CAAC,IAAIC,MAAM,WAAIL,SAAS,OAAI,EAAE,EAAE,CAAC;IACtD;IACA,OAAOE,IAAI;EACb,CAAC,CAAC;EACF,OAAOH,KAAK,CAACD,IAAI,CAACE,SAAS,CAAC;AAC9B"}
|
|
@@ -10,23 +10,22 @@ const DEFAULT_PROPS = {
|
|
|
10
10
|
throttleRequests: true,
|
|
11
11
|
maxRequests: 6
|
|
12
12
|
};
|
|
13
|
+
|
|
13
14
|
export default class RequestScheduler {
|
|
14
|
-
constructor(props = {}) {
|
|
15
|
-
_defineProperty(this, "props", void 0);
|
|
16
15
|
|
|
16
|
+
constructor() {
|
|
17
|
+
let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
18
|
+
_defineProperty(this, "props", void 0);
|
|
17
19
|
_defineProperty(this, "stats", void 0);
|
|
18
|
-
|
|
19
20
|
_defineProperty(this, "activeRequestCount", 0);
|
|
20
|
-
|
|
21
21
|
_defineProperty(this, "requestQueue", []);
|
|
22
|
-
|
|
23
22
|
_defineProperty(this, "requestMap", new Map());
|
|
24
|
-
|
|
25
23
|
_defineProperty(this, "deferredUpdate", null);
|
|
26
|
-
|
|
27
|
-
|
|
24
|
+
this.props = {
|
|
25
|
+
...DEFAULT_PROPS,
|
|
28
26
|
...props
|
|
29
27
|
};
|
|
28
|
+
|
|
30
29
|
this.stats = new Stats({
|
|
31
30
|
id: this.props.id
|
|
32
31
|
});
|
|
@@ -37,7 +36,8 @@ export default class RequestScheduler {
|
|
|
37
36
|
this.stats.get(STAT_ACTIVE_REQUESTS_EVER);
|
|
38
37
|
}
|
|
39
38
|
|
|
40
|
-
scheduleRequest(handle
|
|
39
|
+
scheduleRequest(handle) {
|
|
40
|
+
let getPriority = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => 0;
|
|
41
41
|
if (!this.props.throttleRequests) {
|
|
42
42
|
return Promise.resolve({
|
|
43
43
|
done: () => {}
|
|
@@ -47,7 +47,6 @@ export default class RequestScheduler {
|
|
|
47
47
|
if (this.requestMap.has(handle)) {
|
|
48
48
|
return this.requestMap.get(handle);
|
|
49
49
|
}
|
|
50
|
-
|
|
51
50
|
const request = {
|
|
52
51
|
handle,
|
|
53
52
|
priority: 0,
|
|
@@ -59,9 +58,7 @@ export default class RequestScheduler {
|
|
|
59
58
|
});
|
|
60
59
|
this.requestQueue.push(request);
|
|
61
60
|
this.requestMap.set(handle, promise);
|
|
62
|
-
|
|
63
61
|
this._issueNewRequests();
|
|
64
|
-
|
|
65
62
|
return promise;
|
|
66
63
|
}
|
|
67
64
|
|
|
@@ -71,13 +68,12 @@ export default class RequestScheduler {
|
|
|
71
68
|
resolve
|
|
72
69
|
} = request;
|
|
73
70
|
let isDone = false;
|
|
74
|
-
|
|
75
71
|
const done = () => {
|
|
76
72
|
if (!isDone) {
|
|
77
73
|
isDone = true;
|
|
74
|
+
|
|
78
75
|
this.requestMap.delete(handle);
|
|
79
76
|
this.activeRequestCount--;
|
|
80
|
-
|
|
81
77
|
this._issueNewRequests();
|
|
82
78
|
}
|
|
83
79
|
};
|
|
@@ -99,28 +95,24 @@ export default class RequestScheduler {
|
|
|
99
95
|
_issueNewRequestsAsync() {
|
|
100
96
|
this.deferredUpdate = null;
|
|
101
97
|
const freeSlots = Math.max(this.props.maxRequests - this.activeRequestCount, 0);
|
|
102
|
-
|
|
103
98
|
if (freeSlots === 0) {
|
|
104
99
|
return;
|
|
105
100
|
}
|
|
106
|
-
|
|
107
101
|
this._updateAllRequests();
|
|
108
102
|
|
|
109
103
|
for (let i = 0; i < freeSlots; ++i) {
|
|
110
104
|
const request = this.requestQueue.shift();
|
|
111
|
-
|
|
112
105
|
if (request) {
|
|
113
106
|
this._issueRequest(request);
|
|
114
107
|
}
|
|
115
108
|
}
|
|
109
|
+
|
|
116
110
|
}
|
|
117
111
|
|
|
118
112
|
_updateAllRequests() {
|
|
119
113
|
const requestQueue = this.requestQueue;
|
|
120
|
-
|
|
121
114
|
for (let i = 0; i < requestQueue.length; ++i) {
|
|
122
115
|
const request = requestQueue[i];
|
|
123
|
-
|
|
124
116
|
if (!this._updateRequest(request)) {
|
|
125
117
|
requestQueue.splice(i, 1);
|
|
126
118
|
this.requestMap.delete(request.handle);
|
|
@@ -138,9 +130,7 @@ export default class RequestScheduler {
|
|
|
138
130
|
request.resolve(null);
|
|
139
131
|
return false;
|
|
140
132
|
}
|
|
141
|
-
|
|
142
133
|
return true;
|
|
143
134
|
}
|
|
144
|
-
|
|
145
135
|
}
|
|
146
136
|
//# sourceMappingURL=request-scheduler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/request-utils/request-scheduler.ts"],"names":["Stats","STAT_QUEUED_REQUESTS","STAT_ACTIVE_REQUESTS","STAT_CANCELLED_REQUESTS","STAT_QUEUED_REQUESTS_EVER","STAT_ACTIVE_REQUESTS_EVER","DEFAULT_PROPS","id","throttleRequests","maxRequests","RequestScheduler","constructor","props","Map","stats","get","scheduleRequest","handle","getPriority","Promise","resolve","done","requestMap","has","request","priority","promise","requestQueue","push","set","_issueNewRequests","_issueRequest","isDone","delete","activeRequestCount","deferredUpdate","setTimeout","_issueNewRequestsAsync","freeSlots","Math","max","_updateAllRequests","i","shift","length","_updateRequest","splice","sort","a","b"],"mappings":"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","sourcesContent":["import {Stats} from '@probe.gl/stats';\n\ntype Handle = any;\ntype DoneFunction = () => any;\ntype GetPriorityFunction = () => number;\ntype RequestResult = {\n done: DoneFunction;\n} | null;\n\n/** RequestScheduler Options */\nexport type RequestSchedulerProps = {\n id?: string;\n throttleRequests?: boolean;\n maxRequests?: number;\n};\n\nconst STAT_QUEUED_REQUESTS = 'Queued Requests';\nconst STAT_ACTIVE_REQUESTS = 'Active Requests';\nconst STAT_CANCELLED_REQUESTS = 'Cancelled Requests';\nconst STAT_QUEUED_REQUESTS_EVER = 'Queued Requests Ever';\nconst STAT_ACTIVE_REQUESTS_EVER = 'Active Requests Ever';\n\nconst DEFAULT_PROPS: Required<RequestSchedulerProps> = {\n id: 'request-scheduler',\n // Specifies if the request scheduler should throttle incoming requests, mainly for comparative testing\n throttleRequests: true,\n // The maximum number of simultaneous active requests. Un-throttled requests do not observe this limit.\n maxRequests: 6\n};\n\n/** Tracks one request */\ntype Request = {\n handle: Handle;\n priority: number;\n getPriority: GetPriorityFunction;\n resolve?: (value: any) => any;\n};\n\n/**\n * Used to issue a request, without having them \"deeply queued\" by the browser.\n * @todo - Track requests globally, across multiple servers\n */\nexport default class RequestScheduler {\n readonly props: Required<RequestSchedulerProps>;\n readonly stats: Stats;\n activeRequestCount: number = 0;\n\n /** Tracks the number of active requests and prioritizes/cancels queued requests. */\n private requestQueue: Request[] = [];\n private requestMap: Map<Handle, Promise<RequestResult>> = new Map();\n private deferredUpdate: any = null;\n\n constructor(props: RequestSchedulerProps = {}) {\n this.props = {...DEFAULT_PROPS, ...props};\n\n // Returns the statistics used by the request scheduler.\n this.stats = new Stats({id: this.props.id});\n this.stats.get(STAT_QUEUED_REQUESTS);\n this.stats.get(STAT_ACTIVE_REQUESTS);\n this.stats.get(STAT_CANCELLED_REQUESTS);\n this.stats.get(STAT_QUEUED_REQUESTS_EVER);\n this.stats.get(STAT_ACTIVE_REQUESTS_EVER);\n }\n\n /**\n * Called by an application that wants to issue a request, without having it deeply queued by the browser\n *\n * When the returned promise resolved, it is OK for the application to issue a request.\n * The promise resolves to an object that contains a `done` method.\n * When the application's request has completed (or failed), the application must call the `done` function\n *\n * @param handle\n * @param getPriority will be called when request \"slots\" open up,\n * allowing the caller to update priority or cancel the request\n * Highest priority executes first, priority < 0 cancels the request\n * @returns a promise\n * - resolves to a object (with a `done` field) when the request can be issued without queueing,\n * - resolves to `null` if the request has been cancelled (by the callback return < 0).\n * In this case the application should not issue the request\n */\n scheduleRequest(\n handle: Handle,\n getPriority: GetPriorityFunction = () => 0\n ): Promise<RequestResult> {\n // Allows throttling to be disabled\n if (!this.props.throttleRequests) {\n return Promise.resolve({done: () => {}});\n }\n\n // dedupe\n if (this.requestMap.has(handle)) {\n return this.requestMap.get(handle) as Promise<any>;\n }\n\n const request: Request = {handle, priority: 0, getPriority};\n const promise = new Promise<RequestResult>((resolve) => {\n // @ts-ignore\n request.resolve = resolve;\n return request;\n });\n\n this.requestQueue.push(request);\n this.requestMap.set(handle, promise);\n this._issueNewRequests();\n return promise;\n }\n\n // PRIVATE\n\n _issueRequest(request: Request): Promise<any> {\n const {handle, resolve} = request;\n let isDone = false;\n\n const done = () => {\n // can only be called once\n if (!isDone) {\n isDone = true;\n\n // Stop tracking a request - it has completed, failed, cancelled etc\n this.requestMap.delete(handle);\n this.activeRequestCount--;\n // A slot just freed up, see if any queued requests are waiting\n this._issueNewRequests();\n }\n };\n\n // Track this request\n this.activeRequestCount++;\n\n return resolve ? resolve({done}) : Promise.resolve({done});\n }\n\n /** We check requests asynchronously, to prevent multiple updates */\n _issueNewRequests(): void {\n if (!this.deferredUpdate) {\n this.deferredUpdate = setTimeout(() => this._issueNewRequestsAsync(), 0);\n }\n }\n\n /** Refresh all requests */\n _issueNewRequestsAsync() {\n // TODO - shouldn't we clear the timeout?\n this.deferredUpdate = null;\n\n const freeSlots = Math.max(this.props.maxRequests - this.activeRequestCount, 0);\n\n if (freeSlots === 0) {\n return;\n }\n\n this._updateAllRequests();\n\n // Resolve pending promises for the top-priority requests\n for (let i = 0; i < freeSlots; ++i) {\n const request = this.requestQueue.shift();\n if (request) {\n this._issueRequest(request); // eslint-disable-line @typescript-eslint/no-floating-promises\n }\n }\n\n // Uncomment to debug\n // console.log(`${freeSlots} free slots, ${this.requestQueue.length} queued requests`);\n }\n\n /** Ensure all requests have updated priorities, and that no longer valid requests are cancelled */\n _updateAllRequests() {\n const requestQueue = this.requestQueue;\n for (let i = 0; i < requestQueue.length; ++i) {\n const request = requestQueue[i];\n if (!this._updateRequest(request)) {\n // Remove the element and make sure to adjust the counter to account for shortened array\n requestQueue.splice(i, 1);\n this.requestMap.delete(request.handle);\n i--;\n }\n }\n\n // Sort the remaining requests based on priority\n requestQueue.sort((a, b) => a.priority - b.priority);\n }\n\n /** Update a single request by calling the callback */\n _updateRequest(request) {\n request.priority = request.getPriority(request.handle); // eslint-disable-line callback-return\n\n // by returning a negative priority, the callback cancels the request\n if (request.priority < 0) {\n request.resolve(null);\n return false;\n }\n return true;\n }\n}\n"],"file":"request-scheduler.js"}
|
|
1
|
+
{"version":3,"file":"request-scheduler.js","names":["Stats","STAT_QUEUED_REQUESTS","STAT_ACTIVE_REQUESTS","STAT_CANCELLED_REQUESTS","STAT_QUEUED_REQUESTS_EVER","STAT_ACTIVE_REQUESTS_EVER","DEFAULT_PROPS","id","throttleRequests","maxRequests","RequestScheduler","constructor","props","Map","stats","get","scheduleRequest","handle","getPriority","Promise","resolve","done","requestMap","has","request","priority","promise","requestQueue","push","set","_issueNewRequests","_issueRequest","isDone","delete","activeRequestCount","deferredUpdate","setTimeout","_issueNewRequestsAsync","freeSlots","Math","max","_updateAllRequests","i","shift","length","_updateRequest","splice","sort","a","b"],"sources":["../../../../src/lib/request-utils/request-scheduler.ts"],"sourcesContent":["import {Stats} from '@probe.gl/stats';\n\ntype Handle = any;\ntype DoneFunction = () => any;\ntype GetPriorityFunction = () => number;\ntype RequestResult = {\n done: DoneFunction;\n} | null;\n\n/** RequestScheduler Options */\nexport type RequestSchedulerProps = {\n id?: string;\n throttleRequests?: boolean;\n maxRequests?: number;\n};\n\nconst STAT_QUEUED_REQUESTS = 'Queued Requests';\nconst STAT_ACTIVE_REQUESTS = 'Active Requests';\nconst STAT_CANCELLED_REQUESTS = 'Cancelled Requests';\nconst STAT_QUEUED_REQUESTS_EVER = 'Queued Requests Ever';\nconst STAT_ACTIVE_REQUESTS_EVER = 'Active Requests Ever';\n\nconst DEFAULT_PROPS: Required<RequestSchedulerProps> = {\n id: 'request-scheduler',\n // Specifies if the request scheduler should throttle incoming requests, mainly for comparative testing\n throttleRequests: true,\n // The maximum number of simultaneous active requests. Un-throttled requests do not observe this limit.\n maxRequests: 6\n};\n\n/** Tracks one request */\ntype Request = {\n handle: Handle;\n priority: number;\n getPriority: GetPriorityFunction;\n resolve?: (value: any) => any;\n};\n\n/**\n * Used to issue a request, without having them \"deeply queued\" by the browser.\n * @todo - Track requests globally, across multiple servers\n */\nexport default class RequestScheduler {\n readonly props: Required<RequestSchedulerProps>;\n readonly stats: Stats;\n activeRequestCount: number = 0;\n\n /** Tracks the number of active requests and prioritizes/cancels queued requests. */\n private requestQueue: Request[] = [];\n private requestMap: Map<Handle, Promise<RequestResult>> = new Map();\n private deferredUpdate: any = null;\n\n constructor(props: RequestSchedulerProps = {}) {\n this.props = {...DEFAULT_PROPS, ...props};\n\n // Returns the statistics used by the request scheduler.\n this.stats = new Stats({id: this.props.id});\n this.stats.get(STAT_QUEUED_REQUESTS);\n this.stats.get(STAT_ACTIVE_REQUESTS);\n this.stats.get(STAT_CANCELLED_REQUESTS);\n this.stats.get(STAT_QUEUED_REQUESTS_EVER);\n this.stats.get(STAT_ACTIVE_REQUESTS_EVER);\n }\n\n /**\n * Called by an application that wants to issue a request, without having it deeply queued by the browser\n *\n * When the returned promise resolved, it is OK for the application to issue a request.\n * The promise resolves to an object that contains a `done` method.\n * When the application's request has completed (or failed), the application must call the `done` function\n *\n * @param handle\n * @param getPriority will be called when request \"slots\" open up,\n * allowing the caller to update priority or cancel the request\n * Highest priority executes first, priority < 0 cancels the request\n * @returns a promise\n * - resolves to a object (with a `done` field) when the request can be issued without queueing,\n * - resolves to `null` if the request has been cancelled (by the callback return < 0).\n * In this case the application should not issue the request\n */\n scheduleRequest(\n handle: Handle,\n getPriority: GetPriorityFunction = () => 0\n ): Promise<RequestResult> {\n // Allows throttling to be disabled\n if (!this.props.throttleRequests) {\n return Promise.resolve({done: () => {}});\n }\n\n // dedupe\n if (this.requestMap.has(handle)) {\n return this.requestMap.get(handle) as Promise<any>;\n }\n\n const request: Request = {handle, priority: 0, getPriority};\n const promise = new Promise<RequestResult>((resolve) => {\n // @ts-ignore\n request.resolve = resolve;\n return request;\n });\n\n this.requestQueue.push(request);\n this.requestMap.set(handle, promise);\n this._issueNewRequests();\n return promise;\n }\n\n // PRIVATE\n\n _issueRequest(request: Request): Promise<any> {\n const {handle, resolve} = request;\n let isDone = false;\n\n const done = () => {\n // can only be called once\n if (!isDone) {\n isDone = true;\n\n // Stop tracking a request - it has completed, failed, cancelled etc\n this.requestMap.delete(handle);\n this.activeRequestCount--;\n // A slot just freed up, see if any queued requests are waiting\n this._issueNewRequests();\n }\n };\n\n // Track this request\n this.activeRequestCount++;\n\n return resolve ? resolve({done}) : Promise.resolve({done});\n }\n\n /** We check requests asynchronously, to prevent multiple updates */\n _issueNewRequests(): void {\n if (!this.deferredUpdate) {\n this.deferredUpdate = setTimeout(() => this._issueNewRequestsAsync(), 0);\n }\n }\n\n /** Refresh all requests */\n _issueNewRequestsAsync() {\n // TODO - shouldn't we clear the timeout?\n this.deferredUpdate = null;\n\n const freeSlots = Math.max(this.props.maxRequests - this.activeRequestCount, 0);\n\n if (freeSlots === 0) {\n return;\n }\n\n this._updateAllRequests();\n\n // Resolve pending promises for the top-priority requests\n for (let i = 0; i < freeSlots; ++i) {\n const request = this.requestQueue.shift();\n if (request) {\n this._issueRequest(request); // eslint-disable-line @typescript-eslint/no-floating-promises\n }\n }\n\n // Uncomment to debug\n // console.log(`${freeSlots} free slots, ${this.requestQueue.length} queued requests`);\n }\n\n /** Ensure all requests have updated priorities, and that no longer valid requests are cancelled */\n _updateAllRequests() {\n const requestQueue = this.requestQueue;\n for (let i = 0; i < requestQueue.length; ++i) {\n const request = requestQueue[i];\n if (!this._updateRequest(request)) {\n // Remove the element and make sure to adjust the counter to account for shortened array\n requestQueue.splice(i, 1);\n this.requestMap.delete(request.handle);\n i--;\n }\n }\n\n // Sort the remaining requests based on priority\n requestQueue.sort((a, b) => a.priority - b.priority);\n }\n\n /** Update a single request by calling the callback */\n _updateRequest(request) {\n request.priority = request.getPriority(request.handle); // eslint-disable-line callback-return\n\n // by returning a negative priority, the callback cancels the request\n if (request.priority < 0) {\n request.resolve(null);\n return false;\n }\n return true;\n }\n}\n"],"mappings":"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"}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
|
+
|
|
2
|
+
|
|
1
3
|
import { WorkerBody } from '@loaders.gl/worker-utils';
|
|
4
|
+
|
|
2
5
|
let requestId = 0;
|
|
6
|
+
|
|
3
7
|
export function createLoaderWorker(loader) {
|
|
4
8
|
if (!WorkerBody.inWorkerThread()) {
|
|
5
9
|
return;
|
|
6
10
|
}
|
|
7
|
-
|
|
8
11
|
WorkerBody.onmessage = async (type, payload) => {
|
|
9
12
|
switch (type) {
|
|
10
13
|
case 'process':
|
|
11
14
|
try {
|
|
15
|
+
|
|
12
16
|
const {
|
|
13
17
|
input,
|
|
14
18
|
options = {},
|
|
@@ -18,7 +22,8 @@ export function createLoaderWorker(loader) {
|
|
|
18
22
|
loader,
|
|
19
23
|
arrayBuffer: input,
|
|
20
24
|
options,
|
|
21
|
-
context: {
|
|
25
|
+
context: {
|
|
26
|
+
...context,
|
|
22
27
|
parse: parseOnMainThread
|
|
23
28
|
}
|
|
24
29
|
});
|
|
@@ -31,14 +36,11 @@ export function createLoaderWorker(loader) {
|
|
|
31
36
|
error: message
|
|
32
37
|
});
|
|
33
38
|
}
|
|
34
|
-
|
|
35
39
|
break;
|
|
36
|
-
|
|
37
40
|
default:
|
|
38
41
|
}
|
|
39
42
|
};
|
|
40
43
|
}
|
|
41
|
-
|
|
42
44
|
function parseOnMainThread(arrayBuffer, options) {
|
|
43
45
|
return new Promise((resolve, reject) => {
|
|
44
46
|
const id = requestId++;
|
|
@@ -47,23 +49,21 @@ function parseOnMainThread(arrayBuffer, options) {
|
|
|
47
49
|
if (payload.id !== id) {
|
|
48
50
|
return;
|
|
49
51
|
}
|
|
50
|
-
|
|
51
52
|
switch (type) {
|
|
52
53
|
case 'done':
|
|
53
54
|
WorkerBody.removeEventListener(onMessage);
|
|
54
55
|
resolve(payload.result);
|
|
55
56
|
break;
|
|
56
|
-
|
|
57
57
|
case 'error':
|
|
58
58
|
WorkerBody.removeEventListener(onMessage);
|
|
59
59
|
reject(payload.error);
|
|
60
60
|
break;
|
|
61
|
-
|
|
62
61
|
default:
|
|
63
62
|
}
|
|
64
63
|
};
|
|
65
64
|
|
|
66
65
|
WorkerBody.addEventListener(onMessage);
|
|
66
|
+
|
|
67
67
|
const payload = {
|
|
68
68
|
id,
|
|
69
69
|
input: arrayBuffer,
|
|
@@ -73,15 +73,15 @@ function parseOnMainThread(arrayBuffer, options) {
|
|
|
73
73
|
});
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
-
async function parseData({
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
76
|
+
async function parseData(_ref) {
|
|
77
|
+
let {
|
|
78
|
+
loader,
|
|
79
|
+
arrayBuffer,
|
|
80
|
+
options,
|
|
81
|
+
context
|
|
82
|
+
} = _ref;
|
|
82
83
|
let data;
|
|
83
84
|
let parser;
|
|
84
|
-
|
|
85
85
|
if (loader.parseSync || loader.parse) {
|
|
86
86
|
data = arrayBuffer;
|
|
87
87
|
parser = loader.parseSync || loader.parse;
|
|
@@ -93,11 +93,13 @@ async function parseData({
|
|
|
93
93
|
throw new Error("Could not load data with ".concat(loader.name, " loader"));
|
|
94
94
|
}
|
|
95
95
|
|
|
96
|
-
options = {
|
|
96
|
+
options = {
|
|
97
|
+
...options,
|
|
97
98
|
modules: loader && loader.options && loader.options.modules || {},
|
|
98
99
|
worker: false
|
|
99
100
|
};
|
|
100
|
-
return await parser(data, {
|
|
101
|
+
return await parser(data, {
|
|
102
|
+
...options
|
|
101
103
|
}, context, loader);
|
|
102
104
|
}
|
|
103
105
|
//# sourceMappingURL=create-loader-worker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"create-loader-worker.js","names":["WorkerBody","requestId","createLoaderWorker","loader","inWorkerThread","onmessage","type","payload","input","options","context","result","parseData","arrayBuffer","parse","parseOnMainThread","postMessage","error","message","Error","Promise","resolve","reject","id","onMessage","removeEventListener","addEventListener","data","parser","parseSync","parseTextSync","textDecoder","TextDecoder","decode","name","modules","worker"],"sources":["../../../../src/lib/worker-loader-utils/create-loader-worker.ts"],"sourcesContent":["/* eslint-disable no-restricted-globals */\nimport type {LoaderWithParser} from '../../types';\nimport {WorkerBody} from '@loaders.gl/worker-utils';\n// import {validateLoaderVersion} from './validate-loader-version';\n\nlet requestId = 0;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n * @param loader\n */\nexport function createLoaderWorker(loader: LoaderWithParser) {\n // Check that we are actually in a worker thread\n if (!WorkerBody.inWorkerThread()) {\n return;\n }\n\n WorkerBody.onmessage = async (type, payload) => {\n switch (type) {\n case 'process':\n try {\n // validateLoaderVersion(loader, data.source.split('@')[1]);\n\n const {input, options = {}, context = {}} = payload;\n\n const result = await parseData({\n loader,\n arrayBuffer: input,\n options,\n context: {\n ...context,\n parse: parseOnMainThread\n }\n });\n WorkerBody.postMessage('done', {result});\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n break;\n default:\n }\n };\n}\n\nfunction parseOnMainThread(arrayBuffer: ArrayBuffer, options: {[key: string]: any}): Promise<void> {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type, payload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n\n// TODO - Support byteOffset and byteLength (enabling parsing of embedded binaries without copies)\n// TODO - Why not support async loader.parse* funcs here?\n// TODO - Why not reuse a common function instead of reimplementing loader.parse* selection logic? Keeping loader small?\n// TODO - Lack of appropriate parser functions can be detected when we create worker, no need to wait until parse\nasync function parseData({loader, arrayBuffer, options, context}) {\n let data;\n let parser;\n if (loader.parseSync || loader.parse) {\n data = arrayBuffer;\n parser = loader.parseSync || loader.parse;\n } else if (loader.parseTextSync) {\n const textDecoder = new TextDecoder();\n data = textDecoder.decode(arrayBuffer);\n parser = loader.parseTextSync;\n } else {\n throw new Error(`Could not load data with ${loader.name} loader`);\n }\n\n // TODO - proper merge in of loader options...\n options = {\n ...options,\n modules: (loader && loader.options && loader.options.modules) || {},\n worker: false\n };\n\n return await parser(data, {...options}, context, loader);\n}\n"],"mappings":";;AAEA,SAAQA,UAAU,QAAO,0BAA0B;;AAGnD,IAAIC,SAAS,GAAG,CAAC;;AAMjB,OAAO,SAASC,kBAAkB,CAACC,MAAwB,EAAE;EAE3D,IAAI,CAACH,UAAU,CAACI,cAAc,EAAE,EAAE;IAChC;EACF;EAEAJ,UAAU,CAACK,SAAS,GAAG,OAAOC,IAAI,EAAEC,OAAO,KAAK;IAC9C,QAAQD,IAAI;MACV,KAAK,SAAS;QACZ,IAAI;;UAGF,MAAM;YAACE,KAAK;YAAEC,OAAO,GAAG,CAAC,CAAC;YAAEC,OAAO,GAAG,CAAC;UAAC,CAAC,GAAGH,OAAO;UAEnD,MAAMI,MAAM,GAAG,MAAMC,SAAS,CAAC;YAC7BT,MAAM;YACNU,WAAW,EAAEL,KAAK;YAClBC,OAAO;YACPC,OAAO,EAAE;cACP,GAAGA,OAAO;cACVI,KAAK,EAAEC;YACT;UACF,CAAC,CAAC;UACFf,UAAU,CAACgB,WAAW,CAAC,MAAM,EAAE;YAACL;UAAM,CAAC,CAAC;QAC1C,CAAC,CAAC,OAAOM,KAAK,EAAE;UACd,MAAMC,OAAO,GAAGD,KAAK,YAAYE,KAAK,GAAGF,KAAK,CAACC,OAAO,GAAG,EAAE;UAC3DlB,UAAU,CAACgB,WAAW,CAAC,OAAO,EAAE;YAACC,KAAK,EAAEC;UAAO,CAAC,CAAC;QACnD;QACA;MACF;IAAQ;EAEZ,CAAC;AACH;AAEA,SAASH,iBAAiB,CAACF,WAAwB,EAAEJ,OAA6B,EAAiB;EACjG,OAAO,IAAIW,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;IACtC,MAAMC,EAAE,GAAGtB,SAAS,EAAE;;IAItB,MAAMuB,SAAS,GAAG,CAAClB,IAAI,EAAEC,OAAO,KAAK;MACnC,IAAIA,OAAO,CAACgB,EAAE,KAAKA,EAAE,EAAE;QAErB;MACF;MAEA,QAAQjB,IAAI;QACV,KAAK,MAAM;UACTN,UAAU,CAACyB,mBAAmB,CAACD,SAAS,CAAC;UACzCH,OAAO,CAACd,OAAO,CAACI,MAAM,CAAC;UACvB;QAEF,KAAK,OAAO;UACVX,UAAU,CAACyB,mBAAmB,CAACD,SAAS,CAAC;UACzCF,MAAM,CAACf,OAAO,CAACU,KAAK,CAAC;UACrB;QAEF;MAAQ;IAGZ,CAAC;;IAEDjB,UAAU,CAAC0B,gBAAgB,CAACF,SAAS,CAAC;;IAGtC,MAAMjB,OAAO,GAAG;MAACgB,EAAE;MAAEf,KAAK,EAAEK,WAAW;MAAEJ;IAAO,CAAC;IACjDT,UAAU,CAACgB,WAAW,CAAC,SAAS,EAAET,OAAO,CAAC;EAC5C,CAAC,CAAC;AACJ;;AAMA,eAAeK,SAAS,OAA0C;EAAA,IAAzC;IAACT,MAAM;IAAEU,WAAW;IAAEJ,OAAO;IAAEC;EAAO,CAAC;EAC9D,IAAIiB,IAAI;EACR,IAAIC,MAAM;EACV,IAAIzB,MAAM,CAAC0B,SAAS,IAAI1B,MAAM,CAACW,KAAK,EAAE;IACpCa,IAAI,GAAGd,WAAW;IAClBe,MAAM,GAAGzB,MAAM,CAAC0B,SAAS,IAAI1B,MAAM,CAACW,KAAK;EAC3C,CAAC,MAAM,IAAIX,MAAM,CAAC2B,aAAa,EAAE;IAC/B,MAAMC,WAAW,GAAG,IAAIC,WAAW,EAAE;IACrCL,IAAI,GAAGI,WAAW,CAACE,MAAM,CAACpB,WAAW,CAAC;IACtCe,MAAM,GAAGzB,MAAM,CAAC2B,aAAa;EAC/B,CAAC,MAAM;IACL,MAAM,IAAIX,KAAK,oCAA6BhB,MAAM,CAAC+B,IAAI,aAAU;EACnE;;EAGAzB,OAAO,GAAG;IACR,GAAGA,OAAO;IACV0B,OAAO,EAAGhC,MAAM,IAAIA,MAAM,CAACM,OAAO,IAAIN,MAAM,CAACM,OAAO,CAAC0B,OAAO,IAAK,CAAC,CAAC;IACnEC,MAAM,EAAE;EACV,CAAC;EAED,OAAO,MAAMR,MAAM,CAACD,IAAI,EAAE;IAAC,GAAGlB;EAAO,CAAC,EAAEC,OAAO,EAAEP,MAAM,CAAC;AAC1D"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { WorkerFarm } from '@loaders.gl/worker-utils';
|
|
2
2
|
import { isBrowser } from '../env-utils/globals';
|
|
3
|
+
|
|
3
4
|
export function canEncodeWithWorker(writer, options) {
|
|
4
5
|
if (!WorkerFarm.isSupported()) {
|
|
5
6
|
return false;
|
|
@@ -8,7 +9,6 @@ export function canEncodeWithWorker(writer, options) {
|
|
|
8
9
|
if (!isBrowser && !(options !== null && options !== void 0 && options._nodeWorkers)) {
|
|
9
10
|
return false;
|
|
10
11
|
}
|
|
11
|
-
|
|
12
12
|
return writer.worker && (options === null || options === void 0 ? void 0 : options.worker);
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=encode-with-worker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"encode-with-worker.js","names":["WorkerFarm","isBrowser","canEncodeWithWorker","writer","options","isSupported","_nodeWorkers","worker"],"sources":["../../../../src/lib/worker-loader-utils/encode-with-worker.ts"],"sourcesContent":["import {WorkerFarm} from '@loaders.gl/worker-utils';\nimport {Writer, WriterOptions} from '../../types';\nimport {isBrowser} from '../env-utils/globals';\n\n/**\n * Determines if a loader can parse with worker\n * @param loader\n * @param options\n */\nexport function canEncodeWithWorker(writer: Writer, options?: WriterOptions) {\n if (!WorkerFarm.isSupported()) {\n return false;\n }\n\n // Node workers are still experimental\n if (!isBrowser && !options?._nodeWorkers) {\n return false;\n }\n\n return writer.worker && options?.worker;\n}\n"],"mappings":"AAAA,SAAQA,UAAU,QAAO,0BAA0B;AAEnD,SAAQC,SAAS,QAAO,sBAAsB;;AAO9C,OAAO,SAASC,mBAAmB,CAACC,MAAc,EAAEC,OAAuB,EAAE;EAC3E,IAAI,CAACJ,UAAU,CAACK,WAAW,EAAE,EAAE;IAC7B,OAAO,KAAK;EACd;;EAGA,IAAI,CAACJ,SAAS,IAAI,EAACG,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEE,YAAY,GAAE;IACxC,OAAO,KAAK;EACd;EAEA,OAAOH,MAAM,CAACI,MAAM,KAAIH,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEG,MAAM;AACzC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { isBrowser } from '@loaders.gl/worker-utils';
|
|
2
2
|
import { WorkerFarm, getWorkerURL } from '@loaders.gl/worker-utils';
|
|
3
|
+
|
|
3
4
|
export function canParseWithWorker(loader, options) {
|
|
4
5
|
if (!WorkerFarm.isSupported()) {
|
|
5
6
|
return false;
|
|
@@ -8,9 +9,9 @@ export function canParseWithWorker(loader, options) {
|
|
|
8
9
|
if (!isBrowser && !(options !== null && options !== void 0 && options._nodeWorkers)) {
|
|
9
10
|
return false;
|
|
10
11
|
}
|
|
11
|
-
|
|
12
12
|
return loader.worker && (options === null || options === void 0 ? void 0 : options.worker);
|
|
13
13
|
}
|
|
14
|
+
|
|
14
15
|
export async function parseWithWorker(loader, data, options, context, parseOnMainThread) {
|
|
15
16
|
const name = loader.id;
|
|
16
17
|
const url = getWorkerURL(loader, options);
|
|
@@ -19,9 +20,12 @@ export async function parseWithWorker(loader, data, options, context, parseOnMai
|
|
|
19
20
|
name,
|
|
20
21
|
url
|
|
21
22
|
});
|
|
23
|
+
|
|
22
24
|
options = JSON.parse(JSON.stringify(options));
|
|
23
25
|
context = JSON.parse(JSON.stringify(context || {}));
|
|
24
|
-
const job = await workerPool.startJob('process-on-worker',
|
|
26
|
+
const job = await workerPool.startJob('process-on-worker',
|
|
27
|
+
onMessage.bind(null, parseOnMainThread));
|
|
28
|
+
|
|
25
29
|
job.postMessage('process', {
|
|
26
30
|
input: data,
|
|
27
31
|
options,
|
|
@@ -36,18 +40,15 @@ async function onMessage(parseOnMainThread, job, type, payload) {
|
|
|
36
40
|
case 'done':
|
|
37
41
|
job.done(payload);
|
|
38
42
|
break;
|
|
39
|
-
|
|
40
43
|
case 'error':
|
|
41
44
|
job.error(new Error(payload.error));
|
|
42
45
|
break;
|
|
43
|
-
|
|
44
46
|
case 'process':
|
|
45
47
|
const {
|
|
46
48
|
id,
|
|
47
49
|
input,
|
|
48
50
|
options
|
|
49
51
|
} = payload;
|
|
50
|
-
|
|
51
52
|
try {
|
|
52
53
|
const result = await parseOnMainThread(input, options);
|
|
53
54
|
job.postMessage('done', {
|
|
@@ -61,9 +62,7 @@ async function onMessage(parseOnMainThread, job, type, payload) {
|
|
|
61
62
|
error: message
|
|
62
63
|
});
|
|
63
64
|
}
|
|
64
|
-
|
|
65
65
|
break;
|
|
66
|
-
|
|
67
66
|
default:
|
|
68
67
|
console.warn("parse-with-worker unknown message ".concat(type));
|
|
69
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"parse-with-worker.js","names":["isBrowser","WorkerFarm","getWorkerURL","canParseWithWorker","loader","options","isSupported","_nodeWorkers","worker","parseWithWorker","data","context","parseOnMainThread","name","id","url","workerFarm","getWorkerFarm","workerPool","getWorkerPool","JSON","parse","stringify","job","startJob","onMessage","bind","postMessage","input","result","type","payload","done","error","Error","message","console","warn"],"sources":["../../../../src/lib/worker-loader-utils/parse-with-worker.ts"],"sourcesContent":["import {\n WorkerJob,\n WorkerMessageType,\n WorkerMessagePayload,\n isBrowser\n} from '@loaders.gl/worker-utils';\nimport type {Loader, LoaderOptions, LoaderContext} from '../../types';\nimport {WorkerFarm, getWorkerURL} from '@loaders.gl/worker-utils';\n\n/**\n * Determines if a loader can parse with worker\n * @param loader\n * @param options\n */\nexport function canParseWithWorker(loader: Loader, options?: LoaderOptions) {\n if (!WorkerFarm.isSupported()) {\n return false;\n }\n\n // Node workers are still experimental\n if (!isBrowser && !options?._nodeWorkers) {\n return false;\n }\n\n return loader.worker && options?.worker;\n}\n\n/**\n * this function expects that the worker function sends certain messages,\n * this can be automated if the worker is wrapper by a call to createLoaderWorker in @loaders.gl/loader-utils.\n */\nexport async function parseWithWorker(\n loader: Loader,\n data: any,\n options?: LoaderOptions,\n context?: LoaderContext,\n parseOnMainThread?: (arrayBuffer: ArrayBuffer, options: {[key: string]: any}) => Promise<void>\n) {\n const name = loader.id; // TODO\n const url = getWorkerURL(loader, options);\n\n const workerFarm = WorkerFarm.getWorkerFarm(options);\n const workerPool = workerFarm.getWorkerPool({name, url});\n\n // options.log object contains functions which cannot be transferred\n // context.fetch & context.parse functions cannot be transferred\n // TODO - decide how to handle logging on workers\n options = JSON.parse(JSON.stringify(options));\n context = JSON.parse(JSON.stringify(context || {}));\n\n const job = await workerPool.startJob(\n 'process-on-worker',\n // @ts-expect-error\n onMessage.bind(null, parseOnMainThread) // eslint-disable-line @typescript-eslint/no-misused-promises\n );\n\n job.postMessage('process', {\n // @ts-ignore\n input: data,\n options,\n context\n });\n\n const result = await job.result;\n // TODO - what is going on here?\n return await result.result;\n}\n\n/**\n * Handle worker's responses to the main thread\n * @param job\n * @param type\n * @param payload\n */\nasync function onMessage(\n parseOnMainThread: (arrayBuffer: ArrayBuffer, options?: {[key: string]: any}) => Promise<void>,\n job: WorkerJob,\n type: WorkerMessageType,\n payload: WorkerMessagePayload\n) {\n switch (type) {\n case 'done':\n job.done(payload);\n break;\n\n case 'error':\n job.error(new Error(payload.error));\n break;\n\n case 'process':\n // Worker is asking for main thread to parseO\n const {id, input, options} = payload;\n try {\n const result = await parseOnMainThread(input, options);\n job.postMessage('done', {id, result});\n } catch (error) {\n const message = error instanceof Error ? error.message : 'unknown error';\n job.postMessage('error', {id, error: message});\n }\n break;\n\n default:\n // eslint-disable-next-line\n console.warn(`parse-with-worker unknown message ${type}`);\n }\n}\n"],"mappings":"AAAA,SAIEA,SAAS,QACJ,0BAA0B;AAEjC,SAAQC,UAAU,EAAEC,YAAY,QAAO,0BAA0B;;AAOjE,OAAO,SAASC,kBAAkB,CAACC,MAAc,EAAEC,OAAuB,EAAE;EAC1E,IAAI,CAACJ,UAAU,CAACK,WAAW,EAAE,EAAE;IAC7B,OAAO,KAAK;EACd;;EAGA,IAAI,CAACN,SAAS,IAAI,EAACK,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEE,YAAY,GAAE;IACxC,OAAO,KAAK;EACd;EAEA,OAAOH,MAAM,CAACI,MAAM,KAAIH,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEG,MAAM;AACzC;;AAMA,OAAO,eAAeC,eAAe,CACnCL,MAAc,EACdM,IAAS,EACTL,OAAuB,EACvBM,OAAuB,EACvBC,iBAA8F,EAC9F;EACA,MAAMC,IAAI,GAAGT,MAAM,CAACU,EAAE;EACtB,MAAMC,GAAG,GAAGb,YAAY,CAACE,MAAM,EAAEC,OAAO,CAAC;EAEzC,MAAMW,UAAU,GAAGf,UAAU,CAACgB,aAAa,CAACZ,OAAO,CAAC;EACpD,MAAMa,UAAU,GAAGF,UAAU,CAACG,aAAa,CAAC;IAACN,IAAI;IAAEE;EAAG,CAAC,CAAC;;EAKxDV,OAAO,GAAGe,IAAI,CAACC,KAAK,CAACD,IAAI,CAACE,SAAS,CAACjB,OAAO,CAAC,CAAC;EAC7CM,OAAO,GAAGS,IAAI,CAACC,KAAK,CAACD,IAAI,CAACE,SAAS,CAACX,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;EAEnD,MAAMY,GAAG,GAAG,MAAML,UAAU,CAACM,QAAQ,CACnC,mBAAmB;EAEnBC,SAAS,CAACC,IAAI,CAAC,IAAI,EAAEd,iBAAiB,CAAC,CACxC;;EAEDW,GAAG,CAACI,WAAW,CAAC,SAAS,EAAE;IAEzBC,KAAK,EAAElB,IAAI;IACXL,OAAO;IACPM;EACF,CAAC,CAAC;EAEF,MAAMkB,MAAM,GAAG,MAAMN,GAAG,CAACM,MAAM;EAE/B,OAAO,MAAMA,MAAM,CAACA,MAAM;AAC5B;;AAQA,eAAeJ,SAAS,CACtBb,iBAA8F,EAC9FW,GAAc,EACdO,IAAuB,EACvBC,OAA6B,EAC7B;EACA,QAAQD,IAAI;IACV,KAAK,MAAM;MACTP,GAAG,CAACS,IAAI,CAACD,OAAO,CAAC;MACjB;IAEF,KAAK,OAAO;MACVR,GAAG,CAACU,KAAK,CAAC,IAAIC,KAAK,CAACH,OAAO,CAACE,KAAK,CAAC,CAAC;MACnC;IAEF,KAAK,SAAS;MAEZ,MAAM;QAACnB,EAAE;QAAEc,KAAK;QAAEvB;MAAO,CAAC,GAAG0B,OAAO;MACpC,IAAI;QACF,MAAMF,MAAM,GAAG,MAAMjB,iBAAiB,CAACgB,KAAK,EAAEvB,OAAO,CAAC;QACtDkB,GAAG,CAACI,WAAW,CAAC,MAAM,EAAE;UAACb,EAAE;UAAEe;QAAM,CAAC,CAAC;MACvC,CAAC,CAAC,OAAOI,KAAK,EAAE;QACd,MAAME,OAAO,GAAGF,KAAK,YAAYC,KAAK,GAAGD,KAAK,CAACE,OAAO,GAAG,eAAe;QACxEZ,GAAG,CAACI,WAAW,CAAC,OAAO,EAAE;UAACb,EAAE;UAAEmB,KAAK,EAAEE;QAAO,CAAC,CAAC;MAChD;MACA;IAEF;MAEEC,OAAO,CAACC,IAAI,6CAAsCP,IAAI,EAAG;EAAC;AAEhE"}
|