Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ jobs:
include:
- name: macOS
os: macos-latest
node_version: '18'
node_version: '24'
only_minspec: false
- name: Linux
os: ubuntu-22.04
node_version: '18'
node_version: '24'
only_minspec: false
- name: LinuxMinspec
os: ubuntu-22.04
node_version: '18'
node_version: '24'
only_minspec: true
- name: Windows
os: windows-latest
node_version: '18'
node_version: '24'
only_minspec: false
name: ${{ matrix.name }}
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -65,6 +65,9 @@ jobs:
- name: Type checking
run: npm run test:types

- name: Unit tests
run: npm run test:unit

- name: Lint checking
if: ${{ env.DISABLE_LINT_FOR_NOW != 'true' && !matrix.only_minspec }}
run: npm run test:lint
82 changes: 7 additions & 75 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"eslint-visitor-keys": "^3.4.3",
"execa": "^5.1.1",
"glob-stream": "^8.0.0",
"got": "^15.0.5",
"got": "^16.0.0",
"inversify": "^6.0.2",
"js-xxhash": "^3.0.1",
"jsonc-parser": "^3.3.1",
Expand Down Expand Up @@ -163,5 +163,13 @@
],
"overrides": {
"serialize-javascript": ">=7.0.5"
},
"allowScripts": {
"fsevents@2.3.2": true,
"fsevents@1.2.13": true,
"fsevents@2.3.3": true,
"@vscode/vsce-sign@2.0.9": true,
"keytar@7.7.0": true,
"microtime@3.0.0": true
}
}
1 change: 1 addition & 0 deletions src/common/urlUtils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ describe('urlUtils', () => {
beforeEach(() => {
lookupStub = stub(dns, 'lookup');
lookupStub.callThrough();
lookupStub.withArgs('totes invalid').rejects();
lookupStub.withArgs('contoso.com').resolves({ address: '1.1.1.1' });
lookupStub.withArgs('local.contoso.com').resolves({ address: '127.0.0.1' });
});
Expand Down
51 changes: 51 additions & 0 deletions src/targets/browser/spawn/endpoints.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*---------------------------------------------------------
* Copyright (C) Microsoft Corporation. All rights reserved.
*--------------------------------------------------------*/

import { expect } from 'chai';
import { createServer } from 'http';
import { AddressInfo } from 'net';
import { NeverCancelled } from '../../../common/cancellation';
import { Logger } from '../../../common/logging/logger';
import { delay } from '../../../common/promiseUtil';
import { getWSEndpoint } from './endpoints';

describe('endpoint discovery', () => {
it('discovers an IPv4 only target through localhost without request errors', async function() {
this.timeout(5000);

const server = createServer((request, response) => {
response.setHeader('content-type', 'application/json');
response.end(
request.url === '/json/list'
? JSON.stringify([{ webSocketDebuggerUrl: `ws://127.0.0.1:${port}/target` }])
: JSON.stringify({}),
);
});

await new Promise<void>((resolve, reject) => {
server.once('error', reject);
server.listen(0, '127.0.0.1', resolve);
});

const port = (server.address() as AddressInfo).port;
try {
expect(
await getWSEndpoint(
`http://localhost:${port}`,
NeverCancelled,
Logger.null,
true,
),
).to.equal(`ws://127.0.0.1:${port}/target`);

// A cancelled failed probe used to surface a retry error after discovery succeeded.
await delay(1500);
} finally {
server.closeAllConnections();
await new Promise<void>((resolve, reject) => {
server.close(error => (error ? reject(error) : resolve()));
});
}
});
});
Loading