homebridge-ring-secure-video 1.0.0-beta.1 → 1.0.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # homebridge-ring-secure-video
 
+## 1.0.0-beta.2 (2026-11-13)
+
+- The Homebridge UI shows the plugin as "Ring Secure Video" (was "Homebridge Ring Secure Video"),
+  matching its platform name in the settings and the log.
+- ring-client-api now runs on the whole of `@eneris/push-receiver` 4.3.1, not only its decrypt
+  function, so it also gets 4.3.1's other push client fixes. The plugin puts its 4.3.1 in place of
+  ring-client-api's pinned 4.3.0 before ring-client-api loads; if that copy was already loaded, it
+  falls back to swapping in 4.3.1's decrypt function as before. The log says at start which one
+  was applied, and warns if neither could be.
+
 ## 1.0.0-beta.1 (2026-11-13)
 
 First release as `homebridge-ring-secure-video`, continuing trinityhades/homebridge-ring-hksv

package/README.md

@@ -164,9 +164,9 @@ For support and debugging:
 - Upstream Ring wiki (token/auth/camera references): <https://github.com/dgreif/ring/wiki>
 
 If motion and doorbell events arrive late (the log shows "Detected Motion from Ring event history
-fallback" rather than right away), Ring's instant notifications aren't reaching the plugin. With debug
-logging on, the log says at start whether the push decryption fix for `@eneris/push-receiver` was
-applied. See also the upstream [notification troubleshooting](https://github.com/dgreif/ring/wiki/Notification-Troubleshooting).
+fallback" rather than right away), Ring's instant notifications aren't reaching the plugin. At start the
+log says which `@eneris/push-receiver` the Ring push client uses ("Ring push notifications: ..."), or
+warns "Could not fix Ring push notifications" if the plugin couldn't give it the fixed 4.3.1. See also the upstream [notification troubleshooting](https://github.com/dgreif/ring/wiki/Notification-Troubleshooting).
 
 Use the "Force Ring Push Credential Refresh" and "Force Ring API Session Refresh" settings only as a
 last resort, once. Each refresh adds a registration with Ring, and repeated ones can make Ring stop

package/lib/index.js

@@ -1,5 +1,10 @@
-import { platformName, RingPlatform } from "./ring-platform.js";
 import { setHap } from "./hap.js";
+// The push-receiver fix has to run before Node even reads ring-client-api's imports: Node reads a
+// module's whole static import graph before running any of it, and from then on ring-client-api is
+// tied to its own @eneris/push-receiver 4.3.0. So it is loaded first, and everything that leads to
+// ring-client-api (ring-platform.ts) only after it (see push-receiver-fix.ts).
+await import("./push-receiver-fix.js");
+const { platformName, RingPlatform } = await import("./ring-platform.js");
 export default function (api) {
     setHap(api.hap);
     api.registerPlatform(platformName, RingPlatform);

package/lib/push-receiver-fix.js

@@ -1,6 +1,8 @@
-import { createRequire } from 'node:module';
+import Module, { createRequire } from 'node:module';
 const decryptPath = '@eneris/push-receiver/dist/utils/decrypt.js';
-export function applyPushReceiverDecryptFix() {
+const loggerPath = '@eneris/push-receiver/dist/utils/logger.js';
+const moduleCache = Module._cache;
+export function applyPushReceiverFix() {
     try {
         const ownRequire = createRequire(import.meta.url), ringRequire = createRequire(ownRequire.resolve('ring-client-api')), loadedVersion = ringRequire('@eneris/push-receiver/package.json').version;
         if (loadedVersion !== '4.3.0') {
@@ -9,26 +11,39 @@ export function applyPushReceiverDecryptFix() {
                 detail: `ring-client-api uses @eneris/push-receiver ${loadedVersion}`,
             };
         }
-        const fixedVersion = ownRequire('@eneris/push-receiver/package.json').version;
-        if (fixedVersion === loadedVersion) {
+        const fixedVersion = ownRequire('@eneris/push-receiver/package.json').version, target = ringRequire.resolve('@eneris/push-receiver'), fixed = ownRequire.resolve('@eneris/push-receiver');
+        if (fixedVersion === loadedVersion || target === fixed) {
             return {
                 result: 'failed',
                 detail: `only @eneris/push-receiver ${loadedVersion} is installed; reinstall the plugin`,
             };
         }
-        const loaded = ringRequire(decryptPath), fixed = ownRequire(decryptPath);
-        if (typeof loaded.default !== 'function' || typeof fixed.default !== 'function') {
+        const targetLogger = ringRequire.resolve(loggerPath);
+        if (!moduleCache[target] && !moduleCache[targetLogger]) {
+            ownRequire(fixed);
+            ownRequire(loggerPath);
+            moduleCache[target] = moduleCache[fixed];
+            moduleCache[targetLogger] = moduleCache[ownRequire.resolve(loggerPath)];
+            return {
+                result: 'replaced',
+                detail: `ring-client-api loads @eneris/push-receiver ${fixedVersion} instead of ${loadedVersion}`,
+            };
+        }
+        // ring-client-api's copy is already loaded: swap in the fixed decrypt function. The push
+        // client looks it up on every message, so this also covers a client already running.
+        const loaded = ringRequire(decryptPath), fixedDecrypt = ownRequire(decryptPath);
+        if (typeof loaded.default !== 'function' || typeof fixedDecrypt.default !== 'function') {
             return { result: 'failed', detail: 'unexpected @eneris/push-receiver layout' };
         }
-        // push-receiver's client looks this function up on every message, so replacing the
-        // export also covers a client that is already running.
-        loaded.default = fixed.default;
+        loaded.default = fixedDecrypt.default;
         return {
-            result: 'applied',
-            detail: `ring-client-api's @eneris/push-receiver ${loadedVersion} now decrypts with ${fixedVersion}`,
+            result: 'decrypt-patched',
+            detail: `ring-client-api's @eneris/push-receiver ${loadedVersion} was already loaded; it now decrypts with ${fixedVersion}`,
         };
     }
     catch (e) {
         return { result: 'failed', detail: e.message };
     }
 }
+// Runs when this module is first imported, before ring-client-api is loaded.
+export const pushReceiverFix = applyPushReceiverFix();

package/lib/ring-platform.js

@@ -1,3 +1,6 @@
+// Already applied by index.ts before this module (and so ring-client-api) is loaded; read here
+// for the log line.
+import { pushReceiverFix } from "./push-receiver-fix.js";
 import { RingApi, RingCamera, RingChime, RingDevice, RingDeviceCategory, RingDeviceType, RingIntercom, } from 'ring-client-api';
 import { hap } from "./hap.js";
 import { SecurityPanel } from "./security-panel.js";
@@ -29,7 +32,6 @@ import { Intercom } from "./intercom.js";
 import { Valve } from "./valve.js";
 import { normalizeMediaConfig } from "./media-config.js";
 import { configureHksvResourceGovernor } from "./hksv-work-queue.js";
-import { applyPushReceiverDecryptFix } from "./push-receiver-fix.js";
 import { getMotionNotificationSensorUuid, setUpMotionNotificationSensor, } from "./motion-notification-sensor.js";
 const ignoreHiddenDeviceTypes = [
     RingDeviceType.RingNetAdapter,
@@ -172,12 +174,11 @@ export class RingPlatform {
                 },
             });
         }
-        const pushFix = applyPushReceiverDecryptFix();
-        if (pushFix.result === 'failed') {
-            this.log.warn(`Could not fix Ring push decryption (${pushFix.detail}); instant motion and doorbell events may not arrive`);
+        if (pushReceiverFix.result === 'failed') {
+            this.log.warn(`Could not fix Ring push notifications (${pushReceiverFix.detail}); instant motion and doorbell events may not arrive`);
         }
         else {
-            this.log.debug(`Ring push decryption: ${pushFix.detail}`);
+            this.log.info(`Ring push notifications: ${pushReceiverFix.detail}`);
         }
         config.cameraStatusPollingSeconds = config.cameraStatusPollingSeconds ?? 20;
         config.locationModePollingSeconds = config.locationModePollingSeconds ?? 20;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ring-secure-video",
-  "displayName": "Homebridge Ring Secure Video",
-  "version": "1.0.0-beta.1",
+  "displayName": "Ring Secure Video",
+  "version": "1.0.0-beta.2",
   "description": "Homebridge plugin for Ring devices with HomeKit Secure Video recording, based on homebridge-ring and homebridge-ring-hksv",
   "type": "module",
   "main": "./lib/index.js",