@kosdev-code/kos-ddk-models 2.0.1 → 2.0.3

package/index.mjs

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