homematic-manager 3.0.0-beta.26 → 3.0.0-beta.28

package/node_modules/@homematic-manager/backend/dist/api/backend.js

@@ -392,6 +392,14 @@ export class Backend {
                 return this.#setInstallMode(p[0], p[1], p[2]);
             case 'devices.installMode.get':
                 return Number(await this.#read(p[0], 'getInstallMode', []));
+            case 'devices.installMode.keyMismatch': {
+                // rfd answers the serial as a string; anything else means "none"
+                const serial = await this.#read(p[0], 'getKeyMismatchDevice', [true]);
+                return typeof serial === 'string' ? serial : '';
+            }
+            case 'devices.installMode.tempKey':
+                await this.#write(p[0], 'setTempKey', [p[1]]);
+                return null;
             case 'devices.replaceable':
                 return asDescriptions(await this.#read(p[0], 'listReplaceableDevices', [p[1]]));
             case 'names.get':
@@ -1976,6 +1984,8 @@ export const API_METHOD_NAMES = [
     'devices.installFirmware',
     'devices.installMode.set',
     'devices.installMode.get',
+    'devices.installMode.keyMismatch',
+    'devices.installMode.tempKey',
     'devices.replaceable',
     'names.get',
     'names.set',

package/node_modules/@homematic-manager/backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homematic-manager/backend",
-  "version": "3.0.0-beta.26",
+  "version": "3.0.0-beta.28",
   "type": "module",
   "description": "Homematic Manager backend: XML-RPC/BIN-RPC clients and callback servers, caches, optional ReGa",
   "license": "AGPL-3.0-or-later",

package/node_modules/@homematic-manager/core/dist/api/types.d.ts

@@ -748,7 +748,10 @@ export interface InstallModeOptions {
      * seconds)` with exactly two arguments, `hmipKey` ignored.
      */
     hmipKeyMode?: 'KEY' | 'SGTIN' | 'ANY';
-    /** BidCos: temporary key for `setTempKey`. */
+    /**
+     * BidCos: temporary key for `setTempKey` - the security key (passphrase) of the system the
+     * device was paired to, sent before the install mode or `addDevice`.
+     */
     tempKey?: string;
     /** Restrict to a device address (BidCos `setInstallMode` with address). */
     address?: string;
@@ -899,6 +902,25 @@ export interface ApiMethods {
         params: [interfaceName: string];
         result: number;
     };
+    /**
+     * Task 76: the serial of the last BidCos device rfd refused to pair because it holds a security
+     * key this system does not have (`getKeyMismatchDevice(true)`: read once, then cleared in the
+     * interface process), or `''` when there is none. rfd reports it to nobody, so a client polls
+     * it while its install mode is open, as the CCU WebUI does every five seconds.
+     */
+    'devices.installMode.keyMismatch': {
+        params: [interfaceName: string];
+        result: string;
+    };
+    /**
+     * Task 76: `setTempKey(passphrase)` on its own - the security key of the system a device was
+     * paired to, which rfd uses for the pairings that follow; `''` clears it, so a mistyped key does
+     * not linger for the next pairing. `devices.installMode.set` sends it too when `tempKey` is set.
+     */
+    'devices.installMode.tempKey': {
+        params: [interfaceName: string, key: string];
+        result: null;
+    };
     'devices.replaceable': {
         params: [interfaceName: string, address: string];
         result: DeviceDescription[];

package/node_modules/@homematic-manager/core/dist/i18n/lookup.js

@@ -80,14 +80,25 @@ export class TranslationLookup {
         return undefined;
     }
 }
-/** `CHANNEL_TYPE|SUFFIX` before `SUFFIX`, each as given and upper-cased. */
+/**
+ * `CHANNEL_TYPE|SUFFIX` before `SUFFIX`, each as given and upper-cased - and then the same two
+ * again without a `SHORT_` or `LONG_` prefix (B-75). The string tables label a link's parameters
+ * by the name behind the key press: `ON_TIME`, `JT_ON`, `PROFILE_ACTION_TYPE` are in them,
+ * `SHORT_ON_TIME` and `LONG_ON_TIME` are not - 2.7.1 stripped the prefix for a link's help
+ * texts (homematic-manager.js:3475), and a MASTER parameter that happens to start with one
+ * (`LONG_PRESS_TIME`) still finds its own entry first.
+ */
 function keys(suffix, channelType) {
-    const bare = identifiers(suffix);
-    if (channelType === undefined || channelType === '') {
-        return bare;
-    }
-    const qualified = identifiers(channelType).map((type) => `${type}|${suffix}`);
-    return dedupe([...qualified, ...qualified.map((key) => key.toUpperCase()), ...bare]);
+    const stripped = suffix.replace(/^(?:SHORT|LONG)_/i, '');
+    const forms = stripped === suffix ? [suffix] : [suffix, stripped];
+    return dedupe(forms.flatMap((form) => {
+        const bare = identifiers(form);
+        if (channelType === undefined || channelType === '') {
+            return bare;
+        }
+        const qualified = identifiers(channelType).map((type) => `${type}|${form}`);
+        return [...qualified, ...qualified.map((key) => key.toUpperCase()), ...bare];
+    }));
 }
 /** The key as it was given, plus its upper-case form where that differs. */
 function identifiers(value) {

package/node_modules/@homematic-manager/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homematic-manager/core",
-  "version": "3.0.0-beta.26",
+  "version": "3.0.0-beta.28",
   "type": "module",
   "description": "Pure domain logic of the Homematic Manager: no I/O, no DOM",
   "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homematic-manager",
-  "version": "3.0.0-beta.26",
+  "version": "3.0.0-beta.28",
   "type": "module",
   "description": "Configure and administer Homematic and HomematicIP devices - devices and channels, direct links, paramsets, RSSI, service messages, events and an RPC console - from a local HTTP/WebSocket server that also serves the web UI",
   "keywords": [
@@ -67,8 +67,8 @@
     "hm-simulator": "^1.0.0"
   },
   "dependencies": {
-    "@homematic-manager/backend": "3.0.0-beta.26",
-    "@homematic-manager/core": "3.0.0-beta.26",
+    "@homematic-manager/backend": "3.0.0-beta.28",
+    "@homematic-manager/core": "3.0.0-beta.28",
     "binrpc": "^4.2.0",
     "homematic-rega": "^2.0.0",
     "homematic-xmlrpc": "^2.0.0",