@openfin/cloud-interop-core-api 0.0.1-alpha.5344cb7 → 0.0.1-alpha.53e67c3

package/bundle.d.ts

@@ -364,7 +364,7 @@ export declare type ConnectParameters = {
         /**
          * When JWT authentication is being used, this will be invoked just whenever a JWT token is required for a request
          */
-        jwtRequestCallback: () => string | object;
+        jwtRequestCallback: () => string | object | Promise<string | object>;
         /**
          * The id of the service gateway JWT authentication definition to use
          *

package/index.cjs

@@ -1,8 +1,12 @@
 'use strict';
 
 var buffer = require('buffer');
+require('fs');
+require('path');
 var mqtt = require('mqtt');
 
+var d=n=>{let t=n.replaceAll("-","+").replaceAll("_","/");return t.padEnd(t.length+(4-t.length%4)%4,"=")};
+
 class CloudInteropAPIError extends Error {
     code;
     constructor(message = 'An unexpected error has occurred', code = 'UNEXPECTED_ERROR', cause) {
@@ -49,11 +53,11 @@ class EventController {
 const isErrorIntentResult = (result) => 'error' in result;
 
 const APP_ID_DELIM = '::';
-const getRequestHeaders = (connectionParameters) => {
+const getRequestHeaders = async (connectionParameters) => {
     const headers = {};
     headers['Content-Type'] = 'application/json';
     if (connectionParameters.authenticationType === 'jwt' && connectionParameters.jwtAuthenticationParameters) {
-        const tokenResult = connectionParameters.jwtAuthenticationParameters.jwtRequestCallback();
+        const tokenResult = await connectionParameters.jwtAuthenticationParameters.jwtRequestCallback();
         if (!tokenResult) {
             throw new Error('jwtRequestCallback must return a token');
         }
@@ -158,7 +162,7 @@ class IntentController {
         try {
             const startResponse = await fetch(`${this.#url}/api/intents/${this.#sessionDetails.sessionId}`, {
                 method: 'POST',
-                headers: getRequestHeaders(this.#connectionParams),
+                headers: await getRequestHeaders(this.#connectionParams),
                 body: JSON.stringify({ findOptions }),
             });
             if (!startResponse.ok) {
@@ -203,7 +207,7 @@ class IntentController {
         }
         await fetch(`${this.#url}/api/intents/${this.#sessionDetails.sessionId}/${this.#discovery.id}`, {
             method: 'DELETE',
-            headers: getRequestHeaders(this.#connectionParams),
+            headers: await getRequestHeaders(this.#connectionParams),
         })
             .then((deleteResponse) => {
             if (!deleteResponse.ok) {
@@ -224,7 +228,7 @@ class IntentController {
         }
         const postResponse = await fetch(`${this.#url}/api/intents/${this.#sessionDetails.sessionId}/sessions/${targetSessionId}`, {
             method: 'POST',
-            headers: getRequestHeaders(this.#connectionParams),
+            headers: await getRequestHeaders(this.#connectionParams),
             body: JSON.stringify({ raiseOptions }),
         });
         if (!postResponse.ok) {
@@ -238,7 +242,7 @@ class IntentController {
         try {
             const reportResponse = await fetch(`${this.#url}/api/intents/${this.#sessionDetails.sessionId}/${discoveryId}`, {
                 method: 'POST',
-                headers: getRequestHeaders(this.#connectionParams),
+                headers: await getRequestHeaders(this.#connectionParams),
                 body: JSON.stringify({ intents }),
             });
             if (reportResponse.ok) {
@@ -262,7 +266,7 @@ class IntentController {
         const { sessionId } = getSourceFromSession(this.#sessionDetails);
         const resultResponse = await fetch(`${this.#url}/api/intents/${initiatingSessionId}/result/${sessionId}`, {
             method: 'POST',
-            headers: getRequestHeaders(this.#connectionParams),
+            headers: await getRequestHeaders(this.#connectionParams),
             body: JSON.stringify({ result }),
         });
         if (!resultResponse.ok) {
@@ -346,6 +350,7 @@ class CloudInteropAPI {
     #reconnectRetryLimit = 30;
     #keepAliveIntervalSeconds = 30;
     #logger = (level, message) => {
+        // eslint-disable-next-line security/detect-object-injection -- level is restricted to the LogLevel union
         console[level](message);
     };
     #reconnectRetries = 0;
@@ -381,7 +386,7 @@ class CloudInteropAPI {
         const { sourceId, platformId } = this.#connectionParams;
         const createSessionResponse = await fetch(`${this.#cloudInteropSettings.url}/api/sessions`, {
             method: 'POST',
-            headers: getRequestHeaders(this.#connectionParams),
+            headers: await getRequestHeaders(this.#connectionParams),
             body: JSON.stringify({ sourceId: sourceId.trim(), platformId }),
         });
         if (!createSessionResponse.ok) {
@@ -419,6 +424,7 @@ class CloudInteropAPI {
         // TODO: Dynamic intent discovery
         // search for any ongoing discoveries in DB and fire report-intents on self
         this.#logger('log', `Cloud Interop successfully connected to ${this.#cloudInteropSettings.url}`);
+        // eslint-disable-next-line security-node/detect-unhandled-event-errors -- this callback handles MQTT error events
         this.#mqttClient.on('error', async (error) => {
             // We will receive errors for each failed reconnection attempt
             // We don't want to disconnect on these else we will never reconnect
@@ -511,7 +517,7 @@ class CloudInteropAPI {
         };
         const postResponse = await fetch(`${this.#cloudInteropSettings.url}/api/context-groups/${this.#sessionDetails.sessionId}/${contextGroup}`, {
             method: 'POST',
-            headers: getRequestHeaders(this.#connectionParams),
+            headers: await getRequestHeaders(this.#connectionParams),
             body: JSON.stringify(payload),
         });
         if (!postResponse.ok) {
@@ -571,7 +577,7 @@ class CloudInteropAPI {
             }
             const disconnectResponse = await fetch(`${this.#cloudInteropSettings.url}/api/sessions/${this.#sessionDetails.sessionId}`, {
                 method: 'DELETE',
-                headers: getRequestHeaders(this.#connectionParams),
+                headers: await getRequestHeaders(this.#connectionParams),
             });
             if (disconnectResponse.status !== 200) {
                 throw new CloudInteropAPIError('Error during session tear down - unexpected status', 'ERR_DISCONNECT', new Error(disconnectResponse.statusText));
@@ -594,6 +600,7 @@ class CloudInteropAPI {
         }
     }
     #handleMessage(topic, message, sessionDetails) {
+        this.#logger('debug', `Received message on topic: ${topic}`);
         if (message.length === 0 || !sessionDetails) {
             // Ignore clean up messages
             return;
@@ -684,7 +691,7 @@ class CloudInteropAPI {
             }
             const payload = parts[1];
             // Decode base64url encoded payload
-            const decodedBytes = buffer.Buffer.from(payload, 'base64url');
+            const decodedBytes = buffer.Buffer.from(d(payload), 'base64');
             const payloadJson = decodedBytes.toString('utf8');
             // Parse JSON to get the exp claim
             const claims = JSON.parse(payloadJson);

package/index.mjs

@@ -1,6 +1,10 @@
 import { Buffer } from 'buffer';
+import 'fs';
+import 'path';
 import mqtt from 'mqtt';
 
+var d=n=>{let t=n.replaceAll("-","+").replaceAll("_","/");return t.padEnd(t.length+(4-t.length%4)%4,"=")};
+
 class CloudInteropAPIError extends Error {
     code;
     constructor(message = 'An unexpected error has occurred', code = 'UNEXPECTED_ERROR', cause) {
@@ -47,11 +51,11 @@ class EventController {
 const isErrorIntentResult = (result) => 'error' in result;
 
 const APP_ID_DELIM = '::';
-const getRequestHeaders = (connectionParameters) => {
+const getRequestHeaders = async (connectionParameters) => {
     const headers = {};
     headers['Content-Type'] = 'application/json';
     if (connectionParameters.authenticationType === 'jwt' && connectionParameters.jwtAuthenticationParameters) {
-        const tokenResult = connectionParameters.jwtAuthenticationParameters.jwtRequestCallback();
+        const tokenResult = await connectionParameters.jwtAuthenticationParameters.jwtRequestCallback();
         if (!tokenResult) {
             throw new Error('jwtRequestCallback must return a token');
         }
@@ -156,7 +160,7 @@ class IntentController {
         try {
             const startResponse = await fetch(`${this.#url}/api/intents/${this.#sessionDetails.sessionId}`, {
                 method: 'POST',
-                headers: getRequestHeaders(this.#connectionParams),
+                headers: await getRequestHeaders(this.#connectionParams),
                 body: JSON.stringify({ findOptions }),
             });
             if (!startResponse.ok) {
@@ -201,7 +205,7 @@ class IntentController {
         }
         await fetch(`${this.#url}/api/intents/${this.#sessionDetails.sessionId}/${this.#discovery.id}`, {
             method: 'DELETE',
-            headers: getRequestHeaders(this.#connectionParams),
+            headers: await getRequestHeaders(this.#connectionParams),
         })
             .then((deleteResponse) => {
             if (!deleteResponse.ok) {
@@ -222,7 +226,7 @@ class IntentController {
         }
         const postResponse = await fetch(`${this.#url}/api/intents/${this.#sessionDetails.sessionId}/sessions/${targetSessionId}`, {
             method: 'POST',
-            headers: getRequestHeaders(this.#connectionParams),
+            headers: await getRequestHeaders(this.#connectionParams),
             body: JSON.stringify({ raiseOptions }),
         });
         if (!postResponse.ok) {
@@ -236,7 +240,7 @@ class IntentController {
         try {
             const reportResponse = await fetch(`${this.#url}/api/intents/${this.#sessionDetails.sessionId}/${discoveryId}`, {
                 method: 'POST',
-                headers: getRequestHeaders(this.#connectionParams),
+                headers: await getRequestHeaders(this.#connectionParams),
                 body: JSON.stringify({ intents }),
             });
             if (reportResponse.ok) {
@@ -260,7 +264,7 @@ class IntentController {
         const { sessionId } = getSourceFromSession(this.#sessionDetails);
         const resultResponse = await fetch(`${this.#url}/api/intents/${initiatingSessionId}/result/${sessionId}`, {
             method: 'POST',
-            headers: getRequestHeaders(this.#connectionParams),
+            headers: await getRequestHeaders(this.#connectionParams),
             body: JSON.stringify({ result }),
         });
         if (!resultResponse.ok) {
@@ -344,6 +348,7 @@ class CloudInteropAPI {
     #reconnectRetryLimit = 30;
     #keepAliveIntervalSeconds = 30;
     #logger = (level, message) => {
+        // eslint-disable-next-line security/detect-object-injection -- level is restricted to the LogLevel union
         console[level](message);
     };
     #reconnectRetries = 0;
@@ -379,7 +384,7 @@ class CloudInteropAPI {
         const { sourceId, platformId } = this.#connectionParams;
         const createSessionResponse = await fetch(`${this.#cloudInteropSettings.url}/api/sessions`, {
             method: 'POST',
-            headers: getRequestHeaders(this.#connectionParams),
+            headers: await getRequestHeaders(this.#connectionParams),
             body: JSON.stringify({ sourceId: sourceId.trim(), platformId }),
         });
         if (!createSessionResponse.ok) {
@@ -417,6 +422,7 @@ class CloudInteropAPI {
         // TODO: Dynamic intent discovery
         // search for any ongoing discoveries in DB and fire report-intents on self
         this.#logger('log', `Cloud Interop successfully connected to ${this.#cloudInteropSettings.url}`);
+        // eslint-disable-next-line security-node/detect-unhandled-event-errors -- this callback handles MQTT error events
         this.#mqttClient.on('error', async (error) => {
             // We will receive errors for each failed reconnection attempt
             // We don't want to disconnect on these else we will never reconnect
@@ -509,7 +515,7 @@ class CloudInteropAPI {
         };
         const postResponse = await fetch(`${this.#cloudInteropSettings.url}/api/context-groups/${this.#sessionDetails.sessionId}/${contextGroup}`, {
             method: 'POST',
-            headers: getRequestHeaders(this.#connectionParams),
+            headers: await getRequestHeaders(this.#connectionParams),
             body: JSON.stringify(payload),
         });
         if (!postResponse.ok) {
@@ -569,7 +575,7 @@ class CloudInteropAPI {
             }
             const disconnectResponse = await fetch(`${this.#cloudInteropSettings.url}/api/sessions/${this.#sessionDetails.sessionId}`, {
                 method: 'DELETE',
-                headers: getRequestHeaders(this.#connectionParams),
+                headers: await getRequestHeaders(this.#connectionParams),
             });
             if (disconnectResponse.status !== 200) {
                 throw new CloudInteropAPIError('Error during session tear down - unexpected status', 'ERR_DISCONNECT', new Error(disconnectResponse.statusText));
@@ -592,6 +598,7 @@ class CloudInteropAPI {
         }
     }
     #handleMessage(topic, message, sessionDetails) {
+        this.#logger('debug', `Received message on topic: ${topic}`);
         if (message.length === 0 || !sessionDetails) {
             // Ignore clean up messages
             return;
@@ -682,7 +689,7 @@ class CloudInteropAPI {
             }
             const payload = parts[1];
             // Decode base64url encoded payload
-            const decodedBytes = Buffer.from(payload, 'base64url');
+            const decodedBytes = Buffer.from(d(payload), 'base64');
             const payloadJson = decodedBytes.toString('utf8');
             // Parse JSON to get the exp claim
             const claims = JSON.parse(payloadJson);

package/package.json

@@ -1,18 +1,15 @@
 {
   "name": "@openfin/cloud-interop-core-api",
-  "version": "0.0.1-alpha.5344cb7",
-  "type": "module",
+  "version": "0.0.1-alpha.53e67c3",
   "description": "",
+  "type": "module",
   "main": "./index.cjs",
   "browser": "./index.mjs",
   "types": "./bundle.d.ts",
-  "author": "",
+  "author": "support@here.io",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "mqtt": "^5.13.0",
-    "zod": "^3.24.4"
-  },
-  "optionalDependencies": {
-    "@rollup/rollup-linux-x64-gnu": "*"
+    "mqtt": "catalog:",
+    "zod": "catalog:"
   }
 }