(fix): watchdog for conf health and, if the wg instance is down, don't restart

Dockerfile

@@ -65,6 +65,9 @@ COPY docker-entrypoint.sh /usr/bin/entrypoint
 RUN chmod +x /usr/bin/entrypoint
 ENTRYPOINT ["/usr/bin/entrypoint"]
 
+HEALTHCHECK --interval=60s --timeout=3s --start-period=20s --retries=3 \
+ CMD curl -f http://127.0.0.1:3000/api/health || exit 1
+
 # run the app
 USER bun
 EXPOSE 3000/tcp

Dockerfile-Dev

@@ -53,6 +53,9 @@ COPY docker-entrypoint.sh /usr/bin/entrypoint
 RUN chmod +x /usr/bin/entrypoint
 ENTRYPOINT ["/usr/bin/entrypoint"]
 
+HEALTHCHECK --interval=60s --timeout=3s --start-period=20s --retries=3 \
+ CMD curl -f http://127.0.0.1:3000/api/health || exit 1
+
 # run the appc
 EXPOSE 5173/tcp
 CMD [ "npm", "run", "dev", "--", "--host" ]

docker-entrypoint.sh

@@ -81,10 +81,12 @@ env | grep ^TOR_ | sed -e 's/TOR_//' -e 's/=/ /' >>/etc/tor/torrc
 remove_duplicated_lines "/etc/tor/torrc"
 
 # Start Tor on the background
-screen -L -Logfile /var/vlogs/tor -dmS tor bash -c "tor -f /etc/tor/torrc"
+screen -L -Logfile /var/vlogs/tor -dmS tor \
+  bash -c "tor -f /etc/tor/torrc"
 
 # Starting Redis server in detached mode
-screen -L -Logfile /var/vlogs/redis -dmS redis bash -c "redis-server --port 6479 --daemonize no --dir /data --appendonly yes"
+screen -L -Logfile /var/vlogs/redis -dmS redis \
+  bash -c "redis-server --port 6479 --daemonize no --dir /data --appendonly yes"
 
 echo "                                                   "
 echo " _       ___           ___       __          _     "
@@ -105,7 +107,7 @@ cat /etc/tor/torrc
 echo -e "========================================================\n"
 sleep 1
 
-# After 10 seconds, export the database to the WireGuard config file
+screen -L -Logfile /var/vlogs/warmup -dmS warmup \
-screen -dm bash -c "sleep 10; curl -s -o /dev/null http://127.0.0.1:3000/api/healthcheck"
+  bash -c "sleep 10; echo -n '[+] Warming Up...'; curl -s http://127.0.0.1:3000/; echo -e 'Done!'"
 
 exec "$@"

web/src/lib/wireguard/index.ts

@@ -33,10 +33,10 @@ export class WGServer {
       return false;
     }
 
-    const HASH = await getConfigHash(server.confId);
+    const HASH = getConfigHash(server.confId);
     if (!HASH || server.confHash !== HASH) {
       await writeConfigFile(server);
-      await WGServer.update(id, { confHash: await getConfigHash(server.confId) });
+      await WGServer.update(id, { confHash: getConfigHash(server.confId) });
     }
 
     if (await Network.checkInterfaceExists(`wg${server.confId}`)) {
@@ -125,7 +125,7 @@ export class WGServer {
       ]),
     );
     fs.writeFileSync(confPath, lines.join('\n'), { mode: 0o600 });
-    await WGServer.update(id, { confHash: await getConfigHash(server.confId) });
+    await WGServer.update(id, { confHash: getConfigHash(server.confId) });
 
     const index = await findServerIndex(id);
     if (typeof index !== 'number') {
@@ -141,8 +141,11 @@ export class WGServer {
       }),
     );
 
-    await this.stop(server.id);
+    if (server.status === 'up') {
-    await this.start(server.id);
+      await this.stop(server.id);
+      await this.start(server.id);
+    }
+
     return true;
   }
 
@@ -179,10 +182,12 @@ export class WGServer {
     const serverConfStr = conf.includes('[Peer]') ? conf.split('[Peer]')[0] : conf;
     const peersStr = peers.filter((_, i) => i !== peerIndex).join('\n');
     fs.writeFileSync(confPath, `${serverConfStr}\n${peersStr}`, { mode: 0o600 });
-    await WGServer.update(server.id, { confHash: await getConfigHash(server.confId) });
+    await WGServer.update(server.id, { confHash: getConfigHash(server.confId) });
 
-    await WGServer.stop(server.id);
+    if (server.status === 'up') {
-    await WGServer.start(server.id);
+      await this.stop(server.id);
+      await this.start(server.id);
+    }
 
     return true;
   }
@@ -208,8 +213,10 @@ export class WGServer {
     await client.lset(WG_SEVER_PATH, index, JSON.stringify({ ...server, peers: updatedPeers }));
     await this.storePeers({ id: server.id, confId: server.confId }, publicKey, updatedPeers);
 
-    await WGServer.stop(serverId);
+    if (server.status === 'up') {
-    await WGServer.start(serverId);
+      await this.stop(serverId);
+      await this.start(serverId);
+    }
 
     return true;
   }
@@ -240,7 +247,7 @@ export class WGServer {
 
     const peersStr = peers.filter((_, i) => i !== peerIndex).join('\n');
     fs.writeFileSync(confPath, `${serverConfStr}\n${peersStr}`, { mode: 0o600 });
-    await WGServer.update(sd.id, { confHash: await getConfigHash(sd.confId) });
+    await WGServer.update(sd.id, { confHash: getConfigHash(sd.confId) });
   }
 
   static async getFreePeerIp(id: string): Promise<string | undefined> {
@@ -438,7 +445,7 @@ export async function generateWgServer(config: GenerateWgServerParams): Promise<
   const { privateKey, publicKey } = await generateWgKey();
 
   // inside redis create a config list
-  const confId = (await maxConfId()) + 1;
+  const confId = await getNextFreeConfId();
   const uuid = crypto.randomUUID();
 
   let server: WgServer = {
@@ -487,7 +494,7 @@ export async function generateWgServer(config: GenerateWgServerParams): Promise<
   fs.writeFileSync(CONFIG_PATH, await genServerConf(server), { mode: 0o600 });
 
   // updating hash of the config
-  await WGServer.update(uuid, { confHash: await getConfigHash(confId) });
+  await WGServer.update(uuid, { confHash: getConfigHash(confId) });
 
   // to ensure interface does not exists
   await Shell.exec(`wg-quick down wg${confId}`, true);
@@ -506,13 +513,26 @@ export async function isIPReserved(ip: string): Promise<boolean> {
 
 export async function isPortReserved(port: number): Promise<boolean> {
   const inUsePorts = [await Network.getInUsePorts(), (await getServers()).map((s) => Number(s.listen))].flat();
-
-  console.log(inUsePorts, port, inUsePorts.includes(port));
   return inUsePorts.includes(port);
 }
 
-export async function getConfigHash(confId: number): Promise<string | undefined> {
+export async function isConfigIdReserved(id: number): Promise<boolean> {
-  if (!(await wgConfExists(confId))) {
+  const ids = (await getServers()).map((s) => s.confId);
+  return ids.includes(id);
+}
+
+export async function getNextFreeConfId(): Promise<number> {
+  let id = maxConfId();
+  for (let i = 0; i < 1_000; i++) {
+    if (!(await isConfigIdReserved(id))) {
+      return id;
+    }
+  }
+  throw new Error('Could not find a free config id');
+}
+
+export function getConfigHash(confId: number): string | undefined {
+  if (!wgConfExists(confId)) {
     return undefined;
   }
 
@@ -524,7 +544,7 @@ export async function getConfigHash(confId: number): Promise<string | undefined>
 export async function writeConfigFile(wg: WgServer): Promise<void> {
   const CONFIG_PATH = path.join(WG_PATH, `wg${wg.confId}.conf`);
   fs.writeFileSync(CONFIG_PATH, await genServerConf(wg), { mode: 0o600 });
-  await WGServer.update(wg.id, { confHash: await getConfigHash(wg.confId) });
+  await WGServer.update(wg.id, { confHash: getConfigHash(wg.confId) });
 }
 
 export function maxConfId(): number {
@@ -533,6 +553,7 @@ export function maxConfId(): number {
   // filter files that start with wg and end with .conf
   const reg = new RegExp(/^wg(\d+)\.conf$/);
   const confs = files.filter((f) => reg.test(f));
+
   const ids = confs.map((f) => {
     const m = f.match(reg);
     if (m) {
@@ -540,6 +561,7 @@ export function maxConfId(): number {
     }
     return 0;
   });
+
   return Math.max(0, ...ids);
 }
 
@@ -588,18 +610,16 @@ export async function makeWgIptables(s: WgServer): Promise<{ up: string; down: s
       `iptables -A OUTPUT ! -o lo ! -d 127.0.0.1 ! -s 127.0.0.1 -p tcp -m tcp --tcp-flags ACK,FIN ACK,FIN -j DROP`,
     ]).join('; ');
     return { up, down: up.replace(/-A/g, '-D') };
-  } else {
-    const up = dynaJoin([
-      `iptables -t nat -A POSTROUTING -s ${source} -o ${inet} -j MASQUERADE`,
-      `iptables -A INPUT -p udp -m udp --dport ${s.listen} -j ACCEPT`,
-      `iptables -A INPUT -p tcp -m tcp --dport ${s.listen} -j ACCEPT`,
-      `iptables -A FORWARD -i ${wg_inet} -j ACCEPT`,
-      `iptables -A FORWARD -o ${wg_inet} -j ACCEPT`,
-    ]).join('; ');
-    return { up, down: up.replace(/ -A /g, ' -D ') };
   }
 
-  return { up: '', down: '' };
+  const up = dynaJoin([
+    `iptables -t nat -A POSTROUTING -s ${source} -o ${inet} -j MASQUERADE`,
+    `iptables -A INPUT -p udp -m udp --dport ${s.listen} -j ACCEPT`,
+    `iptables -A INPUT -p tcp -m tcp --dport ${s.listen} -j ACCEPT`,
+    `iptables -A FORWARD -i ${wg_inet} -j ACCEPT`,
+    `iptables -A FORWARD -o ${wg_inet} -j ACCEPT`,
+  ]).join('; ');
+  return { up, down: up.replace(/ -A /g, ' -D ') };
 }
 
 export async function genServerConf(server: WgServer): Promise<string> {

web/src/routes/api/health/+server.ts

@@ -0,0 +1,26 @@
+import type { RequestHandler } from '@sveltejs/kit';
+import { getConfigHash, getServers, WGServer } from '$lib/wireguard';
+
+export const GET: RequestHandler = async () => {
+  try {
+    const servers = await getServers();
+
+    for (const s of servers) {
+      const HASH = getConfigHash(s.confId);
+      if (s.confId && HASH && s.confHash === HASH) {
+        // Skip, due to no changes on the config
+        continue;
+      }
+
+      // Start server
+      if (s.status === 'up') {
+        await WGServer.start(s.id);
+      }
+    }
+  } catch (e) {
+    console.error('APIFailed: HealthCheck:', e);
+    return new Response('FAILED', { status: 500, headers: { 'Content-Type': 'text/plain' } });
+  }
+
+  return new Response('OK', { status: 200, headers: { 'Content-Type': 'text/plain' } });
+};