castv2 - npm Package Compare versions

Comparing version 0.1.2 to 0.1.3

lib/client.js

@@ -65,13 +65,12 @@ var EventEmitter        = require('events').EventEmitter;
       'recv message: protocolVersion=%s sourceId=%s destinationId=%s namespace=%s data=%s',
-      message.protocolVersion,
-      message.sourceId,
-      message.destinationId,
+      message.protocol_version,
+      message.source_id,
+      message.destination_id,
       message.namespace,
-      message.payloadType === 'BINARY' 
-        ? util.inspect(message.payloadBinary)
-        : message.payloadUtf8
+      (message.payload_type === 1) // BINARY
+        ? util.inspect(message.payload_binary)
+        : message.payload_utf8
     );
-
-    if(message.protocolVersion !== 'CASTV2_1_0') {
-      self.emit('error', new Error('Unsupported protocol version: ' + message.protocolVersion));
+    if(message.protocol_version !== 0) { // CASTV2_1_0
+      self.emit('error', new Error('Unsupported protocol version: ' + message.protocol_version));
       self.close();
@@ -82,8 +81,8 @@ return;
     self.emit('message',
-      message.sourceId,
-      message.destinationId,
+      message.source_id,
+      message.destination_id,
       message.namespace,
-      message.payloadType === 'BINARY' 
-        ? message.payloadBinary 
-        : message.payloadUtf8
+      (message.payload_type === 1) // BINARY
+        ? message.payload_binary 
+        : message.payload_utf8
     );    
@@ -101,5 +100,5 @@ }
   var message = {
-    protocolVersion: 0, // CASTV2_1_0
-    sourceId: sourceId,
-    destinationId: destinationId,
+    protocol_version: 0, // CASTV2_1_0
+    source_id: sourceId,
+    destination_id: destinationId,
     namespace: namespace
@@ -109,7 +108,7 @@ };
   if(Buffer.isBuffer(data)) {
-    message.payloadType = 1 // BINARY;
-    message.payloadBinary = data;
+    message.payload_type = 1 // BINARY;
+    message.payload_binary = data;
   } else {
-    message.payloadType = 0 // STRING;
-    message.payloadUtf8 = data;
+    message.payload_type = 0 // STRING;
+    message.payload_utf8 = data;
   }
@@ -119,9 +118,9 @@
     'send message: protocolVersion=%s sourceId=%s destinationId=%s namespace=%s data=%s',
-    message.protocolVersion,
-    message.sourceId,
-    message.destinationId,
+    message.protocol_version,
+    message.source_id,
+    message.destination_id,
     message.namespace,
-    message.payloadType === 1 // BINARY
-      ? util.inspect(message.payloadBinary)
-      : message.payloadUtf8
+    (message.payload_type === 1) // BINARY
+      ? util.inspect(message.payload_binary)
+      : message.payload_utf8
   );
@@ -128,0 +127,0 @@

lib/proto.js

 var fs        = require('fs');
-var protobuf  = require('protobuf');
+var ProtoBuf  = require("protobufjs");
 
-var desc = fs.readFileSync(__dirname + '/cast_channel.desc');
-var schema = new protobuf.Schema(desc);
+var builder = ProtoBuf.loadProtoFile(__dirname + "/cast_channel.proto");
+var extensions = builder.build('extensions.api.cast_channel');
 
-var package_ = 'extensions.api.cast_channel';
-
 var messages = [
@@ -18,3 +16,11 @@ 'CastMessage',
 messages.forEach(function(message) {
-  module.exports[message] = schema[package_ + '.' + message];
+  module.exports[message] = {
+    serialize: function(data) {
+      var msg = new extensions[message](data);
+      return msg.encode().toBuffer();
+    },
+    parse: function(data) {
+      return extensions[message].decode(data);
+    }
+  };
 });

lib/server.js

@@ -54,12 +54,12 @@ var EventEmitter        = require('events').EventEmitter;
         clientId,
-        message.protocolVersion,
-        message.sourceId,
-        message.destinationId,
+        message.protocol_version,
+        message.source_id,
+        message.destination_id,
         message.namespace,
-        message.payloadType === 'BINARY' 
-          ? util.inspect(message.payloadBinary)
-          : message.payloadUtf8
+        (message.payload_type === 1) // BINARY
+          ? util.inspect(message.payload_binary)
+          : message.payload_utf8
       );
 
-      if(message.protocolVersion !== 'CASTV2_1_0') {
+      if(message.protocol_version !== 0) { // CASTV2_1_0
         debug('client error: clientId=%s unsupported protocol version (%s)', clientId, message.protocolVersion);
@@ -73,8 +73,8 @@ var socket = self.clients[clientId].socket;
         clientId,
-        message.sourceId,
-        message.destinationId,
+        message.source_id,
+        message.destination_id,
         message.namespace,
-        message.payloadType === 'BINARY' 
-          ? message.payloadBinary 
-          : message.payloadUtf8
+        (message.payload_type === 1) // BINARY
+          ? message.payload_binary 
+          : message.payload_utf8
       );          
@@ -118,5 +118,5 @@ }
   var message = {
-    protocolVersion: 0, // CASTV2_1_0
-    sourceId: sourceId,
-    destinationId: destinationId,
+    protocol_version: 0, // CASTV2_1_0
+    source_id: sourceId,
+    destination_id: destinationId,
     namespace: namespace
@@ -126,7 +126,7 @@ };
   if(Buffer.isBuffer(data)) {
-    message.payloadType = 1 // BINARY;
-    message.payloadBinary = data;
+    message.payload_type = 1 // BINARY;
+    message.payload_binary = data;
   } else {
-    message.payloadType = 0 // STRING;
-    message.payloadUtf8 = data;
+    message.payload_type = 0 // STRING;
+    message.payload_utf8 = data;
   }
@@ -137,9 +137,9 @@
     clientId,
-    message.protocolVersion,
-    message.sourceId,
-    message.destinationId,
+    message.protocol_version,
+    message.source_id,
+    message.destination_id,
     message.namespace,
-    message.payloadType === 1 // BINARY
-      ? util.inspect(message.payloadBinary)
-      : message.payloadUtf8
+    (message.payload_type === 1) // BINARY
+      ? util.inspect(message.payload_binary)
+      : message.payload_utf8
   );
@@ -146,0 +146,0 @@

package.json

 {
   "name": "castv2",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "An implementation of the Chromecast CASTV2 protocol",
@@ -10,3 +10,3 @@ "author": "thibauts",
     "debug": "~0.8.1",
-    "protobuf": "~0.8.8"
+    "protobufjs": "^3.2.2"
   },
@@ -13,0 +13,0 @@ "scripts": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

30889

increased by0.82%

Lines of code

338

increased by2.11%

Dependency changes

• + Addedprotobufjs@^3.2.2

• + Addedascli@0.3.0(transitive)

• + Addedbufferview@1.0.1(transitive)

• + Addedbytebuffer@3.5.5(transitive)

• + Addedcolour@0.7.1(transitive)

• + Addedlong@2.4.0(transitive)

• + Addedoptjs@3.2.2(transitive)

• + Addedprotobufjs@3.8.2(transitive)

• - Removedprotobuf@~0.8.8

• - Removedprotobuf@0.8.8(transitive)