mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-10 17:02:41 +01:00
4636833f3d
Summary: This was broken in D11383. Basically, I had the `ws` module installed globally whilst testing, but the changes made do not work if the `ws` module is installed locally (i.e. in the `./support/aphlict/server/node_modules` directory). After poking around, it seems that this is due to the sandboxing that is done by `JX.require`. A quick fix is to just //not// use `JX.require`, although you may have a better idea? The error that is occurring is as follows: ``` <<< UNCAUGHT EXCEPTION! >>> Error: Cannot find module 'ws' at Function.Module._resolveFilename (module.js:338:15) at Function.Module._load (module.js:280:25) at Module.require (module.js:364:17) at require (module.js:380:17) at extra.require (/usr/src/phabricator/webroot/rsrc/externals/javelin/core/init_node.js:48:16) at /usr/src/phabricator/support/aphlict/server/lib/AphlictClientServer.js:10:17 at Script.(anonymous function) [as runInNewContext] (vm.js:41:22) at Object.JX.require (/usr/src/phabricator/webroot/rsrc/externals/javelin/core/init_node.js:58:6) at Object.<anonymous> (/usr/src/phabricator/support/aphlict/server/aphlict_server.js:102:4) at Module._compile (module.js:456:26) >>> Server exited! ``` Test Plan: Now able to start the Aphlict server. Reviewers: joshuaspence Reviewed By: joshuaspence Subscribers: Korvin, epriestley Maniphest Tasks: T6987 Differential Revision: https://secure.phabricator.com/D11425
90 lines
2.1 KiB
JavaScript
90 lines
2.1 KiB
JavaScript
var JX = require('./javelin').JX;
|
|
|
|
require('./AphlictListenerList');
|
|
require('./AphlictLog');
|
|
|
|
var util = require('util');
|
|
var WebSocket = require('ws');
|
|
|
|
JX.install('AphlictClientServer', {
|
|
|
|
construct: function(server) {
|
|
this.setListenerList(new JX.AphlictListenerList());
|
|
this.setLogger(new JX.AphlictLog());
|
|
this._server = server;
|
|
},
|
|
|
|
members: {
|
|
_server: null,
|
|
|
|
listen: function() {
|
|
var self = this;
|
|
var server = this._server.listen.apply(this._server, arguments);
|
|
var wss = new WebSocket.Server({server: server});
|
|
|
|
wss.on('connection', function(ws) {
|
|
var listener = self.getListenerList().addListener(ws);
|
|
|
|
function log() {
|
|
self.getLogger().log(
|
|
util.format('<%s>', listener.getDescription()) +
|
|
' ' +
|
|
util.format.apply(null, arguments));
|
|
}
|
|
|
|
log('Connected from %s.', ws._socket.remoteAddress);
|
|
|
|
ws.on('message', function(data) {
|
|
log('Received message: %s', data);
|
|
|
|
var message;
|
|
try {
|
|
message = JSON.parse(data);
|
|
} catch (err) {
|
|
log('Message is invalid: %s', err.message);
|
|
return;
|
|
}
|
|
|
|
switch (message.command) {
|
|
case 'subscribe':
|
|
log(
|
|
'Subscribed to: %s',
|
|
JSON.stringify(message.data));
|
|
listener.subscribe(message.data);
|
|
break;
|
|
|
|
case 'unsubscribe':
|
|
log(
|
|
'Unsubscribed from: %s',
|
|
JSON.stringify(message.data));
|
|
listener.unsubscribe(message.data);
|
|
break;
|
|
|
|
default:
|
|
log(
|
|
'Unrecognized command "%s".',
|
|
message.command || '<undefined>');
|
|
}
|
|
});
|
|
|
|
wss.on('close', function() {
|
|
self.getListenerList().removeListener(listener);
|
|
log('Disconnected.');
|
|
});
|
|
|
|
wss.on('error', function(err) {
|
|
log('Error: %s', err.message);
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
properties: {
|
|
listenerList: null,
|
|
logger: null,
|
|
}
|
|
|
|
});
|