Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
},
"description": "BlueBubbles Server is the app that powers the BlueBubbles app ecosystem",
"scripts": {
"test:headless-window": "node ./scripts/test-headless-window.js",
"build": "export NODE_ENV=production && webpack --config ./scripts/webpack.main.prod.config.js",
"start": "export NODE_ENV=development && webpack --config ./scripts/webpack.main.config.js && electron ./dist/main.js",
"lint": "eslint --ext=jsx,js,tsx,ts src",
Expand Down
43 changes: 43 additions & 0 deletions packages/server/scripts/test-headless-window.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
const assert = require("node:assert/strict");
const fs = require("node:fs");
const path = require("node:path");
const typescript = require("typescript");

const sourcePath = path.resolve(__dirname, "../src/server/utils/WindowUtils.ts");
const sourceCode = fs.readFileSync(sourcePath, "utf8");
const compiledCode = typescript.transpileModule(sourceCode, {
compilerOptions: {
module: typescript.ModuleKind.CommonJS,
target: typescript.ScriptTarget.ES2020
},
fileName: sourcePath
}).outputText;

const loadedModule = { exports: {} };
const executeModule = new Function("require", "module", "exports", compiledCode);
executeModule(require, loadedModule, loadedModule.exports);

const { minimizeWindowIfRequested } = loadedModule.exports;
let minimizeCalls = 0;
const window = {
minimize: () => {
minimizeCalls += 1;
}
};

let didMinimize;
assert.doesNotThrow(() => {
didMinimize = minimizeWindowIfRequested(true, null);
}, "headless startup must not minimize a missing BrowserWindow");
assert.equal(didMinimize, false, "headless startup must report that no window was minimized");
assert.equal(minimizeCalls, 0);

didMinimize = minimizeWindowIfRequested(false, window);
assert.equal(didMinimize, false, "disabled start minimized must report that no window was minimized");
assert.equal(minimizeCalls, 0, "a visible window must remain unchanged when start minimized is disabled");

didMinimize = minimizeWindowIfRequested(true, window);
assert.equal(didMinimize, true, "enabled start minimized must report a successful minimization");
assert.equal(minimizeCalls, 1, "a visible window must still minimize when start minimized is enabled");

console.log("Headless window minimization checks passed.");
6 changes: 4 additions & 2 deletions packages/server/src/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ import { obfuscatedHandle } from "./utils/StringUtils";
import { AutoStartMethods } from "./databases/server/constants";
import { MacOsInterface } from "./api/interfaces/macosInterface";
import { ZrokManager } from "./managers/zrokManager";
import { minimizeWindowIfRequested } from "./utils/WindowUtils";

const findProcess = require("find-process");

Expand Down Expand Up @@ -790,8 +791,9 @@ class BlueBubblesServer extends EventEmitter {

// Start minimized if enabled
const startMinimized = Server().repo.getConfig("start_minimized") as boolean;
if (startMinimized) {
this.window.minimize();
const didMinimizeWindow = minimizeWindowIfRequested(startMinimized, this.window);
if (startMinimized && !didMinimizeWindow) {
this.logger.debug("Skipping start-minimized behavior because headless mode has no BrowserWindow.");
}

// Disable the encryp coms setting if it's enabled.
Expand Down
8 changes: 8 additions & 0 deletions packages/server/src/server/utils/WindowUtils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import type { BrowserWindow } from "electron";

export const minimizeWindowIfRequested = (startMinimized: boolean, window: BrowserWindow | null): boolean => {
if (!startMinimized || !window) return false;

window.minimize();
return true;
};