Use provided control socket path in init packet.

Author: zobo

CHANGELOG.md

@@ -4,10 +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/).
 
-
 ## [Unreleased]
 
 - Xdebug control socket support for pause on Linux and Windows.
+
 ## [1.35.0]
 
 - Support for DBGp stream command

src/controlSocket.ts

@@ -20,32 +20,34 @@ export class ControlSocket {
             this.supportedPlatform() &&
             initPacket.engineName === 'Xdebug' &&
             semver.valid(initPacket.engineVersion, { loose: true }) !== null &&
-            (semver.gte(initPacket.engineVersion, '3.4.0', { loose: true }) || initPacket.engineVersion === '3.4.0-dev')
+            (semver.gte(initPacket.engineVersion, '3.4.0', { loose: true }) ||
+                initPacket.engineVersion.startsWith('3.4.0'))
         )
     }
 
     /**
      *
-     * @param pid appId returned in the init packet
+     * @param ctrlSocket Control socket full path
      * @returns
      */
-    async requestPause(pid: string): Promise<void> {
+    async requestPause(ctrlSocket: string): Promise<void> {
         let retval
         if (process.platform === 'linux') {
-            retval = await this.executeLinux(pid, 'pause')
+            retval = await this.executeLinux(ctrlSocket, 'pause')
         } else if (process.platform === 'win32') {
-            retval = await this.executeWindows(pid, 'pause')
+            retval = await this.executeWindows(ctrlSocket, 'pause')
         } else {
             throw new Error('Invalid platform for Xdebug control socket')
         }
         retval
         return
     }
 
-    private async executeLinux(pid: string, cmd: string): Promise<string> {
+    private async executeLinux(ctrlSocket: string, cmd: string): Promise<string> {
         const abs = await import('abstract-socket')
         return new Promise<string>((resolve, reject) => {
-            const cs = `\0xdebug-ctrl.${pid}y`.padEnd(108, 'x')
+            // const cs = `\0xdebug-ctrl.${pid}y`.padEnd(108, 'x')
+            const cs = `\0${ctrlSocket}`
             try {
                 const s = abs.connect(cs, () => {
                     s.write(`${cmd}\0`)
@@ -81,9 +83,10 @@ export class ControlSocket {
         })
     }
 
-    private async executeWindows(pid: string, cmd: string): Promise<string> {
+    private async executeWindows(ctrlSocket: string, cmd: string): Promise<string> {
         return new Promise<string>((resolve, reject) => {
-            const s = net.createConnection(`\\\\.\\pipe\\xdebug-ctrl.${pid}`, () => {
+            //const s = net.createConnection(`\\\\.\\pipe\\xdebug-ctrl.${pid}`, () => {
+            const s = net.createConnection(ctrlSocket, () => {
                 s.end(`${cmd}\0`)
             })
             s.setTimeout(3000)

src/phpDebug.ts

@@ -1399,7 +1399,7 @@ class PhpDebugSession extends vscode.DebugSession {
                 this._skippingFiles.set(args.threadId, false)
             }
             try {
-                await controlSocket.requestPause(initPacket.appId)
+                await controlSocket.requestPause(initPacket.ctrlSocket)
                 this.sendResponse(response)
                 return
             } catch (error) {

src/xdebugConnection.ts

@@ -20,6 +20,8 @@ export class InitPacket {
     engineName: string
     /** the app id (PID) */
     appId: string
+    /** the control socket path */
+    ctrlSocket: string
     /**
      * @param  {XMLDocument} document - An XML document to read from
      * @param  {Connection} connection
@@ -33,6 +35,7 @@ export class InitPacket {
         this.engineVersion = documentElement.getElementsByTagName('engine').item(0)?.getAttribute('version') ?? ''
         this.engineName = documentElement.getElementsByTagName('engine').item(0)?.textContent ?? ''
         this.appId = documentElement.getAttribute('appid') ?? ''
+        this.ctrlSocket = documentElement.getAttributeNS('https://xdebug.org/dbgp/xdebug', 'ctrl_socket') ?? ''
         this.connection = connection
     }
 }