feat: Add support for runInTerminal request

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.35.0]
+
+- Support for console option with internalConsole, integratedTerminal and externalTerminal options.
+
 ## [1.34.0]
 
 - Partial support for virtual workspaces

README.md

@@ -97,7 +97,8 @@ Options specific to CLI debugging:
 - `cwd`: The current working directory to use when launching the script
 - `runtimeExecutable`: Path to the PHP binary used for launching the script. By default the one on the PATH.
 - `runtimeArgs`: Additional arguments to pass to the PHP binary
-- `externalConsole`: Launches the script in an external console window instead of the debug console (default: `false`)
+- `externalConsole`: _DEPRECATED_ Launches the script in an external console window instead of the debug console (default: `false`)
+- `console`: What kind of console to use for running the script. Possible values are: `internalConsole` (default), `integratedTerminal` or `externalTerminal`.
 - `env`: Environment variables to pass to the script
 - `envFile`: Optional path to a file containing environment variable definitions
 

package.json

@@ -201,9 +201,14 @@
               },
               "externalConsole": {
                 "type": "boolean",
-                "description": "Launch debug target in external console.",
+                "description": "DEPRECATED: Launch debug target in external console.",
                 "default": false
               },
+              "console": {
+                "enum": ["internalConsole", "integratedTerminal", "externalTerminal"],
+                "description": "Where to launch the debug target: internal console, integrated terminal, or external terminal",
+                "default": "internalConsole"
+              },
               "args": {
                 "type": "array",
                 "description": "Command line arguments passed to the program.",

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 path from 'path'
 import * as util from 'util'
 import * as fs from 'fs'
-import { Terminal } from './terminal'
+import { Terminal, IProgram, ProgramPidWrapper, isProcessAlive } from './terminal'
 import { convertClientPathToDebugger, convertDebuggerPathToClient, isPositiveMatchInGlobs } from './paths'
 import minimatch from 'minimatch'
 import { BreakpointManager, BreakpointAdapter } from './breakpoints'
@@ -115,19 +115,24 @@
     env?: { [key: string]: string }
     /** Absolute path to a file containing environment variable definitions. */
     envFile?: string
-    /** If true launch the target in an external console. */
+    /** DEPRECATED: If true launch the target in an external console. */
     externalConsole?: boolean
+    /** Where to launch the debug target: internal console, integrated terminal, or external terminal. */
+    console?: 'internalConsole' | 'integratedTerminal' | 'externalTerminal'
 }
 
 class PhpDebugSession extends vscode.DebugSession {
+    /** The arguments that were given to initializeRequest */
+    private _initializeArgs: VSCodeDebugProtocol.InitializeRequestArguments
+
     /** The arguments that were given to launchRequest */
     private _args: LaunchRequestArguments
 
     /** The TCP server that listens for Xdebug connections */
     private _server: net.Server
 
     /** The child process of the launched PHP script, if launched by the debug adapter */
-    private _phpProcess?: childProcess.ChildProcess
+    private _phpProcess?: IProgram
 
     /**
      * A map from VS Code thread IDs to Xdebug Connections.
@@ -211,6 +216,7 @@
         response: VSCodeDebugProtocol.InitializeResponse,
         args: VSCodeDebugProtocol.InitializeRequestArguments
     ): void {
+        this._initializeArgs = args
         response.body = {
             supportsConfigurationDoneRequest: true,
             supportsEvaluateForHovers: true,
@@ -287,29 +293,48 @@
             const program = args.program ? [args.program] : []
             const cwd = args.cwd || process.cwd()
             const env = Object.fromEntries(
-                Object.entries({ ...process.env, ...getConfiguredEnvironment(args) }).map(v => [
+                Object.entries(getConfiguredEnvironment(args)).map(v => [
                     v[0],
                     v[1]?.replace('${port}', port.toString()),
                 ])
             )
             // launch in CLI mode
-            if (args.externalConsole) {
-                const script = await Terminal.launchInTerminal(
-                    cwd,
-                    [runtimeExecutable, ...runtimeArgs, ...program, ...programArgs],
-                    env
-                )
+            if (args.externalConsole || args.console == 'integratedTerminal' || args.console == 'externalTerminal') {
+                let script: IProgram | undefined
+                if (this._initializeArgs.supportsRunInTerminalRequest) {
+                    const kind: 'integrated' | 'external' =
+                        args.externalConsole || args.console === 'externalTerminal' ? 'external' : 'integrated'
+                    const ritr = await new Promise<VSCodeDebugProtocol.RunInTerminalResponse>((resolve, reject) => {
+                        this.runInTerminalRequest(
+                            { args: [runtimeExecutable, ...runtimeArgs, ...program, ...programArgs], env, cwd, kind },
+                            5000,
+                            resolve
+                        )
+                    })
+                    script =
+                        ritr.success && ritr.body.shellProcessId
+                            ? new ProgramPidWrapper(ritr.body.shellProcessId)
+                            : undefined
+                } else {
+                    script = await Terminal.launchInTerminal(
+                        cwd,
+                        [runtimeExecutable, ...runtimeArgs, ...program, ...programArgs],
+                        env
+                    )
+                }
+
                 if (script) {
                     // we only do this for CLI mode. In normal listen mode, only a thread exited event is send.
                     script.on('exit', (code: number | null) => {
                         this.sendEvent(new vscode.ExitedEvent(code ?? 0))
                         this.sendEvent(new vscode.TerminatedEvent())
                     })
                 }
+                // this._phpProcess = script
             } else {
                 const script = childProcess.spawn(runtimeExecutable, [...runtimeArgs, ...program, ...programArgs], {
                     cwd,
-                    env,
+                    env: { ...process.env, ...env },
                 })
                 // redirect output to debug console
                 script.stdout.on('data', (data: Buffer) => {
@@ -489,6 +514,21 @@
     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 &&

src/terminal.ts

@@ -6,6 +6,7 @@
 import * as Path from 'path'
 import * as FS from 'fs'
 import * as CP from 'child_process'
+import { EventEmitter } from 'events'
 
 export class Terminal {
     private static _terminalService: ITerminalService
@@ -45,6 +46,69 @@
     }
 }
 
+export interface IProgram {
+    readonly pid?: number | undefined
+    kill(signal?: NodeJS.Signals | number): boolean
+    on(event: 'exit', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this
+}
+
+export class ProgramPidWrapper extends EventEmitter implements IProgram {
+    /**
+     * How often to check and see if the process exited.
+     */
+    private static readonly terminationPollInterval = 1000
+
+    /**
+     * How often to check and see if the process exited after we send a close signal.
+     */
+    private static readonly killConfirmInterval = 200
+
+    private loop?: { timer: NodeJS.Timeout; processId: number }
+
+    constructor(readonly pid: number) {
+        super()
+
+        if (pid) {
+            this.startPollLoop(pid)
+        }
+    }
+
+    kill(signal?: number | NodeJS.Signals | undefined): boolean {
+        this.startPollLoop(this.pid, ProgramPidWrapper.killConfirmInterval)
+        Terminal.killTree(this.pid).catch(err => {
+            // ignore
+        })
+        return true
+    }
+
+    private startPollLoop(processId: number, interval = ProgramPidWrapper.terminationPollInterval) {
+        if (this.loop) {
+            clearInterval(this.loop.timer)
+        }
+
+        const loop = {
+            processId,
+            timer: setInterval(() => {
+                if (!isProcessAlive(processId)) {
+                    clearInterval(loop.timer)
+                    this.emit('exit')
+                }
+            }, interval),
+        }
+
+        this.loop = loop
+    }
+}
+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)
+        return true
+    } catch {
+        return false
+    }
+}
+
 interface ITerminalService {
     launchInTerminal(
         dir: string,

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
     }
 }