Commit Graph

7693 Commits

Author SHA1 Message Date
Aaron Hill
e8a440a3f1 Test against Node 0.11 2014-02-20 18:23:52 -05:00
Kevin Roark
3244a57d58 Merge branch 'upstream' into add/binary-support
Merging the browserify changes, etc.
2014-02-20 17:24:09 -05:00
Kevin Roark
c2785fcbb1 fixed spacing on test and updated build 2014-02-20 17:23:49 -05:00
Kevin Roark
675830e726 updated socket.io-client dependency 2014-02-20 17:21:39 -05:00
Guillermo Rauch
2b51abbeea build 2014-02-20 14:14:49 -08:00
Guillermo Rauch
36f8aa8355 updated credentials 2014-02-20 13:56:43 -08:00
Guillermo Rauch
fd1018b92a Merge pull request #1 from rase-/add/zuul
Added zuul config and made testing work on browsers
2014-02-20 13:54:56 -08:00
Guillermo Rauch
b66ef40573 package: bump engine.io-client 2014-02-20 13:48:32 -08:00
Guillermo Rauch
874b6422f2 package: bump engine.io 2014-02-20 13:48:07 -08:00
Guillermo Rauch
2ae3b9dde2 implemented better browserify pipeline 2014-02-20 13:43:08 -08:00
Guillermo Rauch
78164e5f65 Merge pull request #227 from j-salazar/memleak
close() properly when triggered in connection handler
2014-02-20 13:37:04 -08:00
Guillermo Rauch
472e2bd885 Merge pull request #259 from rase-/fix/browserify
Fixed options passed to browserify
2014-02-20 11:58:45 -08:00
Tony Kovanen
52e9744485 Fixed options passed to browserify 2014-02-20 21:57:19 +02:00
GK
bc793d30fc checked out build file 2014-02-20 14:55:04 -05:00
Guillermo Rauch
921efdac63 build 2014-02-20 11:15:50 -08:00
Guillermo Rauch
0beb956530 Revert "Make timestamping default for sockets"
This reverts commit efc5ff99d1.
2014-02-20 10:54:51 -08:00
Guillermo Rauch
46617c995c Merge branch 'master' of github.com:LearnBoost/engine.io-client 2014-02-20 10:48:50 -08:00
Guillermo Rauch
519eb2b8be fix 2014-02-20 10:48:39 -08:00
Guillermo Rauch
d91662e39d Merge pull request #250 from j-salazar/multisockets
Force timestamping for sockets
2014-02-20 10:41:57 -08:00
Guillermo Rauch
76d9692228 build 2014-02-20 10:37:01 -08:00
Guillermo Rauch
e16aefc6d7 fix and upgrade browserify build 2014-02-20 10:36:41 -08:00
Guillermo Rauch
f7c7f2a0f0 build 2014-02-20 09:39:29 -08:00
Guillermo Rauch
f272070ad0 Makefile: make build dependent on package.json changes 2014-02-20 09:39:11 -08:00
Guillermo Rauch
423f84d820 run browserify without shims 2014-02-20 08:54:35 -08:00
Tony Kovanen
4e8db59871 Configured npm test 2014-02-20 13:08:04 +02:00
Tony Kovanen
85f8f98699 Added a couple of tests with Blobs for issue #2 2014-02-20 12:39:56 +02:00
Tony Kovanen
42cc5d2cff Added zuul config and made testing work on browsers 2014-02-20 12:18:21 +02:00
Julian Salazar
efc5ff99d1 Make timestamping default for sockets 2014-02-20 01:21:34 -08:00
Julian Salazar
ef77af8c2f close() properly when triggered in connection handler 2014-02-20 01:06:41 -08:00
Kevin Roark
755870466a updated engine and parser dependencies and build 2014-02-19 19:57:02 -05:00
Kevin Roark
b1c971507b updated engine and -parser dependencies 2014-02-19 19:54:31 -05:00
Guillermo Rauch
5efe005679 Release 2.0.0 2014-02-19 16:51:16 -08:00
Guillermo Rauch
b4342772a3 package: point engine.io to commit for tests 2014-02-19 15:52:11 -08:00
Guillermo Rauch
f071471e46 package: bump engine.io-client 2014-02-19 15:43:49 -08:00
Guillermo Rauch
6524010835 package: bump parser 2014-02-19 15:38:49 -08:00
Guillermo Rauch
ac8156963d package: bump parser 2014-02-19 15:35:56 -08:00
Guillermo Rauch
f00b6bd199 Merge pull request #244 from rase-/add/binary-support
Binary support
2014-02-19 15:32:07 -08:00
Guillermo Rauch
861b60ef26 package: fix github url 2014-02-19 15:26:55 -08:00
Guillermo Rauch
86725d1e92 moved from socket.io-protocol 2014-02-19 15:26:26 -08:00
Kevin Roark
9de6059d64 Merge branch 'upstream' into add/binary-support
Conflicts:
	.zuul.yml
	lib/socket.js
	package.json
	socket.io.js
	test/connection.js
	test/support/server.js
2014-02-19 18:16:55 -05:00
Guillermo Rauch
504996417a updated readme and moved parser out 2014-02-19 15:12:47 -08:00
Kevin Roark
8c3ca99e7c merged binary with upstream's new chat app 2014-02-19 18:03:36 -05:00
Tony Kovanen
5708098f8e style 2014-02-20 01:02:38 +02:00
Kevin Roark
beab053123 anonymous function style correct 2014-02-19 17:57:59 -05:00
Guillermo Rauch
6e8a2cd890 .travis: fix 2014-02-19 12:03:16 -08:00
Guillermo Rauch
db68db7b6b Merge pull request #3 from rase-/add/zuul
Added zuul configurations and testing for browsers
2014-02-19 11:44:28 -08:00
Tony Kovanen
8e5557d712 Added zuul configurations and testing for browsers 2014-02-19 21:26:27 +02:00
Kevin Roark
d5c35bb1f2 Added binary support to socket.io-client
Added changes to reflect socket.io-parser's async encoding, and use
of has-binarydata to check the event type of an event.

Next added browser tests for sending and receiving of binary data via
arraybuffers.

Then added blob tests and blob recognition.

To make blobs fully work (and Files as well), had to add packet buffering
to client so that slow-encoding blobs are still sent before other events.

I fixed a stupid bug I had added where I used the indexof module (for old
browsers) on a string somewhere instead of an array). This was causing
old IE to receive all events twice.

Old iphone tests were still failing so I updated tests to reflect that
some browsers can receive a blob but not construct them.

Finally, reduced build size by adding the "browser" field to package.json
and making browserify less confused.
2014-02-19 14:07:32 -05:00
Kevin Roark
745ee03102 Added binary support to socket.io
This is a squash of about 25 commits, and here is a summary:

adamreis added initial binary test with the doge image.

kevin-roark updated binary tests and wrote some binary encoding protocol.

kevin-roark replaced the custom binary encoding with msgpack because we
have to handle arbitrary json that contains binary.

adamreis added some 'crazy' tests for emmiting and receiving events with
several types of data.

kevin-roark updated client.js to use socket.io-protocol's async encoding

Did a bunch of upstream merging.
2014-02-19 13:46:39 -05:00
Tony Kovanen
43721adf2d Merged current master 2014-02-19 18:35:05 +02:00