@coherentglobal/wasm-runner 0.0.24 → 0.0.32

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 (11) hide show
  1. package/dist/browser.d.ts +6 -5
  2. package/dist/browser.js +32 -8
  3. package/dist/browser.js.map +1 -1
  4. package/dist/error.d.ts +1 -1
  5. package/dist/error.js +1 -1
  6. package/dist/node/template/main.template.ejs +24 -8
  7. package/dist/node.d.ts +10 -9
  8. package/dist/node.js +48 -19
  9. package/dist/node.js.map +1 -1
  10. package/dist/types.d.ts +32 -5
  11. package/package.json +1 -1
package/dist/browser.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { RunnerConfig, Model } from "./types";
1
+ import { ModelConfig, Model, InputObject, ResponseObject } from "./types";
2
2
  /**
3
3
  * WASM runner config
4
4
  * @typedef {Object} RunnerConfig
@@ -25,7 +25,7 @@ export declare class WasmRunner {
25
25
  *
26
26
  * @param {RunnerConfig} wasmRunnerConfig
27
27
  */
28
- constructor(wasmRunnerConfig: RunnerConfig, license?: string);
28
+ constructor(wasmRunnerConfig?: ModelConfig, license?: string);
29
29
  /**
30
30
  * Initialize wasm runner fetching model from remote server
31
31
  *
@@ -45,19 +45,20 @@ export declare class WasmRunner {
45
45
  /**
46
46
  * Remove model from runner
47
47
  * @param {string} id Model id
48
+ * @returns Promise
48
49
  */
49
- remove(id: string): void;
50
+ remove(id: string): Promise<void>;
50
51
  /**
51
52
  * Append and initialized new model to runner
52
53
  * @param {RunnerConfig} modelConfig
53
54
  * @returns Promise
54
55
  */
55
- append(modelConfig: RunnerConfig): Promise<void>;
56
+ append(modelConfig: ModelConfig): Promise<void>;
56
57
  /**
57
58
  * Perform calculation. The runner will use request_meta.version_uuid of input argument to locate model
58
59
  * @async
59
60
  * @param {InputObject} input - Input data for calculation
60
61
  * @returns {Promise<Object>} - Response model data
61
62
  */
62
- execute(input: any, id?: any): Promise<Object>;
63
+ execute(input: InputObject, id?: any): Promise<ResponseObject>;
63
64
  }
package/dist/browser.js CHANGED
@@ -51,6 +51,8 @@ const unzipFile = (zipURL) => __awaiter(void 0, void 0, void 0, function* () {
51
51
  let jsPath;
52
52
  let wasm;
53
53
  let wasmPath;
54
+ let dataPath;
55
+ let data;
54
56
  const zip = yield res.blob();
55
57
  const new_zip = new jszip_1.default();
56
58
  new_zip.loadAsync(zip).then((zipped) => __awaiter(void 0, void 0, void 0, function* () {
@@ -62,6 +64,9 @@ const unzipFile = (zipURL) => __awaiter(void 0, void 0, void 0, function* () {
62
64
  if (path_1.default.extname(entry) === ".wasm") {
63
65
  wasmPath = entry;
64
66
  }
67
+ if (path_1.default.extname(entry) === ".data") {
68
+ dataPath = entry;
69
+ }
65
70
  }
66
71
  });
67
72
  if (!jsPath)
@@ -70,7 +75,7 @@ const unzipFile = (zipURL) => __awaiter(void 0, void 0, void 0, function* () {
70
75
  return reject(new Error("Missing engine file"));
71
76
  js = yield zipped.file(jsPath).async("text");
72
77
  wasm = yield zipped.file(wasmPath).async("arraybuffer");
73
- resolve({
78
+ const response = {
74
79
  wasm: {
75
80
  url: URL.createObjectURL(new Blob([wasm], { type: "application/wasm" })),
76
81
  path: wasmPath,
@@ -79,12 +84,28 @@ const unzipFile = (zipURL) => __awaiter(void 0, void 0, void 0, function* () {
79
84
  url: URL.createObjectURL(new Blob([js], { type: "text/javascript" })),
80
85
  path: jsPath,
81
86
  },
82
- });
87
+ };
88
+ if (dataPath) {
89
+ data = yield zipped.file(dataPath).async("arraybuffer");
90
+ response.data = {
91
+ url: URL.createObjectURL(new Blob([data], { type: "application/octet-stream" })),
92
+ path: dataPath,
93
+ };
94
+ }
95
+ resolve(response);
83
96
  }));
84
97
  }));
85
98
  });
86
99
  });
87
- const getRuntimeContent = (js, wasm) => __awaiter(void 0, void 0, void 0, function* () {
100
+ const getRuntimeContent = (js, wasm, data = undefined) => __awaiter(void 0, void 0, void 0, function* () {
101
+ if (data) {
102
+ const runtime = yield fetch(js.url)
103
+ .then((res) => __awaiter(void 0, void 0, void 0, function* () { return res.text(); }))
104
+ .then((text) => text.replace(wasm.path, wasm.url)
105
+ .replace(data.path, data.url)
106
+ .replace(data.path, data.url));
107
+ return runtime;
108
+ }
88
109
  const runtime = yield fetch(js.url)
89
110
  .then((res) => __awaiter(void 0, void 0, void 0, function* () { return res.text(); }))
90
111
  .then((text) => text.replace(wasm.path, wasm.url));
@@ -140,8 +161,8 @@ class WasmRunner {
140
161
  }
141
162
  _initializeModelInstance(m, license) {
142
163
  return __awaiter(this, void 0, void 0, function* () {
143
- const { js, wasm } = yield unzipFile(m.url);
144
- const runtime = yield getRuntimeContent(js, wasm);
164
+ const { js, wasm, data } = yield unzipFile(m.url);
165
+ const runtime = yield getRuntimeContent(js, wasm, data);
145
166
  m.worker = new Worker(utils.jsString2workerURL((0, template_1.default)(runtime, license)));
146
167
  m.worker.onmessage = function (oEvent) {
147
168
  if (!Array.isArray(oEvent.data) && oEvent.data === "Initialized") {
@@ -238,11 +259,14 @@ class WasmRunner {
238
259
  /**
239
260
  * Remove model from runner
240
261
  * @param {string} id Model id
262
+ * @returns Promise
241
263
  */
242
264
  remove(id) {
243
- if (this.isExist(id)) {
244
- this.models.filter((m) => m.id !== id);
245
- }
265
+ return __awaiter(this, void 0, void 0, function* () {
266
+ if (this.isExist(id)) {
267
+ this.models = this.models.filter((m) => m.id !== id);
268
+ }
269
+ });
246
270
  }
247
271
  /**
248
272
  * Append and initialized new model to runner
package/dist/browser.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"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"}
package/dist/error.d.ts CHANGED
@@ -26,7 +26,7 @@ declare class ModelInitializationError extends ModelError {
26
26
  }
27
27
  declare class ParameterRequiredError extends WasmError {
28
28
  parameter: any;
29
- constructor(parameter: any, inputs?: string);
29
+ constructor(parameter: any, inputs?: {});
30
30
  }
31
31
  declare class BrowserError extends WasmError {
32
32
  constructor(message: any);
package/dist/error.js CHANGED
@@ -49,7 +49,7 @@ class ModelInitializationError extends ModelError {
49
49
  }
50
50
  }
51
51
  class ParameterRequiredError extends WasmError {
52
- constructor(parameter, inputs = "") {
52
+ constructor(parameter, inputs = {}) {
53
53
  super(`WasmRunner failed to find ${parameter} parameter`);
54
54
  this.name = "missing_parameter";
55
55
  this.parameter = parameter;
package/dist/node/template/main.template.ejs CHANGED
@@ -11,14 +11,32 @@ let execute = function (req) { return false }
11
11
  try {
12
12
  model().then(instance => {
13
13
  try {
14
+ let currentParameterSetKey
14
15
  execute = function (req) {
15
16
  try {
16
17
  if(req === "isReady") {
17
18
  return isReady
18
19
  }
19
20
 
21
+ if(req === "destroy") {
22
+ instance._destroy(wb)
23
+ return
24
+ }
25
+
26
+ if(req.request_data._parameters_key) { // Have parameters
27
+ if(currentParameterSetKey !== req.request_data._parameters_key) {
28
+ currentParameterSetKey = req.request_data._parameters_key;
29
+ req.request_data._parameters_key = undefined;
30
+ } else { // Remove if parameter is the same
31
+ req.request_data._parameters_key = undefined;
32
+ req.request_data._parameters = undefined;
33
+ }
34
+ }
35
+
36
+ input = JSON.stringify(req)
37
+
20
38
  const enc = new TextEncoder();
21
- const encoded = enc.encode(req)
39
+ const encoded = enc.encode(input)
22
40
 
23
41
  var inBuffer = instance._malloc(encoded.length);
24
42
 
@@ -41,7 +59,7 @@ model().then(instance => {
41
59
  instance._free(outBuffer);
42
60
  instance._free(outPtr);
43
61
 
44
- return result
62
+ return JSON.parse(result)
45
63
  } catch(err) {
46
64
  throw err
47
65
  }
@@ -59,12 +77,10 @@ model().then(instance => {
59
77
  }).catch(err => console.error(err))
60
78
  } catch(err) {}
61
79
 
62
-
63
-
64
- parentPort.on('message', (param) => {
65
- if (typeof param !== 'string' && param !== "isReady") {
66
- throw new Error('Param must be a json string.');
80
+ parentPort.on('message', (input) => {
81
+ if (typeof input !== 'string' && typeof input !== 'object' && input !== "isReady") {
82
+ throw new Error('Param must be a json string or json object');
67
83
  }
68
- const result = execute(param);
84
+ const result = execute(input);
69
85
  parentPort.postMessage(result);
70
86
  });
package/dist/node.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import tmp from "tmp";
2
- import { NodeModel, RunnerConfig } from "./types";
2
+ import { NodeModel, RunnerConfig, ModelConfig, InputObject, ResponseObject } from "./types";
3
3
  /**
4
4
  * WASM runner config
5
5
  * @typedef {Object} RunnerConfig
@@ -19,8 +19,8 @@ import { NodeModel, RunnerConfig } from "./types";
19
19
  * @classdesc WasmRunner class, responsible for managing model and it's lifecycle
20
20
  */
21
21
  export declare class WasmRunner {
22
- _tempWorkerFolder: tmp.DirSyncObject;
23
- _tempModelFolder: tmp.DirSyncObject;
22
+ _tempWorkerFolder: tmp.DirResult;
23
+ _tempModelFolder: tmp.DirResult;
24
24
  license: string;
25
25
  models: any[];
26
26
  /**
@@ -28,7 +28,7 @@ export declare class WasmRunner {
28
28
  *
29
29
  * @param {RunnerConfig} wasmRunnerConfig
30
30
  */
31
- constructor(wasmRunnerConfig: RunnerConfig, license?: string);
31
+ constructor(wasmRunnerConfig?: RunnerConfig, license?: string);
32
32
  /**
33
33
  * Initialize wasm runner fetching model from remote server
34
34
  *
@@ -39,15 +39,16 @@ export declare class WasmRunner {
39
39
  _initializeModelInstance(m: NodeModel): Promise<void>;
40
40
  /**
41
41
  * Append and initialized new model to runner
42
- * @param {RunnerConfig} modelConfig
42
+ * @param {ModelConfig} modelConfig
43
43
  * @returns Promise
44
44
  */
45
- append(modelConfig: RunnerConfig): Promise<void>;
45
+ append(modelConfig: ModelConfig): Promise<void>;
46
46
  /**
47
47
  * Remove model from runner
48
48
  * @param {string} id Model id
49
+ * @returns Promise
49
50
  */
50
- remove(id: string): void;
51
+ remove(id: string): Promise<void>;
51
52
  _parseError(rawResponse: any): Object;
52
53
  _getModel(id: string): NodeModel;
53
54
  /**
@@ -60,7 +61,7 @@ export declare class WasmRunner {
60
61
  * Perform calculation. The runner will use request_meta.version_uuid of input argument to locate model
61
62
  * @async
62
63
  * @param {InputObject} input - Input data for calculation
63
- * @returns {Promise<Object>} - Response model data
64
+ * @returns {Promise<ResponseObject>} - Response model data
64
65
  */
65
- execute(input: any, id?: string): Promise<Object>;
66
+ execute(input: InputObject, id?: string): Promise<ResponseObject>;
66
67
  }
package/dist/node.js CHANGED
@@ -62,6 +62,7 @@ function replaceRegexInFile(file, search, replace) {
62
62
  const unzipFiles = (id, url, workerFolder) => {
63
63
  let js;
64
64
  let wasm;
65
+ let data;
65
66
  // @ts-ignore
66
67
  const stream = fs_1.default.createReadStream(url).pipe((0, unzipper_1.Parse)());
67
68
  return new Promise((resolve, reject) => {
@@ -81,6 +82,9 @@ const unzipFiles = (id, url, workerFolder) => {
81
82
  if (path_1.default.extname(entry.path) === ".wasm") {
82
83
  wasm = fileName.name;
83
84
  }
85
+ if (path_1.default.extname(entry.path) === ".data") {
86
+ data = fileName.name;
87
+ }
84
88
  return entry.pipe(writeStream);
85
89
  }
86
90
  return entry.autodrain();
@@ -94,6 +98,7 @@ const unzipFiles = (id, url, workerFolder) => {
94
98
  return resolve({
95
99
  js,
96
100
  wasm,
101
+ data,
97
102
  });
98
103
  });
99
104
  stream.on("error", (error) => reject(error));
@@ -103,7 +108,7 @@ const template = ejs_1.default.compile(fs_1.default.readFileSync(path_1.default.
103
108
  encoding: "utf8",
104
109
  flag: "r",
105
110
  }), { async: false });
106
- const createModelInstance = (id, url, workerFolder) => __awaiter(void 0, void 0, void 0, function* () {
111
+ const createModelInstance = (id, url, workerFolder, size) => __awaiter(void 0, void 0, void 0, function* () {
107
112
  const tempFolder = tmp_1.default.dirSync({
108
113
  dir: workerFolder,
109
114
  name: `${id}-${Date.now()}`,
@@ -115,6 +120,10 @@ const createModelInstance = (id, url, workerFolder) => __awaiter(void 0, void 0,
115
120
  yield replaceRegexInFile(modelPack.js, `wasmBinaryFile="${path_1.default.basename(modelPack.wasm)}"`,
116
121
  // `scriptDirectory="";wasmBinaryFile="data:application/octet-stream;base64,${content}"`
117
122
  `scriptDirectory="";wasmBinaryFile="${modelPack.wasm}"`);
123
+ if (modelPack.data) {
124
+ yield replaceRegexInFile(modelPack.js, `var PACKAGE_NAME="${path_1.default.basename(modelPack.data)}"`, `var PACKAGE_NAME="${modelPack.data}"`);
125
+ yield replaceRegexInFile(modelPack.js, `var REMOTE_PACKAGE_BASE="${path_1.default.basename(modelPack.data)}"`, `var REMOTE_PACKAGE_BASE="${modelPack.data}"`);
126
+ }
118
127
  const fileContent = template({
119
128
  runtime: modelPack.js.replace(".js", ""),
120
129
  model: modelPack.wasm,
@@ -128,7 +137,7 @@ const createModelInstance = (id, url, workerFolder) => __awaiter(void 0, void 0,
128
137
  }).name;
129
138
  yield fs_1.default.promises.writeFile(workerPath, fileContent);
130
139
  const instancePool = new node_worker_threads_pool_1.StaticPool({
131
- size: 1,
140
+ size: size || 1,
132
141
  task: workerPath,
133
142
  });
134
143
  return new Promise((resolve, reject) => {
@@ -138,7 +147,8 @@ const createModelInstance = (id, url, workerFolder) => __awaiter(void 0, void 0,
138
147
  if (isReady) {
139
148
  resolve(instancePool);
140
149
  }
141
- else if (limit >= 2000) { // 1 second
150
+ else if (limit >= 2000) {
151
+ // 1 second
142
152
  reject(new Error("Model initialize issue"));
143
153
  }
144
154
  else {
@@ -149,15 +159,14 @@ const createModelInstance = (id, url, workerFolder) => __awaiter(void 0, void 0,
149
159
  });
150
160
  setTimeout(checkModelStatus, 5);
151
161
  });
152
- // return {};
153
162
  });
154
- const createModelInstanceFromURL = (id, url, workerFolder, modelFolder) => __awaiter(void 0, void 0, void 0, function* () {
163
+ const createModelInstanceFromURL = (id, url, workerFolder, modelFolder, size) => __awaiter(void 0, void 0, void 0, function* () {
155
164
  try {
156
165
  const modelPath = path_1.default.join(modelFolder, `${id}.zip`);
157
166
  const downloadStream = got_1.default.stream(url);
158
167
  const fileWriterStream = (0, fs_1.createWriteStream)(modelPath);
159
168
  yield pipeline(downloadStream, fileWriterStream);
160
- const instance = yield createModelInstance(id, modelPath, workerFolder);
169
+ const instance = yield createModelInstance(id, modelPath, workerFolder, size);
161
170
  return instance;
162
171
  }
163
172
  catch (err) {
@@ -235,13 +244,13 @@ class WasmRunner {
235
244
  _initializeModelInstance(m) {
236
245
  return __awaiter(this, void 0, void 0, function* () {
237
246
  if (utils.isHttpURL(m.url)) {
238
- const instance = yield createModelInstanceFromURL(m.id, m.url, this._tempWorkerFolder.name, this._tempModelFolder.name);
247
+ const instance = yield createModelInstanceFromURL(m.id, m.url, this._tempWorkerFolder.name, this._tempModelFolder.name, m.size);
239
248
  m.ready = true;
240
249
  m.worker = instance;
241
250
  return Promise.resolve();
242
251
  }
243
252
  if (yield utils.isPath(m.url)) {
244
- const instance = yield createModelInstance(m.id, m.url, this._tempWorkerFolder.name);
253
+ const instance = yield createModelInstance(m.id, m.url, this._tempWorkerFolder.name, m.size);
245
254
  m.ready = true;
246
255
  m.worker = instance;
247
256
  return Promise.resolve();
@@ -250,7 +259,7 @@ class WasmRunner {
250
259
  }
251
260
  /**
252
261
  * Append and initialized new model to runner
253
- * @param {RunnerConfig} modelConfig
262
+ * @param {ModelConfig} modelConfig
254
263
  * @returns Promise
255
264
  */
256
265
  append(modelConfig) {
@@ -261,6 +270,7 @@ class WasmRunner {
261
270
  const model = {
262
271
  id: modelConfig.id,
263
272
  url: modelConfig.url,
273
+ size: modelConfig.size,
264
274
  };
265
275
  yield this._initializeModelInstance(model);
266
276
  this.models.push(model);
@@ -269,11 +279,18 @@ class WasmRunner {
269
279
  /**
270
280
  * Remove model from runner
271
281
  * @param {string} id Model id
282
+ * @returns Promise
272
283
  */
273
284
  remove(id) {
274
- if (this.isExist(id)) {
275
- this.models.filter((m) => m.id !== id);
276
- }
285
+ return __awaiter(this, void 0, void 0, function* () {
286
+ if (this.isExist(id)) {
287
+ const model = this.models.find((m) => m.id === id);
288
+ yield model.worker.exec("destroy");
289
+ model.worker.destroy();
290
+ delete model.worker;
291
+ this.models = this.models.filter((m) => m.id !== id);
292
+ }
293
+ });
277
294
  }
278
295
  _parseError(rawResponse) {
279
296
  var _a;
@@ -345,23 +362,35 @@ class WasmRunner {
345
362
  * Perform calculation. The runner will use request_meta.version_uuid of input argument to locate model
346
363
  * @async
347
364
  * @param {InputObject} input - Input data for calculation
348
- * @returns {Promise<Object>} - Response model data
365
+ * @returns {Promise<ResponseObject>} - Response model data
349
366
  */
350
367
  execute(input, id = undefined) {
351
- var _a;
368
+ var _a, _b;
352
369
  return __awaiter(this, void 0, void 0, function* () {
353
- console.log(`EXECUTING: ${id}, input: ${JSON.stringify(input)}`);
370
+ const logInput = {
371
+ request_data: {
372
+ inputs: input.request_data.inputs
373
+ },
374
+ request_meta: input.request_meta
375
+ };
376
+ console.log(`EXECUTING: ${id}, input: ${JSON.stringify(logInput)}`);
354
377
  const version_uuid = id || ((_a = input.request_meta) === null || _a === void 0 ? void 0 : _a.version_uuid);
355
378
  if (input) {
356
- console.log(`EXECUTING: ${id}, input: ${JSON.stringify(input)}`);
357
379
  const model = this._getModel(version_uuid);
358
380
  try {
359
- const result = yield model.worker.exec(JSON.stringify(input));
360
- return JSON.parse(result);
381
+ const parsedResult = yield model.worker.exec(input);
382
+ if ((_b = parsedResult.response_data) === null || _b === void 0 ? void 0 : _b.errors) {
383
+ const errors = this._parseError(parsedResult);
384
+ throw new error_1.default.ModelValidationError(errors, version_uuid, parsedResult);
385
+ }
386
+ return parsedResult;
361
387
  }
362
388
  catch (err) {
363
- console.log('ERROR---------');
389
+ console.log("ERROR---------");
364
390
  console.log(err);
391
+ if (err.name === "validation_error") {
392
+ throw err;
393
+ }
365
394
  throw new error_1.default.ModelExecuteError(err.message, version_uuid, input);
366
395
  }
367
396
  }
package/dist/node.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"node.js","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"node.js","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAsC;AACtC,8BAA8B;AAC9B,8BAA8B;AAC9B,sCAAsC;AACtC,yCAAyC;AACzC,8CAAsB;AACtB,uCAAiC;AACjC,8CAAsB;AACtB,oDAA4B;AAC5B,yCAA2C;AAC3C,gDAAwB;AACxB,+BAAiC;AACjC,8CAAsB;AACtB,uEAAsD;AACtD,+CAAiC;AAUjC,oDAAuC;AAEvC,MAAM,QAAQ,GAAG,IAAA,gBAAS,EAAC,gBAAM,CAAC,QAAQ,CAAC,CAAC;AAE5C,SAAe,kBAAkB,CAC/B,IAAY,EACZ,MAAc,EACd,OAAe;;QAEf,IAAI,QAAQ,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACxD,IAAI,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC1D,IAAI,OAAO,GAAG,GAAG,IAAI,eAAe,CAAC;QACrC,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAC;QAChE,MAAM,YAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAED,MAAM,UAAU,GAAG,CACjB,EAAU,EACV,GAAW,EACX,YAAoB,EACJ,EAAE;IAClB,IAAI,EAAE,CAAC;IACP,IAAI,IAAI,CAAC;IACT,IAAI,IAAI,CAAC;IACT,aAAa;IACb,MAAM,MAAM,GAAG,YAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,gBAAK,GAAE,CAAC,CAAC;IAEtD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC3B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;YACxB,IAAI,IAAI,KAAK,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE;gBAC5D,MAAM,QAAQ,GAAG,aAAG,CAAC,QAAQ,CAAC;oBAC5B,GAAG,EAAE,YAAY;oBACjB,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,aAAa;oBACb,IAAI,EAAE,KAAK;iBACZ,CAAC,CAAC;gBAEH,MAAM,WAAW,GAAG,YAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAExD,IAAI,cAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE;oBACtC,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC;iBACpB;gBACD,IAAI,cAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE;oBACxC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;iBACtB;gBACD,IAAI,cAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE;oBACxC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;iBACtB;gBAED,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAChC;YACD,OAAO,KAAK,CAAC,SAAS,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACvB,IAAI,CAAC,EAAE;gBAAE,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;YAC1D,IAAI,CAAC,IAAI;gBAAE,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;YAC3D,IAAI,EAAE,IAAI,IAAI;gBACZ,OAAO,OAAO,CAAC;oBACb,EAAE;oBACF,IAAI;oBACJ,IAAI;iBACL,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,aAAG,CAAC,OAAO,CAC1B,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iCAAiC,CAAC,EAAE;IACvE,QAAQ,EAAE,MAAM;IAChB,IAAI,EAAE,GAAG;CACV,CAAC,EACF,EAAE,KAAK,EAAE,KAAK,EAAE,CACjB,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAC1B,EAAE,EACF,GAAG,EACH,YAAY,EACZ,IAAI,EAC2B,EAAE;IACjC,MAAM,UAAU,GAAG,aAAG,CAAC,OAAO,CAAC;QAC7B,GAAG,EAAE,YAAY;QACjB,IAAI,EAAE,GAAG,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE;QAC3B,aAAa;QACb,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IAE7D,MAAM,SAAS,GAAG,EAAE,CAAC;IAErB,MAAM,kBAAkB,CACtB,SAAS,CAAC,EAAE,EACZ,mBAAmB,cAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG;IACnD,wFAAwF;IACxF,sCAAsC,SAAS,CAAC,IAAI,GAAG,CACxD,CAAC;IAEF,IAAI,SAAS,CAAC,IAAI,EAAE;QAClB,MAAM,kBAAkB,CACtB,SAAS,CAAC,EAAE,EACZ,qBAAqB,cAAI,CAAC,QAAQ,CAChC,SAAS,CAAC,IAAI,CACf,GAAG,EACJ,qBAAqB,SAAS,CAAC,IAAI,GAAG,CACvC,CAAC;QAEF,MAAM,kBAAkB,CACtB,SAAS,CAAC,EAAE,EACZ,4BAA4B,cAAI,CAAC,QAAQ,CACvC,SAAS,CAAC,IAAI,CACf,GAAG,EACJ,4BAA4B,SAAS,CAAC,IAAI,GAAG,CAC9C,CAAC;KACH;IAED,MAAM,WAAW,GAAG,QAAQ,CAAC;QAC3B,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;QACxC,KAAK,EAAE,SAAS,CAAC,IAAI;QACrB,SAAS;KACV,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,aAAG,CAAC,QAAQ,CAAC;QAC9B,GAAG,EAAE,UAAU,CAAC,IAAI;QACpB,IAAI,EAAE,UAAU,EAAE,KAAK;QACvB,aAAa;QACb,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC,IAAI,CAAC;IAER,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAErD,MAAM,YAAY,GAAG,IAAI,qCAAU,CAAC;QAClC,IAAI,EAAE,IAAI,IAAI,CAAC;QACf,IAAI,EAAE,UAAU;KACjB,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,MAAM,gBAAgB,GAAG,GAAS,EAAE;YAClC,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAEnD,IAAI,OAAO,EAAE;gBACX,OAAO,CAAC,YAAY,CAAC,CAAC;aACvB;iBAAM,IAAI,KAAK,IAAI,IAAI,EAAE;gBACxB,WAAW;gBACX,MAAM,CAAC,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC;aAC7C;iBAAM;gBACL,UAAU,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;gBAChC,uCAAuC;gBACvC,KAAK,EAAE,CAAC;aACT;QACH,CAAC,CAAA,CAAC;QAEF,UAAU,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,0BAA0B,GAAG,CACjC,EAAU,EACV,GAAW,EACX,YAAoB,EACpB,WAAmB,EACnB,IAAY,EACmB,EAAE;IACjC,IAAI;QACF,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,cAAc,GAAG,aAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,gBAAgB,GAAG,IAAA,sBAAiB,EAAC,SAAS,CAAC,CAAC;QACtD,MAAM,QAAQ,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;QACjD,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CACxC,EAAE,EACF,SAAS,EACT,YAAY,EACZ,IAAI,CACL,CAAC;QAEF,OAAO,QAAQ,CAAC;KACjB;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,eAAgB,CAAC,UAAU,CACnC,wCAAwC,EAAE,SAAS,GAAG,WAAW,GAAG,CAAC,OAAO,EAAE,CAC/E,CAAC;KACH;AACH,CAAC,CAAA,CAAC;AAEF;;;;;GAKG;AAEH;;;;;GAKG;AAEH;;;;;GAKG;AACH,wDAAwD;AACxD,MAAa,UAAU;IAKrB;;;;OAIG;IACH,YAAY,gBAA+B,EAAE,UAAkB,EAAE;QAC/D,IAAI,CAAC,iBAAiB,GAAG,aAAG,CAAC,OAAO,CAAC;YACnC,MAAM,EAAE,mBAAmB;YAC3B,aAAa;YACb,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QACH,IAAI,CAAC,gBAAgB,GAAG,aAAG,CAAC,OAAO,CAAC;YAClC,MAAM,EAAE,kBAAkB;YAC1B,aAAa;YACb,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QAEjB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;YACpC,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;gBACnC,IAAI,CAAC,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAChD,EAAE,EAAE,QAAQ,CAAC,EAAE;oBACf,GAAG,EAAE,QAAQ,CAAC,GAAG;iBAClB,CAAC,CAAC,CAAC;aACL;iBAAM,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;gBAC/C,IAAI,CAAC,MAAM,GAAG;oBACZ;wBACE,EAAE,EAAE,gBAAgB,CAAC,EAAE;wBACvB,GAAG,EAAE,gBAAgB,CAAC,GAAG;qBAC1B;iBACF,CAAC;aACH;SACF;IACH,CAAC;IAED;;;;;OAKG;IACG,UAAU,CAAC,UAAkB,EAAE;;YACnC,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAO,CAAC,EAAE,EAAE;gBAC1B,MAAM,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;YACzC,CAAC,CAAA,CAAC,CACH,CAAC;QACJ,CAAC;KAAA;IAEK,wBAAwB,CAAC,CAAY;;YACzC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;gBAC1B,MAAM,QAAQ,GAAG,MAAM,0BAA0B,CAC/C,CAAC,CAAC,EAAE,EACJ,CAAC,CAAC,GAAG,EACL,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAC3B,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAC1B,CAAC,CAAC,IAAI,CACP,CAAC;gBAEF,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC;gBACf,CAAC,CAAC,MAAM,GAAG,QAAQ,CAAC;gBACpB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;aAC1B;YAED,IAAI,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;gBAC7B,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CACxC,CAAC,CAAC,EAAE,EACJ,CAAC,CAAC,GAAG,EACL,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAC3B,CAAC,CAAC,IAAI,CACP,CAAC;gBAEF,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC;gBACf,CAAC,CAAC,MAAM,GAAG,QAAQ,CAAC;gBAEpB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;aAC1B;QACH,CAAC;KAAA;IAED;;;;OAIG;IACG,MAAM,CAAC,WAAwB;;YACnC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE;gBAChC,OAAO;aACR;YAED,MAAM,KAAK,GAAG;gBACZ,EAAE,EAAE,WAAW,CAAC,EAAE;gBAClB,GAAG,EAAE,WAAW,CAAC,GAAG;gBACpB,IAAI,EAAE,WAAW,CAAC,IAAI;aACvB,CAAC;YAEF,MAAM,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;YAE3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;KAAA;IAED;;;;OAIG;IACG,MAAM,CAAC,EAAU;;YACrB,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;gBACpB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;gBACnD,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACnC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACvB,OAAO,KAAK,CAAC,MAAM,CAAC;gBAEpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;aACtD;QACH,CAAC;KAAA;IAED,WAAW,CAAC,WAAgB;;QAC1B,IAAI,MAAM,GAAG,MAAA,WAAW,CAAC,aAAa,0CAAE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACnE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;YAE7B,IAAI,CAAC,WAAW,EAAE;gBAChB,OAAO,IAAI,CAAC;aACb;YAED,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEpC,IAAI,OAAO,CAAC;YACZ,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;YACjC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;gBACxB,IAAI,KAAK,KAAK,CAAC,EAAE;oBACf,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;wBACZ,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;qBACd;oBACD,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;iBACnB;qBAAM;oBACL,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;wBACf,IAAI,KAAK,KAAK,QAAQ,EAAE;4BACtB,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;yBACjB;6BAAM;4BACL,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;yBACjB;qBACF;oBACD,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;iBACtB;gBAED,IAAI,KAAK,KAAK,QAAQ,EAAE;oBACtB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;wBAC3B,MAAM,KAAK,GAAG,IAAI,eAAgB,CAAC,YAAY,CAC7C,oCAAoC,WAAW,EAAE,CAClD,CAAC;wBACF,MAAM,KAAK,CAAC;qBACb;yBAAM;wBACL,OAAO,CAAC,IAAI,CAAC;4BACX,OAAO,EAAE,IAAI,CAAC,OAAO;yBACtB,CAAC,CAAC;qBACJ;iBACF;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,MAAM,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;QAClC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,EAAU;QAClB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAEnD,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,eAAgB,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,KAAK,CAAC,KAAK;YAAE,MAAM,IAAI,eAAgB,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC;QAE1E,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,EAAU;QAChB,IAAI;YACF,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;SAC7B;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAED;;;;;OAKG;IACG,OAAO,CACX,KAAkB,EAClB,KAAa,SAAS;;;YAEtB,MAAM,QAAQ,GAAG;gBACf,YAAY,EAAE;oBACZ,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM;iBAClC;gBACD,YAAY,EAAE,KAAK,CAAC,YAAY;aACjC,CAAA;YACD,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACpE,MAAM,YAAY,GAAG,EAAE,KAAI,MAAA,KAAK,CAAC,YAAY,0CAAE,YAAY,CAAA,CAAC;YAC5D,IAAI,KAAK,EAAE;gBACT,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBAE3C,IAAI;oBACF,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAEpD,IAAI,MAAA,YAAY,CAAC,aAAa,0CAAE,MAAM,EAAE;wBACtC,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;wBAC9C,MAAM,IAAI,eAAgB,CAAC,oBAAoB,CAC7C,MAAM,EACN,YAAY,EACZ,YAAY,CACb,CAAC;qBACH;oBACD,OAAO,YAAY,CAAC;iBACrB;gBAAC,OAAO,GAAG,EAAE;oBACZ,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;oBAC9B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAEjB,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAkB,EAAE;wBACnC,MAAM,GAAG,CAAC;qBACX;oBAED,MAAM,IAAI,eAAgB,CAAC,iBAAiB,CAC1C,GAAG,CAAC,OAAO,EACX,YAAY,EACZ,KAAK,CACN,CAAC;iBACH;aACF;iBAAM;gBACL,MAAM,IAAI,eAAgB,CAAC,sBAAsB,CAC/C,2BAA2B,EAC3B,KAAK,CACN,CAAC;aACH;;KACF;CACF;AA1PD,gCA0PC"}
package/dist/types.d.ts CHANGED
@@ -2,10 +2,13 @@ import { StaticPool } from "node-worker-threads-pool";
2
2
  export interface Files {
3
3
  js: string;
4
4
  wasm: string;
5
+ data?: string;
5
6
  }
6
- export interface RunnerConfig {
7
+ export declare type RunnerConfig = ModelConfig[] | ModelConfig;
8
+ export interface ModelConfig {
7
9
  id: string;
8
10
  url: string;
11
+ size?: number;
9
12
  }
10
13
  interface ZipContent {
11
14
  path: string;
@@ -14,19 +17,43 @@ interface ZipContent {
14
17
  export interface UnzippedFiles {
15
18
  js: ZipContent;
16
19
  wasm: ZipContent;
20
+ data?: ZipContent;
17
21
  }
18
22
  export interface NodeModel {
19
- id: any;
20
- url: any;
23
+ id: string;
24
+ url: string;
25
+ size?: number;
21
26
  ready?: boolean;
22
27
  worker?: StaticPool<any, any>;
23
28
  results?: any;
24
29
  }
25
30
  export interface Model {
26
- id: any;
27
- url: any;
31
+ id: string;
32
+ url: string;
28
33
  ready?: boolean;
29
34
  worker?: Worker;
30
35
  results?: any;
31
36
  }
37
+ export interface InputObject {
38
+ request_data: {
39
+ [k: string]: any;
40
+ };
41
+ request_meta: {
42
+ [k: string]: any;
43
+ };
44
+ }
45
+ export interface ResponseObject {
46
+ response_data: {
47
+ [k: string]: any;
48
+ };
49
+ response_meta?: {
50
+ [k: string]: any;
51
+ };
52
+ errors?: {
53
+ [k: string]: any;
54
+ }[];
55
+ warnings?: {
56
+ [k: string]: any;
57
+ }[];
58
+ }
32
59
  export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@coherentglobal/wasm-runner",
3
- "version": "0.0.24",
3
+ "version": "0.0.32",
4
4
  "description": "Coherent WASM runner for Javascript and Node.js",
5
5
  "main": "dist/node.js",
6
6
  "browser": "dist/browser.js",