Compare commits

...

6 Commits
2.2.0 ... 2.3.0

Author SHA1 Message Date
Damien Arrachequesne
47161a65d4 [chore] Release 2.3.0
Diff: https://github.com/socketio/socket.io/compare/2.2.0...2.3.0
2019-09-20 12:18:39 +02:00
Damien Arrachequesne
cf39362014 [chore] Bump socket.io-parser to version 3.4.0
Diff: https://github.com/socketio/socket.io-parser/compare/3.3.0...3.4.0
2019-09-20 11:04:11 +02:00
flaambe
4d01b2c84c test: remove deprecated Buffer usage (#3481) 2019-09-20 10:50:12 +02:00
Jonatan Juárez
82271921db [docs] Fix the default value of the 'origins' parameter (#3464)
Fix documentation about default origins value. The default should read `*:*` instead of `*
2019-09-20 10:37:54 +02:00
Damien Arrachequesne
1150eb50e9 [chore] Bump engine.io to version 3.4.0
Diff: https://github.com/socketio/engine.io/compare/3.3.1...3.4.0
2019-09-20 10:31:25 +02:00
Grant Timmerman
9c1e73c752 [chore] Update the license of the chat example (#3410)
There was no obvious reason to use BSD instead of MIT for that very basic chat app.

Closes #3411
2019-03-15 22:22:22 +01:00
6 changed files with 20 additions and 20 deletions

View File

@@ -78,7 +78,7 @@ Exposed by `require('socket.io')`.
- `path` _(String)_: name of the path to capture (`/socket.io`)
- `serveClient` _(Boolean)_: whether to serve the client files (`true`)
- `adapter` _(Adapter)_: the adapter to use. Defaults to an instance of the `Adapter` that ships with socket.io which is memory based. See [socket.io-adapter](https://github.com/socketio/socket.io-adapter)
- `origins` _(String)_: the allowed origins (`*`)
- `origins` _(String)_: the allowed origins (`*:*`)
- `parser` _(Parser)_: the parser to use. Defaults to an instance of the `Parser` that ships with socket.io. See [socket.io-parser](https://github.com/socketio/socket.io-parser).
Works with and without `new`:
@@ -635,7 +635,7 @@ Emits an event to the socket identified by the string name. Any other parameters
```js
socket.emit('hello', 'world');
socket.emit('with-binary', 1, '2', { 3: '4', 5: new Buffer(6) });
socket.emit('with-binary', 1, '2', { 3: '4', 5: Buffer.alloc(6) });
```
The `ack` argument is optional and will be called with the client's answer.

View File

@@ -5,7 +5,7 @@
"main": "index.js",
"author": "Grant Timmerman",
"private": true,
"license": "BSD",
"license": "MIT",
"dependencies": {
"express": "4.13.4",
"socket.io": "^1.7.2",

View File

@@ -14,7 +14,7 @@ They are tested with various payloads:
- string: `['1', '2', ... '1000']`
- numeric: `[1, 2, ... 1000]`
- binary: `new Buffer(1000), where buf[i] = i`
- binary: `Buffer.allocUnsafe(1000), where buf[i] = i`
## How to use

View File

@@ -27,7 +27,7 @@ let server4 = io(3004, {
let string = [];
let numeric = [];
let binary = new Buffer(1e3);
let binary = Buffer.allocUnsafe(1e3);
for (var i = 0; i < 1e3; i++) {
string.push('' + i);
numeric.push(i);

View File

@@ -1,6 +1,6 @@
{
"name": "socket.io",
"version": "2.2.0",
"version": "2.3.0",
"description": "node.js realtime framework server",
"keywords": [
"realtime",
@@ -25,11 +25,11 @@
},
"dependencies": {
"debug": "~4.1.0",
"engine.io": "~3.3.1",
"engine.io": "~3.4.0",
"has-binary2": "~1.0.2",
"socket.io-adapter": "~1.1.0",
"socket.io-client": "2.2.0",
"socket.io-parser": "~3.3.0"
"socket.io-client": "2.3.0",
"socket.io-parser": "~3.4.0"
},
"devDependencies": {
"expect.js": "0.3.1",

View File

@@ -23,7 +23,7 @@ function client(srv, nsp, opts){
describe('socket.io', function(){
it('should be the same version as client', function(){
it.skip('should be the same version as client', function(){
var version = require('../package').version;
expect(version).to.be(require('socket.io-client/package').version);
});
@@ -1126,7 +1126,7 @@ describe('socket.io', function(){
sio.on('connection', function(s){
fs.readFile(join(__dirname, 'support', 'doge.jpg'), function(err, data){
if (err) return done(err);
var buf = new Buffer('asdfasdf', 'utf8');
var buf = Buffer.from('asdfasdf', 'utf8');
s.emit('multiple', 1, data, '3', [4], buf, [data, 'swag', buf]);
});
});
@@ -1143,7 +1143,7 @@ describe('socket.io', function(){
expect(Buffer.isBuffer(a)).to.be(true);
done();
});
var buf = new Buffer('abcdefg', 'utf8');
var buf = Buffer.from('abcdefg', 'utf8');
socket.emit('buff', buf);
});
});
@@ -1168,7 +1168,7 @@ describe('socket.io', function(){
});
fs.readFile(join(__dirname, 'support', 'doge.jpg'), function(err, data){
if (err) return done(err);
var buf = new Buffer('asdfasdf', 'utf8');
var buf = Buffer.from('asdfasdf', 'utf8');
socket.emit('multiple', 1, data, '3', [4], buf, [data, 'swag', buf]);
});
});
@@ -1496,7 +1496,7 @@ describe('socket.io', function(){
expect(Buffer.isBuffer(buf)).to.be(true);
fn(1, 2);
});
socket.emit('woot', new Buffer(3), function(a, b){
socket.emit('woot', Buffer.alloc(3), function(a, b){
expect(a).to.be(1);
expect(b).to.be(2);
done();
@@ -1515,7 +1515,7 @@ describe('socket.io', function(){
expect(Buffer.isBuffer(a)).to.be(true);
fn();
});
s.emit('hi', new Buffer(4), function(){
s.emit('hi', Buffer.alloc(4), function(){
done();
});
});
@@ -1529,7 +1529,7 @@ describe('socket.io', function(){
var socket = client(srv);
sio.on('connection', function(s){
socket.on('hi', function(fn){
fn(new Buffer(1));
fn(Buffer.alloc(1));
});
s.emit('hi', function(a){
expect(Buffer.isBuffer(a)).to.be(true);
@@ -1546,7 +1546,7 @@ describe('socket.io', function(){
var socket = client(srv);
sio.on('connection', function(s){
s.on('woot', function(fn){
fn(new Buffer(2));
fn(Buffer.alloc(2));
});
socket.emit('woot', function(a){
expect(Buffer.isBuffer(a)).to.be(true);
@@ -1899,7 +1899,7 @@ describe('socket.io', function(){
});
function emit(){
sio.emit('bin', new Buffer(10));
sio.emit('bin', Buffer.alloc(10));
}
});
});
@@ -2083,8 +2083,8 @@ describe('socket.io', function(){
socket.join(room, fn);
});
socket.on('broadcast', function(){
socket.broadcast.to('test').emit('bin', new Buffer(5));
socket.emit('bin2', new Buffer(5));
socket.broadcast.to('test').emit('bin', Buffer.alloc(5));
socket.emit('bin2', Buffer.alloc(5));
});
});
});