Skip to content

V3 30 0: JSON Log Viewer render wrapped line #701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davechri merged 3 commits into from
Sep 16, 2023
Merged

V3 30 0: JSON Log Viewer render wrapped line #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a126f56
v3-30-0: JSON Log - support wrapped lines
davechri Sep 16, 2023
370a1bd
3.30.0
davechri Sep 16, 2023
e440a44
Update readme version
davechri Sep 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ MITM debugging proxy with a web GUI to view and modify all of the HTTP and HTTPS

### Install

> Mac: **[allproxy.dmg](https://github.com/allproxy/allproxy/releases/download/v3.29.0/allproxy-3.29.2-x64.dmg)**
> Mac: **[allproxy.dmg](https://github.com/allproxy/allproxy/releases/download/v3.30.0/allproxy-3.30.0-x64.dmg)**

> RedHat: **[allproxy.rpm](https://github.com/allproxy/allproxy/releases/download/v3.29.0/allproxy-3.29.2-1.x86_64.rpm)**
> RedHat: **[allproxy.rpm](https://github.com/allproxy/allproxy/releases/download/v3.30.0/allproxy-3.30.0-1.x86_64.rpm)**

> Ubuntu: **[allproxy.deb](https://github.com/allproxy/allproxy/releases/download/v3.29.0/allproxy_3.29.2_amd64.deb)**
> Ubuntu: **[allproxy.deb](https://github.com/allproxy/allproxy/releases/download/v3.30.0/allproxy_3.30.0_amd64.deb)**

> Windows: **[Setup.exe](https://github.com/allproxy/allproxy/releases/download/v3.29.0/allproxy-3.29.2.Setup.exe)**
> Windows: **[Setup.exe](https://github.com/allproxy/allproxy/releases/download/v3.30.0/allproxy-3.30.0.Setup.exe)**

> Other install options:
> 1. Install NPM package: **npm install -g allproxy**
Expand Down
32 changes: 25 additions & 7 deletions client/src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ body {
td {
border-color: black !important;
}

.request__msg-even {
background-color: #333333;
}

.request__msg-highlight {
/* color:rgba(0, 55, 255, 0.884) !important; */
color: #4ca728 !important;
}
}

@media screen and (prefers-color-scheme: light) {
Expand Down Expand Up @@ -79,6 +88,15 @@ body {
.MuiCheckbox-colorSecondary {
color: blue;
}

.request__msg-even {
background-color: #e5e5e5;
}

.request__msg-highlight {
/* color:rgba(0, 55, 255, 0.884) !important; */
color: rgb(203, 75, 22) !important;
}
}

.header__filter-input,
Expand Down Expand Up @@ -169,8 +187,8 @@ td input {
padding-bottom: 0 !important;
}

.json-label {
cursor: pointer;
.keep-all {
word-break: keep-all;
}

.center {
Expand Down Expand Up @@ -325,11 +343,6 @@ td input {
white-space: nowrap;
}

.request__msg-highlight {
/* color:rgba(0, 55, 255, 0.884) !important; */
color: rgb(203, 75, 22) !important;
}

.request__msg-unhighlight {
color: grey !important;
}
Expand Down Expand Up @@ -733,6 +746,11 @@ td input {
display: flex;
}

.request__msg.wrap {
white-space: wrap;
word-break: break-all;
}

/* .request__msg.active {
border: red solid thin;
border-radius: .2rem;
Expand Down
7 changes: 4 additions & 3 deletions client/src/components/JsonLogAnnotator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const JsonLogAnnotator = observer(({ message }: Props) => {
// Look for embedded JSON object
let nonJson = message.path ? message.path + ' ' : '';

elements.push(<span> {nonJson + JSON.stringify(message.responseBody)}</span>);
elements.push(<div style={{ display: 'inline-block', maxHeight: '52px', overflow: 'hidden', textOverflow: 'ellipsis' }}> {nonJson + JSON.stringify(message.responseBody)}</div>);
}

let messageText = messageStore.getLogEntry().message;
Expand Down Expand Up @@ -58,14 +58,15 @@ const JsonLogAnnotator = observer(({ message }: Props) => {
function makeLabel(name: string, background: string, color: string, filter: string, value: any = undefined): JSX.Element[] {
const v = value === undefined ? '' : typeof value === 'string' ? `"${value}"` : value;

const className = value !== undefined ? 'json-label' : '';
const className = value !== undefined ? 'json-label keep-all' : '';

const elements: JSX.Element[] = [];
elements.push(
<span className={className}
style={{ color: color, background: background, filter: filter, marginLeft: '.25rem', padding: '0 .25rem', borderRadius: '.25rem', border: `${background} thin solid` }}>{name}</span>);
if (v !== undefined) {
elements.push(<span style={{ marginLeft: '.25rem' }}>{v}</span >);
const className = value === 'string' && v.length > 16 ? undefined : 'keep-all';
elements.push(<span className={className} style={{ marginLeft: '.25rem' }}>{v}</span >);
}
return elements;
}
Expand Down
8 changes: 5 additions & 3 deletions client/src/components/Request.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ type Props = {
maxEndpointSize: number,
vertical: boolean,
isFiltered: boolean,
className: string,
};
const Request = observer(({ isActive, highlight, onClick, store, onResend, maxStatusSize, maxMethodSize, maxEndpointSize, vertical, isFiltered }: Props) => {
const Request = observer(({ isActive, highlight, onClick, store, onResend, maxStatusSize, maxMethodSize, maxEndpointSize, vertical, isFiltered, className }: Props) => {
const [openNoteDialog, setOpenNoteDialog] = React.useState(false);

const handleClick = () => {
Expand All @@ -39,7 +40,7 @@ const Request = observer(({ isActive, highlight, onClick, store, onResend, maxSt

return (
<><div>
<div className="request__msg-container">
<div className={"request__msg-container " + className} >
<div className="request__msg-header">
<div className="request__msg-time-ms">
{message.protocol !== 'log:' ?
Expand Down Expand Up @@ -105,6 +106,7 @@ const Request = observer(({ isActive, highlight, onClick, store, onResend, maxSt
</div>

<div className={`request__msg
${message.protocol === 'log:' ? ' wrap' : ''}
${isActive ? ' active' : ''}
${highlight ? ' highlight' : ''}
${!store.isHttpOrHttps() && !store.isNoResponse() && store.isError() ? ' error' : ''}
Expand Down Expand Up @@ -147,7 +149,7 @@ const Request = observer(({ isActive, highlight, onClick, store, onResend, maxSt
displayDataTypes={false}
quotesOnKeys={false} />}
</div>
</div>
</div >
<NoteDialog
message={store}
open={openNoteDialog}
Expand Down
1 change: 1 addition & 0 deletions client/src/components/SnapshotTabContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ const SnapshotTabContent = observer(({
onResend={() => handleResend(message)}
vertical={vertical}
isFiltered={isFiltered}
className={message.protocol === 'log:' && matchCount % 2 === 0 ? 'request__msg-even' : ''}
/>);
}
})}
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "allproxy",
"version": "3.29.2",
"version": "3.30.0",
"description": "AllProxy: MITM HTTP Debugging Tool.",
"keywords": [
"proxy",
Expand Down