Skip to content

Commit

Permalink
修改例子
Browse files Browse the repository at this point in the history
  • Loading branch information
chyingp committed Jan 6, 2018
1 parent a5a4fd7 commit 3865fdf
Show file tree
Hide file tree
Showing 8 changed files with 345 additions and 106 deletions.
9 changes: 8 additions & 1 deletion demo/2017.05.22-web-socket/.vscode/launch.json
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,11 +4,18 @@
// 欲了解更多信息,请访问: https://go.microsoft.com/fwlink/?linkid=830387 // 欲了解更多信息,请访问: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{
"type": "node",
"request": "launch",
"name": "Launch Program",
"program": "${workspaceFolder}/http-node-server/server.js"
},
{ {
"type": "node", "type": "node",
"request": "launch", "request": "launch",
"name": "启动程序", "name": "启动程序",
"program": "${file}" "program": "${file}"
} },

] ]
} }
8 changes: 8 additions & 0 deletions demo/2017.05.22-web-socket/http-node-server/index.html
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,8 @@
<script src="/socket.io/socket.io.js"></script>
<script>
var socket = io('http://localhost:3000');
socket.on('news', function (data) {
console.log(data);
socket.emit('my other event', { my: 'data' });
});
</script>
25 changes: 25 additions & 0 deletions demo/2017.05.22-web-socket/http-node-server/server.js
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,25 @@
var app = require('http').createServer(handler)
var io = require('socket.io')(app);
var fs = require('fs');

app.listen(3000);

function handler (req, res) {
fs.readFile(__dirname + '/index.html',
function (err, data) {
if (err) {
res.writeHead(500);
return res.end('Error loading index.html');
}

res.writeHead(200);
res.end(data);
});
}

io.on('connection', function (socket) {
socket.emit('news', { hello: 'world' });
socket.on('my other event', function (data) {
console.log(data);
});
});
367 changes: 278 additions & 89 deletions demo/2017.05.22-web-socket/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo/2017.05.22-web-socket/package.json
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"compression": "^1.6.2", "compression": "^1.6.2",
"cookie-parser": "^1.4.3", "cookie-parser": "^1.4.3",
"express": "^4.15.3", "express": "^4.15.3",
"socket.io": "^2.0.1" "socket.io": "^2.0.4"
} }
} }
22 changes: 11 additions & 11 deletions demo/2017.05.22-web-socket/started/index.html
Original file line number Original file line Diff line number Diff line change
@@ -1,18 +1,18 @@
<!-- <script src="/socket.io/socket.io.js"></script> --> <!-- <script src="/socket.io/socket.io.js"></script> -->
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.3/socket.io.js"></script> <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.3/socket.io.js"></script>
<script> <script>
var url = 'http://www.xunjia.com'; // var url = 'http://www.xunjia.com';
var socket = io(url, { // var socket = io(url, {
path: '/push', // path: '/push',
query: { // query: {
user_type: 1, // user_type: 1,
mid: 1, // mid: 1,
uid: 123, // uid: 123,
skey: '12323' // skey: '12323'
} // }
}); // });
// var socket = io.connect(url); // var socket = io.connect(url);
// var socket = io.connect('http://localhost:3000?skey=hello'); var socket = io.connect('http://localhost:3000');


socket.on('news', function (data) { socket.on('news', function (data) {
console.log(data); console.log(data);
Expand Down
8 changes: 4 additions & 4 deletions demo/2017.05.22-web-socket/started/server.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ io.on('connection', function (socket) {
// console.log(data); // console.log(data);
// }); // });
socket.on('disconnect', function () { socket.on('disconnect', function () {
console.log('disconnect: ' + socket.id); console.log('disconnect1: ' + socket.id);
}); });
}); });


setInterval(function () { // setInterval(function () {
console.log(arr.map(socket => socket.connected).join(',')); // console.log(arr.map(socket => socket.connected).join(','));
}, 3000); // }, 3000);


/* /*
var express = require('express'); var express = require('express');
Expand Down
10 changes: 10 additions & 0 deletions demo/2017.05.22-web-socket/ws/cal.js
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,10 @@
const crypto = require('crypto');
const magic = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11';
const secWebSocketKey = 'w4v7O6xFTi36lq3RNcgctw==';

let secWebSocketAccept = crypto.createHash('sha1')
.update(secWebSocketKey + magic)
.digest('base64');

console.log(secWebSocketAccept);
// Oy4NRAQ13jhfONC7bP8dTKb4PTU=

0 comments on commit 3865fdf

Please sign in to comment.