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

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

@@ -1,12 +1,12 @@
 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, isKosModel as b, Kos as v, resolveServiceUrl as S, ServiceFactory as C, KosLog as m, KosModelContainer as R, KosExtensionUtils as N, kosChild as M, FetchError as ht, ExtensionManager as h, 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 g, kosTopicHandler as Q, DependencyLifecycle as Be, getKosModel as Ue, FutureManager as pe, kosFuture as ue, FutureHandler as Ge, EXTENSION_FEATURE_FLAG_RESOLVER as gt, isKosDataModel as yt, ChildModels as It, KosFeatureFlags as ft, kosParentAware as mt, 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 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 "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.defineProperty, Rt = Object.getOwnPropertyDescriptor, Dt = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Rt(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 && Ct(t, r, 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 || {}), 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);
+  return i;
 };
 const G = "ingredient-model";
 let Pe = class {
@@ -36,7 +36,7 @@ let Pe = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-Pe = Dt([
+Pe = Rt([
   I(G)
 ], Pe);
 const je = {
@@ -47,19 +47,19 @@ const je = {
     }
   },
   type: G,
-  predicate: b(G),
-  factory: v.Factory.create(G)
-}, { URL: Fe } = S("INGREDIENT_SERVICE"), { getOne: Tt } = C.build({
+  predicate: v(G),
+  factory: b.Factory.create(G)
+}, { URL: Fe } = S("INGREDIENT_SERVICE"), { getOne: Dt } = C.build({
   basePath: `${Fe}/api/ext/dispense/ingredients`
-}), Nt = async () => await Tt({
+}), Tt = async () => await Dt({
   urlOverride: `${Fe}/api/ext/dispense/ingredients`
 });
-var zt = Object.defineProperty, Lt = Object.getOwnPropertyDescriptor, He = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Lt(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+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 && zt(t, r, i), i;
+  return s && i && Nt(t, r, i), i;
 };
-const j = "ingredient-container-model", xt = m.createLogger({ name: "ingredient-container-model" });
+const j = "ingredient-container-model", Lt = f.createLogger({ name: "ingredient-container-model" });
 let se = class {
   constructor(e, t) {
     o(this, "id");
@@ -80,8 +80,8 @@ let se = class {
   }
   async load(e) {
     var i;
-    xt.debug(`loading ingredient container ${this.id}`);
-    const t = await Nt();
+    Lt.debug(`loading ingredient container ${this.id}`);
+    const t = await Tt();
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load ingredients");
     const r = await N.executeLoaderExtension({
@@ -125,78 +125,78 @@ const Ke = {
     }
   },
   type: j,
-  predicate: b(j),
-  factory: v.Singleton.create(j)
-}, { URL: he } = S("HOLDER_SERVICE"), { getAll: At, postModel: Ve, deleteModel: Bt } = C.build({
-  basePath: `${he}/api/kos/holders`
-}), Ut = m.createLogger({
+  predicate: v(j),
+  factory: b.Singleton.create(j)
+}, { URL: ge } = S("HOLDER_SERVICE"), { getAll: xt, postModel: Ve, deleteModel: At } = C.build({
+  basePath: `${ge}/api/kos/holders`
+}), Bt = f.createLogger({
   name: "holder-service",
   group: "Services"
-}), ai = async () => await At({}), Gt = async (e, t) => {
+}), ri = async () => await xt({}), Ut = async (e, t) => {
   if (!e || !t)
     throw new Error("Missing holderPath or ingredientId");
   return await Ve({
     model: { holderPath: e, ingredientId: t },
-    urlOverride: `${he}/api/ext/dispense/assignments`
+    urlOverride: `${ge}/api/ext/dispense/assignments`
   });
-}, jt = async (e) => {
+}, Gt = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return await Bt({
+  return await At({
     id: e,
-    urlOverride: `${he}/api/ext/dispense/assignments/${e}`
+    urlOverride: `${ge}/api/ext/dispense/assignments/${e}`
   });
-}, Ft = async (e) => {
+}, jt = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return Ut.debug(
+  return Bt.debug(
     `sending POST request to /api/ext/dispense/pumpEvents/replaceLine/${e}`
   ), await Ve({
     model: {},
-    urlOverride: `${he}/api/ext/dispense/pumpEvents/replaceLine/${e}`
+    urlOverride: `${ge}/api/ext/dispense/pumpEvents/replaceLine/${e}`
   });
-}, { URL: ae } = S("ASSIGNMENT_SERVICE"), { getAll: Ht, postModel: Ye, deleteModel: Kt } = C.build({
+}, { URL: ae } = S("ASSIGNMENT_SERVICE"), { getAll: Ft, postModel: ke, deleteModel: Ht } = C.build({
   destinationAddress: "",
   basePath: `${ae}/api/ext/dispense/assignments`
-}), ne = window.kosUseFos, ni = async () => await Ht({ fos: ne }), Vt = async (e, t) => {
+}), 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`;
   try {
-    const l = await Ye({
+    const l = await ke({
       model: { holderPath: e, factoryJson: r },
       urlOverride: s
     });
     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 ht)
+    if (l 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
       ];
   }
   return ["unknownError", void 0];
-}, oi = async (e) => {
+}, si = async (e) => {
   const t = ne ? `${ae}/api/ingredients/assignments/${e.holderPath}` : `${ae}/api/ext/dispense/assignments`;
-  return await Ye({
+  return await ke({
     model: { ...e, fuelGauge: 680 },
     fos: ne,
     urlOverride: t
   });
-}, di = async (e) => await Kt({ id: e, fos: ne });
-var Yt = Object.defineProperty, kt = Object.getOwnPropertyDescriptor, ge = (e, t, r, s) => {
+}, 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 && Yt(t, r, i), i;
+  return s && i && Vt(t, r, i), i;
 };
-const F = D.Holder, De = m.createLogger({ name: "holder-model" });
-h[Me].register(
+const F = D.Holder, De = f.createLogger({ name: "holder-model" });
+g[Me].register(
   "holder",
   async (e) => {
     const t = [];
     return t.push(...e.data.holderPaths), t;
   }
 );
-h[W].register(
+g[W].register(
   "pump",
   async (e) => {
     if (e.data.pumpPath) {
@@ -215,13 +215,13 @@ h[W].register(
     return {};
   }
 );
-h[W].register(
+g[W].register(
   "holder",
   async (e) => e.data.holderNames.length > 0 ? {
     holderName: e.data.holderNames[0] || ""
   } : {}
 );
-h[W].register(
+g[W].register(
   "container",
   async (e) => {
     if (e.data.ingredients.length > 0) {
@@ -235,7 +235,7 @@ h[W].register(
     return {};
   }
 );
-class Zt extends Error {
+class Yt extends Error {
   constructor(r, s) {
     super(s);
     o(this, "type");
@@ -384,7 +384,7 @@ let L = class {
     return this.hasMaxVolume && this.hasRemainingVolume;
   }
   updateIngredient(e) {
-    this.ingredientId !== e && g(() => {
+    this.ingredientId !== e && h(() => {
       this.ingredientId = e;
     });
   }
@@ -396,13 +396,13 @@ let L = class {
     if (!e)
       throw new Error("Invalid override");
     try {
-      const [t, r] = await Vt(this.path, e);
+      const [t, r] = await Kt(this.path, e);
       if (t)
-        throw new Zt(
+        throw new Yt(
           t,
           `Failed to perform rfid override on holder ${this.id}`
         );
-      return g(() => {
+      return h(() => {
         this.ingredientId = r == null ? void 0 : r.ingredientId;
       }), r;
     } catch (t) {
@@ -411,7 +411,7 @@ let L = class {
   }
   async assignIngredient(e) {
     try {
-      e ? await Gt(this.path, e) : await jt(this.path), g(() => {
+      e ? await Ut(this.path, e) : await Gt(this.path), h(() => {
         this.ingredientId = e;
       });
     } catch (t) {
@@ -422,7 +422,7 @@ let L = class {
     return this.troubles.some((e) => e.shouldDefer);
   }
   async replaceLine() {
-    await Ft(this.path);
+    await jt(this.path);
   }
   // -------------------LIFECYCLE----------------------------
   // ----------------------------------
@@ -444,19 +444,19 @@ let L = class {
   // }
   // -------------------ENTITY----------------------------
 };
-ge([
+he([
   M
 ], L.prototype, "pumps", 2);
-ge([
+he([
   ce({ modelType: Ke.type })
 ], L.prototype, "ingredientContainer", 2);
-ge([
+he([
   ce({ modelType: xe.type })
 ], L.prototype, "troubleContainer", 2);
-L = ge([
+L = he([
   I(F)
 ], L);
-const ke = {
+const Ye = {
   registration: {
     [F]: {
       class: L,
@@ -464,21 +464,21 @@ const ke = {
     }
   },
   type: F,
-  predicate: b(F),
-  factory: v.Factory.create(F)
-}, Xt = async (e, t) => {
+  predicate: v(F),
+  factory: b.Factory.create(F)
+}, Zt = async (e, t) => {
   var Re;
-  const r = h.propertyMapper.executeMapper(
+  const r = g.propertyMapper.executeMapper(
     u.HolderIngredientMapper,
     t
-  ), s = h.propertyMapper.executeMapper(
+  ), s = g.propertyMapper.executeMapper(
     u.HolderTypeMapper,
     t
   ) || t.ingType, i = await N.executeDataMapperExtension({
     extension: u.HolderMapper,
     data: t,
     contextData: {}
-  }), { name: a, path: n, ingredientId: c, ingType: l, ingSource: p, slice: y, ...U } = t, f = { ...U, ...i }, T = y || { pos: 0 }, re = {
+  }), { name: a, path: n, ingredientId: c, ingType: l, ingSource: p, slice: y, ...U } = t, m = { ...U, ...i }, T = y || { pos: 0 }, re = {
     name: a,
     path: n,
     ingredientId: r || c,
@@ -487,19 +487,19 @@ const ke = {
     enjoyByDate: (Re = t.container) != null && Re.enjoyByDate ? new Date(t.container.enjoyByDate) : void 0,
     slice: T,
     group: e,
-    data: f
+    data: m
   };
-  return ke.factory(t.path)(re);
-}, { URL: Jt } = S("ASSEMBLY_SERVICE"), { getOne: qt } = C.build({
-  basePath: `${Jt}/api/kos/device/assemblies`
-}), Wt = m.createLogger({
+  return Ye.factory(t.path)(re);
+}, { URL: Xt } = S("ASSEMBLY_SERVICE"), { getOne: Jt } = C.build({
+  basePath: `${Xt}/api/kos/device/assemblies`
+}), qt = f.createLogger({
   name: "assembly-service",
   group: "Services"
-}), Ze = async () => (Wt.debug("sending GET for assembly"), await qt({}));
-var Qt = Object.defineProperty, er = Object.getOwnPropertyDescriptor, ye = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? er(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+}), 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 && Qt(t, r, i), i;
+  return s && i && Wt(t, r, i), i;
 };
 const H = "board-container-model", Xe = "/kos/hardware/board/linked", Je = "/kos/hardware/board/unlinked";
 let x = class {
@@ -560,16 +560,16 @@ ye([
 x = ye([
   I(H)
 ], x);
-const tr = async (e) => {
+const er = async (e) => {
   const t = e.data.boardPath, { model: r } = z(t);
   return {
     boardName: (r == null ? void 0 : r.name) || ""
   };
 };
-var rr = Object.defineProperty, ir = Object.getOwnPropertyDescriptor, qe = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? ir(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+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 && rr(t, r, i), i;
+  return s && i && tr(t, r, i), i;
 };
 const K = D.PumpContainer;
 var We = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(We || {});
@@ -635,19 +635,19 @@ const Oe = {
     }
   },
   type: K,
-  predicate: b(K),
-  factory: v.Singleton.create(
+  predicate: v(K),
+  factory: b.Singleton.create(
     K
   )
 }, Qe = async (e) => {
   const t = [], { model: r } = await Ue(e);
   return r && (t.push(r.boardPath), t.push(r.nozzlePath), t.push(r.holderPath)), t;
-}, sr = async (e) => {
+}, ir = async (e) => {
   const t = [], r = e.data.pumpPath;
   t.push(r);
   const s = await Qe(r);
   return [...t, ...s];
-}, ar = async (e) => {
+}, sr = async (e) => {
   const t = [], r = e.data.boardPath;
   t.push(e.data.boardPath);
   const s = await Ue(
@@ -666,22 +666,22 @@ const Oe = {
   }
   return Array.from(new Set(t));
 };
-var nr = Object.defineProperty, or = Object.getOwnPropertyDescriptor, dr = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? or(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 && nr(t, r, i), i;
+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);
+  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);
 };
-h[Me].register(
+g[Me].register(
   "board",
-  ar
+  sr
 );
-h[W].register(
+g[W].register(
   "board",
-  tr
+  er
 );
 let be = class {
   constructor(e, t, r) {
@@ -705,7 +705,7 @@ let be = class {
     this.logger.debug(`loading board ${this.id}`);
   }
 };
-be = dr([
+be = nr([
   I(V)
 ], be);
 const et = {
@@ -716,8 +716,8 @@ const et = {
     }
   },
   type: V,
-  predicate: b(V),
-  factory: v.Factory.create(V)
+  predicate: v(V),
+  factory: b.Factory.create(V)
 }, tt = {
   registration: {
     [H]: {
@@ -727,17 +727,17 @@ const et = {
     ...et.registration
   },
   type: H,
-  predicate: b(H),
-  factory: v.Singleton.create(
+  predicate: v(H),
+  factory: b.Singleton.create(
     H
   )
 };
-var lr = Object.defineProperty, cr = Object.getOwnPropertyDescriptor, Ie = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? cr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+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 && lr(t, r, i), i;
+  return s && i && or(t, r, i), i;
 };
-const Y = D.HolderContainer, pr = "/kos/insertion/insert/start", ur = "/kos/insertion/insert/complete", hr = "/kos/insertion/insert/update", gr = "/kos/insertion/remove", yr = "/kos/pumpEvent/replaceLine", Ir = "/kos/handle/*";
+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/*";
 let A = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -756,7 +756,7 @@ let A = class {
   }
   handleHolderEvents(e) {
     var r, s, i;
-    m.ifDebug(
+    f.ifDebug(
       () => this.logger.debug("Received holder change event", JSON.stringify(e))
     );
     const t = this.holders.getModel(e.path);
@@ -765,16 +765,16 @@ let A = class {
     ), 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);
   }
   handleInsertion(e) {
-    m.ifDebug(
+    f.ifDebug(
       () => this.logger.debug("Received insertion event", JSON.stringify(e))
     ), (Array.isArray(e) ? e : [e]).forEach((r) => {
-      g(() => {
+      h(() => {
         var a, n, c;
         const s = 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) => {
-          g(() => {
+          h(() => {
             const p = i.pumps.getModel(l.path);
             p && (p.ingredientId = l.ingredientId, p.inserted = l.inserted, p.prevIngredientId = l.prevIngredientId);
           });
@@ -789,7 +789,7 @@ Ie([
 ], A.prototype, "holders", 2);
 Ie([
   Q({
-    topic: Ir,
+    topic: hr,
     websocket: !0,
     condition: (e, t) => t.holders.getModel(e.path) !== void 0
   })
@@ -797,31 +797,31 @@ Ie([
 Ie([
   Q({
     topic: [
+      lr,
+      cr,
       pr,
       ur,
-      hr,
-      gr,
-      yr
+      gr
     ],
     websocket: !0
   })
 ], A.prototype, "handleInsertion", 1);
 A = Ie([
-  I(Y)
+  I(k)
 ], A);
 const rt = {
   registration: {
-    [Y]: {
+    [k]: {
       class: A,
       singleton: !0
     }
   },
-  type: Y,
-  predicate: b(Y),
-  factory: v.Singleton.create(
-    Y
+  type: k,
+  predicate: v(k),
+  factory: b.Singleton.create(
+    k
   )
-}, fr = m.createLogger({ name: "board-utils" }), mr = async (e) => {
+}, yr = f.createLogger({ name: "board-utils" }), Ir = async (e) => {
   const t = await N.executeDataMapperExtension({
     extension: u.BoardMapper,
     data: e,
@@ -835,39 +835,39 @@ const rt = {
     ...l
   }, y = et.factory(e.path)(p);
   return y.updateModel(p), y;
-}, Pr = (e) => async (t) => {
-  fr.debug(`adding board ${t.name}`);
-  const r = await mr(t);
+}, mr = (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: br, getOne: vr } = C.build({
+const { URL: Ee } = S("PUMP_SERVICE"), { postModel: fr, getOne: Pr } = C.build({
   basePath: `${Ee}/api/kos/holders`
 });
-m.createLogger({
+f.createLogger({
   name: "pump-service",
   group: "Services"
 });
-const _r = async ({
+const br = async ({
   intent: e,
   pumpId: t,
   tracker: r
 }) => {
-  const s = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await br({ model: {}, urlOverride: s, tracker: r });
+  const s = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await fr({ model: {}, urlOverride: s, tracker: r });
   return i != null && i.data && pe.initiateFuture(i.data), i;
-}, Mr = async (e, t) => {
-  const r = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, s = await vr({ urlOverride: r });
+}, 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 };
 };
-var Or = Object.defineProperty, Er = Object.getOwnPropertyDescriptor, we = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Er(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+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 && Or(t, r, i), i;
+  return s && i && _r(t, r, i), i;
 };
-const k = D.Pump;
-h[Me].register(
+const Y = D.Pump;
+g[Me].register(
   "pump",
-  sr
+  ir
 );
 let q = class {
   constructor(e, t) {
@@ -939,21 +939,21 @@ let q = class {
     return !!this.ingredientId && !this.isPouring;
   }
   onFutureUpdate(e) {
-    e.endState && g(() => {
+    e.endState && h(() => {
       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()), g(() => {
+    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;
-    })) : m.warn(`Cannot cancel pour in state ${this.currentState}`);
+    })) : f.warn(`Cannot cancel pour in state ${this.currentState}`);
   }
   get future() {
     return this.futureHandler.future;
   }
   async resolveIntentVolume(e) {
-    return await Mr(this.path, e);
+    return await vr(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 _r({
+        const s = await br({
           tracker: t,
           intent: r,
           pumpId: this.path
         });
-        return this.currentState === d.POUR_STARTING && g(() => {
+        return this.currentState === d.POUR_STARTING && h(() => {
           this.currentState = d.POURING;
         }), s == null ? void 0 : s.data;
       } else
         throw new Error(`Cannot pour in state ${this.currentState}`);
     } catch (s) {
-      throw m.error(s), this.currentState = d.IDLE, s;
+      throw f.error(s), this.currentState = d.IDLE, s;
     }
   }
   // -------------------ENTITY----------------------------
@@ -986,19 +986,19 @@ we([
   ue()
 ], q.prototype, "performIntent", 1);
 q = we([
-  I(k)
+  I(Y)
 ], q);
 const it = {
   registration: {
-    [k]: {
+    [Y]: {
       class: q,
       singleton: !1
     }
   },
-  type: k,
-  predicate: b(k),
-  factory: v.Factory.create(k)
-}, wr = m.createLogger({ name: "pump-utils" }), $r = (e, t) => {
+  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 = {
     boardPath: t.boardPath,
     holderPath: t.holderPath,
@@ -1015,8 +1015,8 @@ const it = {
   return i.updateModel(s), i;
 }, st = (e) => (t) => (r) => (s) => {
   var c;
-  wr.debug(`adding pump ${s.name}`);
-  const i = $r(r.path, s);
+  Or.debug(`adding pump ${s.name}`);
+  const i = Er(r.path, s);
   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) => {
@@ -1029,12 +1029,12 @@ const it = {
     st(e)(t)(r)(y);
   });
 };
-var Sr = Object.defineProperty, Cr = Object.getOwnPropertyDescriptor, ee = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Cr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+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 && Sr(t, r, i), i;
+  return s && i && wr(t, r, i), i;
 };
-const Z = "assembly-model", Rr = "assembly-data", Dr = "assembly-raw-data";
+const Z = "assembly-model", Sr = "assembly-data", Cr = "assembly-raw-data";
 let w = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -1087,7 +1087,7 @@ let w = class {
   }
   async ready() {
     var e;
-    (e = this.troubleContainer) == null || e.troubles.increment(), h[gt].execute(
+    (e = this.troubleContainer) == null || e.troubles.increment(), g[ht].execute(
       u.AssemblyFeatureFlags,
       this
     );
@@ -1101,9 +1101,9 @@ let w = class {
         data: t.data,
         contextData: {}
       });
-      e.set(Rr, r), Object.assign(this, r), Object.entries(r).forEach(([s, i]) => {
+      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(Dr, t.data);
+      }), e.set(Cr, t.data);
       for await (const s of t.data.assemblies) {
         const {
           boards: i = [],
@@ -1114,26 +1114,26 @@ let w = class {
           path: p,
           ...y
         } = s;
-        this.logger.debug(`adding assembly ${l}`), Object.keys(y).forEach((f) => {
-          ft.enableFeature(f);
+        this.logger.debug(`adding assembly ${l}`), Object.keys(y).forEach((m) => {
+          mt.enableFeature(m);
         });
-        for await (const f of i)
-          this.logger.debug(`adding board ${f.name}`), await Pr(this.boardContainer)(f);
-        for await (const [f, T] of Object.entries(
+        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 re of T) {
             this.logger.debug(`adding holder ${re.name}`);
-            const Ce = await Xt(f, re);
+            const Ce = await Zt(m, re);
             this.holderContainer.holders.addModel(Ce);
           }
         const U = st(this.pumpContainer)(
           this.holderContainer
         );
-        n.forEach((f) => {
-          this._nozzlePaths.add(f.path);
-          const T = U(f);
-          f.pumps.forEach(T);
+        n.forEach((m) => {
+          this._nozzlePaths.add(m.path);
+          const T = U(m);
+          m.pumps.forEach(T);
         });
       }
     }
@@ -1164,13 +1164,13 @@ const at = {
     }
   },
   type: Z,
-  predicate: b(Z),
-  factory: v.Singleton.create(Z)
+  predicate: v(Z),
+  factory: b.Singleton.create(Z)
 };
-var Tr = Object.defineProperty, Nr = Object.getOwnPropertyDescriptor, zr = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Nr(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 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);
+  return i;
 };
 const X = D.Availability;
 let ve = class {
@@ -1199,8 +1199,8 @@ let ve = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-ve = zr([
-  mt(),
+ve = Dr([
+  ft(),
   I(X)
 ], ve);
 const _e = {
@@ -1211,13 +1211,13 @@ const _e = {
     }
   },
   type: X,
-  predicate: b(X),
-  factory: v.Factory.create(
+  predicate: v(X),
+  factory: b.Factory.create(
     X
   )
-}, { URL: B } = S("NOZZLE_SERVICE"), { postModel: $e, deleteModel: Lr, getOne: xr } = C.build({
+}, { URL: B } = S("NOZZLE_SERVICE"), { postModel: $e, deleteModel: Tr, getOne: Nr } = C.build({
   basePath: `${B}/api/nozzle`
-}), Ar = async (e, t) => {
+}), zr = async (e, t) => {
   const r = await $e({
     model: {},
     urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/pour`,
@@ -1225,7 +1225,7 @@ const _e = {
     tracker: t
   });
   return r != null && r.data && pe.initiateFuture(r.data), r;
-}, Br = async (e, t, r) => {
+}, Lr = async (e, t, r) => {
   const s = await $e({
     model: {},
     urlOverride: `${B}/api/ext/dispense/nozzle/${t}/pipeline/beverage/fixed/${e}`,
@@ -1233,23 +1233,23 @@ const _e = {
     tracker: r
   });
   return s != null && s.data && pe.initiateFuture(s.data), s;
-}, Ur = async (e) => await xr({
+}, xr = async (e) => await Nr({
   urlOverride: `${B}${e}/pipeline/beverage/availability`
-}), Gr = async (e, t) => await $e({
+}), Ar = async (e, t) => await $e({
   model: t,
   urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
-}), jr = async (e) => await Lr({
+}), Br = async (e) => await Tr({
   id: e,
   urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
 });
-var Fr = Object.defineProperty, Hr = Object.getOwnPropertyDescriptor, te = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Hr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+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 && Fr(t, r, i), i;
+  return s && i && Ur(t, r, i), i;
 };
-const J = D.Nozzle, Kr = Pt(
+const J = D.Nozzle, jr = Pt(
   "beverageTopicPrefix"
-), ie = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, Ne = "/kos/nozzle/pour/started", Vr = "/kos/nozzle/pour/progress", fe = "/kos/nozzle/pour/cancel";
+), 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";
 let $ = class {
   constructor(e, t, r) {
     /** the unique identifier for this nozzle.*/
@@ -1358,7 +1358,7 @@ let $ = class {
     context: r
   }) {
     if (!e) {
-      const c = await jr(this.name);
+      const c = await Br(this.name);
       if ((c == null ? void 0 : c.status) !== 200)
         throw new Error("Failed to clear pourable");
       this._selectedBeverage = void 0;
@@ -1369,7 +1369,7 @@ let $ = class {
       return;
     }
     this._selectedBeverage = e, this._additionalItems = t;
-    let s = await h.dataMapper.executeMapper(
+    let s = await g.dataMapper.executeMapper(
       u.SelectedPourableMapper,
       {
         beverage: e,
@@ -1383,7 +1383,7 @@ let $ = class {
     (!s || Object.keys(s).length === 0) && (this.logger.info(
       `No selected pourable mapper defined, using the default payload ${i}`
     ), s = i);
-    const a = s ?? i, n = await Gr(this.name, a);
+    const a = s ?? i, n = await Ar(this.name, a);
     if ((n == null ? void 0 : n.status) !== 200)
       throw new Error("Failed to select pourable");
   }
@@ -1418,7 +1418,7 @@ let $ = class {
     );
   }
   updateIfCurrent(e, t) {
-    this.currentState === e && g(() => {
+    this.currentState === e && h(() => {
       this.currentState = t;
     });
   }
@@ -1437,7 +1437,7 @@ let $ = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    _.publish(Vr, r), e.endState && g(() => {
+    _.publish(Fr, r), e.endState && h(() => {
       this.currentState = d.IDLE;
     });
   }
@@ -1447,7 +1447,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 Ar(this.name, e);
+        const r = await zr(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));
@@ -1461,7 +1461,7 @@ let $ = class {
           const i = {
             nozzleId: this.id
           };
-          _.publish(fe, i);
+          _.publish(me, i);
         }
         return r;
       } else
@@ -1476,8 +1476,8 @@ let $ = class {
       if (this.currentState === d.IDLE) {
         if (this.currentState = d.POUR_STARTING, !t)
           throw new Error("No tracker provided");
-        const s = await Br(e, this.name, t);
-        this.currentState === d.POUR_STARTING && g(() => {
+        const s = await Lr(e, this.name, t);
+        this.currentState === d.POUR_STARTING && h(() => {
           this.currentState = d.POURING;
         }), E(this).forEach((a) => {
           var n;
@@ -1492,7 +1492,7 @@ let $ = class {
           const a = {
             nozzleId: this.id
           };
-          _.publish(fe, a);
+          _.publish(me, a);
         }
         return s;
       } else
@@ -1507,7 +1507,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()), g(() => {
+      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;
@@ -1516,7 +1516,7 @@ let $ = class {
       const t = {
         nozzleId: this.id
       };
-      _.publish(fe, t);
+      _.publish(me, t);
     } else
       this.logger.warn(`Cannot cancel pour in state ${this.currentState}`);
   }
@@ -1534,17 +1534,17 @@ let $ = class {
   async load(e) {
     var s, i;
     this.logger.debug(`loading nozzle ${this.id}`);
-    const t = await Ur(this.urlPrefix);
+    const t = await xr(this.urlPrefix);
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load nozzle availability");
-    const r = await h.loader.executeLoader(
+    const r = await g.loader.executeLoader(
       u.AvailabilityLoader,
       {}
     );
     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 h.dataMapper.executeMapper(
+        const c = await g.dataMapper.executeMapper(
           u.AvailabilityMapper,
           { ...n, groupId: a },
           r
@@ -1575,7 +1575,7 @@ let $ = class {
           this._availabilityItems.removeModel(a.id), Mt(a);
         });
         for (const a of (e == null ? void 0 : e.groups[s]) || []) {
-          const n = await h.dataMapper.executeMapper(
+          const n = await g.dataMapper.executeMapper(
             u.AvailabilityMapper,
             { ...a, groupId: s },
             r
@@ -1604,7 +1604,7 @@ let $ = class {
     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 h.dataMapper.executeMapper(
+          const a = await g.dataMapper.executeMapper(
             u.AvailabilityMapper,
             { ...i, groupId: s },
             r
@@ -1638,7 +1638,7 @@ te([
 ], $.prototype, "fixedPour", 1);
 te([
   Q({
-    topic: `${Kr}/availability`,
+    topic: `${jr}/availability`,
     websocket: !0
   })
 ], $.prototype, "updateAvailability", 1);
@@ -1653,13 +1653,13 @@ const Se = {
     }
   },
   type: J,
-  predicate: b(J),
-  factory: v.Factory.create(J)
+  predicate: v(J),
+  factory: b.Factory.create(J)
 };
-var Yr = 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--)
+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 && Yr(t, r, i), i;
+  return s && i && Hr(t, r, i), i;
 };
 const ot = "device-assembly-model";
 let de = class {
@@ -1701,13 +1701,13 @@ nt([
 de = nt([
   I(ot)
 ], de);
-const Zr = new Ot({
+const Vr = new Ot({
   class: de,
   type: ot
-}), { URL: dt } = S("GENERIC_POUR_SERVICE"), { postModel: Xr } = C.build({
+}), { URL: dt } = S("GENERIC_POUR_SERVICE"), { postModel: kr } = C.build({
   basePath: `${dt}/api/nozzle`
-}), Jr = async (e, t) => {
-  const r = await Xr({
+}), Yr = async (e, t) => {
+  const r = await kr({
     model: {},
     urlOverride: `${dt}${e}`,
     ordered: !0,
@@ -1715,12 +1715,12 @@ const Zr = new Ot({
   });
   return r != null && r.data && pe.initiateFuture(r.data), r;
 };
-var qr = Object.defineProperty, Wr = Object.getOwnPropertyDescriptor, lt = (e, t, r, s) => {
-  for (var i = s > 1 ? void 0 : s ? Wr(t, r) : t, a = e.length - 1, n; a >= 0; a--)
+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 && qr(t, r, i), i;
+  return s && i && Zr(t, r, i), i;
 };
-const ct = "generic-pour-model", Qr = "/kos/generic/pour/started", ei = "/kos/generic/pour/progress", ze = "/kos/generic/pour/cancel", me = (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", ze = "/kos/generic/pour/cancel", fe = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
 let le = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -1741,16 +1741,16 @@ 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 Jr(this.servicePath, e);
+        const r = await Yr(this.servicePath, e);
         this.updateIfCurrent(d.POUR_STARTING, d.POURING), E(this).forEach((i) => {
           var a;
-          me(i) && ((a = i.onPourStart) == null || a.call(i));
+          fe(i) && ((a = i.onPourStart) == null || a.call(i));
         });
         const s = {
           pourTarget: this.id,
           type: this.pourType
         };
-        if (_.publish(Qr, s), (t = r == null ? void 0 : r.data) != null && t.endState) {
+        if (_.publish(Jr, s), (t = r == null ? void 0 : r.data) != null && t.endState) {
           this.updateIfCurrent(d.POURING, d.IDLE);
           const i = {
             pourTarget: this.id
@@ -1767,11 +1767,11 @@ 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()), g(() => {
+      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;
-        me(r) && ((s = r.onPourCancel) == null || s.call(r));
+        fe(r) && ((s = r.onPourCancel) == null || s.call(r));
       });
       const t = {
         pourTarget: this.id
@@ -1781,7 +1781,7 @@ let le = class {
     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 && g(() => {
+    this.currentState === e && h(() => {
       this.currentState = t;
     });
   }
@@ -1813,7 +1813,7 @@ let le = class {
   }
   onFutureUpdate(e) {
     E(this).forEach((r) => {
-      me(r) && r.onPourProgress(e);
+      fe(r) && r.onPourProgress(e);
     });
     const t = {
       pourTarget: this.id,
@@ -1826,7 +1826,7 @@ let le = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    _.publish(ei, t), e.endState && g(() => {
+    _.publish(qr, t), e.endState && h(() => {
       this.currentState = d.IDLE;
     });
   }
@@ -1844,24 +1844,24 @@ lt([
 le = lt([
   I(ct)
 ], le);
-const li = new Et({
+const ni = new Et({
   class: le,
   type: ct
 }), Le = {
   ...Ke.registration,
   ...je.registration,
   ...rt.registration,
-  ...ke.registration,
+  ...Ye.registration,
   ...Se.registration,
   ...it.registration,
   ...Oe.registration,
   ..._e.registration,
   ...at.registration,
   ...tt.registration
-}, ti = (e) => () => ($t(e)(), Zr.register(), Object.keys(Le).forEach((t) => {
+}, Wr = (e) => () => ($t(e)(), Vr.register(), Object.keys(Le).forEach((t) => {
   const r = Le[t];
   St(e)(t, r);
-}), h[W].register(
+}), g[W].register(
   "FirmwareUpdateInProgressTrouble",
   async (t) => {
     var r;
@@ -1889,56 +1889,56 @@ const li = new Et({
   ...wt
 };
 P.dispense = {
-  models: ti(P)
+  models: Wr(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 ci = P;
+const oi = P;
 export {
   at as A,
   x as B,
-  Rr as C,
+  Sr as C,
   D,
   u as E,
-  Ur as F,
-  li as G,
-  ke as H,
+  xr as F,
+  ni as G,
+  Ye as H,
   je as I,
-  Br as J,
-  ci as K,
-  Ar as L,
-  Gr as M,
+  Lr as J,
+  oi as K,
+  zr as L,
+  Ar as M,
   Se as N,
-  Jr as O,
+  Yr as O,
   it as P,
   Xe as T,
-  Dr as a,
+  Cr as a,
   _e as b,
   Je as c,
   tt as d,
   et as e,
-  Zr as f,
+  Vr as f,
   rt as g,
   Ke as h,
   Oe as i,
   We as j,
   Le as k,
   d as l,
-  Nt as m,
-  oi as n,
-  Gt as o,
-  di as p,
-  ni as q,
-  ti as r,
-  ai as s,
-  Ft as t,
-  Vt as u,
-  jt as v,
+  Tt as m,
+  si as n,
+  Ut as o,
+  ai as p,
+  ii as q,
+  Wr as r,
+  ri as s,
+  jt as t,
+  Kt as u,
+  Gt as v,
   Ze as w,
-  Mr as x,
-  _r as y,
-  jr as z
+  vr as x,
+  br as y,
+  Br as z
 };
-//# sourceMappingURL=dispense-registration-manager-eOOE05xT.js.map
+//# sourceMappingURL=dispense-registration-manager-DZWwSdsc.js.map