fix: scan ports with verify for multi user mode (#144)

Author: dabrad26

src/app/core.ts

@@ -1,6 +1,6 @@
 import {messages} from '../constants/messages';
 import {client} from '../helpers/client/client';
-import {errorLog, generateErrorBody, generatePromiseObjects, isValidTransferSpec, randomUUID, throwError} from '../helpers/helpers';
+import {errorLog, generateErrorBody, generatePromiseObjects, isSafari, isValidTransferSpec, randomUUID, throwError} from '../helpers/helpers';
 import { httpDownload, httpUpload } from '../http-gateway';
 import {handleHttpGatewayDrop, httpGatewaySelectFileFolderDialog, httpGetAllTransfers, httpGetTransfer, httpRemoveTransfer, sendTransferUpdate} from '../http-gateway/core';
 import {HttpGatewayInfo} from '../http-gateway/models';
@@ -83,7 +83,6 @@ export const initDragDrop = (initCall?: boolean): Promise<boolean> => {
  */
 export const init = (options?: InitOptions): Promise<any> => {
   const appId = options?.appId ?? randomUUID();
-  const supportMultipleUsers = options?.supportMultipleUsers ?? false;
 
   asperaSdk.globals.appId = appId;
 
@@ -94,7 +93,8 @@ export const init = (options?: InitOptions): Promise<any> => {
     });
   });
 
-  if (supportMultipleUsers) {
+  // For now ignore multi user support in Safari
+  if (options?.supportMultipleUsers && !isSafari()) {
     asperaSdk.globals.supportMultipleUsers = true;
     asperaSdk.globals.sessionId = randomUUID();
   }

src/helpers/ws.ts

@@ -129,7 +129,7 @@ export class WebsocketService {
   }
 
   private connect() {
-    this.getWebSocketConnection(33024, asperaSdk.globals.supportMultipleUsers ? 33029 : 33024)
+    this.getWebSocketConnection(asperaSdk.globals.rpcPort)
       .then((webSocket) => {
         this.globalSocket = webSocket;
         this.globalSocket.onerror = this.handleError;
@@ -153,37 +153,19 @@ export class WebsocketService {
     }, 1000);
   }
 
-  private getWebSocketConnection(startPort: number, endPort: number): Promise<WebSocket> {
+  private getWebSocketConnection(port: number): Promise<WebSocket> {
     const webSocketUrl = getWebsocketUrl(asperaSdk.globals.asperaAppUrl);
 
-    const checkPort = (port: number): Promise<WebSocket> => {
-      return new Promise((resolve, reject) => {
-        const webSocket = new WebSocket(`${webSocketUrl}:${port}`);
-
-        webSocket.onopen = () => {
-          resolve(webSocket);
-        };
-
-        webSocket.onerror = () => {
-          reject(`Connection failed on port ${port}`);
-        };
-      });
-    };
-
     return new Promise((resolve, reject) => {
-      const connectPort = (port: number) => {
-        if (port > endPort) {
-          return reject('No available WebSocket connection found');
-        }
-
-        checkPort(port)
-          .then(ws => resolve(ws))
-          .catch((error) => {
-            connectPort(port + 1);
-          });
+      const webSocket = new WebSocket(`${webSocketUrl}:${port}`);
+
+      webSocket.onopen = () => {
+        resolve(webSocket);
       };
 
-      connectPort(startPort);
+      webSocket.onerror = () => {
+        reject(`Connection failed on port ${port}`);
+      };
     });
   }
 

src/models/aspera-sdk.model.ts

@@ -2,6 +2,7 @@ import {CustomBrandingOptions, DataTransferResponse, AsperaSdkSpec, AsperaSdkTra
 import {hiddenStyleList, installerUrl, protocol} from '../constants/constants';
 import {messages} from '../constants/messages';
 import {safariClient} from '../helpers/client/safari-client';
+import {client} from '../helpers/client/client';
 import {errorLog, isSafari} from '../helpers/helpers';
 import {websocketService} from '../helpers/ws';
 import {asperaSdk} from '../index';
@@ -228,15 +229,53 @@ export class ActivityTracking {
       this.registerDesktopAppSession();
     }
 
-    if (isSafari()) {
-      return safariClient.monitorTransferActivity();
-    }
+    const finalCall = (): Promise<unknown> => {
+      if (isSafari()) {
+        return safariClient.monitorTransferActivity();
+      }
 
-    return websocketService.init()
-      .then(() => {
-        websocketService.registerMessage('transfer_activity', (data: ActivityMessage) => this.handleTransferActivity(data));
-        websocketService.registerEvent((status: 'CLOSED'|'RECONNECT') => this.handleWebSocketEvents(status));
-      });
+      return websocketService.init()
+        .then(() => {
+          websocketService.registerMessage('transfer_activity', (data: ActivityMessage) => this.handleTransferActivity(data));
+          websocketService.registerEvent((status: 'CLOSED'|'RECONNECT') => this.handleWebSocketEvents(status));
+        });
+    };
+
+    if (asperaSdk.globals.supportMultipleUsers) {
+      let retryCount = 0;
+      const makeVerifyCall = (incrementIt: boolean): Promise<unknown> => {
+        if (incrementIt) {
+          asperaSdk.globals.rpcPort = asperaSdk.globals.rpcPort + 1;
+        }
+
+        if (asperaSdk.globals.rpcPort > 33029) {
+          retryCount++;
+          asperaSdk.globals.rpcPort = 33024;
+
+          return new Promise(resolve => setTimeout(resolve, retryCount * 1050)).then(() => makeVerifyCall(false));
+        }
+
+        return client.request('verify_session', {app_id: asperaSdk.globals.appId, session_id: asperaSdk.globals.sessionId})
+          .then(data => {
+            if (data.result) {
+              return finalCall();
+            }
+
+            return makeVerifyCall(true);
+          }).catch(() => {
+            if (retryCount > 5) {
+              asperaSdk.globals.rpcPort = 33024;
+              return Promise.reject('Unable to find port running for session');
+            }
+
+            return makeVerifyCall(true);
+          });
+      };
+
+      return makeVerifyCall(false);
+    } else {
+      return finalCall();
+    }
   }
 
   /**