@mostajs/setup 2.1.25 → 2.1.28

package/dist/api/routes.js

@@ -85,7 +85,31 @@ export function createSetupRoutes(config) {
                         const { NetClient } = await import('../lib/net-client.js');
                         const client = new NetClient({ url: body.url });
                         const health = await client.health();
-                        return Response.json({ ok: true, ...health });
+                        // Auto-save MOSTA_DATA, MOSTA_NET_URL, MOSTA_NET_TRANSPORT in .env.local
+                        try {
+                            const { readFileSync, writeFileSync, existsSync } = await import('fs');
+                            const { resolve } = await import('path');
+                            const envPath = resolve(process.cwd(), '.env.local');
+                            let content = existsSync(envPath) ? readFileSync(envPath, 'utf-8') : '';
+                            const updates = {
+                                'MOSTA_DATA': 'net',
+                                'MOSTA_NET_URL': body.url,
+                                'MOSTA_NET_TRANSPORT': body.transport || 'rest',
+                            };
+                            for (const [key, val] of Object.entries(updates)) {
+                                const regex = new RegExp(`^${key}=.*$`, 'm');
+                                if (regex.test(content)) {
+                                    content = content.replace(regex, `${key}=${val}`);
+                                }
+                                else {
+                                    content += `\n${key}=${val}`;
+                                }
+                                process.env[key] = val;
+                            }
+                            writeFileSync(envPath, content);
+                        }
+                        catch { }
+                        return Response.json({ ok: true, ...health, saved: true });
                     }
                     catch (e) {
                         return Response.json({ ok: false, error: e instanceof Error ? e.message : 'Connexion echouee' });

package/dist/components/SetupWizard.js

@@ -836,7 +836,7 @@ export default function SetupWizard({ t: tProp, onComplete, endpoints = {}, dbNa
                                             const res = await fetch(ep.setupJson.replace('setup-json', 'net-test'), {
                                                 method: 'POST',
                                                 headers: { 'Content-Type': 'application/json' },
-                                                body: JSON.stringify({ url: netUrl }),
+                                                body: JSON.stringify({ url: netUrl, transport: netTransport }),
                                             });
                                             const data = await res.json();
                                             setNetTestResult(data);

package/dist/lib/load-setup-json.js

@@ -93,7 +93,7 @@ function buildConfig(json, repoFactory) {
             if (json.rbac.roles?.length) {
                 const roleRepo = await getRepo('role');
                 const allPermIds = Object.values(permissionMap);
-                for (const roleDef of json.rbac.roles.filter(r => r.name)) {
+                for (const roleDef of json.rbac.roles.filter(r => r.name && r.name.trim() !== '')) {
                     const permissionIds = roleDef.permissions.includes('*')
                         ? allPermIds
                         : roleDef.permissions.map(code => permissionMap[code]).filter(Boolean);

package/dist/lib/setup.js

@@ -73,14 +73,50 @@ export async function runInstall(installConfig, setupConfig) {
         // 4. Disconnect existing dialect singleton
         const { disconnectDialect } = await import('@mostajs/orm');
         await disconnectDialect();
-        // 4. Seed RBAC
         const seeded = [];
-        if (setupConfig.seedRBAC) {
-            await setupConfig.seedRBAC();
-            seeded.push('categories', 'permissions', 'roles');
+        // 4. Discover modules and seed RBAC
+        const { discoverModules } = await import('./module-registry.js');
+        const modules = await discoverModules(installConfig.modules);
+        // 4a. Read setup.json for RBAC + seed data
+        const fs = await import('fs');
+        const path = await import('path');
+        let setupJson = null;
+        const setupJsonPath = path.resolve(process.cwd(), 'setup.json');
+        if (fs.existsSync(setupJsonPath)) {
+            try {
+                setupJson = JSON.parse(fs.readFileSync(setupJsonPath, 'utf-8'));
+            }
+            catch { }
         }
-        // 5. Create admin user
-        if (setupConfig.createAdmin) {
+        // 4b. Seed each module (RBAC gets setup.json.rbac data from Studio)
+        for (const mod of modules) {
+            try {
+                const seedData = setupJson?.[mod.name] || {};
+                await mod.seed(seedData);
+                seeded.push(mod.name);
+            }
+            catch (err) {
+                console.error(`[Setup] Module "${mod.name}" seed failed:`, err);
+            }
+        }
+        // 5. Create admin via rbac module (not setup — rbac handles hash + role)
+        const rbacModule = modules.find(m => m.createAdmin);
+        if (rbacModule && installConfig.admin?.email) {
+            try {
+                await rbacModule.createAdmin({
+                    email: installConfig.admin.email,
+                    password: installConfig.admin.password,
+                    firstName: installConfig.admin.firstName,
+                    lastName: installConfig.admin.lastName,
+                });
+                seeded.push('admin');
+            }
+            catch (err) {
+                console.error('[Setup] createAdmin failed:', err);
+            }
+        }
+        else if (setupConfig.createAdmin) {
+            // Legacy fallback — app provides its own createAdmin
             const bcryptModule = await import('bcryptjs');
             const bcrypt = bcryptModule.default || bcryptModule;
             const hashedPassword = await bcrypt.hash(installConfig.admin.password, 12);
@@ -92,16 +128,17 @@ export async function runInstall(installConfig, setupConfig) {
             });
             seeded.push('admin');
         }
-        // 6. Optional seeds (runtime registry or legacy)
-        if (setupConfig.runModuleSeeds) {
-            await setupConfig.runModuleSeeds(installConfig.modules);
-            seeded.push('module-seeds');
-        }
-        else if (setupConfig.optionalSeeds && installConfig.seed) {
+        // 6. Optional seeds from setup.json (app-specific: activities, clients, plans)
+        if (setupConfig.optionalSeeds && installConfig.seed) {
             for (const seedDef of setupConfig.optionalSeeds) {
                 if (installConfig.seed[seedDef.key]) {
-                    await seedDef.run({});
-                    seeded.push(seedDef.key);
+                    try {
+                        await seedDef.run({});
+                        seeded.push(seedDef.key);
+                    }
+                    catch (err) {
+                        console.error(`[Setup] Seed "${seedDef.key}" failed:`, err);
+                    }
                 }
             }
         }
@@ -142,16 +179,18 @@ async function runNetInstall(installConfig, setupConfig) {
             extraVars['MOSTAJS_MODULES'] = installConfig.modules.join(',');
         }
         const seeded = [];
-        // 2. Verify NET server is reachable (retry up to 10s if just restarted)
+        // 2. Verify NET server is reachable (retry with backoff, max 20s)
         let health = null;
-        for (let i = 0; i < 10; i++) {
+        let retryDelay = 500;
+        for (let i = 0; i < 15; i++) {
             try {
                 health = await net.health();
                 if (health.entities?.length > 0)
                     break;
             }
             catch { }
-            await new Promise(r => setTimeout(r, 1000));
+            await new Promise(r => setTimeout(r, retryDelay));
+            retryDelay = Math.min(retryDelay * 1.5, 3000);
         }
         if (!health) {
             return { ok: false, error: 'Serveur NET non joignable', needsRestart: false };
@@ -200,8 +239,24 @@ async function runNetInstall(installConfig, setupConfig) {
                         // Si le serveur redémarre, attendre qu'il soit de retour
                         if (result.needsRestart) {
                             console.log('[Setup] Serveur NET redémarre pour charger les schemas...');
-                            await new Promise(r => setTimeout(r, 4000)); // Laisser le temps au process.exit + restart
-                            // Poll health jusqu'à ce que le serveur soit de retour (max 30s)
+                            // Phase 1 : attendre que le serveur soit DOWN (max 10s)
+                            let serverDown = false;
+                            for (let i = 0; i < 20; i++) {
+                                try {
+                                    await net.health();
+                                    // Encore up — attendre
+                                }
+                                catch {
+                                    serverDown = true;
+                                    break;
+                                }
+                                await new Promise(r => setTimeout(r, 500));
+                            }
+                            if (!serverDown) {
+                                console.log('[Setup] Serveur n\'a pas redémarré — continue quand même');
+                            }
+                            // Phase 2 : attendre que le serveur soit UP avec schemas (max 60s, backoff)
+                            let backoff = 500;
                             for (let i = 0; i < 30; i++) {
                                 try {
                                     const h = await net.health();
@@ -211,7 +266,8 @@ async function runNetInstall(installConfig, setupConfig) {
                                     }
                                 }
                                 catch { }
-                                await new Promise(r => setTimeout(r, 1000));
+                                await new Promise(r => setTimeout(r, backoff));
+                                backoff = Math.min(backoff * 1.5, 3000); // backoff: 500→750→1125→...→3000ms max
                             }
                             // Recharger la collection map
                             await net.loadCollectionMap();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mostajs/setup",
-  "version": "2.1.25",
+  "version": "2.1.28",
   "description": "Reusable setup wizard module — multi-dialect DB configuration, .env.local writer, seed runner",
   "author": "Dr Hamid MADANI <drmdh@msn.com>",
   "license": "MIT",