@homebridge-plugins/homebridge-resideo 3.0.3-beta.17 → 3.0.3-beta.19

package/.github/workflows/beta-release.yml

@@ -18,7 +18,6 @@ jobs:
 
   publish:
     needs: lint
-    if: ${{ github.repository == 'homebridge-plugins/homebridge-resideo' }}
     permissions:
       id-token: write
     uses: homebridge/.github/.github/workflows/npm-publish-esm.yml@latest
@@ -32,7 +31,6 @@ jobs:
 
   pre-release:
     needs: publish
-    if: ${{ github.repository == 'homebridge-plugins/homebridge-resideo' }}
     uses: homebridge/.github/.github/workflows/pre-release.yml@latest
     with:
       npm_version: ${{ needs.publish.outputs.NPM_VERSION }}
@@ -44,7 +42,6 @@ jobs:
   github-releases-to-discord:
     name: Discord Webhooks
     needs: [build_and_test,publish]
-    if: ${{ github.repository == 'homebridge-plugins/homebridge-resideo' }}
     uses: homebridge/.github/.github/workflows/discord-webhooks.yml@latest
     with:
       title: "Resideo Beta Release"
@@ -52,4 +49,4 @@ jobs:
         Version `v${{ needs.publish.outputs.NPM_VERSION }}`
       url: "https://github.com/homebridge-plugins/homebridge-resideo/releases/tag/v${{ needs.publish.outputs.NPM_VERSION }}"
     secrets:
-      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_URL_BETA || secrets.DISCORD_WEBHOOK_URL_LATEST }}
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_URL_LATEST }}

package/.github/workflows/release.yml

@@ -1,35 +1,75 @@
-name: Release
+name: Unified Release
 
 on:
-  release:
-    types: [published]
+  push:
+    branches:
+      #- "alpha-*"
+      #- "beta-*"
+      - latest
+  workflow_dispatch:
 
 jobs:
-  build_and_test:
-    uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@latest
+  # 1️⃣ Determine release type, ESM status, and branch name
+  determine-release-type:
+    uses: homebridge/.github/.github/workflows/determine-release-type.yml@latest
     with:
-      enable_coverage: false
+      ref_name: ${{ github.ref_name }}
+
+  # 2️⃣ Update version and changelog using the scripts
+  update-version:
+    needs: determine-release-type
+    uses: homebridge/.github/.github/workflows/update-version.yml@latest
+    with:
+      release_type: ${{ needs.determine-release-type.outputs.release_type }}
+      is_esm: ${{ needs.determine-release-type.outputs.is_esm == 'true' }}
     secrets:
-      token: ${{ secrets.GITHUB_TOKEN }}
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-  publish:
-    needs: build_and_test
-    if: ${{ github.repository == 'homebridge-plugins/homebridge-resideo' }}
+  # 3️⃣ Publish to NPM and create GitHub release
+  publish-release:
+    needs: [determine-release-type, update-version]
     permissions:
       id-token: write
-    uses: homebridge/.github/.github/workflows/npm-publish-esm.yml@latest
+      contents: write
+    uses: homebridge/.github/.github/workflows/publish-release.yml@latest
+    with:
+      release_type: ${{ needs.determine-release-type.outputs.release_type }}
+      version: ${{ needs.update-version.outputs.version }}
+      is_esm: ${{ needs.determine-release-type.outputs.is_esm == 'true' }}
+    secrets:
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+  # 4️⃣ Promote branch if this is a prerelease (alpha/beta)
+  promote-branch:
+    needs: [determine-release-type, publish-release]
+    if: ${{ needs.determine-release-type.outputs.release_type != 'latest' && needs.determine-release-type.outputs.release_type != 'skip' }}
+    uses: homebridge/.github/.github/workflows/promote-branch.yml@latest
+    with:
+      branch_name: ${{ needs.determine-release-type.outputs.branch_name }}
+      release_type: ${{ needs.determine-release-type.outputs.release_type }}
+      is_esm: ${{ needs.determine-release-type.outputs.is_esm == 'true' }}
     secrets:
-      npm_auth_token: ${{ secrets.npm_token }}
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+  # 5️⃣ Notify if any previous job fails
+  workflow-failure:
+    if: ${{ failure() }}
+    needs: [determine-release-type, update-version, publish-release, promote-branch]
+    uses: homebridge/.github/.github/workflows/report-failure.yml@latest
+    with:
+      workflow_name: ${{ github.workflow }}
+      job_name: ${{ github.job }}
+      run_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
+  # 6️⃣ Post to Discord
   github-releases-to-discord:
     name: Discord Webhooks
-    needs: [build_and_test,publish]
-    if: ${{ github.repository == 'homebridge-plugins/homebridge-resideo' }}
+    needs: [determine-release-type, update-version, publish-release]
     uses: homebridge/.github/.github/workflows/discord-webhooks.yml@latest
     with:
       title: "Resideo Release"
       description: |
-        Version `v${{ needs.publish.outputs.NPM_VERSION }}`
-      url: "https://github.com/homebridge-plugins/homebridge-resideo/releases/tag/v${{ needs.publish.outputs.NPM_VERSION }}"
+        Version `v${{ needs.update-version.outputs.version }}`
+      url: "https://github.com/homebridge-plugins/homebridge-resideo/releases/tag/v${{ needs.update-version.outputs.version }}"
     secrets:
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_URL_LATEST }}

package/dist/homebridge-ui/public/index.html

@@ -131,6 +131,13 @@
 </div>
 <script type="module">
    import { webUi } from "./lib/webUi.mjs";
+   import { OAuthModule } from "./lib/oauth-module.mjs";
+   import { ConfigModule } from "./lib/config-module.mjs";
+   import { UIUtils } from "./lib/ui-utils.mjs";
+
+   // Initialize modules
+   const oauthModule = new OAuthModule();
+   const configModule = new ConfigModule();
 
    // Initialize the webUI with homebridge-plugin-utils
    const ui = new webUi({
@@ -152,130 +159,62 @@
          }
       },
       firstRun: {
-         isRequired: () => {
-            // Check if we have complete credentials to skip first-run setup
-            const currentConfig = homebridge.getPluginConfig();
-            if (!Array.isArray(currentConfig) || !currentConfig[0]) {
-               return true;
-            }
-            
-            const config = currentConfig[0];
-            const credentials = config?.credentials;
-            
-            // All four credential fields are required to skip first-run setup
-            const requiredCredentials = ['consumerKey', 'consumerSecret', 'accessToken', 'refreshToken'];
-            const hasAllCredentials = requiredCredentials.every(field => 
-               credentials?.[field] && credentials[field].trim() !== ''
-            );
-            
-            // Return true if first-run is required (missing credentials), false if can skip
-            return !hasAllCredentials;
-         },
+         isRequired: () => configModule.isFirstRunRequired(),
          onStart: () => {
-            // Simple first run initialization - no legacy config handling
+            // Clean first run initialization
             return true;
          },
          onSubmit: async () => {
-            // Handle first run setup with clean config creation
-            const key = document.getElementById('firstRunKey')?.value?.trim();
-            const secret = document.getElementById('firstRunSecret')?.value?.trim();
-            const errorDiv = document.getElementById('loginError');
-
-            // Clear any previous errors
-            if (errorDiv) {
-               errorDiv.innerHTML = '&nbsp;';
-            }
-
-            // Validate input fields
-            if (!key || !secret) {
-               if (errorDiv) {
-                  errorDiv.innerHTML = '<div class="alert alert-danger"><strong>Error:</strong> Please enter both Consumer Key and Consumer Secret.</div>';
-               }
-               return false;
-            }
+            // Handle first run setup with modular approach
+            const key = UIUtils.getFieldValue('firstRunKey');
+            const secret = UIUtils.getFieldValue('firstRunSecret');
+            
+            UIUtils.clearMessage('loginError');
+            UIUtils.storeButtonText('firstRun');
+            UIUtils.setButtonLoading('firstRun', true);
 
-            // Basic validation for credential format
-            if (key.length < 10 || secret.length < 10) {
-               if (errorDiv) {
-                  errorDiv.innerHTML = '<div class="alert alert-danger"><strong>Error:</strong> Consumer Key and Secret appear to be too short. Please verify your credentials.</div>';
-               }
+            // Validate credentials
+            const validation = oauthModule.validateCredentials(key, secret);
+            if (!validation.valid) {
+               UIUtils.showError('loginError', validation.message);
+               UIUtils.setButtonLoading('firstRun', false);
                return false;
             }
 
             try {
-               // Create clean config structure for first version
-               const currentConfig = [{
-                  platform: 'Resideo',
-                  name: 'Resideo',
-                  credentials: {
-                     consumerKey: key,
-                     consumerSecret: secret
-                  }
-               }];
-
-               await homebridge.updatePluginConfig(currentConfig);
+               // Create initial config
+               const initialConfig = configModule.createInitialConfig(key, secret);
+               const updateResult = await configModule.updateConfig(initialConfig);
                
-               // Now trigger the OAuth flow
-               await homebridge.request('Start Resideo Login Server');
+               if (!updateResult.success) {
+                  throw new Error(updateResult.error || 'Failed to update configuration');
+               }
+
+               // Start OAuth flow
+               const popup = await oauthModule.startOAuthFlow(key, secret);
                
-               // Open OAuth popup
-               const hostname = window.location.hostname;
-               const w = 450;
-               const h = 700;
-               const y = window.top.outerHeight / 2 + window.top.screenY - (h / 2);
-               const x = window.top.outerWidth / 2 + window.top.screenX - (w / 2);
-               const urlToOpen = 'http://' + hostname + ':8585/start?' +
-                  'key=' + encodeURIComponent(key) +
-                  '&secret=' + encodeURIComponent(secret) +
-                  '&host=' + encodeURIComponent(hostname);
+               // Verify OAuth completion
+               const result = await oauthModule.verifyOAuthCompletion(popup);
                
-               const popup = window.open(
-                  urlToOpen, 'resideo-auth',
-                  'toolbar=no, location=no, directories=no, status=no, menubar=no scrollbars=no, resizable=no, copyhistory=no, ' +
-                  'width=' + w + ', height=' + h + ', top=' + y + ', left=' + x,
-               );
-
-               return new Promise((resolve) => {
-                  const checkClosed = setInterval(() => {
-                     if (popup.closed) {
-                        clearInterval(checkClosed);
-                        
-                        // Wait a moment for config to update
-                        setTimeout(() => {
-                           // Check if authentication completed successfully by verifying all required credentials
-                           const updatedConfig = homebridge.getPluginConfig();
-                           const credentials = Array.isArray(updatedConfig) && updatedConfig[0]?.credentials;
-                           const hasCompleteAuth = credentials?.accessToken && 
-                                                 credentials?.refreshToken && 
-                                                 credentials?.consumerKey && 
-                                                 credentials?.consumerSecret;
-                           
-                           if (hasCompleteAuth) {
-                              if (errorDiv) {
-                                 errorDiv.innerHTML = '<div class="alert alert-success"><strong>Success!</strong> Your account has been linked successfully.</div>';
-                              }
-                              resolve(true);
-                           } else {
-                              if (errorDiv) {
-                                 errorDiv.innerHTML = '<div class="alert alert-warning"><strong>Authentication incomplete.</strong> Please try the setup process again or check your Resideo developer credentials.</div>';
-                              }
-                              resolve(false);
-                           }
-                        }, 500);
-                     }
-                  }, 1000);
-               });
-            } catch (error) {
-               console.error('Resideo setup error:', error);
-               if (errorDiv) {
-                  if (error.message.includes('port')) {
-                     errorDiv.innerHTML = '<div class="alert alert-danger"><strong>Error:</strong> OAuth server port conflict. Please wait a moment and try again.</div>';
-                  } else if (error.message.includes('network') || error.message.includes('fetch')) {
-                     errorDiv.innerHTML = '<div class="alert alert-danger"><strong>Error:</strong> Network error. Please check your connection and try again.</div>';
-                  } else {
-                     errorDiv.innerHTML = `<div class="alert alert-danger"><strong>Error:</strong> Setup failed. ${error.message || 'Please try again.'}</div>`;
-                  }
+               if (result.success) {
+                  UIUtils.showSuccess('loginError', 'Your account has been linked successfully.');
+                  UIUtils.setButtonLoading('firstRun', false);
+                  
+                  // Force UI refresh after short delay
+                  setTimeout(() => {
+                     return true;
+                  }, 100);
+                  
+                  return true;
+               } else {
+                  UIUtils.showWarning('loginError', result.message || 'Authentication incomplete. Please try again.');
+                  UIUtils.setButtonLoading('firstRun', false);
+                  return false;
                }
+            } catch (error) {
+               console.error('First run setup error:', error);
+               UIUtils.handleError(error, 'loginError');
+               UIUtils.setButtonLoading('firstRun', false);
                return false;
             }
          }
@@ -283,60 +222,29 @@
       name: 'homebridge-resideo'
    });
 
-   // Legacy functionality for existing UI elements - simplified for webUi compatibility
-   const setupLegacyHandlers = () => {
-      const hostname = window.location.hostname;
-      
-      homebridge.addEventListener('creds-received', async event => {
-         try {
-            if (event.data.access && event.data.refresh) {
-               // Create clean config structure for first version
-               const currentConfig = [{
-                  platform: 'Resideo',
-                  name: 'Resideo',
-                  credentials: {
-                     consumerKey: event.data.key,
-                     consumerSecret: event.data.secret,
-                     accessToken: event.data.access,
-                     refreshToken: event.data.refresh
-                  }
-               }];
-               
-               await homebridge.updatePluginConfig(currentConfig);
-               await homebridge.savePluginConfig();
-               homebridge.toast.success("Successfully Linked Resideo Account", "homebridge-resideo");
-            }
-         } catch (err) {
-            console.log(err);
-            homebridge.toast.error('Setup failed. Please try again.', 'Error');
-         }
-      });
-
-      window.copyMyText = () => {
-         const textToCopy = document.getElementById("copyMe");
-         if (textToCopy) {
-            textToCopy.select();
-            document.execCommand("copy");
-         }
-      };
+   // Setup OAuth credential handler and other legacy functionality
+   const setupLegacyIntegration = () => {
+      // Setup OAuth credential reception
+      oauthModule.setupCredentialHandler();
 
-      // Initialize legacy components for backwards compatibility
-      setupLegacyMenus();
-   };
-
-   const setupLegacyMenus = () => {
-      // Legacy menu functionality removed for first version approach
-      // The webUi handles all navigation automatically
+      // Setup copy to clipboard functionality
+      UIUtils.setupCopyToClipboard();
+      
+      // Initialize callback URL display
+      const hostname = window.location.hostname;
+      const callbackUrl = `http://${hostname}:8585/auth`;
+      UIUtils.setFieldValue('copyMe', callbackUrl);
    };
 
-   // Show the webUI
+   // Initialize the application
    (async () => {
       try {
          await homebridge.request('Start Resideo Login Server');
-         setupLegacyHandlers();
+         setupLegacyIntegration();
          ui.show();
       } catch (err) {
-         homebridge.toast.error(err.message, 'Error');
+         console.error('Initialization error:', err);
+         homebridge.toast.error(err.message || 'Failed to initialize plugin UI', 'Error');
       }
    })();
 </script>

package/dist/homebridge-ui/public/lib/config-module.mjs

@@ -0,0 +1,94 @@
+/* Copyright(C) 2017-2025, homebridge-plugins/homebridge-resideo developers. All rights reserved.
+ *
+ * config-module.mjs: Configuration management module for Resideo plugin.
+ */
+
+/**
+ * Configuration management module for Resideo plugin.
+ */
+export class ConfigModule {
+  constructor() {
+    // Initialize configuration management
+  }
+
+  /**
+   * Checks if first-run setup is required.
+   */
+  isFirstRunRequired() {
+    const currentConfig = homebridge.getPluginConfig();
+    if (!Array.isArray(currentConfig) || !currentConfig[0]) {
+      return true;
+    }
+    
+    const config = currentConfig[0];
+    const credentials = config?.credentials;
+    
+    if (!credentials) {
+      return true;
+    }
+    
+    // Check for minimum credentials needed to skip first-run
+    const hasMinimumCredentials = credentials.consumerKey && 
+                                credentials.consumerKey.trim() !== '' &&
+                                credentials.consumerSecret && 
+                                credentials.consumerSecret.trim() !== '' &&
+                                credentials.refreshToken && 
+                                credentials.refreshToken.trim() !== '';
+    
+    return !hasMinimumCredentials;
+  }
+
+  /**
+   * Creates a clean initial configuration.
+   */
+  createInitialConfig(key, secret) {
+    return [{
+      platform: 'Resideo',
+      name: 'Resideo',
+      credentials: {
+        consumerKey: key,
+        consumerSecret: secret
+      }
+    }];
+  }
+
+  /**
+   * Updates plugin configuration.
+   */
+  async updateConfig(config) {
+    try {
+      await homebridge.updatePluginConfig(config);
+      return { success: true };
+    } catch (error) {
+      console.error('Config update error:', error);
+      return { success: false, error: error.message };
+    }
+  }
+
+  /**
+   * Gets current plugin configuration.
+   */
+  getCurrentConfig() {
+    const config = homebridge.getPluginConfig();
+    return Array.isArray(config) ? config[0] : null;
+  }
+
+  /**
+   * Validates configuration structure.
+   */
+  validateConfig(config) {
+    if (!config) {
+      return { valid: false, message: 'Configuration is missing' };
+    }
+
+    if (config.platform !== 'Resideo') {
+      return { valid: false, message: 'Invalid platform configuration' };
+    }
+
+    if (!config.credentials) {
+      return { valid: false, message: 'Credentials are missing' };
+    }
+
+    return { valid: true };
+  }
+}

package/dist/homebridge-ui/public/lib/oauth-module.mjs

@@ -0,0 +1,139 @@
+/* Copyright(C) 2017-2025, homebridge-plugins/homebridge-resideo developers. All rights reserved.
+ *
+ * oauth-module.mjs: OAuth authentication module for Resideo plugin.
+ */
+
+/**
+ * OAuth authentication module for Resideo plugin setup.
+ */
+export class OAuthModule {
+  constructor() {
+    this.hostname = window.location.hostname;
+  }
+
+  /**
+   * Validates OAuth credentials format.
+   */
+  validateCredentials(key, secret) {
+    if (!key || !secret) {
+      return { valid: false, message: 'Please enter both Consumer Key and Consumer Secret.' };
+    }
+
+    if (key.length < 10 || secret.length < 10) {
+      return { 
+        valid: false, 
+        message: 'Consumer Key and Secret appear to be too short. Please verify your credentials.' 
+      };
+    }
+
+    return { valid: true };
+  }
+
+  /**
+   * Sets up OAuth flow with popup window.
+   */
+  async startOAuthFlow(key, secret) {
+    try {
+      await homebridge.request('Start Resideo Login Server');
+      
+      const w = 450;
+      const h = 700;
+      const y = window.top.outerHeight / 2 + window.top.screenY - (h / 2);
+      const x = window.top.outerWidth / 2 + window.top.screenX - (w / 2);
+      
+      const urlToOpen = `http://${this.hostname}:8585/start?` +
+        `key=${encodeURIComponent(key)}&` +
+        `secret=${encodeURIComponent(secret)}&` +
+        `host=${encodeURIComponent(this.hostname)}`;
+      
+      const popup = window.open(
+        urlToOpen, 
+        'resideo-auth',
+        `toolbar=no, location=no, directories=no, status=no, menubar=no scrollbars=no, resizable=no, copyhistory=no, ` +
+        `width=${w}, height=${h}, top=${y}, left=${x}`
+      );
+
+      return popup;
+    } catch (error) {
+      console.error('OAuth flow error:', error);
+      throw error;
+    }
+  }
+
+  /**
+   * Verifies OAuth completion with multiple attempts.
+   */
+  async verifyOAuthCompletion(popup, maxAttempts = 10) {
+    return new Promise((resolve) => {
+      const checkClosed = setInterval(() => {
+        if (popup.closed) {
+          clearInterval(checkClosed);
+          
+          let verificationAttempts = 0;
+          
+          const verifyCredentials = () => {
+            verificationAttempts++;
+            
+            const updatedConfig = homebridge.getPluginConfig();
+            const credentials = Array.isArray(updatedConfig) && updatedConfig[0]?.credentials;
+            
+            // Check for minimum required credentials
+            const hasMinimumAuth = credentials?.consumerKey && 
+                                 credentials?.consumerSecret && 
+                                 credentials?.refreshToken;
+            
+            const hasCompleteAuth = hasMinimumAuth && credentials?.accessToken;
+            
+            if (hasCompleteAuth) {
+              resolve({ success: true, complete: true });
+            } else if (hasMinimumAuth && verificationAttempts >= maxAttempts) {
+              // Minimum credentials are acceptable
+              resolve({ success: true, complete: false, message: 'Minimum credentials received' });
+            } else if (verificationAttempts >= maxAttempts) {
+              resolve({ 
+                success: false, 
+                message: 'Authentication incomplete. Please try the setup process again.' 
+              });
+            } else {
+              setTimeout(verifyCredentials, 1000);
+            }
+          };
+          
+          setTimeout(verifyCredentials, 500);
+        }
+      }, 1000);
+    });
+  }
+
+  /**
+   * Sets up OAuth credential reception handler.
+   */
+  setupCredentialHandler() {
+    homebridge.addEventListener('creds-received', async (event) => {
+      try {
+        if (event.data.access && event.data.refresh) {
+          const currentConfig = [{
+            platform: 'Resideo',
+            name: 'Resideo',
+            credentials: {
+              consumerKey: event.data.key,
+              consumerSecret: event.data.secret,
+              accessToken: event.data.access,
+              refreshToken: event.data.refresh
+            }
+          }];
+          
+          await homebridge.updatePluginConfig(currentConfig);
+          await homebridge.savePluginConfig();
+          
+          setTimeout(() => {
+            homebridge.toast.success("Successfully Linked Resideo Account", "homebridge-resideo");
+          }, 200);
+        }
+      } catch (err) {
+        console.error('Credential handling error:', err);
+        homebridge.toast.error('Setup failed. Please try again.', 'Error');
+      }
+    });
+  }
+}