@cyklang/cli 0.15.7 → 0.15.9

package/build/Cmd.js

@@ -44,26 +44,32 @@ class Cmd extends commander_1.Command {
         this.option('--env <env>', 'path to the environment variables file');
     }
     async prologue(options) {
-        if (options.env || fs.existsSync('.env')) {
-            const dotenvOutput = dotenv_1.default.config({ path: options.env });
-            if (dotenvOutput.error !== undefined)
-                throw dotenvOutput.error;
+        try {
+            if (options.env || fs.existsSync('.env')) {
+                const dotenvOutput = dotenv_1.default.config({ path: options.env });
+                if (dotenvOutput.error !== undefined)
+                    throw dotenvOutput.error;
+            }
+            const structure = new core_1.Structure();
+            if (!process.env.DBREMOTE_URL)
+                throw 'DBREMOTE_URL environment variable undefined';
+            if (!process.env.USER_NAME)
+                throw 'USER_NAME environment variable undefined';
+            if (!process.env.USER_PASSWORD)
+                throw 'USER_PASSWORD environment variable undefined';
+            logger.info('Cyk server: ' + process.env.DBREMOTE_URL);
+            const nodeCrypto = new NodeCrypto_1.NodeCrypto();
+            this.dbRemote = new core_1.DBRemote(structure.scope, process.env.DBREMOTE_URL, nodeCrypto);
+            const login = await this.dbRemote.signin(process.env.USER_NAME, undefined, process.env.USER_PASSWORD);
+            // logger.debug(`signinResponse : ${JSON.stringify(login)}`)
+            this.dbManager = new core_1.DBManager(structure.scope, this.dbRemote);
+            await this.dbManager.initialize();
+            return login;
+        }
+        catch (err) {
+            logger.error(err);
+            throw err;
         }
-        const structure = new core_1.Structure();
-        if (!process.env.DBREMOTE_URL)
-            throw 'DBREMOTE_URL environment variable undefined';
-        if (!process.env.USER_NAME)
-            throw 'USER_NAME environment variable undefined';
-        if (!process.env.USER_PASSWORD)
-            throw 'USER_PASSWORD environment variable undefined';
-        logger.info('Cyk server: ' + process.env.DBREMOTE_URL);
-        const nodeCrypto = new NodeCrypto_1.NodeCrypto();
-        this.dbRemote = new core_1.DBRemote(structure.scope, process.env.DBREMOTE_URL, nodeCrypto);
-        const login = await this.dbRemote.signin(process.env.USER_NAME, undefined, process.env.USER_PASSWORD);
-        // logger.debug(login)
-        this.dbManager = new core_1.DBManager(structure.scope, this.dbRemote);
-        await this.dbManager.initialize();
-        return login;
     }
     /**
      * method updateAuthAccess

package/build/index.js

@@ -182,7 +182,7 @@ class StopCommand extends commander_1.Command {
  */
 const program = new commander_1.Command();
 program.name('cyk').description('cyklang CLI')
-    .version('0.15.7');
+    .version('0.15.9');
 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.15.7",
+   "version": "0.15.9",
    "description": "cyklang CLI",
    "main": "build/index.js",
    "scripts": {
@@ -19,7 +19,7 @@
    "author": "",
    "license": "ISC",
    "dependencies": {
-      "@cyklang/core": "^0.25.0",
+      "@cyklang/core": "^0.25.2",
       "commander": "^9.4.0",
       "dotenv": "^16.0.1",
       "form-data": "^4.0.0",

package/src/Cmd.ts

@@ -22,27 +22,32 @@ export class Cmd extends Command {
 
     async prologue(options: any): Promise<SigninResponse> {
 
-        if (options.env || fs.existsSync('.env')) {
-            const dotenvOutput = dotenv.config({ path: options.env })
-            if (dotenvOutput.error !== undefined) throw dotenvOutput.error
+        try {
+            if (options.env || fs.existsSync('.env')) {
+                const dotenvOutput = dotenv.config({ path: options.env })
+                if (dotenvOutput.error !== undefined) throw dotenvOutput.error
+            }
+    
+            const structure = new Structure()
+            if (! process.env.DBREMOTE_URL) throw 'DBREMOTE_URL environment variable undefined'
+            if (! process.env.USER_NAME) throw 'USER_NAME environment variable undefined'
+            if (! process.env.USER_PASSWORD) throw 'USER_PASSWORD environment variable undefined'
+            
+            logger.info('Cyk server: ' + process.env.DBREMOTE_URL)
+            const nodeCrypto = new NodeCrypto()
+            this.dbRemote = new DBRemote(structure.scope, process.env.DBREMOTE_URL, nodeCrypto)
+            const login = await this.dbRemote.signin(process.env.USER_NAME, undefined, process.env.USER_PASSWORD)
+            // logger.debug(`signinResponse : ${JSON.stringify(login)}`)
+    
+            this.dbManager = new DBManager(structure.scope, this.dbRemote)
+            await this.dbManager.initialize()
+    
+            return login
+        }
+        catch (err) {
+            logger.error(err)
+            throw err
         }
-
-        const structure = new Structure()
-        if (! process.env.DBREMOTE_URL) throw 'DBREMOTE_URL environment variable undefined'
-        if (! process.env.USER_NAME) throw 'USER_NAME environment variable undefined'
-        if (! process.env.USER_PASSWORD) throw 'USER_PASSWORD environment variable undefined'
-        
-        logger.info('Cyk server: ' + process.env.DBREMOTE_URL)
-        const nodeCrypto = new NodeCrypto()
-        this.dbRemote = new DBRemote(structure.scope, process.env.DBREMOTE_URL, nodeCrypto)
-        const login = await this.dbRemote.signin(process.env.USER_NAME, undefined, process.env.USER_PASSWORD)
-        // logger.debug(login)
-
-        this.dbManager = new DBManager(structure.scope, this.dbRemote)
-        await this.dbManager.initialize()
-
-        return login
-
 
     }
 

package/src/index.ts

@@ -176,7 +176,7 @@ class StopCommand extends Command {
  */
 const program = new Command()
 program.name('cyk').description('cyklang CLI')
-    .version('0.15.7')
+    .version('0.15.9')
 program.addCommand(new StartCommand('start'))
 program.addCommand(new StopCommand('stop'))
 program.addCommand(new InstallCommand('install'))

package/test/t34.xml

@@ -130,12 +130,12 @@
     <object name="result_sendmail"/>
     <sendmail returns="result_sendmail">
         <string name="to">"philippe.cyk@gmail.com"</string>
-        <string name="subject">"test t34.xml"</string>
+        <string name="subject">"email de test"</string>
         <string name="text">"Contenu de test t34.xml"</string>
-        <string name="html" literal=""><![CDATA[ <h1>Titre en HTML </h1>
-            <p><b>GRAS</b>
+        <!-- <string name="html" literal=""><![CDATA[ <h1>EMAIL DE TEST </h1>
+            <p><b>HTML</b>
             </p>
-        ]]></string>
+        ]]></string> -->
     </sendmail>
     <print>"result_sendmail.accepted : " + string(result_sendmail.accepted)</print>
 

package/test/t35.output

@@ -0,0 +1,3 @@
+function timeout done
+duration : 00:00:01
+15

package/test/t35.xml

@@ -13,4 +13,9 @@
     <sleep>1000</sleep>
     <datetime name="end">now()</datetime>
     <print>"duration : " + duration(start,end)</print>
+    <object name="params">
+        <number name="first">15</number>
+        <number name="last">15</number>
+    </object>
+    <print>query("select * from generate_series({{ first }}::integer, {{ last }}::integer)", params)</print>
 </module>