@kosdev-code/kos-freestyle-sdk 2.1.3 → 2.1.5

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

@@ -1,8 +1,8 @@
-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 Le = Object.defineProperty;
+var Fe = (e, t, r) => t in e ? Le(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 Ge, kosChild as de, resolveServiceUrl as F, ServiceFactory as G, createPropKey as j, kosStateProp as J, kosFuture as U, kosModelEffect as k, kosFutureAware as je, kosLoggerAware as ce, EventBus as M, SingletonKosModelRegistrationFactory as ee, kosParentAware as ge, KosFeatureFlags as H, kosConfigProperty as p, getKosModelSync as v, kosContainerAware as Ue, KosContextManager as Be, KosLog as $, FutureManager as xe, kosAction as w, FetchError as He, KOS_MODEL_ID as m, kosMultipleFutureAware 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 c, Assembly as ue, 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);
@@ -80,7 +80,7 @@ ye([
 S = ye([
   f(fe)
 ], S);
-const { URL: me } = L("CARTRIDGE_AGITATOR_SERVICE"), { postModel: nt } = G.build({
+const { URL: me } = F("CARTRIDGE_AGITATOR_SERVICE"), { postModel: nt } = G.build({
   basePath: `${me}/api/ext/freestyle/freestyle/ice`
 }), lt = async (e, t) => {
   const r = await nt({
@@ -92,8 +92,8 @@ const { URL: me } = L("CARTRIDGE_AGITATOR_SERVICE"), { postModel: nt } = G.build
     throw new Error("No response from server");
   return r.data;
 };
-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--)
+var dt = Object.defineProperty, ct = Object.getOwnPropertyDescriptor, B = (e, t, r, s) => {
+  for (var a = s > 1 ? void 0 : s ? ct(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;
 };
@@ -101,7 +101,7 @@ 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 ct = j("statePath");
+const gt = j("statePath");
 let T = class {
   constructor(e, t) {
     o(this, "id");
@@ -130,7 +130,7 @@ let T = class {
   }
 };
 B([
-  J({ path: ct, attribute: "agitating" })
+  J({ path: gt, attribute: "agitating" })
 ], T.prototype, "agitating", 2);
 B([
   U()
@@ -143,7 +143,7 @@ B([
 T = B([
   f(Pe),
   je(),
-  ue()
+  ce()
 ], T);
 const be = new b({
   class: T,
@@ -153,10 +153,10 @@ const be = new b({
   type: fe
 });
 te.addRelatedModel(be);
-var gt = Object.defineProperty, ht = Object.getOwnPropertyDescriptor, _e = (e, t, r, s) => {
+var ut = 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 && gt(t, r, a), a;
+  return s && a && ut(t, r, a), a;
 };
 const ve = "freestyle-assembly-model", pt = "iceAgitator", yt = "carbAgitator", ft = "remoteTrays";
 let D = class {
@@ -220,13 +220,13 @@ let D = class {
   }
   // -------------------LIFECYCLE----------------------------
   get supportsRemoteTrays() {
-    return x.isFeatureEnabled(ft);
+    return H.isFeatureEnabled(ft);
   }
   get supportsIce() {
-    return x.isFeatureEnabled(pt);
+    return H.isFeatureEnabled(pt);
   }
   get supportsCarb() {
-    return x.isFeatureEnabled(yt);
+    return H.isFeatureEnabled(yt);
   }
   async init() {
     this.logger.debug(`initializing freestyle-assembly ${this.id}`);
@@ -236,7 +236,7 @@ _e([
   de
 ], D.prototype, "_remoteTrays", 2);
 D = _e([
-  ce(),
+  ge(),
   f(ve)
 ], D);
 const W = new ee({
@@ -368,7 +368,7 @@ let Z = class {
 };
 Z = vt([
   f(Oe),
-  ue(),
+  ce(),
   Ue()
 ], Z);
 const re = new ee({
@@ -397,7 +397,7 @@ async function At(e, t) {
     return;
   const r = await e[t]();
   if (r != null && r.tracker)
-    return He.getFuture(r.tracker);
+    return xe.getFuture(r.tracker);
 }
 let Q = class {
   constructor(e, t, r) {
@@ -445,7 +445,7 @@ Q = Tt([
 const se = new b({
   class: Q,
   type: Ae
-}), { URL: Et } = L("FREESTYLE-NOZZLE_SERVICE"), { getOne: $t } = G.build({
+}), { URL: Et } = F("FREESTYLE-NOZZLE_SERVICE"), { getOne: $t } = G.build({
   basePath: `${Et}/api/freestyle-nozzle`
 }), C = $.createLogger({
   name: "freestyle-nozzle-service",
@@ -540,13 +540,13 @@ Ee([
   })
 ], N.prototype, "handleBeverageSelection", 1);
 N = Ee([
-  ce(),
+  ge(),
   f($e)
 ], N);
 const ne = new b({
   class: N,
   type: $e
-}), { URL: Ce } = L("PUMP_SERVICE"), { postModel: Rt } = G.build({
+}), { URL: Ce } = F("PUMP_SERVICE"), { postModel: Rt } = G.build({
   basePath: `${Ce}/api/ext/freestyle/microCalibration`
 }), q = $.createLogger({
   name: "freestyle-pump-service",
@@ -566,7 +566,7 @@ const ne = new b({
     if (q.error(
       `replacePump - sending POST request to /api/cal/${e}/code/${t}`,
       l
-    ), l instanceof xe) {
+    ), l instanceof He) {
       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 }];
     }
@@ -598,20 +598,20 @@ X = Nt([
 const le = new b({
   class: X,
   type: we
-}), { URL: I } = L("ICE_AGITATOR_SERVICE"), { getAll: Me, postModel: H } = G.build({
+}), { URL: I } = F("ICE_AGITATOR_SERVICE"), { getAll: Me, postModel: x } = G.build({
   basePath: `${I}/api/ext/freestyle/ice`
 }), Se = $.createLogger({
   name: "ice-agitator-service",
   group: "Services"
-}), Ft = async (e) => (Se.debug("sending GET for ice types"), await Me({
+}), Lt = async (e) => (Se.debug("sending GET for ice types"), await Me({
   urlOverride: `${I}/api/handle/${e}/types`
-})), Lt = async (e, t) => (Se.debug("sending POST for ice types"), await H({
+})), Ft = async (e, t) => (Se.debug("sending POST for ice types"), await x({
   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 H({
+  const r = await x({
     model: {},
     tracker: t,
     urlOverride: `${I}/api/handle/${e}/pour`
@@ -620,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 H({
+  const r = await x({
     model: {},
     tracker: t,
     urlOverride: `${I}/api/handle/${e}/test/agitation`
@@ -629,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 H({
+  const r = await x({
     model: {},
     tracker: t,
     urlOverride: `${I}/api/handle/${e}/test/gate`
@@ -638,21 +638,20 @@ 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, 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--)
+var xt = Object.defineProperty, Ht = Object.getOwnPropertyDescriptor, g = (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 && Ht(t, r, a), a;
+  return s && a && xt(t, r, a), a;
 };
-class F {
+class L {
 }
-o(F, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/ice-agitation-started"), o(F, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/ice-agitation-ended");
+o(L, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/ice-agitation-started"), o(L, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/ice-agitation-ended");
 const Re = "ice-agitator-model", De = j("statePath");
 let d = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "name");
     o(this, "path");
-    o(this, "futureHandler");
     o(this, "volWithoutIceMl");
     o(this, "durationSec");
     o(this, "enableIceChuteClear");
@@ -668,9 +667,9 @@ let d = class {
     o(this, "statePath");
     o(this, "_allIceTypes");
     o(this, "logger");
-    o(this, "currentState", u.IDLE);
+    o(this, "currentState", c.IDLE);
     o(this, "resetDefaultValues", async () => await Gt(this.path));
-    this.id = e, this.name = t.name, this.path = t.path, this.statePath = t.statePath, this._allIceTypes = [], this.logger = r.logger, this.futureHandler = new Ke(this);
+    this.id = e, this.name = t.name, this.path = t.path, this.statePath = t.statePath, this._allIceTypes = [], this.logger = r.logger;
   }
   get iceTypes() {
     return this._allIceTypes;
@@ -681,25 +680,14 @@ let d = class {
   get isIceChuteOpen() {
     return !!this.iceChuteOpen.value;
   }
-  get future() {
-    return this.futureHandler.future;
-  }
-  get pourFuture() {
-    return this.futureHandler.futureMap.get("pour");
-  }
-  get agitateFuture() {
-    return this.futureHandler.futureMap.get("agitate");
-  }
-  get gateFuture() {
-    return this.futureHandler.futureMap.get("gate");
-  }
+  // future, pourFuture, agitateFuture, gateFuture getters are now provided by @kosMultipleFutureAware decorator
   /**
    * A derived value that indicates if the nozzle is currently pouring a beverage.
    * @readonly
    */
   get isPouring() {
     var e;
-    return !!(this.pourFuture && !((e = this.pourFuture) != null && e.endState)) || this.currentState === u.POUR_STARTING || this.currentState === u.POURING || this.currentState === u.POUR_CANCELING;
+    return !!(this.pourFuture && !((e = this.pourFuture) != null && e.endState)) || this.currentState === c.POUR_STARTING || this.currentState === c.POURING || this.currentState === c.POUR_CANCELING;
   }
   /**
    * A derived value that indicates if it is possible to dispense ice.
@@ -708,7 +696,7 @@ let d = class {
    * @readonly
    * */
   get canPour() {
-    return this.currentState === u.IDLE;
+    return this.currentState === c.IDLE;
   }
   updateIfCurrent(e, t) {
     this.currentState === e && w(() => {
@@ -717,15 +705,15 @@ let d = class {
   }
   async pourIce(e) {
     try {
-      if (this.currentState === u.IDLE) {
-        if (this.updateIfCurrent(u.IDLE, u.POUR_STARTING), !e)
+      if (this.currentState === c.IDLE) {
+        if (this.updateIfCurrent(c.IDLE, c.POUR_STARTING), !e)
           throw new Error("No tracker provided");
         const t = await jt(this.path, e);
-        return this.updateIfCurrent(u.POUR_STARTING, u.POURING), t != null && t.endState && this.updateIfCurrent(u.POURING, u.IDLE), t;
+        return this.updateIfCurrent(c.POUR_STARTING, c.POURING), t != null && t.endState && this.updateIfCurrent(c.POURING, c.IDLE), t;
       } else
         throw new Error(`Cannot pour in state ${this.currentState}`);
     } catch (t) {
-      throw this.logger.error(t), this.currentState = u.IDLE, t;
+      throw this.logger.error(t), this.currentState = c.IDLE, t;
     }
   }
   /**
@@ -733,8 +721,8 @@ 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()), w(() => {
-      this.currentState = u.IDLE;
+    this.currentState === c.POURING || this.currentState === c.POUR_STARTING ? (this.currentState = c.POUR_CANCELING, await ((e = this.pourFuture) == null ? void 0 : e.cancelFuture()), w(() => {
+      this.currentState = c.IDLE;
     })) : this.logger.warn(
       `Cannot cancel ice dispense in state ${this.currentState}`
     );
@@ -751,34 +739,34 @@ let d = class {
   }
   handleAgitationChange() {
     var e;
-    this.isAgitating ? (this.logger.info(`agitating ice-agitator ${this.id}`), M.publish(F.TOPIC_AGITATION_STARTED, {
+    this.isAgitating ? (this.logger.info(`agitating ice-agitator ${this.id}`), M.publish(L.TOPIC_AGITATION_STARTED, {
       path: this.path,
       futureId: (e = this.futureHandler.future) == null ? void 0 : e.futureId
-    })) : M.publish(F.TOPIC_AGITATION_ENDED, {
+    })) : M.publish(L.TOPIC_AGITATION_ENDED, {
       path: this.path
     });
   }
   async updateIceType(e) {
-    await Lt(this.path, e);
+    await Ft(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 Ft(this.path);
+    const e = await Lt(this.path);
     (e == null ? void 0 : e.status) === 200 && w(() => {
       this._allIceTypes = e.data || [];
     });
   }
 };
-c([
+g([
   p({
     path: m,
     attribute: "settings.volWithoutIceMl"
   })
 ], d.prototype, "volWithoutIceMl", 2);
-c([
+g([
   p({
     path: m,
     attribute: "settings.durationSec",
@@ -787,49 +775,49 @@ c([
     }
   })
 ], d.prototype, "durationSec", 2);
-c([
+g([
   p({
     path: m,
     attribute: "enableIceChuteClear"
   })
 ], d.prototype, "enableIceChuteClear", 2);
-c([
+g([
   p({
     path: m,
     attribute: "iceChuteClearDurationMs"
   })
 ], d.prototype, "iceChuteClearDurationMs", 2);
-c([
+g([
   p({
     path: m,
     attribute: "iceChuteClearIntervalSec"
   })
 ], d.prototype, "iceChuteClearIntervalSec", 2);
-c([
+g([
   p({
     path: m,
     attribute: "iceChuteClearRetryIntervalSec"
   })
 ], d.prototype, "iceChuteClearRetryIntervalSec", 2);
-c([
+g([
   p({
     path: m,
     attribute: "maxDispenseSec"
   })
 ], d.prototype, "maxDispenseSec", 2);
-c([
+g([
   p({
     path: m,
     attribute: "type"
   })
 ], d.prototype, "type", 2);
-c([
+g([
   p({
     path: m,
     attribute: "settings.dilutionOffset"
   })
 ], d.prototype, "dilutionOffset", 2);
-c([
+g([
   p({
     path: m,
     attribute: "settings.inactivitySec",
@@ -838,30 +826,31 @@ c([
     }
   })
 ], d.prototype, "inactivitySec", 2);
-c([
+g([
   J({ path: De, attribute: "agitating" })
 ], d.prototype, "agitating", 2);
-c([
+g([
   J({ path: De, attribute: "iceChuteOpen" })
 ], d.prototype, "iceChuteOpen", 2);
-c([
+g([
   U({ alias: "pour" })
 ], d.prototype, "pourIce", 1);
-c([
+g([
   U({ alias: "agitate" })
 ], d.prototype, "testAgitate", 1);
-c([
+g([
   U({
     alias: "gate"
   })
 ], d.prototype, "testGate", 1);
-c([
+g([
   k({
     dependencies: (e) => [e.isAgitating]
   })
 ], d.prototype, "handleAgitationChange", 1);
-d = c([
-  f(Re)
+d = g([
+  f(Re),
+  Ke()
 ], d);
 const ze = new b({
   class: d,
@@ -925,7 +914,7 @@ ae([
 ], E.prototype, "agitateBeforePour", 2);
 ae([
   Ye({
-    topic: Ve(ge.type),
+    topic: Ve(ue.type),
     lifecycle: qe.INIT
   })
 ], E.prototype, "updateHolder", 1);
@@ -941,33 +930,33 @@ const Wt = new b({
 }, 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 O;
-    return Zt.forEach((g) => {
+    return Zt.forEach((u) => {
       var _;
-      const P = l[g];
+      const P = l[u];
       if (P) {
-        const Ne = Qt[g](P.path);
-        n[g] = Ne({
+        const Ne = Qt[u](P.path);
+        n[u] = Ne({
           name: P.name,
           path: P.path,
           statePath: ((_ = P.state) == null ? void 0 : _.path) || ""
         });
       }
-    }), (O = l.cartridgeAgitators) == null || O.forEach((g) => {
+    }), (O = l.cartridgeAgitators) == null || O.forEach((u) => {
       var _;
       const P = be.instance(
-        g.path
+        u.path
       ).options({
-        name: g.name,
-        path: g.path,
-        statePath: ((_ = g.state) == null ? void 0 : _.path) || ""
+        name: u.name,
+        path: u.path,
+        statePath: ((_ = u.state) == null ? void 0 : _.path) || ""
       }).build();
       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
+    }), l.remoteTrays && l.remoteTrays.forEach((u) => {
+      Xt.info(`Found remote tray ${u.name} with path ${u.path}`);
+      const P = `${A.type}-${u.holderPath}`, _ = A.instance(P).options({
+        holderPath: u.holderPath,
+        configPath: u.path,
+        name: u.name
       }).build();
       r.addModel(_);
     }), n;
@@ -983,7 +972,7 @@ const Wt = new b({
   Je.type,
   ne.type
 ), h.companion.register(e)(
-  ge.type,
+  ue.type,
   W.type
 ), Wt.register(), h.companion.register(e)(
   Ze.type,
@@ -1057,7 +1046,7 @@ export {
   Vt as A,
   pe as C,
   W as F,
-  F as I,
+  L as I,
   ar as K,
   Ct as N,
   re as R,
@@ -1077,4 +1066,4 @@ export {
   pt as n,
   Jt as r
 };
-//# sourceMappingURL=freestyle-registration-manager-CClN6mVr.js.map
+//# sourceMappingURL=freestyle-registration-manager-z0aYdMcC.js.map