poad 2.5.6 → 2.5.8

package/global/cli.js

@@ -9,5 +9,6 @@
 module.exports = {
   install: `Install poad environment`,
   init: `Init poad project`,
-  start: 'Start containers for poad local development',
+  start: 'Start container for poad local development',
+  stop: 'Stop container for poad local development',
 };

package/global/init.js

@@ -6,6 +6,7 @@ module.exports = async (args) => {
   const json2toml = require('json2toml');
   const fs = require('fs').promises;
   const generateUniqueId = require('generate-unique-id');
+  const chalk = require('chalk-v2');
   const anon = {
     role: 'anon',
     iss: 'poad',
@@ -22,13 +23,19 @@ module.exports = async (args) => {
   config.project_id = path.basename(process.cwd());
   config.project_uuid = generateUniqueId();
   await fs.mkdir(path.join(process.cwd(), 'poad', 'data'), { recursive: true });
-  const ports = await findFreePorts(3);
+  const ports = await findFreePorts(4);
   config.db = {
     port: ports[0],
   };
   config.web = {
     port: ports[1],
   };
+  config.s3 = {
+    port: ports[2],
+  };
+  config.inbucket = {
+    port: ports[3],
+  };
   const key = generateSecret();
   config.auth = {
     jwt_expiry: 3600,
@@ -37,6 +44,20 @@ module.exports = async (args) => {
     service: jwt.sign(service, key),
     admin: jwt.sign(admin, key),
   };
+  config.s3 = {
+    port: config.s3.port,
+    access_key: generateSecret(),
+    secret_key: generateSecret(),
+    region: 'local',
+  };
   const toml = json2toml(config);
+  const isInstalled = await fs
+    .stat(path.join(process.cwd(), 'poad', 'config.toml'))
+    .catch(() => false);
+  if (isInstalled)
+    return console.log(
+      chalk.bold('\n  ✅ Your project has already been initialized')
+    );
   await fs.writeFile(path.join(process.cwd(), 'poad', 'config.toml'), toml);
+  console.log(chalk.bold('\n  ✅ Your project has been initialized'));
 };

package/global/install.js

@@ -4,7 +4,7 @@ module.exports = async (args) => {
   const cliProgress = require('cli-progress');
 
   const docker = new Docker();
-  const imageName = 'poadio/engine:latest';
+  const imageName = 'poadio/engine:0.5.2';
   const platform = 'linux/amd64';
 
   // Create a new progress bar

package/global/start.js

@@ -1,19 +1,26 @@
 module.exports = async (args) => {
+  const chalk = require('chalk-v2');
   const Docker = require('dockerode');
   const docker = new Docker();
   const toml = require('toml');
   const path = require('path');
+  const ora = require('ora');
   const fs = require('fs').promises;
+  const prettyoutput = require('prettyoutput');
   const { findPoadDir } = require('../utils/findpoad');
+  const { isDockerExist } = require('../utils/docker');
   const root = findPoadDir(process.cwd());
   const config = toml.parse(await fs.readFile(root, 'utf-8'));
-
-  const webPort = config.web.port;
-  const dbPort = config.db.port;
-
+  const containerName = config.project_uuid;
+  console.log(' ');
+  if (await isDockerExist(containerName)) {
+    return console.log(chalk.bold('Container already started'));
+  }
+  const progress = ora('Starting container').start();
   docker
     .createContainer({
-      Image: 'poadio/engine',
+      name: containerName,
+      Image: 'poadio/engine:0.5.2',
       Tty: false,
       Env: [
         'OMNEEDIA_GATEWAY_URL=http://localhost:' + config.web.port,
@@ -23,11 +30,16 @@ module.exports = async (args) => {
         'JWT_SECRET=' + config.auth.secret,
         'ANON_KEY=' + config.auth.anon,
         'SERVICE_ROLE_KEY=' + config.auth.service,
+        'S3_ACCESS_KEY=' + config.s3.access_key,
+        'S3_SECRET_KEY=' + config.s3.secret_key,
+        'S3_REGION=local',
       ],
       HostConfig: {
         PortBindings: {
           '5432/tcp': [{ HostPort: config.db.port.toString() }],
           '8000/tcp': [{ HostPort: config.web.port.toString() }],
+          '9500/tcp': [{ HostPort: config.s3.port.toString() }],
+          '9000/tcp': [{ HostPort: config.inbucket.port.toString() }],
         },
         Binds: [path.dirname(root) + '/data:/data'],
         AutoRemove: true,
@@ -38,9 +50,26 @@ module.exports = async (args) => {
       return container.start();
     })
     .then((container) => {
-      console.log('Container started successfully');
+      progress.succeed(chalk.bold('container started.'));
+      console.log(' ');
+      console.log(chalk.bold('  🚀 Container started successfully'));
+      console.log(' ');
+      const info = {
+        'API URL': `http://localhost:${config.web.port}`,
+        'DB URL': `postgres://postgres:postgres@localhost:${config.db.port}/postgres`,
+        'S3 URL': `http://localhost:${config.s3.port}/`,
+        'S3 ACCESS KEY': config.s3.access_key,
+        'S3 SECRET KEY': config.s3.secret_key,
+        'S3 REGION': 'local',
+        'Inbucket URL': `http://localhost:${config.inbucket.port}`,
+        'JWT secret': `${config.auth.secret}`,
+        'anon key': config.auth.anon,
+        'service_role key': config.auth.service,
+      };
+      console.log(prettyoutput(info));
     })
     .catch((err) => {
-      console.error('Error:', err);
+      console.log(err);
+      progress.fail(chalk.redBright('Error: Container failed to start'));
     });
 };

package/global/stop.js

@@ -0,0 +1,28 @@
+module.exports = async (args) => {
+  const Docker = require('dockerode');
+  const docker = new Docker();
+  const toml = require('toml');
+  const path = require('path');
+  const fs = require('fs').promises;
+  const { findPoadDir } = require('../utils/findpoad');
+  const { isDockerExist } = require('../utils/docker');
+  const root = findPoadDir(process.cwd());
+  const config = toml.parse(await fs.readFile(root, 'utf-8'));
+  const containerName = config.project_uuid;
+  const ora = require('ora');
+  const chalk = require('chalk-v2');
+  console.log(' ');
+  if (!(await isDockerExist(containerName))) {
+    return console.log(chalk.redBright('Container not found'));
+  }
+  const progress = ora('Stopping container').start();
+  docker
+    .getContainer(containerName)
+    .stop()
+    .then(() => {
+      progress.succeed(chalk.bold('Container stopped successfully'));
+    })
+    .catch((err) => {
+      progress.fail('Error: Failed to stop container');
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poad",
-  "version": "2.5.6",
+  "version": "2.5.8",
   "main": "index.js",
   "license": "MIT",
   "bin": {
@@ -19,7 +19,10 @@
     "generate-unique-id": "^2.0.3",
     "json2toml": "^6.1.1",
     "jsonwebtoken": "^9.0.2",
+    "listr": "^0.14.3",
     "log-beautify": "^1.2.0",
+    "ora": "^5.4.1",
+    "prettyoutput": "^1.2.0",
     "toml": "^3.0.0"
   }
 }

package/poad.js

@@ -469,7 +469,9 @@ const main = async () => {
   if (version === null) {
     version = current_version;
   }
-  if (current_version != version) {
+  const cv = current_version.replace(/\./g, '') * 1;
+  const v = version.replace(/\./g, '') * 1;
+  if (v > cv) {
     const message =
       `A new version (${version}) is available. You can upgrade by running:\n` +
       chalk.white.bold(`npm i -g poad@${version}`);

package/project/info.js

@@ -0,0 +1,30 @@
+module.exports = async (args) => {
+  const chalk = require('chalk-v2');
+  const toml = require('toml');
+  const path = require('path');
+  const fs = require('fs').promises;
+  const prettyoutput = require('prettyoutput');
+  const { findPoadDir } = require('../utils/findpoad');
+  const { isDockerExist } = require('../utils/docker');
+  const root = findPoadDir(process.cwd());
+  const config = toml.parse(await fs.readFile(root, 'utf-8'));
+  console.log(' ');
+  if (!(await isDockerExist(config.project_uuid))) {
+    return console.log(chalk.redBright('Container not found'));
+  }
+  console.log(chalk.bold('POAD project info'));
+  console.log(' ');
+  const info = {
+    'API URL': `http://localhost:${config.web.port}`,
+    'DB URL': `postgres://postgres:postgres@localhost:${config.db.port}/postgres`,
+    'S3 URL': `http://localhost:${config.s3.port}/`,
+    'S3 ACCESS KEY': config.s3.access_key,
+    'S3 SECRET KEY': config.s3.secret_key,
+    'S3 REGION': 'local',
+    'Inbucket URL': `http://localhost:${config.inbucket.port}`,
+    'JWT secret': `${config.auth.secret}`,
+    'anon key': config.auth.anon,
+    'service_role key': config.auth.service,
+  };
+  console.log(prettyoutput(info));
+};

package/utils/docker.js

@@ -0,0 +1,23 @@
+const Docker = require('dockerode');
+const docker = new Docker();
+
+async function isDockerExist(containerName) {
+  try {
+    const containers = await docker.listContainers({ all: true });
+
+    for (const container of containers) {
+      if (container.Names.includes(`/${containerName}`)) {
+        return true;
+      }
+    }
+
+    return false;
+  } catch (error) {
+    console.error(
+      `Erreur lors de la vérification du conteneur: ${error.message}`
+    );
+    return false;
+  }
+}
+
+module.exports = { isDockerExist };

package/0.txt

@@ -1,16 +0,0 @@
-docker run 
-  --platform=linux/amd64 
-  --rm 
-  -v ~/prj/omneedia/infra/aio/data:/data 
-  -e OMNEEDIA_GATEWAY_URL=http://localhost:8000 
-  -e DATA_VOLUME_MOUNTPOINT=/data 
-  -e POSTGRES_PASSWORD=dreams 
-  -p 5432:5432 
-  -p 8000:8000 
-  -e ADMIN_API_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoic3VwYWJhc2VfYWRtaW4iLCJpc3MiOiJzdXBhYmFzZS1kZW1vIiwiaWF0IjoxNjQxNzY5MjAwLCJleHAiOjE3OTk1MzU2MDB9.Y9mSNVuTw2TdfryoaqM5wySvwQemGGWfSe9ixcklVfM 
-  -e JWT_SECRET=277e90e7515dbf46bf76ddabfbfa6fa04a11966f4e7550ef3330a31258c49be95944a87c97b725defb264dbb772567592b8a91849115dce1ece7b949a668900ac0738a8d0a89db4a48d77706474e4ea34d20134ac889b73f7ecd732b046bdce7b7367fb9f56638eed1db1bba916a5e674a472ed443d316127b6176a2a6066ca08bffd97ed47ef9f1cfe22c668afca3f7d0011352d113e4315803c35787a3c2bc16424ab02a88452ab7c04ad48143c11f2616c148f85461842afcf28295a0281281c69f2df6344476286425290f7721470c9f92576ece15f275feac53a3dd6763eb0d88bbcdc9391c64f62c4bf556c131f49a5de9de9e914f544c42a5ef33ca10 
-  -e ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiYW5vbiIsImlhdCI6MTcyNjg2MTQ4OH0.fsIJu0uDoMBBxXnHuoXtMlwF4sGHxkFGkLpFDfKuV9g 
-  -e SERVICE_ROLE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJzZXJ2aWNlX3JvbGUiLAogICAgImlzcyI6ICJzdXBhYmFzZS1kZW1vIiwKICAgICJpYXQiOiAxNjQxNzY5MjAwLAogICAgImV4cCI6IDE3OTk1MzU2MDAKfQ.DaYlNEoUrrEn2Ig7tqibS-PHK5vgusbcbo7X36XVt4Q 
-  poadio/engine 
-  &>data/service.log 
-  &

package/project/init.js

@@ -1,9 +0,0 @@
-module.exports = (args) => {
-  return {
-    info: {
-      title: 'init',
-      description: `Démarrage d'un projet poad.`,
-    },
-    start: async () => {},
-  };
-};