Merge pull request #3916 from NativeScript/fatme/msv-preview-app

feat: pass msvKey and msvEnv to preview-sdk in order to respect different min supported versions of preview app

Author: Fatme

config/config.json

@@ -5,6 +5,7 @@
 	"ANDROID_DEBUG_UI_MAC": "Google Chrome",
 	"USE_POD_SANDBOX": false,
 	"DISABLE_HOOKS": false,
-	"UPLOAD_PLAYGROUND_FILES_ENDPOINT": "https://play.nativescript.org/api/files" ,
-	"SHORTEN_URL_ENDPOINT": "https://play.nativescript.org/api/shortenurl?longUrl=%s"
+	"UPLOAD_PLAYGROUND_FILES_ENDPOINT": "https://play.nativescript.org/api/files",
+	"SHORTEN_URL_ENDPOINT": "https://play.nativescript.org/api/shortenurl?longUrl=%s",
+	"PREVIEW_APP_ENVIRONMENT": "live"
 }

lib/config.ts

@@ -10,6 +10,7 @@ export class Configuration extends ConfigBase implements IConfiguration { // Use
 	USE_POD_SANDBOX: boolean = false;
 	UPLOAD_PLAYGROUND_FILES_ENDPOINT: string = null;
 	SHORTEN_URL_ENDPOINT: string = null;
+	PREVIEW_APP_ENVIRONMENT: string = null;
 
 	/*don't require logger and everything that has logger as dependency in config.js due to cyclic dependency*/
 	constructor(protected $fs: IFileSystem) {

lib/declarations.d.ts

@@ -384,6 +384,7 @@ interface IConfiguration extends Config.IConfig {
 	USE_POD_SANDBOX: boolean;
 	UPLOAD_PLAYGROUND_FILES_ENDPOINT: string;
 	SHORTEN_URL_ENDPOINT: string;
+	PREVIEW_APP_ENVIRONMENT: string;
 }
 
 interface IApplicationPackage {

lib/services/livesync/livesync-service.ts

@@ -327,7 +327,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 		let deviceDescriptorsForInitialSync: ILiveSyncDeviceInfo[] = [];
 
 		if (liveSyncData.syncToPreviewApp) {
-			this.$previewAppLiveSyncService.initialize({
+			await this.$previewAppLiveSyncService.initialize({
 				appFilesUpdaterOptions: {
 					bundle: liveSyncData.bundle,
 					release: liveSyncData.release,

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

@@ -20,8 +20,8 @@ export class PreviewAppLiveSyncService implements IPreviewAppLiveSyncService {
 		private $projectFilesManager: IProjectFilesManager,
 		private $projectFilesProvider: IProjectFilesProvider) { }
 
-	public initialize(data: IPreviewAppLiveSyncData) {
-		this.$previewSdkService.initialize(async (device: Device) => {
+	public async initialize(data: IPreviewAppLiveSyncData): Promise<void> {
+		await this.$previewSdkService.initialize(async (device: Device) => {
 			if (!device) {
 				this.$errors.failWithoutHelp("Sending initial preview files without a specified device is not supported.");
 			}

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

@@ -17,10 +17,10 @@ export class PreviewSdkService implements IPreviewSdkService {
 		return `nsplay://boot?instanceId=${this.instanceId}&pKey=${PubnubKeys.PUBLISH_KEY}&sKey=${PubnubKeys.SUBSCRIBE_KEY}&template=play-ng&hmr=${hmrValue}`;
 	}
 
-	public initialize(getInitialFiles: (device: Device) => Promise<FilesPayload>): void {
+	public async initialize(getInitialFiles: (device: Device) => Promise<FilesPayload>): Promise<void> {
 		const initConfig = this.getInitConfig(getInitialFiles);
 		this.messagingService = new MessagingService();
-		this.instanceId = this.messagingService.initialize(initConfig);
+		this.instanceId = await this.messagingService.initialize(initConfig);
 	}
 
 	public applyChanges(filesPayload: FilesPayload): Promise<void> {
@@ -43,6 +43,8 @@ export class PreviewSdkService implements IPreviewSdkService {
 		return {
 			pubnubPublishKey: PubnubKeys.PUBLISH_KEY,
 			pubnubSubscribeKey: PubnubKeys.SUBSCRIBE_KEY,
+			msvKey: "cli",
+			msvEnv: this.$config.PREVIEW_APP_ENVIRONMENT,
 			callbacks: this.getCallbacks(),
 			getInitialFiles
 		};

npm-shrinkwrap.json

@@ -56,7 +56,7 @@
     "mkdirp": "0.5.1",
     "mute-stream": "0.0.5",
     "nativescript-doctor": "1.3.0",
-    "nativescript-preview-sdk": "0.2.9",
+    "nativescript-preview-sdk": "0.2.11",
     "open": "0.0.5",
     "ora": "2.0.0",
     "osenv": "0.1.3",