@coherentglobal/spark-execute-sdk 0.4.9 → 0.4.10

package/dist/browser.js

@@ -7164,7 +7164,15 @@ var Spark = /*#__PURE__*/function () {
    */
   function Spark(config) {
     var _this$config$sparkEnd, _this$config, _this$config$sparkEnd2, _this$config$sparkEnd3, _this$config2, _this$config2$sparkEn, _ref, _this$config$sparkEnd4, _this$config3, _this$config3$sparkEn, _this$config4, _this$config4$sparkEn, _this$config$sparkEnd5, _this$config5, _this$config5$sparkEn, _this$config6;
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     (0, _classCallCheck2["default"])(this, Spark);
+    /**
+    * @private
+    */
+    if (options !== null && options !== void 0 && options.log) {
+      this.logger = options.log;
+    }
+
     /**
      * @private
      */
@@ -7190,25 +7198,51 @@ var Spark = /*#__PURE__*/function () {
      * @private
      */
     this.isCompatible = utils.isWasmSupported();
-    /**
-     * @private
-     */
-    this.model = this._models((_this$config6 = this.config) === null || _this$config6 === void 0 ? void 0 : _this$config6.nodeGenModels);
+
     /**
      * @private
      */
     this.priority = ["model", "onlineEndpoint"];
-  }
 
-  /**
-   *
-   * @param {object} nodegen
-   * @returns {object}
-   */
+    /**
+    * @private
+    */
+    this.model = this._models((_this$config6 = this.config) === null || _this$config6 === void 0 ? void 0 : _this$config6.nodeGenModels);
+  }
   (0, _createClass2["default"])(Spark, [{
+    key: "log",
+    value: function log(msg) {
+      this.logger && this.logger(msg);
+    }
+
+    /**
+     *
+     * @param {object} nodegen
+     * @returns {object}
+     */
+  }, {
     key: "_models",
     value: function _models(nodegen) {
-      var models = nodegen.map(processModels);
+      this.log({
+        eventType: "spark._models",
+        msg: 'Parse models'
+      });
+      var models = [];
+      for (var i = 0; i < nodegen.length; i++) {
+        var startDate = Date.now();
+        this.log({
+          eventType: "spark._models.processModels.start",
+          msg: "Start process model ".concat(i)
+        });
+        var model = processModels(nodegen[i], i, this.log.bind(this));
+        var endDate = Date.now();
+        this.log({
+          eventType: "spark._models.processModels.end",
+          msg: "End process model ".concat(i),
+          duration: endDate - startDate
+        });
+        models.push(model);
+      }
       return models;
     }
     /**
@@ -7219,13 +7253,27 @@ var Spark = /*#__PURE__*/function () {
   }, {
     key: "validateConfig",
     value: function validateConfig(config) {
+      var start = Date.now();
+      this.log({
+        eventType: 'spark.validateconfig.start'
+      });
       var _validate = validate(config),
         value = _validate.value,
         error = _validate.error;
       if (!error) {
+        var end = Date.now();
+        this.log({
+          eventType: 'spark.validateconfig.startend',
+          duration: end - start
+        });
         return value;
       } else {
         var message = JSON.stringify(error.details);
+        var _end = Date.now();
+        this.log({
+          eventType: 'spark.validateconfig.startend.error',
+          duration: _end - start
+        });
         throw new Error("ValidationError: ".concat(message));
       }
     }
@@ -7271,26 +7319,32 @@ var Spark = /*#__PURE__*/function () {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                if (!(this.model == undefined)) {
+                  _context.next = 2;
+                  break;
+                }
+                throw new WasmRunnerErrors.BadRequestError('Spark initialize is required. Please call initialize method');
+              case 2:
                 versionID = version_id || (input === null || input === void 0 ? void 0 : (_input$request_meta = input.request_meta) === null || _input$request_meta === void 0 ? void 0 : _input$request_meta.version_id) || (input === null || input === void 0 ? void 0 : (_input$request_meta2 = input.request_meta) === null || _input$request_meta2 === void 0 ? void 0 : _input$request_meta2.version_uuid);
                 lookup = {
                   model: this.offlineModel,
                   onlineEndpoint: this.onlineModelEndpoint
                 };
-                _context.next = 4;
+                _context.next = 6;
                 return lookup[this.priority[0]](input, versionID, this);
-              case 4:
+              case 6:
                 response = _context.sent;
                 if (!(response instanceof Error && this.config.sparkEndpoint !== undefined)) {
-                  _context.next = 9;
+                  _context.next = 11;
                   break;
                 }
-                _context.next = 8;
+                _context.next = 10;
                 return lookup[this.priority[1]](input, versionID, this);
-              case 8:
+              case 10:
                 response = _context.sent;
-              case 9:
+              case 11:
                 return _context.abrupt("return", response);
-              case 10:
+              case 12:
               case "end":
                 return _context.stop();
             }
@@ -7667,14 +7721,29 @@ var findModel = function findModel(requestMeta, nodegenModels) {
         }));
       }).reverse();
     }
-  } else if (requestMeta.service_id && requestMeta.version) {
+  } else if (requestMeta.servicename) {
+    var transactionDate = new Date();
     model = nodegenModels.filter(function (_ref4) {
       var metaData = _ref4.metaData;
-      return metaData.EngineInformation.ServiceGuid === requestMeta.service_id && metaData.EngineInformation.Revision === requestMeta.version;
+      return metaData.EngineInformation.ServiceName === requestMeta.servicename && transactionDate >= new Date(metaData.EffectiveStartDate) && transactionDate <= new Date(metaData.EffectiveEndDate);
     });
-  } else if (requestMeta.service_id && requestMeta.transaction_date) {
+    if (model.length > 1) {
+      return model.sort(function (versionA, versionB) {
+        return versionA.metaData.EngineInformation.Revision.replace(/\d+/g, function (n) {
+          return +n + 100000;
+        }).localCompare(versionB.metaData.EngineInformation.Revision.replace(/\d+/g, function (n) {
+          return +n + 100000;
+        }));
+      }).reverse();
+    }
+  } else if (requestMeta.service_id && requestMeta.version) {
     model = nodegenModels.filter(function (_ref5) {
       var metaData = _ref5.metaData;
+      return metaData.EngineInformation.ServiceGuid === requestMeta.service_id && metaData.EngineInformation.Revision === requestMeta.version;
+    });
+  } else if (requestMeta.service_id && requestMeta.transaction_date) {
+    model = nodegenModels.filter(function (_ref6) {
+      var metaData = _ref6.metaData;
       return metaData.EngineInformation.ServiceGuid === requestMeta.service_id && new Date(requestMeta.transaction_date) >= new Date(metaData.EffectiveStartDate) && new Date(requestMeta.transaction_date) <= new Date(metaData.EffectiveEndDate);
     });
     if (model.length > 1) {
@@ -7686,6 +7755,21 @@ var findModel = function findModel(requestMeta, nodegenModels) {
         }));
       }).reverse();
     }
+  } else if (requestMeta.service_id) {
+    var _transactionDate = new Date();
+    model = nodegenModels.filter(function (_ref7) {
+      var metaData = _ref7.metaData;
+      return metaData.EngineInformation.ServiceGuid === requestMeta.service_id && _transactionDate >= new Date(metaData.EffectiveStartDate) && _transactionDate <= new Date(metaData.EffectiveEndDate);
+    });
+    if (model.length > 1) {
+      return model.sort(function (versionA, versionB) {
+        return versionA.metaData.EngineInformation.Revision.replace(/\d+/g, function (n) {
+          return +n + 100000;
+        }).localCompare(versionB.metaData.EngineInformation.Revision.replace(/\d+/g, function (n) {
+          return +n + 100000;
+        }));
+      }).reverse();
+    }
   } else if (requestMeta.service_uri && requestMeta.transaction_date) {
     var regex = /folders\/(.+)\/services\/(.+)/gi;
     var parts = regex.exec(requestMeta.service_uri);
@@ -7694,8 +7778,8 @@ var findModel = function findModel(requestMeta, nodegenModels) {
       folder = decodeURI(parts[1]);
       service = decodeURI(parts[2]);
     }
-    model = nodegenModels.filter(function (_ref6) {
-      var metaData = _ref6.metaData;
+    model = nodegenModels.filter(function (_ref8) {
+      var metaData = _ref8.metaData;
       return metaData.EngineInformation.ProductName === folder && metaData.EngineInformation.ServiceName === service && new Date(requestMeta.transaction_date) >= new Date(metaData.EffectiveStartDate) && new Date(requestMeta.transaction_date) <= new Date(metaData.EffectiveEndDate);
     });
     if (model.length > 1) {
@@ -7715,10 +7799,32 @@ var findModel = function findModel(requestMeta, nodegenModels) {
       _folder = decodeURI(_parts[1]);
       _service = decodeURI(_parts[2]);
     }
-    model = nodegenModels.filter(function (_ref7) {
-      var metaData = _ref7.metaData;
+    model = nodegenModels.filter(function (_ref9) {
+      var metaData = _ref9.metaData;
       return metaData.EngineInformation.ProductName === _folder && metaData.EngineInformation.ServiceName === _service && metaData.EngineInformation.Revision === requestMeta.version;
     });
+  } else if (requestMeta.service_uri) {
+    var _transactionDate2 = new Date();
+    var _regex2 = /folders\/(.+)\/services\/(.+)/gi;
+    var _parts2 = _regex2.exec(requestMeta.service_uri);
+    var _folder2, _service2;
+    if (_parts2) {
+      _folder2 = decodeURI(_parts2[1]);
+      _service2 = decodeURI(_parts2[2]);
+    }
+    model = nodegenModels.filter(function (_ref10) {
+      var metaData = _ref10.metaData;
+      return metaData.EngineInformation.ProductName === _folder2 && metaData.EngineInformation.ServiceName === _service2 && _transactionDate2 >= new Date(metaData.EffectiveStartDate) && _transactionDate2 <= new Date(metaData.EffectiveEndDate);
+    });
+    if (model.length > 1) {
+      return model.sort(function (versionA, versionB) {
+        return versionA.metaData.EngineInformation.Revision.replace(/\d+/g, function (n) {
+          return +n + 100000;
+        }).localCompare(versionB.metaData.EngineInformation.Revision.replace(/\d+/g, function (n) {
+          return +n + 100000;
+        }));
+      }).reverse();
+    }
   } else {
     throw new Error("Model not found. requestMeta: " + JSON.stringify(requestMeta));
   }
@@ -7818,13 +7924,35 @@ var path = require("path");
  * @param {object} nodegen
  * @returns
  */
+
 var processModels = function processModels(nodegen, index) {
+  var logFn = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
+  var instanceid = arguments.length > 3 ? arguments[3] : undefined;
+  var startDate = Date.now();
+  logFn && logFn({
+    eventType: 'processModels.start',
+    nodegenType: nodegen.type
+  });
   var processedModels = _objectSpread({}, nodegen);
+  var endSpreadDate = Date.now();
+  logFn && logFn({
+    eventType: 'processModels.spread',
+    nodegenType: nodegen.type,
+    duration: endSpreadDate - startDate
+  });
   switch (nodegen.type) {
     case "binary":
     case "uint8array":
     case "base64":
-      if ((0, _typeof2["default"])(nodegen.binary) === "object") {
+      if (Buffer.isBuffer(nodegen.binary)) {
+        processedModels.binary = nodegen.binary;
+        var _endCreateBufferDate = Date.now();
+        logFn && logFn({
+          eventType: 'processModels.type.buffer',
+          nodegenType: nodegen.type,
+          duration: _endCreateBufferDate - startDate
+        });
+      } else if ((0, _typeof2["default"])(nodegen.binary) === "object") {
         var model = {
           servicename: nodegen.binary.servicename,
           wasm: Buffer.from(nodegen.binary.wasm, "base64"),
@@ -7832,6 +7960,12 @@ var processModels = function processModels(nodegen, index) {
           data: Buffer.from(nodegen.binary.data, "base64"),
           metadata: Buffer.from(nodegen.binary.metadata, "base64")
         };
+        var endCreateobjectDate = Date.now();
+        logFn && logFn({
+          eventType: 'processModels.type.object',
+          nodegenType: nodegen.type,
+          duration: endCreateobjectDate - startDate
+        });
         processedModels.binary = model;
       } else if (typeof nodegen.binaryPath !== 'undefined') {
         processModels.binaryPath = nodegen.binaryPath;
@@ -7847,7 +7981,7 @@ var processModels = function processModels(nodegen, index) {
                 fs.mkdirSync(folder);
               }
             }
-            var filePath = path.join(__dirname, "resolver_temp/model-".concat(nodegen.versionId || nodegen.VersionI || uuidv4(), ".binary"));
+            var filePath = path.join(__dirname, "resolver_temp/".concat(instanceid, "_model_").concat(nodegen.versionId || nodegen.VersionId || uuidv4(), ".binary"));
             fs.writeFileSync(filePath, Buffer.from(nodegen.binary, 'base64'));
             processedModels.binaryPath = filePath;
             nodegen.binaryPath = filePath;
@@ -7856,6 +7990,12 @@ var processModels = function processModels(nodegen, index) {
           }
         } else {
           var _model = Buffer.from(nodegen.binary, "base64");
+          var _endCreateBufferDate2 = Date.now();
+          logFn && logFn({
+            eventType: 'processModels.type.bufferb64',
+            nodegenType: nodegen.type,
+            duration: _endCreateBufferDate2 - startDate
+          });
           processedModels.binary = _model;
         }
       }
@@ -7885,9 +8025,24 @@ var processModels = function processModels(nodegen, index) {
       } else {
         processedModels.binary = func();
       }
+      break;
+    case "url":
+      processedModels.binary = nodegen.binary;
+      var endCreateBufferDate = Date.now();
+      logFn && logFn({
+        eventType: 'processModels.type.url',
+        nodegenType: nodegen.type,
+        duration: endCreateBufferDate - startDate
+      });
     default:
       break;
   }
+  var endDate = Date.now();
+  logFn && logFn({
+    eventType: 'processModels.complete',
+    nodegenType: nodegen.type,
+    duration: endDate - startDate
+  });
   return processedModels;
 };
 module.exports = processModels;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coherentglobal/spark-execute-sdk",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "",
   "main": "src/node.js",
   "browser": "dist/browser.js",

package/src/browser.js

@@ -11,7 +11,14 @@ class Spark {
   /**
    * @param {object} config
    */
-  constructor(config) {
+  constructor(config, options = {}) {
+    /**
+    * @private
+    */
+    if (options?.log) {
+      this.logger = options.log
+    }
+
     /**
      * @private
      */
@@ -40,14 +47,20 @@ class Spark {
      * @private
      */
     this.isCompatible = utils.isWasmSupported();
-    /**
-     * @private
-     */
-    this.model = this._models(this.config?.nodeGenModels);
+
     /**
      * @private
      */
     this.priority = ["model", "onlineEndpoint"];
+
+    /**
+    * @private
+    */
+    this.model = this._models(this.config?.nodeGenModels);
+  }
+
+  log(msg) {
+    this.logger && this.logger(msg)
   }
 
   /**
@@ -56,7 +69,17 @@ class Spark {
    * @returns {object}
    */
   _models(nodegen) {
-    const models = nodegen.map(processModels);
+    this.log({ eventType: "spark._models", msg: 'Parse models' })
+    const models = [];
+
+    for (let i = 0; i < nodegen.length; i++) {
+      const startDate = Date.now();
+      this.log({ eventType: "spark._models.processModels.start", msg: `Start process model ${i}` });
+      const model = processModels(nodegen[i], i, this.log.bind(this));
+      const endDate = Date.now();
+      this.log({ eventType: "spark._models.processModels.end", msg: `End process model ${i}`, duration: endDate - startDate });
+      models.push(model)
+    }
 
     return models;
   }
@@ -66,11 +89,17 @@ class Spark {
    * @returns {object}
    */
   validateConfig(config) {
+    const start = Date.now();
+    this.log({ eventType: 'spark.validateconfig.start' })
     const { value, error } = validate(config);
     if (!error) {
+      const end = Date.now();
+      this.log({ eventType: 'spark.validateconfig.startend', duration: end - start })
       return value;
     } else {
       const message = JSON.stringify(error.details);
+      const end = Date.now();
+      this.log({ eventType: 'spark.validateconfig.startend.error', duration: end - start })
       throw new Error(`ValidationError: ${message}`);
     }
   }
@@ -105,6 +134,10 @@ class Spark {
    * @returns {object}
    */
   async execute(input, version_id) {
+    if (this.model == undefined) {
+      throw new WasmRunnerErrors.BadRequestError('Spark initialize is required. Please call initialize method')
+    }
+
     const versionID =
       version_id ||
       input?.request_meta?.version_id ||
@@ -189,7 +222,7 @@ class Spark {
           },
         });
       }
-      const result = await registry.execute(input, modelVersionId, () => {});
+      const result = await registry.execute(input, modelVersionId, () => { });
       return result;
     } catch (err) {
       return err;

package/src/findModels.js

@@ -17,9 +17,35 @@ const findModel = (requestMeta, nodegenModels) => {
       ({ metaData }) =>
         metaData.EngineInformation.ServiceName === requestMeta.servicename &&
         new Date(requestMeta.transaction_date) >=
-          new Date(metaData.EffectiveStartDate) &&
+        new Date(metaData.EffectiveStartDate) &&
         new Date(requestMeta.transaction_date) <=
-          new Date(metaData.EffectiveEndDate)
+        new Date(metaData.EffectiveEndDate)
+    );
+
+    if (model.length > 1) {
+      return model
+        .sort((versionA, versionB) =>
+          versionA.metaData.EngineInformation.Revision.replace(
+            /\d+/g,
+            (n) => +n + 100000
+          ).localCompare(
+            versionB.metaData.EngineInformation.Revision.replace(
+              /\d+/g,
+              (n) => +n + 100000
+            )
+          )
+        )
+        .reverse();
+    }
+  } else if (requestMeta.servicename) {
+    const transactionDate = new Date();
+    model = nodegenModels.filter(
+      ({ metaData }) =>
+        metaData.EngineInformation.ServiceName === requestMeta.servicename &&
+        transactionDate >=
+        new Date(metaData.EffectiveStartDate) &&
+        transactionDate <=
+        new Date(metaData.EffectiveEndDate)
     );
 
     if (model.length > 1) {
@@ -48,9 +74,35 @@ const findModel = (requestMeta, nodegenModels) => {
       ({ metaData }) =>
         metaData.EngineInformation.ServiceGuid === requestMeta.service_id &&
         new Date(requestMeta.transaction_date) >=
-          new Date(metaData.EffectiveStartDate) &&
+        new Date(metaData.EffectiveStartDate) &&
         new Date(requestMeta.transaction_date) <=
-          new Date(metaData.EffectiveEndDate)
+        new Date(metaData.EffectiveEndDate)
+    );
+
+    if (model.length > 1) {
+      return model
+        .sort((versionA, versionB) =>
+          versionA.metaData.EngineInformation.Revision.replace(
+            /\d+/g,
+            (n) => +n + 100000
+          ).localCompare(
+            versionB.metaData.EngineInformation.Revision.replace(
+              /\d+/g,
+              (n) => +n + 100000
+            )
+          )
+        )
+        .reverse();
+    }
+  } else if (requestMeta.service_id) {
+    const transactionDate = new Date();
+    model = nodegenModels.filter(
+      ({ metaData }) =>
+        metaData.EngineInformation.ServiceGuid === requestMeta.service_id &&
+        transactionDate >=
+        new Date(metaData.EffectiveStartDate) &&
+        transactionDate <=
+        new Date(metaData.EffectiveEndDate)
     );
 
     if (model.length > 1) {
@@ -82,9 +134,9 @@ const findModel = (requestMeta, nodegenModels) => {
         metaData.EngineInformation.ProductName === folder &&
         metaData.EngineInformation.ServiceName === service &&
         new Date(requestMeta.transaction_date) >=
-          new Date(metaData.EffectiveStartDate) &&
+        new Date(metaData.EffectiveStartDate) &&
         new Date(requestMeta.transaction_date) <=
-          new Date(metaData.EffectiveEndDate)
+        new Date(metaData.EffectiveEndDate)
     );
 
     if (model.length > 1) {
@@ -116,6 +168,41 @@ const findModel = (requestMeta, nodegenModels) => {
         metaData.EngineInformation.ServiceName === service &&
         metaData.EngineInformation.Revision === requestMeta.version
     );
+  } else if (requestMeta.service_uri) {
+    const transactionDate = new Date();
+    const regex = /folders\/(.+)\/services\/(.+)/gi;
+    const parts = regex.exec(requestMeta.service_uri);
+    let folder, service;
+    if (parts) {
+      folder = decodeURI(parts[1]);
+      service = decodeURI(parts[2]);
+    }
+
+    model = nodegenModels.filter(
+      ({ metaData }) =>
+        metaData.EngineInformation.ProductName === folder &&
+        metaData.EngineInformation.ServiceName === service &&
+        transactionDate >=
+        new Date(metaData.EffectiveStartDate) &&
+        transactionDate <=
+        new Date(metaData.EffectiveEndDate)
+    );
+
+    if (model.length > 1) {
+      return model
+        .sort((versionA, versionB) =>
+          versionA.metaData.EngineInformation.Revision.replace(
+            /\d+/g,
+            (n) => +n + 100000
+          ).localCompare(
+            versionB.metaData.EngineInformation.Revision.replace(
+              /\d+/g,
+              (n) => +n + 100000
+            )
+          )
+        )
+        .reverse();
+    }
   } else {
     throw new Error(
       "Model not found. requestMeta: " + JSON.stringify(requestMeta)

package/src/models.js

@@ -7,14 +7,24 @@ const path = require("path");
  * @param {object} nodegen
  * @returns
  */
-const processModels = (nodegen, index) => {
+
+const processModels = (nodegen, index, logFn = undefined, instanceid) => {
+  const startDate = Date.now();
+  logFn && logFn({ eventType: 'processModels.start', nodegenType: nodegen.type });
+
   const processedModels = { ...nodegen };
+  const endSpreadDate = Date.now();
+  logFn && logFn({ eventType: 'processModels.spread', nodegenType: nodegen.type, duration: endSpreadDate - startDate });
 
   switch (nodegen.type) {
     case "binary":
     case "uint8array":
     case "base64":
-      if (typeof nodegen.binary === "object") {
+      if (Buffer.isBuffer(nodegen.binary)) {
+        processedModels.binary = nodegen.binary;
+        const endCreateBufferDate = Date.now();
+        logFn && logFn({ eventType: 'processModels.type.buffer', nodegenType: nodegen.type, duration: endCreateBufferDate - startDate });
+      } else if (typeof nodegen.binary === "object") {
         const model = {
           servicename: nodegen.binary.servicename,
           wasm: Buffer.from(nodegen.binary.wasm, "base64"),
@@ -22,6 +32,8 @@ const processModels = (nodegen, index) => {
           data: Buffer.from(nodegen.binary.data, "base64"),
           metadata: Buffer.from(nodegen.binary.metadata, "base64")
         };
+        const endCreateobjectDate = Date.now();
+        logFn && logFn({ eventType: 'processModels.type.object', nodegenType: nodegen.type, duration: endCreateobjectDate - startDate });
         processedModels.binary = model;
       } else if (typeof nodegen.binaryPath !== 'undefined') {
         processModels.binaryPath = nodegen.binaryPath
@@ -39,7 +51,7 @@ const processModels = (nodegen, index) => {
             }
             const filePath = path.join(
               __dirname,
-              `resolver_temp/model-${nodegen.versionId || nodegen.VersionI || uuidv4()}.binary`
+              `resolver_temp/${instanceid}_model_${nodegen.versionId || nodegen.VersionId || uuidv4()}.binary`
             );
 
             fs.writeFileSync(filePath, Buffer.from(nodegen.binary, 'base64'));
@@ -50,6 +62,8 @@ const processModels = (nodegen, index) => {
           }
         } else {
           const model = Buffer.from(nodegen.binary, "base64");
+          const endCreateBufferDate = Date.now();
+          logFn && logFn({ eventType: 'processModels.type.bufferb64', nodegenType: nodegen.type, duration: endCreateBufferDate - startDate });
           processedModels.binary = model;
         }
       }
@@ -67,10 +81,17 @@ const processModels = (nodegen, index) => {
       } else {
         processedModels.binary = func();
       }
+      break;
+    case "url":
+      processedModels.binary = nodegen.binary;
+      const endCreateBufferDate = Date.now();
+      logFn && logFn({ eventType: 'processModels.type.url', nodegenType: nodegen.type, duration: endCreateBufferDate - startDate });
     default:
       break;
   }
 
+  const endDate = Date.now();
+  logFn && logFn({ eventType: 'processModels.complete', nodegenType: nodegen.type, duration: endDate - startDate })
   return processedModels;
 };
 

package/src/node.js

@@ -13,31 +13,34 @@ const { object } = require("joi");
 const { P } = require("pino");
 const findModel = require("./findModels.js");
 
-let registry = [];
-
 class Spark {
   /**
    * @param {object} config
    */
-  constructor(config, option = {}, apmInstance) {
-    // REMOVE ME!!
-    // console.log('init spark instance serialize:', option?.serialize)
+  constructor(config, option = undefined, apmInstance = undefined) {
+    /**
+     * @private
+     */
+    this._registry = undefined;
+
     if (apmInstance) {
-      // console.log(apmInstance)
       this.apm = apmInstance
     }
+
+    /**
+    * @private
+    */
+    this.instanceid = option && option.instanceid ? option.instanceid : uuidv4()
+
     /**
      * @private
      */
-    if (option.serialize) {
+    if (option && option.serialize) {
       const buffer = fs.readFileSync(option.configPath);
       const toBase = buffer.toString("utf8");
       const deserialize = serializeObject.deserialize(toBase);
       const validate = this.validateConfig(deserialize);
       this.config = validate;
-      logger.info({
-        message: "DESERIALIZED"
-      });
       this.isSerializedConfig;
     } else {
       this.config = this.validateConfig(config);
@@ -88,7 +91,7 @@ class Spark {
    * @returns {object}
    */
   _models(nodegen) {
-    const models = nodegen.map(processModels);
+    const models = nodegen.map((n, i) => processModels(n, i, undefined, this.instanceid));
     return models;
   }
 
@@ -105,6 +108,7 @@ class Spark {
       const message = JSON.stringify(error.details);
       logger.error({
         EventType: "ValidationError",
+        InstanceId: this.instanceid,
         TextMessage: message,
       });
       throw new Error(`ValidationError: ${message}`);
@@ -125,15 +129,15 @@ class Spark {
       input.request_meta.version_uuid;
 
     let lookup = {
-      model: this.offlineModel,
-      onlineEndpoint: this.onlineModelEndpoint,
+      model: this.offlineModel.bind(this),
+      onlineEndpoint: this.onlineModelEndpoint.bind(this),
     };
 
     let response;
 
-    response = await lookup[this.priority[0]](input, versionID, this);
+    response = await lookup[this.priority[0]](input, versionID);
     if (response instanceof Error && this.config.sparkEndpoint !== undefined && false) {
-      response = await lookup[this.priority[1]](input, versionID, this);
+      response = await lookup[this.priority[1]](input, versionID);
     }
 
     return response;
@@ -148,12 +152,12 @@ class Spark {
     }
     const filePath = path.join(
       __dirname,
-      `resolver_temp/resolver-${uuidv4()}.js`
+      `resolver_temp/${this.instanceid}_resolver-${uuidv4()}.js`
     );
 
     const configPath = path.join(
       __dirname,
-      `resolver_temp/model_config`
+      `resolver_temp/${this.instanceid}_config`
     );
 
     if (fs.existsSync(filePath)) {
@@ -173,9 +177,11 @@ class Spark {
     template = template.replace(
       "%%config_to_replace%%",
       configPath
+    ).replace(
+      "%%instanceid%%",
+      this.instanceid
     );
 
-
     fs.writeFileSync(filePath, template);
     if (!this.isSerializedConfig) {
       const config = { ...this.config }
@@ -185,7 +191,7 @@ class Spark {
           if (m.binary) {
             const filePath = path.join(
               __dirname,
-              `resolver_temp/model-${m.versionId || m.VersionId || uuidv4()}.binary`
+              `resolver_temp/${this.instanceid}_model_${m.versionId || m.VersionId || uuidv4()}.binary`
             );
 
             fs.writeFileSync(filePath, Buffer.from(m.binary, 'base64'));
@@ -198,6 +204,26 @@ class Spark {
       fs.writeFileSync(configPath, Buffer.from(data))
     }
 
+    process.once('SIGINT', () => {
+      try {
+        fs.rmSync(path.join(
+          __dirname,
+          `resolver_temp`), { recursive: true, force: true });
+      } catch (err) {
+        // Just ignore
+      }
+    });
+
+    process.once('exit', () => {
+      try {
+        fs.rmSync(path.join(
+          __dirname,
+          `resolver_temp`), { recursive: true, force: true });
+      } catch (err) {
+        // Just ignore
+      }
+    });
+
     return require.resolve(filePath);
   }
 
@@ -207,7 +233,9 @@ class Spark {
         m?.metaData?.EngineInformation?.ProductName === folderName &&
         m?.metaData?.EngineInformation?.ServiceName === serviceName
     );
-    if (!model) throw new WasmRunnerErrors.MissingModelError(serviceName);
+    if (!model) {
+      throw new WasmRunnerErrors.MissingModelError(`folder ${folderName} service ${serviceName}`);
+    }
     return model?.metaData?.VersionId || model?.versionId;
   }
 
@@ -216,7 +244,6 @@ class Spark {
       console.err(err)
     );
     return require.resolve("config.json");
-    // return JSON.stringify(this.config)
   }
 
   /**
@@ -224,55 +251,61 @@ class Spark {
    */
   // async remove(versionId) {}
 
-  async offlineModel(input, versionID, ds) {
+  async offlineModel(input, versionID) {
     try {
-      const model = findModel(input.request_meta, ds.model);
+      const model = findModel(input.request_meta, this.model);
 
       const versionId = versionID || (model && model?.versionId);
 
       logger.info({
         EventType: "ExecuteModel",
+        InstanceId: this.instanceid,
         TextMessage: `Execute uuid: ${versionId}`,
       });
-      if (!(registry instanceof WasmRunner)) {
-        registry = new WasmRunner(undefined, ds.externalResolver, "");
+
+      if (this._registry === undefined) {
+        this._registry = new WasmRunner(undefined, this.externalResolver, "");
       }
 
-      if (!registry.isExist(versionId)) {
-        await registry.append({
+      if (!this._registry.isExist(versionId)) {
+        await this._registry.append({
           id: versionId,
           url: model?.binary || model?.binaryPath || "",
         });
       }
 
-      let result = await registry.execute(input, versionId);
+      let result = await this._registry.execute(input, versionId);
 
       return result;
     } catch (err) {
-      console.log('----ERRORR')
-      console.log(err)
+      logger.error({
+        EventType: "ExecutionError",
+        InstanceId: this.instanceid,
+        TextMessage: err.message,
+      });
       return err;
     }
   }
 
-  async onlineModelEndpoint(input, versionID, ds) {
+  async onlineModelEndpoint(input, versionID) {
     logger.info({
       EventType: "ExecuteOnlineModel",
+      InstanceId: this.instanceid,
       TextMessage: `Execute uuid: ${versionID}`,
     });
 
-    const isPublic = ds.authType === "public";
+    const isPublic = this.authType === "public";
     let token = "";
     if (!isPublic) {
-      if (ds.token.constructor.name === "AsyncFunction") {
-        token = await ds.token();
-      } else if (typeof ds.token === "function") {
-        token = ds.token();
+      if (this.token.constructor.name === "AsyncFunction") {
+        token = await this.token();
+      } else if (typeof this.token === "function") {
+        token = this.token();
       } else {
-        token = ds.token;
+        token = this.token;
       }
 
-      if (utils.isEmpty(ds.token)) {
+      if (utils.isEmpty(this.token)) {
         throw new WasmRunnerErrors.UnauthorizedError();
       }
     }
@@ -280,7 +313,7 @@ class Spark {
     try {
       const options = {
         headers: !isPublic
-          ? utils.getAuthHeaders(token, ds.authType, ds.tenant)
+          ? utils.getAuthHeaders(token, this.authType, this.tenant)
           : {},
         json: {
           request_data: {},
@@ -289,8 +322,8 @@ class Spark {
       };
 
       let modelUrl = new URL(
-        `/${ds.tenant}/api/v3/${!isPublic ? "execute" : "public"}`,
-        ds.url
+        `/${this.tenant}/api/v3/${!isPublic ? "execute" : "public"}`,
+        this.url
       );
 
       const result = await got.post(modelUrl, options).json();

package/src/resolver/externalResolver.js

@@ -60,7 +60,7 @@ const sparkServiceVersionOne = async (requestData, context) => {
   const options = {}
 
   if (!instance) {
-    instance = new Spark({}, { serialize: true, configPath: "%%config_to_replace%%" })
+    instance = new Spark({}, { serialize: true, configPath: "%%config_to_replace%%", instanceid: "%%instanceid%%" })
   }
 
   const modelId = instance._getModelByMeta(folderName, serviceName)

package/types/browser.d.ts

@@ -3,7 +3,8 @@ declare class Spark {
     /**
      * @param {object} config
      */
-    constructor(config: object);
+    constructor(config: object, options?: {});
+    logger: any;
     /**
      * @private
      */
@@ -28,14 +29,15 @@ declare class Spark {
      * @private
      */
     private isCompatible;
-    /**
-     * @private
-     */
-    private model;
     /**
      * @private
      */
     private priority;
+    /**
+    * @private
+    */
+    private model;
+    log(msg: any): void;
     /**
      *
      * @param {object} nodegen

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,EAuChB;IApCC;;OAEG;IACH,eAAyC;IAEzC;;OAEG;IACH,eAAsD;IACtD;;OAEG;IACH,iBAA0D;IAC1D;;OAEG;IACH,cAGI;IACJ;;OAEG;IACH,YAAgD;IAChD;;OAEG;IACH,qBAA2C;IAC3C;;OAEG;IACH,cAAqD;IACrD;;OAEG;IACH,iBAA2C;IAG7C;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAMlB;IACD;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAUlB;IACD;;;;OAIG;IACH,cAHW,MAAM,GACJ,OAAO,CAOnB;IAED,wDASC;IAED;;;;;;OAMG;IACH,eAJW,MAAM,oCAEJ,MAAM,CAmBlB;IAED,gEAuEC;IAED,uEA6CC;CACF"}
+{"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"}

package/types/findModels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findModels.d.ts","sourceRoot":"","sources":["../src/findModels.js"],"names":[],"mappings":";AAEA,sEA+HC"}
+{"version":3,"file":"findModels.d.ts","sourceRoot":"","sources":["../src/findModels.js"],"names":[],"mappings":";AAEA,sEAsNC"}

package/types/models.d.ts

@@ -4,5 +4,5 @@ export = processModels;
  * @param {object} nodegen
  * @returns
  */
-declare function processModels(nodegen: object, index: any): {};
+declare function processModels(nodegen: object, index: any, logFn: undefined, instanceid: any): {};
 //# sourceMappingURL=models.d.ts.map

package/types/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.js"],"names":[],"mappings":";AAIA;;;;GAIG;AACH,wCAHW,MAAM,kBAoEhB"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.js"],"names":[],"mappings":";AAIA;;;;GAIG;AAEH,wCAJW,MAAM,qDAyFhB"}

package/types/node.d.ts

@@ -3,9 +3,14 @@ declare class Spark {
     /**
      * @param {object} config
      */
-    constructor(config: object, option: {} | undefined, apmInstance: any);
+    constructor(config: object, option?: undefined, apmInstance?: undefined);
+    /**
+     * @private
+     */
+    private _registry;
     apm: any;
     config: object;
+    instanceid: any;
     /**
      * @private
      */
@@ -64,7 +69,7 @@ declare class Spark {
     /**
      * Remove Model
      */
-    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=node.d.ts.map

package/types/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.js"],"names":[],"mappings":";AAiBA;IACE;;OAEG;IACH,oBAFW,MAAM,4CA8DhB;IAxDG,SAAsB;IAUtB,eAAsB;IASxB;;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,+BA4DC;IAED,wDAQC;IAED,uBAMC;IAED;;OAEG;IAGH,gEA6BC;IAED,uEA4CC;CACF"}
+{"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"}