Support UTF-8 characters in topic.

mcollina · mcollina · commit e7e5cfce6d8a · 2014-06-17T15:49:10.000+02:00
diff --git a/lib/generate.js b/lib/generate.js
@@ -302,7 +302,7 @@ module.exports.subscribe = function(opts) {
         return new Error('Invalid subscriptions - invalid qos');
       }
 
-      length += topic.length + 2 + 1;
+      length += Buffer.byteLength(topic) + 2 + 1;
     }
   } else {
     return new Error('Invalid subscriptions');
@@ -405,7 +405,7 @@ module.exports.unsubscribe = function(opts) {
       if ('string' !== typeof unsubs[i]) {
         return new Error('Invalid unsubscriptions');
       }
-      length += unsubs[i].length + 2;
+      length += Buffer.byteLength(unsubs[i]) + 2;
     }
   } else {
     return new Error('Invalid unsubscriptions');
diff --git a/test/abstract_client.js b/test/abstract_client.js
@@ -310,6 +310,22 @@ module.exports = function(server, createClient, port) {
         client.publish('a', 'b', opts, done);
       });
     });
+
+    it('should support UTF-8 characters in topic', function(done) {
+      var client = createClient(port);
+
+      client.once('connect', function() {
+        client.publish('中国', 'hello', done);
+      });
+    })
+
+    it('should support UTF-8 characters in payload', function(done) {
+      var client = createClient(port);
+
+      client.once('connect', function() {
+        client.publish('hello', '中国', done);
+      });
+    })
   });
 
   describe('unsubscribing', function() {
@@ -374,6 +390,22 @@ module.exports = function(server, createClient, port) {
         });
       });
     });
+
+    it('should unsubscribe from a chinese topic', function(done) {
+      var client = createClient(port);
+      var topic = '中国';
+
+      client.once('connect', function() {
+        client.unsubscribe(topic);
+      });
+
+      server.once('client', function(client) {
+        client.once('unsubscribe', function(packet) {
+          packet.unsubscriptions.should.containEql(topic);
+          done();
+        });
+      });
+    });
   });
 
   describe('pinging', function () {
@@ -427,6 +459,7 @@ module.exports = function(server, createClient, port) {
         });
       });
     });
+
     it('should send a subscribe message', function(done) {
       var client = createClient(port);
 
@@ -506,6 +539,26 @@ module.exports = function(server, createClient, port) {
         });
       });
     });
+
+    it('should subscribe with a chinese topic', function(done) {
+      var client = createClient(port);
+
+      var topic = '中国';
+
+      client.once('connect', function() {
+        client.subscribe(topic);
+      });
+
+      server.once('client', function(client) {
+        client.once('subscribe', function(packet) {
+          packet.subscriptions.should.containEql({
+            topic: topic,
+            qos: 0
+          });
+          done();
+        });
+      });
+    });
   });
 
   describe('receiving messages', function() {

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ module.exports.subscribe = function(opts) {`
`302`	`302`	`return new Error('Invalid subscriptions - invalid qos');`
`303`	`303`	`}`
`304`	`304`
`305`		`- length += topic.length + 2 + 1;`
	`305`	`+ length += Buffer.byteLength(topic) + 2 + 1;`
`306`	`306`	`}`
`307`	`307`	`} else {`
`308`	`308`	`return new Error('Invalid subscriptions');`
`@@ -405,7 +405,7 @@ module.exports.unsubscribe = function(opts) {`
`405`	`405`	`if ('string' !== typeof unsubs[i]) {`
`406`	`406`	`return new Error('Invalid unsubscriptions');`
`407`	`407`	`}`
`408`		`- length += unsubs[i].length + 2;`
	`408`	`+ length += Buffer.byteLength(unsubs[i]) + 2;`
`409`	`409`	`}`
`410`	`410`	`} else {`
`411`	`411`	`return new Error('Invalid unsubscriptions');`