don't be so fragile when comparing marketplace URLs

frontend/projects/shared/src/util/misc.util.ts

@@ -41,6 +41,10 @@ export function removeTrailingSlash(word: string): string {
   return word.replace(/\/+$/, '')
 }
 
+export function sameUrl(u1: string, u2: string): boolean {
+  return new URL(u1).toString() === new URL(u2).toString()
+}
+
 export function isValidHttpUrl(string: string): boolean {
   try {
     const _ = new URL(string)

frontend/projects/ui/src/app/components/store-icon/store-icon.component.ts

@@ -6,6 +6,7 @@ import {
   PipeTransform,
 } from '@angular/core'
 import { ConfigService } from 'src/app/services/config.service'
+import { sameUrl } from '@start9labs/shared'
 
 @Component({
   selector: 'store-icon',
@@ -26,9 +27,9 @@ export class GetIconPipe implements PipeTransform {
   transform(url: string): string | null {
     const { start9, community } = this.config.marketplace
 
-    if (url === start9) {
+    if (sameUrl(url, start9)) {
       return 'assets/img/icon.png'
-    } else if (url === community) {
+    } else if (sameUrl(url, community)) {
       return 'assets/img/community-store.png'
     }
     return null

frontend/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts

@@ -6,7 +6,7 @@ import {
   ModalController,
 } from '@ionic/angular'
 import { ActionSheetButton } from '@ionic/core'
-import { ErrorToastService } from '@start9labs/shared'
+import { ErrorToastService, sameUrl } from '@start9labs/shared'
 import { AbstractMarketplaceService } from '@start9labs/marketplace'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ValueSpecObject } from 'src/app/pkg-config/config-types'
@@ -31,7 +31,7 @@ export class MarketplaceSettingsPage {
     map(([stores, selected]) => {
       const toSlice = stores.map(s => ({
         ...s,
-        selected: s.url === selected.url,
+        selected: sameUrl(s.url, selected.url),
       }))
       // 0 and 1 are prod and community
       const standard = toSlice.slice(0, 1)

frontend/projects/ui/src/app/pages/updates/updates.page.ts

@@ -14,7 +14,7 @@ import {
   MarketplacePkg,
   StoreIdentity,
 } from '@start9labs/marketplace'
-import { Emver, isEmptyObject } from '@start9labs/shared'
+import { Emver, isEmptyObject, sameUrl } from '@start9labs/shared'
 import { Pipe, PipeTransform } from '@angular/core'
 import { combineLatest, Observable } from 'rxjs'
 import { PrimaryRendering } from '../../services/pkg-status-rendering.service'
@@ -194,7 +194,8 @@ export function marketplaceSame(
   local: Record<string, PackageDataEntry>,
   url: string,
 ): boolean {
-  return local[id]?.installed?.['marketplace-url'] === url
+  const localUrl = local[id]?.installed?.['marketplace-url'] || ''
+  return sameUrl(localUrl, url)
 }
 
 export function versionLower(

frontend/projects/ui/src/app/services/marketplace.service.ts

@@ -33,6 +33,7 @@ import {
   tap,
 } from 'rxjs/operators'
 import { ConfigService } from './config.service'
+import { sameUrl } from '@start9labs/shared'
 
 @Injectable()
 export class MarketplaceService implements AbstractMarketplaceService {
@@ -68,7 +69,7 @@ export class MarketplaceService implements AbstractMarketplaceService {
     startWith<StoreIdentity[]>([]),
     pairwise(),
     mergeMap(([prev, curr]) =>
-      curr.filter(c => !prev.find(p => c.url === p.url)),
+      curr.filter(c => !prev.find(p => sameUrl(c.url, p.url))),
     ),
     mergeMap(({ url, name }) =>
       this.fetchStore$(url).pipe(