poad 2.5.11 → 2.6.1

package/global/init.js

@@ -23,7 +23,7 @@ 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(4);
+  const ports = await findFreePorts(3);
   config.engine = global.package.engine;
   config.db = {
     port: ports[0],
@@ -31,11 +31,8 @@ module.exports = async (args) => {
   config.web = {
     port: ports[1],
   };
-  config.s3 = {
-    port: ports[2],
-  };
   config.inbucket = {
-    port: ports[3],
+    port: ports[2],
   };
   const key = generateSecret();
   config.auth = {
@@ -45,12 +42,6 @@ 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'))

package/global/start.js

@@ -9,9 +9,11 @@ module.exports = async (args) => {
   const prettyoutput = require('prettyoutput');
   const { findPoadDir } = require('../utils/findpoad');
   const { isDockerExist } = require('../utils/docker');
+  const { usesMinio, storageInfo } = require('../utils/engine');
   const root = findPoadDir(process.cwd());
   const config = toml.parse(await fs.readFile(root, 'utf-8'));
   const containerName = config.project_uuid;
+  const minio = usesMinio(config);
   console.log(' ');
   if (await isDockerExist(containerName)) {
     return console.log(chalk.bold('Container already started'));
@@ -30,15 +32,21 @@ 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',
+        ...(minio
+          ? [
+              '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() }],
+          ...(minio
+            ? { '9500/tcp': [{ HostPort: config.s3.port.toString() }] }
+            : {}),
           '9000/tcp': [{ HostPort: config.inbucket.port.toString() }],
         },
         Binds: [path.dirname(root) + '/data:/data'],
@@ -57,10 +65,7 @@ module.exports = async (args) => {
       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',
+        ...storageInfo(config),
         'Inbucket URL': `http://localhost:${config.inbucket.port}`,
         'JWT secret': `${config.auth.secret}`,
         'anon key': config.auth.anon,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "poad",
-  "version": "2.5.11",
-  "engine": "0.5.3",
+  "version": "2.6.1",
+  "engine": "0.6.1",
   "main": "index.js",
   "license": "MIT",
   "bin": {

package/poad.js

@@ -462,6 +462,18 @@ const display = (commands) => {
   }
 };
 
+// True when version `a` is strictly newer than `b` (major.minor.patch).
+const isNewerVersion = (a, b) => {
+  const pa = String(a).split('.').map(Number);
+  const pb = String(b).split('.').map(Number);
+  for (let i = 0; i < 3; i++) {
+    const x = pa[i] || 0;
+    const y = pb[i] || 0;
+    if (x !== y) return x > y;
+  }
+  return false;
+};
+
 // Main function.
 const main = async () => {
   let version = await checkVersion();
@@ -470,9 +482,7 @@ const main = async () => {
   if (version === null) {
     version = current_version;
   }
-  const cv = current_version.replace(/\./g, '') * 1;
-  const v = version.replace(/\./g, '') * 1;
-  if (v > cv) {
+  if (isNewerVersion(version, current_version)) {
     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

@@ -6,6 +6,7 @@ module.exports = async (args) => {
   const prettyoutput = require('prettyoutput');
   const { findPoadDir } = require('../utils/findpoad');
   const { isDockerExist } = require('../utils/docker');
+  const { storageInfo } = require('../utils/engine');
   const root = findPoadDir(process.cwd());
   const config = toml.parse(await fs.readFile(root, 'utf-8'));
   console.log(' ');
@@ -17,10 +18,7 @@ module.exports = async (args) => {
   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',
+    ...storageInfo(config),
     'Inbucket URL': `http://localhost:${config.inbucket.port}`,
     'JWT secret': `${config.auth.secret}`,
     'anon key': config.auth.anon,

package/utils/engine.js

@@ -0,0 +1,26 @@
+// Engines before 0.6.0 ship Kong + MinIO: S3 is served on its own port (9500).
+// From 0.6.0 on, the gateway is APISIX and storage is served by the gateway
+// under /storage/v1.
+const usesMinio = (config) => {
+  const [major, minor] = String(config.engine || '')
+    .split('.')
+    .map(Number);
+  return Boolean(config.s3) && major === 0 && minor < 6;
+};
+
+// Storage lines shown by `poad start` and `poad info`.
+const storageInfo = (config) => {
+  if (usesMinio(config)) {
+    return {
+      'S3 URL': `http://localhost:${config.s3.port}/`,
+      'S3 ACCESS KEY': config.s3.access_key,
+      'S3 SECRET KEY': config.s3.secret_key,
+      'S3 REGION': 'local',
+    };
+  }
+  return {
+    'Storage URL': `http://localhost:${config.web.port}/storage/v1`,
+  };
+};
+
+module.exports = { usesMinio, storageInfo };