homebridge-ring 13.2.0-beta.1 → 13.2.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # homebridge-ring
 
+## 13.2.0-beta.2
+
+### Patch Changes
+
+- [`c6a3ff1`](https://github.com/dgreif/ring/commit/c6a3ff1b131abe9ef5df3faef7e4759b31689f30) Thanks [@dgreif](https://github.com/dgreif)! - Update dependencies
+
+- [`6f83b8e`](https://github.com/dgreif/ring/commit/6f83b8e2cd48fc8ca6f101c293d38f4a5c6c42ab) Thanks [@dgreif](https://github.com/dgreif)! - Fix homebridge ui
+
+- Updated dependencies [[`c6a3ff1`](https://github.com/dgreif/ring/commit/c6a3ff1b131abe9ef5df3faef7e4759b31689f30)]:
+  - ring-client-api@13.2.0-beta.2
+
 ## 13.2.0-beta.1
 
 ### Patch Changes

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

@@ -1,17 +1,180 @@
-<button id="ring-new-token" class="btn btn-link m-0 p-0" style="display: none;">
+<button id="ring-new-token" class="btn btn-link m-0 p-0" style="display: none">
   <i class="fa fa-redo mr-2"></i>
   Generate New Refresh Token
 </button>
 
-<h4 id="ring-link-account-header" class="text-center primary-text mb-3" style="display: none;">
+<h4
+  id="ring-link-account-header"
+  class="text-center primary-text mb-3"
+  style="display: none"
+>
   Link Ring Account
 </h4>
 
 <script type="module">
-  // Show the spinner while the JS is loading
-  homebridge.showSpinner()
+  const { homebridge } = window
+  const newTokenButton = document.getElementById('ring-new-token')
+  const linkAccountHeader = document.getElementById('ring-link-account-header')
 
-  // import the JS module for the custom UI
-  // Use the installed version of homebridge to bust the cache for the script
-  import(`./homebridge-ring-ui.js?v=${homebridge.plugin.installedVersion}`)
+  if (!newTokenButton) {
+    homebridge.toast.error('no ring-new-token element found!')
+    throw new Error('no ring-new-token element found!')
+  }
+
+  if (!linkAccountHeader) {
+    homebridge.toast.error('no ring-link-account-header element found!')
+    throw new Error('no ring-link-account-header element found!')
+  }
+
+  newTokenButton.addEventListener('click', () => {
+    showLoginForm()
+  })
+
+  /**
+   * Render the correct form, based on whether we have an existing refresh token
+   */
+  async function renderForm() {
+    const [config] = await homebridge.getPluginConfig()
+    const needToken = !config?.refreshToken
+
+    homebridge.hideSpinner()
+
+    if (needToken) {
+      showLoginForm()
+    } else {
+      showStandardForm()
+    }
+  }
+  renderForm()
+
+  /**
+   * @param {string} refreshToken
+   */
+  async function setRefreshToken(refreshToken) {
+    const [config, ...otherConfigs] = await homebridge.getPluginConfig()
+    await homebridge.updatePluginConfig([
+      { ...config, refreshToken },
+      ...otherConfigs,
+    ])
+    homebridge.toast.success('Refresh Token Updated', 'Ring Login Successful')
+    showStandardForm()
+  }
+
+  function showStandardForm() {
+    newTokenButton?.style.setProperty('display', 'block')
+    linkAccountHeader?.style.setProperty('display', 'none')
+    homebridge.showSchemaForm()
+  }
+
+  function showLoginForm() {
+    // Hide the standard form
+    newTokenButton?.style.setProperty('display', 'none')
+    linkAccountHeader?.style.setProperty('display', 'block')
+    homebridge.hideSchemaForm()
+
+    // Create a new login form
+    const form = homebridge.createForm(
+      {
+        schema: {
+          type: 'object',
+          properties: {
+            email: {
+              title: 'Email',
+              type: 'string',
+              'x-schema-form': {
+                type: 'email',
+              },
+              required: true,
+            },
+            password: {
+              title: 'Password',
+              type: 'string',
+              'x-schema-form': {
+                type: 'password',
+              },
+              required: true,
+            },
+          },
+        },
+      },
+      {},
+      'Log In',
+    )
+
+    form.onSubmit(async ({ email, password }) => {
+      homebridge.showSpinner()
+
+      try {
+        /** @type {{ codePrompt: string } | { refreshToken: string }} */
+        const response = await homebridge.request('/send-code', {
+          email,
+          password,
+        })
+
+        if ('refreshToken' in response) {
+          // didn't need 2fa, return token without asking for code
+          setRefreshToken(response.refreshToken)
+        } else {
+          // Need a token, so show the token form
+          showTokenForm({
+            email,
+            password,
+            codePrompt: response.codePrompt,
+          })
+        }
+      } catch (/** @type {any} */ e) {
+        // eslint-disable-next-line no-console
+        console.error(e)
+        homebridge.toast.error(e.message, 'Ring Login Failed')
+      } finally {
+        homebridge.hideSpinner()
+      }
+    })
+  }
+
+  /**
+   * @param {{ email: string, password: string, codePrompt: string }} loginInfo
+   */
+  function showTokenForm(loginInfo) {
+    const form = homebridge.createForm(
+      {
+        schema: {
+          type: 'object',
+          properties: {
+            code: {
+              title: 'Code',
+              type: 'string',
+              required: true,
+              description: loginInfo.codePrompt,
+            },
+          },
+        },
+      },
+      {},
+      'Link Account',
+      'Change Email',
+    )
+
+    form.onSubmit(async ({ code }) => {
+      homebridge.showSpinner()
+
+      try {
+        const { refreshToken } = await homebridge.request('/token', {
+          email: loginInfo.email,
+          password: loginInfo.password,
+          code,
+        })
+
+        setRefreshToken(refreshToken)
+      } catch (/** @type {any} */ e) {
+        // eslint-disable-next-line no-console
+        console.error(e)
+        homebridge.toast.error(e.message, 'Failed to Link Account')
+      } finally {
+        homebridge.hideSpinner()
+      }
+    })
+
+    form.onCancel(() => showLoginForm())
+  }
 </script>

package/package.json

@@ -1,24 +1,24 @@
 {
   "name": "homebridge-ring",
   "displayName": "Ring",
-  "version": "13.2.0-beta.1",
+  "version": "13.2.0-beta.2",
   "description": "Homebridge plugin for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/index.js",
   "scripts": {
-    "build": "rm -rf lib && tsc && cp ./homebridge-ui/public/index.html ./lib/homebridge-ui/public/",
+    "build": "rm -rf lib && tsc && cp -r ./homebridge-ui/public ./lib/homebridge-ui/public/",
     "lint": "eslint . --ext .ts && tsc --noEmit",
     "dev": "concurrently -c yellow,blue --kill-others \"npm:dev:build\" \"npm:dev:run\" ",
     "dev:build": "tsc --watch --preserveWatchOutput",
     "dev:run": "RING_DEBUG=true node --watch ../../node_modules/.bin/homebridge -U ../../.homebridge"
   },
   "dependencies": {
-    "@homebridge/camera-utils": "^2.2.7-beta",
+    "@homebridge/camera-utils": "^2.2.7",
     "@homebridge/plugin-ui-utils": "^1.0.3",
-    "ring-client-api": "13.2.0-beta.1",
+    "ring-client-api": "13.2.0-beta.2",
     "werift": "0.20.1"
   },
   "devDependencies": {
-    "concurrently": "^9.0.1",
+    "concurrently": "^9.1.0",
     "eslint-config-shared": "*",
     "homebridge": "1.8.5",
     "tsconfig": "*",

package/lib/homebridge-ui/public/homebridge-ring-ui.js

@@ -1,139 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const { homebridge } = window;
-const newTokenButton = document.getElementById('ring-new-token');
-const linkAccountHeader = document.getElementById('ring-link-account-header');
-if (!newTokenButton) {
-    homebridge.toast.error('no ring-new-token element found!');
-    throw new Error('no ring-new-token element found!');
-}
-if (!linkAccountHeader) {
-    homebridge.toast.error('no ring-link-account-header element found!');
-    throw new Error('no ring-link-account-header element found!');
-}
-newTokenButton.addEventListener('click', () => {
-    showLoginForm();
-});
-/**
- * Render the correct form, based on whether we have an existing refresh token
- */
-async function renderForm() {
-    const [config] = await homebridge.getPluginConfig();
-    const needToken = !config?.refreshToken;
-    homebridge.hideSpinner();
-    if (needToken) {
-        showLoginForm();
-    }
-    else {
-        showStandardForm();
-    }
-}
-renderForm();
-async function setRefreshToken(refreshToken) {
-    const [config, ...otherConfigs] = await homebridge.getPluginConfig();
-    await homebridge.updatePluginConfig([
-        { ...config, refreshToken },
-        ...otherConfigs,
-    ]);
-    homebridge.toast.success('Refresh Token Updated', 'Ring Login Successful');
-    showStandardForm();
-}
-function showStandardForm() {
-    newTokenButton?.style.setProperty('display', 'block');
-    linkAccountHeader?.style.setProperty('display', 'none');
-    homebridge.showSchemaForm();
-}
-function showLoginForm() {
-    // Hide the standard form
-    newTokenButton?.style.setProperty('display', 'none');
-    linkAccountHeader?.style.setProperty('display', 'block');
-    homebridge.hideSchemaForm();
-    // Create a new login form
-    const form = homebridge.createForm({
-        schema: {
-            type: 'object',
-            properties: {
-                email: {
-                    title: 'Email',
-                    type: 'string',
-                    'x-schema-form': {
-                        type: 'email',
-                    },
-                    required: true,
-                },
-                password: {
-                    title: 'Password',
-                    type: 'string',
-                    'x-schema-form': {
-                        type: 'password',
-                    },
-                    required: true,
-                },
-            },
-        },
-    }, {}, 'Log In');
-    form.onSubmit(async ({ email, password }) => {
-        homebridge.showSpinner();
-        try {
-            const response = (await homebridge.request('/send-code', {
-                email,
-                password,
-            }));
-            if ('refreshToken' in response) {
-                // didn't need 2fa, return token without asking for code
-                setRefreshToken(response.refreshToken);
-            }
-            else {
-                // Need a token, so show the token form
-                showTokenForm({
-                    email,
-                    password,
-                    codePrompt: response.codePrompt,
-                });
-            }
-        }
-        catch (e) {
-            // eslint-disable-next-line no-console
-            console.error(e);
-            homebridge.toast.error(e.message, 'Ring Login Failed');
-        }
-        finally {
-            homebridge.hideSpinner();
-        }
-    });
-}
-function showTokenForm(loginInfo) {
-    const form = homebridge.createForm({
-        schema: {
-            type: 'object',
-            properties: {
-                code: {
-                    title: 'Code',
-                    type: 'string',
-                    required: true,
-                    description: loginInfo.codePrompt,
-                },
-            },
-        },
-    }, {}, 'Link Account', 'Change Email');
-    form.onSubmit(async ({ code }) => {
-        homebridge.showSpinner();
-        try {
-            const { refreshToken } = await homebridge.request('/token', {
-                email: loginInfo.email,
-                password: loginInfo.password,
-                code,
-            });
-            setRefreshToken(refreshToken);
-        }
-        catch (e) {
-            // eslint-disable-next-line no-console
-            console.error(e);
-            homebridge.toast.error(e.message, 'Failed to Link Account');
-        }
-        finally {
-            homebridge.hideSpinner();
-        }
-    });
-    form.onCancel(() => showLoginForm());
-}