enabling support for wireguard and firewall (#2713)

* wip: enabling support for wireguard and firewall

* wip

* wip

* wip

* wip

* wip

* implement some things

* fix warning

* wip

* alpha.23

* misc fixes

* remove ufw since no longer required

* remove debug info

* add cli bindings

* debugging

* fixes

* individualized acme and privacy settings for domains and bindings

* sdk version bump

* migration

* misc fixes

* refactor Host::update

* debug info

* refactor webserver

* misc fixes

* misc fixes

* refactor port forwarding

* recheck interfaces every 5 min if no dbus event

* misc fixes and cleanup

* misc fixes

sdk/base/lib/Effects.ts

@@ -8,7 +8,7 @@ import {
   SetHealth,
   BindParams,
   HostId,
-  LanInfo,
+  NetInfo,
   Host,
   ExportServiceInterfaceParams,
   ServiceInterface,
@@ -117,7 +117,7 @@ export type Effects = {
     packageId?: PackageId
     hostId: HostId
     internalPort: number
-  }): Promise<LanInfo>
+  }): Promise<NetInfo>
   /** Removes all network bindings, called in the setupInputSpec */
   clearBindings(options: {
     except: { id: HostId; internalPort: number }[]
@@ -129,12 +129,6 @@ export type Effects = {
     hostId: HostId
     callback?: () => void
   }): Promise<Host | null>
-  /** Returns the primary url that a user has selected for a host, if it exists */
-  getPrimaryUrl(options: {
-    packageId?: PackageId
-    hostId: HostId
-    callback?: () => void
-  }): Promise<UrlString | null>
   /** Returns the IP address of the container */
   getContainerIp(): Promise<string>
   // interface

sdk/base/lib/actions/input/builder/inputSpec.ts

@@ -94,8 +94,8 @@ export class InputSpec<Type extends Record<string, any>, Store = never> {
     },
     public validator: Parser<unknown, Type>,
   ) {}
-  _TYPE: Type = null as any as Type
-  _PARTIAL: DeepPartial<Type> = null as any as DeepPartial<Type>
+  public _TYPE: Type = null as any as Type
+  public _PARTIAL: DeepPartial<Type> = null as any as DeepPartial<Type>
   async build(options: LazyBuildOptions<Store>) {
     const answer = {} as {
       [K in keyof Type]: ValueSpec

sdk/base/lib/actions/input/builder/value.ts

@@ -49,6 +49,9 @@ export class Value<Type, Store> {
     public build: LazyBuild<Store, ValueSpec>,
     public validator: Parser<unknown, Type>,
   ) {}
+  public _TYPE: Type = null as any as Type
+  public _PARTIAL: DeepPartial<Type> = null as any as DeepPartial<Type>
+
   static toggle(a: {
     name: string
     description?: string | null

sdk/base/lib/dependencies/setupDependencies.ts

@@ -31,7 +31,7 @@ export type CurrentDependenciesResult<Manifest extends T.SDKManifest> = {
   [K in RequiredDependenciesOf<Manifest>]: DependencyRequirement
 } & {
   [K in OptionalDependenciesOf<Manifest>]?: DependencyRequirement
-} & Record<string, DependencyRequirement>
+}
 
 export function setupDependencies<Manifest extends T.SDKManifest>(
   fn: (options: {
@@ -48,14 +48,16 @@ export function setupDependencies<Manifest extends T.SDKManifest>(
     }
     const dependencyType = await fn(options)
     return await options.effects.setDependencies({
-      dependencies: Object.entries(dependencyType).map(
-        ([id, { versionRange, ...x }, ,]) =>
-          ({
-            // id,
-            ...x,
-            versionRange: versionRange.toString(),
-          }) as T.DependencyRequirement,
-      ),
+      dependencies: Object.entries(dependencyType)
+        .map(([k, v]) => [k, v as DependencyRequirement] as const)
+        .map(
+          ([id, { versionRange, ...x }]) =>
+            ({
+              id,
+              ...x,
+              versionRange: versionRange.toString(),
+            }) as T.DependencyRequirement,
+        ),
     })
   }
   return cell.updater

sdk/base/lib/interfaces/Origin.ts

@@ -46,7 +46,6 @@ export class Origin<T extends Host> {
       const {
         name,
         description,
-        hasPrimary,
         id,
         type,
         username,
@@ -67,7 +66,6 @@ export class Origin<T extends Host> {
         id,
         name,
         description,
-        hasPrimary,
         addressInfo,
         type,
         masked,

sdk/base/lib/interfaces/ServiceInterfaceBuilder.ts

@@ -20,7 +20,6 @@ export class ServiceInterfaceBuilder {
       name: string
       id: string
       description: string
-      hasPrimary: boolean
       type: ServiceInterfaceType
       username: string | null
       path: string

sdk/base/lib/osBindings/AcmeProvider.ts

@@ -1,5 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HostAddress =
-  | { kind: "onion"; address: string }
-  | { kind: "domain"; address: string }
+export type AcmeProvider = string

sdk/base/lib/osBindings/AcmeSettings.ts

@@ -1,13 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type AcmeSettings = {
-  provider: string
-  /**
-   * email addresses for letsencrypt
-   */
-  contact: Array<string>
-  /**
-   * domains to get letsencrypt certs for
-   */
-  domains: string[]
-}
+export type AcmeSettings = { contact: Array<string> }

sdk/base/lib/osBindings/BindInfo.ts

@@ -1,5 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { BindOptions } from "./BindOptions"
-import type { LanInfo } from "./LanInfo"
+import type { NetInfo } from "./NetInfo"
 
-export type BindInfo = { enabled: boolean; options: BindOptions; lan: LanInfo }
+export type BindInfo = { enabled: boolean; options: BindOptions; net: NetInfo }

sdk/base/lib/osBindings/DomainConfig.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AcmeProvider } from "./AcmeProvider"
+
+export type DomainConfig = { public: boolean; acme: AcmeProvider | null }

sdk/base/lib/osBindings/ExportServiceInterfaceParams.ts

@@ -7,7 +7,6 @@ export type ExportServiceInterfaceParams = {
   id: ServiceInterfaceId
   name: string
   description: string
-  hasPrimary: boolean
   masked: boolean
   addressInfo: AddressInfo
   type: ServiceInterfaceType

sdk/base/lib/osBindings/ForgetInterfaceParams.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ForgetInterfaceParams = { interface: string }

sdk/base/lib/osBindings/GetPrimaryUrlParams.ts

@@ -1,10 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { CallbackId } from "./CallbackId"
-import type { HostId } from "./HostId"
-import type { PackageId } from "./PackageId"
-
-export type GetPrimaryUrlParams = {
-  packageId?: PackageId
-  hostId: HostId
-  callback?: CallbackId
-}

sdk/base/lib/osBindings/GitHash.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type GitHash = string

sdk/base/lib/osBindings/Host.ts

@@ -1,13 +1,14 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { BindInfo } from "./BindInfo"
-import type { HostAddress } from "./HostAddress"
+import type { DomainConfig } from "./DomainConfig"
 import type { HostKind } from "./HostKind"
 import type { HostnameInfo } from "./HostnameInfo"
 
 export type Host = {
   kind: HostKind
   bindings: { [key: number]: BindInfo }
-  addresses: Array<HostAddress>
+  onions: string[]
+  domains: { [key: string]: DomainConfig }
   /**
    * COMPUTED: NetService::update
    */

sdk/base/lib/osBindings/IpHostname.ts

@@ -2,7 +2,13 @@
 
 export type IpHostname =
   | { kind: "ipv4"; value: string; port: number | null; sslPort: number | null }
-  | { kind: "ipv6"; value: string; port: number | null; sslPort: number | null }
+  | {
+      kind: "ipv6"
+      value: string
+      scopeId: number
+      port: number | null
+      sslPort: number | null
+    }
   | {
       kind: "local"
       value: string

sdk/base/lib/osBindings/IpInfo.ts

@@ -1,8 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { NetworkInterfaceType } from "./NetworkInterfaceType"
 
 export type IpInfo = {
-  ipv4Range: string | null
-  ipv4: string | null
-  ipv6Range: string | null
-  ipv6: string | null
+  scopeId: number
+  deviceType: NetworkInterfaceType | null
+  subnets: string[]
+  wanIp: string | null
+  ntpServers: string[]
 }

sdk/base/lib/osBindings/Manifest.ts

@@ -2,6 +2,7 @@
 import type { Alerts } from "./Alerts"
 import type { Dependencies } from "./Dependencies"
 import type { Description } from "./Description"
+import type { GitHash } from "./GitHash"
 import type { HardwareRequirements } from "./HardwareRequirements"
 import type { ImageConfig } from "./ImageConfig"
 import type { ImageId } from "./ImageId"
@@ -30,6 +31,6 @@ export type Manifest = {
   alerts: Alerts
   dependencies: Dependencies
   hardwareRequirements: HardwareRequirements
-  gitHash: string | null
+  gitHash?: GitHash
   osVersion: string
 }

sdk/base/lib/osBindings/NetInfo.ts

@@ -1,6 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type LanInfo = {
+export type NetInfo = {
+  public: boolean
   assignedPort: number | null
   assignedSslPort: number | null
 }

sdk/base/lib/osBindings/NetworkInterfaceInfo.ts

@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { IpInfo } from "./IpInfo"
+
+export type NetworkInterfaceInfo = {
+  public: boolean | null
+  ipInfo: IpInfo | null
+}

sdk/base/lib/osBindings/NetworkInterfaceType.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type NetworkInterfaceType = "ethernet" | "wireless" | "wireguard"

sdk/base/lib/osBindings/PackageVersionInfo.ts

@@ -3,6 +3,7 @@ import type { Alerts } from "./Alerts"
 import type { DataUrl } from "./DataUrl"
 import type { DependencyMetadata } from "./DependencyMetadata"
 import type { Description } from "./Description"
+import type { GitHash } from "./GitHash"
 import type { HardwareRequirements } from "./HardwareRequirements"
 import type { MerkleArchiveCommitment } from "./MerkleArchiveCommitment"
 import type { PackageId } from "./PackageId"
@@ -13,7 +14,7 @@ export type PackageVersionInfo = {
   icon: DataUrl
   description: Description
   releaseNotes: string
-  gitHash: string
+  gitHash: GitHash
   license: string
   wrapperRepo: string
   upstreamRepo: string

sdk/base/lib/osBindings/ServerInfo.ts

@@ -1,8 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AcmeProvider } from "./AcmeProvider"
 import type { AcmeSettings } from "./AcmeSettings"
 import type { Governor } from "./Governor"
-import type { IpInfo } from "./IpInfo"
 import type { LshwDevice } from "./LshwDevice"
+import type { NetworkInterfaceInfo } from "./NetworkInterfaceInfo"
 import type { ServerStatus } from "./ServerStatus"
 import type { SmtpValue } from "./SmtpValue"
 import type { WifiInfo } from "./WifiInfo"
@@ -22,8 +23,8 @@ export type ServerInfo = {
    * for backwards compatibility
    */
   torAddress: string
-  ipInfo: { [key: string]: IpInfo }
-  acme: AcmeSettings | null
+  networkInterfaces: { [key: string]: NetworkInterfaceInfo }
+  acme: { [key: AcmeProvider]: AcmeSettings }
   statusInfo: ServerStatus
   wifi: WifiInfo
   unreadNotificationCount: number

sdk/base/lib/osBindings/ServiceInterface.ts

@@ -7,7 +7,6 @@ export type ServiceInterface = {
   id: ServiceInterfaceId
   name: string
   description: string
-  hasPrimary: boolean
   masked: boolean
   addressInfo: AddressInfo
   type: ServiceInterfaceType

sdk/base/lib/osBindings/SetPublicParams.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type SetPublicParams = { interface: string; public: boolean | null }

sdk/base/lib/osBindings/UnsetPublicParams.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type UnsetPublicParams = { interface: string }

sdk/base/lib/osBindings/index.ts

@@ -1,4 +1,5 @@
 export { AcceptSigners } from "./AcceptSigners"
+export { AcmeProvider } from "./AcmeProvider"
 export { AcmeSettings } from "./AcmeSettings"
 export { ActionId } from "./ActionId"
 export { ActionInput } from "./ActionInput"
@@ -66,6 +67,7 @@ export { DepInfo } from "./DepInfo"
 export { Description } from "./Description"
 export { DestroySubcontainerFsParams } from "./DestroySubcontainerFsParams"
 export { DeviceFilter } from "./DeviceFilter"
+export { DomainConfig } from "./DomainConfig"
 export { Duration } from "./Duration"
 export { EchoParams } from "./EchoParams"
 export { EditSignerParams } from "./EditSignerParams"
@@ -73,6 +75,7 @@ export { EncryptedWire } from "./EncryptedWire"
 export { ExportActionParams } from "./ExportActionParams"
 export { ExportServiceInterfaceParams } from "./ExportServiceInterfaceParams"
 export { ExposeForDependentsParams } from "./ExposeForDependentsParams"
+export { ForgetInterfaceParams } from "./ForgetInterfaceParams"
 export { FullIndex } from "./FullIndex"
 export { FullProgress } from "./FullProgress"
 export { GetActionInputParams } from "./GetActionInputParams"
@@ -82,7 +85,6 @@ export { GetOsVersionParams } from "./GetOsVersionParams"
 export { GetPackageParams } from "./GetPackageParams"
 export { GetPackageResponseFull } from "./GetPackageResponseFull"
 export { GetPackageResponse } from "./GetPackageResponse"
-export { GetPrimaryUrlParams } from "./GetPrimaryUrlParams"
 export { GetServiceInterfaceParams } from "./GetServiceInterfaceParams"
 export { GetServicePortForwardParams } from "./GetServicePortForwardParams"
 export { GetSslCertificateParams } from "./GetSslCertificateParams"
@@ -90,11 +92,11 @@ export { GetSslKeyParams } from "./GetSslKeyParams"
 export { GetStatusParams } from "./GetStatusParams"
 export { GetStoreParams } from "./GetStoreParams"
 export { GetSystemSmtpParams } from "./GetSystemSmtpParams"
+export { GitHash } from "./GitHash"
 export { Governor } from "./Governor"
 export { Guid } from "./Guid"
 export { HardwareRequirements } from "./HardwareRequirements"
 export { HealthCheckId } from "./HealthCheckId"
-export { HostAddress } from "./HostAddress"
 export { HostId } from "./HostId"
 export { HostKind } from "./HostKind"
 export { HostnameInfo } from "./HostnameInfo"
@@ -112,7 +114,6 @@ export { InstallingState } from "./InstallingState"
 export { InstallParams } from "./InstallParams"
 export { IpHostname } from "./IpHostname"
 export { IpInfo } from "./IpInfo"
-export { LanInfo } from "./LanInfo"
 export { ListPackageSignersParams } from "./ListPackageSignersParams"
 export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams"
 export { ListVersionSignersParams } from "./ListVersionSignersParams"
@@ -128,6 +129,9 @@ export { MountParams } from "./MountParams"
 export { MountTarget } from "./MountTarget"
 export { NamedHealthCheckResult } from "./NamedHealthCheckResult"
 export { NamedProgress } from "./NamedProgress"
+export { NetInfo } from "./NetInfo"
+export { NetworkInterfaceInfo } from "./NetworkInterfaceInfo"
+export { NetworkInterfaceType } from "./NetworkInterfaceType"
 export { OnionHostname } from "./OnionHostname"
 export { OsIndex } from "./OsIndex"
 export { OsVersionInfoMap } from "./OsVersionInfoMap"
@@ -172,6 +176,7 @@ export { SetIconParams } from "./SetIconParams"
 export { SetMainStatusStatus } from "./SetMainStatusStatus"
 export { SetMainStatus } from "./SetMainStatus"
 export { SetNameParams } from "./SetNameParams"
+export { SetPublicParams } from "./SetPublicParams"
 export { SetStoreParams } from "./SetStoreParams"
 export { SetupExecuteParams } from "./SetupExecuteParams"
 export { SetupProgress } from "./SetupProgress"
@@ -181,6 +186,7 @@ export { SignAssetParams } from "./SignAssetParams"
 export { SignerInfo } from "./SignerInfo"
 export { SmtpValue } from "./SmtpValue"
 export { StartStop } from "./StartStop"
+export { UnsetPublicParams } from "./UnsetPublicParams"
 export { UpdatingState } from "./UpdatingState"
 export { VerifyCifsParams } from "./VerifyCifsParams"
 export { VersionSignerParams } from "./VersionSignerParams"

sdk/base/lib/test/startosTypeValidation.test.ts

@@ -26,7 +26,6 @@ import { SetDependenciesParams } from ".././osBindings"
 import { GetSystemSmtpParams } from ".././osBindings"
 import { GetServicePortForwardParams } from ".././osBindings"
 import { ExportServiceInterfaceParams } from ".././osBindings"
-import { GetPrimaryUrlParams } from ".././osBindings"
 import { ListServiceInterfacesParams } from ".././osBindings"
 import { ExportActionParams } from ".././osBindings"
 import { MountParams } from ".././osBindings"
@@ -83,7 +82,6 @@ describe("startosTypeValidation ", () => {
       getServicePortForward: {} as GetServicePortForwardParams,
       clearServiceInterfaces: {} as ClearServiceInterfacesParams,
       exportServiceInterface: {} as ExportServiceInterfaceParams,
-      getPrimaryUrl: {} as WithCallback<GetPrimaryUrlParams>,
       listServiceInterfaces: {} as WithCallback<ListServiceInterfacesParams>,
       mount: {} as MountParams,
       checkDependencies: {} as CheckDependenciesParam,

sdk/base/lib/types.ts

@@ -138,33 +138,6 @@ export declare const hostName: unique symbol
 // asdflkjadsf.onion | 1.2.3.4
 export type Hostname = string & { [hostName]: never }
 
-export type HostnameInfoIp = {
-  kind: "ip"
-  networkInterfaceId: string
-  public: boolean
-  hostname:
-    | {
-        kind: "ipv4" | "ipv6" | "local"
-        value: string
-        port: number | null
-        sslPort: number | null
-      }
-    | {
-        kind: "domain"
-        domain: string
-        subdomain: string | null
-        port: number | null
-        sslPort: number | null
-      }
-}
-
-export type HostnameInfoOnion = {
-  kind: "onion"
-  hostname: { value: string; port: number | null; sslPort: number | null }
-}
-
-export type HostnameInfo = HostnameInfoIp | HostnameInfoOnion
-
 export type ServiceInterfaceId = string
 
 export { ServiceInterface }

sdk/base/lib/util/getServiceInterface.ts

@@ -1,15 +1,6 @@
 import { ServiceInterfaceType } from "../types"
 import { knownProtocols } from "../interfaces/Host"
-import {
-  AddressInfo,
-  Host,
-  HostAddress,
-  Hostname,
-  HostnameInfo,
-  HostnameInfoIp,
-  HostnameInfoOnion,
-  IpInfo,
-} from "../types"
+import { AddressInfo, Host, Hostname, HostnameInfo } from "../types"
 import { Effects } from "../Effects"
 
 export type UrlString = string
@@ -48,8 +39,6 @@ export type ServiceInterfaceFilled = {
   name: string
   /** Human readable description, used as tooltip usually */
   description: string
-  /** Whether or not the interface has a primary URL */
-  hasPrimary: boolean
   /** Whether or not to mask the URIs for this interface. Useful if the URIs contain sensitive information, such as a password, macaroon, or API key */
   masked: boolean
   /** Information about the host for this binding */
@@ -58,10 +47,6 @@ export type ServiceInterfaceFilled = {
   addressInfo: FilledAddressInfo | null
   /** Indicates if we are a ui/p2p/api for the kind of interface that this is representing */
   type: ServiceInterfaceType
-  /** The primary hostname for the service, as chosen by the user */
-  primaryHostname: Hostname | null
-  /** The primary URL for the service, as chosen by the user */
-  primaryUrl: UrlString | null
 }
 const either =
   <A>(...args: ((a: A) => boolean)[]) =>
@@ -89,7 +74,9 @@ export const addressHostToUrl = (
       if (host.hostname.kind === "domain") {
         hostname = `${host.hostname.subdomain ? `${host.hostname.subdomain}.` : ""}${host.hostname.domain}`
       } else if (host.hostname.kind === "ipv6") {
-        hostname = `[${host.hostname.value}]`
+        hostname = host.hostname.value.startsWith("fe80::")
+          ? `[${host.hostname.value}%${host.hostname.scopeId}]`
+          : `[${host.hostname.value}]`
       } else {
         hostname = host.hostname.value
       }
@@ -200,23 +187,13 @@ const makeInterfaceFilled = async ({
     hostId,
     callback,
   })
-  const primaryUrl = await effects.getPrimaryUrl({
-    hostId,
-    packageId,
-    callback,
-  })
 
   const interfaceFilled: ServiceInterfaceFilled = {
     ...serviceInterfaceValue,
-    primaryUrl: primaryUrl,
     host,
     addressInfo: host
       ? filledAddress(host, serviceInterfaceValue.addressInfo)
       : null,
-    get primaryHostname() {
-      if (primaryUrl == null) return null
-      return getHostname(primaryUrl)
-    },
   }
   return interfaceFilled
 }

sdk/base/lib/util/getServiceInterfaces.ts

@@ -30,22 +30,10 @@ const makeManyInterfaceFilled = async ({
       if (!host) {
         throw new Error(`host ${hostId} not found!`)
       }
-      const primaryUrl = await effects
-        .getPrimaryUrl({
-          hostId,
-          packageId,
-          callback,
-        })
-        .catch(() => null)
       return {
         ...serviceInterfaceValue,
-        primaryUrl: primaryUrl,
         host,
         addressInfo: filledAddress(host, serviceInterfaceValue.addressInfo),
-        get primaryHostname() {
-          if (primaryUrl == null) return null
-          return getHostname(primaryUrl)
-        },
       }
     }),
   )

sdk/base/lib/util/patterns.ts

@@ -2,58 +2,58 @@ import { Pattern } from "../actions/input/inputSpecTypes"
 import * as regexes from "./regexes"
 
 export const ipv6: Pattern = {
-  regex: regexes.ipv6.toString(),
+  regex: regexes.ipv6.source,
   description: "Must be a valid IPv6 address",
 }
 
 export const ipv4: Pattern = {
-  regex: regexes.ipv4.toString(),
+  regex: regexes.ipv4.source,
   description: "Must be a valid IPv4 address",
 }
 
 export const hostname: Pattern = {
-  regex: regexes.hostname.toString(),
+  regex: regexes.hostname.source,
   description: "Must be a valid hostname",
 }
 
 export const localHostname: Pattern = {
-  regex: regexes.localHostname.toString(),
+  regex: regexes.localHostname.source,
   description: 'Must be a valid ".local" hostname',
 }
 
 export const torHostname: Pattern = {
-  regex: regexes.torHostname.toString(),
+  regex: regexes.torHostname.source,
   description: 'Must be a valid Tor (".onion") hostname',
 }
 
 export const url: Pattern = {
-  regex: regexes.url.toString(),
+  regex: regexes.url.source,
   description: "Must be a valid URL",
 }
 
 export const localUrl: Pattern = {
-  regex: regexes.localUrl.toString(),
+  regex: regexes.localUrl.source,
   description: 'Must be a valid ".local" URL',
 }
 
 export const torUrl: Pattern = {
-  regex: regexes.torUrl.toString(),
+  regex: regexes.torUrl.source,
   description: 'Must be a valid Tor (".onion") URL',
 }
 
 export const ascii: Pattern = {
-  regex: regexes.ascii.toString(),
+  regex: regexes.ascii.source,
   description:
     "May only contain ASCII characters. See https://www.w3schools.com/charsets/ref_html_ascii.asp",
 }
 
 export const email: Pattern = {
-  regex: regexes.email.toString(),
+  regex: regexes.email.source,
   description: "Must be a valid email address",
 }
 
 export const base64: Pattern = {
-  regex: regexes.base64.toString(),
+  regex: regexes.base64.source,
   description:
     "May only contain base64 characters. See https://base64.guru/learn/base64-characters",
 }

sdk/base/package-lock.json

@@ -14,7 +14,7 @@
         "isomorphic-fetch": "^3.0.0",
         "lodash.merge": "^4.6.2",
         "mime-types": "^2.1.35",
-        "ts-matches": "^6.1.0",
+        "ts-matches": "^6.2.1",
         "yaml": "^2.2.2"
       },
       "devDependencies": {
@@ -3897,9 +3897,9 @@
       "dev": true
     },
     "node_modules/ts-matches": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-6.1.0.tgz",
-      "integrity": "sha512-01qvbIpOiKdbzzXDH84JeHunvCwBGFdZw94jS6kOGLSN5ms+1nBZtfe8WSuYMIPb1xPA+qyAiVgznFi2VCQ6UQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-6.2.1.tgz",
+      "integrity": "sha512-qdnMgTHsGCEGGK6QiaNMY2vD9eQtRp2Q+pAxcOAzxHJKDKTBYsc1ISTg1zp8H2+EmtCB0eko/1TwYUA5/mUGug==",
       "license": "MIT"
     },
     "node_modules/ts-morph": {

sdk/base/package.json

@@ -27,7 +27,7 @@
     "isomorphic-fetch": "^3.0.0",
     "lodash.merge": "^4.6.2",
     "mime-types": "^2.1.35",
-    "ts-matches": "^6.1.0",
+    "ts-matches": "^6.2.1",
     "yaml": "^2.2.2"
   },
   "prettier": {