@cyklang/cli 0.5.5 → 0.5.6

package/build/AssetCommand.js

@@ -354,11 +354,9 @@ function buildUploadList(dirName, dest, localList, remoteList) {
         const route = dest + localDesc.path.substring(dirName.length);
         const remoteDesc = remoteMap.get(route);
         if (remoteDesc === undefined || remoteDesc.mtime.getTime() + 1000 < localDesc.mtime.getTime()) {
-            if (remoteDesc === undefined)
-                logger.debug('remoteDesc undefined');
-            else
-                logger.debug('remoteDesc.mtime ' + remoteDesc.mtime.getTime(), 'localDesc.mtime ' + localDesc.mtime.getTime());
-            logger.info(localDesc.path);
+            // if (remoteDesc === undefined) logger.debug('remoteDesc undefined')
+            // else logger.debug('remoteDesc.mtime ' + remoteDesc.mtime.getTime(), 'localDesc.mtime ' + localDesc.mtime.getTime())
+            // logger.info(localDesc.path)
             result.push(localDesc);
         }
     }
@@ -417,7 +415,7 @@ async function uploadFiles(dirName, uploadList, dest, dbManager, dbRemote, 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);
+        // logger.debug('upload ' + upload.path + ' to ' + route)
         await uploadAsset(upload, route, dbManager, dbRemote, auth);
     }
 }
@@ -451,7 +449,7 @@ async function uploadAsset(upload, route, dbManager, dbRemote, auth) {
         // logger.debug('dbAsset.content length ' + dbAsset.content.length)
         if (dbAsset.id === undefined) {
             dbAsset.id = await dbManager?.dbAssetInsert(dbAsset);
-            logger.info('inserted asset ' + dbAsset.id + ' route ' + dbAsset.route);
+            logger.info('inserted asset ' + dbAsset.route);
         }
         else {
             await dbManager?.dbAssetUpdate(dbAsset);
@@ -486,7 +484,7 @@ function mimetypeLookup(filename) {
  * @param dbRemote
  */
 async function uploadAssetContent(dbAsset, fileName, dbRemote) {
-    logger.debug('uploadAssetContent file ' + fileName + ' to path ' + path_1.default);
+    // logger.debug('uploadAssetContent file ' + fileName + ' to path ' + path)
     try {
         const file = fs.createReadStream(fileName);
         const form = new form_data_1.default();

package/build/InstallCommand.js

@@ -72,7 +72,7 @@ async function installPackage(node_package, dbManager, dbRemote) {
     /**
      * install the Node Package
      */
-    await installNodePackage(node_package, dbManager);
+    await installNodePackage(node_package, dbManager, dbRemote);
     const installScript = await lookupInstallScript(node_package);
     if (installScript) {
         /**
@@ -117,8 +117,6 @@ async function uploadPackageAssets(node_package, dbManager, dbRemote) {
     }
     console.log();
     console.log('upload assets to server ...');
-    if (!dbManager)
-        throw 'dbManager undefined';
     const items = fs.readdirSync(assetFolder);
     for (let ind = 0; ind < items.length; ind++) {
         const item = items[ind];
@@ -168,7 +166,7 @@ async function uploadPackageModules(node_package, dbManager) {
  * method installNodePackage
  * @param node_package
  */
-async function installNodePackage(node_package, dbManager) {
+async function installNodePackage(node_package, dbManager, dbRemote) {
     try {
         const packageJson = await (0, Cmd_1.readPackageJson)();
         if (packageJson.devDependencies && packageJson.devDependencies[node_package]
@@ -176,7 +174,7 @@ async function installNodePackage(node_package, dbManager) {
             console.log(node_package + ' already installed. We uninstall it first');
             if (!dbManager)
                 throw 'dbManager undefined';
-            await (0, UninstallCommand_1.uninstallPackage)(node_package, dbManager);
+            await (0, UninstallCommand_1.uninstallPackage)(node_package, dbManager, dbRemote);
         }
         await (0, Cmd_1.runShellCommand)('npm', ['install', '--save-dev', node_package]);
     }

package/build/UninstallCommand.d.ts

@@ -1,5 +1,5 @@
 import { Cmd } from "./Cmd";
-import { DBManager } from "@cyklang/core";
+import { DBManager, DBRemote } from "@cyklang/core";
 export declare class UninstallCommand extends Cmd {
     /**
      * constructor
@@ -17,4 +17,4 @@ export declare class UninstallCommand extends Cmd {
  * function uninstallPackage
  * @param node_package
  */
-export declare function uninstallPackage(node_package: string, dbManager: DBManager): Promise<void>;
+export declare function uninstallPackage(node_package: string, dbManager: DBManager, dbRemote: DBRemote): Promise<void>;

package/build/UninstallCommand.js

@@ -56,9 +56,9 @@ class UninstallCommand extends Cmd_1.Cmd {
     async uninstall(node_package, options) {
         try {
             await this.prologue(options);
-            if (this.dbManager === undefined)
-                throw 'dbManager undefined';
-            await uninstallPackage(node_package, this.dbManager);
+            if (!this.dbManager || !this.dbRemote)
+                throw 'dbManager or dbRemote undefined';
+            await uninstallPackage(node_package, this.dbManager, this.dbRemote);
         }
         catch (err) {
             logger.error(err);
@@ -70,7 +70,7 @@ exports.UninstallCommand = UninstallCommand;
  * function uninstallPackage
  * @param node_package
  */
-async function uninstallPackage(node_package, dbManager) {
+async function uninstallPackage(node_package, dbManager, dbRemote) {
     const uninstallScript = await lookupUninstallScript(node_package);
     if (uninstallScript) {
         /**
@@ -83,7 +83,7 @@ async function uninstallPackage(node_package, dbManager) {
         /**
          * default uninstall :
          */
-        await defaultUninstallScript(node_package, dbManager);
+        await defaultUninstallScript(node_package, dbManager, dbRemote);
     }
     /**
      * uninstall the node package
@@ -95,13 +95,60 @@ exports.uninstallPackage = uninstallPackage;
  * method defaultUninstallScript
  * @param node_package
  */
-async function defaultUninstallScript(node_package, dbManager) {
+async function defaultUninstallScript(node_package, dbManager, dbRemote) {
     console.log();
     console.log('Default uninstall script');
     /**
      * delete package modules from server
      */
     await deletePackageModules(node_package, dbManager);
+    /**
+     * delete package assets from server
+     */
+    await deletePackageAssets(node_package, dbManager, dbRemote);
+}
+/**
+ * function deletePackageAssets
+ * @param node_package
+ * @param dbManager
+ * @param dbRemote
+ */
+async function deletePackageAssets(node_package, dbManager, dbRemote) {
+    const assetFolder = path.join('node_modules', node_package, 'asset');
+    if (!fs.existsSync(assetFolder) || !fs.statSync(assetFolder).isDirectory()) {
+        return;
+    }
+    console.log();
+    console.log('delete assets from server ...');
+    await browseFolder(assetFolder, async (filePath) => {
+        const route = '/' + path.relative(assetFolder, filePath);
+        const dbAsset = await dbManager.dbAssetExist(route);
+        if (!dbAsset) {
+            logger.info('asset ' + route + ' not found');
+            return;
+        }
+        await dbManager.dbAssetDelete(dbAsset);
+        logger.info('asset ' + route + ' deleted');
+    });
+    console.log((0, kolorist_1.green)('*') + ' delete assets from server');
+}
+/**
+ * browseFolder
+ * @param folder
+ * @param treatment
+ */
+async function browseFolder(folder, treatment) {
+    const files = fs.readdirSync(folder);
+    for (let ind = 0; ind < files.length; ind++) {
+        const file = files[ind];
+        const pathName = folder + '/' + file;
+        if (fs.statSync(pathName).isDirectory()) {
+            await browseFolder(pathName, treatment);
+        }
+        else {
+            await treatment(pathName);
+        }
+    }
 }
 /**
  * function deletePackageModules

package/build/index.js

@@ -20,7 +20,7 @@ const logger = loglevel_1.default.getLogger("index.ts");
 logger.setLevel("debug");
 const program = new commander_1.Command();
 program.name('cyk').description('cyklang CLI')
-    .version('0.5.5');
+    .version('0.5.6');
 program.addCommand(new InstallCommand_1.InstallCommand('install'));
 program.addCommand(new InstallCommand_1.InstallCommand('i'));
 program.addCommand(new UninstallCommand_1.UninstallCommand('uninstall'));

package/package.json

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

package/src/AssetCommand.ts

@@ -366,9 +366,9 @@ function buildUploadList(dirName: string, dest: string, localList: FileDescripto
         const remoteDesc = remoteMap.get(route)
 
         if (remoteDesc === undefined || remoteDesc.mtime.getTime() + 1000 < localDesc.mtime.getTime()) {
-            if (remoteDesc === undefined) logger.debug('remoteDesc undefined')
-            else logger.debug('remoteDesc.mtime ' + remoteDesc.mtime.getTime(), 'localDesc.mtime ' + localDesc.mtime.getTime())
-            logger.info(localDesc.path)
+            // if (remoteDesc === undefined) logger.debug('remoteDesc undefined')
+            // else logger.debug('remoteDesc.mtime ' + remoteDesc.mtime.getTime(), 'localDesc.mtime ' + localDesc.mtime.getTime())
+            // logger.info(localDesc.path)
             result.push(localDesc)
         }
     }
@@ -426,7 +426,7 @@ async function uploadFiles(dirName: string, uploadList: FileDescriptor[], dest:
     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)
+        // logger.debug('upload ' + upload.path + ' to ' + route)
         await uploadAsset(upload, route, dbManager, dbRemote, auth)
     }
 }
@@ -463,7 +463,7 @@ export async function uploadAsset(upload: FileDescriptor, route: string, dbManag
 
         if (dbAsset.id === undefined) {
             dbAsset.id = await dbManager?.dbAssetInsert(dbAsset)
-            logger.info('inserted asset ' + dbAsset.id + ' route ' + dbAsset.route)
+            logger.info('inserted asset ' + dbAsset.route)
         }
         else {
             await dbManager?.dbAssetUpdate(dbAsset)
@@ -500,7 +500,7 @@ function mimetypeLookup(filename: string): string | false {
  * @param dbRemote 
  */
 async function uploadAssetContent(dbAsset: DBAsset, fileName: string, dbRemote: DBRemote | undefined) {
-    logger.debug('uploadAssetContent file ' + fileName + ' to path ' + path)
+    // logger.debug('uploadAssetContent file ' + fileName + ' to path ' + path)
     try {
         const file = fs.createReadStream(fileName)
         const form = new FormData()

package/src/InstallCommand.ts

@@ -48,7 +48,7 @@ export async function installPackage(node_package: string, dbManager: DBManager,
     /**
      * install the Node Package
      */
-    await installNodePackage(node_package, dbManager)
+    await installNodePackage(node_package, dbManager, dbRemote)
 
     const installScript = await lookupInstallScript(node_package)
 
@@ -100,7 +100,6 @@ async function uploadPackageAssets(node_package: string, dbManager: DBManager, d
     console.log()
     console.log('upload assets to server ...')
     
-    if (!dbManager) throw 'dbManager undefined'
     const items = fs.readdirSync(assetFolder)
     for (let ind = 0; ind < items.length; ind++) {
         const item = items[ind]
@@ -153,7 +152,7 @@ async function uploadPackageModules(node_package: string, dbManager: DBManager)
  * method installNodePackage
  * @param node_package 
  */
-async function installNodePackage(node_package: string, dbManager: DBManager) {
+async function installNodePackage(node_package: string, dbManager: DBManager, dbRemote: DBRemote) {
 
     try {
         const packageJson = await readPackageJson()
@@ -161,7 +160,7 @@ async function installNodePackage(node_package: string, dbManager: DBManager) {
             || packageJson.dependencies && packageJson.dependencies[node_package]) {
             console.log(node_package + ' already installed. We uninstall it first')
             if (!dbManager) throw 'dbManager undefined'
-            await uninstallPackage(node_package, dbManager)
+            await uninstallPackage(node_package, dbManager, dbRemote)
         }
 
         await runShellCommand('npm', ['install', '--save-dev', node_package])

package/src/UninstallCommand.ts

@@ -5,7 +5,7 @@ import { green, red, bold } from 'kolorist'
 
 import loglevel from 'loglevel'
 import { deleteModule } from "./ModuleCommand";
-import { DBManager } from "@cyklang/core";
+import { DBManager, DBRemote } from "@cyklang/core";
 const logger = loglevel.getLogger('UninstallCommand.ts')
 logger.setLevel('debug')
 
@@ -31,9 +31,9 @@ export class UninstallCommand extends Cmd {
     async uninstall(node_package: string, options: any) {
         try {
             await this.prologue(options)
-            if (this.dbManager === undefined) throw 'dbManager undefined'
+            if (! this.dbManager || ! this.dbRemote) throw 'dbManager or dbRemote undefined'
 
-            await uninstallPackage(node_package, this.dbManager)
+            await uninstallPackage(node_package, this.dbManager, this.dbRemote)
         }
         catch (err) {
             logger.error(err)
@@ -45,7 +45,7 @@ export class UninstallCommand extends Cmd {
  * function uninstallPackage
  * @param node_package 
  */
-export async function uninstallPackage(node_package: string, dbManager: DBManager) {
+export async function uninstallPackage(node_package: string, dbManager: DBManager, dbRemote: DBRemote) {
 
     const uninstallScript = await lookupUninstallScript(node_package)
     if (uninstallScript) {
@@ -59,7 +59,7 @@ export async function uninstallPackage(node_package: string, dbManager: DBManage
         /**
          * default uninstall : 
          */
-        await defaultUninstallScript(node_package, dbManager)
+        await defaultUninstallScript(node_package, dbManager, dbRemote)
     }
 
     /**
@@ -72,14 +72,65 @@ export async function uninstallPackage(node_package: string, dbManager: DBManage
  * method defaultUninstallScript
  * @param node_package 
  */
-async function defaultUninstallScript(node_package: string, dbManager: DBManager) {
+async function defaultUninstallScript(node_package: string, dbManager: DBManager, dbRemote: DBRemote) {
     console.log()
     console.log('Default uninstall script')
     /**
      * delete package modules from server
      */
     await deletePackageModules(node_package, dbManager)
+    /**
+     * delete package assets from server
+     */
+    await deletePackageAssets(node_package, dbManager, dbRemote)
+
+}
+
+/**
+ * function deletePackageAssets
+ * @param node_package 
+ * @param dbManager 
+ * @param dbRemote 
+ */
+async function deletePackageAssets(node_package: string, dbManager: DBManager, dbRemote: DBRemote) {
+    const assetFolder = path.join('node_modules', node_package, 'asset')
+    if (!fs.existsSync(assetFolder) || !fs.statSync(assetFolder).isDirectory()) {
+        return
+    }
+    console.log()
+    console.log('delete assets from server ...')
+
+    await browseFolder(assetFolder, async (filePath: string) => {
+        const route = '/' + path.relative(assetFolder, filePath)
+        const dbAsset = await dbManager.dbAssetExist(route)
+        if (!dbAsset) {
+            logger.info('asset ' + route + ' not found')
+            return
+        }
+        await dbManager.dbAssetDelete(dbAsset)
+        logger.info('asset ' + route + ' deleted')
+    })
 
+    console.log(green('*') + ' delete assets from server')
+}
+
+/**
+ * browseFolder
+ * @param folder 
+ * @param treatment 
+ */
+async function browseFolder(folder: string, treatment: (filePath: string) => Promise<void>) {
+    const files = fs.readdirSync(folder)
+    for(let ind = 0; ind < files.length; ind++) {
+        const file = files[ind]
+        const pathName = folder + '/' + file
+        if (fs.statSync(pathName).isDirectory()) {
+            await browseFolder(pathName, treatment)
+        }
+        else {
+            await treatment(pathName)
+        }
+    }
 }
 
 /**

package/src/index.ts

@@ -16,7 +16,7 @@ logger.setLevel("debug")
 
 const program = new Command()
 program.name('cyk').description('cyklang CLI')
-    .version('0.5.5')
+    .version('0.5.6')
 
 program.addCommand(new InstallCommand('install'))
 program.addCommand(new InstallCommand('i'))