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

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

@@ -1,70 +1,70 @@
-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";
+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";
 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 || {}), 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--)
+    (n = e[s]) && (i = n(i) || i);
+  return i;
 };
-const G = "ingredient-model";
-let Pe = class {
+const U = "ingredient-model";
+let me = class {
   constructor(e, {
     name: t,
     type: r,
-    data: s,
+    data: a,
     ingredientId: i,
-    ...a
+    ...s
   }) {
     o(this, "id");
     o(this, "ingredientId");
     o(this, "name");
     o(this, "type");
     o(this, "data");
-    this.id = e, this.ingredientId = i, this.name = t, this.type = r, this.data = s, Object.assign(this, a);
+    this.id = e, this.ingredientId = i, this.name = t, this.type = r, this.data = a, Object.assign(this, s);
   }
   updateModel({
     name: e,
     type: t,
     data: r,
-    ingredientId: s,
+    ingredientId: a,
     ...i
   }) {
-    this.name = e, this.type = t, this.ingredientId = s, this.data = r, Object.assign(this, i);
+    this.name = e, this.type = t, this.ingredientId = a, this.data = r, Object.assign(this, i);
   }
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-Pe = Dt([
-  I(G)
-], Pe);
-const je = {
+me = Rt([
+  I(U)
+], me);
+const Be = {
   registration: {
-    [G]: {
-      class: Pe,
+    [U]: {
+      class: me,
       singleton: !1
     }
   },
-  type: G,
-  predicate: b(G),
-  factory: v.Factory.create(G)
-}, { URL: Fe } = S("INGREDIENT_SERVICE"), { getOne: Tt } = C.build({
-  basePath: `${Fe}/api/ext/dispense/ingredients`
-}), Nt = async () => await Tt({
-  urlOverride: `${Fe}/api/ext/dispense/ingredients`
+  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`
 });
-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--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && zt(t, r, i), i;
+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--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Nt(t, r, i), i;
 };
-const j = "ingredient-container-model", xt = m.createLogger({ name: "ingredient-container-model" });
-let se = class {
+const G = "ingredient-container-model", zt = f.createLogger({ name: "ingredient-container-model" });
+let ie = class {
   constructor(e, t) {
     o(this, "id");
     o(this, "ingredients");
-    this.id = e, this.ingredients = new R({
+    this.id = e, this.ingredients = new C({
       indexMap: {
         ingredientType: "type"
       },
@@ -80,21 +80,21 @@ let se = class {
   }
   async load(e) {
     var i;
-    xt.debug(`loading ingredient container ${this.id}`);
-    const t = await Nt();
+    zt.debug(`loading ingredient container ${this.id}`);
+    const t = await Dt();
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load ingredients");
-    const r = await N.executeLoaderExtension({
+    const r = await T.executeLoaderExtension({
       context: e,
       extension: u.IngredientLoader
-    }), s = (t == null ? void 0 : t.data) ?? {};
-    for (const a of Object.keys(s))
-      for (const n of ((i = t == null ? void 0 : t.data) == null ? void 0 : i[a]) || []) {
-        const c = await N.executeDataMapperExtension({
+    }), a = (t == null ? void 0 : t.data) ?? {};
+    for (const s of Object.keys(a))
+      for (const n of ((i = t == null ? void 0 : t.data) == null ? void 0 : i[s]) || []) {
+        const c = await T.executeDataMapperExtension({
           extension: u.IngredientMapper,
           data: n,
           contextData: r
-        }), l = await N.executePropertyMapperExtension({
+        }), l = await T.executePropertyMapperExtension({
           extension: u.IngredientTypeMapper,
           data: n,
           contextData: r
@@ -103,7 +103,7 @@ let se = class {
           type: l || n.type,
           ...c,
           data: c
-        }, y = je.factory(n.id)(
+        }, y = Be.factory(n.id)(
           p
         );
         this.ingredients.addModel(y);
@@ -111,92 +111,92 @@ let se = class {
   }
   // -------------------ENTITY----------------------------
 };
-He([
+Ge([
   M
-], se.prototype, "ingredients", 2);
-se = He([
-  I(j)
-], se);
-const Ke = {
+], ie.prototype, "ingredients", 2);
+ie = Ge([
+  I(G)
+], ie);
+const je = {
   registration: {
-    [j]: {
-      class: se,
+    [G]: {
+      class: ie,
       singleton: !0
     }
   },
-  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({
+  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({
   name: "holder-service",
   group: "Services"
-}), ai = async () => await At({}), Gt = async (e, t) => {
+}), ti = async () => await Lt({}), Bt = async (e, t) => {
   if (!e || !t)
     throw new Error("Missing holderPath or ingredientId");
-  return await Ve({
+  return await Fe({
     model: { holderPath: e, ingredientId: t },
-    urlOverride: `${he}/api/ext/dispense/assignments`
+    urlOverride: `${ue}/api/ext/dispense/assignments`
   });
-}, jt = async (e) => {
+}, Ut = 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: `${ue}/api/ext/dispense/assignments/${e}`
   });
-}, Ft = async (e) => {
+}, Gt = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return Ut.debug(
+  return xt.debug(
     `sending POST request to /api/ext/dispense/pumpEvents/replaceLine/${e}`
-  ), await Ve({
+  ), await Fe({
     model: {},
-    urlOverride: `${he}/api/ext/dispense/pumpEvents/replaceLine/${e}`
+    urlOverride: `${ue}/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: jt, postModel: He, deleteModel: Ft } = R.build({
   destinationAddress: "",
   basePath: `${ae}/api/ext/dispense/assignments`
-}), ne = window.kosUseFos, ni = async () => await Ht({ fos: ne }), Vt = async (e, t) => {
-  var i, a, n, c;
-  const r = JSON.stringify(t), s = `${ae}/api/ext/dispense/assignments`;
+}), se = window.kosUseFos, ri = async () => await jt({ fos: se }), Ht = async (e, t) => {
+  var i, s, n, c;
+  const r = JSON.stringify(t), a = `${ae}/api/ext/dispense/assignments`;
   try {
-    const l = await Ye({
+    const l = await He({
       model: { holderPath: e, factoryJson: r },
-      urlOverride: s
+      urlOverride: a
     });
     return (l == null ? void 0 : l.status) === 200 && ((i = l == null ? void 0 : l.data) != null && i.error) ? [l.data.error || "unknownError", l.data] : [void 0, l == null ? void 0 : l.data];
   } catch (l) {
-    if (l instanceof ht)
+    if (l instanceof pt)
       return [
-        ((n = (a = l.payload) == null ? void 0 : a.data) == null ? void 0 : n.error) || "unknownError",
+        ((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];
-}, oi = async (e) => {
-  const t = ne ? `${ae}/api/ingredients/assignments/${e.holderPath}` : `${ae}/api/ext/dispense/assignments`;
-  return await Ye({
+}, ii = async (e) => {
+  const t = se ? `${ae}/api/ingredients/assignments/${e.holderPath}` : `${ae}/api/ext/dispense/assignments`;
+  return await He({
     model: { ...e, fuelGauge: 680 },
-    fos: ne,
+    fos: se,
     urlOverride: t
   });
-}, di = async (e) => await Kt({ id: e, fos: ne });
-var Yt = Object.defineProperty, kt = Object.getOwnPropertyDescriptor, ge = (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;
+}, 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--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Vt(t, r, i), i;
 };
-const F = D.Holder, De = m.createLogger({ name: "holder-model" });
-h[Me].register(
+const j = D.Holder, Re = f.createLogger({ name: "holder-model" });
+g[be].register(
   "holder",
   async (e) => {
     const t = [];
     return t.push(...e.data.holderPaths), t;
   }
 );
-h[W].register(
+g[q].register(
   "pump",
   async (e) => {
     if (e.data.pumpPath) {
@@ -215,13 +215,13 @@ h[W].register(
     return {};
   }
 );
-h[W].register(
+g[q].register(
   "holder",
   async (e) => e.data.holderNames.length > 0 ? {
     holderName: e.data.holderNames[0] || ""
   } : {}
 );
-h[W].register(
+g[q].register(
   "container",
   async (e) => {
     if (e.data.ingredients.length > 0) {
@@ -235,20 +235,20 @@ h[W].register(
     return {};
   }
 );
-class Zt extends Error {
-  constructor(r, s) {
-    super(s);
+class kt extends Error {
+  constructor(r, a) {
+    super(a);
     o(this, "type");
     this.name = "AssignmentError", this.type = r;
   }
 }
-let L = class {
+let J = class {
   constructor(e, {
     path: t,
     name: r,
-    ingredientSource: s,
+    ingredientSource: a,
     ingredientId: i,
-    ingredientType: a,
+    ingredientType: s,
     slice: n,
     group: c,
     data: l,
@@ -267,8 +267,7 @@ let L = class {
     o(this, "enjoyByDate");
     o(this, "pumps");
     o(this, "ingredientContainer");
-    o(this, "troubleContainer");
-    this.id = e, this.path = t, this.name = r, this.ingredientType = a, this.ingredientSource = s, this.ingredientId = i, this.group = c, this.slice = n, this.enjoyByDate = p, this.data = l, this.pumps = new R({
+    this.id = e, this.path = t, this.name = r, this.ingredientType = s, this.ingredientSource = a, this.ingredientId = i, this.group = c, this.slice = n, this.enjoyByDate = p, this.data = l, this.pumps = new C({
       parentId: e,
       sortKey: "path"
     }), this.logger = y.logger;
@@ -277,14 +276,14 @@ let L = class {
     path: e,
     name: t,
     ingredientSource: r,
-    ingredientId: s,
+    ingredientId: a,
     ingredientType: i,
-    group: a,
+    group: s,
     slice: n,
     enjoyByDate: c,
     data: l
   }) {
-    this.path = e, this.name = t, this.ingredientId = s, this.ingredientType = i, this.ingredientSource = r, this.enjoyByDate = c, this.slice = n, this.group = a, this.data = l;
+    this.path = e, this.name = t, this.ingredientId = a, this.ingredientType = i, this.ingredientSource = r, this.enjoyByDate = c, this.slice = n, this.group = s, this.data = l;
   }
   get hasEnjoyByDate() {
     return !!this.enjoyByDate && !this.unassigned;
@@ -309,8 +308,8 @@ let L = class {
     return this.logger.debug(`isPouring: ${!!e}`), e;
   }
   async performIntent(e) {
-    const t = typeof e == "string" ? e : e.intent, r = typeof e == "string" ? void 0 : e.pumpPath, s = r ? this.pumps.getModel(r) : this.pumps.data[0];
-    return s == null ? void 0 : s.performIntent({ intent: t });
+    const t = typeof e == "string" ? e : e.intent, r = typeof e == "string" ? void 0 : e.pumpPath, a = r ? this.pumps.getModel(r) : this.pumps.data[0];
+    return a == null ? void 0 : a.performIntent({ intent: t });
   }
   get pourState() {
     return this.pumps.data.reduce((t, r) => r.pouringState ? r.pouringState : t, "");
@@ -343,18 +342,6 @@ let L = class {
   get previousIngredientName() {
     return this.previousIngredient ? this.previousIngredient.displayName ?? this.previousIngredient.name : this.prevIngredientId ? "unknown" : "";
   }
-  get troubles() {
-    return this.troubleContainer.troubles.getIndexByKey("byIface", this.path).sort((e, t) => t.rank - e.rank);
-  }
-  get troubleStatus() {
-    return "";
-  }
-  get troublesByType() {
-    return this.troubles.reduce(
-      Ae,
-      {}
-    );
-  }
   get prevIngredientId() {
     var e, t;
     return (t = (e = this.pumps.data) == null ? void 0 : e[0]) == null ? void 0 : t.prevIngredientId;
@@ -384,7 +371,7 @@ let L = class {
     return this.hasMaxVolume && this.hasRemainingVolume;
   }
   updateIngredient(e) {
-    this.ingredientId !== e && g(() => {
+    this.ingredientId !== e && h(() => {
       this.ingredientId = e;
     });
   }
@@ -396,33 +383,33 @@ let L = class {
     if (!e)
       throw new Error("Invalid override");
     try {
-      const [t, r] = await Vt(this.path, e);
+      const [t, r] = await Ht(this.path, e);
       if (t)
-        throw new Zt(
+        throw new kt(
           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) {
-      throw De.error(`Failed to perform rfid override on holder ${this.id}`, t), t;
+      throw Re.error(`Failed to perform rfid override on holder ${this.id}`, t), t;
     }
   }
   async assignIngredient(e) {
     try {
-      e ? await Gt(this.path, e) : await jt(this.path), g(() => {
+      e ? await Bt(this.path, e) : await Ut(this.path), h(() => {
         this.ingredientId = e;
       });
     } catch (t) {
-      throw De.error(`Failed to perform assign ingredient to holder ${this.id}`, t), t;
+      throw Re.error(`Failed to perform assign ingredient to holder ${this.id}`, t), t;
     }
   }
   get shouldDefer() {
     return this.troubles.some((e) => e.shouldDefer);
   }
   async replaceLine() {
-    await Ft(this.path);
+    await Gt(this.path);
   }
   // -------------------LIFECYCLE----------------------------
   // ----------------------------------
@@ -444,70 +431,68 @@ let L = class {
   // }
   // -------------------ENTITY----------------------------
 };
-ge([
+_e([
   M
-], L.prototype, "pumps", 2);
-ge([
-  ce({ modelType: Ke.type })
-], L.prototype, "ingredientContainer", 2);
-ge([
-  ce({ modelType: xe.type })
-], L.prototype, "troubleContainer", 2);
-L = ge([
-  I(F)
-], L);
-const ke = {
+], J.prototype, "pumps", 2);
+_e([
+  ze({ modelType: je.type })
+], J.prototype, "ingredientContainer", 2);
+J = _e([
+  I(j),
+  ut()
+], J);
+const Ve = {
   registration: {
-    [F]: {
-      class: L,
+    [j]: {
+      class: J,
       singleton: !1
     }
   },
-  type: F,
-  predicate: b(F),
-  factory: v.Factory.create(F)
-}, Xt = async (e, t) => {
-  var Re;
-  const r = h.propertyMapper.executeMapper(
+  type: j,
+  predicate: b(j),
+  factory: v.Factory.create(j)
+}, Yt = async (e, t) => {
+  var Se;
+  const r = g.propertyMapper.executeMapper(
     u.HolderIngredientMapper,
     t
-  ), s = h.propertyMapper.executeMapper(
+  ), a = g.propertyMapper.executeMapper(
     u.HolderTypeMapper,
     t
-  ) || t.ingType, i = await N.executeDataMapperExtension({
+  ) || t.ingType, i = await T.executeDataMapperExtension({
     extension: u.HolderMapper,
     data: t,
     contextData: {}
-  }), { name: a, path: n, ingredientId: c, ingType: l, ingSource: p, slice: y, ...U } = t, f = { ...U, ...i }, T = y || { pos: 0 }, re = {
-    name: a,
+  }), { name: s, path: n, ingredientId: c, ingType: l, ingSource: p, slice: y, ...B } = t, m = { ...B, ...i }, N = y || { pos: 0 }, te = {
+    name: s,
     path: n,
     ingredientId: r || c,
-    ingredientType: s || l,
+    ingredientType: a || l,
     ingredientSource: p,
-    enjoyByDate: (Re = t.container) != null && Re.enjoyByDate ? new Date(t.container.enjoyByDate) : void 0,
-    slice: T,
+    enjoyByDate: (Se = t.container) != null && Se.enjoyByDate ? new Date(t.container.enjoyByDate) : void 0,
+    slice: N,
     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 Ve.factory(t.path)(te);
+}, { URL: Zt } = S("ASSEMBLY_SERVICE"), { getOne: Xt } = R.build({
+  basePath: `${Zt}/api/kos/device/assemblies`
+}), Jt = 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--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && Qt(t, r, i), i;
+}), 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--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && qt(t, r, i), i;
 };
-const H = "board-container-model", Xe = "/kos/hardware/board/linked", Je = "/kos/hardware/board/unlinked";
-let x = class {
+const F = "board-container-model", ke = "/kos/hardware/board/linked", Ye = "/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 R({
+    this.id = e, this.logger = r.logger, this.models = new C({
       parentId: e,
       extensionId: u.BoardIndex
     });
@@ -532,52 +517,52 @@ let x = class {
     r.updateModel(e);
   }
   handleBoardLinkEvent(e) {
-    this.logger.debug(`handling ${Xe} event ${e}`), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
+    this.logger.debug(`handling ${ke} event ${e}`), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
   }
   handleBoardUnlinkEvent(e) {
     this.logger.debug(
-      `handling ${Je} event ${e}`
+      `handling ${Ye} event ${e}`
     ), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
   }
 };
-ye([
+ge([
   M
-], x.prototype, "models", 2);
-ye([
-  Q({
-    lifecycle: Be.INIT,
-    topic: Xe,
+], L.prototype, "models", 2);
+ge([
+  W({
+    lifecycle: Le.INIT,
+    topic: ke,
     websocket: !0
   })
-], x.prototype, "handleBoardLinkEvent", 1);
-ye([
-  Q({
-    lifecycle: Be.INIT,
-    topic: Je,
+], L.prototype, "handleBoardLinkEvent", 1);
+ge([
+  W({
+    lifecycle: Le.INIT,
+    topic: Ye,
     websocket: !0
   })
-], x.prototype, "handleBoardUnlinkEvent", 1);
-x = ye([
-  I(H)
-], x);
-const tr = async (e) => {
+], L.prototype, "handleBoardUnlinkEvent", 1);
+L = ge([
+  I(F)
+], L);
+const Qt = 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--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && rr(t, r, i), i;
+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--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && er(t, r, i), i;
 };
-const K = D.PumpContainer;
-var We = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(We || {});
-let oe = class {
+const H = D.PumpContainer;
+var Xe = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(Xe || {});
+let ne = class {
   constructor(e, t) {
     o(this, "id");
     o(this, "pumps");
-    this.id = e, this.pumps = new R({
+    this.id = e, this.pumps = new C({
       indexMap: {
         byNozzle: (r) => r.nozzlePaths,
         byBoard: (r) => r.boardPath,
@@ -621,69 +606,69 @@ let oe = class {
   }
   // -------------------ENTITY----------------------------
 };
-qe([
+Ze([
   M
-], oe.prototype, "pumps", 2);
-oe = qe([
-  I(K)
-], oe);
-const Oe = {
+], ne.prototype, "pumps", 2);
+ne = Ze([
+  I(H)
+], ne);
+const Me = {
   registration: {
-    [K]: {
-      class: oe,
+    [H]: {
+      class: ne,
       singleton: !0
     }
   },
-  type: K,
-  predicate: b(K),
+  type: H,
+  predicate: b(H),
   factory: v.Singleton.create(
-    K
+    H
   )
-}, Qe = async (e) => {
-  const t = [], { model: r } = await Ue(e);
+}, Je = async (e) => {
+  const t = [], { model: r } = await Ae(e);
   return r && (t.push(r.boardPath), t.push(r.nozzlePath), t.push(r.holderPath)), t;
-}, sr = async (e) => {
+}, rr = async (e) => {
   const t = [], r = e.data.pumpPath;
   t.push(r);
-  const s = await Qe(r);
-  return [...t, ...s];
-}, ar = async (e) => {
+  const a = await Je(r);
+  return [...t, ...a];
+}, ir = async (e) => {
   const t = [], r = e.data.boardPath;
   t.push(e.data.boardPath);
-  const s = await Ue(
-    Oe.type
+  const a = await Ae(
+    Me.type
   );
-  if (s != null && s.model) {
-    const a = s.model.models.getIndexByKey(
-      We.byBoard,
+  if (a != null && a.model) {
+    const s = a.model.models.getIndexByKey(
+      Xe.byBoard,
       r
     ).map(
-      (c) => Qe(c.path)
+      (c) => Je(c.path)
     );
-    (await Promise.allSettled(a)).forEach((c) => {
+    (await Promise.allSettled(s)).forEach((c) => {
       c.status === "fulfilled" && c.value.forEach((l) => t.push(l));
     });
   }
   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, 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--)
+    (n = e[s]) && (i = n(i) || i);
+  return i;
 };
-const V = "board-model", Te = (e, t) => {
-  const { type: r, name: s, path: i, linked: a, instanceId: n, link: c, ...l } = e;
-  t.type = r, t.name = s, t.path = i, t.linked = a, t.link = Object.freeze(c), t.instanceId = n, Object.assign(t, l);
+const V = "board-model", Ce = (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);
 };
-h[Me].register(
+g[be].register(
   "board",
-  ar
+  ir
 );
-h[W].register(
+g[q].register(
   "board",
-  tr
+  Qt
 );
-let be = class {
+let fe = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "type");
@@ -692,10 +677,10 @@ let be = class {
     o(this, "linked");
     o(this, "instanceId");
     o(this, "logger");
-    this.id = e, this.logger = r.logger, Te(t, this);
+    this.id = e, this.logger = r.logger, Ce(t, this);
   }
   updateModel(e) {
-    Te(e, this);
+    Ce(e, this);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -705,47 +690,47 @@ let be = class {
     this.logger.debug(`loading board ${this.id}`);
   }
 };
-be = dr([
+fe = sr([
   I(V)
-], be);
-const et = {
+], fe);
+const qe = {
   registration: {
     [V]: {
-      class: be,
+      class: fe,
       singleton: !1
     }
   },
   type: V,
   predicate: b(V),
   factory: v.Factory.create(V)
-}, tt = {
+}, We = {
   registration: {
-    [H]: {
-      class: x,
+    [F]: {
+      class: L,
       singleton: !0
     },
-    ...et.registration
+    ...qe.registration
   },
-  type: H,
-  predicate: b(H),
+  type: F,
+  predicate: b(F),
   factory: v.Singleton.create(
-    H
+    F
   )
 };
-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--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && lr(t, r, i), i;
+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--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && nr(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, 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 {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "holders");
     o(this, "logger");
-    this.id = e, this.holders = new R({
+    this.id = e, this.holders = new C({
       indexMap: {
-        nozzle: (s) => s.nozzlePaths,
+        nozzle: (a) => a.nozzlePaths,
         group: "group"
       },
       parentId: e,
@@ -755,26 +740,26 @@ let A = class {
   updateModel() {
   }
   handleHolderEvents(e) {
-    var r, s, i;
-    m.ifDebug(
+    var r, a, i;
+    f.ifDebug(
       () => this.logger.debug("Received holder change event", JSON.stringify(e))
     );
     const t = this.holders.getModel(e.path);
     t && (this.logger.info(
       `Received change event for holder ${t.path}.  Updating fuel gauge data.`
-    ), t.slice.currentVolMl = (r = e.slice) == null ? void 0 : r.currentVolMl, t.slice.maxVolMl = (s = e.slice) == null ? void 0 : s.maxVolMl, (i = e == null ? void 0 : e.container) != null && i.enjoyByDate ? t.enjoyByDate = new Date(e.container.enjoyByDate) : t.enjoyByDate = void 0);
+    ), t.slice.currentVolMl = (r = e.slice) == null ? void 0 : r.currentVolMl, t.slice.maxVolMl = (a = e.slice) == null ? void 0 : a.maxVolMl, (i = e == null ? void 0 : e.container) != null && i.enjoyByDate ? t.enjoyByDate = new Date(e.container.enjoyByDate) : t.enjoyByDate = void 0);
   }
   handleInsertion(e) {
-    m.ifDebug(
+    f.ifDebug(
       () => this.logger.debug("Received insertion event", JSON.stringify(e))
     ), (Array.isArray(e) ? e : [e]).forEach((r) => {
-      g(() => {
-        var a, n, c;
-        const s = r.ingredientId, i = this.holders.getModel(r.path);
+      h(() => {
+        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(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(() => {
+        ), 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(() => {
             const p = i.pumps.getModel(l.path);
             p && (p.ingredientId = l.ingredientId, p.inserted = l.inserted, p.prevIngredientId = l.prevIngredientId);
           });
@@ -784,92 +769,92 @@ let A = class {
   }
   // -------------------ENTITY----------------------------
 };
-Ie([
+he([
   M
 ], A.prototype, "holders", 2);
-Ie([
-  Q({
-    topic: Ir,
+he([
+  W({
+    topic: gr,
     websocket: !0,
     condition: (e, t) => t.holders.getModel(e.path) !== void 0
   })
 ], A.prototype, "handleHolderEvents", 1);
-Ie([
-  Q({
+he([
+  W({
     topic: [
+      dr,
+      lr,
+      cr,
       pr,
-      ur,
-      hr,
-      gr,
-      yr
+      ur
     ],
     websocket: !0
   })
 ], A.prototype, "handleInsertion", 1);
-A = Ie([
-  I(Y)
+A = he([
+  I(K)
 ], A);
-const rt = {
+const Qe = {
   registration: {
-    [Y]: {
+    [K]: {
       class: A,
       singleton: !0
     }
   },
-  type: Y,
-  predicate: b(Y),
+  type: K,
+  predicate: b(K),
   factory: v.Singleton.create(
-    Y
+    K
   )
-}, fr = m.createLogger({ name: "board-utils" }), mr = async (e) => {
-  const t = await N.executeDataMapperExtension({
+}, hr = f.createLogger({ name: "board-utils" }), yr = async (e) => {
+  const t = await T.executeDataMapperExtension({
     extension: u.BoardMapper,
     data: e,
     contextData: {}
-  }), { type: r, name: s, path: i, linked: a, instanceId: n, ...c } = e, l = { ...c, ...t }, p = {
+  }), { type: r, name: a, path: i, linked: s, instanceId: n, ...c } = e, l = { ...c, ...t }, p = {
     type: r,
-    name: s,
+    name: a,
     path: i,
-    linked: a,
+    linked: s,
     instanceId: n,
     ...l
-  }, y = et.factory(e.path)(p);
+  }, y = qe.factory(e.path)(p);
   return y.updateModel(p), y;
-}, Pr = (e) => async (t) => {
-  fr.debug(`adding board ${t.name}`);
-  const r = await mr(t);
+}, Ir = (e) => async (t) => {
+  hr.debug(`adding board ${t.name}`);
+  const r = await yr(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({
-  basePath: `${Ee}/api/kos/holders`
+const { URL: Oe } = S("PUMP_SERVICE"), { postModel: mr, getOne: fr } = R.build({
+  basePath: `${Oe}/api/kos/holders`
 });
-m.createLogger({
+f.createLogger({
   name: "pump-service",
   group: "Services"
 });
-const _r = async ({
+const Pr = 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 });
-  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 });
-  return s != null && s.data ? s.data : { volume: -1 };
+  const a = `${Oe}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await mr({ 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 });
+  return a != null && a.data ? a.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--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && Or(t, r, i), i;
+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--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && br(t, r, i), i;
 };
 const k = D.Pump;
-h[Me].register(
+g[be].register(
   "pump",
-  sr
+  rr
 );
-let q = class {
+let oe = class {
   constructor(e, t) {
     o(this, "id");
     o(this, "inserted");
@@ -883,50 +868,37 @@ let q = class {
     o(this, "name");
     o(this, "path");
     o(this, "prevIngredientId");
-    o(this, "troubleContainer");
     o(this, "futureHandler");
     o(this, "currentState", d.IDLE);
     this.id = e;
     const {
       inserted: r,
-      holderPath: s,
+      holderPath: a,
       boardPath: i,
-      nozzlePath: a,
+      nozzlePath: s,
       name: n,
       path: c,
       childPump: l,
       virtual: p,
       prevIngredientId: y,
-      ...U
+      ...B
     } = t;
-    this.inserted = r, this.type = t.type, this.ingredientId = t.ingredientId, this.holderPath = s, this.boardPath = i, this.nozzlePath = a, this.name = n, this.path = c, this.childPump = !!l, this.virtual = !!p, this.prevIngredientId = y, Object.assign(this, U), this.futureHandler = new Ge(this);
+    this.inserted = r, this.type = t.type, this.ingredientId = t.ingredientId, this.holderPath = a, this.boardPath = i, this.nozzlePath = s, this.name = n, this.path = c, this.childPump = !!l, this.virtual = !!p, this.prevIngredientId = y, Object.assign(this, B), this.futureHandler = new xe(this);
   }
   updateModel(e) {
     const {
       inserted: t,
       holderPath: r,
-      boardPath: s,
+      boardPath: a,
       nozzlePath: i,
-      childPump: a,
+      childPump: s,
       name: n,
       path: c,
       ...l
     } = e;
-    this.inserted = t, this.type = e.type, this.ingredientId = e.ingredientId, this.holderPath = r, this.boardPath = s, this.nozzlePath = i, this.childPump = this.childPump ? this.childPump : !!a, this.name = n, this.path = c, this.prevIngredientId = e.prevIngredientId, Object.assign(this, l);
+    this.inserted = t, this.type = e.type, this.ingredientId = e.ingredientId, this.holderPath = r, this.boardPath = a, this.nozzlePath = i, this.childPump = this.childPump ? this.childPump : !!s, this.name = n, this.path = c, this.prevIngredientId = e.prevIngredientId, Object.assign(this, l);
   }
   // -------------------LIFECYCLE----------------------------
-  get troubles() {
-    return this.troubleContainer.troubles.getIndexByKey("byIface", this.path).sort((e, t) => t.rank - e.rank);
-  }
-  get troubleStatus() {
-    return "";
-  }
-  get troublesByType() {
-    return this.troubles.reduce(
-      Ae,
-      {}
-    );
-  }
   get pouringState() {
     var e;
     return ((e = this.future) == null ? void 0 : e.endState) || "";
@@ -939,21 +911,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,43 +935,40 @@ 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 a = await Pr({
           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;
+        }), a == null ? void 0 : a.data;
       } else
         throw new Error(`Cannot pour in state ${this.currentState}`);
-    } catch (s) {
-      throw m.error(s), this.currentState = d.IDLE, s;
+    } catch (a) {
+      throw f.error(a), this.currentState = d.IDLE, a;
     }
   }
   // -------------------ENTITY----------------------------
 };
-we([
-  ce({ modelType: xe.type })
-], q.prototype, "troubleContainer", 2);
-we([
-  ue()
-], q.prototype, "performIntent", 1);
-q = we([
+et([
+  pe()
+], oe.prototype, "performIntent", 1);
+oe = et([
   I(k)
-], q);
-const it = {
+], oe);
+const tt = {
   registration: {
     [k]: {
-      class: q,
+      class: oe,
       singleton: !1
     }
   },
   type: k,
   predicate: b(k),
   factory: v.Factory.create(k)
-}, wr = m.createLogger({ name: "pump-utils" }), $r = (e, t) => {
-  const r = (t.pumps ?? []).length > 1, s = {
+}, Mr = f.createLogger({ name: "pump-utils" }), Or = (e, t) => {
+  const r = (t.pumps ?? []).length > 1, a = {
     boardPath: t.boardPath,
     holderPath: t.holderPath,
     ingredientId: t.ingredientId,
@@ -1011,30 +980,30 @@ const it = {
     type: t.type,
     nozzlePath: e,
     prevIngredientId: t.prevIngredientId
-  }, i = it.factory(t.path)(s);
-  return i.updateModel(s), i;
-}, st = (e) => (t) => (r) => (s) => {
+  }, i = tt.factory(t.path)(a);
+  return i.updateModel(a), i;
+}, rt = (e) => (t) => (r) => (a) => {
   var c;
-  wr.debug(`adding pump ${s.name}`);
-  const i = $r(r.path, s);
+  Mr.debug(`adding pump ${a.name}`);
+  const i = Or(r.path, a);
   e.addModel(i);
-  const a = i.holderPath, n = t.holders.getModel(a);
-  n == null || n.pumps.addModel(i), n != null && n.nozzlePaths.includes(r.path) || n == null || n.nozzlePaths.push(r.path), (c = s == null ? void 0 : s.pumps) == null || c.forEach((l) => {
+  const s = i.holderPath, n = t.holders.getModel(s);
+  n == null || n.pumps.addModel(i), n != null && n.nozzlePaths.includes(r.path) || n == null || n.nozzlePaths.push(r.path), (c = a == null ? void 0 : a.pumps) == null || c.forEach((l) => {
     const p = i.holderPath, y = {
       ...l,
       childPump: !0,
       holderPath: p,
       ingredientId: i.ingredientId
     };
-    st(e)(t)(r)(y);
+    rt(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--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && Sr(t, r, i), i;
+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--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Er(t, r, i), i;
 };
-const Z = "assembly-model", Rr = "assembly-data", Dr = "assembly-raw-data";
+const Y = "assembly-model", $r = "assembly-data", Sr = "assembly-raw-data";
 let w = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -1044,7 +1013,7 @@ let w = class {
     o(this, "boardContainer");
     o(this, "pumpContainer");
     o(this, "logger");
-    this.id = e, this.holderContainer = rt.factory({}), this.boardContainer = tt.factory({}), this.pumpContainer = Oe.factory({}), this.logger = r.logger;
+    this.id = e, this.holderContainer = Qe.factory({}), this.boardContainer = We.factory({}), this.pumpContainer = Me.factory({}), this.logger = r.logger;
   }
   updateModel(e) {
   }
@@ -1087,93 +1056,93 @@ 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[gt].execute(
       u.AssemblyFeatureFlags,
       this
     );
   }
   async load(e) {
     this.logger.debug(`loading assembly ${this.id}`);
-    const t = await Ze();
+    const t = await Ke();
     if ((t == null ? void 0 : t.status) === 200) {
-      const r = await N.executeDataMapperExtension({
+      const r = await T.executeDataMapperExtension({
         extension: u.AssemblyMapper,
         data: t.data,
         contextData: {}
       });
-      e.set(Rr, 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);
-      for await (const s of t.data.assemblies) {
+      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);
+      for await (const a of t.data.assemblies) {
         const {
           boards: i = [],
-          holders: a = {},
+          holders: s = {},
           nozzles: n = [],
           core: c,
           name: l,
           path: p,
           ...y
-        } = s;
-        this.logger.debug(`adding assembly ${l}`), Object.keys(y).forEach((f) => {
-          ft.enableFeature(f);
+        } = a;
+        this.logger.debug(`adding assembly ${l}`), Object.keys(y).forEach((m) => {
+          It.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(
-          a ?? {}
+        for await (const m of i)
+          this.logger.debug(`adding board ${m.name}`), await Ir(this.boardContainer)(m);
+        for await (const [m, N] of Object.entries(
+          s ?? {}
         ))
-          for await (const re of T) {
-            this.logger.debug(`adding holder ${re.name}`);
-            const Ce = await Xt(f, re);
-            this.holderContainer.holders.addModel(Ce);
+          for await (const te of N) {
+            this.logger.debug(`adding holder ${te.name}`);
+            const $e = await Yt(m, te);
+            this.holderContainer.holders.addModel($e);
           }
-        const U = st(this.pumpContainer)(
+        const B = rt(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 N = B(m);
+          m.pumps.forEach(N);
         });
       }
     }
   }
 };
-ee([
-  ce({
+Q([
+  ze({
     modelType: "trouble-container-model"
   })
 ], w.prototype, "troubleContainer", 2);
-ee([
+Q([
   M
 ], w.prototype, "holderContainer", 2);
-ee([
+Q([
   M
 ], w.prototype, "boardContainer", 2);
-ee([
+Q([
   M
 ], w.prototype, "pumpContainer", 2);
-w = ee([
-  I(Z)
+w = Q([
+  I(Y)
 ], w);
-const at = {
+const it = {
   registration: {
-    [Z]: {
+    [Y]: {
       class: w,
       singleton: !0
     }
   },
-  type: Z,
-  predicate: b(Z),
-  factory: v.Singleton.create(Z)
+  type: Y,
+  predicate: b(Y),
+  factory: v.Singleton.create(Y)
 };
-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, 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--)
+    (n = e[s]) && (i = n(i) || i);
+  return i;
 };
-const X = D.Availability;
-let ve = class {
+const Z = D.Availability;
+let Pe = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "data");
@@ -1199,57 +1168,57 @@ let ve = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-ve = zr([
+Pe = Cr([
   mt(),
-  I(X)
-], ve);
-const _e = {
+  I(Z)
+], Pe);
+const ve = {
   registration: {
-    [X]: {
-      class: ve,
+    [Z]: {
+      class: Pe,
       singleton: !1
     }
   },
-  type: X,
-  predicate: b(X),
+  type: Z,
+  predicate: b(Z),
   factory: v.Factory.create(
-    X
+    Z
   )
-}, { URL: B } = S("NOZZLE_SERVICE"), { postModel: $e, deleteModel: Lr, getOne: xr } = C.build({
-  basePath: `${B}/api/nozzle`
-}), Ar = async (e, t) => {
-  const r = await $e({
+}, { URL: x } = S("NOZZLE_SERVICE"), { postModel: Ee, deleteModel: Dr, getOne: Nr } = R.build({
+  basePath: `${x}/api/nozzle`
+}), Tr = async (e, t) => {
+  const r = await Ee({
     model: {},
-    urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/pour`,
+    urlOverride: `${x}/api/ext/dispense/nozzle/${e}/pipeline/beverage/pour`,
     ordered: !0,
     tracker: t
   });
-  return r != null && r.data && pe.initiateFuture(r.data), r;
-}, Br = async (e, t, r) => {
-  const s = await $e({
+  return r != null && r.data && ce.initiateFuture(r.data), r;
+}, zr = async (e, t, r) => {
+  const a = await Ee({
     model: {},
-    urlOverride: `${B}/api/ext/dispense/nozzle/${t}/pipeline/beverage/fixed/${e}`,
+    urlOverride: `${x}/api/ext/dispense/nozzle/${t}/pipeline/beverage/fixed/${e}`,
     ordered: !0,
     tracker: r
   });
-  return s != null && s.data && pe.initiateFuture(s.data), s;
-}, Ur = async (e) => await xr({
-  urlOverride: `${B}${e}/pipeline/beverage/availability`
-}), Gr = async (e, t) => await $e({
+  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({
   model: t,
-  urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
-}), jr = async (e) => await Lr({
+  urlOverride: `${x}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
+}), xr = async (e) => await Dr({
   id: e,
-  urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
+  urlOverride: `${x}/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--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && Fr(t, r, i), i;
+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--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Br(t, r, i), i;
 };
-const J = D.Nozzle, Kr = Pt(
+const X = D.Nozzle, Gr = ft(
   "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";
+), 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";
 let $ = class {
   constructor(e, t, r) {
     /** the unique identifier for this nozzle.*/
@@ -1266,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 bt(this), this._availabilityItems = new R({
+    this.id = e, this.path = t.path, this.name = t.name, this.beverageTopicPrefix = t.beverageTopicPrefix, this.topicPrefix = t.topicPrefix, this.urlPrefix = t.urlPrefix, this._selectedBeverage = void 0, this._selectedBrand = void 0, this._additionalItems = [], this.futureHandler = new Pt(this), this._availabilityItems = new C({
       indexMap: {
         byGroup: "groupId",
         byParent: "parentId"
@@ -1358,7 +1327,7 @@ let $ = class {
     context: r
   }) {
     if (!e) {
-      const c = await jr(this.name);
+      const c = await xr(this.name);
       if ((c == null ? void 0 : c.status) !== 200)
         throw new Error("Failed to clear pourable");
       this._selectedBeverage = void 0;
@@ -1369,7 +1338,7 @@ let $ = class {
       return;
     }
     this._selectedBeverage = e, this._additionalItems = t;
-    let s = await h.dataMapper.executeMapper(
+    let a = await g.dataMapper.executeMapper(
       u.SelectedPourableMapper,
       {
         beverage: e,
@@ -1380,10 +1349,10 @@ let $ = class {
     const i = {
       bevId: e.rawId
     };
-    (!s || Object.keys(s).length === 0) && (this.logger.info(
+    (!a || Object.keys(a).length === 0) && (this.logger.info(
       `No selected pourable mapper defined, using the default payload ${i}`
-    ), s = i);
-    const a = s ?? i, n = await Gr(this.name, a);
+    ), a = i);
+    const s = a ?? i, n = await Ar(this.name, s);
     if ((n == null ? void 0 : n.status) !== 200)
       throw new Error("Failed to select pourable");
   }
@@ -1418,13 +1387,13 @@ let $ = class {
     );
   }
   updateIfCurrent(e, t) {
-    this.currentState === e && g(() => {
+    this.currentState === e && h(() => {
       this.currentState = t;
     });
   }
   onFutureUpdate(e) {
-    E(this).forEach((s) => {
-      ie(s) && s.onPourProgress(e);
+    E(this).forEach((a) => {
+      re(a) && a.onPourProgress(e);
     });
     const r = {
       nozzleId: this.id,
@@ -1437,7 +1406,7 @@ let $ = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    _.publish(Vr, r), e.endState && g(() => {
+    _.publish(jr, r), e.endState && h(() => {
       this.currentState = d.IDLE;
     });
   }
@@ -1447,21 +1416,21 @@ let $ = class {
       if (this.currentState === d.IDLE) {
         if (this.updateIfCurrent(d.IDLE, d.POUR_STARTING), !e)
           throw new Error("No tracker provided");
-        const r = await Ar(this.name, e);
+        const r = await Tr(this.name, e);
         this.updateIfCurrent(d.POUR_STARTING, d.POURING), E(this).forEach((i) => {
-          var a;
-          ie(i) && ((a = i.onPourStart) == null || a.call(i));
+          var s;
+          re(i) && ((s = i.onPourStart) == null || s.call(i));
         });
-        const s = {
+        const a = {
           nozzleId: this.id,
           type: "free"
         };
-        if (_.publish(Ne, s), (t = r == null ? void 0 : r.data) != null && t.endState) {
+        if (_.publish(De, a), (t = r == null ? void 0 : r.data) != null && t.endState) {
           this.updateIfCurrent(d.POURING, d.IDLE);
           const i = {
             nozzleId: this.id
           };
-          _.publish(fe, i);
+          _.publish(ye, i);
         }
         return r;
       } else
@@ -1476,29 +1445,29 @@ 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 a = await zr(e, this.name, t);
+        this.currentState === d.POUR_STARTING && h(() => {
           this.currentState = d.POURING;
-        }), E(this).forEach((a) => {
+        }), E(this).forEach((s) => {
           var n;
-          ie(a) && ((n = a.onPourStart) == null || n.call(a));
+          re(s) && ((n = s.onPourStart) == null || n.call(s));
         });
         const i = {
           nozzleId: this.id,
           type: "fixed"
         };
-        if (_.publish(Ne, i), (r = s == null ? void 0 : s.data) != null && r.endState) {
+        if (_.publish(De, i), (r = a == null ? void 0 : a.data) != null && r.endState) {
           this.updateIfCurrent(d.POURING, d.IDLE);
-          const a = {
+          const s = {
             nozzleId: this.id
           };
-          _.publish(fe, a);
+          _.publish(ye, s);
         }
-        return s;
+        return a;
       } else
         throw new Error(`Cannot pour in state ${this.currentState}`);
-    } catch (s) {
-      throw this.logger.error(s), this.currentState = d.IDLE, s;
+    } catch (a) {
+      throw this.logger.error(a), this.currentState = d.IDLE, a;
     }
   }
   /**
@@ -1507,119 +1476,119 @@ 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;
-        ie(r) && ((s = r.onPourCancel) == null || s.call(r));
+        var a;
+        re(r) && ((a = r.onPourCancel) == null || a.call(r));
       });
       const t = {
         nozzleId: this.id
       };
-      _.publish(fe, t);
+      _.publish(ye, t);
     } else
       this.logger.warn(`Cannot cancel pour in state ${this.currentState}`);
   }
   updateGroupMembers() {
     this._availabilityItems.data.forEach((e) => {
       (e.taggedIds || []).forEach((r) => {
-        const s = this._availabilityItems.data.find(
+        const a = this._availabilityItems.data.find(
           (i) => i.rawId === r
         );
-        s && s.parentId !== e.id && (s.parentId = e.id, this._availabilityItems.updateModel(s));
+        a && a.parentId !== e.id && (a.parentId = e.id, this._availabilityItems.updateModel(a));
       });
     });
   }
   /** @internal */
   async load(e) {
-    var s, i;
+    var a, i;
     this.logger.debug(`loading nozzle ${this.id}`);
-    const t = await Ur(this.urlPrefix);
+    const t = await Lr(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(
+    e == null || e.set(u.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,
-          { ...n, groupId: a },
+          { ...n, groupId: s },
           r
         ), l = {
           ...n,
           note: n.note ?? void 0,
           kosParentId: this.id,
           rawId: n.id,
-          groupId: a,
+          groupId: s,
           data: c,
           properties: n.properties || {}
-        }, p = _e.factory(
-          `${this.id}-${a}-${n.id}`
+        }, p = ve.factory(
+          `${this.id}-${s}-${n.id}`
         )(l);
         this._availabilityItems.addModel(p);
       }
     this.updateGroupMembers();
   }
   async updateAvailability(e) {
-    const t = _t.getContext(this.id), r = (t == null ? void 0 : t.get(u.AvailabilityLoader)) || {};
+    const t = bt.getContext(this.id), r = (t == null ? void 0 : t.get(u.AvailabilityLoader)) || {};
     if (e.rebuild)
-      for (const s of Object.keys(e == null ? void 0 : e.groups) || []) {
-        this._availabilityItems.getIndexByKey("group", s).filter(
-          (a) => !e.groups[s].find(
-            (n) => `${this.id}-${s}-${n.id}` === a.id
+      for (const a of Object.keys(e == null ? void 0 : e.groups) || []) {
+        this._availabilityItems.getIndexByKey("group", a).filter(
+          (s) => !e.groups[a].find(
+            (n) => `${this.id}-${a}-${n.id}` === s.id
           )
-        ).forEach((a) => {
-          this._availabilityItems.removeModel(a.id), Mt(a);
+        ).forEach((s) => {
+          this._availabilityItems.removeModel(s.id), _t(s);
         });
-        for (const a of (e == null ? void 0 : e.groups[s]) || []) {
-          const n = await h.dataMapper.executeMapper(
+        for (const s of (e == null ? void 0 : e.groups[a]) || []) {
+          const n = await g.dataMapper.executeMapper(
             u.AvailabilityMapper,
-            { ...a, groupId: s },
+            { ...s, groupId: a },
             r
           ), c = {
-            ...a,
-            note: a.note ?? void 0,
+            ...s,
+            note: s.note ?? void 0,
             kosParentId: this.id,
-            groupId: s,
-            rawId: a.id,
+            groupId: a,
+            rawId: s.id,
             data: n,
-            taggedIds: a.taggedIds,
-            properties: a.properties || {}
+            taggedIds: s.taggedIds,
+            properties: s.properties || {}
           }, l = this._availabilityItems.getModel(
-            `${this.id}-${s}-${a.id}`
+            `${this.id}-${a}-${s.id}`
           );
           if (l)
             l.updateModel(c);
           else {
-            const p = _e.factory(
-              `${this.id}-${s}-${a.id}`
+            const p = ve.factory(
+              `${this.id}-${a}-${s.id}`
             )(c);
             this._availabilityItems.addModel(p);
           }
         }
       }
     else
-      for (const s of Object.keys(e == null ? void 0 : e.groups) || [])
-        for (const i of (e == null ? void 0 : e.groups[s]) || []) {
-          const a = await h.dataMapper.executeMapper(
+      for (const a of Object.keys(e == null ? void 0 : e.groups) || [])
+        for (const i of (e == null ? void 0 : e.groups[a]) || []) {
+          const s = await g.dataMapper.executeMapper(
             u.AvailabilityMapper,
-            { ...i, groupId: s },
+            { ...i, groupId: a },
             r
           ), n = {
             ...i,
             note: i.note ?? void 0,
             kosParentId: this.id,
-            groupId: s,
+            groupId: a,
             rawId: i.id,
-            data: a,
+            data: s,
             type: i.type,
             taggedIds: i.taggedIds,
             properties: i.properties || {}
           }, c = this._availabilityItems.getModel(
-            `${this.id}-${s}-${i.id}`
+            `${this.id}-${a}-${i.id}`
           );
           c && c.updateModel(n);
         }
@@ -1627,47 +1596,47 @@ let $ = class {
   }
   // -------------------ENTITY----------------------------
 };
-te([
+ee([
   M
 ], $.prototype, "_availabilityItems", 2);
-te([
-  ue()
+ee([
+  pe()
 ], $.prototype, "pour", 1);
-te([
-  ue()
+ee([
+  pe()
 ], $.prototype, "fixedPour", 1);
-te([
-  Q({
-    topic: `${Kr}/availability`,
+ee([
+  W({
+    topic: `${Gr}/availability`,
     websocket: !0
   })
 ], $.prototype, "updateAvailability", 1);
-$ = te([
-  I(J)
+$ = ee([
+  I(X)
 ], $);
-const Se = {
+const we = {
   registration: {
-    [J]: {
+    [X]: {
       class: $,
       singleton: !1
     }
   },
-  type: J,
-  predicate: b(J),
-  factory: v.Factory.create(J)
+  type: X,
+  predicate: b(X),
+  factory: v.Factory.create(X)
 };
-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--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && Yr(t, r, i), i;
+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--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Fr(t, r, i), i;
 };
-const ot = "device-assembly-model";
+const st = "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 R();
+    this.id = e, this.logger = r.logger, this.deviceNozzles = new C();
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1681,46 +1650,46 @@ let de = class {
   }
   async load() {
     this.logger.debug(`loading device-assembly ${this.id}`);
-    const e = await Ze();
+    const e = await Ke();
     (e == null ? void 0 : e.status) === 200 && e.data.assemblies.map((r) => r.nozzles ?? []).flat().forEach((r) => {
       var n;
-      const s = r.path, i = ((n = r.pipelines.find((c) => c.name === "beverage")) == null ? void 0 : n.topicPrefix) || "", a = Se.factory(s)({
+      const a = r.path, i = ((n = r.pipelines.find((c) => c.name === "beverage")) == null ? void 0 : n.topicPrefix) || "", s = we.factory(a)({
         path: r.path,
         name: r.name,
         urlPrefix: r.urlPrefix,
         topicPrefix: r.topicPrefix,
         beverageTopicPrefix: i
       });
-      this.deviceNozzles.addModel(a);
+      this.deviceNozzles.addModel(s);
     });
   }
 };
-nt([
+at([
   M
 ], de.prototype, "deviceNozzles", 2);
-de = nt([
-  I(ot)
+de = at([
+  I(st)
 ], de);
-const Zr = new Ot({
+const Vr = new Mt({
   class: de,
-  type: ot
-}), { URL: dt } = S("GENERIC_POUR_SERVICE"), { postModel: Xr } = C.build({
-  basePath: `${dt}/api/nozzle`
-}), Jr = async (e, t) => {
-  const r = await Xr({
+  type: st
+}), { URL: nt } = S("GENERIC_POUR_SERVICE"), { postModel: Kr } = R.build({
+  basePath: `${nt}/api/nozzle`
+}), kr = async (e, t) => {
+  const r = await Kr({
     model: {},
-    urlOverride: `${dt}${e}`,
+    urlOverride: `${nt}${e}`,
     ordered: !0,
     tracker: t
   });
-  return r != null && r.data && pe.initiateFuture(r.data), r;
+  return r != null && r.data && ce.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--)
-    (n = e[a]) && (i = (s ? n(t, r, i) : n(i)) || i);
-  return s && i && qr(t, r, i), i;
+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--)
+    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
+  return a && i && Yr(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 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;
 let le = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -1730,7 +1699,7 @@ let le = class {
     o(this, "logger");
     o(this, "futureHandler");
     o(this, "selectedId");
-    this.id = e, this.logger = r.logger, this.futureHandler = new Ge(this), this.servicePathFactory = t.servicePathFactory, this.pourType = t.pourType || "free", this.selectedId = t.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;
   }
   get servicePath() {
     return this.selectedId ? this.servicePathFactory(this.selectedId) : "";
@@ -1741,21 +1710,21 @@ 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 kr(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));
+          var s;
+          Ie(i) && ((s = i.onPourStart) == null || s.call(i));
         });
-        const s = {
+        const a = {
           pourTarget: this.id,
           type: this.pourType
         };
-        if (_.publish(Qr, s), (t = r == null ? void 0 : r.data) != null && t.endState) {
+        if (_.publish(Xr, a), (t = r == null ? void 0 : r.data) != null && t.endState) {
           this.updateIfCurrent(d.POURING, d.IDLE);
           const i = {
             pourTarget: this.id
           };
-          _.publish(ze, i);
+          _.publish(Ne, i);
         }
         return r;
       } else
@@ -1767,21 +1736,21 @@ 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));
+        var a;
+        Ie(r) && ((a = r.onPourCancel) == null || a.call(r));
       });
       const t = {
         pourTarget: this.id
       };
-      _.publish(ze, t);
+      _.publish(Ne, t);
     }
     this.currentState === d.IDLE ? this.logger.info("Pour already idle, nothing to cancel.") : this.logger.warn(`Cannot cancel pour in state ${this.currentState}`);
   }
   updateIfCurrent(e, t) {
-    this.currentState === e && g(() => {
+    this.currentState === e && h(() => {
       this.currentState = t;
     });
   }
@@ -1813,7 +1782,7 @@ let le = class {
   }
   onFutureUpdate(e) {
     E(this).forEach((r) => {
-      me(r) && r.onPourProgress(e);
+      Ie(r) && r.onPourProgress(e);
     });
     const t = {
       pourTarget: this.id,
@@ -1826,7 +1795,7 @@ let le = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    _.publish(ei, t), e.endState && g(() => {
+    _.publish(Jr, t), e.endState && h(() => {
       this.currentState = d.IDLE;
     });
   }
@@ -1838,40 +1807,40 @@ let le = class {
     this.logger.debug(`loading generic-pour ${this.id}`);
   }
 };
-lt([
-  ue()
+ot([
+  pe()
 ], le.prototype, "pour", 1);
-le = lt([
-  I(ct)
+le = ot([
+  I(dt)
 ], le);
-const li = new Et({
+const si = new Ot({
   class: le,
-  type: ct
-}), Le = {
-  ...Ke.registration,
+  type: dt
+}), Te = {
   ...je.registration,
-  ...rt.registration,
-  ...ke.registration,
-  ...Se.registration,
+  ...Be.registration,
+  ...Qe.registration,
+  ...Ve.registration,
+  ...we.registration,
+  ...tt.registration,
+  ...Me.registration,
+  ...ve.registration,
   ...it.registration,
-  ...Oe.registration,
-  ..._e.registration,
-  ...at.registration,
-  ...tt.registration
-}, ti = (e) => () => ($t(e)(), Zr.register(), Object.keys(Le).forEach((t) => {
-  const r = Le[t];
-  St(e)(t, r);
-}), h[W].register(
+  ...We.registration
+}, qr = (e) => () => (wt(e)(), Vr.register(), Object.keys(Te).forEach((t) => {
+  const r = Te[t];
+  $t(e)(t, r);
+}), g[q].register(
   "FirmwareUpdateInProgressTrouble",
   async (t) => {
     var r;
     if ((r = t.data) != null && r.deviceId) {
-      const { model: s } = z(
-        at.type
+      const { model: a } = z(
+        it.type
       );
-      if (s) {
-        const i = s.boards.find(
-          (a) => a.id === t.data.deviceId
+      if (a) {
+        const i = a.boards.find(
+          (s) => s.id === t.data.deviceId
         ) ? z(t.data.deviceId).model : void 0;
         return {
           devices: i ? i.name : ""
@@ -1886,59 +1855,59 @@ const li = new Et({
   companion: O.companion.register(e),
   legacy: O.model.registerLegacyModel(e)
 }), P = {
-  ...wt
+  ...Et
 };
 P.dispense = {
-  models: ti(P)
+  models: qr(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 ni = P;
 export {
-  at as A,
-  x as B,
-  Rr as C,
+  it as A,
+  L as B,
+  $r as C,
   D,
   u as E,
-  Ur as F,
-  li as G,
-  ke as H,
-  je as I,
-  Br as J,
-  ci as K,
-  Ar as L,
-  Gr as M,
-  Se as N,
-  Jr as O,
-  it as P,
-  Xe as T,
-  Dr as a,
-  _e as b,
-  Je as c,
-  tt as d,
-  et as e,
-  Zr as f,
-  rt as g,
-  Ke as h,
-  Oe as i,
-  We as j,
-  Le as k,
+  Lr as F,
+  si as G,
+  Ve as H,
+  Be as I,
+  zr as J,
+  ni as K,
+  Tr as L,
+  Ar as M,
+  we as N,
+  kr as O,
+  tt as P,
+  ke as T,
+  Sr as a,
+  ve as b,
+  Ye as c,
+  We as d,
+  qe as e,
+  Vr as f,
+  Qe as g,
+  je as h,
+  Me as i,
+  Xe as j,
+  Te 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,
-  Ze as w,
-  Mr as x,
-  _r as y,
-  jr as z
+  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
 };
-//# sourceMappingURL=dispense-registration-manager-eOOE05xT.js.map
+//# sourceMappingURL=dispense-registration-manager-pB5e_YT1.js.map