Fixed FS path vs encoded URL comparision when handling stop request.

Ref: eclipse-theia/theia#11226 Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
arduino · fstasi · Jun 1, 2022 · May 30, 2022 · May 31, 2022 · May 31, 2022
commit c1125f33159731bd7946eceb08805ba62b1d0ca5
diff --git a/arduino-ide-extension/src/electron-main/arduino-electron-main-module.ts b/arduino-ide-extension/src/electron-main/arduino-electron-main-module.ts
@@ -19,6 +19,8 @@ import {
   IDEUpdaterPath,
 } from '../common/protocol/ide-updater';
 import { IDEUpdaterImpl } from './ide-updater/ide-updater-impl';
+import { TheiaElectronWindow } from './theia/theia-electron-window';
+import { TheiaElectronWindow as DefaultTheiaElectronWindow } from '@theia/core/lib/electron-main/theia-electron-window';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(ElectronMainApplication).toSelf().inSingletonScope();
@@ -56,4 +58,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
         )
     )
     .inSingletonScope();
+
+  bind(TheiaElectronWindow).toSelf();
+  rebind(DefaultTheiaElectronWindow).toService(TheiaElectronWindow);
 });
diff --git a/arduino-ide-extension/src/electron-main/theia/theia-electron-window.ts b/arduino-ide-extension/src/electron-main/theia/theia-electron-window.ts
@@ -0,0 +1,35 @@
+import { injectable } from '@theia/core/shared/inversify';
+import { isWindows } from '@theia/core/lib/common/os';
+import { StopReason } from '@theia/core/lib/electron-common/messaging/electron-messages';
+import { TheiaElectronWindow as DefaultTheiaElectronWindow } from '@theia/core/lib/electron-main/theia-electron-window';
+import { FileUri } from '@theia/core/lib/node';
+
+@injectable()
+export class TheiaElectronWindow extends DefaultTheiaElectronWindow {
+  protected async handleStopRequest(
+    onSafeCallback: () => unknown,
+    reason: StopReason
+  ): Promise<boolean> {
+    // Only confirm close to windows that have loaded our front end.
+    let currentUrl = this.window.webContents.getURL(); // this comes from electron, expected to be an URL encoded string. e.g: space will be `%20`
+    let frontendUri = FileUri.create(
+      this.globals.THEIA_FRONTEND_HTML_PATH
+    ).toString(false); // Map the FS path to an URI, ensure the encoding is not skipped, so that a space will be `%20`.
+    // Since our resolved frontend HTML path might contain backward slashes on Windows, we normalize everything first.
+    if (isWindows) {
+      currentUrl = currentUrl.replace(/\\/g, '/');
+      frontendUri = frontendUri.replace(/\\/g, '/');
+    }
+    const safeToClose =
+      !currentUrl.includes(frontendUri) || (await this.checkSafeToStop(reason));
+    if (safeToClose) {
+      try {
+        await onSafeCallback();
+        return true;
+      } catch (e) {
+        console.warn(`Request ${StopReason[reason]} failed.`, e);
+      }
+    }
+    return false;
+  }
+}