@serve.zone/dcrouter 11.21.5 → 11.22.0

package/dist_ts_web/elements/ops-view-vpn.js

@@ -175,10 +175,15 @@ let OpsViewVpn = (() => {
       }
     `,
         ];
+        /** Look up connected client info by clientId */
+        getConnectedInfo(clientId) {
+            return this.vpnState.connectedClients?.find(c => c.clientId === clientId);
+        }
         render() {
             const status = this.vpnState.status;
             const clients = this.vpnState.clients;
-            const connectedCount = status?.connectedClients ?? 0;
+            const connectedClients = this.vpnState.connectedClients || [];
+            const connectedCount = connectedClients.length;
             const totalClients = clients.length;
             const enabledClients = clients.filter(c => c.enabled).length;
             const statsTiles = [
@@ -299,18 +304,30 @@ let OpsViewVpn = (() => {
         .heading1=${'VPN Clients'}
         .heading2=${'Manage WireGuard and SmartVPN client registrations'}
         .data=${clients}
-        .displayFunction=${(client) => ({
-                'Client ID': client.clientId,
-                'Status': client.enabled
-                    ? html `<span class="statusBadge enabled">enabled</span>`
-                    : html `<span class="statusBadge disabled">disabled</span>`,
-                'VPN IP': client.assignedIp || '-',
-                'Tags': client.serverDefinedClientTags?.length
-                    ? html `${client.serverDefinedClientTags.map(t => html `<span class="tagBadge">${t}</span>`)}`
-                    : '-',
-                'Description': client.description || '-',
-                'Created': new Date(client.createdAt).toLocaleDateString(),
-            })}
+        .displayFunction=${(client) => {
+                const conn = this.getConnectedInfo(client.clientId);
+                let statusHtml;
+                if (!client.enabled) {
+                    statusHtml = html `<span class="statusBadge disabled">disabled</span>`;
+                }
+                else if (conn) {
+                    const since = new Date(conn.connectedSince).toLocaleString();
+                    statusHtml = html `<span class="statusBadge enabled" title="Since ${since}">connected</span>`;
+                }
+                else {
+                    statusHtml = html `<span class="statusBadge enabled" style="background: ${cssManager.bdTheme('#eff6ff', '#172554')}; color: ${cssManager.bdTheme('#1e40af', '#60a5fa')};">offline</span>`;
+                }
+                return {
+                    'Client ID': client.clientId,
+                    'Status': statusHtml,
+                    'VPN IP': client.assignedIp || '-',
+                    'Tags': client.serverDefinedClientTags?.length
+                        ? html `${client.serverDefinedClientTags.map(t => html `<span class="tagBadge">${t}</span>`)}`
+                        : '-',
+                    'Description': client.description || '-',
+                    'Created': new Date(client.createdAt).toLocaleDateString(),
+                };
+            }}
         .dataActions=${[
                 {
                     name: 'Create Client',
@@ -359,14 +376,89 @@ let OpsViewVpn = (() => {
                     },
                 },
                 {
-                    name: 'Toggle',
+                    name: 'Detail',
+                    iconName: 'lucide:info',
+                    type: ['doubleClick'],
+                    actionFunc: async (actionData) => {
+                        const client = actionData.item;
+                        const conn = this.getConnectedInfo(client.clientId);
+                        const { DeesModal } = await import('@design.estate/dees-catalog');
+                        // Fetch telemetry on-demand
+                        let telemetryHtml = html `<p style="color: #9ca3af;">Loading telemetry...</p>`;
+                        try {
+                            const request = new plugins.domtools.plugins.typedrequest.TypedRequest('/typedrequest', 'getVpnClientTelemetry');
+                            const response = await request.fire({
+                                identity: appstate.loginStatePart.getState().identity,
+                                clientId: client.clientId,
+                            });
+                            const t = response.telemetry;
+                            if (t) {
+                                const formatBytes = (b) => b > 1048576 ? `${(b / 1048576).toFixed(1)} MB` : b > 1024 ? `${(b / 1024).toFixed(1)} KB` : `${b} B`;
+                                telemetryHtml = html `
+                    <div class="serverInfo" style="margin-top: 12px;">
+                      <div class="infoItem"><span class="infoLabel">Bytes Sent</span><span class="infoValue">${formatBytes(t.bytesSent)}</span></div>
+                      <div class="infoItem"><span class="infoLabel">Bytes Received</span><span class="infoValue">${formatBytes(t.bytesReceived)}</span></div>
+                      <div class="infoItem"><span class="infoLabel">Keepalives</span><span class="infoValue">${t.keepalivesReceived}</span></div>
+                      <div class="infoItem"><span class="infoLabel">Last Keepalive</span><span class="infoValue">${t.lastKeepaliveAt ? new Date(t.lastKeepaliveAt).toLocaleString() : '-'}</span></div>
+                      <div class="infoItem"><span class="infoLabel">Packets Dropped</span><span class="infoValue">${t.packetsDropped}</span></div>
+                    </div>
+                  `;
+                            }
+                            else {
+                                telemetryHtml = html `<p style="color: #9ca3af;">No telemetry available (client not connected)</p>`;
+                            }
+                        }
+                        catch {
+                            telemetryHtml = html `<p style="color: #9ca3af;">Telemetry unavailable</p>`;
+                        }
+                        DeesModal.createAndShow({
+                            heading: `Client: ${client.clientId}`,
+                            content: html `
+                  <div class="serverInfo">
+                    <div class="infoItem"><span class="infoLabel">Client ID</span><span class="infoValue">${client.clientId}</span></div>
+                    <div class="infoItem"><span class="infoLabel">VPN IP</span><span class="infoValue">${client.assignedIp || '-'}</span></div>
+                    <div class="infoItem"><span class="infoLabel">Status</span><span class="infoValue">${!client.enabled ? 'Disabled' : conn ? 'Connected' : 'Offline'}</span></div>
+                    ${conn ? html `
+                      <div class="infoItem"><span class="infoLabel">Connected Since</span><span class="infoValue">${new Date(conn.connectedSince).toLocaleString()}</span></div>
+                      <div class="infoItem"><span class="infoLabel">Transport</span><span class="infoValue">${conn.transport}</span></div>
+                    ` : ''}
+                    <div class="infoItem"><span class="infoLabel">Description</span><span class="infoValue">${client.description || '-'}</span></div>
+                    <div class="infoItem"><span class="infoLabel">Tags</span><span class="infoValue">${client.serverDefinedClientTags?.join(', ') || '-'}</span></div>
+                    <div class="infoItem"><span class="infoLabel">Created</span><span class="infoValue">${new Date(client.createdAt).toLocaleString()}</span></div>
+                    <div class="infoItem"><span class="infoLabel">Updated</span><span class="infoValue">${new Date(client.updatedAt).toLocaleString()}</span></div>
+                  </div>
+                  <h3 style="margin: 16px 0 4px; font-size: 14px;">Telemetry</h3>
+                  ${telemetryHtml}
+                `,
+                            menuOptions: [
+                                { name: 'Close', iconName: 'lucide:x', action: async (m) => await m.destroy() },
+                            ],
+                        });
+                    },
+                },
+                {
+                    name: 'Enable',
+                    iconName: 'lucide:power',
+                    type: ['contextmenu', 'inRow'],
+                    actionRelevancyCheckFunc: (actionData) => !actionData.item.enabled,
+                    actionFunc: async (actionData) => {
+                        const client = actionData.item;
+                        await appstate.vpnStatePart.dispatchAction(appstate.toggleVpnClientAction, {
+                            clientId: client.clientId,
+                            enabled: true,
+                        });
+                    },
+                },
+                {
+                    name: 'Disable',
                     iconName: 'lucide:power',
                     type: ['contextmenu', 'inRow'],
+                    actionRelevancyCheckFunc: (actionData) => actionData.item.enabled,
                     actionFunc: async (actionData) => {
                         const client = actionData.item;
                         await appstate.vpnStatePart.dispatchAction(appstate.toggleVpnClientAction, {
                             clientId: client.clientId,
-                            enabled: !client.enabled,
+                            enabled: false,
                         });
                     },
                 },
@@ -474,6 +566,48 @@ let OpsViewVpn = (() => {
                         });
                     },
                 },
+                {
+                    name: 'Edit',
+                    iconName: 'lucide:pencil',
+                    type: ['contextmenu', 'inRow'],
+                    actionFunc: async (actionData) => {
+                        const client = actionData.item;
+                        const { DeesModal } = await import('@design.estate/dees-catalog');
+                        const currentDescription = client.description ?? '';
+                        const currentTags = client.serverDefinedClientTags?.join(', ') ?? '';
+                        DeesModal.createAndShow({
+                            heading: `Edit: ${client.clientId}`,
+                            content: html `
+                  <dees-form>
+                    <dees-input-text .key=${'description'} .label=${'Description'} .value=${currentDescription}></dees-input-text>
+                    <dees-input-text .key=${'tags'} .label=${'Server-Defined Tags (comma-separated)'} .value=${currentTags}></dees-input-text>
+                  </dees-form>
+                `,
+                            menuOptions: [
+                                { name: 'Cancel', iconName: 'lucide:x', action: async (modalArg) => await modalArg.destroy() },
+                                {
+                                    name: 'Save',
+                                    iconName: 'lucide:check',
+                                    action: async (modalArg) => {
+                                        const form = modalArg.shadowRoot?.querySelector('.content')?.querySelector('dees-form');
+                                        if (!form)
+                                            return;
+                                        const data = await form.collectFormData();
+                                        const serverDefinedClientTags = data.tags
+                                            ? data.tags.split(',').map((t) => t.trim()).filter(Boolean)
+                                            : [];
+                                        await appstate.vpnStatePart.dispatchAction(appstate.updateVpnClientAction, {
+                                            clientId: client.clientId,
+                                            description: data.description || undefined,
+                                            serverDefinedClientTags,
+                                        });
+                                        await modalArg.destroy();
+                                    },
+                                },
+                            ],
+                        });
+                    },
+                },
                 {
                     name: 'Rotate Keys',
                     iconName: 'lucide:rotate-cw',
@@ -549,4 +683,4 @@ let OpsViewVpn = (() => {
     return OpsViewVpn = _classThis;
 })();
 export { OpsViewVpn };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-vpn.js","sourceRoot":"","sources":["../../ts_web/elements/ops-view-vpn.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-vpn.js","sourceRoot":"","sources":["../../ts_web/elements/ops-view-vpn.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@serve.zone/dcrouter",
   "private": false,
-  "version": "11.21.5",
+  "version": "11.22.0",
   "description": "A multifaceted routing service handling mail and SMS delivery functions.",
   "type": "module",
   "exports": {
@@ -59,7 +59,7 @@
     "@push.rocks/smartrx": "^3.0.10",
     "@push.rocks/smartstate": "^2.3.0",
     "@push.rocks/smartunique": "^3.0.9",
-    "@push.rocks/smartvpn": "1.16.4",
+    "@push.rocks/smartvpn": "1.16.5",
     "@push.rocks/taskbuffer": "^8.0.2",
     "@serve.zone/catalog": "^2.9.0",
     "@serve.zone/interfaces": "^5.3.0",

package/readme.md

@@ -1030,8 +1030,8 @@ DcRouter integrates [`@push.rocks/smartvpn`](https://code.foss.global/push.rocks
 
 1. **SmartVPN daemon** runs inside dcrouter with a Rust data plane (WireGuard via `boringtun`, custom protocol via Noise IK)
 2. Clients connect and get assigned an IP from the VPN subnet (e.g. `10.8.0.0/24`)
-3. **Split tunnel** by default — generated WireGuard configs only route VPN subnet traffic through the tunnel (`AllowedIPs = 10.8.0.0/24`), so regular internet traffic stays direct
-4. Routes with `vpn: { required: true }` get `security.ipAllowList` automatically injected
+3. **Smart split tunnel** — generated WireGuard configs auto-include the VPN subnet plus DNS-resolved IPs of VPN-gated domains. Domains from routes with `vpn.required` are resolved at config generation time, so clients route only the necessary traffic through the tunnel
+4. Routes with `vpn: { required: true }` get `security.ipAllowList` dynamically injected (re-computed on every client change)
 5. When `allowedServerDefinedClientTags` is set, only matching client IPs are injected (not the whole subnet)
 6. SmartProxy enforces the allowlist — only authorized VPN clients can access protected routes
 7. All VPN traffic is forced through SmartProxy via userspace NAT with PROXY protocol v2 — no root required
@@ -1136,13 +1136,14 @@ Routes with `allowedServerDefinedClientTags` only permit VPN clients whose admin
 The OpsServer dashboard and API provide full VPN client lifecycle management:
 
 - **Create client** — generates WireGuard keypairs, assigns IP, returns a ready-to-use `.conf` file
+- **QR code** — scan with the WireGuard mobile app (iOS/Android) for instant setup
 - **Enable / Disable** — toggle client access without deleting
 - **Rotate keys** — generate fresh keypairs (invalidates old ones)
-- **Export config** — download in WireGuard (`.conf`) or SmartVPN (`.json`) format
+- **Export config** — download in WireGuard (`.conf`), SmartVPN (`.json`), or scan as QR code
 - **Telemetry** — per-client bytes sent/received, keepalives, rate limiting
 - **Delete** — remove a client and revoke access
 
-Standard WireGuard clients on any platform (iOS, Android, macOS, Windows, Linux) can connect using the generated `.conf` file — no custom VPN software needed.
+Standard WireGuard clients on any platform (iOS, Android, macOS, Windows, Linux) can connect using the generated `.conf` file or by scanning the QR code — no custom VPN software needed.
 
 ## Certificate Management
 

package/readme.storage.md

@@ -0,0 +1,120 @@
+# DCRouter Storage Overview
+
+DCRouter uses two complementary storage systems: **StorageManager** for configuration and state, and **CacheDb** for time-limited cached data.
+
+## StorageManager (Key-Value Store)
+
+A lightweight, pluggable key-value store for configuration, credentials, and runtime state. Data is persisted as flat JSON files on disk by default.
+
+### Default Path
+
+```
+~/.serve.zone/dcrouter/storage/
+```
+
+Configurable via `options.storage.fsPath` or `options.baseDir`.
+
+### Backends
+
+```typescript
+// Filesystem (default)
+storage: { fsPath: '/var/lib/dcrouter/data' }
+
+// Custom (Redis, S3, etc.)
+storage: {
+  readFunction: async (key) => await redis.get(key),
+  writeFunction: async (key, value) => await redis.set(key, value),
+}
+
+// In-memory (omit storage config — data lost on restart)
+```
+
+### What's Stored
+
+| Prefix | Contents | Managed By |
+|--------|----------|------------|
+| `/vpn/server-keys` | VPN server Noise + WireGuard keypairs | `VpnManager` |
+| `/vpn/clients/{clientId}` | VPN client registrations (keys, tags, description, assigned IP) | `VpnManager` |
+| `/config-api/routes/{uuid}.json` | Programmatic routes (created via OpsServer API) | `RouteConfigManager` |
+| `/config-api/tokens/{uuid}.json` | API tokens (hashed secrets, scopes, expiry) | `ApiTokenManager` |
+| `/config-api/overrides/{routeName}.json` | Hardcoded route overrides (enable/disable) | `RouteConfigManager` |
+| `/email/bounces/suppression-list.json` | Email bounce suppression list | `smartmta` |
+| `/certs/*` | TLS certificates and ACME state | `SmartAcme` (via `StorageBackedCertManager`) |
+
+### API
+
+```typescript
+// Read/write JSON
+await storageManager.getJSON<T>(key);
+await storageManager.setJSON(key, value);
+
+// Raw string read/write
+await storageManager.get(key);
+await storageManager.set(key, value);
+
+// List keys by prefix
+await storageManager.list('/vpn/clients/');
+
+// Delete
+await storageManager.delete(key);
+```
+
+## CacheDb (Embedded MongoDB)
+
+An embedded MongoDB-compatible database (via `@push.rocks/smartdb` + `@push.rocks/smartdata`) for cached data with automatic TTL-based cleanup.
+
+### Default Path
+
+```
+~/.serve.zone/dcrouter/tsmdb/
+```
+
+Configurable via `options.cacheConfig.storagePath`.
+
+### What's Cached
+
+| Document Type | Default TTL | Purpose |
+|--------------|-------------|---------|
+| `CachedEmail` | 30 days | Email metadata cache for dashboard display |
+| `CachedIPReputation` | 1 day | IP reputation lookup results (DNSBL checks) |
+
+### Configuration
+
+```typescript
+cacheConfig: {
+  enabled: true,                                    // default: true
+  storagePath: '~/.serve.zone/dcrouter/tsmdb',     // default
+  dbName: 'dcrouter',                               // default
+  cleanupIntervalHours: 1,                          // how often to purge expired records
+  ttlConfig: {
+    emails: 30,          // days
+    ipReputation: 1,     // days
+    bounces: 30,         // days (reserved)
+    dkimKeys: 90,        // days (reserved)
+    suppression: 30,     // days (reserved)
+  },
+}
+```
+
+### How It Works
+
+1. `CacheDb` starts a `LocalSmartDb` instance (embedded MongoDB process)
+2. `smartdata` connects to it via Unix socket
+3. Document classes (`CachedEmail`, `CachedIPReputation`) are decorated with `@Collection` and use `smartdata` ORM
+4. `CacheCleaner` runs on a timer, purging records older than their configured TTL
+
+### Disabling
+
+For development or lightweight deployments, disable the cache to avoid starting a MongoDB process:
+
+```typescript
+cacheConfig: { enabled: false }
+```
+
+## When to Use Which
+
+| Use Case | System | Why |
+|----------|--------|-----|
+| VPN keys, API tokens, routes, certs | **StorageManager** | Small JSON blobs, key-value access, no queries needed |
+| Email metadata, IP reputation | **CacheDb** | Time-series data, TTL expiry, potential for queries/aggregation |
+| Runtime state (connected clients, metrics) | **Neither** | In-memory only, rebuilt on startup |

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@serve.zone/dcrouter',
-  version: '11.21.5',
+  version: '11.22.0',
   description: 'A multifaceted routing service handling mail and SMS delivery functions.'
 }

package/ts/opsserver/handlers/vpn.handler.ts

@@ -72,6 +72,31 @@ export class VpnHandler {
       ),
     );
 
+    // Get currently connected VPN clients
+    viewRouter.addTypedHandler(
+      new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_GetVpnConnectedClients>(
+        'getVpnConnectedClients',
+        async (dataArg, toolsArg) => {
+          const manager = this.opsServerRef.dcRouterRef.vpnManager;
+          if (!manager) {
+            return { connectedClients: [] };
+          }
+
+          const connected = await manager.getConnectedClients();
+          return {
+            connectedClients: connected.map((c) => ({
+              clientId: c.registeredClientId || c.clientId,
+              assignedIp: c.assignedIp,
+              connectedSince: c.connectedSince,
+              bytesSent: c.bytesSent,
+              bytesReceived: c.bytesReceived,
+              transport: c.transportType,
+            })),
+          };
+        },
+      ),
+    );
+
     // ---- Write endpoints (adminRouter — admin identity required via middleware) ----
 
     // Create a new VPN client
@@ -112,6 +137,29 @@ export class VpnHandler {
       ),
     );
 
+    // Update a VPN client's metadata
+    adminRouter.addTypedHandler(
+      new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_UpdateVpnClient>(
+        'updateVpnClient',
+        async (dataArg, toolsArg) => {
+          const manager = this.opsServerRef.dcRouterRef.vpnManager;
+          if (!manager) {
+            return { success: false, message: 'VPN not configured' };
+          }
+
+          try {
+            await manager.updateClient(dataArg.clientId, {
+              description: dataArg.description,
+              serverDefinedClientTags: dataArg.serverDefinedClientTags,
+            });
+            return { success: true };
+          } catch (err: unknown) {
+            return { success: false, message: (err as Error).message };
+          }
+        },
+      ),
+    );
+
     // Delete a VPN client
     adminRouter.addTypedHandler(
       new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_DeleteVpnClient>(

package/ts/vpn/classes.vpn-manager.ts

@@ -275,6 +275,22 @@ export class VpnManager {
     this.config.onClientChanged?.();
   }
 
+  /**
+   * Update a client's metadata (description, tags) without rotating keys.
+   */
+  public async updateClient(clientId: string, update: {
+    description?: string;
+    serverDefinedClientTags?: string[];
+  }): Promise<void> {
+    const client = this.clients.get(clientId);
+    if (!client) throw new Error(`Client not found: ${clientId}`);
+    if (update.description !== undefined) client.description = update.description;
+    if (update.serverDefinedClientTags !== undefined) client.serverDefinedClientTags = update.serverDefinedClientTags;
+    client.updatedAt = Date.now();
+    await this.persistClient(client);
+    this.config.onClientChanged?.();
+  }
+
   /**
    * Rotate a client's keys. Returns the new config bundle.
    */

package/ts_web/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@serve.zone/dcrouter',
-  version: '11.21.5',
+  version: '11.22.0',
   description: 'A multifaceted routing service handling mail and SMS delivery functions.'
 }

package/ts_web/appstate.ts

@@ -911,6 +911,7 @@ export const toggleRemoteIngressAction = remoteIngressStatePart.createAction<{
 
 export interface IVpnState {
   clients: interfaces.data.IVpnClient[];
+  connectedClients: interfaces.data.IVpnConnectedClient[];
   status: interfaces.data.IVpnServerStatus | null;
   isLoading: boolean;
   error: string | null;
@@ -923,6 +924,7 @@ export const vpnStatePart = await appState.getStatePart<IVpnState>(
   'vpn',
   {
     clients: [],
+    connectedClients: [],
     status: null,
     isLoading: false,
     error: null,
@@ -950,14 +952,20 @@ export const fetchVpnAction = vpnStatePart.createAction(async (statePartArg): Pr
       interfaces.requests.IReq_GetVpnStatus
     >('/typedrequest', 'getVpnStatus');
 
-    const [clientsResponse, statusResponse] = await Promise.all([
+    const connectedRequest = new plugins.domtools.plugins.typedrequest.TypedRequest<
+      interfaces.requests.IReq_GetVpnConnectedClients
+    >('/typedrequest', 'getVpnConnectedClients');
+
+    const [clientsResponse, statusResponse, connectedResponse] = await Promise.all([
       clientsRequest.fire({ identity: context.identity }),
       statusRequest.fire({ identity: context.identity }),
+      connectedRequest.fire({ identity: context.identity }),
     ]);
 
     return {
       ...currentState,
       clients: clientsResponse.clients,
+      connectedClients: connectedResponse.connectedClients,
       status: statusResponse.status,
       isLoading: false,
       error: null,
@@ -1054,6 +1062,39 @@ export const toggleVpnClientAction = vpnStatePart.createAction<{
   }
 });
 
+export const updateVpnClientAction = vpnStatePart.createAction<{
+  clientId: string;
+  description?: string;
+  serverDefinedClientTags?: string[];
+}>(async (statePartArg, dataArg, actionContext): Promise<IVpnState> => {
+  const context = getActionContext();
+  const currentState = statePartArg.getState()!;
+
+  try {
+    const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
+      interfaces.requests.IReq_UpdateVpnClient
+    >('/typedrequest', 'updateVpnClient');
+
+    const response = await request.fire({
+      identity: context.identity!,
+      clientId: dataArg.clientId,
+      description: dataArg.description,
+      serverDefinedClientTags: dataArg.serverDefinedClientTags,
+    });
+
+    if (!response.success) {
+      return { ...currentState, error: response.message || 'Failed to update client' };
+    }
+
+    return await actionContext!.dispatch(fetchVpnAction, null);
+  } catch (error: unknown) {
+    return {
+      ...currentState,
+      error: error instanceof Error ? error.message : 'Failed to update VPN client',
+    };
+  }
+});
+
 export const clearNewClientConfigAction = vpnStatePart.createAction(
   async (statePartArg): Promise<IVpnState> => {
     return { ...statePartArg.getState()!, newClientConfig: null };