homebridge-xbox-tv 2.9.11-beta.21 → 2.9.11-beta.3

package/package.json

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

package/src/localApi/message.js

@@ -12,9 +12,6 @@ class MESSAGE {
         //structure
         const structure = new Packets();
         this.structure = structure[type];
-
-        //packet
-        this.packet = new Packets(this.structure);
     };
 
     getMsgType(type) {
@@ -98,7 +95,7 @@ class MESSAGE {
             0x23: "titleLaunch",
             channelStartRequest: Buffer.from('a026', 'hex'),
             channelStartResponse: Buffer.from('a027', 'hex'),
-            channelStop: Buffer.from('a028', 'hex'),
+            0x28: "stopChannel",
             0x29: "system",
             disconnect: Buffer.from('802a', 'hex'),
             0x2E: "titleTouch",
@@ -195,15 +192,17 @@ class MESSAGE {
 
         // Lets decrypt the data when the payload is encrypted
         if (packet.payloadProtected) {
-            const packetStructureProtected = this.packet[packet.type];
-            const payloadDecrypted = crypto.decrypt(packet.payloadProtected, crypto.encrypt(data.slice(0, 16), crypto.getIv()));
-            const packetDecrypted = new PacketStructure(payloadDecrypted);
+            let structureProtected = new Packets(this.structure);
+            structureProtected = structureProtected[packet.type];
+
+            let payloadDecrypted = crypto.decrypt(packet.payloadProtected, crypto.encrypt(data.slice(0, 16), crypto.getIv()));
+            payloadDecrypted = new PacketStructure(payloadDecrypted);
 
             packet.payloadDecrypted = new PacketStructure(payloadDecrypted).toBuffer();
             packet.payloadProtected = {};
 
-            for (const name in packetStructureProtected) {
-                packet.payloadProtected[name] = packetStructureProtected[name].unpack(packetDecrypted);
+            for (const name in structureProtected) {
+                packet.payloadProtected[name] = structureProtected[name].unpack(payloadDecrypted);
             };
         };
 

package/src/localApi/packets.js

@@ -161,7 +161,7 @@ class PACKETS {
 
         const packets = {
             powerOn: {
-                liveId: types.sgString(''),
+                liveId: types.sgString(),
             },
             json: {
                 json: types.sgString('{}')
@@ -227,9 +227,6 @@ class PACKETS {
                 channelTargetId: types.bytes(8, ''),
                 result: types.uInt32('0'),
             },
-            channelStop: {
-                channelTargetId: types.bytes(8, ''),
-            },
             acknowledge: {
                 lowWatermark: types.uInt32('0'),
                 processedList: types.sgList('processedList', []),
@@ -296,7 +293,7 @@ class PACKETS {
                 command: types.uInt32('0'),
             },
             powerOff: {
-                liveId: types.sgString(''),
+                liveId: types.sgString(),
             },
             disconnect: {
                 reason: types.uInt32('1'),

package/src/localApi/simple.js

@@ -12,8 +12,8 @@ class SIMPLE {
         this.structure = structure[type];
 
         //packet
-        this.packet = new Packets(this.structure);
-        this.structureProtected = this.structure.payloadProtected !== undefined ? this.packet[`${type}Protected`] : false;
+        const packet = new Packets(this.structure);
+        this.structureProtected = this.structure.payloadProtected !== undefined ? packet[`${type}Protected`] : false;
     };
 
     set(key, value, isProtected = false) {
@@ -89,6 +89,19 @@ class SIMPLE {
             case 'connectResponse':
                 packet = this.pack1(Buffer.from('cc01', 'hex'), packetStructure.toBuffer(), '2');
                 break;
+            case 'connectRequestProtected':
+                // Pad packet
+                if (packetStructure.toBuffer().length > 16) {
+                    const padStart = packetStructure.toBuffer().length % 16;
+                    const padTotal = (16 - padStart);
+                    for (let paddingnum = (padStart + 1); paddingnum <= 16; paddingnum++) {
+                        packetStructure.writeUInt8(padTotal);
+                    };
+                };
+                let payloadEncrypted = crypto.encrypt(packetStructure.toBuffer(), crypto.getIv());
+                payloadEncrypted = new PacketStructure(payloadEncrypted)
+                packet = payloadEncrypted.toBuffer();
+                break;
             default:
                 packet = packetStructure.toBuffer();
         };
@@ -153,13 +166,15 @@ class SIMPLE {
             packet.payloadProtected = packet.payloadProtected.slice(0, -32);
             packet.signature = packet.payloadProtected.slice(-32);
 
-            const packetStructureProtected = this.packet[`${packet.type}Protected`];
-            const payloadDecrypted = crypto.decrypt(packet.payloadProtected, packet.iv).slice(0, packet.payloadProtectedLength);
-            const packetDecrypted = new PacketStructure(payloadDecrypted);
+            let payloadDecrypted = crypto.decrypt(packet.payloadProtected, packet.iv).slice(0, packet.payloadProtectedLength);
+            payloadDecrypted = new PacketStructure(payloadDecrypted);
+
+            let structureProtected = new Packets(this.structure);
+            structureProtected = structureProtected[`${packet.type}Protected`];
             packet.payloadProtected = {};
 
-            for (const name in packetStructureProtected) {
-                packet.payloadProtected[name] = packetStructureProtected[name].unpack(packetDecrypted);
+            for (const name in structureProtected) {
+                packet.payloadProtected[name] = structureProtected[name].unpack(payloadDecrypted);
                 this.set('payloadProtected', packet.payloadProtected);
             }
         }

package/src/localApi/structure.js

@@ -164,6 +164,17 @@ class STRUCTURE {
         return int32;
     };
 
+    readUInt64() {
+        let uint64 = 0;
+        try {
+            const rawData = this.readBytes(8);
+            uint64 = Buffer.from(rawData).readUIntBE(0, 8);
+        } catch (error) {
+            console.error(`Error reading unsigned 64-bit integer from packet: ${error}`);
+        }
+        return uint64;
+    };
+
     toBuffer() {
         return this.packet;
     };

package/src/localApi/xboxlocalapi.js

@@ -29,7 +29,7 @@ class XBOXLOCALAPI extends EventEmitter {
         this.sequenceNumber = 1;
         this.targetParticipantId = 0;
         this.sourceParticipantId = 0;
-        this.channelTargetId = 0;
+        this.channelServerId = 0;
         this.mediaRequestId = 0;
         this.emitDevInfo = true;
 
@@ -47,7 +47,7 @@ class XBOXLOCALAPI extends EventEmitter {
                 const debug1 = this.debugLog ? this.emit('debug', `Received packet type hex: ${messageTypeHex}`) : false;
 
                 //check message type exist in types
-                const keysTypes = Object.keys(CONSTANTS.MessageTypes);
+                const keysTypes = Object.keys(CONSTANTS.MediaTypes);
                 const keysTypesExist = keysTypes.includes(messageTypeHex);
 
                 if (!keysTypesExist) {
@@ -255,10 +255,10 @@ class XBOXLOCALAPI extends EventEmitter {
                 this.emit('stateChanged', power, volume, mute, mediaState, titleId, reference);
                 const debug1 = this.debugLog ? this.emit('debug', `Status changed, app Id: ${titleId}, reference: ${reference}`) : false;
             };
-            //this.emit('channelStartRequest');
 
             //start heart beat
             const sendHeartBeat = !this.heartBeatConnection ? this.emit('heartBeat') : false;
+            this.emit('channelStartRequest');
         }).on('channelStartRequest', async () => {
             const debug = this.debugLog ? this.emit('debug', 'Channel start request received.') : false;
 
@@ -273,8 +273,8 @@ class XBOXLOCALAPI extends EventEmitter {
 
         }).on('channelStartResponse', async (packet) => {
             const debug = this.debugLog ? this.emit('debug', 'Channel start response received.') : false;
-            this.channelTargetId = packet.payloadProtected.result === 0 ? packet.payloadProtected.channelTargetId : 0;
-            const debug1 = this.debugLog ? this.emit('debug', `Channel server id: ${this.channelTargetId}.`) : false;
+            this.channelServerId = packet.payloadProtected.result === 0 ? packet.payloadProtected.channelTargetId : 0;
+            const debug1 = this.debugLog ? this.emit('debug', `Channel server id: ${this.channelServerId}.`) : false;
         }).on('heartBeat', () => {
             if (this.heartBeatConnection) {
                 return;
@@ -349,7 +349,7 @@ class XBOXLOCALAPI extends EventEmitter {
                     const message = powerOn.pack(this.crypto);
                     await this.sendSocketMessage(message);
 
-                    await new Promise(resolve => setTimeout(resolve, 1000));
+                    await new Promise(resolve => setTimeout(resolve, 600));
                     resolve();
                 }
                 this.emit('disconnected', 'Power On failed, please try again.');
@@ -418,7 +418,7 @@ class XBOXLOCALAPI extends EventEmitter {
                     const gamepad = new MessagePacket('gamepad')
                     gamepad.set('timestamp', Buffer.from(`000${timestampNow.toString()}`, 'hex'))
                     gamepad.set('buttons', CONSTANTS.GamePadCommands[command]);
-                    gamepad.setChannel(this.channelTargetId);
+                    gamepad.setChannel(this.channelServerId);
                     const message = gamepad.pack(this.crypto, this.getSequenceNumber(), this.targetParticipantId, this.sourceParticipantId)
                     await this.sendSocketMessage(message)
 
@@ -427,7 +427,7 @@ class XBOXLOCALAPI extends EventEmitter {
                         const gamepadUnpress = MessagePacket('gamepad')
                         gamepadUnpress.set('timestamp', Buffer.from(`000${timestamp.toString()}`, 'hex'))
                         gamepadUnpress.set('buttons', 0);
-                        gamepadUnpress.setChannel(this.channelTargetId);
+                        gamepadUnpress.setChannel(this.channelServerId);
                         const message = gamepadUnpress.pack(this.crypto, this.getSequenceNumber(), this.targetParticipantId, this.sourceParticipantId);
                         await this.sendSocketMessage(message);
                         resolve();