Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add DBGP proxy support, with client local port #378

Closed
wants to merge 35 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
85f74a5
chore(settings.json): added markdownlint configs
SidIcarus Jun 25, 2018
fb1a942
style(README): formatted
SidIcarus Oct 15, 2018
2989a48
docs(README): added proxy debugging info
SidIcarus Jun 25, 2018
9d803b8
docs(README): updated contribution steps and formatting
SidIcarus Jul 2, 2018
edc55fb
docs(package): added proxy args
SidIcarus Jun 29, 2018
c835a0b
feat(proxy): support for dbgp proxy connections
towhidabsar Jun 29, 2018
7b2e2f8
test(proxy): unit tests
towhidabsar Jun 29, 2018
3c8ee4a
chore(tasks): use non-deprecated options
SidIcarus Apr 7, 2019
6c448ce
style(tasks): alphabetically sort options
SidIcarus Apr 7, 2019
1c9a951
fix: update `ProcessEnv`-esque properties to match interface
SidIcarus Apr 7, 2019
c12f28e
refactor(test): move retrieval of environment variables outside of tests
SidIcarus Apr 7, 2019
dc96534
style(README): move description below item
SidIcarus Apr 7, 2019
922409a
fix(README): incorrect badge link
SidIcarus Apr 7, 2019
3e01059
style(readme): clean up shortcut url naming convention
SidIcarus Apr 7, 2019
7f6a07a
style(terminal): auto formatting
SidIcarus Apr 7, 2019
a72d7ee
feat(test): move travis `before_install` steps into their own file
SidIcarus Apr 8, 2019
182cda0
fix(proxyConnect): let `msgs` key types be inferred
SidIcarus Apr 29, 2019
0c1ba35
refactor(option): use bool v. num to improve clarity in the options
SidIcarus Apr 29, 2019
8be4919
fix(proxyConnect): add `ProxyMessages` interface and make `socket` pr…
towhidabsar Apr 29, 2019
cafeeec
fix(proxyConnect): run prettier
towhidabsar Apr 29, 2019
99ee211
fix(proxy): remove console.log
towhidabsar Apr 29, 2019
fe122c5
Send to proxy the IDE port, not the proxy port.
zobo Jul 7, 2019
63008f5
If using proxy and no specific IDE port is set, let the OS choose a r…
zobo Jul 7, 2019
1a1ed7e
Change port parameter of sendProxyInitCommand.
zobo Nov 15, 2019
027eb92
Packages update.
zobo Nov 15, 2019
e5e7e51
style fix
zobo Nov 15, 2019
8b1b1d9
Fixing register info text
zobo Nov 15, 2019
15c6fd9
Fix test, missing configurationDone, that will trigger step_into dbgp…
zobo Nov 16, 2019
f6c9841
Fix travis build on macos, native php (7.1.23) conflicts with brew ph…
zobo Nov 16, 2019
a1213d1
Refactored ProxyConnect to use Promises for both commands.
zobo Nov 22, 2019
40ee929
Upgrade contributes definition.
zobo Nov 22, 2019
bb16621
Move IDEKEY to settings and reference from launch.json
zobo Nov 22, 2019
3888c3c
Changed chmod on file, removed from .travis.yml
zobo Nov 22, 2019
dae7145
Reverting parts of travis config.
zobo Nov 22, 2019
819b1b0
Updating PHP and XDebug versions for appveyor and travis, removing ma…
zobo Nov 22, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 8 additions & 28 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
language: php

php:
- '7.3'
- '5.6'
- '7.1'
env:
global:
- NODE_VERSION=8.9.3
- NPM_VERSION=^6.3.0
- BUILD_LEADER_ID=4
matrix:
- XDEBUG_VERSION=2.5.5
- XDEBUG_VERSION=2.8.0
- XDEBUG_VERSION=2.7.2

sudo: false

Expand All @@ -18,11 +19,12 @@ cache:
- $HOME/.npm

before_install:
- pecl install xdebug-$XDEBUG_VERSION
- pecl channel-update pecl.php.net
- pecl install xdebug-${XDEBUG_VERSION} || true
- phpenv config-add travis-php.ini
- nvm install $NODE_VERSION
- nvm use $NODE_VERSION
- npm install -g npm@$NPM_VERSION --depth 0
- nvm install ${NODE_VERSION}
- nvm use ${NODE_VERSION}
- npm install -g npm@${NPM_VERSION} --depth 0

install:
- npm ci
Expand All @@ -38,28 +40,6 @@ after_success:

jobs:
include:
- stage: test
os: osx
osx_image: xcode9.1
language: generic
before_install:
# Fix ruby error https://github.com/Homebrew/brew/issues/3299
- brew update
- brew install [email protected]
- brew link --force --overwrite [email protected]
- mkdir -p /usr/local/etc/php/7.1/conf.d
- cp travis-php.ini /usr/local/etc/php/7.1/conf.d/
# see per https://javorszky.co.uk/2018/05/03/getting-xdebug-working-on-php-7-2-and-homebrew/
# avoid problems with brew's symlink and pecl's recursive mkdir
- rm /usr/local/Cellar/[email protected]/7.1.26/pecl
- pecl install xdebug-$XDEBUG_VERSION
# make xdebug.so available at pecl's expected location
- ln -s /usr/local/Cellar/[email protected]/7.1.26/pecl/ /usr/local/lib/php/pecl
- php -i
- source ~/.nvm/nvm.sh
- nvm install $NODE_VERSION
- nvm use $NODE_VERSION
- npm install -g npm@$NPM_VERSION --depth 0
- stage: release
language: node_js
node_js: '8'
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"type": "node",
"request": "launch",
"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
"args": ["out/test", "--no-timeouts", "--colors"],
"args": ["out/test/proxy.js", "--no-timeouts", "--colors"],
"cwd": "${workspaceRoot}",
"sourceMaps": true,
"outDir": "${workspaceRoot}/out"
Expand Down
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
"eslint.enable": false,
"editor.insertSpaces": true,
"editor.tabSize": 4,
"markdownlint.config": {
"default": true,
"MD003": { "style": "atx" },
"MD007": { "indent": 2 },
"MD024": { "siblings_only": true }
},
"tslint.ignoreDefinitionFiles": true,
"typescript.tsdk": "./node_modules/typescript/lib"
}
29 changes: 18 additions & 11 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,35 @@
{
"version": "0.1.0",
"command": "npm",
"args": ["run", "--silent"],
"command": "npm",
"options": {
"env": {
"VSCODE_DEBUG_PORT": "4711"
}
},
"isShellCommand": true,
"showOutput": "silent",
"presentation": {
"clear": false,
"echo": true,
"focus": false,
"panel": "shared",
"reveal": "silent",
"showReuseMessage": true
},
"tasks": [
{
"taskName": "compile",
"isBuildCommand": true,
"group": "build",
"label": "compile",
"problemMatcher": "$tsc"
},
{
"taskName": "watch",
"isWatching": true,
"isBackground": true,
"label": "watch",
"problemMatcher": "$tsc-watch"
},
{
"taskName": "test",
"isTestCommand": true
"group": "test",
"label": "test"
}
]
],
"type": "shell",
"version": "2.0.0"
}
317 changes: 264 additions & 53 deletions README.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ environment:
NODE_VERSION: '8.9.3'
NPM_VERSION: '^6.3.0'
matrix:
- { PHP_VERSION: '7.0.20', VC_VERSION: '14', XDEBUG_VERSION: '2.5.5' }
- { PHP_VERSION: '5.6.30', VC_VERSION: '11', XDEBUG_VERSION: '2.5.5' }
- { PHP_VERSION: '7.3.12', VC_VERSION: '15', XDEBUG_VERSION: '2.8.0' }
- { PHP_VERSION: '7.1.27', VC_VERSION: '14', XDEBUG_VERSION: '2.5.5' }

install:
- ps: . .\appveyor-install.ps1
Expand Down
Loading