homebridge-ring 11.7.6 → 11.8.0-beta.0

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # homebridge-ring
 
+## 11.8.0-beta.0
+
+### Minor Changes
+
+- [`906225c`](https://github.com/dgreif/ring/commit/906225c4b6e4aecab76fb0d4782b502fee7aca29) Thanks [@dgreif](https://github.com/dgreif)! - Embed hardware id in the refresh token string. This should prevent a second device from being created in Ring Control Center. For this to take effect, please follow the instructions in https://github.com/dgreif/ring/wiki/Notification-Troubleshooting
+
+- [`36cdb0b`](https://github.com/dgreif/ring/commit/36cdb0bc21fab6bf24a2772ff9fcbe3d1315bfe2) Thanks [@dgreif](https://github.com/dgreif)! - Embed push notification credentials in the refresh token. This should allow push notifications to work across restarts and continue working past 24 hours in regions with data residency restrictions.
+
+- [`96bbf54`](https://github.com/dgreif/ring/commit/96bbf54a7c03a8a14c794a7756af4d270efa30f5) Thanks [@dgreif](https://github.com/dgreif)! - Allow Node.js 20
+
+### Patch Changes
+
+- [`da963fd`](https://github.com/dgreif/ring/commit/da963fd69dd294d69da9764869ae4e9886dcccd0) Thanks [@dgreif](https://github.com/dgreif)! - Remove forced session creation on startup. This should fix issues where notifications stop working immediately after a restart.
+
+- Updated dependencies [[`da963fd`](https://github.com/dgreif/ring/commit/da963fd69dd294d69da9764869ae4e9886dcccd0), [`906225c`](https://github.com/dgreif/ring/commit/906225c4b6e4aecab76fb0d4782b502fee7aca29), [`36cdb0b`](https://github.com/dgreif/ring/commit/36cdb0bc21fab6bf24a2772ff9fcbe3d1315bfe2), [`96bbf54`](https://github.com/dgreif/ring/commit/96bbf54a7c03a8a14c794a7756af4d270efa30f5)]:
+  - ring-client-api@11.8.0-beta.0
+
+## 11.7.7
+
+### Patch Changes
+
+- [`f3e66fd`](https://github.com/dgreif/ring/commit/f3e66fdbeb960a9ba35ff26289a054c537bac890) Thanks [@dgreif](https://github.com/dgreif)! - Subscribe to ding/motion events every time the user session is refreshed. This currently happens every 12 hours. This is an attempt to fix motion/ding notifications after restarting, but I am unable to reproduce the issue and verify this change fixes it.
+
+- [`b9881a7`](https://github.com/dgreif/ring/commit/b9881a7b5ed6684bf6dc0464354af7acf1cc77ea) Thanks [@dgreif](https://github.com/dgreif)! - Prevent a duplicate device named "Device name not found" from being created when logging into homebridge with the homebridge ui.
+
+- Updated dependencies [[`f3e66fd`](https://github.com/dgreif/ring/commit/f3e66fdbeb960a9ba35ff26289a054c537bac890), [`af7f44e`](https://github.com/dgreif/ring/commit/af7f44e5f1f97274a8902063b621bde1e94bd08f)]:
+  - ring-client-api@11.7.7
+
 ## 11.7.6
 
 ### Patch Changes

package/lib/config.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.debug = exports.getSystemId = exports.updateHomebridgeConfig = void 0;
+exports.debug = exports.getSystemId = exports.updateHomebridgeConfig = exports.controlCenterDisplayName = void 0;
 const fs_1 = require("fs");
 const crypto_1 = require("crypto");
 const path_1 = require("path");
 const systemIdFileName = '.ring.json';
+exports.controlCenterDisplayName = 'homebridge-ring';
 function updateHomebridgeConfig(homebridge, update) {
     const configPath = homebridge.user.configPath(), config = (0, fs_1.readFileSync)(configPath).toString(), updatedConfig = update(config);
     if (config !== updatedConfig) {
@@ -17,8 +18,8 @@ exports.updateHomebridgeConfig = updateHomebridgeConfig;
 function createSystemId() {
     return (0, crypto_1.createHash)('sha256').update((0, crypto_1.randomBytes)(32)).digest('hex');
 }
-function getSystemId(homebridge) {
-    const storagePath = homebridge.user.storagePath(), filePath = (0, path_1.join)(storagePath, systemIdFileName);
+function getSystemId(homebridgeStoragePath) {
+    const filePath = (0, path_1.join)(homebridgeStoragePath, systemIdFileName);
     try {
         const ringContext = JSON.parse((0, fs_1.readFileSync)(filePath).toString());
         if (ringContext.systemId) {

package/lib/homebridge-ui/server.js

@@ -3,12 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable no-console */
 const plugin_ui_utils_1 = require("@homebridge/plugin-ui-utils");
 const rest_client_1 = require("ring-client-api/rest-client");
+const config_1 = require("../config");
 class PluginUiServer extends plugin_ui_utils_1.HomebridgePluginUiServer {
     constructor() {
         super();
         this.generateCode = async ({ email, password }) => {
             console.log(`Logging in with email '${email}'`);
-            this.restClient = new rest_client_1.RingRestClient({ email, password });
+            const storagePath = this.homebridgeStoragePath;
+            this.restClient = new rest_client_1.RingRestClient({
+                email,
+                password,
+                controlCenterDisplayName: config_1.controlCenterDisplayName,
+                systemId: storagePath ? (0, config_1.getSystemId)(storagePath) : undefined,
+            });
             try {
                 const { refresh_token } = await this.restClient.getCurrentAuth();
                 // If we get here, 2fa was not required.  I'm not sure this is possible anymore, but it's here just in case

package/lib/ring-platform.js

@@ -152,8 +152,8 @@ class RingPlatform {
         this.homebridgeAccessories[accessory.UUID] = accessory;
     }
     async connectToApi() {
-        const { api, config } = this, systemId = (0, config_1.getSystemId)(api), ringApi = new ring_client_api_1.RingApi({
-            controlCenterDisplayName: 'homebridge-ring',
+        const { api, config } = this, systemId = (0, config_1.getSystemId)(api.user.storagePath()), ringApi = new ring_client_api_1.RingApi({
+            controlCenterDisplayName: config_1.controlCenterDisplayName,
             ...config,
             systemId,
         }), locations = await ringApi.getLocations(), cachedAccessoryIds = Object.keys(this.homebridgeAccessories), platformAccessories = [], externalAccessories = [], activeAccessoryIds = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ring",
-  "version": "11.7.6",
+  "version": "11.8.0-beta.0",
   "description": "Homebridge plugin for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/index.js",
   "scripts": {
@@ -13,7 +13,7 @@
   "dependencies": {
     "@homebridge/camera-utils": "^2.2.0",
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "ring-client-api": "11.7.6"
+    "ring-client-api": "11.8.0-beta.0"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
@@ -25,7 +25,7 @@
     "typescript": "5.0.2"
   },
   "engines": {
-    "node": "^16 || ^18",
+    "node": "^16 || ^18 || ^20",
     "homebridge": ">=1.4.0"
   },
   "repository": {