@coherentglobal/spark-execute-sdk 0.4.4 → 0.4.7

package/src/node.js

@@ -5,11 +5,13 @@ const logger = require("./logger.js");
 const validate = require("./validate.js");
 const processModels = require("./models.js");
 const got = require("got");
-const fs = require('fs');
-const serializeObject = require('serialize-anything');
-const path = require('path')
-const { v4: uuidv4 } = require('uuid')
+const fs = require("fs");
+const serializeObject = require("serialize-anything");
+const path = require("path");
+const { v4: uuidv4 } = require("uuid");
 const { object } = require("joi");
+const { P } = require("pino");
+const findModel = require("./findModels.js");
 
 let registry = [];
 
@@ -17,42 +19,43 @@ class Spark {
   /**
    * @param {object} config
    */
-  constructor(config, option={}) {
-    this.externalUuid = config.externalUuid ? config.externalUuid : uuidv4()
+  constructor(config, option = {}) {
+    this.externalUuid = config.externalUuid ? config.externalUuid : uuidv4();
     /**
      * @private
      */
-    if(option.serialize){
-      const toBase = Buffer.from(config, 'base64').toString('utf8')
-      const deserialize = serializeObject.deserialize(toBase)
-      const validate = this.validateConfig(deserialize)
-      this.config = validate
-      this.externalUuid = validate.externalUuid ? validate.externalUuid : uuidv4()
-      logger.info({message: "DESERIALIZE: ", value: this.externalUuid})
+    if (option.serialize) {
+      const toBase = Buffer.from(config, "base64").toString("utf8");
+      const deserialize = serializeObject.deserialize(toBase);
+      const validate = this.validateConfig(deserialize);
+      this.config = validate;
+      this.externalUuid = validate.externalUuid
+        ? validate.externalUuid
+        : uuidv4();
+      logger.info({ message: "DESERIALIZE: ", value: this.externalUuid });
     } else {
-      this.config = this.validateConfig(config)
+      this.config = this.validateConfig(config);
     }
-    const {
-      // sparkEndpoint: { syntheticKey, bearerToken, authType, tenant, url },
-      nodeGenModels,
-    } = this.config;
 
     /**
      * @private
      */
-    this.tenant = "";
+    this.tenant = this.config?.sparkEndpoint?.tenant ?? "";
     /**
      * @private
      */
-    this.authType = "";
+    this.authType = this.config?.sparkEndpoint?.authType ?? "";
     /**
      * @private
      */
-    this.token = "";
+    this.token =
+      this.config?.sparkEndpoint?.syntheticKey ??
+      this.config?.sparkEndpoint?.bearerToken ??
+      "";
     /**
      * @private
      */
-    this.url = "";
+    this.url = this.config?.sparkEndpoint?.url ?? "";
     /**
      * @private
      */
@@ -60,17 +63,17 @@ class Spark {
     /**
      * @private
      */
-    this.model = this._models(nodeGenModels);
+    this.model = this._models(this.config?.nodeGenModels);
 
     /**
      * @private
      */
-    this.externalResolver = this._addExternalResolver()
+    this.externalResolver = this._addExternalResolver();
 
-     /**
+    /**
      * @private
      */
-    this.priority = ["model"];
+    this.priority = ["model", "onlineEndpoint"];
   }
 
   /**
@@ -114,134 +117,6 @@ class Spark {
     return model;
   }
 
-  _findModel(requestMeta) {
-    let model = {};
-    if (requestMeta.version_id) {
-      model = this.model.filter(({ versionId }) => {
-        return versionId === requestMeta.version_id;
-      });
-    } else if (requestMeta.servicename && requestMeta.version) {
-      model = this.model.filter(
-        ({ metaData }) =>
-          metaData.EngineInformation.ServiceName === requestMeta.servicename &&
-          metaData.EngineInformation.Revision === requestMeta.version
-      );
-    } else if (requestMeta.servicename && requestMeta.transaction_date) {
-      model = this.model.filter(
-        ({ metaData }) =>
-          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((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 && requestMeta.version) {
-      model = this.model.filter(
-        ({ metaData }) =>
-          metaData.EngineInformation.ServiceGuid === requestMeta.service_id &&
-          metaData.EngineInformation.Revision === requestMeta.version
-      );
-    } else if (requestMeta.service_id && requestMeta.transaction_date) {
-      model = this.model.filter(
-        ({ metaData }) =>
-          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((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_uri && requestMeta.transaction_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 = this.model.filter(
-        ({ metaData }) =>
-          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((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_uri && requestMeta.version) {
-      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 = this.model.filter(
-        ({ metaData }) =>
-          metaData.EngineInformation.ProductName === folder &&
-          metaData.EngineInformation.ServiceName === service &&
-          metaData.EngineInformation.Revision === requestMeta.version
-      );
-    } else {
-      throw new Error(
-        "Model not found. requestMeta: " +
-          JSON.stringify(requestMeta) +
-          " tenant: " +
-          this.tenant
-      );
-    }
-
-    return model[0];
-  }
-
   /**
    * Execute model
    *
@@ -261,35 +136,45 @@ 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 && this.config.sparkEndpoint !== undefined) {
+      response = await lookup[this.priority[1]](input, versionID, this);
+    }
 
     return response;
   }
 
   _addExternalResolver() {
-    const folder = path.join(__dirname, `resolver_temp`)
+    const folder = path.join(__dirname, `resolver_temp`);
     try {
-      fs.accessSync(folder)
+      fs.accessSync(folder);
     } catch (err) {
-      fs.mkdirSync(folder)
+      fs.mkdirSync(folder);
     }
-    const filePath = path.join(__dirname, `resolver_temp/resolver-${this.externalUuid}.js`)
-    if(fs.existsSync(filePath)) {
-      return require.resolve(filePath)
+    const filePath = path.join(
+      __dirname,
+      `resolver_temp/resolver-${this.externalUuid}.js`
+    );
+    if (fs.existsSync(filePath)) {
+      return require.resolve(filePath);
     }
     let template = fs.readFileSync(
       require.resolve("./resolver/externalResolver.js"),
       {
-        encoding: "utf8"
+        encoding: "utf8",
       }
-    )
-    const data = serializeObject.serialize({...this.config, externalUuid: this.externalUuid})
-    template = template.replace("%%config_to_replace%%", Buffer.from(data).toString('base64'))
-    fs.writeFileSync(filePath, template)
-    return require.resolve(filePath)
+    );
+    const data = serializeObject.serialize({
+      ...this.config,
+      externalUuid: this.externalUuid,
+    });
+    template = template.replace(
+      "%%config_to_replace%%",
+      Buffer.from(data).toString("base64")
+    );
+    fs.writeFileSync(filePath, template);
+    return require.resolve(filePath);
   }
 
   _getModelByMeta(folderName, serviceName) {
@@ -303,8 +188,10 @@ class Spark {
   }
 
   _storeConfig() {
-    fs.writeFileSync('config.json',JSON.stringify(this.config), () => console.err(err))
-    return require.resolve('config.json')
+    fs.writeFileSync("config.json", JSON.stringify(this.config), () =>
+      console.err(err)
+    );
+    return require.resolve("config.json");
     // return JSON.stringify(this.config)
   }
 
@@ -315,9 +202,9 @@ class Spark {
 
   async offlineModel(input, versionID, ds) {
     try {
-      const model = ds._findModel(input.request_meta);
+      const model = findModel(input.request_meta, ds.model);
 
-      const versionId = versionID || (model && model?.versionId)
+      const versionId = versionID || (model && model?.versionId);
 
       logger.info({
         EventType: "ExecuteModel",
@@ -349,26 +236,37 @@ class Spark {
       TextMessage: `Execute uuid: ${versionID}`,
     });
 
+    const isPublic = ds.authType === "public";
     let token = "";
-    if (ds.token.constructor.name === "AsyncFunction") {
-      token = await ds.token();
-    } else {
-      token = ds.token;
-    }
+    if (!isPublic) {
+      if (ds.token.constructor.name === "AsyncFunction") {
+        token = await ds.token();
+      } else if (typeof ds.token === "function") {
+        token = ds.token();
+      } else {
+        token = ds.token;
+      }
 
-    if (utils.isEmpty(ds.token)) {
-      throw new WasmRunnerErrors.UnauthorizedError();
+      if (utils.isEmpty(ds.token)) {
+        throw new WasmRunnerErrors.UnauthorizedError();
+      }
     }
+
     try {
       const options = {
-        headers: utils.getAuthHeaders(token, ds.authType, ds.tenant),
+        headers: !isPublic
+          ? utils.getAuthHeaders(token, ds.authType, ds.tenant)
+          : {},
         json: {
           request_data: {},
           request_meta: input.request_meta,
         },
       };
 
-      let modelUrl = new URL(`/${ds.tenant}/api/v3/execute`, ds.url);
+      let modelUrl = new URL(
+        `/${ds.tenant}/api/v3/${!isPublic ? "execute" : "public"}`,
+        ds.url
+      );
 
       const result = await got.post(modelUrl, options).json();
 

package/src/services/resolver.js

@@ -93,16 +93,15 @@ const resolveOffline = async (requestMeta, tenant, headers, servicemap) => {
       /* istanbul ignore next  */
       resolverCache.delete(key);
     }
-    // console.log("OFFLINE: ", servicemap)
-    const productName = servicemap.dataJson.EngineInformation.ProductName
-    const serviceName = servicemap.dataJson.EngineInformation.ServiceName
-    const revision = servicemap.dataJson.EngineInformation.Revision
-    const latestVersion = servicemap.latestVersionId
+
+    const productName = servicemap.dataJson.EngineInformation.ProductName;
+    const serviceName = servicemap.dataJson.EngineInformation.ServiceName;
+    const revision = servicemap.dataJson.EngineInformation.Revision;
+    const latestVersion = servicemap.latestVersionId;
     let wasmUrl = path.join(
       `${modelLocation}/${tenant}/${productName}/${serviceName}/${revision}`,
       `${latestVersion}.zip`
     );
-    // console.log('wasmUrl: ', wasmUrl)
 
     const responseData = {
       cache_duration: 100,

package/src/validate.js

@@ -15,8 +15,7 @@ const rules = Joi.object({
       .required(),
     syntheticKey: [Joi.string().allow(""), Joi.function().allow("")], // allow fns
     bearerToken: [Joi.string().allow(""), Joi.function().allow("")], // allow strings/fns
-  })
-    .and("url", "tenant", "authType"),
+  }).and("url", "tenant", "authType"),
   nodeGenModels: Joi.array()
     .items(
       Joi.object({
@@ -37,7 +36,7 @@ const rules = Joi.object({
       })
     )
     .required(),
-    externalUuid: Joi.string().allow()
+  externalUuid: Joi.string().allow(),
   // xParameters: Joi.array().items(),
   // xCallCallback: Joi.func()
 }).required();

package/types/browser.d.ts

@@ -32,6 +32,10 @@ declare class Spark {
      * @private
      */
     private model;
+    /**
+     * @private
+     */
+    private priority;
     /**
      *
      * @param {object} nodegen
@@ -60,5 +64,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>;
 }
 //# 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":";AAQA;IACE;;OAEG;IACH,oBAFW,MAAM,EAoChB;IAjCC;;OAEG;IACH,eAAyC;IAMzC;;OAEG;IACH,eAAoB;IACpB;;OAEG;IACH,iBAAwB;IACxB;;OAEG;IACH,cAAwC;IACxC;;OAEG;IACH,YAAc;IACd;;OAEG;IACH,qBAA2C;IAC3C;;OAEG;IACH,cAAwC;IAE1C;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAMlB;IACD;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAUlB;IACD;;;;OAIG;IACH,cAHW,MAAM,GACJ,OAAO,CAOnB;IAED,kCA8HC;IAED,wDASC;IAED;;;;;;OAMG;IACH,eAJW,MAAM,oCAEJ,MAAM,CAmJlB;CACF"}
+{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.js"],"names":[],"mappings":";AAQA;IACE;;OAEG;IACH,oBAFW,MAAM,EA4ChB;IAzCC;;OAEG;IACH,eAAyC;IAOzC;;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;IAE7C;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAMlB;IACD;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAUlB;IACD;;;;OAIG;IACH,cAHW,MAAM,GACJ,OAAO,CAOnB;IAED,kCA8HC;IAED,wDASC;IAED;;;;;;OAMG;IACH,eAJW,MAAM,oCAEJ,MAAM,CAqBlB;IAED,gEA4DC;IAED,uEAgCC;CACF"}

package/types/models.d.ts

@@ -4,5 +4,5 @@ export = processModels;
  * @param {object} nodegen
  * @returns
  */
-declare function processModels(nodegen: object): object;
+declare function processModels(nodegen: object): {};
 //# 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":";AAAA;;;;GAIG;AACH,wCAHW,MAAM,UAyChB"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.js"],"names":[],"mappings":";AAAA;;;;GAIG;AACH,wCAHW,MAAM,MAgDhB"}

package/types/node.d.ts

@@ -3,11 +3,9 @@ declare class Spark {
     /**
      * @param {object} config
      */
-    constructor(config: object);
-    /**
-     * @private
-     */
-    private config;
+    constructor(config: object, option?: {});
+    externalUuid: any;
+    config: object;
     /**
      * @private
      */
@@ -32,6 +30,14 @@ declare class Spark {
      * @private
      */
     private model;
+    /**
+     * @private
+     */
+    private externalResolver;
+    /**
+     * @private
+     */
+    private priority;
     /**
      *
      * @param {object} nodegen
@@ -59,5 +65,13 @@ declare class Spark {
      * @returns {object}
      */
     execute(input: object, version_id?: string | undefined): object;
+    _addExternalResolver(): string;
+    _getModelByMeta(folderName: any, serviceName: any): any;
+    _storeConfig(): string;
+    /**
+     * Remove Model
+     */
+    offlineModel(input: any, versionID: any, ds: any): Promise<any>;
+    onlineModelEndpoint(input: any, versionID: any, ds: 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":";AAUA;IACE;;OAEG;IACH,oBAFW,MAAM,EAoChB;IAjCC;;OAEG;IACH,eAAyC;IAMzC;;OAEG;IACH,eAAoB;IACpB;;OAEG;IACH,iBAAwB;IACxB;;OAEG;IACH,cAAwC;IACxC;;OAEG;IACH,YAAc;IACd;;OAEG;IACH,qBAA2C;IAC3C;;OAEG;IACH,cAAwC;IAG1C;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAKlB;IAED;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAclB;IAED;;;;OAIG;IACH,cAHW,MAAM,GACJ,OAAO,CAOnB;IAED,kCA8HC;IAED;;;;;;OAMG;IACH,eAJW,MAAM,oCAEJ,MAAM,CA2GlB;CAMF"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.js"],"names":[],"mappings":";AAeA;IACE;;OAEG;IACH,oBAFW,MAAM,eA6DhB;IA1DC,kBAAwE;IAQtE,eAAsB;IAaxB;;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,iBAAyB;IAG3B;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAKlB;IAED;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAclB;IAED;;;;OAIG;IACH,cAHW,MAAM,GACJ,OAAO,CAOnB;IAED,kCA8HC;IAED;;;;;;OAMG;IACH,eAJW,MAAM,oCAEJ,MAAM,CAwBlB;IAED,+BA8BC;IAED,wDAQC;IAED,uBAMC;IAED;;OAEG;IAGH,gEA4BC;IAED,uEA0CC;CACF"}

package/types/resolver/externalResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"externalResolver.d.ts","sourceRoot":"","sources":["../../src/resolver/externalResolver.js"],"names":[],"mappings":"AAkDgB,8EAkEb"}
+{"version":3,"file":"externalResolver.d.ts","sourceRoot":"","sources":["../../src/resolver/externalResolver.js"],"names":[],"mappings":"AAkFgB,8EAGb"}

package/types/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../src/validate.js"],"names":[],"mappings":";AA6CA,kEAGC"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../src/validate.js"],"names":[],"mappings":";AA2CA,kEAGC"}