From 7bec4e2c2558d81f3ce83234c3b3309d7904a537 Mon Sep 17 00:00:00 2001 From: Dimitar Kerezov Date: Fri, 21 Jul 2017 18:06:29 +0300 Subject: [PATCH] Set correct timeout on LiveSync --- lib/constants.ts | 1 + lib/services/ios-debug-service.ts | 7 +++---- lib/services/livesync/ios-device-livesync-service.ts | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/constants.ts b/lib/constants.ts index d7512a2f78..0b0d046507 100644 --- a/lib/constants.ts +++ b/lib/constants.ts @@ -17,6 +17,7 @@ export const LIVESYNC_EXCLUDED_FILE_PATTERNS = ["**/*.js.map", "**/*.ts"]; export const XML_FILE_EXTENSION = ".xml"; export const PLATFORMS_DIR_NAME = "platforms"; export const CODE_SIGN_ENTITLEMENTS = "CODE_SIGN_ENTITLEMENTS"; +export const AWAIT_NOTIFICATION_TIMEOUT_SECONDS = 9; export class PackageVersion { static NEXT = "next"; diff --git a/lib/services/ios-debug-service.ts b/lib/services/ios-debug-service.ts index b120065040..15c2f6bf1e 100644 --- a/lib/services/ios-debug-service.ts +++ b/lib/services/ios-debug-service.ts @@ -4,7 +4,7 @@ import * as path from "path"; import * as log4js from "log4js"; import { ChildProcess } from "child_process"; import { DebugServiceBase } from "./debug-service-base"; -import { CONNECTION_ERROR_EVENT_NAME } from "../constants"; +import { CONNECTION_ERROR_EVENT_NAME, AWAIT_NOTIFICATION_TIMEOUT_SECONDS } from "../constants"; import { getPidFromiOSSimulatorLogs } from "../common/helpers"; import byline = require("byline"); @@ -13,7 +13,6 @@ const inspectorBackendPort = 18181; const inspectorAppName = "NativeScript Inspector.app"; const inspectorNpmPackageName = "tns-ios-inspector"; const inspectorUiDir = "WebInspectorUI/"; -const TIMEOUT_SECONDS = 9; class IOSDebugService extends DebugServiceBase implements IPlatformDebugService { private _lldbProcess: ChildProcess; @@ -176,7 +175,7 @@ class IOSDebugService extends DebugServiceBase implements IPlatformDebugService } private async debugBrkCore(device: Mobile.IiOSDevice, debugData: IDebugData, debugOptions: IDebugOptions): Promise { - await this.$iOSSocketRequestExecutor.executeLaunchRequest(device.deviceInfo.identifier, TIMEOUT_SECONDS, TIMEOUT_SECONDS, debugData.applicationIdentifier, debugOptions.debugBrk); + await this.$iOSSocketRequestExecutor.executeLaunchRequest(device.deviceInfo.identifier, AWAIT_NOTIFICATION_TIMEOUT_SECONDS, AWAIT_NOTIFICATION_TIMEOUT_SECONDS, debugData.applicationIdentifier, debugOptions.debugBrk); return this.wireDebuggerClient(debugData, debugOptions, device); } @@ -188,7 +187,7 @@ class IOSDebugService extends DebugServiceBase implements IPlatformDebugService } private async deviceStartCore(device: Mobile.IiOSDevice, debugData: IDebugData, debugOptions: IDebugOptions): Promise { - await this.$iOSSocketRequestExecutor.executeAttachRequest(device, TIMEOUT_SECONDS, debugData.applicationIdentifier); + await this.$iOSSocketRequestExecutor.executeAttachRequest(device, AWAIT_NOTIFICATION_TIMEOUT_SECONDS, debugData.applicationIdentifier); return this.wireDebuggerClient(debugData, debugOptions, device); } diff --git a/lib/services/livesync/ios-device-livesync-service.ts b/lib/services/livesync/ios-device-livesync-service.ts index 872d7af4e0..976376a39f 100644 --- a/lib/services/livesync/ios-device-livesync-service.ts +++ b/lib/services/livesync/ios-device-livesync-service.ts @@ -37,8 +37,7 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen return false; } } else { - let timeout = 9000; - await this.$iOSSocketRequestExecutor.executeAttachRequest(this.device, timeout, projectId); + await this.$iOSSocketRequestExecutor.executeAttachRequest(this.device, constants.AWAIT_NOTIFICATION_TIMEOUT_SECONDS, projectId); this.socket = await this.device.connectToPort(IOSDeviceLiveSyncService.BACKEND_PORT); }