Merge commit '5fa04d8877d1f37e3ee20b0dac9a12389b935e23' into expose-ejson

Conflicts:
	README.markdown

Author: vsivsi

README.markdown

@@ -28,10 +28,9 @@ var ddpclient = new DDPClient({
   /* optional: */
   auto_reconnect: true,
   auto_reconnect_timer: 500,
-  use_ejson: true,  // default is false
-  use_ssl: false, //connect to SSL server,
-  use_ssl_strict: true, //Set to false if you have root ca trouble.
-  maintain_collections: true //Set to false to maintain your own collections.
+  use_ejson: true,           // Use Meteor's EJSON to preserve certain data types.
+  use_ssl: false,
+  maintain_collections: true // Set to false to maintain your own collections.
 });
 
 ddpclient.connect(function(error) {
@@ -42,31 +41,31 @@ ddpclient.connect(function(error) {
 
   console.log('connected!');
 
-  ddpclient.loginWithUsername("myusername","ddp-rocks",function(err, result) {
-      //Do stuff after login
-  });
+  ddpclient.loginWithUsername("username", "password", function (err, result) {
+    // result contains your auth token
 
-  ddpclient.call('test-function', ['foo', 'bar'], function(err, result) {
-    console.log('called function, result: ' + result);
-  })
+    ddpclient.call('test-function', ['foo', 'bar'], function (err, result) {
+      console.log('called function, result: ' + result);
+    });
 
-  ddpclient.subscribe('posts', [], function() {
-    console.log('posts complete:');
-    console.log(ddpclient.collections.posts);
-  })
+    ddpclient.subscribe('posts', [], function () {
+      console.log('posts complete:');
+      console.log(ddpclient.collections.posts);
+    });
+  });
 });
 
 /*
  * Useful for debugging and learning the ddp protocol
  */
-ddpclient.on('message', function(msg) {
+ddpclient.on('message', function (msg) {
   console.log("ddp message: " + msg);
 });
 
 /*
  * If you need to do something specific on close or errors.
- * (You can also disable auto_reconnect and call ddpclient.connect()
- * when you are ready to re-connect.)
+ * You can also disable auto_reconnect and
+ * call ddpclient.connect() when you are ready to re-connect.
 */
 ddpclient.on('socket-close', function(code, message) {
   console.log("Close: %s %s", code, message);
@@ -86,14 +85,15 @@ var oid = new ddpclient.EJSON.ObjectID();
 
 Unimplemented Features
 ====
+The node DDP client does not implement ordered collections, something that while in the DDP spec has not been implemented in Meteor yet.
+
 * Server to Client messages
   * 'addedBefore'
   * 'movedBefore'
   * 'error'
   * 'updated'
 
 
-
 Thanks
 ======
 

examples/example.js

@@ -1,36 +1,42 @@
 var DDPClient = require("../lib/ddp-client");
 
 var ddpclient = new DDPClient({
-  host: "localhost",
+  host: "localhost", 
   port: 3000,
   /* optional: */
   auto_reconnect: true,
   auto_reconnect_timer: 500,
-  use_ejson: true  // default is false
+  use_ejson: true,           // Use Meteor's EJSON to preserve certain data types.
+  use_ssl: false,            
+  maintain_collections: true // Set to false to maintain your own collections.
 });
 
 ddpclient.connect(function(error) {
-  console.log('connected!');
-
   if (error) {
     console.log('DDP connection error!');
     return;
   }
 
-  ddpclient.call('test-function', ['foo', 'bar'], function(err, result) {
-    console.log('called function, result: ' + result);
-  });
+  console.log('connected!');
+
+  ddpclient.loginWithUsername("username", "password", function (err, result) {
+    // result contains your auth token
+
+    ddpclient.call('test-function', ['foo', 'bar'], function (err, result) {
+      console.log('called function, result: ' + result);
+    });
 
-  ddpclient.subscribe('posts', [], function() {
-    console.log('posts complete:');
-    console.log(ddpclient.collections.posts);
+    ddpclient.subscribe('posts', [], function () {
+      console.log('posts complete:');
+      console.log(ddpclient.collections.posts);
+    });
   });
 });
 
 /*
  * Useful for debugging and learning the ddp protocol
  */
-ddpclient.on('message', function(msg) {
+ddpclient.on('message', function (msg) {
   console.log("ddp message: " + msg);
 });
 

lib/ddp-client.js

@@ -2,8 +2,9 @@ var WebSocket = require('faye-websocket'),
     _ = require('underscore'),
     util = require('util'),
     events = require('events'),
-    EJSON = require('meteor-ejson'),
-    SRP = require('node-srp'),
+    EJSON = require('ddp-ejson'),
+    SRP = require('ddp-srp'),
+    Random = require('ddp-random'),
 
 DDPClient = function(opts) {
   var self = this;
@@ -86,7 +87,7 @@ DDPClient.prototype._clearReconnectTimeout = function() {
     clearTimeout(self.reconnectTimeout);
     self.reconnectTimeout = null;
   }
-}
+};
 
 DDPClient.prototype._recoverNetworkError = function() {
   var self = this;
@@ -251,9 +252,6 @@ DDPClient.prototype.connect = function(connected) {
 
   // websocket
   var protocol = self.use_ssl ? 'wss://' : 'ws://';
-  //XXX: These aren't in faye-websocket.  Are they still needed?
-  //var options = self.use_ssl ? {rejectUnauthorized: self.use_ssl_strict} : {};
-  //self.socket = new WebSocket.Client(protocol + self.host + ':' + self.port + '/' + self.path, options);
   self.socket = new WebSocket.Client(protocol + self.host + ':' + self.port + '/' + self.path);
   self._prepareHandlers();
 };
@@ -285,25 +283,25 @@ DDPClient.prototype._login = function(loginParams, password, callback) {
       if (conf) {
         callback(null, result);
       } else {
-        callback({error:"The HAMK doesn't match. Possible MITM attack"});
+        callback({ error : "The HAMK doesn't match. Possible MITM attack" });
       }
 
     });
   });
-}
+};
 
 DDPClient.prototype.loginWithEmail = function(email, password, callback) {
   this._login({email: email}, password, callback);
-}
+};
 
 DDPClient.prototype.loginWithUsername = function(username, password, callback) {
   this._login({username: username}, password, callback);
-}
+};
 
 DDPClient.prototype.loginWithToken = function(token, callback) {
   var self = this;
   self.call("login", [{resume: token}], callback);
-}
+};
 
 DDPClient.prototype.close = function() {
   var self = this;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddp",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "Node.js module to connect to servers using DDP protocol.",
   "author": "Tom Coleman <[email protected]> (http://tom.thesnail.org)",
   "contributors": [
@@ -21,9 +21,10 @@
     "url": "https://github.com/oortcloud/node-ddp-client.git"
   },
   "dependencies": {
-    "underscore": ">=1.3.3",
-    "meteor-ejson": ">=0.6.3",
-    "node-srp": ">=0.0.1",
+    "underscore": "1.5.2",
+    "ddp-ejson": "0.8.1-2",
+    "ddp-srp": "0.8.1-1",
+    "ddp-random": "0.8.1-1",
     "faye-websocket": "~0.7.1"
   },
   "devDependencies": {

test/ddp-client.js

@@ -2,7 +2,7 @@ var assert = require('assert'),
     sinon  = require('sinon'),
     rewire = require('rewire'),
     events = require('events'),
-    EJSON  = require('meteor-ejson');
+    EJSON  = require('ddp-ejson');
 
 var DDPClient = rewire("../lib/ddp-client");