@flareapp/electron 2.6.0 → 2.8.0

package/dist/main.cjs

@@ -34,7 +34,7 @@ let node_fs_promises = require("node:fs/promises");
 let node_url = require("node:url");
 
 //#region src/env.ts
-const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.6.0" : "?";
+const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.8.0" : "?";
 
 //#endregion
 //#region src/types.ts
@@ -51,11 +51,9 @@ const DEFAULT_ELECTRON_OPTIONS = {
 //#endregion
 //#region src/main/collectElectron.ts
 /**
-* App + runtime attributes that are safe to overlay onto ANY report regardless of origin.
-* Reused by both the collector (main errors) and the IPC receiver (forwarded renderer reports).
-*
-* Intentionally does NOT include per-process fields like `flare.entry_point.type` or `process.type`
-* so that forwarded renderer reports keep their own `flare.entry_point.type: 'web'` intact.
+* App + runtime attributes safe to overlay onto any report regardless of origin. Reused by both
+* the collector (main errors) and the IPC receiver (forwarded renderer reports). Excludes per-process
+* fields like `flare.entry_point.type` / `process.type` so forwarded renderer reports keep their own.
 */
 function collectElectronAppAttributes(app) {
 	const versions = process.versions;
@@ -79,7 +77,7 @@ function collectElectronAppAttributes(app) {
 /** Build the ContextCollector core calls on every main-process report. */
 function makeElectronContextCollector(app) {
 	return (_config) => ({
-		"flare.entry_point.type": "server",
+		"flare.entry_point.type": "web",
 		"process.type": process.type ?? "browser",
 		...collectElectronAppAttributes(app)
 	});
@@ -158,10 +156,9 @@ function isTrusted(frame, opts) {
 	return defaultTrustPolicy(frame, opts);
 }
 /**
-* Minimal top-level structural guard for a parsed report. This is intentionally NOT an exhaustive
-* validator of every StackFrame / SpanEvent: the renderer builds the report with our own Flare code,
-* and a compromised renderer could forge any valid-looking shape anyway. The real security boundary
-* is the sender-trust check plus the byte-size cap; this guard only rejects obviously-wrong payloads.
+* Minimal top-level structural guard for a parsed report, not an exhaustive StackFrame/SpanEvent
+* validator: a compromised renderer could forge any valid-looking shape anyway. The security boundary
+* is the sender-trust check plus the byte-size cap; this only rejects obviously-wrong payloads.
 */
 function isReportShape(value) {
 	if (typeof value !== "object" || value === null) return false;
@@ -196,9 +193,9 @@ function disposeIpcReceiver(ipcMain, owner) {
 //#endregion
 //#region src/main/processHandlers.ts
 /**
-* Fatal callbacks for Electron main. Mirrors @flareapp/node's buildFatalCallbacks but exits via
-* the injected `exit` (defaulting to app.exit at the call site), which is immediate and skips
-* before-quit/will-quit, correct after an uncaught exception.
+* Fatal callbacks for Electron main. Mirrors @flareapp/node's buildFatalCallbacks but exits via the
+* injected `exit` (app.exit at the call site), which is immediate and skips before-quit/will-quit,
+* correct after an uncaught exception.
 */
 function buildFatalCallbacks(flare, getOpts, exit) {
 	return {
@@ -229,9 +226,13 @@ function buildFatalCallbacks(flare, getOpts, exit) {
 	};
 }
 /**
-* Owns the lifecycle of the two process-level error listeners for the Electron main process.
-* Mirrors node's ProcessHandlerManager. Attach/detach the two process listeners, reconciling
-* against the desired modes.
+* Owns the lifecycle of the two process-level error listeners for the Electron main process,
+* reconciling attach/detach against the desired modes. Mirrors node's ProcessHandlerManager.
+*
+* Deliberately a copy, not a shared module. @flareapp/electron does not depend on @flareapp/node, and
+* the only package both import is @flareapp/core, which ships in every browser bundle and touches
+* `process` only behind a typeof guard. A shared manager belongs in a new package, not in core, and
+* one method does not pay for one.
 */
 var ProcessHandlerManager = class {
 	uncaughtHandler = null;
@@ -260,13 +261,14 @@ var ProcessHandlerManager = class {
 	reconcileOne(event, mode, get, set, impl) {
 		const current = get();
 		const wants = mode !== "off";
-		if (wants && !current) {
-			set(impl);
-			process.on(event, impl);
-		} else if (!wants && current) {
+		if (wants === (current !== null)) return;
+		if (!wants) {
 			process.off(event, current);
 			set(null);
+			return;
 		}
+		set(impl);
+		process.on(event, impl);
 	}
 };
 
@@ -306,6 +308,7 @@ var ElectronFlare = class extends _flareapp_core.Flare {
 			name: SDK_NAME,
 			version: CLIENT_VERSION
 		});
+		this.setFramework({ name: _flareapp_core.FrameworkName.NodeElectron });
 		this.handlerManager = new ProcessHandlerManager(buildFatalCallbacks(this, () => this.options, (code) => this.app.exit(code)));
 		registerIpcReceiver(this.ipcMain, this, {
 			getOptions: () => this.options,
@@ -343,20 +346,25 @@ var ElectronFlare = class extends _flareapp_core.Flare {
 		disposeIpcReceiver(this.ipcMain, this);
 		this.flushScheduler.dispose();
 	}
-	/** Attach or detach the process-gone listeners to match options.captureRenderProcessGone. Idempotent. */
+	/** Attach/detach the process-gone listeners to match options.captureRenderProcessGone. Idempotent. */
 	reconcileCrashListeners() {
-		const want = this.options.captureRenderProcessGone;
-		const attached = this.renderGoneHandler !== null;
-		if (want && !attached) {
-			this.renderGoneHandler = (_event, webContents, details) => {
-				return this.reportProcessGone("renderer", details, webContents?.id);
-			};
-			this.childGoneHandler = (_event, details) => {
-				return this.reportProcessGone("child", details);
-			};
-			this.app.on("render-process-gone", this.renderGoneHandler);
-			this.app.on("child-process-gone", this.childGoneHandler);
-		} else if (!want && attached) this.detachCrashListeners();
+		const want = Boolean(this.options.captureRenderProcessGone);
+		if (want === (this.renderGoneHandler !== null)) return;
+		if (!want) {
+			this.detachCrashListeners();
+			return;
+		}
+		this.attachCrashListeners();
+	}
+	attachCrashListeners() {
+		this.renderGoneHandler = (_event, webContents, details) => {
+			return this.reportProcessGone("renderer", details, webContents?.id);
+		};
+		this.childGoneHandler = (_event, details) => {
+			return this.reportProcessGone("child", details);
+		};
+		this.app.on("render-process-gone", this.renderGoneHandler);
+		this.app.on("child-process-gone", this.childGoneHandler);
 	}
 	detachCrashListeners() {
 		if (this.renderGoneHandler) {

package/dist/main.d.cts

@@ -44,8 +44,9 @@ declare class ElectronFlare extends Flare {
   light(key?: string, debug?: boolean): this;
   configureElectron(partial: ElectronOptions): this;
   dispose(): void;
-  /** Attach or detach the process-gone listeners to match options.captureRenderProcessGone. Idempotent. */
+  /** Attach/detach the process-gone listeners to match options.captureRenderProcessGone. Idempotent. */
   private reconcileCrashListeners;
+  private attachCrashListeners;
   private detachCrashListeners;
   private reportProcessGone;
   /**

package/dist/main.d.mts

@@ -44,8 +44,9 @@ declare class ElectronFlare extends Flare {
   light(key?: string, debug?: boolean): this;
   configureElectron(partial: ElectronOptions): this;
   dispose(): void;
-  /** Attach or detach the process-gone listeners to match options.captureRenderProcessGone. Idempotent. */
+  /** Attach/detach the process-gone listeners to match options.captureRenderProcessGone. Idempotent. */
   private reconcileCrashListeners;
+  private attachCrashListeners;
   private detachCrashListeners;
   private reportProcessGone;
   /**

package/dist/main.mjs

@@ -1,11 +1,11 @@
 import { app, ipcMain } from "electron";
-import { Api, DEFAULT_URL_DENYLIST, Flare, GlobalScopeProvider, GlobalScopeProvider as GlobalScopeProvider$1, Logger, NullFileReader, Scope, USER_IDENTITY_KEYS, convertToError, redactUrlQuery, resolveDenylist, userIdentityAttributes } from "@flareapp/core";
+import { Api, DEFAULT_URL_DENYLIST, Flare, FrameworkName, GlobalScopeProvider, GlobalScopeProvider as GlobalScopeProvider$1, Logger, NullFileReader, Scope, USER_IDENTITY_KEYS, convertToError, redactUrlQuery, resolveDenylist, userIdentityAttributes } from "@flareapp/core";
 import os from "node:os";
 import { readFile } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 
 //#region src/env.ts
-const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.6.0" : "?";
+const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.8.0" : "?";
 
 //#endregion
 //#region src/types.ts
@@ -22,11 +22,9 @@ const DEFAULT_ELECTRON_OPTIONS = {
 //#endregion
 //#region src/main/collectElectron.ts
 /**
-* App + runtime attributes that are safe to overlay onto ANY report regardless of origin.
-* Reused by both the collector (main errors) and the IPC receiver (forwarded renderer reports).
-*
-* Intentionally does NOT include per-process fields like `flare.entry_point.type` or `process.type`
-* so that forwarded renderer reports keep their own `flare.entry_point.type: 'web'` intact.
+* App + runtime attributes safe to overlay onto any report regardless of origin. Reused by both
+* the collector (main errors) and the IPC receiver (forwarded renderer reports). Excludes per-process
+* fields like `flare.entry_point.type` / `process.type` so forwarded renderer reports keep their own.
 */
 function collectElectronAppAttributes(app) {
 	const versions = process.versions;
@@ -50,7 +48,7 @@ function collectElectronAppAttributes(app) {
 /** Build the ContextCollector core calls on every main-process report. */
 function makeElectronContextCollector(app) {
 	return (_config) => ({
-		"flare.entry_point.type": "server",
+		"flare.entry_point.type": "web",
 		"process.type": process.type ?? "browser",
 		...collectElectronAppAttributes(app)
 	});
@@ -129,10 +127,9 @@ function isTrusted(frame, opts) {
 	return defaultTrustPolicy(frame, opts);
 }
 /**
-* Minimal top-level structural guard for a parsed report. This is intentionally NOT an exhaustive
-* validator of every StackFrame / SpanEvent: the renderer builds the report with our own Flare code,
-* and a compromised renderer could forge any valid-looking shape anyway. The real security boundary
-* is the sender-trust check plus the byte-size cap; this guard only rejects obviously-wrong payloads.
+* Minimal top-level structural guard for a parsed report, not an exhaustive StackFrame/SpanEvent
+* validator: a compromised renderer could forge any valid-looking shape anyway. The security boundary
+* is the sender-trust check plus the byte-size cap; this only rejects obviously-wrong payloads.
 */
 function isReportShape(value) {
 	if (typeof value !== "object" || value === null) return false;
@@ -167,9 +164,9 @@ function disposeIpcReceiver(ipcMain, owner) {
 //#endregion
 //#region src/main/processHandlers.ts
 /**
-* Fatal callbacks for Electron main. Mirrors @flareapp/node's buildFatalCallbacks but exits via
-* the injected `exit` (defaulting to app.exit at the call site), which is immediate and skips
-* before-quit/will-quit, correct after an uncaught exception.
+* Fatal callbacks for Electron main. Mirrors @flareapp/node's buildFatalCallbacks but exits via the
+* injected `exit` (app.exit at the call site), which is immediate and skips before-quit/will-quit,
+* correct after an uncaught exception.
 */
 function buildFatalCallbacks(flare, getOpts, exit) {
 	return {
@@ -200,9 +197,13 @@ function buildFatalCallbacks(flare, getOpts, exit) {
 	};
 }
 /**
-* Owns the lifecycle of the two process-level error listeners for the Electron main process.
-* Mirrors node's ProcessHandlerManager. Attach/detach the two process listeners, reconciling
-* against the desired modes.
+* Owns the lifecycle of the two process-level error listeners for the Electron main process,
+* reconciling attach/detach against the desired modes. Mirrors node's ProcessHandlerManager.
+*
+* Deliberately a copy, not a shared module. @flareapp/electron does not depend on @flareapp/node, and
+* the only package both import is @flareapp/core, which ships in every browser bundle and touches
+* `process` only behind a typeof guard. A shared manager belongs in a new package, not in core, and
+* one method does not pay for one.
 */
 var ProcessHandlerManager = class {
 	uncaughtHandler = null;
@@ -231,13 +232,14 @@ var ProcessHandlerManager = class {
 	reconcileOne(event, mode, get, set, impl) {
 		const current = get();
 		const wants = mode !== "off";
-		if (wants && !current) {
-			set(impl);
-			process.on(event, impl);
-		} else if (!wants && current) {
+		if (wants === (current !== null)) return;
+		if (!wants) {
 			process.off(event, current);
 			set(null);
+			return;
 		}
+		set(impl);
+		process.on(event, impl);
 	}
 };
 
@@ -277,6 +279,7 @@ var ElectronFlare = class extends Flare {
 			name: SDK_NAME,
 			version: CLIENT_VERSION
 		});
+		this.setFramework({ name: FrameworkName.NodeElectron });
 		this.handlerManager = new ProcessHandlerManager(buildFatalCallbacks(this, () => this.options, (code) => this.app.exit(code)));
 		registerIpcReceiver(this.ipcMain, this, {
 			getOptions: () => this.options,
@@ -314,20 +317,25 @@ var ElectronFlare = class extends Flare {
 		disposeIpcReceiver(this.ipcMain, this);
 		this.flushScheduler.dispose();
 	}
-	/** Attach or detach the process-gone listeners to match options.captureRenderProcessGone. Idempotent. */
+	/** Attach/detach the process-gone listeners to match options.captureRenderProcessGone. Idempotent. */
 	reconcileCrashListeners() {
-		const want = this.options.captureRenderProcessGone;
-		const attached = this.renderGoneHandler !== null;
-		if (want && !attached) {
-			this.renderGoneHandler = (_event, webContents, details) => {
-				return this.reportProcessGone("renderer", details, webContents?.id);
-			};
-			this.childGoneHandler = (_event, details) => {
-				return this.reportProcessGone("child", details);
-			};
-			this.app.on("render-process-gone", this.renderGoneHandler);
-			this.app.on("child-process-gone", this.childGoneHandler);
-		} else if (!want && attached) this.detachCrashListeners();
+		const want = Boolean(this.options.captureRenderProcessGone);
+		if (want === (this.renderGoneHandler !== null)) return;
+		if (!want) {
+			this.detachCrashListeners();
+			return;
+		}
+		this.attachCrashListeners();
+	}
+	attachCrashListeners() {
+		this.renderGoneHandler = (_event, webContents, details) => {
+			return this.reportProcessGone("renderer", details, webContents?.id);
+		};
+		this.childGoneHandler = (_event, details) => {
+			return this.reportProcessGone("child", details);
+		};
+		this.app.on("render-process-gone", this.renderGoneHandler);
+		this.app.on("child-process-gone", this.childGoneHandler);
 	}
 	detachCrashListeners() {
 		if (this.renderGoneHandler) {

package/dist/renderer.cjs

@@ -8,7 +8,7 @@ const FLARE_BRIDGE_KEY = "__flare";
 
 //#endregion
 //#region src/env.ts
-const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.6.0" : "?";
+const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.8.0" : "?";
 
 //#endregion
 //#region src/renderer/RendererFlare.ts

package/dist/renderer.mjs

@@ -7,7 +7,7 @@ const FLARE_BRIDGE_KEY = "__flare";
 
 //#endregion
 //#region src/env.ts
-const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.6.0" : "?";
+const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.8.0" : "?";
 
 //#endregion
 //#region src/renderer/RendererFlare.ts

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flareapp/electron",
-    "version": "2.6.0",
+    "version": "2.8.0",
     "description": "Electron SDK for flareapp.io",
     "homepage": "https://flareapp.io",
     "bugs": {
@@ -15,6 +15,9 @@
         "name": "Spatie",
         "email": "info@spatie.be"
     },
+    "contributors": [
+        "Dries Heyninck <dries@spatie.be>"
+    ],
     "files": [
         "dist"
     ],
@@ -62,14 +65,15 @@
         "release": "release-it"
     },
     "dependencies": {
-        "@flareapp/core": "2.6.0",
-        "@flareapp/js": "2.6.0"
+        "@flareapp/core": "2.8.0",
+        "@flareapp/js": "2.8.0"
     },
     "peerDependencies": {
         "electron": ">=35"
     },
     "devDependencies": {
         "@flareapp/react": "file:../react",
+        "@flareapp/test-helpers": "*",
         "@flareapp/vue": "file:../vue",
         "electron": "^35.0.0",
         "react": "^19.0.0",