querysub 0.80.0 → 0.82.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.80.0",
+  "version": "0.82.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/-g-core-values/oneTimeForward.ts

@@ -13,7 +13,6 @@ export async function hackDevtoolsWebsocketForward(config: {
     externalPort: number;
     cancel: () => void;
 }> {
-    let hasConnected = false;
     const server = net.createServer();
 
     // Start listening on a random available port, binding to all interfaces (0.0.0.0)
@@ -30,8 +29,6 @@ export async function hackDevtoolsWebsocketForward(config: {
 
         console.log(`Forwarding connection from ${config.externalIP}:${(address as any).port} to 127.0.0.1:${config.internalPort}`);
 
-        hasConnected = true;
-
         // Forward the connection to the internal port
         const internalConnection = net.createConnection({
             host: "127.0.0.1",
@@ -55,7 +52,9 @@ export async function hackDevtoolsWebsocketForward(config: {
         // // Handle socket closure
         socket.on("close", () => {
             internalConnection.destroy();
-            server.close();
+            // TESTING:
+            //  - For now, we don't close the server, so... we can reconnect. I think this might be required...
+            //server.close();
         });
         socket.on("error", (err) => {
             internalConnection.destroy();

package/src/diagnostics/NodeViewer.tsx

@@ -265,8 +265,10 @@ export class NodeViewer extends qreact.Component {
                                             <button onClick={async () => {
                                                 const controller = NodeViewerController.nodes[getBrowserUrlNode()];
                                                 let url = await controller.getExternalInspectURL(str);
+                                                console.log(url.replace("https://notdevtools.com/devtools", "devtools://devtools/bundled"));
+                                                // devtools://devtools/bundled/inspector.html?experiments=true&v8only=true&wss=99-250-124-91.querysub.com:2058/cc5b76b2-549f-4a66-8026-021811e9edd3
 
-                                                window.open(url, "_blank");
+                                                //window.open(url, "_blank");
                                             }}>
                                                 Inspect
                                             </button>
@@ -385,6 +387,11 @@ class NodeViewerControllerBase {
             internalConnection.pipe(socket);
 
             socket.on("close", () => {
+                console.log(`Inspect closing forward (socket closed) ${ourDomain}:${finalPort} => ${baseNodeIPResolved}:${externalPort} => 127.0.0.1:${internalPort}, for ${callerIP}`);
+                tlsServer.close();
+            });
+            internalConnection.on("close", () => {
+                console.log(`Inspect closing forward (internal connection closed) ${ourDomain}:${finalPort} => ${baseNodeIPResolved}:${externalPort} => 127.0.0.1:${internalPort}, for ${callerIP}`);
                 tlsServer.close();
             });
         });