@kronos-integration/service 12.0.5 → 13.0.1

package/README.md

@@ -91,7 +91,7 @@ The transitions are:
         *   [Parameters](#parameters-13)
     *   [log](#log)
         *   [Parameters](#parameters-14)
-    *   [configurationAttributes](#configurationattributes)
+    *   [attributes](#attributes)
     *   [endpoints](#endpoints-2)
 *   [StandaloneServiceProvider](#standaloneserviceprovider)
     *   [name](#name-3)
@@ -366,7 +366,7 @@ Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/
 
 Takes attribute values from config parameters
 and copies them over to the object.
-Copying is done according to configurationAttributes.
+Copying is done according to attributes.
 Which means we loop over all configuration attributes.
 and then for each attribute decide if we use the default, call a setter function
 or simply assign the attribute value.
@@ -399,7 +399,7 @@ Adds service name to the log event.
 *   `level` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** the log level
 *   `arg` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** log content
 
-### configurationAttributes
+### attributes
 
 Meta information for the config attributes.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kronos-integration/service",
-  "version": "12.0.5",
+  "version": "13.0.1",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -36,10 +36,10 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib es2024 -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "@kronos-integration/endpoint": "^10.0.4",
-    "@kronos-integration/interceptor": "^11.0.4",
+    "@kronos-integration/endpoint": "^10.0.5",
+    "@kronos-integration/interceptor": "^12.0.1",
     "loglevel-mixin": "^7.2.5",
-    "pacc": "^3.7.0",
+    "pacc": "^3.9.0",
     "remove-sensible-values": "^1.3.1",
     "statetransition-mixin": "^8.1.3"
   },

package/src/service.mjs

@@ -3,52 +3,12 @@ import { prepareActions, StateTransitionMixin } from "statetransition-mixin";
 import {
   prepareAttributesDefinitions,
   getAttributes,
-  setAttributes
+  setAttributes,
+  description_attribute
 } from "pacc";
 import { EndpointsMixin } from "./endpoints-mixin.mjs";
 import { InitializationContext } from "./initialization-context.mjs";
 
-const CONFIG_ATTRIBUTES = prepareAttributesDefinitions({
-  description: {
-    type: "string",
-    description: "human readable description of the service"
-  },
-  logLevel: {
-    description: `logging level one of: ${Object.keys(defaultLogLevels)}`,
-    default: defaultLogLevels.info,
-    type: "string",
-    set(newValue) {
-      if (newValue !== undefined) {
-        this.logLevel = newValue;
-        return true;
-      }
-      return false;
-    },
-    get() {
-      return this.logLevel.name;
-    }
-  },
-  timeout: {
-    attributes: {
-      start: {
-        description: "service start timeout",
-        type: "duration",
-        default: 20
-      },
-      stop: {
-        description: "service stop timeout",
-        type: "duration",
-        default: 20
-      },
-      restart: {
-        description: "service restart timeout",
-        type: "duration",
-        default: 20
-      }
-    }
-  }
-});
-
 const timeout = 30000;
 
 const rsfDefault = {
@@ -122,9 +82,43 @@ export class Service extends EndpointsMixin(
    * The Service class only defines the logLevel, and start/stop/restart timeout attribute
    * @return {Object}
    */
-  static get configurationAttributes() {
-    return CONFIG_ATTRIBUTES;
-  }
+  static attributes = prepareAttributesDefinitions({
+    description: description_attribute,
+    logLevel: {
+      description: `logging level one of: ${Object.keys(defaultLogLevels)}`,
+      default: defaultLogLevels.info,
+      type: "string",
+      set(newValue) {
+        if (newValue !== undefined) {
+          this.logLevel = newValue;
+          return true;
+        }
+        return false;
+      },
+      get() {
+        return this.logLevel.name;
+      }
+    },
+    timeout: {
+      attributes: {
+        start: {
+          description: "service start timeout",
+          type: "duration",
+          default: 20
+        },
+        stop: {
+          description: "service stop timeout",
+          type: "duration",
+          default: 20
+        },
+        restart: {
+          description: "service restart timeout",
+          type: "duration",
+          default: 20
+        }
+      }
+    }
+  });
 
   /**
    * Definition of the predefined endpoints.
@@ -181,8 +175,8 @@ export class Service extends EndpointsMixin(
     return this.owner.instantiateInterceptor(options);
   }
 
-  get configurationAttributes() {
-    return this.constructor.configurationAttributes;
+  get attributes() {
+    return this.constructor.attributes;
   }
 
   get type() {
@@ -357,7 +351,7 @@ export class Service extends EndpointsMixin(
     }
 
     if (options.includeConfig) {
-      let atts = getAttributes(this, this.configurationAttributes);
+      let atts = getAttributes(this, this.attributes);
 
       if (!options.includePrivate) {
         atts = Object.fromEntries(
@@ -406,7 +400,7 @@ export class Service extends EndpointsMixin(
   /**
    * Takes attribute values from config parameters
    * and copies them over to the object.
-   * Copying is done according to configurationAttributes.
+   * Copying is done according to attributes.
    * Which means we loop over all configuration attributes.
    * and then for each attribute decide if we use the default, call a setter function
    * or simply assign the attribute value.
@@ -415,24 +409,19 @@ export class Service extends EndpointsMixin(
    */
   _configure(config) {
     const modified = new Set();
-    setAttributes(
-      this,
-      config,
-      this.configurationAttributes,
-      (ca, path, value) => {
-        this.trace(level => {
-          if (ca.private) {
-            value = "***";
-          }
-          return {
-            message: `config ${this.name}.${path}: ${JSON.stringify(value)}`,
-            attribute: path,
-            value: value
-          };
-        });
-        modified.add(ca);
-      }
-    );
+    setAttributes(this, config, this.attributes, (ca, path, value) => {
+      this.trace(level => {
+        if (ca.private) {
+          value = "***";
+        }
+        return {
+          message: `config ${this.name}.${path}: ${JSON.stringify(value)}`,
+          attribute: path,
+          value: value
+        };
+      });
+      modified.add(ca);
+    });
     return modified;
   }
 

package/types/service.d.mts

@@ -26,7 +26,7 @@ export class Service extends Service_base {
      * The Service class only defines the logLevel, and start/stop/restart timeout attribute
      * @return {Object}
      */
-    static get configurationAttributes(): any;
+    static attributes: any;
     /**
      * Definition of the predefined endpoints.
      * - log _out_
@@ -38,7 +38,7 @@ export class Service extends Service_base {
     owner: any;
     logLevel: any;
     instantiateInterceptor(options: any): any;
-    get configurationAttributes(): any;
+    get attributes(): any;
     get type(): string;
     set description(desc: any);
     get description(): any;
@@ -124,7 +124,7 @@ export class Service extends Service_base {
     /**
      * Takes attribute values from config parameters
      * and copies them over to the object.
-     * Copying is done according to configurationAttributes.
+     * Copying is done according to attributes.
      * Which means we loop over all configuration attributes.
      * and then for each attribute decide if we use the default, call a setter function
      * or simply assign the attribute value.