feat: enable strictNullChecks

feat: enable `noImplicitAny` chore: remove sync data access fix loading package data for affected dependencies chore: properly get alt marketplace data update patchdb client to allow for emit on undefined values
Start9Labs · Jun 18, 2022 · 6b4907a · 6b4907a
1 parent 948fb79
commit 6b4907a
Show file tree

Hide file tree

Showing 99 changed files with 673 additions and 534 deletions.
diff --git a/frontend/projects/diagnostic-ui/src/app/pages/logs/logs.page.ts b/frontend/projects/diagnostic-ui/src/app/pages/logs/logs.page.ts
@@ -23,40 +23,47 @@ export class LogsPage {
   scrollToBottomButton = false
   isOnBottom = true
 
-  constructor (
-    private readonly api: ApiService,
-  ) { }
+  constructor(private readonly api: ApiService) {}
 
-  ngOnInit () {
+  ngOnInit() {
     this.getLogs()
   }
 
-  async getLogs () {
+  async getLogs() {
     try {
       // get logs
       const logs = await this.fetch()
-      if (!logs.length) return
+
+      if (!logs?.length) return
 
       const container = document.getElementById('container')
-      const beforeContainerHeight = container.scrollHeight
-      const newLogs = document.getElementById('template').cloneNode(true) as HTMLElement
-      newLogs.innerHTML = logs.map(l => `${l.timestamp} ${convert.toHtml(l.message)}`).join('\n') + (logs.length ? '\n' : '')
+      const beforeContainerHeight = container?.scrollHeight || 0
+      const newLogs = document.getElementById('template')?.cloneNode(true)
+
+      if (!(newLogs instanceof HTMLElement)) return
 
-      container.prepend(newLogs)
-      const afterContainerHeight = container.scrollHeight
+      newLogs.innerHTML =
+        logs
+          .map(l => `${l.timestamp} ${convert.toHtml(l.message)}`)
+          .join('\n') + (logs.length ? '\n' : '')
+      container?.prepend(newLogs)
+
+      const afterContainerHeight = container?.scrollHeight || 0
 
       // scroll down
       scrollBy(0, afterContainerHeight - beforeContainerHeight)
-      this.content.scrollToPoint(0, afterContainerHeight - beforeContainerHeight)
+      this.content.scrollToPoint(
+        0,
+        afterContainerHeight - beforeContainerHeight,
+      )
 
       if (logs.length < this.limit) {
         this.needInfinite = false
       }
-
-    } catch (e) { }
+    } catch (e) {}
   }
 
-  async fetch (isBefore: boolean = true) {
+  async fetch(isBefore: boolean = true) {
     try {
       const cursor = isBefore ? this.startCursor : this.endCursor
 
@@ -81,33 +88,40 @@ export class LogsPage {
     }
   }
 
-  async loadMore () {
+  async loadMore() {
     try {
       this.loadingMore = true
       const logs = await this.fetch(false)
-      if (!logs.length) return this.loadingMore = false
+
+      if (!logs?.length) return (this.loadingMore = false)
 
       const container = document.getElementById('container')
-      const newLogs = document.getElementById('template').cloneNode(true) as HTMLElement
-      newLogs.innerHTML = logs.map(l => `${l.timestamp} ${convert.toHtml(l.message)}`).join('\n') + (logs.length ? '\n' : '')
-      container.append(newLogs)
+      const newLogs = document.getElementById('template')?.cloneNode(true)
+
+      if (!(newLogs instanceof HTMLElement)) return
+
+      newLogs.innerHTML =
+        logs
+          .map(l => `${l.timestamp} ${convert.toHtml(l.message)}`)
+          .join('\n') + (logs.length ? '\n' : '')
+      container?.append(newLogs)
       this.loadingMore = false
       this.scrollEvent()
-    } catch (e) { }
+    } catch (e) {}
   }
 
-  scrollEvent () {
+  scrollEvent() {
     const buttonDiv = document.getElementById('button-div')
-    this.isOnBottom = buttonDiv.getBoundingClientRect().top < window.innerHeight
+    this.isOnBottom =
+      !!buttonDiv && buttonDiv.getBoundingClientRect().top < window.innerHeight
   }
 
-  scrollToBottom () {
+  scrollToBottom() {
     this.content.scrollToBottom(500)
   }
 
-  async loadData (e: any): Promise<void> {
+  async loadData(e: any): Promise<void> {
     await this.getLogs()
     e.target.complete()
   }
 }
-
diff --git a/frontend/projects/diagnostic-ui/src/app/services/api/mock-api.service.ts b/frontend/projects/diagnostic-ui/src/app/services/api/mock-api.service.ts
@@ -25,17 +25,14 @@ export class MockApiService extends ApiService {
 
   async restart(): Promise<void> {
     await pauseFor(1000)
-    return null
   }
 
   async forgetDrive(): Promise<void> {
     await pauseFor(1000)
-    return null
   }
 
   async repairDisk(): Promise<void> {
     await pauseFor(1000)
-    return null
   }
 
   async getLogs(params: GetLogsReq): Promise<GetLogsRes> {

diff --git a/frontend/projects/diagnostic-ui/src/app/services/http.service.ts b/frontend/projects/diagnostic-ui/src/app/services/http.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { HttpClient, HttpErrorResponse } from '@angular/common/http'
+import { HttpClient } from '@angular/common/http'
 import { HttpError, RpcError } from '@start9labs/shared'
 
 @Injectable({
@@ -12,6 +12,8 @@ export class HttpService {
     const res = await this.httpRequest<RPCResponse<T>>(options)
     if (isRpcError(res)) throw new RpcError(res.error)
     if (isRpcSuccess(res)) return res.result
+
+    throw new Error('Unknown RPC response')
   }
 
   async httpRequest<T>(body: RPCOptions): Promise<T> {

diff --git a/frontend/projects/marketplace/src/pages/release-notes/release-notes.component.ts b/frontend/projects/marketplace/src/pages/release-notes/release-notes.component.ts
@@ -1,5 +1,6 @@
 import { ChangeDetectionStrategy, Component, ElementRef } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
+import { getPkgId } from '@start9labs/shared'
 import { AbstractMarketplaceService } from '../../services/marketplace.service'
 
 @Component({
@@ -9,7 +10,7 @@ import { AbstractMarketplaceService } from '../../services/marketplace.service'
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ReleaseNotesComponent {
-  private readonly pkgId = this.route.snapshot.paramMap.get('pkgId')
+  private readonly pkgId = getPkgId(this.route)
 
   private selected: string | null = null
 

diff --git a/frontend/projects/marketplace/src/pages/show/additional/additional.component.ts b/frontend/projects/marketplace/src/pages/show/additional/additional.component.ts
@@ -34,7 +34,7 @@ export class AdditionalComponent {
     const alert = await this.alertCtrl.create({
       header: 'Versions',
       inputs: this.pkg.versions
-        .sort((a, b) => -1 * this.emver.compare(a, b))
+        .sort((a, b) => -1 * (this.emver.compare(a, b) || 0))
         .map(v => ({
           name: v, // for CSS
           type: 'radio',

diff --git a/frontend/projects/marketplace/src/pipes/filter-packages.pipe.ts b/frontend/projects/marketplace/src/pipes/filter-packages.pipe.ts
@@ -1,5 +1,5 @@
 import { NgModule, Pipe, PipeTransform } from '@angular/core'
-import Fuse from 'fuse.js/dist/fuse.min.js'
+import Fuse from 'fuse.js'
 
 import { MarketplacePkg } from '../types/marketplace-pkg'
 import { MarketplaceManifest } from '../types/marketplace-manifest'

diff --git a/frontend/projects/marketplace/src/services/marketplace.service.ts b/frontend/projects/marketplace/src/services/marketplace.service.ts
@@ -15,5 +15,8 @@ export abstract class AbstractMarketplaceService {
 
   abstract getPackageMarkdown(type: string, pkgId: string): Observable<string>
 
-  abstract getPackage(id: string, version: string): Observable<MarketplacePkg>
+  abstract getPackage(
+    id: string,
+    version: string,
+  ): Observable<MarketplacePkg | null>
 }
diff --git a/frontend/projects/setup-wizard/src/app/modals/password/password.page.ts b/frontend/projects/setup-wizard/src/app/modals/password/password.page.ts
@@ -1,6 +1,10 @@
 import { Component, Input, ViewChild } from '@angular/core'
 import { IonInput, ModalController } from '@ionic/angular'
-import { DiskInfo, CifsBackupTarget, DiskBackupTarget } from 'src/app/services/api/api.service'
+import {
+  DiskInfo,
+  CifsBackupTarget,
+  DiskBackupTarget,
+} from 'src/app/services/api/api.service'
 import * as argon2 from '@start9labs/argon2'
 
 @Component({
@@ -21,26 +25,27 @@ export class PasswordPage {
   passwordVer = ''
   unmasked2 = false
 
-  constructor (
-    private modalController: ModalController,
-  ) { }
+  constructor(private modalController: ModalController) {}
 
-  ngAfterViewInit () {
+  ngAfterViewInit() {
     setTimeout(() => this.elem.setFocus(), 400)
   }
 
-  async verifyPw () {
-    if (!this.target || !this.target['embassy-os']) this.pwError = 'No recovery target' // unreachable
+  async verifyPw() {
+    if (!this.target || !this.target['embassy-os'])
+      this.pwError = 'No recovery target' // unreachable
 
     try {
-      argon2.verify(this.target['embassy-os']['password-hash'], this.password)
+      const passwordHash = this.target['embassy-os']?.['password-hash'] || ''
+
+      argon2.verify(passwordHash, this.password)
       this.modalController.dismiss({ password: this.password }, 'success')
     } catch (e) {
       this.pwError = 'Incorrect password provided'
     }
   }
 
-  async submitPw () {
+  async submitPw() {
     this.validate()
     if (this.password !== this.passwordVer) {
       this.verError = '*passwords do not match'
@@ -50,8 +55,8 @@ export class PasswordPage {
     this.modalController.dismiss({ password: this.password }, 'success')
   }
 
-  validate () {
-    if (!!this.target) return this.pwError = ''
+  validate() {
+    if (!!this.target) return (this.pwError = '')
 
     if (this.passwordVer) {
       this.checkVer()
@@ -64,11 +69,12 @@ export class PasswordPage {
     }
   }
 
-  checkVer () {
-    this.verError = this.password !== this.passwordVer ? 'Passwords do not match' : ''
+  checkVer() {
+    this.verError =
+      this.password !== this.passwordVer ? 'Passwords do not match' : ''
   }
 
-  cancel () {
+  cancel() {
     this.modalController.dismiss()
   }
 }
diff --git a/frontend/projects/setup-wizard/src/app/modals/prod-key-modal/prod-key-modal.page.ts b/frontend/projects/setup-wizard/src/app/modals/prod-key-modal/prod-key-modal.page.ts
@@ -16,19 +16,19 @@ export class ProdKeyModal {
   productKey = ''
   unmasked = false
 
-  constructor (
+  constructor(
     private readonly modalController: ModalController,
     private readonly apiService: ApiService,
     private readonly loadingCtrl: LoadingController,
     private readonly httpService: HttpService,
-  ) { }
+  ) {}
 
-  ngAfterViewInit () {
+  ngAfterViewInit() {
     setTimeout(() => this.elem.setFocus(), 400)
   }
 
-  async verifyProductKey () {
-    if (!this.productKey) return
+  async verifyProductKey() {
+    if (!this.productKey || !this.target.logicalname) return
 
     const loader = await this.loadingCtrl.create({
       message: 'Verifying Product Key',
@@ -48,7 +48,7 @@ export class ProdKeyModal {
     }
   }
 
-  cancel () {
+  cancel() {
     this.modalController.dismiss()
   }
 }
diff --git a/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.ts b/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.ts
@@ -68,8 +68,8 @@ export class RecoverPage {
               'embassy-os': p['embassy-os'],
             }
             this.mappedDrives.push({
-              hasValidBackup: p['embassy-os']?.full,
-              is02x: drive['embassy-os']?.version.startsWith('0.2'),
+              hasValidBackup: !!p['embassy-os']?.full,
+              is02x: !!drive['embassy-os']?.version.startsWith('0.2'),
               drive,
             })
           })
@@ -111,7 +111,8 @@ export class RecoverPage {
             {
               text: 'Use Drive',
               handler: async () => {
-                await this.importDrive(importableDrive.guid)
+                if (importableDrive.guid)
+                  await this.importDrive(importableDrive.guid)
               },
             },
           ],
@@ -148,20 +149,23 @@ export class RecoverPage {
   }
 
   async select(target: DiskBackupTarget) {
-    const is02x = target['embassy-os'].version.startsWith('0.2')
+    const is02x = target['embassy-os']?.version.startsWith('0.2')
+    const { logicalname } = target
+
+    if (!logicalname) return
 
     if (this.stateService.hasProductKey) {
       if (is02x) {
-        this.selectRecoverySource(target.logicalname)
+        this.selectRecoverySource(logicalname)
       } else {
         const modal = await this.modalController.create({
           component: PasswordPage,
           componentProps: { target },
           cssClass: 'alertlike-modal',
         })
         modal.onDidDismiss().then(res => {
-          if (res.data && res.data.password) {
-            this.selectRecoverySource(target.logicalname, res.data.password)
+          if (res.data?.password) {
+            this.selectRecoverySource(logicalname, res.data.password)
           }
         })
         await modal.present()
@@ -188,8 +192,8 @@ export class RecoverPage {
           cssClass: 'alertlike-modal',
         })
         modal.onDidDismiss().then(res => {
-          if (res.data && res.data.productKey) {
-            this.selectRecoverySource(target.logicalname)
+          if (res.data?.productKey) {
+            this.selectRecoverySource(logicalname)
           }
         })
         await modal.present()

diff --git a/frontend/projects/setup-wizard/src/app/pages/success/success.page.ts b/frontend/projects/setup-wizard/src/app/pages/success/success.page.ts
@@ -24,7 +24,7 @@ export class SuccessPage {
       await this.stateService.completeEmbassy()
       document
         .getElementById('install-cert')
-        .setAttribute(
+        ?.setAttribute(
           'href',
           'data:application/x-x509-ca-cert;base64,' +
             encodeURIComponent(this.stateService.cert),
@@ -56,20 +56,24 @@ export class SuccessPage {
   }
 
   installCert() {
-    document.getElementById('install-cert').click()
+    document.getElementById('install-cert')?.click()
   }
 
   download() {
-    document.getElementById('tor-addr').innerHTML = this.stateService.torAddress
-    document.getElementById('lan-addr').innerHTML = this.stateService.lanAddress
+    const torAddress = document.getElementById('tor-addr')
+    const lanAddress = document.getElementById('lan-addr')
+
+    if (torAddress) torAddress.innerHTML = this.stateService.torAddress
+    if (lanAddress) lanAddress.innerHTML = this.stateService.lanAddress
+
     document
       .getElementById('cert')
-      .setAttribute(
+      ?.setAttribute(
         'href',
         'data:application/x-x509-ca-cert;base64,' +
           encodeURIComponent(this.stateService.cert),
       )
-    let html = document.getElementById('downloadable').innerHTML
+    let html = document.getElementById('downloadable')?.innerHTML || ''
     const filename = 'embassy-info.html'
 
     const elem = document.createElement('a')