fix: repair proxy migration and pairing-code flow

Add an idempotent webhook proxy migration with a collision-free ID and improve database and migration diagnostics. Fix duplicate session connection requests and pairing-code display errors in the dashboard.

Author: Nicolás Gudiño

db.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"
+	"github.com/rs/zerolog/log"
 	_ "modernc.org/sqlite"
 )
 
@@ -85,6 +86,20 @@ func initializePostgres(config DatabaseConfig) (*sqlx.DB, error) {
 		return nil, fmt.Errorf("failed to ping postgres database: %w", err)
 	}
 
+	var databaseName, schemaName string
+	if err := db.QueryRow("SELECT current_database(), current_schema()").Scan(&databaseName, &schemaName); err != nil {
+		return nil, fmt.Errorf("failed to identify postgres database: %w", err)
+	}
+	log.Info().
+		Str("driver", "postgres").
+		Str("host", config.Host).
+		Str("port", config.Port).
+		Str("database", databaseName).
+		Str("schema", schemaName).
+		Str("user", config.User).
+		Str("sslmode", config.SSLMode).
+		Msg("Database connection established")
+
 	return db, nil
 }
 

handlers.go

@@ -277,7 +277,8 @@ func (s *server) Connect() http.HandlerFunc {
 		if clientManager.GetWhatsmeowClient(txtid) != nil {
 			isConnected := clientManager.GetWhatsmeowClient(txtid).IsConnected()
 			if isConnected == true {
-				s.Respond(w, r, http.StatusInternalServerError, errors.New("already connected"))
+				log.Warn().Str("user_id", txtid).Msg("Connect request rejected because client is already connected")
+				s.Respond(w, r, http.StatusConflict, errors.New("already connected"))
 				return
 			}
 		}
@@ -729,6 +730,8 @@ func (s *server) PairPhone() http.HandlerFunc {
 			return
 		}
 
+		log.Info().Str("user_id", txtid).Msg("Requesting WhatsApp phone pairing code")
+
 		isLoggedIn := clientManager.GetWhatsmeowClient(txtid).IsLoggedIn()
 		if isLoggedIn {
 			log.Error().Msg(fmt.Sprintf("%s", "already paired"))
@@ -738,7 +741,7 @@ func (s *server) PairPhone() http.HandlerFunc {
 
 		linkingCode, err := clientManager.GetWhatsmeowClient(txtid).PairPhone(context.Background(), t.Phone, true, whatsmeow.PairClientChrome, "Chrome (Linux)")
 		if err != nil {
-			log.Error().Msg(fmt.Sprintf("%s", err))
+			log.Error().Err(err).Str("user_id", txtid).Msg("Failed to request WhatsApp phone pairing code")
 			s.Respond(w, r, http.StatusBadRequest, err)
 			return
 		}
@@ -5460,6 +5463,11 @@ func (s *server) ListUsers() http.HandlerFunc {
 
 		rows, err := s.db.Queryx(query, args...)
 		if err != nil {
+			log.Error().
+				Err(err).
+				Str("driver", s.db.DriverName()).
+				Bool("single_user", hasID).
+				Msg("Failed to query users for admin request")
 			s.Respond(w, r, http.StatusInternalServerError, errors.New("problem accessing DB"))
 			return
 		}
@@ -5472,7 +5480,10 @@ func (s *server) ListUsers() http.HandlerFunc {
 			var user usersStruct
 			err := rows.StructScan(&user)
 			if err != nil {
-				log.Error().Str("error", fmt.Sprintf("%v", err)).Msg("admin DB error")
+				log.Error().
+					Err(err).
+					Str("driver", s.db.DriverName()).
+					Msg("Failed to scan user for admin request")
 				s.Respond(w, r, http.StatusInternalServerError, errors.New("problem accessing DB"))
 				return
 			}
@@ -5539,6 +5550,10 @@ func (s *server) ListUsers() http.HandlerFunc {
 		}
 		// Check for any error that occurred during iteration
 		if err := rows.Err(); err != nil {
+			log.Error().
+				Err(err).
+				Str("driver", s.db.DriverName()).
+				Msg("Failed while iterating users for admin request")
 			s.Respond(w, r, http.StatusInternalServerError, errors.New("problem accessing DB"))
 			return
 		}

main.go

@@ -268,8 +268,8 @@ func main() {
 	}
 
 	log.Info().
-		Bool("use_proxy", *globalWebhookUseProxy).
-		Msg("Webhook Proxy Configured")
+		Bool("use_proxy_when_configured", *globalWebhookUseProxy).
+		Msg("Webhook proxy routing policy configured")
 
 	log.Info().
 		Bool("enabled", *webhookRetryEnabled).

migrations.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/jmoiron/sqlx"
+	"github.com/rs/zerolog/log"
 )
 
 type Migration struct {
@@ -80,6 +81,11 @@ var migrations = []Migration{
 		Name:  "add_webhook_use_proxy",
 		UpSQL: addWebhookUseProxySQL,
 	},
+	{
+		ID:    12,
+		Name:  "repair_webhook_use_proxy",
+		UpSQL: repairWebhookUseProxySQL,
+	},
 }
 
 const changeIDToStringSQL = `
@@ -236,16 +242,19 @@ END $$;
 
 const addWebhookUseProxySQL = `
 -- PostgreSQL version
-DO $$
-BEGIN
-    IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'users' AND column_name = 'webhook_use_proxy') THEN
-        ALTER TABLE users ADD COLUMN webhook_use_proxy BOOLEAN DEFAULT TRUE;
-    END IF;
-END $$;
+ALTER TABLE users ADD COLUMN IF NOT EXISTS webhook_use_proxy BOOLEAN DEFAULT TRUE;
 
 -- SQLite version (handled in code)
 `
 
+// Migration 10 collided with migrations from another development branch and
+// also used an information_schema lookup that was not scoped to the active
+// schema. Keep this as a separate, globally unused migration ID so databases
+// that already recorded a different migration 10 or 11 are repaired.
+const repairWebhookUseProxySQL = `
+ALTER TABLE users ADD COLUMN IF NOT EXISTS webhook_use_proxy BOOLEAN DEFAULT TRUE;
+`
+
 // GenerateRandomID creates a random string ID
 func GenerateRandomID() (string, error) {
 	bytes := make([]byte, 16) // 128 bits
@@ -269,11 +278,51 @@ func initializeSchema(db *sqlx.DB) error {
 	}
 
 	// Apply missing migrations
+	sourceMigrations := make(map[int]string, len(migrations))
+	for _, migration := range migrations {
+		sourceMigrations[migration.ID] = migration.Name
+		if appliedName, ok := applied[migration.ID]; ok && appliedName != migration.Name {
+			log.Warn().
+				Int("migration_id", migration.ID).
+				Str("database_name", appliedName).
+				Str("binary_name", migration.Name).
+				Msg("Database migration ID has a different name in this binary")
+		}
+	}
+	for id, appliedName := range applied {
+		if _, ok := sourceMigrations[id]; !ok {
+			log.Warn().
+				Int("migration_id", id).
+				Str("database_name", appliedName).
+				Msg("Database contains a migration unknown to this binary")
+		}
+	}
+
+	pending := 0
+	for _, migration := range migrations {
+		if _, ok := applied[migration.ID]; !ok {
+			pending++
+		}
+	}
+	log.Info().
+		Str("driver", db.DriverName()).
+		Int("applied", len(applied)).
+		Int("pending", pending).
+		Msg("Database migration status")
+
 	for _, migration := range migrations {
 		if _, ok := applied[migration.ID]; !ok {
+			log.Info().
+				Int("migration_id", migration.ID).
+				Str("migration_name", migration.Name).
+				Msg("Applying database migration")
 			if err := applyMigration(db, migration); err != nil {
 				return fmt.Errorf("failed to apply migration %d: %w", migration.ID, err)
 			}
+			log.Info().
+				Int("migration_id", migration.ID).
+				Str("migration_name", migration.Name).
+				Msg("Database migration applied")
 		}
 	}
 
@@ -322,8 +371,8 @@ func createMigrationsTable(db *sqlx.DB) error {
 	return nil
 }
 
-func getAppliedMigrations(db *sqlx.DB) (map[int]struct{}, error) {
-	applied := make(map[int]struct{})
+func getAppliedMigrations(db *sqlx.DB) (map[int]string, error) {
+	applied := make(map[int]string)
 	var rows []struct {
 		ID   int    `db:"id"`
 		Name string `db:"name"`
@@ -335,7 +384,7 @@ func getAppliedMigrations(db *sqlx.DB) (map[int]struct{}, error) {
 	}
 
 	for _, row := range rows {
-		applied[row.ID] = struct{}{}
+		applied[row.ID] = row.Name
 	}
 
 	return applied, nil
@@ -473,7 +522,7 @@ func applyMigration(db *sqlx.DB, migration Migration) error {
 		} else {
 			_, err = tx.Exec(migration.UpSQL)
 		}
-	} else if migration.ID == 10 {
+	} else if migration.ID == 10 || migration.ID == 12 {
 		if db.DriverName() == "sqlite" {
 			err = addColumnIfNotExistsSQLite(tx, "users", "webhook_use_proxy", "BOOLEAN DEFAULT 1")
 		} else {

static/dashboard/js/app.js

@@ -189,31 +189,31 @@ document.addEventListener('DOMContentLoaded', function() {
     return false;
   });
 
-  document.getElementById('pairphoneinput').addEventListener('keypress', function(e) {
-    if (e.key === 'Enter') {
-      const phone = e.currentTarget.value.trim();
-      if (phone) {
-        connect().then((data) => {
-          if(data.success==true) {
-            pairPhone(phone)
-              .then((data) => {
-                document.getElementById('pairHelp').classList.add('hidden');;
-                // Success case
-                if (data.success && data.data && data.data.LinkingCode) {
-                  document.getElementById('pairInfo').innerHTML = `Your link code is: ${data.data.LinkingCode}`;
-                  scanInterval = setInterval(checkStatus, 1000);
-                } else {
-                  document.getElementById('pairInfo').innerHTML = "Problem getting pairing code";
-                }
-              })
-              .catch((error) => {
-                // Error case
-                document.getElementById('pairInfo').innerHTML = "Problem getting pairing code";
-                console.error('Pairing error:', error);
-              });
-          }
-      });
+  document.getElementById('pairphoneinput').addEventListener('keypress', async function(e) {
+    if (e.key !== 'Enter') return;
+
+    e.preventDefault();
+    const input = e.currentTarget;
+    const phone = input.value.trim();
+    if (!phone || input.disabled) return;
+
+    // This modal is shown only after /session/connect has established the
+    // WhatsApp socket. Calling connect() again here made the pairing flow fail
+    // with "already connected" before /session/pairphone was ever requested.
+    input.disabled = true;
+    try {
+      const data = await pairPhone(phone);
+      document.getElementById('pairHelp').classList.add('hidden');
+      if (data.success && data.data && data.data.LinkingCode) {
+        document.getElementById('pairInfo').textContent = `Your link code is: ${data.data.LinkingCode}`;
+      } else {
+        document.getElementById('pairInfo').textContent = `Problem getting pairing code: ${data.error || 'unknown error'}`;
       }
+    } catch (error) {
+      document.getElementById('pairInfo').textContent = "Problem getting pairing code: request failed";
+      console.error('Pairing error:', error);
+    } finally {
+      input.disabled = false;
     }
   });
 
@@ -1067,12 +1067,12 @@ async function pairPhone(phone) {
   const myHeaders = new Headers();
   myHeaders.append('token', token);
   myHeaders.append('Content-Type', 'application/json');
-  res = await fetch(baseUrl + "/session/pairphone", {
+  const res = await fetch(baseUrl + "/session/pairphone", {
     method: "POST",
     headers: myHeaders,
     body: JSON.stringify({Phone: phone})
   });
-  data = await res.json();
+  const data = await res.json();
   return data;
 }
 
@@ -1167,7 +1167,6 @@ function init() {
 
   // Starting
   let notoken=0;
-  let scanInterval;
   let token = getLocalStorageItem('token');
   let admintoken = getLocalStorageItem('admintoken');
   let isAdminLogin = getLocalStorageItem('isAdmin');
@@ -1513,7 +1512,7 @@ function populateInstances(instances) {
             <div class="extra content">
               <button class="ui primary positive button dashboard-button ${instance.connected === true ? 'hidden' : ''}" id="button-connect-${instance.id}" onclick="connect('${instance.token}')">Connect</button>
               <button class="ui primary negative button dashboard-button ${instance.connected === true ? '' : 'hidden'}" id="button-logout-${instance.id}" onclick="logout('${instance.token}')">Logout</button>
-              <button class="ui primary positive button dashboard-button ${instance.connected === true && instance.loggedIn === false ? '' : 'hidden'} id="button-logout-${instance.id}" onclick="modalPairPhone()">Login with Pairing Code</button>
+              <button class="ui primary positive button dashboard-button ${instance.connected === true && instance.loggedIn === false ? '' : 'hidden'}" id="button-pair-${instance.id}" onclick="modalPairPhone()">Login with Pairing Code</button>
               </div>
         </div>
         `;