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: websockets/ws
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b9ce38d80f847a843c05edfe1a907278bcffde0c
Choose a base ref
...
head repository: websockets/ws
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f5297f7090f6a628832a730187c5b3a06a247f00
Choose a head ref

Commits on Oct 7, 2018

  1. Copy the full SHA
    9022a0d View commit details

Commits on Oct 11, 2018

  1. Copy the full SHA
    d2317b1 View commit details

Commits on Oct 29, 2018

  1. Copy the full SHA
    0da3fdb View commit details
  2. [test] Remove unused variables

    lpinca committed Oct 29, 2018
    Copy the full SHA
    cddbcf6 View commit details
  3. Copy the full SHA
    45f817b View commit details
  4. Copy the full SHA
    bc0f8ab View commit details
  5. Copy the full SHA
    7e061bc View commit details

Commits on Nov 4, 2018

  1. [ci] Test on node 11

    lpinca committed Nov 4, 2018
    Copy the full SHA
    1ebff19 View commit details

Commits on Nov 6, 2018

  1. Copy the full SHA
    7d51fb9 View commit details

Commits on Nov 8, 2018

  1. Copy the full SHA
    3fa0e03 View commit details

Commits on Nov 9, 2018

  1. [doc] Fix nits

    lpinca committed Nov 9, 2018
    Copy the full SHA
    5914206 View commit details

Commits on Nov 14, 2018

  1. [minor] Ignore callbacks when clearing the send queue (#1471)

    Do not invoke callbacks when clearing the send queue due to premature
    socket closure.
    
    Refs: #1464 (comment)
    Fixes #1226
    lpinca authored Nov 14, 2018
    Copy the full SHA
    f26fac8 View commit details

Commits on Nov 16, 2018

  1. [pkg] Update dev dependencies

    lpinca committed Nov 16, 2018
    Copy the full SHA
    95bf991 View commit details
  2. Copy the full SHA
    b213bee View commit details

Commits on Nov 17, 2018

  1. [dist] 6.1.1

    lpinca committed Nov 17, 2018
    Copy the full SHA
    029de0c View commit details
  2. [lint] Use prettier

    lpinca committed Nov 17, 2018
    Copy the full SHA
    b9fad73 View commit details
  3. Copy the full SHA
    761b1a4 View commit details
  4. [pkg] Fix lint script

    lpinca committed Nov 17, 2018
    Copy the full SHA
    96b638c View commit details
  5. Copy the full SHA
    26436e0 View commit details
  6. Copy the full SHA
    cc86d22 View commit details
  7. [dist] 6.1.2

    lpinca committed Nov 17, 2018
    Copy the full SHA
    14d9088 View commit details

Commits on Dec 14, 2018

  1. Copy the full SHA
    5a45029 View commit details

Commits on Dec 23, 2018

  1. Copy the full SHA
    e8ada8a View commit details

Commits on Dec 24, 2018

  1. Copy the full SHA
    3d6692a View commit details

Commits on Jan 10, 2019

  1. Copy the full SHA
    dc92e75 View commit details

Commits on Jan 11, 2019

  1. Copy the full SHA
    f502916 View commit details

Commits on Jan 13, 2019

  1. Copy the full SHA
    0236e99 View commit details

Commits on Jan 15, 2019

  1. [minor] Fix nit

    lpinca committed Jan 15, 2019
    Copy the full SHA
    a515600 View commit details

Commits on Jan 17, 2019

  1. Copy the full SHA
    f7b9470 View commit details

Commits on Jan 19, 2019

  1. [minor] Set the handshake timeout via the timeout option

    Set the handshake timeout when a socket is assigned to the request.
    lpinca committed Jan 19, 2019
    Copy the full SHA
    63adb73 View commit details
  2. [minor] Use Array.prototype.includes()

    Use `Array.prototype.includes()` instead of `Array.prototype.indexOf()`.
    lpinca committed Jan 19, 2019
    Copy the full SHA
    f9d4b09 View commit details
  3. Copy the full SHA
    4f88959 View commit details

Commits on Jan 23, 2019

  1. Copy the full SHA
    c61218f View commit details
  2. Copy the full SHA
    3df4809 View commit details

Commits on Jan 24, 2019

  1. [minor] Fix style nit

    lpinca committed Jan 24, 2019
    Copy the full SHA
    6d2930a View commit details
  2. [dist] 6.1.3

    lpinca committed Jan 24, 2019
    Copy the full SHA
    6fa6b8b View commit details

Commits on Jan 26, 2019

  1. Copy the full SHA
    460ae81 View commit details

Commits on Feb 1, 2019

  1. Copy the full SHA
    75cd966 View commit details

Commits on Feb 5, 2019

  1. Copy the full SHA
    b45e912 View commit details

Commits on Feb 15, 2019

  1. Copy the full SHA
    5c82aac View commit details

Commits on Feb 16, 2019

  1. Copy the full SHA
    8b5422e View commit details
  2. [fix] Use the defaultPort option (#1510)

    Prevent the default port from being added to the `Host` header when no
    `Agent` is used.
    
    Fixes #1505
    lpinca authored Feb 16, 2019
    Copy the full SHA
    92b0a65 View commit details
  3. [test] Remove redundant test

    lpinca committed Feb 16, 2019
    Copy the full SHA
    15b0bb3 View commit details
  4. [dist] 6.1.4

    lpinca committed Feb 16, 2019
    Copy the full SHA
    dc745cc View commit details

Commits on Feb 19, 2019

  1. Copy the full SHA
    dd5833a View commit details

Commits on Feb 21, 2019

  1. [pkg] Remove prettylint

    lpinca committed Feb 21, 2019
    Copy the full SHA
    6ad4d86 View commit details
  2. Copy the full SHA
    1d93fb2 View commit details

Commits on Feb 22, 2019

  1. Copy the full SHA
    160af45 View commit details

Commits on Feb 26, 2019

  1. Copy the full SHA
    295786b View commit details

Commits on Feb 28, 2019

  1. [doc] Add logos to badges

    lpinca committed Feb 28, 2019
    Copy the full SHA
    5e238fb View commit details
Showing with 4,750 additions and 2,431 deletions.
  1. +0 −2 .eslintignore
  2. +14 −4 .eslintrc.yaml
  3. +1 −0 .gitattributes
  4. +2 −0 .github/FUNDING.yml
  5. +10 −7 ISSUE_TEMPLATE.md → .github/issue_template.md
  6. +50 −0 .github/workflows/ci.yml
  7. +0 −1 .gitignore
  8. +1 −0 .npmrc
  9. +5 −0 .prettierrc.yaml
  10. +0 −8 .travis.yml
  11. +178 −99 README.md
  12. +11 −8 SECURITY.md
  13. +5 −4 appveyor.yml
  14. +10 −11 bench/parser.benchmark.js
  15. +30 −14 bench/speed.js
  16. +155 −77 doc/ws.md
  17. +45 −22 examples/express-session-parse/index.js
  18. +3 −3 examples/express-session-parse/package.json
  19. +35 −14 examples/express-session-parse/public/app.js
  20. +3 −0 examples/express-session-parse/public/index.html
  21. +0 −1 examples/fileapi/.gitignore
  22. +0 −10 examples/fileapi/package.json
  23. +0 −40 examples/fileapi/public/app.js
  24. +0 −22 examples/fileapi/public/index.html
  25. +0 −56 examples/fileapi/public/uploader.js
  26. +0 −108 examples/fileapi/server.js
  27. +18 −9 examples/{serverstats/server.js → server-stats/index.js}
  28. +1 −1 examples/{serverstats → server-stats}/package.json
  29. +63 −0 examples/server-stats/public/index.html
  30. +0 −33 examples/serverstats/public/index.html
  31. +4 −4 examples/ssl.js
  32. +1 −0 index.js
  33. +70 −13 lib/buffer-util.js
  34. +46 −32 lib/event-target.js
  35. +49 −37 lib/extension.js
  36. +55 −0 lib/limiter.js
  37. +111 −102 lib/permessage-deflate.js
  38. +67 −73 lib/receiver.js
  39. +168 −164 lib/sender.js
  40. +165 −0 lib/stream.js
  41. +88 −13 lib/validation.js
  42. +113 −67 lib/websocket-server.js
  43. +349 −234 lib/websocket.js
  44. +28 −18 package.json
  45. +3 −1 test/autobahn-server.js
  46. +4 −2 test/autobahn.js
  47. +15 −0 test/buffer-util.test.js
  48. +530 −0 test/create-websocket-stream.test.js
  49. +70 −60 test/extension.test.js
  50. +41 −0 test/limiter.test.js
  51. +209 −103 test/permessage-deflate.test.js
  52. +213 −104 test/receiver.test.js
  53. +122 −100 test/sender.test.js
  54. +52 −0 test/validation.test.js
  55. +371 −216 test/websocket-server.test.js
  56. +3 −3 test/websocket.integration.js
  57. +1,163 −531 test/websocket.test.js
2 changes: 0 additions & 2 deletions .eslintignore

This file was deleted.

18 changes: 14 additions & 4 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
extends: standard
env:
browser: true
es6: true
mocha: true
node: true
extends:
- eslint:recommended
- plugin:prettier/recommended
parserOptions:
ecmaVersion: 9
rules:
no-extra-semi: error
semi:
no-console: off
no-var: error
prefer-const: error
quotes:
- error
- always
- single
- avoidEscape: true
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto eol=lf
2 changes: 2 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github:
- lpinca
17 changes: 10 additions & 7 deletions ISSUE_TEMPLATE.md → .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -7,32 +7,35 @@ General support questions should be raised on a channel like Stack Overflow.
Please fill in as much of the template below as you're able.
-->

- [ ] I've searched for any related issues and avoided creating a duplicate issue.
- [ ] I've searched for any related issues and avoided creating a duplicate
issue.

#### Description

<!-- e.g. Description of the bug or feature -->

#### Reproducible in:

version:
Node.js version(s):
OS version(s):
- version:
- Node.js version(s):
- OS version(s):

#### Steps to reproduce:

1.

2.

3.

### Expected result:
#### Expected result:

<!-- e.g. What you expected to happen -->

### Actual result:
#### Actual result:

<!-- e.g. What actually happened -->

### Attachments:
#### Attachments:

<!-- e.g. Logs, screenshots, screencast, etc. -->
50 changes: 50 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: CI

on:
- push
- pull_request

jobs:
test:
runs-on: ${{ matrix.os }}
strategy:
matrix:
node:
- 8
- 10
- 12
- 14
- 16
os:
- macOS-latest
- ubuntu-latest
- windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
- run: npm install
- run: npm run lint
if: matrix.node == 16 && matrix.os == 'ubuntu-latest'
- run: npm test
- run:
echo ::set-output name=job_id::$(node -e
"console.log(crypto.randomBytes(16).toString('hex'))")
id: get_job_id
shell: bash
- uses: coverallsapp/github-action@v1.1.2
with:
flag-name:
${{ steps.get_job_id.outputs.job_id }} (Node.js ${{ matrix.node }}
on ${{ matrix.os }})
github-token: ${{ secrets.GITHUB_TOKEN }}
parallel: true
coverage:
needs: test
runs-on: ubuntu-latest
steps:
- uses: coverallsapp/github-action@v1.1.2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
parallel-finished: true
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -2,4 +2,3 @@ node_modules/
.nyc_output/
coverage/
.vscode/
npm-debug.log
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
5 changes: 5 additions & 0 deletions .prettierrc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
arrowParens: always
endOfLine: lf
proseWrap: always
singleQuote: true
trailingComma: none
8 changes: 0 additions & 8 deletions .travis.yml

This file was deleted.

Loading