@cyklang/cli 0.7.1 → 0.7.4

package/build/Cmd.d.ts

@@ -35,6 +35,13 @@ export declare function runShellCommand(command: string, args: string[]): Promis
  * @returns
  */
 export declare function spawnCommand(command: string, args: string[]): Promise<void>;
+/**
+ * function spawnCommandData
+ * @param command
+ * @param args
+ * @returns
+ */
+export declare function spawnCommandData(command: string, args: string[]): Promise<string>;
 /**
  * function readPackageJson
  * @returns

package/build/Cmd.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readPackageJson = exports.spawnCommand = exports.runShellCommand = exports.Cmd = void 0;
+exports.readPackageJson = exports.spawnCommandData = exports.spawnCommand = exports.runShellCommand = exports.Cmd = void 0;
 const core_1 = require("@cyklang/core");
 const commander_1 = require("commander");
 const dotenv_1 = __importDefault(require("dotenv"));
@@ -168,6 +168,31 @@ function spawnCommand(command, args) {
     });
 }
 exports.spawnCommand = spawnCommand;
+/**
+ * function spawnCommandData
+ * @param command
+ * @param args
+ * @returns
+ */
+function spawnCommandData(command, args) {
+    let result = '';
+    const child_process = (0, child_process_1.spawn)(command, args);
+    return new Promise((resolve, reject) => {
+        child_process.stdout.on('data', (data) => {
+            result += String(data);
+        });
+        child_process.on('close', (code) => {
+            if (code === 0) {
+                // console.log(green('*') + ' ' + [command, ...args].join(' '))
+                resolve(result);
+            }
+            else {
+                reject(new Error([command, ...args].join(' ') + ' --> Error ' + code));
+            }
+        });
+    });
+}
+exports.spawnCommandData = spawnCommandData;
 /**
  * function readPackageJson
  * @returns

package/build/index.js

@@ -71,16 +71,42 @@ async function startServer() {
             await (0, Cmd_1.spawnCommand)('docker', ['compose', 'up', '-d']);
         }
         if (orchestrator === 'kubernetes') {
+            // apply resource files
+            await (0, Cmd_1.spawnCommand)('kubectl', ['apply', '-f', path_1.default.join(process.cwd(), 'k8s')]);
+            // port-forward
             const portForwardPath = path_1.default.join(process.cwd(), 'k8s', 'port-forward');
             if (!fs.existsSync(portForwardPath) || !fs.statSync(portForwardPath).isFile())
                 throw portForwardPath + ' file not found';
-            const config = JSON.parse(fs.readFileSync(portForwardPath).toString());
-            if (!config.postgres || !config.nodejs)
-                throw portForwardPath + ' : file format incorrect';
-            (0, Cmd_1.spawnCommand)('kubectl', ['port-forward', 'svc/postgres', config.postgres + ':5432']);
-            logger.info('Postgresql proxy at localhost:' + config.postgres);
-            (0, Cmd_1.spawnCommand)('kubectl', ['port-forward', 'svc/nodejs', config.nodejs + ':3000']);
-            logger.info('Nodejs proxy at localhost:' + config.nodejs);
+            const portForwardContent = JSON.parse(fs.readFileSync(portForwardPath).toString());
+            // wait for the services to be available
+            while (true) {
+                const declared_services = await (0, Cmd_1.spawnCommandData)('kubectl', ['get', 'svc', '-o', 'name']);
+                let ok = true;
+                for (const service in portForwardContent) {
+                    if (!Object.prototype.hasOwnProperty.call(portForwardContent, service))
+                        continue;
+                    if (!declared_services.includes(`service/${service}`)) {
+                        ok = false;
+                        break;
+                    }
+                    const avail = await serviceAvailable(service);
+                    if (!avail) {
+                        ok = false;
+                        break;
+                    }
+                }
+                if (ok)
+                    break;
+                // wait for 1 second
+                logger.info('Wait for nodejs and postgres services...');
+                await new Promise((resolve) => setTimeout(() => {
+                    resolve();
+                }, 1000));
+            }
+            for (const service in portForwardContent) {
+                (0, Cmd_1.spawnCommand)('kubectl', ['port-forward', `svc/${service}`, portForwardContent[service]]);
+                logger.info(`${service} proxy via localhost ${portForwardContent[service].split(':')[0]}`);
+            }
         }
         if (!orchestrator) {
             logger.error('No cyk server is defined in current folder ' + process.cwd());
@@ -90,6 +116,21 @@ async function startServer() {
         console.error(err);
     }
 }
+/**
+ * function serviceAvailable
+ * @param service
+ * @returns
+ */
+async function serviceAvailable(service) {
+    const descNodejs = await (0, Cmd_1.spawnCommandData)('kubectl', ['describe', 'service', service]);
+    const lines = descNodejs.split('\n');
+    for (const line of lines) {
+        if (line.includes('Endpoints')) {
+            return !line.includes('<none>');
+        }
+    }
+    return false;
+}
 /**
  * function stopServer
  */
@@ -140,7 +181,7 @@ class StopCommand extends commander_1.Command {
  */
 const program = new commander_1.Command();
 program.name('cyk').description('cyklang CLI')
-    .version('0.7.1');
+    .version('0.7.4');
 program.addCommand(new StartCommand('start'));
 program.addCommand(new StopCommand('stop'));
 program.addCommand(new InstallCommand_1.InstallCommand('install'));

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@cyklang/cli",
-   "version": "0.7.1",
+   "version": "0.7.4",
    "description": "cyklang CLI",
    "main": "build/index.js",
    "scripts": {

package/src/Cmd.ts

@@ -115,9 +115,6 @@ export class Cmd extends Command {
             });
         });
     }
-
-
-
 }
 
 
@@ -162,6 +159,31 @@ export function spawnCommand(command: string, args: string[]): Promise<void> {
     })
 }
 
+/**
+ * function spawnCommandData
+ * @param command 
+ * @param args 
+ * @returns 
+ */
+export function spawnCommandData(command: string, args: string[]): Promise<string> {
+    let result = ''
+    const child_process = spawn(command, args)
+    return new Promise((resolve, reject) => {
+        child_process.stdout.on('data', (data) => {
+            result += String(data)
+        })
+        child_process.on('close', (code) => {
+            if (code === 0) {
+                // console.log(green('*') + ' ' + [command, ...args].join(' '))
+                resolve(result)
+            }
+            else {
+                reject(new Error([command, ...args].join(' ') + ' --> Error ' + code))
+            }
+        })
+    })
+}
+
 /**
  * function readPackageJson
  * @returns 

package/src/index.ts

@@ -4,7 +4,7 @@ import * as fs from 'fs'
 import loglevel from 'loglevel'
 import path from 'path'
 import { AssetCommand } from './AssetCommand'
-import { Cmd, spawnCommand } from './Cmd'
+import { Cmd, spawnCommand, spawnCommandData } from './Cmd'
 import { InstallCommand } from './InstallCommand'
 import { ModuleCommand } from "./ModuleCommand"
 import { OpenCommand } from './OpenCommand'
@@ -48,16 +48,53 @@ async function startServer() {
             await spawnCommand('docker', ['compose', 'up', '-d'])
         }
         if (orchestrator === 'kubernetes') {
+
+            // apply resource files
+            await spawnCommand('kubectl', ['apply', '-f', path.join(process.cwd(), 'k8s')])
+
+            // port-forward
             const portForwardPath = path.join(process.cwd(), 'k8s', 'port-forward')
             if (!fs.existsSync(portForwardPath) || !fs.statSync(portForwardPath).isFile())
                 throw portForwardPath + ' file not found'
-            const config = JSON.parse(fs.readFileSync(portForwardPath).toString())
-            if (! config.postgres || ! config.nodejs) 
-                throw portForwardPath + ' : file format incorrect'
-            spawnCommand('kubectl', ['port-forward', 'svc/postgres', config.postgres + ':5432'])
-            logger.info('Postgresql proxy at localhost:' + config.postgres)
-            spawnCommand('kubectl', ['port-forward', 'svc/nodejs', config.nodejs + ':3000'])
-            logger.info('Nodejs proxy at localhost:' + config.nodejs)
+            const portForwardContent = JSON.parse(fs.readFileSync(portForwardPath).toString())
+
+            // wait for the services to be available
+
+            while (true) {
+
+                const declared_services = await spawnCommandData('kubectl', ['get', 'svc', '-o', 'name'])
+
+                let ok = true
+
+                for(const service in portForwardContent) {
+                    if (! Object.prototype.hasOwnProperty.call(portForwardContent, service)) continue
+                    if (! declared_services.includes(`service/${service}`)) {
+                        ok = false
+                        break
+                    }
+                    const avail = await serviceAvailable(service)
+                    if (! avail) {
+                        ok = false
+                        break
+                    }
+                }
+
+                if (ok) break
+
+                // wait for 1 second
+                logger.info('Wait for nodejs and postgres services...')
+                await new Promise<void>((resolve) =>
+                    setTimeout(() => {
+                        resolve();
+                    }, 1000)
+                );
+            }
+
+            for(const service in portForwardContent) {
+                spawnCommand('kubectl', ['port-forward', `svc/${service}`, portForwardContent[service]])
+                logger.info(`${service} proxy via localhost ${portForwardContent[service].split(':')[0]}`)
+            }
+
         }
         if (!orchestrator) {
             logger.error('No cyk server is defined in current folder ' + process.cwd())
@@ -68,6 +105,23 @@ async function startServer() {
     }
 }
 
+/**
+ * function serviceAvailable
+ * @param service 
+ * @returns 
+ */
+async function serviceAvailable(service: string): Promise<boolean> {
+
+    const descNodejs = await spawnCommandData('kubectl', ['describe', 'service', service])
+    const lines = descNodejs.split('\n')
+    for (const line of lines) {
+        if (line.includes('Endpoints')) {
+            return !line.includes('<none>')
+        }
+    }
+    return false
+}
+
 /**
  * function stopServer
  */
@@ -121,7 +175,7 @@ class StopCommand extends Command {
  */
 const program = new Command()
 program.name('cyk').description('cyklang CLI')
-    .version('0.7.1')
+    .version('0.7.4')
 program.addCommand(new StartCommand('start'))
 program.addCommand(new StopCommand('stop'))
 program.addCommand(new InstallCommand('install'))