@kosdev-code/kos-dispense-sdk 2.0.15 → 2.0.16

package/{dispense-registration-manager-CSjwKonf.js → dispense-registration-manager-UjShRcvq.js}

@@ -1,28 +1,28 @@
-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, isKosModel as v, Kos as b, resolveServiceUrl as C, ServiceFactory as S, KosLog as m, KosModelContainer as R, KosExtensionUtils as N, kosChild as _, FetchError as pt, ExtensionManager as g, EXTENSION_TROUBLE_MAPPER as _e, EXTENSION_TROUBLE_DATA_MAPPER as W, getKosModelSync as z, kosDependency as ce, TroubleContainer as ze, troubleByTypeReducer as Le, kosAction as y, kosTopicHandler as Q, DependencyLifecycle as xe, getKosModel as Ae, FutureManager as pe, kosFuture as ue, FutureHandler as Be, isKosDataModel as ut, ChildModels as gt, KosFeatureFlags as ht, kosParentAware as yt, createPropKey as It, MultipleFutureHandler as ft, arraysEqual as mt, getAllKosCompanionModels as O, EventBus as E, KosContextManager as Pt, destroyKosModel as vt, SingletonKosModelRegistrationFactory as bt, KosModelRegistrationFactory as _t, KosModelRegistry as Mt, RegistrationManager as M, registerCoreModels as Ot, registerLegacyModel as Et } from "@kosdev-code/kos-ui-sdk";
+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 v, Kos as b, resolveServiceUrl as C, ServiceFactory as S, KosLog as m, KosModelContainer as R, KosExtensionUtils as T, 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, isKosDataModel as gt, ChildModels as yt, KosFeatureFlags as It, kosParentAware as ft, createPropKey as mt, 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))(u || {}), T = /* @__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))(T || {}), wt = Object.defineProperty, $t = Object.getOwnPropertyDescriptor, Ct = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? $t(t, r) : t, s = e.length - 1, a; s >= 0; s--)
-    (a = e[s]) && (i = (n ? a(t, r, i) : a(i)) || i);
-  return n && i && wt(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))(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, St = Object.getOwnPropertyDescriptor, Rt = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? St(t, r) : t, a = e.length - 1, s; a >= 0; a--)
+    (s = e[a]) && (i = (n ? s(t, r, i) : s(i)) || i);
+  return n && i && Ct(t, r, i), i;
 };
-const j = "ingredient-model";
-let me = class {
+const G = "ingredient-model";
+let Pe = class {
   constructor(e, {
     name: t,
     type: r,
     data: n,
     ingredientId: i,
-    ...s
+    ...a
   }) {
     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 = n, Object.assign(this, s);
+    this.id = e, this.ingredientId = i, this.name = t, this.type = r, this.data = n, Object.assign(this, a);
   }
   updateModel({
     name: e,
@@ -36,30 +36,30 @@ let me = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-me = Ct([
-  I(j)
-], me);
-const Ue = {
+Pe = Rt([
+  I(G)
+], Pe);
+const je = {
   registration: {
-    [j]: {
-      class: me,
+    [G]: {
+      class: Pe,
       singleton: !1
     }
   },
-  type: j,
-  predicate: v(j),
-  factory: b.Factory.create(j)
-}, { URL: je } = C("INGREDIENT_SERVICE"), { getOne: St } = S.build({
-  basePath: `${je}/api/ext/dispense/ingredients`
-}), Rt = async () => await St({
-  urlOverride: `${je}/api/ext/dispense/ingredients`
+  type: G,
+  predicate: v(G),
+  factory: b.Factory.create(G)
+}, { URL: Fe } = C("INGREDIENT_SERVICE"), { getOne: Dt } = S.build({
+  basePath: `${Fe}/api/ext/dispense/ingredients`
+}), Nt = async () => await Dt({
+  urlOverride: `${Fe}/api/ext/dispense/ingredients`
 });
-var Tt = Object.defineProperty, Dt = Object.getOwnPropertyDescriptor, Ge = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Dt(t, r) : t, s = e.length - 1, a; s >= 0; s--)
-    (a = e[s]) && (i = (n ? a(t, r, i) : a(i)) || i);
+var Tt = Object.defineProperty, zt = Object.getOwnPropertyDescriptor, He = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? zt(t, r) : t, a = e.length - 1, s; a >= 0; a--)
+    (s = e[a]) && (i = (n ? s(t, r, i) : s(i)) || i);
   return n && i && Tt(t, r, i), i;
 };
-const G = "ingredient-container-model", Nt = m.createLogger({ name: "ingredient-container-model" });
+const j = "ingredient-container-model", Lt = m.createLogger({ name: "ingredient-container-model" });
 let ne = class {
   constructor(e, t) {
     o(this, "id");
@@ -80,123 +80,123 @@ let ne = class {
   }
   async load(e) {
     var i;
-    Nt.debug(`loading ingredient container ${this.id}`);
-    const t = await Rt();
+    Lt.debug(`loading ingredient container ${this.id}`);
+    const t = await Nt();
     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
     }), n = (t == null ? void 0 : t.data) ?? {};
-    for (const s of Object.keys(n))
-      for (const a of ((i = t == null ? void 0 : t.data) == null ? void 0 : i[s]) || []) {
-        const c = await N.executeDataMapperExtension({
+    for (const a of Object.keys(n))
+      for (const s of ((i = t == null ? void 0 : t.data) == null ? void 0 : i[a]) || []) {
+        const c = await T.executeDataMapperExtension({
           extension: u.IngredientMapper,
-          data: a,
+          data: s,
           contextData: r
-        }), l = await N.executePropertyMapperExtension({
+        }), l = await T.executePropertyMapperExtension({
           extension: u.IngredientTypeMapper,
-          data: a,
+          data: s,
           contextData: r
         }), p = {
-          ...a,
-          type: l || a.type,
+          ...s,
+          type: l || s.type,
           ...c,
           data: c
-        }, h = Ue.factory(a.id)(
+        }, y = je.factory(s.id)(
           p
         );
-        this.ingredients.addModel(h);
+        this.ingredients.addModel(y);
       }
   }
   // -------------------ENTITY----------------------------
 };
-Ge([
-  _
+He([
+  M
 ], ne.prototype, "ingredients", 2);
-ne = Ge([
-  I(G)
+ne = He([
+  I(j)
 ], ne);
-const He = {
+const Ke = {
   registration: {
-    [G]: {
+    [j]: {
       class: ne,
       singleton: !0
     }
   },
-  type: G,
-  predicate: v(G),
-  factory: b.Singleton.create(G)
-}, { URL: ge } = C("HOLDER_SERVICE"), { getAll: zt, postModel: Fe, deleteModel: Lt } = S.build({
-  basePath: `${ge}/api/kos/holders`
-}), xt = m.createLogger({
+  type: j,
+  predicate: v(j),
+  factory: b.Singleton.create(j)
+}, { URL: he } = C("HOLDER_SERVICE"), { getAll: xt, postModel: Ve, deleteModel: At } = S.build({
+  basePath: `${he}/api/kos/holders`
+}), Bt = m.createLogger({
   name: "holder-service",
   group: "Services"
-}), ii = async () => await zt({}), At = async (e, t) => {
+}), ii = async () => await xt({}), Ut = async (e, t) => {
   if (!e || !t)
     throw new Error("Missing holderPath or ingredientId");
-  return await Fe({
+  return await Ve({
     model: { holderPath: e, ingredientId: t },
-    urlOverride: `${ge}/api/ext/dispense/assignments`
+    urlOverride: `${he}/api/ext/dispense/assignments`
   });
-}, Bt = async (e) => {
+}, Gt = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return await Lt({
+  return await At({
     id: e,
-    urlOverride: `${ge}/api/ext/dispense/assignments/${e}`
+    urlOverride: `${he}/api/ext/dispense/assignments/${e}`
   });
-}, Ut = async (e) => {
+}, jt = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return xt.debug(
+  return Bt.debug(
     `sending POST request to /api/ext/dispense/pumpEvents/replaceLine/${e}`
-  ), await Fe({
+  ), await Ve({
     model: {},
-    urlOverride: `${ge}/api/ext/dispense/pumpEvents/replaceLine/${e}`
+    urlOverride: `${he}/api/ext/dispense/pumpEvents/replaceLine/${e}`
   });
-}, { URL: se } = C("ASSIGNMENT_SERVICE"), { getAll: jt, postModel: Ke, deleteModel: Gt } = S.build({
+}, { URL: ae } = C("ASSIGNMENT_SERVICE"), { getAll: Ft, postModel: Ye, deleteModel: Ht } = S.build({
   destinationAddress: "",
-  basePath: `${se}/api/ext/dispense/assignments`
-}), ae = window.kosUseFos, ni = async () => await jt({ fos: ae }), Ht = async (e, t) => {
-  var i, s, a, c;
-  const r = JSON.stringify(t), n = `${se}/api/ext/dispense/assignments`;
+  basePath: `${ae}/api/ext/dispense/assignments`
+}), se = window.kosUseFos, ni = async () => await Ft({ fos: se }), Kt = async (e, t) => {
+  var i, a, s, c;
+  const r = JSON.stringify(t), n = `${ae}/api/ext/dispense/assignments`;
   try {
-    const l = await Ke({
+    const l = await Ye({
       model: { holderPath: e, factoryJson: r },
       urlOverride: n
     });
     return (l == null ? void 0 : l.status) === 200 && ((i = l == null ? void 0 : l.data) != null && i.error) ? [l.data.error || "unknownError", l.data] : [void 0, l == null ? void 0 : l.data];
   } catch (l) {
-    if (l instanceof pt)
+    if (l instanceof ht)
       return [
-        ((a = (s = l.payload) == null ? void 0 : s.data) == null ? void 0 : a.error) || "unknownError",
+        ((s = (a = l.payload) == null ? void 0 : a.data) == null ? void 0 : s.error) || "unknownError",
         (c = l.payload) == null ? void 0 : c.data
       ];
   }
   return ["unknownError", void 0];
-}, si = async (e) => {
-  const t = ae ? `${se}/api/ingredients/assignments/${e.holderPath}` : `${se}/api/ext/dispense/assignments`;
-  return await Ke({
+}, ai = async (e) => {
+  const t = se ? `${ae}/api/ingredients/assignments/${e.holderPath}` : `${ae}/api/ext/dispense/assignments`;
+  return await Ye({
     model: { ...e, fuelGauge: 680 },
-    fos: ae,
+    fos: se,
     urlOverride: t
   });
-}, ai = async (e) => await Gt({ id: e, fos: ae });
-var Ft = Object.defineProperty, Kt = Object.getOwnPropertyDescriptor, he = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Kt(t, r) : t, s = e.length - 1, a; s >= 0; s--)
-    (a = e[s]) && (i = (n ? a(t, r, i) : a(i)) || i);
-  return n && i && Ft(t, r, i), i;
+}, si = async (e) => await Ht({ id: e, fos: se });
+var Vt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, ge = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? Yt(t, r) : t, a = e.length - 1, s; a >= 0; a--)
+    (s = e[a]) && (i = (n ? s(t, r, i) : s(i)) || i);
+  return n && i && Vt(t, r, i), i;
 };
-const H = T.Holder, Re = m.createLogger({ name: "holder-model" });
-g[_e].register(
+const F = D.Holder, De = m.createLogger({ name: "holder-model" });
+h[Me].register(
   "holder",
   async (e) => {
     const t = [];
     return t.push(...e.data.holderPaths), t;
   }
 );
-g[W].register(
+h[W].register(
   "pump",
   async (e) => {
     if (e.data.pumpPath) {
@@ -215,13 +215,13 @@ g[W].register(
     return {};
   }
 );
-g[W].register(
+h[W].register(
   "holder",
   async (e) => e.data.holderNames.length > 0 ? {
     holderName: e.data.holderNames[0] || ""
   } : {}
 );
-g[W].register(
+h[W].register(
   "container",
   async (e) => {
     if (e.data.ingredients.length > 0) {
@@ -235,7 +235,7 @@ g[W].register(
     return {};
   }
 );
-class Vt extends Error {
+class kt extends Error {
   constructor(r, n) {
     super(n);
     o(this, "type");
@@ -248,12 +248,12 @@ let L = class {
     name: r,
     ingredientSource: n,
     ingredientId: i,
-    ingredientType: s,
-    slice: a,
+    ingredientType: a,
+    slice: s,
     group: c,
     data: l,
     enjoyByDate: p
-  }, h) {
+  }, y) {
     o(this, "id");
     o(this, "path");
     o(this, "name");
@@ -268,10 +268,10 @@ let L = class {
     o(this, "pumps");
     o(this, "ingredientContainer");
     o(this, "troubleContainer");
-    this.id = e, this.path = t, this.name = r, this.ingredientType = s, this.ingredientSource = n, this.ingredientId = i, this.group = c, this.slice = a, this.enjoyByDate = p, this.data = l, this.pumps = new R({
+    this.id = e, this.path = t, this.name = r, this.ingredientType = a, this.ingredientSource = n, this.ingredientId = i, this.group = c, this.slice = s, this.enjoyByDate = p, this.data = l, this.pumps = new R({
       parentId: e,
       sortKey: "path"
-    }), this.logger = h.logger;
+    }), this.logger = y.logger;
   }
   updateModel({
     path: e,
@@ -279,12 +279,12 @@ let L = class {
     ingredientSource: r,
     ingredientId: n,
     ingredientType: i,
-    group: s,
-    slice: a,
+    group: a,
+    slice: s,
     enjoyByDate: c,
     data: l
   }) {
-    this.path = e, this.name = t, this.ingredientId = n, this.ingredientType = i, this.ingredientSource = r, this.enjoyByDate = c, this.slice = a, this.group = s, this.data = l;
+    this.path = e, this.name = t, this.ingredientId = n, this.ingredientType = i, this.ingredientSource = r, this.enjoyByDate = c, this.slice = s, this.group = a, this.data = l;
   }
   get hasEnjoyByDate() {
     return !!this.enjoyByDate && !this.unassigned;
@@ -351,7 +351,7 @@ let L = class {
   }
   get troublesByType() {
     return this.troubles.reduce(
-      Le,
+      Ae,
       {}
     );
   }
@@ -384,7 +384,7 @@ let L = class {
     return this.hasMaxVolume && this.hasRemainingVolume;
   }
   updateIngredient(e) {
-    this.ingredientId !== e && y(() => {
+    this.ingredientId !== e && g(() => {
       this.ingredientId = e;
     });
   }
@@ -396,33 +396,33 @@ let L = class {
     if (!e)
       throw new Error("Invalid override");
     try {
-      const [t, r] = await Ht(this.path, e);
+      const [t, r] = await Kt(this.path, e);
       if (t)
-        throw new Vt(
+        throw new kt(
           t,
           `Failed to perform rfid override on holder ${this.id}`
         );
-      return y(() => {
+      return g(() => {
         this.ingredientId = r == null ? void 0 : r.ingredientId;
       }), r;
     } catch (t) {
-      throw Re.error(`Failed to perform rfid override on holder ${this.id}`, t), t;
+      throw De.error(`Failed to perform rfid override on holder ${this.id}`, t), t;
     }
   }
   async assignIngredient(e) {
     try {
-      e ? await At(this.path, e) : await Bt(this.path), y(() => {
+      e ? await Ut(this.path, e) : await Gt(this.path), g(() => {
         this.ingredientId = e;
       });
     } catch (t) {
-      throw Re.error(`Failed to perform assign ingredient to holder ${this.id}`, t), t;
+      throw De.error(`Failed to perform assign ingredient to holder ${this.id}`, t), t;
     }
   }
   get shouldDefer() {
     return this.troubles.some((e) => e.shouldDefer);
   }
   async replaceLine() {
-    await Ut(this.path);
+    await jt(this.path);
   }
   // -------------------LIFECYCLE----------------------------
   // ----------------------------------
@@ -444,64 +444,64 @@ let L = class {
   // }
   // -------------------ENTITY----------------------------
 };
-he([
-  _
+ge([
+  M
 ], L.prototype, "pumps", 2);
-he([
-  ce({ modelType: He.type })
+ge([
+  ce({ modelType: Ke.type })
 ], L.prototype, "ingredientContainer", 2);
-he([
-  ce({ modelType: ze.type })
+ge([
+  ce({ modelType: xe.type })
 ], L.prototype, "troubleContainer", 2);
-L = he([
-  I(H)
+L = ge([
+  I(F)
 ], L);
-const Ve = {
+const ke = {
   registration: {
-    [H]: {
+    [F]: {
       class: L,
       singleton: !1
     }
   },
-  type: H,
-  predicate: v(H),
-  factory: b.Factory.create(H)
-}, Yt = async (e, t) => {
-  var Se;
-  const r = g.propertyMapper.executeMapper(
+  type: F,
+  predicate: v(F),
+  factory: b.Factory.create(F)
+}, Zt = async (e, t) => {
+  var Re;
+  const r = h.propertyMapper.executeMapper(
     u.HolderIngredientMapper,
     t
-  ), n = g.propertyMapper.executeMapper(
+  ), n = h.propertyMapper.executeMapper(
     u.HolderTypeMapper,
     t
-  ) || t.ingType, i = await N.executeDataMapperExtension({
+  ) || t.ingType, i = await T.executeDataMapperExtension({
     extension: u.HolderMapper,
     data: t,
     contextData: {}
-  }), { name: s, path: a, ingredientId: c, ingType: l, ingSource: p, slice: h, ...U } = t, f = { ...U, ...i }, D = h || { pos: 0 }, re = {
-    name: s,
-    path: a,
+  }), { name: a, path: s, ingredientId: c, ingType: l, ingSource: p, slice: y, ...U } = t, f = { ...U, ...i }, N = y || { pos: 0 }, re = {
+    name: a,
+    path: s,
     ingredientId: r || c,
     ingredientType: n || l,
     ingredientSource: p,
-    enjoyByDate: (Se = t.container) != null && Se.enjoyByDate ? new Date(t.container.enjoyByDate) : void 0,
-    slice: D,
+    enjoyByDate: (Re = t.container) != null && Re.enjoyByDate ? new Date(t.container.enjoyByDate) : void 0,
+    slice: N,
     group: e,
     data: f
   };
-  return Ve.factory(t.path)(re);
-}, { URL: kt } = C("ASSEMBLY_SERVICE"), { getOne: Zt } = S.build({
-  basePath: `${kt}/api/kos/device/assemblies`
-}), Jt = m.createLogger({
+  return ke.factory(t.path)(re);
+}, { URL: Jt } = C("ASSEMBLY_SERVICE"), { getOne: Xt } = S.build({
+  basePath: `${Jt}/api/kos/device/assemblies`
+}), qt = m.createLogger({
   name: "assembly-service",
   group: "Services"
-}), Ye = async () => (Jt.debug("sending GET for assembly"), await Zt({}));
-var Xt = Object.defineProperty, qt = Object.getOwnPropertyDescriptor, ye = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? qt(t, r) : t, s = e.length - 1, a; s >= 0; s--)
-    (a = e[s]) && (i = (n ? a(t, r, i) : a(i)) || i);
-  return n && i && Xt(t, r, i), i;
+}), Ze = async () => (qt.debug("sending GET for assembly"), await Xt({}));
+var Wt = Object.defineProperty, Qt = Object.getOwnPropertyDescriptor, ye = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? Qt(t, r) : t, a = e.length - 1, s; a >= 0; a--)
+    (s = e[a]) && (i = (n ? s(t, r, i) : s(i)) || i);
+  return n && i && Wt(t, r, i), i;
 };
-const F = "board-container-model", ke = "/kos/hardware/board/linked", Ze = "/kos/hardware/board/unlinked";
+const H = "board-container-model", Je = "/kos/hardware/board/linked", Xe = "/kos/hardware/board/unlinked";
 let x = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -532,47 +532,47 @@ let x = class {
     r.updateModel(e);
   }
   handleBoardLinkEvent(e) {
-    this.logger.debug(`handling ${ke} event ${e}`), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
+    this.logger.debug(`handling ${Je} event ${e}`), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
   }
   handleBoardUnlinkEvent(e) {
     this.logger.debug(
-      `handling ${Ze} event ${e}`
+      `handling ${Xe} event ${e}`
     ), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
   }
 };
 ye([
-  _
+  M
 ], x.prototype, "models", 2);
 ye([
   Q({
-    lifecycle: xe.INIT,
-    topic: ke,
+    lifecycle: Be.INIT,
+    topic: Je,
     websocket: !0
   })
 ], x.prototype, "handleBoardLinkEvent", 1);
 ye([
   Q({
-    lifecycle: xe.INIT,
-    topic: Ze,
+    lifecycle: Be.INIT,
+    topic: Xe,
     websocket: !0
   })
 ], x.prototype, "handleBoardUnlinkEvent", 1);
 x = ye([
-  I(F)
+  I(H)
 ], x);
-const Wt = async (e) => {
+const er = async (e) => {
   const t = e.data.boardPath, { model: r } = z(t);
   return {
     boardName: (r == null ? void 0 : r.name) || ""
   };
 };
-var Qt = Object.defineProperty, er = Object.getOwnPropertyDescriptor, Je = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? er(t, r) : t, s = e.length - 1, a; s >= 0; s--)
-    (a = e[s]) && (i = (n ? a(t, r, i) : a(i)) || i);
-  return n && i && Qt(t, r, i), i;
+var tr = Object.defineProperty, rr = Object.getOwnPropertyDescriptor, qe = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? rr(t, r) : t, a = e.length - 1, s; a >= 0; a--)
+    (s = e[a]) && (i = (n ? s(t, r, i) : s(i)) || i);
+  return n && i && tr(t, r, i), i;
 };
-const K = T.PumpContainer;
-var Xe = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(Xe || {});
+const K = D.PumpContainer;
+var We = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(We || {});
 let oe = class {
   constructor(e, t) {
     o(this, "id");
@@ -621,13 +621,13 @@ let oe = class {
   }
   // -------------------ENTITY----------------------------
 };
-Je([
-  _
+qe([
+  M
 ], oe.prototype, "pumps", 2);
-oe = Je([
+oe = qe([
   I(K)
 ], oe);
-const Me = {
+const Oe = {
   registration: {
     [K]: {
       class: oe,
@@ -639,51 +639,51 @@ const Me = {
   factory: b.Singleton.create(
     K
   )
-}, qe = async (e) => {
-  const t = [], { model: r } = await Ae(e);
+}, 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;
-}, tr = async (e) => {
+}, ir = async (e) => {
   const t = [], r = e.data.pumpPath;
   t.push(r);
-  const n = await qe(r);
+  const n = await Qe(r);
   return [...t, ...n];
-}, rr = async (e) => {
+}, nr = async (e) => {
   const t = [], r = e.data.boardPath;
   t.push(e.data.boardPath);
-  const n = await Ae(
-    Me.type
+  const n = await Ue(
+    Oe.type
   );
   if (n != null && n.model) {
-    const s = n.model.models.getIndexByKey(
-      Xe.byBoard,
+    const a = n.model.models.getIndexByKey(
+      We.byBoard,
       r
     ).map(
-      (c) => qe(c.path)
+      (c) => Qe(c.path)
     );
-    (await Promise.allSettled(s)).forEach((c) => {
+    (await Promise.allSettled(a)).forEach((c) => {
       c.status === "fulfilled" && c.value.forEach((l) => t.push(l));
     });
   }
   return Array.from(new Set(t));
 };
-var ir = Object.defineProperty, nr = Object.getOwnPropertyDescriptor, sr = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? nr(t, r) : t, s = e.length - 1, a; s >= 0; s--)
-    (a = e[s]) && (i = (n ? a(t, r, i) : a(i)) || i);
-  return n && i && ir(t, r, i), i;
+var ar = Object.defineProperty, sr = Object.getOwnPropertyDescriptor, or = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? sr(t, r) : t, a = e.length - 1, s; a >= 0; a--)
+    (s = e[a]) && (i = (n ? s(t, r, i) : s(i)) || i);
+  return n && i && ar(t, r, i), i;
 };
-const V = "board-model", Te = (e, t) => {
-  const { type: r, name: n, path: i, linked: s, instanceId: a, link: c, ...l } = e;
-  t.type = r, t.name = n, t.path = i, t.linked = s, t.link = Object.freeze(c), t.instanceId = a, Object.assign(t, l);
+const V = "board-model", Ne = (e, t) => {
+  const { type: r, name: n, path: i, linked: a, instanceId: s, link: c, ...l } = e;
+  t.type = r, t.name = n, t.path = i, t.linked = a, t.link = Object.freeze(c), t.instanceId = s, Object.assign(t, l);
 };
-g[_e].register(
+h[Me].register(
   "board",
-  rr
+  nr
 );
-g[W].register(
+h[W].register(
   "board",
-  Wt
+  er
 );
-let Pe = class {
+let ve = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "type");
@@ -692,10 +692,10 @@ let Pe = 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, Ne(t, this);
   }
   updateModel(e) {
-    Te(e, this);
+    Ne(e, this);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -705,39 +705,39 @@ let Pe = class {
     this.logger.debug(`loading board ${this.id}`);
   }
 };
-Pe = sr([
+ve = or([
   I(V)
-], Pe);
-const We = {
+], ve);
+const et = {
   registration: {
     [V]: {
-      class: Pe,
+      class: ve,
       singleton: !1
     }
   },
   type: V,
   predicate: v(V),
   factory: b.Factory.create(V)
-}, Qe = {
+}, tt = {
   registration: {
-    [F]: {
+    [H]: {
       class: x,
       singleton: !0
     },
-    ...We.registration
+    ...et.registration
   },
-  type: F,
-  predicate: v(F),
+  type: H,
+  predicate: v(H),
   factory: b.Singleton.create(
-    F
+    H
   )
 };
-var ar = Object.defineProperty, or = Object.getOwnPropertyDescriptor, Ie = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? or(t, r) : t, s = e.length - 1, a; s >= 0; s--)
-    (a = e[s]) && (i = (n ? a(t, r, i) : a(i)) || i);
-  return n && i && ar(t, r, i), i;
+var dr = Object.defineProperty, lr = Object.getOwnPropertyDescriptor, Ie = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? lr(t, r) : t, a = e.length - 1, s; a >= 0; a--)
+    (s = e[a]) && (i = (n ? s(t, r, i) : s(i)) || i);
+  return n && i && dr(t, r, i), i;
 };
-const Y = T.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/*";
+const Y = D.HolderContainer, cr = "/kos/insertion/insert/start", pr = "/kos/insertion/insert/complete", ur = "/kos/insertion/insert/update", hr = "/kos/insertion/remove", gr = "/kos/pumpEvent/replaceLine", yr = "/kos/handle/*";
 let A = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -768,13 +768,13 @@ let A = class {
     m.ifDebug(
       () => this.logger.debug("Received insertion event", JSON.stringify(e))
     ), (Array.isArray(e) ? e : [e]).forEach((r) => {
-      y(() => {
-        var s, a, c;
+      g(() => {
+        var a, s, c;
         const n = r.ingredientId, i = this.holders.getModel(r.path);
         i && (this.logger.info(
           `Received insertion event for holder ${i.path}`
-        ), i.updateIngredient(n), i.slice.currentVolMl = (s = r.slice) == null ? void 0 : s.currentVolMl, i.slice.maxVolMl = (a = r.slice) == null ? void 0 : a.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) => {
-          y(() => {
+        ), i.updateIngredient(n), i.slice.currentVolMl = (a = r.slice) == null ? void 0 : a.currentVolMl, i.slice.maxVolMl = (s = r.slice) == null ? void 0 : s.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(() => {
             const p = i.pumps.getModel(l.path);
             p && (p.ingredientId = l.ingredientId, p.inserted = l.inserted, p.prevIngredientId = l.prevIngredientId);
           });
@@ -785,11 +785,11 @@ let A = class {
   // -------------------ENTITY----------------------------
 };
 Ie([
-  _
+  M
 ], A.prototype, "holders", 2);
 Ie([
   Q({
-    topic: gr,
+    topic: yr,
     websocket: !0,
     condition: (e, t) => t.holders.getModel(e.path) !== void 0
   })
@@ -797,11 +797,11 @@ Ie([
 Ie([
   Q({
     topic: [
-      dr,
-      lr,
       cr,
       pr,
-      ur
+      ur,
+      hr,
+      gr
     ],
     websocket: !0
   })
@@ -809,7 +809,7 @@ Ie([
 A = Ie([
   I(Y)
 ], A);
-const et = {
+const rt = {
   registration: {
     [Y]: {
       class: A,
@@ -821,53 +821,53 @@ const et = {
   factory: b.Singleton.create(
     Y
   )
-}, hr = m.createLogger({ name: "board-utils" }), yr = async (e) => {
-  const t = await N.executeDataMapperExtension({
+}, Ir = m.createLogger({ name: "board-utils" }), fr = async (e) => {
+  const t = await T.executeDataMapperExtension({
     extension: u.BoardMapper,
     data: e,
     contextData: {}
-  }), { type: r, name: n, path: i, linked: s, instanceId: a, ...c } = e, l = { ...c, ...t }, p = {
+  }), { type: r, name: n, path: i, linked: a, instanceId: s, ...c } = e, l = { ...c, ...t }, p = {
     type: r,
     name: n,
     path: i,
-    linked: s,
-    instanceId: a,
+    linked: a,
+    instanceId: s,
     ...l
-  }, h = We.factory(e.path)(p);
-  return h.updateModel(p), h;
-}, Ir = (e) => async (t) => {
-  hr.debug(`adding board ${t.name}`);
-  const r = await yr(t);
+  }, y = et.factory(e.path)(p);
+  return y.updateModel(p), y;
+}, mr = (e) => async (t) => {
+  Ir.debug(`adding board ${t.name}`);
+  const r = await fr(t);
   e.addModel(r);
 };
 var d = /* @__PURE__ */ ((e) => (e.IDLE = "IDLE", e.POURING = "POURING", e.POUR_STARTING = "POUR_STARTING", e.POUR_CANCELING = "POUR_CANCELING", e.POUR_CANCELED = "POUR_CANCELED", e.POUR_COMPLETE = "POUR_COMPLETE", e))(d || {});
-const { URL: Oe } = C("PUMP_SERVICE"), { postModel: fr, getOne: mr } = S.build({
-  basePath: `${Oe}/api/kos/holders`
+const { URL: Ee } = C("PUMP_SERVICE"), { postModel: Pr, getOne: vr } = S.build({
+  basePath: `${Ee}/api/kos/holders`
 });
 m.createLogger({
   name: "pump-service",
   group: "Services"
 });
-const Pr = async ({
+const br = async ({
   intent: e,
   pumpId: t,
   tracker: r
 }) => {
-  const n = `${Oe}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await fr({ model: {}, urlOverride: n, tracker: r });
+  const n = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await Pr({ model: {}, urlOverride: n, tracker: r });
   return i != null && i.data && pe.initiateFuture(i.data), i;
-}, vr = async (e, t) => {
-  const r = `${Oe}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, n = await mr({ urlOverride: r });
+}, _r = async (e, t) => {
+  const r = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, n = await vr({ urlOverride: r });
   return n != null && n.data ? n.data : { volume: -1 };
 };
-var br = Object.defineProperty, _r = Object.getOwnPropertyDescriptor, Ee = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? _r(t, r) : t, s = e.length - 1, a; s >= 0; s--)
-    (a = e[s]) && (i = (n ? a(t, r, i) : a(i)) || i);
-  return n && i && br(t, r, i), i;
+var Mr = Object.defineProperty, Or = Object.getOwnPropertyDescriptor, we = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? Or(t, r) : t, a = e.length - 1, s; a >= 0; a--)
+    (s = e[a]) && (i = (n ? s(t, r, i) : s(i)) || i);
+  return n && i && Mr(t, r, i), i;
 };
-const k = T.Pump;
-g[_e].register(
+const k = D.Pump;
+h[Me].register(
   "pump",
-  tr
+  ir
 );
 let q = class {
   constructor(e, t) {
@@ -891,15 +891,15 @@ let q = class {
       inserted: r,
       holderPath: n,
       boardPath: i,
-      nozzlePath: s,
-      name: a,
+      nozzlePath: a,
+      name: s,
       path: c,
       childPump: l,
       virtual: p,
-      prevIngredientId: h,
+      prevIngredientId: y,
       ...U
     } = t;
-    this.inserted = r, this.type = t.type, this.ingredientId = t.ingredientId, this.holderPath = n, this.boardPath = i, this.nozzlePath = s, this.name = a, this.path = c, this.childPump = !!l, this.virtual = !!p, this.prevIngredientId = h, Object.assign(this, U), this.futureHandler = new Be(this);
+    this.inserted = r, this.type = t.type, this.ingredientId = t.ingredientId, this.holderPath = n, this.boardPath = i, this.nozzlePath = a, this.name = s, this.path = c, this.childPump = !!l, this.virtual = !!p, this.prevIngredientId = y, Object.assign(this, U), this.futureHandler = new Ge(this);
   }
   updateModel(e) {
     const {
@@ -907,12 +907,12 @@ let q = class {
       holderPath: r,
       boardPath: n,
       nozzlePath: i,
-      childPump: s,
-      name: a,
+      childPump: a,
+      name: s,
       path: c,
       ...l
     } = e;
-    this.inserted = t, this.type = e.type, this.ingredientId = e.ingredientId, this.holderPath = r, this.boardPath = n, this.nozzlePath = i, this.childPump = this.childPump ? this.childPump : !!s, this.name = a, 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 = n, this.nozzlePath = i, this.childPump = this.childPump ? this.childPump : !!a, this.name = s, this.path = c, this.prevIngredientId = e.prevIngredientId, Object.assign(this, l);
   }
   // -------------------LIFECYCLE----------------------------
   get troubles() {
@@ -923,7 +923,7 @@ let q = class {
   }
   get troublesByType() {
     return this.troubles.reduce(
-      Le,
+      Ae,
       {}
     );
   }
@@ -939,13 +939,13 @@ let q = class {
     return !!this.ingredientId && !this.isPouring;
   }
   onFutureUpdate(e) {
-    e.endState && y(() => {
+    e.endState && g(() => {
       this.currentState = d.IDLE;
     });
   }
   async cancelPour() {
     var e;
-    this.currentState === d.POURING || this.currentState === d.POUR_STARTING ? (this.currentState = d.POUR_CANCELING, await ((e = this.future) == null ? void 0 : e.cancelFuture()), y(() => {
+    this.currentState === d.POURING || this.currentState === d.POUR_STARTING ? (this.currentState = d.POUR_CANCELING, await ((e = this.future) == null ? void 0 : e.cancelFuture()), g(() => {
       this.currentState = d.IDLE;
     })) : m.warn(`Cannot cancel pour in state ${this.currentState}`);
   }
@@ -953,7 +953,7 @@ let q = class {
     return this.futureHandler.future;
   }
   async resolveIntentVolume(e) {
-    return await vr(this.path, e);
+    return await _r(this.path, e);
   }
   async performIntent(e, t) {
     const r = typeof e == "string" ? e : e.intent;
@@ -963,12 +963,12 @@ let q = class {
       if (this.currentState === d.IDLE) {
         if (this.currentState = d.POUR_STARTING, !t)
           throw new Error("No tracker provided");
-        const n = await Pr({
+        const n = await br({
           tracker: t,
           intent: r,
           pumpId: this.path
         });
-        return this.currentState === d.POUR_STARTING && y(() => {
+        return this.currentState === d.POUR_STARTING && g(() => {
           this.currentState = d.POURING;
         }), n == null ? void 0 : n.data;
       } else
@@ -979,16 +979,16 @@ let q = class {
   }
   // -------------------ENTITY----------------------------
 };
-Ee([
-  ce({ modelType: ze.type })
+we([
+  ce({ modelType: xe.type })
 ], q.prototype, "troubleContainer", 2);
-Ee([
+we([
   ue()
 ], q.prototype, "performIntent", 1);
-q = Ee([
+q = we([
   I(k)
 ], q);
-const tt = {
+const it = {
   registration: {
     [k]: {
       class: q,
@@ -998,7 +998,7 @@ const tt = {
   type: k,
   predicate: v(k),
   factory: b.Factory.create(k)
-}, Mr = m.createLogger({ name: "pump-utils" }), Or = (e, t) => {
+}, Er = m.createLogger({ name: "pump-utils" }), wr = (e, t) => {
   const r = (t.pumps ?? []).length > 1, n = {
     boardPath: t.boardPath,
     holderPath: t.holderPath,
@@ -1011,30 +1011,30 @@ const tt = {
     type: t.type,
     nozzlePath: e,
     prevIngredientId: t.prevIngredientId
-  }, i = tt.factory(t.path)(n);
+  }, i = it.factory(t.path)(n);
   return i.updateModel(n), i;
-}, rt = (e) => (t) => (r) => (n) => {
+}, nt = (e) => (t) => (r) => (n) => {
   var c;
-  Mr.debug(`adding pump ${n.name}`);
-  const i = Or(r.path, n);
+  Er.debug(`adding pump ${n.name}`);
+  const i = wr(r.path, n);
   e.addModel(i);
-  const s = i.holderPath, a = t.holders.getModel(s);
-  a == null || a.pumps.addModel(i), a != null && a.nozzlePaths.includes(r.path) || a == null || a.nozzlePaths.push(r.path), (c = n == null ? void 0 : n.pumps) == null || c.forEach((l) => {
-    const p = i.holderPath, h = {
+  const a = i.holderPath, s = t.holders.getModel(a);
+  s == null || s.pumps.addModel(i), s != null && s.nozzlePaths.includes(r.path) || s == null || s.nozzlePaths.push(r.path), (c = n == null ? void 0 : n.pumps) == null || c.forEach((l) => {
+    const p = i.holderPath, y = {
       ...l,
       childPump: !0,
       holderPath: p,
       ingredientId: i.ingredientId
     };
-    rt(e)(t)(r)(h);
+    nt(e)(t)(r)(y);
   });
 };
-var Er = Object.defineProperty, wr = Object.getOwnPropertyDescriptor, ee = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? wr(t, r) : t, s = e.length - 1, a; s >= 0; s--)
-    (a = e[s]) && (i = (n ? a(t, r, i) : a(i)) || i);
-  return n && i && Er(t, r, i), i;
+var $r = Object.defineProperty, Cr = Object.getOwnPropertyDescriptor, ee = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? Cr(t, r) : t, a = e.length - 1, s; a >= 0; a--)
+    (s = e[a]) && (i = (n ? s(t, r, i) : s(i)) || i);
+  return n && i && $r(t, r, i), i;
 };
-const Z = "assembly-model", $r = "assembly-data";
+const Z = "assembly-model", Sr = "assembly-data";
 let w = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -1044,7 +1044,7 @@ let w = class {
     o(this, "boardContainer");
     o(this, "pumpContainer");
     o(this, "logger");
-    this.id = e, this.holderContainer = et.factory({}), this.boardContainer = Qe.factory({}), this.pumpContainer = Me.factory({}), this.logger = r.logger;
+    this.id = e, this.holderContainer = rt.factory({}), this.boardContainer = tt.factory({}), this.pumpContainer = Oe.factory({}), this.logger = r.logger;
   }
   updateModel(e) {
   }
@@ -1091,44 +1091,44 @@ let w = class {
   }
   async load(e) {
     this.logger.debug(`loading assembly ${this.id}`);
-    const t = await Ye();
+    const t = await Ze();
     if ((t == null ? void 0 : t.status) === 200) {
-      const r = await N.executeDataMapperExtension({
+      const r = await T.executeDataMapperExtension({
         extension: u.AssemblyMapper,
         data: t.data,
         contextData: {}
       });
-      e.set($r, r), Object.assign(this, r), Object.entries(r).forEach(([n, i]) => {
-        ut(i) && (this.logger.debug(`adding child model ${n} from extension data`), this[gt][n] = !0);
+      e.set(Sr, r), Object.assign(this, r), Object.entries(r).forEach(([n, i]) => {
+        gt(i) && (this.logger.debug(`adding child model ${n} from extension data`), this[yt][n] = !0);
       });
       for await (const n of t.data.assemblies) {
         const {
           boards: i,
-          holders: s,
-          nozzles: a,
+          holders: a,
+          nozzles: s,
           core: c,
           name: l,
           path: p,
-          ...h
+          ...y
         } = n;
-        this.logger.debug(`adding assembly ${l}`), Object.keys(h).forEach((f) => {
-          ht.enableFeature(f);
+        this.logger.debug(`adding assembly ${l}`), Object.keys(y).forEach((f) => {
+          It.enableFeature(f);
         });
         for await (const f of i)
-          this.logger.debug(`adding board ${f.name}`), await Ir(this.boardContainer)(f);
-        for await (const [f, D] of Object.entries(s))
-          for await (const re of D) {
+          this.logger.debug(`adding board ${f.name}`), await mr(this.boardContainer)(f);
+        for await (const [f, N] of Object.entries(a))
+          for await (const re of N) {
             this.logger.debug(`adding holder ${re.name}`);
-            const Ce = await Yt(f, re);
-            this.holderContainer.holders.addModel(Ce);
+            const Se = await Zt(f, re);
+            this.holderContainer.holders.addModel(Se);
           }
-        const U = rt(this.pumpContainer)(
+        const U = nt(this.pumpContainer)(
           this.holderContainer
         );
-        a.forEach((f) => {
+        s.forEach((f) => {
           this._nozzlePaths.add(f.path);
-          const D = U(f);
-          f.pumps.forEach(D);
+          const N = U(f);
+          f.pumps.forEach(N);
         });
       }
     }
@@ -1140,18 +1140,18 @@ ee([
   })
 ], w.prototype, "troubleContainer", 2);
 ee([
-  _
+  M
 ], w.prototype, "holderContainer", 2);
 ee([
-  _
+  M
 ], w.prototype, "boardContainer", 2);
 ee([
-  _
+  M
 ], w.prototype, "pumpContainer", 2);
 w = ee([
   I(Z)
 ], w);
-const it = {
+const at = {
   registration: {
     [Z]: {
       class: w,
@@ -1162,13 +1162,13 @@ const it = {
   predicate: v(Z),
   factory: b.Singleton.create(Z)
 };
-var Cr = Object.defineProperty, Sr = Object.getOwnPropertyDescriptor, Rr = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Sr(t, r) : t, s = e.length - 1, a; s >= 0; s--)
-    (a = e[s]) && (i = (n ? a(t, r, i) : a(i)) || i);
-  return n && i && Cr(t, r, i), i;
+var Rr = Object.defineProperty, Dr = Object.getOwnPropertyDescriptor, Nr = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? Dr(t, r) : t, a = e.length - 1, s; a >= 0; a--)
+    (s = e[a]) && (i = (n ? s(t, r, i) : s(i)) || i);
+  return n && i && Rr(t, r, i), i;
 };
-const J = T.Availability;
-let ve = class {
+const J = D.Availability;
+let be = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "data");
@@ -1193,14 +1193,14 @@ let ve = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-ve = Rr([
-  yt(),
+be = Nr([
+  ft(),
   I(J)
-], ve);
-const be = {
+], be);
+const _e = {
   registration: {
     [J]: {
-      class: ve,
+      class: be,
       singleton: !1
     }
   },
@@ -1209,41 +1209,41 @@ const be = {
   factory: b.Factory.create(
     J
   )
-}, { URL: B } = C("NOZZLE_SERVICE"), { postModel: we, deleteModel: Tr, getOne: Dr } = S.build({
+}, { URL: B } = C("NOZZLE_SERVICE"), { postModel: $e, deleteModel: Tr, getOne: zr } = S.build({
   basePath: `${B}/api/nozzle`
-}), Nr = async (e, t) => {
-  const r = await we({
+}), Lr = async (e, t) => {
+  const r = await $e({
     model: {},
     urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/pour`,
     ordered: !0,
     tracker: t
   });
   return r != null && r.data && pe.initiateFuture(r.data), r;
-}, zr = async (e, t, r) => {
-  const n = await we({
+}, xr = async (e, t, r) => {
+  const n = await $e({
     model: {},
     urlOverride: `${B}/api/ext/dispense/nozzle/${t}/pipeline/beverage/fixed/${e}`,
     ordered: !0,
     tracker: r
   });
   return n != null && n.data && pe.initiateFuture(n.data), n;
-}, Lr = async (e) => await Dr({
+}, Ar = async (e) => await zr({
   urlOverride: `${B}${e}/pipeline/beverage/availability`
-}), xr = async (e, t) => await we({
+}), Br = async (e, t) => await $e({
   model: t,
   urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
-}), Ar = async (e) => await Tr({
+}), Ur = async (e) => await Tr({
   id: e,
   urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
 });
-var Br = Object.defineProperty, Ur = Object.getOwnPropertyDescriptor, te = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Ur(t, r) : t, s = e.length - 1, a; s >= 0; s--)
-    (a = e[s]) && (i = (n ? a(t, r, i) : a(i)) || i);
-  return n && i && Br(t, r, i), i;
+var Gr = Object.defineProperty, jr = Object.getOwnPropertyDescriptor, te = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? jr(t, r) : t, a = e.length - 1, s; a >= 0; a--)
+    (s = e[a]) && (i = (n ? s(t, r, i) : s(i)) || i);
+  return n && i && Gr(t, r, i), i;
 };
-const X = T.Nozzle, jr = It(
+const X = D.Nozzle, Fr = mt(
   "beverageTopicPrefix"
-), ie = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, De = "/kos/nozzle/pour/started", Gr = "/kos/nozzle/pour/progress", Hr = "/kos/nozzle/pour/cancel";
+), ie = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, Te = "/kos/nozzle/pour/started", Hr = "/kos/nozzle/pour/progress", fe = "/kos/nozzle/pour/cancel";
 let $ = class {
   constructor(e, t, r) {
     /** the unique identifier for this nozzle.*/
@@ -1260,7 +1260,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 ft(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 R({
       indexMap: {
         byGroup: "groupId",
         byParent: "parentId"
@@ -1352,18 +1352,18 @@ let $ = class {
     context: r
   }) {
     if (!e) {
-      const c = await Ar(this.name);
+      const c = await Ur(this.name);
       if ((c == null ? void 0 : c.status) !== 200)
         throw new Error("Failed to clear pourable");
       this._selectedBeverage = void 0;
       return;
     }
-    if (e === this._selectedBeverage && mt(this._additionalItems, t)) {
+    if (e === this._selectedBeverage && vt(this._additionalItems, t)) {
       this.logger.info("No change in selected pourable");
       return;
     }
     this._selectedBeverage = e, this._additionalItems = t;
-    let n = await g.dataMapper.executeMapper(
+    let n = await h.dataMapper.executeMapper(
       u.SelectedPourableMapper,
       {
         beverage: e,
@@ -1377,8 +1377,8 @@ let $ = class {
     (!n || Object.keys(n).length === 0) && (this.logger.info(
       `No selected pourable mapper defined, using the default payload ${i}`
     ), n = i);
-    const s = n ?? i, a = await xr(this.name, s);
-    if ((a == null ? void 0 : a.status) !== 200)
+    const a = n ?? i, s = await Br(this.name, a);
+    if ((s == null ? void 0 : s.status) !== 200)
       throw new Error("Failed to select pourable");
   }
   /**
@@ -1412,15 +1412,15 @@ let $ = class {
     );
   }
   updateIfCurrent(e, t) {
-    this.currentState === e && y(() => {
+    this.currentState === e && g(() => {
       this.currentState = t;
     });
   }
   onFutureUpdate(e) {
-    O(this).forEach((r) => {
-      ie(r) && r.onPourProgress(e);
+    E(this).forEach((n) => {
+      ie(n) && n.onPourProgress(e);
     });
-    const t = {
+    const r = {
       nozzleId: this.id,
       progress: e.progress,
       status: e.status,
@@ -1431,50 +1431,68 @@ let $ = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    E.publish(Gr, t);
+    _.publish(Hr, r), e.endState && g(() => {
+      this.currentState = d.IDLE;
+    });
   }
   async pour(e) {
+    var t;
     try {
       if (this.currentState === d.IDLE) {
         if (this.updateIfCurrent(d.IDLE, d.POUR_STARTING), !e)
           throw new Error("No tracker provided");
-        const t = await Nr(this.name, e);
-        this.updateIfCurrent(d.POUR_STARTING, d.POURING), O(this).forEach((n) => {
-          var i;
-          ie(n) && ((i = n.onPourStart) == null || i.call(n));
+        const r = await Lr(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));
         });
-        const r = {
+        const n = {
           nozzleId: this.id,
           type: "free"
         };
-        return E.publish(De, r), t;
+        if (_.publish(Te, n), (t = r == null ? void 0 : r.data) != null && t.endState) {
+          this.updateIfCurrent(d.POURING, d.IDLE);
+          const i = {
+            nozzleId: this.id
+          };
+          _.publish(fe, i);
+        }
+        return r;
       } else
         throw new Error(`Cannot pour in state ${this.currentState}`);
-    } catch (t) {
-      throw this.logger.error(t), this.currentState = d.IDLE, t;
+    } catch (r) {
+      throw this.logger.error(r), this.currentState = d.IDLE, r;
     }
   }
   async fixedPour(e, t) {
+    var r;
     try {
       if (this.currentState === d.IDLE) {
         if (this.currentState = d.POUR_STARTING, !t)
           throw new Error("No tracker provided");
-        const r = await zr(e, this.name, t);
-        this.currentState === d.POUR_STARTING && y(() => {
+        const n = await xr(e, this.name, t);
+        this.currentState === d.POUR_STARTING && g(() => {
           this.currentState = d.POURING;
-        }), O(this).forEach((i) => {
+        }), E(this).forEach((a) => {
           var s;
-          ie(i) && ((s = i.onPourStart) == null || s.call(i));
+          ie(a) && ((s = a.onPourStart) == null || s.call(a));
         });
-        const n = {
+        const i = {
           nozzleId: this.id,
           type: "fixed"
         };
-        return E.publish(De, n), r;
+        if (_.publish(Te, i), (r = n == null ? void 0 : n.data) != null && r.endState) {
+          this.updateIfCurrent(d.POURING, d.IDLE);
+          const a = {
+            nozzleId: this.id
+          };
+          _.publish(fe, a);
+        }
+        return n;
       } else
         throw new Error(`Cannot pour in state ${this.currentState}`);
-    } catch (r) {
-      throw this.logger.error(r), this.currentState = d.IDLE, r;
+    } catch (n) {
+      throw this.logger.error(n), this.currentState = d.IDLE, n;
     }
   }
   /**
@@ -1483,16 +1501,16 @@ 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()), y(() => {
+      this.currentState = d.POUR_CANCELING, await ((e = this.futureHandler.getFuture()) == null ? void 0 : e.cancelFuture()), g(() => {
         this.currentState = d.IDLE;
-      }), O(this).forEach((r) => {
+      }), E(this).forEach((r) => {
         var n;
         ie(r) && ((n = r.onPourCancel) == null || n.call(r));
       });
       const t = {
         nozzleId: this.id
       };
-      E.publish(Hr, t);
+      _.publish(fe, t);
     } else
       this.logger.warn(`Cannot cancel pour in state ${this.currentState}`);
   }
@@ -1510,66 +1528,66 @@ let $ = class {
   async load(e) {
     var n, i;
     this.logger.debug(`loading nozzle ${this.id}`);
-    const t = await Lr(this.urlPrefix);
+    const t = await Ar(this.urlPrefix);
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load nozzle availability");
-    const r = await g.loader.executeLoader(
+    const r = await h.loader.executeLoader(
       u.AvailabilityLoader,
       {}
     );
-    e == null || e.set(u.AvailabilityLoader, r), e == null || e.set($e.type, this);
-    for (const s of Object.keys((n = t.data) == null ? void 0 : n.groups) || [])
-      for (const a of ((i = t.data) == null ? void 0 : i.groups[s]) || []) {
-        const c = await g.dataMapper.executeMapper(
+    e == null || e.set(u.AvailabilityLoader, r), e == null || e.set(Ce.type, this);
+    for (const a of Object.keys((n = t.data) == null ? void 0 : n.groups) || [])
+      for (const s of ((i = t.data) == null ? void 0 : i.groups[a]) || []) {
+        const c = await h.dataMapper.executeMapper(
           u.AvailabilityMapper,
-          { ...a, groupId: s },
+          { ...s, groupId: a },
           r
         ), l = {
-          ...a,
-          note: a.note ?? void 0,
+          ...s,
+          note: s.note ?? void 0,
           kosParentId: this.id,
-          rawId: a.id,
-          groupId: s,
+          rawId: s.id,
+          groupId: a,
           data: c
-        }, p = be.factory(
-          `${this.id}-${s}-${a.id}`
+        }, p = _e.factory(
+          `${this.id}-${a}-${s.id}`
         )(l);
         this._availabilityItems.addModel(p);
       }
     this.updateGroupMembers();
   }
   async updateAvailability(e) {
-    const t = Pt.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 n of Object.keys(e == null ? void 0 : e.groups) || []) {
         this._availabilityItems.getIndexByKey("group", n).filter(
-          (s) => !e.groups[n].find(
-            (a) => `${this.id}-${n}-${a.id}` === s.id
+          (a) => !e.groups[n].find(
+            (s) => `${this.id}-${n}-${s.id}` === a.id
           )
-        ).forEach((s) => {
-          this._availabilityItems.removeModel(s.id), vt(s);
+        ).forEach((a) => {
+          this._availabilityItems.removeModel(a.id), _t(a);
         });
-        for (const s of (e == null ? void 0 : e.groups[n]) || []) {
-          const a = await g.dataMapper.executeMapper(
+        for (const a of (e == null ? void 0 : e.groups[n]) || []) {
+          const s = await h.dataMapper.executeMapper(
             u.AvailabilityMapper,
-            { ...s, groupId: n },
+            { ...a, groupId: n },
             r
           ), c = {
-            ...s,
-            note: s.note ?? void 0,
+            ...a,
+            note: a.note ?? void 0,
             kosParentId: this.id,
             groupId: n,
-            rawId: s.id,
-            data: a,
-            taggedIds: s.taggedIds
+            rawId: a.id,
+            data: s,
+            taggedIds: a.taggedIds
           }, l = this._availabilityItems.getModel(
-            `${this.id}-${n}-${s.id}`
+            `${this.id}-${n}-${a.id}`
           );
           if (l)
             l.updateModel(c);
           else {
-            const p = be.factory(
-              `${this.id}-${n}-${s.id}`
+            const p = _e.factory(
+              `${this.id}-${n}-${a.id}`
             )(c);
             this._availabilityItems.addModel(p);
           }
@@ -1578,30 +1596,30 @@ let $ = class {
     else
       for (const n of Object.keys(e == null ? void 0 : e.groups) || [])
         for (const i of (e == null ? void 0 : e.groups[n]) || []) {
-          const s = await g.dataMapper.executeMapper(
+          const a = await h.dataMapper.executeMapper(
             u.AvailabilityMapper,
             { ...i, groupId: n },
             r
-          ), a = {
+          ), s = {
             ...i,
             note: i.note ?? void 0,
             kosParentId: this.id,
             groupId: n,
             rawId: i.id,
-            data: s,
+            data: a,
             type: i.type,
             taggedIds: i.taggedIds
           }, c = this._availabilityItems.getModel(
             `${this.id}-${n}-${i.id}`
           );
-          c && c.updateModel(a);
+          c && c.updateModel(s);
         }
     this.updateGroupMembers();
   }
   // -------------------ENTITY----------------------------
 };
 te([
-  _
+  M
 ], $.prototype, "_availabilityItems", 2);
 te([
   ue()
@@ -1611,14 +1629,14 @@ te([
 ], $.prototype, "fixedPour", 1);
 te([
   Q({
-    topic: `${jr}/availability`,
+    topic: `${Fr}/availability`,
     websocket: !0
   })
 ], $.prototype, "updateAvailability", 1);
 $ = te([
   I(X)
 ], $);
-const $e = {
+const Ce = {
   registration: {
     [X]: {
       class: $,
@@ -1629,12 +1647,12 @@ const $e = {
   predicate: v(X),
   factory: b.Factory.create(X)
 };
-var Fr = Object.defineProperty, Kr = Object.getOwnPropertyDescriptor, nt = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Kr(t, r) : t, s = e.length - 1, a; s >= 0; s--)
-    (a = e[s]) && (i = (n ? a(t, r, i) : a(i)) || i);
-  return n && i && Fr(t, r, i), i;
+var Kr = Object.defineProperty, Vr = Object.getOwnPropertyDescriptor, st = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? Vr(t, r) : t, a = e.length - 1, s; a >= 0; a--)
+    (s = e[a]) && (i = (n ? s(t, r, i) : s(i)) || i);
+  return n && i && Kr(t, r, i), i;
 };
-const st = "device-assembly-model";
+const ot = "device-assembly-model";
 let de = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -1654,95 +1672,107 @@ let de = class {
   }
   async load() {
     this.logger.debug(`loading device-assembly ${this.id}`);
-    const e = await Ye();
+    const e = await Ze();
     (e == null ? void 0 : e.status) === 200 && e.data.assemblies.map((r) => r.nozzles).flat().forEach((r) => {
-      var a;
-      const n = r.path, i = ((a = r.pipelines.find((c) => c.name === "beverage")) == null ? void 0 : a.topicPrefix) || "", s = $e.factory(n)({
+      var s;
+      const n = r.path, i = ((s = r.pipelines.find((c) => c.name === "beverage")) == null ? void 0 : s.topicPrefix) || "", a = Ce.factory(n)({
         path: r.path,
         name: r.name,
         urlPrefix: r.urlPrefix,
         topicPrefix: r.topicPrefix,
         beverageTopicPrefix: i
       });
-      this.deviceNozzles.addModel(s);
+      this.deviceNozzles.addModel(a);
     });
   }
 };
-nt([
-  _
+st([
+  M
 ], de.prototype, "deviceNozzles", 2);
-de = nt([
-  I(st)
+de = st([
+  I(ot)
 ], de);
-const Vr = new bt({
+const Yr = new Mt({
   class: de,
-  type: st
-}), { URL: at } = C("GENERIC_POUR_SERVICE"), { postModel: Yr } = S.build({
-  basePath: `${at}/api/nozzle`
-}), kr = async (e, t) => {
-  const r = await Yr({
+  type: ot
+}), { URL: dt } = C("GENERIC_POUR_SERVICE"), { postModel: kr } = S.build({
+  basePath: `${dt}/api/nozzle`
+}), Zr = async (e, t) => {
+  const r = await kr({
     model: {},
-    urlOverride: `${at}${e}`,
+    urlOverride: `${dt}${e}`,
     ordered: !0,
     tracker: t
   });
   return r != null && r.data && pe.initiateFuture(r.data), r;
 };
-var Zr = Object.defineProperty, Jr = Object.getOwnPropertyDescriptor, ot = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Jr(t, r) : t, s = e.length - 1, a; s >= 0; s--)
-    (a = e[s]) && (i = (n ? a(t, r, i) : a(i)) || i);
-  return n && i && Zr(t, r, i), i;
+var Jr = Object.defineProperty, Xr = Object.getOwnPropertyDescriptor, lt = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? Xr(t, r) : t, a = e.length - 1, s; a >= 0; a--)
+    (s = e[a]) && (i = (n ? s(t, r, i) : s(i)) || i);
+  return n && i && Jr(t, r, i), i;
 };
-const dt = "generic-pour-model", Xr = "/kos/generic/pour/started", qr = "/kos/generic/pour/progress", Wr = "/kos/generic/pour/cancel", fe = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
+const ct = "generic-pour-model", qr = "/kos/generic/pour/started", Wr = "/kos/generic/pour/progress", ze = "/kos/generic/pour/cancel", me = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
 let le = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "currentState", d.IDLE);
-    o(this, "servicePath");
+    o(this, "servicePathFactory");
     o(this, "pourType");
     o(this, "logger");
     o(this, "futureHandler");
-    this.id = e, this.logger = r.logger, this.futureHandler = new Be(this), this.servicePath = t.servicePath, this.pourType = t.pourType || "free";
+    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;
+  }
+  get servicePath() {
+    return this.selectedId ? this.servicePathFactory(this.selectedId) : "";
   }
   async pour(e) {
+    var t;
     try {
       if (this.currentState === d.IDLE) {
         if (this.updateIfCurrent(d.IDLE, d.POUR_STARTING), !e)
           throw new Error("No tracker provided");
-        const t = await kr(this.servicePath, e);
-        this.updateIfCurrent(d.POUR_STARTING, d.POURING), O(this).forEach((n) => {
-          var i;
-          fe(n) && ((i = n.onPourStart) == null || i.call(n));
+        const r = await Zr(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));
         });
-        const r = {
+        const n = {
           pourTarget: this.id,
           type: this.pourType
         };
-        return E.publish(Xr, r), t;
+        if (_.publish(qr, n), (t = r == null ? void 0 : r.data) != null && t.endState) {
+          this.updateIfCurrent(d.POURING, d.IDLE);
+          const i = {
+            pourTarget: this.id
+          };
+          _.publish(ze, i);
+        }
+        return r;
       } else
         throw new Error(`Cannot pour in state ${this.currentState}`);
-    } catch (t) {
-      throw this.logger.error(t), this.currentState = d.IDLE, t;
+    } catch (r) {
+      throw this.logger.error(r), this.currentState = d.IDLE, r;
     }
   }
   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()), y(() => {
+      this.currentState = d.POUR_CANCELING, await ((e = this.futureHandler.getFuture()) == null ? void 0 : e.cancelFuture()), g(() => {
         this.currentState = d.IDLE;
-      }), O(this).forEach((r) => {
+      }), E(this).forEach((r) => {
         var n;
-        fe(r) && ((n = r.onPourCancel) == null || n.call(r));
+        me(r) && ((n = r.onPourCancel) == null || n.call(r));
       });
       const t = {
         pourTarget: this.id
       };
-      E.publish(Wr, t);
-    } else
-      this.logger.warn(`Cannot cancel pour in state ${this.currentState}`);
+      _.publish(ze, 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 && y(() => {
+    this.currentState === e && g(() => {
       this.currentState = t;
     });
   }
@@ -1772,12 +1802,9 @@ let le = class {
     var e;
     return ((e = this.future) == null ? void 0 : e.progress) ?? 0;
   }
-  updateServicePath(e, t) {
-    e !== this.servicePath && (this.isPouring && t && this.cancelPour(), this.servicePath = e);
-  }
   onFutureUpdate(e) {
-    O(this).forEach((r) => {
-      fe(r) && r.onPourProgress(e);
+    E(this).forEach((r) => {
+      me(r) && r.onPourProgress(e);
     });
     const t = {
       pourTarget: this.id,
@@ -1790,7 +1817,9 @@ let le = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    E.publish(qr, t);
+    _.publish(Wr, t), e.endState && g(() => {
+      this.currentState = d.IDLE;
+    });
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1800,40 +1829,40 @@ let le = class {
     this.logger.debug(`loading generic-pour ${this.id}`);
   }
 };
-ot([
+lt([
   ue()
 ], le.prototype, "pour", 1);
-le = ot([
-  I(dt)
+le = lt([
+  I(ct)
 ], le);
-const oi = new _t({
+const oi = new Ot({
   class: le,
-  type: dt
-}), Ne = {
-  ...He.registration,
-  ...Ue.registration,
-  ...et.registration,
-  ...Ve.registration,
-  ...$e.registration,
-  ...tt.registration,
-  ...Me.registration,
-  ...be.registration,
+  type: ct
+}), Le = {
+  ...Ke.registration,
+  ...je.registration,
+  ...rt.registration,
+  ...ke.registration,
+  ...Ce.registration,
   ...it.registration,
-  ...Qe.registration
-}, Qr = (e) => () => (Ot(e)(), Vr.register(), Object.keys(Ne).forEach((t) => {
-  const r = Ne[t];
-  Et(e)(t, r);
-}), g[W].register(
+  ...Oe.registration,
+  ..._e.registration,
+  ...at.registration,
+  ...tt.registration
+}, Qr = (e) => () => (wt(e)(), Yr.register(), Object.keys(Le).forEach((t) => {
+  const r = Le[t];
+  $t(e)(t, r);
+}), h[W].register(
   "FirmwareUpdateInProgressTrouble",
   async (t) => {
     var r;
     if ((r = t.data) != null && r.deviceId) {
       const { model: n } = z(
-        it.type
+        at.type
       );
       if (n) {
         const i = n.boards.find(
-          (s) => s.id === t.data.deviceId
+          (a) => a.id === t.data.deviceId
         ) ? z(t.data.deviceId).model : void 0;
         return {
           devices: i ? i.name : ""
@@ -1843,62 +1872,62 @@ const oi = new _t({
     return {};
   }
 ), {
-  preload: M.model.preloadModel(e),
-  model: M.model.register(e),
-  companion: M.companion.register(e),
-  legacy: M.model.registerLegacyModel(e)
+  preload: O.model.preloadModel(e),
+  model: O.model.register(e),
+  companion: O.companion.register(e),
+  legacy: O.model.registerLegacyModel(e)
 }), P = {
-  ...Mt
+  ...Et
 };
 P.dispense = {
   models: Qr(P)
 };
-P.preload = M.model.preloadModel(P);
-P.model = M.model.register(P);
-P.companion = M.companion.register(P);
-P.legacy = M.model.registerLegacyModel(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 di = P;
 export {
-  it as A,
+  at as A,
   x as B,
-  zr as C,
-  T as D,
+  xr as C,
+  D,
   u as E,
-  Nr as F,
+  Lr as F,
   oi as G,
-  Ve as H,
-  Ue as I,
-  xr as J,
+  ke as H,
+  je as I,
+  Br as J,
   di as K,
-  kr as L,
-  $e as N,
-  tt as P,
-  ke as T,
-  be as a,
-  Ze as b,
-  Qe as c,
-  We as d,
-  Vr as e,
-  et as f,
-  He as g,
-  Me as h,
-  Xe as i,
+  Zr as L,
+  Ce as N,
+  it as P,
+  Je as T,
+  _e as a,
+  Xe as b,
+  tt as c,
+  et as d,
+  Yr as e,
+  rt as f,
+  Ke as g,
+  Oe as h,
+  We as i,
   d as j,
-  Ne as k,
-  Rt as l,
-  si as m,
-  At as n,
-  ai as o,
+  Le as k,
+  Nt as l,
+  ai as m,
+  Ut as n,
+  si as o,
   ni as p,
   ii as q,
   Qr as r,
-  Ut as s,
-  Ht as t,
-  Bt as u,
-  Ye as v,
-  vr as w,
-  Pr as x,
-  Ar as y,
-  Lr as z
+  jt as s,
+  Kt as t,
+  Gt as u,
+  Ze as v,
+  _r as w,
+  br as x,
+  Ur as y,
+  Ar as z
 };
-//# sourceMappingURL=dispense-registration-manager-CSjwKonf.js.map
+//# sourceMappingURL=dispense-registration-manager-UjShRcvq.js.map