Emulation/Drop64
1
0
Fork 0
mirror of https://github.com/damouse/Drop64.git synced 2024-05-31 18:27:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

websocket messages aren't getting through on the router

Browse source
This commit is contained in:
damouse 2017-02-15 14:15:50 -06:00
parent c4533d3fad
commit dcf25bf379
3 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/controller.js
View file

@ -23,10 +23,9 @@ angular.module('controller', [])
var socket = io.connect($location.$$host + ':' + $location.$$port);
$scope.counter = 0;
$scope.touchesStarted = function() {
console.log("Touch Started");
$scope.counter++;
}
socket.on('connect', function() {
socket.emit('command', 'Controller Connected');
});
$scope.press = function(b, k) {

6
src/display.js
View file

@ -11,11 +11,11 @@ function makeKeyboardEvent(event, key, code) {
// Start socket.io implementation
var sock = io.connect(window.location.host);
sock.on('connect', () => {
sock.emit('command', 'connected');
sock.on('connect', function() {
sock.emit('command', 'Display Connected');
// Turn each input key into a simulated browser keypress
sock.on("input", (m) => {
sock.on("input", function(m) {
makeKeyboardEvent(m.event, m.button, m.code);
})
});

12
src/server.js
View file

@ -3,20 +3,18 @@ const app = express();
var http = require('http').Server(app);
var io = require('socket.io')(http);
app.get('/', (req, res) => { res.sendFile('display.html', { root: 'views' }) })
app.get('/controller', (req, res) => { res.sendFile('controller.html', { root: 'views' }) })
app.get('/', function(req, res) { res.sendFile('display.html', { root: 'views' }) })
app.get('/controller', function(req, res) { res.sendFile('controller.html', { root: 'views' }) })
for (var d of["stylesheets", "vendor", "sensors", "src"]) {
app.use('/assets', express.static(d));
}
for (var d of["stylesheets", "vendor", "sensors", "src"]) { app.use('/assets', express.static(d)) }
io.on('connection', (socket) => {
console.log("Connected");
io.on('connection', function(socket) {
socket.on("controller", function(m) {
console.log(m);
io.emit('input', m)
});
socket.on("command", function(m) {
console.log(m);
io.emit('command', m);
});
});