Merge pull request #3861 from NativeScript/kddimitrov/livesync-tool-tests

Kddimitrov/livesync tool tests

Author: KristianDD

lib/bootstrap.ts

@@ -127,6 +127,7 @@ $injector.require("previewCommandHelper", "./helpers/preview-command-helper");
 
 $injector.requirePublicClass("localBuildService", "./services/local-build-service");
 $injector.requirePublicClass("liveSyncService", "./services/livesync/livesync-service");
+$injector.require("LiveSyncSocket", "./services/livesync/livesync-socket");
 $injector.requirePublicClass("androidLivesyncTool", "./services/livesync/android-livesync-tool");
 $injector.require("androidLiveSyncService", "./services/livesync/android-livesync-service");
 $injector.require("iOSLiveSyncService", "./services/livesync/ios-livesync-service");

lib/definitions/livesync.d.ts

@@ -419,6 +419,11 @@ interface IAndroidNativeScriptDeviceLiveSyncService extends INativeScriptDeviceL
 	finalizeSync(liveSyncInfo: ILiveSyncResultInfo, projectData: IProjectData): Promise<IAndroidLivesyncSyncOperationResult>;
 }
 
+interface ILiveSyncSocket extends INetSocket {
+	uid: string,
+	writeAsync(data: Buffer): Promise<Boolean>
+}
+
 interface IAndroidLivesyncTool {
 	/**
 	 * The protocol version the current app(adnroid runtime) is using.
@@ -454,21 +459,19 @@ interface IAndroidLivesyncTool {
 	 * @param filePath - The full path to the file.
 	 * @returns {Promise<boolean>}
 	 */
-	removeFile(filePath: string): Promise<boolean>;
+	removeFile(filePath: string): Promise<void>;
 	/**
 	 * Removes files
 	 * @param filePaths - Array of files that will be removed.
 	 * @returns {Promise<boolean[]>}
 	 */
-	removeFiles(filePaths: string[]): Promise<boolean[]>;
+	removeFiles(filePaths: string[]): Promise<void[]>;
 	/**
 	 * Sends doSyncOperation that will be handled by the runtime.
-	 * @param doRefresh - Indicates if the application should be restarted. Defaults to true.
-	 * @param operationId - The identifier of the operation
-	 * @param timeout - The timeout in milliseconds
+	 * @param options
 	 * @returns {Promise<void>}
 	 */
-	sendDoSyncOperation(doRefresh: boolean, timeout?: number, operationId?: string): Promise<IAndroidLivesyncSyncOperationResult>;
+	sendDoSyncOperation(options?: IDoSyncOperationOptions): Promise<IAndroidLivesyncSyncOperationResult>;
 	/**
 	 * Generates new operation identifier.
 	 */
@@ -491,6 +494,17 @@ interface IAndroidLivesyncTool {
 	hasConnection(): boolean;
 }
 
+/**
+ * doRefresh - Indicates if the application should be refreshed. Defaults to true.
+ * operationId - The identifier of the operation
+ * timeout - The timeout in milliseconds
+ */
+interface IDoSyncOperationOptions {
+	doRefresh?: boolean,
+	timeout?: number,
+	operationId?: string
+}
+
 interface IAndroidLivesyncToolConfiguration {
 	/**
 	 * The application identifier.
@@ -512,6 +526,10 @@ interface IAndroidLivesyncToolConfiguration {
 	 * If provider will call it when an error occurs.
 	 */
 	errorHandler?: any;
+	/**
+	 * Time to wait for successful connection. Defaults to 30000 miliseconds.
+	 */
+	connectTimeout?: number;
 }
 
 interface IAndroidLivesyncSyncOperationResult {

lib/services/livesync/android-device-livesync-sockets-service.ts

@@ -58,7 +58,7 @@ export class AndroidDeviceSocketsLiveSyncService extends AndroidDeviceLiveSyncSe
 
 		if (liveSyncInfo.modifiedFilesData.length) {
 			const canExecuteFastSync = !liveSyncInfo.isFullSync && this.canExecuteFastSyncForPaths(liveSyncInfo, liveSyncInfo.modifiedFilesData, projectData, this.device.deviceInfo.platform);
-			const doSyncPromise = this.livesyncTool.sendDoSyncOperation(canExecuteFastSync, null, operationId);
+			const doSyncPromise = this.livesyncTool.sendDoSyncOperation({ doRefresh: canExecuteFastSync, operationId});
 
 			const syncInterval: NodeJS.Timer = setInterval(() => {
 				if (this.livesyncTool.isOperationInProgress(operationId)) {