Rollback to 12.0.0 and update index.js

Fix installation error caused by uws

.gitignore

@@ -3,4 +3,3 @@ node_modules
 .DS_Store
 coverage
 .idea
-remotedev-db.sqlite3

bin/injectServer.js

@@ -8,7 +8,9 @@ var endFlag = '/* ' + name + ' end */';
 var serverFlags = {
   'react-native': {
     '0.0.1': '    _server(argv, config, resolve, reject);',
-    '0.31.0': "  runServer(args, config, () => console.log('\\nReact packager ready.\\n'));"
+    '0.31.0': "  runServer(args, config, () => console.log('\\nReact packager ready.\\n'));",
+    '0.44.0-rc.0': '  runServer(args, config, startedCallback, readyCallback);',
+    '0.46.0-rc.0': '  runServer(runServerArgs, configT, startedCallback, readyCallback);'
   },
   'react-native-desktop': {
     '0.0.1': '    _server(argv, config, resolve, reject);'
@@ -92,4 +94,4 @@ exports.revert = function(modulePath, moduleName) {
     );
   }
   return true;
-};
+};

defaultDbOptions.json

@@ -1,6 +0,0 @@
-{
-  "connection": { "filename": "./remotedev-db.sqlite3" },
-  "client": "sqlite3",
-  "debug": false,
-  "migrate": true
-}

index.js

@@ -9,7 +9,7 @@ var LOG_LEVEL_WARN = 2;
 var LOG_LEVEL_INFO = 3;
 
 module.exports = function(argv) {
-  var SocketCluster = require('socketcluster').SocketCluster;
+  var SocketCluster = require('socketcluster');
   var options = assign(getOptions(argv), {
     workerController: __dirname + '/lib/worker.js',
     allowClientPublish: false

lib/db/connector.js

@@ -1,27 +0,0 @@
-var path = require('path');
-var knexModule = require('knex');
-
-module.exports = function connector(options) {
-  var dbOptions = options.dbOptions;
-  dbOptions.useNullAsDefault = true;
-  if (!dbOptions.migrate) {
-    return knexModule(dbOptions);
-  }
-
-  dbOptions.migrations = { directory: path.resolve(__dirname, 'migrations') };
-  dbOptions.seeds = { directory: path.resolve(__dirname, 'seeds') };
-  var knex = knexModule(dbOptions);
-
-  knex.migrate.latest()
-    .then(function() {
-      return knex.seed.run();
-    })
-    .then(function() {
-      console.log('Migrations are finished.');
-    })
-    .catch(function(error) {
-      console.error(error);
-    });
-
-  return knexModule(dbOptions);
-};

lib/db/migrations/reports.js

@@ -1,39 +0,0 @@
-exports.up = function(knex, Promise) {
-  return Promise.all([
-    knex.schema.createTable('remotedev_reports', function(table) {
-      table.uuid('id').primary();
-      table.string('type');
-      table.string('title');
-      table.string('description');
-      table.string('action');
-      table.text('payload');
-      table.text('preloadedState');
-      table.text('screenshot');
-      table.string('userAgent');
-      table.string('version');
-      table.string('user');
-      table.string('userId');
-      table.string('meta');
-      table.string('exception');
-      table.timestamp('added');
-      table.uuid('appId')
-        .references('id')
-        .inTable('remotedev_apps');
-    }),
-
-    knex.schema.createTable('remotedev_apps', function(table){
-      table.uuid('id').primary();
-      table.string('title');
-      table.string('description');
-      table.string('url');
-      table.timestamps();
-    })
-  ])
-};
-
-exports.down = function(knex, Promise) {
-  return Promise.all([
-    knex.schema.dropTable('remotedev_reports'),
-    knex.schema.dropTable('remotedev_apps')
-  ])
-};

lib/db/seeds/apps.js

@@ -1,12 +0,0 @@
-exports.seed = function(knex, Promise) {
-  return Promise.all([
-      knex('remotedev_apps').del()
-    ]).then(function() {
-      return Promise.all([
-        knex('remotedev_apps').insert({
-          id: '78626c31-e16b-4528-b8e5-f81301b627f4',
-          title: 'Default'
-        })
-      ]);
-    });
-};

lib/options.js

@@ -1,13 +1,4 @@
-var path = require('path');
-
 module.exports = function getOptions(argv) {
-  var dbOptions = argv.dbOptions;
-  if (typeof dbOptions === 'string') {
-    dbOptions = require(path.resolve(process.cwd(), argv.dbOptions));
-  } else if (typeof dbOptions === 'undefined') {
-    dbOptions = require('../defaultDbOptions.json');
-  }
-
   return {
     host: argv.hostname || process.env.npm_package_remotedev_hostname || null,
     port: Number(argv.port || process.env.npm_package_remotedev_port) || 8000,
@@ -17,7 +8,8 @@ module.exports = function getOptions(argv) {
       cert: argv.cert || process.env.npm_package_remotedev_cert || null,
       passphrase: argv.passphrase || process.env.npm_package_remotedev_passphrase || null
     },
-    dbOptions: dbOptions,
+    adapter: argv.adapter || process.env.npm_package_remotedev_adapter,
+    dbOptions: argv.dbOptions || process.env.npm_package_remotedev_db,
     logLevel: argv.logLevel || 3
   };
 }

lib/store.js

@@ -1,9 +1,11 @@
-var uuid = require('node-uuid');
+var uuidv4 = require('uuid/v4');
 var pick = require('lodash/pick');
-var connector = require('./db/connector');
+var JSData = require('js-data');
+var getAdapter = require('./adapter');
 
-var reports = 'remotedev_reports'; 
+var store;
-var knex;
+var adapter;
+var Report;
 
 var baseFields = ['id', 'title', 'added'];
 
@@ -13,17 +15,41 @@ function error(msg) {
   });
 }
 
+function map(data, fields) {
+  if (!fields) return data;
+  return data.map(function(r) {
+    return pick(r, fields);
+  });
+}
+
+function listEvery(query) {
+  if (!adapter) {
+    return new Promise(function(resolve) {
+      var report = Report.filter(query);
+      return resolve(report);
+    });
+  }
+  return Report.findAll(query);
+}
+
 function list(query, fields) {
-  knex.select().from('remotedev_apps').then(function(r){ console.log(r) });
+  return new Promise(function(resolve) {
-  var r = knex.select(fields || baseFields).from(reports);
+    listEvery(query).then(function(data) {
-  if (query) return r.where(query);
+      return resolve(map(data, fields || baseFields));
-  return r;
+    });
+  });
 }
 
 function get(id) {
   if (!id) return error('No id specified.');
 
-  return  knex(reports).where('id', id);
+  if (!adapter) {
+    return new Promise(function(resolve) {
+      var report = Report.get(id);
+      return resolve(report);
+    });
+  }
+  return Report.find(id);
 }
 
 function add(data) {
@@ -35,7 +61,7 @@ function add(data) {
   }
 
   var obj = {
-    id: uuid.v4(),
+    id: uuidv4(),
     type: data.type,
     title: data.title || data.exception && data.exception.message || data.action,
     description: data.description,
@@ -49,11 +75,17 @@ function add(data) {
     user: data.user,
     userId: typeof data.user === 'object' ? data.user.id : data.user,
     meta: data.meta,
-    exception: data.exception
+    exception: data.exception,
+    added: Date.now()
   };
 
-  return knex.insert(obj).into(reports)
+  if (!adapter) {
-    .then(function (){ return byBaseFields(obj); })
+    return new Promise(function(resolve) {
+      var report = Report.inject(obj);
+      return resolve(report);
+    });
+  }
+  return Report.create(obj);
 }
 
 function byBaseFields(data) {
@@ -61,12 +93,24 @@ function byBaseFields(data) {
 }
 
 function createStore(options) {
-  knex = connector(options);
+  var adapterName = options.adapter;
+  store = new JSData.DS();
+
+  if (adapterName) {
+    var DSAdapter = getAdapter(adapterName);
+    adapter = new DSAdapter(options.dbOptions);
+    store.registerAdapter(adapterName, adapter, { default: true });
+  }
+
+  Report = store.defineResource('report');
 
   return {
     list: list,
     get: get,
-    add: add
+    add: add,
+    selectors: {
+      byBaseFields: byBaseFields
+    }
   };
 }
 

lib/worker.js

@@ -26,29 +26,20 @@ module.exports.run = function(worker) {
     switch(req.body.op) {
       case 'get':
         store.get(req.body.id).then(function(r) {
-          res.send(r[0] || {});
+          res.send(r || {});
-        }).catch(function(error) {
-          console.error(error);
-          res.sendStatus(500)
         });
         break;
       case 'list':
         store.list(req.body.query, req.body.fields).then(function(r) {
           res.send(r);
-        }).catch(function(error) {
-          console.error(error);
-          res.sendStatus(500)
         });
         break;
       default:
         store.add(req.body).then(function(r) {
           res.send({ id: r.id, error: r.error });
           scServer.exchange.publish('report', {
-            type: 'add', data: r
+            type: 'add', data: store.selectors.byBaseFields(r)
           });
-        }).catch(function(error) {
-          console.error(error);
-          res.status(500).send({})
         });
     }
   });
@@ -69,8 +60,6 @@ module.exports.run = function(worker) {
     if (req.channel === 'report') {
       store.list().then(function(data) {
         req.socket.emit(req.channel, { type: 'list', data: data });
-      }).catch(function(error) {
-        console.error(error);
       });
     }
   });
@@ -90,9 +79,7 @@ module.exports.run = function(worker) {
     });
     socket.on('getReport', function (id, respond) {
       store.get(id).then(function(data) {
-        respond(null, data[0]);
+        respond(null, data);
-      }).catch(function(error) {
-        console.error(error);
       });
     });
     socket.on('disconnect', function() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "remotedev-server",
-  "version": "0.2.1",
+  "version": "0.2.4",
   "description": "Run the RemoteDev monitor on your local server.",
   "main": "index.js",
   "bin": {
@@ -9,9 +9,7 @@
   "files": [
     "bin",
     "lib",
-    "views",
+    "views"
-    "index.js",
-    "defaultDbOptions.json"
   ],
   "repository": {
     "type": "git",
@@ -35,14 +33,12 @@
     "express": "^4.13.3",
     "getport": "^0.1.0",
     "js-data": "^2.9.0",
-    "knex": "^0.12.6",
     "lodash": "^4.15.0",
     "minimist": "^1.2.0",
-    "node-uuid": "^1.4.0",
     "object-assign": "^4.0.0",
     "repeat-string": "^1.5.4",
     "semver": "^5.3.0",
-    "socketcluster": "^5.0.4",
+    "socketcluster": "^12.0.0",
-    "sqlite3": "^3.1.8"
+    "uuid": "^3.2.1"
   }
 }