Fix logLevels and add missing export

Author: dforsber

README.md

@@ -18,7 +18,7 @@ yarn add @boilingdata/node-boilingdata
 `execQueryPromise()` method can be used to await for the results directly.
 
 ```typescript
-import { BoilingData, isDataResponse } from "@boilingdata/node-boilingdata";
+import { BoilingData } from "@boilingdata/node-boilingdata";
 
 async function main() {
   const bdInstance = new BoilingData({ username: process.env["BD_USERNAME"], password: process.env["BD_PASSWORD"] });

package.json

@@ -9,7 +9,7 @@
   "license": "MIT",
   "private": false,
   "files": [
-    "dist/"
+    "dist/*"
   ],
   "repository": {
     "type": "git",

src/boilingdata/boilingdata.ts

@@ -99,7 +99,20 @@ enum ECallbackNames {
   QUERY_FINISHED = "onQueryFinished",
 }
 
-const createLogger = (_props: any): Console => console;
+const createLogger = (props: any): Console => {
+  const logLevel = props.logLevel ?? "info";
+
+  // logLevel == "error"
+  // ==> log.info("") --> NA
+  return {
+    ...console,
+    debug: (a, ...rest) => (["debug"].includes(logLevel) ? console.log(a, ...rest) : undefined),
+    log: (a, ...rest) => (["debug", "info"].includes(logLevel) ? console.log(a, ...rest) : undefined),
+    info: (a, ...rest) => (["debug", "info"].includes(logLevel) ? console.log(a, ...rest) : undefined),
+    warn: (a, ...rest) => (["debug", "info", "warn"].includes(logLevel) ? console.log(a, ...rest) : undefined),
+    error: (a, ...rest) => console.log(a, ...rest),
+  };
+};
 
 function mapEventToCallbackName(event: IEvent): ECallbackNames {
   const entry = Object.entries(ECallbackNames).find(([key, _value]) => key === event.eventType);
@@ -115,9 +128,10 @@ export class BoilingData {
   private region: BDAWSRegion;
   private creds?: BDCredentials;
   private socketInstance: ISocketInstance;
-  private logger = createLogger({ name: "boilingdata", level: this.props.logLevel ?? "info" });
+  private logger: Console;
 
   constructor(public props: IBoilingData) {
+    this.logger = createLogger({ name: "boilingdata", logLevel: this.props.logLevel ?? "info" });
     this.region = this.props.region ? this.props.region : "eu-west-1";
     this.socketInstance = {
       queries: new Map(), // no queries yet
@@ -169,6 +183,7 @@ export class BoilingData {
         this.props.endpointUrl,
         this.props.mfa,
         this.props.authcontext,
+        this.logger,
       )
         .then(creds => {
           this.creds = creds;
@@ -294,7 +309,7 @@ export class BoilingData {
 
   public async execQuery(params: IBDQuery): Promise<void> {
     this.validateJsHooks(params);
-    this.logger.info("execQuery:", params);
+    this.logger.debug("execQuery:", params);
     this.socketInstance.bumpActivity();
     const requestId = params.requestId ?? uuidv4();
     const payload: IBDDataQuery = {

src/common/identity.ts

@@ -22,27 +22,27 @@ export interface BDCredentials {
   signedWebsocketUrl: string;
 }
 
-function getIdToken(Username: string, Password: string, mfa?: number): Promise<CognitoIdToken> {
+function getIdToken(Username: string, Password: string, mfa?: number, logger?: Console): Promise<CognitoIdToken> {
   return new Promise((resolve, reject) => {
     try {
       const loginDetails = { Username, Password };
-      console.log("====", Pool.getUserPoolId(), Pool.getClientId(), Pool.getCurrentUser());
+      logger?.debug("====", Pool.getUserPoolId(), Pool.getClientId(), Pool.getCurrentUser());
       const userData = { Username, Pool };
       const cognitoUser = new CognitoUser(userData);
-      console.log("====", cognitoUser.getUsername());
+      logger?.debug("====", cognitoUser.getUsername());
       const authenticationDetails = new AuthenticationDetails(loginDetails);
       cognitoUser.authenticateUser(authenticationDetails, {
         mfaRequired: async function (challengeName: ChallengeName, challengeParameters: any) {
-          console.log({ callback: "mfaRequired", challengeName, challengeParameters });
+          logger?.debug({ callback: "mfaRequired", challengeName, challengeParameters });
           if (!mfa) return reject("MFA required");
           cognitoUser.sendMFACode(`${mfa}`, this);
         },
         totpRequired: async function (challengeName: ChallengeName, challengeParameters: any) {
-          console.log({ callback: "totpRequired", challengeName, challengeParameters });
+          logger?.debug({ callback: "totpRequired", challengeName, challengeParameters });
           if (!mfa) return reject("TOTP required");
           cognitoUser.sendMFACode(`${mfa}`, this, "SOFTWARE_TOKEN_MFA");
         },
-        onSuccess: (result: any) => resolve(result?.getIdToken()),
+        onSuccess: (result: any) => resolve(result?.getIdToken(undefined, undefined, undefined, logger)),
         onFailure: (err: any) => reject(err),
       });
     } catch (err) {
@@ -63,7 +63,7 @@ async function refreshCredsWithToken(jwtIdToken: string): Promise<any> {
     }),
   });
   const creds = await cognitoidentity.config.credentials();
-  console.log(creds.expiration);
+  // console.log(creds.expiration);
   return creds;
 }
 
@@ -83,15 +83,16 @@ export async function getBoilingDataCredentials(
   endpointUrl?: string,
   mfa?: number,
   authContext?: { idToken?: any; accessToken?: any; refreshToken?: any },
+  logger?: Console,
 ): Promise<BDCredentials> {
   const webSocketHost = getWsApiDomain(region, endpointUrl);
   let idToken: CognitoIdToken | undefined = undefined;
   try {
     if (!authContext && username && password) {
-      console.log("Fetching ID token with username and pw");
-      idToken = await getIdToken(username, password, mfa);
+      logger?.debug("Fetching ID token with username and pw");
+      idToken = await getIdToken(username, password, mfa, logger);
     } else if (authContext && authContext.idToken?.jwtToken) {
-      console.log("Using existing ID token");
+      logger?.debug("Using existing ID token");
       idToken = new CognitoIdToken({ IdToken: authContext.idToken?.jwtToken });
     }
     if (!idToken) throw new Error("No credentials for creating signed WS URL");

src/index.ts

@@ -1 +1 @@
-export { IBoilingData, BoilingData, IBDQuery, IBDCallbacks } from "./boilingdata/boilingdata";
+export { IBoilingData, BoilingData, IBDQuery, IBDCallbacks, IJsHooks, isDataResponse } from "./boilingdata/boilingdata";