@serve.zone/dcrouter 18.9.2 → 18.9.4

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

@@ -811,6 +811,8 @@ export class VpnManager {
     client: Pick<VpnClientDoc, 'useHostIp' | 'useDhcp' | 'staticIp' | 'forceVlan' | 'vlanId'>,
   ): void {
     client.useHostIp = client.useHostIp === true;
+    client.staticIp = client.staticIp ?? undefined;
+    client.vlanId = client.vlanId ?? undefined;
 
     if (!client.useHostIp) {
       client.useDhcp = false;
@@ -883,6 +885,35 @@ export class VpnManager {
   }
 
   private async persistClient(client: VpnClientDoc): Promise<void> {
-    await client.save();
+    if (client.creationStatus === 'new') {
+      await client.save();
+      return;
+    }
+    const persisted = await VpnClientDoc.atomicUpdate({ clientId: client.clientId }, {
+      $set: {
+        enabled: client.enabled,
+        noisePublicKey: client.noisePublicKey,
+        wgPublicKey: client.wgPublicKey,
+        createdAt: client.createdAt,
+        updatedAt: client.updatedAt,
+        ...(client.targetProfileIds !== undefined ? { targetProfileIds: client.targetProfileIds } : {}),
+        ...(client.description !== undefined ? { description: client.description } : {}),
+        ...(client.assignedIp !== undefined ? { assignedIp: client.assignedIp } : {}),
+        ...(client.wgPrivateKey !== undefined ? { wgPrivateKey: client.wgPrivateKey } : {}),
+        ...(client.expiresAt !== undefined ? { expiresAt: client.expiresAt } : {}),
+        ...(client.destinationAllowList !== undefined ? { destinationAllowList: client.destinationAllowList } : {}),
+        ...(client.destinationBlockList !== undefined ? { destinationBlockList: client.destinationBlockList } : {}),
+        ...(client.useHostIp !== undefined ? { useHostIp: client.useHostIp } : {}),
+        ...(client.useDhcp !== undefined ? { useDhcp: client.useDhcp } : {}),
+        ...(client.staticIp !== undefined ? { staticIp: client.staticIp } : {}),
+        ...(client.forceVlan !== undefined ? { forceVlan: client.forceVlan } : {}),
+        ...(client.vlanId !== undefined ? { vlanId: client.vlanId } : {}),
+      },
+      $unset: {
+        ...(client.staticIp === undefined ? { staticIp: true } : {}),
+        ...(client.vlanId === undefined ? { vlanId: true } : {}),
+      },
+    });
+    if (persisted.matchedCount !== 1) throw new Error('VPN client disappeared during update');
   }
 }

package/ts_web/00_commitinfo_data.ts

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