diff --git a/http_server/code/index.mjs b/http_server/code/index.mjs
index 00ed30c..a60e24e 100644
--- a/http_server/code/index.mjs
+++ b/http_server/code/index.mjs
@@ -4,6 +4,7 @@ import { execSync } from "node:child_process";
import { Server } from "socket.io";
import { io } from "socket.io-client";
+import { build_html } from "./har-analyzer/build_html.js"
import fileUpload from "express-fileupload";
@@ -30,11 +31,11 @@ app.use(express.urlencoded({ extended: false }));
app.use(express.static("/code/dist"));
//GET
-app.get("/favicon.ico", function (req, res) {
+app.get("/favicon.ico", function (_req, res) {
res.sendFile("/code/favicon.ico");
});
-app.get("/htmx.js", function (req, res) {
+app.get("/htmx.js", function (_req, res) {
res.sendFile("/code/node_modules/htmx.org/dist/htmx.min.js");
});
@@ -57,6 +58,19 @@ app.get("/", async function (req, res) {
});
//POST
+app.use(express.text({limit: "100mb"}));
+
+app.post("/inspect_har", function (req, res) {
+ let body = JSON.parse(req.body);
+ let har = JSON.stringify(body.har);
+ console.log(har);
+ let private_data;
+ if (body.private_data)
+ private_data = JSON.stringify(body.private_data);
+ res.setHeader("Content-Type", "text/html");
+ res.send(build_html(har, private_data, "/code/har-analyzer/"));
+});
+
app.use(fileUpload());
app.post("/upload_apk", async function (req, res) {
if (!req.files || Object.keys(req.files).length === 0) {
@@ -76,6 +90,7 @@ app.post("/upload_apk", async function (req, res) {
res.send("Files uploaded!");
});
+
let server = app.listen(8080, () => console.log("Listening in port 8080"));
const front = new Server(server);
diff --git a/http_server/code/package-lock.json b/http_server/code/package-lock.json
index b57ca33..bd86331 100644
--- a/http_server/code/package-lock.json
+++ b/http_server/code/package-lock.json
@@ -5,6 +5,7 @@
"packages": {
"": {
"dependencies": {
+ "@types/har-format": "^1.2.16",
"express": "^4.18.2",
"express-fileupload": "^1.5.1",
"htmx.org": "^1.9.12",
@@ -384,6 +385,12 @@
"@types/node": "*"
}
},
+ "node_modules/@types/har-format": {
+ "version": "1.2.16",
+ "resolved": "https://registry.npmjs.org/@types/har-format/-/har-format-1.2.16.tgz",
+ "integrity": "sha512-fluxdy7ryD3MV6h8pTfTYpy/xQzCFC7m89nOH9y94cNqJ1mDIDPut7MnRHI3F6qRmh/cT2fUjG1MLdCNb4hE9A==",
+ "license": "MIT"
+ },
"node_modules/@types/node": {
"version": "22.15.21",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.21.tgz",
diff --git a/http_server/code/package.json b/http_server/code/package.json
index a6176a7..4ea4dce 100644
--- a/http_server/code/package.json
+++ b/http_server/code/package.json
@@ -1,8 +1,9 @@
{
"scripts": {
- "build": "esbuild --sourcemap --bundle src/trafficLog.jsx src/notifications.jsx --outdir=dist/ --jsx-factory=h --jsx-fragment=Fragment"
+ "build": "esbuild --sourcemap --bundle src/trafficLog.tsx src/notifications.jsx --outdir=dist/ --jsx-factory=h --jsx-fragment=Fragment"
},
"dependencies": {
+ "@types/har-format": "^1.2.16",
"express": "^4.18.2",
"express-fileupload": "^1.5.1",
"htmx.org": "^1.9.12",
diff --git a/http_server/code/screenshot.mjs b/http_server/code/screenshot.mjs
deleted file mode 100644
index 4caac92..0000000
--- a/http_server/code/screenshot.mjs
+++ /dev/null
@@ -1,68 +0,0 @@
-import fs from "fs";
-import { sleep } from "./utils.mjs";
-import { WebSocket } from "ws";
-
-export const android_websocket = new WebSocket("ws://android:3000");
-
-let doneWrite = 0;
-let screenshotPromise = null;
-
-async function screenshot() {
- const time_start = Date.now();
- let retries = 0;
- while (android_websocket.readyState != WebSocket.OPEN) {
- await sleep(15);
- retries++;
- if (retries > 50) {
- console.error("Screenshot ws timeout");
- doneWrite = 0;
- screenshotPromise = null;
- return;
- }
- }
- android_websocket.send("screenshot");
- while (!doneWrite) {
- await sleep(15);
- if (Date.now() - time_start > 2000) {
- console.error("Screenshot timed out after 2s");
- break; // timeout
- }
- }
- doneWrite = 0;
- screenshotPromise = null;
-}
-
-export async function guardedScreenshot() {
- if (!screenshotPromise) {
- screenshotPromise = screenshot();
- } else {
- console.log("ongoing screenshot promise not taking a new one");
- }
- return screenshotPromise;
-}
-
-export async function waitFullBoot() {
- var start = performance.now();
- var counter = 0;
-
- //will timeout after 10 min
- while (performance.now() - start < 600 * 1000) {
- var before = performance.now();
- await screenshot();
- var after = performance.now();
- if (after - before < process.env.screenshotDelayMs) counter++;
- else counter = 0;
-
- if (counter === 10) return;
- }
-
- throw new Error("wait for screenshot time to be less than 0.5s timed out");
-}
-
-android_websocket.on("message", (dataBuf) => {
- let fd;
- fd = fs.openSync("/code/screenshot.png", "w");
- fs.writeSync(fd, dataBuf);
- fs.close(fd);
- doneWrite = 1;
-});
diff --git a/http_server/code/src/trafficLog.jsx b/http_server/code/src/trafficLog.jsx
deleted file mode 100644
index e9b3297..0000000
--- a/http_server/code/src/trafficLog.jsx
+++ /dev/null
@@ -1,129 +0,0 @@
-import { h, render, Component } from "preact";
-
-/**
- * @typedef {'urlParam' | 'body' | 'header'} Source;
- */
-
-/**
- * @typedef {{
- * body: string,
- * headers: [[string, string]],
- * url: URL,
- * id: string,
- * kv: Map<[Source, string], string>,
- * }} Req
- */
-
-/**
- * @returns {Req | null}
- */
-function process_msg(s) {
- let obj = JSON.parse(s);
- if (obj.type !== "data") return;
- if (!obj.payload || !obj.payload.data || !obj.payload.data.requestReceived)
- return null;
- let req = obj.payload.data.requestReceived;
- if (!req.rawHeaders || !req.body || !req.url) return null;
-
- /**
- *@type {Map<[Source, string], string>}
- */
- let kv = new Map();
- /**
- *@type {string}
- */
- let body = req.body;
- /**
- *@type {string}
- */
- let decoded_body;
- try {
- decoded_body = atob(body);
- } catch {
- decoded_body = "";
- }
-
- kv.set(["body", "raw"], decoded_body);
-
- /**
- *@type {string}
- */
- let url = new URL(req.url);
-
- const params = new URLSearchParams(url.search);
-
- for (const [k, v] of params.entries()) {
- kv.set(["urlParam", k], v);
- }
-
- /**
- *@type {[[string, string]]}
- */
- let headers = JSON.parse(req.rawHeaders);
-
- for (const [k, v] of headers) {
- kv.set(["header", k], v);
- }
-
- /**
- *@type {[[string, string]]}
- */
- let id = req.id;
-
- /**
- *@type Req
- */
- let ret_req = { id, body: decoded_body, url, headers, kv };
- return ret_req;
-}
-
-class TrafficLog extends Component {
- constructor() {
- super();
- /**
- * @type {{requests: [Req]}}
- */
- this.state = { requests: [] };
- }
-
- componentDidMount() {
- // This should also be dynamic
- this.connection = new WebSocket("ws://localhost:10001");
- this.connection.onmessage = (msg) => {
- let req = process_msg(msg.data);
- if (req) {
- this.setState({ requests: [...this.state.requests, req] });
- }
- };
- this.connection.onclose = this.connection.onerror = () => {
- var element = document.getElementById("httptoolkit-frame");
- element.parentNode.removeChild(element);
- };
- }
-
- componentWillUnmount() {
- clearInterval(this.intervalSetter);
- }
-
- render() {
- const contentWithLineBreaks = this.state.requests.map(
- (
- /**
- * @type {Req}
- */
- req
- ) => {
- return (
-
- {req.url.href}
-
-
- );
- }
- );
-
- return
{contentWithLineBreaks};
- }
-}
-
-render(
, document.getElementById("traffic-log"));
diff --git a/http_server/code/src/trafficLog.tsx b/http_server/code/src/trafficLog.tsx
new file mode 100644
index 0000000..c90b3ba
--- /dev/null
+++ b/http_server/code/src/trafficLog.tsx
@@ -0,0 +1,237 @@
+import { Entry, Har, PostData, Request, Response } from "har-format";
+import { render, Component } from "preact";
+
+type MyState = {
+ finished_entries: Entry[];
+ unfinished_entries: Map
;
+};
+
+class TrafficLog extends Component {
+ connection: WebSocket | undefined;
+
+ state: MyState = { finished_entries: [], unfinished_entries: new Map() };
+
+ constructor() {
+ super();
+ }
+
+ componentDidMount() {
+ // This should also be dynamic
+ this.connection = new WebSocket("ws://localhost:10001");
+ this.connection.onmessage = (msg) => {
+ this.process_msg(msg.data);
+ this.setState({
+ finished_entries: this.state.finished_entries,
+ unfinished_entries: this.state.unfinished_entries,
+ });
+ };
+ this.connection.onclose = this.connection.onerror = () => {
+ window.location.reload();
+ };
+ }
+
+ render() {
+ const download_har = () => {
+ var tempLink = document.createElement("a");
+ var taBlob = new Blob([JSON.stringify(this.export_har())], {
+ type: "text/plain",
+ });
+
+ tempLink.setAttribute("href", URL.createObjectURL(taBlob));
+ tempLink.setAttribute("download", `rentgendroid-capture.har`);
+
+ tempLink.click();
+
+ URL.revokeObjectURL(tempLink.href);
+ };
+
+ const inspect_har = async () => {
+ const req_body = {
+ har: this.export_har(),
+ private_data: undefined,
+ };
+ const resp = await fetch("/inspect_har", {
+ method: "POST",
+ body: JSON.stringify(req_body),
+ })
+ const resp_text = await resp.text();
+ const newWindow = window.open();
+ newWindow?.document.write(resp_text);
+ newWindow?.document.close();
+
+ }
+
+ const contentWithLineBreaks = this.state.finished_entries.map((req) => {
+ return (
+
+ {req.request.url}
+
+
+ );
+ });
+
+ return (
+
+
+
+
+
stats:
+
+ Request + responce pairs:{" "}
+ {this.state.finished_entries.length}
+
+
+ Waiting for the responce:{" "}
+ {this.state.unfinished_entries.size}
+
+
+
{contentWithLineBreaks}
+