Fix port replacement on creating new site from backup (#944)

Author: nightnei

src/components/tests/assistant-code-block.test.tsx

@@ -25,6 +25,7 @@ const selectedSite: SiteDetails = {
 	path: '/test-site',
 	phpVersion: '8.0',
 	adminPassword: btoa( 'test-password' ),
+	port: 9999,
 };
 
 ( useSiteDetails as jest.Mock ).mockReturnValue( {

src/components/tests/content-tab-import-export.test.tsx

@@ -19,6 +19,7 @@ const selectedSite: SiteDetails = {
 	path: '/test-site',
 	phpVersion: '8.0',
 	adminPassword: btoa( 'test-password' ),
+	port: 9999,
 };
 
 beforeEach( () => {

src/hooks/tests/use-import-export.test.tsx

@@ -19,6 +19,7 @@ const selectedSite: SiteDetails = {
 	path: '/test-site',
 	phpVersion: '8.0',
 	adminPassword: btoa( 'test-password' ),
+	port: 9999,
 };
 
 const wrapper = ( { children }: { children: React.ReactNode } ) => (

src/hooks/tests/use-update-demo-site.test.tsx

@@ -49,6 +49,7 @@ describe( 'useUpdateDemoSite', () => {
 		phpVersion: '8.0',
 		id: '54321',
 		path: '/path/to/site',
+		port: 9999,
 	};
 	const clientReqPost = jest.fn().mockResolvedValue( {
 		data: 'success',
@@ -160,6 +161,7 @@ describe( 'useUpdateDemoSite', () => {
 			phpVersion: '8.0',
 			id: '09876',
 			path: '/path/to/site2',
+			port: 9999,
 		};
 
 		// Mock different response times for each site

src/hooks/use-add-site.ts

@@ -67,8 +67,11 @@ export function useAddSite() {
 							isNewSite: true,
 						} );
 						clearImportState( newSite.id );
+					} else {
+						// when we import file we start the server automatically, so doesn't make sense to run it again, to avoid unexpected behaviour
+						await startServer( newSite.id );
 					}
-					await startServer( newSite.id );
+
 					getIpcApi().showNotification( {
 						title: newSite.name,
 						body: __( 'Your new site is up and running' ),

src/hooks/use-site-details.tsx

@@ -218,6 +218,7 @@ export function SiteDetailsProvider( { children }: SiteDetailsProviderProps ) {
 						id: tempSiteId,
 						name: siteName || path,
 						path,
+						port: -1, // Set a temporary port
 						running: false,
 						isAddingSite: true,
 						phpVersion: '',

src/ipc-handlers.ts

@@ -38,6 +38,7 @@ import { StoredToken } from 'src/lib/oauth';
 import * as oauthClient from 'src/lib/oauth';
 import { createPassword } from 'src/lib/passwords';
 import { phpGetThemeDetails } from 'src/lib/php-get-theme-details';
+import { portFinder } from 'src/lib/port-finder';
 import { shellOpenExternalWrapper } from 'src/lib/shell-open-external-wrapper';
 import { sortSites } from 'src/lib/sort-sites';
 import { installSqliteIntegration, keepSqliteIntegrationUpdated } from 'src/lib/sqlite-versions';
@@ -161,11 +162,14 @@ export async function createSite(
 		}
 	}
 
+	const port = await portFinder.getOpenPort();
+
 	const details = {
 		id: crypto.randomUUID(),
 		name: siteName || nodePath.basename( path ),
 		path,
 		adminPassword: createPassword(),
+		port,
 		running: false,
 		phpVersion: DEFAULT_PHP_VERSION,
 	} as const;

src/ipc-types.d.ts

@@ -17,7 +17,7 @@ interface StoppedSiteDetails {
 	id: string;
 	name: string;
 	path: string;
-	port?: number;
+	port: number;
 	phpVersion: string;
 	adminPassword?: string;
 	themeDetails?: {

src/lib/import-export/tests/export/exporters/default-exporter.test.ts

@@ -147,6 +147,7 @@ platformTestSuite( 'DefaultExporter', ( { normalize } ) => {
 				id: '123',
 				name: '123',
 				path: normalize( '/path/to/site' ),
+				port: 9999,
 				phpVersion: '7.4',
 			},
 			backupFile: normalize( '/path/to/backup.tar.gz' ),

src/lib/import-export/tests/export/exporters/sql-exporter.test.ts

@@ -23,6 +23,7 @@ platformTestSuite( 'SqlExporter', ( { normalize } ) => {
 				id: '123',
 				name: '123',
 				path: '/path/to/site',
+				port: 9999,
 				phpVersion: '7.4',
 			},
 			backupFile: normalize( '/path/to/backup.sql' ),