homebridge-xbox-tv 2.9.9-beta.21 → 2.9.9-beta.23

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Xbox TV",
   "name": "homebridge-xbox-tv",
-  "version": "2.9.9-beta.21",
+  "version": "2.9.9-beta.23",
   "description": "Homebridge plugin (https://github.com/homebridge/homebridge) to control Xbox game consoles.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/localApi/message.js

@@ -5,10 +5,7 @@ const CHANNELID = Buffer.from('\x00\x00\x00\x00\x00\x00\x00\x00');
 const CONSTANS = require('../constans.json');
 
 class MESSAGE {
-    constructor(type, packetData = false) {
-        this.packetType = type;
-        this.packetData = packetData;
-
+    constructor() {
         const Type = {
             uInt32(value) {
                 const packet = {
@@ -380,7 +377,7 @@ class MESSAGE {
         }
     }
 
-    pack(xboxlocalapi) {
+    pack(xboxlocalapi, type, value) {
         const packetStructure = new PacketStructure();
         let packet = '';
 
@@ -394,7 +391,7 @@ class MESSAGE {
         header.writeUInt32(xboxlocalapi.getRequestNum());
         header.writeUInt32(xboxlocalapi.targetParticipantId);
         header.writeUInt32(xboxlocalapi.sourceParticipantId);
-        header.writeBytes(this.setFlags(this.packetType));
+        header.writeBytes(this.setFlags(type));
         header.writeBytes(CHANNELID);
 
         if (packetStructure.toBuffer().length % 16 > 0) {
@@ -424,8 +421,8 @@ class MESSAGE {
         return packet;
     };
 
-    unpack(xboxlocalapi = undefined) {
-        const packetStructure = new PacketStructure(this.packetData);
+    unpack(xboxlocalapi = undefined, type, value = false) {
+        const packetStructure = new PacketStructure(type);
 
         let packet = {
             type: packetStructure.readBytes(2).toString('hex'),
@@ -444,7 +441,7 @@ class MESSAGE {
         // Lets decrypt the data when the payload is encrypted
         if (packet.protectedPayload) {
             const iv = xboxlocalapi.crypto.getIv();
-            const key = xboxlocalapi.crypto.encrypt(this.packetData.slice(0, 16), iv);
+            const key = xboxlocalapi.crypto.encrypt(value.slice(0, 16), iv);
             let decryptedPayload = xboxlocalapi.crypto.decrypt(packet.protectedPayload, key);
             packet.decryptedPayload = new PacketStructure(decryptedPayload).toBuffer();
             decryptedPayload = new PacketStructure(decryptedPayload);

package/src/localApi/packer.js

@@ -9,19 +9,23 @@ class PACKER {
         this.packetStructure = '';
 
         if (packetType in CONSTANS.Types) {
-            const packetValue = type;
             type = CONSTANS.Types[packetType];
-            this.packetStructure = this.loadPacketStructure(type, packetValue);
+            const value = type;
+            this.loadPacketStructure(type, value);
         } else {
-            this.packetStructure = this.loadPacketStructure(type);
+            this.loadPacketStructure(type);
         };
     };
 
     loadPacketStructure(type, value = false) {
         if (type.slice(0, 6) == 'simple') {
-            return new SimplePacket(type.slice(7), value);
+            this.type = type.slice(7);
+            this.value = value;
+            this.packetStructure = new SimplePacket();
         } else if (type.slice(0, 7) == 'message') {
-            return new MessagePacket(type.slice(8), value);
+            this.type = type.slice(8);
+            this.value = value;
+            this.packetStructure = new MessagePacket();
         } else {
             return false;
         };
@@ -31,12 +35,12 @@ class PACKER {
         this.packetStructure.set(key, value, protectedPayload);
     };
 
-    pack(xboxlocalapi = undefined) {
-        return this.packetStructure.pack(xboxlocalapi);
+    pack(xboxlocalapi = undefined,) {
+        return this.packetStructure.pack(xboxlocalapi, this.type, this.value);
     };
 
-    unpack(xboxlocalapi = undefined) {
-        return this.packetStructure.unpack(xboxlocalapi);
+    unpack(xboxlocalapi = undefined,) {
+        return this.packetStructure.unpack(xboxlocalapi, this.type, this.value);
     };
 };
 module.exports = PACKER;

package/src/localApi/simple.js

@@ -2,9 +2,8 @@
 const PacketStructure = require('./structure.js');
 
 class SIMPLE {
-    constructor(type, packetData = false) {
+    constructor(type) {
         this.packetType = type;
-        this.packetData = packetData;
         this.structureProtected = false;
 
         const Type = {
@@ -126,7 +125,7 @@ class SIMPLE {
         }
     }
 
-    pack(xboxlocalapi = false) {
+    pack(xboxlocalapi = false, type, value = false) {
         const packetStructure = new PacketStructure();
         let packet = '';
 
@@ -160,7 +159,7 @@ class SIMPLE {
             }
         }
 
-        switch (this.packetType) {
+        switch (type) {
             case 'powerOn':
                 packet = this.pack1(Buffer.from('dd02', 'hex'), packetStructure.toBuffer(), '');
                 break;
@@ -237,9 +236,9 @@ class SIMPLE {
         return packet;
     };
 
-    unpack(xboxlocalapi = undefined) {
-        const packetStructure = new PacketStructure(this.packetData);
-        const packetType = packetStructure.readBytes(2).toString('hex') === 'dd02' ? 'powerOn' : this.packetType;
+    unpack(xboxlocalapi = undefined, type, value = false) {
+        const packetStructure = new PacketStructure(value);
+        const packetType = packetStructure.readBytes(2).toString('hex') === 'dd02' ? 'powerOn' : type;
 
         let packet = {
             type: packetType,
@@ -268,7 +267,7 @@ class SIMPLE {
             decryptedPayload = decryptedPayload.slice(0, protectedPayloadLength);
             decryptedPayload = new PacketStructure(decryptedPayload);
 
-            const protectedStructure = this.packet[`${this.packetType}Protected`];
+            const protectedStructure = this.packet[`${type}Protected`];
             packet.protectedPayload = {};
 
             for (const name in protectedStructure) {