Remove livesync-provider

Remove livesyncProvider and introduce a base class for device specific livesync services.

Author: rosen-vladimirov

lib/bootstrap.ts

@@ -75,7 +75,6 @@ $injector.require("commandsServiceProvider", "./providers/commands-service-provi
 $injector.require("deviceAppDataProvider", "./providers/device-app-data-provider");
 
 $injector.require("deviceLogProvider", "./common/mobile/device-log-provider");
-$injector.require("liveSyncProvider", "./providers/livesync-provider");
 $injector.require("projectFilesProvider", "./providers/project-files-provider");
 
 $injector.require("nodeModulesBuilder", "./tools/node-modules/node-modules-builder");

lib/providers/livesync-provider.ts

@@ -1,31 +1,24 @@
 import { DeviceAndroidDebugBridge } from "../../common/mobile/android/device-android-debug-bridge";
 import { AndroidDeviceHashService } from "../../common/mobile/android/android-device-hash-service";
+import { DeviceLiveSyncServiceBase } from "./device-livesync-service-base";
 import * as helpers from "../../common/helpers";
 import { SYNC_DIR_NAME, FULLSYNC_DIR_NAME, REMOVEDSYNC_DIR_NAME } from "../../constants";
 import { cache } from "../../common/decorators";
 import * as path from "path";
 import * as net from "net";
-import { EOL } from "os";
-
-export class AndroidDeviceLiveSyncService implements IAndroidNativeScriptDeviceLiveSyncService {
-	private static FAST_SYNC_FILE_EXTENSIONS = [".css", ".xml", ".html"];
 
+export class AndroidDeviceLiveSyncService extends DeviceLiveSyncServiceBase implements IAndroidNativeScriptDeviceLiveSyncService {
 	private static BACKEND_PORT = 18182;
 	private device: Mobile.IAndroidDevice;
 
 	constructor(_device: Mobile.IDevice,
 		private $mobileHelper: Mobile.IMobileHelper,
 		private $injector: IInjector,
-		private $logger: ILogger,
-		private $androidDebugService: IPlatformDebugService,
-		private $platformsData: IPlatformsData) {
+		protected $platformsData: IPlatformsData) {
+		super($platformsData);
 		this.device = <Mobile.IAndroidDevice>(_device);
 	}
 
-	public get debugService(): IPlatformDebugService {
-		return this.$androidDebugService;
-	}
-
 	public async refreshApplication(projectData: IProjectData, liveSyncInfo: ILiveSyncResultInfo): Promise<void> {
 		const deviceAppData = liveSyncInfo.deviceAppData;
 		const localToDevicePaths = liveSyncInfo.modifiedFilesData;
@@ -38,7 +31,7 @@ export class AndroidDeviceLiveSyncService implements IAndroidNativeScriptDeviceL
 				`/data/local/tmp/${deviceAppData.appIdentifier}/sync`]
 		);
 
-		let canExecuteFastSync = !liveSyncInfo.isFullSync && !_.some(localToDevicePaths,
+		const canExecuteFastSync = !liveSyncInfo.isFullSync && !_.some(localToDevicePaths,
 			(localToDevicePath: Mobile.ILocalToDevicePathData) => !this.canExecuteFastSync(localToDevicePath.getLocalPath(), projectData, this.device.deviceInfo.platform));
 
 		if (canExecuteFastSync) {
@@ -48,25 +41,6 @@ export class AndroidDeviceLiveSyncService implements IAndroidNativeScriptDeviceL
 		return this.restartApplication(deviceAppData);
 	}
 
-	@cache()
-	private getFastLiveSyncFileExtensions(platform: string, projectData: IProjectData): string[] {
-		const platformData = this.$platformsData.getPlatformData(platform, projectData);
-		const fastSyncFileExtensions = AndroidDeviceLiveSyncService.FAST_SYNC_FILE_EXTENSIONS.concat(platformData.fastLivesyncFileExtensions);
-		return fastSyncFileExtensions;
-	}
-
-	public canExecuteFastSync(filePath: string, projectData: IProjectData, platform: string): boolean {
-		console.log("called canExecuteFastSync for file: ", filePath);
-		const fastSyncFileExtensions = this.getFastLiveSyncFileExtensions(platform, projectData);
-		return _.includes(fastSyncFileExtensions, path.extname(filePath));
-	}
-
-	protected printDebugInformation(information: string[]): void {
-		_.each(information, i => {
-			this.$logger.info(`To start debugging, open the following URL in Chrome:${EOL}${i}${EOL}`.cyan);
-		});
-	}
-
 	private async restartApplication(deviceAppData: Mobile.IDeviceAppData): Promise<void> {
 		let devicePathRoot = `/data/data/${deviceAppData.appIdentifier}/files`;
 		let devicePath = this.$mobileHelper.buildDevicePath(devicePathRoot, "code_cache", "secondary_dexes", "proxyThumb");

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

@@ -0,0 +1,21 @@
+import { cache } from "../../common/decorators";
+import * as path from "path";
+
+export abstract class DeviceLiveSyncServiceBase {
+	private static FAST_SYNC_FILE_EXTENSIONS = [".css", ".xml", ".html"];
+
+	constructor(protected $platformsData: IPlatformsData) { }
+
+	public canExecuteFastSync(filePath: string, projectData: IProjectData, platform: string): boolean {
+		const fastSyncFileExtensions = this.getFastLiveSyncFileExtensions(platform, projectData);
+		return _.includes(fastSyncFileExtensions, path.extname(filePath));
+	}
+
+	@cache()
+	private getFastLiveSyncFileExtensions(platform: string, projectData: IProjectData): string[] {
+		const platformData = this.$platformsData.getPlatformData(platform, projectData);
+		const fastSyncFileExtensions = DeviceLiveSyncServiceBase.FAST_SYNC_FILE_EXTENSIONS.concat(platformData.fastLivesyncFileExtensions);
+		return fastSyncFileExtensions;
+	}
+
+}

lib/services/livesync/device-livesync-service-base.ts

@@ -2,10 +2,11 @@ import * as helpers from "../../common/helpers";
 import * as constants from "../../constants";
 import * as minimatch from "minimatch";
 import * as net from "net";
+import { DeviceLiveSyncServiceBase } from "./device-livesync-service-base";
 
 let currentPageReloadId = 0;
 
-export class IOSDeviceLiveSyncService implements INativeScriptDeviceLiveSyncService {
+export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implements INativeScriptDeviceLiveSyncService {
 	private static BACKEND_PORT = 18181;
 	private socket: net.Socket;
 	private device: Mobile.IiOSDevice;
@@ -15,18 +16,13 @@ export class IOSDeviceLiveSyncService implements INativeScriptDeviceLiveSyncServ
 		private $iOSNotification: IiOSNotification,
 		private $iOSEmulatorServices: Mobile.IiOSSimulatorService,
 		private $logger: ILogger,
-		private $iOSDebugService: IDebugService,
 		private $fs: IFileSystem,
-		private $liveSyncProvider: ILiveSyncProvider,
-		private $processService: IProcessService) {
-
+		private $processService: IProcessService,
+		protected $platformsData: IPlatformsData) {
+		super($platformsData);
 		this.device = _device;
 	}
 
-	public get debugService(): IDebugService {
-		return this.$iOSDebugService;
-	}
-
 	private async setupSocketIfNeeded(projectId: string): Promise<boolean> {
 		if (this.socket) {
 			return true;
@@ -64,11 +60,11 @@ export class IOSDeviceLiveSyncService implements INativeScriptDeviceLiveSyncServ
 		}
 
 		let scriptRelatedFiles: Mobile.ILocalToDevicePathData[] = [];
-		let scriptFiles = _.filter(localToDevicePaths, localToDevicePath => _.endsWith(localToDevicePath.getDevicePath(), ".js"));
+		const scriptFiles = _.filter(localToDevicePaths, localToDevicePath => _.endsWith(localToDevicePath.getDevicePath(), ".js"));
 		constants.LIVESYNC_EXCLUDED_FILE_PATTERNS.forEach(pattern => scriptRelatedFiles = _.concat(scriptRelatedFiles, localToDevicePaths.filter(file => minimatch(file.getDevicePath(), pattern, { nocase: true }))));
 
-		let otherFiles = _.difference(localToDevicePaths, _.concat(scriptFiles, scriptRelatedFiles));
-		let shouldRestart = _.some(otherFiles, (localToDevicePath: Mobile.ILocalToDevicePathData) => !this.$liveSyncProvider.canExecuteFastSync(localToDevicePath.getLocalPath(), projectData, deviceAppData.platform));
+		const otherFiles = _.difference(localToDevicePaths, _.concat(scriptFiles, scriptRelatedFiles));
+		const shouldRestart = _.some(otherFiles, (localToDevicePath: Mobile.ILocalToDevicePathData) => !this.canExecuteFastSync(localToDevicePath.getLocalPath(), projectData, deviceAppData.platform));
 
 		if (shouldRestart || (!liveSyncInfo.useLiveEdit && scriptFiles.length)) {
 			await this.restartApplication(deviceAppData, projectData.projectName);