Files

znetsixe 0a4b52f517 feat(registry): AssetResolver + diffuser supplier curves (Jäger / Aerostrip / PIK / PRK)

Two related changes bundled together because the diffuser curve files
only make sense once the registry namespace they live in exists.

src/registry — new asset-metadata resolver:
- AssetResolver with synchronous resolve(namespace, id) + lazy cache,
  async refresh() for future remote pulls.
- FileBackend (per-id or single-file layouts, case-insensitive) and a
  stub HttpBackend (disabled unless EVOLV_ASSET_REMOTE=1).
- Namespaces: curves, menu, monsterSamples, monsterSpecs, units. Menu
  namespace re-keys by inner softwareType + filename so editors that
  pass either string resolve to the same tree.
- README explains how to add a namespace.
- AssetCategoryManager (datasets/assetData/index.js) becomes a thin
  facade over the resolver so existing consumers don't move.
- 246/246 tests pass — including the 39-test registry suite.

datasets/assetData — file moves + new diffuser data:
- modelData/*.json deleted; curves/*.json is the canonical home.
- New diffuser.json menu tree with GVA, Jäger, Aquaconsult/Entec,
  PIK/PRK suppliers.
- gva-elastox-r.json migrated from the inline _loadSpecs hardcode,
  re-tagged coverageBasis="bottom-coverage-pct" (the legacy 2.4
  elements/m² was a prior mis-conversion; we can't recover the
  original % so it's a single-point curve under key "0").
- jaeger-jetflex-td-65-2-g-epdm-1000.json — extracted from the Jäger
  EPDM-1000mm SSOTE/DWP chart on the data sheet (vector-PDF read).
  SSOTE 8.20→6.40 %/m, DWP 25→48 mbar across Q 2-12 Nm³/h. Single
  coverage (vendor doesn't state test conditions).
- aerostrip-phoenix.json — 4-coverage SOTE family at 4.75 m water
  depth (DD 5/10/15/20 %, flux 10-70 Nm³/h·m²) from the Entec/de
  Winter 2023-11-22 dataset; DWP curve from the 21 % @ 4.05 m chart.
- pik300.json / prk300.json — 5-coverage SOTE + SSOTR (DD 5-25 %)
  with split DWP per model variant, water depth ≈ 4.0 m inferred from
  the SOTE↔SSOTR ratio in the source spreadsheet.

src/configs/diffuser.json:
- New asset.{model, assetTagNumber} block so the editor's selected
  model id survives validation.
- diffuser.density description corrected to "Bottom coverage [%]";
  default 2.4 → 15 (typical fine-bubble install).

src/configs/{rotatingMachine,valve}.json: small alignment edits that
came with the registry phase.

src/menu/asset.js + src/menu/aquonSamples.js: rewritten as facades
over assetResolver, keeping the editor-side cascade behaviour intact.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

2026-05-12 17:12:13 +02:00

2.9 KiB

Raw Blame History

registry — AssetResolver

Single entry point for all asset-side metadata: pump/valve curves, editor menu trees, monster sample codes, unit families, and anything else we add later.

Replaces (will replace, phase-by-phase):

loadCurve(model) → assetResolver.resolve('curves', model)
AssetCategoryManager → assetResolver.resolve('menu', softwareType)
ad-hoc loaders for monsterSamples.json, unitData.json → assetResolver.resolve('monsterSamples'|'units', …)

Surface

const { assetResolver } = require('generalFunctions');

const curve = assetResolver.resolve('curves', 'hidrostal-H05K-S03R');
const tree  = assetResolver.resolve('menu',   'rotatingmachine');
const meta  = assetResolver.resolveAssetMetadata('rotatingmachine', 'hidrostal-H05K-S03R');
// meta → { supplier, type, units, model, raw }

assetResolver.list('curves');       // ['hidrostal-H05K-S03R', 'ECDV', ...]
assetResolver.namespaces();         // ['curves', 'menu', 'monsterSamples', 'units']
await assetResolver.refresh();      // re-pull everything (FileBackend: re-reads disk; HttpBackend: future)

Resolution is synchronous. First call to resolve(namespace, id) warms that namespace's cache; later calls are O(1) map lookups.

Adding a namespace

Create src/registry/namespaces/<name>.js:

const path = require('path');
const FileBackend = require('../backends/FileBackend');

const backend = new FileBackend({
    baseDir: path.resolve(__dirname, '../../../datasets/...'),
    layout: 'per-id',           // or 'single-file'
    caseInsensitive: true,
});

module.exports = {
    name: 'newThing',
    description: 'What this namespace is for',
    loadAll: () => backend.loadAll(),
    refresh: () => backend.refresh(),
};

Backends

FileBackend — reads JSON from disk. Two layouts: per-id (one file per id, filename minus .json is the id) or single-file (one file with an array; pick arrayKey and indexField).
HttpBackend — stub. Disabled unless EVOLV_ASSET_REMOTE=1. Will hold the future WBD product API client; currently throws if invoked. Exists so the resolver contract is backend-agnostic from day one.

Backends are interchangeable per namespace: the namespace file is the declarative join between "what this metadata is" and "where it comes from".

Why sync at runtime

Node-RED node constructors aren't async-friendly. Every consumer that used loadCurve(model) expects a synchronous return. The resolver preserves that contract: cache is warmed lazily (first resolve() call pulls everything), and lookups are O(1) map gets after that. Async refresh() exists for future HttpBackend hydration on a background timer.

Convention: namespace name is the cache key

assetResolver.resolve(namespace, id) lowercases id for the lookup. Old case-mismatched configs (Hidrostal-H05K-S03R vs hidrostal-H05K-S03R) still resolve correctly — same as loadCurve did historically.

2.9 KiB Raw Blame History