devcon-cli 0.1.3 → 0.1.5

package/dist/agent-bun.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env bun
 // @bun
-import*as U from"fs";import*as $ from"net";function L(F){let K=[],G=new Set,N=F.split(`
-`);for(let j=1;j<N.length;j++){let z=N[j].trim();if(!z)continue;let J=z.split(/\s+/),R=J[1],Q=J[3];if(!R||!Q)continue;if(Q!=="0A")continue;let X=R.split(":")[1];if(!X)continue;let V=parseInt(X,16);if(V<=0||G.has(V))continue;let W=J[9];if(!W)continue;let Y=parseInt(W,10);if(isNaN(Y))continue;G.add(V),K.push({port:V,inode:Y})}return K.sort((j,z)=>j.port-z.port)}function O(){let F=new Map,K;try{K=U.readdirSync("/proc").filter((G)=>/^\d+$/.test(G))}catch{return F}for(let G of K){let N=parseInt(G,10),j=`/proc/${N}/fd`,z;try{z=U.readdirSync(j)}catch{continue}for(let J of z)try{let Q=U.readlinkSync(`${j}/${J}`).match(/^socket:\[(\d+)\]$/);if(Q)F.set(parseInt(Q[1],10),N)}catch{continue}}return F}function v(){let F=new Map,K;try{K=U.readdirSync("/proc").filter((G)=>/^\d+$/.test(G))}catch{return F}for(let G of K){let N=parseInt(G,10);try{let j=U.readFileSync(`/proc/${N}/stat`,"utf-8"),z=j.lastIndexOf(")");if(z===-1)continue;let R=j.slice(z+2).split(" "),Q=parseInt(R[1],10);if(!isNaN(Q))F.set(N,Q)}catch{continue}}return F}function w(F){let K=new Map;for(let[j,z]of F){let J=K.get(z);if(!J)J=[],K.set(z,J);J.push(j)}let G=new Set,N=[];for(let[j,z]of F)if(z===0&&j!==1)G.add(j),N.push(j);while(N.length>0){let j=N.shift(),z=K.get(j);if(z){for(let J of z)if(!G.has(J))G.add(J),N.push(J)}}return G}function A(){function F(z){process.stdout.write(JSON.stringify(z)+`
-`)}F({type:"ready",pid:process.pid});let K="";function G(){let z="";try{z+=U.readFileSync("/proc/net/tcp","utf-8")}catch{}try{z+=U.readFileSync("/proc/net/tcp6","utf-8")}catch{}let J=L(z);if(J.length===0){if(K!=="")K="",F({type:"ports",ports:[]});return}let R=O(),Q=v(),X=w(Q),V=[];for(let{port:Y,inode:B}of J){let Z=R.get(B);if(Z!==void 0&&X.has(Z))V.push(Y)}let W=V.join(",");if(W!==K)K=W,F({type:"ports",ports:V})}G();let N=setInterval(G,1000),j="";process.stdin.setEncoding("utf-8"),process.stdin.on("data",(z)=>{j+=z;let J=j.split(`
-`);j=J.pop();for(let R of J){if(!R.trim())continue;try{let Q=JSON.parse(R);if(Q.type==="stop")clearInterval(N),process.exit(0);if(Q.type==="ping")F({type:"ready",pid:process.pid})}catch{}}}),process.stdin.on("end",()=>{clearInterval(N),process.exit(0)})}function C(F){let K=["127.0.0.1","::1"];function G(N){let j=$.createConnection({host:K[N],port:F},()=>{process.stdin.pipe(j),j.pipe(process.stdout)});j.on("error",(z)=>{if(z.code==="ECONNREFUSED"&&N+1<K.length){G(N+1);return}process.stderr.write(`bridge error: ${z.message}
-`),process.exit(1)}),j.on("close",()=>{process.exit(0)}),process.stdin.on("end",()=>{j.end()})}G(0)}var _=process.argv[2];if(_==="monitor")A();else if(_==="bridge"){let F=parseInt(process.argv[3],10);if(isNaN(F))process.stderr.write(`Usage: agent bridge <port>
-`),process.exit(1);C(F)}else process.stderr.write(`Usage: agent <monitor|bridge> [port]
+import*as U from"fs";import*as $ from"net";function L(G){let K=[],J=new Set,N=G.split(`
+`);for(let z=1;z<N.length;z++){let j=N[z].trim();if(!j)continue;let F=j.split(/\s+/),R=F[1],Q=F[3];if(!R||!Q)continue;if(Q!=="0A")continue;let X=R.split(":")[1];if(!X)continue;let V=parseInt(X,16);if(V<=0||J.has(V))continue;let W=F[9];if(!W)continue;let Y=parseInt(W,10);if(isNaN(Y))continue;J.add(V),K.push({port:V,inode:Y})}return K.sort((z,j)=>z.port-j.port)}function O(){let G=new Map,K;try{K=U.readdirSync("/proc").filter((J)=>/^\d+$/.test(J))}catch{return G}for(let J of K){let N=parseInt(J,10),z=`/proc/${N}/fd`,j;try{j=U.readdirSync(z)}catch{continue}for(let F of j)try{let Q=U.readlinkSync(`${z}/${F}`).match(/^socket:\[(\d+)\]$/);if(Q)G.set(parseInt(Q[1],10),N)}catch{continue}}return G}function v(){let G=new Map,K;try{K=U.readdirSync("/proc").filter((J)=>/^\d+$/.test(J))}catch{return G}for(let J of K){let N=parseInt(J,10);try{let z=U.readFileSync(`/proc/${N}/stat`,"utf-8"),j=z.lastIndexOf(")");if(j===-1)continue;let R=z.slice(j+2).split(" "),Q=parseInt(R[1],10);if(!isNaN(Q))G.set(N,Q)}catch{continue}}return G}function w(G){let K=new Map;for(let[z,j]of G){let F=K.get(j);if(!F)F=[],K.set(j,F);F.push(z)}let J=new Set,N=[];for(let[z,j]of G)if(j===0&&z!==1)J.add(z),N.push(z);while(N.length>0){let z=N.shift(),j=K.get(z);if(j){for(let F of j)if(!J.has(F))J.add(F),N.push(F)}}return J}function A(){function G(j){process.stdout.write(JSON.stringify(j)+`
+`)}G({type:"ready",pid:process.pid});let K="";function J(){let j="";try{j+=U.readFileSync("/proc/net/tcp","utf-8")}catch{}try{j+=U.readFileSync("/proc/net/tcp6","utf-8")}catch{}let F=L(j);if(F.length===0){if(K!=="")K="",G({type:"ports",ports:[]});return}let R=O(),Q=v(),X=w(Q),V=[];for(let{port:Y,inode:B}of F){let Z=R.get(B);if(Z!==void 0&&X.has(Z))V.push(Y)}let W=V.join(",");if(W!==K)K=W,G({type:"ports",ports:V})}J();let N=setInterval(J,1000),z="";process.stdin.setEncoding("utf-8"),process.stdin.on("data",(j)=>{z+=j;let F=z.split(`
+`);z=F.pop();for(let R of F){if(!R.trim())continue;try{let Q=JSON.parse(R);if(Q.type==="stop")clearInterval(N),process.exit(0);if(Q.type==="ping")G({type:"ready",pid:process.pid})}catch{}}}),process.stdin.on("end",()=>{clearInterval(N),process.exit(0)})}function C(G){let K=["127.0.0.1","::1"],J=!1;function N(z){let j=$.createConnection({host:K[z],port:G},()=>{J=!0,process.stdin.pipe(j),j.pipe(process.stdout)});j.on("error",(F)=>{if(!J&&F.code==="ECONNREFUSED"&&z+1<K.length){N(z+1);return}process.stderr.write(`bridge error: ${F.message}
+`),process.exit(1)}),j.on("close",()=>{if(J)process.exit(0)}),process.stdin.on("end",()=>{j.end()})}N(0)}var _=process.argv[2];if(_==="monitor")A();else if(_==="bridge"){let G=parseInt(process.argv[3],10);if(isNaN(G))process.stderr.write(`Usage: agent bridge <port>
+`),process.exit(1);C(G)}else process.stderr.write(`Usage: agent <monitor|bridge> [port]
 `),process.exit(1);

package/dist/agent-node.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import*as U from"node:fs";import*as $ from"node:net";function L(F){let K=[],G=new Set,N=F.split(`
-`);for(let j=1;j<N.length;j++){let z=N[j].trim();if(!z)continue;let J=z.split(/\s+/),R=J[1],Q=J[3];if(!R||!Q)continue;if(Q!=="0A")continue;let X=R.split(":")[1];if(!X)continue;let V=parseInt(X,16);if(V<=0||G.has(V))continue;let W=J[9];if(!W)continue;let Y=parseInt(W,10);if(isNaN(Y))continue;G.add(V),K.push({port:V,inode:Y})}return K.sort((j,z)=>j.port-z.port)}function O(){let F=new Map,K;try{K=U.readdirSync("/proc").filter((G)=>/^\d+$/.test(G))}catch{return F}for(let G of K){let N=parseInt(G,10),j=`/proc/${N}/fd`,z;try{z=U.readdirSync(j)}catch{continue}for(let J of z)try{let Q=U.readlinkSync(`${j}/${J}`).match(/^socket:\[(\d+)\]$/);if(Q)F.set(parseInt(Q[1],10),N)}catch{continue}}return F}function v(){let F=new Map,K;try{K=U.readdirSync("/proc").filter((G)=>/^\d+$/.test(G))}catch{return F}for(let G of K){let N=parseInt(G,10);try{let j=U.readFileSync(`/proc/${N}/stat`,"utf-8"),z=j.lastIndexOf(")");if(z===-1)continue;let R=j.slice(z+2).split(" "),Q=parseInt(R[1],10);if(!isNaN(Q))F.set(N,Q)}catch{continue}}return F}function w(F){let K=new Map;for(let[j,z]of F){let J=K.get(z);if(!J)J=[],K.set(z,J);J.push(j)}let G=new Set,N=[];for(let[j,z]of F)if(z===0&&j!==1)G.add(j),N.push(j);while(N.length>0){let j=N.shift(),z=K.get(j);if(z){for(let J of z)if(!G.has(J))G.add(J),N.push(J)}}return G}function A(){function F(z){process.stdout.write(JSON.stringify(z)+`
-`)}F({type:"ready",pid:process.pid});let K="";function G(){let z="";try{z+=U.readFileSync("/proc/net/tcp","utf-8")}catch{}try{z+=U.readFileSync("/proc/net/tcp6","utf-8")}catch{}let J=L(z);if(J.length===0){if(K!=="")K="",F({type:"ports",ports:[]});return}let R=O(),Q=v(),X=w(Q),V=[];for(let{port:Y,inode:B}of J){let Z=R.get(B);if(Z!==void 0&&X.has(Z))V.push(Y)}let W=V.join(",");if(W!==K)K=W,F({type:"ports",ports:V})}G();let N=setInterval(G,1000),j="";process.stdin.setEncoding("utf-8"),process.stdin.on("data",(z)=>{j+=z;let J=j.split(`
-`);j=J.pop();for(let R of J){if(!R.trim())continue;try{let Q=JSON.parse(R);if(Q.type==="stop")clearInterval(N),process.exit(0);if(Q.type==="ping")F({type:"ready",pid:process.pid})}catch{}}}),process.stdin.on("end",()=>{clearInterval(N),process.exit(0)})}function C(F){let K=["127.0.0.1","::1"];function G(N){let j=$.createConnection({host:K[N],port:F},()=>{process.stdin.pipe(j),j.pipe(process.stdout)});j.on("error",(z)=>{if(z.code==="ECONNREFUSED"&&N+1<K.length){G(N+1);return}process.stderr.write(`bridge error: ${z.message}
-`),process.exit(1)}),j.on("close",()=>{process.exit(0)}),process.stdin.on("end",()=>{j.end()})}G(0)}var _=process.argv[2];if(_==="monitor")A();else if(_==="bridge"){let F=parseInt(process.argv[3],10);if(isNaN(F))process.stderr.write(`Usage: agent bridge <port>
-`),process.exit(1);C(F)}else process.stderr.write(`Usage: agent <monitor|bridge> [port]
+import*as U from"node:fs";import*as $ from"node:net";function L(G){let K=[],J=new Set,N=G.split(`
+`);for(let z=1;z<N.length;z++){let j=N[z].trim();if(!j)continue;let F=j.split(/\s+/),R=F[1],Q=F[3];if(!R||!Q)continue;if(Q!=="0A")continue;let X=R.split(":")[1];if(!X)continue;let V=parseInt(X,16);if(V<=0||J.has(V))continue;let W=F[9];if(!W)continue;let Y=parseInt(W,10);if(isNaN(Y))continue;J.add(V),K.push({port:V,inode:Y})}return K.sort((z,j)=>z.port-j.port)}function O(){let G=new Map,K;try{K=U.readdirSync("/proc").filter((J)=>/^\d+$/.test(J))}catch{return G}for(let J of K){let N=parseInt(J,10),z=`/proc/${N}/fd`,j;try{j=U.readdirSync(z)}catch{continue}for(let F of j)try{let Q=U.readlinkSync(`${z}/${F}`).match(/^socket:\[(\d+)\]$/);if(Q)G.set(parseInt(Q[1],10),N)}catch{continue}}return G}function v(){let G=new Map,K;try{K=U.readdirSync("/proc").filter((J)=>/^\d+$/.test(J))}catch{return G}for(let J of K){let N=parseInt(J,10);try{let z=U.readFileSync(`/proc/${N}/stat`,"utf-8"),j=z.lastIndexOf(")");if(j===-1)continue;let R=z.slice(j+2).split(" "),Q=parseInt(R[1],10);if(!isNaN(Q))G.set(N,Q)}catch{continue}}return G}function w(G){let K=new Map;for(let[z,j]of G){let F=K.get(j);if(!F)F=[],K.set(j,F);F.push(z)}let J=new Set,N=[];for(let[z,j]of G)if(j===0&&z!==1)J.add(z),N.push(z);while(N.length>0){let z=N.shift(),j=K.get(z);if(j){for(let F of j)if(!J.has(F))J.add(F),N.push(F)}}return J}function A(){function G(j){process.stdout.write(JSON.stringify(j)+`
+`)}G({type:"ready",pid:process.pid});let K="";function J(){let j="";try{j+=U.readFileSync("/proc/net/tcp","utf-8")}catch{}try{j+=U.readFileSync("/proc/net/tcp6","utf-8")}catch{}let F=L(j);if(F.length===0){if(K!=="")K="",G({type:"ports",ports:[]});return}let R=O(),Q=v(),X=w(Q),V=[];for(let{port:Y,inode:B}of F){let Z=R.get(B);if(Z!==void 0&&X.has(Z))V.push(Y)}let W=V.join(",");if(W!==K)K=W,G({type:"ports",ports:V})}J();let N=setInterval(J,1000),z="";process.stdin.setEncoding("utf-8"),process.stdin.on("data",(j)=>{z+=j;let F=z.split(`
+`);z=F.pop();for(let R of F){if(!R.trim())continue;try{let Q=JSON.parse(R);if(Q.type==="stop")clearInterval(N),process.exit(0);if(Q.type==="ping")G({type:"ready",pid:process.pid})}catch{}}}),process.stdin.on("end",()=>{clearInterval(N),process.exit(0)})}function C(G){let K=["127.0.0.1","::1"],J=!1;function N(z){let j=$.createConnection({host:K[z],port:G},()=>{J=!0,process.stdin.pipe(j),j.pipe(process.stdout)});j.on("error",(F)=>{if(!J&&F.code==="ECONNREFUSED"&&z+1<K.length){N(z+1);return}process.stderr.write(`bridge error: ${F.message}
+`),process.exit(1)}),j.on("close",()=>{if(J)process.exit(0)}),process.stdin.on("end",()=>{j.end()})}N(0)}var _=process.argv[2];if(_==="monitor")A();else if(_==="bridge"){let G=parseInt(process.argv[3],10);if(isNaN(G))process.stderr.write(`Usage: agent bridge <port>
+`),process.exit(1);C(G)}else process.stderr.write(`Usage: agent <monitor|bridge> [port]
 `),process.exit(1);

package/dist/index.js

@@ -601,6 +601,9 @@ async function commandUp(opts) {
     info("Shutting down...");
     monitor.stop();
     portManager.shutdown();
+    const pkill = Bun.spawn(["pkill", "-f", `docker exec.*${containerId}`], { stdout: "pipe", stderr: "pipe" });
+    await pkill.exited;
+    await Bun.sleep(100);
     info("Stopping container...");
     const stopProc = Bun.spawn(["docker", "stop", containerId], {
       stdout: "pipe",
@@ -633,6 +636,11 @@ async function commandDown(opts) {
       debug("devcon process already exited");
     }
   }
+  if (state?.containerId) {
+    const pkill = Bun.spawn(["pkill", "-f", `docker exec.*${state.containerId}`], { stdout: "pipe", stderr: "pipe" });
+    await pkill.exited;
+    await Bun.sleep(100);
+  }
   info("Stopping devcontainer...");
   const proc = Bun.spawn(["devcontainer", "down", "--workspace-folder", workspaceFolder], { stdout: "inherit", stderr: "inherit" });
   const exitCode = await proc.exited;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devcon-cli",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Devcontainer CLI with automatic port forwarding",
   "type": "module",
   "scripts": {