Commit 481ff42

Browse files
committed
Fix three code quality/performance bugs
- Remove redundant no-op Effect.map((option) => option) in ProjectionSnapshotQuery.ts - Avoid double enrichment of replay events in ws.ts subscription handler by applying enrichProjectEvent only to live stream events - Memoize selectThreadIdsByProjectId in store.ts to return stable array references and avoid unnecessary React re-renders
1 parent 410dbe8 commit 481ff42

3 files changed

Lines changed: 55 additions & 49 deletions

File tree

‎apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,6 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
748748
"ProjectionSnapshotQuery.getActiveProjectByWorkspaceRoot:decodeRow",
749749
),
750750
),
751-
Effect.map((option)=>option),
752751
Effect.flatMap((option)=>
753752
Option.isNone(option)
754753
? Effect.succeed(Option.none<OrchestrationProject>())

‎apps/server/src/ws.ts‎

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,10 @@ const WsRpcLayer = WsRpcGroup.toLayer(
503503
Effect.catch(()=>Effect.succeed([]asArray<OrchestrationEvent>)),
504504
);
505505
constreplayStream=Stream.fromIterable(replayEvents);
506-
constsource=Stream.merge(replayStream,orchestrationEngine.streamDomainEvents);
506+
constliveStream=orchestrationEngine.streamDomainEvents.pipe(
507+
Stream.mapEffect(enrichProjectEvent),
508+
);
509+
constsource=Stream.merge(replayStream,liveStream);
507510
typeSequenceState={
508511
readonlynextSequence: number;
509512
readonlypendingBySequence: Map<number,OrchestrationEvent>;
@@ -515,43 +518,33 @@ const WsRpcLayer = WsRpcGroup.toLayer(
515518

516519
returnsource.pipe(
517520
Stream.mapEffect((event)=>
518-
enrichProjectEvent(event).pipe(
519-
Effect.flatMap((enrichedEvent)=>
520-
Ref.modify(
521-
state,
522-
({
523-
nextSequence,
524-
pendingBySequence,
525-
}): [Array<OrchestrationEvent>,SequenceState]=>{
526-
if(
527-
enrichedEvent.sequence<nextSequence||
528-
pendingBySequence.has(enrichedEvent.sequence)
529-
){
530-
return[[],{ nextSequence, pendingBySequence }];
531-
}
521+
Ref.modify(
522+
state,
523+
({
524+
nextSequence,
525+
pendingBySequence,
526+
}): [Array<OrchestrationEvent>,SequenceState]=>{
527+
if(event.sequence<nextSequence||pendingBySequence.has(event.sequence)){
528+
return[[],{ nextSequence, pendingBySequence }];
529+
}
532530

533-
constupdatedPending=newMap(pendingBySequence);
534-
updatedPending.set(enrichedEvent.sequence,enrichedEvent);
531+
constupdatedPending=newMap(pendingBySequence);
532+
updatedPending.set(event.sequence,event);
535533

536-
constemit: Array<OrchestrationEvent>=[];
537-
letexpected=nextSequence;
538-
for(;;){
539-
constexpectedEvent=updatedPending.get(expected);
540-
if(!expectedEvent){
541-
break;
542-
}
543-
emit.push(expectedEvent);
544-
updatedPending.delete(expected);
545-
expected+=1;
546-
}
534+
constemit: Array<OrchestrationEvent>=[];
535+
letexpected=nextSequence;
536+
for(;;){
537+
constexpectedEvent=updatedPending.get(expected);
538+
if(!expectedEvent){
539+
break;
540+
}
541+
emit.push(expectedEvent);
542+
updatedPending.delete(expected);
543+
expected+=1;
544+
}
547545

548-
return[
549-
emit,
550-
{nextSequence: expected,pendingBySequence: updatedPending},
551-
];
552-
},
553-
),
554-
),
546+
return[emit,{nextSequence: expected,pendingBySequence: updatedPending}];
547+
},
555548
),
556549
),
557550
Stream.flatMap((events)=>Stream.fromIterable(events)),

‎apps/web/src/store.ts‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,21 +1305,35 @@ export const selectSidebarThreadSummaryById =
13051305
]
13061306
: undefined;
13071307

1308+
const_threadIdsByProjectCache=newMap<
1309+
string,
1310+
{scopedIds: string[];sidebarMap: Record<string,SidebarThreadSummary>;result: ThreadId[]}
1311+
>();
1312+
13081313
exportconstselectThreadIdsByProjectId=
13091314
(projectId: ProjectId|null|undefined)=>
1310-
(state: AppState): ThreadId[]=>
1311-
projectId
1312-
? (
1313-
state.threadScopedIdsByProjectScopedId[
1314-
getProjectScopedId({
1315-
environmentId: state.activeEnvironmentId,
1316-
id: projectId,
1317-
})
1318-
]??EMPTY_SCOPED_IDS
1319-
)
1320-
.map((scopedId)=>state.sidebarThreadsByScopedId[scopedId]?.id??null)
1321-
.filter((threadId): threadId is ThreadId=>threadId!==null)
1322-
: EMPTY_THREAD_IDS;
1315+
(state: AppState): ThreadId[]=>{
1316+
if(!projectId)returnEMPTY_THREAD_IDS;
1317+
1318+
constprojectScopedId=getProjectScopedId({
1319+
environmentId: state.activeEnvironmentId,
1320+
id: projectId,
1321+
});
1322+
constscopedIds=state.threadScopedIdsByProjectScopedId[projectScopedId]??EMPTY_SCOPED_IDS;
1323+
constsidebarMap=state.sidebarThreadsByScopedId;
1324+
1325+
constcached=_threadIdsByProjectCache.get(projectScopedId);
1326+
if(cached&&cached.scopedIds===scopedIds&&cached.sidebarMap===sidebarMap){
1327+
returncached.result;
1328+
}
1329+
1330+
constresult=scopedIds
1331+
.map((scopedId)=>sidebarMap[scopedId]?.id??null)
1332+
.filter((threadId): threadId is ThreadId=>threadId!==null);
1333+
1334+
_threadIdsByProjectCache.set(projectScopedId,{ scopedIds, sidebarMap, result });
1335+
returnresult;
1336+
};
13231337

13241338
exportfunctionsetError(state: AppState,threadId: ThreadId,error: string|null): AppState{
13251339
returnupdateThreadState(state,state.activeEnvironmentId,threadId,(t)=>{

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit 481ff42

Browse files
committed
Fix three code quality/performance bugs
- Remove redundant no-op Effect.map((option) => option) in ProjectionSnapshotQuery.ts - Avoid double enrichment of replay events in ws.ts subscription handler by applying enrichProjectEvent only to live stream events - Memoize selectThreadIdsByProjectId in store.ts to return stable array references and avoid unnecessary React re-renders
1 parent 410dbe8 commit 481ff42

3 files changed

Lines changed: 55 additions & 49 deletions

File tree

‎apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,6 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
748748
"ProjectionSnapshotQuery.getActiveProjectByWorkspaceRoot:decodeRow",
749749
),
750750
),
751-
Effect.map((option)=>option),
752751
Effect.flatMap((option)=>
753752
Option.isNone(option)
754753
? Effect.succeed(Option.none<OrchestrationProject>())

‎apps/server/src/ws.ts‎

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,10 @@ const WsRpcLayer = WsRpcGroup.toLayer(
503503
Effect.catch(()=>Effect.succeed([]asArray<OrchestrationEvent>)),
504504
);
505505
constreplayStream=Stream.fromIterable(replayEvents);
506-
constsource=Stream.merge(replayStream,orchestrationEngine.streamDomainEvents);
506+
constliveStream=orchestrationEngine.streamDomainEvents.pipe(
507+
Stream.mapEffect(enrichProjectEvent),
508+
);
509+
constsource=Stream.merge(replayStream,liveStream);
507510
typeSequenceState={
508511
readonlynextSequence: number;
509512
readonlypendingBySequence: Map<number,OrchestrationEvent>;
@@ -515,43 +518,33 @@ const WsRpcLayer = WsRpcGroup.toLayer(
515518

516519
returnsource.pipe(
517520
Stream.mapEffect((event)=>
518-
enrichProjectEvent(event).pipe(
519-
Effect.flatMap((enrichedEvent)=>
520-
Ref.modify(
521-
state,
522-
({
523-
nextSequence,
524-
pendingBySequence,
525-
}): [Array<OrchestrationEvent>,SequenceState]=>{
526-
if(
527-
enrichedEvent.sequence<nextSequence||
528-
pendingBySequence.has(enrichedEvent.sequence)
529-
){
530-
return[[],{ nextSequence, pendingBySequence }];
531-
}
521+
Ref.modify(
522+
state,
523+
({
524+
nextSequence,
525+
pendingBySequence,
526+
}): [Array<OrchestrationEvent>,SequenceState]=>{
527+
if(event.sequence<nextSequence||pendingBySequence.has(event.sequence)){
528+
return[[],{ nextSequence, pendingBySequence }];
529+
}
532530

533-
constupdatedPending=newMap(pendingBySequence);
534-
updatedPending.set(enrichedEvent.sequence,enrichedEvent);
531+
constupdatedPending=newMap(pendingBySequence);
532+
updatedPending.set(event.sequence,event);
535533

536-
constemit: Array<OrchestrationEvent>=[];
537-
letexpected=nextSequence;
538-
for(;;){
539-
constexpectedEvent=updatedPending.get(expected);
540-
if(!expectedEvent){
541-
break;
542-
}
543-
emit.push(expectedEvent);
544-
updatedPending.delete(expected);
545-
expected+=1;
546-
}
534+
constemit: Array<OrchestrationEvent>=[];
535+
letexpected=nextSequence;
536+
for(;;){
537+
constexpectedEvent=updatedPending.get(expected);
538+
if(!expectedEvent){
539+
break;
540+
}
541+
emit.push(expectedEvent);
542+
updatedPending.delete(expected);
543+
expected+=1;
544+
}
547545

548-
return[
549-
emit,
550-
{nextSequence: expected,pendingBySequence: updatedPending},
551-
];
552-
},
553-
),
554-
),
546+
return[emit,{nextSequence: expected,pendingBySequence: updatedPending}];
547+
},
555548
),
556549
),
557550
Stream.flatMap((events)=>Stream.fromIterable(events)),

‎apps/web/src/store.ts‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,21 +1305,35 @@ export const selectSidebarThreadSummaryById =
13051305
]
13061306
: undefined;
13071307

1308+
const_threadIdsByProjectCache=newMap<
1309+
string,
1310+
{scopedIds: string[];sidebarMap: Record<string,SidebarThreadSummary>;result: ThreadId[]}
1311+
>();
1312+
13081313
exportconstselectThreadIdsByProjectId=
13091314
(projectId: ProjectId|null|undefined)=>
1310-
(state: AppState): ThreadId[]=>
1311-
projectId
1312-
? (
1313-
state.threadScopedIdsByProjectScopedId[
1314-
getProjectScopedId({
1315-
environmentId: state.activeEnvironmentId,
1316-
id: projectId,
1317-
})
1318-
]??EMPTY_SCOPED_IDS
1319-
)
1320-
.map((scopedId)=>state.sidebarThreadsByScopedId[scopedId]?.id??null)
1321-
.filter((threadId): threadId is ThreadId=>threadId!==null)
1322-
: EMPTY_THREAD_IDS;
1315+
(state: AppState): ThreadId[]=>{
1316+
if(!projectId)returnEMPTY_THREAD_IDS;
1317+
1318+
constprojectScopedId=getProjectScopedId({
1319+
environmentId: state.activeEnvironmentId,
1320+
id: projectId,
1321+
});
1322+
constscopedIds=state.threadScopedIdsByProjectScopedId[projectScopedId]??EMPTY_SCOPED_IDS;
1323+
constsidebarMap=state.sidebarThreadsByScopedId;
1324+
1325+
constcached=_threadIdsByProjectCache.get(projectScopedId);
1326+
if(cached&&cached.scopedIds===scopedIds&&cached.sidebarMap===sidebarMap){
1327+
returncached.result;
1328+
}
1329+
1330+
constresult=scopedIds
1331+
.map((scopedId)=>sidebarMap[scopedId]?.id??null)
1332+
.filter((threadId): threadId is ThreadId=>threadId!==null);
1333+
1334+
_threadIdsByProjectCache.set(projectScopedId,{ scopedIds, sidebarMap, result });
1335+
returnresult;
1336+
};
13231337

13241338
exportfunctionsetError(state: AppState,threadId: ThreadId,error: string|null): AppState{
13251339
returnupdateThreadState(state,state.activeEnvironmentId,threadId,(t)=>{

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 481ff42

Browse files
committed
Fix three code quality/performance bugs
- Remove redundant no-op Effect.map((option) => option) in ProjectionSnapshotQuery.ts - Avoid double enrichment of replay events in ws.ts subscription handler by applying enrichProjectEvent only to live stream events - Memoize selectThreadIdsByProjectId in store.ts to return stable array references and avoid unnecessary React re-renders
1 parent 410dbe8 commit 481ff42

3 files changed

Lines changed: 55 additions & 49 deletions

File tree

‎apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,6 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
748748
"ProjectionSnapshotQuery.getActiveProjectByWorkspaceRoot:decodeRow",
749749
),
750750
),
751-
Effect.map((option)=>option),
752751
Effect.flatMap((option)=>
753752
Option.isNone(option)
754753
? Effect.succeed(Option.none<OrchestrationProject>())

‎apps/server/src/ws.ts‎

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,10 @@ const WsRpcLayer = WsRpcGroup.toLayer(
503503
Effect.catch(()=>Effect.succeed([]asArray<OrchestrationEvent>)),
504504
);
505505
constreplayStream=Stream.fromIterable(replayEvents);
506-
constsource=Stream.merge(replayStream,orchestrationEngine.streamDomainEvents);
506+
constliveStream=orchestrationEngine.streamDomainEvents.pipe(
507+
Stream.mapEffect(enrichProjectEvent),
508+
);
509+
constsource=Stream.merge(replayStream,liveStream);
507510
typeSequenceState={
508511
readonlynextSequence: number;
509512
readonlypendingBySequence: Map<number,OrchestrationEvent>;
@@ -515,43 +518,33 @@ const WsRpcLayer = WsRpcGroup.toLayer(
515518

516519
returnsource.pipe(
517520
Stream.mapEffect((event)=>
518-
enrichProjectEvent(event).pipe(
519-
Effect.flatMap((enrichedEvent)=>
520-
Ref.modify(
521-
state,
522-
({
523-
nextSequence,
524-
pendingBySequence,
525-
}): [Array<OrchestrationEvent>,SequenceState]=>{
526-
if(
527-
enrichedEvent.sequence<nextSequence||
528-
pendingBySequence.has(enrichedEvent.sequence)
529-
){
530-
return[[],{ nextSequence, pendingBySequence }];
531-
}
521+
Ref.modify(
522+
state,
523+
({
524+
nextSequence,
525+
pendingBySequence,
526+
}): [Array<OrchestrationEvent>,SequenceState]=>{
527+
if(event.sequence<nextSequence||pendingBySequence.has(event.sequence)){
528+
return[[],{ nextSequence, pendingBySequence }];
529+
}
532530

533-
constupdatedPending=newMap(pendingBySequence);
534-
updatedPending.set(enrichedEvent.sequence,enrichedEvent);
531+
constupdatedPending=newMap(pendingBySequence);
532+
updatedPending.set(event.sequence,event);
535533

536-
constemit: Array<OrchestrationEvent>=[];
537-
letexpected=nextSequence;
538-
for(;;){
539-
constexpectedEvent=updatedPending.get(expected);
540-
if(!expectedEvent){
541-
break;
542-
}
543-
emit.push(expectedEvent);
544-
updatedPending.delete(expected);
545-
expected+=1;
546-
}
534+
constemit: Array<OrchestrationEvent>=[];
535+
letexpected=nextSequence;
536+
for(;;){
537+
constexpectedEvent=updatedPending.get(expected);
538+
if(!expectedEvent){
539+
break;
540+
}
541+
emit.push(expectedEvent);
542+
updatedPending.delete(expected);
543+
expected+=1;
544+
}
547545

548-
return[
549-
emit,
550-
{nextSequence: expected,pendingBySequence: updatedPending},
551-
];
552-
},
553-
),
554-
),
546+
return[emit,{nextSequence: expected,pendingBySequence: updatedPending}];
547+
},
555548
),
556549
),
557550
Stream.flatMap((events)=>Stream.fromIterable(events)),

‎apps/web/src/store.ts‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,21 +1305,35 @@ export const selectSidebarThreadSummaryById =
13051305
]
13061306
: undefined;
13071307

1308+
const_threadIdsByProjectCache=newMap<
1309+
string,
1310+
{scopedIds: string[];sidebarMap: Record<string,SidebarThreadSummary>;result: ThreadId[]}
1311+
>();
1312+
13081313
exportconstselectThreadIdsByProjectId=
13091314
(projectId: ProjectId|null|undefined)=>
1310-
(state: AppState): ThreadId[]=>
1311-
projectId
1312-
? (
1313-
state.threadScopedIdsByProjectScopedId[
1314-
getProjectScopedId({
1315-
environmentId: state.activeEnvironmentId,
1316-
id: projectId,
1317-
})
1318-
]??EMPTY_SCOPED_IDS
1319-
)
1320-
.map((scopedId)=>state.sidebarThreadsByScopedId[scopedId]?.id??null)
1321-
.filter((threadId): threadId is ThreadId=>threadId!==null)
1322-
: EMPTY_THREAD_IDS;
1315+
(state: AppState): ThreadId[]=>{
1316+
if(!projectId)returnEMPTY_THREAD_IDS;
1317+
1318+
constprojectScopedId=getProjectScopedId({
1319+
environmentId: state.activeEnvironmentId,
1320+
id: projectId,
1321+
});
1322+
constscopedIds=state.threadScopedIdsByProjectScopedId[projectScopedId]??EMPTY_SCOPED_IDS;
1323+
constsidebarMap=state.sidebarThreadsByScopedId;
1324+
1325+
constcached=_threadIdsByProjectCache.get(projectScopedId);
1326+
if(cached&&cached.scopedIds===scopedIds&&cached.sidebarMap===sidebarMap){
1327+
returncached.result;
1328+
}
1329+
1330+
constresult=scopedIds
1331+
.map((scopedId)=>sidebarMap[scopedId]?.id??null)
1332+
.filter((threadId): threadId is ThreadId=>threadId!==null);
1333+
1334+
_threadIdsByProjectCache.set(projectScopedId,{ scopedIds, sidebarMap, result });
1335+
returnresult;
1336+
};
13231337

13241338
exportfunctionsetError(state: AppState,threadId: ThreadId,error: string|null): AppState{
13251339
returnupdateThreadState(state,state.activeEnvironmentId,threadId,(t)=>{

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 481ff42

Browse files
committed
Fix three code quality/performance bugs
- Remove redundant no-op Effect.map((option) => option) in ProjectionSnapshotQuery.ts - Avoid double enrichment of replay events in ws.ts subscription handler by applying enrichProjectEvent only to live stream events - Memoize selectThreadIdsByProjectId in store.ts to return stable array references and avoid unnecessary React re-renders
1 parent 410dbe8 commit 481ff42

3 files changed

Lines changed: 55 additions & 49 deletions

File tree

‎apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,6 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
748748
"ProjectionSnapshotQuery.getActiveProjectByWorkspaceRoot:decodeRow",
749749
),
750750
),
751-
Effect.map((option)=>option),
752751
Effect.flatMap((option)=>
753752
Option.isNone(option)
754753
? Effect.succeed(Option.none<OrchestrationProject>())

‎apps/server/src/ws.ts‎

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,10 @@ const WsRpcLayer = WsRpcGroup.toLayer(
503503
Effect.catch(()=>Effect.succeed([]asArray<OrchestrationEvent>)),
504504
);
505505
constreplayStream=Stream.fromIterable(replayEvents);
506-
constsource=Stream.merge(replayStream,orchestrationEngine.streamDomainEvents);
506+
constliveStream=orchestrationEngine.streamDomainEvents.pipe(
507+
Stream.mapEffect(enrichProjectEvent),
508+
);
509+
constsource=Stream.merge(replayStream,liveStream);
507510
typeSequenceState={
508511
readonlynextSequence: number;
509512
readonlypendingBySequence: Map<number,OrchestrationEvent>;
@@ -515,43 +518,33 @@ const WsRpcLayer = WsRpcGroup.toLayer(
515518

516519
returnsource.pipe(
517520
Stream.mapEffect((event)=>
518-
enrichProjectEvent(event).pipe(
519-
Effect.flatMap((enrichedEvent)=>
520-
Ref.modify(
521-
state,
522-
({
523-
nextSequence,
524-
pendingBySequence,
525-
}): [Array<OrchestrationEvent>,SequenceState]=>{
526-
if(
527-
enrichedEvent.sequence<nextSequence||
528-
pendingBySequence.has(enrichedEvent.sequence)
529-
){
530-
return[[],{ nextSequence, pendingBySequence }];
531-
}
521+
Ref.modify(
522+
state,
523+
({
524+
nextSequence,
525+
pendingBySequence,
526+
}): [Array<OrchestrationEvent>,SequenceState]=>{
527+
if(event.sequence<nextSequence||pendingBySequence.has(event.sequence)){
528+
return[[],{ nextSequence, pendingBySequence }];
529+
}
532530

533-
constupdatedPending=newMap(pendingBySequence);
534-
updatedPending.set(enrichedEvent.sequence,enrichedEvent);
531+
constupdatedPending=newMap(pendingBySequence);
532+
updatedPending.set(event.sequence,event);
535533

536-
constemit: Array<OrchestrationEvent>=[];
537-
letexpected=nextSequence;
538-
for(;;){
539-
constexpectedEvent=updatedPending.get(expected);
540-
if(!expectedEvent){
541-
break;
542-
}
543-
emit.push(expectedEvent);
544-
updatedPending.delete(expected);
545-
expected+=1;
546-
}
534+
constemit: Array<OrchestrationEvent>=[];
535+
letexpected=nextSequence;
536+
for(;;){
537+
constexpectedEvent=updatedPending.get(expected);
538+
if(!expectedEvent){
539+
break;
540+
}
541+
emit.push(expectedEvent);
542+
updatedPending.delete(expected);
543+
expected+=1;
544+
}
547545

548-
return[
549-
emit,
550-
{nextSequence: expected,pendingBySequence: updatedPending},
551-
];
552-
},
553-
),
554-
),
546+
return[emit,{nextSequence: expected,pendingBySequence: updatedPending}];
547+
},
555548
),
556549
),
557550
Stream.flatMap((events)=>Stream.fromIterable(events)),

‎apps/web/src/store.ts‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,21 +1305,35 @@ export const selectSidebarThreadSummaryById =
13051305
]
13061306
: undefined;
13071307

1308+
const_threadIdsByProjectCache=newMap<
1309+
string,
1310+
{scopedIds: string[];sidebarMap: Record<string,SidebarThreadSummary>;result: ThreadId[]}
1311+
>();
1312+
13081313
exportconstselectThreadIdsByProjectId=
13091314
(projectId: ProjectId|null|undefined)=>
1310-
(state: AppState): ThreadId[]=>
1311-
projectId
1312-
? (
1313-
state.threadScopedIdsByProjectScopedId[
1314-
getProjectScopedId({
1315-
environmentId: state.activeEnvironmentId,
1316-
id: projectId,
1317-
})
1318-
]??EMPTY_SCOPED_IDS
1319-
)
1320-
.map((scopedId)=>state.sidebarThreadsByScopedId[scopedId]?.id??null)
1321-
.filter((threadId): threadId is ThreadId=>threadId!==null)
1322-
: EMPTY_THREAD_IDS;
1315+
(state: AppState): ThreadId[]=>{
1316+
if(!projectId)returnEMPTY_THREAD_IDS;
1317+
1318+
constprojectScopedId=getProjectScopedId({
1319+
environmentId: state.activeEnvironmentId,
1320+
id: projectId,
1321+
});
1322+
constscopedIds=state.threadScopedIdsByProjectScopedId[projectScopedId]??EMPTY_SCOPED_IDS;
1323+
constsidebarMap=state.sidebarThreadsByScopedId;
1324+
1325+
constcached=_threadIdsByProjectCache.get(projectScopedId);
1326+
if(cached&&cached.scopedIds===scopedIds&&cached.sidebarMap===sidebarMap){
1327+
returncached.result;
1328+
}
1329+
1330+
constresult=scopedIds
1331+
.map((scopedId)=>sidebarMap[scopedId]?.id??null)
1332+
.filter((threadId): threadId is ThreadId=>threadId!==null);
1333+
1334+
_threadIdsByProjectCache.set(projectScopedId,{ scopedIds, sidebarMap, result });
1335+
returnresult;
1336+
};
13231337

13241338
exportfunctionsetError(state: AppState,threadId: ThreadId,error: string|null): AppState{
13251339
returnupdateThreadState(state,state.activeEnvironmentId,threadId,(t)=>{

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit 481ff42

Browse files
committed
Fix three code quality/performance bugs
- Remove redundant no-op Effect.map((option) => option) in ProjectionSnapshotQuery.ts - Avoid double enrichment of replay events in ws.ts subscription handler by applying enrichProjectEvent only to live stream events - Memoize selectThreadIdsByProjectId in store.ts to return stable array references and avoid unnecessary React re-renders
1 parent 410dbe8 commit 481ff42

3 files changed

Lines changed: 55 additions & 49 deletions

File tree

‎apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,6 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
748748
"ProjectionSnapshotQuery.getActiveProjectByWorkspaceRoot:decodeRow",
749749
),
750750
),
751-
Effect.map((option)=>option),
752751
Effect.flatMap((option)=>
753752
Option.isNone(option)
754753
? Effect.succeed(Option.none<OrchestrationProject>())

‎apps/server/src/ws.ts‎

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,10 @@ const WsRpcLayer = WsRpcGroup.toLayer(
503503
Effect.catch(()=>Effect.succeed([]asArray<OrchestrationEvent>)),
504504
);
505505
constreplayStream=Stream.fromIterable(replayEvents);
506-
constsource=Stream.merge(replayStream,orchestrationEngine.streamDomainEvents);
506+
constliveStream=orchestrationEngine.streamDomainEvents.pipe(
507+
Stream.mapEffect(enrichProjectEvent),
508+
);
509+
constsource=Stream.merge(replayStream,liveStream);
507510
typeSequenceState={
508511
readonlynextSequence: number;
509512
readonlypendingBySequence: Map<number,OrchestrationEvent>;
@@ -515,43 +518,33 @@ const WsRpcLayer = WsRpcGroup.toLayer(
515518

516519
returnsource.pipe(
517520
Stream.mapEffect((event)=>
518-
enrichProjectEvent(event).pipe(
519-
Effect.flatMap((enrichedEvent)=>
520-
Ref.modify(
521-
state,
522-
({
523-
nextSequence,
524-
pendingBySequence,
525-
}): [Array<OrchestrationEvent>,SequenceState]=>{
526-
if(
527-
enrichedEvent.sequence<nextSequence||
528-
pendingBySequence.has(enrichedEvent.sequence)
529-
){
530-
return[[],{ nextSequence, pendingBySequence }];
531-
}
521+
Ref.modify(
522+
state,
523+
({
524+
nextSequence,
525+
pendingBySequence,
526+
}): [Array<OrchestrationEvent>,SequenceState]=>{
527+
if(event.sequence<nextSequence||pendingBySequence.has(event.sequence)){
528+
return[[],{ nextSequence, pendingBySequence }];
529+
}
532530

533-
constupdatedPending=newMap(pendingBySequence);
534-
updatedPending.set(enrichedEvent.sequence,enrichedEvent);
531+
constupdatedPending=newMap(pendingBySequence);
532+
updatedPending.set(event.sequence,event);
535533

536-
constemit: Array<OrchestrationEvent>=[];
537-
letexpected=nextSequence;
538-
for(;;){
539-
constexpectedEvent=updatedPending.get(expected);
540-
if(!expectedEvent){
541-
break;
542-
}
543-
emit.push(expectedEvent);
544-
updatedPending.delete(expected);
545-
expected+=1;
546-
}
534+
constemit: Array<OrchestrationEvent>=[];
535+
letexpected=nextSequence;
536+
for(;;){
537+
constexpectedEvent=updatedPending.get(expected);
538+
if(!expectedEvent){
539+
break;
540+
}
541+
emit.push(expectedEvent);
542+
updatedPending.delete(expected);
543+
expected+=1;
544+
}
547545

548-
return[
549-
emit,
550-
{nextSequence: expected,pendingBySequence: updatedPending},
551-
];
552-
},
553-
),
554-
),
546+
return[emit,{nextSequence: expected,pendingBySequence: updatedPending}];
547+
},
555548
),
556549
),
557550
Stream.flatMap((events)=>Stream.fromIterable(events)),

‎apps/web/src/store.ts‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,21 +1305,35 @@ export const selectSidebarThreadSummaryById =
13051305
]
13061306
: undefined;
13071307

1308+
const_threadIdsByProjectCache=newMap<
1309+
string,
1310+
{scopedIds: string[];sidebarMap: Record<string,SidebarThreadSummary>;result: ThreadId[]}
1311+
>();
1312+
13081313
exportconstselectThreadIdsByProjectId=
13091314
(projectId: ProjectId|null|undefined)=>
1310-
(state: AppState): ThreadId[]=>
1311-
projectId
1312-
? (
1313-
state.threadScopedIdsByProjectScopedId[
1314-
getProjectScopedId({
1315-
environmentId: state.activeEnvironmentId,
1316-
id: projectId,
1317-
})
1318-
]??EMPTY_SCOPED_IDS
1319-
)
1320-
.map((scopedId)=>state.sidebarThreadsByScopedId[scopedId]?.id??null)
1321-
.filter((threadId): threadId is ThreadId=>threadId!==null)
1322-
: EMPTY_THREAD_IDS;
1315+
(state: AppState): ThreadId[]=>{
1316+
if(!projectId)returnEMPTY_THREAD_IDS;
1317+
1318+
constprojectScopedId=getProjectScopedId({
1319+
environmentId: state.activeEnvironmentId,
1320+
id: projectId,
1321+
});
1322+
constscopedIds=state.threadScopedIdsByProjectScopedId[projectScopedId]??EMPTY_SCOPED_IDS;
1323+
constsidebarMap=state.sidebarThreadsByScopedId;
1324+
1325+
constcached=_threadIdsByProjectCache.get(projectScopedId);
1326+
if(cached&&cached.scopedIds===scopedIds&&cached.sidebarMap===sidebarMap){
1327+
returncached.result;
1328+
}
1329+
1330+
constresult=scopedIds
1331+
.map((scopedId)=>sidebarMap[scopedId]?.id??null)
1332+
.filter((threadId): threadId is ThreadId=>threadId!==null);
1333+
1334+
_threadIdsByProjectCache.set(projectScopedId,{ scopedIds, sidebarMap, result });
1335+
returnresult;
1336+
};
13231337

13241338
exportfunctionsetError(state: AppState,threadId: ThreadId,error: string|null): AppState{
13251339
returnupdateThreadState(state,state.activeEnvironmentId,threadId,(t)=>{

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 481ff42

Browse files
committed
Fix three code quality/performance bugs
- Remove redundant no-op Effect.map((option) => option) in ProjectionSnapshotQuery.ts - Avoid double enrichment of replay events in ws.ts subscription handler by applying enrichProjectEvent only to live stream events - Memoize selectThreadIdsByProjectId in store.ts to return stable array references and avoid unnecessary React re-renders
1 parent 410dbe8 commit 481ff42

3 files changed

Lines changed: 55 additions & 49 deletions

File tree

‎apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,6 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
748748
"ProjectionSnapshotQuery.getActiveProjectByWorkspaceRoot:decodeRow",
749749
),
750750
),
751-
Effect.map((option)=>option),
752751
Effect.flatMap((option)=>
753752
Option.isNone(option)
754753
? Effect.succeed(Option.none<OrchestrationProject>())

‎apps/server/src/ws.ts‎

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,10 @@ const WsRpcLayer = WsRpcGroup.toLayer(
503503
Effect.catch(()=>Effect.succeed([]asArray<OrchestrationEvent>)),
504504
);
505505
constreplayStream=Stream.fromIterable(replayEvents);
506-
constsource=Stream.merge(replayStream,orchestrationEngine.streamDomainEvents);
506+
constliveStream=orchestrationEngine.streamDomainEvents.pipe(
507+
Stream.mapEffect(enrichProjectEvent),
508+
);
509+
constsource=Stream.merge(replayStream,liveStream);
507510
typeSequenceState={
508511
readonlynextSequence: number;
509512
readonlypendingBySequence: Map<number,OrchestrationEvent>;
@@ -515,43 +518,33 @@ const WsRpcLayer = WsRpcGroup.toLayer(
515518

516519
returnsource.pipe(
517520
Stream.mapEffect((event)=>
518-
enrichProjectEvent(event).pipe(
519-
Effect.flatMap((enrichedEvent)=>
520-
Ref.modify(
521-
state,
522-
({
523-
nextSequence,
524-
pendingBySequence,
525-
}): [Array<OrchestrationEvent>,SequenceState]=>{
526-
if(
527-
enrichedEvent.sequence<nextSequence||
528-
pendingBySequence.has(enrichedEvent.sequence)
529-
){
530-
return[[],{ nextSequence, pendingBySequence }];
531-
}
521+
Ref.modify(
522+
state,
523+
({
524+
nextSequence,
525+
pendingBySequence,
526+
}): [Array<OrchestrationEvent>,SequenceState]=>{
527+
if(event.sequence<nextSequence||pendingBySequence.has(event.sequence)){
528+
return[[],{ nextSequence, pendingBySequence }];
529+
}
532530

533-
constupdatedPending=newMap(pendingBySequence);
534-
updatedPending.set(enrichedEvent.sequence,enrichedEvent);
531+
constupdatedPending=newMap(pendingBySequence);
532+
updatedPending.set(event.sequence,event);
535533

536-
constemit: Array<OrchestrationEvent>=[];
537-
letexpected=nextSequence;
538-
for(;;){
539-
constexpectedEvent=updatedPending.get(expected);
540-
if(!expectedEvent){
541-
break;
542-
}
543-
emit.push(expectedEvent);
544-
updatedPending.delete(expected);
545-
expected+=1;
546-
}
534+
constemit: Array<OrchestrationEvent>=[];
535+
letexpected=nextSequence;
536+
for(;;){
537+
constexpectedEvent=updatedPending.get(expected);
538+
if(!expectedEvent){
539+
break;
540+
}
541+
emit.push(expectedEvent);
542+
updatedPending.delete(expected);
543+
expected+=1;
544+
}
547545

548-
return[
549-
emit,
550-
{nextSequence: expected,pendingBySequence: updatedPending},
551-
];
552-
},
553-
),
554-
),
546+
return[emit,{nextSequence: expected,pendingBySequence: updatedPending}];
547+
},
555548
),
556549
),
557550
Stream.flatMap((events)=>Stream.fromIterable(events)),

‎apps/web/src/store.ts‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,21 +1305,35 @@ export const selectSidebarThreadSummaryById =
13051305
]
13061306
: undefined;
13071307

1308+
const_threadIdsByProjectCache=newMap<
1309+
string,
1310+
{scopedIds: string[];sidebarMap: Record<string,SidebarThreadSummary>;result: ThreadId[]}
1311+
>();
1312+
13081313
exportconstselectThreadIdsByProjectId=
13091314
(projectId: ProjectId|null|undefined)=>
1310-
(state: AppState): ThreadId[]=>
1311-
projectId
1312-
? (
1313-
state.threadScopedIdsByProjectScopedId[
1314-
getProjectScopedId({
1315-
environmentId: state.activeEnvironmentId,
1316-
id: projectId,
1317-
})
1318-
]??EMPTY_SCOPED_IDS
1319-
)
1320-
.map((scopedId)=>state.sidebarThreadsByScopedId[scopedId]?.id??null)
1321-
.filter((threadId): threadId is ThreadId=>threadId!==null)
1322-
: EMPTY_THREAD_IDS;
1315+
(state: AppState): ThreadId[]=>{
1316+
if(!projectId)returnEMPTY_THREAD_IDS;
1317+
1318+
constprojectScopedId=getProjectScopedId({
1319+
environmentId: state.activeEnvironmentId,
1320+
id: projectId,
1321+
});
1322+
constscopedIds=state.threadScopedIdsByProjectScopedId[projectScopedId]??EMPTY_SCOPED_IDS;
1323+
constsidebarMap=state.sidebarThreadsByScopedId;
1324+
1325+
constcached=_threadIdsByProjectCache.get(projectScopedId);
1326+
if(cached&&cached.scopedIds===scopedIds&&cached.sidebarMap===sidebarMap){
1327+
returncached.result;
1328+
}
1329+
1330+
constresult=scopedIds
1331+
.map((scopedId)=>sidebarMap[scopedId]?.id??null)
1332+
.filter((threadId): threadId is ThreadId=>threadId!==null);
1333+
1334+
_threadIdsByProjectCache.set(projectScopedId,{ scopedIds, sidebarMap, result });
1335+
returnresult;
1336+
};
13231337

13241338
exportfunctionsetError(state: AppState,threadId: ThreadId,error: string|null): AppState{
13251339
returnupdateThreadState(state,state.activeEnvironmentId,threadId,(t)=>{

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 481ff42

Browse files
committed
Fix three code quality/performance bugs
- Remove redundant no-op Effect.map((option) => option) in ProjectionSnapshotQuery.ts - Avoid double enrichment of replay events in ws.ts subscription handler by applying enrichProjectEvent only to live stream events - Memoize selectThreadIdsByProjectId in store.ts to return stable array references and avoid unnecessary React re-renders
1 parent 410dbe8 commit 481ff42

3 files changed

Lines changed: 55 additions & 49 deletions

File tree

‎apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,6 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
748748
"ProjectionSnapshotQuery.getActiveProjectByWorkspaceRoot:decodeRow",
749749
),
750750
),
751-
Effect.map((option)=>option),
752751
Effect.flatMap((option)=>
753752
Option.isNone(option)
754753
? Effect.succeed(Option.none<OrchestrationProject>())

‎apps/server/src/ws.ts‎

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,10 @@ const WsRpcLayer = WsRpcGroup.toLayer(
503503
Effect.catch(()=>Effect.succeed([]asArray<OrchestrationEvent>)),
504504
);
505505
constreplayStream=Stream.fromIterable(replayEvents);
506-
constsource=Stream.merge(replayStream,orchestrationEngine.streamDomainEvents);
506+
constliveStream=orchestrationEngine.streamDomainEvents.pipe(
507+
Stream.mapEffect(enrichProjectEvent),
508+
);
509+
constsource=Stream.merge(replayStream,liveStream);
507510
typeSequenceState={
508511
readonlynextSequence: number;
509512
readonlypendingBySequence: Map<number,OrchestrationEvent>;
@@ -515,43 +518,33 @@ const WsRpcLayer = WsRpcGroup.toLayer(
515518

516519
returnsource.pipe(
517520
Stream.mapEffect((event)=>
518-
enrichProjectEvent(event).pipe(
519-
Effect.flatMap((enrichedEvent)=>
520-
Ref.modify(
521-
state,
522-
({
523-
nextSequence,
524-
pendingBySequence,
525-
}): [Array<OrchestrationEvent>,SequenceState]=>{
526-
if(
527-
enrichedEvent.sequence<nextSequence||
528-
pendingBySequence.has(enrichedEvent.sequence)
529-
){
530-
return[[],{ nextSequence, pendingBySequence }];
531-
}
521+
Ref.modify(
522+
state,
523+
({
524+
nextSequence,
525+
pendingBySequence,
526+
}): [Array<OrchestrationEvent>,SequenceState]=>{
527+
if(event.sequence<nextSequence||pendingBySequence.has(event.sequence)){
528+
return[[],{ nextSequence, pendingBySequence }];
529+
}
532530

533-
constupdatedPending=newMap(pendingBySequence);
534-
updatedPending.set(enrichedEvent.sequence,enrichedEvent);
531+
constupdatedPending=newMap(pendingBySequence);
532+
updatedPending.set(event.sequence,event);
535533

536-
constemit: Array<OrchestrationEvent>=[];
537-
letexpected=nextSequence;
538-
for(;;){
539-
constexpectedEvent=updatedPending.get(expected);
540-
if(!expectedEvent){
541-
break;
542-
}
543-
emit.push(expectedEvent);
544-
updatedPending.delete(expected);
545-
expected+=1;
546-
}
534+
constemit: Array<OrchestrationEvent>=[];
535+
letexpected=nextSequence;
536+
for(;;){
537+
constexpectedEvent=updatedPending.get(expected);
538+
if(!expectedEvent){
539+
break;
540+
}
541+
emit.push(expectedEvent);
542+
updatedPending.delete(expected);
543+
expected+=1;
544+
}
547545

548-
return[
549-
emit,
550-
{nextSequence: expected,pendingBySequence: updatedPending},
551-
];
552-
},
553-
),
554-
),
546+
return[emit,{nextSequence: expected,pendingBySequence: updatedPending}];
547+
},
555548
),
556549
),
557550
Stream.flatMap((events)=>Stream.fromIterable(events)),

‎apps/web/src/store.ts‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,21 +1305,35 @@ export const selectSidebarThreadSummaryById =
13051305
]
13061306
: undefined;
13071307

1308+
const_threadIdsByProjectCache=newMap<
1309+
string,
1310+
{scopedIds: string[];sidebarMap: Record<string,SidebarThreadSummary>;result: ThreadId[]}
1311+
>();
1312+
13081313
exportconstselectThreadIdsByProjectId=
13091314
(projectId: ProjectId|null|undefined)=>
1310-
(state: AppState): ThreadId[]=>
1311-
projectId
1312-
? (
1313-
state.threadScopedIdsByProjectScopedId[
1314-
getProjectScopedId({
1315-
environmentId: state.activeEnvironmentId,
1316-
id: projectId,
1317-
})
1318-
]??EMPTY_SCOPED_IDS
1319-
)
1320-
.map((scopedId)=>state.sidebarThreadsByScopedId[scopedId]?.id??null)
1321-
.filter((threadId): threadId is ThreadId=>threadId!==null)
1322-
: EMPTY_THREAD_IDS;
1315+
(state: AppState): ThreadId[]=>{
1316+
if(!projectId)returnEMPTY_THREAD_IDS;
1317+
1318+
constprojectScopedId=getProjectScopedId({
1319+
environmentId: state.activeEnvironmentId,
1320+
id: projectId,
1321+
});
1322+
constscopedIds=state.threadScopedIdsByProjectScopedId[projectScopedId]??EMPTY_SCOPED_IDS;
1323+
constsidebarMap=state.sidebarThreadsByScopedId;
1324+
1325+
constcached=_threadIdsByProjectCache.get(projectScopedId);
1326+
if(cached&&cached.scopedIds===scopedIds&&cached.sidebarMap===sidebarMap){
1327+
returncached.result;
1328+
}
1329+
1330+
constresult=scopedIds
1331+
.map((scopedId)=>sidebarMap[scopedId]?.id??null)
1332+
.filter((threadId): threadId is ThreadId=>threadId!==null);
1333+
1334+
_threadIdsByProjectCache.set(projectScopedId,{ scopedIds, sidebarMap, result });
1335+
returnresult;
1336+
};
13231337

13241338
exportfunctionsetError(state: AppState,threadId: ThreadId,error: string|null): AppState{
13251339
returnupdateThreadState(state,state.activeEnvironmentId,threadId,(t)=>{

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit 481ff42

Browse files
committed
Fix three code quality/performance bugs
- Remove redundant no-op Effect.map((option) => option) in ProjectionSnapshotQuery.ts - Avoid double enrichment of replay events in ws.ts subscription handler by applying enrichProjectEvent only to live stream events - Memoize selectThreadIdsByProjectId in store.ts to return stable array references and avoid unnecessary React re-renders
1 parent 410dbe8 commit 481ff42

3 files changed

Lines changed: 55 additions & 49 deletions

File tree

‎apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,6 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
748748
"ProjectionSnapshotQuery.getActiveProjectByWorkspaceRoot:decodeRow",
749749
),
750750
),
751-
Effect.map((option)=>option),
752751
Effect.flatMap((option)=>
753752
Option.isNone(option)
754753
? Effect.succeed(Option.none<OrchestrationProject>())

‎apps/server/src/ws.ts‎

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,10 @@ const WsRpcLayer = WsRpcGroup.toLayer(
503503
Effect.catch(()=>Effect.succeed([]asArray<OrchestrationEvent>)),
504504
);
505505
constreplayStream=Stream.fromIterable(replayEvents);
506-
constsource=Stream.merge(replayStream,orchestrationEngine.streamDomainEvents);
506+
constliveStream=orchestrationEngine.streamDomainEvents.pipe(
507+
Stream.mapEffect(enrichProjectEvent),
508+
);
509+
constsource=Stream.merge(replayStream,liveStream);
507510
typeSequenceState={
508511
readonlynextSequence: number;
509512
readonlypendingBySequence: Map<number,OrchestrationEvent>;
@@ -515,43 +518,33 @@ const WsRpcLayer = WsRpcGroup.toLayer(
515518

516519
returnsource.pipe(
517520
Stream.mapEffect((event)=>
518-
enrichProjectEvent(event).pipe(
519-
Effect.flatMap((enrichedEvent)=>
520-
Ref.modify(
521-
state,
522-
({
523-
nextSequence,
524-
pendingBySequence,
525-
}): [Array<OrchestrationEvent>,SequenceState]=>{
526-
if(
527-
enrichedEvent.sequence<nextSequence||
528-
pendingBySequence.has(enrichedEvent.sequence)
529-
){
530-
return[[],{ nextSequence, pendingBySequence }];
531-
}
521+
Ref.modify(
522+
state,
523+
({
524+
nextSequence,
525+
pendingBySequence,
526+
}): [Array<OrchestrationEvent>,SequenceState]=>{
527+
if(event.sequence<nextSequence||pendingBySequence.has(event.sequence)){
528+
return[[],{ nextSequence, pendingBySequence }];
529+
}
532530

533-
constupdatedPending=newMap(pendingBySequence);
534-
updatedPending.set(enrichedEvent.sequence,enrichedEvent);
531+
constupdatedPending=newMap(pendingBySequence);
532+
updatedPending.set(event.sequence,event);
535533

536-
constemit: Array<OrchestrationEvent>=[];
537-
letexpected=nextSequence;
538-
for(;;){
539-
constexpectedEvent=updatedPending.get(expected);
540-
if(!expectedEvent){
541-
break;
542-
}
543-
emit.push(expectedEvent);
544-
updatedPending.delete(expected);
545-
expected+=1;
546-
}
534+
constemit: Array<OrchestrationEvent>=[];
535+
letexpected=nextSequence;
536+
for(;;){
537+
constexpectedEvent=updatedPending.get(expected);
538+
if(!expectedEvent){
539+
break;
540+
}
541+
emit.push(expectedEvent);
542+
updatedPending.delete(expected);
543+
expected+=1;
544+
}
547545

548-
return[
549-
emit,
550-
{nextSequence: expected,pendingBySequence: updatedPending},
551-
];
552-
},
553-
),
554-
),
546+
return[emit,{nextSequence: expected,pendingBySequence: updatedPending}];
547+
},
555548
),
556549
),
557550
Stream.flatMap((events)=>Stream.fromIterable(events)),

‎apps/web/src/store.ts‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,21 +1305,35 @@ export const selectSidebarThreadSummaryById =
13051305
]
13061306
: undefined;
13071307

1308+
const_threadIdsByProjectCache=newMap<
1309+
string,
1310+
{scopedIds: string[];sidebarMap: Record<string,SidebarThreadSummary>;result: ThreadId[]}
1311+
>();
1312+
13081313
exportconstselectThreadIdsByProjectId=
13091314
(projectId: ProjectId|null|undefined)=>
1310-
(state: AppState): ThreadId[]=>
1311-
projectId
1312-
? (
1313-
state.threadScopedIdsByProjectScopedId[
1314-
getProjectScopedId({
1315-
environmentId: state.activeEnvironmentId,
1316-
id: projectId,
1317-
})
1318-
]??EMPTY_SCOPED_IDS
1319-
)
1320-
.map((scopedId)=>state.sidebarThreadsByScopedId[scopedId]?.id??null)
1321-
.filter((threadId): threadId is ThreadId=>threadId!==null)
1322-
: EMPTY_THREAD_IDS;
1315+
(state: AppState): ThreadId[]=>{
1316+
if(!projectId)returnEMPTY_THREAD_IDS;
1317+
1318+
constprojectScopedId=getProjectScopedId({
1319+
environmentId: state.activeEnvironmentId,
1320+
id: projectId,
1321+
});
1322+
constscopedIds=state.threadScopedIdsByProjectScopedId[projectScopedId]??EMPTY_SCOPED_IDS;
1323+
constsidebarMap=state.sidebarThreadsByScopedId;
1324+
1325+
constcached=_threadIdsByProjectCache.get(projectScopedId);
1326+
if(cached&&cached.scopedIds===scopedIds&&cached.sidebarMap===sidebarMap){
1327+
returncached.result;
1328+
}
1329+
1330+
constresult=scopedIds
1331+
.map((scopedId)=>sidebarMap[scopedId]?.id??null)
1332+
.filter((threadId): threadId is ThreadId=>threadId!==null);
1333+
1334+
_threadIdsByProjectCache.set(projectScopedId,{ scopedIds, sidebarMap, result });
1335+
returnresult;
1336+
};
13231337

13241338
exportfunctionsetError(state: AppState,threadId: ThreadId,error: string|null): AppState{
13251339
returnupdateThreadState(state,state.activeEnvironmentId,threadId,(t)=>{

0 commit comments

Comments
 (0)