kempo 4.2.13 → 4.2.15

package/bin/cli.js

@@ -31,7 +31,7 @@ const projectName = basename(projectDir);
 */
 
 const generatePassword = () => {
-  const chars = 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz23456789!@#$%&*';
+  const chars = 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz23456789-_';
   return Array.from(
     { length: 16 },
     () => chars[crypto.randomInt(chars.length)]
@@ -62,11 +62,11 @@ const getPostgresContainers = () => {
   }
 };
 
-const waitForPostgres = async (containerName) => {
+const waitForPostgres = async (containerName, dbName = 'postgres') => {
   process.stdout.write('Waiting for Postgres to be ready');
   for(let i = 0; i < 30; i++){
     try {
-      execSync(`docker exec ${containerName} pg_isready -U kempo -d kempo`, { stdio: 'ignore' });
+      execSync(`docker exec ${containerName} pg_isready -U kempo -d ${dbName}`, { stdio: 'ignore' });
       process.stdout.write(' ready!\n');
       return;
     } catch {
@@ -404,6 +404,21 @@ execSync('npm install kempo', { cwd: projectDir, stdio: 'inherit' });
 console.log('\n--- Starting database ---\n');
 
 if(containerMode === 'new'){
+  const volumeName = `${dbName}_postgres_data`;
+  
+  try {
+    execSync(`docker stop ${containerName}`, { stdio: 'ignore' });
+    execSync(`docker rm ${containerName}`, { stdio: 'ignore' });
+  } catch {
+    // Container doesn't exist, that's fine
+  }
+  
+  try {
+    execSync(`docker volume rm ${volumeName}`, { stdio: 'ignore' });
+  } catch {
+    // Volume doesn't exist, that's fine
+  }
+  
   const compose = spawnSync('docker', ['compose', 'up', '-d'], {
     cwd: projectDir,
     stdio: 'inherit',
@@ -414,12 +429,12 @@ if(containerMode === 'new'){
     printManualSteps(databaseUrl);
     process.exit(1);
   }
-  await waitForPostgres(containerName);
+  await waitForPostgres(containerName, 'postgres');
 } else {
   const container = existingContainers.find(c => c.name === containerName);
   if(container && !container.running){
     execSync(`docker start ${containerName}`, { stdio: 'inherit' });
-    await waitForPostgres(containerName);
+    await waitForPostgres(containerName, 'postgres');
   }
 }
 
@@ -429,14 +444,24 @@ if(containerMode === 'new'){
 
 console.log('\n--- Initializing database ---\n');
 
+// Give database plenty of time to fully initialize
+await new Promise(r => setTimeout(r, 30000));
+
 // Clear migration snapshots so drizzle-kit push compares against the live DB only
 const migrationDir = join(projectDir, 'server', 'db', 'migrations');
 if(existsSync(migrationDir)){
   rmSync(migrationDir, { recursive: true, force: true });
 }
 
-execSync('npx drizzle-kit push --force', { cwd: projectDir, stdio: 'inherit' });
-execSync('node node_modules/kempo/scripts/init-db.js', { cwd: projectDir, stdio: 'inherit' });
+const drizzleResult = spawnSync('npx', ['drizzle-kit', 'push', '--force'], { cwd: projectDir, stdio: 'inherit', env: { ...process.env, DATABASE_URL: databaseUrl }, shell: true });
+if(drizzleResult.status !== 0){
+  console.error('\n❌ Drizzle push failed. DATABASE_URL: ' + databaseUrl);
+  console.error('Container: ' + containerName);
+  console.error('Check: docker logs ' + containerName + '\n');
+  process.exit(1);
+}
+
+execSync('node node_modules/kempo/scripts/init-db.js', { cwd: projectDir, stdio: 'inherit', env: { ...process.env, DATABASE_URL: databaseUrl } });
 
 /*
   Step 8: Create admin user

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kempo",
-  "version": "4.2.13",
+  "version": "4.2.15",
   "type": "module",
   "description": "A fullstack CMS framework for creating websites with user authentication",
   "scripts": {