Skip to content

Commit a0b701a

Browse files
rosen-vladimirovrosen-vladimirov
authored
Merge pull request #4888 from NativeScript/fatme/ddi
fix: multiple errors in Sidekick
2 parents fab4069 + 99676a4 commit a0b701a

File tree

8 files changed

+34
-15
lines changed

8 files changed

+34
-15
lines changed

‎lib/controllers/prepare-controller.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export class PrepareController extends EventEmitter {
1414
private watchersData: IDictionary<IDictionary<IPlatformWatcherData>> = {};
1515
private isInitialPrepareReady = false;
1616
private persistedData: IFilesChangeEventData[] = [];
17+
private webpackCompilerHandler: any = null;
1718

1819
constructor(
1920
private $platformController: IPlatformController,
@@ -46,7 +47,8 @@ export class PrepareController extends EventEmitter {
4647
}
4748

4849
if (this.watchersData && this.watchersData[projectDir] && this.watchersData[projectDir][platformLowerCase] && this.watchersData[projectDir][platformLowerCase].hasWebpackCompilerProcess) {
49-
await this.$webpackCompilerService.stopWebpackCompiler(platform);
50+
await this.$webpackCompilerService.stopWebpackCompiler(platformLowerCase);
51+
this.$webpackCompilerService.removeListener(WEBPACK_COMPILATION_COMPLETE, this.webpackCompilerHandler);
5052
this.watchersData[projectDir][platformLowerCase].hasWebpackCompilerProcess = false;
5153
}
5254
}
@@ -110,11 +112,14 @@ export class PrepareController extends EventEmitter {
110112

111113
private async startJSWatcherWithPrepare(platformData: IPlatformData, projectData: IProjectData, prepareData: IPrepareData): Promise<void> {
112114
if (!this.watchersData[projectData.projectDir][platformData.platformNameLowerCase].hasWebpackCompilerProcess) {
113-
this.$webpackCompilerService.on(WEBPACK_COMPILATION_COMPLETE, data => {
115+
const handler = (data: any) => {
114116
if (data.platform.toLowerCase() === platformData.platformNameLowerCase) {
115117
this.emitPrepareEvent({ ...data, hasNativeChanges: false });
116118
}
117-
});
119+
};
120+
121+
this.webpackCompilerHandler = handler.bind(this);
122+
this.$webpackCompilerService.on(WEBPACK_COMPILATION_COMPLETE, this.webpackCompilerHandler);
118123

119124
this.watchersData[projectData.projectDir][platformData.platformNameLowerCase].hasWebpackCompilerProcess = true;
120125
await this.$webpackCompilerService.compileWithWatch(platformData, projectData, prepareData);

‎lib/controllers/preview-app-controller.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export class PreviewAppController extends EventEmitter implements IPreviewAppCon
1515

1616
constructor(
1717
private $analyticsService: IAnalyticsService,
18+
private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
1819
private $errors: IErrors,
1920
private $hmrStatusService: IHmrStatusService,
2021
private $logger: ILogger,
@@ -39,11 +40,15 @@ export class PreviewAppController extends EventEmitter implements IPreviewAppCon
3940
return result;
4041
}
4142

42-
public async stopPreview(): Promise<void> {
43+
public async stopPreview(data: IProjectDir): Promise<void> {
4344
this.$previewSdkService.stop();
4445
this.$previewDevicesService.updateConnectedDevices([]);
46+
47+
await this.$prepareController.stopWatchers(data.projectDir, this.$devicePlatformsConstants.Android);
48+
await this.$prepareController.stopWatchers(data.projectDir, this.$devicePlatformsConstants.iOS);
49+
4550
if (this.prepareReadyEventHandler) {
46-
this.removeListener(PREPARE_READY_EVENT_NAME, this.prepareReadyEventHandler);
51+
this.$prepareController.removeListener(PREPARE_READY_EVENT_NAME, this.prepareReadyEventHandler);
4752
this.prepareReadyEventHandler = null;
4853
}
4954
}
@@ -83,10 +88,12 @@ export class PreviewAppController extends EventEmitter implements IPreviewAppCon
8388
await this.$previewAppPluginsService.comparePluginsOnDevice(data, device);
8489

8590
if (!this.prepareReadyEventHandler) {
86-
this.prepareReadyEventHandler = async (currentPrepareData: IFilesChangeEventData) => {
91+
const handler = async (currentPrepareData: IFilesChangeEventData) => {
8792
await this.handlePrepareReadyEvent(data, currentPrepareData);
8893
};
89-
this.$prepareController.on(PREPARE_READY_EVENT_NAME, this.prepareReadyEventHandler.bind(this));
94+
95+
this.prepareReadyEventHandler = handler.bind(this);
96+
this.$prepareController.on(PREPARE_READY_EVENT_NAME, this.prepareReadyEventHandler);
9097
}
9198

9299
data.env = data.env || {};

‎lib/controllers/run-controller.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class RunController extends EventEmitter implements IRunController {
5151
}
5252

5353
if (!this.prepareReadyEventHandler) {
54-
this.prepareReadyEventHandler = async (data: IFilesChangeEventData) => {
54+
const handler = async (data: IFilesChangeEventData) => {
5555
if (data.hasNativeChanges) {
5656
const platformData = this.$platformsDataService.getPlatformData(data.platform, projectData);
5757
const prepareData = this.$prepareDataService.getPrepareData(liveSyncInfo.projectDir, data.platform, { ...liveSyncInfo, watch: !liveSyncInfo.skipWatcher });
@@ -63,7 +63,9 @@ export class RunController extends EventEmitter implements IRunController {
6363
await this.syncChangedDataOnDevices(data, projectData, liveSyncInfo);
6464
}
6565
};
66-
this.$prepareController.on(PREPARE_READY_EVENT_NAME, this.prepareReadyEventHandler.bind(this));
66+
67+
this.prepareReadyEventHandler = handler.bind(this);
68+
this.$prepareController.on(PREPARE_READY_EVENT_NAME, this.prepareReadyEventHandler);
6769
}
6870

6971
await this.syncInitialDataOnDevices(projectData, liveSyncInfo, deviceDescriptorsForInitialSync);
@@ -113,7 +115,7 @@ export class RunController extends EventEmitter implements IRunController {
113115
liveSyncProcessInfo.deviceDescriptors = [];
114116

115117
if (this.prepareReadyEventHandler) {
116-
this.removeListener(PREPARE_READY_EVENT_NAME, this.prepareReadyEventHandler);
118+
this.$prepareController.removeListener(PREPARE_READY_EVENT_NAME, this.prepareReadyEventHandler);
117119
this.prepareReadyEventHandler = null;
118120
}
119121

@@ -377,7 +379,7 @@ export class RunController extends EventEmitter implements IRunController {
377379

378380
await this.$deviceInstallAppService.installOnDevice(device, deviceDescriptor.buildData, rebuiltInformation[platformData.platformNameLowerCase].packageFilePath);
379381
await platformLiveSyncService.syncAfterInstall(device, watchInfo);
380-
await platformLiveSyncService.restartApplication(projectData, { deviceAppData, modifiedFilesData: [], isFullSync: false, useHotModuleReload: liveSyncInfo.useHotModuleReload });
382+
await this.refreshApplication(projectData, { deviceAppData, modifiedFilesData: [], isFullSync: false, useHotModuleReload: liveSyncInfo.useHotModuleReload }, data, deviceDescriptor);
381383
} else {
382384
const isInHMRMode = liveSyncInfo.useHotModuleReload && data.hmrData && data.hmrData.hash;
383385
if (isInHMRMode) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,6 @@ declare global {
7777

7878
interface IPreviewAppController {
7979
startPreview(data: IPreviewAppLiveSyncData): Promise<IQrCodeImageData>;
80-
stopPreview(): Promise<void>;
80+
stopPreview(data: IProjectDir): Promise<void>;
8181
}
8282
}

‎lib/services/webpack/webpack-compiler-service.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export class WebpackCompilerService extends EventEmitter implements IWebpackComp
7272

7373
childProcess.on("error", (err) => {
7474
this.$logger.trace(`Unable to start webpack process in watch mode. Error is: ${err}`);
75+
delete this.webpackProcesses[platformData.platformNameLowerCase];
7576
reject(err);
7677
});
7778

@@ -82,6 +83,7 @@ export class WebpackCompilerService extends EventEmitter implements IWebpackComp
8283
this.$logger.trace(`Webpack process exited with code ${exitCode} when we expected it to be long living with watch.`);
8384
const error = new Error(`Executing webpack failed with exit code ${exitCode}.`);
8485
error.code = exitCode;
86+
delete this.webpackProcesses[platformData.platformNameLowerCase];
8587
reject(error);
8688
});
8789
});
@@ -97,12 +99,14 @@ export class WebpackCompilerService extends EventEmitter implements IWebpackComp
9799
const childProcess = await this.startWebpackProcess(platformData, projectData, prepareData);
98100
childProcess.on("error", (err) => {
99101
this.$logger.trace(`Unable to start webpack process in non-watch mode. Error is: ${err}`);
102+
delete this.webpackProcesses[platformData.platformNameLowerCase];
100103
reject(err);
101104
});
102105

103106
childProcess.on("close", async (arg: any) => {
104107
await this.$cleanupService.removeKillProcess(childProcess.pid.toString());
105108

109+
delete this.webpackProcesses[platformData.platformNameLowerCase];
106110
const exitCode = typeof arg === "number" ? arg : arg && arg.code;
107111
if (exitCode === 0) {
108112
resolve();

‎npm-shrinkwrap.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "nativescript",
33
"preferGlobal": true,
4-
"version": "6.0.1",
4+
"version": "6.0.2",
55
"author": "Telerik <support@telerik.com>",
66
"description": "Command-line interface for building NativeScript projects",
77
"bin": {

‎test/controllers/run-controller.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ function createTestInjector() {
9696
prepareData = currentPrepareData;
9797
return { platform: prepareData.platform, hasNativeChanges: false };
9898
},
99-
on: () => ({})
99+
on: () => ({}),
100+
removeListener: (): void => undefined
100101
});
101102
injector.register("prepareNativePlatformService", {});
102103
injector.register("projectChangesService", {});

0 commit comments

Comments
 (0)