diff options
Diffstat (limited to 'app/server')
| -rw-r--r-- | app/server/bridge.js | 20 | ||||
| -rw-r--r-- | app/server/site.js | 14 |
2 files changed, 3 insertions, 31 deletions
diff --git a/app/server/bridge.js b/app/server/bridge.js index 9eba844..10bffb8 100644 --- a/app/server/bridge.js +++ b/app/server/bridge.js @@ -75,23 +75,9 @@ function bind_relay(socket) { }) // // data responses from the server, telling us that files, folders, etc were created - // socket.on('data_res', data => { - // if (EXPRESS_CONNECTS_TO_RELAY) return - // switch (data.type) { - // case 'file_create': - // // certain files should be persisted in the database... - // db.models.file.create(data.data).then(file => { - // client.emit('data_res', { - // type: 'file_create', - // data: file, - // }) - // }) - // break - // default: - // client.emit('data_res', data) - // break - // } - // }) + socket.on('api_res', data => { + client.emit('api_res', data) + }) // image frames generated by pix2pix socket.on('frame', (data) => { diff --git a/app/server/site.js b/app/server/site.js index 39919de..85c932f 100644 --- a/app/server/site.js +++ b/app/server/site.js @@ -76,20 +76,6 @@ app.post('/api/folder/:id/upload/', if (req.body.should_relay === "true" || req.body.generated === "true") { console.log('relaying...') const client = require('./bridge').client - console.log("__________\n_____________--\n") - console.log("__________\n_______asdfdsaf______--\n") - console.log("__________\n_____________--\n") - console.log(require('./bridge')) - console.log("__________\n_____________--\n") - console.log("__________\n________clieieieie_____--\n") - console.log("__________\n_____________--\n") - console.log("__________\n_____________--\n") - console.log(require('./bridge').client) - console.log("__________\n_____________--\n") - console.log("__________\n_____________--\n") - console.log("__________\n_____________--\n") - console.log("__________\n_____________--\n") - console.log("__________\n_____________--\n") client.emit('api_res', JSON.stringify({ type: 'create', datatype: 'file', data: db_file })) } resolve(db_file) |