@kosdev-code/kos-dispense-sdk 2.1.8 → 2.1.10

package/{dispense-registration-manager-Mh8b5sDW.js → dispense-registration-manager-CB_nSTZw.js}

@@ -1,10 +1,10 @@
-var lt = Object.defineProperty;
-var ct = (e, t, r) => t in e ? lt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var o = (e, t, r) => (ct(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { kosModel as I, Kos as v, isKosModel as b, resolveServiceUrl as S, ServiceFactory as R, KosLog as f, KosModelContainer as C, KosExtensionUtils as T, kosChild as M, FetchError as pt, ExtensionManager as g, EXTENSION_TROUBLE_MAPPER as be, EXTENSION_TROUBLE_DATA_MAPPER as q, getKosModelSync as z, kosDependency as ze, kosTroubleAware as ut, kosAction as h, kosTopicHandler as W, DependencyLifecycle as Le, getKosModel as Ae, FutureManager as ce, kosFuture as pe, FutureHandler as xe, EXTENSION_FEATURE_FLAG_RESOLVER as gt, isKosDataModel as ht, ChildModels as yt, KosFeatureFlags as It, kosParentAware as mt, createPropKey as ft, MultipleFutureHandler as Pt, arraysEqual as vt, getAllKosCompanionModels as E, EventBus as _, KosContextManager as bt, destroyKosModel as _t, SingletonKosModelRegistrationFactory as Mt, KosModelRegistrationFactory as Ot, KosModelRegistry as Et, RegistrationManager as O, registerCoreModels as wt, registerLegacyModel as $t } from "@kosdev-code/kos-ui-sdk";
+var ct = Object.defineProperty;
+var pt = (e, t, r) => t in e ? ct(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
+var o = (e, t, r) => (pt(e, typeof t != "symbol" ? t + "" : t, r), r);
+import { kosModel as I, Kos as v, isKosModel as b, resolveServiceUrl as S, ServiceFactory as C, KosLog as f, KosModelContainer as R, KosExtensionUtils as T, kosChild as M, FetchError as ht, ExtensionManager as u, EXTENSION_TROUBLE_MAPPER as be, EXTENSION_TROUBLE_DATA_MAPPER as q, getKosModelSync as z, kosDependency as Le, kosTroubleAware as ut, kosAction as g, kosTopicHandler as W, DependencyLifecycle as xe, getKosModel as Ae, FutureManager as ce, kosFuture as pe, FutureHandler as Be, EXTENSION_FEATURE_FLAG_RESOLVER as gt, isKosDataModel as yt, ChildModels as It, KosFeatureFlags as mt, kosParentAware as ft, createPropKey as Pt, MultipleFutureHandler as vt, arraysEqual as bt, getAllKosCompanionModels as E, EventBus as _, KosContextManager as _t, destroyKosModel as Mt, SingletonKosModelRegistrationFactory as Ot, kosLoggerAware as Et, kosFutureAware as wt, ObservableData as Ce, KosModelRegistrationFactory as $t, KosModelRegistry as St, RegistrationManager as O, registerCoreModels as Ct, registerLegacyModel as Rt } 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 || {}), St = Object.getOwnPropertyDescriptor, Rt = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? St(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var h = /* @__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))(h || {}), 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 || {}), Dt = Object.getOwnPropertyDescriptor, Nt = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Dt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
     (n = e[s]) && (i = n(i) || i);
   return i;
 };
@@ -36,10 +36,10 @@ let me = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-me = Rt([
+me = Nt([
   I(U)
 ], me);
-const Be = {
+const Ue = {
   registration: {
     [U]: {
       class: me,
@@ -49,26 +49,26 @@ const Be = {
   type: U,
   predicate: b(U),
   factory: v.Factory.create(U)
-}, { URL: Ue } = S("INGREDIENT_SERVICE"), { getOne: Ct } = R.build({
-  basePath: `${Ue}/api/ext/dispense/ingredients`
-}), Dt = async () => await Ct({
-  urlOverride: `${Ue}/api/ext/dispense/ingredients`
+}, { URL: Ge } = S("INGREDIENT_SERVICE"), { getOne: Tt } = C.build({
+  basePath: `${Ge}/api/ext/dispense/ingredients`
+}), zt = async () => await Tt({
+  urlOverride: `${Ge}/api/ext/dispense/ingredients`
 });
-var Nt = Object.defineProperty, Tt = Object.getOwnPropertyDescriptor, Ge = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Tt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var Lt = Object.defineProperty, xt = Object.getOwnPropertyDescriptor, je = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? xt(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 && Nt(t, r, i), i;
+  return a && i && Lt(t, r, i), i;
 };
-const G = "ingredient-container-model", zt = f.createLogger({ name: "ingredient-container-model" });
+const G = "ingredient-container-model", At = f.createLogger({ name: "ingredient-container-model" });
 let ie = class {
   constructor(e, t) {
     o(this, "id");
     o(this, "ingredients");
-    this.id = e, this.ingredients = new C({
+    this.id = e, this.ingredients = new R({
       indexMap: {
         ingredientType: "type"
       },
-      extensionId: u.IngredientIndex,
+      extensionId: h.IngredientIndex,
       parentId: e
     });
   }
@@ -80,22 +80,22 @@ let ie = class {
   }
   async load(e) {
     var i;
-    zt.debug(`loading ingredient container ${this.id}`);
-    const t = await Dt();
+    At.debug(`loading ingredient container ${this.id}`);
+    const t = await zt();
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load ingredients");
     const r = await T.executeLoaderExtension({
       context: e,
-      extension: u.IngredientLoader
+      extension: h.IngredientLoader
     }), 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 c = await T.executeDataMapperExtension({
-          extension: u.IngredientMapper,
+          extension: h.IngredientMapper,
           data: n,
           contextData: r
         }), l = await T.executePropertyMapperExtension({
-          extension: u.IngredientTypeMapper,
+          extension: h.IngredientTypeMapper,
           data: n,
           contextData: r
         }), p = {
@@ -103,7 +103,7 @@ let ie = class {
           type: l || n.type,
           ...c,
           data: c
-        }, y = Be.factory(n.id)(
+        }, y = Ue.factory(n.id)(
           p
         );
         this.ingredients.addModel(y);
@@ -111,13 +111,13 @@ let ie = class {
   }
   // -------------------ENTITY----------------------------
 };
-Ge([
+je([
   M
 ], ie.prototype, "ingredients", 2);
-ie = Ge([
+ie = je([
   I(G)
 ], ie);
-const je = {
+const Fe = {
   registration: {
     [G]: {
       class: ie,
@@ -127,76 +127,76 @@ const je = {
   type: G,
   predicate: b(G),
   factory: v.Singleton.create(G)
-}, { URL: ue } = S("HOLDER_SERVICE"), { getAll: Lt, postModel: Fe, deleteModel: At } = R.build({
-  basePath: `${ue}/api/kos/holders`
-}), xt = f.createLogger({
+}, { URL: he } = S("HOLDER_SERVICE"), { getAll: Bt, postModel: He, deleteModel: Ut } = C.build({
+  basePath: `${he}/api/kos/holders`
+}), Gt = f.createLogger({
   name: "holder-service",
   group: "Services"
-}), ti = async () => await Lt({}), Bt = async (e, t) => {
+}), ai = async () => await Bt({}), jt = async (e, t) => {
   if (!e || !t)
     throw new Error("Missing holderPath or ingredientId");
-  return await Fe({
+  return await He({
     model: { holderPath: e, ingredientId: t },
-    urlOverride: `${ue}/api/ext/dispense/assignments`
+    urlOverride: `${he}/api/ext/dispense/assignments`
   });
-}, Ut = async (e) => {
+}, Ft = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return await At({
+  return await Ut({
     id: e,
-    urlOverride: `${ue}/api/ext/dispense/assignments/${e}`
+    urlOverride: `${he}/api/ext/dispense/assignments/${e}`
   });
-}, Gt = async (e) => {
+}, Ht = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return xt.debug(
+  return Gt.debug(
     `sending POST request to /api/ext/dispense/pumpEvents/replaceLine/${e}`
-  ), await Fe({
+  ), await He({
     model: {},
-    urlOverride: `${ue}/api/ext/dispense/pumpEvents/replaceLine/${e}`
+    urlOverride: `${he}/api/ext/dispense/pumpEvents/replaceLine/${e}`
   });
-}, { URL: ae } = S("ASSIGNMENT_SERVICE"), { getAll: jt, postModel: He, deleteModel: Ft } = R.build({
+}, { URL: ae } = S("ASSIGNMENT_SERVICE"), { getAll: Vt, postModel: Ve, deleteModel: Kt } = C.build({
   destinationAddress: "",
   basePath: `${ae}/api/ext/dispense/assignments`
-}), se = window.kosUseFos, ri = async () => await jt({ fos: se }), Ht = async (e, t) => {
+}), se = window.kosUseFos, si = async () => await Vt({ fos: se }), kt = async (e, t) => {
   var i, s, n, c;
   const r = JSON.stringify(t), a = `${ae}/api/ext/dispense/assignments`;
   try {
-    const l = await He({
+    const l = await Ve({
       model: { holderPath: e, factoryJson: r },
       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 pt)
+    if (l instanceof ht)
       return [
         ((n = (s = l.payload) == null ? void 0 : s.data) == null ? void 0 : n.error) || "unknownError",
         (c = l.payload) == null ? void 0 : c.data
       ];
   }
   return ["unknownError", void 0];
-}, ii = async (e) => {
+}, ni = async (e) => {
   const t = se ? `${ae}/api/ingredients/assignments/${e.holderPath}` : `${ae}/api/ext/dispense/assignments`;
-  return await He({
+  return await Ve({
     model: { ...e, fuelGauge: 680 },
     fos: se,
     urlOverride: t
   });
-}, ai = async (e) => await Ft({ id: e, fos: se });
-var Vt = Object.defineProperty, Kt = Object.getOwnPropertyDescriptor, _e = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Kt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+}, oi = async (e) => await Kt({ id: e, fos: se });
+var Yt = Object.defineProperty, Zt = Object.getOwnPropertyDescriptor, _e = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Zt(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;
+  return a && i && Yt(t, r, i), i;
 };
 const j = D.Holder, Re = f.createLogger({ name: "holder-model" });
-g[be].register(
+u[be].register(
   "holder",
   async (e) => {
     const t = [];
     return t.push(...e.data.holderPaths), t;
   }
 );
-g[q].register(
+u[q].register(
   "pump",
   async (e) => {
     if (e.data.pumpPath) {
@@ -215,13 +215,13 @@ g[q].register(
     return {};
   }
 );
-g[q].register(
+u[q].register(
   "holder",
   async (e) => e.data.holderNames.length > 0 ? {
     holderName: e.data.holderNames[0] || ""
   } : {}
 );
-g[q].register(
+u[q].register(
   "container",
   async (e) => {
     if (e.data.ingredients.length > 0) {
@@ -235,7 +235,7 @@ g[q].register(
     return {};
   }
 );
-class kt extends Error {
+class Xt extends Error {
   constructor(r, a) {
     super(a);
     o(this, "type");
@@ -267,7 +267,7 @@ let J = class {
     o(this, "enjoyByDate");
     o(this, "pumps");
     o(this, "ingredientContainer");
-    this.id = e, this.path = t, this.name = r, this.ingredientType = s, this.ingredientSource = a, this.ingredientId = i, this.group = c, this.slice = n, this.enjoyByDate = p, this.data = l, this.pumps = new C({
+    this.id = e, this.path = t, this.name = r, this.ingredientType = s, this.ingredientSource = a, this.ingredientId = i, this.group = c, this.slice = n, this.enjoyByDate = p, this.data = l, this.pumps = new R({
       parentId: e,
       sortKey: "path"
     }), this.logger = y.logger;
@@ -371,7 +371,7 @@ let J = class {
     return this.hasMaxVolume && this.hasRemainingVolume;
   }
   updateIngredient(e) {
-    this.ingredientId !== e && h(() => {
+    this.ingredientId !== e && g(() => {
       this.ingredientId = e;
     });
   }
@@ -383,13 +383,13 @@ let J = class {
     if (!e)
       throw new Error("Invalid override");
     try {
-      const [t, r] = await Ht(this.path, e);
+      const [t, r] = await kt(this.path, e);
       if (t)
-        throw new kt(
+        throw new Xt(
           t,
           `Failed to perform rfid override on holder ${this.id}`
         );
-      return h(() => {
+      return g(() => {
         this.ingredientId = r == null ? void 0 : r.ingredientId;
       }), r;
     } catch (t) {
@@ -398,7 +398,7 @@ let J = class {
   }
   async assignIngredient(e) {
     try {
-      e ? await Bt(this.path, e) : await Ut(this.path), h(() => {
+      e ? await jt(this.path, e) : await Ft(this.path), g(() => {
         this.ingredientId = e;
       });
     } catch (t) {
@@ -409,7 +409,7 @@ let J = class {
     return this.troubles.some((e) => e.shouldDefer);
   }
   async replaceLine() {
-    await Gt(this.path);
+    await Ht(this.path);
   }
   // -------------------LIFECYCLE----------------------------
   // ----------------------------------
@@ -435,13 +435,13 @@ _e([
   M
 ], J.prototype, "pumps", 2);
 _e([
-  ze({ modelType: je.type })
+  Le({ modelType: Fe.type })
 ], J.prototype, "ingredientContainer", 2);
 J = _e([
   I(j),
   ut()
 ], J);
-const Ve = {
+const Ke = {
   registration: {
     [j]: {
       class: J,
@@ -451,16 +451,16 @@ const Ve = {
   type: j,
   predicate: b(j),
   factory: v.Factory.create(j)
-}, Yt = async (e, t) => {
+}, Jt = async (e, t) => {
   var Se;
-  const r = g.propertyMapper.executeMapper(
-    u.HolderIngredientMapper,
+  const r = u.propertyMapper.executeMapper(
+    h.HolderIngredientMapper,
     t
-  ), a = g.propertyMapper.executeMapper(
-    u.HolderTypeMapper,
+  ), a = u.propertyMapper.executeMapper(
+    h.HolderTypeMapper,
     t
   ) || t.ingType, i = await T.executeDataMapperExtension({
-    extension: u.HolderMapper,
+    extension: h.HolderMapper,
     data: t,
     contextData: {}
   }), { name: s, path: n, ingredientId: c, ingType: l, ingSource: p, slice: y, ...B } = t, m = { ...B, ...i }, N = y || { pos: 0 }, te = {
@@ -474,27 +474,27 @@ const Ve = {
     group: e,
     data: m
   };
-  return Ve.factory(t.path)(te);
-}, { URL: Zt } = S("ASSEMBLY_SERVICE"), { getOne: Xt } = R.build({
-  basePath: `${Zt}/api/kos/device/assemblies`
-}), Jt = f.createLogger({
+  return Ke.factory(t.path)(te);
+}, { URL: qt } = S("ASSEMBLY_SERVICE"), { getOne: Wt } = C.build({
+  basePath: `${qt}/api/kos/device/assemblies`
+}), Qt = f.createLogger({
   name: "assembly-service",
   group: "Services"
-}), Ke = async () => (Jt.debug("sending GET for assembly"), await Xt({}));
-var qt = Object.defineProperty, Wt = Object.getOwnPropertyDescriptor, ge = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Wt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+}), ke = async () => (Qt.debug("sending GET for assembly"), await Wt({}));
+var er = Object.defineProperty, tr = Object.getOwnPropertyDescriptor, ue = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? tr(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 && qt(t, r, i), i;
+  return a && i && er(t, r, i), i;
 };
-const F = "board-container-model", ke = "/kos/hardware/board/linked", Ye = "/kos/hardware/board/unlinked";
+const F = "board-container-model", Ye = "/kos/hardware/board/linked", Ze = "/kos/hardware/board/unlinked";
 let L = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
     o(this, "models");
-    this.id = e, this.logger = r.logger, this.models = new C({
+    this.id = e, this.logger = r.logger, this.models = new R({
       parentId: e,
-      extensionId: u.BoardIndex
+      extensionId: h.BoardIndex
     });
   }
   get boardList() {
@@ -517,59 +517,59 @@ let L = class {
     r.updateModel(e);
   }
   handleBoardLinkEvent(e) {
-    this.logger.debug(`handling ${ke} event ${e}`), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
+    this.logger.debug(`handling ${Ye} event ${e}`), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
   }
   handleBoardUnlinkEvent(e) {
     this.logger.debug(
-      `handling ${Ye} event ${e}`
+      `handling ${Ze} event ${e}`
     ), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
   }
 };
-ge([
+ue([
   M
 ], L.prototype, "models", 2);
-ge([
+ue([
   W({
-    lifecycle: Le.INIT,
-    topic: ke,
+    lifecycle: xe.INIT,
+    topic: Ye,
     websocket: !0
   })
 ], L.prototype, "handleBoardLinkEvent", 1);
-ge([
+ue([
   W({
-    lifecycle: Le.INIT,
-    topic: Ye,
+    lifecycle: xe.INIT,
+    topic: Ze,
     websocket: !0
   })
 ], L.prototype, "handleBoardUnlinkEvent", 1);
-L = ge([
+L = ue([
   I(F)
 ], L);
-const Qt = async (e) => {
+const rr = async (e) => {
   const t = e.data.boardPath, { model: r } = z(t);
   return {
     boardName: (r == null ? void 0 : r.name) || ""
   };
 };
-var er = Object.defineProperty, tr = Object.getOwnPropertyDescriptor, Ze = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? tr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var ir = Object.defineProperty, ar = Object.getOwnPropertyDescriptor, Xe = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? ar(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 && er(t, r, i), i;
+  return a && i && ir(t, r, i), i;
 };
 const H = D.PumpContainer;
-var Xe = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(Xe || {});
+var Je = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(Je || {});
 let ne = class {
   constructor(e, t) {
     o(this, "id");
     o(this, "pumps");
-    this.id = e, this.pumps = new C({
+    this.id = e, this.pumps = new R({
       indexMap: {
         byNozzle: (r) => r.nozzlePaths,
         byBoard: (r) => r.boardPath,
         byType: "type"
       },
       parentId: e,
-      extensionId: u.PumpIndex
+      extensionId: h.PumpIndex
     });
   }
   /**
@@ -606,10 +606,10 @@ let ne = class {
   }
   // -------------------ENTITY----------------------------
 };
-Ze([
+Xe([
   M
 ], ne.prototype, "pumps", 2);
-ne = Ze([
+ne = Xe([
   I(H)
 ], ne);
 const Me = {
@@ -624,15 +624,15 @@ const Me = {
   factory: v.Singleton.create(
     H
   )
-}, Je = async (e) => {
+}, qe = async (e) => {
   const t = [], { model: r } = await Ae(e);
   return r && (t.push(r.boardPath), t.push(r.nozzlePath), t.push(r.holderPath)), t;
-}, rr = async (e) => {
+}, sr = async (e) => {
   const t = [], r = e.data.pumpPath;
   t.push(r);
-  const a = await Je(r);
+  const a = await qe(r);
   return [...t, ...a];
-}, ir = async (e) => {
+}, nr = async (e) => {
   const t = [], r = e.data.boardPath;
   t.push(e.data.boardPath);
   const a = await Ae(
@@ -640,10 +640,10 @@ const Me = {
   );
   if (a != null && a.model) {
     const s = a.model.models.getIndexByKey(
-      Xe.byBoard,
+      Je.byBoard,
       r
     ).map(
-      (c) => Je(c.path)
+      (c) => qe(c.path)
     );
     (await Promise.allSettled(s)).forEach((c) => {
       c.status === "fulfilled" && c.value.forEach((l) => t.push(l));
@@ -651,22 +651,22 @@ const Me = {
   }
   return Array.from(new Set(t));
 };
-var ar = Object.getOwnPropertyDescriptor, sr = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? ar(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var or = Object.getOwnPropertyDescriptor, dr = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? or(t, r) : t, s = e.length - 1, n; s >= 0; s--)
     (n = e[s]) && (i = n(i) || i);
   return i;
 };
-const V = "board-model", Ce = (e, t) => {
+const V = "board-model", De = (e, t) => {
   const { type: r, name: a, path: i, linked: s, instanceId: n, link: c, ...l } = e;
   t.type = r, t.name = a, t.path = i, t.linked = s, t.link = Object.freeze(c), t.instanceId = n, Object.assign(t, l);
 };
-g[be].register(
+u[be].register(
   "board",
-  ir
+  nr
 );
-g[q].register(
+u[q].register(
   "board",
-  Qt
+  rr
 );
 let fe = class {
   constructor(e, t, r) {
@@ -677,10 +677,10 @@ let fe = class {
     o(this, "linked");
     o(this, "instanceId");
     o(this, "logger");
-    this.id = e, this.logger = r.logger, Ce(t, this);
+    this.id = e, this.logger = r.logger, De(t, this);
   }
   updateModel(e) {
-    Ce(e, this);
+    De(e, this);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -690,10 +690,10 @@ let fe = class {
     this.logger.debug(`loading board ${this.id}`);
   }
 };
-fe = sr([
+fe = dr([
   I(V)
 ], fe);
-const qe = {
+const We = {
   registration: {
     [V]: {
       class: fe,
@@ -703,13 +703,13 @@ const qe = {
   type: V,
   predicate: b(V),
   factory: v.Factory.create(V)
-}, We = {
+}, Qe = {
   registration: {
     [F]: {
       class: L,
       singleton: !0
     },
-    ...qe.registration
+    ...We.registration
   },
   type: F,
   predicate: b(F),
@@ -717,24 +717,24 @@ const qe = {
     F
   )
 };
-var nr = Object.defineProperty, or = Object.getOwnPropertyDescriptor, he = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? or(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var lr = Object.defineProperty, cr = Object.getOwnPropertyDescriptor, ge = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? cr(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 && nr(t, r, i), i;
+  return a && i && lr(t, r, i), i;
 };
-const K = D.HolderContainer, dr = "/kos/insertion/insert/start", lr = "/kos/insertion/insert/complete", cr = "/kos/insertion/insert/update", pr = "/kos/insertion/remove", ur = "/kos/pumpEvent/replaceLine", gr = "/kos/handle/*";
-let A = class {
+const K = D.HolderContainer, pr = "/kos/insertion/insert/start", hr = "/kos/insertion/insert/complete", ur = "/kos/insertion/insert/update", gr = "/kos/insertion/remove", yr = "/kos/pumpEvent/replaceLine", Ir = "/kos/handle/*";
+let x = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "holders");
     o(this, "logger");
-    this.id = e, this.holders = new C({
+    this.id = e, this.holders = new R({
       indexMap: {
         nozzle: (a) => a.nozzlePaths,
         group: "group"
       },
       parentId: e,
-      extensionId: u.HolderIndex
+      extensionId: h.HolderIndex
     }), this.logger = r.logger;
   }
   updateModel() {
@@ -753,13 +753,13 @@ let A = class {
     f.ifDebug(
       () => this.logger.debug("Received insertion event", JSON.stringify(e))
     ), (Array.isArray(e) ? e : [e]).forEach((r) => {
-      h(() => {
+      g(() => {
         var s, n, c;
         const a = r.ingredientId, i = this.holders.getModel(r.path);
         i && (this.logger.info(
           `Received insertion event for holder ${i.path}`
         ), 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, (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) => {
-          h(() => {
+          g(() => {
             const p = i.pumps.getModel(l.path);
             p && (p.ingredientId = l.ingredientId, p.inserted = l.inserted, p.prevIngredientId = l.prevIngredientId);
           });
@@ -769,35 +769,35 @@ let A = class {
   }
   // -------------------ENTITY----------------------------
 };
-he([
+ge([
   M
-], A.prototype, "holders", 2);
-he([
+], x.prototype, "holders", 2);
+ge([
   W({
-    topic: gr,
+    topic: Ir,
     websocket: !0,
     condition: (e, t) => t.holders.getModel(e.path) !== void 0
   })
-], A.prototype, "handleHolderEvents", 1);
-he([
+], x.prototype, "handleHolderEvents", 1);
+ge([
   W({
     topic: [
-      dr,
-      lr,
-      cr,
       pr,
-      ur
+      hr,
+      ur,
+      gr,
+      yr
     ],
     websocket: !0
   })
-], A.prototype, "handleInsertion", 1);
-A = he([
+], x.prototype, "handleInsertion", 1);
+x = ge([
   I(K)
-], A);
-const Qe = {
+], x);
+const et = {
   registration: {
     [K]: {
-      class: A,
+      class: x,
       singleton: !0
     }
   },
@@ -806,9 +806,9 @@ const Qe = {
   factory: v.Singleton.create(
     K
   )
-}, hr = f.createLogger({ name: "board-utils" }), yr = async (e) => {
+}, mr = f.createLogger({ name: "board-utils" }), fr = async (e) => {
   const t = await T.executeDataMapperExtension({
-    extension: u.BoardMapper,
+    extension: h.BoardMapper,
     data: e,
     contextData: {}
   }), { type: r, name: a, path: i, linked: s, instanceId: n, ...c } = e, l = { ...c, ...t }, p = {
@@ -818,41 +818,41 @@ const Qe = {
     linked: s,
     instanceId: n,
     ...l
-  }, y = qe.factory(e.path)(p);
+  }, y = We.factory(e.path)(p);
   return y.updateModel(p), y;
-}, Ir = (e) => async (t) => {
-  hr.debug(`adding board ${t.name}`);
-  const r = await yr(t);
+}, Pr = (e) => async (t) => {
+  mr.debug(`adding board ${t.name}`);
+  const r = await fr(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: Oe } = S("PUMP_SERVICE"), { postModel: mr, getOne: fr } = R.build({
+const { URL: Oe } = S("PUMP_SERVICE"), { postModel: vr, getOne: br } = C.build({
   basePath: `${Oe}/api/kos/holders`
 });
 f.createLogger({
   name: "pump-service",
   group: "Services"
 });
-const Pr = async ({
+const _r = async ({
   intent: e,
   pumpId: t,
   tracker: r
 }) => {
-  const a = `${Oe}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await mr({ model: {}, urlOverride: a, tracker: r });
+  const a = `${Oe}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await vr({ model: {}, urlOverride: a, tracker: r });
   return i != null && i.data && ce.initiateFuture(i.data), i;
-}, vr = async (e, t) => {
-  const r = `${Oe}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, a = await fr({ urlOverride: r });
+}, Mr = async (e, t) => {
+  const r = `${Oe}/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 br = Object.defineProperty, _r = Object.getOwnPropertyDescriptor, et = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? _r(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var Or = Object.defineProperty, Er = Object.getOwnPropertyDescriptor, tt = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Er(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 && br(t, r, i), i;
+  return a && i && Or(t, r, i), i;
 };
 const k = D.Pump;
-g[be].register(
+u[be].register(
   "pump",
-  rr
+  sr
 );
 let oe = class {
   constructor(e, t) {
@@ -883,7 +883,7 @@ let oe = class {
       prevIngredientId: y,
       ...B
     } = t;
-    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 = c, this.childPump = !!l, this.virtual = !!p, this.prevIngredientId = y, Object.assign(this, B), this.futureHandler = new xe(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 = c, this.childPump = !!l, this.virtual = !!p, this.prevIngredientId = y, Object.assign(this, B), this.futureHandler = new Be(this);
   }
   updateModel(e) {
     const {
@@ -911,13 +911,13 @@ let oe = class {
     return !!this.ingredientId && !this.isPouring;
   }
   onFutureUpdate(e) {
-    e.endState && h(() => {
+    e.endState && g(() => {
       this.currentState = d.IDLE;
     });
   }
   async cancelPour() {
     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.POURING || this.currentState === d.POUR_STARTING ? (this.currentState = d.POUR_CANCELING, await ((e = this.future) == null ? void 0 : e.cancelFuture()), g(() => {
       this.currentState = d.IDLE;
     })) : f.warn(`Cannot cancel pour in state ${this.currentState}`);
   }
@@ -925,7 +925,7 @@ let oe = class {
     return this.futureHandler.future;
   }
   async resolveIntentVolume(e) {
-    return await vr(this.path, e);
+    return await Mr(this.path, e);
   }
   async performIntent(e, t) {
     const r = typeof e == "string" ? e : e.intent;
@@ -935,12 +935,12 @@ let oe = class {
       if (this.currentState === d.IDLE) {
         if (this.currentState = d.POUR_STARTING, !t)
           throw new Error("No tracker provided");
-        const a = await Pr({
+        const a = await _r({
           tracker: t,
           intent: r,
           pumpId: this.path
         });
-        return this.currentState === d.POUR_STARTING && h(() => {
+        return this.currentState === d.POUR_STARTING && g(() => {
           this.currentState = d.POURING;
         }), a == null ? void 0 : a.data;
       } else
@@ -951,13 +951,13 @@ let oe = class {
   }
   // -------------------ENTITY----------------------------
 };
-et([
+tt([
   pe()
 ], oe.prototype, "performIntent", 1);
-oe = et([
+oe = tt([
   I(k)
 ], oe);
-const tt = {
+const rt = {
   registration: {
     [k]: {
       class: oe,
@@ -967,7 +967,7 @@ const tt = {
   type: k,
   predicate: b(k),
   factory: v.Factory.create(k)
-}, Mr = f.createLogger({ name: "pump-utils" }), Or = (e, t) => {
+}, wr = f.createLogger({ name: "pump-utils" }), $r = (e, t) => {
   const r = (t.pumps ?? []).length > 1, a = {
     boardPath: t.boardPath,
     holderPath: t.holderPath,
@@ -980,12 +980,12 @@ const tt = {
     type: t.type,
     nozzlePath: e,
     prevIngredientId: t.prevIngredientId
-  }, i = tt.factory(t.path)(a);
+  }, i = rt.factory(t.path)(a);
   return i.updateModel(a), i;
-}, rt = (e) => (t) => (r) => (a) => {
+}, it = (e) => (t) => (r) => (a) => {
   var c;
-  Mr.debug(`adding pump ${a.name}`);
-  const i = Or(r.path, a);
+  wr.debug(`adding pump ${a.name}`);
+  const i = $r(r.path, a);
   e.addModel(i);
   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), (c = a == null ? void 0 : a.pumps) == null || c.forEach((l) => {
@@ -995,15 +995,15 @@ const tt = {
       holderPath: p,
       ingredientId: i.ingredientId
     };
-    rt(e)(t)(r)(y);
+    it(e)(t)(r)(y);
   });
 };
-var Er = Object.defineProperty, wr = Object.getOwnPropertyDescriptor, Q = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? wr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var Sr = Object.defineProperty, Cr = Object.getOwnPropertyDescriptor, Q = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Cr(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 && Er(t, r, i), i;
+  return a && i && Sr(t, r, i), i;
 };
-const Y = "assembly-model", $r = "assembly-data", Sr = "assembly-raw-data";
+const Y = "assembly-model", Rr = "assembly-data", Dr = "assembly-raw-data";
 let w = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -1013,7 +1013,7 @@ let w = class {
     o(this, "boardContainer");
     o(this, "pumpContainer");
     o(this, "logger");
-    this.id = e, this.holderContainer = Qe.factory({}), this.boardContainer = We.factory({}), this.pumpContainer = Me.factory({}), this.logger = r.logger;
+    this.id = e, this.holderContainer = et.factory({}), this.boardContainer = Qe.factory({}), this.pumpContainer = Me.factory({}), this.logger = r.logger;
   }
   updateModel(e) {
   }
@@ -1056,23 +1056,23 @@ let w = class {
   }
   async ready() {
     var e;
-    (e = this.troubleContainer) == null || e.troubles.increment(), g[gt].execute(
-      u.AssemblyFeatureFlags,
+    (e = this.troubleContainer) == null || e.troubles.increment(), u[gt].execute(
+      h.AssemblyFeatureFlags,
       this
     );
   }
   async load(e) {
     this.logger.debug(`loading assembly ${this.id}`);
-    const t = await Ke();
+    const t = await ke();
     if ((t == null ? void 0 : t.status) === 200) {
       const r = await T.executeDataMapperExtension({
-        extension: u.AssemblyMapper,
+        extension: h.AssemblyMapper,
         data: t.data,
         contextData: {}
       });
-      e.set($r, r), Object.assign(this, r), Object.entries(r).forEach(([a, i]) => {
-        ht(i) && (this.logger.debug(`adding child model ${a} from extension data`), this[yt][a] = !0);
-      }), e.set(Sr, t.data);
+      e.set(Rr, 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(Dr, t.data);
       for await (const a of t.data.assemblies) {
         const {
           boards: i = [],
@@ -1084,19 +1084,19 @@ let w = class {
           ...y
         } = a;
         this.logger.debug(`adding assembly ${l}`), Object.keys(y).forEach((m) => {
-          It.enableFeature(m);
+          mt.enableFeature(m);
         });
         for await (const m of i)
-          this.logger.debug(`adding board ${m.name}`), await Ir(this.boardContainer)(m);
+          this.logger.debug(`adding board ${m.name}`), await Pr(this.boardContainer)(m);
         for await (const [m, N] of Object.entries(
           s ?? {}
         ))
           for await (const te of N) {
             this.logger.debug(`adding holder ${te.name}`);
-            const $e = await Yt(m, te);
+            const $e = await Jt(m, te);
             this.holderContainer.holders.addModel($e);
           }
-        const B = rt(this.pumpContainer)(
+        const B = it(this.pumpContainer)(
           this.holderContainer
         );
         n.forEach((m) => {
@@ -1109,7 +1109,7 @@ let w = class {
   }
 };
 Q([
-  ze({
+  Le({
     modelType: "trouble-container-model"
   })
 ], w.prototype, "troubleContainer", 2);
@@ -1125,7 +1125,7 @@ Q([
 w = Q([
   I(Y)
 ], w);
-const it = {
+const at = {
   registration: {
     [Y]: {
       class: w,
@@ -1136,8 +1136,8 @@ const it = {
   predicate: b(Y),
   factory: v.Singleton.create(Y)
 };
-var Rr = Object.getOwnPropertyDescriptor, Cr = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Rr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var Nr = Object.getOwnPropertyDescriptor, Tr = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Nr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
     (n = e[s]) && (i = n(i) || i);
   return i;
 };
@@ -1168,8 +1168,8 @@ let Pe = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-Pe = Cr([
-  mt(),
+Pe = Tr([
+  ft(),
   I(Z)
 ], Pe);
 const ve = {
@@ -1184,41 +1184,41 @@ const ve = {
   factory: v.Factory.create(
     Z
   )
-}, { URL: x } = S("NOZZLE_SERVICE"), { postModel: Ee, deleteModel: Dr, getOne: Nr } = R.build({
-  basePath: `${x}/api/nozzle`
-}), Tr = async (e, t) => {
+}, { URL: A } = S("NOZZLE_SERVICE"), { postModel: Ee, deleteModel: zr, getOne: Lr } = C.build({
+  basePath: `${A}/api/nozzle`
+}), xr = async (e, t) => {
   const r = await Ee({
     model: {},
-    urlOverride: `${x}/api/ext/dispense/nozzle/${e}/pipeline/beverage/pour`,
+    urlOverride: `${A}/api/ext/dispense/nozzle/${e}/pipeline/beverage/pour`,
     ordered: !0,
     tracker: t
   });
   return r != null && r.data && ce.initiateFuture(r.data), r;
-}, zr = async (e, t, r) => {
+}, Ar = async (e, t, r) => {
   const a = await Ee({
     model: {},
-    urlOverride: `${x}/api/ext/dispense/nozzle/${t}/pipeline/beverage/fixed/${e}`,
+    urlOverride: `${A}/api/ext/dispense/nozzle/${t}/pipeline/beverage/fixed/${e}`,
     ordered: !0,
     tracker: r
   });
   return a != null && a.data && ce.initiateFuture(a.data), a;
-}, Lr = async (e) => await Nr({
-  urlOverride: `${x}${e}/pipeline/beverage/availability`
-}), Ar = async (e, t) => await Ee({
+}, Br = async (e) => await Lr({
+  urlOverride: `${A}${e}/pipeline/beverage/availability`
+}), Ur = async (e, t) => await Ee({
   model: t,
-  urlOverride: `${x}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
-}), xr = async (e) => await Dr({
+  urlOverride: `${A}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
+}), Gr = async (e) => await zr({
   id: e,
-  urlOverride: `${x}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
+  urlOverride: `${A}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
 });
-var Br = Object.defineProperty, Ur = Object.getOwnPropertyDescriptor, ee = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Ur(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var jr = Object.defineProperty, Fr = Object.getOwnPropertyDescriptor, ee = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Fr(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 && Br(t, r, i), i;
+  return a && i && jr(t, r, i), i;
 };
-const X = D.Nozzle, Gr = ft(
+const X = D.Nozzle, Hr = Pt(
   "beverageTopicPrefix"
-), re = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, De = "/kos/nozzle/pour/started", jr = "/kos/nozzle/pour/progress", ye = "/kos/nozzle/pour/cancel";
+), re = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, Ne = "/kos/nozzle/pour/started", Vr = "/kos/nozzle/pour/progress", ye = "/kos/nozzle/pour/cancel";
 let $ = class {
   constructor(e, t, r) {
     /** the unique identifier for this nozzle.*/
@@ -1235,7 +1235,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 Pt(this), this._availabilityItems = new C({
+    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"
@@ -1327,19 +1327,19 @@ let $ = class {
     context: r
   }) {
     if (!e) {
-      const c = await xr(this.name);
+      const c = await Gr(this.name);
       if ((c == null ? void 0 : c.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 && bt(this._additionalItems, t)) {
       this.logger.info("No change in selected pourable");
       return;
     }
     this._selectedBeverage = e, this._additionalItems = t;
-    let a = await g.dataMapper.executeMapper(
-      u.SelectedPourableMapper,
+    let a = await u.dataMapper.executeMapper(
+      h.SelectedPourableMapper,
       {
         beverage: e,
         additional: t,
@@ -1352,7 +1352,7 @@ let $ = class {
     (!a || Object.keys(a).length === 0) && (this.logger.info(
       `No selected pourable mapper defined, using the default payload ${i}`
     ), a = i);
-    const s = a ?? i, n = await Ar(this.name, s);
+    const s = a ?? i, n = await Ur(this.name, s);
     if ((n == null ? void 0 : n.status) !== 200)
       throw new Error("Failed to select pourable");
   }
@@ -1387,7 +1387,7 @@ let $ = class {
     );
   }
   updateIfCurrent(e, t) {
-    this.currentState === e && h(() => {
+    this.currentState === e && g(() => {
       this.currentState = t;
     });
   }
@@ -1406,7 +1406,7 @@ let $ = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    _.publish(jr, r), e.endState && h(() => {
+    _.publish(Vr, r), e.endState && g(() => {
       this.currentState = d.IDLE;
     });
   }
@@ -1416,7 +1416,7 @@ 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 Tr(this.name, e);
+        const r = await xr(this.name, e);
         this.updateIfCurrent(d.POUR_STARTING, d.POURING), E(this).forEach((i) => {
           var s;
           re(i) && ((s = i.onPourStart) == null || s.call(i));
@@ -1425,7 +1425,7 @@ let $ = class {
           nozzleId: this.id,
           type: "free"
         };
-        if (_.publish(De, a), (t = r == null ? void 0 : r.data) != null && t.endState) {
+        if (_.publish(Ne, a), (t = r == null ? void 0 : r.data) != null && t.endState) {
           this.updateIfCurrent(d.POURING, d.IDLE);
           const i = {
             nozzleId: this.id
@@ -1445,8 +1445,8 @@ let $ = class {
       if (this.currentState === d.IDLE) {
         if (this.currentState = d.POUR_STARTING, !t)
           throw new Error("No tracker provided");
-        const a = await zr(e, this.name, t);
-        this.currentState === d.POUR_STARTING && h(() => {
+        const a = await Ar(e, this.name, t);
+        this.currentState === d.POUR_STARTING && g(() => {
           this.currentState = d.POURING;
         }), E(this).forEach((s) => {
           var n;
@@ -1456,7 +1456,7 @@ let $ = class {
           nozzleId: this.id,
           type: "fixed"
         };
-        if (_.publish(De, i), (r = a == null ? void 0 : a.data) != null && r.endState) {
+        if (_.publish(Ne, i), (r = a == null ? void 0 : a.data) != null && r.endState) {
           this.updateIfCurrent(d.POURING, d.IDLE);
           const s = {
             nozzleId: this.id
@@ -1476,7 +1476,7 @@ let $ = class {
   async cancelPour() {
     var e;
     if (this.currentState === d.POURING || this.currentState === d.POUR_STARTING) {
-      this.currentState = d.POUR_CANCELING, await ((e = this.futureHandler.getFuture()) == null ? void 0 : e.cancelFuture()), h(() => {
+      this.currentState = d.POUR_CANCELING, await ((e = this.futureHandler.getFuture()) == null ? void 0 : e.cancelFuture()), g(() => {
         this.currentState = d.IDLE;
       }), E(this).forEach((r) => {
         var a;
@@ -1503,18 +1503,18 @@ let $ = class {
   async load(e) {
     var a, i;
     this.logger.debug(`loading nozzle ${this.id}`);
-    const t = await Lr(this.urlPrefix);
+    const t = await Br(this.urlPrefix);
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load nozzle availability");
-    const r = await g.loader.executeLoader(
-      u.AvailabilityLoader,
+    const r = await u.loader.executeLoader(
+      h.AvailabilityLoader,
       {}
     );
-    e == null || e.set(u.AvailabilityLoader, r), e == null || e.set(we.type, this);
+    e == null || e.set(h.AvailabilityLoader, r), e == null || e.set(we.type, this);
     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 c = await g.dataMapper.executeMapper(
-          u.AvailabilityMapper,
+        const c = await u.dataMapper.executeMapper(
+          h.AvailabilityMapper,
           { ...n, groupId: s },
           r
         ), l = {
@@ -1533,7 +1533,7 @@ let $ = class {
     this.updateGroupMembers();
   }
   async updateAvailability(e) {
-    const t = bt.getContext(this.id), r = (t == null ? void 0 : t.get(u.AvailabilityLoader)) || {};
+    const t = _t.getContext(this.id), r = (t == null ? void 0 : t.get(h.AvailabilityLoader)) || {};
     if (e.rebuild)
       for (const a of Object.keys(e == null ? void 0 : e.groups) || []) {
         this._availabilityItems.getIndexByKey("group", a).filter(
@@ -1541,11 +1541,11 @@ let $ = class {
             (n) => `${this.id}-${a}-${n.id}` === s.id
           )
         ).forEach((s) => {
-          this._availabilityItems.removeModel(s.id), _t(s);
+          this._availabilityItems.removeModel(s.id), Mt(s);
         });
         for (const s of (e == null ? void 0 : e.groups[a]) || []) {
-          const n = await g.dataMapper.executeMapper(
-            u.AvailabilityMapper,
+          const n = await u.dataMapper.executeMapper(
+            h.AvailabilityMapper,
             { ...s, groupId: a },
             r
           ), c = {
@@ -1573,8 +1573,8 @@ let $ = class {
     else
       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,
+          const s = await u.dataMapper.executeMapper(
+            h.AvailabilityMapper,
             { ...i, groupId: a },
             r
           ), n = {
@@ -1607,7 +1607,7 @@ ee([
 ], $.prototype, "fixedPour", 1);
 ee([
   W({
-    topic: `${Gr}/availability`,
+    topic: `${Hr}/availability`,
     websocket: !0
   })
 ], $.prototype, "updateAvailability", 1);
@@ -1625,18 +1625,18 @@ const we = {
   predicate: b(X),
   factory: v.Factory.create(X)
 };
-var Fr = Object.defineProperty, Hr = Object.getOwnPropertyDescriptor, at = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Hr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var Kr = Object.defineProperty, kr = Object.getOwnPropertyDescriptor, st = (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 && Fr(t, r, i), i;
+  return a && i && Kr(t, r, i), i;
 };
-const st = "device-assembly-model";
+const nt = "device-assembly-model";
 let de = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "deviceNozzles");
     o(this, "logger");
-    this.id = e, this.logger = r.logger, this.deviceNozzles = new C();
+    this.id = e, this.logger = r.logger, this.deviceNozzles = new R();
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1650,7 +1650,7 @@ let de = class {
   }
   async load() {
     this.logger.debug(`loading device-assembly ${this.id}`);
-    const e = await Ke();
+    const e = await ke();
     (e == null ? void 0 : e.status) === 200 && e.data.assemblies.map((r) => r.nozzles ?? []).flat().forEach((r) => {
       var n;
       const a = r.path, i = ((n = r.pipelines.find((c) => c.name === "beverage")) == null ? void 0 : n.topicPrefix) || "", s = we.factory(a)({
@@ -1664,45 +1664,53 @@ let de = class {
     });
   }
 };
-at([
+st([
   M
 ], de.prototype, "deviceNozzles", 2);
-de = at([
-  I(st)
+de = st([
+  I(nt)
 ], de);
-const Vr = new Mt({
+const Yr = new Ot({
   class: de,
-  type: st
-}), { URL: nt } = S("GENERIC_POUR_SERVICE"), { postModel: Kr } = R.build({
-  basePath: `${nt}/api/nozzle`
-}), kr = async (e, t) => {
-  const r = await Kr({
+  type: nt
+}), { URL: ot } = S("GENERIC_POUR_SERVICE"), { postModel: Zr } = C.build({
+  basePath: `${ot}/api/nozzle`
+}), Xr = async (e, t) => {
+  const r = await Zr({
     model: {},
-    urlOverride: `${nt}${e}`,
+    urlOverride: `${ot}${e}`,
     ordered: !0,
     tracker: t
   });
   return r != null && r.data && ce.initiateFuture(r.data), r;
 };
-var Yr = Object.defineProperty, Zr = Object.getOwnPropertyDescriptor, ot = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Zr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var Jr = Object.defineProperty, qr = Object.getOwnPropertyDescriptor, dt = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? qr(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 && Yr(t, r, i), i;
+  return a && i && Jr(t, r, i), i;
 };
-const dt = "generic-pour-model", Xr = "/kos/generic/pour/started", Jr = "/kos/generic/pour/progress", Ne = "/kos/generic/pour/cancel", Ie = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
+const lt = "generic-pour-model", Wr = "/kos/generic/pour/started", Qr = "/kos/generic/pour/progress", Te = "/kos/generic/pour/cancel", Ie = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
 let le = class {
-  constructor(e, t, r) {
+  constructor(e, t) {
     o(this, "id");
     o(this, "currentState", d.IDLE);
     o(this, "servicePathFactory");
     o(this, "pourType");
-    o(this, "logger");
-    o(this, "futureHandler");
     o(this, "selectedId");
-    this.id = e, this.logger = r.logger, this.futureHandler = new xe(this), this.servicePathFactory = t.servicePathFactory, this.pourType = t.pourType || "free", this.selectedId = t.selectedId;
+    o(this, "state");
+    this.id = e, this.futureHandler = new Be(this), this.servicePathFactory = t.servicePathFactory, this.pourType = t.pourType || "free", this.selectedId = t.selectedId, this.state = Ce();
   }
   get servicePath() {
-    return this.selectedId ? this.servicePathFactory(this.selectedId) : "";
+    return this.selectedId ? this.servicePathFactory(this.selectedId, this.state) : "";
+  }
+  updateContextData(e, t) {
+    this.state[e] = t;
+  }
+  removeContextData(e) {
+    delete this.state[e];
+  }
+  clearContextData() {
+    this.state = Ce();
   }
   async pour(e) {
     var t;
@@ -1710,7 +1718,7 @@ let le = class {
       if (this.currentState === d.IDLE) {
         if (this.updateIfCurrent(d.IDLE, d.POUR_STARTING), !e)
           throw new Error("No tracker provided");
-        const r = await kr(this.servicePath, e);
+        const r = await Xr(this.servicePath, e);
         this.updateIfCurrent(d.POUR_STARTING, d.POURING), E(this).forEach((i) => {
           var s;
           Ie(i) && ((s = i.onPourStart) == null || s.call(i));
@@ -1719,12 +1727,12 @@ let le = class {
           pourTarget: this.id,
           type: this.pourType
         };
-        if (_.publish(Xr, a), (t = r == null ? void 0 : r.data) != null && t.endState) {
+        if (_.publish(Wr, a), (t = r == null ? void 0 : r.data) != null && t.endState) {
           this.updateIfCurrent(d.POURING, d.IDLE);
           const i = {
             pourTarget: this.id
           };
-          _.publish(Ne, i);
+          _.publish(Te, i);
         }
         return r;
       } else
@@ -1736,7 +1744,7 @@ let le = class {
   async cancelPour() {
     var e;
     if (this.currentState === d.POURING || this.currentState === d.POUR_STARTING) {
-      this.currentState = d.POUR_CANCELING, await ((e = this.futureHandler.getFuture()) == null ? void 0 : e.cancelFuture()), h(() => {
+      this.currentState = d.POUR_CANCELING, await ((e = this.futureHandler.getFuture()) == null ? void 0 : e.cancelFuture()), g(() => {
         this.currentState = d.IDLE;
       }), E(this).forEach((r) => {
         var a;
@@ -1745,12 +1753,12 @@ let le = class {
       const t = {
         pourTarget: this.id
       };
-      _.publish(Ne, t);
+      _.publish(Te, t);
     }
     this.currentState === d.IDLE ? this.logger.info("Pour already idle, nothing to cancel.") : this.logger.warn(`Cannot cancel pour in state ${this.currentState}`);
   }
   updateIfCurrent(e, t) {
-    this.currentState === e && h(() => {
+    this.currentState === e && g(() => {
       this.currentState = t;
     });
   }
@@ -1760,7 +1768,7 @@ let le = class {
    */
   get isPouring() {
     var e;
-    return !!(this.futureHandler.getFuture() && !((e = this.futureHandler.getFuture()) != null && e.endState)) || this.currentState === d.POUR_STARTING || this.currentState === d.POURING || this.currentState === d.POUR_CANCELING;
+    return !!(this.future && !((e = this.future) != null && e.endState)) || this.currentState === d.POUR_STARTING || this.currentState === d.POURING || this.currentState === d.POUR_CANCELING;
   }
   /**
    * A derived value that indicates if the pour target is currently available to pour a beverage.
@@ -1769,16 +1777,12 @@ let le = class {
    * The value is observable and will change when the selected pourable changes or the pour target
    * starts or stops pouring.
    * @readonly
-   * */
+   */
   get canPour() {
     return this.currentState === d.IDLE;
   }
-  get future() {
-    return this.futureHandler.getFuture();
-  }
   get pourProgress() {
-    var e;
-    return ((e = this.future) == null ? void 0 : e.progress) ?? 0;
+    return this.progress ?? 0;
   }
   onFutureUpdate(e) {
     E(this).forEach((r) => {
@@ -1795,48 +1799,43 @@ let le = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    _.publish(Jr, t), e.endState && h(() => {
+    _.publish(Qr, t), e.endState && g(() => {
       this.currentState = d.IDLE;
     });
   }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing generic-pour ${this.id}`);
-  }
-  async load() {
-    this.logger.debug(`loading generic-pour ${this.id}`);
-  }
 };
-ot([
+dt([
   pe()
 ], le.prototype, "pour", 1);
-le = ot([
-  I(dt)
+le = dt([
+  I(lt),
+  Et(),
+  wt()
 ], le);
-const si = new Ot({
+const di = new $t({
   class: le,
-  type: dt
-}), Te = {
-  ...je.registration,
-  ...Be.registration,
-  ...Qe.registration,
-  ...Ve.registration,
+  type: lt
+}), ze = {
+  ...Fe.registration,
+  ...Ue.registration,
+  ...et.registration,
+  ...Ke.registration,
   ...we.registration,
-  ...tt.registration,
+  ...rt.registration,
   ...Me.registration,
   ...ve.registration,
-  ...it.registration,
-  ...We.registration
-}, qr = (e) => () => (wt(e)(), Vr.register(), Object.keys(Te).forEach((t) => {
-  const r = Te[t];
-  $t(e)(t, r);
-}), g[q].register(
+  ...at.registration,
+  ...Qe.registration
+}, ei = (e) => () => (Ct(e)(), Yr.register(), Object.keys(ze).forEach((t) => {
+  const r = ze[t];
+  Rt(e)(t, r);
+}), u[q].register(
   "FirmwareUpdateInProgressTrouble",
   async (t) => {
     var r;
     if ((r = t.data) != null && r.deviceId) {
       const { model: a } = z(
-        it.type
+        at.type
       );
       if (a) {
         const i = a.boards.find(
@@ -1855,59 +1854,59 @@ const si = new Ot({
   companion: O.companion.register(e),
   legacy: O.model.registerLegacyModel(e)
 }), P = {
-  ...Et
+  ...St
 };
 P.dispense = {
-  models: qr(P)
+  models: ei(P)
 };
 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 ni = P;
+const li = P;
 export {
-  it as A,
+  at as A,
   L as B,
-  $r as C,
+  Rr as C,
   D,
-  u as E,
-  Lr as F,
-  si as G,
-  Ve as H,
-  Be as I,
-  zr as J,
-  ni as K,
-  Tr as L,
-  Ar as M,
+  h as E,
+  Br as F,
+  di as G,
+  Ke as H,
+  Ue as I,
+  Ar as J,
+  li as K,
+  xr as L,
+  Ur as M,
   we as N,
-  kr as O,
-  tt as P,
-  ke as T,
-  Sr as a,
+  Xr as O,
+  rt as P,
+  Ye as T,
+  Dr as a,
   ve as b,
-  Ye as c,
-  We as d,
-  qe as e,
-  Vr as f,
-  Qe as g,
-  je as h,
+  Ze as c,
+  Qe as d,
+  We as e,
+  Yr as f,
+  et as g,
+  Fe as h,
   Me as i,
-  Xe as j,
+  Je as j,
   d as k,
-  Te as l,
-  Dt as m,
-  ii as n,
-  Bt as o,
-  ai as p,
-  ri as q,
-  qr as r,
-  ti as s,
-  Gt as t,
-  Ht as u,
-  Ut as v,
-  Ke as w,
-  vr as x,
-  Pr as y,
-  xr as z
+  ze as l,
+  zt as m,
+  ni as n,
+  jt as o,
+  oi as p,
+  si as q,
+  ei as r,
+  ai as s,
+  Ht as t,
+  kt as u,
+  Ft as v,
+  ke as w,
+  Mr as x,
+  _r as y,
+  Gr as z
 };
-//# sourceMappingURL=dispense-registration-manager-Mh8b5sDW.js.map
+//# sourceMappingURL=dispense-registration-manager-CB_nSTZw.js.map