@@ -3,9 +3,8 @@ import { WorkerPoolManager } from "@pierre/diffs/worker";
33import DiffsWorker from "@pierre/diffs/worker/worker.js?worker" ;
44import * as Schema from "effect/Schema" ;
55import { useEffect , useState , useSyncExternalStore , type ReactNode } from "react" ;
6- import { useStableCallback } from "../hooks/useStableCallback" ;
7- import { useRenderedAppearance } from "../hooks/useTheme" ;
8- import { resolveDiffThemeName , type DiffThemeName } from "../lib/diffRendering" ;
6+ import { getRenderedAppearance , subscribeRenderedAppearance } from "../hooks/useTheme" ;
7+ import { resolveDiffThemeName } from "../lib/diffRendering" ;
98import { PREFERRED_HIGHLIGHTER } from "../lib/syntaxHighlighting" ;
109
1110export class DiffWorkerError extends Schema . TaggedError < DiffWorkerError > ( ) ( "DiffWorkerError" , {
@@ -27,71 +26,66 @@ function resolveDiffWorkerPoolSize() {
2726let sharedWorkerPool :
2827 | {
2928 readonly pool : WorkerPoolManager ;
29+ readonly unsubscribeTheme : ( ) => void ;
3030 consumers : number ;
3131 idleTimer : ReturnType < typeof setTimeout > | undefined ;
3232 }
3333 | undefined ;
3434
35- function acquireDiffWorkerPool ( themeName : DiffThemeName , poolSize : number ) {
36- const entry = ( sharedWorkerPool ??= {
37- pool : new WorkerPoolManager (
38- {
39- workerFactory : ( ) => {
40- try {
41- return new DiffsWorker ( ) ;
42- } catch ( cause ) {
43- throw new DiffWorkerError ( { operation : "create-worker" , themeName, cause } ) ;
44- }
45- } ,
46- poolSize,
47- totalASTLRUCacheSize : 240 ,
48- } ,
49- {
50- theme : themeName ,
51- preferredHighlighter : PREFERRED_HIGHLIGHTER ,
52- tokenizeMaxLineLength : 1_000 ,
53- useTokenTransformer : true ,
35+ function applyDiffWorkerTheme ( pool : WorkerPoolManager ) {
36+ const themeName = resolveDiffThemeName ( getRenderedAppearance ( ) ) ;
37+ let operation : DiffWorkerError [ "operation" ] = "get-render-options" ;
38+ void ( async ( ) => {
39+ try {
40+ const current = pool . getDiffRenderOptions ( ) ;
41+ if ( current . theme === themeName ) return ;
42+ operation = "set-render-options" ;
43+ await pool . setRenderOptions ( { ...current , theme : themeName } ) ;
44+ } catch ( cause ) {
45+ console . error ( new DiffWorkerError ( { operation, themeName, cause } ) ) ;
46+ }
47+ } ) ( ) ;
48+ }
49+
50+ // The pool follows the rendered appearance for as long as it lives, so it never depends on a
51+ // mounted provider to carry a theme change across.
52+ function createDiffWorkerPool ( poolSize : number ) {
53+ const themeName = resolveDiffThemeName ( getRenderedAppearance ( ) ) ;
54+ const pool = new WorkerPoolManager (
55+ {
56+ workerFactory : ( ) => {
57+ try {
58+ return new DiffsWorker ( ) ;
59+ } catch ( cause ) {
60+ throw new DiffWorkerError ( { operation : "create-worker" , themeName, cause } ) ;
61+ }
5462 } ,
55- ) ,
63+ poolSize,
64+ totalASTLRUCacheSize : 240 ,
65+ } ,
66+ {
67+ theme : themeName ,
68+ preferredHighlighter : PREFERRED_HIGHLIGHTER ,
69+ tokenizeMaxLineLength : 1_000 ,
70+ useTokenTransformer : true ,
71+ } ,
72+ ) ;
73+ return {
74+ pool,
75+ unsubscribeTheme : subscribeRenderedAppearance ( ( ) => applyDiffWorkerTheme ( pool ) ) ,
5676 consumers : 0 ,
5777 idleTimer : undefined ,
58- } ) ;
78+ } ;
79+ }
80+
81+ function acquireDiffWorkerPool ( poolSize : number ) {
82+ const entry = ( sharedWorkerPool ??= createDiffWorkerPool ( poolSize ) ) ;
5983 clearTimeout ( entry . idleTimer ) ;
6084 entry . idleTimer = undefined ;
6185 entry . consumers += 1 ;
6286 return entry ;
6387}
6488
65- function DiffWorkerThemeSync ( { themeName } : { themeName : DiffThemeName } ) {
66- const workerPool = useWorkerPool ( ) ;
67-
68- useEffect ( ( ) => {
69- if ( ! workerPool ) {
70- return ;
71- }
72-
73- let operation : DiffWorkerError [ "operation" ] = "get-render-options" ;
74- void ( async ( ) => {
75- try {
76- const current = workerPool . getDiffRenderOptions ( ) ;
77- if ( current . theme === themeName ) {
78- return ;
79- }
80-
81- operation = "set-render-options" ;
82- await workerPool . setRenderOptions ( {
83- ...current ,
84- theme : themeName ,
85- } ) ;
86- } catch ( cause ) {
87- console . error ( new DiffWorkerError ( { operation, themeName, cause } ) ) ;
88- }
89- } ) ( ) ;
90- } , [ themeName , workerPool ] ) ;
91-
92- return null ;
93- }
94-
9589// Plain-text views do not queue a highlight task that could retry a blank first render.
9690function DiffWorkerReady ( { children } : { children ?: ReactNode } ) {
9791 const workerPool = useWorkerPool ( ) ;
@@ -125,37 +119,37 @@ function DiffWorkerReady({ children }: { children?: ReactNode }) {
125119 ) ;
126120}
127121
128- export function useDiffWorkerPool ( diffThemeName : DiffThemeName ) {
129- const [ workerPoolSize ] = useState ( resolveDiffWorkerPoolSize ) ;
130- const subscribe = useStableCallback ( ( onStoreChange : ( ) => void ) => {
131- if ( typeof window === "undefined" ) return ( ) => { } ;
132- const entry = acquireDiffWorkerPool ( diffThemeName , workerPoolSize ) ;
133- onStoreChange ( ) ;
134- return ( ) => {
135- entry . consumers -= 1 ;
136- if ( entry . consumers !== 0 ) return ;
137- entry . idleTimer = setTimeout ( ( ) => {
138- entry . idleTimer = undefined ;
139- entry . pool . terminate ( ) ;
140- if ( sharedWorkerPool === entry ) sharedWorkerPool = undefined ;
141- } , DIFF_WORKER_IDLE_TTL_MS ) ;
142- } ;
143- } ) ;
122+ // Module-level so the subscribe identity is stable: a new one would release and reacquire
123+ // the shared pool on every render.
124+ function subscribeSharedWorkerPool ( onStoreChange : ( ) => void ) {
125+ if ( typeof window === "undefined" ) return ( ) => { } ;
126+ const entry = acquireDiffWorkerPool ( resolveDiffWorkerPoolSize ( ) ) ;
127+ onStoreChange ( ) ;
128+ return ( ) => {
129+ entry . consumers -= 1 ;
130+ if ( entry . consumers !== 0 ) return ;
131+ entry . idleTimer = setTimeout ( ( ) => {
132+ entry . idleTimer = undefined ;
133+ entry . unsubscribeTheme ( ) ;
134+ entry . pool . terminate ( ) ;
135+ if ( sharedWorkerPool === entry ) sharedWorkerPool = undefined ;
136+ } , DIFF_WORKER_IDLE_TTL_MS ) ;
137+ } ;
138+ }
139+
140+ export function useDiffWorkerPool ( ) {
144141 return useSyncExternalStore (
145- subscribe ,
142+ subscribeSharedWorkerPool ,
146143 ( ) => sharedWorkerPool ?. pool ,
147144 ( ) => undefined ,
148145 ) ;
149146}
150147
151148export function DiffWorkerPoolProvider ( { children } : { children ?: ReactNode } ) {
152- const resolvedTheme = useRenderedAppearance ( ) ;
153- const diffThemeName = resolveDiffThemeName ( resolvedTheme ) ;
154- const workerPool = useDiffWorkerPool ( diffThemeName ) ;
149+ const workerPool = useDiffWorkerPool ( ) ;
155150
156151 return (
157152 < WorkerPoolContext value = { workerPool } >
158- < DiffWorkerThemeSync themeName = { diffThemeName } />
159153 < DiffWorkerReady > { children } </ DiffWorkerReady >
160154 </ WorkerPoolContext >
161155 ) ;
0 commit comments