@@ -252,19 +252,10 @@ export const make = Effect.gen(function* () {
252252 Effect . suspend ( ( ) => reportEnd ( lifeKey ( target ) , lifeOf ( target ) , reason ) ) ;
253253
254254 const readFailures = new Map < string , number > ( ) ;
255- /** The last sweep's groups, which host change events read from between sweeps . */
255+ /** The last sweep's groups, whose pull requests get host change feeds . */
256256 let currentGroups : ReadonlyArray < WatchGroup > = [ ] ;
257- // A change event can land while the sweep reads the same group.
258- const groupLocks = new Map < string , Semaphore . Semaphore > ( ) ;
259- const locked = < A , E > ( key : string , effect : Effect . Effect < A , E > ) =>
260- Effect . suspend ( ( ) => {
261- let lock = groupLocks . get ( key ) ;
262- if ( lock === undefined ) {
263- lock = Semaphore . makeUnsafe ( 1 ) ;
264- groupLocks . set ( key , lock ) ;
265- }
266- return lock . withPermit ( effect ) ;
267- } ) ;
257+ // A pass reads watches and records new ones, so passes must not overlap.
258+ const passes = Semaphore . makeUnsafe ( 1 ) ;
268259 const lastReads = new Map < string , LastRead > ( ) ;
269260 const threadTails = new Map <
270261 string ,
@@ -596,19 +587,26 @@ export const make = Effect.gen(function* () {
596587 } ) ;
597588 } ) ;
598589
599- const sweep = Effect . gen ( function * ( ) {
590+ /** Every watch, or with `changed`, only that pull request's after its host reported a change. */
591+ // The sweep and change reads each name their own span.
592+ const pass = Effect . fnUntraced ( function * ( changed : string | undefined ) {
600593 const threads = yield * projections . getThreadsWithPullRequests ( ) ;
601594 const targets = threads . flatMap ( ( thread ) =>
602595 visibleThreadPullRequests ( thread . pullRequests ?? [ ] ) . flatMap ( ( link ) =>
603- link . watch === undefined ? [ ] : [ { thread, link, watch : link . watch } ] ,
596+ link . watch === undefined ||
597+ ( changed !== undefined && threadPullRequestKeyOf ( link ) !== changed )
598+ ? [ ]
599+ : [ { thread, link, watch : link . watch } ] ,
604600 ) ,
605601 ) ;
606- const present = new Set ( targets . map ( lifeKey ) ) ;
607- yield * Effect . forEach (
608- [ ...lives ] . filter ( ( [ key ] ) => ! present . has ( key ) ) ,
609- ( [ key , life ] ) => reportEnd ( key , life , "stopped" ) ,
610- { discard : true } ,
611- ) ;
602+ if ( changed === undefined ) {
603+ const present = new Set ( targets . map ( lifeKey ) ) ;
604+ yield * Effect . forEach (
605+ [ ...lives ] . filter ( ( [ key ] ) => ! present . has ( key ) ) ,
606+ ( [ key , life ] ) => reportEnd ( key , life , "stopped" ) ,
607+ { discard : true } ,
608+ ) ;
609+ }
612610 for ( const target of targets ) lifeOf ( target ) ;
613611 const byPullRequest = new Map < string , Array < WatchTarget > > ( ) ;
614612 const ending : Array < readonly [ WatchTarget , WatchEndReason ] > = [ ] ;
@@ -627,9 +625,11 @@ export const make = Effect.gen(function* () {
627625 targets : members ,
628626 fingerprint : [ ...new Set ( members . map ( snapshotFingerprint ) ) ] . toSorted ( ) . join ( "\n" ) ,
629627 } ) ) ;
630- currentGroups = groups ;
631- for ( const cache of [ readFailures , lastReads , threadTails , groupLocks ] ) {
632- for ( const key of cache . keys ( ) ) if ( ! byPullRequest . has ( key ) ) cache . delete ( key ) ;
628+ if ( changed === undefined ) {
629+ currentGroups = groups ;
630+ for ( const cache of [ readFailures , lastReads , threadTails ] ) {
631+ for ( const key of cache . keys ( ) ) if ( ! byPullRequest . has ( key ) ) cache . delete ( key ) ;
632+ }
633633 }
634634 yield * Effect . forEach (
635635 ending ,
@@ -651,12 +651,29 @@ export const make = Effect.gen(function* () {
651651 yield * Effect . forEach (
652652 groups ,
653653 ( group ) =>
654- fingerprintOf ( group ) . pipe (
654+ // The host just reported a change, so a cached fingerprint may predate it.
655+ ( changed === undefined
656+ ? Effect . void
657+ : pullRequests . invalidate ( { reference : referenceOf ( group ) } )
658+ ) . pipe (
659+ Effect . andThen ( fingerprintOf ( group ) ) ,
660+ Effect . tap ( ( fingerprint ) => {
661+ const last = lastReads . get ( group . key ) ;
662+ // Open pull request views refresh only when the host state moved.
663+ return changed !== undefined &&
664+ fingerprint !== null &&
665+ fingerprint !== "paused" &&
666+ ( last === undefined ||
667+ last . status !== fingerprint . status ||
668+ last . remarks !== fingerprint . remarks )
669+ ? pullRequests . invalidate ( { reference : referenceOf ( group ) } , { notifyReaders : true } )
670+ : Effect . void ;
671+ } ) ,
655672 Effect . flatMap ( ( fingerprint ) =>
656673 fingerprint === "paused"
657674 ? Effect . void
658675 : reads . withPermit (
659- locked ( group . key , readGroup ( group , fingerprint ) ) . pipe (
676+ readGroup ( group , fingerprint ) . pipe (
660677 Effect . catchCause (
661678 logFailure ( "pull request watch check failed" , { pullRequest : group . key } ) ,
662679 ) ,
@@ -666,35 +683,20 @@ export const make = Effect.gen(function* () {
666683 ) ,
667684 { concurrency : "unbounded" , discard : true } ,
668685 ) ;
669- } ) . pipe (
686+ } , passes . withPermit ) ;
687+
688+ const sweep = pass ( undefined ) . pipe (
670689 Effect . catchCause ( logFailure ( "pull request watch sweep failed" , { } ) ) ,
671690 Effect . withSpan ( "PullRequestWatchReactor.sweep" ) ,
672691 ) ;
673692
674693 const pullRequestOf = ( group : WatchGroup ) => threadPullRequestKeyOf ( group . targets [ 0 ] ! . link ) ;
675694
676- /** A host event can come from any change, so reread now rather than at the next sweep. */
677- const readOnChange = Effect . fn ( "PullRequestWatchReactor.readOnChange" ) ( function * (
678- pullRequest : string ,
679- ) {
680- const groups = currentGroups . filter ( ( group ) => pullRequestOf ( group ) === pullRequest ) ;
681- yield * Effect . forEach (
682- groups ,
683- ( group ) =>
684- pullRequests . invalidate ( { reference : referenceOf ( group ) } , { notifyReaders : true } ) . pipe (
685- Effect . andThen ( fingerprintOf ( group ) ) ,
686- Effect . flatMap ( ( fingerprint ) =>
687- fingerprint === "paused"
688- ? Effect . void
689- : locked ( group . key , readGroup ( group , fingerprint ) ) . pipe ( Effect . asVoid ) ,
690- ) ,
691- Effect . catchCause (
692- logFailure ( "pull request watch change read failed" , { pullRequest : group . key } ) ,
693- ) ,
694- ) ,
695- { discard : true } ,
695+ const readOnChange = ( pullRequest : string ) =>
696+ pass ( pullRequest ) . pipe (
697+ Effect . catchCause ( logFailure ( "pull request watch change read failed" , { pullRequest } ) ) ,
698+ Effect . withSpan ( "PullRequestWatchReactor.readOnChange" ) ,
696699 ) ;
697- } ) ;
698700
699701 const start : PullRequestWatchReactor [ "Service" ] [ "start" ] = Effect . fn (
700702 "PullRequestWatchReactor.start" ,
0 commit comments