baraqex 1.0.68 → 1.0.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baraqex",
-  "version": "1.0.68",
+  "version": "1.0.69",
   "description": "A powerful full-stack framework for modern web development",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/templates/fullstack-template/package-lock.json

@@ -9,9 +9,9 @@
       "version": "0.1.0",
       "license": "MIT",
       "dependencies": {
-        "baraqex": "^1.0.67",
+        "baraqex": "^1.0.68",
         "dotenv": "^16.0.0",
-        "express": "^4.18.0"
+        "express": "^4.21.2"
       },
       "devDependencies": {
         "@types/express": "^4.17.0",
@@ -699,9 +699,9 @@
       }
     },
     "node_modules/baraqex": {
-      "version": "1.0.67",
-      "resolved": "https://registry.npmjs.org/baraqex/-/baraqex-1.0.67.tgz",
-      "integrity": "sha512-9s6N9069xXqrUPx/9qm/IbcddnzNbU0uau1Rpawukes6vTBBEktdfPieUy+xrDJQqiDs651wnF1EAuoLuRmsdQ==",
+      "version": "1.0.68",
+      "resolved": "https://registry.npmjs.org/baraqex/-/baraqex-1.0.68.tgz",
+      "integrity": "sha512-S9YqZw4a/h0atirvgyZQpXr8fR+XyOje3UAOQtewl2c2G19K01BJG0kCKKshQziV0o7dw7RO1P3iHkpZ3OL1eA==",
       "license": "MIT",
       "dependencies": {
         "chokidar": "^4.0.3",

package/templates/fullstack-template/package.json

@@ -12,15 +12,15 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "baraqex": "^1.0.67",
-    "express": "^4.18.0",
-    "dotenv": "^16.0.0"
+    "baraqex": "^1.0.68",
+    "dotenv": "^16.0.0",
+    "express": "^4.21.2"
   },
   "devDependencies": {
     "@types/express": "^4.17.0",
     "@types/node": "^20.0.0",
-    "typescript": "^5.0.0",
-    "tsx": "^4.0.0"
+    "tsx": "^4.0.0",
+    "typescript": "^5.0.0"
   },
   "engines": {
     "node": ">=16.0.0"

package/templates/fullstack-template/src/pages/index.tsx

@@ -1,7 +1,13 @@
 import { useState, useEffect } from 'baraqex';
 
+interface User {
+  id: number;
+  name: string;
+  email: string;
+}
+
 export default function HomePage() {
-  const [users, setUsers] = useState([]);
+  const [users, setUsers] = useState<User[]>([]);
   const [newUser, setNewUser] = useState({ name: '', email: '' });
   const [loading, setLoading] = useState(false);
 
@@ -22,7 +28,7 @@ export default function HomePage() {
     }
   };
 
-  const handleSubmit = async (e) => {
+  const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
     setLoading(true);
 

package/templates/fullstack-template/src/server.ts

@@ -1,4 +1,3 @@
-import { createServer } from 'baraqex/server';
 import dotenv from 'dotenv';
 
 // Load environment variables
@@ -27,89 +26,195 @@ const config = {
   }
 };
 
-// Create server instance
-const server = createServer(config);
-
-// Health check endpoint
-const app = server.getExpressApp();
-app.get('/health', (req, res) => {
-  res.json({ 
-    status: 'ok', 
-    timestamp: new Date().toISOString(),
-    version: process.env.npm_package_version || '1.0.0',
-    environment: process.env.NODE_ENV || 'development'
-  });
-});
-
-// API status endpoint
-app.get('/api/status', (req, res) => {
-  const db = server.getDatabase();
-  res.json({
-    api: 'online',
-    database: db ? 'connected' : 'not configured',
-    authentication: server.getAuth() ? 'enabled' : 'disabled',
-    timestamp: new Date().toISOString()
-  });
-});
-
-// Database connection
-async function connectDatabase() {
-  const db = server.getDatabase();
-  if (db) {
+// Wait for baraqex to be ready
+async function waitForBaraqex() {
+  const maxWait = 10000;
+  const interval = 100;
+  let waited = 0;
+  
+  while (waited < maxWait) {
     try {
-      await db.connect();
-      console.log('✅ Database connected successfully');
-    } catch (error) {
-      console.error('❌ Database connection failed:', error);
-      if (process.env.NODE_ENV === 'production') {
-        process.exit(1);
+      const baraqex = await import('baraqex');
+      if (baraqex.createServer && typeof baraqex.createServer === 'function') {
+        return baraqex;
       }
+    } catch (error) {
+      // Continue waiting
     }
-  } else {
-    console.log('⚠️  No database configured');
+    
+    await new Promise(resolve => setTimeout(resolve, interval));
+    waited += interval;
   }
+  
+  throw new Error('Baraqex failed to initialize within timeout period');
 }
 
-// Graceful shutdown
-process.on('SIGTERM', async () => {
-  console.log('🔄 SIGTERM received, shutting down gracefully...');
-  
+// Async function to start server
+async function startServer() {
   try {
-    await server.stop();
-    const db = server.getDatabase();
-    if (db) {
-      await db.disconnect();
+    console.log('🔄 Waiting for Baraqex to initialize...');
+    
+    // Wait for baraqex to be ready
+    const baraqex = await waitForBaraqex();
+    const { createServer } = baraqex;
+    
+    console.log('✅ Baraqex initialized successfully');
+    
+    if (!createServer || typeof createServer !== 'function') {
+      throw new Error('createServer function not available from baraqex package');
     }
-    console.log('✅ Server shut down complete');
-    process.exit(0);
-  } catch (error) {
-    console.error('❌ Error during shutdown:', error);
-    process.exit(1);
-  }
-});
 
-// Start server
-async function startServer() {
-  try {
-    // Connect to database first
-    await connectDatabase();
+    // Create server instance
+    const server = createServer(config);
     
-    // Start the server
+    // Wait for server initialization
+    await new Promise(resolve => setTimeout(resolve, 1000));
+
+    // Start the server first
+    console.log('🚀 Starting server...');
     await server.start();
     
+    // Then try to set up additional endpoints after server is running
+    try {
+      if (typeof server.getExpressApp === 'function') {
+        const app = server.getExpressApp();
+        
+        if (app) {
+          // Health check endpoint
+          app.get('/health', (req, res) => {
+            res.json({ 
+              status: 'ok', 
+              timestamp: new Date().toISOString(),
+              version: process.env.npm_package_version || '1.0.0',
+              environment: process.env.NODE_ENV || 'development'
+            });
+          });
+
+          // API status endpoint
+          app.get('/api/status', (req, res) => {
+            let db = null;
+            let auth = null;
+            
+            try {
+              if (typeof server.getDatabase === 'function') {
+                db = server.getDatabase();
+              }
+            } catch (e) {
+              // Database method not available
+            }
+            
+            try {
+              if (typeof server.getAuth === 'function') {
+                auth = server.getAuth();
+              }
+            } catch (e) {
+              // Auth method not available
+            }
+            
+            res.json({
+              api: 'online',
+              database: db ? 'connected' : 'not configured',
+              authentication: auth ? 'enabled' : 'disabled',
+              timestamp: new Date().toISOString()
+            });
+          });
+        }
+      }
+    } catch (setupError) {
+      console.warn('⚠️ Could not set up additional endpoints:', setupError.message);
+    }
+
+    // Database connection (if configured)
+    await connectDatabase(server);
+    
     console.log(`🚀 Fullstack server running on http://localhost:${config.port}`);
     console.log(`📊 Environment: ${process.env.NODE_ENV || 'development'}`);
-    console.log(`🔑 Auth: ${server.getAuth() ? 'enabled' : 'disabled'}`);
-    console.log(`💾 Database: ${server.getDatabase() ? 'connected' : 'not configured'}`);
+    
+    // Safely check auth status
+    let authStatus = 'disabled';
+    try {
+      if (typeof server.getAuth === 'function') {
+        authStatus = server.getAuth() ? 'enabled' : 'disabled';
+      }
+    } catch (e) {
+      // Auth check failed
+    }
+    console.log(`🔑 Auth: ${authStatus}`);
+    
+    // Safely check database status
+    let dbStatus = 'not configured';
+    try {
+      if (typeof server.getDatabase === 'function') {
+        dbStatus = server.getDatabase() ? 'connected' : 'not configured';
+      }
+    } catch (e) {
+      // Database check failed
+    }
+    console.log(`💾 Database: ${dbStatus}`);
+    
     console.log(`🌐 API docs: http://localhost:${config.port}/api-docs`);
     console.log(`❤️  Health check: http://localhost:${config.port}/health`);
     
+    return server;
+    
   } catch (error) {
     console.error('❌ Failed to start server:', error);
+    
+    if (error.message.includes('Express not installed')) {
+      console.log('\n💡 To fix this, run:');
+      console.log('  npm install express @types/express');
+    } else if (error.message.includes('createServer function not available')) {
+      console.log('\n💡 To fix this, make sure baraqex is properly installed:');
+      console.log('  npm install baraqex');
+      console.log('  npm install express @types/express');
+    } else if (error.message.includes('timeout')) {
+      console.log('\n💡 Baraqex is taking longer than expected to initialize.');
+      console.log('  This might be due to missing dependencies.');
+      console.log('  Try installing: npm install express @types/express');
+    }
+    
     process.exit(1);
   }
 }
 
+// Database connection helper
+async function connectDatabase(server) {
+  let db = null;
+  try {
+    if (typeof server.getDatabase === 'function') {
+      db = server.getDatabase();
+    }
+  } catch (e) {
+    console.log('⚠️  Database functionality not available');
+    return;
+  }
+  
+  if (db && typeof db.connect === 'function') {
+    try {
+      await db.connect();
+      console.log('✅ Database connected successfully');
+    } catch (error) {
+      console.error('❌ Database connection failed:', error);
+      if (process.env.NODE_ENV === 'production') {
+        process.exit(1);
+      }
+    }
+  } else {
+    console.log('⚠️  No database configured');
+  }
+}
+
+// Graceful shutdown
+process.on('SIGTERM', async () => {
+  console.log('🔄 SIGTERM received, shutting down gracefully...');
+  process.exit(0);
+});
+
+process.on('SIGINT', async () => {
+  console.log('🔄 SIGINT received, shutting down gracefully...');
+  process.exit(0);
+});
+
 // Handle unhandled promise rejections
 process.on('unhandledRejection', (reason, promise) => {
   console.error('Unhandled Rejection at:', promise, 'reason:', reason);
@@ -124,5 +229,3 @@ process.on('uncaughtException', (error) => {
 
 // Start the server
 startServer();
-
-export default server;