@serve.zone/dcrouter 6.7.0 → 6.8.0

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

@@ -149,6 +149,17 @@ let OpsViewRemoteIngress = (() => {
         background: ${cssManager.bdTheme('#eff6ff', '#172554')};
         color: ${cssManager.bdTheme('#1e40af', '#60a5fa')};
       }
+
+      .portBadge.manual {
+        background: ${cssManager.bdTheme('#eff6ff', '#172554')};
+        color: ${cssManager.bdTheme('#1e40af', '#60a5fa')};
+      }
+
+      .portBadge.derived {
+        background: ${cssManager.bdTheme('#ecfdf5', '#022c22')};
+        color: ${cssManager.bdTheme('#047857', '#34d399')};
+        border: 1px dashed ${cssManager.bdTheme('#6ee7b7', '#065f46')};
+      }
     `,
         ];
         render() {
@@ -235,7 +246,8 @@ let OpsViewRemoteIngress = (() => {
                             content: html `
                     <dees-form>
                       <dees-input-text .key=${'name'} .label=${'Name'} .required=${true}></dees-input-text>
-                      <dees-input-text .key=${'listenPorts'} .label=${'Listen Ports (comma-separated, auto-derived if empty)'}></dees-input-text>
+                      <dees-input-text .key=${'listenPorts'} .label=${'Additional Manual Ports (comma-separated, optional)'}></dees-input-text>
+                      <dees-input-checkbox .key=${'autoDerivePorts'} .label=${'Auto-derive ports from routes'} .value=${true}></dees-input-checkbox>
                       <dees-input-text .key=${'tags'} .label=${'Tags (comma-separated, optional)'}></dees-input-text>
                     </dees-form>
                   `,
@@ -260,10 +272,11 @@ let OpsViewRemoteIngress = (() => {
                                         const listenPorts = portsStr
                                             ? portsStr.split(',').map((p) => parseInt(p.trim(), 10)).filter((p) => !isNaN(p))
                                             : undefined;
+                                        const autoDerivePorts = formData.autoDerivePorts !== false;
                                         const tags = formData.tags
                                             ? formData.tags.split(',').map((t) => t.trim()).filter(Boolean)
                                             : undefined;
-                                        await appstate.remoteIngressStatePart.dispatchAction(appstate.createRemoteIngressAction, { name, listenPorts, tags });
+                                        await appstate.remoteIngressStatePart.dispatchAction(appstate.createRemoteIngressAction, { name, listenPorts, autoDerivePorts, tags });
                                         await modalArg.destroy();
                                     },
                                 },
@@ -291,6 +304,59 @@ let OpsViewRemoteIngress = (() => {
                         await appstate.remoteIngressStatePart.dispatchAction(appstate.toggleRemoteIngressAction, { id: edge.id, enabled: false });
                     },
                 },
+                {
+                    name: 'Edit',
+                    iconName: 'lucide:pencil',
+                    type: ['inRow', 'contextmenu'],
+                    actionFunc: async (actionData) => {
+                        const edge = actionData.item;
+                        const { DeesModal } = await import('@design.estate/dees-catalog');
+                        await DeesModal.createAndShow({
+                            heading: `Edit Edge: ${edge.name}`,
+                            content: html `
+                    <dees-form>
+                      <dees-input-text .key=${'name'} .label=${'Name'} .value=${edge.name}></dees-input-text>
+                      <dees-input-text .key=${'listenPorts'} .label=${'Manual Ports (comma-separated)'} .value=${(edge.listenPorts || []).join(', ')}></dees-input-text>
+                      <dees-input-checkbox .key=${'autoDerivePorts'} .label=${'Auto-derive ports from routes'} .value=${edge.autoDerivePorts !== false}></dees-input-checkbox>
+                      <dees-input-text .key=${'tags'} .label=${'Tags (comma-separated)'} .value=${(edge.tags || []).join(', ')}></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 formData = await form.collectFormData();
+                                        const portsStr = formData.listenPorts?.trim();
+                                        const listenPorts = portsStr
+                                            ? portsStr.split(',').map((p) => parseInt(p.trim(), 10)).filter((p) => !isNaN(p))
+                                            : [];
+                                        const autoDerivePorts = formData.autoDerivePorts !== false;
+                                        const tags = formData.tags
+                                            ? formData.tags.split(',').map((t) => t.trim()).filter(Boolean)
+                                            : [];
+                                        await appstate.remoteIngressStatePart.dispatchAction(appstate.updateRemoteIngressAction, {
+                                            id: edge.id,
+                                            name: formData.name || edge.name,
+                                            listenPorts,
+                                            autoDerivePorts,
+                                            tags,
+                                        });
+                                        await modalArg.destroy();
+                                    },
+                                },
+                            ],
+                        });
+                    },
+                },
                 {
                     name: 'Regenerate Secret',
                     iconName: 'lucide:key',
@@ -332,13 +398,12 @@ let OpsViewRemoteIngress = (() => {
             return status?.publicIp || '-';
         }
         getPortsHtml(edge) {
-            const hasManualPorts = edge.listenPorts && edge.listenPorts.length > 0;
-            const ports = hasManualPorts ? edge.listenPorts : (edge.effectiveListenPorts || []);
-            const isAuto = !hasManualPorts && ports.length > 0;
-            if (ports.length === 0) {
+            const manualPorts = edge.manualPorts || [];
+            const derivedPorts = edge.derivedPorts || [];
+            if (manualPorts.length === 0 && derivedPorts.length === 0) {
                 return html `<span style="color: var(--text-muted, #6b7280); font-size: 12px;">none</span>`;
             }
-            return html `<div class="portsDisplay">${ports.map(p => html `<span class="portBadge">${p}</span>`)}${isAuto ? html `<span style="font-size: 11px; color: var(--text-muted, #6b7280); align-self: center;">(auto)</span>` : ''}</div>`;
+            return html `<div class="portsDisplay">${manualPorts.map(p => html `<span class="portBadge manual">${p}</span>`)}${derivedPorts.map(p => html `<span class="portBadge derived">${p}</span>`)}${derivedPorts.length > 0 ? html `<span style="font-size: 11px; color: var(--text-muted, #6b7280); align-self: center;">(auto)</span>` : ''}</div>`;
         }
         getEdgeTunnelCount(edgeId) {
             const status = this.getEdgeStatus(edgeId);
@@ -362,4 +427,4 @@ let OpsViewRemoteIngress = (() => {
     return OpsViewRemoteIngress = _classThis;
 })();
 export { OpsViewRemoteIngress };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-remoteingress.js","sourceRoot":"","sources":["../../ts_web/elements/ops-view-remoteingress.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-remoteingress.js","sourceRoot":"","sources":["../../ts_web/elements/ops-view-remoteingress.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@serve.zone/dcrouter",
   "private": false,
-  "version": "6.7.0",
+  "version": "6.8.0",
   "description": "A multifaceted routing service handling mail and SMS delivery functions.",
   "type": "module",
   "exports": {

package/ts/00_commitinfo_data.ts

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

package/ts/opsserver/handlers/remoteingress.handler.ts

@@ -20,12 +20,17 @@ export class RemoteIngressHandler {
           if (!manager) {
             return { edges: [] };
           }
-          // Return edges without secrets, enriched with effective listen ports
-          const edges = manager.getAllEdges().map((e) => ({
-            ...e,
-            secret: '********', // Never expose secrets via API
-            effectiveListenPorts: manager.getEffectiveListenPorts(e),
-          }));
+          // Return edges without secrets, enriched with effective listen ports and breakdown
+          const edges = manager.getAllEdges().map((e) => {
+            const breakdown = manager.getPortBreakdown(e);
+            return {
+              ...e,
+              secret: '********', // Never expose secrets via API
+              effectiveListenPorts: manager.getEffectiveListenPorts(e),
+              manualPorts: breakdown.manual,
+              derivedPorts: breakdown.derived,
+            };
+          });
           return { edges };
         },
       ),
@@ -50,6 +55,7 @@ export class RemoteIngressHandler {
             dataArg.name,
             dataArg.listenPorts || [],
             dataArg.tags,
+            dataArg.autoDerivePorts ?? true,
           );
 
           // Sync allowed edges with the hub
@@ -102,6 +108,7 @@ export class RemoteIngressHandler {
           const edge = await manager.updateEdge(dataArg.id, {
             name: dataArg.name,
             listenPorts: dataArg.listenPorts,
+            autoDerivePorts: dataArg.autoDerivePorts,
             enabled: dataArg.enabled,
             tags: dataArg.tags,
           });
@@ -115,7 +122,17 @@ export class RemoteIngressHandler {
             await tunnelManager.syncAllowedEdges();
           }
 
-          return { success: true, edge: { ...edge, secret: '********' } };
+          const breakdown = manager.getPortBreakdown(edge);
+          return {
+            success: true,
+            edge: {
+              ...edge,
+              secret: '********',
+              effectiveListenPorts: manager.getEffectiveListenPorts(edge),
+              manualPorts: breakdown.manual,
+              derivedPorts: breakdown.derived,
+            },
+          };
         },
       ),
     );

package/ts/remoteingress/classes.remoteingress-manager.ts

@@ -47,6 +47,11 @@ export class RemoteIngressManager {
     for (const key of keys) {
       const edge = await this.storageManager.getJSON<IRemoteIngress>(key);
       if (edge) {
+        // Migration: old edges without autoDerivePorts default to true
+        if ((edge as any).autoDerivePorts === undefined) {
+          edge.autoDerivePorts = true;
+          await this.storageManager.setJSON(key, edge);
+        }
         this.edges.set(edge.id, edge);
       }
     }
@@ -91,13 +96,28 @@ export class RemoteIngressManager {
 
   /**
    * Get the effective listen ports for an edge.
-   * Returns manual listenPorts if non-empty, otherwise derives ports from tagged routes.
+   * Manual ports are always included. Auto-derived ports are added (union) when autoDerivePorts is true.
    */
   public getEffectiveListenPorts(edge: IRemoteIngress): number[] {
-    if (edge.listenPorts && edge.listenPorts.length > 0) {
-      return edge.listenPorts;
-    }
-    return this.derivePortsForEdge(edge.id, edge.tags);
+    const manualPorts = edge.listenPorts || [];
+    const shouldDerive = edge.autoDerivePorts !== false;
+    if (!shouldDerive) return [...manualPorts].sort((a, b) => a - b);
+    const derivedPorts = this.derivePortsForEdge(edge.id, edge.tags);
+    return [...new Set([...manualPorts, ...derivedPorts])].sort((a, b) => a - b);
+  }
+
+  /**
+   * Get manual and derived port breakdown for an edge (used in API responses).
+   * Derived ports exclude any ports already present in the manual list.
+   */
+  public getPortBreakdown(edge: IRemoteIngress): { manual: number[]; derived: number[] } {
+    const manual = edge.listenPorts || [];
+    const shouldDerive = edge.autoDerivePorts !== false;
+    if (!shouldDerive) return { manual, derived: [] };
+    const manualSet = new Set(manual);
+    const allDerived = this.derivePortsForEdge(edge.id, edge.tags);
+    const derived = allDerived.filter((p) => !manualSet.has(p));
+    return { manual, derived };
   }
 
   /**
@@ -107,6 +127,7 @@ export class RemoteIngressManager {
     name: string,
     listenPorts: number[] = [],
     tags?: string[],
+    autoDerivePorts: boolean = true,
   ): Promise<IRemoteIngress> {
     const id = plugins.uuid.v4();
     const secret = plugins.crypto.randomBytes(32).toString('hex');
@@ -118,6 +139,7 @@ export class RemoteIngressManager {
       secret,
       listenPorts,
       enabled: true,
+      autoDerivePorts,
       tags: tags || [],
       createdAt: now,
       updatedAt: now,
@@ -150,6 +172,7 @@ export class RemoteIngressManager {
     updates: {
       name?: string;
       listenPorts?: number[];
+      autoDerivePorts?: boolean;
       enabled?: boolean;
       tags?: string[];
     },
@@ -161,6 +184,7 @@ export class RemoteIngressManager {
 
     if (updates.name !== undefined) edge.name = updates.name;
     if (updates.listenPorts !== undefined) edge.listenPorts = updates.listenPorts;
+    if (updates.autoDerivePorts !== undefined) edge.autoDerivePorts = updates.autoDerivePorts;
     if (updates.enabled !== undefined) edge.enabled = updates.enabled;
     if (updates.tags !== undefined) edge.tags = updates.tags;
     edge.updatedAt = Date.now();

package/ts_web/00_commitinfo_data.ts

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

package/ts_web/appstate.ts

@@ -822,6 +822,7 @@ export const fetchRemoteIngressAction = remoteIngressStatePart.createAction(asyn
 export const createRemoteIngressAction = remoteIngressStatePart.createAction<{
   name: string;
   listenPorts?: number[];
+  autoDerivePorts?: boolean;
   tags?: string[];
 }>(async (statePartArg, dataArg) => {
   const context = getActionContext();
@@ -836,6 +837,7 @@ export const createRemoteIngressAction = remoteIngressStatePart.createAction<{
       identity: context.identity,
       name: dataArg.name,
       listenPorts: dataArg.listenPorts,
+      autoDerivePorts: dataArg.autoDerivePorts,
       tags: dataArg.tags,
     });
 
@@ -883,6 +885,40 @@ export const deleteRemoteIngressAction = remoteIngressStatePart.createAction<str
   }
 );
 
+export const updateRemoteIngressAction = remoteIngressStatePart.createAction<{
+  id: string;
+  name?: string;
+  listenPorts?: number[];
+  autoDerivePorts?: boolean;
+  tags?: string[];
+}>(async (statePartArg, dataArg) => {
+  const context = getActionContext();
+  const currentState = statePartArg.getState();
+
+  try {
+    const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
+      interfaces.requests.IReq_UpdateRemoteIngress
+    >('/typedrequest', 'updateRemoteIngress');
+
+    await request.fire({
+      identity: context.identity,
+      id: dataArg.id,
+      name: dataArg.name,
+      listenPorts: dataArg.listenPorts,
+      autoDerivePorts: dataArg.autoDerivePorts,
+      tags: dataArg.tags,
+    });
+
+    await remoteIngressStatePart.dispatchAction(fetchRemoteIngressAction, null);
+    return statePartArg.getState();
+  } catch (error) {
+    return {
+      ...currentState,
+      error: error instanceof Error ? error.message : 'Failed to update edge',
+    };
+  }
+});
+
 export const regenerateRemoteIngressSecretAction = remoteIngressStatePart.createAction<string>(
   async (statePartArg, edgeId) => {
     const context = getActionContext();

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

@@ -114,6 +114,17 @@ export class OpsViewRemoteIngress extends DeesElement {
         background: ${cssManager.bdTheme('#eff6ff', '#172554')};
         color: ${cssManager.bdTheme('#1e40af', '#60a5fa')};
       }
+
+      .portBadge.manual {
+        background: ${cssManager.bdTheme('#eff6ff', '#172554')};
+        color: ${cssManager.bdTheme('#1e40af', '#60a5fa')};
+      }
+
+      .portBadge.derived {
+        background: ${cssManager.bdTheme('#ecfdf5', '#022c22')};
+        color: ${cssManager.bdTheme('#047857', '#34d399')};
+        border: 1px dashed ${cssManager.bdTheme('#6ee7b7', '#065f46')};
+      }
     `,
   ];
 
@@ -203,7 +214,8 @@ export class OpsViewRemoteIngress extends DeesElement {
                   content: html`
                     <dees-form>
                       <dees-input-text .key=${'name'} .label=${'Name'} .required=${true}></dees-input-text>
-                      <dees-input-text .key=${'listenPorts'} .label=${'Listen Ports (comma-separated, auto-derived if empty)'}></dees-input-text>
+                      <dees-input-text .key=${'listenPorts'} .label=${'Additional Manual Ports (comma-separated, optional)'}></dees-input-text>
+                      <dees-input-checkbox .key=${'autoDerivePorts'} .label=${'Auto-derive ports from routes'} .value=${true}></dees-input-checkbox>
                       <dees-input-text .key=${'tags'} .label=${'Tags (comma-separated, optional)'}></dees-input-text>
                     </dees-form>
                   `,
@@ -226,12 +238,13 @@ export class OpsViewRemoteIngress extends DeesElement {
                         const listenPorts = portsStr
                           ? portsStr.split(',').map((p: string) => parseInt(p.trim(), 10)).filter((p: number) => !isNaN(p))
                           : undefined;
+                        const autoDerivePorts = formData.autoDerivePorts !== false;
                         const tags = formData.tags
                           ? formData.tags.split(',').map((t: string) => t.trim()).filter(Boolean)
                           : undefined;
                         await appstate.remoteIngressStatePart.dispatchAction(
                           appstate.createRemoteIngressAction,
-                          { name, listenPorts, tags },
+                          { name, listenPorts, autoDerivePorts, tags },
                         );
                         await modalArg.destroy();
                       },
@@ -266,6 +279,61 @@ export class OpsViewRemoteIngress extends DeesElement {
                 );
               },
             },
+            {
+              name: 'Edit',
+              iconName: 'lucide:pencil',
+              type: ['inRow', 'contextmenu'] as any,
+              actionFunc: async (actionData: any) => {
+                const edge = actionData.item as interfaces.data.IRemoteIngress;
+                const { DeesModal } = await import('@design.estate/dees-catalog');
+                await DeesModal.createAndShow({
+                  heading: `Edit Edge: ${edge.name}`,
+                  content: html`
+                    <dees-form>
+                      <dees-input-text .key=${'name'} .label=${'Name'} .value=${edge.name}></dees-input-text>
+                      <dees-input-text .key=${'listenPorts'} .label=${'Manual Ports (comma-separated)'} .value=${(edge.listenPorts || []).join(', ')}></dees-input-text>
+                      <dees-input-checkbox .key=${'autoDerivePorts'} .label=${'Auto-derive ports from routes'} .value=${edge.autoDerivePorts !== false}></dees-input-checkbox>
+                      <dees-input-text .key=${'tags'} .label=${'Tags (comma-separated)'} .value=${(edge.tags || []).join(', ')}></dees-input-text>
+                    </dees-form>
+                  `,
+                  menuOptions: [
+                    {
+                      name: 'Cancel',
+                      iconName: 'lucide:x',
+                      action: async (modalArg: any) => await modalArg.destroy(),
+                    },
+                    {
+                      name: 'Save',
+                      iconName: 'lucide:check',
+                      action: async (modalArg: any) => {
+                        const form = modalArg.shadowRoot?.querySelector('.content')?.querySelector('dees-form');
+                        if (!form) return;
+                        const formData = await form.collectFormData();
+                        const portsStr = formData.listenPorts?.trim();
+                        const listenPorts = portsStr
+                          ? portsStr.split(',').map((p: string) => parseInt(p.trim(), 10)).filter((p: number) => !isNaN(p))
+                          : [];
+                        const autoDerivePorts = formData.autoDerivePorts !== false;
+                        const tags = formData.tags
+                          ? formData.tags.split(',').map((t: string) => t.trim()).filter(Boolean)
+                          : [];
+                        await appstate.remoteIngressStatePart.dispatchAction(
+                          appstate.updateRemoteIngressAction,
+                          {
+                            id: edge.id,
+                            name: formData.name || edge.name,
+                            listenPorts,
+                            autoDerivePorts,
+                            tags,
+                          },
+                        );
+                        await modalArg.destroy();
+                      },
+                    },
+                  ],
+                });
+              },
+            },
             {
               name: 'Regenerate Secret',
               iconName: 'lucide:key',
@@ -317,13 +385,12 @@ export class OpsViewRemoteIngress extends DeesElement {
   }
 
   private getPortsHtml(edge: interfaces.data.IRemoteIngress): TemplateResult {
-    const hasManualPorts = edge.listenPorts && edge.listenPorts.length > 0;
-    const ports = hasManualPorts ? edge.listenPorts : (edge.effectiveListenPorts || []);
-    const isAuto = !hasManualPorts && ports.length > 0;
-    if (ports.length === 0) {
+    const manualPorts = edge.manualPorts || [];
+    const derivedPorts = edge.derivedPorts || [];
+    if (manualPorts.length === 0 && derivedPorts.length === 0) {
       return html`<span style="color: var(--text-muted, #6b7280); font-size: 12px;">none</span>`;
     }
-    return html`<div class="portsDisplay">${ports.map(p => html`<span class="portBadge">${p}</span>`)}${isAuto ? html`<span style="font-size: 11px; color: var(--text-muted, #6b7280); align-self: center;">(auto)</span>` : ''}</div>`;
+    return html`<div class="portsDisplay">${manualPorts.map(p => html`<span class="portBadge manual">${p}</span>`)}${derivedPorts.map(p => html`<span class="portBadge derived">${p}</span>`)}${derivedPorts.length > 0 ? html`<span style="font-size: 11px; color: var(--text-muted, #6b7280); align-self: center;">(auto)</span>` : ''}</div>`;
   }
 
   private getEdgeTunnelCount(edgeId: string): number {