@kosdev-code/kos-freestyle-sdk 2.0.41 → 2.1.1

package/{freestyle-registration-manager-D57Lznu_.js → freestyle-registration-manager-CClN6mVr.js}

@@ -1,15 +1,15 @@
-var Ne = Object.defineProperty;
-var Fe = (e, t, r) => t in e ? Ne(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var o = (e, t, r) => (Fe(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { kosModel as f, KosModelRegistrationFactory as b, KosModelContainer as de, kosChild as X, resolveServiceUrl as L, ServiceFactory as G, createPropKey as j, kosStateProp as J, kosFuture as U, setupMinimalFutureSupport as Le, kosEffect as Ge, EventBus as w, SingletonKosModelRegistrationFactory as k, kosParentAware as ue, KosFeatureFlags as H, kosConfigProperty as p, getKosModelSync as v, KosContextManager as je, KosLog as $, FutureManager as Ue, kosAutoEffect as Be, kosAction as M, FetchError as He, KOS_MODEL_ID as m, kosModelEffect as xe, MultipleFutureHandler as Ke, kosTopicHandler as Ye, DependencyLifecycle as qe, modelTypeEventTopicFactory as Ve, RegistrationManager as h, registerCoreModels as We, Trouble as Ze, ExtensionManager as x, EXTENSION_TROUBLE_DATA_MAPPER as K } from "@kosdev-code/kos-ui-sdk";
+var Fe = Object.defineProperty;
+var Le = (e, t, r) => t in e ? Fe(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
+var o = (e, t, r) => (Le(e, typeof t != "symbol" ? t + "" : t, r), r);
+import { kosModel as f, KosModelRegistrationFactory as b, KosModelContainer as Ge, kosChild as de, resolveServiceUrl as L, ServiceFactory as G, createPropKey as j, kosStateProp as J, kosFuture as U, kosModelEffect as k, kosFutureAware as je, kosLoggerAware as ue, EventBus as M, SingletonKosModelRegistrationFactory as ee, kosParentAware as ce, KosFeatureFlags as x, kosConfigProperty as p, getKosModelSync as v, kosContainerAware as Ue, KosContextManager as Be, KosLog as $, FutureManager as He, kosAction as w, FetchError as xe, KOS_MODEL_ID as m, MultipleFutureHandler as Ke, kosTopicHandler as Ye, DependencyLifecycle as qe, modelTypeEventTopicFactory as Ve, RegistrationManager as h, registerCoreModels as We, Trouble as Ze, ExtensionManager as K, EXTENSION_TROUBLE_DATA_MAPPER as Y } from "@kosdev-code/kos-ui-sdk";
 import { PourState as u, Assembly as ge, KosModelRegistry as Qe, registerDispenseModels as Xe, Nozzle as Je, Pump as ke, Holder as et, PumpContainer as tt, PumpIndex as rt } from "@kosdev-code/kos-dispense-sdk";
 var at = Object.getOwnPropertyDescriptor, ot = (e, t, r, s) => {
   for (var a = s > 1 ? void 0 : s ? at(t, r) : t, i = e.length - 1, n; i >= 0; i--)
     (n = e[i]) && (a = n(a) || a);
   return a;
 };
-const ce = "carb-agitator-model";
-let q = class {
+const he = "carb-agitator-model";
+let V = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "name");
@@ -25,25 +25,25 @@ let q = class {
     this.logger.debug(`loading carb-agitator ${this.id}`);
   }
 };
-q = ot([
-  f(ce)
-], q);
-const he = new b({
-  class: q,
-  type: ce
+V = ot([
+  f(he)
+], V);
+const pe = new b({
+  class: V,
+  type: he
 });
-var st = Object.defineProperty, it = Object.getOwnPropertyDescriptor, pe = (e, t, r, s) => {
+var st = Object.defineProperty, it = Object.getOwnPropertyDescriptor, ye = (e, t, r, s) => {
   for (var a = s > 1 ? void 0 : s ? it(t, r) : t, i = e.length - 1, n; i >= 0; i--)
     (n = e[i]) && (a = (s ? n(t, r, a) : n(a)) || a);
   return s && a && st(t, r, a), a;
 };
-const ye = "cartridge-agitator-container-model";
+const fe = "cartridge-agitator-container-model";
 let S = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
     o(this, "_models");
-    this.id = e, this.logger = r.logger, this._models = new de({
+    this.id = e, this.logger = r.logger, this._models = new Ge({
       parentId: e
     });
   }
@@ -74,45 +74,42 @@ let S = class {
     );
   }
 };
-pe([
-  X
+ye([
+  de
 ], S.prototype, "_models", 2);
-S = pe([
-  f(ye)
+S = ye([
+  f(fe)
 ], S);
-const { URL: fe } = L("CARTRIDGE_AGITATOR_SERVICE"), { postModel: nt } = G.build({
-  basePath: `${fe}/api/ext/freestyle/freestyle/ice`
+const { URL: me } = L("CARTRIDGE_AGITATOR_SERVICE"), { postModel: nt } = G.build({
+  basePath: `${me}/api/ext/freestyle/freestyle/ice`
 }), lt = async (e, t) => {
   const r = await nt({
     model: {},
     tracker: t,
-    urlOverride: `${fe}/api/handle/${e}/test`
+    urlOverride: `${me}/api/handle/${e}/test`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r.data;
 };
-var dt = Object.defineProperty, ut = Object.getOwnPropertyDescriptor, ee = (e, t, r, s) => {
+var dt = Object.defineProperty, ut = Object.getOwnPropertyDescriptor, B = (e, t, r, s) => {
   for (var a = s > 1 ? void 0 : s ? ut(t, r) : t, i = e.length - 1, n; i >= 0; i--)
     (n = e[i]) && (a = (s ? n(t, r, a) : n(a)) || a);
   return s && a && dt(t, r, a), a;
 };
-const me = "cartridge-agitator-model";
+const Pe = "cartridge-agitator-model";
 class R {
 }
 o(R, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/agitation-started"), o(R, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/agitation-ended");
-const gt = j("statePath");
-let O = class {
-  constructor(e, t, r) {
+const ct = j("statePath");
+let T = class {
+  constructor(e, t) {
     o(this, "id");
-    o(this, "futureHandler");
-    o(this, "logger");
-    o(this, "disposer");
     o(this, "agitating");
     o(this, "path");
     o(this, "statePath");
     o(this, "name");
-    this.id = e, this.logger = r.logger, this.path = t.path, this.name = t.name, this.statePath = t.statePath, Le(this);
+    this.id = e, this.path = t.path, this.name = t.name, this.statePath = t.statePath;
   }
   get isAgitating() {
     return !!this.agitating.value;
@@ -122,53 +119,46 @@ let O = class {
       throw new Error("No tracker provided");
     return this.logger.info(`agitating cartridge-agitator ${this.id}`), lt(this.path, e);
   }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing cartridge-agitator ${this.id}`);
-  }
-  unload() {
+  handleAgitation() {
     var e;
-    (e = this.disposer) == null || e.call(this);
-  }
-  async load() {
-    this.logger.debug(`loading cartridge-agitator ${this.id}`), this.disposer = Ge(
-      () => this.isAgitating,
-      () => {
-        var e;
-        this.isAgitating ? (this.logger.info(`agitating cartridge-agitator ${this.id}`), w.publish(R.TOPIC_AGITATION_STARTED, {
-          path: this.path,
-          futureId: (e = this.futureHandler.future) == null ? void 0 : e.futureId
-        })) : w.publish(R.TOPIC_AGITATION_ENDED, {
-          path: this.path
-        });
-      },
-      {}
-    );
+    this.isAgitating ? (this.logger.info(`agitating cartridge-agitator ${this.id}`), M.publish(R.TOPIC_AGITATION_STARTED, {
+      path: this.path,
+      futureId: (e = this.future) == null ? void 0 : e.futureId
+    })) : M.publish(R.TOPIC_AGITATION_ENDED, {
+      path: this.path
+    });
   }
 };
-ee([
-  J({ path: gt, attribute: "agitating" })
-], O.prototype, "agitating", 2);
-ee([
+B([
+  J({ path: ct, attribute: "agitating" })
+], T.prototype, "agitating", 2);
+B([
   U()
-], O.prototype, "testAgitate", 1);
-O = ee([
-  f(me)
-], O);
-const _e = new b({
-  class: O,
-  type: me
-}), te = new k({
+], T.prototype, "testAgitate", 1);
+B([
+  k({
+    dependencies: (e) => [e.isAgitating]
+  })
+], T.prototype, "handleAgitation", 1);
+T = B([
+  f(Pe),
+  je(),
+  ue()
+], T);
+const be = new b({
+  class: T,
+  type: Pe
+}), te = new ee({
   class: S,
-  type: ye
+  type: fe
 });
-te.addRelatedModel(_e);
-var ct = Object.defineProperty, ht = Object.getOwnPropertyDescriptor, be = (e, t, r, s) => {
+te.addRelatedModel(be);
+var gt = Object.defineProperty, ht = Object.getOwnPropertyDescriptor, _e = (e, t, r, s) => {
   for (var a = s > 1 ? void 0 : s ? ht(t, r) : t, i = e.length - 1, n; i >= 0; i--)
     (n = e[i]) && (a = (s ? n(t, r, a) : n(a)) || a);
-  return s && a && ct(t, r, a), a;
+  return s && a && gt(t, r, a), a;
 };
-const Pe = "freestyle-assembly-model", pt = "iceAgitator", yt = "carbAgitator", ft = "remoteTrays";
+const ve = "freestyle-assembly-model", pt = "iceAgitator", yt = "carbAgitator", ft = "remoteTrays";
 let D = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -230,35 +220,35 @@ let D = class {
   }
   // -------------------LIFECYCLE----------------------------
   get supportsRemoteTrays() {
-    return H.isFeatureEnabled(ft);
+    return x.isFeatureEnabled(ft);
   }
   get supportsIce() {
-    return H.isFeatureEnabled(pt);
+    return x.isFeatureEnabled(pt);
   }
   get supportsCarb() {
-    return H.isFeatureEnabled(yt);
+    return x.isFeatureEnabled(yt);
   }
   async init() {
     this.logger.debug(`initializing freestyle-assembly ${this.id}`);
   }
 };
-be([
-  X
+_e([
+  de
 ], D.prototype, "_remoteTrays", 2);
-D = be([
-  ue(),
-  f(Pe)
+D = _e([
+  ce(),
+  f(ve)
 ], D);
-const V = new k({
+const W = new ee({
   class: D,
-  type: Pe
+  type: ve
 });
-var mt = Object.defineProperty, _t = Object.getOwnPropertyDescriptor, ve = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? _t(t, r) : t, i = e.length - 1, n; i >= 0; i--)
+var mt = Object.defineProperty, Pt = Object.getOwnPropertyDescriptor, Ie = (e, t, r, s) => {
+  for (var a = s > 1 ? void 0 : s ? Pt(t, r) : t, i = e.length - 1, n; i >= 0; i--)
     (n = e[i]) && (a = (s ? n(t, r, a) : n(a)) || a);
   return s && a && mt(t, r, a), a;
 };
-const Ie = "remote-tray-model";
+const Te = "remote-tray-model";
 j("holderPath");
 const bt = j("configPath");
 let z = class {
@@ -278,7 +268,7 @@ let z = class {
   /**
    * Gets the troubles from the associated holder model.
    * Propagates trouble states from the holder to this remote tray.
-   * 
+   *
    * @returns Array of trouble models from the holder, or empty array if no holder
    */
   get troubles() {
@@ -288,7 +278,7 @@ let z = class {
   /**
    * Gets the highest priority trouble status.
    * Currently returns empty string as troubles are managed by the holder.
-   * 
+   *
    * @returns Empty string (trouble status handled by holder)
    */
   get troubleStatus() {
@@ -296,7 +286,7 @@ let z = class {
   }
   /**
    * Gets troubles grouped by type from the associated holder.
-   * 
+   *
    * @returns Record of troubles grouped by type from the holder, or empty object if no holder
    */
   get troublesByType() {
@@ -306,7 +296,7 @@ let z = class {
   /**
    * Updates the model with new configuration options.
    * Can be used to modify the holder path, config path, or name after initialization.
-   * 
+   *
    * @param _options - New configuration options for the remote tray
    */
   updateModel(e) {
@@ -314,7 +304,7 @@ let z = class {
   /**
    * Gets the associated holder model for this remote tray.
    * Uses synchronous model lookup to retrieve the holder by path.
-   * 
+   *
    * @returns The HolderModel instance referenced by holderPath, or undefined if not found
    */
   get holder() {
@@ -323,7 +313,7 @@ let z = class {
   /**
    * Determines if the remote tray is currently active.
    * Active state is based on the remoteTrayEnabled configuration property.
-   * 
+   *
    * @returns true if the tray is enabled, false otherwise
    */
   get active() {
@@ -334,7 +324,7 @@ let z = class {
    * Initializes the remote tray model.
    * Called during the model lifecycle initialization phase.
    * Sets up initial state and prepares the model for use.
-   * 
+   *
    * @returns Promise that resolves when initialization is complete
    */
   async init() {
@@ -344,88 +334,57 @@ let z = class {
    * Loads the remote tray configuration and associated data.
    * Called during the model lifecycle load phase.
    * Typically loads configuration settings and establishes holder references.
-   * 
+   *
    * @returns Promise that resolves when loading is complete
    */
   async load() {
     this.logger.debug(`loading remote-tray ${this.id}`);
   }
 };
-ve([
+Ie([
   p({
     path: bt,
     attribute: "enabled"
   })
 ], z.prototype, "remoteTrayEnabled", 2);
-z = ve([
-  f(Ie)
+z = Ie([
+  f(Te)
 ], z);
-const E = new b({
+const A = new b({
   class: z,
-  type: Ie
+  type: Te
 });
-var Pt = Object.defineProperty, vt = Object.getOwnPropertyDescriptor, Te = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? vt(t, r) : t, i = e.length - 1, n; i >= 0; i--)
-    (n = e[i]) && (a = (s ? n(t, r, a) : n(a)) || a);
-  return s && a && Pt(t, r, a), a;
+var _t = Object.getOwnPropertyDescriptor, vt = (e, t, r, s) => {
+  for (var a = s > 1 ? void 0 : s ? _t(t, r) : t, i = e.length - 1, n; i >= 0; i--)
+    (n = e[i]) && (a = n(a) || a);
+  return a;
 };
 const Oe = "remote-tray-container-model";
-let N = class {
-  constructor(e, t, r) {
+let Z = class {
+  constructor(e) {
     o(this, "id");
-    o(this, "logger");
-    o(this, "_models");
-    this.id = e, this.logger = r.logger, this._models = new de({
-      parentId: e
-    });
-  }
-  getModel(e) {
-    return this._models.getModel(e);
-  }
-  get models() {
-    return this._models;
-  }
-  get data() {
-    return this._models.data;
-  }
-  updateModel(e) {
-  }
-  addModel(e) {
-    this._models.addModel(e);
-  }
-  removeModel(e) {
-    this._models.removeModel(e);
-  }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(
-      `initializing remote-tray-container container ${this.id}`
-    );
-  }
-  async load() {
-    this.logger.debug(`loading remote-tray-container container ${this.id}`);
+    this.id = e;
   }
 };
-Te([
-  X
-], N.prototype, "_models", 2);
-N = Te([
-  f(Oe)
-], N);
-const re = new k({
-  class: N,
+Z = vt([
+  f(Oe),
+  ue(),
+  Ue()
+], Z);
+const re = new ee({
+  class: Z,
   type: Oe
 });
-re.addRelatedModel(E);
+re.addRelatedModel(A);
 var It = Object.getOwnPropertyDescriptor, Tt = (e, t, r, s) => {
   for (var a = s > 1 ? void 0 : s ? It(t, r) : t, i = e.length - 1, n; i >= 0; i--)
     (n = e[i]) && (a = n(a) || a);
   return a;
 };
-const Ee = "freestyle-holder-model";
+const Ae = "freestyle-holder-model";
 function Ot(e) {
-  const t = je.getContext(e), r = t == null ? void 0 : t.get(
-    V.type
+  const t = Be.getContext(e), r = t == null ? void 0 : t.get(
+    W.type
   );
   if (!r) {
     $.error("Freestyle assembly not found");
@@ -433,14 +392,14 @@ function Ot(e) {
   }
   return r;
 }
-async function Et(e, t) {
+async function At(e, t) {
   if (!e || !t)
     return;
   const r = await e[t]();
   if (r != null && r.tracker)
-    return Ue.getFuture(r.tracker);
+    return He.getFuture(r.tracker);
 }
-let W = class {
+let Q = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
@@ -463,13 +422,13 @@ let W = class {
       this.logger.error("Agitator not found");
       return;
     }
-    return this.future = await Et(
+    return this.future = await At(
       e.defaultCartridgeAgitator,
       "testAgitate"
     ), this.future;
   }
   get isRemote() {
-    const e = `${E.type}-${this.holder.path}`, t = v(e);
+    const e = `${A.type}-${this.holder.path}`, t = v(e);
     return t != null && t.model ? !!t.model.remoteTrayEnabled.value : !1;
   }
   // -------------------LIFECYCLE----------------------------
@@ -480,14 +439,14 @@ let W = class {
     this.logger.debug(`loading freestyle-holder ${this.id}`);
   }
 };
-W = Tt([
-  f(Ee)
-], W);
+Q = Tt([
+  f(Ae)
+], Q);
 const se = new b({
-  class: W,
-  type: Ee
-}), { URL: At } = L("FREESTYLE-NOZZLE_SERVICE"), { getOne: $t } = G.build({
-  basePath: `${At}/api/freestyle-nozzle`
+  class: Q,
+  type: Ae
+}), { URL: Et } = L("FREESTYLE-NOZZLE_SERVICE"), { getOne: $t } = G.build({
+  basePath: `${Et}/api/freestyle-nozzle`
 }), C = $.createLogger({
   name: "freestyle-nozzle-service",
   group: "Services"
@@ -502,7 +461,7 @@ class ie extends Error {
     super(t), this.name = "InvalidRequestError";
   }
 }
-const Mt = async (e, t, r, s = "http://localhost:8081") => {
+const wt = async (e, t, r, s = "http://localhost:8081") => {
   if (C.debug("sending GET for freestyle-nozzle"), !t)
     throw C.error("Invalid freestyle-nozzle request: beverageId is required"), new ie("No beverageId provided");
   if (!r || r.length === 0)
@@ -518,20 +477,19 @@ const Mt = async (e, t, r, s = "http://localhost:8081") => {
     throw new Ct(a.data.error);
   return a.data;
 };
-var wt = Object.getOwnPropertyDescriptor, St = (e, t, r, s) => {
-  for (var a = s > 1 ? void 0 : s ? wt(t, r) : t, i = e.length - 1, n; i >= 0; i--)
-    (n = e[i]) && (a = n(a) || a);
-  return a;
+var Mt = Object.defineProperty, St = Object.getOwnPropertyDescriptor, Ee = (e, t, r, s) => {
+  for (var a = s > 1 ? void 0 : s ? St(t, r) : t, i = e.length - 1, n; i >= 0; i--)
+    (n = e[i]) && (a = (s ? n(t, r, a) : n(a)) || a);
+  return s && a && Mt(t, r, a), a;
 };
-const Ae = "freestyle-nozzle-model";
-let Z = class {
+const $e = "freestyle-nozzle-model";
+let N = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
     o(this, "nozzleModel");
     o(this, "_cupSizes");
     o(this, "_nutritionInfo");
-    o(this, "_disposer", null);
     this.id = e, this.logger = r.logger, this.nozzleModel = t.companionParent, this._cupSizes = [100];
   }
   set cupSizes(e) {
@@ -540,66 +498,77 @@ let Z = class {
   get nutritionInfo() {
     return this._nutritionInfo;
   }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing freestyle-nozzle ${this.id}`), this._disposer = Be(async () => {
-      if (this.nozzleModel.selectedPourable.beverage && this._cupSizes.length) {
-        this.logger.debug(
-          `selected beverage: ${this.nozzleModel.selectedPourable.beverage.rawId}.  Volume: ${this._cupSizes.join(", ")}`
+  get selectedPourable() {
+    return this.nozzleModel.selectedPourable;
+  }
+  async handleBeverageSelection() {
+    if (this.nozzleModel.selectedPourable.beverage && this._cupSizes.length) {
+      this.logger.debug(
+        `selected beverage: ${this.nozzleModel.selectedPourable.beverage.rawId}.  Volume: ${this._cupSizes.join(", ")}`
+      );
+      const e = this.nozzleModel.selectedPourable.beverage.rawId, t = this.nozzleModel.urlPrefix;
+      try {
+        const r = await wt(
+          t,
+          e,
+          this._cupSizes
         );
-        const e = this.nozzleModel.selectedPourable.beverage.rawId, t = this.nozzleModel.urlPrefix;
-        try {
-          const r = await Mt(
-            t,
-            e,
-            this._cupSizes
-          );
-          M(() => {
-            this._nutritionInfo = r;
-          });
-        } catch (r) {
-          this.logger.error(`Error fetching nutrition info: ${r}`);
-        }
+        w(() => {
+          this._nutritionInfo = r;
+        });
+      } catch (r) {
+        this.logger.error(`Error fetching nutrition info: ${r}`);
       }
-    });
+    }
+  }
+  // -------------------LIFECYCLE----------------------------
+  async init() {
+    this.logger.debug(`initializing freestyle-nozzle ${this.id}`);
   }
   unload() {
-    this.logger.debug(`unloading freestyle-nozzle ${this.id}`), this._disposer && this._disposer();
+    this.logger.debug(`unloading freestyle-nozzle ${this.id}`);
   }
   async load() {
     this.logger.debug(`loading freestyle-nozzle ${this.id}`);
   }
 };
-Z = St([
-  ue(),
-  f(Ae)
-], Z);
+Ee([
+  k({
+    dependencies: (e) => [
+      e.selectedPourable.beverage
+    ]
+  })
+], N.prototype, "handleBeverageSelection", 1);
+N = Ee([
+  ce(),
+  f($e)
+], N);
 const ne = new b({
-  class: Z,
-  type: Ae
-}), { URL: $e } = L("PUMP_SERVICE"), { postModel: Rt } = G.build({
-  basePath: `${$e}/api/ext/freestyle/microCalibration`
-}), Y = $.createLogger({
+  class: N,
+  type: $e
+}), { URL: Ce } = L("PUMP_SERVICE"), { postModel: Rt } = G.build({
+  basePath: `${Ce}/api/ext/freestyle/microCalibration`
+}), q = $.createLogger({
   name: "freestyle-pump-service",
   group: "Services"
 }), Dt = async (e, t) => {
   var r, s, a, i, n;
-  Y.debug(
+  q.debug(
     `replacePump - sending POST request to /api/ext/freestyle/microCalibration/cal/${e}/code/${t}`
   );
   try {
     const l = await Rt({
       model: {},
-      urlOverride: `${$e}/api/ext/freestyle/microCalibration/cal/${e}/code/${t}`
+      urlOverride: `${Ce}/api/ext/freestyle/microCalibration/cal/${e}/code/${t}`
     });
-    return Y.debug("replacePump - response:", l), ((l == null ? void 0 : l.status) === 200 || (l == null ? void 0 : l.status) === 499) && ((r = l.data) != null && r.error) ? [l.data.error || "unknownError", l.data] : [void 0, l == null ? void 0 : l.data];
+    return q.debug("replacePump - response:", l), ((l == null ? void 0 : l.status) === 200 || (l == null ? void 0 : l.status) === 499) && ((r = l.data) != null && r.error) ? [l.data.error || "unknownError", l.data] : [void 0, l == null ? void 0 : l.data];
   } catch (l) {
-    if (Y.error(
+    if (q.error(
       `replacePump - sending POST request to /api/cal/${e}/code/${t}`,
       l
-    ), l instanceof He) {
-      const T = ((a = (s = l.payload) == null ? void 0 : s.data) == null ? void 0 : a.error) || ((i = l.payload) == null ? void 0 : i.error) || "unknownError";
-      return [T, ((n = l.payload) == null ? void 0 : n.data) || { error: T }];
+    ), l instanceof xe) {
+      const O = ((a = (s = l.payload) == null ? void 0 : s.data) == null ? void 0 : a.error) || ((i = l.payload) == null ? void 0 : i.error) || "unknownError";
+      return [O, ((n = l.payload) == null ? void 0 : n.data) || { error: O }];
     }
   }
   return ["unknownError", { error: "unknownError" }];
@@ -609,8 +578,8 @@ var zt = Object.getOwnPropertyDescriptor, Nt = (e, t, r, s) => {
     (n = e[i]) && (a = n(a) || a);
   return a;
 };
-const Ce = "freestyle-pump-model";
-let Q = class {
+const we = "freestyle-pump-model";
+let X = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
@@ -623,26 +592,26 @@ let Q = class {
     return t && this.logger.error(`Failed to replace the pump, ${this.pump.id}`, t), [t, r];
   }
 };
-Q = Nt([
-  f(Ce)
-], Q);
+X = Nt([
+  f(we)
+], X);
 const le = new b({
-  class: Q,
-  type: Ce
-}), { URL: I } = L("ICE_AGITATOR_SERVICE"), { getAll: Me, postModel: B } = G.build({
+  class: X,
+  type: we
+}), { URL: I } = L("ICE_AGITATOR_SERVICE"), { getAll: Me, postModel: H } = G.build({
   basePath: `${I}/api/ext/freestyle/ice`
-}), we = $.createLogger({
+}), Se = $.createLogger({
   name: "ice-agitator-service",
   group: "Services"
-}), Ft = async (e) => (we.debug("sending GET for ice types"), await Me({
+}), Ft = async (e) => (Se.debug("sending GET for ice types"), await Me({
   urlOverride: `${I}/api/handle/${e}/types`
-})), Lt = async (e, t) => (we.debug("sending POST for ice types"), await B({
+})), Lt = async (e, t) => (Se.debug("sending POST for ice types"), await H({
   urlOverride: `${I}/api/handle/${e}/type/${t}`,
   model: {}
 })), Gt = async (e) => await Me({
   urlOverride: `${I}/api/kos/config/details/${e}/4`
 }), jt = async (e, t) => {
-  const r = await B({
+  const r = await H({
     model: {},
     tracker: t,
     urlOverride: `${I}/api/handle/${e}/pour`
@@ -651,7 +620,7 @@ const le = new b({
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
 }, Ut = async (e, t) => {
-  const r = await B({
+  const r = await H({
     model: {},
     tracker: t,
     urlOverride: `${I}/api/handle/${e}/test/agitation`
@@ -660,7 +629,7 @@ const le = new b({
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
 }, Bt = async (e, t) => {
-  const r = await B({
+  const r = await H({
     model: {},
     tracker: t,
     urlOverride: `${I}/api/handle/${e}/test/gate`
@@ -669,7 +638,7 @@ const le = new b({
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
 };
-var Ht = Object.defineProperty, xt = Object.getOwnPropertyDescriptor, g = (e, t, r, s) => {
+var Ht = Object.defineProperty, xt = Object.getOwnPropertyDescriptor, c = (e, t, r, s) => {
   for (var a = s > 1 ? void 0 : s ? xt(t, r) : t, i = e.length - 1, n; i >= 0; i--)
     (n = e[i]) && (a = (s ? n(t, r, a) : n(a)) || a);
   return s && a && Ht(t, r, a), a;
@@ -677,7 +646,7 @@ var Ht = Object.defineProperty, xt = Object.getOwnPropertyDescriptor, g = (e, t,
 class F {
 }
 o(F, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/ice-agitation-started"), o(F, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/ice-agitation-ended");
-const Se = "ice-agitator-model", Re = j("statePath");
+const Re = "ice-agitator-model", De = j("statePath");
 let d = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -742,7 +711,7 @@ let d = class {
     return this.currentState === u.IDLE;
   }
   updateIfCurrent(e, t) {
-    this.currentState === e && M(() => {
+    this.currentState === e && w(() => {
       this.currentState = t;
     });
   }
@@ -764,7 +733,7 @@ let d = class {
    * */
   async cancelIceDispense() {
     var e;
-    this.currentState === u.POURING || this.currentState === u.POUR_STARTING ? (this.currentState = u.POUR_CANCELING, await ((e = this.pourFuture) == null ? void 0 : e.cancelFuture()), M(() => {
+    this.currentState === u.POURING || this.currentState === u.POUR_STARTING ? (this.currentState = u.POUR_CANCELING, await ((e = this.pourFuture) == null ? void 0 : e.cancelFuture()), w(() => {
       this.currentState = u.IDLE;
     })) : this.logger.warn(
       `Cannot cancel ice dispense in state ${this.currentState}`
@@ -782,10 +751,10 @@ let d = class {
   }
   handleAgitationChange() {
     var e;
-    this.isAgitating ? (this.logger.info(`agitating ice-agitator ${this.id}`), w.publish(F.TOPIC_AGITATION_STARTED, {
+    this.isAgitating ? (this.logger.info(`agitating ice-agitator ${this.id}`), M.publish(F.TOPIC_AGITATION_STARTED, {
       path: this.path,
       futureId: (e = this.futureHandler.future) == null ? void 0 : e.futureId
-    })) : w.publish(F.TOPIC_AGITATION_ENDED, {
+    })) : M.publish(F.TOPIC_AGITATION_ENDED, {
       path: this.path
     });
   }
@@ -798,18 +767,18 @@ let d = class {
   async load() {
     this.logger.debug(`loading ice-agitator ${this.id}`);
     const e = await Ft(this.path);
-    (e == null ? void 0 : e.status) === 200 && M(() => {
+    (e == null ? void 0 : e.status) === 200 && w(() => {
       this._allIceTypes = e.data || [];
     });
   }
 };
-g([
+c([
   p({
     path: m,
     attribute: "settings.volWithoutIceMl"
   })
 ], d.prototype, "volWithoutIceMl", 2);
-g([
+c([
   p({
     path: m,
     attribute: "settings.durationSec",
@@ -818,49 +787,49 @@ g([
     }
   })
 ], d.prototype, "durationSec", 2);
-g([
+c([
   p({
     path: m,
     attribute: "enableIceChuteClear"
   })
 ], d.prototype, "enableIceChuteClear", 2);
-g([
+c([
   p({
     path: m,
     attribute: "iceChuteClearDurationMs"
   })
 ], d.prototype, "iceChuteClearDurationMs", 2);
-g([
+c([
   p({
     path: m,
     attribute: "iceChuteClearIntervalSec"
   })
 ], d.prototype, "iceChuteClearIntervalSec", 2);
-g([
+c([
   p({
     path: m,
     attribute: "iceChuteClearRetryIntervalSec"
   })
 ], d.prototype, "iceChuteClearRetryIntervalSec", 2);
-g([
+c([
   p({
     path: m,
     attribute: "maxDispenseSec"
   })
 ], d.prototype, "maxDispenseSec", 2);
-g([
+c([
   p({
     path: m,
     attribute: "type"
   })
 ], d.prototype, "type", 2);
-g([
+c([
   p({
     path: m,
     attribute: "settings.dilutionOffset"
   })
 ], d.prototype, "dilutionOffset", 2);
-g([
+c([
   p({
     path: m,
     attribute: "settings.inactivitySec",
@@ -869,34 +838,34 @@ g([
     }
   })
 ], d.prototype, "inactivitySec", 2);
-g([
-  J({ path: Re, attribute: "agitating" })
+c([
+  J({ path: De, attribute: "agitating" })
 ], d.prototype, "agitating", 2);
-g([
-  J({ path: Re, attribute: "iceChuteOpen" })
+c([
+  J({ path: De, attribute: "iceChuteOpen" })
 ], d.prototype, "iceChuteOpen", 2);
-g([
+c([
   U({ alias: "pour" })
 ], d.prototype, "pourIce", 1);
-g([
+c([
   U({ alias: "agitate" })
 ], d.prototype, "testAgitate", 1);
-g([
+c([
   U({
     alias: "gate"
   })
 ], d.prototype, "testGate", 1);
-g([
-  xe({
+c([
+  k({
     dependencies: (e) => [e.isAgitating]
   })
 ], d.prototype, "handleAgitationChange", 1);
-d = g([
-  f(Se)
+d = c([
+  f(Re)
 ], d);
-const De = new b({
+const ze = new b({
   class: d,
-  type: Se
+  type: Re
 });
 var Kt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, ae = (e, t, r, s) => {
   for (var a = s > 1 ? void 0 : s ? Yt(t, r) : t, i = e.length - 1, n; i >= 0; i--)
@@ -907,7 +876,7 @@ const oe = "agitation-required-trouble-model", qt = (e) => {
   if (e.data.agitationRequired)
     return oe;
 }, Vt = "InsufficientAgitationTrouble";
-let A = class {
+let E = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
@@ -953,54 +922,54 @@ ae([
     path: "app:kosdev.ddk:app",
     attribute: "ncui.agitateBeforePour"
   })
-], A.prototype, "agitateBeforePour", 2);
+], E.prototype, "agitateBeforePour", 2);
 ae([
   Ye({
     topic: Ve(ge.type),
     lifecycle: qe.INIT
   })
-], A.prototype, "updateHolder", 1);
-A = ae([
+], E.prototype, "updateHolder", 1);
+E = ae([
   f(oe)
-], A);
+], E);
 const Wt = new b({
-  class: A,
+  class: E,
   type: oe
 }), Zt = ["iceAgitator", "carbAgitator"], Qt = {
-  iceAgitator: De.factory,
-  carbAgitator: he.factory
+  iceAgitator: ze.factory,
+  carbAgitator: pe.factory
 }, Xt = $.createLogger({ name: "freestyle-assembly-data-mapper" }), rr = async (e) => {
   const t = te.instance().options({}).build(), r = re.instance().options({}).build(), s = e.assemblies.reduce((n, l) => {
-    var T;
-    return Zt.forEach((c) => {
-      var P;
-      const _ = l[c];
-      if (_) {
-        const ze = Qt[c](_.path);
-        n[c] = ze({
-          name: _.name,
-          path: _.path,
-          statePath: ((P = _.state) == null ? void 0 : P.path) || ""
+    var O;
+    return Zt.forEach((g) => {
+      var _;
+      const P = l[g];
+      if (P) {
+        const Ne = Qt[g](P.path);
+        n[g] = Ne({
+          name: P.name,
+          path: P.path,
+          statePath: ((_ = P.state) == null ? void 0 : _.path) || ""
         });
       }
-    }), (T = l.cartridgeAgitators) == null || T.forEach((c) => {
-      var P;
-      const _ = _e.instance(
-        c.path
+    }), (O = l.cartridgeAgitators) == null || O.forEach((g) => {
+      var _;
+      const P = be.instance(
+        g.path
       ).options({
-        name: c.name,
-        path: c.path,
-        statePath: ((P = c.state) == null ? void 0 : P.path) || ""
+        name: g.name,
+        path: g.path,
+        statePath: ((_ = g.state) == null ? void 0 : _.path) || ""
       }).build();
-      t.addModel(_);
-    }), l.remoteTrays && l.remoteTrays.forEach((c) => {
-      Xt.info(`Found remote tray ${c.name} with path ${c.path}`);
-      const _ = `${E.type}-${c.holderPath}`, P = E.instance(_).options({
-        holderPath: c.holderPath,
-        configPath: c.path,
-        name: c.name
+      t.addModel(P);
+    }), l.remoteTrays && l.remoteTrays.forEach((g) => {
+      Xt.info(`Found remote tray ${g.name} with path ${g.path}`);
+      const P = `${A.type}-${g.holderPath}`, _ = A.instance(P).options({
+        holderPath: g.holderPath,
+        configPath: g.path,
+        name: g.name
       }).build();
-      r.addModel(P);
+      r.addModel(_);
     }), n;
   }, {}), a = !!s.iceAgitator, i = !!s.carbAgitator;
   return {
@@ -1010,19 +979,19 @@ const Wt = new b({
     supportsCarb: i,
     supportsIce: a
   };
-}, Jt = (e) => () => (We(e)(), Xe(e)(), ne.register(), V.register(), De.register(), he.register(), te.register(), le.register(), se.register(), E.register(), re.register(), h.companion.register(e)(
+}, Jt = (e) => () => (We(e)(), Xe(e)(), ne.register(), W.register(), ze.register(), pe.register(), te.register(), le.register(), se.register(), A.register(), re.register(), h.companion.register(e)(
   Je.type,
   ne.type
 ), h.companion.register(e)(
   ge.type,
-  V.type
+  W.type
 ), Wt.register(), h.companion.register(e)(
   Ze.type,
   qt
 ), h.companion.register(e)(ke.type, le.type), h.companion.register(e)(
   et.type,
   se.type
-), x[K].register(
+), K[Y].register(
   "EnjoyByTrouble",
   async (t) => {
     if (t.data.enjoyByDate) {
@@ -1035,7 +1004,7 @@ const Wt = new b({
     }
     return {};
   }
-), x[K].register(
+), K[Y].register(
   "SuperPumpRequiredTrouble",
   // This is the trouble type
   async (t) => {
@@ -1049,7 +1018,7 @@ const Wt = new b({
       ).map((i) => i.name).join(", ")
     } : {};
   }
-), x[K].register(
+), K[Y].register(
   "MicroPumpAirDetectTrouble",
   async (t) => {
     if (t.ifaces.includes("container"))
@@ -1086,26 +1055,26 @@ y.legacy = h.model.registerLegacyModel(y);
 const ar = y;
 export {
   Vt as A,
-  he as C,
-  V as F,
+  pe as C,
+  W as F,
   F as I,
   ar as K,
   Ct as N,
   re as R,
   te as a,
   R as b,
-  _e as c,
+  be as c,
   se as d,
   ne as e,
   le as f,
-  De as g,
+  ze as g,
   Wt as h,
-  E as i,
+  A as i,
   ie as j,
-  Mt as k,
+  wt as k,
   Dt as l,
   rr as m,
   pt as n,
   Jt as r
 };
-//# sourceMappingURL=freestyle-registration-manager-D57Lznu_.js.map
+//# sourceMappingURL=freestyle-registration-manager-CClN6mVr.js.map