Skip to content

Commit 040da22

Browse files
committed
release 1.2 - node v9 implementation, websocket module update
1 parent 4d99f84 commit 040da22

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,5 @@ Temporary Items
5656
.hgtags
5757

5858
# third party node modules
59-
node_modules
59+
node_modules
60+
/package-lock.json

chat/data/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ App.prototype = {
2424
this._wss = new WebSocketServer({ server: httpServer });
2525
this._wss.on('connection', this._webSocketConnectionHandler.bind(this));
2626
},
27-
_webSocketConnectionHandler: function (ws) {
27+
_webSocketConnectionHandler: function (ws, req) {
2828
this._sessionParser(
29-
ws.upgradeReq,
29+
req,
3030
{},
31-
this._webSocketSessionParsedHandler.bind(this, ws)
31+
this._webSocketSessionParsedHandler.bind(this, ws, req)
3232
);
3333
},
34-
_webSocketSessionParsedHandler: function (ws) {
35-
var sessionId = ws.upgradeReq.session.id;
34+
_webSocketSessionParsedHandler: function (ws, req) {
35+
var sessionId = req.session.id;
3636
if (typeof(this._allowedSessionIds[sessionId]) == 'undefined') {
3737
console.log("Connected not authorized user with session id: " + sessionId);
3838
ws.close(4000, 'Not authorized session.');

chat/js/client.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Class.Define('Chat', {
8282
},
8383
type: 'json',
8484
error: function (responseText, statusCode, xhr) {
85-
alert(responseText);
85+
alert("Wrong username or password. See: ./chat/data/login-data.csv");
8686
}
8787
});
8888
}

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web-dev-server-example-chat-pure-js",
3-
"version": "1.1.2",
3+
"version": "1.2.0",
44
"description": "Chat example with session authentication in pure Javascript.",
55
"homepage": "https://github.com/web-dev-server/example-chat-pure-js",
66
"repository": {
@@ -15,7 +15,7 @@
1515
},
1616
"main": "server.js",
1717
"dependencies": {
18-
"web-dev-server": "~1.1.0",
19-
"ws": "~1.1.1"
18+
"web-dev-server": "^1.1.1",
19+
"ws": "^3.3.2"
2020
}
21-
}
21+
}

run-server-in-debug-mode.cmd

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
:: run command bellow before first run:
2-
:: npm install node-debug
3-
4-
node-debug server.js
1+
::node --inspect-brk server.js
2+
node --inspect server.js

0 commit comments

Comments
 (0)