@kosdev-code/kos-ddk-models 2.1.2 → 3.0.0

package/index.mjs

@@ -1,39 +1,64 @@
-var yo = Object.defineProperty;
-var fo = (e, t, o) => t in e ? yo(e, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[t] = o;
-var i = (e, t, o) => (fo(e, typeof t != "symbol" ? t + "" : t, o), o);
-import { resolveServiceUrl as h, ServiceFactory as y, KosLog as g, kosTopicHandler as Te, kosModel as l, kosAction as v, Kos as c, isKosModel as u, createPropKey as ht, kosStateProp as vo, kosConfigProperty as d, KosModelRegistrationFactory as mo, kosDependency as p, KosModelContainer as Ve, resolveContainerDeltas as it, kosChild as $e, Device as bo, kosFuture as M, kosModelEffect as Pe, MultipleFutureHandler as _o, FutureEndState as T, TroubleServices as Me, Troubles as nt, SingletonKosModelRegistrationFactory as He, getKosCompanionModel as Be, FetchError as yt, StorageDeviceContainer as To, kosFutureAware as $o, kosLoggerAware as Ke, KosDataContainer as Po, TroubleContainer as Ye, FutureHandler as Ge, troubleByTypeReducer as Mo, registerExtensionPoint as Oo, ExtensionManager as Oe, kosConfigBean as So, kosStateBean as wo, ObservableData as Eo } from "@kosdev-code/kos-ui-sdk";
-import { AGITATION_REQUIRED_TROUBLE as ft, CartridgeAgitatorEvents as vt, FcmPump as mt, FreestyleHolder as Co } from "@kosdev-code/kos-freestyle-sdk";
-import { Assembly as Se, HolderContainer as Lo, IngredientContainer as Do } from "@kosdev-code/kos-dispense-sdk";
-const at = "PurgeTrouble", ko = "PrimeTrouble", { URL: qe } = h("AUTH_SERVICE"), { getOne: Io, postModel: Ro } = y.build({
-  basePath: `${qe}/api/auth`
-}), bt = g.createLogger({ name: "auth-service", group: "Services" }), _t = async () => (bt.debug("sending GET for auth"), await Io({
-  urlOverride: `${qe}/api/app/kosdev.ddk/auth/role`
-})), Tt = async (e) => (bt.debug("sending POST for auth"), await Ro({
-  urlOverride: `${qe}/api/app/kosdev.ddk/auth/pincode/${e}`,
-  model: {}
-})), Bs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+import { resolveServiceUrl, ServiceFactory, KosLog, kosTopicHandler, kosModel, kosAction, Kos, isKosModel, createPropKey, kosStateProp, kosConfigProperty, KosModelRegistrationFactory, kosDependency, KosModelContainer, resolveContainerDeltas, kosChild, Device, kosFuture, kosModelEffect, MultipleFutureHandler, FutureEndState, TroubleServices, Troubles, SingletonKosModelRegistrationFactory, getKosCompanionModel, FetchError, StorageDeviceContainer, kosFutureAware, kosLoggerAware, KosDataContainer, TroubleContainer, FutureHandler, troubleByTypeReducer, registerExtensionPoint, ExtensionManager, kosConfigBean, kosStateBean, ObservableData } from "@kosdev-code/kos-ui-sdk";
+import { AGITATION_REQUIRED_TROUBLE, CartridgeAgitatorEvents, FcmPump, FreestyleHolder } from "@kosdev-code/kos-freestyle-sdk";
+import { Assembly, HolderContainer, IngredientContainer } from "@kosdev-code/kos-dispense-sdk";
+const TROUBLE_TYPE_PURGE$1 = "PurgeTrouble";
+const TROUBLE_TYPE_PRIME$1 = "PrimeTrouble";
+const { URL: URL$d } = resolveServiceUrl("AUTH_SERVICE");
+const { getOne: getOne$4, postModel: postModel$4 } = ServiceFactory.build({
+  basePath: `${URL$d}/api/auth`
+});
+const log$e = KosLog.createLogger({ name: "auth-service", group: "Services" });
+const getCurrentRole = async () => {
+  log$e.debug("sending GET for auth");
+  const response = await getOne$4({
+    urlOverride: `${URL$d}/api/app/kosdev.ddk/auth/role`
+  });
+  return response;
+};
+const sendPinCode = async (pinCode) => {
+  log$e.debug("sending POST for auth");
+  const response = await postModel$4({
+    urlOverride: `${URL$d}/api/app/kosdev.ddk/auth/pincode/${pinCode}`,
+    model: {}
+  });
+  return response;
+};
+const index$d = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getCurrentRole: _t,
-  sendPinCode: Tt
+  getCurrentRole,
+  sendPinCode
 }, Symbol.toStringTag, { value: "Module" }));
-var Ao = Object.defineProperty, Fo = Object.getOwnPropertyDescriptor, $t = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? Fo(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && Ao(t, o, r), r;
-};
-const x = "auth-model", lt = (e) => e.toLowerCase();
-let he = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "logger");
-    i(this, "currentRole");
-    this.id = e, this.logger = o.logger, this.currentRole = "crew";
-  }
-  async authorize(e) {
-    if (!e)
-      return !1;
-    const t = await Tt(e);
-    return (t == null ? void 0 : t.status) === 200 ? t.data : !1;
+var __defProp$j = Object.defineProperty;
+var __getOwnPropDesc$p = Object.getOwnPropertyDescriptor;
+var __decorateClass$p = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$p(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$j(target, key, result);
+  return result;
+};
+const MODEL_TYPE$p = "auth-model";
+const convertAuthResponse = (response) => response.toLowerCase();
+let AuthModelImpl = class {
+  id;
+  logger;
+  currentRole;
+  constructor(modelId, options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
+    this.currentRole = "crew";
+  }
+  async authorize(pinCode) {
+    if (!pinCode) {
+      return false;
+    }
+    const response = await sendPinCode(pinCode);
+    if (response?.status === 200) {
+      return response.data;
+    } else {
+      return false;
+    }
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -41,112 +66,158 @@ let he = class {
   }
   async load() {
     this.logger.debug(`loading auth ${this.id}`);
-    const e = await _t();
-    (e == null ? void 0 : e.status) === 200 && (this.logger.debug(`response ${e.data}`), v(() => {
-      this.currentRole = lt(e.data);
-    }));
+    const response = await getCurrentRole();
+    if (response?.status === 200) {
+      this.logger.debug(`response ${response.data}`);
+      kosAction(() => {
+        this.currentRole = convertAuthResponse(response.data);
+      });
+    }
   }
-  handleRoleChange(e) {
-    this.currentRole = lt(e);
+  handleRoleChange(role) {
+    this.currentRole = convertAuthResponse(role);
   }
-  forceRole(e) {
-    this.currentRole = e;
+  forceRole(role) {
+    this.currentRole = role;
   }
 };
-$t([
-  Te({
+__decorateClass$p([
+  kosTopicHandler({
     topic: "/app/kosdev.ddk/auth/role",
-    websocket: !0
+    websocket: true
   })
-], he.prototype, "handleRoleChange", 1);
-he = $t([
-  l(x)
-], he);
-const Qe = {
+], AuthModelImpl.prototype, "handleRoleChange", 1);
+AuthModelImpl = __decorateClass$p([
+  kosModel(MODEL_TYPE$p)
+], AuthModelImpl);
+const Auth = {
   registration: {
-    [x]: {
-      class: he,
-      singleton: !1
+    [MODEL_TYPE$p]: {
+      class: AuthModelImpl,
+      singleton: false
     }
   },
-  type: x,
-  predicate: u(x),
-  factory: c.Factory.create(x)
-};
-var xo = Object.defineProperty, Uo = Object.getOwnPropertyDescriptor, Xe = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? Uo(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && xo(t, o, r), r;
-};
-const Pt = "door-model", jo = ht("doorPath");
-let re = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "logger");
-    i(this, "doorPath");
-    i(this, "open");
-    i(this, "ignoreDoor");
-    this.id = e, this.logger = o.logger, this.doorPath = t.doorPath;
+  type: MODEL_TYPE$p,
+  predicate: isKosModel(MODEL_TYPE$p),
+  factory: Kos.Factory.create(MODEL_TYPE$p)
+};
+var __defProp$i = Object.defineProperty;
+var __getOwnPropDesc$o = Object.getOwnPropertyDescriptor;
+var __decorateClass$o = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$o(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$i(target, key, result);
+  return result;
+};
+const MODEL_TYPE$o = "door-model";
+const PROP_PATH = createPropKey("doorPath");
+let DoorModelImpl = class {
+  id;
+  logger;
+  doorPath;
+  open;
+  ignoreDoor;
+  constructor(modelId, options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
+    this.doorPath = options.doorPath;
   }
   get currentState() {
-    return this.open.value === void 0 ? "UNKNOWN" : this.open.value ? "OPEN" : "CLOSED";
+    if (this.open.value === void 0) {
+      return "UNKNOWN";
+    }
+    return this.open.value ? "OPEN" : "CLOSED";
   }
   get isOpen() {
-    const e = this.open.value === void 0 ? !0 : this.open.value;
-    return this.ignoreDoor.value ? (this.logger.debug(
-      "Door state is being ignored (treating as closed) due to ignoreDoor config property being true."
-    ), !1) : e;
+    const value = this.open.value === void 0 ? true : this.open.value;
+    const ignore = this.ignoreDoor.value;
+    if (ignore) {
+      this.logger.debug(
+        `Door state is being ignored (treating as closed) due to ignoreDoor config property being true.`
+      );
+      return false;
+    }
+    return value;
   }
 };
-Xe([
-  vo({ path: jo, attribute: "state" })
-], re.prototype, "open", 2);
-Xe([
-  d({
+__decorateClass$o([
+  kosStateProp({ path: PROP_PATH, attribute: "state" })
+], DoorModelImpl.prototype, "open", 2);
+__decorateClass$o([
+  kosConfigProperty({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.ignoreDoorStateOnExit"
   })
-], re.prototype, "ignoreDoor", 2);
-re = Xe([
-  l(Pt)
-], re);
-const Wo = new mo({
-  class: re,
-  type: Pt
-}), { URL: Je } = h("SETUP-STEP_SERVICE"), { getAll: No, postModel: zo } = y.build({
-  basePath: `${Je}/api/setup-step`
-}), Mt = g.createLogger({
+], DoorModelImpl.prototype, "ignoreDoor", 2);
+DoorModelImpl = __decorateClass$o([
+  kosModel(MODEL_TYPE$o)
+], DoorModelImpl);
+const Door = new KosModelRegistrationFactory({
+  class: DoorModelImpl,
+  type: MODEL_TYPE$o
+});
+const { URL: URL$c } = resolveServiceUrl("SETUP-STEP_SERVICE");
+const { getAll: getAll$9, postModel: postModel$3 } = ServiceFactory.build({
+  basePath: `${URL$c}/api/setup-step`
+});
+const log$d = KosLog.createLogger({
   name: "setup-step-service",
   group: "Services"
-}), Ot = async () => (Mt.debug("sending GET for setup-step"), await No({
-  urlOverride: `${Je}/api/app/kosdev.ddk/setup/steps`
-})), St = async (e) => (Mt.debug("sending POST for setup-step"), await zo({
-  urlOverride: `${Je}/api/app/kosdev.ddk/setup/complete/${e}`,
-  model: {}
-})), Ks = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+});
+const getSetupSteps = async () => {
+  log$d.debug("sending GET for setup-step");
+  const response = await getAll$9({
+    urlOverride: `${URL$c}/api/app/kosdev.ddk/setup/steps`
+  });
+  return response;
+};
+const markStepComplete = async (stepId) => {
+  log$d.debug("sending POST for setup-step");
+  const response = await postModel$3({
+    urlOverride: `${URL$c}/api/app/kosdev.ddk/setup/complete/${stepId}`,
+    model: {}
+  });
+  return response;
+};
+const index$c = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getSetupSteps: Ot,
-  markStepComplete: St
+  getSetupSteps,
+  markStepComplete
 }, Symbol.toStringTag, { value: "Module" }));
-var Vo = Object.getOwnPropertyDescriptor, Ho = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? Vo(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = a(r) || r);
-  return r;
-};
-const U = "setup-step-model";
-let Ae = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "idx");
-    i(this, "name");
-    i(this, "complete");
-    i(this, "preStep");
-    i(this, "exclusive");
-    i(this, "logger");
-    this.id = e, this.idx = t.idx, this.logger = o.logger, this.name = t.name, this.complete = t.complete, this.preStep = t.preStep, this.exclusive = t.exclusive;
-  }
-  updateModel(e) {
-    this.name = e.name, this.idx = e.idx, this.complete = e.complete, this.preStep = e.preStep, this.exclusive = e.exclusive;
+var __getOwnPropDesc$n = Object.getOwnPropertyDescriptor;
+var __decorateClass$n = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$n(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = decorator(result) || result;
+  return result;
+};
+const MODEL_TYPE$n = "setup-step-model";
+let SetupStepModelImpl = class {
+  id;
+  idx;
+  name;
+  complete;
+  preStep;
+  exclusive;
+  logger;
+  constructor(modelId, options, context) {
+    this.id = modelId;
+    this.idx = options.idx;
+    this.logger = context.logger;
+    this.name = options.name;
+    this.complete = options.complete;
+    this.preStep = options.preStep;
+    this.exclusive = options.exclusive;
+  }
+  updateModel(options) {
+    this.name = options.name;
+    this.idx = options.idx;
+    this.complete = options.complete;
+    this.preStep = options.preStep;
+    this.exclusive = options.exclusive;
   }
   get titleKey() {
     return `setup.${this.name}.title`;
@@ -155,10 +226,12 @@ let Ae = class {
     return `setup.${this.name}.body`;
   }
   async completeStep() {
-    const e = await St(this.name);
-    (e == null ? void 0 : e.status) === 200 && v(() => {
-      this.complete = !0;
-    });
+    const response = await markStepComplete(this.name);
+    if (response?.status === 200) {
+      kosAction(() => {
+        this.complete = true;
+      });
+    }
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -168,88 +241,101 @@ let Ae = class {
     this.logger.debug(`loading setup-step ${this.id}`);
   }
 };
-Ae = Ho([
-  l(U)
-], Ae);
-const wt = {
+SetupStepModelImpl = __decorateClass$n([
+  kosModel(MODEL_TYPE$n)
+], SetupStepModelImpl);
+const SetupStep = {
   registration: {
-    [U]: {
-      class: Ae,
-      singleton: !1
+    [MODEL_TYPE$n]: {
+      class: SetupStepModelImpl,
+      singleton: false
     }
   },
-  type: U,
-  predicate: u(U),
-  factory: c.Factory.create(U)
-};
-var Bo = Object.defineProperty, Ko = Object.getOwnPropertyDescriptor, we = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? Ko(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && Bo(t, o, r), r;
-};
-const j = "setup-step-container-model";
-function dt(e) {
-  return (t) => {
-    const o = wt.factory(t.id)(t);
-    o.updateModel(t), e.addModel(o);
+  type: MODEL_TYPE$n,
+  predicate: isKosModel(MODEL_TYPE$n),
+  factory: Kos.Factory.create(MODEL_TYPE$n)
+};
+var __defProp$h = Object.defineProperty;
+var __getOwnPropDesc$m = Object.getOwnPropertyDescriptor;
+var __decorateClass$m = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$m(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$h(target, key, result);
+  return result;
+};
+const MODEL_TYPE$m = "setup-step-container-model";
+function addStep(container) {
+  return (step) => {
+    const model = SetupStep.factory(step.id)(step);
+    model.updateModel(step);
+    container.addModel(model);
   };
 }
-function ct(e) {
-  return (t) => {
-    e.removeModel(t);
+function removeStep(container) {
+  return (id) => {
+    container.removeModel(id);
   };
 }
-let E = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "_currentStep");
-    i(this, "logger");
-    i(this, "models");
-    i(this, "authModel");
-    this.id = e, this.logger = o.logger, this._currentStep = void 0, this.models = new Ve({
-      parentId: e,
+let SetupStepContainerModelImpl = class {
+  id;
+  _currentStep;
+  logger;
+  models;
+  authModel;
+  constructor(modelId, options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
+    this._currentStep = void 0;
+    this.models = new KosModelContainer({
+      parentId: modelId,
       sortKey: "idx"
     });
   }
   get currentStep() {
     return this._currentStep;
   }
-  setCurrentStep(e) {
-    const t = this.models.getModel(e);
-    t && (this._currentStep = t);
+  setCurrentStep(id) {
+    const step = this.models.getModel(id);
+    if (step) {
+      this._currentStep = step;
+    }
   }
   nextStep() {
-    if (!this._currentStep)
+    if (!this._currentStep) {
       this._currentStep = this.firstIncompleteStep;
-    else {
-      const e = this._currentStep.idx, t = this.models.data.find((o) => o.idx > e);
-      t && (this._currentStep = t);
+    } else {
+      const currentIdx = this._currentStep.idx;
+      const nextStep = this.models.data.find((step) => step.idx > currentIdx);
+      if (nextStep) {
+        this._currentStep = nextStep;
+      }
     }
   }
   get hasIncompletePreSteps() {
-    return this.models.data.some((e) => e.preStep && !e.complete);
+    return this.models.data.some((step) => step.preStep && !step.complete);
   }
   get setupRequired() {
-    return this.models.data.some((e) => !e.complete);
+    return this.models.data.some((step) => !step.complete);
   }
   get firstIncompleteStep() {
-    return this.models.data.find((e) => !e.complete);
+    return this.models.data.find((step) => !step.complete);
   }
   get isLastStep() {
-    var e;
-    return this.models.data[this.models.data.length - 1].id === ((e = this._currentStep) == null ? void 0 : e.id);
+    return this.models.data[this.models.data.length - 1].id === this._currentStep?.id;
   }
   get data() {
     return this.models.data;
   }
-  getModel(e) {
-    return this.models.getModel(e);
+  getModel(id) {
+    return this.models.getModel(id);
   }
-  addModel(e) {
-    this.models.addModel(e);
+  addModel(model) {
+    this.models.addModel(model);
   }
-  removeModel(e) {
-    this.models.removeModel(e);
+  removeModel(id) {
+    this.models.removeModel(id);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -257,156 +343,190 @@ let E = class {
   }
   async load() {
     this.logger.debug(`loading setup-step-container container ${this.id}`);
-    const e = await Ot();
-    if (e != null && e.data) {
-      const t = e.data.map(
-        (o, s) => ({
-          ...o,
-          idx: s,
-          id: `setup-${o.name}`
-        })
+    const response = await getSetupSteps();
+    if (response?.data) {
+      const identifiableSteps = response.data.map(
+        (step, index2) => {
+          return {
+            ...step,
+            idx: index2,
+            id: `setup-${step.name}`
+          };
+        }
       );
-      it({
+      resolveContainerDeltas({
         container: this.models,
-        onAddItem: dt(this),
-        onRemoveItem: ct(this)
-      })(t);
+        onAddItem: addStep(this),
+        onRemoveItem: removeStep(this)
+      })(identifiableSteps);
     }
     this.nextStep();
   }
-  handleStepChanges(e) {
-    const t = e.map((o, s) => ({
-      ...o,
-      idx: s,
-      id: `setup-${o.name}`
-    }));
-    it({
+  handleStepChanges(steps) {
+    const identifiableSteps = steps.map((step, index2) => {
+      return {
+        ...step,
+        idx: index2,
+        id: `setup-${step.name}`
+      };
+    });
+    resolveContainerDeltas({
       container: this.models,
-      onAddItem: dt(this),
-      onRemoveItem: ct(this)
-    })(t);
-  }
-};
-we([
-  $e
-], E.prototype, "models", 2);
-we([
-  p({ modelType: Qe.type })
-], E.prototype, "authModel", 2);
-we([
-  Te({
+      onAddItem: addStep(this),
+      onRemoveItem: removeStep(this)
+    })(identifiableSteps);
+  }
+};
+__decorateClass$m([
+  kosChild
+], SetupStepContainerModelImpl.prototype, "models", 2);
+__decorateClass$m([
+  kosDependency({ modelType: Auth.type })
+], SetupStepContainerModelImpl.prototype, "authModel", 2);
+__decorateClass$m([
+  kosTopicHandler({
     topic: "/app/kosdev.ddk/setup/steps",
-    websocket: !0
+    websocket: true
   })
-], E.prototype, "handleStepChanges", 1);
-E = we([
-  l(j)
-], E);
-const Et = {
+], SetupStepContainerModelImpl.prototype, "handleStepChanges", 1);
+SetupStepContainerModelImpl = __decorateClass$m([
+  kosModel(MODEL_TYPE$m)
+], SetupStepContainerModelImpl);
+const SetupStepContainer = {
   registration: {
-    [j]: {
-      class: E,
-      singleton: !0
+    [MODEL_TYPE$m]: {
+      class: SetupStepContainerModelImpl,
+      singleton: true
     },
-    ...wt.registration
+    ...SetupStep.registration
   },
-  type: j,
-  predicate: u(j),
-  factory: c.Singleton.create(j)
-}, { URL: S } = h("AUTH_SERVICE"), { getOne: Ct, getAll: pe } = y.build({
-  basePath: `${S}/api/app/kosdev.ddk/ncui/`
-}), se = g.createLogger({ name: "auth-service", group: "Services" }), Yo = async () => {
-  se.debug("sending GET for cuis");
-  const e = await pe({
-    urlOverride: `${S}/api/app/kosdev.ddk/cui`
+  type: MODEL_TYPE$m,
+  predicate: isKosModel(MODEL_TYPE$m),
+  factory: Kos.Singleton.create(MODEL_TYPE$m)
+};
+const { URL: URL$b } = resolveServiceUrl("AUTH_SERVICE");
+const { getOne: getOne$3, getAll: getAll$8 } = ServiceFactory.build({
+  basePath: `${URL$b}/api/app/kosdev.ddk/ncui/`
+});
+const log$c = KosLog.createLogger({ name: "auth-service", group: "Services" });
+const getCuis = async () => {
+  log$c.debug("sending GET for cuis");
+  const response = await getAll$8({
+    urlOverride: `${URL$b}/api/app/kosdev.ddk/cui`
   });
-  if ((e == null ? void 0 : e.status) !== 200)
+  if (response?.status !== 200) {
     throw new Error("Failed to retrieve cuis");
-  return e.data;
-}, Go = async () => {
-  se.debug("sending GET for navigation");
+  }
+  return response.data;
+};
+const getNavigation = async () => {
+  log$c.debug("sending GET for navigation");
   try {
-    const e = await pe({
-      urlOverride: `${S}/api/kos/descriptor/app:kosdev.ddk:ncuiDescriptor/kondra.ncui.navigations`
+    const extensionResponse = await getAll$8({
+      urlOverride: `${URL$b}/api/kos/descriptor/app:kosdev.ddk:ncuiDescriptor/kondra.ncui.navigations`
     });
-    if ((e == null ? void 0 : e.status) !== 200) {
-      se.info("no extensions found, using base data");
-      const t = await pe({
-        urlOverride: `${S}/api/kos/descriptor/system:app/kondra.ncui.navigations`
+    if (extensionResponse?.status !== 200) {
+      log$c.info(`no extensions found, using base data`);
+      const response = await getAll$8({
+        urlOverride: `${URL$b}/api/kos/descriptor/system:app/kondra.ncui.navigations`
       });
-      return (t == null ? void 0 : t.data) ?? [];
+      return response?.data ?? [];
     }
-    return (e == null ? void 0 : e.data) ?? [];
-  } catch {
-    const t = await pe({
-      urlOverride: `${S}/api/kos/descriptor/system:app/kondra.ncui.navigations`
+    return extensionResponse?.data ?? [];
+  } catch (error) {
+    const response = await getAll$8({
+      urlOverride: `${URL$b}/api/kos/descriptor/system:app/kondra.ncui.navigations`
     });
-    return (t == null ? void 0 : t.data) ?? [];
-  }
-}, qo = async () => (se.debug("navigating to CUI"), await Ct({
-  urlOverride: `${S}/api/app/kosdev.ddk/cui/open`
-})), Qo = async () => (se.debug("navigating to NCUI"), await Ct({
-  urlOverride: `${S}/api/app/kosdev.ddk/ncui/open`
-}));
-var Xo = Object.defineProperty, Jo = Object.getOwnPropertyDescriptor, O = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? Jo(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && Xo(t, o, r), r;
-};
-const W = "application-model", Lt = (e, t = "") => e.reduce((o, s) => {
-  const r = t ? `${t}.${s.name}` : s.name;
-  if (o[r] = { ...s, root: !t }, s.children) {
-    const n = Lt(s.children, r);
-    Object.keys(n).forEach((a) => {
-      o[a] = n[a];
+    return response?.data ?? [];
+  }
+};
+const navigateToCui = async () => {
+  log$c.debug("navigating to CUI");
+  const response = await getOne$3({
+    urlOverride: `${URL$b}/api/app/kosdev.ddk/cui/open`
+  });
+  return response;
+};
+const navigateToNCui$1 = async () => {
+  log$c.debug("navigating to NCUI");
+  const response = await getOne$3({
+    urlOverride: `${URL$b}/api/app/kosdev.ddk/ncui/open`
+  });
+  return response;
+};
+var __defProp$g = Object.defineProperty;
+var __getOwnPropDesc$l = Object.getOwnPropertyDescriptor;
+var __decorateClass$l = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$l(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$g(target, key, result);
+  return result;
+};
+const MODEL_TYPE$l = "application-model";
+const flattenNavigationItems = (items, path = "") => items.reduce((acc, item) => {
+  const itemPath = path ? `${path}.${item.name}` : item.name;
+  acc[itemPath] = { ...item, root: !path };
+  if (item.children) {
+    const childItems = flattenNavigationItems(item.children, itemPath);
+    Object.keys(childItems).forEach((key) => {
+      acc[key] = childItems[key];
     });
   }
-  return o;
+  return acc;
 }, {});
-let b = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "device");
-    i(this, "authModel");
-    i(this, "setupStepContainer");
-    i(this, "door");
-    i(this, "ncuiLanguage");
-    i(this, "activeCui");
-    i(this, "fallbackCui");
-    i(this, "_cuis", []);
-    i(this, "_navigationItems", []);
-    // @kosConfigProperty({
-    //   path: 'somewhere.enable.dial.animation',
-    //   attribute: 'enableDialAnimation',
-    // })
-    // enableDialAnimation!: KosConfigProperty<boolean>;
-    // @kosConfigProperty({
-    //   path: 'somewhere.enable.modal.animation',
-    //   attribute: 'enableModalAnimation',
-    // })
-    // enableModalAnimation!: KosConfigProperty<boolean>;
-    // @kosConfigProperty({
-    //   path: 'somewhere.enable.sidebar.animation',
-    //   attribute: 'enableSidebarAnimation',
-    // })
-    // enableSidebarAnimation!: KosConfigProperty<boolean>;
-    i(this, "languages");
-    i(this, "logger");
-    this.id = e, this.languages = [], this._cuis = [], this.logger = o.logger, this.door = Wo.instance("app:kosdev.ddk:service:door:door").options({
+let ApplicationModelImpl = class {
+  id;
+  device;
+  authModel;
+  setupStepContainer;
+  door;
+  ncuiLanguage;
+  activeCui;
+  fallbackCui;
+  _cuis = [];
+  _navigationItems = [];
+  // @kosConfigProperty({
+  //   path: 'somewhere.enable.dial.animation',
+  //   attribute: 'enableDialAnimation',
+  // })
+  // enableDialAnimation!: KosConfigProperty<boolean>;
+  // @kosConfigProperty({
+  //   path: 'somewhere.enable.modal.animation',
+  //   attribute: 'enableModalAnimation',
+  // })
+  // enableModalAnimation!: KosConfigProperty<boolean>;
+  // @kosConfigProperty({
+  //   path: 'somewhere.enable.sidebar.animation',
+  //   attribute: 'enableSidebarAnimation',
+  // })
+  // enableSidebarAnimation!: KosConfigProperty<boolean>;
+  languages;
+  logger;
+  constructor(modelId, _options, context) {
+    this.id = modelId;
+    this.languages = [];
+    this._cuis = [];
+    this.logger = context.logger;
+    this.door = Door.instance("app:kosdev.ddk:service:door:door").options({
       doorPath: "app:kosdev.ddk:service:door:door"
     }).build();
   }
   get setupRequired() {
-    return this.authModel.currentRole === "crew" ? !1 : this.setupStepContainer.setupRequired;
+    return this.authModel.currentRole === "crew" ? false : this.setupStepContainer.setupRequired;
   }
   get currentRole() {
     return this.authModel.currentRole;
   }
   get cuis() {
-    return this._cuis.reduce((e, t) => (e[t.appId] = t, e), {});
+    return this._cuis.reduce((acc, cui) => {
+      acc[cui.appId] = cui;
+      return acc;
+    }, {});
   }
   get navigationItems() {
-    return Lt(this._navigationItems);
+    return flattenNavigationItems(this._navigationItems);
   }
   get hasCuiDefined() {
     return !!this.activeCui.value || !!this.fallbackCui.value;
@@ -415,19 +535,24 @@ let b = class {
     return this.door.isOpen;
   }
   async enter() {
-    this.logger.info("navigating to NCUI"), await Qo();
+    this.logger.info("navigating to NCUI");
+    await navigateToNCui$1();
   }
   async exit() {
-    this.logger.info("navigating to CUI"), await qo();
+    this.logger.info("navigating to CUI");
+    await navigateToCui();
   }
   // -------------------LIFECYCLE----------------------------
   async load() {
-    var o, s;
     this.logger.debug(`loading application ${this.id}`);
-    const e = await Go();
-    this._navigationItems = e;
-    const t = await Yo();
-    this._cuis = t, (o = this.setupStepContainer) != null && o.hasIncompletePreSteps && ((s = this.authModel) == null || s.forceRole("technician")), this.languages = [
+    const navigationItems = await getNavigation();
+    this._navigationItems = navigationItems;
+    const cuis = await getCuis();
+    this._cuis = cuis;
+    if (this.setupStepContainer?.hasIncompletePreSteps) {
+      this.authModel?.forceRole("technician");
+    }
+    this.languages = [
       {
         name: "English",
         locale: "en"
@@ -435,90 +560,103 @@ let b = class {
     ];
   }
 };
-O([
-  p({ modelType: bo.type })
-], b.prototype, "device", 2);
-O([
-  p({ modelType: Qe.type })
-], b.prototype, "authModel", 2);
-O([
-  p({ modelType: Et.type })
-], b.prototype, "setupStepContainer", 2);
-O([
-  $e
-], b.prototype, "door", 2);
-O([
-  d({
+__decorateClass$l([
+  kosDependency({ modelType: Device.type })
+], ApplicationModelImpl.prototype, "device", 2);
+__decorateClass$l([
+  kosDependency({ modelType: Auth.type })
+], ApplicationModelImpl.prototype, "authModel", 2);
+__decorateClass$l([
+  kosDependency({ modelType: SetupStepContainer.type })
+], ApplicationModelImpl.prototype, "setupStepContainer", 2);
+__decorateClass$l([
+  kosChild
+], ApplicationModelImpl.prototype, "door", 2);
+__decorateClass$l([
+  kosConfigProperty({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.ncuiLanguage"
     //updated attribute for language config property
   })
-], b.prototype, "ncuiLanguage", 2);
-O([
-  d({
+], ApplicationModelImpl.prototype, "ncuiLanguage", 2);
+__decorateClass$l([
+  kosConfigProperty({
     path: "app:kosdev.ddk:service:cui",
     attribute: "activeCui"
   })
-], b.prototype, "activeCui", 2);
-O([
-  d({
+], ApplicationModelImpl.prototype, "activeCui", 2);
+__decorateClass$l([
+  kosConfigProperty({
     path: "app:kosdev.ddk:service:cui",
     attribute: "fallbackCui"
   })
-], b.prototype, "fallbackCui", 2);
-b = O([
-  l(W)
-], b);
-const Ze = {
+], ApplicationModelImpl.prototype, "fallbackCui", 2);
+ApplicationModelImpl = __decorateClass$l([
+  kosModel(MODEL_TYPE$l)
+], ApplicationModelImpl);
+const Application = {
   registration: {
-    [W]: {
-      class: b,
-      singleton: !0
+    [MODEL_TYPE$l]: {
+      class: ApplicationModelImpl,
+      singleton: true
     }
   },
-  type: W,
-  predicate: u(W),
-  factory: c.Singleton.create(
-    W
+  type: MODEL_TYPE$l,
+  predicate: isKosModel(MODEL_TYPE$l),
+  factory: Kos.Singleton.create(
+    MODEL_TYPE$l
   )
-}, ue = {
+};
+const RoleMap = {
   none: 999,
   crew: 0,
   technician: 1,
   manager: 2
-}, Dt = (e) => (t) => {
-  if (t.type === ft)
-    return !1;
-  const o = (t == null ? void 0 : t.role) || "technician";
-  if (e && o) {
-    const s = ue[e.toLowerCase()] ?? ue.crew, r = ue[o.toLowerCase()] ?? ue.crew;
-    return s >= r;
-  }
-  return !1;
-};
-var Zo = Object.defineProperty, er = Object.getOwnPropertyDescriptor, I = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? er(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && Zo(t, o, r), r;
-};
-const kt = "agitation-control-model", Fe = "resolve", tr = "agitate";
-let $ = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "futureHandler");
-    i(this, "logger");
-    i(this, "troubleContainer");
-    i(this, "_agitationFutureId");
-    i(this, "_canExit", !0);
-    i(this, "_exiting", !1);
-    i(this, "_isFailed", !1);
-    i(this, "disposer");
-    i(this, "application");
-    i(this, "inProgress", []);
-    this.id = e, this.logger = o.logger, this.troubleContainer = t.companionParent, this.futureHandler = new _o(this, Fe);
-  }
-  set isFailed(e) {
-    this._isFailed = e;
+};
+const troubleVisibilityFilter = (currentRole) => (trouble) => {
+  if (trouble.type === AGITATION_REQUIRED_TROUBLE) {
+    return false;
+  }
+  const visibleRole = trouble?.role || "technician";
+  if (currentRole && visibleRole) {
+    const currentRoleIndex = RoleMap[currentRole.toLowerCase()] ?? RoleMap["crew"];
+    const visibleRoleIndex = RoleMap[visibleRole.toLowerCase()] ?? RoleMap["crew"];
+    return currentRoleIndex >= visibleRoleIndex;
+  }
+  return false;
+};
+var __defProp$f = Object.defineProperty;
+var __getOwnPropDesc$k = Object.getOwnPropertyDescriptor;
+var __decorateClass$k = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$k(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$f(target, key, result);
+  return result;
+};
+const MODEL_TYPE$k = "agitation-control-model";
+const FUTURE_RESOLVE = "resolve";
+const FUTURE_AGITATE = "agitate";
+let AgitationControlModelImpl = class {
+  id;
+  futureHandler;
+  logger;
+  troubleContainer;
+  _agitationFutureId;
+  _canExit = true;
+  _exiting = false;
+  _isFailed = false;
+  disposer;
+  application;
+  constructor(modelId, options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
+    this.troubleContainer = options.companionParent;
+    this.futureHandler = new MultipleFutureHandler(this, FUTURE_RESOLVE);
+  }
+  set isFailed(value) {
+    this._isFailed = value;
   }
   get isFailed() {
     return this._isFailed;
@@ -529,188 +667,241 @@ let $ = class {
   get isAgitating() {
     return !!this._agitationFutureId;
   }
-  set exiting(e) {
-    this._exiting = e;
+  set exiting(value) {
+    this._exiting = value;
   }
   get exiting() {
     return this._exiting;
   }
   get canExit() {
-    return this.queuedTroubles.length === 0 && this._canExit;
+    const allDeferredCount = this.queuedTroubles.length;
+    return allDeferredCount === 0 && this._canExit;
   }
   clearAll() {
-    this.queuedTroubles.forEach((e) => {
-      e.clearDefer();
+    this.queuedTroubles.forEach((trouble) => {
+      trouble.clearDefer();
     });
   }
   get readyToResolve() {
-    const e = this.queuedTroubles.length, t = this.queuedTroubles.filter((s) => s.shouldDefer), o = e > 0 && t.length === 0;
-    return this.isDoorClosed && o && this.exiting;
-  }
-  onFutureUpdate(e) {
-    e.endState === T.Success ? (this.logger.debug(
-      `Resolve deferred troubles future ${e.id} completed successfully`
-    ), this.queuedTroubles.forEach((t) => {
-      t.clearDefer();
-    }), v(() => {
-      this._canExit = !0, this._isFailed = !1;
-    })) : (e.endState === T.Fail || e.endState === T.Canceled || e.endState === T.Aborted) && (this.logger.error(`Resolve deferred troubles future ${e.id} failed`), this.clearAll(), v(() => {
-      this._canExit = !1, this._isFailed = !0;
-    }));
-  }
-  async resolveDeferredTroubles(e) {
-    const t = this.queuedTroubles.filter((s) => !s.shouldDefer).map((s) => s.rawId).filter((s) => !this.inProgress.includes(s));
-    return this.inProgress.push(...t), t.length === 0 ? void 0 : await Me.bulkResolveTroubles(
-      t,
+    const allDeferredCount = this.queuedTroubles.length;
+    const notResolvable = this.queuedTroubles.filter((t) => t.shouldDefer);
+    const _readyToResolve = allDeferredCount > 0 && notResolvable.length === 0;
+    return this.isDoorClosed && _readyToResolve && this.exiting;
+  }
+  onFutureUpdate(future) {
+    if (future.endState === FutureEndState.Success) {
+      this.logger.debug(
+        `Resolve deferred troubles future ${future.id} completed successfully`
+      );
+      this.queuedTroubles.forEach((trouble) => {
+        trouble.clearDefer();
+      });
+      kosAction(() => {
+        this._canExit = true;
+        this._isFailed = false;
+      });
+    } else if (future.endState === FutureEndState.Fail || future.endState === FutureEndState.Canceled || future.endState === FutureEndState.Aborted) {
+      this.logger.error(`Resolve deferred troubles future ${future.id} failed`);
+      this.clearAll();
+      kosAction(() => {
+        this._canExit = false;
+        this._isFailed = true;
+      });
+    }
+  }
+  inProgress = [];
+  async resolveDeferredTroubles(tracker) {
+    const toResolve = this.queuedTroubles.filter((t) => !t.shouldDefer).map((trouble) => trouble.rawId).filter((id) => !this.inProgress.includes(id));
+    this.inProgress.push(...toResolve);
+    if (toResolve.length === 0) {
+      return void 0;
+    }
+    const response = await TroubleServices.bulkResolveTroubles(
+      toResolve,
       void 0,
-      e
+      tracker
     );
+    return response;
   }
   get hasQueuedTroubles() {
     return this.queuedTroubles.length > 0;
   }
   get queuedTroubles() {
     return this.troubleContainer.troubles.getIndexByKey(
-      nt.INDEX_TROUBLES_BY_DEFERRED,
-      nt.TROUBLES_DEFERRED
+      Troubles.INDEX_TROUBLES_BY_DEFERRED,
+      Troubles.TROUBLES_DEFERRED
     );
   }
   get visibleTroubles() {
-    const e = this.application.currentRole;
-    return this.troubleContainer.troubles.data.filter(Dt(e)).filter((t) => t.type !== ft);
+    const currentRole = this.application.currentRole;
+    return this.troubleContainer.troubles.data.filter(troubleVisibilityFilter(currentRole)).filter((trouble) => trouble.type !== AGITATION_REQUIRED_TROUBLE);
   }
   // -------------------LIFECYCLE----------------------------
   get future() {
     return this.futureHandler.future;
   }
   get resolveFuture() {
-    return this.futureHandler.getFuture(Fe);
+    return this.futureHandler.getFuture(FUTURE_RESOLVE);
   }
   get agitateFuture() {
-    return this.futureHandler.getFuture(tr);
+    return this.futureHandler.getFuture(FUTURE_AGITATE);
   }
-  handleAgitationStarted(e) {
-    this.logger.info(`Agitation started for ${e.path}`), this._agitationFutureId = String(e.futureId);
+  handleAgitationStarted(event) {
+    this.logger.info(`Agitation started for ${event.path}`);
+    this._agitationFutureId = String(event.futureId);
   }
-  handleAgitationEnded(e) {
-    this.logger.info(`Agitation ended for ${e.path}`), this._agitationFutureId = void 0;
+  handleAgitationEnded(event) {
+    this.logger.info(`Agitation ended for ${event.path}`);
+    this._agitationFutureId = void 0;
   }
   async init() {
     this.logger.debug(`initializing agitation-control ${this.id}`);
   }
   unload() {
-    this.logger.debug(`unloading agitation-control ${this.id}`), this.disposer && this.disposer();
+    this.logger.debug(`unloading agitation-control ${this.id}`);
+    if (this.disposer) {
+      this.disposer();
+    }
   }
   handleReadyToResolve() {
-    this.readyToResolve && (this.logger.info("AgitationControl - Resolving deferred troubles"), this.resolveDeferredTroubles()), this._agitationFutureId && this.logger.info("AgitationControl - Agitation started");
+    if (this.readyToResolve) {
+      this.logger.info(`AgitationControl - Resolving deferred troubles`);
+      this.resolveDeferredTroubles();
+    }
+    if (this._agitationFutureId) {
+      this.logger.info(`AgitationControl - Agitation started`);
+    }
   }
   async load() {
     this.logger.debug(`loading agitation-control ${this.id}`);
   }
 };
-I([
-  p({ modelType: Ze.type })
-], $.prototype, "application", 2);
-I([
-  M({ alias: Fe })
-], $.prototype, "resolveDeferredTroubles", 1);
-I([
-  Te({ topic: vt.TOPIC_AGITATION_STARTED })
-], $.prototype, "handleAgitationStarted", 1);
-I([
-  Te({ topic: vt.TOPIC_AGITATION_ENDED })
-], $.prototype, "handleAgitationEnded", 1);
-I([
-  Pe({
-    dependencies: (e) => [e.readyToResolve, e._agitationFutureId]
+__decorateClass$k([
+  kosDependency({ modelType: Application.type })
+], AgitationControlModelImpl.prototype, "application", 2);
+__decorateClass$k([
+  kosFuture({ alias: FUTURE_RESOLVE })
+], AgitationControlModelImpl.prototype, "resolveDeferredTroubles", 1);
+__decorateClass$k([
+  kosTopicHandler({ topic: CartridgeAgitatorEvents.TOPIC_AGITATION_STARTED })
+], AgitationControlModelImpl.prototype, "handleAgitationStarted", 1);
+__decorateClass$k([
+  kosTopicHandler({ topic: CartridgeAgitatorEvents.TOPIC_AGITATION_ENDED })
+], AgitationControlModelImpl.prototype, "handleAgitationEnded", 1);
+__decorateClass$k([
+  kosModelEffect({
+    dependencies: (model) => [model.readyToResolve, model._agitationFutureId]
   })
-], $.prototype, "handleReadyToResolve", 1);
-$ = I([
-  l(kt)
-], $);
-const Ys = new He({
-  class: $,
-  type: kt
+], AgitationControlModelImpl.prototype, "handleReadyToResolve", 1);
+AgitationControlModelImpl = __decorateClass$k([
+  kosModel(MODEL_TYPE$k)
+], AgitationControlModelImpl);
+const AgitationControl = new SingletonKosModelRegistrationFactory({
+  class: AgitationControlModelImpl,
+  type: MODEL_TYPE$k
 });
-var or = Object.defineProperty, rr = Object.getOwnPropertyDescriptor, le = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? rr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && or(t, o, r), r;
-};
-const N = "animation-model";
-let w = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "logger");
-    i(this, "disableAll");
-    i(this, "enableDial");
-    i(this, "enableModal");
-    i(this, "enableSideBar");
-    this.id = e, this.logger = o.logger;
-  }
-};
-le([
-  d({
+var __defProp$e = Object.defineProperty;
+var __getOwnPropDesc$j = Object.getOwnPropertyDescriptor;
+var __decorateClass$j = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$j(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$e(target, key, result);
+  return result;
+};
+const MODEL_TYPE$j = "animation-model";
+let AnimationModelImpl = class {
+  id;
+  logger;
+  disableAll;
+  enableDial;
+  enableModal;
+  enableSideBar;
+  constructor(modelId, options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
+  }
+};
+__decorateClass$j([
+  kosConfigProperty({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.disableAll"
   })
-], w.prototype, "disableAll", 2);
-le([
-  d({
+], AnimationModelImpl.prototype, "disableAll", 2);
+__decorateClass$j([
+  kosConfigProperty({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableDial"
   })
-], w.prototype, "enableDial", 2);
-le([
-  d({
+], AnimationModelImpl.prototype, "enableDial", 2);
+__decorateClass$j([
+  kosConfigProperty({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableModal"
   })
-], w.prototype, "enableModal", 2);
-le([
-  d({
+], AnimationModelImpl.prototype, "enableModal", 2);
+__decorateClass$j([
+  kosConfigProperty({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableSideBar"
   })
-], w.prototype, "enableSideBar", 2);
-w = le([
-  l(N)
-], w);
-const sr = {
+], AnimationModelImpl.prototype, "enableSideBar", 2);
+AnimationModelImpl = __decorateClass$j([
+  kosModel(MODEL_TYPE$j)
+], AnimationModelImpl);
+const Animation = {
   registration: {
-    [N]: {
-      class: w,
-      singleton: !0
+    [MODEL_TYPE$j]: {
+      class: AnimationModelImpl,
+      singleton: true
     }
   },
-  type: N,
-  predicate: u(N),
-  factory: c.Singleton.create(N)
-}, { URL: ir } = h("ANIMATION_SERVICE"), { getAll: nr } = y.build({
-  basePath: `${ir}/api/animation`
-}), ar = g.createLogger({
+  type: MODEL_TYPE$j,
+  predicate: isKosModel(MODEL_TYPE$j),
+  factory: Kos.Singleton.create(MODEL_TYPE$j)
+};
+const { URL: URL$a } = resolveServiceUrl("ANIMATION_SERVICE");
+const { getAll: getAll$7 } = ServiceFactory.build({
+  basePath: `${URL$a}/api/animation`
+});
+const log$b = KosLog.createLogger({
   name: "animation-service",
   group: "Services"
-}), lr = async () => (ar.debug("sending GET for animation"), await nr({})), Gs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+});
+const getAnimations = async () => {
+  log$b.debug("sending GET for animation");
+  const response = await getAll$7({});
+  return response;
+};
+const index$b = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getAnimations: lr
+  getAnimations
 }, Symbol.toStringTag, { value: "Module" }));
-var dr = Object.defineProperty, cr = Object.getOwnPropertyDescriptor, It = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? cr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && dr(t, o, r), r;
-};
-const z = "carb-water-model";
-let ye = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "assemblyModel");
-    i(this, "logger");
-    this.id = e, this.logger = o.logger;
+var __defProp$d = Object.defineProperty;
+var __getOwnPropDesc$i = Object.getOwnPropertyDescriptor;
+var __decorateClass$i = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$i(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$d(target, key, result);
+  return result;
+};
+const MODEL_TYPE$i = "carb-water-model";
+let CarbWaterModelImpl = class {
+  id;
+  assemblyModel;
+  logger;
+  constructor(modelId, _options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
   }
   getPump() {
-    const t = this.assemblyModel.getHoldersByGroup("carb")[0].pumps.data[0];
-    return Be(t, mt.type);
+    const carbHolder = this.assemblyModel.getHoldersByGroup("carb")[0];
+    const pump = carbHolder.pumps.data[0];
+    const model = getKosCompanionModel(pump, FcmPump.type);
+    return model;
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -720,102 +911,128 @@ let ye = class {
     this.logger.debug(`loading carb-water ${this.id}`);
   }
 };
-It([
-  p({ modelType: Se.type })
-], ye.prototype, "assemblyModel", 2);
-ye = It([
-  l(z)
-], ye);
-const ur = {
+__decorateClass$i([
+  kosDependency({ modelType: Assembly.type })
+], CarbWaterModelImpl.prototype, "assemblyModel", 2);
+CarbWaterModelImpl = __decorateClass$i([
+  kosModel(MODEL_TYPE$i)
+], CarbWaterModelImpl);
+const CarbWater = {
   registration: {
-    [z]: {
-      class: ye,
-      singleton: !1
+    [MODEL_TYPE$i]: {
+      class: CarbWaterModelImpl,
+      singleton: false
     }
   },
-  type: z,
-  predicate: u(z),
-  factory: c.Factory.create(z)
-}, { URL: R } = h("COPY-LOGS_SERVICE"), { getAll: pr, getOne: gr, postModel: Rt, deleteModel: hr } = y.build({
-  basePath: `${R}/api/copy-logs`
-}), fe = g.createLogger({
+  type: MODEL_TYPE$i,
+  predicate: isKosModel(MODEL_TYPE$i),
+  factory: Kos.Factory.create(MODEL_TYPE$i)
+};
+const { URL: URL$9 } = resolveServiceUrl("COPY-LOGS_SERVICE");
+const { getAll: getAll$6, getOne: getOne$2, postModel: postModel$2, deleteModel } = ServiceFactory.build({
+  basePath: `${URL$9}/api/copy-logs`
+});
+const log$a = KosLog.createLogger({
   name: "copy-logs-service",
   group: "Services"
-}), At = async (e, t) => {
-  const o = await hr({
-    tracker: t,
-    id: e,
-    urlOverride: `${R}/api/app/kosdev.ddk/copyLogs/${e}`
+});
+const eraseVolume = async (volumeId, tracker) => {
+  const response = await deleteModel({
+    tracker,
+    id: volumeId,
+    urlOverride: `${URL$9}/api/app/kosdev.ddk/copyLogs/${volumeId}`
   });
-  if (!(o != null && o.data))
+  if (!response?.data) {
     throw new Error("No response from server");
-  return o.data;
-}, Ft = async (e, t) => {
-  const o = await Rt({
+  }
+  return response.data;
+};
+const eraseAndCopyLogsToVolume = async (volumeId, tracker) => {
+  const response = await postModel$2({
     model: {},
-    tracker: t,
-    urlOverride: `${R}/api/app/kosdev.ddk/copyLogs/eraseAndCopy/${e}`
+    tracker,
+    urlOverride: `${URL$9}/api/app/kosdev.ddk/copyLogs/eraseAndCopy/${volumeId}`
   });
-  if (!(o != null && o.data))
+  if (!response?.data) {
     throw new Error("No response from server");
-  return o.data;
-}, xt = async (e, t) => {
-  const o = await Rt({
+  }
+  return response.data;
+};
+const copyLogFromVolume = async (volumeId, tracker) => {
+  const response = await postModel$2({
     model: {},
-    tracker: t,
-    urlOverride: `${R}/api/app/kosdev.ddk/copyLogs/${e}`
+    tracker,
+    urlOverride: `${URL$9}/api/app/kosdev.ddk/copyLogs/${volumeId}`
   });
-  if (!(o != null && o.data))
+  if (!response?.data) {
     throw new Error("No response from server");
-  return o.data;
-}, Ut = async () => {
-  fe.debug("sending GET for copy-logs");
+  }
+  return response.data;
+};
+const getVolumes = async () => {
+  log$a.debug("sending GET for copy-logs");
   try {
-    const e = await pr({
-      urlOverride: `${R}/api/app/kosdev.ddk/copyLogs/volumes/size`
+    const response = await getAll$6({
+      urlOverride: `${URL$9}/api/app/kosdev.ddk/copyLogs/volumes/size`
     });
-    return [void 0, e == null ? void 0 : e.data];
-  } catch (e) {
-    if (e instanceof yt)
-      return fe.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
+    return [void 0, response?.data];
+  } catch (error) {
+    if (error instanceof FetchError) {
+      log$a.error(`Error fetching log file size: ${error.payload.error}`);
+      return [error.payload.error, void 0];
+    }
   }
   return ["unknownError", void 0];
-}, jt = async () => {
-  fe.debug("sending GET for log file size");
+};
+const getLogFileSize = async () => {
+  log$a.debug("sending GET for log file size");
   try {
-    const e = await gr({
-      urlOverride: `${R}/api/app/kosdev.ddk/copyLogs/files/size`
+    const response = await getOne$2({
+      urlOverride: `${URL$9}/api/app/kosdev.ddk/copyLogs/files/size`
     });
-    return [void 0, e == null ? void 0 : e.data];
-  } catch (e) {
-    if (e instanceof yt)
-      return fe.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
+    return [void 0, response?.data];
+  } catch (error) {
+    if (error instanceof FetchError) {
+      log$a.error(`Error fetching log file size: ${error.payload.error}`);
+      return [error.payload.error, void 0];
+    }
   }
   return ["unknownError", void 0];
-}, qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+};
+const index$a = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  copyLogFromVolume: xt,
-  eraseAndCopyLogsToVolume: Ft,
-  eraseVolume: At,
-  getLogFileSize: jt,
-  getVolumes: Ut
+  copyLogFromVolume,
+  eraseAndCopyLogsToVolume,
+  eraseVolume,
+  getLogFileSize,
+  getVolumes
 }, Symbol.toStringTag, { value: "Module" }));
-var Wt = Object.defineProperty, yr = Object.getOwnPropertyDescriptor, fr = (e, t, o) => t in e ? Wt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[t] = o, A = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? yr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && Wt(t, o, r), r;
-}, vr = (e, t, o) => (fr(e, t + "", o), o);
-const mr = "copy-logs-model";
-let _ = class {
-  constructor(e) {
-    i(this, "id");
-    i(this, "_volumes");
-    i(this, "storageDeviceContainer");
-    i(this, "_activeVolume");
-    i(this, "_logFileSize", 0);
-    i(this, "_actionState", "idle");
-    i(this, "copyProgress");
-    this.id = e, this._volumes = new Po(), this._activeVolume = void 0, this.copyProgress = {
+var __defProp$c = Object.defineProperty;
+var __getOwnPropDesc$h = Object.getOwnPropertyDescriptor;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __decorateClass$h = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$h(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$c(target, key, result);
+  return result;
+};
+var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, key + "", value);
+const MODEL_TYPE$h = "copy-logs-model";
+let CopyLogsModelImpl = class {
+  id;
+  _volumes;
+  storageDeviceContainer;
+  _activeVolume;
+  _logFileSize = 0;
+  _actionState = "idle";
+  copyProgress;
+  constructor(modelId) {
+    this.id = modelId;
+    this._volumes = new KosDataContainer();
+    this._activeVolume = void 0;
+    this.copyProgress = {
       bytesCopied: 0,
       bytesToCopy: 0,
       filesCopied: 0,
@@ -833,19 +1050,20 @@ let _ = class {
     return this._logFileSize;
   }
   reset() {
-    this.clearActiveVolume(), this.futureHandler.removeFuture();
+    this.clearActiveVolume();
+    this.futureHandler.removeFuture();
   }
   clearActiveVolume() {
     this._activeVolume = void 0;
   }
-  updateActiveVolume(e) {
-    this._activeVolume = e;
+  updateActiveVolume(volume) {
+    this._activeVolume = volume;
   }
   get inserted() {
     return this.storageDeviceContainer.isStorageInserted;
   }
-  updateLogFileSize(e) {
-    this._logFileSize = e;
+  updateLogFileSize(size) {
+    this._logFileSize = size;
   }
   get canCopyLogs() {
     return this.inserted && this._activeVolume;
@@ -854,170 +1072,235 @@ let _ = class {
     return this._actionState;
   }
   get diskFull() {
-    var e;
-    return ((e = this.future) == null ? void 0 : e.status) === T.Success && this.copyProgress.filesSkipped > 0;
-  }
-  onFutureUpdate(e) {
-    this.logger.info(`Future update: ${e.status}`), e.status === T.Success && (this.logger.info(`Future success: ${e.status}`), this.diskFull && v(() => {
-      e.endState = T.Fail, e.reason = "errDiskFull";
-    })), e.status === T.Fail && this.logger.error(`Future failed: ${e.status}`), e.note === "copy" ? v(() => {
-      this._actionState = "copying", this.copyProgress = e.clientData || {
-        bytesCopied: 0,
-        bytesToCopy: 0,
-        filesCopied: 0,
-        filesSkipped: 0
-      };
-    }) : (this._actionState = "erasing", v(() => {
-      this.copyProgress = {
-        bytesCopied: 0,
-        bytesToCopy: 0,
-        filesCopied: 0,
-        filesSkipped: 0
-      };
-    }));
+    return this.future?.status === FutureEndState.Success && this.copyProgress.filesSkipped > 0;
+  }
+  onFutureUpdate(update) {
+    this.logger.info(`Future update: ${update.status}`);
+    if (update.status === FutureEndState.Success) {
+      this.logger.info(`Future success: ${update.status}`);
+      if (this.diskFull) {
+        kosAction(() => {
+          update.endState = FutureEndState.Fail;
+          update.reason = "errDiskFull";
+        });
+      }
+    }
+    if (update.status === FutureEndState.Fail) {
+      this.logger.error(`Future failed: ${update.status}`);
+    }
+    if (update.note === "copy") {
+      kosAction(() => {
+        this._actionState = "copying";
+        this.copyProgress = update.clientData || {
+          bytesCopied: 0,
+          bytesToCopy: 0,
+          filesCopied: 0,
+          filesSkipped: 0
+        };
+      });
+    } else {
+      this._actionState = "erasing";
+      kosAction(() => {
+        this.copyProgress = {
+          bytesCopied: 0,
+          bytesToCopy: 0,
+          filesCopied: 0,
+          filesSkipped: 0
+        };
+      });
+    }
   }
-  async eraseAndCopyVolume(e) {
-    var t;
-    if (!e)
+  async eraseAndCopyVolume(tracker) {
+    if (!tracker) {
       throw new Error("No tracker provided");
-    if (v(() => {
+    }
+    kosAction(() => {
       this._actionState = "erasing";
-    }), !this._activeVolume)
-      throw this.logger.error("No active volume selected"), new Error("No active volume selected");
-    return this.logger.info(`Erasing volume ${(t = this._activeVolume) == null ? void 0 : t.name}`), Ft(this._activeVolume.id, e);
+    });
+    if (!this._activeVolume) {
+      this.logger.error("No active volume selected");
+      throw new Error("No active volume selected");
+    }
+    this.logger.info(`Erasing volume ${this._activeVolume?.name}`);
+    return eraseAndCopyLogsToVolume(this._activeVolume.id, tracker);
   }
-  async eraseVolume(e) {
-    var t;
-    if (!e)
+  async eraseVolume(tracker) {
+    if (!tracker) {
       throw new Error("No tracker provided");
-    if (v(() => {
+    }
+    kosAction(() => {
       this._actionState = "erasing";
-    }), !this._activeVolume)
-      throw this.logger.error("No active volume selected"), new Error("No active volume selected");
-    return this.logger.info(`Erasing volume ${(t = this._activeVolume) == null ? void 0 : t.name}`), At(this._activeVolume.id, e);
+    });
+    if (!this._activeVolume) {
+      this.logger.error("No active volume selected");
+      throw new Error("No active volume selected");
+    }
+    this.logger.info(`Erasing volume ${this._activeVolume?.name}`);
+    return eraseVolume(this._activeVolume.id, tracker);
   }
-  async copyLogs(e) {
-    var t;
-    if (!e)
+  async copyLogs(tracker) {
+    if (!tracker) {
       throw new Error("No tracker provided");
-    if (v(() => {
+    }
+    kosAction(() => {
       this._actionState = "copying";
-    }), !this._activeVolume)
-      throw this.logger.error("No active volume selected"), new Error("No active volume selected");
-    return this.logger.info(`Copying logs to ${(t = this._activeVolume) == null ? void 0 : t.name}`), xt(this._activeVolume.id, e);
+    });
+    if (!this._activeVolume) {
+      this.logger.error("No active volume selected");
+      throw new Error("No active volume selected");
+    }
+    this.logger.info(`Copying logs to ${this._activeVolume?.name}`);
+    return copyLogFromVolume(this._activeVolume.id, tracker);
   }
   handleInsertion() {
-    this.inserted ? this.syncVolumes() : (this._volumes.clear(), this.clearActiveVolume());
+    if (this.inserted) {
+      this.syncVolumes();
+    } else {
+      this._volumes.clear();
+      this.clearActiveVolume();
+    }
   }
   async init() {
     this.logger.debug(`initializing copy-logs ${this.id}`);
   }
   async syncVolumes() {
-    const [e, t] = await Ut(), [o, s] = await jt();
-    if (o) {
-      this.logger.error(`Error fetching log file size: ${o}`);
+    const [volumeError, volumes] = await getVolumes();
+    const [error, logSize] = await getLogFileSize();
+    if (error) {
+      this.logger.error(`Error fetching log file size: ${error}`);
       return;
     }
-    if (e) {
-      this.logger.error(`Error fetching volumes: ${e}`);
+    if (volumeError) {
+      this.logger.error(`Error fetching volumes: ${volumeError}`);
       return;
     }
-    t && (t.forEach((r) => {
-      const n = this.storageDeviceContainer.getModel(r.id);
-      if (n) {
-        const a = {
-          id: r.id,
-          name: n.label,
-          freeBytes: r.info.freeBytes,
-          totalBytes: r.info.totalBytes
-        };
-        this._volumes.addModel(a);
+    if (volumes) {
+      volumes.forEach((volume) => {
+        const storageVolume = this.storageDeviceContainer.getModel(volume.id);
+        if (storageVolume) {
+          const _volume = {
+            id: volume.id,
+            name: storageVolume.label,
+            freeBytes: volume.info.freeBytes,
+            totalBytes: volume.info.totalBytes
+          };
+          this._volumes.addModel(_volume);
+        }
+      });
+      if (volumes.length === 1) {
+        this.updateActiveVolume(this._volumes.data[0]);
+      } else {
+        this.clearActiveVolume();
       }
-    }), t.length === 1 ? this.updateActiveVolume(this._volumes.data[0]) : this.clearActiveVolume()), s && (this.logger.info(`Log file size: ${s}`), this.updateLogFileSize(parseInt(s, 10)));
+    }
+    if (logSize) {
+      this.logger.info(`Log file size: ${logSize}`);
+      this.updateLogFileSize(parseInt(logSize, 10));
+    }
   }
   async activate() {
-    this.logger.debug(`activating copy-logs ${this.id}`), await this.syncVolumes();
+    this.logger.debug(`activating copy-logs ${this.id}`);
+    await this.syncVolumes();
   }
   async load() {
     this.logger.debug(`loading copy-logs ${this.id}`);
   }
 };
-vr(_, "Registration");
-A([
-  p({ modelType: To.type })
-], _.prototype, "storageDeviceContainer", 2);
-A([
-  M()
-], _.prototype, "eraseAndCopyVolume", 1);
-A([
-  M()
-], _.prototype, "eraseVolume", 1);
-A([
-  M()
-], _.prototype, "copyLogs", 1);
-A([
-  Pe({
-    dependencies: (e) => [e.inserted]
+__publicField$1(CopyLogsModelImpl, "Registration");
+__decorateClass$h([
+  kosDependency({ modelType: StorageDeviceContainer.type })
+], CopyLogsModelImpl.prototype, "storageDeviceContainer", 2);
+__decorateClass$h([
+  kosFuture()
+], CopyLogsModelImpl.prototype, "eraseAndCopyVolume", 1);
+__decorateClass$h([
+  kosFuture()
+], CopyLogsModelImpl.prototype, "eraseVolume", 1);
+__decorateClass$h([
+  kosFuture()
+], CopyLogsModelImpl.prototype, "copyLogs", 1);
+__decorateClass$h([
+  kosModelEffect({
+    dependencies: (model) => [model.inserted]
   })
-], _.prototype, "handleInsertion", 1);
-_ = A([
-  l({ modelTypeId: mr, singleton: !0 }),
-  $o(),
-  Ke()
-], _);
-const Qs = _.Registration, Nt = g.createLogger({
+], CopyLogsModelImpl.prototype, "handleInsertion", 1);
+CopyLogsModelImpl = __decorateClass$h([
+  kosModel({ modelTypeId: MODEL_TYPE$h, singleton: true }),
+  kosFutureAware(),
+  kosLoggerAware()
+], CopyLogsModelImpl);
+const CopyLogs = CopyLogsModelImpl.Registration;
+const log$9 = KosLog.createLogger({
   name: "dashboard-operations-service",
   group: "Services"
-}), zt = async (e, t) => (Nt.debug("resolveAll"), await Me.bulkResolveTroubles(
-  e,
-  void 0,
-  t
-)), Vt = async (e, t) => (Nt.debug("resolveTrouble"), await Me.resolveTrouble(
-  e,
-  void 0,
-  t
-)), Xs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+});
+const resolveAll = async (troubleIds, tracker) => {
+  log$9.debug("resolveAll");
+  const response = await TroubleServices.bulkResolveTroubles(
+    troubleIds,
+    void 0,
+    tracker
+  );
+  return response;
+};
+const resolveTrouble = async (troubleId, tracker) => {
+  log$9.debug("resolveTrouble");
+  const response = await TroubleServices.resolveTrouble(
+    troubleId,
+    void 0,
+    tracker
+  );
+  return response;
+};
+const index$9 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  resolveAll: zt,
-  resolveTrouble: Vt
+  resolveAll,
+  resolveTrouble
 }, Symbol.toStringTag, { value: "Module" }));
-var br = Object.defineProperty, _r = Object.getOwnPropertyDescriptor, Ee = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? _r(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && br(t, o, r), r;
-};
-const V = "dashboard-operations-model";
-function ut(e) {
-  return !e.deferred;
+var __defProp$b = Object.defineProperty;
+var __getOwnPropDesc$g = Object.getOwnPropertyDescriptor;
+var __decorateClass$g = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$g(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$b(target, key, result);
+  return result;
+};
+const MODEL_TYPE$g = "dashboard-operations-model";
+function resolvableTroubleFilter(trouble) {
+  return !trouble.deferred;
 }
-function pt(e) {
-  return e.deferred;
+function deferredTroubleFilter(trouble) {
+  return trouble.deferred;
 }
-let C = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "troubles");
-    i(this, "futureHandler");
-    i(this, "logger");
-    this.id = e, this.futureHandler = new Ge(this), this.logger = o.logger;
+let DashboardOperationsModelImpl = class {
+  id;
+  troubles;
+  futureHandler;
+  logger;
+  constructor(modelId, options, context) {
+    this.id = modelId;
+    this.futureHandler = new FutureHandler(this);
+    this.logger = context.logger;
   }
   get troublesByType() {
     return this.troubles.troubles.data.reduce(
-      Mo,
+      troubleByTypeReducer,
       {}
     );
   }
   get queuedPurgeTroubles() {
-    return this.purgeTroubles.filter(pt);
+    return this.purgeTroubles.filter(deferredTroubleFilter);
   }
   get queuedPrimeTroubles() {
-    return this.primeTroubles.filter(pt);
+    return this.primeTroubles.filter(deferredTroubleFilter);
   }
   get resolvablePrimeTroubles() {
-    return this.primeTroubles.filter(ut);
+    return this.primeTroubles.filter(resolvableTroubleFilter);
   }
   get resolvablePurgeTroubles() {
-    return this.purgeTroubles.filter(ut);
+    return this.purgeTroubles.filter(resolvableTroubleFilter);
   }
   get hasResolvablePurgeTroubles() {
     return this.resolvablePurgeTroubles.length > 0;
@@ -1032,28 +1315,37 @@ let C = class {
     return this.primeTroubles.length > 0;
   }
   get purgeTroubles() {
-    return this.troublesByType[at] || [];
+    return this.troublesByType[TROUBLE_TYPE_PURGE$1] || [];
   }
   get primeTroubles() {
-    return this.troublesByType[ko] || [];
+    return this.troublesByType[TROUBLE_TYPE_PRIME$1] || [];
   }
   get future() {
     return this.futureHandler.getFuture();
   }
-  async resolveAllTroubles(e, t) {
-    if (!t)
+  async resolveAllTroubles(type, tracker) {
+    if (!tracker) {
       throw new Error("No tracker provided");
-    const o = e === at ? this.purgeTroubles : this.primeTroubles;
-    o.filter((a) => a.shouldDefer).forEach((a) => {
-      this.logger.info(`Deferring trouble ${a.rawId}`), a.defer();
+    }
+    const container = type === TROUBLE_TYPE_PURGE$1 ? this.purgeTroubles : this.primeTroubles;
+    const shouldDefer = container.filter((trouble) => trouble.shouldDefer);
+    shouldDefer.forEach((trouble) => {
+      this.logger.info(`Deferring trouble ${trouble.rawId}`);
+      trouble.defer();
     });
-    const r = o.filter((a) => !a.shouldDefer).map((a) => a.rawId);
-    return r.length === 0 ? void 0 : await zt(r, t);
+    const allTroubles = container.filter((trouble) => !trouble.shouldDefer).map((trouble) => trouble.rawId);
+    if (allTroubles.length === 0) {
+      return void 0;
+    }
+    const response = await resolveAll(allTroubles, tracker);
+    return response;
   }
-  async resolveTrouble(e, t) {
-    if (!t)
+  async resolveTrouble(troubleId, tracker) {
+    if (!tracker) {
       throw new Error("No tracker provided");
-    return await Vt(e, t);
+    }
+    const response = await resolveTrouble(troubleId, tracker);
+    return response;
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1063,42 +1355,46 @@ let C = class {
     this.logger.debug(`loading dashboard-operations ${this.id}`);
   }
 };
-Ee([
-  p({
-    modelType: Ye.type
+__decorateClass$g([
+  kosDependency({
+    modelType: TroubleContainer.type
   })
-], C.prototype, "troubles", 2);
-Ee([
-  M()
-], C.prototype, "resolveAllTroubles", 1);
-Ee([
-  M()
-], C.prototype, "resolveTrouble", 1);
-C = Ee([
-  l(V)
-], C);
-const et = {
+], DashboardOperationsModelImpl.prototype, "troubles", 2);
+__decorateClass$g([
+  kosFuture()
+], DashboardOperationsModelImpl.prototype, "resolveAllTroubles", 1);
+__decorateClass$g([
+  kosFuture()
+], DashboardOperationsModelImpl.prototype, "resolveTrouble", 1);
+DashboardOperationsModelImpl = __decorateClass$g([
+  kosModel(MODEL_TYPE$g)
+], DashboardOperationsModelImpl);
+const DashboardOperations = {
   registration: {
-    [V]: {
-      class: C,
-      singleton: !0
+    [MODEL_TYPE$g]: {
+      class: DashboardOperationsModelImpl,
+      singleton: true
     }
   },
-  type: V,
-  predicate: u(V),
-  factory: c.Singleton.create(V)
-};
-var Tr = Object.getOwnPropertyDescriptor, $r = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? Tr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = a(r) || r);
-  return r;
-};
-const H = "dispenser-model";
-let xe = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "logger");
-    this.id = e, this.logger = o.logger;
+  type: MODEL_TYPE$g,
+  predicate: isKosModel(MODEL_TYPE$g),
+  factory: Kos.Singleton.create(MODEL_TYPE$g)
+};
+var __getOwnPropDesc$f = Object.getOwnPropertyDescriptor;
+var __decorateClass$f = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$f(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = decorator(result) || result;
+  return result;
+};
+const MODEL_TYPE$f = "dispenser-model";
+let DispenserModelImpl = class {
+  id;
+  logger;
+  constructor(modelId, options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
   }
   updateModel() {
   }
@@ -1110,40 +1406,55 @@ let xe = class {
     this.logger.debug(`loading dispenser ${this.id}`);
   }
 };
-xe = $r([
-  l(H)
-], xe);
-const Pr = {
+DispenserModelImpl = __decorateClass$f([
+  kosModel(MODEL_TYPE$f)
+], DispenserModelImpl);
+const Dispenser = {
   registration: {
-    [H]: {
-      class: xe,
-      singleton: !0
+    [MODEL_TYPE$f]: {
+      class: DispenserModelImpl,
+      singleton: true
     }
   },
-  type: H,
-  predicate: u(H),
-  factory: c.Singleton.create(H)
-}, { URL: Mr } = h("DISPENSER_SERVICE"), { getAll: Or } = y.build({
-  basePath: `${Mr}/api/dispenser`
-}), Sr = g.createLogger({
+  type: MODEL_TYPE$f,
+  predicate: isKosModel(MODEL_TYPE$f),
+  factory: Kos.Singleton.create(MODEL_TYPE$f)
+};
+const { URL: URL$8 } = resolveServiceUrl("DISPENSER_SERVICE");
+const { getAll: getAll$5 } = ServiceFactory.build({
+  basePath: `${URL$8}/api/dispenser`
+});
+const log$8 = KosLog.createLogger({
   name: "dispenser-service",
   group: "Services"
-}), wr = async () => (Sr.debug("sending GET for dispenser"), await Or({})), Js = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+});
+const getDispensers = async () => {
+  log$8.debug("sending GET for dispenser");
+  const response = await getAll$5({});
+  return response;
+};
+const index$8 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getDispensers: wr
+  getDispensers
 }, Symbol.toStringTag, { value: "Module" }));
-var Er = Object.defineProperty, Cr = Object.getOwnPropertyDescriptor, Ht = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? Cr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && Er(t, o, r), r;
-};
-const B = "dispenser-info-model";
-let ve = class {
-  constructor(e, t, o) {
-    i(this, "logger");
-    i(this, "id");
-    i(this, "name");
-    this.id = e, this.logger = o.logger;
+var __defProp$a = Object.defineProperty;
+var __getOwnPropDesc$e = Object.getOwnPropertyDescriptor;
+var __decorateClass$e = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$e(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$a(target, key, result);
+  return result;
+};
+const MODEL_TYPE$e = "dispenser-info-model";
+let DispenserInfoModelImpl = class {
+  logger;
+  id;
+  name;
+  constructor(modelId, _options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1153,51 +1464,65 @@ let ve = class {
     this.logger.debug(`loading dispenser-info ${this.id}`);
   }
 };
-Ht([
-  d({
+__decorateClass$e([
+  kosConfigProperty({
     path: "kos:device",
     attribute: "name"
   })
-], ve.prototype, "name", 2);
-ve = Ht([
-  l(B)
-], ve);
-const Lr = {
+], DispenserInfoModelImpl.prototype, "name", 2);
+DispenserInfoModelImpl = __decorateClass$e([
+  kosModel(MODEL_TYPE$e)
+], DispenserInfoModelImpl);
+const DispenserInfo = {
   registration: {
-    [B]: {
-      class: ve,
-      singleton: !1
+    [MODEL_TYPE$e]: {
+      class: DispenserInfoModelImpl,
+      singleton: false
     }
   },
-  type: B,
-  predicate: u(B),
-  factory: c.Factory.create(
-    B
+  type: MODEL_TYPE$e,
+  predicate: isKosModel(MODEL_TYPE$e),
+  factory: Kos.Factory.create(
+    MODEL_TYPE$e
   )
-}, { URL: Dr } = h("DISPENSER-INFO_SERVICE"), { getAll: kr } = y.build({
-  basePath: `${Dr}/api/dispenser-info`
-}), Ir = g.createLogger({
+};
+const { URL: URL$7 } = resolveServiceUrl("DISPENSER-INFO_SERVICE");
+const { getAll: getAll$4 } = ServiceFactory.build({
+  basePath: `${URL$7}/api/dispenser-info`
+});
+const log$7 = KosLog.createLogger({
   name: "dispenser-info-service",
   group: "Services"
-}), Rr = async () => (Ir.debug("sending GET for dispenser-info"), await kr({})), Zs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+});
+const getDispenserInfos = async () => {
+  log$7.debug("sending GET for dispenser-info");
+  const response = await getAll$4({});
+  return response;
+};
+const index$7 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getDispenserInfos: Rr
+  getDispenserInfos
 }, Symbol.toStringTag, { value: "Module" }));
-var Ar = Object.getOwnPropertyDescriptor, Fr = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? Ar(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = a(r) || r);
-  return r;
-};
-const K = "enrollment-model";
-let Ue = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "logger");
-    i(this, "enrolled");
-    this.id = e, this.logger = o.logger, this.enrolled = !1;
-  }
-  updateModel(e) {
-    console.log("updateModel:", e);
+var __getOwnPropDesc$d = Object.getOwnPropertyDescriptor;
+var __decorateClass$d = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$d(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = decorator(result) || result;
+  return result;
+};
+const MODEL_TYPE$d = "enrollment-model";
+let EnrollmentModelImpl = class {
+  id;
+  logger;
+  enrolled;
+  constructor(modelId, _options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
+    this.enrolled = false;
+  }
+  updateModel(options) {
+    console.log("updateModel:", options);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1207,100 +1532,159 @@ let Ue = class {
     this.logger.debug(`loading enrollment ${this.id}`);
   }
 };
-Ue = Fr([
-  l(K)
-], Ue);
-const xr = {
+EnrollmentModelImpl = __decorateClass$d([
+  kosModel(MODEL_TYPE$d)
+], EnrollmentModelImpl);
+const Enrollment = {
   registration: {
-    [K]: {
-      class: Ue,
-      singleton: !0
+    [MODEL_TYPE$d]: {
+      class: EnrollmentModelImpl,
+      singleton: true
     }
   },
-  type: K,
-  predicate: u(K),
-  factory: c.Singleton.create(K)
-}, { URL: Ur } = h("ENROLLMENT_SERVICE"), { getAll: jr } = y.build({
-  basePath: `${Ur}/api/enrollment`
-}), Wr = g.createLogger({
+  type: MODEL_TYPE$d,
+  predicate: isKosModel(MODEL_TYPE$d),
+  factory: Kos.Singleton.create(MODEL_TYPE$d)
+};
+const { URL: URL$6 } = resolveServiceUrl("ENROLLMENT_SERVICE");
+const { getAll: getAll$3 } = ServiceFactory.build({
+  basePath: `${URL$6}/api/enrollment`
+});
+const log$6 = KosLog.createLogger({
   name: "enrollment-service",
   group: "Services"
-}), Nr = async () => (Wr.debug("sending GET for enrollment"), await jr({})), ei = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+});
+const getEnrollments = async () => {
+  log$6.debug("sending GET for enrollment");
+  const response = await getAll$3({});
+  return response;
+};
+const index$6 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getEnrollments: Nr
-}, Symbol.toStringTag, { value: "Module" })), ti = (e) => e.toLowerCase().includes("micros"), oi = (e) => !e.toLowerCase().includes("micros"), ri = (e) => (t) => {
-  const o = e == null ? void 0 : e.getHoldersByGroup(t);
-  return o ? o.map((s) => ({ id: s.id, name: s.ingredientName, path: s.path })) : null;
-}, si = ["water", "carb", "ns", "nss"], ie = "dashboardKeyFactory", ke = [];
-Oo(ie, {
-  register: (e, t) => {
-    ke.includes(t) || ke.push(t);
+  getEnrollments
+}, Symbol.toStringTag, { value: "Module" }));
+const isMicroGroup = (group) => group.toLowerCase().includes("micros");
+const isMacroGroup = (group) => !group.toLowerCase().includes("micros");
+const macroHolderMap = (assembly) => (holderName) => {
+  const holderGroup = assembly?.getHoldersByGroup(holderName);
+  if (!holderGroup) {
+    return null;
+  }
+  return holderGroup.map((holder) => {
+    return { id: holder.id, name: holder.ingredientName, path: holder.path };
+  });
+};
+const MACRO_KEYS = ["water", "carb", "ns", "nss"];
+const EXTENSION_POINT_DASHBOARD_KEY_FACTORY = "dashboardKeyFactory";
+const dashboardKeyFactories = [];
+registerExtensionPoint(EXTENSION_POINT_DASHBOARD_KEY_FACTORY, {
+  register: (_id, factory) => {
+    if (dashboardKeyFactories.includes(factory)) {
+      return;
+    }
+    dashboardKeyFactories.push(factory);
   },
-  execute: (e, t) => {
-    const o = ke.sort((s, r) => s.rank - r.rank);
-    for (const s of o) {
-      const r = s.factory(t);
-      if (r)
-        return r;
+  execute: (_id, holder) => {
+    const factories = dashboardKeyFactories.sort((a, b) => a.rank - b.rank);
+    for (const factory of factories) {
+      const key = factory.factory(holder);
+      if (key) {
+        return key;
+      }
     }
+    return void 0;
   }
 });
-const zr = (e) => {
-  Oe[ie].register(
-    ie,
-    e
+const registerDashboardKeyFactory = (factory) => {
+  ExtensionManager[EXTENSION_POINT_DASHBOARD_KEY_FACTORY].register(
+    EXTENSION_POINT_DASHBOARD_KEY_FACTORY,
+    factory
   );
-}, Vr = (e) => Oe[ie].execute(
-  ie,
-  e
+};
+const executeDashboardKeyFactory = (holder) => ExtensionManager[EXTENSION_POINT_DASHBOARD_KEY_FACTORY].execute(
+  EXTENSION_POINT_DASHBOARD_KEY_FACTORY,
+  holder
 );
-Oe.registerDashboardKeyFactory = zr;
-Oe.executeDashboardKeyFactory = Vr;
-const je = 3600, Bt = 60, ii = (e) => {
-  const t = Math.floor(e / je), o = Math.floor(e % je / Bt);
-  return { hours: t, minutes: o };
-}, ni = (e, t) => e * je + t * Bt, Hr = (e) => {
-  const o = (/* @__PURE__ */ new Date()).valueOf() - e.valueOf(), s = Math.floor(o / (1e3 * 60)), r = Math.floor(s / 60), n = Math.floor(r / 24), a = s % 60, de = r % 24;
-  let ce = "";
-  return n > 0 && (ce += `${n} day${n > 1 ? "s" : ""} `), de > 0 && (ce += `${de} hour${de > 1 ? "s" : ""} `), (a > 0 || n === 0 && de === 0) && (ce += `${a} minute${a > 1 ? "s" : ""} `), ce;
-};
-var Br = Object.defineProperty, Kr = Object.getOwnPropertyDescriptor, Ce = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? Kr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && Br(t, o, r), r;
-};
-const Y = "ingredient-summary-model";
-let L = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "assemblyModel");
-    i(this, "dashboardOperationModel");
-    i(this, "appModel");
-    i(this, "logger");
-    this.id = e, this.logger = o.logger, this.dashboardOperationModel = et.factory({});
+ExtensionManager.registerDashboardKeyFactory = registerDashboardKeyFactory;
+ExtensionManager.executeDashboardKeyFactory = executeDashboardKeyFactory;
+const HOUR = 3600;
+const MINUTE = 60;
+const toTimeComponents = (seconds) => {
+  const hours = Math.floor(seconds / HOUR);
+  const minutes = Math.floor(seconds % HOUR / MINUTE);
+  return { hours, minutes };
+};
+const toSeconds = (hours, minutes) => {
+  const time = hours * HOUR + minutes * MINUTE;
+  return time;
+};
+const calculateTimeDifference = (date) => {
+  const currentDate = /* @__PURE__ */ new Date();
+  const timeDifference = currentDate.valueOf() - date.valueOf();
+  const minutes = Math.floor(timeDifference / (1e3 * 60));
+  const hours = Math.floor(minutes / 60);
+  const days = Math.floor(hours / 24);
+  const remainingMinutes = minutes % 60;
+  const remainingHours = hours % 24;
+  let result = "";
+  if (days > 0) {
+    result += `${days} day${days > 1 ? "s" : ""} `;
+  }
+  if (remainingHours > 0) {
+    result += `${remainingHours} hour${remainingHours > 1 ? "s" : ""} `;
+  }
+  if (remainingMinutes > 0 || days === 0 && remainingHours === 0) {
+    result += `${remainingMinutes} minute${remainingMinutes > 1 ? "s" : ""} `;
+  }
+  return result;
+};
+var __defProp$9 = Object.defineProperty;
+var __getOwnPropDesc$c = Object.getOwnPropertyDescriptor;
+var __decorateClass$c = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$c(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$9(target, key, result);
+  return result;
+};
+const MODEL_TYPE$c = "ingredient-summary-model";
+let IngredientSummaryModelImpl = class {
+  id;
+  assemblyModel;
+  dashboardOperationModel;
+  appModel;
+  logger;
+  constructor(modelId, options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
+    this.dashboardOperationModel = DashboardOperations.factory({});
   }
   get highPriorityHolders() {
     return this.assemblyModel.allHolders.filter(
-      (e) => e.troubles.length > 0 && e.troubles.find((t) => t.rank >= 400)
+      (holder) => holder.troubles.length > 0 && holder.troubles.find((trouble) => trouble.rank >= 400)
     );
   }
   get actionRequiredHolders() {
-    const e = this.appModel.currentRole, t = Dt(e);
-    return this.assemblyModel.allHolders.filter((o) => {
-      const s = Be(
-        o,
-        Co.type
+    const currentRole = this.appModel.currentRole;
+    const filter = troubleVisibilityFilter(currentRole);
+    return this.assemblyModel.allHolders.filter((holder) => {
+      const companionModel = getKosCompanionModel(
+        holder,
+        FreestyleHolder.type
       );
-      if (s != null && s.isRemote)
-        return !1;
-      const r = o.troubles.filter(t);
-      return r.length > 0 && r.find((n) => n.resolvable);
+      if (companionModel?.isRemote) {
+        return false;
+      }
+      const visibleTroubles = holder.troubles.filter(filter);
+      return visibleTroubles.length > 0 && visibleTroubles.find((trouble) => trouble.resolvable);
     });
   }
   get lowLevelHolders() {
-    return this.assemblyModel.allHolders.filter((e) => {
-      const t = e.fillPercent;
-      return e.hasFuelGuage && t < 20;
+    return this.assemblyModel.allHolders.filter((holder) => {
+      const fillPercent = holder.fillPercent;
+      const hasFuelGuage = holder.hasFuelGuage;
+      return hasFuelGuage && fillPercent < 20;
     });
   }
   // -------------------LIFECYCLE----------------------------
@@ -1311,53 +1695,69 @@ let L = class {
     this.logger.debug(`loading ingredient-summary ${this.id}`);
   }
 };
-Ce([
-  p({ modelType: Se.type })
-], L.prototype, "assemblyModel", 2);
-Ce([
-  p({ modelType: et.type })
-], L.prototype, "dashboardOperationModel", 2);
-Ce([
-  p({ modelType: Ze.type })
-], L.prototype, "appModel", 2);
-L = Ce([
-  l(Y)
-], L);
-const Yr = {
+__decorateClass$c([
+  kosDependency({ modelType: Assembly.type })
+], IngredientSummaryModelImpl.prototype, "assemblyModel", 2);
+__decorateClass$c([
+  kosDependency({ modelType: DashboardOperations.type })
+], IngredientSummaryModelImpl.prototype, "dashboardOperationModel", 2);
+__decorateClass$c([
+  kosDependency({ modelType: Application.type })
+], IngredientSummaryModelImpl.prototype, "appModel", 2);
+IngredientSummaryModelImpl = __decorateClass$c([
+  kosModel(MODEL_TYPE$c)
+], IngredientSummaryModelImpl);
+const IngredientSummary = {
   registration: {
-    [Y]: {
-      class: L,
-      singleton: !1
+    [MODEL_TYPE$c]: {
+      class: IngredientSummaryModelImpl,
+      singleton: false
     }
   },
-  type: Y,
-  predicate: u(Y),
-  factory: c.Factory.create(
-    Y
+  type: MODEL_TYPE$c,
+  predicate: isKosModel(MODEL_TYPE$c),
+  factory: Kos.Factory.create(
+    MODEL_TYPE$c
   )
-}, { URL: tt } = h("LOCKOUT_SERVICE"), { postModel: Kt } = y.build({
-  basePath: `${tt}/api/app/kosdev.ddk/lockout`
-}), Yt = g.createLogger({ name: "lockout-service", group: "Services" }), Gr = async () => (Yt.info("lock"), await Kt({
-  model: {},
-  urlOverride: `${tt}/api/app/kosdev.ddk/lockout/lockNow`
-})), Gt = async (e) => {
-  Yt.info("unlock");
-  const t = await Kt({
+};
+const { URL: URL$5 } = resolveServiceUrl("LOCKOUT_SERVICE");
+const { postModel: postModel$1 } = ServiceFactory.build({
+  basePath: `${URL$5}/api/app/kosdev.ddk/lockout`
+});
+const log$5 = KosLog.createLogger({ name: "lockout-service", group: "Services" });
+const lock = async () => {
+  log$5.info("lock");
+  const response = await postModel$1({
     model: {},
-    urlOverride: `${tt}/api/app/kosdev.ddk/lockout/unlock/${e}`
+    urlOverride: `${URL$5}/api/app/kosdev.ddk/lockout/lockNow`
   });
-  return t == null ? void 0 : t.data;
-}, ai = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  return response;
+};
+const unlock = async (pin) => {
+  log$5.info("unlock");
+  const response = await postModel$1({
+    model: {},
+    urlOverride: `${URL$5}/api/app/kosdev.ddk/lockout/unlock/${pin}`
+  });
+  return response?.data;
+};
+const index$5 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  lock: Gr,
-  unlock: Gt
+  lock,
+  unlock
 }, Symbol.toStringTag, { value: "Module" }));
-var qr = Object.defineProperty, Qr = Object.getOwnPropertyDescriptor, F = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? Qr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && qr(t, o, r), r;
+var __defProp$8 = Object.defineProperty;
+var __getOwnPropDesc$b = Object.getOwnPropertyDescriptor;
+var __decorateClass$b = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$b(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$8(target, key, result);
+  return result;
 };
-const qt = "lockout-model", Xr = [
+const MODEL_TYPE$b = "lockout-model";
+const scheduleData = [
   { day: "monday", lock: "dayWiseLockConfigMap.Mon.enabled", open: "dayWiseLockConfigMap.Mon.unlockTime", close: "dayWiseLockConfigMap.Mon.lockTime" },
   { day: "tuesday", lock: "dayWiseLockConfigMap.Tue.enabled", open: "dayWiseLockConfigMap.Tue.unlockTime", close: "dayWiseLockConfigMap.Tue.lockTime" },
   { day: "wednesday", lock: "dayWiseLockConfigMap.Wed.enabled", open: "dayWiseLockConfigMap.Wed.unlockTime", close: "dayWiseLockConfigMap.Wed.lockTime" },
@@ -1366,146 +1766,170 @@ const qt = "lockout-model", Xr = [
   { day: "saturday", lock: "dayWiseLockConfigMap.Sat.enabled", open: "dayWiseLockConfigMap.Sat.unlockTime", close: "dayWiseLockConfigMap.Sat.lockTime" },
   { day: "sunday", lock: "dayWiseLockConfigMap.Sun.enabled", open: "dayWiseLockConfigMap.Sun.unlockTime", close: "dayWiseLockConfigMap.Sun.lockTime" }
 ];
-let P = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "logger");
-    i(this, "dayEnabledList", [
-      "dayWiseLockConfigMap.Sun.enabled",
-      "dayWiseLockConfigMap.Mon.enabled",
-      "dayWiseLockConfigMap.Tue.enabled",
-      "dayWiseLockConfigMap.Wed.enabled",
-      "dayWiseLockConfigMap.Thu.enabled",
-      "dayWiseLockConfigMap.Fri.enabled",
-      "dayWiseLockConfigMap.Sat.enabled"
-    ]);
-    i(this, "dayOpenAtList", [
-      "dayWiseLockConfigMap.Sun.unlockTime",
-      "dayWiseLockConfigMap.Mon.unlockTime",
-      "dayWiseLockConfigMap.Tue.unlockTime",
-      "dayWiseLockConfigMap.Wed.unlockTime",
-      "dayWiseLockConfigMap.Thu.unlockTime",
-      "dayWiseLockConfigMap.Fri.unlockTime",
-      "dayWiseLockConfigMap.Sat.unlockTime"
-    ]);
-    i(this, "dayCloseAtList", [
-      "dayWiseLockConfigMap.Sun.lockTime",
-      "dayWiseLockConfigMap.Mon.lockTime",
-      "dayWiseLockConfigMap.Tue.lockTime",
-      "dayWiseLockConfigMap.Wed.lockTime",
-      "dayWiseLockConfigMap.Thu.lockTime",
-      "dayWiseLockConfigMap.Fri.lockTime",
-      "dayWiseLockConfigMap.Sat.lockTime"
-    ]);
-    i(this, "saveMap");
-    i(this, "pin");
-    i(this, "nextLockSkipped");
-    i(this, "nextLockTime");
-    i(this, "nextUnLockTime");
-    i(this, "cuiLockout");
-    this.id = e, this.logger = o.logger, this.saveMap = /* @__PURE__ */ new Map();
-  }
+let LockoutModelImpl = class {
+  id;
+  logger;
+  dayEnabledList = [
+    "dayWiseLockConfigMap.Sun.enabled",
+    "dayWiseLockConfigMap.Mon.enabled",
+    "dayWiseLockConfigMap.Tue.enabled",
+    "dayWiseLockConfigMap.Wed.enabled",
+    "dayWiseLockConfigMap.Thu.enabled",
+    "dayWiseLockConfigMap.Fri.enabled",
+    "dayWiseLockConfigMap.Sat.enabled"
+  ];
+  dayOpenAtList = [
+    "dayWiseLockConfigMap.Sun.unlockTime",
+    "dayWiseLockConfigMap.Mon.unlockTime",
+    "dayWiseLockConfigMap.Tue.unlockTime",
+    "dayWiseLockConfigMap.Wed.unlockTime",
+    "dayWiseLockConfigMap.Thu.unlockTime",
+    "dayWiseLockConfigMap.Fri.unlockTime",
+    "dayWiseLockConfigMap.Sat.unlockTime"
+  ];
+  dayCloseAtList = [
+    "dayWiseLockConfigMap.Sun.lockTime",
+    "dayWiseLockConfigMap.Mon.lockTime",
+    "dayWiseLockConfigMap.Tue.lockTime",
+    "dayWiseLockConfigMap.Wed.lockTime",
+    "dayWiseLockConfigMap.Thu.lockTime",
+    "dayWiseLockConfigMap.Fri.lockTime",
+    "dayWiseLockConfigMap.Sat.lockTime"
+  ];
+  saveMap;
+  pin;
+  nextLockSkipped;
+  nextLockTime;
+  nextUnLockTime;
+  cuiLockout;
   get enabled() {
-    const e = this.getProp(
+    const oneTimeLockConfigLockTime = this.getProp(
       "oneTimeLockConfig.lockTime"
-    ), t = e !== void 0 && e !== "", o = this.getProp("lockScheduleEnabled");
-    return t || o;
+    );
+    const oneTimeLockEnabled = oneTimeLockConfigLockTime !== void 0 && oneTimeLockConfigLockTime !== "";
+    const lockScheduleEnabled = this.getProp("lockScheduleEnabled");
+    const enabled = oneTimeLockEnabled || lockScheduleEnabled;
+    return enabled;
   }
   get schedule() {
-    return Xr;
+    return scheduleData;
   }
-  getProp(e) {
-    return this.saveMap.get(e);
+  constructor(modelId, _options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
+    this.saveMap = /* @__PURE__ */ new Map();
   }
-  setProp(e, t) {
-    this.saveMap.set(e, t);
+  getProp(key) {
+    return this.saveMap.get(key);
+  }
+  setProp(key, value) {
+    this.saveMap.set(key, value);
   }
   // Skip or resume the next lock...
   toggleSkip() {
-    if (this.nextLockSkipped.value === "0") {
-      const t = this.nextLockTime.value;
-      t !== void 0 && this.nextLockSkipped.updateProperty(t);
-    } else
+    const nextLockSkipped = this.nextLockSkipped.value;
+    if (nextLockSkipped === "0") {
+      const nextLockTime = this.nextLockTime.value;
+      if (nextLockTime !== void 0)
+        this.nextLockSkipped.updateProperty(nextLockTime);
+    } else {
       this.nextLockSkipped.updateProperty("0");
+    }
   }
-  async unlock(e) {
-    return await Gt(e);
+  async unlock(pin) {
+    return await unlock(pin);
   }
   async save() {
-    return this.saveMap.forEach((e, t) => {
-      e !== this.cuiLockout.props[t] && (this.cuiLockout.props[t] = e);
-    }), this.cuiLockout.updateConfigBean();
+    this.saveMap.forEach((value, key) => {
+      if (value !== this.cuiLockout.props[key])
+        this.cuiLockout.props[key] = value;
+    });
+    return this.cuiLockout.updateConfigBean();
   }
   reset() {
     this.cuiLockout.props.entries.forEach(
-      ([e, t]) => this.saveMap.set(e, t)
+      ([key, value]) => this.saveMap.set(key, value)
     );
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
-    this.logger.debug(`initializing lockout ${this.id}`), this.cuiLockout.props.entries.forEach(
-      ([e, t]) => this.saveMap.set(e, t)
+    this.logger.debug(`initializing lockout ${this.id}`);
+    this.cuiLockout.props.entries.forEach(
+      ([key, value]) => this.saveMap.set(key, value)
     );
   }
   async load() {
     this.logger.debug(`loading lockout ${this.id}`);
   }
 };
-F([
-  d({
+__decorateClass$b([
+  kosConfigProperty({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "pin"
   })
-], P.prototype, "pin", 2);
-F([
-  d({
+], LockoutModelImpl.prototype, "pin", 2);
+__decorateClass$b([
+  kosConfigProperty({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextLockSkipped"
   })
-], P.prototype, "nextLockSkipped", 2);
-F([
-  d({
+], LockoutModelImpl.prototype, "nextLockSkipped", 2);
+__decorateClass$b([
+  kosConfigProperty({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextLockTime"
   })
-], P.prototype, "nextLockTime", 2);
-F([
-  d({
+], LockoutModelImpl.prototype, "nextLockTime", 2);
+__decorateClass$b([
+  kosConfigProperty({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextUnLockTime"
   })
-], P.prototype, "nextUnLockTime", 2);
-F([
-  So({ path: "app:kosdev.ddk:service:cuiLockout" })
-], P.prototype, "cuiLockout", 2);
-P = F([
-  l(qt)
-], P);
-const li = new He({
-  class: P,
-  type: qt
-}), Jr = async (e, t) => await Me.bulkResolveTroubles(
-  e,
-  void 0,
-  t
-);
-var Zr = Object.defineProperty, es = Object.getOwnPropertyDescriptor, Le = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? es(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && Zr(t, o, r), r;
-};
-const G = "macro-assignment-model", gt = "PurgeTrouble", ts = "PrimeTrouble";
-let D = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "logger");
-    /**
-     * futureHandler is used to handle async operations
-     */
-    i(this, "futureHandler");
-    i(this, "holders");
-    i(this, "ingredients");
-    this.id = e, this.futureHandler = new Ge(), this.logger = o.logger;
+], LockoutModelImpl.prototype, "nextUnLockTime", 2);
+__decorateClass$b([
+  kosConfigBean({ path: "app:kosdev.ddk:service:cuiLockout" })
+], LockoutModelImpl.prototype, "cuiLockout", 2);
+LockoutModelImpl = __decorateClass$b([
+  kosModel(MODEL_TYPE$b)
+], LockoutModelImpl);
+const Lockout = new SingletonKosModelRegistrationFactory({
+  class: LockoutModelImpl,
+  type: MODEL_TYPE$b
+});
+const purgeMacroPumps = async (troubleIds, tracker) => {
+  const response = await TroubleServices.bulkResolveTroubles(
+    troubleIds,
+    void 0,
+    tracker
+  );
+  return response;
+};
+var __defProp$7 = Object.defineProperty;
+var __getOwnPropDesc$a = Object.getOwnPropertyDescriptor;
+var __decorateClass$a = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$a(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$7(target, key, result);
+  return result;
+};
+const MODEL_TYPE$a = "macro-assignment-model";
+const TROUBLE_TYPE_PURGE = "PurgeTrouble";
+const TROUBLE_TYPE_PRIME = "PrimeTrouble";
+let MacroAssignmentModelImpl = class {
+  id;
+  logger;
+  /**
+   * futureHandler is used to handle async operations
+   */
+  futureHandler;
+  holders;
+  ingredients;
+  constructor(modelId, _options, context) {
+    this.id = modelId;
+    this.futureHandler = new FutureHandler();
+    this.logger = context.logger;
   }
   /**
    * shortcut to the current running future
@@ -1520,7 +1944,11 @@ let D = class {
    * by the holders position in the dispenser assembly.
    */
   get macroHolders() {
-    return this.holders.holders.getIndexByKey("group", "macros").sort((e, t) => e.name < t.name ? -1 : e.name > t.name ? 1 : 0);
+    return this.holders.holders.getIndexByKey("group", "macros").sort((a, b) => {
+      if (a.name < b.name) return -1;
+      if (a.name > b.name) return 1;
+      return 0;
+    });
   }
   /**
    * Returns true if there are any macro holders in the dispenser assembly
@@ -1534,16 +1962,20 @@ let D = class {
    * Relying on the indexing of troubles by type to find the purge troubles.
    */
   get holderPurgeTroubles() {
-    return this.macroHolders.reduce((t, o) => {
-      const s = o.troublesByType[gt] || [];
-      return t = [...t, ...s], t;
+    const troubles = this.macroHolders.reduce((acc, curr) => {
+      const purgeTroubles = curr.troublesByType[TROUBLE_TYPE_PURGE] || [];
+      acc = [...acc, ...purgeTroubles];
+      return acc;
     }, []);
+    return troubles;
   }
   get holderPrimeTroubles() {
-    return this.macroHolders.reduce((t, o) => {
-      const s = o.troublesByType[ts] || [];
-      return t = [...t, ...s], t;
+    const troubles = this.macroHolders.reduce((acc, curr) => {
+      const primeTroubles = curr.troublesByType[TROUBLE_TYPE_PRIME] || [];
+      acc = [...acc, ...primeTroubles];
+      return acc;
     }, []);
+    return troubles;
   }
   /**
    * Returns true if there are any purge troubles for the macro holders.
@@ -1574,59 +2006,77 @@ let D = class {
   get hasMacroIngredients() {
     return this.macroIngredients.length > 0;
   }
-  async resolveAll(e, t) {
-    if (!t)
+  async resolveAll(type, tracker) {
+    if (!tracker) {
       throw new Error("No tracker provided");
-    const s = (e === gt ? this.holderPurgeTroubles : this.holderPrimeTroubles).map((n) => n.rawId);
-    return await Jr(s, t);
-  }
-};
-Le([
-  p({ modelType: Lo.type })
-], D.prototype, "holders", 2);
-Le([
-  p({ modelType: Do.type })
-], D.prototype, "ingredients", 2);
-Le([
-  M()
-], D.prototype, "resolveAll", 1);
-D = Le([
-  l(G)
-], D);
-const os = {
+    }
+    const container = type === TROUBLE_TYPE_PURGE ? this.holderPurgeTroubles : this.holderPrimeTroubles;
+    const allTroubles = container.map((trouble) => trouble.rawId);
+    const response = await purgeMacroPumps(allTroubles, tracker);
+    return response;
+  }
+};
+__decorateClass$a([
+  kosDependency({ modelType: HolderContainer.type })
+], MacroAssignmentModelImpl.prototype, "holders", 2);
+__decorateClass$a([
+  kosDependency({ modelType: IngredientContainer.type })
+], MacroAssignmentModelImpl.prototype, "ingredients", 2);
+__decorateClass$a([
+  kosFuture()
+], MacroAssignmentModelImpl.prototype, "resolveAll", 1);
+MacroAssignmentModelImpl = __decorateClass$a([
+  kosModel(MODEL_TYPE$a)
+], MacroAssignmentModelImpl);
+const MacroAssignment = {
   registration: {
-    [G]: {
-      class: D,
-      singleton: !0
+    [MODEL_TYPE$a]: {
+      class: MacroAssignmentModelImpl,
+      singleton: true
     }
   },
-  type: G,
-  predicate: u(G),
-  factory: c.Singleton.create(
-    G
+  type: MODEL_TYPE$a,
+  predicate: isKosModel(MODEL_TYPE$a),
+  factory: Kos.Singleton.create(
+    MODEL_TYPE$a
   )
 };
-var rs = Object.getOwnPropertyDescriptor, ss = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? rs(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = a(r) || r);
-  return r;
-};
-const q = "network-test-model";
-let We = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "group");
-    i(this, "passed");
-    i(this, "inProgress");
-    i(this, "failureTime");
-    i(this, "timestamp");
-    i(this, "name");
-    i(this, "results");
-    i(this, "logger");
-    this.id = e, this.logger = o.logger, this.group = t.group, this.passed = !1, this.inProgress = !1, this.name = t.name, this.results = [];
-  }
-  updateModel(e) {
-    this.group = e.group, this.name = e.name, this.passed = e.passed, this.failureTime = e.failureTime, this.inProgress = e.inProgress, this.timestamp = e.timestamp, this.results = e.results;
+var __getOwnPropDesc$9 = Object.getOwnPropertyDescriptor;
+var __decorateClass$9 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$9(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = decorator(result) || result;
+  return result;
+};
+const MODEL_TYPE$9 = "network-test-model";
+let NetworkTestModelImpl = class {
+  id;
+  group;
+  passed;
+  inProgress;
+  failureTime;
+  timestamp;
+  name;
+  results;
+  logger;
+  constructor(modelId, options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
+    this.group = options.group;
+    this.passed = false;
+    this.inProgress = false;
+    this.name = options.name;
+    this.results = [];
+  }
+  updateModel(options) {
+    this.group = options.group;
+    this.name = options.name;
+    this.passed = options.passed;
+    this.failureTime = options.failureTime;
+    this.inProgress = options.inProgress;
+    this.timestamp = options.timestamp;
+    this.results = options.results;
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1636,75 +2086,94 @@ let We = class {
     this.logger.debug(`loading network-test ${this.id}`);
   }
 };
-We = ss([
-  l(q)
-], We);
-const Qt = {
+NetworkTestModelImpl = __decorateClass$9([
+  kosModel(MODEL_TYPE$9)
+], NetworkTestModelImpl);
+const NetworkTest = {
   registration: {
-    [q]: {
-      class: We,
-      singleton: !1
+    [MODEL_TYPE$9]: {
+      class: NetworkTestModelImpl,
+      singleton: false
     }
   },
-  type: q,
-  predicate: u(q),
-  factory: c.Factory.create(q)
-}, { URL: De } = h("NETWORK-TEST_SERVICE"), { getAll: is, getOne: Xt } = y.build({
-  basePath: `${De}/api/app/ncui/network/tests`
-}), ns = g.createLogger({
+  type: MODEL_TYPE$9,
+  predicate: isKosModel(MODEL_TYPE$9),
+  factory: Kos.Factory.create(MODEL_TYPE$9)
+};
+const { URL: URL$4 } = resolveServiceUrl("NETWORK-TEST_SERVICE");
+const { getAll: getAll$2, getOne: getOne$1 } = ServiceFactory.build({
+  basePath: `${URL$4}/api/app/ncui/network/tests`
+});
+const log$4 = KosLog.createLogger({
   name: "network-test-service",
   group: "Services"
-}), Jt = async () => {
-  ns.debug("sending GET for network-test");
-  const e = await is({
-    urlOverride: `${De}/api/app/kosdev.ddk/network/tests`
+});
+const getNetworkTests = async () => {
+  log$4.debug("sending GET for network-test");
+  const response = await getAll$2({
+    urlOverride: `${URL$4}/api/app/kosdev.ddk/network/tests`
+  });
+  return response?.data;
+};
+const getTestsReports = async () => {
+  const response = await getOne$1({
+    urlOverride: `${URL$4}/api/app/kosdev.ddk/network/reports`
   });
-  return e == null ? void 0 : e.data;
-}, Zt = async () => {
-  const e = await Xt({
-    urlOverride: `${De}/api/app/kosdev.ddk/network/reports`
+  return response?.data;
+};
+const performGroupTest = async (group, tracker) => {
+  const response = await getOne$1({
+    urlOverride: `${URL$4}/api/app/kosdev.ddk/network/tests/run/group/${group}`,
+    tracker
   });
-  return e == null ? void 0 : e.data;
-}, eo = async (e, t) => await Xt({
-  urlOverride: `${De}/api/app/kosdev.ddk/network/tests/run/group/${e}`,
-  tracker: t
-}), di = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  return response;
+};
+const index$4 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getNetworkTests: Jt,
-  getTestsReports: Zt,
-  performGroupTest: eo
+  getNetworkTests,
+  getTestsReports,
+  performGroupTest
 }, Symbol.toStringTag, { value: "Module" }));
-var as = Object.defineProperty, ls = Object.getOwnPropertyDescriptor, ot = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? ls(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && as(t, o, r), r;
-};
-const Q = "network-test-container-model";
-let ne = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "logger");
-    i(this, "lastTested");
-    i(this, "futureHandler");
-    i(this, "models");
-    this.id = e, this.logger = o.logger, this.futureHandler = new Ge(this), this.models = new Ve({
-      parentId: e,
+var __defProp$6 = Object.defineProperty;
+var __getOwnPropDesc$8 = Object.getOwnPropertyDescriptor;
+var __decorateClass$8 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$8(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$6(target, key, result);
+  return result;
+};
+const MODEL_TYPE$8 = "network-test-container-model";
+let NetworkTestContainerModelImpl = class {
+  id;
+  logger;
+  lastTested;
+  futureHandler;
+  models;
+  constructor(modelId, options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
+    this.futureHandler = new FutureHandler(this);
+    this.models = new KosModelContainer({
+      parentId: modelId,
       indexMap: {
         group: "group"
       }
-    }), this.lastTested = /* @__PURE__ */ new Date("default");
+    });
+    this.lastTested = /* @__PURE__ */ new Date("default");
   }
   get data() {
     return this.models.data;
   }
-  addModel(e) {
-    this.models.addModel(e);
+  addModel(model) {
+    this.models.addModel(model);
   }
-  removeModel(e) {
-    this.models.removeModel(e);
+  removeModel(id) {
+    this.models.removeModel(id);
   }
-  getModel(e) {
-    return this.models.getModel(e);
+  getModel(id) {
+    return this.models.getModel(id);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1712,99 +2181,119 @@ let ne = class {
       `initializing network-test-container container ${this.id}`
     );
   }
-  getLastTested(e) {
-    const t = this.models.getIndexByKey("group", e).map((s) => s.timestamp && new Date(s.timestamp)), o = Math.max(
-      ...t.map((s) => s ? s.getTime() : 0)
+  getLastTested(groupName) {
+    const dateArray = this.models.getIndexByKey("group", groupName).map((obj) => obj.timestamp && new Date(obj.timestamp));
+    const latestDate = Math.max(
+      ...dateArray.map((date) => date ? date.getTime() : 0)
     );
-    return o ? Hr(new Date(o)) : "";
+    return latestDate ? calculateTimeDifference(new Date(latestDate)) : "";
   }
   async load() {
     this.logger.debug(`loading network-test-container container ${this.id}`);
-    const e = await Jt(), t = await Zt();
-    e && e.forEach((o) => {
-      const s = Qt.factory(o.id)(o);
-      this.addModel(s);
-    }), e && t && e.forEach((o) => {
-      const s = t == null ? void 0 : t[o.group], r = s == null ? void 0 : s[o.id], n = this.getModel(o.id);
-      if (n && r) {
-        const a = {
-          group: r.group,
-          name: r.name,
-          passed: r.passed,
-          failureTime: r.failureTime ? new Date(r.failureTime) : void 0,
-          inProgress: r.inProgress,
-          timestamp: new Date(r.timestamp),
-          results: r.results
-        };
-        n.updateModel(a);
-      }
-    });
+    const testResponse = await getNetworkTests();
+    const testReportResponse = await getTestsReports();
+    if (testResponse) {
+      testResponse.forEach((item) => {
+        const testModel = NetworkTest.factory(item.id)(item);
+        this.addModel(testModel);
+      });
+    }
+    if (testResponse && testReportResponse) {
+      testResponse.forEach((item) => {
+        const groupReport = testReportResponse?.[item.group];
+        const testReport = groupReport?.[item.id];
+        const testModel = this.getModel(item.id);
+        if (testModel && testReport) {
+          const update = {
+            group: testReport.group,
+            name: testReport.name,
+            passed: testReport.passed,
+            failureTime: testReport.failureTime ? new Date(testReport.failureTime) : void 0,
+            inProgress: testReport.inProgress,
+            timestamp: new Date(testReport.timestamp),
+            results: testReport.results
+          };
+          testModel.updateModel(update);
+        }
+      });
+    }
   }
-  async performTest(e, t) {
-    if (!t)
+  async performTest(group, tracker) {
+    if (!tracker) {
       throw new Error("No tracker provided");
-    const o = await eo(e, t);
-    return o == null ? void 0 : o.data;
-  }
-  onFutureUpdate(e) {
-    const { clientData: t } = e;
-    t && t.forEach((o) => {
-      const s = this.getModel(o.id);
-      if (v(() => {
-        this.lastTested = this.lastTested > new Date(o.timestamp) ? this.lastTested : new Date(o.timestamp);
-      }), s) {
-        const r = {
-          group: o.group,
-          name: o.name,
-          passed: o.passed,
-          failureTime: o.failureTime ? new Date(o.failureTime) : void 0,
-          inProgress: o.inProgress,
-          timestamp: new Date(o.timestamp),
-          results: o.results
-        };
-        v(() => {
-          s.updateModel(r);
+    }
+    const result = await performGroupTest(group, tracker);
+    return result?.data;
+  }
+  onFutureUpdate(future) {
+    const { clientData } = future;
+    if (clientData) {
+      clientData.forEach((item) => {
+        const testModel = this.getModel(item.id);
+        kosAction(() => {
+          this.lastTested = this.lastTested > new Date(item.timestamp) ? this.lastTested : new Date(item.timestamp);
         });
-      }
-    });
+        if (testModel) {
+          const update = {
+            group: item.group,
+            name: item.name,
+            passed: item.passed,
+            failureTime: item.failureTime ? new Date(item.failureTime) : void 0,
+            inProgress: item.inProgress,
+            timestamp: new Date(item.timestamp),
+            results: item.results
+          };
+          kosAction(() => {
+            testModel.updateModel(update);
+          });
+        }
+      });
+    }
   }
 };
-ot([
-  $e
-], ne.prototype, "models", 2);
-ot([
-  M()
-], ne.prototype, "performTest", 1);
-ne = ot([
-  l(Q)
-], ne);
-const ds = {
+__decorateClass$8([
+  kosChild
+], NetworkTestContainerModelImpl.prototype, "models", 2);
+__decorateClass$8([
+  kosFuture()
+], NetworkTestContainerModelImpl.prototype, "performTest", 1);
+NetworkTestContainerModelImpl = __decorateClass$8([
+  kosModel(MODEL_TYPE$8)
+], NetworkTestContainerModelImpl);
+const NetworkTestContainer = {
   registration: {
-    [Q]: {
-      class: ne,
-      singleton: !0
+    [MODEL_TYPE$8]: {
+      class: NetworkTestContainerModelImpl,
+      singleton: true
     },
-    ...Qt.registration
+    ...NetworkTest.registration
   },
-  type: Q,
-  predicate: u(Q),
-  factory: c.Singleton.create(Q)
-};
-var cs = Object.defineProperty, us = Object.getOwnPropertyDescriptor, rt = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? us(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && cs(t, o, r), r;
-};
-const X = "nutritive-sweetener-model", ps = ht("statePath");
-let ae = class {
-  constructor(e, t) {
-    i(this, "id");
-    i(this, "assemblyModel");
-    i(this, "pumpState");
-    this.id = e;
+  type: MODEL_TYPE$8,
+  predicate: isKosModel(MODEL_TYPE$8),
+  factory: Kos.Singleton.create(MODEL_TYPE$8)
+};
+var __defProp$5 = Object.defineProperty;
+var __getOwnPropDesc$7 = Object.getOwnPropertyDescriptor;
+var __decorateClass$7 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$7(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$5(target, key, result);
+  return result;
+};
+const MODEL_TYPE$7 = "nutritive-sweetener-model";
+const PATH_PUMP_STATE = createPropKey("statePath");
+let NutritiveSweetenerModelImpl = class {
+  id;
+  assemblyModel;
+  pumpState;
+  constructor(modelId, _options) {
+    this.id = modelId;
   }
   get holder() {
-    return this.assemblyModel.getHoldersByGroup("ns")[0];
+    const nsHolder = this.assemblyModel.getHoldersByGroup("ns")[0];
+    return nsHolder;
   }
   getHolder() {
     return this.holder;
@@ -1819,49 +2308,57 @@ let ae = class {
     return this.pump;
   }
 };
-rt([
-  p({ modelType: Se.type })
-], ae.prototype, "assemblyModel", 2);
-rt([
-  wo({
-    path: ps
+__decorateClass$7([
+  kosDependency({ modelType: Assembly.type })
+], NutritiveSweetenerModelImpl.prototype, "assemblyModel", 2);
+__decorateClass$7([
+  kosStateBean({
+    path: PATH_PUMP_STATE
   })
-], ae.prototype, "pumpState", 2);
-ae = rt([
-  l(X),
-  Ke()
-], ae);
-const gs = {
+], NutritiveSweetenerModelImpl.prototype, "pumpState", 2);
+NutritiveSweetenerModelImpl = __decorateClass$7([
+  kosModel(MODEL_TYPE$7),
+  kosLoggerAware()
+], NutritiveSweetenerModelImpl);
+const NutritiveSweetener = {
   registration: {
-    [X]: {
-      class: ae,
-      singleton: !1
+    [MODEL_TYPE$7]: {
+      class: NutritiveSweetenerModelImpl,
+      singleton: false
     }
   },
-  type: X,
-  predicate: u(X),
-  factory: c.Factory.create(X)
-};
-var hs = Object.defineProperty, ys = Object.getOwnPropertyDescriptor, to = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? ys(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && hs(t, o, r), r;
-};
-const J = "plain-water-model";
-let me = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "assemblyModel");
-    i(this, "logger");
-    this.id = e, this.logger = o.logger;
+  type: MODEL_TYPE$7,
+  predicate: isKosModel(MODEL_TYPE$7),
+  factory: Kos.Factory.create(MODEL_TYPE$7)
+};
+var __defProp$4 = Object.defineProperty;
+var __getOwnPropDesc$6 = Object.getOwnPropertyDescriptor;
+var __decorateClass$6 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$6(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$4(target, key, result);
+  return result;
+};
+const MODEL_TYPE$6 = "plain-water-model";
+let PlainWaterModelImpl = class {
+  id;
+  assemblyModel;
+  logger;
+  constructor(modelId, _options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
   }
   getHolder() {
-    return this.assemblyModel.getHoldersByGroup("water")[0];
+    const waterHolder = this.assemblyModel.getHoldersByGroup("water")[0];
+    return waterHolder;
   }
   getPump() {
-    var s, r;
-    const e = this.getHolder(), t = (r = (s = e == null ? void 0 : e.pumps) == null ? void 0 : s.data) == null ? void 0 : r[0];
-    return Be(t, mt.type);
+    const waterHolder = this.getHolder();
+    const pump = waterHolder?.pumps?.data?.[0];
+    const model = getKosCompanionModel(pump, FcmPump.type);
+    return model;
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1871,45 +2368,58 @@ let me = class {
     this.logger.debug(`loading plain-water ${this.id}`);
   }
 };
-to([
-  p({ modelType: Se.type })
-], me.prototype, "assemblyModel", 2);
-me = to([
-  l(J)
-], me);
-const fs = {
+__decorateClass$6([
+  kosDependency({ modelType: Assembly.type })
+], PlainWaterModelImpl.prototype, "assemblyModel", 2);
+PlainWaterModelImpl = __decorateClass$6([
+  kosModel(MODEL_TYPE$6)
+], PlainWaterModelImpl);
+const PlainWater = {
   registration: {
-    [J]: {
-      class: me,
-      singleton: !1
+    [MODEL_TYPE$6]: {
+      class: PlainWaterModelImpl,
+      singleton: false
     }
   },
-  type: J,
-  predicate: u(J),
-  factory: c.Factory.create(J)
-}, { URL: oo } = h("REBOOT_SERVICE"), { postModel: vs } = y.build({
-  basePath: `${oo}/api/reboot`
-}), ms = g.createLogger({ name: "reboot-service", group: "Services" }), ro = async () => (ms.debug("sending POST call for Reboot Dispenser"), await vs({
-  urlOverride: `${oo}/api/app/kosdev.ddk/ncui/reboot`,
-  model: {}
-})), ci = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  type: MODEL_TYPE$6,
+  predicate: isKosModel(MODEL_TYPE$6),
+  factory: Kos.Factory.create(MODEL_TYPE$6)
+};
+const { URL: URL$3 } = resolveServiceUrl("REBOOT_SERVICE");
+const { postModel } = ServiceFactory.build({
+  basePath: `${URL$3}/api/reboot`
+});
+const log$3 = KosLog.createLogger({ name: "reboot-service", group: "Services" });
+const rebootDispenser = async () => {
+  log$3.debug("sending POST call for Reboot Dispenser");
+  const response = await postModel({
+    urlOverride: `${URL$3}/api/app/kosdev.ddk/ncui/reboot`,
+    model: {}
+  });
+  return response;
+};
+const index$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  rebootDispenser: ro
+  rebootDispenser
 }, Symbol.toStringTag, { value: "Module" }));
-var bs = Object.getOwnPropertyDescriptor, _s = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? bs(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = a(r) || r);
-  return r;
-};
-const Z = "reboot-model";
-let Ne = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "logger");
-    this.id = e, this.logger = o.logger;
+var __getOwnPropDesc$5 = Object.getOwnPropertyDescriptor;
+var __decorateClass$5 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$5(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = decorator(result) || result;
+  return result;
+};
+const MODEL_TYPE$5 = "reboot-model";
+let RebootModelImpl = class {
+  id;
+  logger;
+  constructor(modelId, options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
   }
   async completeReboot() {
-    await ro();
+    await rebootDispenser();
   }
   updateModel() {
   }
@@ -1921,41 +2431,47 @@ let Ne = class {
     this.logger.debug(`loading reboot ${this.id}`);
   }
 };
-Ne = _s([
-  l(Z)
-], Ne);
-const Ts = {
+RebootModelImpl = __decorateClass$5([
+  kosModel(MODEL_TYPE$5)
+], RebootModelImpl);
+const Reboot = {
   registration: {
-    [Z]: {
-      class: Ne,
-      singleton: !1
+    [MODEL_TYPE$5]: {
+      class: RebootModelImpl,
+      singleton: false
     }
   },
-  type: Z,
-  predicate: u(Z),
-  factory: c.Factory.create(Z)
-};
-var $s = Object.defineProperty, Ps = Object.getOwnPropertyDescriptor, m = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? Ps(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && $s(t, o, r), r;
-};
-const ee = "settings-model";
-let f = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "logger");
-    i(this, "ncuiLanguageData");
-    i(this, "resolveDelaysMs");
-    i(this, "dateFormat");
-    i(this, "timeFormat");
-    i(this, "hidePlainWaterBev");
-    i(this, "hideCarbWaterBev");
-    i(this, "ncuiLanguage");
-    i(this, "name");
-    i(this, "activateAndRebootTime");
-    i(this, "horizontalMode");
-    this.id = e, this.logger = o.logger;
+  type: MODEL_TYPE$5,
+  predicate: isKosModel(MODEL_TYPE$5),
+  factory: Kos.Factory.create(MODEL_TYPE$5)
+};
+var __defProp$3 = Object.defineProperty;
+var __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor;
+var __decorateClass$4 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$4(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$3(target, key, result);
+  return result;
+};
+const MODEL_TYPE$4 = "settings-model";
+let SettingsModelImpl = class {
+  id;
+  logger;
+  ncuiLanguageData;
+  resolveDelaysMs;
+  dateFormat;
+  timeFormat;
+  hidePlainWaterBev;
+  hideCarbWaterBev;
+  ncuiLanguage;
+  name;
+  activateAndRebootTime;
+  horizontalMode;
+  constructor(modelId, _options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
   }
   // -------------------LIFECYCLE----------------------------
   async ready() {
@@ -1975,7 +2491,8 @@ let f = class {
     };
   }
   async load() {
-    this.logger.debug(`loading settings ${this.id}`), this.ncuiLanguageData = {
+    this.logger.debug(`loading settings ${this.id}`);
+    this.ncuiLanguageData = {
       status: 200,
       data: {
         languages: [
@@ -1991,114 +2508,141 @@ let f = class {
     this.updateDisplayMode();
   }
   updateDisplayMode() {
-    this.horizontalMode.value ? document.body.setAttribute("data-dashboard-layout", "horizontal") : document.body.setAttribute("data-dashboard-layout", "vertical");
+    if (this.horizontalMode.value) {
+      document.body.setAttribute("data-dashboard-layout", "horizontal");
+    } else {
+      document.body.setAttribute("data-dashboard-layout", "vertical");
+    }
   }
 };
-m([
-  d({
+__decorateClass$4([
+  kosConfigProperty({
     path: "system:app",
     attribute: "resolveDelaysMs"
     // optionsExpander: () => [],
   })
-], f.prototype, "resolveDelaysMs", 2);
-m([
-  d({
+], SettingsModelImpl.prototype, "resolveDelaysMs", 2);
+__decorateClass$4([
+  kosConfigProperty({
     path: "system:app",
     attribute: "dateFormat"
     // optionsExpander: () => [],
   })
-], f.prototype, "dateFormat", 2);
-m([
-  d({
+], SettingsModelImpl.prototype, "dateFormat", 2);
+__decorateClass$4([
+  kosConfigProperty({
     path: "system:app",
     attribute: "timeFormat"
     // optionsExpander: () => [],
   })
-], f.prototype, "timeFormat", 2);
-m([
-  d({
+], SettingsModelImpl.prototype, "timeFormat", 2);
+__decorateClass$4([
+  kosConfigProperty({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.hidePlainWaterBev"
   })
-], f.prototype, "hidePlainWaterBev", 2);
-m([
-  d({
+], SettingsModelImpl.prototype, "hidePlainWaterBev", 2);
+__decorateClass$4([
+  kosConfigProperty({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.hideCarbWaterBev"
   })
-], f.prototype, "hideCarbWaterBev", 2);
-m([
-  d({
+], SettingsModelImpl.prototype, "hideCarbWaterBev", 2);
+__decorateClass$4([
+  kosConfigProperty({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.ncuiLanguage"
   })
-], f.prototype, "ncuiLanguage", 2);
-m([
-  d({
+], SettingsModelImpl.prototype, "ncuiLanguage", 2);
+__decorateClass$4([
+  kosConfigProperty({
     path: "kos:device",
     attribute: "name"
   })
-], f.prototype, "name", 2);
-m([
-  d({
+], SettingsModelImpl.prototype, "name", 2);
+__decorateClass$4([
+  kosConfigProperty({
     path: "kos:service:OTA",
     attribute: "activateAndRebootTime"
   })
-], f.prototype, "activateAndRebootTime", 2);
-m([
-  d({
+], SettingsModelImpl.prototype, "activateAndRebootTime", 2);
+__decorateClass$4([
+  kosConfigProperty({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.display.horizontalMode"
   })
-], f.prototype, "horizontalMode", 2);
-m([
-  Pe({
-    dependencies: (e) => [e.horizontalMode.value]
+], SettingsModelImpl.prototype, "horizontalMode", 2);
+__decorateClass$4([
+  kosModelEffect({
+    dependencies: (model) => [model.horizontalMode.value]
   })
-], f.prototype, "handleUpdateDisplayMode", 1);
-f = m([
-  l(ee)
-], f);
-const Ms = {
+], SettingsModelImpl.prototype, "handleUpdateDisplayMode", 1);
+SettingsModelImpl = __decorateClass$4([
+  kosModel(MODEL_TYPE$4)
+], SettingsModelImpl);
+const Settings = {
   registration: {
-    [ee]: {
-      class: f,
-      singleton: !0
+    [MODEL_TYPE$4]: {
+      class: SettingsModelImpl,
+      singleton: true
     }
   },
-  type: ee,
-  predicate: u(ee),
-  factory: c.Singleton.create(ee)
-}, { URL: so } = h("SETTINGS_SERVICE"), { getAll: io } = y.build({
-  basePath: `${so}/api/settings`
-}), Os = g.createLogger({
+  type: MODEL_TYPE$4,
+  predicate: isKosModel(MODEL_TYPE$4),
+  factory: Kos.Singleton.create(MODEL_TYPE$4)
+};
+const { URL: URL$2 } = resolveServiceUrl("SETTINGS_SERVICE");
+const { getAll: getAll$1 } = ServiceFactory.build({
+  basePath: `${URL$2}/api/settings`
+});
+const log$2 = KosLog.createLogger({
   name: "settings-service",
   group: "Services"
-}), Ss = async () => (Os.debug("sending GET for settings"), await io({})), ws = async () => await io({
-  urlOverride: `${so}api/app/kosdev.ddk/ncui/languages`
-}), ui = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+});
+const getSettings = async () => {
+  log$2.debug("sending GET for settings");
+  const response = await getAll$1({});
+  return response;
+};
+const getNcuiLanguage = async () => {
+  const response = await getAll$1({
+    urlOverride: `${URL$2}api/app/kosdev.ddk/ncui/languages`
+  });
+  return response;
+};
+const index$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getNcuiLanguage: ws,
-  getSettings: Ss
+  getNcuiLanguage,
+  getSettings
 }, Symbol.toStringTag, { value: "Module" }));
-var Es = Object.getOwnPropertyDescriptor, Cs = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? Es(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = a(r) || r);
-  return r;
-};
-const te = "utilities-model";
-let ze = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "name");
-    i(this, "options");
-    i(this, "roles");
-    i(this, "columnId");
-    i(this, "logger");
-    this.id = e, this.logger = o.logger, this.name = t.name, this.options = t.options, this.roles = t == null ? void 0 : t.roles, this.columnId = t.columnId;
-  }
-  updateModel(e) {
-    this.name = e.name, this.options = e.options, this.roles = e == null ? void 0 : e.roles;
+var __getOwnPropDesc$3 = Object.getOwnPropertyDescriptor;
+var __decorateClass$3 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$3(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = decorator(result) || result;
+  return result;
+};
+const MODEL_TYPE$3 = "utilities-model";
+let UtilitiesModelImpl = class {
+  id;
+  name;
+  options;
+  roles;
+  columnId;
+  logger;
+  constructor(modelId, options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
+    this.name = options.name;
+    this.options = options.options;
+    this.roles = options?.roles;
+    this.columnId = options.columnId;
+  }
+  updateModel(options) {
+    this.name = options.name;
+    this.options = options.options;
+    this.roles = options?.roles;
   }
   get titleKey() {
     return `utility.${this.id}.title`;
@@ -2114,62 +2658,74 @@ let ze = class {
     this.logger.debug(`loading utilities ${this.id}`);
   }
 };
-ze = Cs([
-  l(te)
-], ze);
-const no = {
+UtilitiesModelImpl = __decorateClass$3([
+  kosModel(MODEL_TYPE$3)
+], UtilitiesModelImpl);
+const Utilities = {
   registration: {
-    [te]: {
-      class: ze,
-      singleton: !1
+    [MODEL_TYPE$3]: {
+      class: UtilitiesModelImpl,
+      singleton: false
     }
   },
-  type: te,
-  predicate: u(te),
-  factory: c.Factory.create(te)
-}, { URL: ge } = h("UTILITIES_SERVICE"), { getAll: Ie } = y.build({
-  basePath: `${ge}/api/utilities`
-}), Re = g.createLogger({
+  type: MODEL_TYPE$3,
+  predicate: isKosModel(MODEL_TYPE$3),
+  factory: Kos.Factory.create(MODEL_TYPE$3)
+};
+const { URL: URL$1 } = resolveServiceUrl("UTILITIES_SERVICE");
+const { getAll } = ServiceFactory.build({
+  basePath: `${URL$1}/api/utilities`
+});
+const log$1 = KosLog.createLogger({
   name: "utilities-service",
   group: "Services"
-}), ao = async () => {
-  Re.debug("sending GET for utilities");
+});
+const getUtilities = async () => {
+  log$1.debug("sending GET for utilities");
   try {
-    const e = await Ie({
-      urlOverride: `${ge}/api/kos/descriptor/app:kosdev.ddk:ncuiDescriptor/kondra.ncui.utilities`
+    const extensionResponse = await getAll({
+      urlOverride: `${URL$1}/api/kos/descriptor/app:kosdev.ddk:ncuiDescriptor/kondra.ncui.utilities`
     });
-    if ((e == null ? void 0 : e.status) !== 200) {
-      Re.info("no extensions found, using base data");
-      const t = await Ie({
-        urlOverride: `${ge}/api/kos/descriptor/system:app/kondra.ncui.utilities`
+    if (extensionResponse?.status !== 200) {
+      log$1.info(`no extensions found, using base data`);
+      const response = await getAll({
+        urlOverride: `${URL$1}/api/kos/descriptor/system:app/kondra.ncui.utilities`
       });
-      return (t == null ? void 0 : t.data) ?? [];
+      return response?.data ?? [];
     }
-    return (e == null ? void 0 : e.data) ?? [];
-  } catch (e) {
-    Re.info(`error fetching utilities: ${e}. Using base data`);
-    const t = await Ie({
-      urlOverride: `${ge}/api/kos/descriptor/system:app/kondra.ncui.utilities`
+    return extensionResponse?.data ?? [];
+  } catch (error) {
+    log$1.info(`error fetching utilities: ${error}. Using base data`);
+    const response = await getAll({
+      urlOverride: `${URL$1}/api/kos/descriptor/system:app/kondra.ncui.utilities`
     });
-    return (t == null ? void 0 : t.data) ?? [];
+    return response?.data ?? [];
   }
-}, pi = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+};
+const index$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getUtilities: ao
+  getUtilities
 }, Symbol.toStringTag, { value: "Module" }));
-var Ls = Object.defineProperty, Ds = Object.getOwnPropertyDescriptor, lo = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? Ds(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && Ls(t, o, r), r;
-};
-const oe = "utilities-container-model";
-let be = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "logger");
-    i(this, "_models");
-    this.id = e, this.logger = o.logger, this._models = new Ve({
-      parentId: e,
+var __defProp$2 = Object.defineProperty;
+var __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor;
+var __decorateClass$2 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$2(target, key, result);
+  return result;
+};
+const MODEL_TYPE$2 = "utilities-container-model";
+let UtilitiesContainerModelImpl = class {
+  id;
+  logger;
+  _models;
+  constructor(modelId, _options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
+    this._models = new KosModelContainer({
+      parentId: modelId,
       sortKey: "id",
       indexMap: {
         byColumn: "columnId"
@@ -2183,80 +2739,129 @@ let be = class {
     return this._models;
   }
   get columns() {
-    return this._models.getIndexKeys("byColumn").sort((e, t) => e.localeCompare(t));
+    return this._models.getIndexKeys("byColumn").sort((a, b) => a.localeCompare(b));
   }
-  addModel(e) {
-    this._models.addModel(e);
+  addModel(model) {
+    this._models.addModel(model);
   }
-  removeModel(e) {
-    this._models.removeModel(e);
+  removeModel(id) {
+    this._models.removeModel(id);
   }
-  getModel(e) {
-    return this._models.getModel(e);
+  getModel(id) {
+    return this._models.getModel(id);
   }
-  getUtilitiesByColumn(e) {
-    return this._models.getIndexByKey("byColumn", e);
+  getUtilitiesByColumn(id) {
+    return this._models.getIndexByKey("byColumn", id);
   }
   // -------------------LIFECYCLE----------------------------
   async load() {
     this.logger.debug(`loading utilities-container container ${this.id}`);
-    const e = await ao();
-    e == null || e.forEach((t, o) => {
-      t.forEach((s) => {
-        const r = {
-          ...s,
-          columnId: String(o)
-        }, n = no.factory(s.name)(
-          r
+    const utilitiesResponse = await getUtilities();
+    utilitiesResponse?.forEach((utilityColumnsResponse, columnId) => {
+      utilityColumnsResponse.forEach((utilityResponse) => {
+        const utilityOptions = {
+          ...utilityResponse,
+          columnId: String(columnId)
+        };
+        const utilityModel = Utilities.factory(utilityResponse.name)(
+          utilityOptions
         );
-        this.addModel(n);
+        this.addModel(utilityModel);
       });
     });
   }
 };
-lo([
-  $e
-], be.prototype, "_models", 2);
-be = lo([
-  l(oe)
-], be);
-const ks = {
+__decorateClass$2([
+  kosChild
+], UtilitiesContainerModelImpl.prototype, "_models", 2);
+UtilitiesContainerModelImpl = __decorateClass$2([
+  kosModel(MODEL_TYPE$2)
+], UtilitiesContainerModelImpl);
+const UtilitiesContainer = {
   registration: {
-    [oe]: {
-      class: be,
-      singleton: !0
+    [MODEL_TYPE$2]: {
+      class: UtilitiesContainerModelImpl,
+      singleton: true
     },
-    ...no.registration
+    ...Utilities.registration
   },
-  type: oe,
-  predicate: u(oe),
-  factory: c.Singleton.create(oe)
-}, gi = {
-  ...sr.registration,
-  ...Ze.registration,
-  ...Qe.registration,
-  ...ur.registration,
-  ...et.registration,
-  ...Pr.registration,
-  ...Lr.registration,
-  ...xr.registration,
-  ...Yr.registration,
-  ...os.registration,
-  ...ds.registration,
-  ...gs.registration,
-  ...fs.registration,
-  ...Ts.registration,
-  ...Ms.registration,
-  ...Et.registration,
-  ...ks.registration
-};
-var co = Object.defineProperty, Is = Object.getOwnPropertyDescriptor, Rs = (e, t, o) => t in e ? co(e, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[t] = o, st = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? Is(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && co(t, o, r), r;
-}, As = (e, t, o) => (Rs(e, t + "", o), o);
-const Fs = "trouble-action-model";
-let k = class {
+  type: MODEL_TYPE$2,
+  predicate: isKosModel(MODEL_TYPE$2),
+  factory: Kos.Singleton.create(MODEL_TYPE$2)
+};
+const DDKModels = {
+  ...Animation.registration,
+  ...Application.registration,
+  ...Auth.registration,
+  ...CarbWater.registration,
+  ...DashboardOperations.registration,
+  ...Dispenser.registration,
+  ...DispenserInfo.registration,
+  ...Enrollment.registration,
+  ...IngredientSummary.registration,
+  ...MacroAssignment.registration,
+  ...NetworkTestContainer.registration,
+  ...NutritiveSweetener.registration,
+  ...PlainWater.registration,
+  ...Reboot.registration,
+  ...Settings.registration,
+  ...SetupStepContainer.registration,
+  ...UtilitiesContainer.registration
+};
+var __defProp$1 = Object.defineProperty;
+var __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __decorateClass$1 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$1(target, key, result);
+  return result;
+};
+var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
+const MODEL_TYPE$1 = "trouble-action-model";
+let TroubleActionModelImpl = class {
+  /**
+   * Unique identifier for this model instance.
+   *
+   * Set during construction and used for model lifecycle management
+   * and debugging purposes.
+   *
+   * @category Model Properties
+   */
+  id;
+  troubleContainer;
+  /**
+   * Observable state object mapping trouble state keys to values.
+   *
+   * This reactive state object is automatically updated when troubles are
+   * added or removed from the system. Keys and values are determined by
+   * the trouble action definitions provided during model initialization.
+   *
+   * State keys that no longer have associated active troubles are set to
+   * undefined.
+   *
+   * @example
+   * ```typescript
+   * // Access state values
+   * const isAgitationRequired = troubleActionModel.state.agitationRequired;
+   *
+   * // State is reactive - updates automatically propagate to React components
+   * ```
+   *
+   * @category Model State
+   */
+  state;
+  /**
+   * Internal mapping of trouble types to their action definitions.
+   *
+   * Built from the definitions array provided in TroubleActionOptions during
+   * construction. Used for efficient lookup when processing trouble changes.
+   *
+   * @category Internal State
+   */
+  troubleActionData;
   /**
    * Creates a new TroubleActionModel instance.
    *
@@ -2270,48 +2875,13 @@ let k = class {
    *
    * @category Lifecycle
    */
-  constructor(e, t) {
-    /**
-     * Unique identifier for this model instance.
-     *
-     * Set during construction and used for model lifecycle management
-     * and debugging purposes.
-     *
-     * @category Model Properties
-     */
-    i(this, "id");
-    i(this, "troubleContainer");
-    /**
-     * Observable state object mapping trouble state keys to values.
-     *
-     * This reactive state object is automatically updated when troubles are
-     * added or removed from the system. Keys and values are determined by
-     * the trouble action definitions provided during model initialization.
-     *
-     * State keys that no longer have associated active troubles are set to
-     * undefined.
-     *
-     * @example
-     * ```typescript
-     * // Access state values
-     * const isAgitationRequired = troubleActionModel.state.agitationRequired;
-     *
-     * // State is reactive - updates automatically propagate to React components
-     * ```
-     *
-     * @category Model State
-     */
-    i(this, "state");
-    /**
-     * Internal mapping of trouble types to their action definitions.
-     *
-     * Built from the definitions array provided in TroubleActionOptions during
-     * construction. Used for efficient lookup when processing trouble changes.
-     *
-     * @category Internal State
-     */
-    i(this, "troubleActionData");
-    this.id = e, this.state = Eo(), this.troubleActionData = t.definitions.reduce((o, s) => (o[s.troubleType] = s, o), {});
+  constructor(modelId, options) {
+    this.id = modelId;
+    this.state = ObservableData();
+    this.troubleActionData = options.definitions.reduce((acc, curr) => {
+      acc[curr.troubleType] = curr;
+      return acc;
+    }, {});
   }
   // -------------------LIFECYCLE----------------------------
   /**
@@ -2336,14 +2906,20 @@ let k = class {
    * @see {@link TroubleContainerModel} for trouble data structure
    */
   get activeTrouble() {
-    const e = Object.keys(this.troubleActionData);
-    if (e.length > 0) {
-      const t = e[0], o = this.troubleContainer.troubles.getIndexByKey(
+    const actions = Object.keys(this.troubleActionData);
+    if (actions.length > 0) {
+      const firstAction = actions[0];
+      const troubles = this.troubleContainer.troubles.getIndexByKey(
         "byType",
-        t
+        firstAction
       );
-      return o.length > 0 ? o[0] : void 0;
+      if (troubles.length > 0) {
+        return troubles[0];
+      } else {
+        return void 0;
+      }
     }
+    return void 0;
   }
   /**
    * Gets the type of the first active trouble with an associated action definition.
@@ -2364,59 +2940,75 @@ let k = class {
    * @category Trouble Access
    */
   get activeTroubleType() {
-    var e;
-    return (e = this.activeTrouble) == null ? void 0 : e.type;
+    return this.activeTrouble?.type;
   }
   handleTroubleActions() {
-    const e = this.troubleContainer.troubles.data.reduce((t, o) => {
-      const s = o.type;
-      if (this.troubleActionData[s]) {
-        const r = this.troubleActionData[s].stateKey ?? s, n = this.troubleActionData[s].stateValue ?? s;
-        t[r] = n;
+    const _state = this.troubleContainer.troubles.data.reduce((acc, curr) => {
+      const _troubleType = curr.type;
+      if (this.troubleActionData[_troubleType]) {
+        const _stateKey = this.troubleActionData[_troubleType].stateKey ?? _troubleType;
+        const _stateValue = this.troubleActionData[_troubleType].stateValue ?? _troubleType;
+        acc[_stateKey] = _stateValue;
       }
-      return t;
+      return acc;
     }, {});
-    this.state.setValues(e), Object.keys(this.troubleActionData).forEach((t) => {
-      if (this.troubleContainer.troubles.getIndexByKey("byType", t).length === 0) {
-        const o = this.troubleActionData[t].stateKey ?? t;
-        this.state[o] = void 0;
+    this.state.setValues(_state);
+    Object.keys(this.troubleActionData).forEach((key) => {
+      if (this.troubleContainer.troubles.getIndexByKey("byType", key).length === 0) {
+        const _stateKey = this.troubleActionData[key].stateKey ?? key;
+        this.state[_stateKey] = void 0;
       }
     });
   }
 };
-As(k, "Registration");
-st([
-  p({ modelType: Ye.type })
-], k.prototype, "troubleContainer", 2);
-st([
-  Pe({
-    dependencies: (e) => [e.troubleContainer.troubles.data]
+__publicField(TroubleActionModelImpl, "Registration");
+__decorateClass$1([
+  kosDependency({ modelType: TroubleContainer.type })
+], TroubleActionModelImpl.prototype, "troubleContainer", 2);
+__decorateClass$1([
+  kosModelEffect({
+    dependencies: (model) => [model.troubleContainer.troubles.data]
   })
-], k.prototype, "handleTroubleActions", 1);
-k = st([
-  l({ modelTypeId: Fs, singleton: !0 }),
-  Ke()
-], k);
-const hi = k.Registration, { URL: uo } = h("START_SERVICE"), { getOne: xs } = y.build({
-  basePath: `${uo}/api/start`
-}), Us = g.createLogger({ name: "start-service", group: "Services" }), po = async () => (Us.debug("navigating to NCUI"), await xs({
-  urlOverride: `${uo}/api/app/kosdev.ddk/ncui/open`
-})), yi = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+], TroubleActionModelImpl.prototype, "handleTroubleActions", 1);
+TroubleActionModelImpl = __decorateClass$1([
+  kosModel({ modelTypeId: MODEL_TYPE$1, singleton: true }),
+  kosLoggerAware()
+], TroubleActionModelImpl);
+const TroubleAction = TroubleActionModelImpl.Registration;
+const { URL } = resolveServiceUrl("START_SERVICE");
+const { getOne } = ServiceFactory.build({
+  basePath: `${URL}/api/start`
+});
+const log = KosLog.createLogger({ name: "start-service", group: "Services" });
+const navigateToNCui = async () => {
+  log.debug("navigating to NCUI");
+  const response = await getOne({
+    urlOverride: `${URL}/api/app/kosdev.ddk/ncui/open`
+  });
+  return response;
+};
+const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  navigateToNCui: po
+  navigateToNCui
 }, Symbol.toStringTag, { value: "Module" }));
-var js = Object.defineProperty, Ws = Object.getOwnPropertyDescriptor, go = (e, t, o, s) => {
-  for (var r = s > 1 ? void 0 : s ? Ws(t, o) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
-  return s && r && js(t, o, r), r;
-};
-const ho = "start-model";
-let _e = class {
-  constructor(e, t, o) {
-    i(this, "id");
-    i(this, "logger");
-    i(this, "troubles");
-    this.id = e, this.logger = o.logger;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __decorateClass = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp(target, key, result);
+  return result;
+};
+const MODEL_TYPE = "start-model";
+let StartModelImpl = class {
+  id;
+  logger;
+  troubles;
+  constructor(modelId, options, context) {
+    this.id = modelId;
+    this.logger = context.logger;
   }
   get firmwareFailed() {
     return this.troubles.troubles.getIndexByKey(
@@ -2431,7 +3023,7 @@ let _e = class {
     ).length > 0;
   }
   async navigate() {
-    await po();
+    await navigateToNCui();
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -2441,69 +3033,70 @@ let _e = class {
     this.logger.debug(`loading start ${this.id}`);
   }
 };
-go([
-  p({ modelType: Ye.type })
-], _e.prototype, "troubles", 2);
-_e = go([
-  l(ho)
-], _e);
-const fi = new He({
-  class: _e,
-  type: ho
+__decorateClass([
+  kosDependency({ modelType: TroubleContainer.type })
+], StartModelImpl.prototype, "troubles", 2);
+StartModelImpl = __decorateClass([
+  kosModel(MODEL_TYPE)
+], StartModelImpl);
+const Start = new SingletonKosModelRegistrationFactory({
+  class: StartModelImpl,
+  type: MODEL_TYPE
 });
 export {
-  Ys as AgitationControl,
-  sr as Animation,
-  Gs as AnimationServices,
-  Ze as Application,
-  Qe as Auth,
-  Bs as AuthServices,
-  ur as CarbWater,
-  Qs as CopyLogs,
-  qs as CopyLogsServices,
-  gi as DDKModels,
-  et as DashboardOperations,
-  Xs as DashboardOperationsServices,
-  Pr as Dispenser,
-  Lr as DispenserInfo,
-  Zs as DispenserInfoServices,
-  Js as DispenserServices,
-  Wo as Door,
-  ie as EXTENSION_POINT_DASHBOARD_KEY_FACTORY,
-  xr as Enrollment,
-  ei as EnrollmentServices,
-  Yr as IngredientSummary,
-  li as Lockout,
-  ai as LockoutServices,
-  si as MACRO_KEYS,
-  os as MacroAssignment,
-  Qt as NetworkTest,
-  ds as NetworkTestContainer,
-  di as NetworkTestServices,
-  gs as NutritiveSweetener,
-  fs as PlainWater,
-  Ts as Reboot,
-  ci as RebootServices,
-  Ms as Settings,
-  ui as SettingsServices,
-  wt as SetupStep,
-  Et as SetupStepContainer,
-  Ks as SetupStepServices,
-  fi as Start,
-  yi as StartServices,
-  ko as TROUBLE_TYPE_PRIME,
-  at as TROUBLE_TYPE_PURGE,
-  hi as TroubleActionManager,
-  no as Utilities,
-  ks as UtilitiesContainer,
-  pi as UtilitiesServices,
-  Hr as calculateTimeDifference,
-  Vr as executeDashboardKeyFactory,
-  oi as isMacroGroup,
-  ti as isMicroGroup,
-  ri as macroHolderMap,
-  zr as registerDashboardKeyFactory,
-  ni as toSeconds,
-  ii as toTimeComponents,
-  Dt as troubleVisibilityFilter
+  AgitationControl,
+  Animation,
+  index$b as AnimationServices,
+  Application,
+  Auth,
+  index$d as AuthServices,
+  CarbWater,
+  CopyLogs,
+  index$a as CopyLogsServices,
+  DDKModels,
+  DashboardOperations,
+  index$9 as DashboardOperationsServices,
+  Dispenser,
+  DispenserInfo,
+  index$7 as DispenserInfoServices,
+  index$8 as DispenserServices,
+  Door,
+  EXTENSION_POINT_DASHBOARD_KEY_FACTORY,
+  Enrollment,
+  index$6 as EnrollmentServices,
+  IngredientSummary,
+  Lockout,
+  index$5 as LockoutServices,
+  MACRO_KEYS,
+  MacroAssignment,
+  NetworkTest,
+  NetworkTestContainer,
+  index$4 as NetworkTestServices,
+  NutritiveSweetener,
+  PlainWater,
+  Reboot,
+  index$3 as RebootServices,
+  Settings,
+  index$2 as SettingsServices,
+  SetupStep,
+  SetupStepContainer,
+  index$c as SetupStepServices,
+  Start,
+  index as StartServices,
+  TROUBLE_TYPE_PRIME$1 as TROUBLE_TYPE_PRIME,
+  TROUBLE_TYPE_PURGE$1 as TROUBLE_TYPE_PURGE,
+  TroubleAction as TroubleActionManager,
+  Utilities,
+  UtilitiesContainer,
+  index$1 as UtilitiesServices,
+  calculateTimeDifference,
+  executeDashboardKeyFactory,
+  isMacroGroup,
+  isMicroGroup,
+  macroHolderMap,
+  registerDashboardKeyFactory,
+  toSeconds,
+  toTimeComponents,
+  troubleVisibilityFilter
 };
+//# sourceMappingURL=index.mjs.map