[gnome] Update extensions for version 48

gnome/.local/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/plugins/mpris.js

@@ -8,6 +8,7 @@ import GObject from 'gi://GObject';
 
 import * as Components from '../components/index.js';
 import Config from '../../config.js';
+import * as Core from '../core.js';
 import * as DBus from '../utils/dbus.js';
 import  {Player} from '../components/mpris.js';
 import Plugin from '../plugin.js';
@@ -42,6 +43,8 @@ const MPRISPlugin = GObject.registerClass({
         this._transferring = new WeakSet();
         this._updating = new WeakSet();
 
+        this._queueTimers = new Map();
+
         this._mpris = Components.acquire('mpris');
 
         this._playerAddedId = this._mpris.connect(
@@ -75,6 +78,12 @@ const MPRISPlugin = GObject.registerClass({
     disconnected() {
         super.disconnected();
 
+        for (const [identity, timer] of this._queueTimers) {
+            if (timer)
+                GLib.source_remove(timer);
+            this._queueTimers.delete(identity);
+        }
+
         for (const [identity, player] of this._players) {
             this._players.delete(identity);
             player.destroy();
@@ -144,7 +153,7 @@ const MPRISPlugin = GObject.registerClass({
     /**
      * Handle an update for a remote player.
      *
-     * @param {Object} packet - A `kdeconnect.mpris` packet
+     * @param {object} packet - A `kdeconnect.mpris` packet
      */
     _handlePlayerUpdate(packet) {
         const player = this._players.get(packet.body.player);
@@ -174,7 +183,7 @@ const MPRISPlugin = GObject.registerClass({
      * Handle a request for player information or action.
      *
      * @param {Core.Packet} packet - a `kdeconnect.mpris.request`
-     * @return {undefined} no return value
+     * @returns {undefined} no return value
      */
     _handleRequest(packet) {
         // A request for the list of players
@@ -258,18 +267,35 @@ const MPRISPlugin = GObject.registerClass({
                 }
             }
 
-            // Information Request
-            let hasResponse = false;
+            if (packet.body.hasOwnProperty('requestNowPlaying') ||
+                packet.body.hasOwnProperty('requestVolume')) {
+                const response = this._getUpdate(player.Identity, packet);
+                this._sendUpdate(player, response);
+            }
 
-            const response = {
-                type: 'kdeconnect.mpris',
-                body: {
-                    player: packet.body.player,
-                },
-            };
+        } catch (e) {
+            debug(e, this.device.name);
+        } finally {
+            this._updating.delete(player);
+        }
+    }
 
+    // Respond to information request (or push updated information)
+    _getUpdate(identity, packet) {
+
+        const player = this._mpris?.getPlayer(identity);
+        if (!player)
+            return;
+
+        const response = {
+            type: 'kdeconnect.mpris',
+            body: {
+                player: player.Identity,
+            },
+        };
+
+        try {
             if (packet.body.hasOwnProperty('requestNowPlaying')) {
-                hasResponse = true;
 
                 Object.assign(response.body, {
                     pos: Math.floor(player.Position / 1000),
@@ -330,31 +356,61 @@ const MPRISPlugin = GObject.registerClass({
                 }
             }
 
-            if (packet.body.hasOwnProperty('requestVolume')) {
-                hasResponse = true;
+            if (packet.body.hasOwnProperty('requestVolume'))
                 response.body.volume = Math.floor(player.Volume * 100);
-            }
 
-            if (hasResponse)
-                this.device.sendPacket(response);
+            return response;
         } catch (e) {
             debug(e, this.device.name);
-        } finally {
-            this._updating.delete(player);
         }
     }
 
+    _sendUpdate(player, packet = null) {
+        if (!player || (!packet && this._updating.has(player)))
+            return GLib.SOURCE_REMOVE;
+
+        debug(`Sending update for ${player.Identity}`);
+        this._updating.add(player);
+
+        if (this._queueTimers.has(player.Identity)) {
+            const timer_id = this._queueTimers.get(player.Identity);
+            if (timer_id) {
+                debug(`Stopping timer id ${timer_id}`);
+                GLib.source_remove(timer_id);
+            }
+            this._queueTimers.delete(player.Identity);
+        }
+        if (!packet) {
+            packet = this._getUpdate(player.Identity, {
+                body: {
+                    requestNowPlaying: true,
+                    requestVolume: true,
+                },
+            }, false);
+        }
+        this.device.sendPacket(packet);
+
+        this._updating.delete(player);
+        return GLib.SOURCE_REMOVE;
+    }
+
     _onPlayerChanged(mpris, player) {
         if (!this.settings.get_boolean('share-players'))
             return;
 
-        this._handleCommand({
-            body: {
-                player: player.Identity,
-                requestNowPlaying: true,
-                requestVolume: true,
-            },
-        });
+        // Set a timer to send the updated state after a short delay.
+        // Allows further state changes to be bundled into a single packet.
+        if (this._queueTimers.has(player.Identity))
+            return;
+        this._queueTimers.set(player.Identity, 0);
+
+        const timer_id = GLib.timeout_add(
+            GLib.PRIORITY_DEFAULT,
+            250,  // ms (0.25 seconds)
+            this._sendUpdate.bind(this, player)
+        );
+        this._queueTimers.set(player.Identity, timer_id);
+        debug(`Set update timer id ${timer_id} for ${player.Identity}`);
     }
 
     _onPlayerSeeked(mpris, player, offset) {
@@ -434,6 +490,11 @@ const MPRISPlugin = GObject.registerClass({
     }
 
     destroy() {
+        for (const [identity, timer] of this._queueTimers) {
+            this._queueTimers.delete(identity);
+            GLib.source_remove(timer);
+        }
+
         if (this._mpris !== undefined) {
             this._mpris.disconnect(this._playerAddedId);
             this._mpris.disconnect(this._playerRemovedId);