homebridge-xbox-tv 3.7.9-beta.21 → 3.7.9-beta.22

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Xbox TV",
   "name": "homebridge-xbox-tv",
-  "version": "3.7.9-beta.21",
+  "version": "3.7.9-beta.22",
   "description": "Homebridge plugin to control Xbox game consoles.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/localApi/xboxlocalapi.js

@@ -30,6 +30,7 @@ class XboxLocalApi extends EventEmitter {
         this.channels = [];
         this.channelRequestId = 0;
         this.mediaRequestId = 0;
+        this.fragments = {};
 
         //create impulse generator
         this.impulseGenerator = new ImpulseGenerator();
@@ -205,8 +206,8 @@ class XboxLocalApi extends EventEmitter {
         };
 
         const channelRequestId = LocalApi.Channels.System[channelName].Id
-        const channelCommunicationId = this.channels[requestId].id;
-        const channelOpen = this.channels[requestId].open;
+        const channelCommunicationId = this.channels[channelRequestId]?.id ?? -1;
+        const channelOpen = this.channels[channelRequestId]?.open ?? false;
 
         if (channelCommunicationId === -1 || !channelOpen) {
             this.emit('warn', `Channel Id: ${channelCommunicationId}, state: ${channelOpen ? 'Open' : 'Closed'}, trying to open it`);
@@ -278,91 +279,6 @@ class XboxLocalApi extends EventEmitter {
         return true;
     };
 
-    // Dodaj do klasy XboxLocalApi:
-
-    async sendSystemButton(channelName, command) {
-        if (!this.isConnected) {
-            this.emit('warn', `Cannot send command, console not connected`);
-            return;
-        }
-
-        const channelInfo = LocalApi.Channels.System[channelName];
-        if (!channelInfo) {
-            this.emit('warn', `Unknown channel: ${channelName}`);
-            return;
-        }
-
-        let channel = this.channels.find(c => c.id !== -1);
-        if (!channel) {
-            // Otwórz kanał jeśli nie istnieje
-            await this.channelOpen(channelInfo.Id, channelInfo.Uuid);
-            channel = this.channels.find(c => c.id !== -1);
-            if (!channel) {
-                this.emit('warn', `Failed to open channel: ${channelName}`);
-                return;
-            }
-        }
-
-        const channelId = channel.id;
-
-        switch (channelInfo.Id) {
-            case 0: // Gamepad
-                await this._sendGamepadCommand(command, channelId);
-                break;
-            case 1: // TvRemote
-                await this._sendTvRemoteCommand(command, channelId);
-                break;
-            case 2: // Media
-                await this._sendMediaCommand(command, channelId);
-                break;
-            default:
-                this.emit('warn', `Unhandled channel type: ${channelName}`);
-        }
-    }
-
-    // Prywatne metody do wysyłania komend
-    async _sendGamepadCommand(buttons, channelId) {
-        const timestamp = Buffer.from(`000${Date.now()}`, 'hex');
-        const press = new MessagePacket('gamepad');
-        press.set('timestamp', timestamp);
-        press.set('buttons', buttons);
-        let seq = await this.getSequenceNumber();
-        await this.sendSocketMessage(press.pack(this.crypto, seq, this.sourceParticipantId, channelId), 'gamepad');
-
-        // Release buttons
-        setTimeout(async () => {
-            const release = new MessagePacket('gamepad');
-            release.set('timestamp', timestamp);
-            release.set('buttons', LocalApi.Channels.System.Input.Commands.unpress);
-            seq = await this.getSequenceNumber();
-            await this.sendSocketMessage(release.pack(this.crypto, seq, this.sourceParticipantId, channelId), 'gamepadUnpress');
-        }, 150);
-    }
-
-    async _sendTvRemoteCommand(command, channelId) {
-        const seq = await this.getSequenceNumber();
-        const jsonReq = JSON.stringify({
-            msgid: `2ed6c0fd.${seq}`,
-            request: LocalApi.Channels.System.TvRemote.MessageType.SendKey,
-            params: { button_id: command, device_id: null }
-        });
-        const json = new MessagePacket('json');
-        json.set('json', jsonReq);
-        await this.sendSocketMessage(json.pack(this.crypto, seq, this.sourceParticipantId, channelId), 'json');
-    }
-
-    async _sendMediaCommand(command, channelId) {
-        const requestIdHex = (`0000000000000000${this.mediaRequestId}`).slice(-16);
-        const media = new MessagePacket('mediaCommand');
-        media.set('requestId', Buffer.from(requestIdHex, 'hex'));
-        media.set('titleId', 0);
-        media.set('command', command);
-        const seq = await this.getSequenceNumber();
-        await this.sendSocketMessage(media.pack(this.crypto, seq, this.sourceParticipantId, channelId), 'mediaCommand');
-        this.mediaRequestId++;
-    }
-
-
     async disconnect() {
         if (this.enableDebugMode) this.emit('debug', 'Disconnecting...');
 
@@ -475,7 +391,7 @@ class XboxLocalApi extends EventEmitter {
                     switch (type) {
                         case 'json':
                             // Object to hold fragments
-                            const fragments = {};
+                            const fragments = this.fragments;
                             const jsonMessage = JSON.parse(packet.payloadProtected.json);
                             const datagramId = jsonMessage.datagramId;
 

package/src/xboxdevice.js

@@ -658,10 +658,7 @@ class XboxDevice extends EventEmitter {
                                 break;
                         }
 
-                        //await this.xboxWebApi.send(channelName, 'InjectKey', [{ 'keyType': command }]);
-                        await this.xboxLocalApi.sendSystemButton('Input', LocalApi.Channels.System.Input.Commands[command]);
-                        //await xboxLocalApi.sendSystemButton('TvRemote', LocalApi.Channels.System.TvRemote.Buttons.Power);
-                        //await xboxLocalApi.sendSystemButton('Media', LocalApi.Channels.System.Media.Commands[command]);
+                        await this.xboxWebApi.send(channelName, 'InjectKey', [{ 'keyType': command }]);
                         if (!this.disableLogInfo) this.emit('info', `Remote Key: ${command}`);
                     } catch (error) {
                         this.emit('warn', `set Remote Key error: ${JSON.stringify(error, null, 2)}`);