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

package/package.json

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

package/src/localApi/message.js

@@ -9,9 +9,9 @@ class MESSAGE {
         //type
         this.type = type;
 
-        //packet
-        this.packets = new Packets();
-        this.packet = this.packets[type];
+        //structure
+        const structure = new Packets();
+        this.structure = structure[type];
 
         //channelId
         this.channelId = '\x00\x00\x00\x00\x00\x00\x00\x00';
@@ -128,10 +128,10 @@ class MESSAGE {
     set(key, value, subkey = false) {
         switch (subkey) {
             case true:
-                this.packet[subkey][key].value = value;
+                this.structure[subkey][key].value = value;
                 break;
             case false:
-                this.packet[key].value = value;
+                this.structure[key].value = value;
                 break;
         };
     };
@@ -141,8 +141,8 @@ class MESSAGE {
         const structure = new Structure();
         let packet;
 
-        for (const name in this.packet) {
-            this.packet[name].pack(structure);
+        for (const name in this.structure) {
+            this.structure[name].pack(structure);
         }
 
         const header = new Structure();
@@ -201,10 +201,12 @@ class MESSAGE {
             packet.payloadDecrypted = new Structure(payloadDecrypted).toBuffer();
             packet.payloadProtected = {};
 
-            const packetProtected = this.packets[packet.type];
-            const structureDecrypted = new Structure(payloadDecrypted);
-            for (const name in packetProtected) {
-                packet.payloadProtected[name] = packetProtected[name].unpack(structureDecrypted);
+            let packetStructureProtected = new Packets();
+            packetStructureProtected = packetStructureProtected[packet.type];
+
+            const packetDecrypted = new Structure(payloadDecrypted);
+            for (const name in packetStructureProtected) {
+                packet.payloadProtected[name] = packetStructureProtected[name].unpack(packetDecrypted);
             };
         };
 

package/src/localApi/simple.js

@@ -7,23 +7,23 @@ class SIMPLE {
         //type
         this.type = type;
 
-        //packet
-        this.packets = new Packets();
-        this.packet = this.packets[type];
-        this.packetProtected = this.packets.payloadProtected !== undefined ? this.packets[`${type}Protected`] : false;
+        //structure
+        const structure = new Packets();
+        this.structure = structure[type];
+        this.structureProtected = this.structure.payloadProtected !== undefined ? structure[`${type}Protected`] : false;
     };
 
     set(key, value, isProtected = false) {
         switch (isProtected) {
             case true:
-                const structureProtectedLength = this.packetProtected[key].length || 0;
-                this.packetProtected[key].value = value;
-                this.packetProtected[key].length = structureProtectedLength > 0 ? value.length : structureProtectedLength;
+                const structureProtectedLength = this.structureProtected[key].length || 0;
+                this.structureProtected[key].value = value;
+                this.structureProtected[key].length = structureProtectedLength > 0 ? value.length : structureProtectedLength;
                 break;
             case false:
-                const structureLength = this.packet[key].length || 0;
-                this.packet[key].value = value;
-                this.packet[key].length = structureLength > 0 ? value.length : structureLength;
+                const structureLength = this.structure[key].length || 0;
+                this.structure[key].value = value;
+                this.structure[key].length = structureLength > 0 ? value.length : structureLength;
                 break;
         };
     }
@@ -34,15 +34,15 @@ class SIMPLE {
         let payloadProtectedLength = 0;
         let payloadProtectedLengthReal = 0;
 
-        for (const name in this.packet) {
+        for (const name in this.structure) {
             switch (name) {
                 case 'payloadProtected':
                     const packetStructureProtected = new Structure();
-                    for (const nameStruct in this.packetProtected) {
-                        if (this.packet.payloadProtected.value !== undefined) {
-                            this.packetProtected[nameStruct].value = this.packet.payloadProtected.value[nameStruct];
+                    for (const nameStruct in this.structureProtected) {
+                        if (this.structure.payloadProtected.value !== undefined) {
+                            this.structureProtected[nameStruct].value = this.structure.payloadProtected.value[nameStruct];
                         }
-                        this.packetProtected[nameStruct].pack(packetStructureProtected);
+                        this.structureProtected[nameStruct].pack(packetStructureProtected);
                     }
                     payloadProtectedLength = packetStructureProtected.toBuffer().length;
 
@@ -56,11 +56,11 @@ class SIMPLE {
                     }
 
                     payloadProtectedLengthReal = packetStructureProtected.toBuffer().length;
-                    const payloadEncrypted = crypto.encrypt(packetStructureProtected.toBuffer(), crypto.getKey(), this.packet.iv.value);
+                    const payloadEncrypted = crypto.encrypt(packetStructureProtected.toBuffer(), crypto.getKey(), this.structure.iv.value);
                     structure.writeBytes(payloadEncrypted);
                     break;
                 default:
-                    this.packet[name].pack(structure);
+                    this.structure[name].pack(structure);
             }
         }
 
@@ -153,8 +153,8 @@ class SIMPLE {
             packet.version = structure.readUInt16();
         }
 
-        for (const name in this.packet) {
-            packet[name] = this.packet[name].unpack(structure);
+        for (const name in this.structure) {
+            packet[name] = this.structure[name].unpack(structure);
             this.set(name, packet[name]);
         }
 
@@ -166,10 +166,12 @@ class SIMPLE {
             const payloadDecrypted = crypto.decrypt(packet.payloadProtected, packet.iv).slice(0, packet.payloadProtectedLength);
             packet.payloadProtected = {};
 
-            const packetProtected = this.packets[`${packet.type}Protected`];
-            const structureDecrypted = new Structure(payloadDecrypted);
-            for (const name in packetProtected) {
-                packet.payloadProtected[name] = packetProtected[name].unpack(structureDecrypted);
+            let packetStructureProtected = new Packets();
+            packetStructureProtected = packetStructureProtected[`${packet.type}Protected`];
+
+            const packetDecrypted = new Structure(payloadDecrypted);
+            for (const name in packetStructureProtected) {
+                packet.payloadProtected[name] = packetStructureProtected[name].unpack(packetDecrypted);
                 this.set('payloadProtected', packet.payloadProtected);
             }
         }