homebridge-ring 12.0.0-beta.1 → 12.0.0-beta.3

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # homebridge-ring
 
+## 12.0.0-beta.3
+
+### Patch Changes
+
+- [`bac6b96`](https://github.com/dgreif/ring/commit/bac6b96e1d6b5f115d6c1f67735fd122e32e7311) Thanks [@dgreif](https://github.com/dgreif)! - Wait 30 seconds (instead of 5 seconds) before fetching remote camera status after light is toggled in HomeKit. This may help with issues where camera lights appear to toggle back to old state shortly after turning them on/off.
+
+- [`7d198b8`](https://github.com/dgreif/ring/commit/7d198b87ce03531fb75276eac2d89e2af2be4c23) Thanks [@dgreif](https://github.com/dgreif)! - Temporary fix for 2-way audio. This pins werift to an older version while we look into bug fixes. Thanks to @tsightler for debugging and pursuing a real fix!
+
+- [`7b9fbec`](https://github.com/dgreif/ring/commit/7b9fbec0950b72f310cecd93a052800e6b7efe36) Thanks [@dgreif](https://github.com/dgreif)! - Switched from a React-based UI to a simple JS UI for the homebridge-ring plugin UI. This should reduce the package size and simplify development. No visual changes should be noticiable in the UI.
+
+- Updated dependencies [[`d54168d`](https://github.com/dgreif/ring/commit/d54168dac5f0aa06b50ef805eca98785cb513f83)]:
+  - ring-client-api@12.0.0-beta.3
+
+## 12.0.0-beta.2
+
+### Patch Changes
+
+- [`02304ba`](https://github.com/dgreif/ring/commit/02304ba6f41e2e8311d152c104c9256bacf87b8c) Thanks [@dgreif](https://github.com/dgreif)! - Another attempt at fixing pvtsutils version
+
+- Updated dependencies [[`02304ba`](https://github.com/dgreif/ring/commit/02304ba6f41e2e8311d152c104c9256bacf87b8c)]:
+  - ring-client-api@12.0.0-beta.2
+
 ## 12.0.0-beta.1
 
 ### Patch Changes

package/lib/camera.js

@@ -78,8 +78,8 @@ class Camera extends base_data_accessory_1.BaseDataAccessory {
                     return value;
                 },
                 setValue: (value) => {
-                    // Allow 5 seconds for the light value to update in our status updates from Ring
-                    lightTargetTimer.setTarget(value, 5000);
+                    // Allow 30 seconds for the light value to update in our status updates from Ring
+                    lightTargetTimer.setTarget(value, 30000);
                     return device.setLight(value);
                 },
                 requestUpdate: () => device.requestUpdate(),

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

@@ -0,0 +1,138 @@
+"use strict";
+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());
+}

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

@@ -1 +1,22 @@
-<head><script defer="defer" src="./static/js/main.e1f36307.js"></script></head><div id="root"></div>
+<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;">
+  Link Ring Account
+</h4>
+
+<script>
+  // Show the spinner while the JS is loading
+  homebridge.showSpinner()
+
+  // Create a script tag to load the JS onto the page
+  const script = document.createElement('script')
+
+  // Use the installed version of homebridge to bust the cache for the script
+  script.src = `homebridge-ring-ui.js?v=${homebridge.plugin.installedVersion}`
+
+  // Append the script to the head of the page to load it
+  document.head.appendChild(script)
+</script>

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "homebridge-ring",
-  "version": "12.0.0-beta.1",
+  "version": "12.0.0-beta.3",
   "description": "Homebridge plugin for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/index.js",
   "scripts": {
-    "build": "rm -rf lib && tsc && cp -r ../homebridge-ui/build ./lib/homebridge-ui/public",
+    "build": "rm -rf lib && tsc && cp ./homebridge-ui/public/index.html ./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",
@@ -12,15 +12,14 @@
   },
   "dependencies": {
     "@homebridge/camera-utils": "^2.2.0",
-    "@homebridge/plugin-ui-utils": "^0.0.19",
-    "ring-client-api": "12.0.0-beta.1",
-    "werift": "0.18.5"
+    "@homebridge/plugin-ui-utils": "^0.1.0",
+    "ring-client-api": "12.0.0-beta.3",
+    "werift": "0.17.6"
   },
   "devDependencies": {
     "concurrently": "^8.2.0",
     "eslint-config-shared": "*",
     "homebridge": "1.6.1",
-    "homebridge-ui": "*",
     "nodemon": "^3.0.1",
     "tsconfig": "*",
     "typescript": "5.1.6"

package/lib/homebridge-ui/public/asset-manifest.json

@@ -1,10 +0,0 @@
-{
-  "files": {
-    "main.js": "./static/js/main.e1f36307.js",
-    "index.html": "./index.html",
-    "main.e1f36307.js.map": "./static/js/main.e1f36307.js.map"
-  },
-  "entrypoints": [
-    "static/js/main.e1f36307.js"
-  ]
-}