add old event client logic as a catch, and stringify electorn error m…

…essage (#542)
Azure · Sep 6, 2022 · 58d290f · 58d290f
1 parent bd1a207
commit 58d290f
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-iot-explorer",
-  "version": "0.14.13",
+  "version": "0.14.14",
   "description": "This project welcomes contributions and suggestions. Most contributions require you to agree to a\r Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us\r the rights to use your contribution. For details, visit https://cla.microsoft.com.",
   "main": "host/electron.js",
   "build": {

diff --git a/public/handlers/eventHubHandler.ts b/public/handlers/eventHubHandler.ts
@@ -32,22 +32,34 @@ export const onStopMonitoring = async (): Promise<void> => {
 }
 
 const eventHubProvider = async (params: StartEventHubMonitoringParameters) =>  {
+    await initializeEventHubClient(params);
+    updateEntityIdIfNecessary(params);
+
+    return listeningToMessages(client, params);
+};
+
+const initializeEventHubClient = async (params: StartEventHubMonitoringParameters) =>  {
     if (needToCreateNewEventHubClient(params))
     {
         // hub has changed, reinitialize client, receivers and mesages
-        client = params.customEventHubConnectionString ?
-            await EventHubClient.createFromConnectionString(params.customEventHubConnectionString, params.customEventHubName) :
-            await EventHubClient.createFromConnectionString(await convertIotHubToEventHubsConnectionString(params.hubConnectionString), params.customEventHubName);
+        if (params.customEventHubConnectionString) {
+            client = await EventHubClient.createFromConnectionString(params.customEventHubConnectionString, params.customEventHubName);
+        }
+        else {
+            try {
+                client = await EventHubClient.createFromConnectionString(await convertIotHubToEventHubsConnectionString(params.hubConnectionString));
+            }
+            catch {
+                client = await EventHubClient.createFromIotHubConnectionString(params.hubConnectionString);
+            }
+        }
 
         connectionString = params.customEventHubConnectionString ?
             `${params.customEventHubConnectionString}/${params.customEventHubName}` :
             params.hubConnectionString;
         receivers = [];
         messages = [];
     }
-    updateEntityIdIfNecessary(params);
-
-    return listeningToMessages(client, params);
 };
 
 const listeningToMessages = async (eventHubClient: EventHubClient, params: StartEventHubMonitoringParameters) => {

diff --git a/public/utils/invokeHelper.ts b/public/utils/invokeHelper.ts
@@ -15,7 +15,7 @@ export const invokeInMainWorld = async <T>(channel: string, ...args: Array<unkno
     // using customer invoker that returns the original error if handler throws.
     const { error, result } =  await ipcRenderer.invoke(channel, ...args);
     if (error) {
-        throw error;
+        throw new Error(JSON.stringify(error.message));
     }
 
     return result;

diff --git a/src/server/serverBase.ts b/src/server/serverBase.ts
@@ -331,22 +331,34 @@ export const addPropertiesToCloudToDeviceMessage = (message: CloudToDeviceMessag
 };
 
 export const eventHubProvider = async (params: any) =>  {
+    await initializeEventHubClient(params);
+    updateEntityIdIfNecessary(params);
+
+    return listeningToMessages(client, params);
+};
+
+const initializeEventHubClient = async (params: any) =>  {
     if (needToCreateNewEventHubClient(params))
     {
         // hub has changed, reinitialize client, receivers and mesages
-        client = params.customEventHubConnectionString ?
-            await EventHubClient.createFromConnectionString(params.customEventHubConnectionString, params.customEventHubName) :
-            await EventHubClient.createFromConnectionString(await convertIotHubToEventHubsConnectionString(params.hubConnectionString), params.customEventHubName);
+        if (params.customEventHubConnectionString) {
+            client = await EventHubClient.createFromConnectionString(params.customEventHubConnectionString, params.customEventHubName);
+        }
+        else {
+            try {
+                client = await EventHubClient.createFromConnectionString(await convertIotHubToEventHubsConnectionString(params.hubConnectionString));
+            }
+            catch {
+                client = await EventHubClient.createFromIotHubConnectionString(params.hubConnectionString);
+            }
+        }
 
         connectionString = params.customEventHubConnectionString ?
             `${params.customEventHubConnectionString}/${params.customEventHubName}` :
             params.hubConnectionString;
         receivers = [];
         messages = [];
     }
-    updateEntityIdIfNecessary(params);
-
-    return listeningToMessages(client, params);
 };
 
 const listeningToMessages = async (eventHubClient: EventHubClient, params: any) => {