Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: TooTallNate/proxy-agents
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: https-proxy-agent@7.0.0
Choose a base ref
...
head repository: TooTallNate/proxy-agents
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: https-proxy-agent@7.0.1
Choose a head ref
  • 18 commits
  • 14 files changed
  • 4 contributors

Commits on May 25, 2023

  1. Use pnpm publish -r to publish packages (#193)

    Following the instructions here: https://pnpm.io/using-changesets
    
    Also includes a script to create the appropriate git tags, since `pnpm publish -r`
    does not create any tags, whereas `changeset publish` does.
    TooTallNate authored May 25, 2023
    1
    Copy the full SHA
    2d5f9af View commit details
  2. Debugging tags script

    TooTallNate committed May 25, 2023
    1
    Copy the full SHA
    ea6982d View commit details
  3. .

    TooTallNate committed May 25, 2023
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6972c40 View commit details
  4. .

    TooTallNate committed May 25, 2023
    1
    Copy the full SHA
    11d9547 View commit details
  5. .

    TooTallNate committed May 25, 2023
    1
    Copy the full SHA
    83ad4b1 View commit details
  6. .

    TooTallNate committed May 25, 2023
    1
    Copy the full SHA
    3a7b338 View commit details
  7. .

    TooTallNate committed May 25, 2023
    1
    Copy the full SHA
    1dc70e1 View commit details

Commits on May 30, 2023

  1. Use changeset tag

    TooTallNate committed May 30, 2023
    1
    Copy the full SHA
    952785d View commit details
  2. Fetch git tags

    TooTallNate committed May 30, 2023
    1
    Copy the full SHA
    e1e80ab View commit details

Commits on Jun 15, 2023

  1. 1
    Copy the full SHA
    f53b0e6 View commit details

Commits on Jun 17, 2023

  1. 1
    Copy the full SHA
    8e92eb8 View commit details
  2. 1
    Copy the full SHA
    6e78b01 View commit details

Commits on Jun 29, 2023

  1. 1
    Copy the full SHA
    7008a93 View commit details
  2. 1
    Copy the full SHA
    0fe8b72 View commit details
  3. 1
    Copy the full SHA
    08c4625 View commit details

Commits on Jul 10, 2023

  1. 1
    Copy the full SHA
    b75b5fd View commit details
  2. 1
    Copy the full SHA
    23fe1e3 View commit details
  3. 1
    Copy the full SHA
    08487f0 View commit details
7 changes: 5 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -15,6 +15,9 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v3

- name: Fetch git tags
run: git fetch origin 'refs/tags/*:refs/tags/*'

- name: Setup pnpm
uses: pnpm/action-setup@v2
with:
@@ -36,8 +39,8 @@ jobs:
id: changesets
uses: changesets/action@v1
with:
version: pnpm version:prepare
publish: pnpm release
version: pnpm ci:version
publish: pnpm ci:publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@ Each package in this monorepo has an individual changelog:
* [`get-uri`](packages/get-uri/CHANGELOG.md)
* [`http-proxy-agent`](packages/http-proxy-agent/CHANGELOG.md)
* [`https-proxy-agent`](packages/https-proxy-agent/CHANGELOG.md)
* [`https-proxy-agent`](packages/https-proxy-agent/CHANGELOG.md)
* [`pac-proxy-agent`](packages/pac-proxy-agent/CHANGELOG.md)
* [`pac-resolver`](packages/pac-resolver/CHANGELOG.md)
* [`proxy`](packages/proxy/CHANGELOG.md)
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -6,9 +6,9 @@
"lint": "turbo run lint",
"test": "turbo run test",
"test-e2e": "turbo run test-e2e",
"format": "prettier --write \"**/*.{ts,js}\"",
"version:prepare": "changeset version && pnpm install --no-frozen-lockfile",
"release": "changeset publish"
"format": "prettier --write \"**/*.{ts,js,mjs}\"",
"ci:version": "changeset version && pnpm install --no-frozen-lockfile",
"ci:publish": "pnpm publish -r && changeset tag"
},
"devDependencies": {
"@changesets/cli": "^2.26.1",
12 changes: 12 additions & 0 deletions packages/degenerator/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# degenerator

## 4.0.4

### Patch Changes

- 7008a93: Update dependencies to fix ReDoS vulnerability

## 4.0.3

### Patch Changes

- 8e92eb8: Update `vm2` dependency to v3.9.19

## 4.0.2

### Patch Changes
18 changes: 9 additions & 9 deletions packages/degenerator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "degenerator",
"version": "4.0.2",
"version": "4.0.4",
"description": "Compiles sync functions into async generator functions",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
@@ -24,19 +24,19 @@
},
"license": "MIT",
"dependencies": {
"ast-types": "^0.13.2",
"escodegen": "^1.8.1",
"esprima": "^4.0.0",
"vm2": "^3.9.17"
"ast-types": "^0.13.4",
"escodegen": "^1.14.3",
"esprima": "^4.0.1",
"vm2": "^3.9.19"
},
"devDependencies": {
"@types/escodegen": "^0.0.6",
"@types/esprima": "^4.0.2",
"@types/jest": "^29.5.1",
"@types/node": "^14.18.45",
"@types/esprima": "^4.0.3",
"@types/jest": "^29.5.2",
"@types/node": "^14.18.52",
"jest": "^29.5.0",
"ts-jest": "^29.1.0",
"tsconfig": "workspace:*",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
}
}
14 changes: 7 additions & 7 deletions packages/https-proxy-agent/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# https-proxy-agent

## 7.0.1

### Patch Changes

- 23fe1e3: Correct the header parsing logic to stop before the response content to avoid generating an exception.

## 7.0.0

### Major Changes
@@ -77,13 +83,7 @@ Updated 6.x usage:

```ts
const agent = new HttpsProxyAgent(
{
protocol: 'https:',
hostname: 'myproxy.mydomain.com'
port: '1234',
username: 'proxyUser',
password: 'proxyPass'
},
'https://proxyUser:proxyPass@myproxy.mydomain.com:1234',
{
timeout: 1000,
headers: { 'trace', 'foo' }
2 changes: 1 addition & 1 deletion packages/https-proxy-agent/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "https-proxy-agent",
"version": "7.0.0",
"version": "7.0.1",
"description": "An HTTP(s) proxy `http.Agent` implementation for HTTPS",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
2 changes: 1 addition & 1 deletion packages/https-proxy-agent/src/parse-proxy-response.ts
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ export function parseProxyResponse(
return;
}

const headerParts = buffered.toString('ascii').split('\r\n');
const headerParts = buffered.slice(0,endOfHeaders).toString('ascii').split('\r\n');
const firstLine = headerParts.shift();
if (!firstLine) {
socket.destroy();
8 changes: 8 additions & 0 deletions packages/pac-resolver/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# pac-resolver

## 6.0.2

### Patch Changes

- 0fe8b72: Update dependencies
- Updated dependencies [7008a93]
- degenerator@4.0.4

## 6.0.1

### Patch Changes
12 changes: 6 additions & 6 deletions packages/pac-resolver/package.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"name": "pac-resolver",
"version": "6.0.1",
"version": "6.0.2",
"description": "Generates an asynchronous resolver function from a PAC file",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"files": [
"dist"
],
"dependencies": {
"degenerator": "^4.0.1",
"ip": "^1.1.5",
"degenerator": "^4.0.4",
"ip": "^1.1.8",
"netmask": "^2.0.2"
},
"devDependencies": {
"@types/ip": "^1.1.0",
"@types/jest": "^29.5.1",
"@types/jest": "^29.5.2",
"@types/netmask": "^1.0.30",
"@types/node": "^14.18.45",
"@types/node": "^14.18.52",
"jest": "^29.5.0",
"ts-jest": "^29.1.0",
"tsconfig": "workspace:*",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"scripts": {
"build": "tsc",
11 changes: 7 additions & 4 deletions packages/proxy-agent/test/test.ts
Original file line number Diff line number Diff line change
@@ -329,10 +329,13 @@ describe('ProxyAgent', () => {
process.env.WSS_PROXY = httpProxyServerUrl.href;
const agent = new ProxyAgent();

const ws = new WebSocket(httpsServerUrl.href.replace('https', 'wss'), {
agent,
rejectUnauthorized: false
});
const ws = new WebSocket(
httpsServerUrl.href.replace('https', 'wss'),
{
agent,
rejectUnauthorized: false,
}
);
const [message] = await once(ws, 'message');
expect(connectionCount).toEqual(1);
expect(requestCount).toEqual(0);
2 changes: 1 addition & 1 deletion packages/proxy/src/proxy.ts
Original file line number Diff line number Diff line change
@@ -462,5 +462,5 @@ function requestAuthorization(
'Proxy-Authenticate': 'Basic realm="' + realm + '"',
};
res.writeHead(407, headers);
res.end();
res.end('Proxy authorization required');
}
Loading