This commit is contained in:
peter
2019-09-17 15:22:24 +02:00
parent 3e804fd0e6
commit e1340d6350
7 changed files with 235 additions and 479 deletions
+14 -14
View File
@@ -2052,9 +2052,9 @@
}
},
"frontblock": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/frontblock/-/frontblock-0.14.2.tgz",
"integrity": "sha512-M4/Kadf1i/g4pkSrkITtPdrwP4/SCQL/qA+22n41F+c/oxQVsEIpdTZQXK9iLlhMzx6ijIxokGoYh6uPY9yrlw==",
"version": "0.15.1",
"resolved": "https://registry.npmjs.org/frontblock/-/frontblock-0.15.1.tgz",
"integrity": "sha512-nRSoAT5HZhJmYkCdX8YGya+YTnvzw0W7eG0ISr+HBUO5u4hjmnHwwA1U7VewbTNokan9JvA7TF6/QijLeSCCVA==",
"requires": {
"@angular/common": "^8.2.1",
"@angular/core": "^8.2.1",
@@ -2063,7 +2063,7 @@
"@angular/router": "^8.2.1",
"@clr/angular": "^2.1.1",
"@types/node": "^11.13.10",
"frontblock-generic": "^0.32.3",
"frontblock-generic": "^0.34.0",
"fs": "0.0.1-security",
"knex": "^0.19.2",
"log4js": "^4.3.1",
@@ -2074,9 +2074,9 @@
}
},
"frontblock-generic": {
"version": "0.32.3",
"resolved": "https://registry.npmjs.org/frontblock-generic/-/frontblock-generic-0.32.3.tgz",
"integrity": "sha512-VcSP3EvV8Te78XOlyEL7WywxXawHSfgIPD/7g6ivZPWDSG8JzpgX1rq9fn4jnfpS167CMyGuKoHLwAY8tWkAng==",
"version": "0.34.1",
"resolved": "https://registry.npmjs.org/frontblock-generic/-/frontblock-generic-0.34.1.tgz",
"integrity": "sha512-BiVUzpJSFV3FbnpdP3mxQTi1ivzlA9BXNrVp6rjuvNuxJYK1JIcd7Lhfaw1xR5v9XRPCBVVgksH37zfMUAPMjg==",
"requires": {
"@types/lowdb": "^1.0.9",
"@types/node": "^12.7.1",
@@ -2116,11 +2116,11 @@
}
},
"fs-minipass": {
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz",
"integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==",
"version": "1.2.7",
"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
"integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
"requires": {
"minipass": "^2.2.1"
"minipass": "^2.6.0"
}
},
"fs-write-stream-atomic": {
@@ -3698,9 +3698,9 @@
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
},
"minipass": {
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.6.0.tgz",
"integrity": "sha512-OuNZ0OHrrI+jswzmgivYBZ+fAAGHZA4293d5q0z631/I9QSw3yumKB92njxHIHiB1eAdGRsE+3CcOPkoEyV5FQ==",
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz",
"integrity": "sha512-38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ==",
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
+2 -2
View File
@@ -25,8 +25,8 @@
"child-process-promise": "^2.2.1",
"debug": "^4.1.1",
"express": "^4.16.4",
"frontblock": "^0.14.2",
"frontblock-generic": "^0.32.3",
"frontblock": "^0.15.1",
"frontblock-generic": "^0.34.1",
"git-cherrypicker": "0.0.3",
"git-describe": "^4.0.4",
"http": "0.0.0",
+5 -2
View File
@@ -4,7 +4,7 @@ import * as Knex from 'knex'
import * as Path from 'path'
import { FrontblockApiClient, FrontblockApiConf } from 'frontblock';
import { getLogger } from 'frontblock-generic/Types';
import { AdminBase } from 'frontblock-generic/Admin';
import { AdminBase, NotificationSeverity } from 'frontblock-generic/Admin';
import { IFrontblockApiClient } from 'frontblock-generic/Api';
import { Plugin } from 'frontblock-generic/Plugin';
import { socketioRPC } from 'frontblock-generic/RPC';
@@ -24,9 +24,12 @@ export class FrontblockAdmin extends AdminBase<AdminConf>{
this.initialize().then(() => this.makeKnex(this.getConfigKey('dbConf'))).then(() => logger.debug("Admin initialization finished"))
}
getDefaultConfig(): { apiConf: FrontblockApiConf; } & AdminConf & { dbConf:Knex.Config; } {
getDefaultConfig(): { apiConf: FrontblockApiConf; } & AdminConf & { dbConf:Knex.Config; eventBusConf: { [topic in string]: NotificationSeverity}} {
return {
httpPort: 8080,
eventBusConf: {
},
apiConf: {
apiHost: "api.testnet.frontblock.me",
apiKey: "",
+3
View File
@@ -0,0 +1,3 @@
module.exports = {
externals: ['log4js']
}
+179 -461
View File
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,32 @@
import { Component, OnInit } from '@angular/core';
declare const fb
@Component({
selector: '[apiclientconfig]',
template: `
consumers {{consumers}} subscribers {{subscribers}}
`
})
export class ApiclientWidgetComponent implements OnInit {
consumers = 0
subscribers = 0
constructor() { }
async ngOnInit() {
await new Promise((resolve, reject)=>{
let awaitAdmin: { (): void; (...args: any[]): void; }
(awaitAdmin = () => {
if(fb.ApiClient != null){
resolve()
}
setTimeout(awaitAdmin,25)
})()
})
fb.ApiClient.getConsumers().then(cons => this.consumers = cons.length)
fb.ApiClient.getSubscriptions().then(subs => this.subscribers = subs.length)
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB