@serve.zone/dcrouter 11.17.0 → 11.19.0

package/dist_serve/bundle.js

@@ -41407,7 +41407,7 @@ Customer Support Team`}};async onActivate(b){this.appui=b.appui,this.appui.setCo
                     <dees-input-text .key=${"description"} .label=${"Description"}></dees-input-text>
                     <dees-input-text .key=${"tags"} .label=${"Server-Defined Tags (comma-separated)"}></dees-input-text>
                   </dees-form>
-                `,menuOptions:[{name:"Cancel",iconName:"lucide:x",action:i(async p=>await p.destroy(),"action")},{name:"Create",iconName:"lucide:plus",action:i(async p=>{let f=p.shadowRoot?.querySelector(".content")?.querySelector("dees-form");if(!f)return;let u=await f.collectFormData();if(!u.clientId)return;let g=u.tags?u.tags.split(",").map(v=>v.trim()).filter(Boolean):void 0;await Lr.dispatchAction(b1a,{clientId:u.clientId,description:u.description||void 0,serverDefinedClientTags:g}),await p.destroy()},"action")}]})},"actionFunc")},{name:"Toggle",iconName:"lucide:power",type:["contextmenu","inRow"],actionFunc:i(async h=>{await Lr.dispatchAction(x1a,{clientId:h.clientId,enabled:!h.enabled})},"actionFunc")},{name:"Export Config",iconName:"lucide:download",type:["contextmenu","inRow"],actionFunc:i(async h=>{let{DeesToast:p}=await Promise.resolve().then(()=>(ja(),Va));try{let u=await new bt.plugins.typedrequest.TypedRequest("/typedrequest","exportVpnClientConfig").fire({identity:Aa.getState().identity,clientId:h.clientId,format:"wireguard"});if(u.success&&u.config){let g=new Blob([u.config],{type:"text/plain"}),v=URL.createObjectURL(g),x=document.createElement("a");x.href=v,x.download=`${h.clientId}.conf`,x.click(),URL.revokeObjectURL(v),p.createAndShow({message:"Config downloaded",type:"success",duration:3e3})}else p.createAndShow({message:u.message||"Export failed",type:"error",duration:5e3})}catch(f){p.createAndShow({message:f.message||"Export failed",type:"error",duration:5e3})}},"actionFunc")},{name:"Rotate Keys",iconName:"lucide:rotate-cw",type:["contextmenu"],actionFunc:i(async h=>{let{DeesModal:p,DeesToast:f}=await Promise.resolve().then(()=>(ja(),Va));p.createAndShow({heading:"Rotate Client Keys",content:w`<p>Generate new keys for "${h.clientId}"? The old keys will be invalidated and the client will need the new config to reconnect.</p>`,menuOptions:[{name:"Cancel",iconName:"lucide:x",action:i(async u=>await u.destroy(),"action")},{name:"Rotate",iconName:"lucide:rotate-cw",action:i(async u=>{try{let v=await new bt.plugins.typedrequest.TypedRequest("/typedrequest","rotateVpnClientKey").fire({identity:Aa.getState().identity,clientId:h.clientId});v.success&&v.wireguardConfig&&Lr.setState({...Lr.getState(),newClientConfig:v.wireguardConfig}),await u.destroy()}catch(g){f.createAndShow({message:g.message||"Rotate failed",type:"error",duration:5e3})}},"action")}]})},"actionFunc")},{name:"Delete",iconName:"lucide:trash2",type:["contextmenu"],actionFunc:i(async h=>{let{DeesModal:p}=await Promise.resolve().then(()=>(ja(),Va));p.createAndShow({heading:"Delete VPN Client",content:w`<p>Are you sure you want to delete client "${h.clientId}"?</p>`,menuOptions:[{name:"Cancel",iconName:"lucide:x",action:i(async f=>await f.destroy(),"action")},{name:"Delete",iconName:"lucide:trash2",action:i(async f=>{await Lr.dispatchAction(v1a,h.clientId),await f.destroy()},"action")}]})},"actionFunc")}]}
+                `,menuOptions:[{name:"Cancel",iconName:"lucide:x",action:i(async p=>await p.destroy(),"action")},{name:"Create",iconName:"lucide:plus",action:i(async p=>{let f=p.shadowRoot?.querySelector(".content")?.querySelector("dees-form");if(!f)return;let u=await f.collectFormData();if(!u.clientId)return;let g=u.tags?u.tags.split(",").map(v=>v.trim()).filter(Boolean):void 0;await Lr.dispatchAction(b1a,{clientId:u.clientId,description:u.description||void 0,serverDefinedClientTags:g}),await p.destroy()},"action")}]})},"actionFunc")},{name:"Toggle",iconName:"lucide:power",type:["contextmenu","inRow"],actionFunc:i(async h=>{let p=h.item;await Lr.dispatchAction(x1a,{clientId:p.clientId,enabled:!p.enabled})},"actionFunc")},{name:"Export Config",iconName:"lucide:download",type:["contextmenu","inRow"],actionFunc:i(async h=>{let p=h.item,{DeesModal:f,DeesToast:u}=await Promise.resolve().then(()=>(ja(),Va)),g=i(async v=>{try{let b=await new bt.plugins.typedrequest.TypedRequest("/typedrequest","exportVpnClientConfig").fire({identity:Aa.getState().identity,clientId:p.clientId,format:v});if(b.success&&b.config){let m=v==="wireguard"?"conf":"json",y=new Blob([b.config],{type:"text/plain"}),M=URL.createObjectURL(y),k=document.createElement("a");k.href=M,k.download=`${p.clientId}.${m}`,k.click(),URL.revokeObjectURL(M),u.createAndShow({message:`${v} config downloaded`,type:"success",duration:3e3})}else u.createAndShow({message:b.message||"Export failed",type:"error",duration:5e3})}catch(x){u.createAndShow({message:x.message||"Export failed",type:"error",duration:5e3})}},"exportConfig");f.createAndShow({heading:`Export Config: ${p.clientId}`,content:w`<p>Choose a config format to download.</p>`,menuOptions:[{name:"WireGuard (.conf)",iconName:"lucide:shield",action:i(async v=>{await v.destroy(),await g("wireguard")},"action")},{name:"SmartVPN (.json)",iconName:"lucide:braces",action:i(async v=>{await v.destroy(),await g("smartvpn")},"action")},{name:"Cancel",iconName:"lucide:x",action:i(async v=>await v.destroy(),"action")}]})},"actionFunc")},{name:"Rotate Keys",iconName:"lucide:rotate-cw",type:["contextmenu"],actionFunc:i(async h=>{let p=h.item,{DeesModal:f,DeesToast:u}=await Promise.resolve().then(()=>(ja(),Va));f.createAndShow({heading:"Rotate Client Keys",content:w`<p>Generate new keys for "${p.clientId}"? The old keys will be invalidated and the client will need the new config to reconnect.</p>`,menuOptions:[{name:"Cancel",iconName:"lucide:x",action:i(async g=>await g.destroy(),"action")},{name:"Rotate",iconName:"lucide:rotate-cw",action:i(async g=>{try{let x=await new bt.plugins.typedrequest.TypedRequest("/typedrequest","rotateVpnClientKey").fire({identity:Aa.getState().identity,clientId:p.clientId});x.success&&x.wireguardConfig&&Lr.setState({...Lr.getState(),newClientConfig:x.wireguardConfig}),await g.destroy()}catch(v){u.createAndShow({message:v.message||"Rotate failed",type:"error",duration:5e3})}},"action")}]})},"actionFunc")},{name:"Delete",iconName:"lucide:trash2",type:["contextmenu"],actionFunc:i(async h=>{let p=h.item,{DeesModal:f}=await Promise.resolve().then(()=>(ja(),Va));f.createAndShow({heading:"Delete VPN Client",content:w`<p>Are you sure you want to delete client "${p.clientId}"?</p>`,menuOptions:[{name:"Cancel",iconName:"lucide:x",action:i(async u=>await u.destroy(),"action")},{name:"Delete",iconName:"lucide:trash2",action:i(async u=>{await Lr.dispatchAction(v1a,p.clientId),await u.destroy()},"action")}]})},"actionFunc")}]}
       ></dees-table>
       </div>
     `}};Du=$a(mra),Oqe=new WeakMap,xt(Du,4,"vpnState",hra,_l,Oqe),_l=xt(Du,0,"OpsViewVpn",gra,_l),i(_l,"OpsViewVpn"),ta(_l,"styles",[d.defaultStyles,n1,Z`
@@ -43361,4 +43361,4 @@ ibantools/jsnext/ibantools.js:
    * @preferred
    *)
 */
-//# sourceMappingURL=bundle-1774889439064.js.map
+//# sourceMappingURL=bundle-1774891496876.js.map

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@serve.zone/dcrouter',
-    version: '11.17.0',
+    version: '11.19.0',
     description: 'A multifaceted routing service handling mail and SMS delivery functions.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLFNBQVM7SUFDbEIsV0FBVyxFQUFFLDBFQUEwRTtDQUN4RixDQUFBIn0=

package/dist_ts_web/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@serve.zone/dcrouter',
-    version: '11.17.0',
+    version: '11.19.0',
     description: 'A multifaceted routing service handling mail and SMS delivery functions.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsc0JBQXNCO0lBQzVCLE9BQU8sRUFBRSxTQUFTO0lBQ2xCLFdBQVcsRUFBRSwwRUFBMEU7Q0FDeEYsQ0FBQSJ9

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

@@ -342,7 +342,8 @@ let OpsViewVpn = (() => {
                     name: 'Toggle',
                     iconName: 'lucide:power',
                     type: ['contextmenu', 'inRow'],
-                    actionFunc: async (client) => {
+                    actionFunc: async (actionData) => {
+                        const client = actionData.item;
                         await appstate.vpnStatePart.dispatchAction(appstate.toggleVpnClientAction, {
                             clientId: client.clientId,
                             enabled: !client.enabled,
@@ -353,39 +354,71 @@ let OpsViewVpn = (() => {
                     name: 'Export Config',
                     iconName: 'lucide:download',
                     type: ['contextmenu', 'inRow'],
-                    actionFunc: async (client) => {
-                        const { DeesToast } = await import('@design.estate/dees-catalog');
-                        try {
-                            const request = new plugins.domtools.plugins.typedrequest.TypedRequest('/typedrequest', 'exportVpnClientConfig');
-                            const response = await request.fire({
-                                identity: appstate.loginStatePart.getState().identity,
-                                clientId: client.clientId,
-                                format: 'wireguard',
-                            });
-                            if (response.success && response.config) {
-                                const blob = new Blob([response.config], { type: 'text/plain' });
-                                const url = URL.createObjectURL(blob);
-                                const a = document.createElement('a');
-                                a.href = url;
-                                a.download = `${client.clientId}.conf`;
-                                a.click();
-                                URL.revokeObjectURL(url);
-                                DeesToast.createAndShow({ message: 'Config downloaded', type: 'success', duration: 3000 });
+                    actionFunc: async (actionData) => {
+                        const client = actionData.item;
+                        const { DeesModal, DeesToast } = await import('@design.estate/dees-catalog');
+                        const exportConfig = async (format) => {
+                            try {
+                                const request = new plugins.domtools.plugins.typedrequest.TypedRequest('/typedrequest', 'exportVpnClientConfig');
+                                const response = await request.fire({
+                                    identity: appstate.loginStatePart.getState().identity,
+                                    clientId: client.clientId,
+                                    format,
+                                });
+                                if (response.success && response.config) {
+                                    const ext = format === 'wireguard' ? 'conf' : 'json';
+                                    const blob = new Blob([response.config], { type: 'text/plain' });
+                                    const url = URL.createObjectURL(blob);
+                                    const a = document.createElement('a');
+                                    a.href = url;
+                                    a.download = `${client.clientId}.${ext}`;
+                                    a.click();
+                                    URL.revokeObjectURL(url);
+                                    DeesToast.createAndShow({ message: `${format} config downloaded`, type: 'success', duration: 3000 });
+                                }
+                                else {
+                                    DeesToast.createAndShow({ message: response.message || 'Export failed', type: 'error', duration: 5000 });
+                                }
                             }
-                            else {
-                                DeesToast.createAndShow({ message: response.message || 'Export failed', type: 'error', duration: 5000 });
+                            catch (err) {
+                                DeesToast.createAndShow({ message: err.message || 'Export failed', type: 'error', duration: 5000 });
                             }
-                        }
-                        catch (err) {
-                            DeesToast.createAndShow({ message: err.message || 'Export failed', type: 'error', duration: 5000 });
-                        }
+                        };
+                        DeesModal.createAndShow({
+                            heading: `Export Config: ${client.clientId}`,
+                            content: html `<p>Choose a config format to download.</p>`,
+                            menuOptions: [
+                                {
+                                    name: 'WireGuard (.conf)',
+                                    iconName: 'lucide:shield',
+                                    action: async (modalArg) => {
+                                        await modalArg.destroy();
+                                        await exportConfig('wireguard');
+                                    },
+                                },
+                                {
+                                    name: 'SmartVPN (.json)',
+                                    iconName: 'lucide:braces',
+                                    action: async (modalArg) => {
+                                        await modalArg.destroy();
+                                        await exportConfig('smartvpn');
+                                    },
+                                },
+                                {
+                                    name: 'Cancel',
+                                    iconName: 'lucide:x',
+                                    action: async (modalArg) => await modalArg.destroy(),
+                                },
+                            ],
+                        });
                     },
                 },
                 {
                     name: 'Rotate Keys',
                     iconName: 'lucide:rotate-cw',
                     type: ['contextmenu'],
-                    actionFunc: async (client) => {
+                    actionFunc: async (actionData) => {
+                        const client = actionData.item;
                         const { DeesModal, DeesToast } = await import('@design.estate/dees-catalog');
                         DeesModal.createAndShow({
                             heading: 'Rotate Client Keys',
@@ -423,7 +456,8 @@ let OpsViewVpn = (() => {
                     name: 'Delete',
                     iconName: 'lucide:trash2',
                     type: ['contextmenu'],
-                    actionFunc: async (client) => {
+                    actionFunc: async (actionData) => {
+                        const client = actionData.item;
                         const { DeesModal } = await import('@design.estate/dees-catalog');
                         DeesModal.createAndShow({
                             heading: 'Delete VPN Client',
@@ -454,4 +488,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.17.0",
+  "version": "11.19.0",
   "description": "A multifaceted routing service handling mail and SMS delivery functions.",
   "type": "module",
   "exports": {

package/readme.md

@@ -77,10 +77,13 @@ For reporting bugs, issues, or security vulnerabilities, please visit [community
 ### 🔐 VPN Access Control (powered by [smartvpn](https://code.foss.global/push.rocks/smartvpn))
 - **WireGuard + native transports** — standard WireGuard clients (iOS, Android, macOS, Windows, Linux) plus custom WebSocket/QUIC tunnels
 - **Route-level VPN gating** — mark any route with `vpn: { required: true }` to restrict access to VPN clients only
-- **Rootless operation** — auto-detects privileges: kernel TUN when running as root, userspace NAT (smoltcp) when not
-- **Client management** — create, enable, disable, rotate keys, export WireGuard `.conf` files via OpsServer API
+- **Tag-based access control** — assign `serverDefinedClientTags` to clients and restrict routes with `allowedServerDefinedClientTags`
+- **Constructor-defined clients** — pre-define VPN clients with tags in config for declarative, code-driven setup
+- **Rootless operation** — uses userspace NAT (smoltcp) with no root required
+- **Destination policy** — configurable `forceTarget`, `block`, or `allow` with allowList/blockList for granular traffic control
+- **Client management** — create, enable, disable, rotate keys, export WireGuard/SmartVPN configs via OpsServer API and dashboard
 - **IP-based enforcement** — VPN clients get IPs from a configurable subnet; SmartProxy enforces `ipAllowList` per route
-- **PROXY protocol v2** — in socket mode, the NAT engine sends PP v2 on outbound connections to preserve VPN client identity
+- **PROXY protocol v2** — the NAT engine sends PP v2 on outbound connections to preserve VPN client identity
 
 ### ⚡ High Performance
 - **Rust-powered proxy engine** via SmartProxy for maximum throughput
@@ -261,7 +264,9 @@ const router = new DcRouter({
   vpnConfig: {
     enabled: true,
     serverEndpoint: 'vpn.example.com',
-    wgListenPort: 51820,
+    clients: [
+      { clientId: 'dev-laptop', serverDefinedClientTags: ['engineering'] },
+    ],
   },
 
   // Persistent storage
@@ -456,7 +461,17 @@ interface IDcRouterOptions {
     wgListenPort?: number;               // default: 51820
     dns?: string[];                      // DNS servers pushed to VPN clients
     serverEndpoint?: string;             // Hostname in generated client configs
-    forwardingMode?: 'tun' | 'socket';   // default: auto-detect (root → tun, else socket)
+    clients?: Array<{                    // Pre-defined VPN clients
+      clientId: string;
+      serverDefinedClientTags?: string[];
+      description?: string;
+    }>;
+    destinationPolicy?: {                // Traffic routing policy
+      default: 'forceTarget' | 'block' | 'allow';
+      target?: string;                   // IP for forceTarget (default: '127.0.0.1')
+      allowList?: string[];              // Pass through directly
+      blockList?: string[];              // Always block (overrides allowList)
+    };
   };
 
   // ── HTTP/3 (QUIC) ────────────────────────────────────────────
@@ -1014,17 +1029,33 @@ 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. Routes with `vpn: { required: true }` get `security.ipAllowList` automatically injected with the VPN subnet
-4. SmartProxy enforces the allowlist — only VPN-sourced traffic is accepted on those routes
+3. Routes with `vpn: { required: true }` get `security.ipAllowList` automatically injected
+4. When `allowedServerDefinedClientTags` is set, only matching client IPs are injected (not the whole subnet)
+5. SmartProxy enforces the allowlist — only authorized VPN clients can access protected routes
+6. All VPN traffic is forced through SmartProxy via userspace NAT with PROXY protocol v2 — no root required
 
-### Two Operating Modes
+### Destination Policy
 
-| Mode | Root Required? | How It Works |
-|------|---------------|-------------|
-| **TUN** (`forwardingMode: 'tun'`) | Yes | Kernel TUN device — VPN traffic enters the network stack with real VPN IPs |
-| **Socket** (`forwardingMode: 'socket'`) | No | Userspace NAT via smoltcp — outbound connections send PROXY protocol v2 to preserve VPN client IPs |
+By default, VPN client traffic is redirected to localhost (SmartProxy) via `forceTarget`. You can customize this with a destination policy:
 
-DcRouter auto-detects: if running as root, it uses TUN mode; otherwise, it falls back to socket mode. You can override this with the `forwardingMode` option.
+```typescript
+// Default: all traffic → SmartProxy
+destinationPolicy: { default: 'forceTarget', target: '127.0.0.1' }
+
+// Allow direct access to a backend subnet
+destinationPolicy: {
+  default: 'forceTarget',
+  target: '127.0.0.1',
+  allowList: ['192.168.190.*'],     // direct access to this subnet
+  blockList: ['192.168.190.1'],     // except the gateway
+}
+
+// Block everything except specific IPs
+destinationPolicy: {
+  default: 'block',
+  allowList: ['10.0.0.*', '192.168.1.*'],
+}
+```
 
 ### Configuration
 
@@ -1032,26 +1063,47 @@ DcRouter auto-detects: if running as root, it uses TUN mode; otherwise, it falls
 const router = new DcRouter({
   vpnConfig: {
     enabled: true,
-    subnet: '10.8.0.0/24',          // VPN client IP pool (default)
-    wgListenPort: 51820,             // WireGuard UDP port (default)
+    subnet: '10.8.0.0/24',            // VPN client IP pool (default)
+    wgListenPort: 51820,               // WireGuard UDP port (default)
     serverEndpoint: 'vpn.example.com', // Hostname in generated client configs
-    dns: ['1.1.1.1', '8.8.8.8'],    // DNS servers pushed to clients
-    // forwardingMode: 'socket',     // Override auto-detection
+    dns: ['1.1.1.1', '8.8.8.8'],      // DNS servers pushed to clients
+
+    // Pre-define VPN clients with server-defined tags
+    clients: [
+      { clientId: 'alice-laptop', serverDefinedClientTags: ['engineering'], description: 'Dev laptop' },
+      { clientId: 'bob-phone', serverDefinedClientTags: ['engineering', 'mobile'] },
+      { clientId: 'carol-desktop', serverDefinedClientTags: ['finance'] },
+    ],
+
+    // Optional: customize destination policy (default: forceTarget → localhost)
+    // destinationPolicy: { default: 'forceTarget', target: '127.0.0.1', allowList: ['192.168.1.*'] },
   },
   smartProxyConfig: {
     routes: [
-      // This route is VPN-only — non-VPN clients are blocked
+      // 🔐 VPN-only: any VPN client can access
       {
-        name: 'admin-panel',
-        match: { domains: ['admin.example.com'], ports: [443] },
+        name: 'internal-app',
+        match: { domains: ['internal.example.com'], ports: [443] },
         action: {
           type: 'forward',
           targets: [{ host: '192.168.1.50', port: 8080 }],
           tls: { mode: 'terminate', certificate: 'auto' },
         },
-        vpn: { required: true },  // 🔐 Only VPN clients can access this
+        vpn: { required: true },
       },
-      // This route is public — anyone can access it
+      // 🔐 VPN + tag-restricted: only 'engineering' tagged clients
+      {
+        name: 'eng-dashboard',
+        match: { domains: ['eng.example.com'], ports: [443] },
+        action: {
+          type: 'forward',
+          targets: [{ host: '192.168.1.51', port: 8080 }],
+          tls: { mode: 'terminate', certificate: 'auto' },
+        },
+        vpn: { required: true, allowedServerDefinedClientTags: ['engineering'] },
+        // → alice + bob can access, carol cannot
+      },
+      // 🌐 Public: no VPN required
       {
         name: 'public-site',
         match: { domains: ['example.com'], ports: [443] },
@@ -1066,17 +1118,29 @@ const router = new DcRouter({
 });
 ```
 
-### Client Management via OpsServer API
+### Client Tags
+
+SmartVPN distinguishes between two types of client tags:
+
+| Tag Type | Set By | Purpose |
+|----------|--------|---------|
+| `serverDefinedClientTags` | Admin (via config or API) | **Trusted** — used for route access control |
+| `clientDefinedClientTags` | Connecting client | **Informational** — displayed in dashboard, never used for security |
+
+Routes with `allowedServerDefinedClientTags` only permit VPN clients whose admin-assigned tags match. Clients cannot influence their own server-defined tags.
+
+### Client Management via OpsServer
 
-Once the VPN server is running, you can manage clients through the OpsServer dashboard or API:
+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
 - **Enable / Disable** — toggle client access without deleting
 - **Rotate keys** — generate fresh keypairs (invalidates old ones)
-- **Export config** — re-export in WireGuard or SmartVPN format
+- **Export config** — download in WireGuard (`.conf`) or SmartVPN (`.json`) format
 - **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 or QR code — no custom VPN software needed.
+Standard WireGuard clients on any platform (iOS, Android, macOS, Windows, Linux) can connect using the generated `.conf` file — no custom VPN software needed.
 
 ## Certificate Management
 

package/ts/00_commitinfo_data.ts

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

package/ts_web/00_commitinfo_data.ts

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

package/ts_web/elements/ops-view-vpn.ts

@@ -308,7 +308,8 @@ export class OpsViewVpn extends DeesElement {
             name: 'Toggle',
             iconName: 'lucide:power',
             type: ['contextmenu', 'inRow'],
-            actionFunc: async (client: interfaces.data.IVpnClient) => {
+            actionFunc: async (actionData: any) => {
+              const client = actionData.item as interfaces.data.IVpnClient;
               await appstate.vpnStatePart.dispatchAction(appstate.toggleVpnClientAction, {
                 clientId: client.clientId,
                 enabled: !client.enabled,
@@ -319,39 +320,73 @@ export class OpsViewVpn extends DeesElement {
             name: 'Export Config',
             iconName: 'lucide:download',
             type: ['contextmenu', 'inRow'],
-            actionFunc: async (client: interfaces.data.IVpnClient) => {
-              const { DeesToast } = await import('@design.estate/dees-catalog');
-              try {
-                const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
-                  interfaces.requests.IReq_ExportVpnClientConfig
-                >('/typedrequest', 'exportVpnClientConfig');
-                const response = await request.fire({
-                  identity: appstate.loginStatePart.getState()!.identity!,
-                  clientId: client.clientId,
-                  format: 'wireguard',
-                });
-                if (response.success && response.config) {
-                  const blob = new Blob([response.config], { type: 'text/plain' });
-                  const url = URL.createObjectURL(blob);
-                  const a = document.createElement('a');
-                  a.href = url;
-                  a.download = `${client.clientId}.conf`;
-                  a.click();
-                  URL.revokeObjectURL(url);
-                  DeesToast.createAndShow({ message: 'Config downloaded', type: 'success', duration: 3000 });
-                } else {
-                  DeesToast.createAndShow({ message: response.message || 'Export failed', type: 'error', duration: 5000 });
+            actionFunc: async (actionData: any) => {
+              const client = actionData.item as interfaces.data.IVpnClient;
+              const { DeesModal, DeesToast } = await import('@design.estate/dees-catalog');
+
+              const exportConfig = async (format: 'wireguard' | 'smartvpn') => {
+                try {
+                  const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
+                    interfaces.requests.IReq_ExportVpnClientConfig
+                  >('/typedrequest', 'exportVpnClientConfig');
+                  const response = await request.fire({
+                    identity: appstate.loginStatePart.getState()!.identity!,
+                    clientId: client.clientId,
+                    format,
+                  });
+                  if (response.success && response.config) {
+                    const ext = format === 'wireguard' ? 'conf' : 'json';
+                    const blob = new Blob([response.config], { type: 'text/plain' });
+                    const url = URL.createObjectURL(blob);
+                    const a = document.createElement('a');
+                    a.href = url;
+                    a.download = `${client.clientId}.${ext}`;
+                    a.click();
+                    URL.revokeObjectURL(url);
+                    DeesToast.createAndShow({ message: `${format} config downloaded`, type: 'success', duration: 3000 });
+                  } else {
+                    DeesToast.createAndShow({ message: response.message || 'Export failed', type: 'error', duration: 5000 });
+                  }
+                } catch (err: any) {
+                  DeesToast.createAndShow({ message: err.message || 'Export failed', type: 'error', duration: 5000 });
                 }
-              } catch (err: any) {
-                DeesToast.createAndShow({ message: err.message || 'Export failed', type: 'error', duration: 5000 });
-              }
+              };
+
+              DeesModal.createAndShow({
+                heading: `Export Config: ${client.clientId}`,
+                content: html`<p>Choose a config format to download.</p>`,
+                menuOptions: [
+                  {
+                    name: 'WireGuard (.conf)',
+                    iconName: 'lucide:shield',
+                    action: async (modalArg: any) => {
+                      await modalArg.destroy();
+                      await exportConfig('wireguard');
+                    },
+                  },
+                  {
+                    name: 'SmartVPN (.json)',
+                    iconName: 'lucide:braces',
+                    action: async (modalArg: any) => {
+                      await modalArg.destroy();
+                      await exportConfig('smartvpn');
+                    },
+                  },
+                  {
+                    name: 'Cancel',
+                    iconName: 'lucide:x',
+                    action: async (modalArg: any) => await modalArg.destroy(),
+                  },
+                ],
+              });
             },
           },
           {
             name: 'Rotate Keys',
             iconName: 'lucide:rotate-cw',
             type: ['contextmenu'],
-            actionFunc: async (client: interfaces.data.IVpnClient) => {
+            actionFunc: async (actionData: any) => {
+              const client = actionData.item as interfaces.data.IVpnClient;
               const { DeesModal, DeesToast } = await import('@design.estate/dees-catalog');
               DeesModal.createAndShow({
                 heading: 'Rotate Client Keys',
@@ -390,7 +425,8 @@ export class OpsViewVpn extends DeesElement {
             name: 'Delete',
             iconName: 'lucide:trash2',
             type: ['contextmenu'],
-            actionFunc: async (client: interfaces.data.IVpnClient) => {
+            actionFunc: async (actionData: any) => {
+              const client = actionData.item as interfaces.data.IVpnClient;
               const { DeesModal } = await import('@design.estate/dees-catalog');
               DeesModal.createAndShow({
                 heading: 'Delete VPN Client',