Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Experimental Ohm language driver #541

Open
wants to merge 4 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 19 additions & 2 deletions lib/nodejs/reflector.js
Expand Up @@ -7,8 +7,25 @@ var parseurl = require( './parse-url' ),
fs = require( 'fs' );

function parseSocketUrl( socket ) {
var application = socket.handshake.url.substring(0, socket.handshake.url.indexOf("/1/?t="));
return parseurl.Process( application );
// var application = socket.handshake.url.substring(0, socket.handshake.url.indexOf("/1/?t="));
// return parseurl.Process( application );

try {
var referer = require('url')
.parse(socket.handshake.url)
.query;
referer = require('querystring')
.parse(referer)
.pathname;
var namespace = referer;
if (!namespace) return null;
if (namespace[namespace.length - 1] != "/")
namespace += "/";
return parseurl.Process(namespace);
}
catch (e) {
return null;
}
}

function GetLoadForSocket( processedURL ) {
Expand Down
20 changes: 10 additions & 10 deletions node_vwf.js
Expand Up @@ -139,16 +139,16 @@ function startVWF() {
//create socket server
var socketManager = sio.listen( srv, {
log: false,
resource: {
exec: function( url ) {
var match = /\/1\/\?t=\d*/.exec( url ) || /\/1\/websocket/.exec( url );
if (match) {
return [url.substring(0, url.indexOf(match[0]))];
} else {
return null;
}
}
}
// resource: {
// exec: function( url ) {
// var match = /\/1\/\?t=\d*/.exec( url ) || /\/1\/websocket/.exec( url );
// if (match) {
// return [url.substring(0, url.indexOf(match[0]))];
// } else {
// return null;
// }
// }
// }
} );
socketManager.set( 'transports', [ 'websocket' ] );
socketManager.sockets.on( 'connection', reflector.OnConnection );
Expand Down