homematic-manager 3.0.0-beta.30 → 3.0.0-beta.31

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

@@ -1,6 +1,6 @@
 {
   "name": "@homematic-manager/backend",
-  "version": "3.0.0-beta.30",
+  "version": "3.0.0-beta.31",
   "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/easymodes/engine.d.ts

@@ -143,9 +143,22 @@ export declare class EasyModeEngine {
      */
     applyProfile(profile: LinkProfile, current: Paramset, description: ParamsetDescription, options?: ApplyProfileOptions): AppliedProfile;
     /**
-     * Which profile a link paramset currently follows: by `UI_HINT` when the CCU wrote one,
-     * otherwise by matching the profiles' `fixed` parameters against the current values - the more
-     * fixed parameters a profile matches, the better the fit.
+     * Which profile a link paramset currently follows, the way the WebUI's `get_cur_profile2`
+     * decides it: a profile fits when every parameter it names holds on the link - a `fixed` value
+     * equal, a `list` value one of its values, a `range` value inside it - leaving out the
+     * parameters the link does not have (B-59, "Gibt es diesen Parameter im Aktor überhaupt?").
+     *
+     * B-77: only the `fixed` parameters used to count, and the profile with the most of them won.
+     * The profiles of one channel pair often differ only in their lists - an HmIP switch's
+     * "Schalter ein" and "Schalter ein / aus" differ in the jump table (`*_JT_ON` 1/3 or 4/6) -
+     * so a toggle link was shown as "switch on", which has more fixed parameters.
+     *
+     * Order: `UI_HINT` when its profile fits (`0`, the expert view, is taken as it is); otherwise
+     * the fitting profile the link has the most named parameters of, then the one with more fixed
+     * parameters (a staircase light is a "switch on" with a fixed time: the more specific one), then
+     * the one that lacks fewer, then the lower id - the WebUI takes the first fitting one by id, and
+     * where only one fits, as for B-77's pair, the two agree; last a `UI_HINT` whose profile no
+     * longer fits, as before.
      *
      * `undefined` means "none of them"; the caller then shows the expert view.
      */

package/node_modules/@homematic-manager/core/dist/easymodes/engine.js

@@ -153,43 +153,43 @@ export class EasyModeEngine {
         return { values, problems };
     }
     /**
-     * Which profile a link paramset currently follows: by `UI_HINT` when the CCU wrote one,
-     * otherwise by matching the profiles' `fixed` parameters against the current values - the more
-     * fixed parameters a profile matches, the better the fit.
+     * Which profile a link paramset currently follows, the way the WebUI's `get_cur_profile2`
+     * decides it: a profile fits when every parameter it names holds on the link - a `fixed` value
+     * equal, a `list` value one of its values, a `range` value inside it - leaving out the
+     * parameters the link does not have (B-59, "Gibt es diesen Parameter im Aktor überhaupt?").
+     *
+     * B-77: only the `fixed` parameters used to count, and the profile with the most of them won.
+     * The profiles of one channel pair often differ only in their lists - an HmIP switch's
+     * "Schalter ein" and "Schalter ein / aus" differ in the jump table (`*_JT_ON` 1/3 or 4/6) -
+     * so a toggle link was shown as "switch on", which has more fixed parameters.
+     *
+     * Order: `UI_HINT` when its profile fits (`0`, the expert view, is taken as it is); otherwise
+     * the fitting profile the link has the most named parameters of, then the one with more fixed
+     * parameters (a staircase light is a "switch on" with a fixed time: the more specific one), then
+     * the one that lacks fewer, then the lower id - the WebUI takes the first fitting one by id, and
+     * where only one fits, as for B-77's pair, the two agree; last a `UI_HINT` whose profile no
+     * longer fits, as before.
      *
      * `undefined` means "none of them"; the caller then shows the expert view.
      */
     detectProfile(linkParamset, profiles) {
         const hint = linkParamset[UI_HINT];
-        if (hint !== undefined && hint !== '') {
-            const byHint = profiles.find((profile) => String(profile.id) === String(hint));
-            if (byHint) {
-                return byHint;
-            }
+        const byHint = hint === undefined || hint === ''
+            ? undefined
+            : profiles.find((profile) => String(profile.id) === String(hint));
+        if (byHint && (byHint.id === EXPERT_PROFILE_ID || profileFits(byHint, linkParamset) !== undefined)) {
+            return byHint;
         }
         let best;
-        let bestScore = 0;
-        let bestMissing = 0;
-        for (const profile of profiles) {
-            const all = Object.entries(profile.params).filter((entry) => entry[1].kind === 'fixed');
-            // B-59: a parameter the link does not have (this firmware lacks it) is left out, as the
-            // WebUI's get_cur_profile2 does ("Gibt es diesen Parameter im Aktor überhaupt?")
-            const fixed = all.filter(([param]) => param in linkParamset);
-            const missing = all.length - fixed.length;
-            if (fixed.length === 0) {
-                continue;
-            }
-            if (!fixed.every(([param, constraint]) => sameProfileValue(linkParamset[param], constraint.value))) {
-                continue;
-            }
-            // the most fixed parameters matched; on a tie the profile that asks for less the link lacks
-            if (fixed.length > bestScore || (fixed.length === bestScore && missing < bestMissing)) {
-                bestScore = fixed.length;
-                bestMissing = missing;
+        let bestFit;
+        for (const profile of [...profiles].sort((a, b) => a.id - b.id)) {
+            const fit = profileFits(profile, linkParamset);
+            if (fit !== undefined && betterFit(fit, bestFit)) {
+                bestFit = fit;
                 best = profile;
             }
         }
-        return best;
+        return best ?? byHint;
     }
     /**
      * The MASTER paramset of a channel type as the dialog should show it: ordered, with the
@@ -250,6 +250,58 @@ export function resolveAlias(receiverType, aliases) {
     }
     return current;
 }
+/**
+ * Whether every parameter a profile names holds on the link, as `get_cur_profile2` checks it, and
+ * how many of them the link has and lacks. `undefined` when one does not hold, or when the link
+ * has none of them (the expert profile, or a profile of another firmware).
+ */
+function profileFits(profile, linkParamset) {
+    let present = 0;
+    let fixed = 0;
+    let missing = 0;
+    for (const [param, constraint] of Object.entries(profile.params)) {
+        if (!(param in linkParamset)) {
+            missing += 1;
+            continue;
+        }
+        if (!constraintHolds(constraint, linkParamset[param])) {
+            return undefined;
+        }
+        present += 1;
+        if (constraint.kind === 'fixed') {
+            fixed += 1;
+        }
+    }
+    return present === 0 ? undefined : { present, fixed, missing };
+}
+/** Whether a fit is the better one: more named parameters, then more fixed ones, then fewer lacking. */
+function betterFit(fit, best) {
+    if (best === undefined)
+        return true;
+    if (fit.present !== best.present)
+        return fit.present > best.present;
+    if (fit.fixed !== best.fixed)
+        return fit.fixed > best.fixed;
+    return fit.missing < best.missing;
+}
+function constraintHolds(constraint, value) {
+    switch (constraint.kind) {
+        case 'fixed':
+            return sameProfileValue(value, constraint.value);
+        case 'list':
+            return constraint.values.some((entry) => sameProfileValue(value, entry));
+        case 'range': {
+            const number = Number(value);
+            // an enum name where the range counts indices cannot be judged here; it rules nothing out
+            if (value === '' || Number.isNaN(number)) {
+                return true;
+            }
+            // the WebUI also accepts the range's default outside it: `{31 range 0 - 7}` of an HmIP
+            // "Schalter aus" holds for 31, because its last check compares against the first element
+            return (number >= constraint.min && number <= constraint.max) || number === constraint.default;
+        }
+    }
+}
 function applyConstraint(constraint, current) {
     switch (constraint.kind) {
         case 'fixed':

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

@@ -1,6 +1,6 @@
 {
   "name": "@homematic-manager/core",
-  "version": "3.0.0-beta.30",
+  "version": "3.0.0-beta.31",
   "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.30",
+  "version": "3.0.0-beta.31",
   "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.1.0"
   },
   "dependencies": {
-    "@homematic-manager/backend": "3.0.0-beta.30",
-    "@homematic-manager/core": "3.0.0-beta.30",
+    "@homematic-manager/backend": "3.0.0-beta.31",
+    "@homematic-manager/core": "3.0.0-beta.31",
     "binrpc": "^4.2.0",
     "homematic-rega": "^2.0.0",
     "homematic-xmlrpc": "^2.0.0",