replace debug with obug (#2619)

* patch unenv

* replaces debug with obug

reverts unenv patch

Dockerfile

@@ -72,7 +72,7 @@ RUN update-alternatives --install /usr/sbin/iptables iptables /usr/sbin/iptables
 RUN update-alternatives --install /usr/sbin/ip6tables ip6tables /usr/sbin/ip6tables-legacy 10 --slave /usr/sbin/ip6tables-restore ip6tables-restore /usr/sbin/ip6tables-legacy-restore --slave /usr/sbin/ip6tables-save ip6tables-save /usr/sbin/ip6tables-legacy-save
 
 # Set Environment
-ENV DEBUG=Server,WireGuard,Database,CMD
+ENV DEBUG=Server,WireGuard,Database,CMD,Firewall
 ENV PORT=51821
 ENV HOST=0.0.0.0
 ENV INSECURE=false

Dockerfile.dev

@@ -24,7 +24,7 @@ RUN update-alternatives --install /usr/sbin/iptables iptables /usr/sbin/iptables
 RUN update-alternatives --install /usr/sbin/ip6tables ip6tables /usr/sbin/ip6tables-legacy 10 --slave /usr/sbin/ip6tables-restore ip6tables-restore /usr/sbin/ip6tables-legacy-restore --slave /usr/sbin/ip6tables-save ip6tables-save /usr/sbin/ip6tables-legacy-save
 
 # Set Environment
-ENV DEBUG=Server,WireGuard,Database,CMD
+ENV DEBUG=Server,WireGuard,Database,CMD,Firewall
 ENV PORT=51821
 ENV HOST=0.0.0.0
 ENV INSECURE=true

src/package.json

@@ -37,13 +37,13 @@
     "citty": "^0.2.2",
     "consola": "^3.4.2",
     "crc-32": "^1.2.2",
-    "debug": "^4.4.3",
     "drizzle-orm": "^0.45.2",
     "ip-bigint": "^9.0.4",
     "is-cidr": "^7.0.0",
     "is-ip": "^5.0.1",
     "js-sha256": "^0.11.1",
     "nuxt": "^3.21.5",
+    "obug": "^2.1.1",
     "otpauth": "^9.5.1",
     "pinia": "^3.0.4",
     "qr": "^0.6.0",
@@ -58,7 +58,6 @@
   "devDependencies": {
     "@nuxt/eslint": "^1.15.2",
     "@nuxt/test-utils": "^4.0.3",
-    "@types/debug": "^4.1.13",
     "@types/phc__format": "^1.0.1",
     "@types/semver": "^7.7.1",
     "@vitest/coverage-v8": "^4.1.6",

src/pnpm-lock.yaml

@@ -56,9 +56,6 @@ importers:
       crc-32:
         specifier: ^1.2.2
         version: 1.2.2
-      debug:
-        specifier: ^4.4.3
-        version: 4.4.3
       drizzle-orm:
         specifier: ^0.45.2
         version: 0.45.2(@libsql/[email protected])
@@ -77,6 +74,9 @@ importers:
       nuxt:
         specifier: ^3.21.5
         version: 3.21.5(@libsql/[email protected])(@parcel/[email protected])(@types/[email protected])(@vue/[email protected])([email protected])([email protected](@libsql/[email protected])([email protected](@libsql/[email protected])))([email protected](@libsql/[email protected]))([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected]))([email protected]([email protected]))([email protected])
+      obug:
+        specifier: ^2.1.1
+        version: 2.1.1
       otpauth:
         specifier: ^9.5.1
         version: 9.5.1
@@ -114,9 +114,6 @@ importers:
       '@nuxt/test-utils':
         specifier: ^4.0.3
         version: 4.0.3(@vitest/[email protected])([email protected]([email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected]))([email protected])
-      '@types/debug':
-        specifier: ^4.1.13
-        version: 4.1.13
       '@types/phc__format':
         specifier: ^1.0.1
         version: 1.0.1
@@ -2510,9 +2507,6 @@ packages:
   '@types/[email protected]':
     resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==}
 
-  '@types/[email protected]':
-    resolution: {integrity: sha512-KSVgmQmzMwPlmtljOomayoR89W4FynCAi3E8PPs7vmDVPe84hT+vGPKkJfThkmXs0x0jAaa9U8uW8bbfyS2fWw==}
-
   '@types/[email protected]':
     resolution: {integrity: sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==}
 
@@ -2531,9 +2525,6 @@ packages:
   '@types/[email protected]':
     resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
-  '@types/[email protected]':
-    resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==}
-
   '@types/[email protected]':
     resolution: {integrity: sha512-TCFSk8IZh+iLX1xtksoBVtdmgL+1IX0fC9BeU4QqFSuNdN/K+HUlhqOzEmSYYpZUVsLYcPqc9KX+60iDuninSQ==}
 
@@ -8477,10 +8468,6 @@ snapshots:
       '@types/deep-eql': 4.0.2
       assertion-error: 2.0.1
 
-  '@types/[email protected]':
-    dependencies:
-      '@types/ms': 2.1.0
-
   '@types/[email protected]': {}
 
   '@types/[email protected]': {}
@@ -8493,8 +8480,6 @@ snapshots:
 
   '@types/[email protected]': {}
 
-  '@types/[email protected]': {}
-
   '@types/[email protected]':
     dependencies:
       undici-types: 7.24.6

src/server/database/sqlite.ts

@@ -1,7 +1,7 @@
 import { drizzle } from 'drizzle-orm/libsql';
 import { migrate as drizzleMigrate } from 'drizzle-orm/libsql/migrator';
 import { createClient } from '@libsql/client';
-import debug from 'debug';
+import { createDebug } from 'obug';
 import { eq } from 'drizzle-orm';
 
 import * as schema from './schema';
@@ -13,7 +13,7 @@ import { InterfaceService } from './repositories/interface/service';
 import { HooksService } from './repositories/hooks/service';
 import { OneTimeLinkService } from './repositories/oneTimeLink/service';
 
-const DB_DEBUG = debug('Database');
+const DB_DEBUG = createDebug('Database');
 
 const client = createClient({ url: 'file:/etc/wireguard/wg-easy.db' });
 const db = drizzle({ client, schema });

src/server/utils/WireGuard.ts

@@ -1,8 +1,8 @@
 import fs from 'node:fs/promises';
-import debug from 'debug';
+import { createDebug } from 'obug';
 import type { InterfaceType } from '#db/repositories/interface/types';
 
-const WG_DEBUG = debug('WireGuard');
+const WG_DEBUG = createDebug('WireGuard');
 
 const generateRandomHeaderValue = () =>
   Math.floor(Math.random() * 2147483642) + 5;

src/server/utils/cmd.ts

@@ -1,7 +1,7 @@
 import childProcess from 'child_process';
-import debug from 'debug';
+import { createDebug } from 'obug';
 
-const CMD_DEBUG = debug('CMD');
+const CMD_DEBUG = createDebug('CMD');
 
 export function exec(
   cmd: string,

src/server/utils/config.ts

@@ -1,9 +1,9 @@
-import debug from 'debug';
+import { createDebug } from 'obug';
 import packageJson from '@@/package.json';
 
 export const RELEASE = 'v' + packageJson.version;
 
-export const SERVER_DEBUG = debug('Server');
+export const SERVER_DEBUG = createDebug('Server');
 
 export const OLD_ENV = {
   /** @deprecated Only for migration purposes */

src/server/utils/firewall.ts

@@ -1,11 +1,11 @@
-import debug from 'debug';
+import { createDebug } from 'obug';
 import { isIPv6 } from 'is-ip';
 
 import type { ClientType } from '#db/repositories/client/types';
 import type { InterfaceType } from '#db/repositories/interface/types';
 import type { UserConfigType } from '#db/repositories/userConfig/types';
 
-const FW_DEBUG = debug('Firewall');
+const FW_DEBUG = createDebug('Firewall');
 const CHAIN_NAME = 'WG_CLIENTS';
 
 // Mutex to prevent concurrent rule rebuilds