all async paths working

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/server/index.js b/lib/server/index.js
index f8cea0c..5c70cba 100644
--- a/lib/server/index.js
+++ b/lib/server/index.js
@@ -31,6 +31,8 @@ site.init = function(){
   
   io = socketIo(server)
   
+  bridge.serve()
+  bridge.getDevices()
   bridge.connectSocketIo(io)
 
   const api_folders = api(app, 'folder')
@@ -51,7 +53,6 @@ site.init = function(){
       if (Object.keys(data).some( el => !! el )) {
         res.json( Object.keys(data).map(k=>data[k]).sort((a,b) => { b.id - a.id }) )
       }
-      bridge.process()
     })
 
     loader.register('upload')
@@ -62,7 +63,7 @@ site.init = function(){
       data[fn] = false
       loader.register(fn)
       fs.rename(file.path, 'data/' + req.params.id + '/' + fn, function(err){
-        api_files.crud.create({
+        api_files.create({
           // table.string('username')
           'folder_id': req.params.id,
           'name': fn,
@@ -70,7 +71,7 @@ site.init = function(){
           'generated': false,
           'processed': false,
         }).then( (file) => {
-          data[fn] = file.toJSON()
+          data[fn] = file
           loader.ready(fn)
         }).catch( (err) => {
           console.warn(err)