@kosdev-code/kos-freestyle-sdk 2.1.25 → 2.1.27

package/{freestyle-registration-manager-DSugLmqT.js → service-C0WOCTr1.js}

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