@@ -3,6 +3,7 @@ import * as Cause from "effect/Cause";
33import * as Clock from "effect/Clock" ;
44import * as Context from "effect/Context" ;
55import * as Effect from "effect/Effect" ;
6+ import * as Fiber from "effect/Fiber" ;
67import * as Layer from "effect/Layer" ;
78import * as Path from "effect/Path" ;
89import * as Queue from "effect/Queue" ;
@@ -23,6 +24,7 @@ export class DesktopRendererHistory extends Context.Service<
2324 identity : RendererIdentity ,
2425 ) => Effect . Effect < void > ;
2526 readonly recordMetrics : ( metrics : ReadonlyArray < Electron . ProcessMetric > ) => Effect . Effect < void > ;
27+ readonly shutdown : Effect . Effect < void > ;
2628 }
2729> ( ) ( "@t3tools/desktop/telemetry/DesktopRendererHistory" ) { }
2830
@@ -63,6 +65,7 @@ interface TrackedRenderer {
6365 pid : number | null ;
6466 creationTimeMs : number | null ;
6567 memory : RendererMemory | null ;
68+ gone : boolean ;
6669 readonly removeListeners : ( ) => void ;
6770}
6871
@@ -79,6 +82,7 @@ const make = Effect.fn("DesktopRendererHistory.make")(function* () {
7982 const mainSessionStartedAtUnixMs = clock . currentTimeMillisUnsafe ( ) ;
8083 const records = yield * Queue . sliding < RendererRecord > ( 256 ) ;
8184 const active = new Map < number , TrackedRenderer > ( ) ;
85+ let accepting = true ;
8286 const writer = yield * makeRotatingLogFileWriter ( {
8387 filePath : path . join ( environment . logDir , "renderer-history.ndjson" ) ,
8488 maxBytes : 256 * 1024 ,
@@ -93,7 +97,7 @@ const make = Effect.fn("DesktopRendererHistory.make")(function* () {
9397
9498 const writeRecord = ( record : RendererRecord ) =>
9599 writer . writeText ( `${ JSON . stringify ( record ) } \n` ) . pipe ( Effect . ignore ) ;
96- yield * Effect . forever (
100+ const writerFiber = yield * Effect . forever (
97101 Effect . uninterruptibleMask ( ( restore ) =>
98102 restore ( Queue . take ( records ) ) . pipe ( Effect . flatMap ( writeRecord ) ) ,
99103 ) . pipe (
@@ -116,7 +120,7 @@ const make = Effect.fn("DesktopRendererHistory.make")(function* () {
116120
117121 const readPid = ( renderer : TrackedRenderer ) : RendererRecord [ "rendererPidSource" ] => {
118122 try {
119- if ( ! renderer . webContents . isDestroyed ( ) ) {
123+ if ( ! renderer . gone && ! renderer . webContents . isDestroyed ( ) ) {
120124 const pid = renderer . webContents . getOSProcessId ( ) ;
121125 if ( Number . isInteger ( pid ) && pid > 0 ) {
122126 if ( pid !== renderer . pid ) {
@@ -163,7 +167,7 @@ const make = Effect.fn("DesktopRendererHistory.make")(function* () {
163167
164168 const register = ( webContents : Electron . WebContents , identity : RendererIdentity ) =>
165169 Effect . sync ( ( ) => {
166- if ( webContents . isDestroyed ( ) ) return ;
170+ if ( ! accepting || webContents . isDestroyed ( ) ) return ;
167171 const boundedIdentity : RendererIdentity = {
168172 surface : identity . surface ,
169173 ...( identity . tabId === undefined ? { } : { tabId : identity . tabId . slice ( 0 , 128 ) } ) ,
@@ -179,7 +183,15 @@ const make = Effect.fn("DesktopRendererHistory.make")(function* () {
179183 }
180184 return ;
181185 }
182- const onDomReady = ( ) => record ( renderer , "dom-ready" ) ;
186+ const onDomReady = ( ) => {
187+ if ( renderer . gone ) {
188+ renderer . pid = null ;
189+ renderer . creationTimeMs = null ;
190+ renderer . memory = null ;
191+ renderer . gone = false ;
192+ }
193+ record ( renderer , "dom-ready" ) ;
194+ } ;
183195 const onDevToolsOpened = ( ) => {
184196 const tools = webContents . devToolsWebContents ;
185197 if ( tools )
@@ -190,8 +202,11 @@ const make = Effect.fn("DesktopRendererHistory.make")(function* () {
190202 } ) ,
191203 ) ;
192204 } ;
193- const onGone = ( _event : Electron . Event , details : Electron . RenderProcessGoneDetails ) =>
205+ const onGone = ( _event : Electron . Event , details : Electron . RenderProcessGoneDetails ) => {
206+ readPid ( renderer ) ;
207+ renderer . gone = true ;
194208 record ( renderer , "render-process-gone" , details ) ;
209+ } ;
195210 const onDestroyed = ( ) => {
196211 record ( renderer , "destroyed" ) ;
197212 active . delete ( webContents . id ) ;
@@ -203,6 +218,7 @@ const make = Effect.fn("DesktopRendererHistory.make")(function* () {
203218 pid : null ,
204219 creationTimeMs : null ,
205220 memory : null ,
221+ gone : false ,
206222 removeListeners : ( ) => {
207223 webContents . removeListener ( "dom-ready" , onDomReady ) ;
208224 webContents . removeListener ( "devtools-opened" , onDevToolsOpened ) ;
@@ -226,10 +242,11 @@ const make = Effect.fn("DesktopRendererHistory.make")(function* () {
226242 let lastSampledAtUnixMs = - Infinity ;
227243 const recordMetrics = ( metrics : ReadonlyArray < Electron . ProcessMetric > ) =>
228244 Effect . sync ( ( ) => {
229- const byPid = new Map ( metrics . map ( ( metric ) => [ metric . pid , metric ] ) ) ;
245+ if ( ! accepting ) return ;
230246 const sampledAtUnixMs = clock . currentTimeMillisUnsafe ( ) ;
231247 if ( sampledAtUnixMs - lastSampledAtUnixMs < 30_000 ) return ;
232248 lastSampledAtUnixMs = sampledAtUnixMs ;
249+ const byPid = new Map ( metrics . map ( ( metric ) => [ metric . pid , metric ] ) ) ;
233250 for ( const renderer of active . values ( ) ) {
234251 const pidSource = readPid ( renderer ) ;
235252 // A last-known PID may already have been reused by another process.
@@ -253,14 +270,14 @@ const make = Effect.fn("DesktopRendererHistory.make")(function* () {
253270 ( ) => Effect . void ,
254271 ) ,
255272 ) ;
256- yield * Effect . addFinalizer ( ( ) =>
257- Effect . sync ( ( ) => {
258- for ( const renderer of active . values ( ) ) renderer . removeListeners ( ) ;
259- active . clear ( ) ;
260- } ) ,
261- ) ;
273+ const shutdown = Effect . sync ( ( ) => {
274+ accepting = false ;
275+ for ( const renderer of active . values ( ) ) renderer . removeListeners ( ) ;
276+ active . clear ( ) ;
277+ } ) . pipe ( Effect . andThen ( Fiber . interrupt ( writerFiber ) ) , Effect . asVoid ) ;
278+ yield * Effect . addFinalizer ( ( ) => shutdown ) ;
262279
263- return DesktopRendererHistory . of ( { register, recordMetrics } ) ;
280+ return DesktopRendererHistory . of ( { register, recordMetrics, shutdown } ) ;
264281} ) ;
265282
266283export const layer = Layer . effect ( DesktopRendererHistory , make ( ) ) ;
0 commit comments