npm - @kosdev-code/kos-ddk-models - Versions diffs - 2.0.2 → 2.0.4 - Mend

@kosdev-code/kos-ddk-models 2.0.2 → 2.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/index.js +1 -1
package/index.mjs +1024 -1021
package/lib/agitation-control/types/index.d.ts +3 -3
package/lib/copy-logs/copy-logs-model.d.ts +4 -4
package/lib/copy-logs/copy-logs-model.d.ts.map +1 -1
package/lib/copy-logs/copy-logs-registration.d.ts +3 -1
package/lib/copy-logs/copy-logs-registration.d.ts.map +1 -1
package/lib/spm-pump/services/spm-pump-services.d.ts +1 -1
package/lib/spm-pump/services/spm-pump-services.d.ts.map +1 -1
package/lib/spm-pump/spm-pump-model.d.ts +1 -1
package/package.json +5 -5

package/index.mjs CHANGED Viewed

@@ -1,28 +1,28 @@
-var Fr = Object.defineProperty;
-var xr = (e, t, r) => t in e ? Fr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var s = (e, t, r) => (xr(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { resolveServiceUrl as g, ServiceFactory as h, KosLog as p, kosTopicHandler as we, kosModel as l, kosAction as v, isKosModel as c, Kos as u, createPropKey as Ar, kosStateProp as jr, KosModelRegistrationFactory as Ee, kosDependency as f, KosModelContainer as Ze, resolveContainerDeltas as ct, kosChild as Le, Device as Ur, kosConfigProperty as d, kosFuture as b, kosModelEffect as bt, MultipleFutureHandler as Vr, FutureEndState as y, TroubleServices as De, Troubles as ut, SingletonKosModelRegistrationFactory as de, FetchError as et, FutureManager as $, FutureHandler as A, getKosCompanionModel as vt, StorageDeviceContainer as Hr, KosDataContainer as Wr, TroubleContainer as tt, troubleByTypeReducer as zr, registerExtensionPoint as Nr, ExtensionManager as Re, kosConfigBean as Br, ObservableData as Kr, kosAutoEffect as Yr } from "@kosdev-code/kos-ui-sdk";
-import { AGITATION_REQUIRED_TROUBLE as _t, CartridgeAgitatorEvents as $t } from "@kosdev-code/kos-freestyle-sdk";
-import { Assembly as Ie, HolderContainer as qr, IngredientContainer as Gr } from "@kosdev-code/kos-dispense-sdk";
-const dt = "PurgeTrouble", Qr = "PrimeTrouble", { URL: rt } = g("AUTH_SERVICE"), { getOne: Xr, postModel: Jr } = h.build({
-  basePath: `${rt}/api/auth`
-}), Pt = p.createLogger({ name: "auth-service", group: "Services" }), Tt = async () => (Pt.debug("sending GET for auth"), await Xr({
-  urlOverride: `${rt}/api/app/kosdev.ddk/auth/role`
-})), Ot = async (e) => (Pt.debug("sending POST for auth"), await Jr({
-  urlOverride: `${rt}/api/app/kosdev.ddk/auth/pincode/${e}`,
+var Ar = Object.defineProperty;
+var jr = (e, t, r) => t in e ? Ar(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
+var s = (e, t, r) => (jr(e, typeof t != "symbol" ? t + "" : t, r), r);
+import { resolveServiceUrl as h, ServiceFactory as f, KosLog as g, kosTopicHandler as Ee, kosModel as l, kosAction as _, Kos as c, isKosModel as u, createPropKey as Ur, kosStateProp as Vr, KosModelRegistrationFactory as Le, kosDependency as m, KosModelContainer as tt, resolveContainerDeltas as dt, kosChild as De, Device as Hr, kosConfigProperty as d, kosFuture as v, kosModelEffect as _t, MultipleFutureHandler as Wr, FutureEndState as b, TroubleServices as ke, Troubles as pt, SingletonKosModelRegistrationFactory as pe, FetchError as Re, FutureManager as T, FutureHandler as ge, getKosCompanionModel as $t, StorageDeviceContainer as zr, KosDataContainer as Nr, setupCompleteFutureSupport as Br, TroubleContainer as rt, troubleByTypeReducer as Kr, registerExtensionPoint as Yr, ExtensionManager as Ie, kosConfigBean as qr, ObservableData as Gr, kosAutoEffect as Qr } from "@kosdev-code/kos-ui-sdk";
+import { AGITATION_REQUIRED_TROUBLE as Tt, CartridgeAgitatorEvents as Pt } from "@kosdev-code/kos-freestyle-sdk";
+import { Assembly as Fe, HolderContainer as Xr, IngredientContainer as Jr } from "@kosdev-code/kos-dispense-sdk";
+const gt = "PurgeTrouble", Zr = "PrimeTrouble", { URL: ot } = h("AUTH_SERVICE"), { getOne: eo, postModel: to } = f.build({
+  basePath: `${ot}/api/auth`
+}), Ot = g.createLogger({ name: "auth-service", group: "Services" }), Mt = async () => (Ot.debug("sending GET for auth"), await eo({
+  urlOverride: `${ot}/api/app/kosdev.ddk/auth/role`
+})), St = async (e) => (Ot.debug("sending POST for auth"), await to({
+  urlOverride: `${ot}/api/app/kosdev.ddk/auth/pincode/${e}`,
   model: {}
-})), Ms = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), $s = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getCurrentRole: Tt,
-  sendPinCode: Ot
+  getCurrentRole: Mt,
+  sendPinCode: St
 }, Symbol.toStringTag, { value: "Module" }));
-var Zr = Object.defineProperty, eo = Object.getOwnPropertyDescriptor, Mt = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? eo(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && Zr(t, r, o), o;
+var ro = Object.defineProperty, oo = Object.getOwnPropertyDescriptor, Ct = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? oo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && ro(t, r, o), o;
 };
-const z = "auth-model", pt = (e) => e.toLowerCase();
-let be = class {
+const N = "auth-model", ht = (e) => e.toLowerCase();
+let ve = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -32,7 +32,7 @@ let be = class {
   async authorize(e) {
     if (!e)
       return !1;
-    const t = await Ot(e);
+    const t = await St(e);
     return (t == null ? void 0 : t.status) === 200 ? t.data : !1;
   }
   // -------------------LIFECYCLE----------------------------
@@ -41,45 +41,45 @@ let be = class {
   }
   async load() {
     this.logger.debug(`loading auth ${this.id}`);
-    const e = await Tt();
-    (e == null ? void 0 : e.status) === 200 && (this.logger.debug(`response ${e.data}`), v(() => {
-      this.currentRole = pt(e.data);
+    const e = await Mt();
+    (e == null ? void 0 : e.status) === 200 && (this.logger.debug(`response ${e.data}`), _(() => {
+      this.currentRole = ht(e.data);
     }));
   }
   handleRoleChange(e) {
-    this.currentRole = pt(e);
+    this.currentRole = ht(e);
   }
   forceRole(e) {
     this.currentRole = e;
   }
 };
-Mt([
-  we({
+Ct([
+  Ee({
     topic: "/app/kosdev.ddk/auth/role",
     websocket: !0
   })
-], be.prototype, "handleRoleChange", 1);
-be = Mt([
-  l(z)
-], be);
-const ot = {
+], ve.prototype, "handleRoleChange", 1);
+ve = Ct([
+  l(N)
+], ve);
+const it = {
   registration: {
-    [z]: {
-      class: be,
+    [N]: {
+      class: ve,
       singleton: !1
     }
   },
-  type: z,
-  predicate: c(z),
-  factory: u.Factory.create(z)
+  type: N,
+  predicate: u(N),
+  factory: c.Factory.create(N)
 };
-var to = Object.defineProperty, ro = Object.getOwnPropertyDescriptor, St = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ro(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && to(t, r, o), o;
+var io = Object.defineProperty, so = Object.getOwnPropertyDescriptor, wt = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? so(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && io(t, r, o), o;
 };
-const Ct = "door-model", oo = Ar("doorPath");
-let ve = class {
+const Et = "door-model", ao = Ur("doorPath");
+let _e = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -94,37 +94,37 @@ let ve = class {
     return this.open.value === void 0 ? !0 : this.open.value;
   }
 };
-St([
-  jr({ path: oo, attribute: "state" })
-], ve.prototype, "open", 2);
-ve = St([
-  l(Ct)
-], ve);
-const io = new Ee({
-  class: ve,
-  type: Ct
-}), { URL: it } = g("SETUP-STEP_SERVICE"), { getAll: so, postModel: no } = h.build({
-  basePath: `${it}/api/setup-step`
-}), wt = p.createLogger({
+wt([
+  Vr({ path: ao, attribute: "state" })
+], _e.prototype, "open", 2);
+_e = wt([
+  l(Et)
+], _e);
+const no = new Le({
+  class: _e,
+  type: Et
+}), { URL: st } = h("SETUP-STEP_SERVICE"), { getAll: lo, postModel: co } = f.build({
+  basePath: `${st}/api/setup-step`
+}), Lt = g.createLogger({
   name: "setup-step-service",
   group: "Services"
-}), Et = async () => (wt.debug("sending GET for setup-step"), await so({
-  urlOverride: `${it}/api/app/kosdev.ddk/setup/steps`
-})), Lt = async (e) => (wt.debug("sending POST for setup-step"), await no({
-  urlOverride: `${it}/api/app/kosdev.ddk/setup/complete/${e}`,
+}), Dt = async () => (Lt.debug("sending GET for setup-step"), await lo({
+  urlOverride: `${st}/api/app/kosdev.ddk/setup/steps`
+})), kt = async (e) => (Lt.debug("sending POST for setup-step"), await co({
+  urlOverride: `${st}/api/app/kosdev.ddk/setup/complete/${e}`,
   model: {}
-})), Ss = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), Ts = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getSetupSteps: Et,
-  markStepComplete: Lt
+  getSetupSteps: Dt,
+  markStepComplete: kt
 }, Symbol.toStringTag, { value: "Module" }));
-var ao = Object.defineProperty, lo = Object.getOwnPropertyDescriptor, co = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? lo(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && ao(t, r, o), o;
+var uo = Object.getOwnPropertyDescriptor, po = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? uo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = a(o) || o);
+  return o;
 };
-const N = "setup-step-model";
-let Ne = class {
+const B = "setup-step-model";
+let Ke = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "idx");
@@ -145,8 +145,8 @@ let Ne = class {
     return `setup.${this.name}.body`;
   }
   async completeStep() {
-    const e = await Lt(this.name);
-    (e == null ? void 0 : e.status) === 200 && v(() => {
+    const e = await kt(this.name);
+    (e == null ? void 0 : e.status) === 200 && _(() => {
       this.complete = !0;
     });
   }
@@ -158,45 +158,45 @@ let Ne = class {
     this.logger.debug(`loading setup-step ${this.id}`);
   }
 };
-Ne = co([
-  l(N)
-], Ne);
-const Dt = {
+Ke = po([
+  l(B)
+], Ke);
+const Rt = {
   registration: {
-    [N]: {
-      class: Ne,
+    [B]: {
+      class: Ke,
       singleton: !1
     }
   },
-  type: N,
-  predicate: c(N),
-  factory: u.Factory.create(N)
+  type: B,
+  predicate: u(B),
+  factory: c.Factory.create(B)
 };
-var uo = Object.defineProperty, po = Object.getOwnPropertyDescriptor, ke = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? po(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && uo(t, r, o), o;
+var go = Object.defineProperty, ho = Object.getOwnPropertyDescriptor, xe = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? ho(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && go(t, r, o), o;
 };
-const B = "setup-step-container-model";
-function gt(e) {
+const K = "setup-step-container-model";
+function ft(e) {
   return (t) => {
-    const r = Dt.factory(t.id)(t);
+    const r = Rt.factory(t.id)(t);
     r.updateModel(t), e.addModel(r);
   };
 }
-function ht(e) {
+function mt(e) {
   return (t) => {
     e.removeModel(t);
   };
 }
-let D = class {
+let R = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "_currentStep");
     s(this, "logger");
     s(this, "models");
     s(this, "authModel");
-    this.id = e, this.logger = r.logger, this._currentStep = void 0, this.models = new Ze({
+    this.id = e, this.logger = r.logger, this._currentStep = void 0, this.models = new tt({
       parentId: e,
       sortKey: "idx"
     });
@@ -247,7 +247,7 @@ let D = class {
   }
   async load() {
     this.logger.debug(`loading setup-step-container container ${this.id}`);
-    const e = await Et();
+    const e = await Dt();
     if (e != null && e.data) {
       const t = e.data.map(
         (r, i) => ({
@@ -256,10 +256,10 @@ let D = class {
           id: `setup-${r.name}`
         })
       );
-      ct({
+      dt({
         container: this.models,
-        onAddItem: gt(this),
-        onRemoveItem: ht(this)
+        onAddItem: ft(this),
+        onRemoveItem: mt(this)
       })(t);
     }
     this.nextStep();
@@ -270,78 +270,78 @@ let D = class {
       idx: i,
       id: `setup-${r.name}`
     }));
-    ct({
+    dt({
       container: this.models,
-      onAddItem: gt(this),
-      onRemoveItem: ht(this)
+      onAddItem: ft(this),
+      onRemoveItem: mt(this)
     })(t);
   }
 };
-ke([
-  Le
-], D.prototype, "models", 2);
-ke([
-  f({ modelType: ot.type })
-], D.prototype, "authModel", 2);
-ke([
-  we({
+xe([
+  De
+], R.prototype, "models", 2);
+xe([
+  m({ modelType: it.type })
+], R.prototype, "authModel", 2);
+xe([
+  Ee({
     topic: "/app/kosdev.ddk/setup/steps",
     websocket: !0
   })
-], D.prototype, "handleStepChanges", 1);
-D = ke([
-  l(B)
-], D);
-const Rt = {
+], R.prototype, "handleStepChanges", 1);
+R = xe([
+  l(K)
+], R);
+const It = {
   registration: {
-    [B]: {
-      class: D,
+    [K]: {
+      class: R,
       singleton: !0
     },
-    ...Dt.registration
+    ...Rt.registration
   },
-  type: B,
-  predicate: c(B),
-  factory: u.Singleton.create(B)
-}, { URL: pe } = g("AUTH_SERVICE"), { getOne: It, getAll: kt } = h.build({
-  basePath: `${pe}/api/app/kosdev.ddk/ncui/`
-}), Fe = p.createLogger({ name: "auth-service", group: "Services" }), go = async () => {
-  Fe.debug("sending GET for cuis");
-  const e = await kt({
-    urlOverride: `${pe}/api/app/kosdev.ddk/cui`
+  type: K,
+  predicate: u(K),
+  factory: c.Singleton.create(K)
+}, { URL: he } = h("AUTH_SERVICE"), { getOne: Ft, getAll: xt } = f.build({
+  basePath: `${he}/api/app/kosdev.ddk/ncui/`
+}), Ae = g.createLogger({ name: "auth-service", group: "Services" }), fo = async () => {
+  Ae.debug("sending GET for cuis");
+  const e = await xt({
+    urlOverride: `${he}/api/app/kosdev.ddk/cui`
   });
   if ((e == null ? void 0 : e.status) !== 200)
     throw new Error("Failed to retrieve cuis");
   return e.data;
-}, ho = async () => {
-  Fe.debug("sending GET for navigation");
-  const e = await kt({
-    urlOverride: `${pe}/api/kos/descriptor/system:app/kondra.ncui.navigations`
+}, mo = async () => {
+  Ae.debug("sending GET for navigation");
+  const e = await xt({
+    urlOverride: `${he}/api/kos/descriptor/system:app/kondra.ncui.navigations`
   });
   if ((e == null ? void 0 : e.status) !== 200)
     throw new Error("Failed to retrieve navigation data");
   return e.data;
-}, fo = async () => (Fe.debug("navigating to CUI"), await It({
-  urlOverride: `${pe}/api/app/kosdev.ddk/cui/open`
-})), mo = async () => (Fe.debug("navigating to NCUI"), await It({
-  urlOverride: `${pe}/api/app/kosdev.ddk/ncui/open`
+}, yo = async () => (Ae.debug("navigating to CUI"), await Ft({
+  urlOverride: `${he}/api/app/kosdev.ddk/cui/open`
+})), bo = async () => (Ae.debug("navigating to NCUI"), await Ft({
+  urlOverride: `${he}/api/app/kosdev.ddk/ncui/open`
 }));
-var yo = Object.defineProperty, bo = Object.getOwnPropertyDescriptor, w = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? bo(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && yo(t, r, o), o;
+var vo = Object.defineProperty, _o = Object.getOwnPropertyDescriptor, L = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? _o(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && vo(t, r, o), o;
 };
-const K = "application-model", Ft = (e, t = "") => e.reduce((r, i) => {
+const Y = "application-model", At = (e, t = "") => e.reduce((r, i) => {
   const o = t ? `${t}.${i.name}` : i.name;
   if (r[o] = { ...i, root: !t }, i.children) {
-    const a = Ft(i.children, o);
-    Object.keys(a).forEach((n) => {
-      r[n] = a[n];
+    const n = At(i.children, o);
+    Object.keys(n).forEach((a) => {
+      r[a] = n[a];
     });
   }
   return r;
 }, {});
-let T = class {
+let M = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "device");
@@ -370,7 +370,7 @@ let T = class {
     // enableSidebarAnimation!: KosConfigProperty<boolean>;
     s(this, "languages");
     s(this, "logger");
-    this.id = e, this.languages = [], this._cuis = [], this.logger = r.logger, this.door = io.instance("app:kosdev.ddk:service:door:door").options({
+    this.id = e, this.languages = [], this._cuis = [], this.logger = r.logger, this.door = no.instance("app:kosdev.ddk:service:door:door").options({
       doorPath: "app:kosdev.ddk:service:door:door"
     }).build();
   }
@@ -384,7 +384,7 @@ let T = class {
     return this._cuis.reduce((e, t) => (e[t.name] = t, e), {});
   }
   get navigationItems() {
-    return Ft(this._navigationItems);
+    return At(this._navigationItems);
   }
   get hasCuiDefined() {
     return !!this.activeCui.value || !!this.fallbackCui.value;
@@ -393,18 +393,18 @@ let T = class {
     return this.door.isOpen;
   }
   async enter() {
-    this.logger.info("navigating to NCUI"), await mo();
+    this.logger.info("navigating to NCUI"), await bo();
   }
   async exit() {
-    this.logger.info("navigating to CUI"), await fo();
+    this.logger.info("navigating to CUI"), await yo();
   }
   // -------------------LIFECYCLE----------------------------
   async load() {
     var r, i;
     this.logger.debug(`loading application ${this.id}`);
-    const e = await ho();
+    const e = await mo();
     this._navigationItems = e;
-    const t = await go();
+    const t = await fo();
     this._cuis = t, (r = this.setupStepContainer) != null && r.hasIncompletePreSteps && ((i = this.authModel) == null || i.forceRole("technician")), this.languages = [
       {
         name: "English",
@@ -413,74 +413,74 @@ let T = class {
     ];
   }
 };
-w([
-  f({ modelType: Ur.type })
-], T.prototype, "device", 2);
-w([
-  f({ modelType: ot.type })
-], T.prototype, "authModel", 2);
-w([
-  f({ modelType: Rt.type })
-], T.prototype, "setupStepContainer", 2);
-w([
-  Le
-], T.prototype, "door", 2);
-w([
+L([
+  m({ modelType: Hr.type })
+], M.prototype, "device", 2);
+L([
+  m({ modelType: it.type })
+], M.prototype, "authModel", 2);
+L([
+  m({ modelType: It.type })
+], M.prototype, "setupStepContainer", 2);
+L([
+  De
+], M.prototype, "door", 2);
+L([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.ncuiLanguage"
     //updated attribute for language config property
   })
-], T.prototype, "ncuiLanguage", 2);
-w([
+], M.prototype, "ncuiLanguage", 2);
+L([
   d({
     path: "app:kosdev.ddk:service:cui",
     attribute: "activeCui"
   })
-], T.prototype, "activeCui", 2);
-w([
+], M.prototype, "activeCui", 2);
+L([
   d({
     path: "app:kosdev.ddk:service:cui",
     attribute: "fallbackCui"
   })
-], T.prototype, "fallbackCui", 2);
-T = w([
-  l(K)
-], T);
-const st = {
+], M.prototype, "fallbackCui", 2);
+M = L([
+  l(Y)
+], M);
+const at = {
   registration: {
-    [K]: {
-      class: T,
+    [Y]: {
+      class: M,
       singleton: !0
     }
   },
-  type: K,
-  predicate: c(K),
-  factory: u.Singleton.create(
-    K
+  type: Y,
+  predicate: u(Y),
+  factory: c.Singleton.create(
+    Y
   )
-}, ye = {
+}, be = {
   none: 999,
   crew: 0,
   technician: 1,
   manager: 2
-}, xt = (e) => (t) => {
-  if (t.type === _t)
+}, jt = (e) => (t) => {
+  if (t.type === Tt)
     return !1;
   const r = (t == null ? void 0 : t.role) || "technician";
   if (e && r) {
-    const i = ye[e.toLowerCase()] ?? ye.crew, o = ye[r.toLowerCase()] ?? ye.crew;
+    const i = be[e.toLowerCase()] ?? be.crew, o = be[r.toLowerCase()] ?? be.crew;
     return i >= o;
   }
   return !1;
 };
-var vo = Object.defineProperty, _o = Object.getOwnPropertyDescriptor, j = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? _o(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && vo(t, r, o), o;
+var $o = Object.defineProperty, To = Object.getOwnPropertyDescriptor, U = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? To(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && $o(t, r, o), o;
 };
-const At = "agitation-control-model", Be = "resolve", $o = "agitate";
-let M = class {
+const Ut = "agitation-control-model", Ye = "resolve", Po = "agitate";
+let C = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "futureHandler");
@@ -493,7 +493,7 @@ let M = class {
     s(this, "disposer");
     s(this, "application");
     s(this, "inProgress", []);
-    this.id = e, this.logger = r.logger, this.troubleContainer = t.companionParent, this.futureHandler = new Vr(this, Be);
+    this.id = e, this.logger = r.logger, this.troubleContainer = t.companionParent, this.futureHandler = new Wr(this, Ye);
   }
   set isFailed(e) {
     this._isFailed = e;
@@ -526,19 +526,19 @@ let M = class {
     return this.isDoorClosed && r && this.exiting;
   }
   onFutureUpdate(e) {
-    e.endState === y.Success ? (this.logger.debug(
+    e.endState === b.Success ? (this.logger.debug(
       `Resolve deferred troubles future ${e.id} completed successfully`
     ), this.queuedTroubles.forEach((t) => {
       t.clearDefer();
-    }), v(() => {
+    }), _(() => {
       this._canExit = !0, this._isFailed = !1;
-    })) : (e.endState === y.Fail || e.endState === y.Canceled || e.endState === y.Aborted) && (this.logger.error(`Resolve deferred troubles future ${e.id} failed`), this.clearAll(), v(() => {
+    })) : (e.endState === b.Fail || e.endState === b.Canceled || e.endState === b.Aborted) && (this.logger.error(`Resolve deferred troubles future ${e.id} failed`), this.clearAll(), _(() => {
       this._canExit = !1, this._isFailed = !0;
     }));
   }
   async resolveDeferredTroubles(e) {
     const t = this.queuedTroubles.filter((i) => !i.shouldDefer).map((i) => i.rawId).filter((i) => !this.inProgress.includes(i));
-    return this.inProgress.push(...t), t.length === 0 ? void 0 : await De.bulkResolveTroubles(
+    return this.inProgress.push(...t), t.length === 0 ? void 0 : await ke.bulkResolveTroubles(
       t,
       e
     );
@@ -548,23 +548,23 @@ let M = class {
   }
   get queuedTroubles() {
     return this.troubleContainer.troubles.getIndexByKey(
-      ut.INDEX_TROUBLES_BY_DEFERRED,
-      ut.TROUBLES_DEFERRED
+      pt.INDEX_TROUBLES_BY_DEFERRED,
+      pt.TROUBLES_DEFERRED
     );
   }
   get visibleTroubles() {
     const e = this.application.currentRole;
-    return this.troubleContainer.troubles.data.filter(xt(e)).filter((t) => t.type !== _t);
+    return this.troubleContainer.troubles.data.filter(jt(e)).filter((t) => t.type !== Tt);
   }
   // -------------------LIFECYCLE----------------------------
   get future() {
     return this.futureHandler.future;
   }
   get resolveFuture() {
-    return this.futureHandler.getFuture(Be);
+    return this.futureHandler.getFuture(Ye);
   }
   get agitateFuture() {
-    return this.futureHandler.getFuture($o);
+    return this.futureHandler.getFuture(Po);
   }
   handleAgitationStarted(e) {
     this.logger.info(`Agitation started for ${e.path}`), this._agitationFutureId = String(e.futureId);
@@ -585,37 +585,37 @@ let M = class {
     this.logger.debug(`loading agitation-control ${this.id}`);
   }
 };
-j([
-  f({ modelType: st.type })
-], M.prototype, "application", 2);
-j([
-  b({ alias: Be })
-], M.prototype, "resolveDeferredTroubles", 1);
-j([
-  we({ topic: $t.TOPIC_AGITATION_STARTED })
-], M.prototype, "handleAgitationStarted", 1);
-j([
-  we({ topic: $t.TOPIC_AGITATION_ENDED })
-], M.prototype, "handleAgitationEnded", 1);
-j([
-  bt({
+U([
+  m({ modelType: at.type })
+], C.prototype, "application", 2);
+U([
+  v({ alias: Ye })
+], C.prototype, "resolveDeferredTroubles", 1);
+U([
+  Ee({ topic: Pt.TOPIC_AGITATION_STARTED })
+], C.prototype, "handleAgitationStarted", 1);
+U([
+  Ee({ topic: Pt.TOPIC_AGITATION_ENDED })
+], C.prototype, "handleAgitationEnded", 1);
+U([
+  _t({
     dependencies: (e) => [e.readyToResolve, e._agitationFutureId]
   })
-], M.prototype, "handleReadyToResolve", 1);
-M = j([
-  l(At)
-], M);
-const Cs = new de({
-  class: M,
-  type: At
+], C.prototype, "handleReadyToResolve", 1);
+C = U([
+  l(Ut)
+], C);
+const Ps = new pe({
+  class: C,
+  type: Ut
 });
-var Po = Object.defineProperty, To = Object.getOwnPropertyDescriptor, ge = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? To(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && Po(t, r, o), o;
+var Oo = Object.defineProperty, Mo = Object.getOwnPropertyDescriptor, fe = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Mo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Oo(t, r, o), o;
 };
-const Y = "animation-model";
-let L = class {
+const q = "animation-model";
+let k = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -626,187 +626,187 @@ let L = class {
     this.id = e, this.logger = r.logger;
   }
 };
-ge([
+fe([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.disableAll"
   })
-], L.prototype, "disableAll", 2);
-ge([
+], k.prototype, "disableAll", 2);
+fe([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableDial"
   })
-], L.prototype, "enableDial", 2);
-ge([
+], k.prototype, "enableDial", 2);
+fe([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableModal"
   })
-], L.prototype, "enableModal", 2);
-ge([
+], k.prototype, "enableModal", 2);
+fe([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableSideBar"
   })
-], L.prototype, "enableSideBar", 2);
-L = ge([
-  l(Y)
-], L);
-const Oo = {
+], k.prototype, "enableSideBar", 2);
+k = fe([
+  l(q)
+], k);
+const So = {
   registration: {
-    [Y]: {
-      class: L,
+    [q]: {
+      class: k,
       singleton: !0
     }
   },
-  type: Y,
-  predicate: c(Y),
-  factory: u.Singleton.create(Y)
-}, { URL: Mo } = g("ANIMATION_SERVICE"), { getAll: So } = h.build({
-  basePath: `${Mo}/api/animation`
-}), Co = p.createLogger({
+  type: q,
+  predicate: u(q),
+  factory: c.Singleton.create(q)
+}, { URL: Co } = h("ANIMATION_SERVICE"), { getAll: wo } = f.build({
+  basePath: `${Co}/api/animation`
+}), Eo = g.createLogger({
   name: "animation-service",
   group: "Services"
-}), wo = async () => (Co.debug("sending GET for animation"), await So({})), ws = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Lo = async () => (Eo.debug("sending GET for animation"), await wo({})), Os = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getAnimations: wo
-}, Symbol.toStringTag, { value: "Module" })), { URL: U } = g("FCM-PUMP_SERVICE"), { postModel: he } = h.build({
-  basePath: `${U}/api/fcm-pump`
-}), m = p.createLogger({
+  getAnimations: Lo
+}, Symbol.toStringTag, { value: "Module" })), { URL: V } = h("FCM-PUMP_SERVICE"), { postModel: me } = f.build({
+  basePath: `${V}/api/fcm-pump`
+}), y = g.createLogger({
   name: "fcm-pump-service",
   group: "Services"
-}), jt = async (e) => {
-  var t, r, i, o, a;
-  m.debug(
+}), Vt = async (e) => {
+  var t, r, i, o, n;
+  y.debug(
     `performElectricalTest - sending POST request to /api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
   );
   try {
-    const n = await he({
+    const a = await me({
       model: {},
-      urlOverride: `${U}/api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
+      urlOverride: `${V}/api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
     });
-    return m.debug("performElectricalTest - response:", n), ((n == null ? void 0 : n.status) === 200 || (n == null ? void 0 : n.status) === 499) && ((t = n.data) != null && t.error) ? [n.data.error || "unknownError", n.data] : [void 0, n == null ? void 0 : n.data];
-  } catch (n) {
-    if (m.error(
+    return y.debug("performElectricalTest - response:", a), ((a == null ? void 0 : a.status) === 200 || (a == null ? void 0 : a.status) === 499) && ((t = a.data) != null && t.error) ? [a.data.error || "unknownError", a.data] : [void 0, a == null ? void 0 : a.data];
+  } catch (a) {
+    if (y.error(
       `performElectricalTest - sending POST request to /api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`,
-      n
-    ), n instanceof et) {
-      const E = ((i = (r = n.payload) == null ? void 0 : r.data) == null ? void 0 : i.error) || ((o = n.payload) == null ? void 0 : o.error) || "unknownError";
-      return [E, ((a = n.payload) == null ? void 0 : a.data) || { error: E }];
+      a
+    ), a instanceof Re) {
+      const O = ((i = (r = a.payload) == null ? void 0 : r.data) == null ? void 0 : i.error) || ((o = a.payload) == null ? void 0 : o.error) || "unknownError";
+      return [O, ((n = a.payload) == null ? void 0 : n.data) || { error: O }];
     }
   }
   return ["unknownError", { error: "unknownError" }];
-}, Ut = async (e, t) => {
-  m.debug(
+}, Ht = async (e, t) => {
+  y.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/preCalibrate`
   );
   try {
-    const r = await he({
+    const r = await me({
       model: {},
-      urlOverride: `${U}/api/ext/freestyle/fcm/calibration/${e}/preCalibrate`,
+      urlOverride: `${V}/api/ext/freestyle/fcm/calibration/${e}/preCalibrate`,
       tracker: t
     });
-    return m.debug("performPreCalibrate - response:", r), r != null && r.data && $.initiateFuture(r.data), r == null ? void 0 : r.data;
+    return y.debug("performPreCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
   } catch (r) {
-    m.error(
+    y.error(
       `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/preCalibrate`,
       r
     );
     const i = {
       id: t || "",
-      endState: y.Fail,
+      endState: b.Fail,
       tracker: t,
       reason: "Failed to resolve trouble"
     };
-    return $.initiateFuture(i), i;
+    return T.initiateFuture(i), i;
   }
-}, Vt = async (e, t) => {
-  m.debug(
+}, Wt = async (e, t) => {
+  y.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/calibrate`
   );
   try {
-    const r = await he({
+    const r = await me({
       model: {},
-      urlOverride: `${U}/api/ext/freestyle/fcm/calibration/${e}/calibrate`,
+      urlOverride: `${V}/api/ext/freestyle/fcm/calibration/${e}/calibrate`,
       tracker: t
     });
-    return m.debug("performPreCalibrate - response:", r), r != null && r.data && $.initiateFuture(r.data), r == null ? void 0 : r.data;
+    return y.debug("performPreCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
   } catch (r) {
-    m.error(
+    y.error(
       `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/calibrate`,
       r
     );
     const i = {
       id: t || "",
-      endState: y.Fail,
+      endState: b.Fail,
       tracker: t,
       reason: "Failed to resolve trouble"
     };
-    return $.initiateFuture(i), i;
+    return T.initiateFuture(i), i;
   }
-}, Ht = async (e, t, r) => {
-  m.debug(
+}, zt = async (e, t, r) => {
+  y.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/verify/${t}`
   );
   try {
-    const i = await he({
+    const i = await me({
       model: {},
-      urlOverride: `${U}/api/ext/freestyle/fcm/calibration/${e}/verify/${t}`,
+      urlOverride: `${V}/api/ext/freestyle/fcm/calibration/${e}/verify/${t}`,
       tracker: r
     });
-    return m.debug("performVerify - response:", i), i != null && i.data && $.initiateFuture(i.data), i == null ? void 0 : i.data;
+    return y.debug("performVerify - response:", i), i != null && i.data && T.initiateFuture(i.data), i == null ? void 0 : i.data;
   } catch (i) {
-    m.error(
+    y.error(
       `performVerify - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/verify/${t}`,
       i
     );
     const o = {
       id: r || "",
-      endState: y.Fail,
+      endState: b.Fail,
       tracker: r,
       reason: "Failed to resolve trouble"
     };
-    return $.initiateFuture(o), o;
+    return T.initiateFuture(o), o;
   }
-}, Wt = async (e, t, r) => {
-  m.debug(
+}, Nt = async (e, t, r) => {
+  y.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
   );
   try {
-    const i = await he({
+    const i = await me({
       model: {},
-      urlOverride: `${U}/api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
+      urlOverride: `${V}/api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
     });
-    return m.debug("performPreCalibrate - response:", i), i == null ? void 0 : i.data;
+    return y.debug("performPreCalibrate - response:", i), i == null ? void 0 : i.data;
   } catch (i) {
-    m.error(
+    y.error(
       `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`,
       i
     );
     return;
   }
-}, Es = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Ms = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  performCalibrate: Vt,
-  performComplete: Wt,
-  performElectricalTest: jt,
-  performPreCalibrate: Ut,
-  performVerify: Ht
+  performCalibrate: Wt,
+  performComplete: Nt,
+  performElectricalTest: Vt,
+  performPreCalibrate: Ht,
+  performVerify: zt
 }, Symbol.toStringTag, { value: "Module" }));
-var Eo = Object.defineProperty, Lo = Object.getOwnPropertyDescriptor, xe = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Lo(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && Eo(t, r, o), o;
+var Do = Object.defineProperty, ko = Object.getOwnPropertyDescriptor, je = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? ko(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Do(t, r, o), o;
 };
-const zt = "fcm-pump-model", Do = p.createLogger({ name: "fcm-pump-model" });
-let R = class {
+const Bt = "fcm-pump-model", Ro = g.createLogger({ name: "fcm-pump-model" });
+let I = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
     s(this, "pumpModel");
     s(this, "futureHandler");
-    this.id = e, this.logger = r.logger, this.pumpModel = t.companionParent, this.futureHandler = new A(this);
+    this.id = e, this.logger = r.logger, this.pumpModel = t.companionParent, this.futureHandler = new ge(this);
   }
   get future() {
     return this.futureHandler.future;
@@ -827,23 +827,23 @@ let R = class {
     return this.pumpModel.performIntent(e);
   }
   async performElectricalTest() {
-    const [e, t] = await jt(this.pumpModel.path);
-    return e && Do.error(`Failed to perform electrical test on pump ${this.id}`, e), t;
+    const [e, t] = await Vt(this.pumpModel.path);
+    return e && Ro.error(`Failed to perform electrical test on pump ${this.id}`, e), t;
   }
   getChildren() {
     return [...this.futureHandler.allFutures];
   }
   async performPreCalibrate(e) {
-    return Ut(this.pumpModel.path, e);
+    return Ht(this.pumpModel.path, e);
   }
   async performCalibrate(e) {
-    return Vt(this.pumpModel.path, e);
+    return Wt(this.pumpModel.path, e);
   }
   async performVerify(e, t) {
-    return Ht(this.pumpModel.path, e, t);
+    return zt(this.pumpModel.path, e, t);
   }
   async performComplete(e, t) {
-    return Wt(this.pumpModel.path, e, t);
+    return Nt(this.pumpModel.path, e, t);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -853,29 +853,29 @@ let R = class {
     this.logger.debug(`loading fcm-pump ${this.id}`);
   }
 };
-xe([
-  b()
-], R.prototype, "performPreCalibrate", 1);
-xe([
-  b()
-], R.prototype, "performCalibrate", 1);
-xe([
-  b()
-], R.prototype, "performVerify", 1);
-R = xe([
-  l(zt)
-], R);
-const Nt = new Ee({
-  class: R,
-  type: zt
+je([
+  v()
+], I.prototype, "performPreCalibrate", 1);
+je([
+  v()
+], I.prototype, "performCalibrate", 1);
+je([
+  v()
+], I.prototype, "performVerify", 1);
+I = je([
+  l(Bt)
+], I);
+const Kt = new Le({
+  class: I,
+  type: Bt
 });
-var Ro = Object.defineProperty, Io = Object.getOwnPropertyDescriptor, Bt = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Io(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && Ro(t, r, o), o;
+var Io = Object.defineProperty, Fo = Object.getOwnPropertyDescriptor, Yt = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Fo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Io(t, r, o), o;
 };
-const q = "carb-water-model";
-let _e = class {
+const G = "carb-water-model";
+let $e = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "assemblyModel");
@@ -884,7 +884,7 @@ let _e = class {
   }
   getPump() {
     const t = this.assemblyModel.getHoldersByGroup("carb")[0].pumps.data[0];
-    return vt(t, Nt.type);
+    return $t(t, Kt.type);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -894,109 +894,111 @@ let _e = class {
     this.logger.debug(`loading carb-water ${this.id}`);
   }
 };
-Bt([
-  f({ modelType: Ie.type })
-], _e.prototype, "assemblyModel", 2);
-_e = Bt([
-  l(q)
-], _e);
-const ko = {
+Yt([
+  m({ modelType: Fe.type })
+], $e.prototype, "assemblyModel", 2);
+$e = Yt([
+  l(G)
+], $e);
+const xo = {
   registration: {
-    [q]: {
-      class: _e,
+    [G]: {
+      class: $e,
       singleton: !1
     }
   },
-  type: q,
-  predicate: c(q),
-  factory: u.Factory.create(q)
-}, { URL: V } = g("COPY-LOGS_SERVICE"), { getAll: Fo, getOne: xo, postModel: Kt, deleteModel: Ao } = h.build({
-  basePath: `${V}/api/copy-logs`
-}), $e = p.createLogger({
+  type: G,
+  predicate: u(G),
+  factory: c.Factory.create(G)
+}, { URL: H } = h("COPY-LOGS_SERVICE"), { getAll: Ao, getOne: jo, postModel: qt, deleteModel: Uo } = f.build({
+  basePath: `${H}/api/copy-logs`
+}), Te = g.createLogger({
   name: "copy-logs-service",
   group: "Services"
-}), Yt = async (e, t) => {
-  const r = await Ao({
+}), Gt = async (e, t) => {
+  const r = await Uo({
     tracker: t,
     id: e,
-    urlOverride: `${V}/api/app/kosdev.ddk/copyLogs/${e}`
+    urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/${e}`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r.data;
-}, qt = async (e, t) => {
-  const r = await Kt({
+}, Qt = async (e, t) => {
+  const r = await qt({
     model: {},
     tracker: t,
-    urlOverride: `${V}/api/app/kosdev.ddk/copyLogs/eraseAndCopy/${e}`
+    urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/eraseAndCopy/${e}`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r.data;
-}, Gt = async (e, t) => {
-  const r = await Kt({
+}, Xt = async (e, t) => {
+  const r = await qt({
     model: {},
     tracker: t,
-    urlOverride: `${V}/api/app/kosdev.ddk/copyLogs/${e}`
+    urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/${e}`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r.data;
-}, Qt = async () => {
-  $e.debug("sending GET for copy-logs");
+}, Jt = async () => {
+  Te.debug("sending GET for copy-logs");
   try {
-    const e = await Fo({
-      urlOverride: `${V}/api/app/kosdev.ddk/copyLogs/volumes/size`
+    const e = await Ao({
+      urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/volumes/size`
     });
     return [void 0, e == null ? void 0 : e.data];
   } catch (e) {
-    if (e instanceof et)
-      return $e.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
+    if (e instanceof Re)
+      return Te.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
   }
   return ["unknownError", void 0];
-}, Xt = async () => {
-  $e.debug("sending GET for log file size");
+}, Zt = async () => {
+  Te.debug("sending GET for log file size");
   try {
-    const e = await xo({
-      urlOverride: `${V}/api/app/kosdev.ddk/copyLogs/files/size`
+    const e = await jo({
+      urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/files/size`
     });
     return [void 0, e == null ? void 0 : e.data];
   } catch (e) {
-    if (e instanceof et)
-      return $e.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
+    if (e instanceof Re)
+      return Te.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
   }
   return ["unknownError", void 0];
-}, Ls = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Ss = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  copyLogFromVolume: Gt,
-  eraseAndCopyLogsToVolume: qt,
-  eraseVolume: Yt,
-  getLogFileSize: Xt,
-  getVolumes: Qt
+  copyLogFromVolume: Xt,
+  eraseAndCopyLogsToVolume: Qt,
+  eraseVolume: Gt,
+  getLogFileSize: Zt,
+  getVolumes: Jt
 }, Symbol.toStringTag, { value: "Module" }));
-var jo = Object.defineProperty, Uo = Object.getOwnPropertyDescriptor, H = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Uo(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && jo(t, r, o), o;
+var Vo = Object.defineProperty, Ho = Object.getOwnPropertyDescriptor, W = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Ho(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Vo(t, r, o), o;
 };
-const Jt = "copy-logs-model";
-let S = class {
+const er = "copy-logs-model";
+let w = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
     s(this, "_volumes");
+    // Only declare what's needed internally - setupCompleteFutureSupport() handles the rest
     s(this, "futureHandler");
+    s(this, "future");
     s(this, "storageDeviceContainer");
     s(this, "_activeVolume");
     s(this, "_logFileSize", 0);
     s(this, "_actionState", "idle");
     s(this, "copyProgress");
-    this.id = e, this.logger = r.logger, this._volumes = new Wr(), this.futureHandler = new A(this), this._activeVolume = void 0, this.copyProgress = {
+    this.id = e, this.logger = r.logger, this._volumes = new Nr(), this._activeVolume = void 0, this.copyProgress = {
       bytesCopied: 0,
       bytesToCopy: 0,
       filesCopied: 0,
       filesSkipped: 0
-    };
+    }, Br(this);
   }
   // -------------------LIFECYCLE----------------------------
   get volumes() {
@@ -1026,27 +1028,24 @@ let S = class {
   get canCopyLogs() {
     return this.inserted && this._activeVolume;
   }
-  get future() {
-    return this.futureHandler.future;
-  }
   get actionState() {
     return this._actionState;
   }
   get diskFull() {
     var e;
-    return ((e = this.future) == null ? void 0 : e.status) === y.Success && this.copyProgress.filesSkipped > 0;
+    return ((e = this.future) == null ? void 0 : e.status) === b.Success && this.copyProgress.filesSkipped > 0;
   }
   onFutureUpdate(e) {
-    this.logger.info(`Future update: ${e.status}`), e.status === y.Success && (this.logger.info(`Future success: ${e.status}`), this.diskFull && v(() => {
-      e.endState = y.Fail, e.reason = "errDiskFull";
-    })), e.status === y.Fail && this.logger.error(`Future failed: ${e.status}`), e.note === "copy" ? v(() => {
+    this.logger.info(`Future update: ${e.status}`), e.status === b.Success && (this.logger.info(`Future success: ${e.status}`), this.diskFull && _(() => {
+      e.endState = b.Fail, e.reason = "errDiskFull";
+    })), e.status === b.Fail && this.logger.error(`Future failed: ${e.status}`), e.note === "copy" ? _(() => {
       this._actionState = "copying", this.copyProgress = e.clientData || {
         bytesCopied: 0,
         bytesToCopy: 0,
         filesCopied: 0,
         filesSkipped: 0
       };
-    }) : (this._actionState = "erasing", v(() => {
+    }) : (this._actionState = "erasing", _(() => {
       this.copyProgress = {
         bytesCopied: 0,
         bytesToCopy: 0,
@@ -1059,31 +1058,31 @@ let S = class {
     var t;
     if (!e)
       throw new Error("No tracker provided");
-    if (v(() => {
+    if (_(() => {
       this._actionState = "erasing";
     }), !this._activeVolume)
       throw this.logger.error("No active volume selected"), new Error("No active volume selected");
-    return this.logger.info(`Erasing volume ${(t = this._activeVolume) == null ? void 0 : t.name}`), qt(this._activeVolume.id, e);
+    return this.logger.info(`Erasing volume ${(t = this._activeVolume) == null ? void 0 : t.name}`), Qt(this._activeVolume.id, e);
   }
   async eraseVolume(e) {
     var t;
     if (!e)
       throw new Error("No tracker provided");
-    if (v(() => {
+    if (_(() => {
       this._actionState = "erasing";
     }), !this._activeVolume)
       throw this.logger.error("No active volume selected"), new Error("No active volume selected");
-    return this.logger.info(`Erasing volume ${(t = this._activeVolume) == null ? void 0 : t.name}`), Yt(this._activeVolume.id, e);
+    return this.logger.info(`Erasing volume ${(t = this._activeVolume) == null ? void 0 : t.name}`), Gt(this._activeVolume.id, e);
   }
   async copyLogs(e) {
     var t;
     if (!e)
       throw new Error("No tracker provided");
-    if (v(() => {
+    if (_(() => {
       this._actionState = "copying";
     }), !this._activeVolume)
       throw this.logger.error("No active volume selected"), new Error("No active volume selected");
-    return this.logger.info(`Copying logs to ${(t = this._activeVolume) == null ? void 0 : t.name}`), Gt(this._activeVolume.id, e);
+    return this.logger.info(`Copying logs to ${(t = this._activeVolume) == null ? void 0 : t.name}`), Xt(this._activeVolume.id, e);
   }
   handleInsertion() {
     this.inserted ? this.syncVolumes() : (this._volumes.clear(), this.clearActiveVolume());
@@ -1092,7 +1091,7 @@ let S = class {
     this.logger.debug(`initializing copy-logs ${this.id}`);
   }
   async syncVolumes() {
-    const [e, t] = await Qt(), [r, i] = await Xt();
+    const [e, t] = await Jt(), [r, i] = await Zt();
     if (r) {
       this.logger.error(`Error fetching log file size: ${r}`);
       return;
@@ -1102,15 +1101,15 @@ let S = class {
       return;
     }
     t && (t.forEach((o) => {
-      const a = this.storageDeviceContainer.getModel(o.id);
-      if (a) {
-        const n = {
+      const n = this.storageDeviceContainer.getModel(o.id);
+      if (n) {
+        const a = {
           id: o.id,
-          name: a.label,
+          name: n.label,
           freeBytes: o.info.freeBytes,
           totalBytes: o.info.totalBytes
         };
-        this._volumes.addModel(n);
+        this._volumes.addModel(a);
       }
     }), t.length === 1 ? this.updateActiveVolume(this._volumes.data[0]) : this.clearActiveVolume()), i && (this.logger.info(`Log file size: ${i}`), this.updateLogFileSize(parseInt(i, 10)));
   }
@@ -1121,77 +1120,77 @@ let S = class {
     this.logger.debug(`loading copy-logs ${this.id}`);
   }
 };
-H([
-  f({ modelType: Hr.type })
-], S.prototype, "storageDeviceContainer", 2);
-H([
-  b()
-], S.prototype, "eraseAndCopyVolume", 1);
-H([
-  b()
-], S.prototype, "eraseVolume", 1);
-H([
-  b()
-], S.prototype, "copyLogs", 1);
-H([
-  bt({
+W([
+  m({ modelType: zr.type })
+], w.prototype, "storageDeviceContainer", 2);
+W([
+  v()
+], w.prototype, "eraseAndCopyVolume", 1);
+W([
+  v()
+], w.prototype, "eraseVolume", 1);
+W([
+  v()
+], w.prototype, "copyLogs", 1);
+W([
+  _t({
     dependencies: (e) => [e.inserted]
   })
-], S.prototype, "handleInsertion", 1);
-S = H([
-  l(Jt)
-], S);
-const Ds = new de({
-  class: S,
-  type: Jt
-}), Zt = p.createLogger({
+], w.prototype, "handleInsertion", 1);
+w = W([
+  l(er)
+], w);
+const Cs = new pe({
+  class: w,
+  type: er
+}), tr = g.createLogger({
   name: "dashboard-operations-service",
   group: "Services"
-}), er = async (e, t) => (Zt.debug("resolveAll"), await De.bulkResolveTroubles(
+}), rr = async (e, t) => (tr.debug("resolveAll"), await ke.bulkResolveTroubles(
   e,
   t
-)), tr = async (e, t) => (Zt.debug("resolveTrouble"), await De.resolveTrouble(e, t)), Rs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+)), or = async (e, t) => (tr.debug("resolveTrouble"), await ke.resolveTrouble(e, t)), ws = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  resolveAll: er,
-  resolveTrouble: tr
+  resolveAll: rr,
+  resolveTrouble: or
 }, Symbol.toStringTag, { value: "Module" }));
-var Vo = Object.defineProperty, Ho = Object.getOwnPropertyDescriptor, Ae = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ho(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && Vo(t, r, o), o;
+var Wo = Object.defineProperty, zo = Object.getOwnPropertyDescriptor, Ue = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? zo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Wo(t, r, o), o;
 };
-const G = "dashboard-operations-model";
-function ft(e) {
+const Q = "dashboard-operations-model";
+function yt(e) {
   return !e.deferred;
 }
-function mt(e) {
+function bt(e) {
   return e.deferred;
 }
-let I = class {
+let F = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "troubles");
     s(this, "futureHandler");
     s(this, "logger");
-    this.id = e, this.futureHandler = new A(this), this.logger = r.logger;
+    this.id = e, this.futureHandler = new ge(this), this.logger = r.logger;
   }
   get troublesByType() {
     return this.troubles.troubles.data.reduce(
-      zr,
+      Kr,
       {}
     );
   }
   get queuedPurgeTroubles() {
-    return this.purgeTroubles.filter(mt);
+    return this.purgeTroubles.filter(bt);
   }
   get queuedPrimeTroubles() {
-    return this.primeTroubles.filter(mt);
+    return this.primeTroubles.filter(bt);
   }
   get resolvablePrimeTroubles() {
-    return this.primeTroubles.filter(ft);
+    return this.primeTroubles.filter(yt);
   }
   get resolvablePurgeTroubles() {
-    return this.purgeTroubles.filter(ft);
+    return this.purgeTroubles.filter(yt);
   }
   get hasResolvablePurgeTroubles() {
     return this.resolvablePurgeTroubles.length > 0;
@@ -1206,10 +1205,10 @@ let I = class {
     return this.primeTroubles.length > 0;
   }
   get purgeTroubles() {
-    return this.troublesByType[dt] || [];
+    return this.troublesByType[gt] || [];
   }
   get primeTroubles() {
-    return this.troublesByType[Qr] || [];
+    return this.troublesByType[Zr] || [];
   }
   get future() {
     return this.futureHandler.getFuture();
@@ -1217,17 +1216,17 @@ let I = class {
   async resolveAllTroubles(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    const r = e === dt ? this.purgeTroubles : this.primeTroubles;
-    r.filter((n) => n.shouldDefer).forEach((n) => {
-      this.logger.info(`Deferring trouble ${n.rawId}`), n.defer();
+    const r = e === gt ? this.purgeTroubles : this.primeTroubles;
+    r.filter((a) => a.shouldDefer).forEach((a) => {
+      this.logger.info(`Deferring trouble ${a.rawId}`), a.defer();
     });
-    const o = r.filter((n) => !n.shouldDefer).map((n) => n.rawId);
-    return o.length === 0 ? void 0 : await er(o, t);
+    const o = r.filter((a) => !a.shouldDefer).map((a) => a.rawId);
+    return o.length === 0 ? void 0 : await rr(o, t);
   }
   async resolveTrouble(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    return await tr(e, t);
+    return await or(e, t);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1237,36 +1236,36 @@ let I = class {
     this.logger.debug(`loading dashboard-operations ${this.id}`);
   }
 };
-Ae([
-  f({ modelType: tt.type })
-], I.prototype, "troubles", 2);
-Ae([
-  b()
-], I.prototype, "resolveAllTroubles", 1);
-Ae([
-  b()
-], I.prototype, "resolveTrouble", 1);
-I = Ae([
-  l(G)
-], I);
+Ue([
+  m({ modelType: rt.type })
+], F.prototype, "troubles", 2);
+Ue([
+  v()
+], F.prototype, "resolveAllTroubles", 1);
+Ue([
+  v()
+], F.prototype, "resolveTrouble", 1);
+F = Ue([
+  l(Q)
+], F);
 const nt = {
   registration: {
-    [G]: {
-      class: I,
+    [Q]: {
+      class: F,
       singleton: !0
     }
   },
-  type: G,
-  predicate: c(G),
-  factory: u.Singleton.create(G)
+  type: Q,
+  predicate: u(Q),
+  factory: c.Singleton.create(Q)
 };
-var Wo = Object.defineProperty, zo = Object.getOwnPropertyDescriptor, No = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? zo(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && Wo(t, r, o), o;
+var No = Object.getOwnPropertyDescriptor, Bo = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? No(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = a(o) || o);
+  return o;
 };
-const Q = "dispenser-model";
-let Ke = class {
+const X = "dispenser-model";
+let qe = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -1282,34 +1281,34 @@ let Ke = class {
     this.logger.debug(`loading dispenser ${this.id}`);
   }
 };
-Ke = No([
-  l(Q)
-], Ke);
-const Bo = {
+qe = Bo([
+  l(X)
+], qe);
+const Ko = {
   registration: {
-    [Q]: {
-      class: Ke,
+    [X]: {
+      class: qe,
       singleton: !0
     }
   },
-  type: Q,
-  predicate: c(Q),
-  factory: u.Singleton.create(Q)
-}, { URL: Ko } = g("DISPENSER_SERVICE"), { getAll: Yo } = h.build({
-  basePath: `${Ko}/api/dispenser`
-}), qo = p.createLogger({
+  type: X,
+  predicate: u(X),
+  factory: c.Singleton.create(X)
+}, { URL: Yo } = h("DISPENSER_SERVICE"), { getAll: qo } = f.build({
+  basePath: `${Yo}/api/dispenser`
+}), Go = g.createLogger({
   name: "dispenser-service",
   group: "Services"
-}), Go = async () => (qo.debug("sending GET for dispenser"), await Yo({})), Is = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Qo = async () => (Go.debug("sending GET for dispenser"), await qo({})), Es = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getDispensers: Go
+  getDispensers: Qo
 }, Symbol.toStringTag, { value: "Module" }));
-var Qo = Object.defineProperty, Xo = Object.getOwnPropertyDescriptor, rr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Xo(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && Qo(t, r, o), o;
+var Xo = Object.defineProperty, Jo = Object.getOwnPropertyDescriptor, ir = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Jo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Xo(t, r, o), o;
 };
-const X = "dispenser-info-model";
+const J = "dispenser-info-model";
 let Pe = class {
   constructor(e, t, r) {
     s(this, "logger");
@@ -1325,43 +1324,43 @@ let Pe = class {
     this.logger.debug(`loading dispenser-info ${this.id}`);
   }
 };
-rr([
+ir([
   d({
     path: "kos:device",
     attribute: "name"
   })
 ], Pe.prototype, "name", 2);
-Pe = rr([
-  l(X)
+Pe = ir([
+  l(J)
 ], Pe);
-const Jo = {
+const Zo = {
   registration: {
-    [X]: {
+    [J]: {
       class: Pe,
       singleton: !1
     }
   },
-  type: X,
-  predicate: c(X),
-  factory: u.Factory.create(
-    X
+  type: J,
+  predicate: u(J),
+  factory: c.Factory.create(
+    J
   )
-}, { URL: Zo } = g("DISPENSER-INFO_SERVICE"), { getAll: ei } = h.build({
-  basePath: `${Zo}/api/dispenser-info`
-}), ti = p.createLogger({
+}, { URL: ei } = h("DISPENSER-INFO_SERVICE"), { getAll: ti } = f.build({
+  basePath: `${ei}/api/dispenser-info`
+}), ri = g.createLogger({
   name: "dispenser-info-service",
   group: "Services"
-}), ri = async () => (ti.debug("sending GET for dispenser-info"), await ei({})), ks = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), oi = async () => (ri.debug("sending GET for dispenser-info"), await ti({})), Ls = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getDispenserInfos: ri
+  getDispenserInfos: oi
 }, Symbol.toStringTag, { value: "Module" }));
-var oi = Object.defineProperty, ii = Object.getOwnPropertyDescriptor, si = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ii(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && oi(t, r, o), o;
+var ii = Object.getOwnPropertyDescriptor, si = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? ii(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = a(o) || o);
+  return o;
 };
-const J = "enrollment-model";
-let Ye = class {
+const Z = "enrollment-model";
+let Ge = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -1379,37 +1378,37 @@ let Ye = class {
     this.logger.debug(`loading enrollment ${this.id}`);
   }
 };
-Ye = si([
-  l(J)
-], Ye);
-const ni = {
+Ge = si([
+  l(Z)
+], Ge);
+const ai = {
   registration: {
-    [J]: {
-      class: Ye,
+    [Z]: {
+      class: Ge,
       singleton: !0
     }
   },
-  type: J,
-  predicate: c(J),
-  factory: u.Singleton.create(J)
-}, { URL: ai } = g("ENROLLMENT_SERVICE"), { getAll: li } = h.build({
-  basePath: `${ai}/api/enrollment`
-}), ci = p.createLogger({
+  type: Z,
+  predicate: u(Z),
+  factory: c.Singleton.create(Z)
+}, { URL: ni } = h("ENROLLMENT_SERVICE"), { getAll: li } = f.build({
+  basePath: `${ni}/api/enrollment`
+}), ci = g.createLogger({
   name: "enrollment-service",
   group: "Services"
-}), ui = async () => (ci.debug("sending GET for enrollment"), await li({})), Fs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), ui = async () => (ci.debug("sending GET for enrollment"), await li({})), Ds = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   getEnrollments: ui
-}, Symbol.toStringTag, { value: "Module" })), xs = (e) => e.toLowerCase().includes("micros"), As = (e) => !e.toLowerCase().includes("micros"), js = (e) => (t) => {
+}, Symbol.toStringTag, { value: "Module" })), ks = (e) => e.toLowerCase().includes("micros"), Rs = (e) => !e.toLowerCase().includes("micros"), Is = (e) => (t) => {
   const r = e == null ? void 0 : e.getHoldersByGroup(t);
   return r ? r.map((i) => ({ id: i.id, name: i.ingredientName, path: i.path })) : null;
-}, Us = ["water", "carb", "ns", "nss"], ce = "dashboardKeyFactory", ze = [];
-Nr(ce, {
+}, Fs = ["water", "carb", "ns", "nss"], ue = "dashboardKeyFactory", Be = [];
+Yr(ue, {
   register: (e, t) => {
-    ze.includes(t) || ze.push(t);
+    Be.includes(t) || Be.push(t);
   },
   execute: (e, t) => {
-    const r = ze.sort((i, o) => i.rank - o.rank);
+    const r = Be.sort((i, o) => i.rank - o.rank);
     for (const i of r) {
       const o = i.factory(t);
       if (o)
@@ -1418,31 +1417,31 @@ Nr(ce, {
   }
 });
 const di = (e) => {
-  Re[ce].register(
-    ce,
+  Ie[ue].register(
+    ue,
     e
   );
-}, pi = (e) => Re[ce].execute(
-  ce,
+}, pi = (e) => Ie[ue].execute(
+  ue,
   e
 );
-Re.registerDashboardKeyFactory = di;
-Re.executeDashboardKeyFactory = pi;
-const qe = 3600, or = 60, Vs = (e) => {
-  const t = Math.floor(e / qe), r = Math.floor(e % qe / or);
+Ie.registerDashboardKeyFactory = di;
+Ie.executeDashboardKeyFactory = pi;
+const Qe = 3600, sr = 60, xs = (e) => {
+  const t = Math.floor(e / Qe), r = Math.floor(e % Qe / sr);
   return { hours: t, minutes: r };
-}, Hs = (e, t) => e * qe + t * or, gi = (e) => {
-  const r = (/* @__PURE__ */ new Date()).valueOf() - e.valueOf(), i = Math.floor(r / (1e3 * 60)), o = Math.floor(i / 60), a = Math.floor(o / 24), n = i % 60, E = o % 24;
-  let me = "";
-  return a > 0 && (me += `${a} day${a > 1 ? "s" : ""} `), E > 0 && (me += `${E} hour${E > 1 ? "s" : ""} `), (n > 0 || a === 0 && E === 0) && (me += `${n} minute${n > 1 ? "s" : ""} `), me;
-};
-var hi = Object.defineProperty, fi = Object.getOwnPropertyDescriptor, je = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? fi(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
+}, As = (e, t) => e * Qe + t * sr, gi = (e) => {
+  const r = (/* @__PURE__ */ new Date()).valueOf() - e.valueOf(), i = Math.floor(r / (1e3 * 60)), o = Math.floor(i / 60), n = Math.floor(o / 24), a = i % 60, O = o % 24;
+  let D = "";
+  return n > 0 && (D += `${n} day${n > 1 ? "s" : ""} `), O > 0 && (D += `${O} hour${O > 1 ? "s" : ""} `), (a > 0 || n === 0 && O === 0) && (D += `${a} minute${a > 1 ? "s" : ""} `), D;
+};
+var hi = Object.defineProperty, fi = Object.getOwnPropertyDescriptor, Ve = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? fi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
   return i && o && hi(t, r, o), o;
 };
-const Z = "ingredient-summary-model";
-let k = class {
+const ee = "ingredient-summary-model";
+let x = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "assemblyModel");
@@ -1457,7 +1456,7 @@ let k = class {
     );
   }
   get actionRequiredHolders() {
-    const e = this.appModel.currentRole, t = xt(e);
+    const e = this.appModel.currentRole, t = jt(e);
     return this.assemblyModel.allHolders.filter((r) => {
       const i = r.troubles.filter(t);
       return i.length > 0 && i.find((o) => o.resolvable);
@@ -1477,38 +1476,38 @@ let k = class {
     this.logger.debug(`loading ingredient-summary ${this.id}`);
   }
 };
-je([
-  f({ modelType: Ie.type })
-], k.prototype, "assemblyModel", 2);
-je([
-  f({ modelType: nt.type })
-], k.prototype, "dashboardOperationModel", 2);
-je([
-  f({ modelType: st.type })
-], k.prototype, "appModel", 2);
-k = je([
-  l(Z)
-], k);
+Ve([
+  m({ modelType: Fe.type })
+], x.prototype, "assemblyModel", 2);
+Ve([
+  m({ modelType: nt.type })
+], x.prototype, "dashboardOperationModel", 2);
+Ve([
+  m({ modelType: at.type })
+], x.prototype, "appModel", 2);
+x = Ve([
+  l(ee)
+], x);
 const mi = {
   registration: {
-    [Z]: {
-      class: k,
+    [ee]: {
+      class: x,
       singleton: !1
     }
   },
-  type: Z,
-  predicate: c(Z),
-  factory: u.Factory.create(
-    Z
+  type: ee,
+  predicate: u(ee),
+  factory: c.Factory.create(
+    ee
   )
 };
-var yi = Object.defineProperty, bi = Object.getOwnPropertyDescriptor, vi = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? bi(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && yi(t, r, o), o;
+var yi = Object.getOwnPropertyDescriptor, bi = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? yi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = a(o) || o);
+  return o;
 };
-const ir = "lfcv-pump-model";
-let Ge = class {
+const ar = "lfcv-pump-model";
+let Xe = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -1538,43 +1537,43 @@ let Ge = class {
     this.logger.debug(`loading lfcv-pump ${this.id}`);
   }
 };
-Ge = vi([
-  l(ir)
-], Ge);
-const Ws = new Ee({
-  class: Ge,
-  type: ir
-}), { URL: _i } = g("LFCV-PUMP_SERVICE"), { getAll: $i } = h.build({
-  basePath: `${_i}/api/lfcv-pump`
-}), Pi = p.createLogger({
+Xe = bi([
+  l(ar)
+], Xe);
+const js = new Le({
+  class: Xe,
+  type: ar
+}), { URL: vi } = h("LFCV-PUMP_SERVICE"), { getAll: _i } = f.build({
+  basePath: `${vi}/api/lfcv-pump`
+}), $i = g.createLogger({
   name: "lfcv-pump-service",
   group: "Services"
-}), Ti = async () => (Pi.debug("sending GET for lfcv-pump"), await $i({})), zs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Ti = async () => ($i.debug("sending GET for lfcv-pump"), await _i({})), Us = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   getLfcvPumps: Ti
-}, Symbol.toStringTag, { value: "Module" })), { URL: at } = g("LOCKOUT_SERVICE"), { postModel: sr } = h.build({
-  basePath: `${at}/api/app/kosdev.ddk/lockout`
-}), nr = p.createLogger({ name: "lockout-service", group: "Services" }), Oi = async () => (nr.info("lock"), await sr({
+}, Symbol.toStringTag, { value: "Module" })), { URL: lt } = h("LOCKOUT_SERVICE"), { postModel: nr } = f.build({
+  basePath: `${lt}/api/app/kosdev.ddk/lockout`
+}), lr = g.createLogger({ name: "lockout-service", group: "Services" }), Pi = async () => (lr.info("lock"), await nr({
   model: {},
-  urlOverride: `${at}/api/app/kosdev.ddk/lockout/lockNow`
-})), ar = async (e) => {
-  nr.info("unlock");
-  const t = await sr({
+  urlOverride: `${lt}/api/app/kosdev.ddk/lockout/lockNow`
+})), cr = async (e) => {
+  lr.info("unlock");
+  const t = await nr({
     model: {},
-    urlOverride: `${at}/api/app/kosdev.ddk/lockout/unlock/${e}`
+    urlOverride: `${lt}/api/app/kosdev.ddk/lockout/unlock/${e}`
   });
   return t == null ? void 0 : t.data;
-}, Ns = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Vs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  lock: Oi,
-  unlock: ar
+  lock: Pi,
+  unlock: cr
 }, Symbol.toStringTag, { value: "Module" }));
-var Mi = Object.defineProperty, Si = Object.getOwnPropertyDescriptor, W = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Si(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && Mi(t, r, o), o;
+var Oi = Object.defineProperty, Mi = Object.getOwnPropertyDescriptor, z = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Mi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Oi(t, r, o), o;
 };
-const lr = "lockout-model", Ci = [
+const ur = "lockout-model", Si = [
   { day: "monday", lock: "dayWiseLockConfigMap.Mon.enabled", open: "dayWiseLockConfigMap.Mon.unlockTime", close: "dayWiseLockConfigMap.Mon.lockTime" },
   { day: "tuesday", lock: "dayWiseLockConfigMap.Tue.enabled", open: "dayWiseLockConfigMap.Tue.unlockTime", close: "dayWiseLockConfigMap.Tue.lockTime" },
   { day: "wednesday", lock: "dayWiseLockConfigMap.Wed.enabled", open: "dayWiseLockConfigMap.Wed.unlockTime", close: "dayWiseLockConfigMap.Wed.lockTime" },
@@ -1583,7 +1582,7 @@ const lr = "lockout-model", Ci = [
   { day: "saturday", lock: "dayWiseLockConfigMap.Sat.enabled", open: "dayWiseLockConfigMap.Sat.unlockTime", close: "dayWiseLockConfigMap.Sat.lockTime" },
   { day: "sunday", lock: "dayWiseLockConfigMap.Sun.enabled", open: "dayWiseLockConfigMap.Sun.unlockTime", close: "dayWiseLockConfigMap.Sun.lockTime" }
 ];
-let C = class {
+let E = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -1629,7 +1628,7 @@ let C = class {
     return t || r;
   }
   get schedule() {
-    return Ci;
+    return Si;
   }
   getProp(e) {
     return this.saveMap.get(e);
@@ -1646,7 +1645,7 @@ let C = class {
       this.nextLockSkipped.updateProperty("0");
   }
   async unlock(e) {
-    return await ar(e);
+    return await cr(e);
   }
   async save() {
     return this.saveMap.forEach((e, t) => {
@@ -1668,50 +1667,50 @@ let C = class {
     this.logger.debug(`loading lockout ${this.id}`);
   }
 };
-W([
+z([
   d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "pin"
   })
-], C.prototype, "pin", 2);
-W([
+], E.prototype, "pin", 2);
+z([
   d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextLockSkipped"
   })
-], C.prototype, "nextLockSkipped", 2);
-W([
+], E.prototype, "nextLockSkipped", 2);
+z([
   d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextLockTime"
   })
-], C.prototype, "nextLockTime", 2);
-W([
+], E.prototype, "nextLockTime", 2);
+z([
   d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextUnLockTime"
   })
-], C.prototype, "nextUnLockTime", 2);
-W([
-  Br({ path: "app:kosdev.ddk:service:cuiLockout" })
-], C.prototype, "cuiLockout", 2);
-C = W([
-  l(lr)
-], C);
-const Bs = new de({
-  class: C,
-  type: lr
-}), wi = async (e, t) => await De.bulkResolveTroubles(
+], E.prototype, "nextUnLockTime", 2);
+z([
+  qr({ path: "app:kosdev.ddk:service:cuiLockout" })
+], E.prototype, "cuiLockout", 2);
+E = z([
+  l(ur)
+], E);
+const Hs = new pe({
+  class: E,
+  type: ur
+}), Ci = async (e, t) => await ke.bulkResolveTroubles(
   e,
   t
 );
-var Ei = Object.defineProperty, Li = Object.getOwnPropertyDescriptor, Ue = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Li(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && Ei(t, r, o), o;
+var wi = Object.defineProperty, Ei = Object.getOwnPropertyDescriptor, He = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Ei(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && wi(t, r, o), o;
 };
-const ee = "macro-assignment-model", yt = "PurgeTrouble", Di = "PrimeTrouble";
-let F = class {
+const te = "macro-assignment-model", vt = "PurgeTrouble", Li = "PrimeTrouble";
+let A = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -1721,7 +1720,7 @@ let F = class {
     s(this, "futureHandler");
     s(this, "holders");
     s(this, "ingredients");
-    this.id = e, this.futureHandler = new A(), this.logger = r.logger;
+    this.id = e, this.futureHandler = new ge(), this.logger = r.logger;
   }
   /**
    * shortcut to the current running future
@@ -1751,13 +1750,13 @@ let F = class {
    */
   get holderPurgeTroubles() {
     return this.macroHolders.reduce((t, r) => {
-      const i = r.troublesByType[yt] || [];
+      const i = r.troublesByType[vt] || [];
       return t = [...t, ...i], t;
     }, []);
   }
   get holderPrimeTroubles() {
     return this.macroHolders.reduce((t, r) => {
-      const i = r.troublesByType[Di] || [];
+      const i = r.troublesByType[Li] || [];
       return t = [...t, ...i], t;
     }, []);
   }
@@ -1793,42 +1792,42 @@ let F = class {
   async resolveAll(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    const i = (e === yt ? this.holderPurgeTroubles : this.holderPrimeTroubles).map((a) => a.rawId);
-    return await wi(i, t);
-  }
-};
-Ue([
-  f({ modelType: qr.type })
-], F.prototype, "holders", 2);
-Ue([
-  f({ modelType: Gr.type })
-], F.prototype, "ingredients", 2);
-Ue([
-  b()
-], F.prototype, "resolveAll", 1);
-F = Ue([
-  l(ee)
-], F);
-const Ri = {
+    const i = (e === vt ? this.holderPurgeTroubles : this.holderPrimeTroubles).map((n) => n.rawId);
+    return await Ci(i, t);
+  }
+};
+He([
+  m({ modelType: Xr.type })
+], A.prototype, "holders", 2);
+He([
+  m({ modelType: Jr.type })
+], A.prototype, "ingredients", 2);
+He([
+  v()
+], A.prototype, "resolveAll", 1);
+A = He([
+  l(te)
+], A);
+const Di = {
   registration: {
-    [ee]: {
-      class: F,
+    [te]: {
+      class: A,
       singleton: !0
     }
   },
-  type: ee,
-  predicate: c(ee),
-  factory: u.Singleton.create(
-    ee
+  type: te,
+  predicate: u(te),
+  factory: c.Singleton.create(
+    te
   )
 };
-var Ii = Object.defineProperty, ki = Object.getOwnPropertyDescriptor, Fi = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ki(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && Ii(t, r, o), o;
+var ki = Object.getOwnPropertyDescriptor, Ri = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? ki(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = a(o) || o);
+  return o;
 };
-const te = "network-test-model";
-let Qe = class {
+const re = "network-test-model";
+let Je = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "group");
@@ -1852,58 +1851,58 @@ let Qe = class {
     this.logger.debug(`loading network-test ${this.id}`);
   }
 };
-Qe = Fi([
-  l(te)
-], Qe);
-const cr = {
+Je = Ri([
+  l(re)
+], Je);
+const dr = {
   registration: {
-    [te]: {
-      class: Qe,
+    [re]: {
+      class: Je,
       singleton: !1
     }
   },
-  type: te,
-  predicate: c(te),
-  factory: u.Factory.create(te)
-}, { URL: Ve } = g("NETWORK-TEST_SERVICE"), { getAll: xi, getOne: ur } = h.build({
-  basePath: `${Ve}/api/app/ncui/network/tests`
-}), Ai = p.createLogger({
+  type: re,
+  predicate: u(re),
+  factory: c.Factory.create(re)
+}, { URL: We } = h("NETWORK-TEST_SERVICE"), { getAll: Ii, getOne: pr } = f.build({
+  basePath: `${We}/api/app/ncui/network/tests`
+}), Fi = g.createLogger({
   name: "network-test-service",
   group: "Services"
-}), dr = async () => {
-  Ai.debug("sending GET for network-test");
-  const e = await xi({
-    urlOverride: `${Ve}/api/app/kosdev.ddk/network/tests`
+}), gr = async () => {
+  Fi.debug("sending GET for network-test");
+  const e = await Ii({
+    urlOverride: `${We}/api/app/kosdev.ddk/network/tests`
   });
   return e == null ? void 0 : e.data;
-}, pr = async () => {
-  const e = await ur({
-    urlOverride: `${Ve}/api/app/kosdev.ddk/network/reports`
+}, hr = async () => {
+  const e = await pr({
+    urlOverride: `${We}/api/app/kosdev.ddk/network/reports`
   });
   return e == null ? void 0 : e.data;
-}, gr = async (e, t) => await ur({
-  urlOverride: `${Ve}/api/app/kosdev.ddk/network/tests/run/group/${e}`,
+}, fr = async (e, t) => await pr({
+  urlOverride: `${We}/api/app/kosdev.ddk/network/tests/run/group/${e}`,
   tracker: t
-}), Ks = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Ws = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getNetworkTests: dr,
-  getTestsReports: pr,
-  performGroupTest: gr
+  getNetworkTests: gr,
+  getTestsReports: hr,
+  performGroupTest: fr
 }, Symbol.toStringTag, { value: "Module" }));
-var ji = Object.defineProperty, Ui = Object.getOwnPropertyDescriptor, lt = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ui(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && ji(t, r, o), o;
+var xi = Object.defineProperty, Ai = Object.getOwnPropertyDescriptor, ct = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Ai(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && xi(t, r, o), o;
 };
-const re = "network-test-container-model";
-let ue = class {
+const oe = "network-test-container-model";
+let de = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
     s(this, "lastTested");
     s(this, "futureHandler");
     s(this, "models");
-    this.id = e, this.logger = r.logger, this.futureHandler = new A(this), this.models = new Ze({
+    this.id = e, this.logger = r.logger, this.futureHandler = new ge(this), this.models = new tt({
       parentId: e,
       indexMap: {
         group: "group"
@@ -1936,14 +1935,14 @@ let ue = class {
   }
   async load() {
     this.logger.debug(`loading network-test-container container ${this.id}`);
-    const e = await dr(), t = await pr();
+    const e = await gr(), t = await hr();
     e && e.forEach((r) => {
-      const i = cr.factory(r.id)(r);
+      const i = dr.factory(r.id)(r);
       this.addModel(i);
     }), e && t && e.forEach((r) => {
-      const i = t == null ? void 0 : t[r.group], o = i == null ? void 0 : i[r.id], a = this.getModel(r.id);
-      if (a && o) {
-        const n = {
+      const i = t == null ? void 0 : t[r.group], o = i == null ? void 0 : i[r.id], n = this.getModel(r.id);
+      if (n && o) {
+        const a = {
           group: o.group,
           name: o.name,
           passed: o.passed,
@@ -1952,21 +1951,21 @@ let ue = class {
           timestamp: new Date(o.timestamp),
           results: o.results
         };
-        a.updateModel(n);
+        n.updateModel(a);
       }
     });
   }
   async performTest(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    const r = await gr(e, t);
+    const r = await fr(e, t);
     return r == null ? void 0 : r.data;
   }
   onFutureUpdate(e) {
     const { clientData: t } = e;
     t && t.forEach((r) => {
       const i = this.getModel(r.id);
-      if (v(() => {
+      if (_(() => {
         this.lastTested = this.lastTested > new Date(r.timestamp) ? this.lastTested : new Date(r.timestamp);
       }), i) {
         const o = {
@@ -1978,41 +1977,41 @@ let ue = class {
           timestamp: new Date(r.timestamp),
           results: r.results
         };
-        v(() => {
+        _(() => {
           i.updateModel(o);
         });
       }
     });
   }
 };
-lt([
-  Le
-], ue.prototype, "models", 2);
-lt([
-  b()
-], ue.prototype, "performTest", 1);
-ue = lt([
-  l(re)
-], ue);
-const Vi = {
+ct([
+  De
+], de.prototype, "models", 2);
+ct([
+  v()
+], de.prototype, "performTest", 1);
+de = ct([
+  l(oe)
+], de);
+const ji = {
   registration: {
-    [re]: {
-      class: ue,
+    [oe]: {
+      class: de,
       singleton: !0
     },
-    ...cr.registration
+    ...dr.registration
   },
-  type: re,
-  predicate: c(re),
-  factory: u.Singleton.create(re)
+  type: oe,
+  predicate: u(oe),
+  factory: c.Singleton.create(oe)
 };
-var Hi = Object.defineProperty, Wi = Object.getOwnPropertyDescriptor, hr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Wi(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && Hi(t, r, o), o;
+var Ui = Object.defineProperty, Vi = Object.getOwnPropertyDescriptor, mr = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Vi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Ui(t, r, o), o;
 };
-const oe = "nutritive-sweetener-model";
-let Te = class {
+const ie = "nutritive-sweetener-model";
+let Oe = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "assemblyModel");
@@ -2033,30 +2032,30 @@ let Te = class {
     this.logger.debug(`loading nutritive-sweetener ${this.id}`);
   }
 };
-hr([
-  f({ modelType: Ie.type })
-], Te.prototype, "assemblyModel", 2);
-Te = hr([
-  l(oe)
-], Te);
-const zi = {
+mr([
+  m({ modelType: Fe.type })
+], Oe.prototype, "assemblyModel", 2);
+Oe = mr([
+  l(ie)
+], Oe);
+const Hi = {
   registration: {
-    [oe]: {
-      class: Te,
+    [ie]: {
+      class: Oe,
       singleton: !1
     }
   },
-  type: oe,
-  predicate: c(oe),
-  factory: u.Factory.create(oe)
+  type: ie,
+  predicate: u(ie),
+  factory: c.Factory.create(ie)
 };
-var Ni = Object.defineProperty, Bi = Object.getOwnPropertyDescriptor, fr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Bi(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && Ni(t, r, o), o;
+var Wi = Object.defineProperty, zi = Object.getOwnPropertyDescriptor, yr = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? zi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Wi(t, r, o), o;
 };
-const ie = "plain-water-model";
-let Oe = class {
+const se = "plain-water-model";
+let Me = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "assemblyModel");
@@ -2069,7 +2068,7 @@ let Oe = class {
   getPump() {
     var i, o;
     const e = this.getHolder(), t = (o = (i = e == null ? void 0 : e.pumps) == null ? void 0 : i.data) == null ? void 0 : o[0];
-    return vt(t, Nt.type);
+    return $t(t, Kt.type);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -2079,45 +2078,45 @@ let Oe = class {
     this.logger.debug(`loading plain-water ${this.id}`);
   }
 };
-fr([
-  f({ modelType: Ie.type })
-], Oe.prototype, "assemblyModel", 2);
-Oe = fr([
-  l(ie)
-], Oe);
-const Ki = {
+yr([
+  m({ modelType: Fe.type })
+], Me.prototype, "assemblyModel", 2);
+Me = yr([
+  l(se)
+], Me);
+const Ni = {
   registration: {
-    [ie]: {
-      class: Oe,
+    [se]: {
+      class: Me,
       singleton: !1
     }
   },
-  type: ie,
-  predicate: c(ie),
-  factory: u.Factory.create(ie)
-}, { URL: mr } = g("REBOOT_SERVICE"), { postModel: Yi } = h.build({
-  basePath: `${mr}/api/reboot`
-}), qi = p.createLogger({ name: "reboot-service", group: "Services" }), yr = async () => (qi.debug("sending POST call for Reboot Dispenser"), await Yi({
-  urlOverride: `${mr}/api/app/kosdev.ddk/ncui/reboot`,
+  type: se,
+  predicate: u(se),
+  factory: c.Factory.create(se)
+}, { URL: br } = h("REBOOT_SERVICE"), { postModel: Bi } = f.build({
+  basePath: `${br}/api/reboot`
+}), Ki = g.createLogger({ name: "reboot-service", group: "Services" }), vr = async () => (Ki.debug("sending POST call for Reboot Dispenser"), await Bi({
+  urlOverride: `${br}/api/app/kosdev.ddk/ncui/reboot`,
   model: {}
-})), Ys = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), zs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  rebootDispenser: yr
+  rebootDispenser: vr
 }, Symbol.toStringTag, { value: "Module" }));
-var Gi = Object.defineProperty, Qi = Object.getOwnPropertyDescriptor, Xi = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Qi(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && Gi(t, r, o), o;
+var Yi = Object.getOwnPropertyDescriptor, qi = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Yi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = a(o) || o);
+  return o;
 };
-const se = "reboot-model";
-let Xe = class {
+const ae = "reboot-model";
+let Ze = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
     this.id = e, this.logger = r.logger;
   }
   async completeReboot() {
-    await yr();
+    await vr();
   }
   updateModel() {
   }
@@ -2129,24 +2128,24 @@ let Xe = class {
     this.logger.debug(`loading reboot ${this.id}`);
   }
 };
-Xe = Xi([
-  l(se)
-], Xe);
-const Ji = {
+Ze = qi([
+  l(ae)
+], Ze);
+const Gi = {
   registration: {
-    [se]: {
-      class: Xe,
+    [ae]: {
+      class: Ze,
       singleton: !1
     }
   },
-  type: se,
-  predicate: c(se),
-  factory: u.Factory.create(se)
+  type: ae,
+  predicate: u(ae),
+  factory: c.Factory.create(ae)
 };
-var Zi = Object.defineProperty, es = Object.getOwnPropertyDescriptor, O = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? es(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && Zi(t, r, o), o;
+var Qi = Object.defineProperty, Xi = Object.getOwnPropertyDescriptor, S = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Xi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Qi(t, r, o), o;
 };
 const ne = "settings-model";
 let P = class {
@@ -2197,61 +2196,61 @@ let P = class {
     };
   }
 };
-O([
+S([
   d({
     path: "system:app",
     attribute: "resolveDelaysMs"
     // optionsExpander: () => [],
   })
 ], P.prototype, "resolveDelaysMs", 2);
-O([
+S([
   d({
     path: "system:app",
     attribute: "dateFormat"
     // optionsExpander: () => [],
   })
 ], P.prototype, "dateFormat", 2);
-O([
+S([
   d({
     path: "system:app",
     attribute: "timeFormat"
     // optionsExpander: () => [],
   })
 ], P.prototype, "timeFormat", 2);
-O([
+S([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.hidePlainWaterBev"
   })
 ], P.prototype, "hidePlainWaterBev", 2);
-O([
+S([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.hideCarbWaterBev"
   })
 ], P.prototype, "hideCarbWaterBev", 2);
-O([
+S([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.ncuiLanguage"
   })
 ], P.prototype, "ncuiLanguage", 2);
-O([
+S([
   d({
     path: "kos:device",
     attribute: "name"
   })
 ], P.prototype, "name", 2);
-O([
+S([
   d({
     path: "kos:service:OTA",
     attribute: "activateAndRebootTime"
   })
 ], P.prototype, "activateAndRebootTime", 2);
-P = O([
+P = S([
   l(ne)
 ], P);
-const ts = {
+const Ji = {
   registration: {
     [ne]: {
       class: P,
@@ -2259,27 +2258,27 @@ const ts = {
     }
   },
   type: ne,
-  predicate: c(ne),
-  factory: u.Singleton.create(ne)
-}, { URL: br } = g("SETTINGS_SERVICE"), { getAll: vr } = h.build({
-  basePath: `${br}/api/settings`
-}), rs = p.createLogger({
+  predicate: u(ne),
+  factory: c.Singleton.create(ne)
+}, { URL: _r } = h("SETTINGS_SERVICE"), { getAll: $r } = f.build({
+  basePath: `${_r}/api/settings`
+}), Zi = g.createLogger({
   name: "settings-service",
   group: "Services"
-}), os = async () => (rs.debug("sending GET for settings"), await vr({})), is = async () => await vr({
-  urlOverride: `${br}api/app/kosdev.ddk/ncui/languages`
-}), qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), es = async () => (Zi.debug("sending GET for settings"), await $r({})), ts = async () => await $r({
+  urlOverride: `${_r}api/app/kosdev.ddk/ncui/languages`
+}), Ns = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getNcuiLanguage: is,
-  getSettings: os
+  getNcuiLanguage: ts,
+  getSettings: es
 }, Symbol.toStringTag, { value: "Module" }));
-var ss = Object.defineProperty, ns = Object.getOwnPropertyDescriptor, as = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ns(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && ss(t, r, o), o;
+var rs = Object.getOwnPropertyDescriptor, os = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? rs(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = a(o) || o);
+  return o;
 };
-const ae = "utilities-model";
-let Je = class {
+const le = "utilities-model";
+let et = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "name");
@@ -2306,46 +2305,46 @@ let Je = class {
     this.logger.debug(`loading utilities ${this.id}`);
   }
 };
-Je = as([
-  l(ae)
-], Je);
-const _r = {
+et = os([
+  l(le)
+], et);
+const Tr = {
   registration: {
-    [ae]: {
-      class: Je,
+    [le]: {
+      class: et,
       singleton: !1
     }
   },
-  type: ae,
-  predicate: c(ae),
-  factory: u.Factory.create(ae)
-}, { URL: $r } = g("UTILITIES_SERVICE"), { getAll: ls } = h.build({
-  basePath: `${$r}/api/utilities`
-}), cs = p.createLogger({
+  type: le,
+  predicate: u(le),
+  factory: c.Factory.create(le)
+}, { URL: Pr } = h("UTILITIES_SERVICE"), { getAll: is } = f.build({
+  basePath: `${Pr}/api/utilities`
+}), ss = g.createLogger({
   name: "utilities-service",
   group: "Services"
-}), Pr = async () => {
-  cs.debug("sending GET for utilities");
-  const e = await ls({
-    urlOverride: `${$r}/api/kos/descriptor/system:app/kondra.ncui.utilities`
+}), Or = async () => {
+  ss.debug("sending GET for utilities");
+  const e = await is({
+    urlOverride: `${Pr}/api/kos/descriptor/system:app/kondra.ncui.utilities`
   });
   return e == null ? void 0 : e.data;
-}, Gs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Bs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getUtilities: Pr
+  getUtilities: Or
 }, Symbol.toStringTag, { value: "Module" }));
-var us = Object.defineProperty, ds = Object.getOwnPropertyDescriptor, Tr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ds(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && us(t, r, o), o;
+var as = Object.defineProperty, ns = Object.getOwnPropertyDescriptor, Mr = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? ns(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && as(t, r, o), o;
 };
-const le = "utilities-container-model";
-let Me = class {
+const ce = "utilities-container-model";
+let Se = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
     s(this, "_models");
-    this.id = e, this.logger = r.logger, this._models = new Ze({
+    this.id = e, this.logger = r.logger, this._models = new tt({
       parentId: e,
       sortKey: "id",
       indexMap: {
@@ -2377,63 +2376,63 @@ let Me = class {
   // -------------------LIFECYCLE----------------------------
   async load() {
     this.logger.debug(`loading utilities-container container ${this.id}`);
-    const e = await Pr();
+    const e = await Or();
     e == null || e.forEach((t, r) => {
       t.forEach((i) => {
         const o = {
           ...i,
           columnId: String(r)
-        }, a = _r.factory(i.name)(
+        }, n = Tr.factory(i.name)(
           o
         );
-        this.addModel(a);
+        this.addModel(n);
       });
     });
   }
 };
-Tr([
-  Le
-], Me.prototype, "_models", 2);
-Me = Tr([
-  l(le)
-], Me);
-const ps = {
+Mr([
+  De
+], Se.prototype, "_models", 2);
+Se = Mr([
+  l(ce)
+], Se);
+const ls = {
   registration: {
-    [le]: {
-      class: Me,
+    [ce]: {
+      class: Se,
       singleton: !0
     },
-    ..._r.registration
+    ...Tr.registration
   },
-  type: le,
-  predicate: c(le),
-  factory: u.Singleton.create(le)
-}, Qs = {
-  ...Oo.registration,
-  ...st.registration,
-  ...ot.registration,
-  ...ko.registration,
+  type: ce,
+  predicate: u(ce),
+  factory: c.Singleton.create(ce)
+}, Ks = {
+  ...So.registration,
+  ...at.registration,
+  ...it.registration,
+  ...xo.registration,
   ...nt.registration,
-  ...Bo.registration,
-  ...Jo.registration,
-  ...ni.registration,
+  ...Ko.registration,
+  ...Zo.registration,
+  ...ai.registration,
   ...mi.registration,
-  ...Ri.registration,
-  ...Vi.registration,
-  ...zi.registration,
-  ...Ki.registration,
+  ...Di.registration,
+  ...ji.registration,
+  ...Hi.registration,
+  ...Ni.registration,
+  ...Gi.registration,
   ...Ji.registration,
-  ...ts.registration,
-  ...Rt.registration,
-  ...ps.registration
+  ...It.registration,
+  ...ls.registration
 };
-var gs = Object.defineProperty, hs = Object.getOwnPropertyDescriptor, Or = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? hs(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && gs(t, r, o), o;
+var cs = Object.defineProperty, us = Object.getOwnPropertyDescriptor, Sr = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? us(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && cs(t, r, o), o;
 };
-const Mr = "trouble-action-model";
-let Se = class {
+const Cr = "trouble-action-model";
+let Ce = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -2441,7 +2440,7 @@ let Se = class {
     s(this, "disposer");
     s(this, "state");
     s(this, "troubleActionData");
-    this.id = e, this.logger = r.logger, this.state = Kr(), this.troubleActionData = t.definitions.reduce((i, o) => (i[o.troubleType] = o, i), {});
+    this.id = e, this.logger = r.logger, this.state = Gr(), this.troubleActionData = t.definitions.reduce((i, o) => (i[o.troubleType] = o, i), {});
   }
   // -------------------LIFECYCLE----------------------------
   get activeTrouble() {
@@ -2459,12 +2458,12 @@ let Se = class {
     return (e = this.activeTrouble) == null ? void 0 : e.type;
   }
   async init() {
-    this.logger.debug(`initializing trouble-action ${this.id}`), this.disposer = Yr(() => {
+    this.logger.debug(`initializing trouble-action ${this.id}`), this.disposer = Qr(() => {
       const e = this.troubleContainer.troubles.data.reduce((t, r) => {
         const i = r.type;
         if (this.troubleActionData[i]) {
-          const o = this.troubleActionData[i].stateKey ?? i, a = this.troubleActionData[i].stateValue ?? i;
-          t[o] = a;
+          const o = this.troubleActionData[i].stateKey ?? i, n = this.troubleActionData[i].stateValue ?? i;
+          t[o] = n;
         }
         return t;
       }, {});
@@ -2484,30 +2483,30 @@ let Se = class {
     this.logger.debug(`loading trouble-action ${this.id}`);
   }
 };
-Or([
-  f({ modelType: tt.type })
-], Se.prototype, "troubleContainer", 2);
-Se = Or([
-  l(Mr)
-], Se);
-const Xs = new de({
-  class: Se,
-  type: Mr
-}), { URL: Sr } = g("START_SERVICE"), { getOne: fs } = h.build({
-  basePath: `${Sr}/api/start`
-}), ms = p.createLogger({ name: "start-service", group: "Services" }), Cr = async () => (ms.debug("navigating to NCUI"), await fs({
-  urlOverride: `${Sr}/api/app/kosdev.ddk/ncui/open`
-})), Js = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+Sr([
+  m({ modelType: rt.type })
+], Ce.prototype, "troubleContainer", 2);
+Ce = Sr([
+  l(Cr)
+], Ce);
+const Ys = new pe({
+  class: Ce,
+  type: Cr
+}), { URL: wr } = h("START_SERVICE"), { getOne: ds } = f.build({
+  basePath: `${wr}/api/start`
+}), ps = g.createLogger({ name: "start-service", group: "Services" }), Er = async () => (ps.debug("navigating to NCUI"), await ds({
+  urlOverride: `${wr}/api/app/kosdev.ddk/ncui/open`
+})), qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  navigateToNCui: Cr
+  navigateToNCui: Er
 }, Symbol.toStringTag, { value: "Module" }));
-var ys = Object.defineProperty, bs = Object.getOwnPropertyDescriptor, wr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? bs(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && ys(t, r, o), o;
+var gs = Object.defineProperty, hs = Object.getOwnPropertyDescriptor, Lr = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? hs(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && gs(t, r, o), o;
 };
-const Er = "start-model";
-let Ce = class {
+const Dr = "start-model";
+let we = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -2527,7 +2526,7 @@ let Ce = class {
     ).length > 0;
   }
   async navigate() {
-    await Cr();
+    await Er();
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -2537,74 +2536,74 @@ let Ce = class {
     this.logger.debug(`loading start ${this.id}`);
   }
 };
-wr([
-  f({ modelType: tt.type })
-], Ce.prototype, "troubles", 2);
-Ce = wr([
-  l(Er)
-], Ce);
-const Zs = new de({
-  class: Ce,
-  type: Er
-}), { URL: fe } = g("SPM-PUMP_SERVICE"), { postModel: He } = h.build({
-  basePath: `${fe}/api/spm-pump`
-}), _ = p.createLogger({
+Lr([
+  m({ modelType: rt.type })
+], we.prototype, "troubles", 2);
+we = Lr([
+  l(Dr)
+], we);
+const Gs = new pe({
+  class: we,
+  type: Dr
+}), { URL: ye } = h("SPM-PUMP_SERVICE"), { postModel: ze } = f.build({
+  basePath: `${ye}/api/spm-pump`
+}), $ = g.createLogger({
   name: "spm-pump-service",
   group: "Services"
-}), Lr = async (e, t) => {
-  _.debug(
+}), kr = async (e, t) => {
+  $.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`
   );
   try {
-    const r = await He({
+    const r = await ze({
       model: {},
-      urlOverride: `${fe}/api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`,
+      urlOverride: `${ye}/api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`,
       tracker: t
     });
-    return _.debug("performPreCalibrate - response:", r), r != null && r.data && $.initiateFuture(r.data), r == null ? void 0 : r.data;
+    return $.debug("performPreCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
   } catch (r) {
-    _.error(
+    $.error(
       `performPreCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`,
       r
     );
     const i = {
       id: t || "",
-      endState: y.Fail,
+      endState: b.Fail,
       tracker: t,
       reason: "Failed to resolve trouble"
     };
-    return $.initiateFuture(i), i;
+    return T.initiateFuture(i), i;
   }
-}, Dr = async (e, t) => {
-  _.debug(
+}, Rr = async (e, t) => {
+  $.debug(
     `performCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/calibrate`
   );
   try {
-    const r = await He({
+    const r = await ze({
       model: {},
-      urlOverride: `${fe}/api/ext/freestyle/microCalibration/pour/${e}/calibrate`,
+      urlOverride: `${ye}/api/ext/freestyle/microCalibration/pour/${e}/calibrate`,
       tracker: t
     });
-    return _.debug("performCalibrate - response:", r), r != null && r.data && $.initiateFuture(r.data), r == null ? void 0 : r.data;
+    return $.debug("performCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
   } catch (r) {
-    _.error(
+    $.error(
       `performCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/calibrate`,
       r
     );
     const i = {
       id: t || "",
-      endState: y.Fail,
+      endState: b.Fail,
       tracker: t,
       reason: "Failed to resolve trouble"
     };
-    return $.initiateFuture(i), i;
+    return T.initiateFuture(i), i;
   }
-}, Rr = async (e, t, r, i) => {
-  _.debug(
+}, Ir = async (e, t, r, i) => {
+  $.debug(
     `performVerify - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/verify`
   );
   try {
-    const o = await He({
+    const o = await ze({
       model: {
         ...r,
         // commandedCalibrationVolume: 0,
@@ -2613,29 +2612,30 @@ const Zs = new de({
         // newCalibrationValue: 0,
         // pouredCalibrationVolume: 0,
       },
-      urlOverride: `${fe}/api/ext/freestyle/microCalibration/pour/${e}/verify`,
+      urlOverride: `${ye}/api/ext/freestyle/microCalibration/pour/${e}/verify`,
       tracker: i
     });
-    return _.debug("performVerify - response:", o), o != null && o.data && $.initiateFuture(o.data), o == null ? void 0 : o.data;
+    return $.debug("performVerify - response:", o), o != null && o.data && T.initiateFuture(o.data), o == null ? void 0 : o.data;
   } catch (o) {
-    _.error(
+    $.error(
       `performVerify - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/verify`,
       o
     );
-    const a = {
+    const n = {
       id: i || "",
-      endState: y.Fail,
+      endState: b.Fail,
       tracker: i,
       reason: "Failed to resolve trouble"
     };
-    return $.initiateFuture(a), a;
+    return T.initiateFuture(n), n;
   }
-}, Ir = async (e, t, r, i) => {
-  _.debug(
+}, Fr = async (e, t, r, i) => {
+  var o, n, a, O, D;
+  $.debug(
     `performComplete - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/complete`
   );
   try {
-    const o = await He({
+    const p = await ze({
       model: {
         ...i,
         // commandedCalibrationVolume: 0,
@@ -2644,36 +2644,39 @@ const Zs = new de({
         // newCalibrationValue: 0,
         // pouredCalibrationVolume: 0,
       },
-      urlOverride: `${fe}/api/ext/freestyle/microCalibration/pour/${e}/complete`
+      urlOverride: `${ye}/api/ext/freestyle/microCalibration/pour/${e}/complete`
     });
-    return _.debug("performComplete - response:", o), o == null ? void 0 : o.data;
-  } catch (o) {
-    _.error(
+    return $.debug("performComplete - response:", p), ((p == null ? void 0 : p.status) === 200 || (p == null ? void 0 : p.status) === 499) && ((o = p.data) != null && o.error) ? [p.data.error || "unknownError", p.data] : [void 0, p == null ? void 0 : p.data];
+  } catch (p) {
+    if ($.error(
       `performComplete - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/complete`,
-      o
-    );
-    return;
+      p
+    ), p instanceof Re) {
+      const ut = ((a = (n = p.payload) == null ? void 0 : n.data) == null ? void 0 : a.error) || ((O = p.payload) == null ? void 0 : O.error) || "unknownError";
+      return [ut, ((D = p.payload) == null ? void 0 : D.data) || { error: ut }];
+    }
   }
-}, en = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  return ["unknownError", { error: "unknownError" }];
+}, Qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  performCalibrate: Dr,
-  performComplete: Ir,
-  performPreCalibrate: Lr,
-  performVerify: Rr
+  performCalibrate: Rr,
+  performComplete: Fr,
+  performPreCalibrate: kr,
+  performVerify: Ir
 }, Symbol.toStringTag, { value: "Module" }));
-var vs = Object.defineProperty, _s = Object.getOwnPropertyDescriptor, We = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? _s(t, r) : t, a = e.length - 1, n; a >= 0; a--)
-    (n = e[a]) && (o = (i ? n(t, r, o) : n(o)) || o);
-  return i && o && vs(t, r, o), o;
+var fs = Object.defineProperty, ms = Object.getOwnPropertyDescriptor, Ne = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? ms(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && fs(t, r, o), o;
 };
-const kr = "spm-pump-model";
-let x = class {
+const xr = "spm-pump-model";
+let j = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
     s(this, "pump");
     s(this, "futureHandler");
-    this.id = e, this.logger = r.logger, this.pump = t.companionParent, this.futureHandler = new A(this);
+    this.id = e, this.logger = r.logger, this.pump = t.companionParent, this.futureHandler = new ge(this);
   }
   get name() {
     return this.pump.name;
@@ -2694,16 +2697,16 @@ let x = class {
     return this.futureHandler.future;
   }
   async performPreCalibrate(e) {
-    return Lr(this.pump.path, e);
+    return kr(this.pump.path, e);
   }
   async performCalibrate(e) {
-    return Dr(this.pump.path, e);
+    return Rr(this.pump.path, e);
   }
   async performVerify(e, t, r) {
-    return Rr(this.pump.path, e, t, r);
+    return Ir(this.pump.path, e, t, r);
   }
   async performComplete(e, t, r) {
-    return Ir(this.pump.path, e, t, r);
+    return Fr(this.pump.path, e, t, r);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -2713,81 +2716,81 @@ let x = class {
     this.logger.debug(`loading spm-pump ${this.id}`);
   }
 };
-We([
-  b()
-], x.prototype, "performPreCalibrate", 1);
-We([
-  b()
-], x.prototype, "performCalibrate", 1);
-We([
-  b()
-], x.prototype, "performVerify", 1);
-x = We([
-  l(kr)
-], x);
-const tn = new Ee({
-  class: x,
-  type: kr
+Ne([
+  v()
+], j.prototype, "performPreCalibrate", 1);
+Ne([
+  v()
+], j.prototype, "performCalibrate", 1);
+Ne([
+  v()
+], j.prototype, "performVerify", 1);
+j = Ne([
+  l(xr)
+], j);
+const Xs = new Le({
+  class: j,
+  type: xr
 });
 export {
-  Cs as AgitationControl,
-  Oo as Animation,
-  ws as AnimationServices,
-  st as Application,
-  ot as Auth,
-  Ms as AuthServices,
-  ko as CarbWater,
-  Ds as CopyLogs,
-  Ls as CopyLogsServices,
-  Qs as DDKModels,
+  Ps as AgitationControl,
+  So as Animation,
+  Os as AnimationServices,
+  at as Application,
+  it as Auth,
+  $s as AuthServices,
+  xo as CarbWater,
+  Cs as CopyLogs,
+  Ss as CopyLogsServices,
+  Ks as DDKModels,
   nt as DashboardOperations,
-  Rs as DashboardOperationsServices,
-  Bo as Dispenser,
-  Jo as DispenserInfo,
-  ks as DispenserInfoServices,
-  Is as DispenserServices,
-  io as Door,
-  ce as EXTENSION_POINT_DASHBOARD_KEY_FACTORY,
-  ni as Enrollment,
-  Fs as EnrollmentServices,
-  Nt as FcmPump,
-  Es as FcmPumpServices,
+  ws as DashboardOperationsServices,
+  Ko as Dispenser,
+  Zo as DispenserInfo,
+  Ls as DispenserInfoServices,
+  Es as DispenserServices,
+  no as Door,
+  ue as EXTENSION_POINT_DASHBOARD_KEY_FACTORY,
+  ai as Enrollment,
+  Ds as EnrollmentServices,
+  Kt as FcmPump,
+  Ms as FcmPumpServices,
   mi as IngredientSummary,
-  Ws as LfcvPump,
-  zs as LfcvPumpServices,
-  Bs as Lockout,
-  Ns as LockoutServices,
-  Us as MACRO_KEYS,
-  Ri as MacroAssignment,
-  cr as NetworkTest,
-  Vi as NetworkTestContainer,
-  Ks as NetworkTestServices,
-  zi as NutritiveSweetener,
-  Ki as PlainWater,
-  Ji as Reboot,
-  Ys as RebootServices,
-  ts as Settings,
-  qs as SettingsServices,
-  Dt as SetupStep,
-  Rt as SetupStepContainer,
-  Ss as SetupStepServices,
-  tn as SpmPump,
-  en as SpmPumpServices,
-  Zs as Start,
-  Js as StartServices,
-  Qr as TROUBLE_TYPE_PRIME,
-  dt as TROUBLE_TYPE_PURGE,
-  Xs as TroubleActionManager,
-  _r as Utilities,
-  ps as UtilitiesContainer,
-  Gs as UtilitiesServices,
+  js as LfcvPump,
+  Us as LfcvPumpServices,
+  Hs as Lockout,
+  Vs as LockoutServices,
+  Fs as MACRO_KEYS,
+  Di as MacroAssignment,
+  dr as NetworkTest,
+  ji as NetworkTestContainer,
+  Ws as NetworkTestServices,
+  Hi as NutritiveSweetener,
+  Ni as PlainWater,
+  Gi as Reboot,
+  zs as RebootServices,
+  Ji as Settings,
+  Ns as SettingsServices,
+  Rt as SetupStep,
+  It as SetupStepContainer,
+  Ts as SetupStepServices,
+  Xs as SpmPump,
+  Qs as SpmPumpServices,
+  Gs as Start,
+  qs as StartServices,
+  Zr as TROUBLE_TYPE_PRIME,
+  gt as TROUBLE_TYPE_PURGE,
+  Ys as TroubleActionManager,
+  Tr as Utilities,
+  ls as UtilitiesContainer,
+  Bs as UtilitiesServices,
   gi as calculateTimeDifference,
   pi as executeDashboardKeyFactory,
-  As as isMacroGroup,
-  xs as isMicroGroup,
-  js as macroHolderMap,
+  Rs as isMacroGroup,
+  ks as isMicroGroup,
+  Is as macroHolderMap,
   di as registerDashboardKeyFactory,
-  Hs as toSeconds,
-  Vs as toTimeComponents,
-  xt as troubleVisibilityFilter
+  As as toSeconds,
+  xs as toTimeComponents,
+  jt as troubleVisibilityFilter
 };