@kosdev-code/kos-dispense-sdk 2.0.42 → 2.0.44

package/{dispense-registration-manager-DZWwSdsc.js → dispense-registration-manager-B6nEgoFC.js}

@@ -1,66 +1,66 @@
 var pt = Object.defineProperty;
 var ut = (e, t, r) => t in e ? pt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
 var o = (e, t, r) => (ut(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { kosModel as I, Kos as b, isKosModel as v, resolveServiceUrl as S, ServiceFactory as C, KosLog as f, KosModelContainer as R, KosExtensionUtils as N, kosChild as M, FetchError as gt, ExtensionManager as g, EXTENSION_TROUBLE_MAPPER as Me, EXTENSION_TROUBLE_DATA_MAPPER as W, getKosModelSync as z, kosDependency as ce, TroubleContainer as xe, troubleByTypeReducer as Ae, kosAction as h, kosTopicHandler as Q, DependencyLifecycle as Be, getKosModel as Ue, FutureManager as pe, kosFuture as ue, FutureHandler as Ge, EXTENSION_FEATURE_FLAG_RESOLVER as ht, isKosDataModel as yt, ChildModels as It, KosFeatureFlags as mt, kosParentAware as ft, createPropKey as Pt, MultipleFutureHandler as bt, arraysEqual as vt, getAllKosCompanionModels as E, EventBus as _, KosContextManager as _t, destroyKosModel as Mt, SingletonKosModelRegistrationFactory as Ot, KosModelRegistrationFactory as Et, KosModelRegistry as wt, RegistrationManager as O, registerCoreModels as $t, registerLegacyModel as St } from "@kosdev-code/kos-ui-sdk";
+import { kosModel as I, Kos as v, isKosModel as P, resolveServiceUrl as S, ServiceFactory as C, KosLog as m, KosModelContainer as R, KosExtensionUtils as T, kosChild as M, FetchError as gt, ExtensionManager as g, EXTENSION_TROUBLE_MAPPER as Me, EXTENSION_TROUBLE_DATA_MAPPER as W, getKosModelSync as N, kosDependency as ce, TroubleContainer as xe, troubleByTypeReducer as Ae, kosAction as h, kosTopicHandler as Q, DependencyLifecycle as Be, getKosModel as Ue, FutureManager as pe, kosFuture as ue, FutureHandler as Ge, EXTENSION_FEATURE_FLAG_RESOLVER as ht, isKosDataModel as yt, ChildModels as It, KosFeatureFlags as ft, kosParentAware as mt, createPropKey as bt, MultipleFutureHandler as vt, arraysEqual as Pt, getAllKosCompanionModels as E, EventBus as _, KosContextManager as _t, destroyKosModel as Mt, SingletonKosModelRegistrationFactory as Ot, KosModelRegistrationFactory as Et, KosModelRegistry as wt, RegistrationManager as O, registerCoreModels as $t, registerLegacyModel as St } from "@kosdev-code/kos-ui-sdk";
 import "react";
-var u = /* @__PURE__ */ ((e) => (e.IngredientLoader = "kos.ingredient.loader", e.IngredientMapper = "kos.ingredient.mapper", e.IngredientIndex = "kos.ingredient.index", e.IngredientTypeMapper = "kos.ingredient.type.mapper", e.HolderTypeMapper = "kos.holder.type.mapper", e.HolderMapper = "kos.holder.mapper", e.HolderIndex = "kos.holder.index", e.HolderIngredientMapper = "kos.holder.ingredient.mapper", e.AvailabilityMapper = "kos.availability.mapper", e.AvailabilityLoader = "kos.availability.loader", e.SelectedPourableMapper = "kos.selected.pourable.mapper", e.AssemblyMapper = "kos.assembly.mapper", e.BoardMapper = "kos.board.mapper", e.BoardIndex = "kos.board.index", e.PumpIndex = "kos.pump.index", e.AssemblyFeatureFlags = "kos.assembly.feature.flags", e))(u || {}), D = /* @__PURE__ */ ((e) => (e.Nozzle = "nozzle-model", e.Availability = "availability-model", e.Holder = "holder-model", e.HolderContainer = "holder-container-model", e.IngredientContainer = "ingredient-container-model", e.Ingredient = "ingredient-model", e.Pump = "pump-model", e.PumpContainer = "pump-container-model", e))(D || {}), Ct = Object.getOwnPropertyDescriptor, Rt = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Ct(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (i = n(i) || i);
+var u = /* @__PURE__ */ ((e) => (e.IngredientLoader = "kos.ingredient.loader", e.IngredientMapper = "kos.ingredient.mapper", e.IngredientIndex = "kos.ingredient.index", e.IngredientTypeMapper = "kos.ingredient.type.mapper", e.HolderTypeMapper = "kos.holder.type.mapper", e.HolderMapper = "kos.holder.mapper", e.HolderIndex = "kos.holder.index", e.HolderIngredientMapper = "kos.holder.ingredient.mapper", e.AvailabilityMapper = "kos.availability.mapper", e.AvailabilityLoader = "kos.availability.loader", e.SelectedPourableMapper = "kos.selected.pourable.mapper", e.AssemblyMapper = "kos.assembly.mapper", e.BoardMapper = "kos.board.mapper", e.BoardIndex = "kos.board.index", e.PumpIndex = "kos.pump.index", e.AssemblyFeatureFlags = "kos.assembly.feature.flags", e))(u || {}), z = /* @__PURE__ */ ((e) => (e.Nozzle = "nozzle-model", e.Availability = "availability-model", e.Holder = "holder-model", e.HolderContainer = "holder-container-model", e.IngredientContainer = "ingredient-container-model", e.Ingredient = "ingredient-model", e.Pump = "pump-model", e.PumpContainer = "pump-container-model", e))(z || {}), Ct = Object.getOwnPropertyDescriptor, Rt = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Ct(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = n(i) || i);
   return i;
 };
 const G = "ingredient-model";
-let Pe = class {
+let be = class {
   constructor(e, {
     name: t,
     type: r,
-    data: s,
+    data: a,
     ingredientId: i,
-    ...a
+    ...s
   }) {
     o(this, "id");
     o(this, "ingredientId");
     o(this, "name");
     o(this, "type");
     o(this, "data");
-    this.id = e, this.ingredientId = i, this.name = t, this.type = r, this.data = s, Object.assign(this, a);
+    this.id = e, this.ingredientId = i, this.name = t, this.type = r, this.data = a, Object.assign(this, s);
   }
   updateModel({
     name: e,
     type: t,
     data: r,
-    ingredientId: s,
+    ingredientId: a,
     ...i
   }) {
-    this.name = e, this.type = t, this.ingredientId = s, this.data = r, Object.assign(this, i);
+    this.name = e, this.type = t, this.ingredientId = a, this.data = r, Object.assign(this, i);
   }
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-Pe = Rt([
+be = Rt([
   I(G)
-], Pe);
+], be);
 const je = {
   registration: {
     [G]: {
-      class: Pe,
+      class: be,
       singleton: !1
     }
   },
   type: G,
-  predicate: v(G),
-  factory: b.Factory.create(G)
-}, { URL: Fe } = S("INGREDIENT_SERVICE"), { getOne: Dt } = C.build({
+  predicate: P(G),
+  factory: v.Factory.create(G)
+}, { URL: Fe } = S("INGREDIENT_SERVICE"), { getOne: zt } = C.build({
   basePath: `${Fe}/api/ext/dispense/ingredients`
-}), Tt = async () => await Dt({
+}), Dt = async () => await zt({
   urlOverride: `${Fe}/api/ext/dispense/ingredients`
 });
-var Nt = Object.defineProperty, zt = Object.getOwnPropertyDescriptor, He = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? zt(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && Nt(t, r, i), i;
+var Tt = Object.defineProperty, Nt = Object.getOwnPropertyDescriptor, He = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Nt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Tt(t, r, i), i;
 };
-const j = "ingredient-container-model", Lt = f.createLogger({ name: "ingredient-container-model" });
-let se = class {
+const j = "ingredient-container-model", Lt = m.createLogger({ name: "ingredient-container-model" });
+let ae = class {
   constructor(e, t) {
     o(this, "id");
     o(this, "ingredients");
@@ -81,28 +81,28 @@ let se = class {
   async load(e) {
     var i;
     Lt.debug(`loading ingredient container ${this.id}`);
-    const t = await Tt();
+    const t = await Dt();
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load ingredients");
-    const r = await N.executeLoaderExtension({
+    const r = await T.executeLoaderExtension({
       context: e,
       extension: u.IngredientLoader
-    }), s = (t == null ? void 0 : t.data) ?? {};
-    for (const a of Object.keys(s))
-      for (const n of ((i = t == null ? void 0 : t.data) == null ? void 0 : i[a]) || []) {
-        const c = await N.executeDataMapperExtension({
+    }), a = (t == null ? void 0 : t.data) ?? {};
+    for (const s of Object.keys(a))
+      for (const n of ((i = t == null ? void 0 : t.data) == null ? void 0 : i[s]) || []) {
+        const l = await T.executeDataMapperExtension({
           extension: u.IngredientMapper,
           data: n,
           contextData: r
-        }), l = await N.executePropertyMapperExtension({
+        }), c = await T.executePropertyMapperExtension({
           extension: u.IngredientTypeMapper,
           data: n,
           contextData: r
         }), p = {
           ...n,
-          type: l || n.type,
-          ...c,
-          data: c
+          type: c || n.type,
+          ...l,
+          data: l
         }, y = je.factory(n.id)(
           p
         );
@@ -113,23 +113,23 @@ let se = class {
 };
 He([
   M
-], se.prototype, "ingredients", 2);
-se = He([
+], ae.prototype, "ingredients", 2);
+ae = He([
   I(j)
-], se);
+], ae);
 const Ke = {
   registration: {
     [j]: {
-      class: se,
+      class: ae,
       singleton: !0
     }
   },
   type: j,
-  predicate: v(j),
-  factory: b.Singleton.create(j)
+  predicate: P(j),
+  factory: v.Singleton.create(j)
 }, { URL: ge } = S("HOLDER_SERVICE"), { getAll: xt, postModel: Ve, deleteModel: At } = C.build({
   basePath: `${ge}/api/kos/holders`
-}), Bt = f.createLogger({
+}), Bt = m.createLogger({
   name: "holder-service",
   group: "Services"
 }), ri = async () => await xt({}), Ut = async (e, t) => {
@@ -155,40 +155,40 @@ const Ke = {
     model: {},
     urlOverride: `${ge}/api/ext/dispense/pumpEvents/replaceLine/${e}`
   });
-}, { URL: ae } = S("ASSIGNMENT_SERVICE"), { getAll: Ft, postModel: ke, deleteModel: Ht } = C.build({
+}, { URL: se } = S("ASSIGNMENT_SERVICE"), { getAll: Ft, postModel: ke, deleteModel: Ht } = C.build({
   destinationAddress: "",
-  basePath: `${ae}/api/ext/dispense/assignments`
+  basePath: `${se}/api/ext/dispense/assignments`
 }), ne = window.kosUseFos, ii = async () => await Ft({ fos: ne }), Kt = async (e, t) => {
-  var i, a, n, c;
-  const r = JSON.stringify(t), s = `${ae}/api/ext/dispense/assignments`;
+  var i, s, n, l;
+  const r = JSON.stringify(t), a = `${se}/api/ext/dispense/assignments`;
   try {
-    const l = await ke({
+    const c = await ke({
       model: { holderPath: e, factoryJson: r },
-      urlOverride: s
+      urlOverride: a
     });
-    return (l == null ? void 0 : l.status) === 200 && ((i = l == null ? void 0 : l.data) != null && i.error) ? [l.data.error || "unknownError", l.data] : [void 0, l == null ? void 0 : l.data];
-  } catch (l) {
-    if (l instanceof gt)
+    return (c == null ? void 0 : c.status) === 200 && ((i = c == null ? void 0 : c.data) != null && i.error) ? [c.data.error || "unknownError", c.data] : [void 0, c == null ? void 0 : c.data];
+  } catch (c) {
+    if (c instanceof gt)
       return [
-        ((n = (a = l.payload) == null ? void 0 : a.data) == null ? void 0 : n.error) || "unknownError",
-        (c = l.payload) == null ? void 0 : c.data
+        ((n = (s = c.payload) == null ? void 0 : s.data) == null ? void 0 : n.error) || "unknownError",
+        (l = c.payload) == null ? void 0 : l.data
       ];
   }
   return ["unknownError", void 0];
-}, si = async (e) => {
-  const t = ne ? `${ae}/api/ingredients/assignments/${e.holderPath}` : `${ae}/api/ext/dispense/assignments`;
+}, ai = async (e) => {
+  const t = ne ? `${se}/api/ingredients/assignments/${e.holderPath}` : `${se}/api/ext/dispense/assignments`;
   return await ke({
     model: { ...e, fuelGauge: 680 },
     fos: ne,
     urlOverride: t
   });
-}, ai = async (e) => await Ht({ id: e, fos: ne });
-var Vt = Object.defineProperty, kt = Object.getOwnPropertyDescriptor, he = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? kt(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && Vt(t, r, i), i;
+}, si = async (e) => await Ht({ id: e, fos: ne });
+var Vt = Object.defineProperty, kt = Object.getOwnPropertyDescriptor, he = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? kt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Vt(t, r, i), i;
 };
-const F = D.Holder, De = f.createLogger({ name: "holder-model" });
+const F = z.Holder, ze = m.createLogger({ name: "holder-model" });
 g[Me].register(
   "holder",
   async (e) => {
@@ -200,11 +200,11 @@ g[W].register(
   "pump",
   async (e) => {
     if (e.data.pumpPath) {
-      const { model: t } = z(
+      const { model: t } = N(
         e.data.pumpPath
       );
       if (t) {
-        const r = t.ingredientId ? z(t.ingredientId).model : void 0;
+        const r = t.ingredientId ? N(t.ingredientId).model : void 0;
         return {
           ingredientId: t.ingredientId,
           ingredientName: (r == null ? void 0 : r.displayName) ?? ((r == null ? void 0 : r.name) || ""),
@@ -225,7 +225,7 @@ g[W].register(
   "container",
   async (e) => {
     if (e.data.ingredients.length > 0) {
-      const t = e.data.ingredients[0], { model: r } = z(t);
+      const t = e.data.ingredients[0], { model: r } = N(t);
       return {
         ingredientName: (r == null ? void 0 : r.displayName) ?? ((r == null ? void 0 : r.name) || ""),
         ingredients: e.data.ingredients ? e.data.ingredients : [],
@@ -236,8 +236,8 @@ g[W].register(
   }
 );
 class Yt extends Error {
-  constructor(r, s) {
-    super(s);
+  constructor(r, a) {
+    super(a);
     o(this, "type");
     this.name = "AssignmentError", this.type = r;
   }
@@ -246,12 +246,12 @@ let L = class {
   constructor(e, {
     path: t,
     name: r,
-    ingredientSource: s,
+    ingredientSource: a,
     ingredientId: i,
-    ingredientType: a,
+    ingredientType: s,
     slice: n,
-    group: c,
-    data: l,
+    group: l,
+    data: c,
     enjoyByDate: p
   }, y) {
     o(this, "id");
@@ -268,7 +268,7 @@ let L = class {
     o(this, "pumps");
     o(this, "ingredientContainer");
     o(this, "troubleContainer");
-    this.id = e, this.path = t, this.name = r, this.ingredientType = a, this.ingredientSource = s, this.ingredientId = i, this.group = c, this.slice = n, this.enjoyByDate = p, this.data = l, this.pumps = new R({
+    this.id = e, this.path = t, this.name = r, this.ingredientType = s, this.ingredientSource = a, this.ingredientId = i, this.group = l, this.slice = n, this.enjoyByDate = p, this.data = c, this.pumps = new R({
       parentId: e,
       sortKey: "path"
     }), this.logger = y.logger;
@@ -277,14 +277,14 @@ let L = class {
     path: e,
     name: t,
     ingredientSource: r,
-    ingredientId: s,
+    ingredientId: a,
     ingredientType: i,
-    group: a,
+    group: s,
     slice: n,
-    enjoyByDate: c,
-    data: l
+    enjoyByDate: l,
+    data: c
   }) {
-    this.path = e, this.name = t, this.ingredientId = s, this.ingredientType = i, this.ingredientSource = r, this.enjoyByDate = c, this.slice = n, this.group = a, this.data = l;
+    this.path = e, this.name = t, this.ingredientId = a, this.ingredientType = i, this.ingredientSource = r, this.enjoyByDate = l, this.slice = n, this.group = s, this.data = c;
   }
   get hasEnjoyByDate() {
     return !!this.enjoyByDate && !this.unassigned;
@@ -309,8 +309,8 @@ let L = class {
     return this.logger.debug(`isPouring: ${!!e}`), e;
   }
   async performIntent(e) {
-    const t = typeof e == "string" ? e : e.intent, r = typeof e == "string" ? void 0 : e.pumpPath, s = r ? this.pumps.getModel(r) : this.pumps.data[0];
-    return s == null ? void 0 : s.performIntent({ intent: t });
+    const t = typeof e == "string" ? e : e.intent, r = typeof e == "string" ? void 0 : e.pumpPath, a = r ? this.pumps.getModel(r) : this.pumps.data[0];
+    return a == null ? void 0 : a.performIntent({ intent: t });
   }
   get pourState() {
     return this.pumps.data.reduce((t, r) => r.pouringState ? r.pouringState : t, "");
@@ -406,7 +406,7 @@ let L = class {
         this.ingredientId = r == null ? void 0 : r.ingredientId;
       }), r;
     } catch (t) {
-      throw De.error(`Failed to perform rfid override on holder ${this.id}`, t), t;
+      throw ze.error(`Failed to perform rfid override on holder ${this.id}`, t), t;
     }
   }
   async assignIngredient(e) {
@@ -415,7 +415,7 @@ let L = class {
         this.ingredientId = e;
       });
     } catch (t) {
-      throw De.error(`Failed to perform assign ingredient to holder ${this.id}`, t), t;
+      throw ze.error(`Failed to perform assign ingredient to holder ${this.id}`, t), t;
     }
   }
   get shouldDefer() {
@@ -464,42 +464,42 @@ const Ye = {
     }
   },
   type: F,
-  predicate: v(F),
-  factory: b.Factory.create(F)
+  predicate: P(F),
+  factory: v.Factory.create(F)
 }, Zt = async (e, t) => {
   var Re;
   const r = g.propertyMapper.executeMapper(
     u.HolderIngredientMapper,
     t
-  ), s = g.propertyMapper.executeMapper(
+  ), a = g.propertyMapper.executeMapper(
     u.HolderTypeMapper,
     t
-  ) || t.ingType, i = await N.executeDataMapperExtension({
+  ) || t.ingType, i = await T.executeDataMapperExtension({
     extension: u.HolderMapper,
     data: t,
     contextData: {}
-  }), { name: a, path: n, ingredientId: c, ingType: l, ingSource: p, slice: y, ...U } = t, m = { ...U, ...i }, T = y || { pos: 0 }, re = {
-    name: a,
+  }), { name: s, path: n, ingredientId: l, ingType: c, ingSource: p, slice: y, ...U } = t, f = { ...U, ...i }, D = y || { pos: 0 }, re = {
+    name: s,
     path: n,
-    ingredientId: r || c,
-    ingredientType: s || l,
+    ingredientId: r || l,
+    ingredientType: a || c,
     ingredientSource: p,
     enjoyByDate: (Re = t.container) != null && Re.enjoyByDate ? new Date(t.container.enjoyByDate) : void 0,
-    slice: T,
+    slice: D,
     group: e,
-    data: m
+    data: f
   };
   return Ye.factory(t.path)(re);
 }, { URL: Xt } = S("ASSEMBLY_SERVICE"), { getOne: Jt } = C.build({
   basePath: `${Xt}/api/kos/device/assemblies`
-}), qt = f.createLogger({
+}), qt = m.createLogger({
   name: "assembly-service",
   group: "Services"
 }), Ze = async () => (qt.debug("sending GET for assembly"), await Jt({}));
-var Wt = Object.defineProperty, Qt = Object.getOwnPropertyDescriptor, ye = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Qt(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && Wt(t, r, i), i;
+var Wt = Object.defineProperty, Qt = Object.getOwnPropertyDescriptor, ye = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Qt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Wt(t, r, i), i;
 };
 const H = "board-container-model", Xe = "/kos/hardware/board/linked", Je = "/kos/hardware/board/unlinked";
 let x = class {
@@ -561,17 +561,17 @@ x = ye([
   I(H)
 ], x);
 const er = async (e) => {
-  const t = e.data.boardPath, { model: r } = z(t);
+  const t = e.data.boardPath, { model: r } = N(t);
   return {
     boardName: (r == null ? void 0 : r.name) || ""
   };
 };
-var tr = Object.defineProperty, rr = Object.getOwnPropertyDescriptor, qe = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? rr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && tr(t, r, i), i;
+var tr = Object.defineProperty, rr = Object.getOwnPropertyDescriptor, qe = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? rr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && tr(t, r, i), i;
 };
-const K = D.PumpContainer;
+const K = z.PumpContainer;
 var We = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(We || {});
 let oe = class {
   constructor(e, t) {
@@ -635,8 +635,8 @@ const Oe = {
     }
   },
   type: K,
-  predicate: v(K),
-  factory: b.Singleton.create(
+  predicate: P(K),
+  factory: v.Singleton.create(
     K
   )
 }, Qe = async (e) => {
@@ -645,45 +645,45 @@ const Oe = {
 }, ir = async (e) => {
   const t = [], r = e.data.pumpPath;
   t.push(r);
-  const s = await Qe(r);
-  return [...t, ...s];
-}, sr = async (e) => {
+  const a = await Qe(r);
+  return [...t, ...a];
+}, ar = async (e) => {
   const t = [], r = e.data.boardPath;
   t.push(e.data.boardPath);
-  const s = await Ue(
+  const a = await Ue(
     Oe.type
   );
-  if (s != null && s.model) {
-    const a = s.model.models.getIndexByKey(
+  if (a != null && a.model) {
+    const s = a.model.models.getIndexByKey(
       We.byBoard,
       r
     ).map(
-      (c) => Qe(c.path)
+      (l) => Qe(l.path)
     );
-    (await Promise.allSettled(a)).forEach((c) => {
-      c.status === "fulfilled" && c.value.forEach((l) => t.push(l));
+    (await Promise.allSettled(s)).forEach((l) => {
+      l.status === "fulfilled" && l.value.forEach((c) => t.push(c));
     });
   }
   return Array.from(new Set(t));
 };
-var ar = Object.getOwnPropertyDescriptor, nr = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? ar(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (i = n(i) || i);
+var sr = Object.getOwnPropertyDescriptor, nr = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? sr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = n(i) || i);
   return i;
 };
-const V = "board-model", Te = (e, t) => {
-  const { type: r, name: s, path: i, linked: a, instanceId: n, link: c, ...l } = e;
-  t.type = r, t.name = s, t.path = i, t.linked = a, t.link = Object.freeze(c), t.instanceId = n, Object.assign(t, l);
+const V = "board-model", De = (e, t) => {
+  const { type: r, name: a, path: i, linked: s, instanceId: n, link: l, ...c } = e;
+  t.type = r, t.name = a, t.path = i, t.linked = s, t.link = Object.freeze(l), t.instanceId = n, Object.assign(t, c);
 };
 g[Me].register(
   "board",
-  sr
+  ar
 );
 g[W].register(
   "board",
   er
 );
-let be = class {
+let ve = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "type");
@@ -692,10 +692,10 @@ let be = class {
     o(this, "linked");
     o(this, "instanceId");
     o(this, "logger");
-    this.id = e, this.logger = r.logger, Te(t, this);
+    this.id = e, this.logger = r.logger, De(t, this);
   }
   updateModel(e) {
-    Te(e, this);
+    De(e, this);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -705,19 +705,19 @@ let be = class {
     this.logger.debug(`loading board ${this.id}`);
   }
 };
-be = nr([
+ve = nr([
   I(V)
-], be);
+], ve);
 const et = {
   registration: {
     [V]: {
-      class: be,
+      class: ve,
       singleton: !1
     }
   },
   type: V,
-  predicate: v(V),
-  factory: b.Factory.create(V)
+  predicate: P(V),
+  factory: v.Factory.create(V)
 }, tt = {
   registration: {
     [H]: {
@@ -727,17 +727,17 @@ const et = {
     ...et.registration
   },
   type: H,
-  predicate: v(H),
-  factory: b.Singleton.create(
+  predicate: P(H),
+  factory: v.Singleton.create(
     H
   )
 };
-var or = Object.defineProperty, dr = Object.getOwnPropertyDescriptor, Ie = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? dr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && or(t, r, i), i;
+var or = Object.defineProperty, dr = Object.getOwnPropertyDescriptor, Ie = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? dr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && or(t, r, i), i;
 };
-const k = D.HolderContainer, lr = "/kos/insertion/insert/start", cr = "/kos/insertion/insert/complete", pr = "/kos/insertion/insert/update", ur = "/kos/insertion/remove", gr = "/kos/pumpEvent/replaceLine", hr = "/kos/handle/*";
+const k = z.HolderContainer, lr = "/kos/insertion/insert/start", cr = "/kos/insertion/insert/complete", pr = "/kos/insertion/insert/update", ur = "/kos/insertion/remove", gr = "/kos/pumpEvent/replaceLine", hr = "/kos/handle/*";
 let A = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -745,7 +745,7 @@ let A = class {
     o(this, "logger");
     this.id = e, this.holders = new R({
       indexMap: {
-        nozzle: (s) => s.nozzlePaths,
+        nozzle: (a) => a.nozzlePaths,
         group: "group"
       },
       parentId: e,
@@ -755,28 +755,28 @@ let A = class {
   updateModel() {
   }
   handleHolderEvents(e) {
-    var r, s, i;
-    f.ifDebug(
+    var r, a, i;
+    m.ifDebug(
       () => this.logger.debug("Received holder change event", JSON.stringify(e))
     );
     const t = this.holders.getModel(e.path);
     t && (this.logger.info(
       `Received change event for holder ${t.path}.  Updating fuel gauge data.`
-    ), t.slice.currentVolMl = (r = e.slice) == null ? void 0 : r.currentVolMl, t.slice.maxVolMl = (s = e.slice) == null ? void 0 : s.maxVolMl, (i = e == null ? void 0 : e.container) != null && i.enjoyByDate ? t.enjoyByDate = new Date(e.container.enjoyByDate) : t.enjoyByDate = void 0);
+    ), t.slice.currentVolMl = (r = e.slice) == null ? void 0 : r.currentVolMl, t.slice.maxVolMl = (a = e.slice) == null ? void 0 : a.maxVolMl, (i = e == null ? void 0 : e.container) != null && i.enjoyByDate ? t.enjoyByDate = new Date(e.container.enjoyByDate) : t.enjoyByDate = void 0);
   }
   handleInsertion(e) {
-    f.ifDebug(
+    m.ifDebug(
       () => this.logger.debug("Received insertion event", JSON.stringify(e))
     ), (Array.isArray(e) ? e : [e]).forEach((r) => {
       h(() => {
-        var a, n, c;
-        const s = r.ingredientId, i = this.holders.getModel(r.path);
+        var s, n, l;
+        const a = r.ingredientId, i = this.holders.getModel(r.path);
         i && (this.logger.info(
           `Received insertion event for holder ${i.path}`
-        ), i.updateIngredient(s), i.slice.currentVolMl = (a = r.slice) == null ? void 0 : a.currentVolMl, i.slice.maxVolMl = (n = r.slice) == null ? void 0 : n.maxVolMl, (c = r == null ? void 0 : r.container) != null && c.enjoyByDate ? i.enjoyByDate = new Date(r.container.enjoyByDate) : i.enjoyByDate = void 0, r.pumps.forEach((l) => {
+        ), i.updateIngredient(a), i.slice.currentVolMl = (s = r.slice) == null ? void 0 : s.currentVolMl, i.slice.maxVolMl = (n = r.slice) == null ? void 0 : n.maxVolMl, (l = r == null ? void 0 : r.container) != null && l.enjoyByDate ? i.enjoyByDate = new Date(r.container.enjoyByDate) : i.enjoyByDate = void 0, r.pumps.forEach((c) => {
           h(() => {
-            const p = i.pumps.getModel(l.path);
-            p && (p.ingredientId = l.ingredientId, p.inserted = l.inserted, p.prevIngredientId = l.prevIngredientId);
+            const p = i.pumps.getModel(c.path);
+            p && (p.ingredientId = c.ingredientId, p.inserted = c.inserted, p.prevIngredientId = c.prevIngredientId);
           });
         }));
       });
@@ -817,54 +817,54 @@ const rt = {
     }
   },
   type: k,
-  predicate: v(k),
-  factory: b.Singleton.create(
+  predicate: P(k),
+  factory: v.Singleton.create(
     k
   )
-}, yr = f.createLogger({ name: "board-utils" }), Ir = async (e) => {
-  const t = await N.executeDataMapperExtension({
+}, yr = m.createLogger({ name: "board-utils" }), Ir = async (e) => {
+  const t = await T.executeDataMapperExtension({
     extension: u.BoardMapper,
     data: e,
     contextData: {}
-  }), { type: r, name: s, path: i, linked: a, instanceId: n, ...c } = e, l = { ...c, ...t }, p = {
+  }), { type: r, name: a, path: i, linked: s, instanceId: n, ...l } = e, c = { ...l, ...t }, p = {
     type: r,
-    name: s,
+    name: a,
     path: i,
-    linked: a,
+    linked: s,
     instanceId: n,
-    ...l
+    ...c
   }, y = et.factory(e.path)(p);
   return y.updateModel(p), y;
-}, mr = (e) => async (t) => {
+}, fr = (e) => async (t) => {
   yr.debug(`adding board ${t.name}`);
   const r = await Ir(t);
   e.addModel(r);
 };
 var d = /* @__PURE__ */ ((e) => (e.IDLE = "IDLE", e.POURING = "POURING", e.POUR_STARTING = "POUR_STARTING", e.POUR_CANCELING = "POUR_CANCELING", e.POUR_CANCELED = "POUR_CANCELED", e.POUR_COMPLETE = "POUR_COMPLETE", e))(d || {});
-const { URL: Ee } = S("PUMP_SERVICE"), { postModel: fr, getOne: Pr } = C.build({
+const { URL: Ee } = S("PUMP_SERVICE"), { postModel: mr, getOne: br } = C.build({
   basePath: `${Ee}/api/kos/holders`
 });
-f.createLogger({
+m.createLogger({
   name: "pump-service",
   group: "Services"
 });
-const br = async ({
+const vr = async ({
   intent: e,
   pumpId: t,
   tracker: r
 }) => {
-  const s = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await fr({ model: {}, urlOverride: s, tracker: r });
+  const a = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await mr({ model: {}, urlOverride: a, tracker: r });
   return i != null && i.data && pe.initiateFuture(i.data), i;
-}, vr = async (e, t) => {
-  const r = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, s = await Pr({ urlOverride: r });
-  return s != null && s.data ? s.data : { volume: -1 };
+}, Pr = async (e, t) => {
+  const r = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, a = await br({ urlOverride: r });
+  return a != null && a.data ? a.data : { volume: -1 };
 };
-var _r = Object.defineProperty, Mr = Object.getOwnPropertyDescriptor, we = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Mr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && _r(t, r, i), i;
+var _r = Object.defineProperty, Mr = Object.getOwnPropertyDescriptor, we = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Mr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && _r(t, r, i), i;
 };
-const Y = D.Pump;
+const Y = z.Pump;
 g[Me].register(
   "pump",
   ir
@@ -889,30 +889,30 @@ let q = class {
     this.id = e;
     const {
       inserted: r,
-      holderPath: s,
+      holderPath: a,
       boardPath: i,
-      nozzlePath: a,
+      nozzlePath: s,
       name: n,
-      path: c,
-      childPump: l,
+      path: l,
+      childPump: c,
       virtual: p,
       prevIngredientId: y,
       ...U
     } = t;
-    this.inserted = r, this.type = t.type, this.ingredientId = t.ingredientId, this.holderPath = s, this.boardPath = i, this.nozzlePath = a, this.name = n, this.path = c, this.childPump = !!l, this.virtual = !!p, this.prevIngredientId = y, Object.assign(this, U), this.futureHandler = new Ge(this);
+    this.inserted = r, this.type = t.type, this.ingredientId = t.ingredientId, this.holderPath = a, this.boardPath = i, this.nozzlePath = s, this.name = n, this.path = l, this.childPump = !!c, this.virtual = !!p, this.prevIngredientId = y, Object.assign(this, U), this.futureHandler = new Ge(this);
   }
   updateModel(e) {
     const {
       inserted: t,
       holderPath: r,
-      boardPath: s,
+      boardPath: a,
       nozzlePath: i,
-      childPump: a,
+      childPump: s,
       name: n,
-      path: c,
-      ...l
+      path: l,
+      ...c
     } = e;
-    this.inserted = t, this.type = e.type, this.ingredientId = e.ingredientId, this.holderPath = r, this.boardPath = s, this.nozzlePath = i, this.childPump = this.childPump ? this.childPump : !!a, this.name = n, this.path = c, this.prevIngredientId = e.prevIngredientId, Object.assign(this, l);
+    this.inserted = t, this.type = e.type, this.ingredientId = e.ingredientId, this.holderPath = r, this.boardPath = a, this.nozzlePath = i, this.childPump = this.childPump ? this.childPump : !!s, this.name = n, this.path = l, this.prevIngredientId = e.prevIngredientId, Object.assign(this, c);
   }
   // -------------------LIFECYCLE----------------------------
   get troubles() {
@@ -947,13 +947,13 @@ let q = class {
     var e;
     this.currentState === d.POURING || this.currentState === d.POUR_STARTING ? (this.currentState = d.POUR_CANCELING, await ((e = this.future) == null ? void 0 : e.cancelFuture()), h(() => {
       this.currentState = d.IDLE;
-    })) : f.warn(`Cannot cancel pour in state ${this.currentState}`);
+    })) : m.warn(`Cannot cancel pour in state ${this.currentState}`);
   }
   get future() {
     return this.futureHandler.future;
   }
   async resolveIntentVolume(e) {
-    return await vr(this.path, e);
+    return await Pr(this.path, e);
   }
   async performIntent(e, t) {
     const r = typeof e == "string" ? e : e.intent;
@@ -963,18 +963,18 @@ let q = class {
       if (this.currentState === d.IDLE) {
         if (this.currentState = d.POUR_STARTING, !t)
           throw new Error("No tracker provided");
-        const s = await br({
+        const a = await vr({
           tracker: t,
           intent: r,
           pumpId: this.path
         });
         return this.currentState === d.POUR_STARTING && h(() => {
           this.currentState = d.POURING;
-        }), s == null ? void 0 : s.data;
+        }), a == null ? void 0 : a.data;
       } else
         throw new Error(`Cannot pour in state ${this.currentState}`);
-    } catch (s) {
-      throw f.error(s), this.currentState = d.IDLE, s;
+    } catch (a) {
+      throw m.error(a), this.currentState = d.IDLE, a;
     }
   }
   // -------------------ENTITY----------------------------
@@ -996,10 +996,10 @@ const it = {
     }
   },
   type: Y,
-  predicate: v(Y),
-  factory: b.Factory.create(Y)
-}, Or = f.createLogger({ name: "pump-utils" }), Er = (e, t) => {
-  const r = (t.pumps ?? []).length > 1, s = {
+  predicate: P(Y),
+  factory: v.Factory.create(Y)
+}, Or = m.createLogger({ name: "pump-utils" }), Er = (e, t) => {
+  const r = (t.pumps ?? []).length > 1, a = {
     boardPath: t.boardPath,
     holderPath: t.holderPath,
     ingredientId: t.ingredientId,
@@ -1011,28 +1011,28 @@ const it = {
     type: t.type,
     nozzlePath: e,
     prevIngredientId: t.prevIngredientId
-  }, i = it.factory(t.path)(s);
-  return i.updateModel(s), i;
-}, st = (e) => (t) => (r) => (s) => {
-  var c;
-  Or.debug(`adding pump ${s.name}`);
-  const i = Er(r.path, s);
+  }, i = it.factory(t.path)(a);
+  return i.updateModel(a), i;
+}, at = (e) => (t) => (r) => (a) => {
+  var l;
+  Or.debug(`adding pump ${a.name}`);
+  const i = Er(r.path, a);
   e.addModel(i);
-  const a = i.holderPath, n = t.holders.getModel(a);
-  n == null || n.pumps.addModel(i), n != null && n.nozzlePaths.includes(r.path) || n == null || n.nozzlePaths.push(r.path), (c = s == null ? void 0 : s.pumps) == null || c.forEach((l) => {
+  const s = i.holderPath, n = t.holders.getModel(s);
+  n == null || n.pumps.addModel(i), n != null && n.nozzlePaths.includes(r.path) || n == null || n.nozzlePaths.push(r.path), (l = a == null ? void 0 : a.pumps) == null || l.forEach((c) => {
     const p = i.holderPath, y = {
-      ...l,
+      ...c,
       childPump: !0,
       holderPath: p,
       ingredientId: i.ingredientId
     };
-    st(e)(t)(r)(y);
+    at(e)(t)(r)(y);
   });
 };
-var wr = Object.defineProperty, $r = Object.getOwnPropertyDescriptor, ee = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? $r(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && wr(t, r, i), i;
+var wr = Object.defineProperty, $r = Object.getOwnPropertyDescriptor, ee = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? $r(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && wr(t, r, i), i;
 };
 const Z = "assembly-model", Sr = "assembly-data", Cr = "assembly-raw-data";
 let w = class {
@@ -1096,44 +1096,44 @@ let w = class {
     this.logger.debug(`loading assembly ${this.id}`);
     const t = await Ze();
     if ((t == null ? void 0 : t.status) === 200) {
-      const r = await N.executeDataMapperExtension({
+      const r = await T.executeDataMapperExtension({
         extension: u.AssemblyMapper,
         data: t.data,
         contextData: {}
       });
-      e.set(Sr, r), Object.assign(this, r), Object.entries(r).forEach(([s, i]) => {
-        yt(i) && (this.logger.debug(`adding child model ${s} from extension data`), this[It][s] = !0);
+      e.set(Sr, r), Object.assign(this, r), Object.entries(r).forEach(([a, i]) => {
+        yt(i) && (this.logger.debug(`adding child model ${a} from extension data`), this[It][a] = !0);
       }), e.set(Cr, t.data);
-      for await (const s of t.data.assemblies) {
+      for await (const a of t.data.assemblies) {
         const {
           boards: i = [],
-          holders: a = {},
+          holders: s = {},
           nozzles: n = [],
-          core: c,
-          name: l,
+          core: l,
+          name: c,
           path: p,
           ...y
-        } = s;
-        this.logger.debug(`adding assembly ${l}`), Object.keys(y).forEach((m) => {
-          mt.enableFeature(m);
+        } = a;
+        this.logger.debug(`adding assembly ${c}`), Object.keys(y).forEach((f) => {
+          ft.enableFeature(f);
         });
-        for await (const m of i)
-          this.logger.debug(`adding board ${m.name}`), await mr(this.boardContainer)(m);
-        for await (const [m, T] of Object.entries(
-          a ?? {}
+        for await (const f of i)
+          this.logger.debug(`adding board ${f.name}`), await fr(this.boardContainer)(f);
+        for await (const [f, D] of Object.entries(
+          s ?? {}
         ))
-          for await (const re of T) {
+          for await (const re of D) {
             this.logger.debug(`adding holder ${re.name}`);
-            const Ce = await Zt(m, re);
+            const Ce = await Zt(f, re);
             this.holderContainer.holders.addModel(Ce);
           }
-        const U = st(this.pumpContainer)(
+        const U = at(this.pumpContainer)(
           this.holderContainer
         );
-        n.forEach((m) => {
-          this._nozzlePaths.add(m.path);
-          const T = U(m);
-          m.pumps.forEach(T);
+        n.forEach((f) => {
+          this._nozzlePaths.add(f.path);
+          const D = U(f);
+          f.pumps.forEach(D);
         });
       }
     }
@@ -1156,7 +1156,7 @@ ee([
 w = ee([
   I(Z)
 ], w);
-const at = {
+const st = {
   registration: {
     [Z]: {
       class: w,
@@ -1164,16 +1164,16 @@ const at = {
     }
   },
   type: Z,
-  predicate: v(Z),
-  factory: b.Singleton.create(Z)
+  predicate: P(Z),
+  factory: v.Singleton.create(Z)
 };
-var Rr = Object.getOwnPropertyDescriptor, Dr = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Rr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (i = n(i) || i);
+var Rr = Object.getOwnPropertyDescriptor, zr = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Rr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = n(i) || i);
   return i;
 };
-const X = D.Availability;
-let ve = class {
+const X = z.Availability;
+let Pe = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "data");
@@ -1199,25 +1199,25 @@ let ve = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-ve = Dr([
-  ft(),
+Pe = zr([
+  mt(),
   I(X)
-], ve);
+], Pe);
 const _e = {
   registration: {
     [X]: {
-      class: ve,
+      class: Pe,
       singleton: !1
     }
   },
   type: X,
-  predicate: v(X),
-  factory: b.Factory.create(
+  predicate: P(X),
+  factory: v.Factory.create(
     X
   )
-}, { URL: B } = S("NOZZLE_SERVICE"), { postModel: $e, deleteModel: Tr, getOne: Nr } = C.build({
+}, { URL: B } = S("NOZZLE_SERVICE"), { postModel: $e, deleteModel: Dr, getOne: Tr } = C.build({
   basePath: `${B}/api/nozzle`
-}), zr = async (e, t) => {
+}), Nr = async (e, t) => {
   const r = await $e({
     model: {},
     urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/pour`,
@@ -1226,30 +1226,30 @@ const _e = {
   });
   return r != null && r.data && pe.initiateFuture(r.data), r;
 }, Lr = async (e, t, r) => {
-  const s = await $e({
+  const a = await $e({
     model: {},
     urlOverride: `${B}/api/ext/dispense/nozzle/${t}/pipeline/beverage/fixed/${e}`,
     ordered: !0,
     tracker: r
   });
-  return s != null && s.data && pe.initiateFuture(s.data), s;
-}, xr = async (e) => await Nr({
+  return a != null && a.data && pe.initiateFuture(a.data), a;
+}, xr = async (e) => await Tr({
   urlOverride: `${B}${e}/pipeline/beverage/availability`
 }), Ar = async (e, t) => await $e({
   model: t,
   urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
-}), Br = async (e) => await Tr({
+}), Br = async (e) => await Dr({
   id: e,
   urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
 });
-var Ur = Object.defineProperty, Gr = Object.getOwnPropertyDescriptor, te = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Gr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && Ur(t, r, i), i;
+var Ur = Object.defineProperty, Gr = Object.getOwnPropertyDescriptor, te = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Gr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Ur(t, r, i), i;
 };
-const J = D.Nozzle, jr = Pt(
+const J = z.Nozzle, jr = bt(
   "beverageTopicPrefix"
-), ie = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, Ne = "/kos/nozzle/pour/started", Fr = "/kos/nozzle/pour/progress", me = "/kos/nozzle/pour/cancel";
+), ie = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, Te = "/kos/nozzle/pour/started", Fr = "/kos/nozzle/pour/progress", fe = "/kos/nozzle/pour/cancel";
 let $ = class {
   constructor(e, t, r) {
     /** the unique identifier for this nozzle.*/
@@ -1266,7 +1266,7 @@ let $ = class {
     o(this, "beverageTopicPrefix");
     o(this, "topicPrefix");
     o(this, "urlPrefix");
-    this.id = e, this.path = t.path, this.name = t.name, this.beverageTopicPrefix = t.beverageTopicPrefix, this.topicPrefix = t.topicPrefix, this.urlPrefix = t.urlPrefix, this._selectedBeverage = void 0, this._selectedBrand = void 0, this._additionalItems = [], this.futureHandler = new bt(this), this._availabilityItems = new R({
+    this.id = e, this.path = t.path, this.name = t.name, this.beverageTopicPrefix = t.beverageTopicPrefix, this.topicPrefix = t.topicPrefix, this.urlPrefix = t.urlPrefix, this._selectedBeverage = void 0, this._selectedBrand = void 0, this._additionalItems = [], this.futureHandler = new vt(this), this._availabilityItems = new R({
       indexMap: {
         byGroup: "groupId",
         byParent: "parentId"
@@ -1358,18 +1358,18 @@ let $ = class {
     context: r
   }) {
     if (!e) {
-      const c = await Br(this.name);
-      if ((c == null ? void 0 : c.status) !== 200)
+      const l = await Br(this.name);
+      if ((l == null ? void 0 : l.status) !== 200)
         throw new Error("Failed to clear pourable");
       this._selectedBeverage = void 0;
       return;
     }
-    if (e === this._selectedBeverage && vt(this._additionalItems, t)) {
+    if (e === this._selectedBeverage && Pt(this._additionalItems, t)) {
       this.logger.info("No change in selected pourable");
       return;
     }
     this._selectedBeverage = e, this._additionalItems = t;
-    let s = await g.dataMapper.executeMapper(
+    let a = await g.dataMapper.executeMapper(
       u.SelectedPourableMapper,
       {
         beverage: e,
@@ -1380,10 +1380,10 @@ let $ = class {
     const i = {
       bevId: e.rawId
     };
-    (!s || Object.keys(s).length === 0) && (this.logger.info(
+    (!a || Object.keys(a).length === 0) && (this.logger.info(
       `No selected pourable mapper defined, using the default payload ${i}`
-    ), s = i);
-    const a = s ?? i, n = await Ar(this.name, a);
+    ), a = i);
+    const s = a ?? i, n = await Ar(this.name, s);
     if ((n == null ? void 0 : n.status) !== 200)
       throw new Error("Failed to select pourable");
   }
@@ -1423,8 +1423,8 @@ let $ = class {
     });
   }
   onFutureUpdate(e) {
-    E(this).forEach((s) => {
-      ie(s) && s.onPourProgress(e);
+    E(this).forEach((a) => {
+      ie(a) && a.onPourProgress(e);
     });
     const r = {
       nozzleId: this.id,
@@ -1447,21 +1447,21 @@ let $ = class {
       if (this.currentState === d.IDLE) {
         if (this.updateIfCurrent(d.IDLE, d.POUR_STARTING), !e)
           throw new Error("No tracker provided");
-        const r = await zr(this.name, e);
+        const r = await Nr(this.name, e);
         this.updateIfCurrent(d.POUR_STARTING, d.POURING), E(this).forEach((i) => {
-          var a;
-          ie(i) && ((a = i.onPourStart) == null || a.call(i));
+          var s;
+          ie(i) && ((s = i.onPourStart) == null || s.call(i));
         });
-        const s = {
+        const a = {
           nozzleId: this.id,
           type: "free"
         };
-        if (_.publish(Ne, s), (t = r == null ? void 0 : r.data) != null && t.endState) {
+        if (_.publish(Te, a), (t = r == null ? void 0 : r.data) != null && t.endState) {
           this.updateIfCurrent(d.POURING, d.IDLE);
           const i = {
             nozzleId: this.id
           };
-          _.publish(me, i);
+          _.publish(fe, i);
         }
         return r;
       } else
@@ -1476,29 +1476,29 @@ let $ = class {
       if (this.currentState === d.IDLE) {
         if (this.currentState = d.POUR_STARTING, !t)
           throw new Error("No tracker provided");
-        const s = await Lr(e, this.name, t);
+        const a = await Lr(e, this.name, t);
         this.currentState === d.POUR_STARTING && h(() => {
           this.currentState = d.POURING;
-        }), E(this).forEach((a) => {
+        }), E(this).forEach((s) => {
           var n;
-          ie(a) && ((n = a.onPourStart) == null || n.call(a));
+          ie(s) && ((n = s.onPourStart) == null || n.call(s));
         });
         const i = {
           nozzleId: this.id,
           type: "fixed"
         };
-        if (_.publish(Ne, i), (r = s == null ? void 0 : s.data) != null && r.endState) {
+        if (_.publish(Te, i), (r = a == null ? void 0 : a.data) != null && r.endState) {
           this.updateIfCurrent(d.POURING, d.IDLE);
-          const a = {
+          const s = {
             nozzleId: this.id
           };
-          _.publish(me, a);
+          _.publish(fe, s);
         }
-        return s;
+        return a;
       } else
         throw new Error(`Cannot pour in state ${this.currentState}`);
-    } catch (s) {
-      throw this.logger.error(s), this.currentState = d.IDLE, s;
+    } catch (a) {
+      throw this.logger.error(a), this.currentState = d.IDLE, a;
     }
   }
   /**
@@ -1510,29 +1510,29 @@ let $ = class {
       this.currentState = d.POUR_CANCELING, await ((e = this.futureHandler.getFuture()) == null ? void 0 : e.cancelFuture()), h(() => {
         this.currentState = d.IDLE;
       }), E(this).forEach((r) => {
-        var s;
-        ie(r) && ((s = r.onPourCancel) == null || s.call(r));
+        var a;
+        ie(r) && ((a = r.onPourCancel) == null || a.call(r));
       });
       const t = {
         nozzleId: this.id
       };
-      _.publish(me, t);
+      _.publish(fe, t);
     } else
       this.logger.warn(`Cannot cancel pour in state ${this.currentState}`);
   }
   updateGroupMembers() {
     this._availabilityItems.data.forEach((e) => {
       (e.taggedIds || []).forEach((r) => {
-        const s = this._availabilityItems.data.find(
+        const a = this._availabilityItems.data.find(
           (i) => i.rawId === r
         );
-        s && s.parentId !== e.id && (s.parentId = e.id, this._availabilityItems.updateModel(s));
+        a && a.parentId !== e.id && (a.parentId = e.id, this._availabilityItems.updateModel(a));
       });
     });
   }
   /** @internal */
   async load(e) {
-    var s, i;
+    var a, i;
     this.logger.debug(`loading nozzle ${this.id}`);
     const t = await xr(this.urlPrefix);
     if ((t == null ? void 0 : t.status) !== 200)
@@ -1542,87 +1542,103 @@ let $ = class {
       {}
     );
     e == null || e.set(u.AvailabilityLoader, r), e == null || e.set(Se.type, this);
-    for (const a of Object.keys((s = t.data) == null ? void 0 : s.groups) || [])
-      for (const n of ((i = t.data) == null ? void 0 : i.groups[a]) || []) {
-        const c = await g.dataMapper.executeMapper(
+    for (const s of Object.keys((a = t.data) == null ? void 0 : a.groups) || [])
+      for (const n of ((i = t.data) == null ? void 0 : i.groups[s]) || []) {
+        const l = await g.dataMapper.executeMapper(
           u.AvailabilityMapper,
-          { ...n, groupId: a },
+          { ...n, groupId: s },
           r
-        ), l = {
+        ), c = {
           ...n,
           note: n.note ?? void 0,
           kosParentId: this.id,
           rawId: n.id,
-          groupId: a,
-          data: c,
+          groupId: s,
+          data: l,
           properties: n.properties || {}
         }, p = _e.factory(
-          `${this.id}-${a}-${n.id}`
-        )(l);
+          `${this.id}-${s}-${n.id}`
+        )(c);
         this._availabilityItems.addModel(p);
       }
     this.updateGroupMembers();
   }
   async updateAvailability(e) {
     const t = _t.getContext(this.id), r = (t == null ? void 0 : t.get(u.AvailabilityLoader)) || {};
-    if (e.rebuild)
-      for (const s of Object.keys(e == null ? void 0 : e.groups) || []) {
-        this._availabilityItems.getIndexByKey("group", s).filter(
-          (a) => !e.groups[s].find(
-            (n) => `${this.id}-${s}-${n.id}` === a.id
+    if (e.rebuild) {
+      this.logger.info(
+        `Received rebuild update for nozzle ${this.path}, rebuilding entire availability set`
+      );
+      for (const a of Object.keys(e == null ? void 0 : e.groups) || []) {
+        this._availabilityItems.getIndexByKey("group", a).filter(
+          (s) => !e.groups[a].find(
+            (n) => `${this.id}-${a}-${n.id}` === s.id
           )
-        ).forEach((a) => {
-          this._availabilityItems.removeModel(a.id), Mt(a);
+        ).forEach((s) => {
+          this.logger.info(
+            `Removing beverage ${s.id} from nozzle ${this.path} due to rebuild update`
+          ), this._availabilityItems.removeModel(s.id), Mt(s);
         });
-        for (const a of (e == null ? void 0 : e.groups[s]) || []) {
+        for (const s of (e == null ? void 0 : e.groups[a]) || []) {
           const n = await g.dataMapper.executeMapper(
             u.AvailabilityMapper,
-            { ...a, groupId: s },
+            { ...s, groupId: a },
             r
-          ), c = {
-            ...a,
-            note: a.note ?? void 0,
+          ), l = {
+            ...s,
+            note: s.note ?? void 0,
             kosParentId: this.id,
-            groupId: s,
-            rawId: a.id,
+            groupId: a,
+            rawId: s.id,
             data: n,
-            taggedIds: a.taggedIds,
-            properties: a.properties || {}
-          }, l = this._availabilityItems.getModel(
-            `${this.id}-${s}-${a.id}`
+            taggedIds: s.taggedIds,
+            properties: s.properties || {}
+          }, c = this._availabilityItems.getModel(
+            `${this.id}-${a}-${s.id}`
           );
-          if (l)
-            l.updateModel(c);
+          if (c)
+            c.available !== l.available && this.logger.info(
+              `Updating availability of beverage ${c.id} in nozzle ${this.path} to ${l.available}`
+            ), c.updateModel(l);
           else {
+            this.logger.info(
+              `Adding beverage ${s.id} to nozzle ${this.path}`
+            );
             const p = _e.factory(
-              `${this.id}-${s}-${a.id}`
-            )(c);
+              `${this.id}-${a}-${s.id}`
+            )(l);
             this._availabilityItems.addModel(p);
           }
         }
       }
-    else
-      for (const s of Object.keys(e == null ? void 0 : e.groups) || [])
-        for (const i of (e == null ? void 0 : e.groups[s]) || []) {
-          const a = await g.dataMapper.executeMapper(
+    } else {
+      this.logger.info(
+        `Received delta update for nozzle ${this.path}, updating availability nodes`
+      );
+      for (const a of Object.keys(e == null ? void 0 : e.groups) || [])
+        for (const i of (e == null ? void 0 : e.groups[a]) || []) {
+          const s = await g.dataMapper.executeMapper(
             u.AvailabilityMapper,
-            { ...i, groupId: s },
+            { ...i, groupId: a },
             r
           ), n = {
             ...i,
             note: i.note ?? void 0,
             kosParentId: this.id,
-            groupId: s,
+            groupId: a,
             rawId: i.id,
-            data: a,
+            data: s,
             type: i.type,
             taggedIds: i.taggedIds,
             properties: i.properties || {}
-          }, c = this._availabilityItems.getModel(
-            `${this.id}-${s}-${i.id}`
+          }, l = this._availabilityItems.getModel(
+            `${this.id}-${a}-${i.id}`
           );
-          c && c.updateModel(n);
+          l && (l.available !== n.available && this.logger.info(
+            `Updating availability of beverage ${l.id} in nozzle ${this.path} to ${n.available}`
+          ), l.updateModel(n));
         }
+    }
     this.updateGroupMembers();
   }
   // -------------------ENTITY----------------------------
@@ -1653,13 +1669,13 @@ const Se = {
     }
   },
   type: J,
-  predicate: v(J),
-  factory: b.Factory.create(J)
+  predicate: P(J),
+  factory: v.Factory.create(J)
 };
-var Hr = Object.defineProperty, Kr = Object.getOwnPropertyDescriptor, nt = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Kr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && Hr(t, r, i), i;
+var Hr = Object.defineProperty, Kr = Object.getOwnPropertyDescriptor, nt = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Kr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Hr(t, r, i), i;
 };
 const ot = "device-assembly-model";
 let de = class {
@@ -1684,14 +1700,14 @@ let de = class {
     const e = await Ze();
     (e == null ? void 0 : e.status) === 200 && e.data.assemblies.map((r) => r.nozzles ?? []).flat().forEach((r) => {
       var n;
-      const s = r.path, i = ((n = r.pipelines.find((c) => c.name === "beverage")) == null ? void 0 : n.topicPrefix) || "", a = Se.factory(s)({
+      const a = r.path, i = ((n = r.pipelines.find((l) => l.name === "beverage")) == null ? void 0 : n.topicPrefix) || "", s = Se.factory(a)({
         path: r.path,
         name: r.name,
         urlPrefix: r.urlPrefix,
         topicPrefix: r.topicPrefix,
         beverageTopicPrefix: i
       });
-      this.deviceNozzles.addModel(a);
+      this.deviceNozzles.addModel(s);
     });
   }
 };
@@ -1715,12 +1731,12 @@ const Vr = new Ot({
   });
   return r != null && r.data && pe.initiateFuture(r.data), r;
 };
-var Zr = Object.defineProperty, Xr = Object.getOwnPropertyDescriptor, lt = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Xr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && Zr(t, r, i), i;
+var Zr = Object.defineProperty, Xr = Object.getOwnPropertyDescriptor, lt = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Xr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Zr(t, r, i), i;
 };
-const ct = "generic-pour-model", Jr = "/kos/generic/pour/started", qr = "/kos/generic/pour/progress", ze = "/kos/generic/pour/cancel", fe = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
+const ct = "generic-pour-model", Jr = "/kos/generic/pour/started", qr = "/kos/generic/pour/progress", Ne = "/kos/generic/pour/cancel", me = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
 let le = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -1743,19 +1759,19 @@ let le = class {
           throw new Error("No tracker provided");
         const r = await Yr(this.servicePath, e);
         this.updateIfCurrent(d.POUR_STARTING, d.POURING), E(this).forEach((i) => {
-          var a;
-          fe(i) && ((a = i.onPourStart) == null || a.call(i));
+          var s;
+          me(i) && ((s = i.onPourStart) == null || s.call(i));
         });
-        const s = {
+        const a = {
           pourTarget: this.id,
           type: this.pourType
         };
-        if (_.publish(Jr, s), (t = r == null ? void 0 : r.data) != null && t.endState) {
+        if (_.publish(Jr, a), (t = r == null ? void 0 : r.data) != null && t.endState) {
           this.updateIfCurrent(d.POURING, d.IDLE);
           const i = {
             pourTarget: this.id
           };
-          _.publish(ze, i);
+          _.publish(Ne, i);
         }
         return r;
       } else
@@ -1770,13 +1786,13 @@ let le = class {
       this.currentState = d.POUR_CANCELING, await ((e = this.futureHandler.getFuture()) == null ? void 0 : e.cancelFuture()), h(() => {
         this.currentState = d.IDLE;
       }), E(this).forEach((r) => {
-        var s;
-        fe(r) && ((s = r.onPourCancel) == null || s.call(r));
+        var a;
+        me(r) && ((a = r.onPourCancel) == null || a.call(r));
       });
       const t = {
         pourTarget: this.id
       };
-      _.publish(ze, t);
+      _.publish(Ne, t);
     }
     this.currentState === d.IDLE ? this.logger.info("Pour already idle, nothing to cancel.") : this.logger.warn(`Cannot cancel pour in state ${this.currentState}`);
   }
@@ -1813,7 +1829,7 @@ let le = class {
   }
   onFutureUpdate(e) {
     E(this).forEach((r) => {
-      fe(r) && r.onPourProgress(e);
+      me(r) && r.onPourProgress(e);
     });
     const t = {
       pourTarget: this.id,
@@ -1856,7 +1872,7 @@ const ni = new Et({
   ...it.registration,
   ...Oe.registration,
   ..._e.registration,
-  ...at.registration,
+  ...st.registration,
   ...tt.registration
 }, Wr = (e) => () => ($t(e)(), Vr.register(), Object.keys(Le).forEach((t) => {
   const r = Le[t];
@@ -1866,13 +1882,13 @@ const ni = new Et({
   async (t) => {
     var r;
     if ((r = t.data) != null && r.deviceId) {
-      const { model: s } = z(
-        at.type
+      const { model: a } = N(
+        st.type
       );
-      if (s) {
-        const i = s.boards.find(
-          (a) => a.id === t.data.deviceId
-        ) ? z(t.data.deviceId).model : void 0;
+      if (a) {
+        const i = a.boards.find(
+          (s) => s.id === t.data.deviceId
+        ) ? N(t.data.deviceId).model : void 0;
         return {
           devices: i ? i.name : ""
         };
@@ -1885,22 +1901,22 @@ const ni = new Et({
   model: O.model.register(e),
   companion: O.companion.register(e),
   legacy: O.model.registerLegacyModel(e)
-}), P = {
+}), b = {
   ...wt
 };
-P.dispense = {
-  models: Wr(P)
+b.dispense = {
+  models: Wr(b)
 };
-P.preload = O.model.preloadModel(P);
-P.model = O.model.register(P);
-P.companion = O.companion.register(P);
-P.legacy = O.model.registerLegacyModel(P);
-const oi = P;
+b.preload = O.model.preloadModel(b);
+b.model = O.model.register(b);
+b.companion = O.companion.register(b);
+b.legacy = O.model.registerLegacyModel(b);
+const oi = b;
 export {
-  at as A,
+  st as A,
   x as B,
   Sr as C,
-  D,
+  z as D,
   u as E,
   xr as F,
   ni as G,
@@ -1908,7 +1924,7 @@ export {
   je as I,
   Lr as J,
   oi as K,
-  zr as L,
+  Nr as L,
   Ar as M,
   Se as N,
   Yr as O,
@@ -1926,10 +1942,10 @@ export {
   We as j,
   Le as k,
   d as l,
-  Tt as m,
-  si as n,
+  Dt as m,
+  ai as n,
   Ut as o,
-  ai as p,
+  si as p,
   ii as q,
   Wr as r,
   ri as s,
@@ -1937,8 +1953,8 @@ export {
   Kt as u,
   Gt as v,
   Ze as w,
-  vr as x,
-  br as y,
+  Pr as x,
+  vr as y,
   Br as z
 };
-//# sourceMappingURL=dispense-registration-manager-DZWwSdsc.js.map
+//# sourceMappingURL=dispense-registration-manager-B6nEgoFC.js.map