Merge branch 'master' into fix/webcontentsview-lifecycle

Author: krassowski

src/main/app.ts

@@ -1257,9 +1257,15 @@ export class JupyterApplication implements IApplication, IDisposable {
       )
       .then(async response => {
         try {
+          if (!response.ok) {
+            throw new Error(`Update check failed: ${response.status}`);
+          }
           const data = await response.text();
           const latestReleaseData = yaml.load(data);
           const latestVersion = (latestReleaseData as any).version;
+          if (!latestVersion || !semver.valid(latestVersion)) {
+            throw new Error('No valid version in update metadata');
+          }
           const currentVersion = app.getVersion();
           const newVersionAvailable =
             semver.compare(currentVersion, latestVersion) === -1;

src/main/dialog/themedwindow.ts

@@ -106,6 +106,7 @@ export class ThemedWindow {
             overflow-y: auto;
           }
           </style>
+          <!-- do not prepend the cjsInteropShim here: the toolkit is a UMD bundle that branches on typeof exports, so faking exports breaks every jp-* component -->
           <script type="module">${toolkitJsSrc}</script>
           <script type="module">${cjsInteropShim}${titlebarJsSrc}</script>
           <script>

src/main/sessionwindow/sessionwindow.ts

@@ -170,12 +170,7 @@ export class SessionWindow implements IDisposable {
   load() {
     const titleBarView = new TitleBarView({ isDarkTheme: this._isDarkTheme });
     this._window.contentView.addChildView(titleBarView.view);
-    titleBarView.view.setBounds({
-      x: 0,
-      y: 0,
-      width: DEFAULT_WIN_WIDTH,
-      height: titleBarHeight
-    });
+    titleBarView.view.setBounds(this._titleBarBounds());
 
     this._window.on('focus', () => {
       titleBarView.activate();
@@ -336,11 +331,15 @@ export class SessionWindow implements IDisposable {
       isDarkTheme: this._isDarkTheme
     });
     this._window.contentView.addChildView(welcomeView.view);
+    const {
+      width: contentWidth,
+      height: contentHeight
+    } = this._window.getContentBounds();
     welcomeView.view.setBounds({
       x: 0,
       y: titleBarHeight,
-      width: DEFAULT_WIN_WIDTH,
-      height: DEFAULT_WIN_HEIGHT
+      width: contentWidth,
+      height: contentHeight - titleBarHeight
     });
 
     welcomeView.load();
@@ -1243,16 +1242,23 @@ export class SessionWindow implements IDisposable {
     }, 300);
   }
 
-  private _resizeViews() {
-    const { width, height } = this._window.getContentBounds();
-    // add padding to allow resizing around title bar
+  // Title bar bounds, shared by load() and _resizeViews() so the first paint
+  // matches every later resize. Non-macOS insets by 1px so the frame stays
+  // grabbable for resizing around the title bar.
+  private _titleBarBounds(): Electron.Rectangle {
+    const { width } = this._window.getContentBounds();
     const padding = process.platform === 'darwin' ? 0 : 1;
-    this._titleBarView.view.setBounds({
+    return {
       x: padding,
       y: padding,
       width: width - 2 * padding,
       height: titleBarHeight - padding
-    });
+    };
+  }
+
+  private _resizeViews() {
+    const { width, height } = this._window.getContentBounds();
+    this._titleBarView.view.setBounds(this._titleBarBounds());
     const contentRect: Electron.Rectangle = {
       x: 0,
       y: titleBarHeight,
@@ -1278,6 +1284,7 @@ export class SessionWindow implements IDisposable {
       };
       invalidate(this._titleBarView?.view?.webContents);
       invalidate(this.contentView?.webContents);
+      invalidate(this._progressView?.view?.view?.webContents);
       invalidate(this._envSelectPopup?.view?.view?.webContents);
     }, 200);
   }

test/setup/electron-stub.ts

@@ -55,6 +55,8 @@ export const BrowserWindow = vi.fn().mockImplementation(() => ({
 
 export const shell = { openExternal: vi.fn(), openPath: vi.fn() };
 
+export const net = { fetch: vi.fn() };
+
 export const nativeTheme = { shouldUseDarkColors: false };
 
 export const screen = {

test/unit/app-checkforupdates.test.ts

@@ -0,0 +1,42 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { net } from '../setup/electron-stub';
+import { JupyterApplication } from '../../src/main/app';
+
+// checkForUpdates is a method on the large JupyterApplication class whose
+// constructor wires up the whole main process, so we exercise the method on a
+// prototype-only instance and stub the two collaborators it reaches: the
+// electron `net.fetch` boundary and the private _showUpdateDialog sink.
+function makeApp(): {
+  app: JupyterApplication;
+  showUpdateDialog: ReturnType<typeof vi.fn>;
+} {
+  const app = Object.create(JupyterApplication.prototype) as JupyterApplication;
+  const showUpdateDialog = vi.fn();
+  ((app as unknown) as {
+    _showUpdateDialog: unknown;
+  })._showUpdateDialog = showUpdateDialog;
+  return { app, showUpdateDialog };
+}
+
+describe('JupyterApplication.checkForUpdates', () => {
+  beforeEach(() => {
+    (net.fetch as ReturnType<typeof vi.fn>).mockReset();
+  });
+
+  it('does not read the body when the release feed responds non-ok', async () => {
+    const { app, showUpdateDialog } = makeApp();
+    const text = vi.fn(() => Promise.resolve('<html>not yaml</html>'));
+    (net.fetch as ReturnType<typeof vi.fn>).mockResolvedValue({
+      ok: false,
+      status: 503,
+      text
+    });
+
+    app.checkForUpdates('always');
+
+    await vi.waitFor(() => expect(showUpdateDialog).toHaveBeenCalled());
+    expect(text).not.toHaveBeenCalled();
+    expect(showUpdateDialog).toHaveBeenCalledWith('error');
+    expect(showUpdateDialog).not.toHaveBeenCalledWith('updates-available');
+  });
+});

test/unit/sessionwindow-titlebar-bounds.test.ts

@@ -0,0 +1,40 @@
+import { afterEach, describe, expect, it } from 'vitest';
+import { SessionWindow } from '../../src/main/sessionwindow/sessionwindow';
+
+// _titleBarBounds is the single source of truth shared by load() and
+// _resizeViews(); if the two ever diverge again the first paint gaps by a pixel
+// on non-macOS. Drive it directly without the heavy constructor.
+const realPlatform = process.platform;
+function setPlatform(p: string): void {
+  Object.defineProperty(process, 'platform', { value: p, configurable: true });
+}
+
+function windowWith(width: number): any {
+  const win = Object.create(SessionWindow.prototype);
+  win._window = { getContentBounds: () => ({ width, height: 600 }) };
+  return win;
+}
+
+describe('SessionWindow._titleBarBounds', () => {
+  afterEach(() => setPlatform(realPlatform));
+
+  it('spans the full content width with no inset on macOS', () => {
+    setPlatform('darwin');
+    expect(windowWith(800)._titleBarBounds()).toEqual({
+      x: 0,
+      y: 0,
+      width: 800,
+      height: 29
+    });
+  });
+
+  it('insets by one pixel on non-macOS so the frame stays grabbable', () => {
+    setPlatform('linux');
+    expect(windowWith(800)._titleBarBounds()).toEqual({
+      x: 1,
+      y: 1,
+      width: 798,
+      height: 28
+    });
+  });
+});