freeschema 1.0.8 → 1.0.9

package/bin/freeschema.js

@@ -122,6 +122,47 @@ function generateMosquittoPassword(username, password) {
   return `${username}:$7$${iterations}$${salt.toString('base64')}$${hash.toString('base64')}\n`;
 }
 
+function waitForAccessControl(container) {
+  process.stdout.write('  Waiting for access-control-server');
+  for (let i = 0; i < 30; i++) {
+    const r = spawnSync('docker', [
+      'exec', container, 'curl', '-sf', 'http://localhost:7000/health'
+    ], { stdio: 'pipe' });
+    if (r.status === 0) { process.stdout.write(' ready\n'); return true; }
+    process.stdout.write('.');
+    sleep(2000);
+  }
+  process.stdout.write(' timed out\n');
+  return false;
+}
+
+function setupSuperAdmin() {
+  const env        = readEnv();
+  const adminId    = parseInt(env.SUPER_ADMIN_ID || '100000016', 10);
+  const out        = runComposeOutput(['ps', '--format', 'json']);
+  const containers = out.split('\n')
+    .map(l => { try { return JSON.parse(l); } catch { return null; } })
+    .filter(Boolean);
+  const ac = containers.find(c => c.Service === 'access-control-server');
+  if (!ac) return;
+  const container = ac.Name || ac.ID;
+
+  if (!waitForAccessControl(container)) return;
+
+  const result = spawnSync('docker', [
+    'exec', container, 'curl', '-sf',
+    '-X', 'POST', 'http://localhost:7000/api/access/super-admin/concept',
+    '-H', 'Content-Type: application/json',
+    '-d', JSON.stringify({ ConceptId: adminId })
+  ], { stdio: ['inherit', 'pipe', 'pipe'] });
+
+  if (result.status === 0) {
+    console.log(`  Super admin    concept ${adminId} ✓`);
+  } else {
+    console.log(`  Super admin    already set or skipped`);
+  }
+}
+
 function ensureMosquittoConfig(cwd) {
   const dir = (sub) => path.join(cwd, 'mosquitto', sub);
   ['config', 'data', 'log'].forEach(d => {
@@ -556,6 +597,9 @@ async function cmdStart() {
     console.log('  Seed applied ✓');
   }
 
+  console.log('\nFinalizing setup…');
+  setupSuperAdmin();
+
   console.log('\nFreeSchema is running.');
   console.log('  Status: freeschema status');
   console.log('  Logs:   freeschema logs');

package/package.json

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

package/templates/.env.example

@@ -121,3 +121,8 @@ DISABLE_SWAGGER=true
 # ====================================
 CLIENT_ID=
 CLIENT_SECRET=
+
+# ====================================
+# SUPER ADMIN SETUP
+# ====================================
+SUPER_ADMIN_ID=100000016

package/templates/docker-compose.yml

@@ -188,6 +188,12 @@ services:
         condition: service_started
     networks:
       - freeschema-network
+    healthcheck:
+      test: ["CMD-SHELL", "curl -sI http://localhost:5000/health || exit 1"]
+      interval: 1m30s
+      timeout: 30s
+      retries: 5
+      start_period: 30s
 
   log-server:
     image: mentorayush/log-server:latest
@@ -229,6 +235,12 @@ services:
       - node-server
     networks:
       - freeschema-network
+    healthcheck:
+      test: ["CMD-SHELL", "wget -q --spider http://localhost/ || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
 
   wico-app:
     image: mentorayush/wico-app:latest
@@ -243,6 +255,12 @@ services:
       - node-server
     networks:
       - freeschema-network
+    healthcheck:
+      test: ["CMD-SHELL", "wget -q --spider http://localhost/ || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
 
   nginx-server:
     image: nginx:alpine
@@ -255,13 +273,20 @@ services:
     volumes:
       - ./nginx/nginx.conf.template:/etc/nginx/templates/default.conf.template:ro
     depends_on:
-      - wico-app
-      - vccs-app
-      - node-server
-      - node-cache-server
-      - log-server
-      - wico-server
-      - access-control-server
+      access-control-server:
+        condition: service_healthy
+      wico-server:
+        condition: service_healthy
+      node-server:
+        condition: service_healthy
+      node-cache-server:
+        condition: service_healthy
+      log-server:
+        condition: service_healthy
+      vccs-app:
+        condition: service_healthy
+      wico-app:
+        condition: service_healthy
     networks:
       - freeschema-network