From fabac587967df21040e727e4ecb798a0a547cd1c Mon Sep 17 00:00:00 2001 From: Aarushsr12 Date: Thu, 11 Dec 2025 20:45:26 +0530 Subject: [PATCH 1/2] logs for no-proxy --- src/main/actions/startBackgroundProcess.js | 102 ++++++++++-------- src/renderer/actions/initEventHandlers.js | 7 +- .../actions/proxy/startProxyServer.ts | 36 ++++++- 3 files changed, 92 insertions(+), 53 deletions(-) diff --git a/src/main/actions/startBackgroundProcess.js b/src/main/actions/startBackgroundProcess.js index 8b04d734..c62a0c38 100644 --- a/src/main/actions/startBackgroundProcess.js +++ b/src/main/actions/startBackgroundProcess.js @@ -24,61 +24,69 @@ const resolveBackgroundPath = (htmlFileName) => { const startBackgroundProcess = async () => { // eslint-disable-next-line no-async-promise-executor + console.log("DEBUG: startBackgroundProcess: Starting Background Process"); return new Promise(async (resolve) => { - let backgroundWindow = await getState("backgroundWindow"); - if (!backgroundWindow) { - backgroundWindow = await setState(null, { - stateName: "backgroundWindow", - // Background Process Window - newValue: new BrowserWindow({ - width: 800, - height: 600, - show: - process.env.NODE_ENV === "development" || - process.env.DEBUG_PROD === "true", - webPreferences: { - nodeIntegration: true, - contextIsolation: false, - enableRemoteModule: true, - }, - }), - }); - enableWebContents(backgroundWindow.webContents); - } else { - logger.log( - "startBackgroundProcess: A background windows already exists. Cancelling." - ); - - resolve(true); - return; - } + try { + let backgroundWindow = await getState("backgroundWindow"); + if (!backgroundWindow) { + backgroundWindow = await setState(null, { + stateName: "backgroundWindow", + // Background Process Window + newValue: new BrowserWindow({ + width: 800, + height: 600, + show: + process.env.NODE_ENV === "development" || + process.env.DEBUG_PROD === "true", + webPreferences: { + nodeIntegration: true, + contextIsolation: false, + enableRemoteModule: true, + }, + }), + }); + enableWebContents(backgroundWindow.webContents); + console.log("DEBUG: startBackgroundProcess: Background Window Created"); + } else { + logger.log( + "startBackgroundProcess: A background windows already exists. Cancelling." + ); - global.backgroundWindow = backgroundWindow; + resolve(true); + return; + } - // Load background code - backgroundWindow.loadURL(resolveBackgroundPath("index.html")); + global.backgroundWindow = backgroundWindow; - // Open the DevTools in dev mode - if ( - process.env.NODE_ENV === "development" || - process.env.DEBUG_PROD === "true" - ) - { - backgroundWindow.webContents.once('dom-ready', () => { - backgroundWindow.webContents.openDevTools(); - }) - } + // Load background code + backgroundWindow.loadURL(resolveBackgroundPath("index.html")); - // Setup IPC forwarding - setupIPCForwardingToBackground(backgroundWindow); + // Open the DevTools in dev mode + if ( + process.env.NODE_ENV === "development" || + process.env.DEBUG_PROD === "true" + ) { + backgroundWindow.webContents.once("dom-ready", () => { + backgroundWindow.webContents.openDevTools(); + }); + } - // Set state - global.isBackgroundProcessActive = true; + // Setup IPC forwarding + setupIPCForwardingToBackground(backgroundWindow); - backgroundWindow.webContents.on("did-finish-load", () => { - resolve(true); - }); + // Set state + global.isBackgroundProcessActive = true; + backgroundWindow.webContents.on("did-finish-load", () => { + resolve(true); + }); + } catch (error) { + console.log( + "DEBUG: startBackgroundProcess: Error starting background process", + error + ); + resolve(false); + } }); }; diff --git a/src/renderer/actions/initEventHandlers.js b/src/renderer/actions/initEventHandlers.js index 793dee9b..2c18492c 100644 --- a/src/renderer/actions/initEventHandlers.js +++ b/src/renderer/actions/initEventHandlers.js @@ -27,16 +27,19 @@ import { getAvailableAndroidDevices } from "./apps/mobile/utils"; import { sendMessageToExtension } from "./helperSocketServer"; import IosSimulatorDevice from "./apps/mobile/iosSimulator"; - const initEventHandlers = () => { + console.log("DEBUG:", "initializing IPC Event Handlers"); ipcRenderer.send("background-process-started"); ipcRenderer.on("start-proxy-server", async () => { const PROXY_RESULT = await startProxyServer(); + console.log("DEBUG:", "Proxy Server Started:", PROXY_RESULT); ipcRenderer.send("reply-start-proxy-server", PROXY_RESULT); ipcRenderer.send("proxy-config-updated", getProxyConfig()); }); ipcRenderer.on("detect-available-apps", async (event, payload) => { + console.log("DEBUG: detect-available-apps", payload); + const arrayOfAppIds = payload; let final_result = {}; @@ -53,6 +56,8 @@ const initEventHandlers = () => { .catch((e) => console.error("Unexpected Behaviour", e)); } + console.log("DEBUG: detect-available-apps final result", final_result); + ipcRenderer.send("reply-detect-available-apps", final_result); }); diff --git a/src/renderer/actions/proxy/startProxyServer.ts b/src/renderer/actions/proxy/startProxyServer.ts index 7962b103..265c1f64 100644 --- a/src/renderer/actions/proxy/startProxyServer.ts +++ b/src/renderer/actions/proxy/startProxyServer.ts @@ -13,7 +13,10 @@ import startHelperServer, { stopHelperServer } from "../startHelperServer"; import logger from "utils/logger"; import { getDefaultProxyPort } from "../storage/cacheUtils"; import { handleCARegeneration } from "../apps/os/ca/utils"; -import { startHelperSocketServer, stopHelperSocketServer } from "../helperSocketServer"; +import { + startHelperSocketServer, + stopHelperSocketServer, +} from "../helperSocketServer"; import portfinder from "portfinder"; import LoggerService from "renderer/lib/proxy-interface/loggerService"; import { addShutdownHandler } from "../shutdown"; @@ -47,13 +50,24 @@ function startProxyFromModule(PROXY_PORT: number) { RQProxyProvider.createInstance( proxyConfig, new RulesDataSource(), - new LoggerService(), + new LoggerService() ); window.proxy = RQProxyProvider.getInstance().proxy; + console.log("DEBUG:", "Proxy assigned to window object"); } export function stopProxyServer() { - if(window.proxy) { + // on startup window.proxy comes undefined + // but if refreshed or some earlier proxy was there it will show the proxy object + console.log( + "DEBUG:", + `onStartup window.proxy is undefined, else not: ${window.proxy}` + ); + if (window.proxy) { + console.log( + "DEBUG:", + `onRefresh window.proxy will be there: ${window.proxy}` + ); window.proxy.close(); } } @@ -65,6 +79,7 @@ export default async function startProxyServer( ): Promise { // Check if proxy is already listening. If so, close it try { + console.log("DEBUG:", "stopProxyServerCalled"); stopProxyServer(); logger.log("A proxy server was closed"); } catch (error) { @@ -82,7 +97,9 @@ export default async function startProxyServer( // start the proxy server const FINAL_PROXY_PORT = await getNextAvailablePort(targetPort); + console.log("DEBUG: Is FINAL_PROXY_PORT is available", FINAL_PROXY_PORT); if (!FINAL_PROXY_PORT) { + console.log("DEBUG: returning success as false"); result.success = false; return result; } @@ -94,6 +111,8 @@ export default async function startProxyServer( // start the helper server if not already running if (shouldStartHelperServer) { + // No proxy comes for the case when there is success is false in result + console.log("DEBUG:", "starting up the helper server"); const HELPER_SERVER_PORT = await getNextAvailablePort( DEFAULT_HELPER_SERVER_PORT ); @@ -101,6 +120,9 @@ export default async function startProxyServer( result.helperServerPort = HELPER_SERVER_PORT; if (!HELPER_SERVER_PORT) { + console.log( + "DEBUG: returning success as false as no helper server port available" + ); result.success = false; return result; } @@ -111,15 +133,19 @@ export default async function startProxyServer( port: DEFAULT_SOCKET_SERVER_PORT, stopPort: DEFAULT_SOCKET_SERVER_PORT + 4, // 5 ports for fallback }); + console.log( + "DEBUG:", + `${HELPER_SOCKET_SERVER_PORT} HELPER_SOCKET_SERVER_PORT is available` + ); startHelperSocketServer(HELPER_SOCKET_SERVER_PORT); - // fix-me: this does not remove existing handlers when restarting. + // fix-me: this does not remove existing handlers when restarting. // For now that doesn't have side effects addShutdownHandler(() => { stopProxyServer(); stopHelperServer(); stopHelperSocketServer(); - }) + }); return result; } From 8119cc9fa048b4c508fb4ac11da57a456f1cfcac Mon Sep 17 00:00:00 2001 From: Aarushsr12 Date: Thu, 11 Dec 2025 21:11:55 +0530 Subject: [PATCH 2/2] more logs --- src/renderer/actions/proxy/startProxyServer.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/renderer/actions/proxy/startProxyServer.ts b/src/renderer/actions/proxy/startProxyServer.ts index 265c1f64..6bdae2e6 100644 --- a/src/renderer/actions/proxy/startProxyServer.ts +++ b/src/renderer/actions/proxy/startProxyServer.ts @@ -89,6 +89,8 @@ export default async function startProxyServer( const proxyIp = ip()!; const targetPort = proxyPort || getDefaultProxyPort(); + console.log(`DEBUG: ${proxyIp} ${targetPort}`); + const result: IStartProxyResult = { success: true, port: targetPort,