@ibm-aspera/sdk 0.2.12 → 0.2.30

package/dist/commonjs/app/core.js

@@ -77,9 +77,8 @@ exports.initDragDrop = initDragDrop;
  * rejects if unable to connect
  */
 var init = function (options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     var appId = (_a = options === null || options === void 0 ? void 0 : options.appId) !== null && _a !== void 0 ? _a : (0, helpers_1.randomUUID)();
-    var supportMultipleUsers = (_b = options === null || options === void 0 ? void 0 : options.supportMultipleUsers) !== null && _b !== void 0 ? _b : false;
     index_1.asperaSdk.globals.appId = appId;
     // Watch for old HTTP Gateway transfers in case used.
     (0, http_gateway_sdk_js_1.registerActivityCallback)(function (oldHttpTransfers) {
@@ -87,7 +86,8 @@ var init = function (options) {
             (0, core_1.sendTransferUpdate)(oldHttpTransfer);
         });
     });
-    if (supportMultipleUsers) {
+    // For now ignore multi user support in Safari
+    if ((options === null || options === void 0 ? void 0 : options.supportMultipleUsers) && !(0, helpers_1.isSafari)()) {
         index_1.asperaSdk.globals.supportMultipleUsers = true;
         index_1.asperaSdk.globals.sessionId = (0, helpers_1.randomUUID)();
     }
@@ -120,7 +120,7 @@ var init = function (options) {
             .then(function () { return index_1.asperaSdk.globals.sdkResponseData; })
             .catch(handleErrors);
     };
-    if (((_c = options === null || options === void 0 ? void 0 : options.httpGatewaySettings) === null || _c === void 0 ? void 0 : _c.url) && !index_1.asperaSdk.globals.httpGatewayVerified) {
+    if (((_b = options === null || options === void 0 ? void 0 : options.httpGatewaySettings) === null || _b === void 0 ? void 0 : _b.url) && !index_1.asperaSdk.globals.httpGatewayVerified) {
         var finalHttpGatewayUrl = options.httpGatewaySettings.url.trim();
         if (finalHttpGatewayUrl.indexOf('http') !== 0) {
             finalHttpGatewayUrl = "https://".concat(finalHttpGatewayUrl);
@@ -158,7 +158,7 @@ var init = function (options) {
             return ((_a = options === null || options === void 0 ? void 0 : options.connectSettings) === null || _a === void 0 ? void 0 : _a.useConnect) ? getConnectStartCalls() : getDesktopStartCalls();
         });
     }
-    return ((_d = options === null || options === void 0 ? void 0 : options.connectSettings) === null || _d === void 0 ? void 0 : _d.useConnect) ? getConnectStartCalls() : getDesktopStartCalls();
+    return ((_c = options === null || options === void 0 ? void 0 : options.connectSettings) === null || _c === void 0 ? void 0 : _c.useConnect) ? getConnectStartCalls() : getDesktopStartCalls();
 };
 exports.init = init;
 /**

package/dist/commonjs/helpers/ws.js

@@ -109,7 +109,7 @@ var WebsocketService = /** @class */ (function () {
     };
     WebsocketService.prototype.connect = function () {
         var _this = this;
-        this.getWebSocketConnection(33024, index_1.asperaSdk.globals.supportMultipleUsers ? 33029 : 33024)
+        this.getWebSocketConnection(index_1.asperaSdk.globals.rpcPort)
             .then(function (webSocket) {
             _this.globalSocket = webSocket;
             _this.globalSocket.onerror = _this.handleError;
@@ -130,31 +130,16 @@ var WebsocketService = /** @class */ (function () {
             _this.connect();
         }, 1000);
     };
-    WebsocketService.prototype.getWebSocketConnection = function (startPort, endPort) {
+    WebsocketService.prototype.getWebSocketConnection = function (port) {
         var webSocketUrl = (0, helpers_1.getWebsocketUrl)(index_1.asperaSdk.globals.asperaAppUrl);
-        var checkPort = function (port) {
-            return new Promise(function (resolve, reject) {
-                var webSocket = new WebSocket("".concat(webSocketUrl, ":").concat(port));
-                webSocket.onopen = function () {
-                    resolve(webSocket);
-                };
-                webSocket.onerror = function () {
-                    reject("Connection failed on port ".concat(port));
-                };
-            });
-        };
         return new Promise(function (resolve, reject) {
-            var connectPort = function (port) {
-                if (port > endPort) {
-                    return reject('No available WebSocket connection found');
-                }
-                checkPort(port)
-                    .then(function (ws) { return resolve(ws); })
-                    .catch(function (error) {
-                    connectPort(port + 1);
-                });
+            var webSocket = new WebSocket("".concat(webSocketUrl, ":").concat(port));
+            webSocket.onopen = function () {
+                resolve(webSocket);
+            };
+            webSocket.onerror = function () {
+                reject("Connection failed on port ".concat(port));
             };
-            connectPort(startPort);
         });
     };
     WebsocketService.prototype.notifyEvent = function (event) {

package/dist/commonjs/http-gateway/download.js

@@ -39,13 +39,14 @@ var httpDownloadPresigned = function (transferSpec, asperaSdkSpec) {
         headers['Authorization'] = "Bearer ".concat(asperaSdkSpec.http_gateway_authentication.token);
         headers['X-Aspera-AccessKey'] = asperaSdkSpec.http_gateway_authentication.access_key;
     }
+    var protocol = url.protocol === 'https:' ? 'https' : 'http';
     return fetch("".concat(url.toString(), "/presign"), {
         method: 'POST',
         headers: headers,
         body: (0, helpers_1.safeJsonString)({
             transfer_spec: transferSpec,
             method: 'GET',
-            protocol: 'http',
+            protocol: protocol,
             headers: {
                 host: url.host,
             },

package/dist/commonjs/models/aspera-sdk.model.js

@@ -15,6 +15,7 @@ exports.AsperaSdk = exports.ActivityTracking = void 0;
 var constants_1 = require("../constants/constants");
 var messages_1 = require("../constants/messages");
 var safari_client_1 = require("../helpers/client/safari-client");
+var client_1 = require("../helpers/client/client");
 var helpers_1 = require("../helpers/helpers");
 var ws_1 = require("../helpers/ws");
 var index_1 = require("../index");
@@ -175,14 +176,46 @@ var ActivityTracking = /** @class */ (function () {
         if (index_1.asperaSdk.globals.sessionId) {
             this.registerDesktopAppSession();
         }
-        if ((0, helpers_1.isSafari)()) {
-            return safari_client_1.safariClient.monitorTransferActivity();
+        var finalCall = function () {
+            if ((0, helpers_1.isSafari)()) {
+                return safari_client_1.safariClient.monitorTransferActivity();
+            }
+            return ws_1.websocketService.init()
+                .then(function () {
+                ws_1.websocketService.registerMessage('transfer_activity', function (data) { return _this.handleTransferActivity(data); });
+                ws_1.websocketService.registerEvent(function (status) { return _this.handleWebSocketEvents(status); });
+            });
+        };
+        if (index_1.asperaSdk.globals.supportMultipleUsers) {
+            var retryCount_1 = 0;
+            var makeVerifyCall_1 = function (incrementIt) {
+                if (incrementIt) {
+                    index_1.asperaSdk.globals.rpcPort = index_1.asperaSdk.globals.rpcPort + 1;
+                }
+                if (index_1.asperaSdk.globals.rpcPort > 33029) {
+                    retryCount_1++;
+                    index_1.asperaSdk.globals.rpcPort = 33024;
+                    return new Promise(function (resolve) { return setTimeout(resolve, retryCount_1 * 1050); }).then(function () { return makeVerifyCall_1(false); });
+                }
+                return client_1.client.request('verify_session', { app_id: index_1.asperaSdk.globals.appId, session_id: index_1.asperaSdk.globals.sessionId })
+                    .then(function (data) {
+                    if (data.result) {
+                        return finalCall();
+                    }
+                    return makeVerifyCall_1(true);
+                }).catch(function () {
+                    if (retryCount_1 > 5) {
+                        index_1.asperaSdk.globals.rpcPort = 33024;
+                        return Promise.reject('Unable to find port running for session');
+                    }
+                    return makeVerifyCall_1(true);
+                });
+            };
+            return makeVerifyCall_1(false);
+        }
+        else {
+            return finalCall();
         }
-        return ws_1.websocketService.init()
-            .then(function () {
-            ws_1.websocketService.registerMessage('transfer_activity', function (data) { return _this.handleTransferActivity(data); });
-            ws_1.websocketService.registerEvent(function (status) { return _this.handleWebSocketEvents(status); });
-        });
     };
     /**
      * Register a callback for getting transfers back to the consumer