@cyklang/cli 0.3.0 → 0.3.1

package/build/AssetCommand.js

@@ -42,7 +42,7 @@ class AssetCommand extends commander_1.Command {
         this.description(description);
         this.addCommand(new AssetList('list', 'list assets'));
         this.addCommand(new AssetList('l', '(l)ist assets'));
-        this.addCommand(new AssetUpload('upload', 'upload assets from current directory'));
+        this.addCommand(new AssetUpload('upload', 'upload assets from sources'));
         this.addCommand(new AssetUpload('u', '(u)pload assets'));
     }
 }
@@ -75,6 +75,7 @@ class AssetUpload extends Cmd_1.Cmd {
         //----------------------------------------------------------------------------------------------
         this.ignorePatterns = ['.git', 'node_modules'];
         this.description(description)
+            .option('-a --auth <auth_schema>', 'authentication schema : basic | token | any, default is no authentication')
             .option('-d --dest <destination>', 'destination path, directory name')
             .option('-c --clean', 'clean destination path before uploading')
             .option('-y --yes', 'upload list is automatically confirmed')
@@ -100,6 +101,11 @@ class AssetUpload extends Cmd_1.Cmd {
                 throw 'dbManager undefined';
             if (sources.length === 0)
                 throw 'no source to upload';
+            if (options.auth && ' basic | token | any '.indexOf(options.auth) === -1) {
+                throw 'valid authentication schemas are : basic | token | any';
+            }
+            logger.debug('options : ', options);
+            logger.debug('auth : ' + options.auth);
             let dest = "/";
             if (options.dest !== undefined)
                 dest = options.dest;
@@ -121,7 +127,7 @@ class AssetUpload extends Cmd_1.Cmd {
                 else if (filestat.isFile() === true) {
                     const base = path_1.default.parse(source).base;
                     logger.debug('upload file ' + source + ' to ' + dest + base);
-                    await this.uploadAsset({ path: source, mtime: filestat.mtime }, dest + base);
+                    await this.uploadAsset({ path: source, mtime: filestat.mtime }, dest + base, options.auth);
                 }
             }
         }
@@ -169,7 +175,7 @@ class AssetUpload extends Cmd_1.Cmd {
                 uploadConfirmed = true;
         }
         if (uploadConfirmed === true) {
-            await this.uploadFiles(dirName, uploadList, dest);
+            await this.uploadFiles(dirName, uploadList, dest, options.auth);
         }
         // const rl = readline.createInterface(process.stdin, process.stdout)
         // rl.question('Do you want to upload this(these) ' + uploadList.length + ' file(s) (Y/N/y/n) ?', async (reply) => {
@@ -269,19 +275,19 @@ class AssetUpload extends Cmd_1.Cmd {
     //----------------------------------------------------------------------------------------------
     // uploadFiles
     //----------------------------------------------------------------------------------------------
-    async uploadFiles(dirName, uploadList, dest) {
+    async uploadFiles(dirName, uploadList, dest, auth) {
         for (let ind = 0; ind < uploadList.length; ind++) {
             const upload = uploadList[ind];
             const route = dest + upload.path.substring(dirName.length);
             logger.debug('upload ' + upload.path + ' to ' + route);
-            await this.uploadAsset(upload, route);
+            await this.uploadAsset(upload, route, auth);
         }
     }
     //----------------------------------------------------------------------------------------------
     // uploadAsset
     //----------------------------------------------------------------------------------------------
-    async uploadAsset(upload, route) {
-        logger.debug('uploadAsset ' + upload.path + ' to route ' + route + ' with mimetype ' + this.mimetypeLookup(upload.path));
+    async uploadAsset(upload, route, auth) {
+        logger.debug('uploadAsset ' + upload.path + ' to route ' + route + ' with mimetype ' + this.mimetypeLookup(upload.path) + ', auth : ' + auth);
         try {
             let dbAsset = await this.dbManager?.dbAssetExist(route);
             if (dbAsset === undefined) {
@@ -292,6 +298,7 @@ class AssetUpload extends Cmd_1.Cmd {
                 throw 'mimetype false for ' + upload;
             dbAsset.mimetype = mimetype;
             dbAsset.route = route;
+            dbAsset.auth = auth;
             // const fstat = fs.statSync(fileName)
             dbAsset.last_update = upload.mtime;
             // const contentBuffer = fs.readFileSync(fileName)

package/build/UserCommand.js

@@ -16,7 +16,8 @@ class UserCommand extends commander_1.Command {
     constructor(name) {
         super(name);
         this.description('manage users in cyk_user table').version('0.1');
-        this.addCommand(new UserAddCmd());
+        this.addCommand(new UserAddCmd('add', 'add a new user'));
+        this.addCommand(new UserAddCmd('a', 'add a new user'));
         this.addCommand(new UserUpdateCmd('update', 'update user by id all fields except password'));
         this.addCommand(new UserUpdateCmd('u', 'shortcut for (u)pdate'));
         this.addCommand(new UserDeleteCmd('delete', 'delete user by id and name. Both options are mandatory to avoid typing error'));
@@ -27,9 +28,9 @@ class UserCommand extends commander_1.Command {
 }
 exports.UserCommand = UserCommand;
 class UserAddCmd extends Cmd_1.Cmd {
-    constructor() {
-        super('add');
-        this.description('add a new user')
+    constructor(name, description) {
+        super(name);
+        this.description(description)
             .requiredOption('-n --name <name>', 'user name')
             .option('-e --email <email>', 'user email address')
             .option('-p --passwd <password>', 'initial password')

package/package.json

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

package/src/AssetCommand.ts

@@ -19,7 +19,7 @@ export class AssetCommand extends Command {
         this.description(description)
         this.addCommand(new AssetList('list', 'list assets'))
         this.addCommand(new AssetList('l', '(l)ist assets'))
-        this.addCommand(new AssetUpload('upload', 'upload assets from current directory'))
+        this.addCommand(new AssetUpload('upload', 'upload assets from sources'))
         this.addCommand(new AssetUpload('u', '(u)pload assets'))
     }
 }
@@ -61,6 +61,7 @@ class AssetUpload extends Cmd {
     constructor(name: string, description: string) {
         super(name)
         this.description(description)
+            .option('-a --auth <auth_schema>', 'authentication schema : basic | token | any, default is no authentication')
             .option('-d --dest <destination>', 'destination path, directory name')
             .option('-c --clean', 'clean destination path before uploading')
             .option('-y --yes', 'upload list is automatically confirmed')
@@ -89,6 +90,12 @@ class AssetUpload extends Cmd {
 
             if (sources.length === 0) throw 'no source to upload'
 
+            if ( options.auth && ' basic | token | any '.indexOf(options.auth) === -1 ) {
+                throw 'valid authentication schemas are : basic | token | any'
+            }
+            logger.debug('options : ', options)
+            logger.debug('auth : ' + options.auth)
+
             let dest = "/"
             if (options.dest !== undefined) dest = options.dest
             if (dest.substring(0, 1) !== '/') dest = '/' + dest
@@ -108,7 +115,7 @@ class AssetUpload extends Cmd {
                 else if (filestat.isFile() === true) {
                     const base = path.parse(source).base
                     logger.debug('upload file ' + source + ' to ' + dest + base)
-                    await this.uploadAsset({ path: source, mtime: filestat.mtime }, dest + base)
+                    await this.uploadAsset({ path: source, mtime: filestat.mtime }, dest + base, options.auth)
                 }
             }
         }
@@ -168,7 +175,7 @@ class AssetUpload extends Cmd {
         }
 
         if (uploadConfirmed === true) {
-            await this.uploadFiles(dirName, uploadList, dest)
+            await this.uploadFiles(dirName, uploadList, dest, options.auth)
         }
 
         // const rl = readline.createInterface(process.stdin, process.stdout)
@@ -281,12 +288,12 @@ class AssetUpload extends Cmd {
     // uploadFiles
     //----------------------------------------------------------------------------------------------
 
-    async uploadFiles(dirName: string, uploadList: FileDescriptor[], dest: string) {
+    async uploadFiles(dirName: string, uploadList: FileDescriptor[], dest: string, auth: string | undefined) {
         for (let ind = 0; ind < uploadList.length; ind++) {
             const upload = uploadList[ind]
             const route = dest + upload.path.substring(dirName.length)
             logger.debug('upload ' + upload.path + ' to ' + route)
-            await this.uploadAsset(upload, route)
+            await this.uploadAsset(upload, route, auth)
         }
     }
 
@@ -294,8 +301,8 @@ class AssetUpload extends Cmd {
     // uploadAsset
     //----------------------------------------------------------------------------------------------
 
-    async uploadAsset(upload: FileDescriptor, route: string) {
-        logger.debug('uploadAsset ' + upload.path + ' to route ' + route + ' with mimetype ' + this.mimetypeLookup(upload.path))
+    async uploadAsset(upload: FileDescriptor, route: string, auth?: string) {
+        logger.debug('uploadAsset ' + upload.path + ' to route ' + route + ' with mimetype ' + this.mimetypeLookup(upload.path) + ', auth : ' + auth)
 
         try {
             let dbAsset: DBAsset | undefined = await this.dbManager?.dbAssetExist(route)
@@ -306,6 +313,7 @@ class AssetUpload extends Cmd {
             if (mimetype === false) throw 'mimetype false for ' + upload
             dbAsset.mimetype = mimetype
             dbAsset.route = route
+            dbAsset.auth = auth
             
             // const fstat = fs.statSync(fileName)
             dbAsset.last_update = upload.mtime

package/src/UserCommand.ts

@@ -11,7 +11,8 @@ export class UserCommand extends Command {
     constructor(name: string) {
         super(name)
         this.description('manage users in cyk_user table').version('0.1')
-        this.addCommand(new UserAddCmd())
+        this.addCommand(new UserAddCmd('add', 'add a new user'))
+        this.addCommand(new UserAddCmd('a', 'add a new user'))
         this.addCommand(new UserUpdateCmd('update', 'update user by id all fields except password'))
         this.addCommand(new UserUpdateCmd('u', 'shortcut for (u)pdate'))
         this.addCommand(new UserDeleteCmd('delete', 'delete user by id and name. Both options are mandatory to avoid typing error'))
@@ -35,9 +36,9 @@ interface Options {
 }
 
 class UserAddCmd extends Cmd {
-    constructor() {
-        super('add')
-        this.description('add a new user')
+    constructor(name: string, description: string) {
+        super(name)
+        this.description(description)
             .requiredOption('-n --name <name>', 'user name')
             .option('-e --email <email>', 'user email address')
             .option('-p --passwd <password>', 'initial password')