- Select the drive containing the backup you would like to restore. -
-
-
- {{ disk.vendor || 'Unknown Vendor' }} - {{ disk.model || 'Unknown Model' }} - {{ disk.capacity | convertBytes }}
-
-
-
-
-
-
-
-
- {{ partition.label || partition.logicalname }}
-{{ partition.capacity | convertBytes }}
-
-
{{ label }}
-
{{ dep.version | displayEmver }}
@@ -121,7 +121,7 @@ -
+
exists(obj)),
+ )
.subscribe(currentDeps => {
- // unsubscribe to deleted
- this.dependencies.forEach(dep => {
- if (!currentDeps[dep.id]) {
- dep.sub.unsubscribe()
- }
- })
+ // remove deleted
+ this.dependencies.forEach((dep, i) => {
+ if (!currentDeps[dep.id]) {
+ dep.sub.unsubscribe()
+ this.dependencies.splice(i, 1)
+ }
+ })
- this.dependencies = Object.keys(currentDeps).map(id => {
- const version = this.pkg.manifest.dependencies[id]?.version
- if (version) {
- const dep = { id, version } as DependencyInfo
- dep.sub = this.patch.watch$('package-data', id)
- .subscribe(localDep => {
- this.setDepValues(dep, localDep)
- })
- return dep
- }
- }).filter(exists)
+ // subscribe
+ Object.keys(currentDeps)
+ .filter(id => {
+ const inManifest = !!this.pkg.manifest.dependencies[id]
+ const exists = this.dependencies.find(d => d.id === id)
+ return inManifest && !exists
+ })
+ .forEach(id => {
+ const version = this.pkg.manifest.dependencies[id].version
+ const dep = { id, version } as DependencyInfo
+ dep.sub = this.patch.watch$('package-data', id)
+ .subscribe(localDep => {
+ this.setDepValues(dep, localDep)
+ })
+ this.dependencies.push(dep)
+ })
}),
// 3
this.patch.watch$('package-data', this.pkgId, 'installed', 'status', 'main')
+ .pipe(
+ filter(obj => exists(obj)),
+ )
.subscribe(main => {
if (main.status === PackageMainStatus.Running) {
this.healthChecks = { ...main.health }
diff --git a/ui/src/app/pages/maintenance/maintenance.module.ts b/ui/src/app/pages/maintenance/maintenance.module.ts
deleted file mode 100644
index 5caac9549..000000000
--- a/ui/src/app/pages/maintenance/maintenance.module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { IonicModule } from '@ionic/angular'
-import { RouterModule, Routes } from '@angular/router'
-import { MaintenancePage } from './maintenance.page'
-import { SharingModule } from 'src/app/modules/sharing.module'
-
-const routes: Routes = [
- {
- path: '',
- component: MaintenancePage,
- },
-]
-
-@NgModule({
- imports: [
- CommonModule,
- IonicModule,
- RouterModule.forChild(routes),
- SharingModule,
- ],
- declarations: [MaintenancePage],
-})
-export class MaintenancePageModule { }
diff --git a/ui/src/app/pages/maintenance/maintenance.page.html b/ui/src/app/pages/maintenance/maintenance.page.html
deleted file mode 100644
index e11322998..000000000
--- a/ui/src/app/pages/maintenance/maintenance.page.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
- 
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ui/src/app/pages/maintenance/maintenance.page.scss b/ui/src/app/pages/maintenance/maintenance.page.scss
deleted file mode 100644
index eeedcc997..000000000
--- a/ui/src/app/pages/maintenance/maintenance.page.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-img {
- width: 50%;
- max-width: 500px;
-}
\ No newline at end of file
diff --git a/ui/src/app/pages/maintenance/maintenance.page.ts b/ui/src/app/pages/maintenance/maintenance.page.ts
deleted file mode 100644
index 04b0549af..000000000
--- a/ui/src/app/pages/maintenance/maintenance.page.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Component } from '@angular/core'
-
-@Component({
- selector: 'maintenance',
- templateUrl: 'maintenance.page.html',
- styleUrls: ['maintenance.page.scss'],
-})
-export class MaintenancePage { }
-
diff --git a/ui/src/app/pages/server-routes/server-backup/server-backup.module.ts b/ui/src/app/pages/server-routes/server-backup/server-backup.module.ts
index 53dd1a7ea..4cf401106 100644
--- a/ui/src/app/pages/server-routes/server-backup/server-backup.module.ts
+++ b/ui/src/app/pages/server-routes/server-backup/server-backup.module.ts
@@ -3,6 +3,7 @@ import { CommonModule } from '@angular/common'
import { IonicModule } from '@ionic/angular'
import { ServerBackupPage } from './server-backup.page'
import { RouterModule, Routes } from '@angular/router'
+import { BackupDrivesComponentModule } from 'src/app/components/backup-drives/backup-drives.component.module'
import { SharingModule } from 'src/app/modules/sharing.module'
const routes: Routes = [
@@ -18,6 +19,7 @@ const routes: Routes = [
IonicModule,
RouterModule.forChild(routes),
SharingModule,
+ BackupDrivesComponentModule,
],
declarations: [
ServerBackupPage,
diff --git a/ui/src/app/pages/server-routes/server-backup/server-backup.page.html b/ui/src/app/pages/server-routes/server-backup/server-backup.page.html
index 4bdd519c5..bb596dd9f 100644
--- a/ui/src/app/pages/server-routes/server-backup/server-backup.page.html
+++ b/ui/src/app/pages/server-routes/server-backup/server-backup.page.html
@@ -1,88 +1,56 @@
-
-
-
-
- Create Backup
-
-
- Refresh
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ Backup Progress
+
+
-
-
-
-
-
-
-
- {{ loadingError }}
-
-
-
-
-
-
-
-
-
- No drives found. Insert a backup drive into your Embassy and click "Refresh" above.
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts b/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
index 0099538fa..591ff2c04 100644
--- a/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
+++ b/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
@@ -1,10 +1,12 @@
import { Component } from '@angular/core'
-import { ModalController, IonicSafeString } from '@ionic/angular'
+import { ModalController, NavController } from '@ionic/angular'
import { ApiService } from 'src/app/services/api/embassy-api.service'
import { GenericInputComponent } from 'src/app/modals/generic-input/generic-input.component'
-import { getErrorMessage } from 'src/app/services/error-toast.service'
-import { MappedDiskInfo, MappedPartitionInfo } from 'src/app/util/misc.util'
-import { Emver } from 'src/app/services/emver.service'
+import { MappedPartitionInfo } from 'src/app/util/misc.util'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
+import { PackageDataEntry, PackageMainStatus, ServerStatus } from 'src/app/services/patch-db/data-model'
+import { Subscription } from 'rxjs'
+import { take } from 'rxjs/operators'
@Component({
selector: 'server-backup',
@@ -12,68 +14,107 @@ import { Emver } from 'src/app/services/emver.service'
styleUrls: ['./server-backup.page.scss'],
})
export class ServerBackupPage {
- disks: MappedDiskInfo[]
- loading = true
- loadingError: string | IonicSafeString
+ backingUp = false
+ pkgs: PkgInfo[] = []
+ subs: Subscription[]
constructor (
+ private readonly navCtrl: NavController,
private readonly modalCtrl: ModalController,
- private readonly emver: Emver,
private readonly embassyApi: ApiService,
+ private readonly patch: PatchDbService,
) { }
ngOnInit () {
- this.getExternalDisks()
- }
-
- async refresh () {
- this.loading = true
- await this.getExternalDisks()
- }
-
- async getExternalDisks (): Promise {
- try {
- const disks = await this.embassyApi.getDisks({ })
- this.disks = disks.map(d => {
- const partionInfo: MappedPartitionInfo[] = d.partitions.map(p => {
- return {
- ...p,
- hasBackup: [0, 1].includes(this.emver.compare(p['embassy-os']?.version, '0.3.0')),
- backupInfo: null,
- }
- })
- return {
- ...d,
- partitions: partionInfo,
+ this.subs = [
+ this.patch.watch$('server-info', 'status').subscribe(status => {
+ if (status === ServerStatus.BackingUp) {
+ this.backingUp = true
+ this.subscribeToBackup()
+ } else {
+ this.backingUp = false
+ this.pkgs.forEach(pkg => pkg.sub.unsubscribe())
}
- })
- } catch (e) {
- this.loadingError = getErrorMessage(e)
- } finally {
- this.loading = false
- }
+ }),
+ ]
}
- async presentModal (logicalname: string): Promise {
+ ngOnDestroy () {
+ this.subs.forEach(sub => sub.unsubscribe())
+ this.pkgs.forEach(pkg => pkg.sub.unsubscribe())
+ }
+
+ back () {
+ this.navCtrl.back()
+ }
+
+ async presentModal (partition: MappedPartitionInfo): Promise {
+ let message: string
+ if (partition.hasBackup) {
+ message = 'Enter your master password to decrypt this drive and update its backup. Depending on how much data was added or changed, this could be very fast, or it could take a while.'
+ } else {
+ message = 'Enter your master password to create an encrypted backup of your Embassy and all its installed services. Since this is a fresh backup, it could take a while. Future backups will likely be much faster.'
+ }
+
const m = await this.modalCtrl.create({
componentProps: {
title: 'Create Backup',
- message: `Enter your master password to create an encrypted backup of your Embassy and all its installed services.`,
+ message,
label: 'Password',
placeholder: 'Enter password',
useMask: true,
buttonText: 'Create Backup',
loadingText: 'Beginning backup...',
- submitFn: async (value: string) => await this.create(logicalname, value),
+ submitFn: async (password: string) => await this.create(partition.logicalname, password),
},
cssClass: 'alertlike-modal',
component: GenericInputComponent,
})
- return await m.present()
+ await m.present()
}
private async create (logicalname: string, password: string): Promise {
await this.embassyApi.createBackup({ logicalname, password })
}
+
+ private subscribeToBackup () {
+ this.patch.watch$('package-data')
+ .pipe(
+ take(1),
+ )
+ .subscribe(pkgs => {
+ const pkgArr = Object.values(pkgs)
+ const activeIndex = pkgArr.findIndex(pkg => pkg.installed.status.main.status === PackageMainStatus.BackingUp)
+
+ this.pkgs = pkgArr.map((pkg, i) => {
+ const pkgInfo = {
+ entry: pkg,
+ active: i === activeIndex,
+ complete: i < activeIndex,
+ sub: null,
+ }
+ return pkgInfo
+ })
+
+ // subscribe to pkg
+ this.pkgs.forEach(pkg => {
+ pkg.sub = this.patch.watch$('package-data', pkg.entry.manifest.id, 'installed', 'status', 'main', 'status').subscribe(status => {
+ if (status === PackageMainStatus.BackingUp) {
+ pkg.active = true
+ } else if (pkg.active) {
+ pkg.active = false
+ pkg.complete = true
+ }
+ })
+ })
+ })
+ }
+}
+
+interface PkgInfo {
+ entry: PackageDataEntry,
+ active: boolean
+ complete: boolean,
+ sub: Subscription,
}
diff --git a/ui/src/app/pages/server-routes/server-show/server-show.page.html b/ui/src/app/pages/server-routes/server-show/server-show.page.html
index f661bebd0..be9ab41f3 100644
--- a/ui/src/app/pages/server-routes/server-show/server-show.page.html
+++ b/ui/src/app/pages/server-routes/server-show/server-show.page.html
@@ -9,6 +9,20 @@
+ Backups
+
+
+
+
{{ cat.key }}
diff --git a/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/ui/src/app/pages/server-routes/server-show/server-show.page.ts
index b8f50a6ab..a61d0ad7d 100644
--- a/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -105,15 +105,6 @@ export class ServerShowPage {
private setButtons (): void {
this.settings = {
- 'Backups': [
- {
- title: 'Create Backup',
- description: 'Back up your Embassy and all its services',
- icon: 'save-outline',
- action: () => this.navCtrl.navigateForward(['backup'], { relativeTo: this.route }),
- detail: true,
- },
- ],
'Insights': [
{
title: 'About',
diff --git a/ui/src/app/services/api/api.fixures.ts b/ui/src/app/services/api/api.fixures.ts
index feaa85dfd..b2cfdf1cb 100644
--- a/ui/src/app/services/api/api.fixures.ts
+++ b/ui/src/app/services/api/api.fixures.ts
@@ -974,7 +974,7 @@ export module Mock {
'signal-strength': 50,
}
- export const Disks: RR.GetDisksRes = [
+ export const Drives: RR.GetDrivesRes = [
{
logicalname: '/dev/sda',
model: null,
diff --git a/ui/src/app/services/api/api.types.ts b/ui/src/app/services/api/api.types.ts
index 6c63312a8..83b9f8683 100644
--- a/ui/src/app/services/api/api.types.ts
+++ b/ui/src/app/services/api/api.types.ts
@@ -121,10 +121,10 @@ export module RR {
export type CreateBackupReq = WithExpire<{ logicalname: string, password: string }> // backup.create
export type CreateBackupRes = WithRevision
- // disk
+ // drive
- export type GetDisksReq = { } // disk.list
- export type GetDisksRes = DiskInfo[]
+ export type GetDrivesReq = { } // disk.list
+ export type GetDrivesRes = DriveInfo[]
export type GetBackupInfoReq = { logicalname: string, password: string } // disk.backup-info
export type GetBackupInfoRes = BackupInfo
@@ -287,7 +287,7 @@ export interface SessionMetadata {
export type PlatformType = 'cli' | 'ios' | 'ipad' | 'iphone' | 'android' | 'phablet' | 'tablet' | 'cordova' | 'capacitor' | 'electron' | 'pwa' | 'mobile' | 'mobileweb' | 'desktop' | 'hybrid'
-export interface DiskInfo {
+export interface DriveInfo {
logicalname: string
vendor: string | null
model: string | null
@@ -300,10 +300,10 @@ export interface PartitionInfo {
label: string | null
capacity: number
used: number | null
- 'embassy-os': EmbassyOsDiskInfo | null
+ 'embassy-os': EmbassyOsDriveInfo | null
}
-export interface EmbassyOsDiskInfo {
+export interface EmbassyOsDriveInfo {
version: string
full: boolean
}
diff --git a/ui/src/app/services/api/embassy-api.service.ts b/ui/src/app/services/api/embassy-api.service.ts
index 448914ba2..458b6b4de 100644
--- a/ui/src/app/services/api/embassy-api.service.ts
+++ b/ui/src/app/services/api/embassy-api.service.ts
@@ -126,9 +126,9 @@ export abstract class ApiService implements Source, Http {
() => this.createBackupRaw(params),
)()
- // disk
+ // drive
- abstract getDisks (params: RR.GetDisksReq): Promise
+ abstract getDrives (params: RR.GetDrivesReq): Promise
abstract getBackupInfo (params: RR.GetBackupInfoReq): Promise
diff --git a/ui/src/app/services/api/embassy-live-api.service.ts b/ui/src/app/services/api/embassy-live-api.service.ts
index 158f3b516..fda5742ae 100644
--- a/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/ui/src/app/services/api/embassy-live-api.service.ts
@@ -191,9 +191,9 @@ export class LiveApiService extends ApiService {
return this.http.rpcRequest({ method: 'backup.create', params })
}
- // disk
+ // drives
- getDisks (params: RR.GetDisksReq): Promise {
+ getDrives (params: RR.GetDrivesReq): Promise {
return this.http.rpcRequest({ method: 'disk.list', params })
}
diff --git a/ui/src/app/services/api/embassy-mock-api.service.ts b/ui/src/app/services/api/embassy-mock-api.service.ts
index b59cb534e..c1ed0435d 100644
--- a/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -263,7 +263,7 @@ export class MockApiService extends ApiService {
async createBackupRaw (params: RR.CreateBackupReq): Promise {
await pauseFor(2000)
const path = '/server-info/status'
- const patch = [
+ let patch = [
{
op: PatchOp.REPLACE,
path,
@@ -271,8 +271,37 @@ export class MockApiService extends ApiService {
},
]
const res = await this.http.rpcRequest>({ method: 'db.patch', params: { patch } })
- setTimeout(() => {
- const patch = [
+
+ const ids = ['bitcoind', 'lnd']
+
+ setTimeout(async () => {
+ for (let i = 0; i < ids.length; i++) {
+ const appPath = `/package-data/${ids[i]}/installed/status/main/status`
+ let appPatch = [
+ {
+ op: PatchOp.REPLACE,
+ path: appPath,
+ value: PackageMainStatus.BackingUp,
+ },
+ ]
+ this.http.rpcRequest>({ method: 'db.patch', params: { patch: appPatch } })
+
+ await pauseFor(8000)
+
+ appPatch = [
+ {
+ op: PatchOp.REPLACE,
+ path: appPath,
+ value: PackageMainStatus.Stopped,
+ },
+ ]
+ this.http.rpcRequest>({ method: 'db.patch', params: { patch: appPatch } })
+ }
+
+ await pauseFor(1000)
+
+ // set server back to running
+ patch = [
{
op: PatchOp.REPLACE,
path,
@@ -280,15 +309,16 @@ export class MockApiService extends ApiService {
},
]
this.http.rpcRequest>({ method: 'db.patch', params: { patch } })
- }, this.revertTime)
+ }, 200)
+
return res
}
- // disk
+ // drives
- async getDisks (params: RR.GetDisksReq): Promise {
+ async getDrives (params: RR.GetDrivesReq): Promise {
await pauseFor(2000)
- return Mock.Disks
+ return Mock.Drives
}
async getBackupInfo (params: RR.GetBackupInfoReq): Promise {
diff --git a/ui/src/app/util/misc.util.ts b/ui/src/app/util/misc.util.ts
index f9a1d9828..74e737eb3 100644
--- a/ui/src/app/util/misc.util.ts
+++ b/ui/src/app/util/misc.util.ts
@@ -1,6 +1,6 @@
import { OperatorFunction } from 'rxjs'
import { map } from 'rxjs/operators'
-import { BackupInfo, DiskInfo, PartitionInfo } from '../services/api/api.types'
+import { DriveInfo, PartitionInfo } from '../services/api/api.types'
export type Omit = Pick>
export type PromiseRes = { result: 'resolve', value: T } | { result: 'reject', value: Error }
@@ -193,11 +193,10 @@ export function debounce (delay: number = 300): MethodDecorator {
}
}
-export interface MappedDiskInfo extends DiskInfo {
+export interface MappedDriveInfo extends DriveInfo {
partitions: MappedPartitionInfo[]
}
export interface MappedPartitionInfo extends PartitionInfo {
hasBackup: boolean
- backupInfo: BackupInfo | null
}
\ No newline at end of file
diff --git a/ui/src/global.scss b/ui/src/global.scss
index 061902667..8148f1e50 100644
--- a/ui/src/global.scss
+++ b/ui/src/global.scss
@@ -120,6 +120,13 @@ ion-toast {
white-space: normal !important;
}
+.inline {
+ * {
+ display: inline-block;
+ vertical-align: middle;
+ }
+}
+
img {
border-radius: 100%;
}
@@ -132,13 +139,6 @@ ion-title {
font-family: 'Montserrat';
}
-ion-note {
- max-width: 140px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
ion-badge {
font-weight: bold;
}
Downloading: {{ installProgress.downloadProgress }}%
Embassy backing up
-
- - Select the drive where you want to create a backup of your Embassy. -
-
-
- {{ disk.vendor || 'Unknown Vendor' }} - {{ disk.model || 'Unknown Model' }} - {{ disk.capacity | convertBytes }}
-
-
-
+
+
+
+
+
+
+ ![]()
+
-
+
+
+ Complete
+
+
+
+ Backing up
+
+
+
+
+ Waiting...
+
-
- {{ partition.label || partition.logicalname }}
-{{ partition.capacity | convertBytes }}
-
-
Create Backup
+Back up your Embassy and all its services
+
+