Merge pull request #5 from boilingdata/add-multi-region-testing

feat: Add multi region testing

Author: dforsber

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boilingdata/node-boilingdata",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "BoilingData client",
   "main": "dist/cjs/index.js",
   "types": "dist/cjs/index.d.ts",

src/boilingdata/boilingdata.api.ts

@@ -25,7 +25,7 @@ export interface IBDDataQuery {
 
 export interface IBDDataResponse {
   messageType: "DATA";
-  data: Array<string>;
+  data: Array<any>;
   requestId: string;
   numOfRecords?: number;
   batchSerial?: number;

src/boilingdata/boilingdata.ts

@@ -19,11 +19,25 @@ export interface IBDCallbacks {
   onSocketClose?: () => void;
 }
 
+export type BDAWSRegion =
+  | "eu-west-1"
+  | "eu-west-2"
+  | "eu-west-3"
+  | "eu-north-1"
+  | "eu-south-1"
+  | "eu-central-1"
+  | "us-east-1"
+  | "us-east-2"
+  | "us-west-1"
+  | "us-west-2"
+  | "ca-central-1";
+
 export interface IBoilingData {
   username: string;
   password: string;
   logLevel?: "trace" | "debug" | "info" | "warn" | "error" | "fatal"; // Match with Bunyan
   globalCallbacks?: IBDCallbacks;
+  region?: BDAWSRegion;
 }
 
 export interface IBDQuery {
@@ -74,11 +88,13 @@ export function isDataResponse(data: IBDDataResponse | unknown): data is IBDData
 
 export class BoilingData {
   private statusTimer?: NodeJS.Timeout;
+  private region: BDAWSRegion;
   private creds?: BDCredentials;
   private socketInstance: ISocketInstance;
   private logger = createLogger({ name: "boilingdata", level: this.props.logLevel ?? "info" });
 
   constructor(public props: IBoilingData) {
+    this.region = this.props.region ? this.props.region : "eu-west-1";
     this.socketInstance = {
       queries: new Map(), // no queries yet
       queryCallbacks: new Map(), // no queries yet, so no query specific callbacks either
@@ -103,9 +119,8 @@ export class BoilingData {
     return new Promise((resolve, reject) => {
       const sock = this.socketInstance;
       const cbs = this.props.globalCallbacks;
-      getBoilingDataCredentials(this.props.username, this.props.password).then(creds => {
+      getBoilingDataCredentials(this.props.username, this.props.password, this.region).then(creds => {
         this.creds = creds;
-        this.logger.debug(this.creds);
         sock.socket = new WebSocket(this.creds.signedWebsocketUrl);
         sock.socket.onclose = () => {
           if (cbs?.onSocketClose) cbs.onSocketClose();

src/common/identity.ts

@@ -1,13 +1,12 @@
 import { CognitoIdentity, CognitoIdentityCredentials } from "aws-sdk";
 import { CognitoIdToken, CognitoUserPool, CognitoUser, AuthenticationDetails } from "amazon-cognito-identity-js";
 import { getSignedWssUrl } from "./signature";
+import { BDAWSRegion } from "boilingdata/boilingdata";
 
-// FIXME: Hard coded
-const region = "eu-west-1";
+const IDP_REGION = "eu-west-1";
 const UserPoolId = "eu-west-1_0GLV9KO1p";
+const Logins = `cognito-idp.${IDP_REGION}.amazonaws.com/${UserPoolId}`;
 const IdentityPoolId = "eu-west-1:bce21571-e3a6-47a4-8032-fd015213405f";
-const webSocketHost = "m9fhs4t5vh.execute-api.eu-west-1.amazonaws.com";
-const Logins = `cognito-idp.${region}.amazonaws.com/${UserPoolId}`;
 const poolData = { UserPoolId, ClientId: "6timr8knllr4frovfvq8r2o6oo" };
 const Pool = new CognitoUserPool(poolData);
 
@@ -31,20 +30,30 @@ function getIdToken(Username: string, Password: string): Promise<CognitoIdToken>
 
 async function refreshCredsWithToken(idToken: string): Promise<CognitoIdentityCredentials> {
   const idParams = { IdentityPoolId, Logins: { [Logins]: idToken } };
-  const creds = new CognitoIdentityCredentials(idParams, { region });
+  const creds = new CognitoIdentityCredentials(idParams, { region: IDP_REGION });
   await creds.getPromise();
   return creds;
 }
 
-export async function getBoilingDataCredentials(username: string, password: string): Promise<BDCredentials> {
+function getWsApiDomain(region: string): string {
+  return `${region}.api.boilingdata.com`;
+  // return `api.boilingdata.com`;
+}
+
+export async function getBoilingDataCredentials(
+  username: string,
+  password: string,
+  region: BDAWSRegion = "eu-west-1",
+): Promise<BDCredentials> {
+  const webSocketHost = getWsApiDomain(region);
   const idToken = await getIdToken(username, password);
   const creds = await refreshCredsWithToken(idToken.getJwtToken());
   const accessKeyId = creds.data?.Credentials?.AccessKeyId;
   const secretAccessKey = (<CognitoIdentity.Types.GetCredentialsForIdentityResponse>creds.data)?.Credentials?.SecretKey;
   const sessionToken = creds.data?.Credentials?.SessionToken;
   if (!accessKeyId || !secretAccessKey) throw new Error("Missing credentials (after refresh)!");
   const credentials = { accessKeyId, secretAccessKey, sessionToken };
-  const signedWebsocketUrl = await getSignedWssUrl(webSocketHost, credentials);
+  const signedWebsocketUrl = await getSignedWssUrl(webSocketHost, credentials, region, "wss", "");
   const cognitoUsername = idToken.decodePayload()["cognito:username"];
   return { cognitoUsername, signedWebsocketUrl };
 }

src/common/signature.ts

@@ -11,9 +11,9 @@ function getSigner(region: string, credentials: any): SignatureV4 {
 export async function getSignedWssUrl(
   host: string,
   credentials: Credentials | Provider<Credentials>,
+  region: string,
   protocol = "wss",
   path = "/dev",
-  region = "eu-west-1",
 ): Promise<string> {
   const request = new HttpRequest({ protocol, headers: { host }, hostname: host, path });
   const fiveMinsS = 5 * 60;