0.1.0

c58 · Feb 13, 2016 · 7e57d2b · 7e57d2b
1 parent d06c4af
commit 7e57d2b
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 21 deletions.
diff --git a/dist/MongoCollectionDelegate.js b/dist/MongoCollectionDelegate.js
@@ -1,12 +1,13 @@
 'use strict';
 
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
-var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
 exports._updateLocally = _updateLocally;
 exports._updateMany = _updateMany;
 exports._updateOne = _updateOne;
@@ -102,7 +103,7 @@ function createCollectionDelegate() {
    * operations.
    */
 
-  var MongoCollectionDelegate = (function (_defaultDelegate2) {
+  var MongoCollectionDelegate = function (_defaultDelegate2) {
     _inherits(MongoCollectionDelegate, _defaultDelegate2);
 
     function MongoCollectionDelegate() {
@@ -185,7 +186,7 @@ function createCollectionDelegate() {
     }]);
 
     return MongoCollectionDelegate;
-  })(_defaultDelegate);
+  }(_defaultDelegate);
 
   return MongoCollectionDelegate;
 }
diff --git a/dist/MongoCursor.js b/dist/MongoCursor.js
@@ -1,12 +1,13 @@
 'use strict';
 
-var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
-
-var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
+
 exports.selectorIdToObject = selectorIdToObject;
 exports.createCursor = createCursor;
 
@@ -53,7 +54,7 @@ function selectorIdToObject(query) {
 function createCursor() {
   var _defaultCursor = _marsdb2.default.defaultCursor();
 
-  var MongoCursor = (function (_defaultCursor2) {
+  var MongoCursor = function (_defaultCursor2) {
     _inherits(MongoCursor, _defaultCursor2);
 
     function MongoCursor(db, query, options) {
@@ -90,6 +91,7 @@ function createCursor() {
         return (0, _index.getDb)().then(function (db) {
           var coll = db.collection(_this3.db.modelName);
           var nativeCursor = coll.find(_this3._query);
+          nativeCursor.maxTimeMS(2000);
 
           if (_this3._skip !== undefined) {
             nativeCursor.skip(_this3._skip);
@@ -121,7 +123,7 @@ function createCursor() {
     }]);
 
     return MongoCursor;
-  })(_defaultCursor);
+  }(_defaultCursor);
 
   return MongoCursor;
 }
diff --git a/dist/MongoIndexManager.js b/dist/MongoIndexManager.js
@@ -16,7 +16,7 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
-var MongoIndexManager = (function (_IndexManager) {
+var MongoIndexManager = function (_IndexManager) {
   _inherits(MongoIndexManager, _IndexManager);
 
   function MongoIndexManager() {
@@ -26,6 +26,6 @@ var MongoIndexManager = (function (_IndexManager) {
   }
 
   return MongoIndexManager;
-})(_IndexManager3.default);
+}(_IndexManager3.default);
 
 exports.default = MongoIndexManager;
diff --git a/dist/index.js b/dist/index.js
@@ -3,6 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 exports.getDb = getDb;
 exports.configure = configure;
 
@@ -42,22 +45,28 @@ function getDb() {
  * Create a connection to the MongoDB and setup
  * MarsDB to work with this database
  * @param  {String} options.url
+ * @param  {Object} options.options
  * @return {Promise}
  */
 function configure(_ref) {
   var url = _ref.url;
+  var _ref$options = _ref.options;
+  var options = _ref$options === undefined ? {} : _ref$options;
 
   _marsdb2.default.defaultIndexManager(_MongoIndexManager2.default);
   _marsdb2.default.defaultDelegate((0, _MongoCollectionDelegate.createCollectionDelegate)());
   _marsdb2.default.defaultCursor((0, _MongoCursor.createCursor)());
 
   (0, _invariant2.default)(_db === undefined, 'configure(...): database is already configured');
 
-  _db = _mongodb.MongoClient.connect(url, {
-    db: { pkFactory: {
-        createPk: _idGenerator
-      } }
-  });
+  _db = _mongodb.MongoClient.connect(url, _extends({
+    db: { pkFactory: { createPk: _idGenerator } },
+    server: {
+      socketOptions: { autoReconnect: true },
+      reconnectTries: Infinity,
+      reconnectInterval: 2500
+    }
+  }, options));
 
   return _db;
 }
diff --git a/index.js b/index.js
@@ -1,3 +1,3 @@
 module.exports = {
-  configure: require('./dist').configure,
+  configure: require('./dist').configure
 };
diff --git a/lib/index.js b/lib/index.js
@@ -43,7 +43,7 @@ export function configure({ url, options = {} }) {
       reconnectTries: Infinity,
       reconnectInterval: 2500,
     },
-    ...options
+    ...options,
   });
 
   return _db;

diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
     "marsdb": "0.6.x"
   },
   "devDependencies": {
+    "marsdb": "^0.6.0",
     "babel-cli": "^6.3.17",
     "babel-eslint": "^5.0.0-beta6",
     "babel-preset-es2015": "^6.3.13",