@openfin/cloud-notification-core-api 0.0.1-alpha.9a2ca93 → 0.0.1-alpha.9ac8c3d

package/index.cjs

@@ -337,7 +337,7 @@ class CloudNotificationAPI {
     async connect(parameters) {
         validateConnectParameters(parameters);
         this.#connectionParams = parameters;
-        this.#logger('info', `Connecting to Cloud Notification service: ${this.#cloudNotificationSettings.url}`);
+        this.#logger('info', 'Creating Notification service session');
         if (this.#timeDifferenceTracker) {
             this.#timeDifferenceTracker.stop();
             this.#timeDifferenceTracker = undefined;
@@ -362,6 +362,8 @@ class CloudNotificationAPI {
             throw new CloudNotificationAPIError(`Failed to connect to the Cloud Notification service: ${this.#cloudNotificationSettings.url}`, 'ERR_CONNECT', new Error(createSessionResponse.statusText));
         }
         this.#sessionDetails = (await createSessionResponse.json());
+        const { mqtt: _, ...sessionDetailsWithoutMQTT } = this.#sessionDetails;
+        this.#logger('info', `Notification service session created: ${JSON.stringify(sessionDetailsWithoutMQTT, null, 2)}`);
         // Now have the details from the server about where to connect to and a token to connect with
         // we can go ahead and connect to the MQTT server
         await this.#connectToMQTT();
@@ -612,6 +614,8 @@ class CloudNotificationAPI {
             this.#logger('error', 'Invalid Session');
             throw new SessionNotConnectedError();
         }
+        const { token: _, ...mqttDetailsWithoutToken } = this.#sessionDetails.mqtt;
+        this.#logger('info', `Connecting to MQTT server: ${JSON.stringify(mqttDetailsWithoutToken, null, 2)}`);
         const clientOptions = {
             keepalive: this.#keepAliveIntervalSeconds,
             clientId: this.#sessionDetails.sessionId,
@@ -627,7 +631,6 @@ class CloudNotificationAPI {
             username: this.#sessionDetails.mqtt.token,
         };
         this.#mqttClient = await mqtt.connectAsync(this.#sessionDetails.mqtt.url, clientOptions);
-        this.#logger('debug', `Cloud Notifications successfully connected to notification backbone`);
         this.#mqttClient.on('error', async (error) => this.#mqttErrorHandler(error));
         this.#mqttClient.on('reconnect', () => this.#mqttReconnectionHandler());
         // Does not fire on initial connection, only successful reconnection attempts
@@ -635,8 +638,7 @@ class CloudNotificationAPI {
         this.#mqttClient.on('message', (topic, message) => this.#mqttMessageHandler(topic, message));
         // Subscribe any session specific topics
         this.#mqttClient.subscribe(`${this.#sessionDetails.mqtt.sessionRootTopic}/#`);
-        // NOTE: uncomment this to debug session details
-        // this.#logger('info', `Cloud Notifications session created: ${JSON.stringify(this.#sessionDetails, null, 2)}`);
+        this.#logger('info', 'Successfully connected to MQTT server');
         // Subscribe to the user notification delivery topics for groups and users
         await this.#subscribeToNotificationTopics();
     }

package/index.mjs

@@ -335,7 +335,7 @@ class CloudNotificationAPI {
     async connect(parameters) {
         validateConnectParameters(parameters);
         this.#connectionParams = parameters;
-        this.#logger('info', `Connecting to Cloud Notification service: ${this.#cloudNotificationSettings.url}`);
+        this.#logger('info', 'Creating Notification service session');
         if (this.#timeDifferenceTracker) {
             this.#timeDifferenceTracker.stop();
             this.#timeDifferenceTracker = undefined;
@@ -360,6 +360,8 @@ class CloudNotificationAPI {
             throw new CloudNotificationAPIError(`Failed to connect to the Cloud Notification service: ${this.#cloudNotificationSettings.url}`, 'ERR_CONNECT', new Error(createSessionResponse.statusText));
         }
         this.#sessionDetails = (await createSessionResponse.json());
+        const { mqtt: _, ...sessionDetailsWithoutMQTT } = this.#sessionDetails;
+        this.#logger('info', `Notification service session created: ${JSON.stringify(sessionDetailsWithoutMQTT, null, 2)}`);
         // Now have the details from the server about where to connect to and a token to connect with
         // we can go ahead and connect to the MQTT server
         await this.#connectToMQTT();
@@ -610,6 +612,8 @@ class CloudNotificationAPI {
             this.#logger('error', 'Invalid Session');
             throw new SessionNotConnectedError();
         }
+        const { token: _, ...mqttDetailsWithoutToken } = this.#sessionDetails.mqtt;
+        this.#logger('info', `Connecting to MQTT server: ${JSON.stringify(mqttDetailsWithoutToken, null, 2)}`);
         const clientOptions = {
             keepalive: this.#keepAliveIntervalSeconds,
             clientId: this.#sessionDetails.sessionId,
@@ -625,7 +629,6 @@ class CloudNotificationAPI {
             username: this.#sessionDetails.mqtt.token,
         };
         this.#mqttClient = await mqtt.connectAsync(this.#sessionDetails.mqtt.url, clientOptions);
-        this.#logger('debug', `Cloud Notifications successfully connected to notification backbone`);
         this.#mqttClient.on('error', async (error) => this.#mqttErrorHandler(error));
         this.#mqttClient.on('reconnect', () => this.#mqttReconnectionHandler());
         // Does not fire on initial connection, only successful reconnection attempts
@@ -633,8 +636,7 @@ class CloudNotificationAPI {
         this.#mqttClient.on('message', (topic, message) => this.#mqttMessageHandler(topic, message));
         // Subscribe any session specific topics
         this.#mqttClient.subscribe(`${this.#sessionDetails.mqtt.sessionRootTopic}/#`);
-        // NOTE: uncomment this to debug session details
-        // this.#logger('info', `Cloud Notifications session created: ${JSON.stringify(this.#sessionDetails, null, 2)}`);
+        this.#logger('info', 'Successfully connected to MQTT server');
         // Subscribe to the user notification delivery topics for groups and users
         await this.#subscribeToNotificationTopics();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfin/cloud-notification-core-api",
-  "version": "0.0.1-alpha.9a2ca93",
+  "version": "0.0.1-alpha.9ac8c3d",
   "type": "module",
   "description": "",
   "main": "./index.cjs",