@coherentglobal/spark-execute-sdk 0.3.16 → 0.4.1

package/dist/browser.js

@@ -6322,7 +6322,7 @@ var Spark = /*#__PURE__*/function () {
       } else if (requestMeta.servicename && requestMeta.transaction_date) {
         model = this.model.filter(function (_ref3) {
           var metaData = _ref3.metaData;
-          return metaData.EngineInformation.ServiceName === requestMeta.servicename && new Date(requestMeta.transaction_date) >= new Date(metaData.effectiveStartDate) && new Date(requestMeta.transaction_date) <= new Date(metaData.effectiveEndDate);
+          return metaData.EngineInformation.ServiceName === requestMeta.servicename && new Date(requestMeta.transaction_date) >= new Date(metaData.EffectiveStartDate) && new Date(requestMeta.transaction_date) <= new Date(metaData.EffectiveEndDate);
         });
         if (model.length > 1) {
           return model.sort(function (versionA, versionB) {
@@ -6341,7 +6341,7 @@ var Spark = /*#__PURE__*/function () {
       } else if (requestMeta.service_id && requestMeta.transaction_date) {
         model = this.model.filter(function (_ref5) {
           var metaData = _ref5.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);
+          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) {
           return model.sort(function (versionA, versionB) {
@@ -6362,7 +6362,7 @@ var Spark = /*#__PURE__*/function () {
         }
         model = this.model.filter(function (_ref6) {
           var metaData = _ref6.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);
+          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) {
           return model.sort(function (versionA, versionB) {
@@ -6927,7 +6927,7 @@ var rules = Joi.object({
     syntheticKey: [Joi.string().allow(""), Joi["function"]().allow("")],
     // allow fns
     bearerToken: [Joi.string().allow(""), Joi["function"]().allow("")] // allow strings/fns
-  }).and("url", "tenant", "authType").required(),
+  }).and("url", "tenant", "authType"),
   nodeGenModels: Joi.array().items(Joi.object({
     versionId: Joi.string(),
     type: Joi.string(),

package/package.json

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

package/src/browser.js

@@ -102,9 +102,9 @@ class Spark {
         ({ 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) {
@@ -133,9 +133,9 @@ class Spark {
         ({ 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) {
@@ -167,9 +167,9 @@ class Spark {
           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) {

package/src/node.js

@@ -33,26 +33,26 @@ class Spark {
       this.config = this.validateConfig(config)
     }
     const {
-      sparkEndpoint: { syntheticKey, bearerToken, authType, tenant, url },
+      // sparkEndpoint: { syntheticKey, bearerToken, authType, tenant, url },
       nodeGenModels,
     } = this.config;
 
     /**
      * @private
      */
-    this.tenant = tenant;
+    this.tenant = "";
     /**
      * @private
      */
-    this.authType = authType;
+    this.authType = "";
     /**
      * @private
      */
-    this.token = syntheticKey || bearerToken;
+    this.token = "";
     /**
      * @private
      */
-    this.url = url;
+    this.url = "";
     /**
      * @private
      */
@@ -61,22 +61,16 @@ class Spark {
      * @private
      */
     this.model = this._models(nodeGenModels);
-    /**
-     * @private
-     */
-    this.fallbackEnabled = false;
 
     /**
      * @private
      */
     this.externalResolver = this._addExternalResolver()
-    console.log('EX: ', this.externalResolver)
 
      /**
      * @private
      */
-    //  this.storedConfig = this._storeConfig()
-    this.priority = ["model", "onlineEndpoint"];
+    this.priority = ["model"];
   }
 
   /**
@@ -137,9 +131,9 @@ class Spark {
         ({ 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) {
@@ -168,9 +162,9 @@ class Spark {
         ({ 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) {
@@ -202,9 +196,9 @@ class Spark {
           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) {
@@ -268,9 +262,9 @@ class Spark {
 
     let response;
     response = await lookup[this.priority[0]](input, versionID, this);
-    if (response instanceof Error) {
-      response = await lookup[this.priority[1]](input, versionID, this);
-    }
+    // if (response instanceof Error) {
+    //   response = await lookup[this.priority[1]](input, versionID, this);
+    // }
 
     return response;
   }
@@ -293,7 +287,7 @@ class Spark {
       }
     )
     const data = serializeObject.serialize({...this.config, externalUuid: this.externalUuid})
-    template = template.replace("%%config_to_replace%%", new Buffer(data).toString('base64'))
+    template = template.replace("%%config_to_replace%%", Buffer.from(data).toString('base64'))
     fs.writeFileSync(filePath, template)
     return require.resolve(filePath)
   }
@@ -323,23 +317,25 @@ class Spark {
     try {
       const model = ds._findModel(input.request_meta);
 
+      const versionId = versionID || (model && model?.versionId)
+
       logger.info({
         EventType: "ExecuteModel",
-        TextMessage: `Execute uuid: ${model && model?.versionId}`,
+        TextMessage: `Execute uuid: ${versionId}`,
       });
       if (!(registry instanceof WasmRunner)) {
         registry = new WasmRunner(undefined, ds.externalResolver, "");
       }
 
-      if (!registry.isExist(versionID)) {
+      if (!registry.isExist(versionId)) {
         await registry.append({
-          id: versionID,
+          id: versionId,
           url: model?.binary || "",
           // size,
         });
       }
 
-      let result = await registry.execute(input, versionID);
+      let result = await registry.execute(input, versionId);
 
       return result;
     } catch (err) {

package/src/validate.js

@@ -7,7 +7,6 @@ const rules = Joi.object({
         scheme: ["http", "https"],
       })
       .required(),
-
     tenant: Joi.string()
       .pattern(/^[ A-Za-z0-9_./#&+-]+$/)
       .required(),
@@ -17,8 +16,7 @@ const rules = Joi.object({
     syntheticKey: [Joi.string().allow(""), Joi.function().allow("")], // allow fns
     bearerToken: [Joi.string().allow(""), Joi.function().allow("")], // allow strings/fns
   })
-    .and("url", "tenant", "authType")
-    .required(),
+    .and("url", "tenant", "authType"),
   nodeGenModels: Joi.array()
     .items(
       Joi.object({