@coherentglobal/spark-execute-sdk 0.4.11 → 0.4.12

package/dist/browser.js

@@ -900,13 +900,19 @@ var unzipppedModel = function unzipppedModel(model) {
           case 0:
             servicename = model.servicename, wasm = model.wasm, js = model.js, data = model.data, metadata = model.metadata;
             response = {
-              wasm: {
+              wasm: utils.isFilePath(wasm, "wasm") ? {
+                url: new URL(wasm, window.location.origin).toString(),
+                path: utils.last(wasm.split("/"))
+              } : {
                 url: URL.createObjectURL(new Blob([wasm], {
                   type: "application/wasm"
                 })),
                 path: "".concat(servicename, ".wasm")
               },
-              js: {
+              js: utils.isFilePath(js, "js") ? {
+                url: new URL(js, window.location.origin).toString(),
+                path: utils.last(js.split("/"))
+              } : {
                 url: URL.createObjectURL(new Blob([js], {
                   type: "text/javascript"
                 })),
@@ -914,7 +920,10 @@ var unzipppedModel = function unzipppedModel(model) {
               }
             };
             if (data) {
-              response.data = {
+              response.data = utils.isFilePath(data, "data") ? {
+                url: new URL(data, window.location.origin).toString(),
+                path: utils.last(data.split("/"))
+              } : {
                 url: URL.createObjectURL(new Blob([data], {
                   type: "application/octet-stream"
                 })),
@@ -922,7 +931,10 @@ var unzipppedModel = function unzipppedModel(model) {
               };
             }
             if (metadata) {
-              response.metadata = {
+              response.metadata = utils.isFilePath(metadata, "json") ? {
+                url: new URL(metadata, window.location.origin).toString(),
+                path: utils.last(metadata.split("/"))
+              } : {
                 url: URL.createObjectURL(new Blob([metadata], {
                   type: "application/json"
                 })),
@@ -966,7 +978,7 @@ var getRuntimeContent = function getRuntimeContent(js, wasm) {
                 }, _callee7);
               }));
             }).then(function (text) {
-              return text.replace(wasm.path, wasm.url).replace(data.path, data.url).replace(data.path, data.url);
+              return text.replace(wasm.path, wasm.url).replace("\"".concat(data.path, "\""), "\"".concat(data.url, "\"")).replace("\"".concat(data.path, "\""), "\"".concat(data.url, "\"")).replace("'".concat(data.path, "'"), "'".concat(data.url, "'")).replace("'".concat(data.path, "'"), "'".concat(data.url, "'"));
             });
           case 3:
             _runtime = _context9.sent;
@@ -1710,7 +1722,7 @@ var __importDefault = void 0 && (void 0).__importDefault || function (mod) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.addScript = exports.isEmpty = exports.fn2workerURL = exports.jsString2workerURL = exports.isCompatible = exports.isWorkerSupported = exports.isWasmSupported = exports.isBrowser = exports.isHttpURL = exports.isPath = exports.ENVIRONMENT_IS_NODE = exports.ENVIRONMENT_IS_WEB = void 0;
+exports.last = exports.addScript = exports.isEmpty = exports.fn2workerURL = exports.jsString2workerURL = exports.isCompatible = exports.isWorkerSupported = exports.isWasmSupported = exports.isBrowser = exports.isFilePath = exports.isHttpURL = exports.isPath = exports.ENVIRONMENT_IS_NODE = exports.ENVIRONMENT_IS_WEB = void 0;
 var fs_1 = __importDefault(require("fs"));
 var url_1 = __importDefault(require("url"));
 var error_1 = __importDefault(require("./error"));
@@ -1757,6 +1769,11 @@ function isHttpURL(str) {
   return urlInstance.protocol === "http:" || urlInstance.protocol === "https:";
 }
 exports.isHttpURL = isHttpURL;
+function isFilePath(str, ext) {
+  var idx = str.indexOf(".".concat(ext));
+  return idx > -1 && idx === str.length - ".".concat(ext).length;
+}
+exports.isFilePath = isFilePath;
 function isBrowser() {
   try {
     // eslint-disable-next-line no-undef
@@ -1829,6 +1846,17 @@ function addScript(src) {
   document.body.appendChild(s);
 }
 exports.addScript = addScript;
+function last(arr) {
+  if (!Array.isArray(arr)) {
+    throw new Error("Argument is not array");
+  }
+  var length = arr.length;
+  if (length === 0) {
+    return undefined;
+  }
+  return arr[length - 1];
+}
+exports.last = last;
 
 }).call(this)}).call(this,require('_process'))
 },{"./error":22,"@babel/runtime/helpers/interopRequireDefault":9,"@babel/runtime/helpers/typeof":17,"@babel/runtime/regenerator":19,"_process":36,"fs":25,"url":42}],24:[function(require,module,exports){

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@coherentglobal/spark-execute-sdk",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "description": "",
   "main": "src/node.js",
   "browser": "dist/browser.js",
   "types": "types/node.d.ts",
   "scripts": {
+    "build": "npm run build:types && npm run bundle:full && npm run bundle:min",
     "build:types": "tsc --declaration",
     "bundle:full": "browserify src/browser.js  --standalone Spark > dist/browser.js",
     "bundle:min": "browserify src/browser.js --standalone Spark | uglifyjs --compress --mangle --comments false > lib/sparkexecute.min.js",
@@ -22,7 +23,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@coherentglobal/wasm-runner": "^0.0.60",
+    "@coherentglobal/wasm-runner": "^0.0.63",
     "@types/node": "^18.7.18",
     "axios": "^0.27.2",
     "chai": "^4.3.6",

package/src/browser.js

@@ -164,7 +164,6 @@ class Spark {
   async offlineModel(input, versionID) {
     const model = findModel(input.request_meta, this.model);
     const modelVersionId = versionID || (model && model?.versionId);
-
     if (!input?.request_meta) {
       input.request_meta = {};
     }

package/types/browser.d.ts

@@ -4,6 +4,10 @@ declare class Spark {
      * @param {object} config
      */
     constructor(config: object, options?: {});
+    /**
+    * @private
+    */
+    private _registry;
     logger: any;
     /**
      * @private
@@ -65,7 +69,7 @@ declare class Spark {
      * @returns {object}
      */
     execute(input: object, version_id?: string | undefined): object;
-    offlineModel(input: any, versionID: any, ds: any): Promise<any>;
-    onlineModelEndpoint(input: any, versionID: any, ds: any): Promise<any>;
+    offlineModel(input: any, versionID: any): Promise<unknown>;
+    onlineModelEndpoint(input: any, versionID: any): Promise<any>;
 }
 //# sourceMappingURL=browser.d.ts.map

package/types/browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.js"],"names":[],"mappings":";AASA;IACE;;OAEG;IACH,oBAFW,MAAM,gBAgDhB;IAzCG,YAAyB;IAG3B;;OAEG;IACH,eAAyC;IAEzC;;OAEG;IACH,eAAsD;IACtD;;OAEG;IACH,iBAA0D;IAC1D;;OAEG;IACH,cAGI;IACJ;;OAEG;IACH,YAAgD;IAChD;;OAEG;IACH,qBAA2C;IAE3C;;OAEG;IACH,iBAA2C;IAE3C;;MAEE;IACF,cAAqD;IAGvD,oBAEC;IAED;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAgBlB;IACD;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAgBlB;IACD;;;;OAIG;IACH,cAHW,MAAM,GACJ,OAAO,CAOnB;IAED,wDASC;IAED;;;;;;OAMG;IACH,eAJW,MAAM,oCAEJ,MAAM,CAuBlB;IAED,gEAuEC;IAED,uEA6CC;CACF"}
+{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.js"],"names":[],"mappings":";AASA;IACE;;OAEG;IACH,oBAFW,MAAM,gBAqDhB;IAlDC;;MAEE;IACF,kBAA0B;IAMxB,YAAyB;IAG3B;;OAEG;IACH,eAAyC;IAEzC;;OAEG;IACH,eAAsD;IACtD;;OAEG;IACH,iBAA0D;IAC1D;;OAEG;IACH,cAGI;IACJ;;OAEG;IACH,YAAgD;IAChD;;OAEG;IACH,qBAA2C;IAE3C;;OAEG;IACH,iBAA2C;IAE3C;;MAEE;IACF,cAAqD;IAGvD,oBAEC;IAED;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAgBlB;IACD;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAgBlB;IACD;;;;OAIG;IACH,cAHW,MAAM,GACJ,OAAO,CAOnB;IAED,wDASC;IAED;;;;;;OAMG;IACH,eAJW,MAAM,oCAEJ,MAAM,CAuBlB;IAED,2DAsEC;IAED,8DA6CC;CACF"}

package/types/node.d.ts

@@ -9,8 +9,11 @@ declare class Spark {
      */
     private _registry;
     apm: any;
+    /**
+    * @private
+    */
+    private instanceid;
     config: object;
-    instanceid: any;
     /**
      * @private
      */

package/types/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.js"],"names":[],"mappings":";AAeA;IACE;;OAEG;IACH,oBAFW,MAAM,+CAmEhB;IAhEC;;OAEG;IACH,kBAA0B;IAGxB,SAAsB;IAUtB,eAAsB;IASxB,gBAA4E;IAE5E;;OAEG;IACH,eAAsD;IACtD;;OAEG;IACH,iBAA0D;IAC1D;;OAEG;IACH,cAGI;IACJ;;OAEG;IACH,YAAgD;IAChD;;OAEG;IACH,qBAA2C;IAC3C;;OAEG;IACH,cAAqD;IAErD;;OAEG;IACH,yBAAmD;IAEnD;;OAEG;IACH,iBAA2C;IAG7C;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAKlB;IAED;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAclB;IAED;;;;;;OAMG;IACH,eAJW,MAAM,oCAEJ,MAAM,CAqBlB;IAED,+BAkFC;IAED,wDAWC;IAED,uBAKC;IAED;;OAEG;IAGH,2DA0CC;IAED,8DA4CC;CACF"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.js"],"names":[],"mappings":";AAeA;IACE;;OAEG;IACH,oBAFW,MAAM,+CAoEhB;IAjEC;;OAEG;IACH,kBAA0B;IAGxB,SAAsB;IAGxB;;MAEE;IACF,mBAA4E;IAU1E,eAAsB;IAMxB;;OAEG;IACH,eAAsD;IACtD;;OAEG;IACH,iBAA0D;IAC1D;;OAEG;IACH,cAGI;IACJ;;OAEG;IACH,YAAgD;IAChD;;OAEG;IACH,qBAA2C;IAC3C;;OAEG;IACH,cAAqD;IAErD;;OAEG;IACH,yBAAmD;IAEnD;;OAEG;IACH,iBAA2C;IAG7C;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAKlB;IAED;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAelB;IAED;;;;;;OAMG;IACH,eAJW,MAAM,oCAEJ,MAAM,CAqBlB;IAED,+BAkFC;IAED,wDAUC;IAED,uBAKC;IAED;;OAEG;IAGH,2DAkCC;IAED,8DA6CC;CACF"}