round out dns check, dns server check, port forward check, and gateway port forwards

web/projects/ui/src/app/services/api/api.types.ts

@@ -89,6 +89,10 @@ export type GetRegistryPackageReq = GetPackageReq & { registry: string }
 
 export type GetRegistryPackagesReq = GetPackagesReq & { registry: string }
 
+// dns
+// TODO: Replace with T.CheckDnsRes when SDK types are generated
+export type CheckDnsRes = boolean
+
 // backup
 
 export type DiskBackupTarget = Extract<T.BackupTarget, { type: 'disk' }>

web/projects/ui/src/app/services/api/embassy-api.service.ts

@@ -6,6 +6,7 @@ import { WebSocketSubject } from 'rxjs/webSocket'
 import { DataModel } from '../patch-db/data-model'
 import {
   ActionRes,
+  CheckDnsRes,
   CifsBackupTarget,
   DiagnosticErrorRes,
   FollowPackageLogsReq,
@@ -128,9 +129,9 @@ export abstract class ApiService {
 
   abstract queryDns(params: T.QueryDnsParams): Promise<string | null>
 
-  abstract checkPort(
-    params: T.CheckPortParams,
-  ): Promise<T.CheckPortRes>
+  abstract checkPort(params: T.CheckPortParams): Promise<T.CheckPortRes>
+
+  abstract checkDns(params: T.CheckDnsParams): Promise<CheckDnsRes>
 
   // smtp
 
@@ -191,9 +192,7 @@ export abstract class ApiService {
 
   abstract setDefaultOutbound(params: { gateway: string | null }): Promise<null>
 
-  abstract setServiceOutbound(
-    params: T.SetOutboundGatewayParams,
-  ): Promise<null>
+  abstract setServiceOutbound(params: T.SetOutboundGatewayParams): Promise<null>
 
   // ** domains **
 

web/projects/ui/src/app/services/api/embassy-live-api.service.ts

@@ -19,6 +19,7 @@ import { AuthService } from '../auth.service'
 import { DataModel } from '../patch-db/data-model'
 import {
   ActionRes,
+  CheckDnsRes,
   CifsBackupTarget,
   DiagnosticErrorRes,
   FollowPackageLogsReq,
@@ -283,6 +284,13 @@ export class LiveApiService extends ApiService {
     })
   }
 
+  async checkDns(params: T.CheckDnsParams): Promise<CheckDnsRes> {
+    return this.rpcRequest({
+      method: 'net.gateway.check-dns',
+      params,
+    })
+  }
+
   // marketplace URLs
 
   async checkOSUpdate(params: {

web/projects/ui/src/app/services/api/embassy-mock-api.service.ts

@@ -26,6 +26,7 @@ import {
 import { GetPackageRes, GetPackagesRes } from '@start9labs/marketplace'
 import {
   ActionRes,
+  CheckDnsRes,
   CifsBackupTarget,
   DiagnosticErrorRes,
   FollowPackageLogsReq,
@@ -497,14 +498,18 @@ export class MockApiService extends ApiService {
     return null
   }
 
-  async checkPort(
-    params: T.CheckPortParams,
-  ): Promise<T.CheckPortRes> {
+  async checkPort(params: T.CheckPortParams): Promise<T.CheckPortRes> {
     await pauseFor(2000)
 
     return { ip: '0.0.0.0', port: params.port, reachable: false }
   }
 
+  async checkDns(params: T.CheckDnsParams): Promise<CheckDnsRes> {
+    await pauseFor(2000)
+
+    return false
+  }
+
   // marketplace URLs
 
   async checkOSUpdate(params: {
@@ -662,9 +667,7 @@ export class MockApiService extends ApiService {
     return null
   }
 
-  async setServiceOutbound(
-    params: T.SetOutboundGatewayParams,
-  ): Promise<null> {
+  async setServiceOutbound(params: T.SetOutboundGatewayParams): Promise<null> {
     await pauseFor(2000)
     const patch = [
       {

web/projects/ui/src/app/services/api/mock-patch.ts

@@ -54,32 +54,42 @@ export const mockPatchData: DataModel = {
                   },
                 },
                 {
-                  ssl: true,
+                  ssl: false,
                   public: false,
                   host: '10.0.0.1',
-                  port: 443,
+                  port: 80,
                   metadata: { kind: 'ipv4', gateway: 'eth0' },
                 },
                 {
-                  ssl: true,
+                  ssl: false,
                   public: false,
                   host: '10.0.0.2',
-                  port: 443,
+                  port: 80,
                   metadata: { kind: 'ipv4', gateway: 'wlan0' },
                 },
                 {
-                  ssl: true,
+                  ssl: false,
                   public: false,
                   host: 'fe80::cd00:0000:0cde:1257:0000:211e:72cd',
-                  port: 443,
+                  port: 80,
                   metadata: { kind: 'ipv6', gateway: 'eth0', scopeId: 2 },
                 },
+                {
+                  ssl: false,
+                  public: false,
+                  host: 'fe80::cd00:0000:0cde:1257:0000:211e:1234',
+                  port: 80,
+                  metadata: { kind: 'ipv6', gateway: 'wlan0', scopeId: 3 },
+                },
                 {
                   ssl: true,
                   public: false,
-                  host: 'fe80::cd00:0000:0cde:1257:0000:211e:1234',
+                  host: 'my-server.home',
                   port: 443,
-                  metadata: { kind: 'ipv6', gateway: 'wlan0', scopeId: 3 },
+                  metadata: {
+                    kind: 'private-domain',
+                    gateways: ['eth0'],
+                  },
                 },
                 {
                   ssl: false,
@@ -109,8 +119,16 @@ export const mockPatchData: DataModel = {
           },
         },
         publicDomains: {},
-        privateDomains: {},
-        portForwards: [],
+        privateDomains: {
+          'my-server.home': ['eth0'],
+        },
+        portForwards: [
+          {
+            src: '203.0.113.45:443',
+            dst: '10.0.0.1:443',
+            gateway: 'eth0',
+          },
+        ],
       },
       gateways: {
         eth0: {
@@ -504,70 +522,70 @@ export const mockPatchData: DataModel = {
             80: {
               enabled: true,
               net: {
-                assignedPort: 80,
-                assignedSslPort: 443,
+                assignedPort: 42080,
+                assignedSslPort: 42443,
               },
               addresses: {
-                enabled: ['203.0.113.45:443'],
+                enabled: ['203.0.113.45:42443'],
                 disabled: [],
                 available: [
                   {
                     ssl: true,
                     public: false,
                     host: 'adjective-noun.local',
-                    port: 443,
+                    port: 42443,
                     metadata: {
                       kind: 'mdns',
                       gateways: ['eth0'],
                     },
                   },
                   {
-                    ssl: true,
+                    ssl: false,
                     public: false,
                     host: '10.0.0.1',
-                    port: 443,
+                    port: 42080,
                     metadata: { kind: 'ipv4', gateway: 'eth0' },
                   },
                   {
-                    ssl: true,
+                    ssl: false,
                     public: false,
                     host: 'fe80::cd00:0cde:1257:211e:72cd',
-                    port: 443,
+                    port: 42080,
                     metadata: { kind: 'ipv6', gateway: 'eth0', scopeId: 2 },
                   },
                   {
                     ssl: true,
                     public: true,
                     host: '203.0.113.45',
-                    port: 443,
+                    port: 42443,
                     metadata: { kind: 'ipv4', gateway: 'eth0' },
                   },
                   {
                     ssl: true,
                     public: true,
                     host: 'bitcoin.example.com',
-                    port: 443,
+                    port: 42443,
                     metadata: { kind: 'public-domain', gateway: 'eth0' },
                   },
                   {
-                    ssl: true,
+                    ssl: false,
                     public: false,
                     host: '192.168.10.11',
-                    port: 443,
+                    port: 42080,
                     metadata: { kind: 'ipv4', gateway: 'wlan0' },
                   },
                   {
-                    ssl: true,
+                    ssl: false,
                     public: false,
                     host: 'fe80::cd00:0cde:1257:211e:1234',
-                    port: 443,
+                    port: 42080,
                     metadata: { kind: 'ipv6', gateway: 'wlan0', scopeId: 3 },
                   },
                   {
                     ssl: true,
                     public: false,
                     host: 'my-bitcoin.home',
-                    port: 443,
+                    port: 42443,
                     metadata: {
                       kind: 'private-domain',
                       gateways: ['wlan0'],
@@ -577,22 +595,22 @@ export const mockPatchData: DataModel = {
                     ssl: false,
                     public: false,
                     host: 'xyz789abc123def456ghi789jkl012mno345pqr678stu901vwx234.onion',
-                    port: 80,
+                    port: 42080,
                     metadata: { kind: 'plugin', package: 'tor' },
                   },
                   {
                     ssl: true,
                     public: false,
                     host: 'xyz789abc123def456ghi789jkl012mno345pqr678stu901vwx234.onion',
-                    port: 443,
+                    port: 42443,
                     metadata: { kind: 'plugin', package: 'tor' },
                   },
                 ],
               },
               options: {
-                preferredExternalPort: 443,
+                preferredExternalPort: 42443,
                 addSsl: {
-                  preferredExternalPort: 443,
+                  preferredExternalPort: 42443,
                   alpn: { specified: ['http/1.1', 'h2'] },
                   addXForwardedHeaders: false,
                 },
@@ -609,14 +627,25 @@ export const mockPatchData: DataModel = {
           privateDomains: {
             'my-bitcoin.home': ['wlan0'],
           },
-          portForwards: [],
+          portForwards: [
+            {
+              src: '203.0.113.45:443',
+              dst: '10.0.0.1:443',
+              gateway: 'eth0',
+            },
+            {
+              src: '203.0.113.45:42443',
+              dst: '10.0.0.1:42443',
+              gateway: 'eth0',
+            },
+          ],
         },
         bcdefgh: {
           bindings: {
             8332: {
               enabled: true,
               net: {
-                assignedPort: 8332,
+                assignedPort: 48332,
                 assignedSslPort: null,
               },
               addresses: {
@@ -627,7 +656,7 @@ export const mockPatchData: DataModel = {
                     ssl: false,
                     public: false,
                     host: 'adjective-noun.local',
-                    port: 8332,
+                    port: 48332,
                     metadata: {
                       kind: 'mdns',
                       gateways: ['eth0'],
@@ -637,14 +666,14 @@ export const mockPatchData: DataModel = {
                     ssl: false,
                     public: false,
                     host: '10.0.0.1',
-                    port: 8332,
+                    port: 48332,
                     metadata: { kind: 'ipv4', gateway: 'eth0' },
                   },
                 ],
               },
               options: {
                 addSsl: null,
-                preferredExternalPort: 8332,
+                preferredExternalPort: 48332,
                 secure: { ssl: false },
               },
             },
@@ -658,7 +687,7 @@ export const mockPatchData: DataModel = {
             8333: {
               enabled: true,
               net: {
-                assignedPort: 8333,
+                assignedPort: 48333,
                 assignedSslPort: null,
               },
               addresses: {
@@ -668,7 +697,7 @@ export const mockPatchData: DataModel = {
               },
               options: {
                 addSsl: null,
-                preferredExternalPort: 8333,
+                preferredExternalPort: 48333,
                 secure: { ssl: false },
               },
             },