[ddwrt] Fix Copilot review comments and radio name formatting

- SyslogParser: Reuse static Gson instance instead of per-call allocation
- SyslogParser: Add Locale.ENGLISH to timestamp DateTimeFormatter
- SshRunner: Add timeout to ch.open().verify() to prevent indefinite blocking
- SshClientManager: Add shutdown() method for OSGi lifecycle cleanup
- DDWRTHandlerFactory: Call SshClientManager.shutdown() on deactivate
- DDWRTRadioThingHandler: Pass ifaceName (not interfaceId) to setRadioEnabled
- DDWRTRadioThingHandler: Normalize interfaceId in initialize for manual config
- thing-types.xml: Update radio interfaceId description to document mac:iface format
- ddwrt.properties: Update radio interfaceId description
- DDWRTBaseDevice: Change radioName separator from hyphen to space

PR openhab#20505

Assisted-by: Windsurf:Claude Opus 4.6
Signed-off-by: Lee Ballard <ballle98@gmail.com>

Author: ballle98

bundles/org.openhab.binding.ddwrt/src/main/java/org/openhab/binding/ddwrt/internal/DDWRTHandlerFactory.java

@@ -21,6 +21,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
+import org.openhab.binding.ddwrt.internal.api.SshClientManager;
 import org.openhab.binding.ddwrt.internal.handler.DDWRTClientHandler;
 import org.openhab.binding.ddwrt.internal.handler.DDWRTDeviceThingHandler;
 import org.openhab.binding.ddwrt.internal.handler.DDWRTFirewallRuleHandler;
@@ -32,7 +33,9 @@
 import org.openhab.core.thing.binding.BaseThingHandlerFactory;
 import org.openhab.core.thing.binding.ThingHandler;
 import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
 
 /**
  * The {@link DDWRTHandlerFactory} is responsible for creating things and thing
@@ -44,6 +47,13 @@
 @Component(configurationPid = "binding.ddwrt", service = ThingHandlerFactory.class)
 public class DDWRTHandlerFactory extends BaseThingHandlerFactory {
 
+    @Override
+    @Deactivate
+    protected void deactivate(ComponentContext componentContext) {
+        SshClientManager.getInstance().shutdown();
+        super.deactivate(componentContext);
+    }
+
     @Override
     public boolean supportsThingType(ThingTypeUID thingTypeUID) {
         return SUPPORTED_THING_TYPES_UIDS.contains(thingTypeUID);

bundles/org.openhab.binding.ddwrt/src/main/java/org/openhab/binding/ddwrt/internal/api/DDWRTBaseDevice.java

@@ -879,7 +879,7 @@ public void onWirelessEvent(SyslogEvent event) {
                 String iface = Objects.requireNonNull(m.group(1));
                 String action = Objects.requireNonNull(m.group(2));
                 String clientMac = Objects.requireNonNull(m.group(3)).toLowerCase(Locale.ROOT);
-                String radioName = (hostname.isEmpty() ? mac : hostname) + "-" + iface;
+                String radioName = (hostname.isEmpty() ? mac : hostname) + " " + iface;
 
                 if ("CONNECTED".equalsIgnoreCase(action)) {
                     // Look up the radio to get its SSID and channel
@@ -928,7 +928,7 @@ public void onWirelessEvent(SyslogEvent event) {
                 String iface = Objects.requireNonNull(mlme.group(1));
                 String clientMac = Objects.requireNonNull(mlme.group(2)).toLowerCase(Locale.ROOT);
                 String action = Objects.requireNonNull(mlme.group(3)).toLowerCase(Locale.ROOT);
-                String radioName = (hostname.isEmpty() ? mac : hostname) + "-" + iface;
+                String radioName = (hostname.isEmpty() ? mac : hostname) + " " + iface;
 
                 boolean isConnect = "assoc".equals(action) || "authenticated".equals(action);
                 boolean isDisconnect = "disassoc".equals(action) || "deauthenticated".equals(action);
@@ -1562,7 +1562,7 @@ protected void refreshWirelessClients(SshRunner runner) {
             if (!radio.getParentDeviceMac().equals(mac)) {
                 continue;
             }
-            String radioName = (hostname.isEmpty() ? mac : hostname) + "-" + radio.getIfaceName();
+            String radioName = (hostname.isEmpty() ? mac : hostname) + " " + radio.getIfaceName();
             for (String clientMac : radio.getAssoclist()) {
                 // Thread-safe update of wireless client (computeWirelessClient handles null case)
                 cache.computeWirelessClient(clientMac, client -> {

bundles/org.openhab.binding.ddwrt/src/main/java/org/openhab/binding/ddwrt/internal/api/SshClientManager.java

@@ -57,6 +57,19 @@ public static SshClientManager getInstance() {
         return INSTANCE;
     }
 
+    /**
+     * Stop the SSH client and release resources. Called from the handler factory
+     * deactivate to ensure clean shutdown during OSGi bundle restarts.
+     */
+    public void shutdown() {
+        try {
+            client.stop();
+            logger.debug("SSH client stopped");
+        } catch (Exception e) {
+            logger.debug("Error stopping SSH client: {}", e.getMessage());
+        }
+    }
+
     private final SshClient client;
     private final String ohPrivateKeyDirString = OpenHAB.getUserDataFolder() + "/ddwrt/keys";
 

bundles/org.openhab.binding.ddwrt/src/main/java/org/openhab/binding/ddwrt/internal/api/SshRunner.java

@@ -94,7 +94,7 @@ public CommandResult execResult(String command, Duration timeout) throws IOExcep
                 ByteArrayOutputStream err = new ByteArrayOutputStream();
                 ch.setOut(out);
                 ch.setErr(err);
-                ch.open().verify();
+                ch.open().verify(timeout.toMillis());
                 Set<ClientChannelEvent> events = ch.waitFor(
                         EnumSet.of(ClientChannelEvent.CLOSED, ClientChannelEvent.EXIT_STATUS), timeout.toMillis());
                 Integer rc = ch.getExitStatus();

bundles/org.openhab.binding.ddwrt/src/main/java/org/openhab/binding/ddwrt/internal/api/SyslogParser.java

@@ -16,6 +16,7 @@
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -40,6 +41,8 @@ public class SyslogParser {
 
     private final Logger logger;
 
+    private static final Gson GSON = new Gson();
+
     private static final Pattern ANSI_ESCAPE = Pattern.compile("\u001B\\[[;?0-9]*[ -/]*[@-~]");
     private static final Pattern OSC_SEQUENCE = Pattern.compile("\u001B\\].*?(\u0007|\u001B\\\\)");
 
@@ -289,7 +292,7 @@ private static String stripControlCodes(String value) {
                 // Normalize single-digit days (e.g., "Mar 4" -> "Mar 4") by removing extra space
                 String normalizedTimestamp = timestampStr.replaceFirst("^(\\w{3})  (\\d{1,2})", "$1 $2");
                 LocalDateTime dt = LocalDateTime.parse(currentYear + " " + normalizedTimestamp,
-                        DateTimeFormatter.ofPattern("yyyy MMM d HH:mm:ss"));
+                        DateTimeFormatter.ofPattern("yyyy MMM d HH:mm:ss", Locale.ENGLISH));
                 return dt.atZone(ZoneId.systemDefault()).toInstant();
             }
         } catch (Exception e) {
@@ -304,8 +307,7 @@ private static String stripControlCodes(String value) {
      */
     private @Nullable SyslogEvent parseUbusLine(String jsonLine) {
         try {
-            Gson gson = new Gson();
-            JsonObject root = gson.fromJson(jsonLine, JsonObject.class);
+            JsonObject root = GSON.fromJson(jsonLine, JsonObject.class);
             if (root == null) {
                 return null;
             }

bundles/org.openhab.binding.ddwrt/src/main/java/org/openhab/binding/ddwrt/internal/handler/DDWRTRadioThingHandler.java

@@ -65,6 +65,12 @@ protected boolean initialize(DDWRTRadioConfiguration config) {
                     "@text/offline.conf-error-no-interfaceid");
             return false;
         }
+        // If interfaceId is just the iface name (e.g. "wl0") and parentDeviceMac is set,
+        // build the full cache key "mac:iface" so cache lookups work for manual configs.
+        if (!config.interfaceId.contains(":") && !config.parentDeviceMac.isEmpty()) {
+            config.interfaceId = config.parentDeviceMac.toLowerCase(Locale.ROOT) + ":" + config.interfaceId;
+            logger.debug("Normalized interfaceId to {}", config.interfaceId);
+        }
         return true;
     }
 
@@ -96,7 +102,7 @@ protected boolean handleCommand(DDWRTNetwork network, DDWRTRadio radio, ChannelU
             boolean enabled = onOff == OnOffType.ON;
             logger.debug("{} radio {}", enabled ? "Enabling" : "Disabling", radio.getInterfaceId());
 
-            boolean success = network.setRadioEnabled(radio.getParentDeviceMac(), radio.getInterfaceId(), enabled);
+            boolean success = network.setRadioEnabled(radio.getParentDeviceMac(), radio.getIfaceName(), enabled);
             if (success) {
                 logger.debug("Radio {} command sent successfully", radio.getInterfaceId());
                 // State will be updated on next network refresh cycle

bundles/org.openhab.binding.ddwrt/src/main/resources/OH-INF/i18n/ddwrt.properties

@@ -61,7 +61,7 @@ thing-type.config.ddwrt.network.user.description = Default SSH username. Precede
 thing-type.config.ddwrt.network.useSystemUser.label = Use System User
 thing-type.config.ddwrt.network.useSystemUser.description = Ignore the User field and resolve the username from ~/.ssh/config or the system username.
 thing-type.config.ddwrt.radio.interfaceId.label = Interface ID
-thing-type.config.ddwrt.radio.interfaceId.description = Wireless interface identifier (e.g. wl0, ath0, wlan0)
+thing-type.config.ddwrt.radio.interfaceId.description = Wireless interface identifier. Discovery sets this to deviceMAC:iface (e.g. aa:bb:cc:dd:ee:ff:wl0). For manual configuration, use just the interface name (e.g. wl0) together with parentDeviceMac.
 thing-type.config.ddwrt.radio.parentDeviceMac.label = Parent Device MAC
 thing-type.config.ddwrt.radio.parentDeviceMac.description = MAC address of the parent device
 thing-type.config.ddwrt.client.hostname.label = Hostname

bundles/org.openhab.binding.ddwrt/src/main/resources/OH-INF/thing/thing-types.xml

@@ -208,7 +208,8 @@
 		<config-description>
 			<parameter name="interfaceId" type="text" required="true">
 				<label>Interface ID</label>
-				<description>Wireless interface identifier (e.g. wl0, ath0, wlan0)</description>
+				<description>Wireless interface identifier. Discovery sets this to deviceMAC:iface (e.g. aa:bb:cc:dd:ee:ff:wl0). For
+					manual configuration, use just the interface name (e.g. wl0) together with parentDeviceMac.</description>
 			</parameter>
 			<parameter name="parentDeviceMac" type="text" required="false">
 				<label>Parent Device MAC</label>