@kosdev-code/kos-freestyle-sdk 0.1.0-dev.5163 → 0.1.0-dev.5167

package/{service-C0WOCTr1.js → service-Rmefh9Kc.js}

@@ -1,31 +1,31 @@
-var mt = Object.defineProperty;
-var yt = (e, t, r) => t in e ? mt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var i = (e, t, r) => (yt(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { resolveServiceUrl as A, ServiceFactory as w, KosLog as $, createPropKey as x, kosStateProp as O, kosConfigProperty as b, kosStateEntry as me, kosStateExit as bt, kosStateGuard as ye, kosFuture as _, kosModel as f, kosLoggerAware as ee, kosCompanion as De, kosFutureAware as Le, kosStateMachine as Pt, DependencyLifecycle as Fe, KosModelContainer as vt, kosChild as Ne, kosModelEffect as be, EventBus as Y, KosModelRegistrationFactory as C, SingletonKosModelRegistrationFactory as Pe, FetchError as ve, FutureManager as y, FutureEndState as U, FutureHandler as ze, kosParentAware as xe, KosFeatureFlags as ne, getKosCompanionModel as Tt, getKosModelSync as R, kosContainerAware as It, KosContextManager as _t, kosAction as K, KOS_MODEL_ID as E, kosMultipleFutureAware as $t, kosTopicHandler as Ct, modelTypeEventTopicFactory as Et, RegistrationManager as m, registerCoreModels as Ot, Trouble as St, ExtensionManager as le, EXTENSION_TROUBLE_DATA_MAPPER as ue, createClient as Ue, kosServiceRequest as Ge } from "@kosdev-code/kos-ui-sdk";
-import { PourState as d, Assembly as je, KosModelRegistry as At, registerDispenseModels as wt, Nozzle as Mt, Pump as Rt, Holder as Dt, PumpContainer as Lt, PumpIndex as Ft } from "@kosdev-code/kos-dispense-sdk";
-const { URL: qe } = A("ICE_AGITATOR_SERVICE"), { postModel: Nt } = w.build({
-  basePath: `${qe}/api/ext/freestyle/ice`
+var Pt = Object.defineProperty;
+var vt = (e, t, r) => t in e ? Pt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
+var i = (e, t, r) => (vt(e, typeof t != "symbol" ? t + "" : t, r), r);
+import { resolveServiceUrl as A, ServiceFactory as w, KosLog as $, createPropKey as x, kosStateProp as E, kosConfigProperty as b, kosStateEntry as be, kosStateExit as Tt, kosStateGuard as Pe, kosFuture as I, kosModel as f, kosLoggerAware as re, kosCompanion as xe, kosFutureAware as Ue, kosStateMachine as _t, DependencyLifecycle as je, KosModelContainer as It, kosChild as qe, kosModelEffect as ve, EventBus as Z, KosModelRegistrationFactory as C, SingletonKosModelRegistrationFactory as Te, FetchError as _e, FutureManager as y, FutureEndState as U, FutureHandler as Ge, kosParentAware as Ve, KosFeatureFlags as ue, getKosCompanionModel as $t, getKosModelSync as R, kosContainerAware as Ct, KosContextManager as Ot, kosAction as W, KOS_MODEL_ID as O, kosMultipleFutureAware as Et, kosTopicHandler as St, modelTypeEventTopicFactory as At, RegistrationManager as m, registerCoreModels as wt, Trouble as Mt, ExtensionManager as ce, EXTENSION_TROUBLE_DATA_MAPPER as de, createClient as V, kosServiceRequest as H } from "@kosdev-code/kos-ui-sdk";
+import { PourState as d, Assembly as He, KosModelRegistry as Rt, registerDispenseModels as Dt, Nozzle as Lt, Pump as Ft, Holder as zt, PumpContainer as Nt, PumpIndex as xt } from "@kosdev-code/kos-dispense-sdk";
+const { URL: Be } = A("ICE_AGITATOR_SERVICE"), { postModel: Ut } = w.build({
+  basePath: `${Be}/api/ext/freestyle/ice`
 });
 $.createLogger({
   name: "carb-tank-service",
   group: "Services"
 });
-const zt = async (e, t) => {
-  const r = await Nt({
+const jt = async (e, t) => {
+  const r = await Ut({
     model: {},
     tracker: t,
-    urlOverride: `${qe}/api/handle/${e}/test`
+    urlOverride: `${Be}/api/handle/${e}/test`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
 };
-var Ve = Object.defineProperty, xt = Object.getOwnPropertyDescriptor, Ut = (e, t, r) => t in e ? Ve(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, P = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? xt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var Ke = Object.defineProperty, qt = Object.getOwnPropertyDescriptor, Gt = (e, t, r) => t in e ? Ke(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, P = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? qt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && Ve(t, r, a), a;
-}, Gt = (e, t, r) => (Ut(e, t + "", r), r);
-const jt = "carb-agitator-model", Te = x("statePath");
+  return o && a && Ke(t, r, a), a;
+}, Vt = (e, t, r) => (Gt(e, t + "", r), r);
+const Ht = "carb-agitator-model", Ie = x("statePath");
 let g = class {
   constructor(e, t, r) {
     i(this, "id");
@@ -97,25 +97,25 @@ let g = class {
   handleTestCarbTank(e) {
     if (!e)
       throw new Error("No tracker provided");
-    return this.logger.info(`testing carb tank:  ${this.id}`), zt(this.path, e);
+    return this.logger.info(`testing carb tank:  ${this.id}`), jt(this.path, e);
   }
 };
-Gt(g, "Registration");
+Vt(g, "Registration");
 P([
-  O({
-    path: Te,
+  E({
+    path: Ie,
     attribute: "highProbeWet"
   })
 ], g.prototype, "highProbeWet", 2);
 P([
-  O({
-    path: Te,
+  E({
+    path: Ie,
     attribute: "lowProbeWet"
   })
 ], g.prototype, "lowProbeWet", 2);
 P([
-  O({
-    path: Te,
+  E({
+    path: Ie,
     attribute: "filling"
   })
 ], g.prototype, "filling", 2);
@@ -126,43 +126,43 @@ P([
   })
 ], g.prototype, "enabled", 2);
 P([
-  me(
+  be(
     "ACTIVATING"
     /* ACTIVATING */
   )
 ], g.prototype, "handleActivationStart", 1);
 P([
-  bt(
+  Tt(
     "ACTIVATING"
     /* ACTIVATING */
   )
 ], g.prototype, "handleActivationComplete", 1);
 P([
-  me(
+  be(
     "INITIALIZED"
     /* INITIALIZED */
   )
 ], g.prototype, "handleInitialized", 1);
 P([
-  me(
+  be(
     "SKIPPED"
     /* SKIPPED */
   )
 ], g.prototype, "handleSkipped", 1);
 P([
-  ye({ allowedStates: [
+  Pe({ allowedStates: [
     "UNINITIALIZED"
     /* UNINITIALIZED */
   ] })
 ], g.prototype, "activateCarbTank", 1);
 P([
-  ye({ allowedStates: [
+  Pe({ allowedStates: [
     "UNINITIALIZED"
     /* UNINITIALIZED */
   ] })
 ], g.prototype, "skip", 1);
 P([
-  ye({
+  Pe({
     allowedStates: [
       "INITIALIZED",
       "SKIPPED"
@@ -171,14 +171,14 @@ P([
   })
 ], g.prototype, "reset", 1);
 P([
-  _()
+  I()
 ], g.prototype, "handleTestCarbTank", 1);
 g = P([
-  f({ modelTypeId: jt, singleton: !1 }),
-  ee(),
-  De({ mode: "composition", lifecycle: Fe.LOAD }),
-  Le(),
-  Pt(
+  f({ modelTypeId: Ht, singleton: !1 }),
+  re(),
+  xe({ mode: "composition", lifecycle: je.LOAD }),
+  Ue(),
+  _t(
     {
       initial: "UNINITIALIZED",
       states: {
@@ -215,19 +215,19 @@ g = P([
     }
   )
 ], g);
-const Be = g.Registration;
-var qt = Object.defineProperty, Vt = Object.getOwnPropertyDescriptor, He = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? Vt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+const Ye = g.Registration;
+var Bt = Object.defineProperty, Kt = Object.getOwnPropertyDescriptor, We = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? Kt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && qt(t, r, a), a;
+  return o && a && Bt(t, r, a), a;
 };
-const Ke = "cartridge-agitator-container-model";
-let W = class {
+const Ze = "cartridge-agitator-container-model";
+let k = class {
   constructor(e, t, r) {
     i(this, "id");
     i(this, "logger");
     i(this, "_models");
-    this.id = e, this.logger = r.logger, this._models = new vt({
+    this.id = e, this.logger = r.logger, this._models = new It({
       parentId: e
     });
   }
@@ -258,34 +258,34 @@ let W = class {
     );
   }
 };
-He([
-  Ne
-], W.prototype, "_models", 2);
-W = He([
-  f(Ke)
-], W);
-const { URL: Ye } = A("CARTRIDGE_AGITATOR_SERVICE"), { postModel: Bt } = w.build({
-  basePath: `${Ye}/api/ext/freestyle/freestyle/ice`
-}), Ht = async (e, t) => {
-  const r = await Bt({
+We([
+  qe
+], k.prototype, "_models", 2);
+k = We([
+  f(Ze)
+], k);
+const { URL: ke } = A("CARTRIDGE_AGITATOR_SERVICE"), { postModel: Yt } = w.build({
+  basePath: `${ke}/api/ext/freestyle/freestyle/ice`
+}), Wt = async (e, t) => {
+  const r = await Yt({
     model: {},
     tracker: t,
-    urlOverride: `${Ye}/api/handle/${e}/test`
+    urlOverride: `${ke}/api/handle/${e}/test`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r.data;
 };
-var Kt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, te = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? Yt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var Zt = Object.defineProperty, kt = Object.getOwnPropertyDescriptor, ae = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? kt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && Kt(t, r, a), a;
+  return o && a && Zt(t, r, a), a;
 };
-const We = "cartridge-agitator-model";
-class Z {
+const Je = "cartridge-agitator-model";
+class J {
 }
-i(Z, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/agitation-started"), i(Z, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/agitation-ended");
-const Wt = x("statePath");
+i(J, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/agitation-started"), i(J, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/agitation-ended");
+const Jt = x("statePath");
 let F = class {
   constructor(e, t) {
     i(this, "id");
@@ -301,48 +301,48 @@ let F = class {
   async testAgitate(e) {
     if (!e)
       throw new Error("No tracker provided");
-    return this.logger.info(`agitating cartridge-agitator ${this.id}`), Ht(this.path, e);
+    return this.logger.info(`agitating cartridge-agitator ${this.id}`), Wt(this.path, e);
   }
   handleAgitation() {
     var e;
-    this.isAgitating ? (this.logger.info(`agitating cartridge-agitator ${this.id}`), Y.publish(Z.TOPIC_AGITATION_STARTED, {
+    this.isAgitating ? (this.logger.info(`agitating cartridge-agitator ${this.id}`), Z.publish(J.TOPIC_AGITATION_STARTED, {
       path: this.path,
       futureId: (e = this.future) == null ? void 0 : e.futureId
-    })) : Y.publish(Z.TOPIC_AGITATION_ENDED, {
+    })) : Z.publish(J.TOPIC_AGITATION_ENDED, {
       path: this.path
     });
   }
 };
-te([
-  O({ path: Wt, attribute: "agitating" })
+ae([
+  E({ path: Jt, attribute: "agitating" })
 ], F.prototype, "agitating", 2);
-te([
-  _()
+ae([
+  I()
 ], F.prototype, "testAgitate", 1);
-te([
-  be({
+ae([
+  ve({
     dependencies: (e) => [e.isAgitating]
   })
 ], F.prototype, "handleAgitation", 1);
-F = te([
-  f(We),
-  Le(),
-  ee()
+F = ae([
+  f(Je),
+  Ue(),
+  re()
 ], F);
-const Ze = new C({
+const Qe = new C({
   class: F,
-  type: We
-}), Ie = new Pe({
-  class: W,
-  type: Ke
+  type: Je
+}), $e = new Te({
+  class: k,
+  type: Ze
 });
-Ie.addRelatedModel(Ze);
-var ke = Object.defineProperty, Zt = Object.getOwnPropertyDescriptor, kt = (e, t, r) => t in e ? ke(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, re = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? Zt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+$e.addRelatedModel(Qe);
+var Xe = Object.defineProperty, Qt = Object.getOwnPropertyDescriptor, Xt = (e, t, r) => t in e ? Xe(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, oe = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? Qt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && ke(t, r, a), a;
-}, Qt = (e, t, r) => (kt(e, t + "", r), r);
-const Xt = "cgp-pump-model", _e = x("statePath");
+  return o && a && Xe(t, r, a), a;
+}, er = (e, t, r) => (Xt(e, t + "", r), r);
+const tr = "cgp-pump-model", Ce = x("statePath");
 let D = class {
   constructor(e, t) {
     i(this, "highProbeWet");
@@ -357,66 +357,66 @@ let D = class {
     return this.state.path;
   }
 };
-Qt(D, "Registration");
-re([
-  O({
-    path: _e,
+er(D, "Registration");
+oe([
+  E({
+    path: Ce,
     attribute: "highProbeWet"
   })
 ], D.prototype, "highProbeWet", 2);
-re([
-  O({
-    path: _e,
+oe([
+  E({
+    path: Ce,
     attribute: "lowProbeWet"
   })
 ], D.prototype, "lowProbeWet", 2);
-re([
-  O({
-    path: _e,
+oe([
+  E({
+    path: Ce,
     attribute: "filling"
   })
 ], D.prototype, "filling", 2);
-D = re([
-  f({ modelTypeId: Xt, singleton: !1 }),
-  De({
+D = oe([
+  f({ modelTypeId: tr, singleton: !1 }),
+  xe({
     mode: "composition"
   }),
-  ee()
+  re()
 ], D);
-const Jt = D.Registration, { URL: G } = A("FCM-PUMP_SERVICE"), { postModel: V } = w.build({
-  basePath: `${G}/api/fcm-pump`
+const rr = D.Registration, { URL: j } = A("FCM-PUMP_SERVICE"), { postModel: B } = w.build({
+  basePath: `${j}/api/fcm-pump`
 }), h = $.createLogger({
   name: "fcm-pump-service",
   group: "Services"
-}), er = async (e) => {
+}), ar = async (e) => {
   var t, r, o, a, n;
   h.debug(
     `performElectricalTest - sending POST request to /api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
   );
   try {
-    const s = await V({
+    const s = await B({
       model: {},
-      urlOverride: `${G}/api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
+      urlOverride: `${j}/api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
     });
     return h.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 (h.error(
       `performElectricalTest - sending POST request to /api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`,
       s
-    ), s instanceof ve) {
+    ), s instanceof _e) {
       const u = ((o = (r = s.payload) == null ? void 0 : r.data) == null ? void 0 : o.error) || ((a = s.payload) == null ? void 0 : a.error) || "unknownError";
       return [u, ((n = s.payload) == null ? void 0 : n.data) || { error: u }];
     }
   }
   return ["unknownError", { error: "unknownError" }];
-}, tr = async (e, t) => {
+}, or = async (e, t) => {
   h.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/preCalibrate`
   );
   try {
-    const r = await V({
+    const r = await B({
       model: {},
-      urlOverride: `${G}/api/ext/freestyle/fcm/calibration/${e}/preCalibrate`,
+      urlOverride: `${j}/api/ext/freestyle/fcm/calibration/${e}/preCalibrate`,
       tracker: t
     });
     return h.debug("performPreCalibrate - response:", r), r != null && r.data && y.initiateFuture(r.data), r == null ? void 0 : r.data;
@@ -433,14 +433,14 @@ const Jt = D.Registration, { URL: G } = A("FCM-PUMP_SERVICE"), { postModel: V }
     };
     return y.initiateFuture(o), o;
   }
-}, rr = async (e, t) => {
+}, ir = async (e, t) => {
   h.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/calibrate`
   );
   try {
-    const r = await V({
+    const r = await B({
       model: {},
-      urlOverride: `${G}/api/ext/freestyle/fcm/calibration/${e}/calibrate`,
+      urlOverride: `${j}/api/ext/freestyle/fcm/calibration/${e}/calibrate`,
       tracker: t
     });
     return h.debug("performPreCalibrate - response:", r), r != null && r.data && y.initiateFuture(r.data), r == null ? void 0 : r.data;
@@ -457,14 +457,14 @@ const Jt = D.Registration, { URL: G } = A("FCM-PUMP_SERVICE"), { postModel: V }
     };
     return y.initiateFuture(o), o;
   }
-}, ar = async (e, t, r) => {
+}, sr = async (e, t, r) => {
   h.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/verify/${t}`
   );
   try {
-    const o = await V({
+    const o = await B({
       model: {},
-      urlOverride: `${G}/api/ext/freestyle/fcm/calibration/${e}/verify/${t}`,
+      urlOverride: `${j}/api/ext/freestyle/fcm/calibration/${e}/verify/${t}`,
       tracker: r
     });
     return h.debug("performVerify - response:", o), o != null && o.data && y.initiateFuture(o.data), o == null ? void 0 : o.data;
@@ -481,16 +481,16 @@ const Jt = D.Registration, { URL: G } = A("FCM-PUMP_SERVICE"), { postModel: V }
     };
     return y.initiateFuture(a), a;
   }
-}, or = (e) => e ? e.data === "success" || !e.data ? "success" : e.data : "error", ir = async (e, t, r) => {
+}, nr = (e) => e ? e.data === "success" || !e.data ? "success" : e.data : "error", lr = async (e, t, r) => {
   h.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
   );
   try {
-    const o = await V({
+    const o = await B({
       model: {},
-      urlOverride: `${G}/api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
+      urlOverride: `${j}/api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
     });
-    return h.debug("performPreCalibrate - response:", o), or(o == null ? void 0 : o.data);
+    return h.debug("performPreCalibrate - response:", o), nr(o == null ? void 0 : o.data);
   } catch (o) {
     h.error(
       `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`,
@@ -499,19 +499,19 @@ const Jt = D.Registration, { URL: G } = A("FCM-PUMP_SERVICE"), { postModel: V }
     return;
   }
 };
-var sr = Object.defineProperty, nr = Object.getOwnPropertyDescriptor, ae = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? nr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var ur = Object.defineProperty, cr = Object.getOwnPropertyDescriptor, ie = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? cr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && sr(t, r, a), a;
+  return o && a && ur(t, r, a), a;
 };
-const Qe = "fcm-pump-model", lr = $.createLogger({ name: "fcm-pump-model" });
-let N = class {
+const et = "fcm-pump-model", dr = $.createLogger({ name: "fcm-pump-model" });
+let z = 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 ze(this);
+    this.id = e, this.logger = r.logger, this.pumpModel = t.companionParent, this.futureHandler = new Ge(this);
   }
   get future() {
     return this.futureHandler.future;
@@ -532,23 +532,23 @@ let N = class {
     return this.pumpModel.performIntent(e);
   }
   async performElectricalTest() {
-    const [e, t] = await er(this.pumpModel.path);
-    return e && lr.error(`Failed to perform electrical test on pump ${this.id}`, e), t;
+    const [e, t] = await ar(this.pumpModel.path);
+    return e && dr.error(`Failed to perform electrical test on pump ${this.id}`, e), t;
   }
   getChildren() {
     return [...this.futureHandler.allFutures];
   }
   async performPreCalibrate(e) {
-    return tr(this.pumpModel.path, e);
+    return or(this.pumpModel.path, e);
   }
   async performCalibrate(e) {
-    return rr(this.pumpModel.path, e);
+    return ir(this.pumpModel.path, e);
   }
   async performVerify(e, t) {
-    return ar(this.pumpModel.path, e, t);
+    return sr(this.pumpModel.path, e, t);
   }
   async performComplete(e, t) {
-    return ir(this.pumpModel.path, e, t);
+    return lr(this.pumpModel.path, e, t);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -558,29 +558,29 @@ let N = class {
     this.logger.debug(`loading fcm-pump ${this.id}`);
   }
 };
-ae([
-  _()
-], N.prototype, "performPreCalibrate", 1);
-ae([
-  _()
-], N.prototype, "performCalibrate", 1);
-ae([
-  _()
-], N.prototype, "performVerify", 1);
-N = ae([
-  f(Qe)
-], N);
-const ur = new C({
-  class: N,
-  type: Qe
+ie([
+  I()
+], z.prototype, "performPreCalibrate", 1);
+ie([
+  I()
+], z.prototype, "performCalibrate", 1);
+ie([
+  I()
+], z.prototype, "performVerify", 1);
+z = ie([
+  f(et)
+], z);
+const pr = new C({
+  class: z,
+  type: et
 });
-var cr = Object.defineProperty, dr = Object.getOwnPropertyDescriptor, Xe = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? dr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var gr = Object.defineProperty, hr = Object.getOwnPropertyDescriptor, tt = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? hr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && cr(t, r, a), a;
+  return o && a && gr(t, r, a), a;
 };
-const Je = "freestyle-assembly-model", pr = "iceAgitator", gr = "carbTank", hr = "remoteTrays";
-let k = class {
+const rt = "freestyle-assembly-model", fr = "iceAgitator", mr = "carbTank", yr = "remoteTrays";
+let Q = class {
   constructor(e, t, r) {
     i(this, "id");
     i(this, "_carbTankModel");
@@ -642,45 +642,45 @@ let k = class {
   }
   // -------------------LIFECYCLE----------------------------
   get supportsRemoteTrays() {
-    return ne.isFeatureEnabled(hr);
+    return ue.isFeatureEnabled(yr);
   }
   get supportsIce() {
-    return ne.isFeatureEnabled(pr);
+    return ue.isFeatureEnabled(fr);
   }
   get supportsCarb() {
-    return ne.isFeatureEnabled(gr);
+    return ue.isFeatureEnabled(mr);
   }
   async init() {
     this.logger.debug(`initializing freestyle-assembly ${this.id}`);
   }
   async ready() {
-    const e = Tt(
+    const e = $t(
       this.assembly,
-      Be.type
+      Ye.type
     );
     this._carbTankModel = e;
   }
 };
-Xe([
-  Ne
-], k.prototype, "_remoteTrays", 2);
-k = Xe([
-  xe(),
-  f(Je)
-], k);
-const de = new Pe({
-  class: k,
-  type: Je
+tt([
+  qe
+], Q.prototype, "_remoteTrays", 2);
+Q = tt([
+  Ve(),
+  f(rt)
+], Q);
+const ge = new Te({
+  class: Q,
+  type: rt
 });
-var fr = Object.defineProperty, mr = Object.getOwnPropertyDescriptor, et = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? mr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var br = Object.defineProperty, Pr = Object.getOwnPropertyDescriptor, at = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? Pr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && fr(t, r, a), a;
+  return o && a && br(t, r, a), a;
 };
-const tt = "remote-tray-model";
+const ot = "remote-tray-model";
 x("holderPath");
-const yr = x("configPath");
-let Q = class {
+const vr = x("configPath");
+let X = class {
   constructor(e, t, r) {
     /** Unique identifier for the remote tray instance */
     i(this, "id");
@@ -770,50 +770,50 @@ let Q = class {
     this.logger.debug(`loading remote-tray ${this.id}`);
   }
 };
-et([
+at([
   b({
-    path: yr,
+    path: vr,
     attribute: "enabled"
   })
-], Q.prototype, "remoteTrayEnabled", 2);
-Q = et([
-  f(tt)
-], Q);
-const j = new C({
-  class: Q,
-  type: tt
+], X.prototype, "remoteTrayEnabled", 2);
+X = at([
+  f(ot)
+], X);
+const q = new C({
+  class: X,
+  type: ot
 });
-var br = Object.getOwnPropertyDescriptor, Pr = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? br(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var Tr = Object.getOwnPropertyDescriptor, _r = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? Tr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = s(a) || a);
   return a;
 };
-const rt = "remote-tray-container-model";
-let pe = class {
+const it = "remote-tray-container-model";
+let he = class {
   constructor(e) {
     i(this, "id");
     this.id = e;
   }
 };
-pe = Pr([
-  f(rt),
-  ee(),
-  It()
-], pe);
-const $e = new Pe({
-  class: pe,
-  type: rt
+he = _r([
+  f(it),
+  re(),
+  Ct()
+], he);
+const Oe = new Te({
+  class: he,
+  type: it
 });
-$e.addRelatedModel(j);
-var vr = Object.getOwnPropertyDescriptor, Tr = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? vr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+Oe.addRelatedModel(q);
+var Ir = Object.getOwnPropertyDescriptor, $r = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? Ir(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = s(a) || a);
   return a;
 };
-const at = "freestyle-holder-model";
-function Ir(e) {
-  const t = _t.getContext(e), r = t == null ? void 0 : t.get(
-    de.type
+const st = "freestyle-holder-model";
+function Cr(e) {
+  const t = Ot.getContext(e), r = t == null ? void 0 : t.get(
+    ge.type
   );
   if (!r) {
     $.error("Freestyle assembly not found");
@@ -821,14 +821,14 @@ function Ir(e) {
   }
   return r;
 }
-async function _r(e, t) {
+async function Or(e, t) {
   if (!e || !t)
     return;
   const r = await e[t]();
   if (r != null && r.tracker)
     return y.getFuture(r.tracker);
 }
-let ge = class {
+let fe = class {
   constructor(e, t, r) {
     i(this, "id");
     i(this, "logger");
@@ -844,20 +844,20 @@ let ge = class {
     if (!this.holder.data.agitated)
       return;
     this.future = void 0;
-    const e = Ir(this.id);
+    const e = Cr(this.id);
     if (!e)
       return;
     if (!e.defaultCartridgeAgitator) {
       this.logger.error("Agitator not found");
       return;
     }
-    return this.future = await _r(
+    return this.future = await Or(
       e.defaultCartridgeAgitator,
       "testAgitate"
     ), this.future;
   }
   get isRemote() {
-    const e = `${j.type}-${this.holder.path}`, t = R(e);
+    const e = `${q.type}-${this.holder.path}`, t = R(e);
     return t != null && t.model ? !!t.model.remoteTrayEnabled.value : !1;
   }
   // -------------------LIFECYCLE----------------------------
@@ -868,51 +868,51 @@ let ge = class {
     this.logger.debug(`loading freestyle-holder ${this.id}`);
   }
 };
-ge = Tr([
-  f(at)
-], ge);
-const Oe = new C({
-  class: ge,
-  type: at
-}), { URL: $r } = A("FREESTYLE-NOZZLE_SERVICE"), { getOne: Cr } = w.build({
-  basePath: `${$r}/api/freestyle-nozzle`
-}), H = $.createLogger({
+fe = $r([
+  f(st)
+], fe);
+const Ae = new C({
+  class: fe,
+  type: st
+}), { URL: Er } = A("FREESTYLE-NOZZLE_SERVICE"), { getOne: Sr } = w.build({
+  basePath: `${Er}/api/freestyle-nozzle`
+}), Y = $.createLogger({
   name: "freestyle-nozzle-service",
   group: "Services"
 });
-class Er extends Error {
+class Ar extends Error {
   constructor(t) {
     super(t), this.name = "NutritionInfoError";
   }
 }
-class Se extends Error {
+class we extends Error {
   constructor(t) {
     super(t), this.name = "InvalidRequestError";
   }
 }
-const Or = async (e, t, r, o = "http://localhost:8081") => {
-  if (H.debug("sending GET for freestyle-nozzle"), !t)
-    throw H.error("Invalid freestyle-nozzle request: beverageId is required"), new Se("No beverageId provided");
+const wr = async (e, t, r, o = "http://localhost:8081") => {
+  if (Y.debug("sending GET for freestyle-nozzle"), !t)
+    throw Y.error("Invalid freestyle-nozzle request: beverageId is required"), new we("No beverageId provided");
   if (!r || r.length === 0)
-    throw H.error("Invalid freestyle-nozzle request: volumes are required"), new Se("No volumes provided");
-  const a = await Cr({
+    throw Y.error("Invalid freestyle-nozzle request: volumes are required"), new we("No volumes provided");
+  const a = await Sr({
     urlOverride: `${o}${e}/pipeline/beverage/engine/nutrition/${t}?volumes=${r.join(
       ","
     )}`
   });
   if (!(a != null && a.data))
-    throw H.error("Failed to retrieve freestyle-nozzle data"), new Error("Failed to retrieve freestyle-nozzle data");
+    throw Y.error("Failed to retrieve freestyle-nozzle data"), new Error("Failed to retrieve freestyle-nozzle data");
   if (a.data.error)
-    throw new Er(a.data.error);
+    throw new Ar(a.data.error);
   return a.data;
 };
-var Sr = Object.defineProperty, Ar = Object.getOwnPropertyDescriptor, ot = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? Ar(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var Mr = Object.defineProperty, Rr = Object.getOwnPropertyDescriptor, nt = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? Rr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && Sr(t, r, a), a;
+  return o && a && Mr(t, r, a), a;
 };
-const it = "freestyle-nozzle-model";
-let X = class {
+const lt = "freestyle-nozzle-model";
+let ee = class {
   constructor(e, t, r) {
     i(this, "id");
     i(this, "logger");
@@ -937,12 +937,12 @@ let X = class {
       );
       const e = this.nozzleModel.selectedPourable.beverage.rawId, t = this.nozzleModel.urlPrefix;
       try {
-        const r = await Or(
+        const r = await wr(
           t,
           e,
           this._cupSizes
         );
-        K(() => {
+        W(() => {
           this._nutritionInfo = r;
         });
       } catch (r) {
@@ -961,54 +961,54 @@ let X = class {
     this.logger.debug(`loading freestyle-nozzle ${this.id}`);
   }
 };
-ot([
-  be({
+nt([
+  ve({
     dependencies: (e) => [
       e.selectedPourable.beverage
     ]
   })
-], X.prototype, "handleBeverageSelection", 1);
-X = ot([
-  xe(),
-  f(it)
-], X);
-const Ae = new C({
-  class: X,
-  type: it
-}), { URL: st } = A("PUMP_SERVICE"), { postModel: wr } = w.build({
-  basePath: `${st}/api/ext/freestyle/microCalibration`
-}), ce = $.createLogger({
+], ee.prototype, "handleBeverageSelection", 1);
+ee = nt([
+  Ve(),
+  f(lt)
+], ee);
+const Me = new C({
+  class: ee,
+  type: lt
+}), { URL: ut } = A("PUMP_SERVICE"), { postModel: Dr } = w.build({
+  basePath: `${ut}/api/ext/freestyle/microCalibration`
+}), pe = $.createLogger({
   name: "freestyle-pump-service",
   group: "Services"
-}), Mr = async (e, t) => {
+}), Lr = async (e, t) => {
   var r, o, a, n, s;
-  ce.debug(
+  pe.debug(
     `replacePump - sending POST request to /api/ext/freestyle/microCalibration/cal/${e}/code/${t}`
   );
   try {
-    const u = await wr({
+    const u = await Dr({
       model: {},
-      urlOverride: `${st}/api/ext/freestyle/microCalibration/cal/${e}/code/${t}`
+      urlOverride: `${ut}/api/ext/freestyle/microCalibration/cal/${e}/code/${t}`
     });
-    return ce.debug("replacePump - response:", u), ((u == null ? void 0 : u.status) === 200 || (u == null ? void 0 : u.status) === 499) && ((r = u.data) != null && r.error) ? [u.data.error || "unknownError", u.data] : [void 0, u == null ? void 0 : u.data];
+    return pe.debug("replacePump - response:", u), ((u == null ? void 0 : u.status) === 200 || (u == null ? void 0 : u.status) === 499) && ((r = u.data) != null && r.error) ? [u.data.error || "unknownError", u.data] : [void 0, u == null ? void 0 : u.data];
   } catch (u) {
-    if (ce.error(
+    if (pe.error(
       `replacePump - sending POST request to /api/cal/${e}/code/${t}`,
       u
-    ), u instanceof ve) {
+    ), u instanceof _e) {
       const S = ((a = (o = u.payload) == null ? void 0 : o.data) == null ? void 0 : a.error) || ((n = u.payload) == null ? void 0 : n.error) || "unknownError";
       return [S, ((s = u.payload) == null ? void 0 : s.data) || { error: S }];
     }
   }
   return ["unknownError", { error: "unknownError" }];
 };
-var Rr = Object.getOwnPropertyDescriptor, Dr = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? Rr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var Fr = Object.getOwnPropertyDescriptor, zr = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? Fr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = s(a) || a);
   return a;
 };
-const nt = "freestyle-pump-model";
-let he = class {
+const ct = "freestyle-pump-model";
+let me = class {
   constructor(e, t, r) {
     i(this, "id");
     i(this, "logger");
@@ -1017,30 +1017,30 @@ let he = class {
   }
   // -------------------LIFECYCLE----------------------------
   async replacePump(e) {
-    const [t, r] = await Mr(this.pump.path, e);
+    const [t, r] = await Lr(this.pump.path, e);
     return t && this.logger.error(`Failed to replace the pump, ${this.pump.id}`, t), [t, r];
   }
 };
-he = Dr([
-  f(nt)
-], he);
-const we = new C({
-  class: he,
-  type: nt
-}), { URL: L } = A("ICE_AGITATOR_SERVICE"), { getAll: lt, postModel: oe } = w.build({
+me = zr([
+  f(ct)
+], me);
+const Re = new C({
+  class: me,
+  type: ct
+}), { URL: L } = A("ICE_AGITATOR_SERVICE"), { getAll: dt, postModel: se } = w.build({
   basePath: `${L}/api/ext/freestyle/ice`
-}), ut = $.createLogger({
+}), pt = $.createLogger({
   name: "ice-agitator-service",
   group: "Services"
-}), Lr = async (e) => (ut.debug("sending GET for ice types"), await lt({
+}), Nr = async (e) => (pt.debug("sending GET for ice types"), await dt({
   urlOverride: `${L}/api/handle/${e}/types`
-})), Fr = async (e, t) => (ut.debug("sending POST for ice types"), await oe({
+})), xr = async (e, t) => (pt.debug("sending POST for ice types"), await se({
   urlOverride: `${L}/api/handle/${e}/type/${t}`,
   model: {}
-})), Nr = async (e) => await lt({
+})), Ur = async (e) => await dt({
   urlOverride: `${L}/api/kos/config/details/${e}/4`
-}), zr = async (e, t) => {
-  const r = await oe({
+}), jr = async (e, t) => {
+  const r = await se({
     model: {},
     tracker: t,
     urlOverride: `${L}/api/handle/${e}/pour`
@@ -1048,8 +1048,8 @@ const we = new C({
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
-}, xr = async (e, t) => {
-  const r = await oe({
+}, qr = async (e, t) => {
+  const r = await se({
     model: {},
     tracker: t,
     urlOverride: `${L}/api/handle/${e}/test/agitation`
@@ -1057,8 +1057,8 @@ const we = new C({
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
-}, Ur = async (e, t) => {
-  const r = await oe({
+}, Gr = async (e, t) => {
+  const r = await se({
     model: {},
     tracker: t,
     urlOverride: `${L}/api/handle/${e}/test/gate`
@@ -1067,15 +1067,15 @@ const we = new C({
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
 };
-var Gr = Object.defineProperty, jr = Object.getOwnPropertyDescriptor, p = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? jr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var Vr = Object.defineProperty, Hr = Object.getOwnPropertyDescriptor, p = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? Hr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && Gr(t, r, a), a;
+  return o && a && Vr(t, r, a), a;
 };
-class J {
+class te {
 }
-i(J, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/ice-agitation-started"), i(J, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/ice-agitation-ended");
-const ct = "ice-agitator-model", dt = x("statePath");
+i(te, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/ice-agitation-started"), i(te, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/ice-agitation-ended");
+const gt = "ice-agitator-model", ht = x("statePath");
 let c = class {
   constructor(e, t, r) {
     i(this, "id");
@@ -1097,7 +1097,7 @@ let c = class {
     i(this, "_allIceTypes");
     i(this, "logger");
     i(this, "currentState", d.IDLE);
-    i(this, "resetDefaultValues", async () => await Nr(this.path));
+    i(this, "resetDefaultValues", async () => await Ur(this.path));
     this.id = e, this.name = t.name, this.path = t.path, this.statePath = t.statePath, this._allIceTypes = [], this.logger = r.logger;
   }
   get iceTypes() {
@@ -1128,7 +1128,7 @@ let c = class {
     return this.currentState === d.IDLE;
   }
   updateIfCurrent(e, t) {
-    this.currentState === e && K(() => {
+    this.currentState === e && W(() => {
       this.currentState = t;
     });
   }
@@ -1137,7 +1137,7 @@ let c = class {
       if (this.currentState === d.IDLE) {
         if (this.updateIfCurrent(d.IDLE, d.POUR_STARTING), !e)
           throw new Error("No tracker provided");
-        const t = await zr(this.path, e);
+        const t = await jr(this.path, e);
         return this.updateIfCurrent(d.POUR_STARTING, d.POURING), t != null && t.endState && this.updateIfCurrent(d.POURING, d.IDLE), t;
       } else
         throw new Error(`Cannot pour in state ${this.currentState}`);
@@ -1150,7 +1150,7 @@ let c = class {
    * */
   async cancelIceDispense() {
     var e;
-    this.currentState === d.POURING || this.currentState === d.POUR_STARTING ? (this.currentState = d.POUR_CANCELING, await ((e = this.pourFuture) == null ? void 0 : e.cancelFuture()), K(() => {
+    this.currentState === d.POURING || this.currentState === d.POUR_STARTING ? (this.currentState = d.POUR_CANCELING, await ((e = this.pourFuture) == null ? void 0 : e.cancelFuture()), W(() => {
       this.currentState = d.IDLE;
     })) : this.logger.warn(
       `Cannot cancel ice dispense in state ${this.currentState}`
@@ -1159,45 +1159,45 @@ let c = class {
   async testAgitate(e) {
     if (!e)
       throw new Error("No tracker provided");
-    return this.logger.info(`agitating ice-agitator ${this.id}`), xr(this.path, e);
+    return this.logger.info(`agitating ice-agitator ${this.id}`), qr(this.path, e);
   }
   async testGate(e) {
     if (!e)
       throw new Error("No tracker provided");
-    return this.logger.info(`testing ice gate:  ${this.id}`), Ur(this.path, e);
+    return this.logger.info(`testing ice gate:  ${this.id}`), Gr(this.path, e);
   }
   handleAgitationChange() {
     var e;
-    this.isAgitating ? (this.logger.info(`agitating ice-agitator ${this.id}`), Y.publish(J.TOPIC_AGITATION_STARTED, {
+    this.isAgitating ? (this.logger.info(`agitating ice-agitator ${this.id}`), Z.publish(te.TOPIC_AGITATION_STARTED, {
       path: this.path,
       futureId: (e = this.futureHandler.future) == null ? void 0 : e.futureId
-    })) : Y.publish(J.TOPIC_AGITATION_ENDED, {
+    })) : Z.publish(te.TOPIC_AGITATION_ENDED, {
       path: this.path
     });
   }
   async updateIceType(e) {
-    await Fr(this.path, e);
+    await xr(this.path, e);
   }
   async init() {
     this.logger.debug(`initializing ice-agitator ${this.id}`);
   }
   async load() {
     this.logger.debug(`loading ice-agitator ${this.id}`);
-    const e = await Lr(this.path);
-    (e == null ? void 0 : e.status) === 200 && K(() => {
+    const e = await Nr(this.path);
+    (e == null ? void 0 : e.status) === 200 && W(() => {
       this._allIceTypes = e.data || [];
     });
   }
 };
 p([
   b({
-    path: E,
+    path: O,
     attribute: "settings.volWithoutIceMl"
   })
 ], c.prototype, "volWithoutIceMl", 2);
 p([
   b({
-    path: E,
+    path: O,
     attribute: "settings.durationSec",
     converter: {
       to: "second"
@@ -1206,49 +1206,49 @@ p([
 ], c.prototype, "durationSec", 2);
 p([
   b({
-    path: E,
+    path: O,
     attribute: "enableIceChuteClear"
   })
 ], c.prototype, "enableIceChuteClear", 2);
 p([
   b({
-    path: E,
+    path: O,
     attribute: "iceChuteClearDurationMs"
   })
 ], c.prototype, "iceChuteClearDurationMs", 2);
 p([
   b({
-    path: E,
+    path: O,
     attribute: "iceChuteClearIntervalSec"
   })
 ], c.prototype, "iceChuteClearIntervalSec", 2);
 p([
   b({
-    path: E,
+    path: O,
     attribute: "iceChuteClearRetryIntervalSec"
   })
 ], c.prototype, "iceChuteClearRetryIntervalSec", 2);
 p([
   b({
-    path: E,
+    path: O,
     attribute: "maxDispenseSec"
   })
 ], c.prototype, "maxDispenseSec", 2);
 p([
   b({
-    path: E,
+    path: O,
     attribute: "type"
   })
 ], c.prototype, "type", 2);
 p([
   b({
-    path: E,
+    path: O,
     attribute: "settings.dilutionOffset"
   })
 ], c.prototype, "dilutionOffset", 2);
 p([
   b({
-    path: E,
+    path: O,
     attribute: "settings.inactivitySec",
     converter: {
       to: "minute"
@@ -1256,42 +1256,42 @@ p([
   })
 ], c.prototype, "inactivitySec", 2);
 p([
-  O({ path: dt, attribute: "agitating" })
+  E({ path: ht, attribute: "agitating" })
 ], c.prototype, "agitating", 2);
 p([
-  O({ path: dt, attribute: "iceChuteOpen" })
+  E({ path: ht, attribute: "iceChuteOpen" })
 ], c.prototype, "iceChuteOpen", 2);
 p([
-  _({ alias: "pour" })
+  I({ alias: "pour" })
 ], c.prototype, "pourIce", 1);
 p([
-  _({ alias: "agitate" })
+  I({ alias: "agitate" })
 ], c.prototype, "testAgitate", 1);
 p([
-  _({
+  I({
     alias: "gate"
   })
 ], c.prototype, "testGate", 1);
 p([
-  be({
+  ve({
     dependencies: (e) => [e.isAgitating]
   })
 ], c.prototype, "handleAgitationChange", 1);
 c = p([
-  f(ct),
-  $t()
+  f(gt),
+  Et()
 ], c);
-const pt = new C({
+const ft = new C({
   class: c,
-  type: ct
+  type: gt
 });
-var qr = Object.getOwnPropertyDescriptor, Vr = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? qr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var Br = Object.getOwnPropertyDescriptor, Kr = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? Br(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = s(a) || a);
   return a;
 };
-const gt = "lfcv-pump-model";
-let fe = class {
+const mt = "lfcv-pump-model";
+let ye = class {
   constructor(e, t, r) {
     i(this, "id");
     i(this, "logger");
@@ -1321,30 +1321,30 @@ let fe = class {
     this.logger.debug(`loading lfcv-pump ${this.id}`);
   }
 };
-fe = Vr([
-  f(gt)
-], fe);
-const Br = new C({
-  class: fe,
-  type: gt
-}), { URL: Hr } = A("LFCV-PUMP_SERVICE"), { getAll: Kr } = w.build({
-  basePath: `${Hr}/api/lfcv-pump`
-}), Yr = $.createLogger({
+ye = Kr([
+  f(mt)
+], ye);
+const Yr = new C({
+  class: ye,
+  type: mt
+}), { URL: Wr } = A("LFCV-PUMP_SERVICE"), { getAll: Zr } = w.build({
+  basePath: `${Wr}/api/lfcv-pump`
+}), kr = $.createLogger({
   name: "lfcv-pump-service",
   group: "Services"
-}), fa = async () => (Yr.debug("sending GET for lfcv-pump"), await Kr({})), { URL: B } = A("SPM-PUMP_SERVICE"), { postModel: ie } = w.build({
-  basePath: `${B}/api/spm-pump`
+}), Ta = async () => (kr.debug("sending GET for lfcv-pump"), await Zr({})), { URL: K } = A("SPM-PUMP_SERVICE"), { postModel: ne } = w.build({
+  basePath: `${K}/api/spm-pump`
 }), T = $.createLogger({
   name: "spm-pump-service",
   group: "Services"
-}), Wr = async (e, t) => {
+}), Jr = async (e, t) => {
   T.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`
   );
   try {
-    const r = await ie({
+    const r = await ne({
       model: {},
-      urlOverride: `${B}/api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`,
+      urlOverride: `${K}/api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`,
       tracker: t
     });
     return T.debug("performPreCalibrate - response:", r), r != null && r.data && y.initiateFuture(r.data), r == null ? void 0 : r.data;
@@ -1361,14 +1361,14 @@ const Br = new C({
     };
     return y.initiateFuture(o), o;
   }
-}, Zr = async (e, t) => {
+}, Qr = async (e, t) => {
   T.debug(
     `performCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/calibrate`
   );
   try {
-    const r = await ie({
+    const r = await ne({
       model: {},
-      urlOverride: `${B}/api/ext/freestyle/microCalibration/pour/${e}/calibrate`,
+      urlOverride: `${K}/api/ext/freestyle/microCalibration/pour/${e}/calibrate`,
       tracker: t
     });
     return T.debug("performCalibrate - response:", r), r != null && r.data && y.initiateFuture(r.data), r == null ? void 0 : r.data;
@@ -1385,12 +1385,12 @@ const Br = new C({
     };
     return y.initiateFuture(o), o;
   }
-}, kr = async (e, t, r, o) => {
+}, Xr = async (e, t, r, o) => {
   T.debug(
     `performVerify - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/verify`
   );
   try {
-    const a = await ie({
+    const a = await ne({
       model: {
         ...r,
         // commandedCalibrationVolume: 0,
@@ -1399,7 +1399,7 @@ const Br = new C({
         // newCalibrationValue: 0,
         // pouredCalibrationVolume: 0,
       },
-      urlOverride: `${B}/api/ext/freestyle/microCalibration/pour/${e}/verify`,
+      urlOverride: `${K}/api/ext/freestyle/microCalibration/pour/${e}/verify`,
       tracker: o
     });
     return T.debug("performVerify - response:", a), a != null && a.data && y.initiateFuture(a.data), a == null ? void 0 : a.data;
@@ -1416,13 +1416,13 @@ const Br = new C({
     };
     return y.initiateFuture(n), n;
   }
-}, Qr = async (e, t, r, o) => {
+}, ea = async (e, t, r, o) => {
   var a, n, s, u, S;
   T.debug(
     `performComplete - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/complete`
   );
   try {
-    const l = await ie({
+    const l = await ne({
       model: {
         ...o,
         // commandedCalibrationVolume: 0,
@@ -1431,33 +1431,33 @@ const Br = new C({
         // newCalibrationValue: 0,
         // pouredCalibrationVolume: 0,
       },
-      urlOverride: `${B}/api/ext/freestyle/microCalibration/pour/${e}/complete`
+      urlOverride: `${K}/api/ext/freestyle/microCalibration/pour/${e}/complete`
     });
     return T.debug("performComplete - response:", l), ((l == null ? void 0 : l.status) === 200 || (l == null ? void 0 : l.status) === 499) && ((a = l.data) != null && a.error) ? [l.data.error || "unknownError", l.data] : [void 0, l == null ? void 0 : l.data];
   } catch (l) {
     if (T.error(
       `performComplete - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/complete`,
       l
-    ), l instanceof ve) {
+    ), l instanceof _e) {
       const v = ((s = (n = l.payload) == null ? void 0 : n.data) == null ? void 0 : s.error) || ((u = l.payload) == null ? void 0 : u.error) || "unknownError";
       return [v, ((S = l.payload) == null ? void 0 : S.data) || { error: v }];
     }
   }
   return ["unknownError", { error: "unknownError" }];
 };
-var Xr = Object.defineProperty, Jr = Object.getOwnPropertyDescriptor, se = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? Jr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var ta = Object.defineProperty, ra = Object.getOwnPropertyDescriptor, le = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? ra(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && Xr(t, r, a), a;
+  return o && a && ta(t, r, a), a;
 };
-const ht = "spm-pump-model";
-let z = class {
+const yt = "spm-pump-model";
+let N = class {
   constructor(e, t, r) {
     i(this, "id");
     i(this, "logger");
     i(this, "pump");
     i(this, "futureHandler");
-    this.id = e, this.logger = r.logger, this.pump = t.companionParent, this.futureHandler = new ze(this);
+    this.id = e, this.logger = r.logger, this.pump = t.companionParent, this.futureHandler = new Ge(this);
   }
   get name() {
     return this.pump.name;
@@ -1478,16 +1478,16 @@ let z = class {
     return this.futureHandler.future;
   }
   async performPreCalibrate(e) {
-    return Wr(this.pump.path, e);
+    return Jr(this.pump.path, e);
   }
   async performCalibrate(e) {
-    return Zr(this.pump.path, e);
+    return Qr(this.pump.path, e);
   }
   async performVerify(e, t, r) {
-    return kr(this.pump.path, e, t, r);
+    return Xr(this.pump.path, e, t, r);
   }
   async performComplete(e, t, r) {
-    return Qr(this.pump.path, e, t, r);
+    return ea(this.pump.path, e, t, r);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1497,32 +1497,32 @@ let z = class {
     this.logger.debug(`loading spm-pump ${this.id}`);
   }
 };
-se([
-  _()
-], z.prototype, "performPreCalibrate", 1);
-se([
-  _()
-], z.prototype, "performCalibrate", 1);
-se([
-  _()
-], z.prototype, "performVerify", 1);
-z = se([
-  f(ht)
-], z);
-const ea = new C({
-  class: z,
-  type: ht
+le([
+  I()
+], N.prototype, "performPreCalibrate", 1);
+le([
+  I()
+], N.prototype, "performCalibrate", 1);
+le([
+  I()
+], N.prototype, "performVerify", 1);
+N = le([
+  f(yt)
+], N);
+const aa = new C({
+  class: N,
+  type: yt
 });
-var ta = Object.defineProperty, ra = Object.getOwnPropertyDescriptor, Ce = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? ra(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var oa = Object.defineProperty, ia = Object.getOwnPropertyDescriptor, Ee = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? ia(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && ta(t, r, a), a;
+  return o && a && oa(t, r, a), a;
 };
-const Ee = "agitation-required-trouble-model", aa = (e) => {
+const Se = "agitation-required-trouble-model", sa = (e) => {
   if (e.data.agitationRequired)
-    return Ee;
-}, oa = "InsufficientAgitationTrouble";
-let q = class {
+    return Se;
+}, na = "InsufficientAgitationTrouble";
+let G = class {
   constructor(e, t, r) {
     i(this, "id");
     i(this, "logger");
@@ -1550,7 +1550,7 @@ let q = class {
     var o, a;
     if (!this.holder)
       return !0;
-    const t = (((o = this.holder) == null ? void 0 : o.troublesByType[oa]) || []).length > 0;
+    const t = (((o = this.holder) == null ? void 0 : o.troublesByType[na]) || []).length > 0;
     return !!((a = this.agitateBeforePour) != null && a.value) && t;
   }
   get deferred() {
@@ -1563,35 +1563,35 @@ let q = class {
     this._deferred = !1;
   }
 };
-Ce([
+Ee([
   b({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.agitateBeforePour"
   })
-], q.prototype, "agitateBeforePour", 2);
-Ce([
-  Ct({
-    topic: Et(je.type),
-    lifecycle: Fe.INIT
+], G.prototype, "agitateBeforePour", 2);
+Ee([
+  St({
+    topic: At(He.type),
+    lifecycle: je.INIT
   })
-], q.prototype, "updateHolder", 1);
-q = Ce([
-  f(Ee)
-], q);
-const ia = new C({
-  class: q,
-  type: Ee
-}), sa = ["iceAgitator"], na = {
-  iceAgitator: pt.factory
-}, la = $.createLogger({ name: "freestyle-assembly-data-mapper" }), ma = async (e) => {
-  const t = Ie.instance().options({}).build(), r = $e.instance().options({}).build(), o = e.assemblies.reduce((s, u) => {
+], G.prototype, "updateHolder", 1);
+G = Ee([
+  f(Se)
+], G);
+const la = new C({
+  class: G,
+  type: Se
+}), ua = ["iceAgitator"], ca = {
+  iceAgitator: ft.factory
+}, da = $.createLogger({ name: "freestyle-assembly-data-mapper" }), _a = async (e) => {
+  const t = $e.instance().options({}).build(), r = Oe.instance().options({}).build(), o = e.assemblies.reduce((s, u) => {
     var S;
-    return sa.forEach((l) => {
+    return ua.forEach((l) => {
       var M;
       const v = u[l];
       if (v) {
-        const ft = na[l](v.path);
-        s[l] = ft({
+        const bt = ca[l](v.path);
+        s[l] = bt({
           name: v.name,
           path: v.path,
           statePath: ((M = v.state) == null ? void 0 : M.path) || ""
@@ -1599,7 +1599,7 @@ const ia = new C({
       }
     }), (S = u.cartridgeAgitators) == null || S.forEach((l) => {
       var M;
-      const v = Ze.instance(
+      const v = Qe.instance(
         l.path
       ).options({
         name: l.name,
@@ -1608,8 +1608,8 @@ const ia = new C({
       }).build();
       t.addModel(v);
     }), u.remoteTrays && u.remoteTrays.forEach((l) => {
-      la.info(`Found remote tray ${l.name} with path ${l.path}`);
-      const v = `${j.type}-${l.holderPath}`, M = j.instance(v).options({
+      da.info(`Found remote tray ${l.name} with path ${l.path}`);
+      const v = `${q.type}-${l.holderPath}`, M = q.instance(v).options({
         holderPath: l.holderPath,
         configPath: l.path,
         name: l.name
@@ -1624,19 +1624,19 @@ const ia = new C({
     supportsCarb: n,
     supportsIce: a
   };
-}, ua = (e) => () => (Ot(e)(), wt(e)(), Ae.register(), de.register(), pt.register(), Be.register(), Ie.register(), ea.register(), ur.register(), Br.register(), Jt.register(), we.register(), Oe.register(), j.register(), $e.register(), m.companion.register(e)(
+}, pa = (e) => () => (wt(e)(), Dt(e)(), Me.register(), ge.register(), ft.register(), Ye.register(), $e.register(), aa.register(), pr.register(), Yr.register(), rr.register(), Re.register(), Ae.register(), q.register(), Oe.register(), m.companion.register(e)(
+  Lt.type,
+  Me.type
+), m.companion.register(e)(
+  He.type,
+  ge.type
+), la.register(), m.companion.register(e)(
   Mt.type,
+  sa
+), m.companion.register(e)(Ft.type, Re.type), m.companion.register(e)(
+  zt.type,
   Ae.type
-), m.companion.register(e)(
-  je.type,
-  de.type
-), ia.register(), m.companion.register(e)(
-  St.type,
-  aa
-), m.companion.register(e)(Rt.type, we.type), m.companion.register(e)(
-  Dt.type,
-  Oe.type
-), le[ue].register(
+), ce[de].register(
   "EnjoyByTrouble",
   async (t) => {
     if (t.data.enjoyByDate) {
@@ -1649,21 +1649,21 @@ const ia = new C({
     }
     return {};
   }
-), le[ue].register(
+), ce[de].register(
   "SuperPumpRequiredTrouble",
   // This is the trouble type
   async (t) => {
     const { model: r } = R(
-      Lt.type
+      Nt.type
     );
     return r ? {
       superPumps: r.models.getIndexByKey(
-        Ft.byType,
+        xt.byType,
         "microSuper"
       ).map((n) => n.name).join(", ")
     } : {};
   }
-), le[ue].register(
+), ce[de].register(
   "MicroPumpAirDetectTrouble",
   async (t) => {
     if (t.ifaces.includes("container"))
@@ -1687,73 +1687,103 @@ const ia = new C({
   model: m.model.register(e),
   companion: m.companion.register(e),
   legacy: m.model.registerLegacyModel(e)
-}), I = {
-  ...At
+}), _ = {
+  ...Rt
 };
-I.freestyle = {
-  models: ua(I)
+_.freestyle = {
+  models: pa(_)
 };
-I.preload = m.model.preloadModel(I);
-I.model = m.model.register(I);
-I.companion = m.companion.register(I);
-I.legacy = m.model.registerLegacyModel(I);
-const ya = I;
-function ca(e) {
-  return Ge(e);
+_.preload = m.model.preloadModel(_);
+_.model = m.model.register(_);
+_.companion = m.companion.register(_);
+_.legacy = m.model.registerLegacyModel(_);
+const Ia = _;
+function ga(e) {
+  return H(e);
+}
+const De = V(), $a = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  api: De,
+  default: De,
+  kosServiceRequest: ga
+}, Symbol.toStringTag, { value: "Module" }));
+function ha(e) {
+  return H(e);
+}
+const Le = V(), Ca = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  api: Le,
+  default: Le,
+  kosServiceRequest: ha
+}, Symbol.toStringTag, { value: "Module" }));
+function fa(e) {
+  return H(e);
+}
+const Fe = V(), Oa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  api: Fe,
+  default: Fe,
+  kosServiceRequest: fa
+}, Symbol.toStringTag, { value: "Module" }));
+function ma(e) {
+  return H(e);
 }
-const Me = Ue(), ba = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const ze = V(), Ea = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  api: Me,
-  default: Me,
-  kosServiceRequest: ca
+  api: ze,
+  default: ze,
+  kosServiceRequest: ma
 }, Symbol.toStringTag, { value: "Module" }));
-function da(e) {
-  return Ge(e);
+function ya(e) {
+  return H(e);
 }
-const Re = Ue(), Pa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const Ne = V(), Sa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  api: Re,
-  default: Re,
-  kosServiceRequest: da
+  api: Ne,
+  default: Ne,
+  kosServiceRequest: ya
 }, Symbol.toStringTag, { value: "Module" }));
 export {
-  oa as A,
-  kr as B,
-  Be as C,
-  ma as D,
-  pr as E,
-  ur as F,
-  J as I,
-  ya as K,
-  Br as L,
-  Er as N,
-  $e as R,
-  ea as S,
-  Ie as a,
-  Z as b,
-  Ze as c,
-  Jt as d,
-  de as e,
-  Oe as f,
-  Ae as g,
-  we as h,
-  pt as i,
-  ia as j,
-  Pa as k,
-  j as l,
-  ir as m,
-  er as n,
-  tr as o,
-  rr as p,
-  ar as q,
-  ua as r,
-  ba as s,
-  Se as t,
-  Or as u,
-  Mr as v,
-  fa as w,
-  Zr as x,
-  Qr as y,
-  Wr as z
+  na as A,
+  Qr as B,
+  Ye as C,
+  ea as D,
+  Jr as E,
+  pr as F,
+  Xr as G,
+  _a as H,
+  te as I,
+  fr as J,
+  Ia as K,
+  Yr as L,
+  Ar as N,
+  Oe as R,
+  aa as S,
+  $e as a,
+  J as b,
+  Qe as c,
+  rr as d,
+  ge as e,
+  Ae as f,
+  Me as g,
+  Re as h,
+  ft as i,
+  la as j,
+  Ca as k,
+  Oa as l,
+  Ea as m,
+  Sa as n,
+  q as o,
+  ir as p,
+  lr as q,
+  pa as r,
+  $a as s,
+  ar as t,
+  or as u,
+  sr as v,
+  we as w,
+  wr as x,
+  Lr as y,
+  Ta as z
 };
-//# sourceMappingURL=service-C0WOCTr1.js.map
+//# sourceMappingURL=service-Rmefh9Kc.js.map