store fresh auth context, add onSocketError cb

Author: dforsber

browser/boilingdata.min.js

@@ -17,6 +17,7 @@ export interface IBDCallbacks {
   onLambdaEvent?: (data: unknown) => void;
   onSocketOpen?: () => void;
   onSocketClose?: () => void;
+  onSocketError?: (err: unknown) => void;
   unknown?: (data: unknown) => void;
 }
 
@@ -133,6 +134,7 @@ export class BoilingData {
   private socketInstance: ISocketInstance;
   private logger: Console;
   private closedPromise?: Promise<void>;
+  private authcontext!: any;
 
   constructor(public props: IBoilingData) {
     this.logger = createLogger({ name: "boilingdata", logLevel: this.props.logLevel ?? "info" });
@@ -178,7 +180,7 @@ export class BoilingData {
   }
 
   public getCachedAuthContext(): { idToken: any } | undefined {
-    return this.creds?.idToken;
+    return this.authcontext;
   }
 
   public async connect(): Promise<void> {
@@ -192,11 +194,12 @@ export class BoilingData {
           this.region,
           this.props.endpointUrl,
           this.props.mfa,
-          this.props.authcontext,
+          this.authcontext ?? this.props.authcontext, // this.authcontext is more fresh
           this.logger,
         )
           .then(creds => {
             this.creds = creds;
+            this.authcontext = creds.idToken;
             sock.socket = new WebSocket(this.creds.signedWebsocketUrl);
             sock.socket!.onclose = () => {
               if (cbs?.onSocketClose) cbs.onSocketClose();
@@ -206,8 +209,10 @@ export class BoilingData {
               if (cbs?.onSocketOpen) cbs.onSocketOpen();
               resolve();
             };
-            sock.socket!.onerror = (err: any) => {
+            sock.socket!.onerror = (err: unknown) => {
               this.logger.error(err);
+              this.authcontext = undefined; // reset auth context
+              if (cbs?.onSocketError) cbs.onSocketError(err);
               reject(err);
             };
             sock.socket!.onmessage = (msg: MessageEvent) => {

src/boilingdata/boilingdata.ts

@@ -95,9 +95,12 @@ export async function getBoilingDataCredentials(
     } else if (authContext && authContext.idToken?.jwtToken) {
       logger?.debug("Using existing ID token");
       idToken = new CognitoIdToken({ IdToken: authContext.idToken?.jwtToken });
+    } else {
+      throw new Error("No credentials for creating signed WS URL");
     }
-    if (!idToken) throw new Error("No credentials for creating signed WS URL");
+    if (!idToken) throw new Error("Failed using existing auth context");
     const creds = await refreshCredsWithToken(idToken.getJwtToken());
+    if (!creds) throw new Error("Failed refreshing credentials");
     const { accessKeyId, secretAccessKey, sessionToken } = creds;
     if (!accessKeyId || !secretAccessKey) throw new Error("Missing credentials (after refresh)!");
     const credentials = { accessKeyId, secretAccessKey, sessionToken };