Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix types

Browse Source
This commit is contained in:
Matt Hill
2021-08-09 12:00:03 -06:00
committed by Aiden McClelland
parent 31b820214e
commit ae09f5a4f2
4 changed files with 72 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
appmgr/src/db/model.rs
View File

@@ -49,18 +49,9 @@ impl Database {
}, },
unread_notification_count: 0, unread_notification_count: 0,
specs: ServerSpecs { specs: ServerSpecs {
cpu: Usage { cpu: "".to_owned(),
used: 0_f64, disk: "".to_owned(),
total: 1_f64, memory: "".to_owned(),
},
disk: Usage {
used: 0_f64,
total: 1_f64,
},
memory: Usage {
used: 0_f64,
total: 1_f64,
},
}, },
connection_addresses: ConnectionAddresses { connection_addresses: ConnectionAddresses {
tor: Vec::new(), tor: Vec::new(),
@@ -114,16 +105,9 @@ pub struct WifiInfo {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub struct ServerSpecs { pub struct ServerSpecs {
pub cpu: Usage, pub cpu: String,
pub disk: Usage, pub disk: String,
pub memory: Usage, pub memory: String,
}
#[derive(Debug, Deserialize, Serialize)]
#[serde(rename_all = "kebab-case")]
pub struct Usage {
pub used: f64,
pub total: f64,
} }
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]

6
ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
View File

@@ -1,13 +1,13 @@
import { Component, Input, ViewChild } from '@angular/core' import { Component, Input, ViewChild } from '@angular/core'
import { ActivatedRoute } from '@angular/router' import { ActivatedRoute } from '@angular/router'
import { IonContent, ToastController } from '@ionic/angular' import { IonContent, ToastController } from '@ionic/angular'
import { InterfaceDef, InterfaceInfo } from 'src/app/services/patch-db/data-model' import { InstalledPackageDataEntry, InterfaceDef } from 'src/app/services/patch-db/data-model'
import { PatchDbService } from 'src/app/services/patch-db/patch-db.service' import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
import { copyToClipboard } from 'src/app/util/web.util' import { copyToClipboard } from 'src/app/util/web.util'
interface LocalInterface { interface LocalInterface {
def: InterfaceDef def: InterfaceDef
addresses: InterfaceInfo['addresses'][string] addresses: InstalledPackageDataEntry['interface-addresses'][string]
} }
@Component({ @Component({
@@ -29,7 +29,7 @@ export class AppInterfacesPage {
const pkgId = this.route.snapshot.paramMap.get('pkgId') const pkgId = this.route.snapshot.paramMap.get('pkgId')
const pkg = this.patch.data['package-data'][pkgId] const pkg = this.patch.data['package-data'][pkgId]
const interfaces = pkg.manifest.interfaces const interfaces = pkg.manifest.interfaces
const addressesMap = pkg.installed['interface-info'].addresses const addressesMap = pkg.installed['interface-addresses']
const ui = interfaces['ui'] const ui = interfaces['ui']
if (ui) { if (ui) {

120
ui/src/app/services/api/api.fixures.ts
View File

@@ -46,14 +46,14 @@ export module Mock {
system: true, system: true,
entrypoint: '', entrypoint: '',
args: [''], args: [''],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Yaml, 'io-format': DockerIoFormat.Yaml,
inject: false, inject: false,
'shm-size': '', 'shm-size': '',
}, },
'health-checks': {}, 'health-checks': { },
config: null, config: null,
volumes: {}, volumes: { },
'min-os-version': '0.2.12', 'min-os-version': '0.2.12',
interfaces: { interfaces: {
ui: { ui: {
@@ -61,9 +61,9 @@ export module Mock {
description: 'Web application for viewing information about your node and the Bitcoin network.', description: 'Web application for viewing information about your node and the Bitcoin network.',
ui: true, ui: true,
'tor-config': { 'tor-config': {
'port-mapping': {}, 'port-mapping': { },
}, },
'lan-config': {}, 'lan-config': { },
protocols: [], protocols: [],
}, },
rpc: { rpc: {
@@ -71,9 +71,9 @@ export module Mock {
description: 'Used by wallets to interact with your Bitcoin Core node.', description: 'Used by wallets to interact with your Bitcoin Core node.',
ui: false, ui: false,
'tor-config': { 'tor-config': {
'port-mapping': {}, 'port-mapping': { },
}, },
'lan-config': {}, 'lan-config': { },
protocols: [], protocols: [],
}, },
p2p: { p2p: {
@@ -81,9 +81,9 @@ export module Mock {
description: 'Used by other Bitcoin nodes to communicate and interact with your node.', description: 'Used by other Bitcoin nodes to communicate and interact with your node.',
ui: false, ui: false,
'tor-config': { 'tor-config': {
'port-mapping': {}, 'port-mapping': { },
}, },
'lan-config': {}, 'lan-config': { },
protocols: [], protocols: [],
}, },
}, },
@@ -94,7 +94,7 @@ export module Mock {
system: true, system: true,
entrypoint: '', entrypoint: '',
args: [''], args: [''],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Yaml, 'io-format': DockerIoFormat.Yaml,
inject: false, inject: false,
'shm-size': '', 'shm-size': '',
@@ -105,7 +105,7 @@ export module Mock {
system: true, system: true,
entrypoint: '', entrypoint: '',
args: [''], args: [''],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Yaml, 'io-format': DockerIoFormat.Yaml,
inject: false, inject: false,
'shm-size': '', 'shm-size': '',
@@ -124,7 +124,7 @@ export module Mock {
system: true, system: true,
entrypoint: '', entrypoint: '',
args: [''], args: [''],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Yaml, 'io-format': DockerIoFormat.Yaml,
inject: false, inject: false,
'shm-size': '', 'shm-size': '',
@@ -132,8 +132,8 @@ export module Mock {
'input-spec': null, 'input-spec': null,
}, },
}, },
permissions: {}, permissions: { },
dependencies: {}, dependencies: { },
} }
export const MockManifestLnd: Manifest = { export const MockManifestLnd: Manifest = {
@@ -164,14 +164,14 @@ export module Mock {
system: true, system: true,
entrypoint: '', entrypoint: '',
args: [''], args: [''],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Yaml, 'io-format': DockerIoFormat.Yaml,
inject: false, inject: false,
'shm-size': '', 'shm-size': '',
}, },
'health-checks': {}, 'health-checks': { },
config: null, config: null,
volumes: {}, volumes: { },
'min-os-version': '0.2.12', 'min-os-version': '0.2.12',
interfaces: { interfaces: {
rpc: { rpc: {
@@ -179,7 +179,7 @@ export module Mock {
description: 'Good for connecting to your node at a distance.', description: 'Good for connecting to your node at a distance.',
ui: true, ui: true,
'tor-config': { 'tor-config': {
'port-mapping': {}, 'port-mapping': { },
}, },
'lan-config': { 'lan-config': {
44: { 44: {
@@ -194,7 +194,7 @@ export module Mock {
description: 'Certain wallet use grpc.', description: 'Certain wallet use grpc.',
ui: false, ui: false,
'tor-config': { 'tor-config': {
'port-mapping': {}, 'port-mapping': { },
}, },
'lan-config': { 'lan-config': {
66: { 66: {
@@ -212,7 +212,7 @@ export module Mock {
system: true, system: true,
entrypoint: '', entrypoint: '',
args: [''], args: [''],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Yaml, 'io-format': DockerIoFormat.Yaml,
inject: false, inject: false,
'shm-size': '', 'shm-size': '',
@@ -223,7 +223,7 @@ export module Mock {
system: true, system: true,
entrypoint: '', entrypoint: '',
args: [''], args: [''],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Yaml, 'io-format': DockerIoFormat.Yaml,
inject: false, inject: false,
'shm-size': '', 'shm-size': '',
@@ -242,7 +242,7 @@ export module Mock {
system: true, system: true,
entrypoint: '', entrypoint: '',
args: [''], args: [''],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Yaml, 'io-format': DockerIoFormat.Yaml,
inject: false, inject: false,
'shm-size': '', 'shm-size': '',
@@ -258,7 +258,7 @@ export module Mock {
}, },
}, },
}, },
permissions: {}, permissions: { },
dependencies: { dependencies: {
'bitcoind': { 'bitcoind': {
version: '=0.21.0', version: '=0.21.0',
@@ -273,22 +273,22 @@ export module Mock {
system: true, system: true,
entrypoint: 'true', entrypoint: 'true',
args: [], args: [],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Cbor, 'io-format': DockerIoFormat.Cbor,
inject: false, inject: false,
"shm-size": '10m' 'shm-size': '10m',
}, },
"auto-configure": { 'auto-configure': {
type: 'docker', type: 'docker',
image: 'alpine', image: 'alpine',
system: true, system: true,
entrypoint: 'cat', entrypoint: 'cat',
args: [], args: [],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Cbor, 'io-format': DockerIoFormat.Cbor,
inject: false, inject: false,
"shm-size": '10m' 'shm-size': '10m',
} },
}, },
}, },
'bitcoin-proxy': { 'bitcoin-proxy': {
@@ -304,22 +304,22 @@ export module Mock {
system: true, system: true,
entrypoint: 'true', entrypoint: 'true',
args: [], args: [],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Cbor, 'io-format': DockerIoFormat.Cbor,
inject: false, inject: false,
"shm-size": '10m' 'shm-size': '10m',
}, },
"auto-configure": { 'auto-configure': {
type: 'docker', type: 'docker',
image: 'alpine', image: 'alpine',
system: true, system: true,
entrypoint: 'cat', entrypoint: 'cat',
args: [], args: [],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Cbor, 'io-format': DockerIoFormat.Cbor,
inject: false, inject: false,
"shm-size": '10m' 'shm-size': '10m',
} },
}, },
}, },
}, },
@@ -353,14 +353,14 @@ export module Mock {
system: true, system: true,
entrypoint: '', entrypoint: '',
args: [''], args: [''],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Yaml, 'io-format': DockerIoFormat.Yaml,
inject: false, inject: false,
'shm-size': '', 'shm-size': '',
}, },
'health-checks': {}, 'health-checks': { },
config: null, config: null,
volumes: {}, volumes: { },
'min-os-version': '0.2.12', 'min-os-version': '0.2.12',
interfaces: { interfaces: {
rpc: { rpc: {
@@ -368,7 +368,7 @@ export module Mock {
description: 'Good for connecting to your node at a distance.', description: 'Good for connecting to your node at a distance.',
ui: true, ui: true,
'tor-config': { 'tor-config': {
'port-mapping': {}, 'port-mapping': { },
}, },
'lan-config': { 'lan-config': {
44: { 44: {
@@ -386,7 +386,7 @@ export module Mock {
system: true, system: true,
entrypoint: '', entrypoint: '',
args: [''], args: [''],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Yaml, 'io-format': DockerIoFormat.Yaml,
inject: false, inject: false,
'shm-size': '', 'shm-size': '',
@@ -397,15 +397,15 @@ export module Mock {
system: true, system: true,
entrypoint: '', entrypoint: '',
args: [''], args: [''],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Yaml, 'io-format': DockerIoFormat.Yaml,
inject: false, inject: false,
'shm-size': '', 'shm-size': '',
}, },
}, },
migrations: null, migrations: null,
actions: {}, actions: { },
permissions: {}, permissions: { },
dependencies: { dependencies: {
'bitcoind': { 'bitcoind': {
version: '>=0.20.0', version: '>=0.20.0',
@@ -420,22 +420,22 @@ export module Mock {
system: true, system: true,
entrypoint: 'true', entrypoint: 'true',
args: [], args: [],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Cbor, 'io-format': DockerIoFormat.Cbor,
inject: false, inject: false,
"shm-size": '10m' 'shm-size': '10m',
}, },
"auto-configure": { 'auto-configure': {
type: 'docker', type: 'docker',
image: 'alpine', image: 'alpine',
system: true, system: true,
entrypoint: 'cat', entrypoint: 'cat',
args: [], args: [],
mounts: {}, mounts: { },
'io-format': DockerIoFormat.Cbor, 'io-format': DockerIoFormat.Cbor,
inject: false, inject: false,
"shm-size": '10m' 'shm-size': '10m',
} },
}, },
}, },
}, },
@@ -457,7 +457,7 @@ export module Mock {
}, },
categories: ['bitcoin', 'cryptocurrency'], categories: ['bitcoin', 'cryptocurrency'],
versions: ['0.19.0', '0.20.0', '0.21.0'], versions: ['0.19.0', '0.20.0', '0.21.0'],
'dependency-metadata': {}, 'dependency-metadata': { },
}, },
'0.20.0': { '0.20.0': {
icon: 'assets/img/service-icons/bitcoind.png', icon: 'assets/img/service-icons/bitcoind.png',
@@ -469,7 +469,7 @@ export module Mock {
}, },
categories: ['bitcoin', 'cryptocurrency'], categories: ['bitcoin', 'cryptocurrency'],
versions: ['0.19.0', '0.20.0', '0.21.0'], versions: ['0.19.0', '0.20.0', '0.21.0'],
'dependency-metadata': {}, 'dependency-metadata': { },
}, },
'0.21.0': { '0.21.0': {
icon: 'assets/img/service-icons/bitcoind.png', icon: 'assets/img/service-icons/bitcoind.png',
@@ -482,7 +482,7 @@ export module Mock {
}, },
categories: ['bitcoin', 'cryptocurrency'], categories: ['bitcoin', 'cryptocurrency'],
versions: ['0.19.0', '0.20.0', '0.21.0'], versions: ['0.19.0', '0.20.0', '0.21.0'],
'dependency-metadata': {}, 'dependency-metadata': { },
}, },
'latest': { 'latest': {
icon: 'assets/img/service-icons/bitcoind.png', icon: 'assets/img/service-icons/bitcoind.png',
@@ -494,7 +494,7 @@ export module Mock {
}, },
categories: ['bitcoin', 'cryptocurrency'], categories: ['bitcoin', 'cryptocurrency'],
versions: ['0.19.0', '0.20.0', '0.21.0'], versions: ['0.19.0', '0.20.0', '0.21.0'],
'dependency-metadata': {}, 'dependency-metadata': { },
}, },
}, },
'lnd': { 'lnd': {
@@ -595,9 +595,9 @@ export module Mock {
main: { main: {
status: PackageMainStatus.Running, status: PackageMainStatus.Running,
started: new Date().toISOString(), started: new Date().toISOString(),
health: {}, health: { },
}, },
'dependency-errors': {}, 'dependency-errors': { },
}, },
manifest: MockManifestBitcoinProxy, manifest: MockManifestBitcoinProxy,
'interface-addresses': { 'interface-addresses': {
@@ -1321,7 +1321,7 @@ export module Mock {
'description': 'api keys that are authorized to access your Bitcoin node.', 'description': 'api keys that are authorized to access your Bitcoin node.',
'range': '[0,*)', 'range': '[0,*)',
'default': [], 'default': [],
'spec': {}, 'spec': { },
}, },
}, },
// actual config // actual config
@@ -1468,7 +1468,7 @@ export module Mock {
}, },
}, },
'system-pointers': [], 'system-pointers': [],
'current-dependents': {}, 'current-dependents': { },
'current-dependencies': { 'current-dependencies': {
'bitcoind': { 'bitcoind': {
pointers: [], pointers: [],
@@ -1502,9 +1502,9 @@ export module Mock {
// 'package-marketplace': 'https://registry.start9.com', // 'package-marketplace': 'https://registry.start9.com',
// 'unread-notification-count': 4, // 'unread-notification-count': 4,
// specs: { // specs: {
// CPU: 'Cortex-A72: 4 Cores @1500MHz', // cpu: 'Cortex-A72: 4 Cores @1500MHz',
// Disk: '1TB SSD', // disk: '1TB SSD',
// Memory: '8GB', // memory: '8GB',
// }, // },
// 'connection-addresses': { // 'connection-addresses': {
// tor: ['http://privacy34kn4ez3y3nijweec6w4g54i3g54sdv7r5mr6soma3w4begyd.onion'], // tor: ['http://privacy34kn4ez3y3nijweec6w4g54i3g54sdv7r5mr6soma3w4begyd.onion'],

11
ui/src/app/services/patch-db/data-model.ts
View File

@@ -22,9 +22,9 @@ export interface ServerInfo {
wifi: WiFiInfo wifi: WiFiInfo
'unread-notification-count': number 'unread-notification-count': number
specs: { specs: {
cpu: Usage cpu: string
disk: Usage disk: string
memory: Usage memory: string
} }
'connection-addresses': { 'connection-addresses': {
tor: string[] tor: string[]
@@ -44,11 +44,6 @@ export interface WiFiInfo {
connected: string | null connected: string | null
} }
export interface Usage {
used: number
total: number
}
export interface PackageDataEntry { export interface PackageDataEntry {
state: PackageState state: PackageState
'static-files': { 'static-files': {