freeschema 1.0.10 → 1.0.12

package/bin/freeschema.js

@@ -122,9 +122,18 @@ function generateMosquittoPassword(username, password) {
   return `${username}:$7$${iterations}$${salt.toString('base64')}$${hash.toString('base64')}\n`;
 }
 
+function isContainerHealthy(containerName) {
+  const r = spawnSync('docker', [
+    'inspect', '--format', '{{.State.Health.Status}}', containerName
+  ], { stdio: 'pipe' });
+  return (r.stdout || '').toString().trim() === 'healthy';
+}
+
 function waitForAccessControl(container) {
+  if (isContainerHealthy(container)) return true;  // already healthy — no wait needed
   process.stdout.write('  Waiting for access-control-server');
-  for (let i = 0; i < 30; i++) {
+  for (let i = 0; i < 60; i++) {  // 60 × 2s = 120s
+    if (isContainerHealthy(container)) { process.stdout.write(' ready\n'); return true; }
     const r = spawnSync('docker', [
       'exec', container, 'curl', '-sf', 'http://localhost:7000/health'
     ], { stdio: 'pipe' });
@@ -147,7 +156,10 @@ function setupSuperAdmin() {
   if (!ac) return;
   const container = ac.Name || ac.ID;
 
-  if (!waitForAccessControl(container)) return;
+  if (!isContainerHealthy(container)) {
+    console.log('  Super admin    will be set on next start (access-control still starting)');
+    return;
+  }
 
   const result = spawnSync('docker', [
     'exec', container, 'curl', '-sf',
@@ -600,21 +612,18 @@ async function cmdStart() {
   console.log('\nFinalizing setup…');
   setupSuperAdmin();
 
-  console.log('\nFreeSchema is running.');
-  console.log('  Status: freeschema status');
-  console.log('  Logs:   freeschema logs');
-  console.log('  Stop:   freeschema stop');
-
-  // Auto-setup credentials if CLIENT_SECRET is missing or placeholder
   const envAfterStart = readEnv();
   const clientSecret  = envAfterStart.CLIENT_SECRET || '';
-  const isPlaceholder = clientSecret === '' || clientSecret === 'sk_test_placeholder';
+  const isPlaceholder = !clientSecret || clientSecret === 'sk_test_placeholder';
+
+  console.log('\nFreeSchema is running.');
+  console.log('  Status:  freeschema status');
+  console.log('  Logs:    freeschema logs');
+  console.log('  Stop:    freeschema stop');
   if (isPlaceholder) {
-    console.log('\n─────────────────────────────────────────');
-    console.log('  CLIENT_SECRET is not configured.');
-    console.log('  Setting up admin credentials…');
-    console.log('─────────────────────────────────────────');
-    await cmdSetupCredentials();
+    console.log('\n  CLIENT_SECRET is not set yet.');
+    console.log('  Once services are healthy, run:');
+    console.log('    freeschema setup-credentials');
   }
 }
 
@@ -770,8 +779,10 @@ function getWicoContainer() {
 }
 
 function waitForWicoServer(container, maxAttempts = 60) {
+  if (isContainerHealthy(container)) return true;  // already healthy — no wait needed
   process.stdout.write('  Waiting for wico-server');
   for (let i = 0; i < maxAttempts; i++) {
+    if (isContainerHealthy(container)) { process.stdout.write(' ready\n'); return true; }
     const r = spawnSync('docker', [
       'exec', container, 'curl', '-sf', 'http://localhost:7000/health'
     ], { stdio: 'pipe' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freeschema",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "FreeSchema — self-hosted deployment CLI",
   "keywords": [
     "freeschema",