@cyklang/cli 0.18.16 → 0.19.1

package/build/InstallCommand.js

@@ -103,7 +103,7 @@ async function defaultInstallScript(node_package, dbManager, dbRemote) {
     /**
      * upload package modules to the server
      */
-    await uploadPackageModules(node_package, dbManager);
+    await uploadPackageModules(node_package, dbManager, dbRemote);
 }
 /**
  * function uploadPackageAssets
@@ -138,7 +138,7 @@ async function uploadPackageAssets(node_package, dbManager, dbRemote) {
  * @param node_package
  * @param dbManager
  */
-async function uploadPackageModules(node_package, dbManager) {
+async function uploadPackageModules(node_package, dbManager, dbRemote) {
     const moduleFolder = path.join('node_modules', node_package, 'module');
     if (!fs.existsSync(moduleFolder) || !fs.statSync(moduleFolder).isDirectory()) {
         return;
@@ -151,7 +151,7 @@ async function uploadPackageModules(node_package, dbManager) {
         const file = files[ind];
         if (!dbManager)
             throw 'dbManager undefined';
-        await (0, ModuleCommand_1.uploadModule)(path.join(moduleFolder, file), dbManager);
+        await (0, ModuleCommand_1.uploadModule)(path.join(moduleFolder, file), dbManager, dbRemote);
         if (file.endsWith('_init.xml')) {
             initModule = file;
         }

package/build/ModuleCommand.d.ts

@@ -1,15 +1,15 @@
 #!/usr/bin/env ts-node
-import { DBManager } from "@cyklang/core";
+import { DBManager, DBRemote } from "@cyklang/core";
 import { Command } from 'commander';
 export declare class ModuleCommand extends Command {
     constructor(name: string);
 }
 /**
  *
- * @param file
+ * @param fileName
  * @param dbManager
  */
-export declare function uploadModule(file: string, dbManager: DBManager): Promise<void>;
+export declare function uploadModule(fileName: string, dbManager: DBManager, dbRemote: DBRemote | undefined): Promise<void>;
 /**
  * function deleteModule
  * @param dbname

package/build/ModuleCommand.js

@@ -36,6 +36,7 @@ const commander_1 = require("commander");
 const Cmd_1 = require("./Cmd");
 const DBClient_1 = require("./DBClient");
 const RunCommand_1 = require("./RunCommand");
+const form_data_1 = __importDefault(require("form-data"));
 const logger = loglevel_1.default.getLogger("ModuleCommand.ts");
 logger.setLevel("debug");
 class ModuleCommand extends commander_1.Command {
@@ -130,21 +131,31 @@ class ModuleU extends Cmd_1.Cmd {
                 if (files.length > 1)
                     throw 'with --id option you can only specify 1 local file';
                 const dbModule = await this.dbManager.getModule(options.id);
-                dbModule.source = fs.readFileSync(files[0]).toString();
+                const fileName = files[0];
+                const source = fs.readFileSync(fileName).toString();
+                if (source.length < REQUEST_LIMIT) {
+                    dbModule.source = source;
+                }
+                else {
+                    dbModule.source = '';
+                }
                 dbModule.dbname = getModuleDBName(files[0]);
-                const tag = (0, core_1.parseXML)(dbModule.dbname, dbModule.source);
+                const tag = (0, core_1.parseXML)(dbModule.dbname, source);
                 dbModule.access = tag.attributes.ACCESS;
                 dbModule.description = tag.attributes.DESCRIPTION;
                 await this.dbManager.dbModuleUpdate(dbModule);
+                if (source.length >= REQUEST_LIMIT) {
+                    await uploadModuleSource(dbModule, fileName, this.dbRemote);
+                }
             }
             else {
                 for (let ind = 0; ind < files.length; ind++) {
-                    const file = files[ind];
+                    const fileName = files[ind];
                     try {
-                        await uploadModule(file, this.dbManager);
+                        await uploadModule(fileName, this.dbManager, this.dbRemote);
                     }
                     catch (err) {
-                        logger.error('Error uploading module ' + file, err);
+                        logger.error('Error uploading module ' + fileName, err);
                         throw err;
                     }
                 }
@@ -168,35 +179,50 @@ class ModuleU extends Cmd_1.Cmd {
         }
     }
 }
+const REQUEST_LIMIT = 50000;
 /**
  *
- * @param file
+ * @param fileName
  * @param dbManager
  */
-async function uploadModule(file, dbManager) {
-    const dbname = getModuleDBName(file);
-    const source = fs.readFileSync(file).toString();
+async function uploadModule(fileName, dbManager, dbRemote) {
+    const dbname = getModuleDBName(fileName);
+    const source = fs.readFileSync(fileName).toString();
     const tag = (0, core_1.parseXML)(dbname, source);
     const dbModuleExist = await dbManager.dbModuleExist(dbname);
     if (dbModuleExist === undefined) {
         // insert
         const dbModule = new core_1.DBModule();
-        dbModule.source = source;
+        if (source.length < REQUEST_LIMIT) {
+            dbModule.source = source;
+        }
         dbModule.dbname = dbname;
         dbModule.access = tag.attributes.ACCESS;
         dbModule.description = tag.attributes.DESCRIPTION;
         // logger.debug('module insert ' + dbname + ' access ' + dbModule.access + ' description ' + dbModule.description)
         const id = await dbManager.dbModuleInsert(dbModule);
+        dbModule.id = id;
+        if (source.length >= REQUEST_LIMIT) {
+            await uploadModuleSource(dbModule, fileName, dbRemote);
+        }
         logger.info('module ' + dbname + ' added with ID ' + id);
     }
     else {
         logger.debug('module exists : ' + dbModuleExist.dbname + ', id ' + dbModuleExist.id);
         // update
-        dbModuleExist.source = source;
+        if (source.length < REQUEST_LIMIT) {
+            dbModuleExist.source = source;
+        }
+        else {
+            dbModuleExist.source = '';
+        }
         dbModuleExist.access = tag.attributes.ACCESS;
         dbModuleExist.description = tag.attributes.DESCRIPTION;
         // logger.debug('module update ' + dbname + ' access ' + dbModuleExist.access + ' description ' + dbModuleExist.description)
         await dbManager.dbModuleUpdate(dbModuleExist);
+        if (source.length >= REQUEST_LIMIT) {
+            await uploadModuleSource(dbModuleExist, fileName, dbRemote);
+        }
         logger.info('module ' + dbname + ' updated');
     }
 }
@@ -315,3 +341,19 @@ async function deleteModule(dbname, dbManager) {
     await dbClient.deleteModule(dbname);
 }
 exports.deleteModule = deleteModule;
+async function uploadModuleSource(dbModule, fileName, dbRemote) {
+    try {
+        const file = fs.createReadStream(fileName);
+        const form = new form_data_1.default();
+        form.append('uploadFile', file);
+        const route = `/api/admin/modules/${dbModule.id}/source`;
+        if (!dbRemote)
+            throw 'dbRemote undefined';
+        await dbRemote.apiServer.post(route, form);
+        logger.info(`module source uploaded by form : ${dbModule.dbname}`);
+    }
+    catch (err) {
+        logger.error(err);
+        throw err;
+    }
+}

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.18.15');
+    .version('0.19.1');
 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.18.16",
+   "version": "0.19.1",
    "description": "cyklang CLI",
    "main": "build/index.js",
    "scripts": {
@@ -19,7 +19,7 @@
    "author": "",
    "license": "ISC",
    "dependencies": {
-      "@cyklang/core": "^0.62.0",
+      "@cyklang/core": "^0.64.0",
       "commander": "^9.4.0",
       "dotenv": "^16.0.1",
       "form-data": "^4.0.0",

package/src/InstallCommand.ts

@@ -84,7 +84,7 @@ async function defaultInstallScript(node_package: string, dbManager: DBManager,
     /**
      * upload package modules to the server 
      */
-    await uploadPackageModules(node_package, dbManager)
+    await uploadPackageModules(node_package, dbManager, dbRemote)
 }
 
 /**
@@ -123,7 +123,7 @@ async function uploadPackageAssets(node_package: string, dbManager: DBManager, d
  * @param node_package 
  * @param dbManager 
  */
-async function uploadPackageModules(node_package: string, dbManager: DBManager) {
+async function uploadPackageModules(node_package: string, dbManager: DBManager, dbRemote: DBRemote) {
 
     const moduleFolder = path.join('node_modules', node_package, 'module')
     if (!fs.existsSync(moduleFolder) || !fs.statSync(moduleFolder).isDirectory()) {
@@ -136,7 +136,7 @@ async function uploadPackageModules(node_package: string, dbManager: DBManager)
     for (let ind = 0; ind < files.length; ind++) {
         const file = files[ind]
         if (!dbManager) throw 'dbManager undefined'
-        await uploadModule(path.join(moduleFolder, file), dbManager)
+        await uploadModule(path.join(moduleFolder, file), dbManager, dbRemote)
         if (file.endsWith('_init.xml')) {
             initModule = file
         }

package/src/ModuleCommand.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env ts-node
-import { DBManager, DBModule, parseXML } from "@cyklang/core"
+import { DBManager, DBModule, DBRemote, parseXML } from "@cyklang/core"
 import * as fs from "fs"
 import loglevel from 'loglevel'
 import path from "path"
@@ -7,6 +7,7 @@ import { Command } from 'commander'
 import { Cmd } from "./Cmd"
 import { DBClient } from "./DBClient"
 import { runFile } from "./RunCommand"
+import FormData from 'form-data'
 const logger = loglevel.getLogger("ModuleCommand.ts")
 logger.setLevel("debug")
 
@@ -110,21 +111,34 @@ class ModuleU extends Cmd {
             if (options.id !== undefined) {
                 if (files.length > 1) throw 'with --id option you can only specify 1 local file'
                 const dbModule = await this.dbManager.getModule(options.id)
-                dbModule.source = fs.readFileSync(files[0]).toString()
+                const fileName = files[0]
+                const source = fs.readFileSync(fileName).toString()
+                if (source.length < REQUEST_LIMIT) {
+                    dbModule.source = source
+                }
+                else {
+                    dbModule.source = ''
+                }
+                
                 dbModule.dbname = getModuleDBName(files[0])
-                const tag = parseXML(dbModule.dbname, dbModule.source)
+                const tag = parseXML(dbModule.dbname, source)
                 dbModule.access = tag.attributes.ACCESS
                 dbModule.description = tag.attributes.DESCRIPTION
+
                 await this.dbManager.dbModuleUpdate(dbModule)
+
+                if (source.length >= REQUEST_LIMIT) {
+                    await uploadModuleSource(dbModule, fileName, this.dbRemote)
+                }
             }
             else {
                 for (let ind = 0; ind < files.length; ind++) {
-                    const file = files[ind]
+                    const fileName = files[ind]
                     try {
-                        await uploadModule(file, this.dbManager)
+                        await uploadModule(fileName, this.dbManager, this.dbRemote)
                     }
                     catch (err) {
-                        logger.error('Error uploading module ' + file, err)
+                        logger.error('Error uploading module ' + fileName, err)
                         throw err
                     }
                 }
@@ -149,35 +163,57 @@ class ModuleU extends Cmd {
     }
 }
 
+const REQUEST_LIMIT=50000
+
 /**
  * 
- * @param file 
+ * @param fileName 
  * @param dbManager 
  */
-export async function uploadModule(file: string, dbManager: DBManager) {
-    const dbname = getModuleDBName(file)
-    const source = fs.readFileSync(file).toString()
+export async function uploadModule(fileName: string, dbManager: DBManager, dbRemote: DBRemote | undefined) {
+    const dbname = getModuleDBName(fileName)
+    const source = fs.readFileSync(fileName).toString()
     const tag = parseXML(dbname, source)
     const dbModuleExist = await dbManager.dbModuleExist(dbname)
     if (dbModuleExist === undefined) {
         // insert
         const dbModule = new DBModule()
-        dbModule.source = source
+        if ( source.length < REQUEST_LIMIT ) {
+            dbModule.source = source
+        }
+        
         dbModule.dbname = dbname
         dbModule.access = tag.attributes.ACCESS
         dbModule.description = tag.attributes.DESCRIPTION
         // logger.debug('module insert ' + dbname + ' access ' + dbModule.access + ' description ' + dbModule.description)
         const id = await dbManager.dbModuleInsert(dbModule)
+        dbModule.id = id
+
+        if ( source.length >= REQUEST_LIMIT ) {
+            await uploadModuleSource(dbModule, fileName, dbRemote)
+        }
+        
         logger.info('module ' + dbname + ' added with ID ' + id)
     }
     else {
         logger.debug('module exists : ' + dbModuleExist.dbname + ', id ' + dbModuleExist.id)
         // update
-        dbModuleExist.source = source
+        if (source.length < REQUEST_LIMIT) {
+             dbModuleExist.source = source
+        }
+        else {
+            dbModuleExist.source = ''
+        }
+       
         dbModuleExist.access = tag.attributes.ACCESS
         dbModuleExist.description = tag.attributes.DESCRIPTION
         // logger.debug('module update ' + dbname + ' access ' + dbModuleExist.access + ' description ' + dbModuleExist.description)
         await dbManager.dbModuleUpdate(dbModuleExist)
+
+        if ( source.length >= REQUEST_LIMIT ) {
+            await uploadModuleSource(dbModuleExist, fileName, dbRemote)
+        }
+
         logger.info('module ' + dbname + ' updated')
     }
 }
@@ -309,3 +345,19 @@ export async function deleteModule(dbname: string, dbManager: DBManager) {
     await dbClient.deleteModule(dbname)
 }
 
+async function uploadModuleSource(dbModule: DBModule, fileName: string,  dbRemote: DBRemote | undefined) {
+    try {
+        const file = fs.createReadStream(fileName)
+        const form = new FormData()
+        form.append('uploadFile', file)
+
+        const route = `/api/admin/modules/${dbModule.id}/source`
+        if ( ! dbRemote ) throw 'dbRemote undefined'
+        await dbRemote.apiServer.post(route, form)
+        logger.info(`module source uploaded by form : ${dbModule.dbname}`)
+    }
+    catch (err) {
+        logger.error(err)
+        throw err
+    }
+}

package/src/index.ts

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

package/test/db/t21.output

@@ -33,3 +33,7 @@ string(true) = true
 string(false) = false
 boolean('true') = true
 boolean('false') = true
+typeof(chaine) = string
+typeof(booleen) = boolean
+typeof(nombre) = number
+typeof(indéfini) = undefined

package/test/t37.xml

@@ -66,4 +66,6 @@
     <print>format("result = {0}", result)</print>
     <print>format("columns = {0}", columns)</print>
 
+    <print>format("xlsx_has_sheet(Feuill1) = {0}",xlsx_has_sheet(bExcel, 'Feuill1'))</print>
+    <print>format("xlsx_has_sheet(Feuill2) = {0}",xlsx_has_sheet(bExcel, 'Feuill2'))</print>
 </module>

package/tsconfig.json

@@ -3,6 +3,7 @@
     "target": "es2020",
     "module": "Node16",
     "declaration": true,
+    "rootDir": "./src",
     "outDir": "./build",
     "strict": true,
     "esModuleInterop": true,