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.

Sign up for GitHub

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

chore(devtools-proxy-support): use socksv5 fork COMPASS-5472 #443

Merged
merged 1 commit into from
Aug 7, 2024
Merged

chore(devtools-proxy-support): use socksv5 fork COMPASS-5472 #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
87 changes: 22 additions & 65 deletions package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion packages/devtools-proxy-support/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
"reformat": "npm run prettier -- --write ."
},
"dependencies": {
"@mongodb-js/socksv5": "^0.0.10",
"agent-base": "^7.1.1",
"node-fetch": "^3.3.2",
"proxy-agent": "^6.4.0",
"ssh2": "^1.15.0",
"socksv5": "^0.0.6",
"system-ca": "^2.0.0"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/devtools-proxy-support/src/socks5.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { useOrCreateAgent } from './agent';

// The socksv5 module is not bundle-able by itself, so we get the
// subpackages directly
import socks5Server from 'socksv5/lib/server';
import socks5AuthNone from 'socksv5/lib/auth/None';
import socks5AuthUserPassword from 'socksv5/lib/auth/UserPassword';
import socks5Server from '@mongodb-js/socksv5/lib/server';
import socks5AuthNone from '@mongodb-js/socksv5/lib/auth/None';
import socks5AuthUserPassword from '@mongodb-js/socksv5/lib/auth/UserPassword';
import { promisify } from 'util';
import { isIPv6 } from 'net';
import type { Socket } from 'net';
Expand Down
6 changes: 3 additions & 3 deletions packages/devtools-proxy-support/src/socksv5.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
declare module 'socksv5/lib/server' {
declare module '@mongodb-js/socksv5/lib/server' {
const mod: any;
export = mod;
}
declare module 'socksv5/lib/auth/None' {
declare module '@mongodb-js/socksv5/lib/auth/None' {
const mod: any;
export = mod;
}
declare module 'socksv5/lib/auth/UserPassword' {
declare module '@mongodb-js/socksv5/lib/auth/UserPassword' {
const mod: any;
export = mod;
}
6 changes: 3 additions & 3 deletions packages/devtools-proxy-support/test/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import { Server as SSHServer } from 'ssh2';
import DuplexPair from 'duplexpair';
import { promisify } from 'util';

import socks5Server from 'socksv5/lib/server';
import socks5AuthNone from 'socksv5/lib/auth/None';
import socks5AuthUserPassword from 'socksv5/lib/auth/UserPassword';
import socks5Server from '@mongodb-js/socksv5/lib/server';
import socks5AuthNone from '@mongodb-js/socksv5/lib/auth/None';
import socks5AuthUserPassword from '@mongodb-js/socksv5/lib/auth/UserPassword';
import type { Duplex } from 'stream';

function parseHTTPAuthHeader(header: string | undefined): [string, string] {
Expand Down
6 changes: 3 additions & 3 deletions packages/devtools-proxy-support/test/socksv5.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
declare module 'socksv5/lib/server' {
declare module '@mongodb-js/socksv5/lib/server' {
const mod: any;
export = mod;
}
declare module 'socksv5/lib/auth/None' {
declare module '@mongodb-js/socksv5/lib/auth/None' {
const mod: any;
export = mod;
}
declare module 'socksv5/lib/auth/UserPassword' {
declare module '@mongodb-js/socksv5/lib/auth/UserPassword' {
const mod: any;
export = mod;
}
Loading