Define debugPacket() for dumps

Author: ferdnyc

src/service/__init__.js

@@ -126,6 +126,17 @@ const _debugFunc = function (error, prefix = null) {
     });
 };
 
+/**
+ * A special debug function for logging packet dumps with
+ * their contents omitted.
+ * @param {object} packet - A GSConnect packet payload
+ * @param {string} [prefix] - An optional prefix for the dump
+ */
+// eslint-disable-next-line func-style
+const _packetDebugFunc = function (packet, prefix = null) {
+    _debugFunc(packet.type, prefix);
+};
+
 // Swap the function out for a no-op anonymous function for speed
 const settings = new Gio.Settings({
     settings_schema: Config.GSCHEMA.lookup(Config.APP_ID, true),
@@ -138,16 +149,23 @@ settings.connect('changed::debug', (settings, key) => {
 if (settings.get_boolean('debug'))
     globalThis.debug = _debugFunc;
 else
-    globalThis.debug = () => {};
+    globalThis.debug = () => { };
+
+// eslint-disable-next-line func-style
+const _getPacketFunc = function (settings, debugKey, detailKey) {
+    const debugEnabled = settings.get_boolean(debugKey);
+    const debugDetail = settings.get_boolean(detailKey);
+    if (debugEnabled && !debugDetail)
+        return _packetDebugFunc;
+    else
+        return globalThis.debug;
+};
 
 settings.connect('changed::debug-detail', (settings, key) => {
-    globalThis.debugDetail = settings.get_boolean(key);
+    globalThis.debugPacket = _getPacketFunc(settings, 'debug', key);
 });
 
-if (settings.get_boolean('debug-detail'))
-    globalThis.debugDetail = true;
-else
-    globalThis.debugDetail = false;
+globalThis.debugPacket = _getPacketFunc(settings, 'debug', 'debug-detail');
 
 /**
  * A simple (for now) pre-comparison sanitizer for phone numbers

src/service/device.js

@@ -338,10 +338,7 @@ var Device = GObject.registerClass({
             let packet = null;
 
             while ((packet = await this.channel.readPacket())) {
-                if (globalThis.debugDetail)
-                    debug(packet, this.name);
-                else
-                    debug(packet.type, this.name);
+                debugPacket(packet, this.name);
                 this.handlePacket(packet);
             }
         } catch (e) {
@@ -449,10 +446,7 @@ var Device = GObject.registerClass({
 
             while ((next = this._outputQueue.shift())) {
                 await this.channel.sendPacket(next);
-                if (globalThis.debugDetail)
-                    debug(next, this.name);
-                else
-                    debug(next.type, this.name);
+                debugPacket(next, this.name);
             }
 
             this._outputLock = false;