From 891bf001d46240c4327fa1f4591a1ea67a4f0473 Mon Sep 17 00:00:00 2001 From: Erick Pacheco Pedraza Date: Wed, 23 Jan 2019 10:23:14 -0500 Subject: [PATCH 1/6] Update switch.js Updated line five. --- switch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/switch.js b/switch.js index 243884c..87c1791 100644 --- a/switch.js +++ b/switch.js @@ -2,7 +2,7 @@ try { module.exports = require('./compiled'); } catch(error) { - require('./node_modules/coffee-script'); + require('coffee-script'); module.exports = require('./lib'); } From 4ee2f21d9809a7db40ab164e13ab66afbf488ac0 Mon Sep 17 00:00:00 2001 From: Erick Pacheco Pedraza Date: Wed, 23 Jan 2019 15:09:32 -0500 Subject: [PATCH 2/6] Update index.coffee --- lib/index.coffee | 70 +++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/lib/index.coffee b/lib/index.coffee index c6887fb..ce6b25e 100644 --- a/lib/index.coffee +++ b/lib/index.coffee @@ -1,8 +1,5 @@ -cookieParser = require 'cookie-parser' -cookieParserUtils = require 'cookie-parser/lib/parse' +connect = require 'connect' express = require 'express' -expressLayer = require 'express/lib/router/layer' -expressSession = require 'express-session' io = require 'socket.io' http = require 'http' https = require 'https' @@ -16,12 +13,12 @@ RoomIO = require('./room').RoomIO express.io = io express.io.routeForward = middleware.routeForward -session = expressSession; +session = express.session delete express.session sessionConfig = new Object express.session = (options) -> options ?= new Object - options.key ?= 'express.sid' + options.key ?= 'connect.sid' options.store ?= new session.MemoryStore options.cookie ?= new Object sessionConfig = options @@ -40,7 +37,7 @@ express.application.https = (options) -> express.application.io = (options) -> options ?= new Object defaultOptions = log:false - _.defaults options, defaultOptions + _.extend options, defaultOptions @io = io.listen @server, options @io.router = new Object @io.middleware = [] @@ -63,7 +60,7 @@ express.application.io = (options) -> , (error) -> return next error if error? next null, true - cookieParser = cookieParser() + cookieParser = express.cookieParser() cookieParser data, null, (error) -> return next error if error? rawCookie = data.cookies[sessionConfig.key] @@ -73,18 +70,18 @@ express.application.io = (options) -> data.cookies = request.cookies rawCookie = data.cookies[sessionConfig.key] return next "No cookie present", false unless rawCookie? - sessionId = cookieParserUtils.signedCookies rawCookie, sessionConfig.secret + sessionId = connect.utils.parseSignedCookie rawCookie, sessionConfig.secret data.sessionID = sessionId sessionConfig.store.get sessionId, (error, session) -> return next error if error? - data.session = new expressSession.Session data, session + data.session = new connect.session.Session data, session next null, true - sessionId = cookieParserUtils.signedCookies rawCookie, sessionConfig.secret + sessionId = connect.utils.parseSignedCookie rawCookie, sessionConfig.secret data.sessionID = sessionId sessionConfig.store.get sessionId, (error, session) -> return next error if error? - data.session = new expressSession.Session data, session + data.session = new connect.session.Session data, session next null, true @io.use = (callback) => @@ -98,32 +95,27 @@ express.application.io = (options) -> @io.sockets.emit.apply @io.sockets, args @io.room = (room) => - new RoomIO(room, @io.sockets) - - layer = new expressLayer('', - sensitive: undefined - strict: undefined - end: false - , (request, response, next) => - request.io = - route: (route) => - ioRequest = new Object - for key, value of request - ioRequest[key] = value - ioRequest.io = - broadcast: @io.broadcast - respond: => - args = Array.prototype.slice.call arguments, 0 - response.json.apply response, args - route: (route) => - @io.route route, ioRequest, trigger: true - data: request.body - @io.route route, ioRequest, trigger: true - broadcast: @io.broadcast - next() - ) - - @_router.stack.push layer + new RoomIO(room, @io.sockets) + + @stack.push + route: '' + handle: (request, response, next) => + request.io = + route: (route) => + ioRequest = new Object + for key, value of request + ioRequest[key] = value + ioRequest.io = + broadcast: @io.broadcast + respond: => + args = Array.prototype.slice.call arguments, 0 + response.json.apply response, args + route: (route) => + @io.route route, ioRequest, trigger: true + data: request.body + @io.route route, ioRequest, trigger: true + broadcast: @io.broadcast + next() return this @@ -152,7 +144,7 @@ initRoutes = (socket, io) -> cookies: socket.handshake.cookies handshake: socket.handshake session = socket.handshake.session - request.session = new expressSession.Session request, session if session? + request.session = new connect.session.Session request, session if session? socket.handshake.session = request.session request.io = new RequestIO(socket, request, io) request.io.respond = respond From 7c321a94f73418de8fc154e1635890c5e2a2d8d8 Mon Sep 17 00:00:00 2001 From: Erick Pacheco Pedraza Date: Wed, 23 Jan 2019 15:41:04 -0500 Subject: [PATCH 3/6] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8b44679..96925fb 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ realtime-web framework for node.js express.io = express + socket.io ``` +## This version has updated the files switch.js and /lib/index.coffee; now all tests and library is working well. + ## Simple App Setup Here is the canonical express.io example. From d951bec2982396faeb7bc1bbef1ae3afe7e47fff Mon Sep 17 00:00:00 2001 From: Erick Pacheco Pedraza Date: Wed, 23 Jan 2019 15:48:32 -0500 Subject: [PATCH 4/6] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 96925fb..39217f2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -![express.io](http://cdn.techpines.io/express.io-black.png) +## This version has updated the files switch.js and /lib/index.coffee; now all tests and library is working well. +Solved the problems related with te problems: "cannot find module 'express/node_modules/connect' " and "Cannot find module './node_modules/coffee-script' " realtime-web framework for node.js @@ -6,8 +7,6 @@ realtime-web framework for node.js express.io = express + socket.io ``` -## This version has updated the files switch.js and /lib/index.coffee; now all tests and library is working well. - ## Simple App Setup Here is the canonical express.io example. From 138c495ef3fc074d5bedd09ff532e6c49331986b Mon Sep 17 00:00:00 2001 From: Erick Pacheco Pedraza Date: Wed, 23 Jan 2019 15:52:35 -0500 Subject: [PATCH 5/6] Update README.md --- README.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 39217f2..b96bf93 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,19 @@ -## This version has updated the files switch.js and /lib/index.coffee; now all tests and library is working well. +## UPDATES Solved the problems related with te problems: "cannot find module 'express/node_modules/connect' " and "Cannot find module './node_modules/coffee-script' " +1. Download this code and run: +``` +npm install +``` + +2. After that run: + +``` +npm run test +``` + + + realtime-web framework for node.js ```coffeescript From e5c969984a22656ba0f9d1bb9bc169def72f9c04 Mon Sep 17 00:00:00 2001 From: Erick Pacheco Pedraza Date: Wed, 23 Jan 2019 15:53:33 -0500 Subject: [PATCH 6/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b96bf93..056a447 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ npm run test ``` - +## realtime-web framework for node.js ```coffeescript