Skip to content

refactor: extract preview sync hook to separate method #4081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 30, 2018
Merged

refactor: extract preview sync hook to separate method #4081

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d47e664
refactor: move the private method after the public
Fatme Oct 25, 2018
0f15780
refactor: extract preview sync hook to separate method
Fatme Oct 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 52 additions & 46 deletions lib/services/livesync/playground/preview-app-livesync-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,52 +52,6 @@ export class PreviewAppLiveSyncService implements IPreviewAppLiveSyncService {
});
}

private async initializePreviewForDevice(data: IPreviewAppLiveSyncData, device: Device): Promise<FilesPayload> {
const filesToSyncMap: IDictionary<string[]> = {};
const hmrData: IDictionary<IPlatformHmrData> = {};
let promise = Promise.resolve<FilesPayload>(null);
const startSyncFilesTimeout = async (platform: string) => {
await promise
.then(async () => {
const currentHmrData = _.cloneDeep(hmrData);
const platformHmrData = currentHmrData[platform] || <any>{};
const filesToSync = _.cloneDeep(filesToSyncMap[platform]);
// We don't need to prepare when webpack emits changed files. We just need to send a message to pubnub.
promise = this.syncFilesForPlatformSafe(data, platform, { filesToSync, skipPrepare: true, useHotModuleReload: data.appFilesUpdaterOptions.useHotModuleReload });
await promise;

if (data.appFilesUpdaterOptions.useHotModuleReload && platformHmrData.hash) {
const devices = _.filter(this.$previewSdkService.connectedDevices, { platform: platform.toLowerCase() });

await Promise.all(_.map(devices, async (previewDevice: Device) => {
const status = await this.$hmrStatusService.getHmrStatus(previewDevice.id, platformHmrData.hash);
if (status === HmrConstants.HMR_ERROR_STATUS) {
await this.syncFilesForPlatformSafe(data, platform, { filesToSync: platformHmrData.fallbackFiles, useHotModuleReload: false, deviceId: previewDevice.id });
}
}));
}
});
filesToSyncMap[platform] = [];
};
await this.$hooksService.executeBeforeHooks("preview-sync", {
hookArgs: {
projectData: this.$projectDataService.getProjectData(data.projectDir),
hmrData,
config: {
env: data.env,
platform: device.platform,
appFilesUpdaterOptions: data.appFilesUpdaterOptions,
},
externals: this.$previewAppPluginsService.getExternalPlugins(device),
filesToSyncMap,
startSyncFilesTimeout: startSyncFilesTimeout.bind(this)
}
});
await this.$previewAppPluginsService.comparePluginsOnDevice(data, device);
const payloads = await this.syncFilesForPlatformSafe(data, device.platform, { isInitialSync: true, useHotModuleReload: data.appFilesUpdaterOptions.useHotModuleReload });
return payloads;
}

public async syncFiles(data: IPreviewAppLiveSyncData, filesToSync: string[], filesToRemove: string[]): Promise<void> {
this.showWarningsForNativeFiles(filesToSync);

Expand All @@ -119,6 +73,58 @@ export class PreviewAppLiveSyncService implements IPreviewAppLiveSyncService {
this.$previewSdkService.stop();
}

private async initializePreviewForDevice(data: IPreviewAppLiveSyncData, device: Device): Promise<FilesPayload> {
const hookArgs = this.getHookArgs(data, device);
await this.$hooksService.executeBeforeHooks("preview-sync", { hookArgs });
await this.$previewAppPluginsService.comparePluginsOnDevice(data, device);
const payloads = await this.syncFilesForPlatformSafe(data, device.platform, { isInitialSync: true, useHotModuleReload: data.appFilesUpdaterOptions.useHotModuleReload });
return payloads;
}

private getHookArgs(data: IPreviewAppLiveSyncData, device: Device) {
const filesToSyncMap: IDictionary<string[]> = {};
const hmrData: IDictionary<IPlatformHmrData> = {};
const promise = Promise.resolve<FilesPayload>(null);
const result = {
projectData: this.$projectDataService.getProjectData(data.projectDir),
hmrData,
config: {
env: data.env,
platform: device.platform,
appFilesUpdaterOptions: data.appFilesUpdaterOptions,
},
externals: this.$previewAppPluginsService.getExternalPlugins(device),
filesToSyncMap,
startSyncFilesTimeout: async (platform: string) => await this.onWebpackCompilationComplete(data, hmrData, filesToSyncMap, promise, platform)
};

return result;
}

private async onWebpackCompilationComplete(data: IPreviewAppLiveSyncData, hmrData: IDictionary<IPlatformHmrData>, filesToSyncMap: IDictionary<string[]>, promise: Promise<FilesPayload>, platform: string) {
await promise
.then(async () => {
const currentHmrData = _.cloneDeep(hmrData);
const platformHmrData = currentHmrData[platform] || <any>{};
const filesToSync = _.cloneDeep(filesToSyncMap[platform]);
// We don't need to prepare when webpack emits changed files. We just need to send a message to pubnub.
promise = this.syncFilesForPlatformSafe(data, platform, { filesToSync, skipPrepare: true, useHotModuleReload: data.appFilesUpdaterOptions.useHotModuleReload });
await promise;

if (data.appFilesUpdaterOptions.useHotModuleReload && platformHmrData.hash) {
const devices = _.filter(this.$previewSdkService.connectedDevices, { platform: platform.toLowerCase() });

await Promise.all(_.map(devices, async (previewDevice: Device) => {
const status = await this.$hmrStatusService.getHmrStatus(previewDevice.id, platformHmrData.hash);
if (status === HmrConstants.HMR_ERROR_STATUS) {
await this.syncFilesForPlatformSafe(data, platform, { filesToSync: platformHmrData.fallbackFiles, useHotModuleReload: false, deviceId: previewDevice.id });
}
}));
}
});
filesToSyncMap[platform] = [];
}

private async syncFilesForPlatformSafe(data: IPreviewAppLiveSyncData, platform: string, opts?: ISyncFilesOptions): Promise<FilesPayload> {
this.$logger.info(`Start syncing changes for platform ${platform}.`);

Expand Down