track terminal helper server connected (#118)

Author: nsrCodes

src/main/events.js

@@ -18,6 +18,8 @@ import {
   storeSessionRecording,
 } from "./actions/networkSessionStorage";
 import { createOrUpdateAxiosInstance } from "./actions/getProxiedAxios";
+// todo: refactor main.ts to only export core entities like webappWindow
+// and then build these utilites elsewhere
 // eslint-disable-next-line import/no-cycle
 import createTrayMenu from "./main";
 
@@ -218,9 +220,9 @@ export const registerMainProcessEventsForWebAppWindow = (webAppWindow) => {
         const filePath = filePaths[0];
         trackRecentlyAccessedFile(filePath);
         const fileName = path.basename(filePath);
-        const finalCategory = getFileCategory(path.extname(filePath));
+        const fileCategory = getFileCategory(path.extname(filePath));
         const contents = fs.readFileSync(filePath, "utf-8");
-        return { filePath, name: fileName, category: finalCategory, contents };
+        return { filePath, name: fileName, category: fileCategory, contents };
       })
       .catch((err) => {
         console.log(err);
@@ -242,11 +244,15 @@ export const registerMainProcessEventsForWebAppWindow = (webAppWindow) => {
       return "err:NOT FOUND";
     }
   });
+
+  ipcMain.handle("helper-server-hit", () => {
+    webAppWindow.send("helper-server-hit");
+  });
 };
 
 export const registerMainProcessCommonEvents = () => {
-  ipcMain.handle("open-file-dialog", async () => {
-    const fileDialogPromise = dialog.showOpenDialog({});
+  ipcMain.handle("open-file-dialog", async (event, options) => {
+    const fileDialogPromise = dialog.showOpenDialog(options ?? {});
     return fileDialogPromise;
   });
 };

src/renderer/actions/startHelperServer.js

@@ -1,7 +1,13 @@
+import { ipcRenderer } from "electron";
 import { staticConfig } from "../config";
 
-var http = require("http");
-const pem_path = staticConfig.ROOT_CERT_PATH;
+const http = require("http");
+
+const pemPath = staticConfig.ROOT_CERT_PATH;
+
+function trackHelperServerHit() {
+  ipcRenderer.invoke("helper-server-hit");
+}
 
 const getShellScript = (port) => `
     export http_proxy="http://127.0.0.1:${port}"
@@ -13,13 +19,13 @@ const getShellScript = (port) => `
     export npm_config_proxy="http://127.0.0.1:${port}"
     export npm_config_https_proxy="http://127.0.0.1:${port}"
     export GOPROXY="http://127.0.0.1:${port}"
-    export SSL_CERT_FILE="${pem_path}"
-    export NODE_EXTRA_CA_CERTS="${pem_path}"
-    export REQUESTS_CA_BUNDLE="${pem_path}"
-    export PERL_LWP_SSL_CA_FILE="${pem_path}"
-    export GIT_SSL_CAINFO="${pem_path}"
-    export CARGO_HTTP_CAINFO="${pem_path}"
-    export CURL_CA_BUNDLE="${pem_path}"
+    export SSL_CERT_FILE="${pemPath}"
+    export NODE_EXTRA_CA_CERTS="${pemPath}"
+    export REQUESTS_CA_BUNDLE="${pemPath}"
+    export PERL_LWP_SSL_CA_FILE="${pemPath}"
+    export GIT_SSL_CAINFO="${pemPath}"
+    export CARGO_HTTP_CAINFO="${pemPath}"
+    export CURL_CA_BUNDLE="${pemPath}"
     if command -v winpty >/dev/null 2>&1; then
         # Work around for winpty's hijacking of certain commands
         alias php=php
@@ -35,12 +41,13 @@ const getShellScript = (port) => `
 
 const startHelperServer = async (helperServerPort) => {
   return new Promise((resolve) => {
-    var server = http.createServer(function (req, res) {
-      //create web server
+    const server = http.createServer((req, res) => {
+      // create web server
       console.log(window.proxy.httpPort);
-      if (req.url == "/tpsetup") {
+      if (req.url === "/tpsetup") {
         const shellScript = getShellScript(window.proxy.httpPort);
         // const shellScript = `export http_proxy="http://127.0.0.1:${window.proxy.httpPort}"`
+        trackHelperServerHit();
         res.writeHead(200, { "Content-Type": "text/x-shellscript" });
         res.write(shellScript);
         res.end();