@midwayjs/prometheus 3.0.0-alpha.1 → 3.0.0-alpha.36

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [3.0.0-alpha.1](https://github.com/midwayjs/midway/compare/v2.12.1...v3.0.0-alpha.1) (2021-08-04)
+## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09)
 
 **Note:** Version bump only for package @midwayjs/prometheus
 

package/dist/configuration.js

@@ -23,7 +23,7 @@ const dataService_1 = require("./service/dataService");
 let AutoConfiguration = class AutoConfiguration {
     async onReady(contanier) {
         PromClient.collectDefaultMetrics(this.prometheusConfig);
-        const modules = decorator_1.listModule('prometheus:master');
+        const modules = (0, decorator_1.listModule)('prometheus:master');
         const handlers = {};
         let sockFile = path.join(os.tmpdir(), 'midway-master.sock');
         if (process.platform === 'win32') {
@@ -31,7 +31,7 @@ let AutoConfiguration = class AutoConfiguration {
                 '\\\\.\\pipe\\' + sockFile.replace(/^\//, '').replace(/\//g, '-');
         }
         if (modules.length > 0 && process.platform !== 'win32') {
-            if (utils_1.isMaster()) {
+            if ((0, utils_1.isMaster)()) {
                 if (fs.existsSync(sockFile)) {
                     fs.unlinkSync(sockFile);
                 }
@@ -47,9 +47,9 @@ let AutoConfiguration = class AutoConfiguration {
             }
         }
         for (const module of modules) {
-            const rules = decorator_1.getClassMetadata('prometheus:master:options', module);
+            const rules = (0, decorator_1.getClassMetadata)('prometheus:master:options', module);
             for (const rule of rules) {
-                if (utils_1.isMaster()) {
+                if ((0, utils_1.isMaster)()) {
                     handlers[rule.name] = async (...args) => {
                         const service = await this.app
                             .createAnonymousContext()
@@ -85,24 +85,24 @@ let AutoConfiguration = class AutoConfiguration {
         });
     }
     async onStop() {
-        if (utils_1.isMaster()) {
-            utils_1.closeLock();
+        if ((0, utils_1.isMaster)()) {
+            (0, utils_1.closeLock)();
             this.http_server && this.http_server.close();
         }
     }
 };
 __decorate([
-    decorator_1.Config('prometheus'),
+    (0, decorator_1.Config)('prometheus'),
     __metadata("design:type", Object)
 ], AutoConfiguration.prototype, "prometheusConfig", void 0);
 __decorate([
-    decorator_1.App(),
+    (0, decorator_1.App)(),
     __metadata("design:type", Object)
 ], AutoConfiguration.prototype, "app", void 0);
 AutoConfiguration = __decorate([
-    decorator_1.Configuration({
+    (0, decorator_1.Configuration)({
         namespace: 'prometheus',
-        importConfigs: [path_1.join(__dirname, 'config')],
+        importConfigs: [(0, path_1.join)(__dirname, 'config')],
     })
 ], AutoConfiguration);
 exports.AutoConfiguration = AutoConfiguration;

package/dist/decorator/master.js

@@ -9,9 +9,9 @@ const utils_1 = require("../utils/utils");
 const qs = require("querystring");
 function Master() {
     return function (target, propertyKey, descriptor) {
-        decorator_1.saveModule('prometheus:master', target.constructor);
+        (0, decorator_1.saveModule)('prometheus:master', target.constructor);
         const sockFile = path.join(os.tmpdir(), 'midway-master.sock');
-        if (!utils_1.isMaster()) {
+        if (!(0, utils_1.isMaster)()) {
             descriptor.value = (...args) => {
                 const params = {
                     path: `${target.constructor.name}_${propertyKey}`,
@@ -26,7 +26,7 @@ function Master() {
                 });
             };
         }
-        decorator_1.attachClassMetadata('prometheus:master:options', {
+        (0, decorator_1.attachClassMetadata)('prometheus:master:options', {
             name: `${target.constructor.name}_${propertyKey}`,
             value: descriptor.value,
         }, target.constructor);

package/dist/service/dataService.d.ts

@@ -11,6 +11,7 @@ export declare class DataService {
     define(name: any, type: any, options: any): Promise<void>;
     inc(name: any, labels: any, value?: number): Promise<void>;
     set(name: any, value: any): Promise<void>;
+    setDiff(name: any, diff: any): Promise<void>;
     getData(): Promise<string>;
 }
 //# sourceMappingURL=dataService.d.ts.map

package/dist/service/dataService.js

@@ -66,42 +66,56 @@ let DataService = class DataService {
     async set(name, value) {
         this.userDefinedMetrics[name].set({ ...this.prometheusConfig.labels }, value);
     }
+    async setDiff(name, diff) {
+        const current = await this.userDefinedMetrics[name].get();
+        let value = diff;
+        if (current.values.length !== 0) {
+            value = current.values[0].value + diff;
+        }
+        this.userDefinedMetrics[name].set({ ...this.prometheusConfig.labels }, value);
+    }
     async getData() {
         const Register = PromClient.register;
         return Register.metrics();
     }
 };
 __decorate([
-    decorator_1.Config('prometheus'),
+    (0, decorator_1.Config)('prometheus'),
     __metadata("design:type", Object)
 ], DataService.prototype, "prometheusConfig", void 0);
 __decorate([
-    master_1.Master(),
+    (0, master_1.Master)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object, Object]),
     __metadata("design:returntype", Promise)
 ], DataService.prototype, "getUser", null);
 __decorate([
-    master_1.Master(),
+    (0, master_1.Master)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", Promise)
 ], DataService.prototype, "inc", null);
 __decorate([
-    master_1.Master(),
+    (0, master_1.Master)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], DataService.prototype, "set", null);
 __decorate([
-    master_1.Master(),
+    (0, master_1.Master)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", Promise)
+], DataService.prototype, "setDiff", null);
+__decorate([
+    (0, master_1.Master)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], DataService.prototype, "getData", null);
 DataService = __decorate([
-    decorator_1.Provide(),
-    decorator_1.Scope(decorator_1.ScopeEnum.Singleton)
+    (0, decorator_1.Provide)(),
+    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)
 ], DataService);
 exports.DataService = DataService;
 //# sourceMappingURL=dataService.js.map

package/dist/utils/utils.js

@@ -11,7 +11,8 @@ const ppid = process.ppid;
 const now = new Date();
 const lockFile = path.join(os.tmpdir(), `midway-master-${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}-${ppid}.lock`);
 function isMaster() {
-    if (cluster.isMaster) {
+    // fix for node v16
+    if (cluster['isPrimary'] || cluster['isMaster']) {
         return true;
     }
     if (process.argv[1].indexOf('egg-cluster') >= 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/prometheus",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.36+b2d0a363",
   "description": "midway component for prometheus",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -22,10 +22,10 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.0.0-alpha.1",
-    "@midwayjs/decorator": "^3.0.0-alpha.1",
-    "@midwayjs/koa": "^3.0.0-alpha.1",
-    "@midwayjs/mock": "^3.0.0-alpha.1",
+    "@midwayjs/core": "^3.0.0-alpha.36+b2d0a363",
+    "@midwayjs/decorator": "^3.0.0-alpha.36+b2d0a363",
+    "@midwayjs/koa": "^3.0.0-alpha.36+b2d0a363",
+    "@midwayjs/mock": "^3.0.0-alpha.36+b2d0a363",
     "@types/request": "^2.48.5"
   },
   "dependencies": {
@@ -35,5 +35,5 @@
   "engines": {
     "node": ">= 12.0.0"
   },
-  "gitHead": "408dca018bcbf6d1724e44fdcb785867e76a4007"
+  "gitHead": "b2d0a363d98302fda64ff47a6d25fca6e003a434"
 }