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: socketio/socket.io
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0abbd4da50c3fbffa5e32359b269e96c156c6ef2
Choose a base ref
...
head repository: socketio/socket.io
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: db831a3de4528a2017dad5e9b419333d4d929bd3
Choose a head ref
29 contributors

Commits on Dec 30, 2016

  1. [docs] API documentation (#2784)

    @darrachequesne
    darrachequesne authored Dec 30, 2016
    Copy the full SHA
    255b845 View commit details

  2. [docs] Add install script on Readme.md (#2780)

    @bananaappletw @darrachequesne
    bananaappletw authored and darrachequesne committed Dec 30, 2016
    Copy the full SHA
    d821900 View commit details

  3. [perf] micro-optimisations (#2793)

    @billouboq @darrachequesne
    billouboq authored and darrachequesne committed Dec 30, 2016
    Copy the full SHA
    c46d448 View commit details

  4. [fix] Prevent null from being accepted as argument (#2606)

    @yanbrod @darrachequesne
    yanbrod authored and darrachequesne committed Dec 30, 2016
    Copy the full SHA
    a27802e View commit details

Commits on Jan 4, 2017

  1. [docs] Fix wrong argument name in API.md (#2802)

    @andrea11 @darrachequesne
    andrea11 authored and darrachequesne committed Jan 4, 2017
    Copy the full SHA
    e04de3c View commit details

Commits on Jan 6, 2017

  1. [chore] Update copyright year LICENSE to 2017 (#2803)

    @isabellatea @darrachequesne
    isabellatea authored and darrachequesne committed Jan 6, 2017
    Copy the full SHA
    f260439 View commit details

Commits on Jan 10, 2017

  1. [chore] Update issue template with fiddle (#2811)

    @darrachequesne
    darrachequesne authored Jan 10, 2017
    Copy the full SHA
    01b262f View commit details

  2. [docs] Fix a typo on clients method in the API documentation (#2812)

    @darrachequesne
    darrachequesne authored Jan 10, 2017
    Copy the full SHA
    0be865f View commit details

  3. [docs] Add an example for socket.join() method (#2813)

    @darrachequesne
    darrachequesne authored Jan 10, 2017
    Copy the full SHA
    131a2be View commit details

  4. [docs] Add pingInterval/pingTimeout/transports options in the API doc… 

    …umentation (#2814)
    @darrachequesne
    darrachequesne authored Jan 10, 2017
    Copy the full SHA
    accd0bd View commit details

  5. [docs] Add emit cheatsheet (#2815)

    @darrachequesne
    darrachequesne authored Jan 10, 2017
    Copy the full SHA
    706ca2a View commit details

  6. [docs] Fix documentation for local flag (#2816)

    @darrachequesne
    darrachequesne authored Jan 10, 2017
    Copy the full SHA
    b754cff View commit details

Commits on Jan 16, 2017

  1. [perf] Reset properties instead of deleting them (#2826) 

    Deleting properties is a v8 'optimization killer'
    @darrachequesne
    Tom Atkinson authored and darrachequesne committed Jan 16, 2017
    Copy the full SHA
    e24434a View commit details

  2. [perf] Use shared instance of the encoder (#2825)

    @darrachequesne
    Tom Atkinson authored and darrachequesne committed Jan 16, 2017
    Copy the full SHA
    ad658b8 View commit details

  3. [fix] Properly close the connection on error (#2681)

    @darrachequesne
    Tom Atkinson authored and darrachequesne committed Jan 16, 2017
    Copy the full SHA
    2258a6a View commit details

  4. [docs] Implement whiteboard example (#2810)

    @darrachequesne
    darrachequesne authored Jan 16, 2017
    Copy the full SHA
    8eaba08 View commit details

  5. [docs] Add nginx cluster example (#2817)

    @darrachequesne
    darrachequesne authored Jan 16, 2017
    Copy the full SHA
    9888529 View commit details

  6. [docs] Add haproxy cluster example (#2818)

    @darrachequesne
    darrachequesne authored Jan 16, 2017
    Copy the full SHA
    f7eed6e View commit details

  7. [docs] Add httpd cluster example (#2819)

    @darrachequesne
    darrachequesne authored Jan 16, 2017
    Copy the full SHA
    e28b475 View commit details

  8. [docs] Add a 'Features' section in the README (#2824)

    @darrachequesne
    darrachequesne authored Jan 16, 2017
    Copy the full SHA
    23c9dd3 View commit details

Commits on Jan 22, 2017

  1. [fix] Use path.resolve by default and require.resolve as a fallback (#… 

    …2797)

Browserify doesn't support require.resolve, and as a consequence, makes nexe fail the compilation. This PR attempts to get the path of the socket.io-client file via path.resolve and falls back to the original require.resolve if this file cannot be found.
    @a-lucas @darrachequesne
    a-lucas authored and darrachequesne committed Jan 22, 2017
    Copy the full SHA
    3b5f433 View commit details

Commits on Jan 23, 2017

  1. [chore] Bump engine.io to version 2.0.0 (#2832)

    @darrachequesne
    darrachequesne authored Jan 23, 2017
    Copy the full SHA
    3d695c6 View commit details

Commits on Jan 24, 2017

  1. [feature] Allow the use of custom parsers (#2829)

    @darrachequesne
    darrachequesne authored Jan 24, 2017
    Copy the full SHA
    3b92cc2 View commit details

Commits on Feb 1, 2017

  1. [docs] Small addition to the Express Readme Part (#2846)

    @H3rby7 @darrachequesne
    H3rby7 authored and darrachequesne committed Feb 1, 2017
    Copy the full SHA
    e1facd5 View commit details

  2. [feature] Merge Engine.IO and Socket.IO handshake packets (#2833)

    @darrachequesne
    darrachequesne authored Feb 1, 2017
    Copy the full SHA
    54ff591 View commit details

Commits on Feb 13, 2017

  1. [docs] Update the wording to match the code example (#2853)

    @timruffles @darrachequesne
    timruffles authored and darrachequesne committed Feb 13, 2017
    Copy the full SHA
    5b79ab1 View commit details

Commits on Feb 16, 2017

  1. [chore] Bump engine.io to version 2.0.2 (#2864) 

    Includes the following (from engine.io changelog):

* [fix] Initialize the WebSocket server in the Server constructor (#476)
* [chore] Bump ws to version 1.1.2 (vulnerability fix) (#480)
    @sgress454 @darrachequesne
    sgress454 authored and darrachequesne committed Feb 16, 2017
    Copy the full SHA
    4d8f68c View commit details

Commits on Feb 17, 2017

  1. [chore] Bump socket.io-adapter to version 1.0.0 (#2867)

    @darrachequesne
    darrachequesne authored Feb 17, 2017
    Copy the full SHA
    5ae06e6 View commit details

Commits on Feb 22, 2017

  1. [docs] Add webpack build example (#2828)

    @darrachequesne
    darrachequesne authored Feb 22, 2017
    Copy the full SHA
    2d5b002 View commit details

Commits on Feb 26, 2017

  1. [feat] Allow to join several rooms at once (#2879)

    @darrachequesne
    darrachequesne authored Feb 26, 2017
    Copy the full SHA
    01a4623 View commit details

Commits on Mar 18, 2017

  1. [docs] Fix documentation for 'connect' event (#2898)

    @swhgoon @darrachequesne
    swhgoon authored and darrachequesne committed Mar 18, 2017
    Copy the full SHA
    e40accf View commit details

Commits on Mar 27, 2017

  1. [docs] Fix wrong space character in README (#2900)

    @SimenB @darrachequesne
    SimenB authored and darrachequesne committed Mar 27, 2017
    Copy the full SHA
    03f3bc9 View commit details

Commits on Mar 29, 2017

  1. [docs] Add server.engine.generateId attribute (#2880)

    @efkan @darrachequesne
    efkan authored and darrachequesne committed Mar 29, 2017
    Copy the full SHA
    c5b7738 View commit details

  2. [docs] Explicitly document that Server extends EventEmitter (#2874)

    @darrachequesne
    darrachequesne committed Mar 29, 2017
    Copy the full SHA
    240b154 View commit details

Commits on Apr 3, 2017

  1. [docs] Update emit cheatsheet (#2906)

    @FarazPatankar @darrachequesne
    FarazPatankar authored and darrachequesne committed Apr 3, 2017
    Copy the full SHA
    f1b39a6 View commit details

Commits on Apr 19, 2017

  1. [docs] Replace non-breaking space with proper whitespace (#2913)

    @epicTCK @darrachequesne
    epicTCK authored and darrachequesne committed Apr 19, 2017
    Copy the full SHA
    199eec6 View commit details

Commits on Apr 24, 2017

  1. [feat] Move binary detection to the parser (#2923)

    @darrachequesne
    darrachequesne authored Apr 24, 2017
    Copy the full SHA
    87b06ad View commit details

Commits on Apr 28, 2017

  1. [chore] Bump dependencies (#2926)

    @darrachequesne
    darrachequesne authored Apr 28, 2017
    1
    Copy the full SHA
    a086588 View commit details

Commits on May 8, 2017

  1. [chore] Added backers and sponsors on the README (#2933)

    @xdamman @darrachequesne
    xdamman authored and darrachequesne committed May 8, 2017
    Copy the full SHA
    0d07c47 View commit details

  2. [chore] Merge history of 1.7.x and 0.9.x branches (#2930)

    @darrachequesne
    darrachequesne authored May 8, 2017
    Copy the full SHA
    1980fb4 View commit details

  3. [docs] Add an example of custom parser (#2929)

    @darrachequesne
    darrachequesne authored May 8, 2017
    Copy the full SHA
    6c0705f View commit details

  4. [chore] Release 2.0.0

    @darrachequesne
    darrachequesne committed May 8, 2017
    Copy the full SHA
    3367eaa View commit details

  5. [fix] Update path of client file (#2934)

    @darrachequesne
    darrachequesne authored May 8, 2017
    Copy the full SHA
    a005690 View commit details

  6. [chore] Release 2.0.1

    @darrachequesne
    darrachequesne committed May 8, 2017
    Copy the full SHA
    832b8fc View commit details

Commits on May 22, 2017

  1. [fix] Fix timing issues with middleware (#2948) 

    Using a middleware could previously lead to a connecting client
receiving a connect event from the server before the server triggers
its own connect event.
    @darrachequesne
    darrachequesne authored May 22, 2017
    3
    Copy the full SHA
    2b21690 View commit details

Commits on Jun 1, 2017

  1. [chore] Release 2.0.2

    @darrachequesne
    darrachequesne committed Jun 1, 2017
    Copy the full SHA
    a10dc8d View commit details

Commits on Jun 3, 2017

  1. [docs] Update webpack example (#2960)

    @darrachequesne
    darrachequesne authored Jun 3, 2017
    Copy the full SHA
    2b10f1b View commit details

Commits on Jun 8, 2017

  1. [docs] Update slack badge (#2961) 

    Update badge to https://slackin-socketio.now.sh/badge.svg
    @snuggs @darrachequesne
    snuggs authored and darrachequesne committed Jun 8, 2017
    Copy the full SHA
    9a014e2 View commit details

Commits on Jun 12, 2017

  1. [fix] Fix middleware initialization (#2969) 

    Fix "TypeError: Cannot convert undefined or null to object" when a
middleware is added before the engine is properly attached.
    @darrachequesne
    darrachequesne authored Jun 12, 2017
    Copy the full SHA
    94df7bc View commit details

  2. [fix] Reset rooms object before broadcasting (#2970) 

    It seems packets could be delivered to wrong room in some case, if the
_rooms array was not reset before the next emit.
    @darrachequesne
    darrachequesne authored Jun 12, 2017
    Copy the full SHA
    db0c699 View commit details
Showing with 4,437 additions and 1,300 deletions.
  1. +1 −0 .github/ISSUE_TEMPLATE.md
  2. +1 −0 .gitignore
  3. +10 −24 .travis.yml
  4. +0 −638 History.md
  5. +1 −1 LICENSE
  6. +0 −8 Makefile
  7. +156 −402 Readme.md
  8. +880 −0 docs/API.md
  9. +15 −0 docs/README.md
  10. +64 −0 docs/emit.md
  11. +2 −1 examples/chat/index.js
  12. +1 −1 examples/chat/public/main.js
  13. +31 −0 examples/cluster-haproxy/README.md
  14. +51 −0 examples/cluster-haproxy/docker-compose.yml
  15. +2 −0 examples/cluster-haproxy/haproxy/Dockerfile
  16. +31 −0 examples/cluster-haproxy/haproxy/haproxy.cfg
  17. +15 −0 examples/cluster-haproxy/server/Dockerfile
  18. +87 −0 examples/cluster-haproxy/server/index.js
  19. +17 −0 examples/cluster-haproxy/server/package.json
  20. +28 −0 examples/cluster-haproxy/server/public/index.html
  21. +286 −0 examples/cluster-haproxy/server/public/main.js
  22. +149 −0 examples/cluster-haproxy/server/public/style.css
  23. +31 −0 examples/cluster-httpd/README.md
  24. +51 −0 examples/cluster-httpd/docker-compose.yml
  25. +2 −0 examples/cluster-httpd/httpd/Dockerfile
  26. +52 −0 examples/cluster-httpd/httpd/httpd.conf
  27. +15 −0 examples/cluster-httpd/server/Dockerfile
  28. +82 −0 examples/cluster-httpd/server/index.js
  29. +17 −0 examples/cluster-httpd/server/package.json
  30. +28 −0 examples/cluster-httpd/server/public/index.html
  31. +286 −0 examples/cluster-httpd/server/public/main.js
  32. +149 −0 examples/cluster-httpd/server/public/style.css
  33. +31 −0 examples/cluster-nginx/README.md
  34. +51 −0 examples/cluster-nginx/docker-compose.yml
  35. +3 −0 examples/cluster-nginx/nginx/Dockerfile
  36. +35 −0 examples/cluster-nginx/nginx/nginx.conf
  37. +15 −0 examples/cluster-nginx/server/Dockerfile
  38. +82 −0 examples/cluster-nginx/server/index.js
  39. +17 −0 examples/cluster-nginx/server/package.json
  40. +28 −0 examples/cluster-nginx/server/public/index.html
  41. +286 −0 examples/cluster-nginx/server/public/main.js
  42. +149 −0 examples/cluster-nginx/server/public/style.css
  43. +50 −0 examples/custom-parsers/README.md
  44. +21 −0 examples/custom-parsers/package.json
  45. +13 −0 examples/custom-parsers/public/index.html
  46. +8 −0 examples/custom-parsers/src/client1.js
  47. +11 −0 examples/custom-parsers/src/client2.js
  48. +11 −0 examples/custom-parsers/src/client3.js
  49. +11 −0 examples/custom-parsers/src/client4.js
  50. +125 −0 examples/custom-parsers/src/custom-parser.js
  51. +55 −0 examples/custom-parsers/src/server.js
  52. +15 −0 examples/custom-parsers/support/webpack.config.js
  53. +18 −0 examples/webpack-build-server/README.md
  54. +16 −0 examples/webpack-build-server/lib/index.js
  55. +15 −0 examples/webpack-build-server/package.json
  56. +9 −0 examples/webpack-build-server/support/webpack.config.js
  57. +20 −0 examples/webpack-build/README.md
  58. +13 −0 examples/webpack-build/index.html
  59. +12 −0 examples/webpack-build/lib/index.js
  60. +21 −0 examples/webpack-build/package.json
  61. +2 −0 examples/webpack-build/support/noop.js
  62. +8 −0 examples/webpack-build/support/webpack.config.js
  63. +33 −0 examples/webpack-build/support/webpack.config.json-parser.js
  64. +31 −0 examples/webpack-build/support/webpack.config.slim.js
  65. +17 −0 examples/whiteboard/README.md
  66. +16 −0 examples/whiteboard/index.js
  67. +19 −0 examples/whiteboard/package.json
  68. +23 −0 examples/whiteboard/public/index.html
  69. +100 −0 examples/whiteboard/public/main.js
  70. +44 −0 examples/whiteboard/public/style.css
  71. +0 −69 gulpfile.js
  72. +30 −11 lib/client.js
  73. +94 −15 lib/index.js
  74. +43 −22 lib/namespace.js
  75. +39 −0 lib/parent-namespace.js
  76. +76 −51 lib/socket.js
  77. +12 −20 package.json
  78. +168 −37 test/socket.io.js
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@

### Steps to reproduce (if the current behaviour is a bug)

**Note**: the best way to get a quick answer is to provide a failing test case, by forking the following [fiddle](https://github.com/darrachequesne/socket.io-fiddle) for example.

### Expected behaviour

1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -11,3 +11,4 @@ node_modules
coverage
.idea
dist
.nyc_output
34 changes: 10 additions & 24 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,14 @@
sudo: false
before_install:
- npm install -g npm@'>=1.4.3'
language: node_js
sudo: false
node_js:
- "0.10"
- "0.12"
- "4"
- "node"

git:
depth: 1

matrix:
include:
- node_js: '0.10'
env: TEST_VERSION=compat
- node_js: '0.12'
env: TEST_VERSION=compat
- node_js: '4'
env: TEST_VERSION=compat
#matrix:
#fast_finish: true
#allow_failures:
#- node_js: "0.11"

- '4'
- '6'
- '8'
- node
notifications:
irc: "irc.freenode.org#socket.io"
git:
depth: 1
cache:
directories:
- node_modules
Loading