feat: add force reload

src/electron/create-main-menu/create-view-menu.ts

@@ -30,6 +30,19 @@ export function createViewMenu(
 					});
 				}
 			},
+			{
+				label: '&Force Reload',
+				accelerator: 'CmdOrCtrl+Shift+R',
+				click: (item: Electron.MenuItem, focusedWindow: Electron.BrowserWindow) => {
+					injection.sender.send({
+						id: uuid.v4(),
+						type: Message.ServerMessageType.Reload,
+						payload: {
+							forced: true
+						}
+					});
+				}
+			},
 			{
 				label: 'Toggle &Full Screen',
 				accelerator: process.platform === 'darwin' ? 'Ctrl+Command+F' : 'F11',

src/electron/create-server-message-handler.ts

@@ -78,18 +78,7 @@ export async function createServerMessageHandler(
 				break;
 			}
 			case Message.ServerMessageType.Reload: {
-				/* const lastMainMenuRequest = injection.sender.last(
-					Message.ServerMessageType.MainMenuRequest
-				);
-
-				if (lastMainMenuRequest) {
-					showMainMenu(lastMainMenuRequest.payload, { sender: injection.sender });
-				} */
-
-				const focusedWindow = Electron.BrowserWindow.getFocusedWindow();
-				focusedWindow.reload();
-
-				injection.emitter.emit('reload');
+				injection.emitter.emit('reload', message.payload || {});
 				break;
 			}
 			case Message.ServerMessageType.CreateNewFileRequest: {

src/electron/ephemeral-store.ts

@@ -28,6 +28,10 @@ export class EphemeralStore {
 		this.store.set('connections', [...connections]);
 	}
 
+	public async clear(): Promise<void> {
+		this.store.clear();
+	}
+
 	public async getConnections(): Promise<EphemeralConnection[]> {
 		const raw = this.store.get('connections');
 

src/electron/main.ts

@@ -11,22 +11,14 @@ const CONTEXT: AppContext = {
 	win: undefined
 };
 
-let restarting: Promise<void> = Promise.resolve();
-
 async function main(): Promise<void> {
 	const StartApp = importFresh('./start-app');
 	const startApp = StartApp.startApp as typeof start;
 	const app = await startApp(CONTEXT);
 
-	const restart = async () => {
+	app.emitter.once('reload', async () => {
 		clearModule.match(new RegExp(`^${Path.join(__dirname, '..')}`));
 		await main();
-		restarting = Promise.resolve();
-	};
-
-	app.emitter.on('reload', async () => {
-		await restarting;
-		restarting = restart();
 	});
 }
 

src/electron/start-app.ts

@@ -21,7 +21,7 @@ export interface AppContext {
 
 export async function startApp(ctx: AppContext): Promise<{ emitter: Events.EventEmitter }> {
 	log.info('App starting...');
-	ctx.win = ctx.win ? ctx.win : (await createWindow()).window;
+
 	const emitter = new Events.EventEmitter();
 
 	// Cast getPort return type from PromiseLike<number> to Promise<number>
@@ -69,12 +69,23 @@ export async function startApp(ctx: AppContext): Promise<{ emitter: Events.Event
 	});
 
 	await server.start();
-	log.info(`App started on port ${ctx.port}.`);
+	log.info(`Server started on port ${ctx.port}.`);
+
+	if (ctx.win) {
+		ctx.win.reload();
+	} else {
+		ctx.win = (await createWindow()).window;
+	}
 
 	startUpdater();
 
-	emitter.on('reload', async () => {
-		log.info('App reloading ...');
+	emitter.once('reload', async payload => {
+		log.info(`App reloading ${payload.forced ? 'forcefully' : ''}...`);
+
+		if (payload && payload !== null && payload.forced) {
+			ephemeralStore.clear();
+		}
+
 		await server.stop();
 		sender.stop();
 		server.removeAllListeners();
@@ -83,5 +94,6 @@ export async function startApp(ctx: AppContext): Promise<{ emitter: Events.Event
 		stopUpdater();
 	});
 
+	log.info('App started.');
 	return { emitter };
 }

src/message/server-message.ts

@@ -258,7 +258,7 @@ export type ProjectResponse = Envelope<
 	{ data: Types.SerializedProject | undefined; status: Types.ProjectStatus }
 >;
 export type Redo = EmptyEnvelope<ServerMessageType.Redo>;
-export type Reload = EmptyEnvelope<ServerMessageType.Reload>;
+export type Reload = Envelope<ServerMessageType.Reload, { forced: boolean } | undefined>;
 export type Save = Envelope<ServerMessageType.Save, Types.SavePayload>;
 export type SelectElement = Envelope<ServerMessageType.SelectElement, Types.PatternIdPayload>;
 export type SetPane = Envelope<