New Direct Terminal Tsunami SubBlock + TCP over PTY system to forward ports #3275
simplify, use tsunamidirect
- Loading branch information
commit db626d00bc9b5f304cda53c85d57fe2424452155
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,3 +44,4 @@ docsite/ | |
| .superpowers | ||
| docs/superpowers | ||
| .claude | ||
| CLAUDE.local.md | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ import { makeFeBlockRouteId } from "@/app/store/wshrouter"; | |
| import { DefaultRouter, TabRpcClient } from "@/app/store/wshrpcutil"; | ||
| import { TermClaudeIcon, TerminalView } from "@/app/view/term/term"; | ||
| import { TermWshClient } from "@/app/view/term/term-wsh"; | ||
| import type { TsunamiDirectViewModel } from "@/app/view/tsunamidirect/tsunamidirect"; | ||
| import { VDomModel } from "@/app/view/vdom/vdom-model"; | ||
| import { WorkspaceLayoutModel } from "@/app/workspace/workspace-layout-model"; | ||
| import { | ||
|
|
@@ -65,6 +65,7 @@ export class TermViewModel implements ViewModel { | |
| vdomBlockId: jotai.Atom<string>; | ||
| vdomToolbarBlockId: jotai.Atom<string>; | ||
| tsunamiBlockId: jotai.Atom<string>; | ||
| tsunamiLocalPort: jotai.Atom<number>; | ||
| vdomToolbarTarget: jotai.PrimitiveAtom<VDomTargetToolbar>; | ||
| fontSizeAtom: jotai.Atom<number>; | ||
| termThemeNameAtom: jotai.Atom<string>; | ||
|
|
@@ -108,6 +109,10 @@ export class TermViewModel implements ViewModel { | |
| const blockData = get(this.blockAtom); | ||
| return blockData?.meta?.["term:tsunamiblockid"]; | ||
| }); | ||
| this.tsunamiLocalPort = jotai.atom((get) => { | ||
| const blockData = get(this.blockAtom); | ||
| return blockData?.meta?.["term:tsunamilocalport"] ?? 0; | ||
| }); | ||
| this.vdomToolbarTarget = jotai.atom<VDomTargetToolbar>(null) as jotai.PrimitiveAtom<VDomTargetToolbar>; | ||
| this.termMode = jotai.atom((get) => { | ||
| const blockData = get(this.blockAtom); | ||
|
|
@@ -122,7 +127,7 @@ export class TermViewModel implements ViewModel { | |
| if (termMode == "tsunami") { | ||
| const tsunamiBlockId = get(this.tsunamiBlockId); | ||
| const tsunamiBcm = tsunamiBlockId ? get(getBlockComponentModelAtom(tsunamiBlockId)) : null; | ||
| const tsunamiVM = tsunamiBcm?.viewModel as TsunamiDirectViewModel; | ||
| if (tsunamiVM?.viewIcon) { | ||
| return get(tsunamiVM.viewIcon); | ||
| } | ||
|
|
@@ -139,7 +144,7 @@ export class TermViewModel implements ViewModel { | |
| if (termMode == "tsunami") { | ||
| const tsunamiBlockId = get(this.tsunamiBlockId); | ||
| const tsunamiBcm = tsunamiBlockId ? get(getBlockComponentModelAtom(tsunamiBlockId)) : null; | ||
| const tsunamiVM = tsunamiBcm?.viewModel as TsunamiDirectViewModel; | ||
| if (tsunamiVM?.viewName) { | ||
| return get(tsunamiVM.viewName); | ||
| } | ||
|
|
@@ -635,6 +640,17 @@ export class TermViewModel implements ViewModel { | |
| return bcm.viewModel as VDomModel; | ||
| } | ||
|
|
||
| teardownTsunamiSubBlock() { | ||
| const tsunamiBlockId = globalStore.get(this.tsunamiBlockId); | ||
| if (tsunamiBlockId) { | ||
| RpcApi.DeleteSubBlockCommand(TabRpcClient, { blockid: tsunamiBlockId }); | ||
| } | ||
| RpcApi.SetMetaCommand(TabRpcClient, { | ||
| oref: WOS.makeORef("block", this.blockId), | ||
| meta: { "term:mode": null, "term:tsunamiblockid": null, "term:tsunamilocalport": null }, | ||
| }); | ||
| } | ||
|
|
||
| focusTsunamiSubBlock() { | ||
| const tsunamiBlockId = globalStore.get(this.tsunamiBlockId); | ||
| if (!tsunamiBlockId) return; | ||
|
|
@@ -1008,7 +1024,7 @@ export class TermViewModel implements ViewModel { | |
| if (termMode === "tsunami") { | ||
| const tsunamiBlockId = globalStore.get(this.tsunamiBlockId); | ||
| const bcm = tsunamiBlockId ? globalStore.get(getBlockComponentModelAtom(tsunamiBlockId)) : null; | ||
| const tsunamiVM = bcm?.viewModel as TsunamiDirectViewModel; | ||
| const promotedItems = tsunamiVM?.getPromotedContextMenuItems?.() ?? []; | ||
| fullMenu.push({ | ||
| label: "Send ^C to Tsunami App", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -183,61 +183,46 @@ const TermTsunamiNodeSingleId = ({ | |
| blockId, | ||
| model, | ||
| }: TerminalViewProps & { tsunamiBlockId: string }) => { | ||
| const tsunamiPort = jotai.useAtomValue(model.tsunamiLocalPort); | ||
|
|
||
| React.useEffect(() => { | ||
| if (!(tsunamiPort > 0)) { | ||
| model.teardownTsunamiSubBlock(); | ||
| return; | ||
| } | ||
| let cancelled = false; | ||
| RpcApi.TermListenCheckPortCommand(TabRpcClient, { port: tsunamiPort }) | ||
| .then((active) => { | ||
| if (!cancelled && !active) { | ||
| model.teardownTsunamiSubBlock(); | ||
| } | ||
| }) | ||
| .catch(() => { | ||
| if (!cancelled) { | ||
| model.teardownTsunamiSubBlock(); | ||
| } | ||
| }); | ||
| return () => { | ||
| cancelled = true; | ||
| }; | ||
| }, [tsunamiPort]); | ||
|
|
||
| React.useEffect(() => { | ||
| const unsubBlockClose = waveEventSubscribeSingle({ | ||
| eventType: "blockclose", | ||
| scope: WOS.makeORef("block", tsunamiBlockId), | ||
| handler: () => model.teardownTsunamiSubBlock(), | ||
| }); | ||
| const unsubTermListenDown = waveEventSubscribeSingle({ | ||
| eventType: "termlisten:down", | ||
| scope: WOS.makeORef("block", blockId), | ||
| handler: (event) => { | ||
| if (tsunamiPort > 0 && event.data?.port === tsunamiPort) { | ||
| model.teardownTsunamiSubBlock(); | ||
| } | ||
| }, | ||
| }); | ||
| return () => { | ||
| unsubBlockClose(); | ||
| unsubTermListenDown(); | ||
| }; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,6 @@ import { RpcApi } from "@/app/store/wshclientapi"; | |
| import { TabRpcClient } from "@/app/store/wshrpcutil"; | ||
| import { WebView, WebViewModel } from "@/app/view/webview/webview"; | ||
| import * as services from "@/store/services"; | ||
| import * as jotai from "jotai"; | ||
| import { memo, useEffect } from "react"; | ||
|
|
||
|
|
@@ -253,64 +252,11 @@ const TsunamiView = memo((props: ViewComponentProps<TsunamiViewModel>) => { | |
| const shellProcFullStatus = jotai.useAtomValue(model.shellProcFullStatus); | ||
| const blockData = jotai.useAtomValue(model.blockAtom); | ||
| const isRestarting = jotai.useAtomValue(model.isRestarting); | ||
|
|
||
| useEffect(() => { | ||
| model.resyncController(); | ||
| }, [model]); | ||
|
|
||
| const appPath = blockData?.meta?.["tsunami:apppath"]; | ||
| const appId = blockData?.meta?.["tsunami:appid"]; | ||
| const controller = blockData?.meta?.controller; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Verify the advertised port before opening a localhost block.
Any process that can write to this terminal can emit OSC 9009 with
{ "termlisten": true, "port": N }, and this handler will immediately create atsunamidirectblock tohttp://localhost:N. That crosses a trust boundary and lets terminal output target arbitrary local services. Validate thatportis an integer in range and belongs to an active termlisten registration before creating the sub-block.Proposed fix
try { payload = JSON.parse(jsonStr); } catch { return true; } if (!payload.port || !payload.termlisten) return true; + if (!Number.isInteger(payload.port) || payload.port < 1 || payload.port > 65535) return true; + const active = await RpcApi.TermListenCheckPortCommand(TabRpcClient, { port: payload.port }); + if (!active) return true; const tsunamiUrl = `http://localhost:${payload.port}`;🤖 Prompt for AI Agents