wip

Author: xquanluu

app.js

@@ -259,6 +259,9 @@ srf.use('options', [
 srf.register(require('./lib/register')({logger}));
 srf.options(require('./lib/options')({srf, logger}));
 
+// Start CLI runtime config server with access to srf.locals
+require('./lib/cli/runtime-config').initialize(srf.locals);
+
 setInterval(async() => {
   const count = await srf.locals.registrar.getCountOfUsers();
   debug(`count of registered users: ${count}`);

lib/cli/cli.js

@@ -85,6 +85,20 @@ async function handleFeatureServerCommand(args) {
       }
       break;
 
+    case 'active':
+      const active = await sendCommand('fs-available');
+      if (active.error || !active.success) {
+        console.error('Error:', active.error || 'Failed to get active servers');
+        process.exit(1);
+      }
+      if (active.available.length === 0) {
+        console.log('No active feature servers found');
+      } else {
+        console.log('Available feature servers:');
+        active.available.forEach((s) => console.log(`  🟢 ${s}`));
+      }
+      break;
+
     case 'list':
       const list = await sendCommand('fs-list');
       if (list.error) {
@@ -108,7 +122,7 @@ async function handleFeatureServerCommand(args) {
 
     default:
       console.error('Unknown command:', cmd);
-      console.error('Use: drain, undrain, drained, list');
+      console.error('Use: drain, undrain, drained, active, list');
       process.exit(1);
   }
 }
@@ -121,7 +135,8 @@ async function main() {
     console.log('  sbc-cli fs drain <ip>        Drain server by IP');
     console.log('  sbc-cli fs undrain <ip>      Undrain server by IP');
     console.log('  sbc-cli fs drained           List drained server IPs');
-    console.log('  sbc-cli fs list              List all servers');
+    console.log('  sbc-cli fs active            List active/available servers');
+    console.log('  sbc-cli fs list              List all servers with status');
     console.log('  sbc-cli set <key> <value>    Set config');
     console.log('  sbc-cli get <key>            Get config');
     console.log('  sbc-cli list                 List all config');
@@ -130,6 +145,7 @@ async function main() {
     console.log('  sbc-cli fs drain 192.168.1.10');
     console.log('  sbc-cli fs undrain 192.168.1.10');
     console.log('  sbc-cli fs drained');
+    console.log('  sbc-cli fs active');
     return;
   }
 
@@ -139,7 +155,7 @@ async function main() {
     switch (cmd) {
       case 'fs':
         if (args.length < 2) {
-          console.error('fs needs: drain, undrain, drained, or list');
+          console.error('fs needs: drain, undrain, drained, active, or list');
           process.exit(1);
         }
         await handleFeatureServerCommand(args.slice(1));

lib/cli/runtime-config.js

@@ -31,9 +31,10 @@ async function processQueue() {
 }
 
 class RuntimeConfig {
-  constructor() {
+  constructor(srfLocals = null) {
     this.server = null;
     this.socketPath = process.env.SBC_SOCKET_PATH || '/tmp/sbc-sip-sidecar.sock';
+    this.srfLocals = srfLocals;
     this.startServer();
   }
 
@@ -99,6 +100,25 @@ class RuntimeConfig {
     return runOperation(() => Object.fromEntries(config));
   }
 
+  async getAvailableFeatureServers() {
+    return runOperation(async() => {
+      if (!this.srfLocals || !this.srfLocals.retrieveSet) {
+        return { error: 'Redis connection not available' };
+      }
+
+      const JAMBONES_CLUSTER_ID = process.env.JAMBONES_CLUSTER_ID;
+      const setNameFs = `${(JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
+
+      try {
+        const activeServers = await this.srfLocals.retrieveSet(setNameFs);
+        return { activeServers: activeServers || [] };
+      } catch (err) {
+        logger.error({ err }, 'Error retrieving active feature servers');
+        return { error: 'Failed to retrieve active feature servers' };
+      }
+    });
+  }
+
   startServer() {
     try {
       require('fs').unlinkSync(this.socketPath);
@@ -232,6 +252,21 @@ class RuntimeConfig {
           socket.write(JSON.stringify({ success: true, config: allConfig }) + '\n');
           break;
 
+        case 'fs-available':
+          const availableResult = await this.getAvailableFeatureServers();
+          if (availableResult.error) {
+            socket.write(JSON.stringify({
+              success: false,
+              error: availableResult.error
+            }) + '\n');
+          } else {
+            socket.write(JSON.stringify({
+              success: true,
+              available: availableResult.activeServers
+            }) + '\n');
+          }
+          break;
+
         default:
           socket.write(JSON.stringify({ error: 'Unknown action' }) + '\n');
       }
@@ -253,9 +288,23 @@ class RuntimeConfig {
   }
 }
 
-const runtimeConfig = new RuntimeConfig();
+let runtimeConfig = null;
 
-process.on('SIGINT', () => runtimeConfig.shutdown());
-process.on('SIGTERM', () => runtimeConfig.shutdown());
+function initializeRuntimeConfig(srfLocals) {
+  if (!runtimeConfig) {
+    runtimeConfig = new RuntimeConfig(srfLocals);
+    process.on('SIGINT', () => runtimeConfig.shutdown());
+    process.on('SIGTERM', () => runtimeConfig.shutdown());
+  }
+  return runtimeConfig;
+}
+
+// For backward compatibility - create without srfLocals if imported directly
+if (!runtimeConfig) {
+  runtimeConfig = new RuntimeConfig();
+  process.on('SIGINT', () => runtimeConfig.shutdown());
+  process.on('SIGTERM', () => runtimeConfig.shutdown());
+}
 
 module.exports = runtimeConfig;
+module.exports.initialize = initializeRuntimeConfig;