Skip to content

Commit f148081

Browse files
committed
Tighten up message & connection rows for raw tunnels
1 parent cb81d99 commit f148081

File tree

3 files changed

+23
-10
lines changed

3 files changed

+23
-10
lines changed

src/components/view/raw-tunnel-details-pane.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@ import { getReadableIP } from '../../model/network';
77
import { RawTunnel } from '../../model/raw-tunnel';
88
import { UiStore } from '../../model/ui/ui-store';
99

10+
import { formatDuration } from '../../util/text';
11+
import { getReadableSize } from '../../util/buffer';
12+
1013
import { MediumCard } from '../common/card';
14+
1115
import { ContentLabelBlock, Content, CopyableMonoValue } from '../common/text-content';
1216
import { PaneScrollContainer } from './view-details-pane';
1317
import { StreamMessageListCard } from './stream-message-list-card';
1418
import { SelfSizedEditor } from '../editor/base-editor';
15-
import { formatDuration } from '../../util/text';
1619

1720
@inject('uiStore')
1821
@observer
@@ -39,7 +42,7 @@ export class RawTunnelDetailsPane extends React.Component<{
3942
cardHeading='Raw Data'
4043
streamLabel={tunnel.upstreamHostname}
4144
editorNode={this.props.streamMessageEditor}
42-
filenamePrefix={`Raw Tunnel ${tunnel.upstreamHostname} ${tunnel.id}`}
45+
filenamePrefix={`Raw Tunnel ${tunnel.upstreamHostname} ${tunnel.upstreamPort} ${tunnel.id}`}
4346
messages={tunnel.packets}
4447
/>;
4548

src/components/view/stream-message-rows.tsx

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,15 @@ export const StreamMessageCollapsedRow = React.memo((p: {
6666
)
6767
}
6868
</CollapsedStreamContent>
69-
{
70-
p.message.isBinary &&
71-
<Pill color={warningColor}>Binary</Pill>
72-
}
73-
<Pill>
74-
{ getReadableSize(p.message.content.byteLength) }
75-
</Pill>
69+
<RowTags>
70+
{
71+
p.message.isBinary &&
72+
<Pill color={warningColor}>Binary</Pill>
73+
}
74+
<Pill>
75+
{ getReadableSize(p.message.content.byteLength) }
76+
</Pill>
77+
</RowTags>
7678
</CollapsedStreamRowContainer>);
7779

7880
const MessageArrow = styled(React.memo((p: {
@@ -141,6 +143,12 @@ const CollapsedStreamContent = styled(ContentMonoValue)`
141143
padding: 3px 0 4px;
142144
`;
143145

146+
const RowTags = styled.div`
147+
display: flex;
148+
gap: 8px;
149+
flex-direction: row;
150+
`;
151+
144152
interface MessageEditorRowProps {
145153
streamId: string,
146154
message: StreamMessage,

src/components/view/view-event-list.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,9 @@ const RawTunnelRow = observer((p: {
724724
}) => {
725725
const { event } = p;
726726

727-
const connectionTarget = event.upstreamHostname || 'unknown domain';
727+
const connectionTarget = event.upstreamHostname
728+
? `${event.upstreamHostname}:${event.upstreamPort}`
729+
: 'unknown destination';
728730

729731
return <TlsListRow
730732
role="row"

0 commit comments

Comments
 (0)