@kosdev-code/kos-dispense-sdk 2.0.44 → 2.0.46

package/{dispense-registration-manager-B6nEgoFC.js → dispense-registration-manager-o2X21qmP.js}

@@ -1,10 +1,10 @@
-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, Kos as v, isKosModel as P, resolveServiceUrl as S, ServiceFactory as C, KosLog as m, KosModelContainer as R, KosExtensionUtils as T, kosChild as M, FetchError as gt, ExtensionManager as g, EXTENSION_TROUBLE_MAPPER as Me, EXTENSION_TROUBLE_DATA_MAPPER as W, getKosModelSync as N, kosDependency as ce, TroubleContainer as xe, troubleByTypeReducer as Ae, kosAction as h, kosTopicHandler as Q, DependencyLifecycle as Be, getKosModel as Ue, FutureManager as pe, kosFuture as ue, FutureHandler as Ge, EXTENSION_FEATURE_FLAG_RESOLVER as ht, isKosDataModel as yt, ChildModels as It, KosFeatureFlags as ft, kosParentAware as mt, createPropKey as bt, MultipleFutureHandler as vt, arraysEqual as Pt, getAllKosCompanionModels as E, EventBus as _, KosContextManager as _t, destroyKosModel as Mt, SingletonKosModelRegistrationFactory as Ot, KosModelRegistrationFactory as Et, KosModelRegistry as wt, RegistrationManager as O, registerCoreModels as $t, registerLegacyModel as St } from "@kosdev-code/kos-ui-sdk";
+var gt = Object.defineProperty;
+var ht = (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) => (ht(e, typeof t != "symbol" ? t + "" : t, r), r);
+import { kosModel as I, Kos as v, isKosModel as P, resolveServiceUrl as S, ServiceFactory as C, KosLog as m, KosModelContainer as R, KosExtensionUtils as T, kosChild as M, FetchError as yt, ExtensionManager as g, EXTENSION_TROUBLE_MAPPER as Me, EXTENSION_TROUBLE_DATA_MAPPER as W, getKosModelSync as N, kosDependency as ce, TroubleContainer as Be, troubleByTypeReducer as Ue, kosAction as h, kosTopicHandler as Q, DependencyLifecycle as Ge, getKosModel as Fe, FutureManager as pe, kosFuture as ue, FutureHandler as je, EXTENSION_FEATURE_FLAG_RESOLVER as It, isKosDataModel as ft, ChildModels as mt, KosFeatureFlags as bt, kosParentAware as vt, createPropKey as Pt, MultipleFutureHandler as _t, arraysEqual as Mt, getAllKosCompanionModels as E, EventBus as _, KosContextManager as ze, destroyKosModel as Ot, SingletonKosModelRegistrationFactory as Et, KosModelRegistrationFactory as wt, KosModelRegistry as $t, RegistrationManager as O, registerCoreModels as St, registerLegacyModel as Ct } from "@kosdev-code/kos-ui-sdk";
 import "react";
-var u = /* @__PURE__ */ ((e) => (e.IngredientLoader = "kos.ingredient.loader", e.IngredientMapper = "kos.ingredient.mapper", e.IngredientIndex = "kos.ingredient.index", e.IngredientTypeMapper = "kos.ingredient.type.mapper", e.HolderTypeMapper = "kos.holder.type.mapper", e.HolderMapper = "kos.holder.mapper", e.HolderIndex = "kos.holder.index", e.HolderIngredientMapper = "kos.holder.ingredient.mapper", e.AvailabilityMapper = "kos.availability.mapper", e.AvailabilityLoader = "kos.availability.loader", e.SelectedPourableMapper = "kos.selected.pourable.mapper", e.AssemblyMapper = "kos.assembly.mapper", e.BoardMapper = "kos.board.mapper", e.BoardIndex = "kos.board.index", e.PumpIndex = "kos.pump.index", e.AssemblyFeatureFlags = "kos.assembly.feature.flags", e))(u || {}), z = /* @__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))(z || {}), Ct = Object.getOwnPropertyDescriptor, Rt = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Ct(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var u = /* @__PURE__ */ ((e) => (e.IngredientLoader = "kos.ingredient.loader", e.IngredientMapper = "kos.ingredient.mapper", e.IngredientIndex = "kos.ingredient.index", e.IngredientTypeMapper = "kos.ingredient.type.mapper", e.HolderTypeMapper = "kos.holder.type.mapper", e.HolderMapper = "kos.holder.mapper", e.HolderIndex = "kos.holder.index", e.HolderIngredientMapper = "kos.holder.ingredient.mapper", e.AvailabilityMapper = "kos.availability.mapper", e.AvailabilityLoader = "kos.availability.loader", e.SelectedPourableMapper = "kos.selected.pourable.mapper", e.AssemblyMapper = "kos.assembly.mapper", e.BoardMapper = "kos.board.mapper", e.BoardIndex = "kos.board.index", e.PumpIndex = "kos.pump.index", e.AssemblyFeatureFlags = "kos.assembly.feature.flags", e))(u || {}), z = /* @__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))(z || {}), Rt = Object.getOwnPropertyDescriptor, zt = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Rt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
     (n = e[s]) && (i = n(i) || i);
   return i;
 };
@@ -36,10 +36,10 @@ let be = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-be = Rt([
+be = zt([
   I(G)
 ], be);
-const je = {
+const He = {
   registration: {
     [G]: {
       class: be,
@@ -49,17 +49,17 @@ const je = {
   type: G,
   predicate: P(G),
   factory: v.Factory.create(G)
-}, { URL: Fe } = S("INGREDIENT_SERVICE"), { getOne: zt } = C.build({
-  basePath: `${Fe}/api/ext/dispense/ingredients`
-}), Dt = async () => await zt({
-  urlOverride: `${Fe}/api/ext/dispense/ingredients`
+}, { URL: Ke } = S("INGREDIENT_SERVICE"), { getOne: Dt } = C.build({
+  basePath: `${Ke}/api/ext/dispense/ingredients`
+}), Tt = async () => await Dt({
+  urlOverride: `${Ke}/api/ext/dispense/ingredients`
 });
-var Tt = Object.defineProperty, Nt = Object.getOwnPropertyDescriptor, He = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Nt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var Nt = Object.defineProperty, Lt = Object.getOwnPropertyDescriptor, Ve = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Lt(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 && Tt(t, r, i), i;
+  return a && i && Nt(t, r, i), i;
 };
-const j = "ingredient-container-model", Lt = m.createLogger({ name: "ingredient-container-model" });
+const F = "ingredient-container-model", xt = m.createLogger({ name: "ingredient-container-model" });
 let ae = class {
   constructor(e, t) {
     o(this, "id");
@@ -80,8 +80,8 @@ let ae = class {
   }
   async load(e) {
     var i;
-    Lt.debug(`loading ingredient container ${this.id}`);
-    const t = await Dt();
+    xt.debug(`loading ingredient container ${this.id}`);
+    const t = await Tt();
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load ingredients");
     const r = await T.executeLoaderExtension({
@@ -103,7 +103,7 @@ let ae = class {
           type: c || n.type,
           ...l,
           data: l
-        }, y = je.factory(n.id)(
+        }, y = He.factory(n.id)(
           p
         );
         this.ingredients.addModel(y);
@@ -111,64 +111,64 @@ let ae = class {
   }
   // -------------------ENTITY----------------------------
 };
-He([
+Ve([
   M
 ], ae.prototype, "ingredients", 2);
-ae = He([
-  I(j)
+ae = Ve([
+  I(F)
 ], ae);
-const Ke = {
+const ke = {
   registration: {
-    [j]: {
+    [F]: {
       class: ae,
       singleton: !0
     }
   },
-  type: j,
-  predicate: P(j),
-  factory: v.Singleton.create(j)
-}, { URL: ge } = S("HOLDER_SERVICE"), { getAll: xt, postModel: Ve, deleteModel: At } = C.build({
+  type: F,
+  predicate: P(F),
+  factory: v.Singleton.create(F)
+}, { URL: ge } = S("HOLDER_SERVICE"), { getAll: At, postModel: Ye, deleteModel: Bt } = C.build({
   basePath: `${ge}/api/kos/holders`
-}), Bt = m.createLogger({
+}), Ut = m.createLogger({
   name: "holder-service",
   group: "Services"
-}), ri = async () => await xt({}), Ut = async (e, t) => {
+}), ri = async () => await At({}), Gt = async (e, t) => {
   if (!e || !t)
     throw new Error("Missing holderPath or ingredientId");
-  return await Ve({
+  return await Ye({
     model: { holderPath: e, ingredientId: t },
     urlOverride: `${ge}/api/ext/dispense/assignments`
   });
-}, Gt = async (e) => {
+}, Ft = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return await At({
+  return await Bt({
     id: e,
     urlOverride: `${ge}/api/ext/dispense/assignments/${e}`
   });
 }, jt = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return Bt.debug(
+  return Ut.debug(
     `sending POST request to /api/ext/dispense/pumpEvents/replaceLine/${e}`
-  ), await Ve({
+  ), await Ye({
     model: {},
     urlOverride: `${ge}/api/ext/dispense/pumpEvents/replaceLine/${e}`
   });
-}, { URL: se } = S("ASSIGNMENT_SERVICE"), { getAll: Ft, postModel: ke, deleteModel: Ht } = C.build({
+}, { URL: se } = S("ASSIGNMENT_SERVICE"), { getAll: Ht, postModel: Ze, deleteModel: Kt } = C.build({
   destinationAddress: "",
   basePath: `${se}/api/ext/dispense/assignments`
-}), ne = window.kosUseFos, ii = async () => await Ft({ fos: ne }), Kt = async (e, t) => {
+}), ne = window.kosUseFos, ii = async () => await Ht({ fos: ne }), Vt = async (e, t) => {
   var i, s, n, l;
   const r = JSON.stringify(t), a = `${se}/api/ext/dispense/assignments`;
   try {
-    const c = await ke({
+    const c = await Ze({
       model: { holderPath: e, factoryJson: r },
       urlOverride: a
     });
     return (c == null ? void 0 : c.status) === 200 && ((i = c == null ? void 0 : c.data) != null && i.error) ? [c.data.error || "unknownError", c.data] : [void 0, c == null ? void 0 : c.data];
   } catch (c) {
-    if (c instanceof gt)
+    if (c instanceof yt)
       return [
         ((n = (s = c.payload) == null ? void 0 : s.data) == null ? void 0 : n.error) || "unknownError",
         (l = c.payload) == null ? void 0 : l.data
@@ -177,18 +177,18 @@ const Ke = {
   return ["unknownError", void 0];
 }, ai = async (e) => {
   const t = ne ? `${se}/api/ingredients/assignments/${e.holderPath}` : `${se}/api/ext/dispense/assignments`;
-  return await ke({
+  return await Ze({
     model: { ...e, fuelGauge: 680 },
     fos: ne,
     urlOverride: t
   });
-}, si = async (e) => await Ht({ id: e, fos: ne });
-var Vt = Object.defineProperty, kt = Object.getOwnPropertyDescriptor, he = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? kt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+}, si = async (e) => await Kt({ id: e, fos: ne });
+var kt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, he = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Yt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
     (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
-  return a && i && Vt(t, r, i), i;
+  return a && i && kt(t, r, i), i;
 };
-const F = z.Holder, ze = m.createLogger({ name: "holder-model" });
+const j = z.Holder, De = m.createLogger({ name: "holder-model" });
 g[Me].register(
   "holder",
   async (e) => {
@@ -235,7 +235,7 @@ g[W].register(
     return {};
   }
 );
-class Yt extends Error {
+class Zt extends Error {
   constructor(r, a) {
     super(a);
     o(this, "type");
@@ -351,7 +351,7 @@ let L = class {
   }
   get troublesByType() {
     return this.troubles.reduce(
-      Ae,
+      Ue,
       {}
     );
   }
@@ -396,9 +396,9 @@ let L = class {
     if (!e)
       throw new Error("Invalid override");
     try {
-      const [t, r] = await Kt(this.path, e);
+      const [t, r] = await Vt(this.path, e);
       if (t)
-        throw new Yt(
+        throw new Zt(
           t,
           `Failed to perform rfid override on holder ${this.id}`
         );
@@ -406,16 +406,16 @@ let L = class {
         this.ingredientId = r == null ? void 0 : r.ingredientId;
       }), r;
     } catch (t) {
-      throw ze.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 Ut(this.path, e) : await Gt(this.path), h(() => {
+      e ? await Gt(this.path, e) : await Ft(this.path), h(() => {
         this.ingredientId = e;
       });
     } catch (t) {
-      throw ze.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() {
@@ -448,25 +448,25 @@ he([
   M
 ], L.prototype, "pumps", 2);
 he([
-  ce({ modelType: Ke.type })
+  ce({ modelType: ke.type })
 ], L.prototype, "ingredientContainer", 2);
 he([
-  ce({ modelType: xe.type })
+  ce({ modelType: Be.type })
 ], L.prototype, "troubleContainer", 2);
 L = he([
-  I(F)
+  I(j)
 ], L);
-const Ye = {
+const Xe = {
   registration: {
-    [F]: {
+    [j]: {
       class: L,
       singleton: !1
     }
   },
-  type: F,
-  predicate: P(F),
-  factory: v.Factory.create(F)
-}, Zt = async (e, t) => {
+  type: j,
+  predicate: P(j),
+  factory: v.Factory.create(j)
+}, Xt = async (e, t) => {
   var Re;
   const r = g.propertyMapper.executeMapper(
     u.HolderIngredientMapper,
@@ -489,19 +489,19 @@ const Ye = {
     group: e,
     data: f
   };
-  return Ye.factory(t.path)(re);
-}, { URL: Xt } = S("ASSEMBLY_SERVICE"), { getOne: Jt } = C.build({
-  basePath: `${Xt}/api/kos/device/assemblies`
-}), qt = m.createLogger({
+  return Xe.factory(t.path)(re);
+}, { URL: Jt } = S("ASSEMBLY_SERVICE"), { getOne: qt } = C.build({
+  basePath: `${Jt}/api/kos/device/assemblies`
+}), Wt = m.createLogger({
   name: "assembly-service",
   group: "Services"
-}), Ze = async () => (qt.debug("sending GET for assembly"), await Jt({}));
-var Wt = Object.defineProperty, Qt = Object.getOwnPropertyDescriptor, ye = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Qt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+}), Je = async () => (Wt.debug("sending GET for assembly"), await qt({}));
+var Qt = Object.defineProperty, er = Object.getOwnPropertyDescriptor, ye = (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 && Wt(t, r, i), i;
+  return a && i && Qt(t, r, i), i;
 };
-const H = "board-container-model", Xe = "/kos/hardware/board/linked", Je = "/kos/hardware/board/unlinked";
+const H = "board-container-model", qe = "/kos/hardware/board/linked", We = "/kos/hardware/board/unlinked";
 let x = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -532,11 +532,11 @@ let x = class {
     r.updateModel(e);
   }
   handleBoardLinkEvent(e) {
-    this.logger.debug(`handling ${Xe} event ${e}`), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
+    this.logger.debug(`handling ${qe} event ${e}`), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
   }
   handleBoardUnlinkEvent(e) {
     this.logger.debug(
-      `handling ${Je} event ${e}`
+      `handling ${We} event ${e}`
     ), e ? this.updateBoard(e) : this.logger.debug("- boardLinkEvent is undefined");
   }
 };
@@ -545,34 +545,34 @@ ye([
 ], x.prototype, "models", 2);
 ye([
   Q({
-    lifecycle: Be.INIT,
-    topic: Xe,
+    lifecycle: Ge.INIT,
+    topic: qe,
     websocket: !0
   })
 ], x.prototype, "handleBoardLinkEvent", 1);
 ye([
   Q({
-    lifecycle: Be.INIT,
-    topic: Je,
+    lifecycle: Ge.INIT,
+    topic: We,
     websocket: !0
   })
 ], x.prototype, "handleBoardUnlinkEvent", 1);
 x = ye([
   I(H)
 ], x);
-const er = async (e) => {
+const tr = async (e) => {
   const t = e.data.boardPath, { model: r } = N(t);
   return {
     boardName: (r == null ? void 0 : r.name) || ""
   };
 };
-var tr = Object.defineProperty, rr = Object.getOwnPropertyDescriptor, qe = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? rr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var rr = Object.defineProperty, ir = Object.getOwnPropertyDescriptor, Qe = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? ir(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 && tr(t, r, i), i;
+  return a && i && rr(t, r, i), i;
 };
 const K = z.PumpContainer;
-var We = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(We || {});
+var et = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(et || {});
 let oe = class {
   constructor(e, t) {
     o(this, "id");
@@ -621,10 +621,10 @@ let oe = class {
   }
   // -------------------ENTITY----------------------------
 };
-qe([
+Qe([
   M
 ], oe.prototype, "pumps", 2);
-oe = qe([
+oe = Qe([
   I(K)
 ], oe);
 const Oe = {
@@ -639,26 +639,26 @@ const Oe = {
   factory: v.Singleton.create(
     K
   )
-}, Qe = async (e) => {
-  const t = [], { model: r } = await Ue(e);
+}, tt = async (e) => {
+  const t = [], { model: r } = await Fe(e);
   return r && (t.push(r.boardPath), t.push(r.nozzlePath), t.push(r.holderPath)), t;
-}, ir = async (e) => {
+}, ar = async (e) => {
   const t = [], r = e.data.pumpPath;
   t.push(r);
-  const a = await Qe(r);
+  const a = await tt(r);
   return [...t, ...a];
-}, ar = async (e) => {
+}, sr = async (e) => {
   const t = [], r = e.data.boardPath;
   t.push(e.data.boardPath);
-  const a = await Ue(
+  const a = await Fe(
     Oe.type
   );
   if (a != null && a.model) {
     const s = a.model.models.getIndexByKey(
-      We.byBoard,
+      et.byBoard,
       r
     ).map(
-      (l) => Qe(l.path)
+      (l) => tt(l.path)
     );
     (await Promise.allSettled(s)).forEach((l) => {
       l.status === "fulfilled" && l.value.forEach((c) => t.push(c));
@@ -666,22 +666,22 @@ const Oe = {
   }
   return Array.from(new Set(t));
 };
-var sr = Object.getOwnPropertyDescriptor, nr = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? sr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var nr = Object.getOwnPropertyDescriptor, or = (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;
 };
-const V = "board-model", De = (e, t) => {
+const V = "board-model", Te = (e, t) => {
   const { type: r, name: a, path: i, linked: s, instanceId: n, link: l, ...c } = e;
   t.type = r, t.name = a, t.path = i, t.linked = s, t.link = Object.freeze(l), t.instanceId = n, Object.assign(t, c);
 };
 g[Me].register(
   "board",
-  ar
+  sr
 );
 g[W].register(
   "board",
-  er
+  tr
 );
 let ve = class {
   constructor(e, t, r) {
@@ -692,10 +692,10 @@ let ve = 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, Te(t, this);
   }
   updateModel(e) {
-    De(e, this);
+    Te(e, this);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -705,10 +705,10 @@ let ve = class {
     this.logger.debug(`loading board ${this.id}`);
   }
 };
-ve = nr([
+ve = or([
   I(V)
 ], ve);
-const et = {
+const rt = {
   registration: {
     [V]: {
       class: ve,
@@ -718,13 +718,13 @@ const et = {
   type: V,
   predicate: P(V),
   factory: v.Factory.create(V)
-}, tt = {
+}, it = {
   registration: {
     [H]: {
       class: x,
       singleton: !0
     },
-    ...et.registration
+    ...rt.registration
   },
   type: H,
   predicate: P(H),
@@ -732,12 +732,12 @@ const et = {
     H
   )
 };
-var or = Object.defineProperty, dr = Object.getOwnPropertyDescriptor, Ie = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? dr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var dr = Object.defineProperty, lr = Object.getOwnPropertyDescriptor, Ie = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? lr(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;
+  return a && i && dr(t, r, i), i;
 };
-const k = z.HolderContainer, lr = "/kos/insertion/insert/start", cr = "/kos/insertion/insert/complete", pr = "/kos/insertion/insert/update", ur = "/kos/insertion/remove", gr = "/kos/pumpEvent/replaceLine", hr = "/kos/handle/*";
+const k = z.HolderContainer, cr = "/kos/insertion/insert/start", pr = "/kos/insertion/insert/complete", ur = "/kos/insertion/insert/update", gr = "/kos/insertion/remove", hr = "/kos/pumpEvent/replaceLine", yr = "/kos/handle/*";
 let A = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -789,7 +789,7 @@ Ie([
 ], A.prototype, "holders", 2);
 Ie([
   Q({
-    topic: hr,
+    topic: yr,
     websocket: !0,
     condition: (e, t) => t.holders.getModel(e.path) !== void 0
   })
@@ -797,11 +797,11 @@ Ie([
 Ie([
   Q({
     topic: [
-      lr,
       cr,
       pr,
       ur,
-      gr
+      gr,
+      hr
     ],
     websocket: !0
   })
@@ -809,7 +809,7 @@ Ie([
 A = Ie([
   I(k)
 ], A);
-const rt = {
+const at = {
   registration: {
     [k]: {
       class: A,
@@ -821,7 +821,7 @@ const rt = {
   factory: v.Singleton.create(
     k
   )
-}, yr = m.createLogger({ name: "board-utils" }), Ir = async (e) => {
+}, Ir = m.createLogger({ name: "board-utils" }), fr = async (e) => {
   const t = await T.executeDataMapperExtension({
     extension: u.BoardMapper,
     data: e,
@@ -833,41 +833,41 @@ const rt = {
     linked: s,
     instanceId: n,
     ...c
-  }, y = et.factory(e.path)(p);
+  }, y = rt.factory(e.path)(p);
   return y.updateModel(p), y;
-}, fr = (e) => async (t) => {
-  yr.debug(`adding board ${t.name}`);
-  const r = await Ir(t);
+}, 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: Ee } = S("PUMP_SERVICE"), { postModel: mr, getOne: br } = C.build({
+const { URL: Ee } = S("PUMP_SERVICE"), { postModel: br, getOne: vr } = C.build({
   basePath: `${Ee}/api/kos/holders`
 });
 m.createLogger({
   name: "pump-service",
   group: "Services"
 });
-const vr = async ({
+const Pr = async ({
   intent: e,
   pumpId: t,
   tracker: r
 }) => {
-  const a = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await mr({ model: {}, urlOverride: a, tracker: r });
+  const a = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await br({ model: {}, urlOverride: a, tracker: r });
   return i != null && i.data && pe.initiateFuture(i.data), i;
-}, Pr = async (e, t) => {
-  const r = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, a = await br({ urlOverride: r });
+}, _r = async (e, t) => {
+  const r = `${Ee}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, a = await vr({ urlOverride: r });
   return a != null && a.data ? a.data : { volume: -1 };
 };
-var _r = Object.defineProperty, Mr = Object.getOwnPropertyDescriptor, we = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Mr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var Mr = Object.defineProperty, Or = Object.getOwnPropertyDescriptor, we = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Or(t, r) : t, s = e.length - 1, n; s >= 0; s--)
     (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
-  return a && i && _r(t, r, i), i;
+  return a && i && Mr(t, r, i), i;
 };
 const Y = z.Pump;
 g[Me].register(
   "pump",
-  ir
+  ar
 );
 let q = class {
   constructor(e, t) {
@@ -899,7 +899,7 @@ let q = class {
       prevIngredientId: y,
       ...U
     } = 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 = l, this.childPump = !!c, this.virtual = !!p, this.prevIngredientId = y, Object.assign(this, U), this.futureHandler = new Ge(this);
+    this.inserted = r, this.type = t.type, this.ingredientId = t.ingredientId, this.holderPath = a, this.boardPath = i, this.nozzlePath = s, this.name = n, this.path = l, this.childPump = !!c, this.virtual = !!p, this.prevIngredientId = y, Object.assign(this, U), this.futureHandler = new je(this);
   }
   updateModel(e) {
     const {
@@ -923,7 +923,7 @@ let q = class {
   }
   get troublesByType() {
     return this.troubles.reduce(
-      Ae,
+      Ue,
       {}
     );
   }
@@ -953,7 +953,7 @@ let q = class {
     return this.futureHandler.future;
   }
   async resolveIntentVolume(e) {
-    return await Pr(this.path, e);
+    return await _r(this.path, e);
   }
   async performIntent(e, t) {
     const r = typeof e == "string" ? e : e.intent;
@@ -963,7 +963,7 @@ let q = class {
       if (this.currentState === d.IDLE) {
         if (this.currentState = d.POUR_STARTING, !t)
           throw new Error("No tracker provided");
-        const a = await vr({
+        const a = await Pr({
           tracker: t,
           intent: r,
           pumpId: this.path
@@ -980,7 +980,7 @@ let q = class {
   // -------------------ENTITY----------------------------
 };
 we([
-  ce({ modelType: xe.type })
+  ce({ modelType: Be.type })
 ], q.prototype, "troubleContainer", 2);
 we([
   ue()
@@ -988,7 +988,7 @@ we([
 q = we([
   I(Y)
 ], q);
-const it = {
+const st = {
   registration: {
     [Y]: {
       class: q,
@@ -998,7 +998,7 @@ const it = {
   type: Y,
   predicate: P(Y),
   factory: v.Factory.create(Y)
-}, Or = m.createLogger({ name: "pump-utils" }), Er = (e, t) => {
+}, Er = m.createLogger({ name: "pump-utils" }), wr = (e, t) => {
   const r = (t.pumps ?? []).length > 1, a = {
     boardPath: t.boardPath,
     holderPath: t.holderPath,
@@ -1011,12 +1011,12 @@ const it = {
     type: t.type,
     nozzlePath: e,
     prevIngredientId: t.prevIngredientId
-  }, i = it.factory(t.path)(a);
+  }, i = st.factory(t.path)(a);
   return i.updateModel(a), i;
-}, at = (e) => (t) => (r) => (a) => {
+}, nt = (e) => (t) => (r) => (a) => {
   var l;
-  Or.debug(`adding pump ${a.name}`);
-  const i = Er(r.path, a);
+  Er.debug(`adding pump ${a.name}`);
+  const i = wr(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), (l = a == null ? void 0 : a.pumps) == null || l.forEach((c) => {
@@ -1026,15 +1026,15 @@ const it = {
       holderPath: p,
       ingredientId: i.ingredientId
     };
-    at(e)(t)(r)(y);
+    nt(e)(t)(r)(y);
   });
 };
-var wr = Object.defineProperty, $r = Object.getOwnPropertyDescriptor, ee = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? $r(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var $r = Object.defineProperty, Sr = Object.getOwnPropertyDescriptor, ee = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Sr(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 && wr(t, r, i), i;
+  return a && i && $r(t, r, i), i;
 };
-const Z = "assembly-model", Sr = "assembly-data", Cr = "assembly-raw-data";
+const Z = "assembly-model", Cr = "assembly-data", Rr = "assembly-raw-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 = rt.factory({}), this.boardContainer = tt.factory({}), this.pumpContainer = Oe.factory({}), this.logger = r.logger;
+    this.id = e, this.holderContainer = at.factory({}), this.boardContainer = it.factory({}), this.pumpContainer = Oe.factory({}), this.logger = r.logger;
   }
   updateModel(e) {
   }
@@ -1087,23 +1087,23 @@ let w = class {
   }
   async ready() {
     var e;
-    (e = this.troubleContainer) == null || e.troubles.increment(), g[ht].execute(
+    (e = this.troubleContainer) == null || e.troubles.increment(), g[It].execute(
       u.AssemblyFeatureFlags,
       this
     );
   }
   async load(e) {
     this.logger.debug(`loading assembly ${this.id}`);
-    const t = await Ze();
+    const t = await Je();
     if ((t == null ? void 0 : t.status) === 200) {
       const r = await T.executeDataMapperExtension({
         extension: u.AssemblyMapper,
         data: t.data,
         contextData: {}
       });
-      e.set(Sr, 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(Cr, t.data);
+      e.set(Cr, r), Object.assign(this, r), Object.entries(r).forEach(([a, i]) => {
+        ft(i) && (this.logger.debug(`adding child model ${a} from extension data`), this[mt][a] = !0);
+      }), e.set(Rr, t.data);
       for await (const a of t.data.assemblies) {
         const {
           boards: i = [],
@@ -1115,19 +1115,19 @@ let w = class {
           ...y
         } = a;
         this.logger.debug(`adding assembly ${c}`), Object.keys(y).forEach((f) => {
-          ft.enableFeature(f);
+          bt.enableFeature(f);
         });
         for await (const f of i)
-          this.logger.debug(`adding board ${f.name}`), await fr(this.boardContainer)(f);
+          this.logger.debug(`adding board ${f.name}`), await mr(this.boardContainer)(f);
         for await (const [f, D] of Object.entries(
           s ?? {}
         ))
           for await (const re of D) {
             this.logger.debug(`adding holder ${re.name}`);
-            const Ce = await Zt(f, re);
+            const Ce = await Xt(f, re);
             this.holderContainer.holders.addModel(Ce);
           }
-        const U = at(this.pumpContainer)(
+        const U = nt(this.pumpContainer)(
           this.holderContainer
         );
         n.forEach((f) => {
@@ -1156,7 +1156,7 @@ ee([
 w = ee([
   I(Z)
 ], w);
-const st = {
+const ot = {
   registration: {
     [Z]: {
       class: w,
@@ -1167,8 +1167,8 @@ const st = {
   predicate: P(Z),
   factory: v.Singleton.create(Z)
 };
-var Rr = Object.getOwnPropertyDescriptor, zr = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Rr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var zr = Object.getOwnPropertyDescriptor, Dr = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? zr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
     (n = e[s]) && (i = n(i) || i);
   return i;
 };
@@ -1199,8 +1199,8 @@ let Pe = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-Pe = zr([
-  mt(),
+Pe = Dr([
+  vt(),
   I(X)
 ], Pe);
 const _e = {
@@ -1215,9 +1215,9 @@ const _e = {
   factory: v.Factory.create(
     X
   )
-}, { URL: B } = S("NOZZLE_SERVICE"), { postModel: $e, deleteModel: Dr, getOne: Tr } = C.build({
+}, { URL: B } = S("NOZZLE_SERVICE"), { postModel: $e, deleteModel: Tr, getOne: Nr } = C.build({
   basePath: `${B}/api/nozzle`
-}), Nr = async (e, t) => {
+}), Lr = async (e, t) => {
   const r = await $e({
     model: {},
     urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/pour`,
@@ -1225,7 +1225,7 @@ const _e = {
     tracker: t
   });
   return r != null && r.data && pe.initiateFuture(r.data), r;
-}, Lr = async (e, t, r) => {
+}, xr = async (e, t, r) => {
   const a = await $e({
     model: {},
     urlOverride: `${B}/api/ext/dispense/nozzle/${t}/pipeline/beverage/fixed/${e}`,
@@ -1233,12 +1233,12 @@ const _e = {
     tracker: r
   });
   return a != null && a.data && pe.initiateFuture(a.data), a;
-}, xr = async (e) => await Tr({
+}, Ne = async (e) => await Nr({
   urlOverride: `${B}${e}/pipeline/beverage/availability`
 }), Ar = async (e, t) => await $e({
   model: t,
   urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
-}), Br = async (e) => await Dr({
+}), Br = async (e) => await Tr({
   id: e,
   urlOverride: `${B}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
 });
@@ -1247,9 +1247,9 @@ var Ur = Object.defineProperty, Gr = Object.getOwnPropertyDescriptor, te = (e, t
     (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
   return a && i && Ur(t, r, i), i;
 };
-const J = z.Nozzle, jr = bt(
+const J = z.Nozzle, Fr = Pt(
   "beverageTopicPrefix"
-), ie = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, Te = "/kos/nozzle/pour/started", Fr = "/kos/nozzle/pour/progress", fe = "/kos/nozzle/pour/cancel";
+), ie = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, Le = "/kos/nozzle/pour/started", jr = "/kos/nozzle/pour/progress", fe = "/kos/nozzle/pour/cancel";
 let $ = class {
   constructor(e, t, r) {
     /** the unique identifier for this nozzle.*/
@@ -1266,7 +1266,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 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 R({
       indexMap: {
         byGroup: "groupId",
         byParent: "parentId"
@@ -1364,7 +1364,7 @@ let $ = class {
       this._selectedBeverage = void 0;
       return;
     }
-    if (e === this._selectedBeverage && Pt(this._additionalItems, t)) {
+    if (e === this._selectedBeverage && Mt(this._additionalItems, t)) {
       this.logger.info("No change in selected pourable");
       return;
     }
@@ -1437,7 +1437,7 @@ let $ = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    _.publish(Fr, r), e.endState && h(() => {
+    _.publish(jr, r), e.endState && h(() => {
       this.currentState = d.IDLE;
     });
   }
@@ -1447,7 +1447,7 @@ let $ = class {
       if (this.currentState === d.IDLE) {
         if (this.updateIfCurrent(d.IDLE, d.POUR_STARTING), !e)
           throw new Error("No tracker provided");
-        const r = await Nr(this.name, e);
+        const r = await Lr(this.name, e);
         this.updateIfCurrent(d.POUR_STARTING, d.POURING), E(this).forEach((i) => {
           var s;
           ie(i) && ((s = i.onPourStart) == null || s.call(i));
@@ -1456,7 +1456,7 @@ let $ = class {
           nozzleId: this.id,
           type: "free"
         };
-        if (_.publish(Te, a), (t = r == null ? void 0 : r.data) != null && t.endState) {
+        if (_.publish(Le, a), (t = r == null ? void 0 : r.data) != null && t.endState) {
           this.updateIfCurrent(d.POURING, d.IDLE);
           const i = {
             nozzleId: this.id
@@ -1476,7 +1476,7 @@ let $ = class {
       if (this.currentState === d.IDLE) {
         if (this.currentState = d.POUR_STARTING, !t)
           throw new Error("No tracker provided");
-        const a = await Lr(e, this.name, t);
+        const a = await xr(e, this.name, t);
         this.currentState === d.POUR_STARTING && h(() => {
           this.currentState = d.POURING;
         }), E(this).forEach((s) => {
@@ -1487,7 +1487,7 @@ let $ = class {
           nozzleId: this.id,
           type: "fixed"
         };
-        if (_.publish(Te, i), (r = a == null ? void 0 : a.data) != null && r.endState) {
+        if (_.publish(Le, i), (r = a == null ? void 0 : a.data) != null && r.endState) {
           this.updateIfCurrent(d.POURING, d.IDLE);
           const s = {
             nozzleId: this.id
@@ -1530,11 +1530,23 @@ let $ = class {
       });
     });
   }
+  async reload() {
+    this.logger.info(`reloading nozzle ${this.id}`);
+    const e = ze.getContext(this.id);
+    e != null && e.get(u.AvailabilityLoader);
+    const t = await Ne(this.urlPrefix);
+    if ((t == null ? void 0 : t.status) !== 200 || !(t != null && t.data)) {
+      this.logger.error("Failed to load nozzle availability");
+      return;
+    }
+    const r = t == null ? void 0 : t.data;
+    r && await this.updateAvailability(r);
+  }
   /** @internal */
   async load(e) {
     var a, i;
     this.logger.debug(`loading nozzle ${this.id}`);
-    const t = await xr(this.urlPrefix);
+    const t = await Ne(this.urlPrefix);
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load nozzle availability");
     const r = await g.loader.executeLoader(
@@ -1564,7 +1576,7 @@ let $ = class {
     this.updateGroupMembers();
   }
   async updateAvailability(e) {
-    const t = _t.getContext(this.id), r = (t == null ? void 0 : t.get(u.AvailabilityLoader)) || {};
+    const t = ze.getContext(this.id), r = (t == null ? void 0 : t.get(u.AvailabilityLoader)) || {};
     if (e.rebuild) {
       this.logger.info(
         `Received rebuild update for nozzle ${this.path}, rebuilding entire availability set`
@@ -1577,7 +1589,7 @@ let $ = class {
         ).forEach((s) => {
           this.logger.info(
             `Removing beverage ${s.id} from nozzle ${this.path} due to rebuild update`
-          ), this._availabilityItems.removeModel(s.id), Mt(s);
+          ), this._availabilityItems.removeModel(s.id), Ot(s);
         });
         for (const s of (e == null ? void 0 : e.groups[a]) || []) {
           const n = await g.dataMapper.executeMapper(
@@ -1654,7 +1666,7 @@ te([
 ], $.prototype, "fixedPour", 1);
 te([
   Q({
-    topic: `${jr}/availability`,
+    topic: `${Fr}/availability`,
     websocket: !0
   })
 ], $.prototype, "updateAvailability", 1);
@@ -1672,12 +1684,12 @@ const Se = {
   predicate: P(J),
   factory: v.Factory.create(J)
 };
-var Hr = Object.defineProperty, Kr = Object.getOwnPropertyDescriptor, nt = (e, t, r, a) => {
+var Hr = Object.defineProperty, Kr = Object.getOwnPropertyDescriptor, dt = (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 && Hr(t, r, i), i;
 };
-const ot = "device-assembly-model";
+const lt = "device-assembly-model";
 let de = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -1697,7 +1709,7 @@ let de = class {
   }
   async load() {
     this.logger.debug(`loading device-assembly ${this.id}`);
-    const e = await Ze();
+    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((l) => l.name === "beverage")) == null ? void 0 : n.topicPrefix) || "", s = Se.factory(a)({
@@ -1711,32 +1723,32 @@ let de = class {
     });
   }
 };
-nt([
+dt([
   M
 ], de.prototype, "deviceNozzles", 2);
-de = nt([
-  I(ot)
+de = dt([
+  I(lt)
 ], de);
-const Vr = new Ot({
+const Vr = new Et({
   class: de,
-  type: ot
-}), { URL: dt } = S("GENERIC_POUR_SERVICE"), { postModel: kr } = C.build({
-  basePath: `${dt}/api/nozzle`
+  type: lt
+}), { URL: ct } = S("GENERIC_POUR_SERVICE"), { postModel: kr } = C.build({
+  basePath: `${ct}/api/nozzle`
 }), Yr = async (e, t) => {
   const r = await kr({
     model: {},
-    urlOverride: `${dt}${e}`,
+    urlOverride: `${ct}${e}`,
     ordered: !0,
     tracker: t
   });
   return r != null && r.data && pe.initiateFuture(r.data), r;
 };
-var Zr = Object.defineProperty, Xr = Object.getOwnPropertyDescriptor, lt = (e, t, r, a) => {
+var Zr = Object.defineProperty, Xr = Object.getOwnPropertyDescriptor, pt = (e, t, r, a) => {
   for (var i = a > 1 ? void 0 : a ? Xr(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 && Zr(t, r, i), i;
 };
-const ct = "generic-pour-model", Jr = "/kos/generic/pour/started", qr = "/kos/generic/pour/progress", Ne = "/kos/generic/pour/cancel", me = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
+const ut = "generic-pour-model", Jr = "/kos/generic/pour/started", qr = "/kos/generic/pour/progress", xe = "/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");
@@ -1746,7 +1758,7 @@ let le = class {
     o(this, "logger");
     o(this, "futureHandler");
     o(this, "selectedId");
-    this.id = e, this.logger = r.logger, this.futureHandler = new Ge(this), this.servicePathFactory = t.servicePathFactory, this.pourType = t.pourType || "free", this.selectedId = t.selectedId;
+    this.id = e, this.logger = r.logger, this.futureHandler = new je(this), this.servicePathFactory = t.servicePathFactory, this.pourType = t.pourType || "free", this.selectedId = t.selectedId;
   }
   get servicePath() {
     return this.selectedId ? this.servicePathFactory(this.selectedId) : "";
@@ -1771,7 +1783,7 @@ let le = class {
           const i = {
             pourTarget: this.id
           };
-          _.publish(Ne, i);
+          _.publish(xe, i);
         }
         return r;
       } else
@@ -1792,7 +1804,7 @@ let le = class {
       const t = {
         pourTarget: this.id
       };
-      _.publish(Ne, t);
+      _.publish(xe, t);
     }
     this.currentState === d.IDLE ? this.logger.info("Pour already idle, nothing to cancel.") : this.logger.warn(`Cannot cancel pour in state ${this.currentState}`);
   }
@@ -1854,36 +1866,36 @@ let le = class {
     this.logger.debug(`loading generic-pour ${this.id}`);
   }
 };
-lt([
+pt([
   ue()
 ], le.prototype, "pour", 1);
-le = lt([
-  I(ct)
+le = pt([
+  I(ut)
 ], le);
-const ni = new Et({
+const ni = new wt({
   class: le,
-  type: ct
-}), Le = {
-  ...Ke.registration,
-  ...je.registration,
-  ...rt.registration,
-  ...Ye.registration,
+  type: ut
+}), Ae = {
+  ...ke.registration,
+  ...He.registration,
+  ...at.registration,
+  ...Xe.registration,
   ...Se.registration,
-  ...it.registration,
+  ...st.registration,
   ...Oe.registration,
   ..._e.registration,
-  ...st.registration,
-  ...tt.registration
-}, Wr = (e) => () => ($t(e)(), Vr.register(), Object.keys(Le).forEach((t) => {
-  const r = Le[t];
-  St(e)(t, r);
+  ...ot.registration,
+  ...it.registration
+}, Wr = (e) => () => (St(e)(), Vr.register(), Object.keys(Ae).forEach((t) => {
+  const r = Ae[t];
+  Ct(e)(t, r);
 }), g[W].register(
   "FirmwareUpdateInProgressTrouble",
   async (t) => {
     var r;
     if ((r = t.data) != null && r.deviceId) {
       const { model: a } = N(
-        st.type
+        ot.type
       );
       if (a) {
         const i = a.boards.find(
@@ -1902,7 +1914,7 @@ const ni = new Et({
   companion: O.companion.register(e),
   legacy: O.model.registerLegacyModel(e)
 }), b = {
-  ...wt
+  ...$t
 };
 b.dispense = {
   models: Wr(b)
@@ -1913,48 +1925,48 @@ b.companion = O.companion.register(b);
 b.legacy = O.model.registerLegacyModel(b);
 const oi = b;
 export {
-  st as A,
+  ot as A,
   x as B,
-  Sr as C,
+  Cr as C,
   z as D,
   u as E,
-  xr as F,
+  Ne as F,
   ni as G,
-  Ye as H,
-  je as I,
-  Lr as J,
+  Xe as H,
+  He as I,
+  xr as J,
   oi as K,
-  Nr as L,
+  Lr as L,
   Ar as M,
   Se as N,
   Yr as O,
-  it as P,
-  Xe as T,
-  Cr as a,
+  st as P,
+  qe as T,
+  Rr as a,
   _e as b,
-  Je as c,
-  tt as d,
-  et as e,
+  We as c,
+  it as d,
+  rt as e,
   Vr as f,
-  rt as g,
-  Ke as h,
+  at as g,
+  ke as h,
   Oe as i,
-  We as j,
-  Le as k,
+  et as j,
+  Ae as k,
   d as l,
-  Dt as m,
+  Tt as m,
   ai as n,
-  Ut as o,
+  Gt as o,
   si as p,
   ii as q,
   Wr as r,
   ri as s,
   jt as t,
-  Kt as u,
-  Gt as v,
-  Ze as w,
-  Pr as x,
-  vr as y,
+  Vt as u,
+  Ft as v,
+  Je as w,
+  _r as x,
+  Pr as y,
   Br as z
 };
-//# sourceMappingURL=dispense-registration-manager-B6nEgoFC.js.map
+//# sourceMappingURL=dispense-registration-manager-o2X21qmP.js.map