@kosdev-code/kos-dispense-sdk 0.1.0-dev.5072 → 0.1.0-dev.5077

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

@@ -1,20 +1,20 @@
-var ct = Object.defineProperty;
-var pt = (e, t, r) => t in e ? ct(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var o = (e, t, r) => (pt(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { kosModel as I, Kos as v, isKosModel as b, resolveServiceUrl as S, ServiceFactory as C, KosLog as f, KosModelContainer as R, KosExtensionUtils as T, kosChild as M, FetchError as ht, ExtensionManager as u, EXTENSION_TROUBLE_MAPPER as be, EXTENSION_TROUBLE_DATA_MAPPER as q, getKosModelSync as z, kosDependency as Le, kosTroubleAware as ut, kosAction as g, kosTopicHandler as W, DependencyLifecycle as xe, getKosModel as Ae, FutureManager as ce, kosFuture as pe, FutureHandler as Be, EXTENSION_FEATURE_FLAG_RESOLVER as gt, isKosDataModel as yt, ChildModels as It, KosFeatureFlags as mt, kosParentAware as ft, createPropKey as Pt, MultipleFutureHandler as vt, arraysEqual as bt, getAllKosCompanionModels as E, EventBus as _, KosContextManager as _t, destroyKosModel as Mt, SingletonKosModelRegistrationFactory as Ot, kosLoggerAware as Et, kosFutureAware as wt, ObservableData as Ce, KosModelRegistrationFactory as $t, KosModelRegistry as St, RegistrationManager as O, registerCoreModels as Ct, registerLegacyModel as Rt } from "@kosdev-code/kos-ui-sdk";
+var gt = Object.defineProperty;
+var ut = (e, t, r) => t in e ? gt(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 P, Kos as v, isKosModel as b, resolveServiceUrl as N, ServiceFactory as $, KosLog as m, KosModelContainer as D, KosExtensionUtils as A, kosChild as _, FetchError as Pt, ExtensionManager as g, EXTENSION_TROUBLE_MAPPER as Me, EXTENSION_TROUBLE_DATA_MAPPER as ee, getKosModelSync as z, kosDependency as xe, kosTroubleAware as yt, kosAction as O, kosTopicHandler as te, DependencyLifecycle as pe, getKosModel as Be, FutureManager as he, kosFuture as ge, FutureHandler as Ge, EXTENSION_FEATURE_FLAG_RESOLVER as It, isKosDataModel as mt, ChildModels as ft, KosFeatureFlags as vt, kosParentAware as bt, createPropKey as Ot, kosStateEntry as ue, kosStateExit as Pe, kosStateGuard as re, kosLoggerAware as je, kosStateMachine as Fe, MultipleFutureHandler as _t, arraysEqual as Et, getAllKosCompanionModels as U, EventBus as R, KosContextManager as Mt, destroyKosModel as wt, SingletonKosModelRegistrationFactory as Rt, kosFutureAware as Ct, ObservableData as Te, KosModelRegistrationFactory as Nt, KosModelRegistry as $t, RegistrationManager as w, registerCoreModels as Dt, registerLegacyModel as St } from "@kosdev-code/kos-ui-sdk";
 import "react";
-var h = /* @__PURE__ */ ((e) => (e.IngredientLoader = "kos.ingredient.loader", e.IngredientMapper = "kos.ingredient.mapper", e.IngredientIndex = "kos.ingredient.index", e.IngredientTypeMapper = "kos.ingredient.type.mapper", e.HolderTypeMapper = "kos.holder.type.mapper", e.HolderMapper = "kos.holder.mapper", e.HolderIndex = "kos.holder.index", e.HolderIngredientMapper = "kos.holder.ingredient.mapper", e.AvailabilityMapper = "kos.availability.mapper", e.AvailabilityLoader = "kos.availability.loader", e.SelectedPourableMapper = "kos.selected.pourable.mapper", e.AssemblyMapper = "kos.assembly.mapper", e.BoardMapper = "kos.board.mapper", e.BoardIndex = "kos.board.index", e.PumpIndex = "kos.pump.index", e.AssemblyFeatureFlags = "kos.assembly.feature.flags", e))(h || {}), D = /* @__PURE__ */ ((e) => (e.Nozzle = "nozzle-model", e.Availability = "availability-model", e.Holder = "holder-model", e.HolderContainer = "holder-container-model", e.IngredientContainer = "ingredient-container-model", e.Ingredient = "ingredient-model", e.Pump = "pump-model", e.PumpContainer = "pump-container-model", e))(D || {}), Dt = Object.getOwnPropertyDescriptor, Nt = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Dt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (i = n(i) || i);
-  return i;
+var h = /* @__PURE__ */ ((e) => (e.IngredientLoader = "kos.ingredient.loader", e.IngredientMapper = "kos.ingredient.mapper", e.IngredientIndex = "kos.ingredient.index", e.IngredientTypeMapper = "kos.ingredient.type.mapper", e.HolderTypeMapper = "kos.holder.type.mapper", e.HolderMapper = "kos.holder.mapper", e.HolderIndex = "kos.holder.index", e.HolderIngredientMapper = "kos.holder.ingredient.mapper", e.AvailabilityMapper = "kos.availability.mapper", e.AvailabilityLoader = "kos.availability.loader", e.SelectedPourableMapper = "kos.selected.pourable.mapper", e.AssemblyMapper = "kos.assembly.mapper", e.BoardMapper = "kos.board.mapper", e.BoardIndex = "kos.board.index", e.PumpIndex = "kos.pump.index", e.AssemblyFeatureFlags = "kos.assembly.feature.flags", e))(h || {}), S = /* @__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))(S || {}), Tt = Object.getOwnPropertyDescriptor, Lt = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? Tt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = n(a) || a);
+  return a;
 };
-const U = "ingredient-model";
-let me = class {
+const F = "ingredient-model";
+let be = class {
   constructor(e, {
     name: t,
     type: r,
-    data: a,
-    ingredientId: i,
+    data: i,
+    ingredientId: a,
     ...s
   }) {
     o(this, "id");
@@ -22,49 +22,49 @@ let me = class {
     o(this, "name");
     o(this, "type");
     o(this, "data");
-    this.id = e, this.ingredientId = i, this.name = t, this.type = r, this.data = a, Object.assign(this, s);
+    this.id = e, this.ingredientId = a, this.name = t, this.type = r, this.data = i, Object.assign(this, s);
   }
   updateModel({
     name: e,
     type: t,
     data: r,
-    ingredientId: a,
-    ...i
+    ingredientId: i,
+    ...a
   }) {
-    this.name = e, this.type = t, this.ingredientId = a, this.data = r, Object.assign(this, i);
+    this.name = e, this.type = t, this.ingredientId = i, this.data = r, Object.assign(this, a);
   }
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-me = Nt([
-  I(U)
-], me);
-const Ue = {
+be = Lt([
+  P(F)
+], be);
+const He = {
   registration: {
-    [U]: {
-      class: me,
+    [F]: {
+      class: be,
       singleton: !1
     }
   },
-  type: U,
-  predicate: b(U),
-  factory: v.Factory.create(U)
-}, { URL: Ge } = S("INGREDIENT_SERVICE"), { getOne: Tt } = C.build({
-  basePath: `${Ge}/api/ext/dispense/ingredients`
-}), zt = async () => await Tt({
-  urlOverride: `${Ge}/api/ext/dispense/ingredients`
+  type: F,
+  predicate: b(F),
+  factory: v.Factory.create(F)
+}, { URL: Ve } = N("INGREDIENT_SERVICE"), { getOne: At } = $.build({
+  basePath: `${Ve}/api/ext/dispense/ingredients`
+}), Ut = async () => await At({
+  urlOverride: `${Ve}/api/ext/dispense/ingredients`
 });
-var Lt = Object.defineProperty, xt = Object.getOwnPropertyDescriptor, je = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? xt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
-  return a && i && Lt(t, r, i), i;
+var zt = Object.defineProperty, xt = Object.getOwnPropertyDescriptor, Ke = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? xt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && zt(t, r, a), a;
 };
-const G = "ingredient-container-model", At = f.createLogger({ name: "ingredient-container-model" });
-let ie = class {
+const H = "ingredient-container-model", Bt = m.createLogger({ name: "ingredient-container-model" });
+let se = class {
   constructor(e, t) {
     o(this, "id");
     o(this, "ingredients");
-    this.id = e, this.ingredients = new R({
+    this.id = e, this.ingredients = new D({
       indexMap: {
         ingredientType: "type"
       },
@@ -79,22 +79,22 @@ let ie = class {
     return this.ingredients.getIndexByKey("ingredientType", e);
   }
   async load(e) {
-    var i;
-    At.debug(`loading ingredient container ${this.id}`);
-    const t = await zt();
+    var a;
+    Bt.debug(`loading ingredient container ${this.id}`);
+    const t = await Ut();
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load ingredients");
-    const r = await T.executeLoaderExtension({
+    const r = await A.executeLoaderExtension({
       context: e,
       extension: h.IngredientLoader
-    }), a = (t == null ? void 0 : t.data) ?? {};
-    for (const s of Object.keys(a))
-      for (const n of ((i = t == null ? void 0 : t.data) == null ? void 0 : i[s]) || []) {
-        const c = await T.executeDataMapperExtension({
+    }), i = (t == null ? void 0 : t.data) ?? {};
+    for (const s of Object.keys(i))
+      for (const n of ((a = t == null ? void 0 : t.data) == null ? void 0 : a[s]) || []) {
+        const c = await A.executeDataMapperExtension({
           extension: h.IngredientMapper,
           data: n,
           contextData: r
-        }), l = await T.executePropertyMapperExtension({
+        }), l = await A.executePropertyMapperExtension({
           extension: h.IngredientTypeMapper,
           data: n,
           contextData: r
@@ -103,100 +103,100 @@ let ie = class {
           type: l || n.type,
           ...c,
           data: c
-        }, y = Ue.factory(n.id)(
+        }, u = He.factory(n.id)(
           p
         );
-        this.ingredients.addModel(y);
+        this.ingredients.addModel(u);
       }
   }
   // -------------------ENTITY----------------------------
 };
-je([
-  M
-], ie.prototype, "ingredients", 2);
-ie = je([
-  I(G)
-], ie);
-const Fe = {
+Ke([
+  _
+], se.prototype, "ingredients", 2);
+se = Ke([
+  P(H)
+], se);
+const ke = {
   registration: {
-    [G]: {
-      class: ie,
+    [H]: {
+      class: se,
       singleton: !0
     }
   },
-  type: G,
-  predicate: b(G),
-  factory: v.Singleton.create(G)
-}, { URL: he } = S("HOLDER_SERVICE"), { getAll: Bt, postModel: He, deleteModel: Ut } = C.build({
-  basePath: `${he}/api/kos/holders`
-}), Gt = f.createLogger({
+  type: H,
+  predicate: b(H),
+  factory: v.Singleton.create(H)
+}, { URL: ye } = N("HOLDER_SERVICE"), { getAll: Gt, postModel: Ye, deleteModel: jt } = $.build({
+  basePath: `${ye}/api/kos/holders`
+}), Ft = m.createLogger({
   name: "holder-service",
   group: "Services"
-}), ai = async () => await Bt({}), jt = async (e, t) => {
+}), di = async () => await Gt({}), Ht = async (e, t) => {
   if (!e || !t)
     throw new Error("Missing holderPath or ingredientId");
-  return await He({
+  return await Ye({
     model: { holderPath: e, ingredientId: t },
-    urlOverride: `${he}/api/ext/dispense/assignments`
+    urlOverride: `${ye}/api/ext/dispense/assignments`
   });
-}, Ft = async (e) => {
+}, Vt = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return await Ut({
+  return await jt({
     id: e,
-    urlOverride: `${he}/api/ext/dispense/assignments/${e}`
+    urlOverride: `${ye}/api/ext/dispense/assignments/${e}`
   });
-}, Ht = async (e) => {
+}, Kt = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return Gt.debug(
+  return Ft.debug(
     `sending POST request to /api/ext/dispense/pumpEvents/replaceLine/${e}`
-  ), await He({
+  ), await Ye({
     model: {},
-    urlOverride: `${he}/api/ext/dispense/pumpEvents/replaceLine/${e}`
+    urlOverride: `${ye}/api/ext/dispense/pumpEvents/replaceLine/${e}`
   });
-}, { URL: ae } = S("ASSIGNMENT_SERVICE"), { getAll: Vt, postModel: Ve, deleteModel: Kt } = C.build({
+}, { URL: ne } = N("ASSIGNMENT_SERVICE"), { getAll: kt, postModel: Ze, deleteModel: Yt } = $.build({
   destinationAddress: "",
-  basePath: `${ae}/api/ext/dispense/assignments`
-}), se = window.kosUseFos, si = async () => await Vt({ fos: se }), kt = async (e, t) => {
-  var i, s, n, c;
-  const r = JSON.stringify(t), a = `${ae}/api/ext/dispense/assignments`;
+  basePath: `${ne}/api/ext/dispense/assignments`
+}), oe = window.kosUseFos, li = async () => await kt({ fos: oe }), Zt = async (e, t) => {
+  var a, s, n, c;
+  const r = JSON.stringify(t), i = `${ne}/api/ext/dispense/assignments`;
   try {
-    const l = await Ve({
+    const l = await Ze({
       model: { holderPath: e, factoryJson: r },
-      urlOverride: a
+      urlOverride: i
     });
-    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];
+    return (l == null ? void 0 : l.status) === 200 && ((a = l == null ? void 0 : l.data) != null && a.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 = (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];
-}, ni = async (e) => {
-  const t = se ? `${ae}/api/ingredients/assignments/${e.holderPath}` : `${ae}/api/ext/dispense/assignments`;
-  return await Ve({
+}, ci = async (e) => {
+  const t = oe ? `${ne}/api/ingredients/assignments/${e.holderPath}` : `${ne}/api/ext/dispense/assignments`;
+  return await Ze({
     model: { ...e, fuelGauge: 680 },
-    fos: se,
+    fos: oe,
     urlOverride: t
   });
-}, oi = async (e) => await Kt({ id: e, fos: se });
-var Yt = Object.defineProperty, Zt = Object.getOwnPropertyDescriptor, _e = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Zt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
-  return a && i && Yt(t, r, i), i;
+}, pi = async (e) => await Yt({ id: e, fos: oe });
+var Xt = Object.defineProperty, Jt = Object.getOwnPropertyDescriptor, we = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? Jt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && Xt(t, r, a), a;
 };
-const j = D.Holder, Re = f.createLogger({ name: "holder-model" });
-u[be].register(
+const V = S.Holder, Le = m.createLogger({ name: "holder-model" });
+g[Me].register(
   "holder",
   async (e) => {
     const t = [];
     return t.push(...e.data.holderPaths), t;
   }
 );
-u[q].register(
+g[ee].register(
   "pump",
   async (e) => {
     if (e.data.pumpPath) {
@@ -215,13 +215,13 @@ u[q].register(
     return {};
   }
 );
-u[q].register(
+g[ee].register(
   "holder",
   async (e) => e.data.holderNames.length > 0 ? {
     holderName: e.data.holderNames[0] || ""
   } : {}
 );
-u[q].register(
+g[ee].register(
   "container",
   async (e) => {
     if (e.data.ingredients.length > 0) {
@@ -235,25 +235,25 @@ u[q].register(
     return {};
   }
 );
-class Xt extends Error {
-  constructor(r, a) {
-    super(a);
+class qt extends Error {
+  constructor(r, i) {
+    super(i);
     o(this, "type");
     this.name = "AssignmentError", this.type = r;
   }
 }
-let J = class {
+let Q = class {
   constructor(e, {
     path: t,
     name: r,
-    ingredientSource: a,
-    ingredientId: i,
+    ingredientSource: i,
+    ingredientId: a,
     ingredientType: s,
     slice: n,
     group: c,
     data: l,
     enjoyByDate: p
-  }, y) {
+  }, u) {
     o(this, "id");
     o(this, "path");
     o(this, "name");
@@ -267,23 +267,23 @@ let J = class {
     o(this, "enjoyByDate");
     o(this, "pumps");
     o(this, "ingredientContainer");
-    this.id = e, this.path = t, this.name = r, this.ingredientType = s, this.ingredientSource = a, this.ingredientId = i, this.group = c, this.slice = n, this.enjoyByDate = p, this.data = l, this.pumps = new R({
+    this.id = e, this.path = t, this.name = r, this.ingredientType = s, this.ingredientSource = i, this.ingredientId = a, this.group = c, this.slice = n, this.enjoyByDate = p, this.data = l, this.pumps = new D({
       parentId: e,
       sortKey: "path"
-    }), this.logger = y.logger;
+    }), this.logger = u.logger;
   }
   updateModel({
     path: e,
     name: t,
     ingredientSource: r,
-    ingredientId: a,
-    ingredientType: i,
+    ingredientId: i,
+    ingredientType: a,
     group: s,
     slice: n,
     enjoyByDate: c,
     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;
+    this.path = e, this.name = t, this.ingredientId = i, this.ingredientType = a, this.ingredientSource = r, this.enjoyByDate = c, this.slice = n, this.group = s, this.data = l;
   }
   get hasEnjoyByDate() {
     return !!this.enjoyByDate && !this.unassigned;
@@ -308,8 +308,8 @@ let J = 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, a = r ? this.pumps.getModel(r) : this.pumps.data[0];
-    return a == null ? void 0 : a.performIntent({ intent: t });
+    const t = typeof e == "string" ? e : e.intent, r = typeof e == "string" ? void 0 : e.pumpPath, i = r ? this.pumps.getModel(r) : this.pumps.data[0];
+    return i == null ? void 0 : i.performIntent({ intent: t });
   }
   get pourState() {
     return this.pumps.data.reduce((t, r) => r.pouringState ? r.pouringState : t, "");
@@ -371,7 +371,7 @@ let J = class {
     return this.hasMaxVolume && this.hasRemainingVolume;
   }
   updateIngredient(e) {
-    this.ingredientId !== e && g(() => {
+    this.ingredientId !== e && O(() => {
       this.ingredientId = e;
     });
   }
@@ -383,33 +383,33 @@ let J = class {
     if (!e)
       throw new Error("Invalid override");
     try {
-      const [t, r] = await kt(this.path, e);
+      const [t, r] = await Zt(this.path, e);
       if (t)
-        throw new Xt(
+        throw new qt(
           t,
           `Failed to perform rfid override on holder ${this.id}`
         );
-      return g(() => {
+      return O(() => {
         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 Le.error(`Failed to perform rfid override on holder ${this.id}`, t), t;
     }
   }
   async assignIngredient(e) {
     try {
-      e ? await jt(this.path, e) : await Ft(this.path), g(() => {
+      e ? await Ht(this.path, e) : await Vt(this.path), O(() => {
         this.ingredientId = e;
       });
     } catch (t) {
-      throw Re.error(`Failed to perform assign ingredient to holder ${this.id}`, t), t;
+      throw Le.error(`Failed to perform assign ingredient to holder ${this.id}`, t), t;
     }
   }
   get shouldDefer() {
     return this.troubles.some((e) => e.shouldDefer);
   }
   async replaceLine() {
-    await Ht(this.path);
+    await Kt(this.path);
   }
   // -------------------LIFECYCLE----------------------------
   // ----------------------------------
@@ -431,68 +431,68 @@ let J = class {
   // }
   // -------------------ENTITY----------------------------
 };
-_e([
-  M
-], J.prototype, "pumps", 2);
-_e([
-  Le({ modelType: Fe.type })
-], J.prototype, "ingredientContainer", 2);
-J = _e([
-  I(j),
-  ut()
-], J);
-const Ke = {
+we([
+  _
+], Q.prototype, "pumps", 2);
+we([
+  xe({ modelType: ke.type })
+], Q.prototype, "ingredientContainer", 2);
+Q = we([
+  P(V),
+  yt()
+], Q);
+const Xe = {
   registration: {
-    [j]: {
-      class: J,
+    [V]: {
+      class: Q,
       singleton: !1
     }
   },
-  type: j,
-  predicate: b(j),
-  factory: v.Factory.create(j)
-}, Jt = async (e, t) => {
+  type: V,
+  predicate: b(V),
+  factory: v.Factory.create(V)
+}, Wt = async (e, t) => {
   var Se;
-  const r = u.propertyMapper.executeMapper(
+  const r = g.propertyMapper.executeMapper(
     h.HolderIngredientMapper,
     t
-  ), a = u.propertyMapper.executeMapper(
+  ), i = g.propertyMapper.executeMapper(
     h.HolderTypeMapper,
     t
-  ) || t.ingType, i = await T.executeDataMapperExtension({
+  ) || t.ingType, a = await A.executeDataMapperExtension({
     extension: h.HolderMapper,
     data: t,
     contextData: {}
-  }), { name: s, path: n, ingredientId: c, ingType: l, ingSource: p, slice: y, ...B } = t, m = { ...B, ...i }, N = y || { pos: 0 }, te = {
+  }), { name: s, path: n, ingredientId: c, ingType: l, ingSource: p, slice: u, ...j } = t, y = { ...j, ...a }, L = u || { pos: 0 }, ae = {
     name: s,
     path: n,
     ingredientId: r || c,
-    ingredientType: a || l,
+    ingredientType: i || l,
     ingredientSource: p,
     enjoyByDate: (Se = t.container) != null && Se.enjoyByDate ? new Date(t.container.enjoyByDate) : void 0,
-    slice: N,
+    slice: L,
     group: e,
-    data: m
+    data: y
   };
-  return Ke.factory(t.path)(te);
-}, { URL: qt } = S("ASSEMBLY_SERVICE"), { getOne: Wt } = C.build({
-  basePath: `${qt}/api/kos/device/assemblies`
-}), Qt = f.createLogger({
+  return Xe.factory(t.path)(ae);
+}, { URL: Qt } = N("ASSEMBLY_SERVICE"), { getOne: er } = $.build({
+  basePath: `${Qt}/api/kos/device/assemblies`
+}), tr = m.createLogger({
   name: "assembly-service",
   group: "Services"
-}), ke = async () => (Qt.debug("sending GET for assembly"), await Wt({}));
-var er = Object.defineProperty, tr = Object.getOwnPropertyDescriptor, ue = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? tr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
-  return a && i && er(t, r, i), i;
+}), Je = async () => (tr.debug("sending GET for assembly"), await er({}));
+var rr = Object.defineProperty, ir = Object.getOwnPropertyDescriptor, Ie = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? ir(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && rr(t, r, a), a;
 };
-const F = "board-container-model", Ye = "/kos/hardware/board/linked", Ze = "/kos/hardware/board/unlinked";
-let L = class {
+const K = "board-container-model", qe = "/kos/hardware/board/linked", We = "/kos/hardware/board/unlinked";
+let x = 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 D({
       parentId: e,
       extensionId: h.BoardIndex
     });
@@ -517,52 +517,52 @@ let L = class {
     r.updateModel(e);
   }
   handleBoardLinkEvent(e) {
-    this.logger.debug(`handling ${Ye} event ${e}`), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
+    this.logger.debug(`handling ${qe} event ${e}`), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
   }
   handleBoardUnlinkEvent(e) {
     this.logger.debug(
-      `handling ${Ze} event ${e}`
+      `handling ${We} event ${e}`
     ), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
   }
 };
-ue([
-  M
-], L.prototype, "models", 2);
-ue([
-  W({
-    lifecycle: xe.INIT,
-    topic: Ye,
+Ie([
+  _
+], x.prototype, "models", 2);
+Ie([
+  te({
+    lifecycle: pe.INIT,
+    topic: qe,
     websocket: !0
   })
-], L.prototype, "handleBoardLinkEvent", 1);
-ue([
-  W({
-    lifecycle: xe.INIT,
-    topic: Ze,
+], x.prototype, "handleBoardLinkEvent", 1);
+Ie([
+  te({
+    lifecycle: pe.INIT,
+    topic: We,
     websocket: !0
   })
-], L.prototype, "handleBoardUnlinkEvent", 1);
-L = ue([
-  I(F)
-], L);
-const rr = async (e) => {
+], x.prototype, "handleBoardUnlinkEvent", 1);
+x = Ie([
+  P(K)
+], x);
+const ar = async (e) => {
   const t = e.data.boardPath, { model: r } = z(t);
   return {
     boardName: (r == null ? void 0 : r.name) || ""
   };
 };
-var ir = Object.defineProperty, ar = Object.getOwnPropertyDescriptor, Xe = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? ar(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
-  return a && i && ir(t, r, i), i;
+var sr = Object.defineProperty, nr = Object.getOwnPropertyDescriptor, Qe = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? nr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && sr(t, r, a), a;
 };
-const H = D.PumpContainer;
-var Je = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(Je || {});
-let ne = class {
+const k = S.PumpContainer;
+var et = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(et || {});
+let de = class {
   constructor(e, t) {
     o(this, "id");
     o(this, "pumps");
-    this.id = e, this.pumps = new R({
+    this.id = e, this.pumps = new D({
       indexMap: {
         byNozzle: (r) => r.nozzlePaths,
         byBoard: (r) => r.boardPath,
@@ -606,44 +606,44 @@ let ne = class {
   }
   // -------------------ENTITY----------------------------
 };
-Xe([
-  M
-], ne.prototype, "pumps", 2);
-ne = Xe([
-  I(H)
-], ne);
-const Me = {
+Qe([
+  _
+], de.prototype, "pumps", 2);
+de = Qe([
+  P(k)
+], de);
+const Re = {
   registration: {
-    [H]: {
-      class: ne,
+    [k]: {
+      class: de,
       singleton: !0
     }
   },
-  type: H,
-  predicate: b(H),
+  type: k,
+  predicate: b(k),
   factory: v.Singleton.create(
-    H
+    k
   )
-}, qe = async (e) => {
-  const t = [], { model: r } = await Ae(e);
+}, tt = async (e) => {
+  const t = [], { model: r } = await Be(e);
   return r && (t.push(r.boardPath), t.push(r.nozzlePath), t.push(r.holderPath)), t;
-}, sr = async (e) => {
+}, or = async (e) => {
   const t = [], r = e.data.pumpPath;
   t.push(r);
-  const a = await qe(r);
-  return [...t, ...a];
-}, nr = async (e) => {
+  const i = await tt(r);
+  return [...t, ...i];
+}, dr = async (e) => {
   const t = [], r = e.data.boardPath;
   t.push(e.data.boardPath);
-  const a = await Ae(
-    Me.type
+  const i = await Be(
+    Re.type
   );
-  if (a != null && a.model) {
-    const s = a.model.models.getIndexByKey(
-      Je.byBoard,
+  if (i != null && i.model) {
+    const s = i.model.models.getIndexByKey(
+      et.byBoard,
       r
     ).map(
-      (c) => qe(c.path)
+      (c) => tt(c.path)
     );
     (await Promise.allSettled(s)).forEach((c) => {
       c.status === "fulfilled" && c.value.forEach((l) => t.push(l));
@@ -651,24 +651,24 @@ const Me = {
   }
   return Array.from(new Set(t));
 };
-var or = Object.getOwnPropertyDescriptor, dr = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? or(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (i = n(i) || i);
-  return i;
+var lr = Object.getOwnPropertyDescriptor, cr = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? lr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = n(a) || a);
+  return a;
 };
-const V = "board-model", De = (e, t) => {
-  const { type: r, name: a, path: i, linked: s, instanceId: n, link: c, ...l } = e;
-  t.type = r, t.name = a, t.path = i, t.linked = s, t.link = Object.freeze(c), t.instanceId = n, Object.assign(t, l);
+const Y = "board-model", Ae = (e, t) => {
+  const { type: r, name: i, path: a, linked: s, instanceId: n, link: c, ...l } = e;
+  t.type = r, t.name = i, t.path = a, t.linked = s, t.link = Object.freeze(c), t.instanceId = n, Object.assign(t, l);
 };
-u[be].register(
+g[Me].register(
   "board",
-  nr
+  dr
 );
-u[q].register(
+g[ee].register(
   "board",
-  rr
+  ar
 );
-let fe = class {
+let Oe = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "type");
@@ -677,10 +677,10 @@ let fe = class {
     o(this, "linked");
     o(this, "instanceId");
     o(this, "logger");
-    this.id = e, this.logger = r.logger, De(t, this);
+    this.id = e, this.logger = r.logger, Ae(t, this);
   }
   updateModel(e) {
-    De(e, this);
+    Ae(e, this);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -690,47 +690,47 @@ let fe = class {
     this.logger.debug(`loading board ${this.id}`);
   }
 };
-fe = dr([
-  I(V)
-], fe);
-const We = {
+Oe = cr([
+  P(Y)
+], Oe);
+const rt = {
   registration: {
-    [V]: {
-      class: fe,
+    [Y]: {
+      class: Oe,
       singleton: !1
     }
   },
-  type: V,
-  predicate: b(V),
-  factory: v.Factory.create(V)
-}, Qe = {
+  type: Y,
+  predicate: b(Y),
+  factory: v.Factory.create(Y)
+}, it = {
   registration: {
-    [F]: {
-      class: L,
+    [K]: {
+      class: x,
       singleton: !0
     },
-    ...We.registration
+    ...rt.registration
   },
-  type: F,
-  predicate: b(F),
+  type: K,
+  predicate: b(K),
   factory: v.Singleton.create(
-    F
+    K
   )
 };
-var lr = Object.defineProperty, cr = Object.getOwnPropertyDescriptor, ge = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? cr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
-  return a && i && lr(t, r, i), i;
+var pr = Object.defineProperty, hr = Object.getOwnPropertyDescriptor, me = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? hr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && pr(t, r, a), a;
 };
-const K = D.HolderContainer, pr = "/kos/insertion/insert/start", hr = "/kos/insertion/insert/complete", ur = "/kos/insertion/insert/update", gr = "/kos/insertion/remove", yr = "/kos/pumpEvent/replaceLine", Ir = "/kos/handle/*";
-let x = class {
+const Z = S.HolderContainer, gr = "/kos/insertion/insert/start", ur = "/kos/insertion/insert/complete", Pr = "/kos/insertion/insert/update", yr = "/kos/insertion/remove", Ir = "/kos/pumpEvent/replaceLine", mr = "/kos/handle/*";
+let B = 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 D({
       indexMap: {
-        nozzle: (a) => a.nozzlePaths,
+        nozzle: (i) => i.nozzlePaths,
         group: "group"
       },
       parentId: e,
@@ -740,27 +740,27 @@ let x = class {
   updateModel() {
   }
   handleHolderEvents(e) {
-    var r, a, i;
-    f.ifDebug(
+    var r, i, a;
+    m.ifDebug(
       () => this.logger.debug("Received holder change event", JSON.stringify(e))
     );
     const t = this.holders.getModel(e.path);
     t && (this.logger.info(
       `Received change event for holder ${t.path}.  Updating fuel gauge data.`
-    ), t.slice.currentVolMl = (r = e.slice) == null ? void 0 : r.currentVolMl, t.slice.maxVolMl = (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);
+    ), t.slice.currentVolMl = (r = e.slice) == null ? void 0 : r.currentVolMl, t.slice.maxVolMl = (i = e.slice) == null ? void 0 : i.maxVolMl, (a = e == null ? void 0 : e.container) != null && a.enjoyByDate ? t.enjoyByDate = new Date(e.container.enjoyByDate) : t.enjoyByDate = void 0);
   }
   handleInsertion(e) {
-    f.ifDebug(
+    m.ifDebug(
       () => this.logger.debug("Received insertion event", JSON.stringify(e))
     ), (Array.isArray(e) ? e : [e]).forEach((r) => {
-      g(() => {
+      O(() => {
         var s, n, c;
-        const a = r.ingredientId, i = this.holders.getModel(r.path);
-        i && (this.logger.info(
-          `Received insertion event for holder ${i.path}`
-        ), i.updateIngredient(a), i.slice.currentVolMl = (s = r.slice) == null ? void 0 : s.currentVolMl, i.slice.maxVolMl = (n = r.slice) == null ? void 0 : n.maxVolMl, (c = r == null ? void 0 : r.container) != null && c.enjoyByDate ? i.enjoyByDate = new Date(r.container.enjoyByDate) : i.enjoyByDate = void 0, r.pumps.forEach((l) => {
-          g(() => {
-            const p = i.pumps.getModel(l.path);
+        const i = r.ingredientId, a = this.holders.getModel(r.path);
+        a && (this.logger.info(
+          `Received insertion event for holder ${a.path}`
+        ), a.updateIngredient(i), a.slice.currentVolMl = (s = r.slice) == null ? void 0 : s.currentVolMl, a.slice.maxVolMl = (n = r.slice) == null ? void 0 : n.maxVolMl, (c = r == null ? void 0 : r.container) != null && c.enjoyByDate ? a.enjoyByDate = new Date(r.container.enjoyByDate) : a.enjoyByDate = void 0, r.pumps.forEach((l) => {
+          O(() => {
+            const p = a.pumps.getModel(l.path);
             p && (p.ingredientId = l.ingredientId, p.inserted = l.inserted, p.prevIngredientId = l.prevIngredientId);
           });
         }));
@@ -769,92 +769,92 @@ let x = class {
   }
   // -------------------ENTITY----------------------------
 };
-ge([
-  M
-], x.prototype, "holders", 2);
-ge([
-  W({
-    topic: Ir,
+me([
+  _
+], B.prototype, "holders", 2);
+me([
+  te({
+    topic: mr,
     websocket: !0,
     condition: (e, t) => t.holders.getModel(e.path) !== void 0
   })
-], x.prototype, "handleHolderEvents", 1);
-ge([
-  W({
+], B.prototype, "handleHolderEvents", 1);
+me([
+  te({
     topic: [
-      pr,
-      hr,
-      ur,
       gr,
-      yr
+      ur,
+      Pr,
+      yr,
+      Ir
     ],
     websocket: !0
   })
-], x.prototype, "handleInsertion", 1);
-x = ge([
-  I(K)
-], x);
-const et = {
+], B.prototype, "handleInsertion", 1);
+B = me([
+  P(Z)
+], B);
+const at = {
   registration: {
-    [K]: {
-      class: x,
+    [Z]: {
+      class: B,
       singleton: !0
     }
   },
-  type: K,
-  predicate: b(K),
+  type: Z,
+  predicate: b(Z),
   factory: v.Singleton.create(
-    K
+    Z
   )
-}, mr = f.createLogger({ name: "board-utils" }), fr = async (e) => {
-  const t = await T.executeDataMapperExtension({
+}, fr = m.createLogger({ name: "board-utils" }), vr = async (e) => {
+  const t = await A.executeDataMapperExtension({
     extension: h.BoardMapper,
     data: e,
     contextData: {}
-  }), { type: r, name: a, path: i, linked: s, instanceId: n, ...c } = e, l = { ...c, ...t }, p = {
+  }), { type: r, name: i, path: a, linked: s, instanceId: n, ...c } = e, l = { ...c, ...t }, p = {
     type: r,
-    name: a,
-    path: i,
+    name: i,
+    path: a,
     linked: s,
     instanceId: n,
     ...l
-  }, y = We.factory(e.path)(p);
-  return y.updateModel(p), y;
-}, Pr = (e) => async (t) => {
-  mr.debug(`adding board ${t.name}`);
-  const r = await fr(t);
+  }, u = rt.factory(e.path)(p);
+  return u.updateModel(p), u;
+}, br = (e) => async (t) => {
+  fr.debug(`adding board ${t.name}`);
+  const r = await vr(t);
   e.addModel(r);
 };
-var d = /* @__PURE__ */ ((e) => (e.IDLE = "IDLE", e.POURING = "POURING", e.POUR_STARTING = "POUR_STARTING", e.POUR_CANCELING = "POUR_CANCELING", e.POUR_CANCELED = "POUR_CANCELED", e.POUR_COMPLETE = "POUR_COMPLETE", e))(d || {});
-const { URL: Oe } = S("PUMP_SERVICE"), { postModel: vr, getOne: br } = C.build({
-  basePath: `${Oe}/api/kos/holders`
+var d = /* @__PURE__ */ ((e) => (e.IDLE = "IDLE", e.POURING = "POURING", e.POUR_STARTING = "POUR_STARTING", e.POUR_CANCELING = "POUR_CANCELING", e))(d || {});
+const { URL: Ce } = N("PUMP_SERVICE"), { postModel: Or, getOne: _r } = $.build({
+  basePath: `${Ce}/api/kos/holders`
 });
-f.createLogger({
+m.createLogger({
   name: "pump-service",
   group: "Services"
 });
-const _r = async ({
+const Er = async ({
   intent: e,
   pumpId: t,
   tracker: r
 }) => {
-  const a = `${Oe}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await vr({ model: {}, urlOverride: a, tracker: r });
-  return i != null && i.data && ce.initiateFuture(i.data), i;
+  const i = `${Ce}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, a = await Or({ model: {}, urlOverride: i, tracker: r });
+  return a != null && a.data && he.initiateFuture(a.data), a;
 }, Mr = async (e, t) => {
-  const r = `${Oe}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, a = await br({ urlOverride: r });
-  return a != null && a.data ? a.data : { volume: -1 };
+  const r = `${Ce}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, i = await _r({ urlOverride: r });
+  return i != null && i.data ? i.data : { volume: -1 };
 };
-var Or = Object.defineProperty, Er = Object.getOwnPropertyDescriptor, tt = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Er(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
-  return a && i && Or(t, r, i), i;
+var wr = Object.defineProperty, Rr = Object.getOwnPropertyDescriptor, st = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? Rr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && wr(t, r, a), a;
 };
-const k = D.Pump;
-u[be].register(
+const X = S.Pump;
+g[Me].register(
   "pump",
-  sr
+  or
 );
-let oe = class {
+let le = class {
   constructor(e, t) {
     o(this, "id");
     o(this, "inserted");
@@ -873,30 +873,30 @@ let oe = class {
     this.id = e;
     const {
       inserted: r,
-      holderPath: a,
-      boardPath: i,
+      holderPath: i,
+      boardPath: a,
       nozzlePath: s,
       name: n,
       path: c,
       childPump: l,
       virtual: p,
-      prevIngredientId: y,
-      ...B
+      prevIngredientId: u,
+      ...j
     } = t;
-    this.inserted = r, this.type = t.type, this.ingredientId = t.ingredientId, this.holderPath = a, this.boardPath = i, this.nozzlePath = s, this.name = n, this.path = c, this.childPump = !!l, this.virtual = !!p, this.prevIngredientId = y, Object.assign(this, B), this.futureHandler = new Be(this);
+    this.inserted = r, this.type = t.type, this.ingredientId = t.ingredientId, this.holderPath = i, this.boardPath = a, this.nozzlePath = s, this.name = n, this.path = c, this.childPump = !!l, this.virtual = !!p, this.prevIngredientId = u, Object.assign(this, j), this.futureHandler = new Ge(this);
   }
   updateModel(e) {
     const {
       inserted: t,
       holderPath: r,
-      boardPath: a,
-      nozzlePath: i,
+      boardPath: i,
+      nozzlePath: 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 = 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);
+    this.inserted = t, this.type = e.type, this.ingredientId = e.ingredientId, this.holderPath = r, this.boardPath = i, this.nozzlePath = a, this.childPump = this.childPump ? this.childPump : !!s, this.name = n, this.path = c, this.prevIngredientId = e.prevIngredientId, Object.assign(this, l);
   }
   // -------------------LIFECYCLE----------------------------
   get pouringState() {
@@ -911,15 +911,15 @@ let oe = class {
     return !!this.ingredientId && !this.isPouring;
   }
   onFutureUpdate(e) {
-    e.endState && g(() => {
+    e.endState && O(() => {
       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()), O(() => {
       this.currentState = d.IDLE;
-    })) : f.warn(`Cannot cancel pour in state ${this.currentState}`);
+    })) : m.warn(`Cannot cancel pour in state ${this.currentState}`);
   }
   get future() {
     return this.futureHandler.future;
@@ -935,40 +935,40 @@ let oe = class {
       if (this.currentState === d.IDLE) {
         if (this.currentState = d.POUR_STARTING, !t)
           throw new Error("No tracker provided");
-        const a = await _r({
+        const i = await Er({
           tracker: t,
           intent: r,
           pumpId: this.path
         });
-        return this.currentState === d.POUR_STARTING && g(() => {
+        return this.currentState === d.POUR_STARTING && O(() => {
           this.currentState = d.POURING;
-        }), a == null ? void 0 : a.data;
+        }), i == null ? void 0 : i.data;
       } else
         throw new Error(`Cannot pour in state ${this.currentState}`);
-    } catch (a) {
-      throw f.error(a), this.currentState = d.IDLE, a;
+    } catch (i) {
+      throw m.error(i), this.currentState = d.IDLE, i;
     }
   }
   // -------------------ENTITY----------------------------
 };
-tt([
-  pe()
-], oe.prototype, "performIntent", 1);
-oe = tt([
-  I(k)
-], oe);
-const rt = {
+st([
+  ge()
+], le.prototype, "performIntent", 1);
+le = st([
+  P(X)
+], le);
+const nt = {
   registration: {
-    [k]: {
-      class: oe,
+    [X]: {
+      class: le,
       singleton: !1
     }
   },
-  type: k,
-  predicate: b(k),
-  factory: v.Factory.create(k)
-}, wr = f.createLogger({ name: "pump-utils" }), $r = (e, t) => {
-  const r = (t.pumps ?? []).length > 1, a = {
+  type: X,
+  predicate: b(X),
+  factory: v.Factory.create(X)
+}, Cr = m.createLogger({ name: "pump-utils" }), Nr = (e, t) => {
+  const r = (t.pumps ?? []).length > 1, i = {
     boardPath: t.boardPath,
     holderPath: t.holderPath,
     ingredientId: t.ingredientId,
@@ -980,31 +980,31 @@ const rt = {
     type: t.type,
     nozzlePath: e,
     prevIngredientId: t.prevIngredientId
-  }, i = rt.factory(t.path)(a);
-  return i.updateModel(a), i;
-}, it = (e) => (t) => (r) => (a) => {
+  }, a = nt.factory(t.path)(i);
+  return a.updateModel(i), a;
+}, ot = (e) => (t) => (r) => (i) => {
   var c;
-  wr.debug(`adding pump ${a.name}`);
-  const i = $r(r.path, a);
-  e.addModel(i);
-  const s = i.holderPath, n = t.holders.getModel(s);
-  n == null || n.pumps.addModel(i), n != null && n.nozzlePaths.includes(r.path) || n == null || n.nozzlePaths.push(r.path), (c = a == null ? void 0 : a.pumps) == null || c.forEach((l) => {
-    const p = i.holderPath, y = {
+  Cr.debug(`adding pump ${i.name}`);
+  const a = Nr(r.path, i);
+  e.addModel(a);
+  const s = a.holderPath, n = t.holders.getModel(s);
+  n == null || n.pumps.addModel(a), n != null && n.nozzlePaths.includes(r.path) || n == null || n.nozzlePaths.push(r.path), (c = i == null ? void 0 : i.pumps) == null || c.forEach((l) => {
+    const p = a.holderPath, u = {
       ...l,
       childPump: !0,
       holderPath: p,
-      ingredientId: i.ingredientId
+      ingredientId: a.ingredientId
     };
-    it(e)(t)(r)(y);
+    ot(e)(t)(r)(u);
   });
 };
-var Sr = Object.defineProperty, Cr = Object.getOwnPropertyDescriptor, Q = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Cr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
-  return a && i && Sr(t, r, i), i;
+var $r = Object.defineProperty, Dr = Object.getOwnPropertyDescriptor, ie = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? Dr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && $r(t, r, a), a;
 };
-const Y = "assembly-model", Rr = "assembly-data", Dr = "assembly-raw-data";
-let w = class {
+const J = "assembly-model", Sr = "assembly-data", Tr = "assembly-raw-data";
+let C = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "_nozzlePaths", /* @__PURE__ */ new Set());
@@ -1013,7 +1013,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 = at.factory({}), this.boardContainer = it.factory({}), this.pumpContainer = Re.factory({}), this.logger = r.logger;
   }
   updateModel(e) {
   }
@@ -1056,93 +1056,93 @@ let w = class {
   }
   async ready() {
     var e;
-    (e = this.troubleContainer) == null || e.troubles.increment(), u[gt].execute(
+    (e = this.troubleContainer) == null || e.troubles.increment(), g[It].execute(
       h.AssemblyFeatureFlags,
       this
     );
   }
   async load(e) {
     this.logger.debug(`loading assembly ${this.id}`);
-    const t = await ke();
+    const t = await Je();
     if ((t == null ? void 0 : t.status) === 200) {
-      const r = await T.executeDataMapperExtension({
+      const r = await A.executeDataMapperExtension({
         extension: h.AssemblyMapper,
         data: t.data,
         contextData: {}
       });
-      e.set(Rr, r), Object.assign(this, r), Object.entries(r).forEach(([a, i]) => {
-        yt(i) && (this.logger.debug(`adding child model ${a} from extension data`), this[It][a] = !0);
-      }), e.set(Dr, t.data);
-      for await (const a of t.data.assemblies) {
+      e.set(Sr, r), Object.assign(this, r), Object.entries(r).forEach(([i, a]) => {
+        mt(a) && (this.logger.debug(`adding child model ${i} from extension data`), this[ft][i] = !0);
+      }), e.set(Tr, t.data);
+      for await (const i of t.data.assemblies) {
         const {
-          boards: i = [],
+          boards: a = [],
           holders: s = {},
           nozzles: n = [],
           core: c,
           name: l,
           path: p,
-          ...y
-        } = a;
-        this.logger.debug(`adding assembly ${l}`), Object.keys(y).forEach((m) => {
-          mt.enableFeature(m);
+          ...u
+        } = i;
+        this.logger.debug(`adding assembly ${l}`), Object.keys(u).forEach((y) => {
+          vt.enableFeature(y);
         });
-        for await (const m of i)
-          this.logger.debug(`adding board ${m.name}`), await Pr(this.boardContainer)(m);
-        for await (const [m, N] of Object.entries(
+        for await (const y of a)
+          this.logger.debug(`adding board ${y.name}`), await br(this.boardContainer)(y);
+        for await (const [y, L] of Object.entries(
           s ?? {}
         ))
-          for await (const te of N) {
-            this.logger.debug(`adding holder ${te.name}`);
-            const $e = await Jt(m, te);
-            this.holderContainer.holders.addModel($e);
+          for await (const ae of L) {
+            this.logger.debug(`adding holder ${ae.name}`);
+            const De = await Wt(y, ae);
+            this.holderContainer.holders.addModel(De);
           }
-        const B = it(this.pumpContainer)(
+        const j = ot(this.pumpContainer)(
           this.holderContainer
         );
-        n.forEach((m) => {
-          this._nozzlePaths.add(m.path);
-          const N = B(m);
-          m.pumps.forEach(N);
+        n.forEach((y) => {
+          this._nozzlePaths.add(y.path);
+          const L = j(y);
+          y.pumps.forEach(L);
         });
       }
     }
   }
 };
-Q([
-  Le({
+ie([
+  xe({
     modelType: "trouble-container-model"
   })
-], w.prototype, "troubleContainer", 2);
-Q([
-  M
-], w.prototype, "holderContainer", 2);
-Q([
-  M
-], w.prototype, "boardContainer", 2);
-Q([
-  M
-], w.prototype, "pumpContainer", 2);
-w = Q([
-  I(Y)
-], w);
-const at = {
+], C.prototype, "troubleContainer", 2);
+ie([
+  _
+], C.prototype, "holderContainer", 2);
+ie([
+  _
+], C.prototype, "boardContainer", 2);
+ie([
+  _
+], C.prototype, "pumpContainer", 2);
+C = ie([
+  P(J)
+], C);
+const dt = {
   registration: {
-    [Y]: {
-      class: w,
+    [J]: {
+      class: C,
       singleton: !0
     }
   },
-  type: Y,
-  predicate: b(Y),
-  factory: v.Singleton.create(Y)
+  type: J,
+  predicate: b(J),
+  factory: v.Singleton.create(J)
 };
-var Nr = Object.getOwnPropertyDescriptor, Tr = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Nr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (i = n(i) || i);
-  return i;
+var Lr = Object.getOwnPropertyDescriptor, Ar = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? Lr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = n(a) || a);
+  return a;
 };
-const Z = D.Availability;
-let Pe = class {
+const q = S.Availability;
+let _e = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "data");
@@ -1168,80 +1168,78 @@ let Pe = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-Pe = Tr([
-  ft(),
-  I(Z)
-], Pe);
-const ve = {
+_e = Ar([
+  bt(),
+  P(q)
+], _e);
+const Ee = {
   registration: {
-    [Z]: {
-      class: Pe,
+    [q]: {
+      class: _e,
       singleton: !1
     }
   },
-  type: Z,
-  predicate: b(Z),
+  type: q,
+  predicate: b(q),
   factory: v.Factory.create(
-    Z
+    q
   )
-}, { URL: A } = S("NOZZLE_SERVICE"), { postModel: Ee, deleteModel: zr, getOne: Lr } = C.build({
-  basePath: `${A}/api/nozzle`
+}, { URL: G } = N("NOZZLE_SERVICE"), { postModel: Ne, deleteModel: Ur, getOne: zr } = $.build({
+  basePath: `${G}/api/nozzle`
 }), xr = async (e, t) => {
-  const r = await Ee({
+  const r = await Ne({
     model: {},
-    urlOverride: `${A}/api/ext/dispense/nozzle/${e}/pipeline/beverage/pour`,
+    urlOverride: `${G}/api/ext/dispense/nozzle/${e}/pipeline/beverage/pour`,
     ordered: !0,
     tracker: t
   });
-  return r != null && r.data && ce.initiateFuture(r.data), r;
-}, Ar = async (e, t, r) => {
-  const a = await Ee({
+  return r != null && r.data && he.initiateFuture(r.data), r;
+}, Br = async (e, t, r) => {
+  const i = await Ne({
     model: {},
-    urlOverride: `${A}/api/ext/dispense/nozzle/${t}/pipeline/beverage/fixed/${e}`,
+    urlOverride: `${G}/api/ext/dispense/nozzle/${t}/pipeline/beverage/fixed/${e}`,
     ordered: !0,
     tracker: r
   });
-  return a != null && a.data && ce.initiateFuture(a.data), a;
-}, Br = async (e) => await Lr({
-  urlOverride: `${A}${e}/pipeline/beverage/availability`
-}), Ur = async (e, t) => await Ee({
+  return i != null && i.data && he.initiateFuture(i.data), i;
+}, Gr = async (e) => await zr({
+  urlOverride: `${G}${e}/pipeline/beverage/availability`
+}), jr = async (e, t) => await Ne({
   model: t,
-  urlOverride: `${A}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
-}), Gr = async (e) => await zr({
+  urlOverride: `${G}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
+}), Fr = async (e) => await Ur({
   id: e,
-  urlOverride: `${A}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
+  urlOverride: `${G}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
 });
-var jr = Object.defineProperty, Fr = Object.getOwnPropertyDescriptor, ee = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Fr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
-  return a && i && jr(t, r, i), i;
+var Hr = Object.defineProperty, Vr = Object.getOwnPropertyDescriptor, E = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? Vr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && Hr(t, r, a), a;
 };
-const X = D.Nozzle, Hr = Pt(
+const W = S.Nozzle, Kr = Ot(
   "beverageTopicPrefix"
-), re = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, Ne = "/kos/nozzle/pour/started", Vr = "/kos/nozzle/pour/progress", ye = "/kos/nozzle/pour/cancel";
-let $ = class {
-  constructor(e, t, r) {
+), fe = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, Ue = "/kos/nozzle/pour/started", kr = "/kos/nozzle/pour/progress", Yr = "/kos/nozzle/pour/cancel";
+let I = class {
+  constructor(e, t) {
     /** the unique identifier for this nozzle.*/
     o(this, "id");
     o(this, "path");
-    o(this, "logger");
     o(this, "name");
     o(this, "_selectedBeverage");
     o(this, "_selectedBrand");
     o(this, "_additionalItems");
     o(this, "_availabilityItems");
     o(this, "futureHandler");
-    o(this, "currentState", d.IDLE);
     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 vt(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 _t(this), this._availabilityItems = new D({
       indexMap: {
         byGroup: "groupId",
         byParent: "parentId"
       },
       parentId: e
-    }), this.logger = r.logger;
+    });
   }
   /**
    * The availability nodes that can be dispensed from this nozzle.
@@ -1327,18 +1325,18 @@ let $ = class {
     context: r
   }) {
     if (!e) {
-      const c = await Gr(this.name);
+      const c = await Fr(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 && bt(this._additionalItems, t)) {
+    if (e === this._selectedBeverage && Et(this._additionalItems, t)) {
       this.logger.info("No change in selected pourable");
       return;
     }
     this._selectedBeverage = e, this._additionalItems = t;
-    let a = await u.dataMapper.executeMapper(
+    let i = await g.dataMapper.executeMapper(
       h.SelectedPourableMapper,
       {
         beverage: e,
@@ -1346,13 +1344,13 @@ let $ = class {
         context: r
       }
     );
-    const i = {
+    const a = {
       bevId: e.rawId
     };
-    (!a || Object.keys(a).length === 0) && (this.logger.info(
-      `No selected pourable mapper defined, using the default payload ${i}`
-    ), a = i);
-    const s = a ?? i, n = await Ur(this.name, s);
+    (!i || Object.keys(i).length === 0) && (this.logger.info(
+      `No selected pourable mapper defined, using the default payload ${a}`
+    ), i = a);
+    const s = i ?? a, n = await jr(this.name, s);
     if ((n == null ? void 0 : n.status) !== 200)
       throw new Error("Failed to select pourable");
   }
@@ -1386,14 +1384,34 @@ let $ = class {
       e
     );
   }
-  updateIfCurrent(e, t) {
-    this.currentState === e && g(() => {
-      this.currentState = t;
+  handlePouringStart() {
+    this.logger.info("Pour started"), U(this).forEach((e) => {
+      var t;
+      fe(e) && ((t = e.onPourStart) == null || t.call(e));
     });
   }
+  handlePouringEnd() {
+    this.logger.info("Pour ended");
+  }
+  handleCancelStart() {
+    this.logger.info("Pour canceling");
+  }
+  handleCanceled() {
+    this.logger.info("Pour canceled"), U(this).forEach((t) => {
+      var r;
+      fe(t) && ((r = t.onPourCancel) == null || r.call(t));
+    });
+    const e = {
+      nozzleId: this.id
+    };
+    R.publish(Yr, e);
+  }
+  // ============================================================================
+  // Future Lifecycle Handler
+  // ============================================================================
   onFutureUpdate(e) {
-    E(this).forEach((a) => {
-      re(a) && a.onPourProgress(e);
+    U(this).forEach((i) => {
+      fe(i) && i.onPourProgress(e);
     });
     const r = {
       nozzleId: this.id,
@@ -1406,114 +1424,74 @@ let $ = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    _.publish(Vr, r), e.endState && g(() => {
-      this.currentState = d.IDLE;
+    R.publish(kr, r), e.endState && O(() => {
+      this.currentState === d.POURING && this.transition("POUR_COMPLETED");
     });
   }
+  // Inherits throwOnInvalid: false from class
   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 r = await xr(this.name, e);
-        this.updateIfCurrent(d.POUR_STARTING, d.POURING), E(this).forEach((i) => {
-          var s;
-          re(i) && ((s = i.onPourStart) == null || s.call(i));
-        });
-        const a = {
-          nozzleId: this.id,
-          type: "free"
-        };
-        if (_.publish(Ne, a), (t = r == null ? void 0 : r.data) != null && t.endState) {
-          this.updateIfCurrent(d.POURING, d.IDLE);
-          const i = {
-            nozzleId: this.id
-          };
-          _.publish(ye, i);
-        }
-        return r;
-      } else
-        throw new Error(`Cannot pour in state ${this.currentState}`);
+      if (this.transition("START_POUR"), !e)
+        throw new Error("No tracker provided");
+      const r = await xr(this.name, e);
+      this.transition("POUR_ACTIVE");
+      const i = {
+        nozzleId: this.id,
+        type: "free"
+      };
+      return R.publish(Ue, i), (t = r == null ? void 0 : r.data) != null && t.endState && this.transition("POUR_COMPLETED"), r;
     } catch (r) {
-      throw this.logger.error(r), this.currentState = d.IDLE, r;
+      throw this.logger.error(r), this.currentState !== d.IDLE && this.transition("POUR_COMPLETED"), r;
     }
   }
+  // Inherits throwOnInvalid: false from class
   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 a = await Ar(e, this.name, t);
-        this.currentState === d.POUR_STARTING && g(() => {
-          this.currentState = d.POURING;
-        }), E(this).forEach((s) => {
-          var n;
-          re(s) && ((n = s.onPourStart) == null || n.call(s));
-        });
-        const i = {
-          nozzleId: this.id,
-          type: "fixed"
-        };
-        if (_.publish(Ne, i), (r = a == null ? void 0 : a.data) != null && r.endState) {
-          this.updateIfCurrent(d.POURING, d.IDLE);
-          const s = {
-            nozzleId: this.id
-          };
-          _.publish(ye, s);
-        }
-        return a;
-      } else
-        throw new Error(`Cannot pour in state ${this.currentState}`);
-    } catch (a) {
-      throw this.logger.error(a), this.currentState = d.IDLE, a;
+      if (this.transition("START_POUR"), !t)
+        throw new Error("No tracker provided");
+      const i = await Br(e, this.name, t);
+      this.transition("POUR_ACTIVE");
+      const a = {
+        nozzleId: this.id,
+        type: "fixed"
+      };
+      return R.publish(Ue, a), (r = i == null ? void 0 : i.data) != null && r.endState && this.transition("POUR_COMPLETED"), i;
+    } catch (i) {
+      throw this.logger.error(i), this.currentState !== d.IDLE && this.transition("POUR_COMPLETED"), i;
     }
   }
-  /**
-   * An action that will cancel a pour for this nozzle.
-   * */
+  // Inherits throwOnInvalid: false - silently ignore if already idle
   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.IDLE;
-      }), E(this).forEach((r) => {
-        var a;
-        re(r) && ((a = r.onPourCancel) == null || a.call(r));
-      });
-      const t = {
-        nozzleId: this.id
-      };
-      _.publish(ye, t);
-    } else
-      this.logger.warn(`Cannot cancel pour in state ${this.currentState}`);
+    this.transition("CANCEL_POUR"), await ((e = this.futureHandler.getFuture()) == null ? void 0 : e.cancelFuture()), this.transition("POUR_CANCELED");
   }
   updateGroupMembers() {
     this._availabilityItems.data.forEach((e) => {
       (e.taggedIds || []).forEach((r) => {
-        const a = this._availabilityItems.data.find(
-          (i) => i.rawId === r
+        const i = this._availabilityItems.data.find(
+          (a) => a.rawId === r
         );
-        a && a.parentId !== e.id && (a.parentId = e.id, this._availabilityItems.updateModel(a));
+        i && i.parentId !== e.id && (i.parentId = e.id, this._availabilityItems.updateModel(i));
       });
     });
   }
   /** @internal */
   async load(e) {
-    var a, i;
+    var i, a;
     this.logger.debug(`loading nozzle ${this.id}`);
-    const t = await Br(this.urlPrefix);
+    const t = await Gr(this.urlPrefix);
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load nozzle availability");
-    const r = await u.loader.executeLoader(
+    const r = await g.loader.executeLoader(
       h.AvailabilityLoader,
       {}
     );
-    e == null || e.set(h.AvailabilityLoader, r), e == null || e.set(we.type, this);
-    for (const s of Object.keys((a = t.data) == null ? void 0 : a.groups) || [])
-      for (const n of ((i = t.data) == null ? void 0 : i.groups[s]) || []) {
-        const c = await u.dataMapper.executeMapper(
+    e == null || e.set(h.AvailabilityLoader, r), e == null || e.set($e.type, this);
+    for (const s of Object.keys((i = t.data) == null ? void 0 : i.groups) || [])
+      for (const n of ((a = t.data) == null ? void 0 : a.groups[s]) || []) {
+        const c = await g.dataMapper.executeMapper(
           h.AvailabilityMapper,
           { ...n, groupId: s },
           r
@@ -1525,7 +1503,7 @@ let $ = class {
           groupId: s,
           data: c,
           properties: n.properties || {}
-        }, p = ve.factory(
+        }, p = Ee.factory(
           `${this.id}-${s}-${n.id}`
         )(l);
         this._availabilityItems.addModel(p);
@@ -1533,62 +1511,62 @@ let $ = class {
     this.updateGroupMembers();
   }
   async updateAvailability(e) {
-    const t = _t.getContext(this.id), r = (t == null ? void 0 : t.get(h.AvailabilityLoader)) || {};
+    const t = Mt.getContext(this.id), r = (t == null ? void 0 : t.get(h.AvailabilityLoader)) || {};
     if (e.rebuild)
-      for (const a of Object.keys(e == null ? void 0 : e.groups) || []) {
-        this._availabilityItems.getIndexByKey("group", a).filter(
-          (s) => !e.groups[a].find(
-            (n) => `${this.id}-${a}-${n.id}` === s.id
+      for (const i of Object.keys(e == null ? void 0 : e.groups) || []) {
+        this._availabilityItems.getIndexByKey("group", i).filter(
+          (s) => !e.groups[i].find(
+            (n) => `${this.id}-${i}-${n.id}` === s.id
           )
         ).forEach((s) => {
-          this._availabilityItems.removeModel(s.id), Mt(s);
+          this._availabilityItems.removeModel(s.id), wt(s);
         });
-        for (const s of (e == null ? void 0 : e.groups[a]) || []) {
-          const n = await u.dataMapper.executeMapper(
+        for (const s of (e == null ? void 0 : e.groups[i]) || []) {
+          const n = await g.dataMapper.executeMapper(
             h.AvailabilityMapper,
-            { ...s, groupId: a },
+            { ...s, groupId: i },
             r
           ), c = {
             ...s,
             note: s.note ?? void 0,
             kosParentId: this.id,
-            groupId: a,
+            groupId: i,
             rawId: s.id,
             data: n,
             taggedIds: s.taggedIds,
             properties: s.properties || {}
           }, l = this._availabilityItems.getModel(
-            `${this.id}-${a}-${s.id}`
+            `${this.id}-${i}-${s.id}`
           );
           if (l)
             l.updateModel(c);
           else {
-            const p = ve.factory(
-              `${this.id}-${a}-${s.id}`
+            const p = Ee.factory(
+              `${this.id}-${i}-${s.id}`
             )(c);
             this._availabilityItems.addModel(p);
           }
         }
       }
     else
-      for (const a of Object.keys(e == null ? void 0 : e.groups) || [])
-        for (const i of (e == null ? void 0 : e.groups[a]) || []) {
-          const s = await u.dataMapper.executeMapper(
+      for (const i of Object.keys(e == null ? void 0 : e.groups) || [])
+        for (const a of (e == null ? void 0 : e.groups[i]) || []) {
+          const s = await g.dataMapper.executeMapper(
             h.AvailabilityMapper,
-            { ...i, groupId: a },
+            { ...a, groupId: i },
             r
           ), n = {
-            ...i,
-            note: i.note ?? void 0,
+            ...a,
+            note: a.note ?? void 0,
             kosParentId: this.id,
-            groupId: a,
-            rawId: i.id,
+            groupId: i,
+            rawId: a.id,
             data: s,
-            type: i.type,
-            taggedIds: i.taggedIds,
-            properties: i.properties || {}
+            type: a.type,
+            taggedIds: a.taggedIds,
+            properties: a.properties || {}
           }, c = this._availabilityItems.getModel(
-            `${this.id}-${a}-${i.id}`
+            `${this.id}-${i}-${a.id}`
           );
           c && c.updateModel(n);
         }
@@ -1596,47 +1574,103 @@ let $ = class {
   }
   // -------------------ENTITY----------------------------
 };
-ee([
-  M
-], $.prototype, "_availabilityItems", 2);
-ee([
-  pe()
-], $.prototype, "pour", 1);
-ee([
-  pe()
-], $.prototype, "fixedPour", 1);
-ee([
-  W({
-    topic: `${Hr}/availability`,
+E([
+  _
+], I.prototype, "_availabilityItems", 2);
+E([
+  ue(d.POURING)
+], I.prototype, "handlePouringStart", 1);
+E([
+  Pe(d.POURING)
+], I.prototype, "handlePouringEnd", 1);
+E([
+  ue(d.POUR_CANCELING)
+], I.prototype, "handleCancelStart", 1);
+E([
+  Pe(d.POUR_CANCELING)
+], I.prototype, "handleCanceled", 1);
+E([
+  ge(),
+  re({ allowedStates: [d.IDLE] })
+], I.prototype, "pour", 1);
+E([
+  ge(),
+  re({ allowedStates: [d.IDLE] })
+], I.prototype, "fixedPour", 1);
+E([
+  re({
+    allowedStates: [d.POUR_STARTING, d.POURING]
+  })
+], I.prototype, "cancelPour", 1);
+E([
+  te({
+    topic: `${Kr}/availability`,
     websocket: !0
   })
-], $.prototype, "updateAvailability", 1);
-$ = ee([
-  I(X)
-], $);
-const we = {
+], I.prototype, "updateAvailability", 1);
+I = E([
+  P(W),
+  je(),
+  Fe(
+    {
+      initial: d.IDLE,
+      initializeAt: pe.READY,
+      states: {
+        [d.IDLE]: {
+          on: {
+            START_POUR: d.POUR_STARTING
+          }
+        },
+        [d.POUR_STARTING]: {
+          on: {
+            POUR_ACTIVE: d.POURING,
+            CANCEL_POUR: d.POUR_CANCELING,
+            POUR_COMPLETED: d.IDLE
+          }
+        },
+        [d.POURING]: {
+          on: {
+            CANCEL_POUR: d.POUR_CANCELING,
+            POUR_COMPLETED: d.IDLE
+          }
+        },
+        [d.POUR_CANCELING]: {
+          on: {
+            POUR_CANCELED: d.IDLE
+          }
+        }
+      }
+    },
+    {
+      trackHistory: !1,
+      throwOnInvalid: !1
+      // Gracefully ignore invalid state calls (expected runtime scenarios)
+    }
+  )
+], I);
+const $e = {
   registration: {
-    [X]: {
-      class: $,
+    [W]: {
+      class: I,
       singleton: !1
     }
   },
-  type: X,
-  predicate: b(X),
-  factory: v.Factory.create(X)
+  type: W,
+  predicate: b(W),
+  factory: v.Factory.create(W)
 };
-var Kr = Object.defineProperty, kr = Object.getOwnPropertyDescriptor, st = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? kr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
-  return a && i && Kr(t, r, i), i;
+var Zr = Object.defineProperty, Xr = Object.getOwnPropertyDescriptor, lt = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? Xr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && Zr(t, r, a), a;
 };
-const nt = "device-assembly-model";
-let de = class {
+const ct = "device-assembly-model";
+let ce = 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 D();
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1650,55 +1684,54 @@ let de = class {
   }
   async load() {
     this.logger.debug(`loading device-assembly ${this.id}`);
-    const e = await ke();
+    const e = await Je();
     (e == null ? void 0 : e.status) === 200 && e.data.assemblies.map((r) => r.nozzles ?? []).flat().forEach((r) => {
       var n;
-      const a = r.path, i = ((n = r.pipelines.find((c) => c.name === "beverage")) == null ? void 0 : n.topicPrefix) || "", s = we.factory(a)({
+      const i = r.path, a = ((n = r.pipelines.find((c) => c.name === "beverage")) == null ? void 0 : n.topicPrefix) || "", s = $e.factory(i)({
         path: r.path,
         name: r.name,
         urlPrefix: r.urlPrefix,
         topicPrefix: r.topicPrefix,
-        beverageTopicPrefix: i
+        beverageTopicPrefix: a
       });
       this.deviceNozzles.addModel(s);
     });
   }
 };
-st([
-  M
-], de.prototype, "deviceNozzles", 2);
-de = st([
-  I(nt)
-], de);
-const Yr = new Ot({
-  class: de,
-  type: nt
-}), { URL: ot } = S("GENERIC_POUR_SERVICE"), { postModel: Zr } = C.build({
-  basePath: `${ot}/api/nozzle`
-}), Xr = async (e, t) => {
-  const r = await Zr({
+lt([
+  _
+], ce.prototype, "deviceNozzles", 2);
+ce = lt([
+  P(ct)
+], ce);
+const Jr = new Rt({
+  class: ce,
+  type: ct
+}), { URL: pt } = N("GENERIC_POUR_SERVICE"), { postModel: qr } = $.build({
+  basePath: `${pt}/api/nozzle`
+}), Wr = async (e, t) => {
+  const r = await qr({
     model: {},
-    urlOverride: `${ot}${e}`,
+    urlOverride: `${pt}${e}`,
     ordered: !0,
     tracker: t
   });
-  return r != null && r.data && ce.initiateFuture(r.data), r;
+  return r != null && r.data && he.initiateFuture(r.data), r;
 };
-var Jr = Object.defineProperty, qr = Object.getOwnPropertyDescriptor, dt = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? qr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
-    (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
-  return a && i && Jr(t, r, i), i;
+var Qr = Object.defineProperty, ei = Object.getOwnPropertyDescriptor, T = (e, t, r, i) => {
+  for (var a = i > 1 ? void 0 : i ? ei(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+    (n = e[s]) && (a = (i ? n(t, r, a) : n(a)) || a);
+  return i && a && Qr(t, r, a), a;
 };
-const lt = "generic-pour-model", Wr = "/kos/generic/pour/started", Qr = "/kos/generic/pour/progress", Te = "/kos/generic/pour/cancel", Ie = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
-let le = class {
+const ht = "generic-pour-model", ti = "/kos/generic/pour/started", ri = "/kos/generic/pour/progress", ii = "/kos/generic/pour/cancel", ve = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
+let M = class {
   constructor(e, t) {
     o(this, "id");
-    o(this, "currentState", d.IDLE);
     o(this, "servicePathFactory");
     o(this, "pourType");
     o(this, "selectedId");
     o(this, "state");
-    this.id = e, this.futureHandler = new Be(this), this.servicePathFactory = t.servicePathFactory, this.pourType = t.pourType || "free", this.selectedId = t.selectedId, this.state = Ce();
+    this.id = e, this.futureHandler = new Ge(this), this.servicePathFactory = t.servicePathFactory, this.pourType = t.pourType || "free", this.selectedId = t.selectedId, this.state = Te();
   }
   get servicePath() {
     return this.selectedId ? this.servicePathFactory(this.selectedId, this.state) : "";
@@ -1710,58 +1743,55 @@ let le = class {
     delete this.state[e];
   }
   clearContextData() {
-    this.state = Ce();
+    this.state = Te();
   }
+  handlePouringStart() {
+    this.logger.info("Pour started"), U(this).forEach((t) => {
+      var r;
+      ve(t) && ((r = t.onPourStart) == null || r.call(t));
+    });
+    const e = {
+      pourTarget: this.id,
+      type: this.pourType
+    };
+    R.publish(ti, e);
+  }
+  handlePouringEnd() {
+    this.logger.info("Pour ended");
+  }
+  handleCancelStart() {
+    this.logger.info("Pour canceling");
+  }
+  handleCanceled() {
+    this.logger.info("Pour canceled"), U(this).forEach((t) => {
+      var r;
+      ve(t) && ((r = t.onPourCancel) == null || r.call(t));
+    });
+    const e = {
+      pourTarget: this.id
+    };
+    R.publish(ii, e);
+  }
+  // Inherits throwOnInvalid: false from class
   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 r = await Xr(this.servicePath, e);
-        this.updateIfCurrent(d.POUR_STARTING, d.POURING), E(this).forEach((i) => {
-          var s;
-          Ie(i) && ((s = i.onPourStart) == null || s.call(i));
-        });
-        const a = {
-          pourTarget: this.id,
-          type: this.pourType
-        };
-        if (_.publish(Wr, a), (t = r == null ? void 0 : r.data) != null && t.endState) {
-          this.updateIfCurrent(d.POURING, d.IDLE);
-          const i = {
-            pourTarget: this.id
-          };
-          _.publish(Te, i);
-        }
-        return r;
-      } else
-        throw new Error(`Cannot pour in state ${this.currentState}`);
+      if (this.transition("START_POUR"), !e)
+        throw new Error("No tracker provided");
+      const r = await Wr(this.servicePath, e);
+      return this.transition("POUR_ACTIVE"), (t = r == null ? void 0 : r.data) != null && t.endState && this.transition("POUR_COMPLETED"), r;
     } catch (r) {
-      throw this.logger.error(r), this.currentState = d.IDLE, r;
+      throw this.logger.error(r), this.currentState !== d.IDLE && this.transition("POUR_COMPLETED"), r;
     }
   }
+  // Inherits throwOnInvalid: false - silently ignore if already idle
   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.IDLE;
-      }), E(this).forEach((r) => {
-        var a;
-        Ie(r) && ((a = r.onPourCancel) == null || a.call(r));
-      });
-      const t = {
-        pourTarget: this.id
-      };
-      _.publish(Te, t);
-    }
-    this.currentState === d.IDLE ? this.logger.info("Pour already idle, nothing to cancel.") : this.logger.warn(`Cannot cancel pour in state ${this.currentState}`);
-  }
-  updateIfCurrent(e, t) {
-    this.currentState === e && g(() => {
-      this.currentState = t;
-    });
+    this.transition("CANCEL_POUR"), await ((e = this.futureHandler.getFuture()) == null ? void 0 : e.cancelFuture()), this.transition("POUR_CANCELED");
   }
+  // ============================================================================
+  // Computed Properties
+  // ============================================================================
   /**
    * A derived value that indicates if the nozzle is currently pouring a beverage.
    * @readonly
@@ -1773,7 +1803,8 @@ let le = class {
   /**
    * A derived value that indicates if the pour target is currently available to pour a beverage.
    *
-   * Generally this means that the pour target is currently idle and not in the process of pouring, initiating a pour, or canceling a pour.
+   * Generally this means that the pour target is currently idle and not in the process of pouring,
+   * initiating a pour, or canceling a pour.
    * The value is observable and will change when the selected pourable changes or the pour target
    * starts or stops pouring.
    * @readonly
@@ -1784,9 +1815,12 @@ let le = class {
   get pourProgress() {
     return this.progress ?? 0;
   }
+  // ============================================================================
+  // Future Lifecycle Handler
+  // ============================================================================
   onFutureUpdate(e) {
-    E(this).forEach((r) => {
-      Ie(r) && r.onPourProgress(e);
+    U(this).forEach((r) => {
+      ve(r) && r.onPourProgress(e);
     });
     const t = {
       pourTarget: this.id,
@@ -1799,114 +1833,168 @@ let le = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    _.publish(Qr, t), e.endState && g(() => {
-      this.currentState = d.IDLE;
+    R.publish(ri, t), e.endState && O(() => {
+      this.currentState === d.POURING && this.transition("POUR_COMPLETED");
     });
   }
 };
-dt([
-  pe()
-], le.prototype, "pour", 1);
-le = dt([
-  I(lt),
-  Et(),
-  wt()
-], le);
-const di = new $t({
-  class: le,
-  type: lt
+T([
+  ue(d.POURING)
+], M.prototype, "handlePouringStart", 1);
+T([
+  Pe(d.POURING)
+], M.prototype, "handlePouringEnd", 1);
+T([
+  ue(d.POUR_CANCELING)
+], M.prototype, "handleCancelStart", 1);
+T([
+  Pe(d.POUR_CANCELING)
+], M.prototype, "handleCanceled", 1);
+T([
+  ge(),
+  re({ allowedStates: [d.IDLE] })
+], M.prototype, "pour", 1);
+T([
+  re({
+    allowedStates: [d.POUR_STARTING, d.POURING]
+  })
+], M.prototype, "cancelPour", 1);
+M = T([
+  P(ht),
+  je(),
+  Ct(),
+  Fe(
+    {
+      initial: d.IDLE,
+      initializeAt: pe.READY,
+      states: {
+        [d.IDLE]: {
+          on: {
+            START_POUR: d.POUR_STARTING
+          }
+        },
+        [d.POUR_STARTING]: {
+          on: {
+            POUR_ACTIVE: d.POURING,
+            CANCEL_POUR: d.POUR_CANCELING,
+            POUR_COMPLETED: d.IDLE
+          }
+        },
+        [d.POURING]: {
+          on: {
+            CANCEL_POUR: d.POUR_CANCELING,
+            POUR_COMPLETED: d.IDLE
+          }
+        },
+        [d.POUR_CANCELING]: {
+          on: {
+            POUR_CANCELED: d.IDLE
+          }
+        }
+      }
+    },
+    {
+      trackHistory: !1,
+      throwOnInvalid: !1
+      // Gracefully ignore invalid state calls (expected runtime scenarios)
+    }
+  )
+], M);
+const hi = new Nt({
+  class: M,
+  type: ht
 }), ze = {
-  ...Fe.registration,
-  ...Ue.registration,
-  ...et.registration,
-  ...Ke.registration,
-  ...we.registration,
-  ...rt.registration,
-  ...Me.registration,
-  ...ve.registration,
+  ...ke.registration,
+  ...He.registration,
   ...at.registration,
-  ...Qe.registration
-}, ei = (e) => () => (Ct(e)(), Yr.register(), Object.keys(ze).forEach((t) => {
+  ...Xe.registration,
+  ...$e.registration,
+  ...nt.registration,
+  ...Re.registration,
+  ...Ee.registration,
+  ...dt.registration,
+  ...it.registration
+}, ai = (e) => () => (Dt(e)(), Jr.register(), Object.keys(ze).forEach((t) => {
   const r = ze[t];
-  Rt(e)(t, r);
-}), u[q].register(
+  St(e)(t, r);
+}), g[ee].register(
   "FirmwareUpdateInProgressTrouble",
   async (t) => {
     var r;
     if ((r = t.data) != null && r.deviceId) {
-      const { model: a } = z(
-        at.type
+      const { model: i } = z(
+        dt.type
       );
-      if (a) {
-        const i = a.boards.find(
+      if (i) {
+        const a = i.boards.find(
           (s) => s.id === t.data.deviceId
         ) ? z(t.data.deviceId).model : void 0;
         return {
-          devices: i ? i.name : ""
+          devices: a ? a.name : ""
         };
       }
     }
     return {};
   }
 ), {
-  preload: O.model.preloadModel(e),
-  model: O.model.register(e),
-  companion: O.companion.register(e),
-  legacy: O.model.registerLegacyModel(e)
-}), P = {
-  ...St
+  preload: w.model.preloadModel(e),
+  model: w.model.register(e),
+  companion: w.companion.register(e),
+  legacy: w.model.registerLegacyModel(e)
+}), f = {
+  ...$t
 };
-P.dispense = {
-  models: ei(P)
+f.dispense = {
+  models: ai(f)
 };
-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 li = P;
+f.preload = w.model.preloadModel(f);
+f.model = w.model.register(f);
+f.companion = w.companion.register(f);
+f.legacy = w.model.registerLegacyModel(f);
+const gi = f;
 export {
-  at as A,
-  L as B,
-  Rr as C,
-  D,
+  dt as A,
+  x as B,
+  Sr as C,
+  S as D,
   h as E,
-  Br as F,
-  di as G,
-  Ke as H,
-  Ue as I,
-  Ar as J,
-  li as K,
+  Gr as F,
+  hi as G,
+  Xe as H,
+  He as I,
+  Br as J,
+  gi as K,
   xr as L,
-  Ur as M,
-  we as N,
-  Xr as O,
-  rt as P,
-  Ye as T,
-  Dr as a,
-  ve as b,
-  Ze as c,
-  Qe as d,
-  We as e,
-  Yr as f,
-  et as g,
-  Fe as h,
-  Me as i,
-  Je as j,
+  jr as M,
+  $e as N,
+  Wr as O,
+  nt as P,
+  qe as T,
+  Tr as a,
+  Ee as b,
+  We as c,
+  it as d,
+  rt as e,
+  Jr as f,
+  at as g,
+  ke as h,
+  Re as i,
+  et as j,
   d as k,
   ze as l,
-  zt as m,
-  ni as n,
-  jt as o,
-  oi as p,
-  si as q,
-  ei as r,
-  ai as s,
-  Ht as t,
-  kt as u,
-  Ft as v,
-  ke as w,
+  Ut as m,
+  ci as n,
+  Ht as o,
+  pi as p,
+  li as q,
+  ai as r,
+  di as s,
+  Kt as t,
+  Zt as u,
+  Vt as v,
+  Je as w,
   Mr as x,
-  _r as y,
-  Gr as z
+  Er as y,
+  Fr as z
 };
-//# sourceMappingURL=dispense-registration-manager-CB_nSTZw.js.map
+//# sourceMappingURL=dispense-registration-manager-kSiG2s8S.js.map