@xyo-network/prometheus-node-plugin 2.65.4 → 2.65.6

package/dist/esm/Witness.js

@@ -13,7 +13,10 @@ export class PrometheusNodeWitness extends AbstractWitness {
     get registry() {
         return this._registry;
     }
-    async start(timeout) {
+    async observeHandler(_payloads) {
+        return await this.generateMetricValues();
+    }
+    async startHandler() {
         collectDefaultMetrics({ register: this._registry });
         if (this.config.port) {
             this.server = createServer(async (_request, response) => {
@@ -22,14 +25,11 @@ export class PrometheusNodeWitness extends AbstractWitness {
             });
             this.server.listen(this.config.port);
         }
-        return await super.start(timeout);
+        return await super.startHandler();
     }
-    stop(_timeout) {
+    stopHandler() {
         this.server?.close();
-        return this;
-    }
-    async observeHandler(_payloads) {
-        return await this.generateMetricValues();
+        return super.stopHandler();
     }
     async generateMetricValues() {
         return compact((await this._registry.getMetricsAsJSON()).map((metric) => {

package/dist/esm/Witness.js.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAEtE,OAAO,EAAE,eAAe,EAAgC,MAAM,sBAAsB,CAAA;AACpF,OAAO,EAAE,YAAY,EAAU,MAAM,MAAM,CAAA;AAC3C,OAAO,OAAO,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,qBAAqB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAG7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAGtD,MAAM,CAAC,MAAM,iCAAiC,GAAsC,4CAA4C,CAAA;AAShI,eAAe,EAAE,CAAA;AACjB,MAAM,OAAO,qBAAiG,SAAQ,eAAwB;IAC5I,MAAM,CAAU,aAAa,GAAG,CAAC,iCAAiC,CAAC,CAAA;IACzD,SAAS,GAAG,IAAI,QAAQ,EAAE,CAAA;IAC1B,MAAM,CAAS;IAEzB,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAC,OAAgB;QACnC,qBAAqB,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;QACnD,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;YACpB,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;gBACtD,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBAEvB,QAAQ,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAA;YAC9C,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;SACrC;QACD,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACnC,CAAC;IAEQ,IAAI,CAAC,QAAiB;QAC7B,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAA;QACpB,OAAO,IAAI,CAAA;IACb,CAAC;IAEkB,KAAK,CAAC,cAAc,CAAC,SAA8B;QACpE,OAAO,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAA;IAC1C,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAChC,OAAO,OAAO,CACZ,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACvD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;YAC5B,IAAI,MAAM,EAAE;gBACV,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,2BAA2B,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,CAAA;aAC5H;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAEtE,OAAO,EAAE,eAAe,EAAgC,MAAM,sBAAsB,CAAA;AACpF,OAAO,EAAE,YAAY,EAAU,MAAM,MAAM,CAAA;AAC3C,OAAO,OAAO,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,qBAAqB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAG7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAGtD,MAAM,CAAC,MAAM,iCAAiC,GAAsC,4CAA4C,CAAA;AAShI,eAAe,EAAE,CAAA;AACjB,MAAM,OAAO,qBAAiG,SAAQ,eAAwB;IAC5I,MAAM,CAAU,aAAa,GAAG,CAAC,iCAAiC,CAAC,CAAA;IACzD,SAAS,GAAG,IAAI,QAAQ,EAAE,CAAA;IAC1B,MAAM,CAAS;IAEzB,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;IAEkB,KAAK,CAAC,cAAc,CAAC,SAA8B;QACpE,OAAO,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAA;IAC1C,CAAC;IAEkB,KAAK,CAAC,YAAY;QACnC,qBAAqB,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;QACnD,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;YACpB,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;gBACtD,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBAEvB,QAAQ,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAA;YAC9C,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;SACrC;QACD,OAAO,MAAM,KAAK,CAAC,YAAY,EAAE,CAAA;IACnC,CAAC;IAEkB,WAAW;QAC5B,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAA;QACpB,OAAO,KAAK,CAAC,WAAW,EAAE,CAAA;IAC5B,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAChC,OAAO,OAAO,CACZ,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACvD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;YAC5B,IAAI,MAAM,EAAE;gBACV,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,2BAA2B,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,CAAA;aAC5H;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC"}

package/dist/types/Witness.d.ts

@@ -16,9 +16,9 @@ export declare class PrometheusNodeWitness<TParams extends PrometheusNodeWitness
     protected _registry: Registry;
     protected server?: Server;
     get registry(): Registry;
-    start(timeout?: number): Promise<void>;
-    stop(_timeout?: number): this;
     protected observeHandler(_payloads?: Partial<Payload>[]): Promise<Payload[]>;
+    protected startHandler(): Promise<boolean>;
+    protected stopHandler(): import("@xyo-network/promise").Promisable<boolean>;
     private generateMetricValues;
 }
 //# sourceMappingURL=Witness.d.ts.map

package/dist/types/Witness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAmB,MAAM,qBAAqB,CAAA;AACtE,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpF,OAAO,EAAgB,MAAM,EAAE,MAAM,MAAM,CAAA;AAE3C,OAAO,EAAyB,QAAQ,EAAE,MAAM,aAAa,CAAA;AAK7D,MAAM,MAAM,iCAAiC,GAAG,4CAA4C,CAAA;AAC5F,eAAO,MAAM,iCAAiC,EAAE,iCAAgF,CAAA;AAEhI,MAAM,MAAM,2BAA2B,GAAG,aAAa,CAAC;IACtD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,iCAAiC,CAAA;CAC1C,CAAC,CAAA;AAEF,MAAM,MAAM,2BAA2B,GAAG,aAAa,CAAC,eAAe,CAAC,2BAA2B,CAAC,CAAC,CAAA;AAGrG,qBAAa,qBAAqB,CAAC,OAAO,SAAS,2BAA2B,GAAG,2BAA2B,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;IAC5I,OAAgB,aAAa,iDAAsC;IACnE,SAAS,CAAC,SAAS,WAAiB;IACpC,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IAEzB,IAAI,QAAQ,IAAI,QAAQ,CAEvB;IAEc,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM;IAa5B,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM;cAKN,cAAc,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;YAI7E,oBAAoB;CAUnC"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAmB,MAAM,qBAAqB,CAAA;AACtE,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpF,OAAO,EAAgB,MAAM,EAAE,MAAM,MAAM,CAAA;AAE3C,OAAO,EAAyB,QAAQ,EAAE,MAAM,aAAa,CAAA;AAK7D,MAAM,MAAM,iCAAiC,GAAG,4CAA4C,CAAA;AAC5F,eAAO,MAAM,iCAAiC,EAAE,iCAAgF,CAAA;AAEhI,MAAM,MAAM,2BAA2B,GAAG,aAAa,CAAC;IACtD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,iCAAiC,CAAA;CAC1C,CAAC,CAAA;AAEF,MAAM,MAAM,2BAA2B,GAAG,aAAa,CAAC,eAAe,CAAC,2BAA2B,CAAC,CAAC,CAAA;AAGrG,qBAAa,qBAAqB,CAAC,OAAO,SAAS,2BAA2B,GAAG,2BAA2B,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;IAC5I,OAAgB,aAAa,iDAAsC;IACnE,SAAS,CAAC,SAAS,WAAiB;IACpC,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IAEzB,IAAI,QAAQ,IAAI,QAAQ,CAEvB;cAEwB,cAAc,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAIlE,YAAY;cAalB,WAAW;YAKhB,oBAAoB;CAUnC"}

package/package.json

@@ -10,10 +10,10 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/module": "^2.65.4",
-    "@xyo-network/payload-model": "^2.65.4",
-    "@xyo-network/payloadset-plugin": "^2.65.4",
-    "@xyo-network/witness": "^2.65.4",
+    "@xyo-network/module": "^2.65.6",
+    "@xyo-network/payload-model": "^2.65.6",
+    "@xyo-network/payloadset-plugin": "^2.65.6",
+    "@xyo-network/witness": "^2.65.6",
     "lodash": "^4.17.21",
     "prom-client": "^14.2.0"
   },
@@ -56,5 +56,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.65.4"
+  "version": "2.65.6"
 }

package/src/Witness.ts

@@ -28,7 +28,11 @@ export class PrometheusNodeWitness<TParams extends PrometheusNodeWitnessParams =
     return this._registry
   }
 
-  override async start(timeout?: number) {
+  protected override async observeHandler(_payloads?: Partial<Payload>[]): Promise<Payload[]> {
+    return await this.generateMetricValues()
+  }
+
+  protected override async startHandler() {
     collectDefaultMetrics({ register: this._registry })
     if (this.config.port) {
       this.server = createServer(async (_request, response) => {
@@ -38,16 +42,12 @@ export class PrometheusNodeWitness<TParams extends PrometheusNodeWitnessParams =
       })
       this.server.listen(this.config.port)
     }
-    return await super.start(timeout)
+    return await super.startHandler()
   }
 
-  override stop(_timeout?: number) {
+  protected override stopHandler() {
     this.server?.close()
-    return this
-  }
-
-  protected override async observeHandler(_payloads?: Partial<Payload>[]): Promise<Payload[]> {
-    return await this.generateMetricValues()
+    return super.stopHandler()
   }
 
   private async generateMetricValues(): Promise<PrometheusMetricValuePayload[]> {