create-sip 1.2.2 → 1.3.1

package/expressapi/op

@@ -52,7 +52,7 @@ yargs(hideBin(process.argv))
   }
 )
 .command('conf:generate',
-  'Generates a new config file: config/default.json from config/default.json.example',
+  'Generate a new config file: .env',
   (yargs) => {
     return yargs
   },
@@ -60,6 +60,15 @@ yargs(hideBin(process.argv))
     startGenerateConf();
   }
 )
+.command('testconf:generate',
+  'Generate a new config file: .env.test',
+  (yargs) => {
+    return yargs
+  },
+  async (argv) => {
+    startGenerateTestConf();
+  }
+)
 .command('admin:generate',
   'Generates a new admin user in database table: users',
   (yargs) => {
@@ -241,45 +250,64 @@ function capitalizeFirstLetter(word) {
   return word.charAt(0).toUpperCase() + word.slice(1);
 }
 
-function startGenerateKey() {
-  console.log('Generate key...');
-  const fileName = 'config/default.json'
-  fsp.readFile(fileName)
-      .then(body => JSON.parse(body))
-      .then(json => {
-          json.app.key = generateApiKey({method: 'bytes', length: 32})
-          return json
-      })
-      .then(json => JSON.stringify(json, null, 4))
-      .then(body => fse.writeFile(fileName, body, 'utf8'))
-      .catch(error => console.log(error))
+async function startGenerateKey() {
+  try {
+    const envFile = '.env'
+    let content = await fse.readFile(envFile, 'utf8')
+    const key = generateApiKey({method: 'bytes', length: 32})
+
+    const regex = /^APP_KEY *=.*$/m
+    if(regex.test(content)) {
+      content = content.replace(regex, `APP_KEY=${key}`)
+    }else {
+      if(content.trim() !== '') {
+        content += `\nAPP_KEY=${key}\n`
+      }else {
+        content = `APP_KEY=${key}\n`
+      }
+    }
+    fse.writeFile(envFile, content, 'utf8')
+  } catch (error) {
+    console.error(error)
+  }
 }
 
 async function startGenerateConf() {
-  console.log('Generate conf...');
-  const sourceFileName = 'config/default.json.example';
-  const destinationFileName = 'config/default.json';
+  const content = `
+APP_PORT=8000
+APP_KEY=
+APP_LOG=console.log
+
+DB_DIALECT=sqlite
+DB_HOST=127.0.0.1
+DB_NAME=
+DB_USER=
+DB_PASS=
+DB_PATH=:memory:
+`
+  const destinationFileName = '.env'
   if(await startCheckIfFileExists(destinationFileName)) {
     process.exit(1);
   }
-  try {
-    await fse.copyFile(sourceFileName, destinationFileName)
-  } catch (error) {
-    console.log(error)
-  }
-      
+
+  await fse.writeFile(destinationFileName, content, 'utf8')
 }
 
-async function loadConfig() {
-  try {
-    const filePath = path.resolve('./config/default.json');
-    const data = await fsp.readFile(filePath, 'utf8');
-    const config = JSON.parse(data);
-    return config;
-  } catch (error) {
-    console.error('Error loading config:', error);
-    return null;
+async function startGenerateTestConf() {
+  const content = `
+APP_PORT=8000
+APP_KEY=my_secret_key
+APP_LOG=console.log
+
+DB_DIALECT=sqlite
+DB_PATH=:memory:
+`
+  const destinationFileName = '.env.test'
+  if(await startCheckIfFileExists(destinationFileName)) {
+    process.exit(1);
   }
+
+  await fse.writeFile(destinationFileName, content, 'utf8')
 }
 
 async function inputPassword() {
@@ -292,33 +320,33 @@ async function inputPassword() {
 }
 
 async function startGenerateAdmin() {
-  console.log('Generate admin...')
   try {
-    const config = await loadConfig();
-    const isMemoryDb = config.db.path === ':memory:';
+    const { default: User } = await import('./app/models/user.js')
+    await User.sync()
+
+    await import('dotenv').then((dotenv) => dotenv.config())
+    const isMemoryDb = process.env.DB_PATH === ':memory:';
     if(isMemoryDb) {
       console.log('Admin cannot be created in memory db!')
-    }else {
-      const { default: User } = await import('./app/models/user.js')
-      await User.sync()
+      return;
+    }
 
-      const isUserExist = await User.findOne({ where: { name: 'admin' } })
-      if (isUserExist) {
-        console.log('Admin already exists!')
-        return;
-      }
-      const password = await inputPassword()
-      const hashedPassword = await bcrypt.hash(password, 10);
-      await User.create({
-        name: 'admin',
-        email: 'admin',
-        password: hashedPassword
-      })
-      console.log('Admin created!')
+    const isUserExist = await User.findOne({ where: { name: 'admin' } })
+    if (isUserExist) {
+      console.log('Admin already exists!')
+      return;
     }
-  } catch( err) {
+    const password = await inputPassword()
+    const hashedPassword = await bcrypt.hash(password, 10);
+    await User.create({
+      name: 'admin',
+      email: 'admin',
+      password: hashedPassword
+    })
+    console.log('Admin created!')
+  } catch (error) {
     console.error('Error creating admin!')
-    console.error(err)
+    console.error(error)
   }
 }