chore(preview): handle PR comments

Author: Fatme

lib/definitions/preview-app-livesync.d.ts

@@ -35,8 +35,8 @@ declare global {
 	}
 
 	interface IPreviewDevicesService extends EventEmitter {
-		connectedDevices: Device[];
-		onDevicesPresence(devices: Device[]): void;
+		getConnectedDevices(): Device[];
+		updateConnectedDevices(devices: Device[]): void;
 		getDeviceById(id: string): Device;
 		getDevicesForPlatform(platform: string): Device[];
 	}

lib/services/livesync/playground/devices/preview-devices-service.ts

@@ -3,9 +3,13 @@ import { EventEmitter } from "events";
 import { DeviceDiscoveryEventNames } from "../../../../common/constants";
 
 export class PreviewDevicesService extends EventEmitter implements IPreviewDevicesService {
-	public connectedDevices: Device[] = [];
+	private connectedDevices: Device[] = [];
 
-	public onDevicesPresence(devices: Device[]): void {
+	public getConnectedDevices(): Device[] {
+		return this.connectedDevices;
+	}
+
+	public updateConnectedDevices(devices: Device[]): void {
 		_(devices)
 			.reject(d => _.find(this.connectedDevices, device => d.id === device.id))
 			.each(device => this.raiseDeviceFound(device));

lib/services/livesync/playground/preview-app-livesync-service.ts

@@ -56,15 +56,15 @@ export class PreviewAppLiveSyncService implements IPreviewAppLiveSyncService {
 	public async syncFiles(data: IPreviewAppLiveSyncData, filesToSync: string[], filesToRemove: string[]): Promise<void> {
 		this.showWarningsForNativeFiles(filesToSync);
 
-		for (const device of this.$previewDevicesService.connectedDevices) {
+		const connectedDevices = this.$previewDevicesService.getConnectedDevices();
+		for (const device of connectedDevices) {
 			await this.$previewAppPluginsService.comparePluginsOnDevice(data, device);
 		}
 
-		const platforms = _(this.$previewDevicesService.connectedDevices)
+		const platforms = _(connectedDevices)
 			.map(device => device.platform)
 			.uniq()
 			.value();
-
 		for (const platform of platforms) {
 			await this.syncFilesForPlatformSafe(data, platform, { filesToSync, filesToRemove, useHotModuleReload: data.appFilesUpdaterOptions.useHotModuleReload });
 		}

lib/services/livesync/playground/preview-sdk-service.ts

@@ -74,7 +74,7 @@ export class PreviewSdkService extends EventEmitter implements IPreviewSdkServic
 			onConnectedDevicesChange: (connectedDevices: ConnectedDevices) => ({}),
 			onDeviceConnectedMessage: (deviceConnectedMessage: DeviceConnectedMessage) => ({}),
 			onDeviceConnected: (device: Device) => ({}),
-			onDevicesPresence: (devices: Device[]) => this.$previewDevicesService.onDevicesPresence(devices),
+			onDevicesPresence: (devices: Device[]) => this.$previewDevicesService.updateConnectedDevices(devices),
 			onSendingChange: (sending: boolean) => ({ }),
 			onBiggerFilesUpload: async (filesContent, callback) => {
 				const gzippedContent = Buffer.from(pako.gzip(filesContent));

test/services/playground/preview-app-livesync-service.ts

@@ -158,7 +158,7 @@ function createTestInjector(options?: {
 		}
 	});
 	injector.register("previewDevicesService", {
-		connectedDevices: [deviceMockData]
+		getConnectedDevices: () => [deviceMockData]
 	});
 
 	return injector;

test/services/preview-devices-service.ts

@@ -27,6 +27,11 @@ function createDevice(id: string): Device {
 	};
 }
 
+function resetDevices() {
+	foundDevices = [];
+	lostDevices = [];
+}
+
 describe("PreviewDevicesService", () => {
 	describe("onDevicesPresence", () => {
 		let previewDevicesService: IPreviewDevicesService = null;
@@ -43,27 +48,31 @@ describe("PreviewDevicesService", () => {
 
 		afterEach(() => {
 			previewDevicesService.removeAllListeners();
-			foundDevices = [];
-			lostDevices = [];
+			resetDevices();
 		});
 
 		it("should add new device", () => {
 			const device = createDevice("device1");
 
-			previewDevicesService.onDevicesPresence([device]);
+			previewDevicesService.updateConnectedDevices([device]);
 
-			assert.deepEqual(previewDevicesService.connectedDevices, [device]);
+			assert.deepEqual(previewDevicesService.getConnectedDevices(), [device]);
 			assert.deepEqual(foundDevices, [device]);
 			assert.deepEqual(lostDevices, []);
 		});
 		it("should add new device when there are already connected devices", () => {
 			const device1 = createDevice("device1");
 			const device2 = createDevice("device2");
-			previewDevicesService.connectedDevices = [device1];
 
-			previewDevicesService.onDevicesPresence([device1, device2]);
+			previewDevicesService.updateConnectedDevices([device1]);
+			assert.deepEqual(previewDevicesService.getConnectedDevices(), [device1]);
+			assert.deepEqual(foundDevices, [device1]);
+			assert.deepEqual(lostDevices, []);
+			resetDevices();
+
+			previewDevicesService.updateConnectedDevices([device1, device2]);
 
-			assert.deepEqual(previewDevicesService.connectedDevices, [device1, device2]);
+			assert.deepEqual(previewDevicesService.getConnectedDevices(), [device1, device2]);
 			assert.deepEqual(foundDevices, [device2]);
 			assert.deepEqual(lostDevices, []);
 		});
@@ -72,29 +81,38 @@ describe("PreviewDevicesService", () => {
 			const device2 = createDevice("device2");
 			const device3 = createDevice("device3");
 
-			previewDevicesService.onDevicesPresence([device1, device2, device3]);
+			previewDevicesService.updateConnectedDevices([device1, device2, device3]);
 
-			assert.deepEqual(previewDevicesService.connectedDevices, [device1, device2, device3]);
+			assert.deepEqual(previewDevicesService.getConnectedDevices(), [device1, device2, device3]);
 			assert.deepEqual(foundDevices, [device1, device2, device3]);
 			assert.deepEqual(lostDevices, []);
 		});
 		it("should remove device", () => {
 			const device1 = createDevice("device1");
-			previewDevicesService.connectedDevices = [device1];
+			previewDevicesService.updateConnectedDevices([device1]);
+			assert.deepEqual(previewDevicesService.getConnectedDevices(), [device1]);
+			assert.deepEqual(foundDevices, [device1]);
+			assert.deepEqual(lostDevices, []);
+			resetDevices();
 
-			previewDevicesService.onDevicesPresence([]);
+			previewDevicesService.updateConnectedDevices([]);
 
 			assert.deepEqual(foundDevices, []);
 			assert.deepEqual(lostDevices, [device1]);
 		});
 		it("should add and remove devices in the same time", () => {
 			const device1 = createDevice("device1");
 			const device2 = createDevice("device2");
-			previewDevicesService.connectedDevices = [device1];
 
-			previewDevicesService.onDevicesPresence([device2]);
+			previewDevicesService.updateConnectedDevices([device1]);
+			assert.deepEqual(previewDevicesService.getConnectedDevices(), [device1]);
+			assert.deepEqual(foundDevices, [device1]);
+			assert.deepEqual(lostDevices, []);
+			resetDevices();
+
+			previewDevicesService.updateConnectedDevices([device2]);
 
-			assert.deepEqual(previewDevicesService.connectedDevices, [device2]);
+			assert.deepEqual(previewDevicesService.getConnectedDevices(), [device2]);
 			assert.deepEqual(foundDevices, [device2]);
 			assert.deepEqual(lostDevices, [device1]);
 		});