In case of cli, observe the process with the PID from the Init packet

Author: zobo

src/cloud.ts

@@ -4,7 +4,7 @@ import { Transport, DbgpConnection, ENCODING } from './dbgp'
 import * as tls from 'tls'
 import * as iconv from 'iconv-lite'
 import * as xdebug from './xdebugConnection'
-import { EventEmitter } from 'stream'
+import { EventEmitter } from 'events'
 
 export declare interface XdebugCloudConnection {
     on(event: 'error', listener: (error: Error) => void): this

src/phpDebug.ts

@@ -8,7 +8,7 @@ import * as childProcess from 'child_process'
 import * as path from 'path'
 import * as util from 'util'
 import * as fs from 'fs'
-import { Terminal, IProgram, ProgramPidWrapper } from './terminal'
+import { Terminal, IProgram, ProgramPidWrapper, isProcessAlive } from './terminal'
 import { convertClientPathToDebugger, convertDebuggerPathToClient, isPositiveMatchInGlobs } from './paths'
 import minimatch from 'minimatch'
 import { BreakpointManager, BreakpointAdapter } from './breakpoints'
@@ -514,6 +514,21 @@ class PhpDebugSession extends vscode.DebugSession {
     private async initializeConnection(connection: xdebug.Connection): Promise<void> {
         const initPacket = await connection.waitForInitPacket()
 
+        // track the process, if we asked the IDE to spawn it
+        if (
+            !this._phpProcess &&
+            (this._args.program || this._args.runtimeArgs) &&
+            initPacket.appid &&
+            isProcessAlive(parseInt(initPacket.appid))
+        ) {
+            this._phpProcess = new ProgramPidWrapper(parseInt(initPacket.appid))
+            // we only do this for CLI mode. In normal listen mode, only a thread exited event is send.
+            this._phpProcess.on('exit', (code: number | null) => {
+                this.sendEvent(new vscode.ExitedEvent(code ?? 0))
+                this.sendEvent(new vscode.TerminatedEvent())
+            })
+        }
+
         // check if this connection should be skipped
         if (
             this._args.skipEntryPaths &&
@@ -1448,10 +1463,8 @@ class PhpDebugSession extends vscode.DebugSession {
                 }
             }
             // If launched as CLI, kill process
-            if (this._phpProcess?.pid) {
-                Terminal.killTree(this._phpProcess.pid).catch(err =>
-                    this.sendEvent(new vscode.OutputEvent(`killTree: ${err as string}\n`))
-                )
+            if (this._phpProcess) {
+                this._phpProcess.kill()
             }
         } catch (error) {
             this.sendErrorResponse(response, error as Error)

src/terminal.ts

@@ -6,7 +6,7 @@
 import * as Path from 'path'
 import * as FS from 'fs'
 import * as CP from 'child_process'
-import { EventEmitter } from 'stream'
+import { EventEmitter } from 'events'
 
 export class Terminal {
     private static _terminalService: ITerminalService
@@ -61,11 +61,11 @@ export class ProgramPidWrapper extends EventEmitter implements IProgram {
     /**
      * How often to check and see if the process exited after we send a close signal.
      */
-    //private static readonly killConfirmInterval = 200;
+    private static readonly killConfirmInterval = 200
 
     private loop?: { timer: NodeJS.Timeout; processId: number }
 
-    constructor(readonly pid?: number) {
+    constructor(readonly pid: number) {
         super()
 
         if (pid) {
@@ -74,7 +74,11 @@ export class ProgramPidWrapper extends EventEmitter implements IProgram {
     }
 
     kill(signal?: number | NodeJS.Signals | undefined): boolean {
-        return false
+        this.startPollLoop(this.pid, ProgramPidWrapper.killConfirmInterval)
+        Terminal.killTree(this.pid).catch(err => {
+            // ignore
+        })
+        return true
     }
 
     private startPollLoop(processId: number, interval = ProgramPidWrapper.terminationPollInterval) {
@@ -95,7 +99,7 @@ export class ProgramPidWrapper extends EventEmitter implements IProgram {
         this.loop = loop
     }
 }
-function isProcessAlive(processId: number) {
+export function isProcessAlive(processId: number) {
     try {
         // kill with signal=0 just test for whether the proc is alive. It throws if not.
         process.kill(processId, 0)

src/xdebugConnection.ts

@@ -18,6 +18,8 @@ export class InitPacket {
     engineVersion: string
     /** the name of the engine */
     engineName: string
+    /** the internal PID */
+    appid: string
     /**
      * @param  {XMLDocument} document - An XML document to read from
      * @param  {Connection} connection
@@ -30,6 +32,7 @@ export class InitPacket {
         this.ideKey = documentElement.getAttribute('idekey')!
         this.engineVersion = documentElement.getElementsByTagName('engine').item(0)?.getAttribute('version') ?? ''
         this.engineName = documentElement.getElementsByTagName('engine').item(0)?.textContent ?? ''
+        this.appid = documentElement.getAttribute('appid') ?? ''
         this.connection = connection
     }
 }