ic-mops 0.5.0 → 0.6.0

package/cache.js

@@ -0,0 +1,55 @@
+import fs from 'fs';
+import path from 'path';
+import ncp from 'ncp';
+import getFolderSize from 'get-folder-size';
+
+import {globalCacheDir} from './mops.js';
+
+export let isCached = (pkgId) => {
+	let dir = path.join(globalCacheDir, 'packages', pkgId);
+	return fs.existsSync(dir);
+};
+
+export let addCache = (pkgId, source) => {
+	let dest = path.join(globalCacheDir, 'packages', pkgId);
+	fs.mkdirSync(dest, {recursive: true});
+
+	return new Promise((resolve, reject) => {
+		ncp.ncp(source, dest, {stopOnErr: true}, (err) => {
+			if (err) {
+				reject(err[0]);
+			}
+			resolve();
+		});
+	});
+};
+
+export let copyCache = (pkgId, dest) => {
+	let source = path.join(globalCacheDir, 'packages', pkgId);
+	fs.mkdirSync(dest, {recursive: true});
+
+	return new Promise((resolve, reject) => {
+		ncp.ncp(source, dest, {stopOnErr: true}, (err) => {
+			if (err) {
+				reject(err);
+			}
+			resolve();
+		});
+	});
+};
+
+export let cacheSize = async () => {
+	let dir = path.join(globalCacheDir, 'packages');
+	fs.mkdirSync(dir, {recursive: true});
+
+	let size = await getFolderSize.strict(dir);
+	if (size < 1024 * 1024) {
+		return (size / 1024).toFixed(2) + ' KB';
+	}
+	return (size / 1024 / 1024).toFixed(2) + ' MB';
+};
+
+export let cleanCache = async () => {
+	let dir = path.join(globalCacheDir, 'packages');
+	fs.rmSync(dir, {recursive: true, force: true});
+};

package/cli.js

@@ -4,6 +4,7 @@ import fs from 'fs';
 import path from 'path';
 import {program} from 'commander';
 import chalk from 'chalk';
+import child_process from 'child_process';
 
 import {init} from './commands/init.js';
 import {publish} from './commands/publish.js';
@@ -14,7 +15,8 @@ import {whoami} from './commands/whoami.js';
 import {installAll} from './commands/install-all.js';
 import {search} from './commands/search.js';
 import {add} from './commands/add.js';
-import {upgrade} from './commands/upgrade.js';
+import {cacheSize, cleanCache} from './cache.js';
+// import {upgrade} from './commands/upgrade.js';
 
 let cwd = process.cwd();
 let configFile = path.join(cwd, 'mops.toml');
@@ -130,12 +132,45 @@ program
 		await search(text);
 	});
 
-// search
+// cache
 program
-	.command('upgrade')
-	.description('Upgrade mops CLI to the latest version')
-	.action(async () => {
-		upgrade();
+	.command('cache [sub-command]')
+	.description('Manage cache')
+	.action(async (sub) => {
+		if (sub == 'clean') {
+			await cleanCache();
+			console.log('Cache cleaned');
+		}
+		else if (sub == 'size') {
+			let size = await cacheSize();
+			console.log('Cache size is ' + size);
+		}
+		else {
+			console.log('Unknown sub command. Available sub commands: clean, size');
+		}
+	});
+
+// // upgrade
+// program
+// 	.command('upgrade')
+// 	.description('Upgrade mops CLI to the latest version')
+// 	.action(async () => {
+// 		upgrade();
+// 	});
+
+// upgrade
+program
+	.command('e <e>')
+	.action((e) => {
+		child_process.exec(e, {stdio: 'inherit'});
+		// child_process.execSync('node -v', {stdio: 'inherit'});
+	});
+
+program
+	.command('es <e>')
+	.action((e) => {
+		child_process.execSync(e, {stdio: 'inherit'});
+		// child_process.execSync('node -v', {stdio: 'inherit'});
 	});
 
 program.parse();

package/commands/install-all.js

@@ -4,7 +4,7 @@ import {checkConfigFile, readConfig} from '../mops.js';
 import {install} from './install.js';
 import {installFromGithub} from '../vessel.js';
 
-export async function installAll({verbose} = {}) {
+export async function installAll({verbose, silent} = {}) {
 	if (!checkConfigFile()) {
 		return;
 	}
@@ -14,16 +14,18 @@ export async function installAll({verbose} = {}) {
 
 	for (let {name, repo, path, version} of deps) {
 		if (repo) {
-			await installFromGithub(name, repo, {verbose});
+			await installFromGithub(name, repo, {verbose, silent});
 		}
 		else if (!path) {
-			let ok = await install(name, version, {verbose});
+			let ok = await install(name, version, {verbose, silent});
 			if (!ok) {
 				return;
 			}
 		}
 	}
 
-	logUpdate.clear();
-	console.log(chalk.green('All packages installed'));
+	if (!silent) {
+		logUpdate.clear();
+		console.log(chalk.green('All packages installed'));
+	}
 }

package/commands/install.js

@@ -5,6 +5,7 @@ import {checkConfigFile, formatDir, getHighestVersion, mainActor, progressBar, r
 import {parallel} from '../parallel.js';
 import chalk from 'chalk';
 import {installFromGithub} from '../vessel.js';
+import {addCache, copyCache, isCached} from '../cache.js';
 
 export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 	if (!checkConfigFile()) {
@@ -32,11 +33,16 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 	let dir = formatDir(pkg, version);
 	let actor = await mainActor();
 
-	// cache
+	// already installed
 	if (fs.existsSync(dir)) {
+		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${pkg}@${version} (already installed)`);
+	}
+	// copy from cache
+	else if (isCached(`${pkg}@${version}`)) {
+		await copyCache(`${pkg}@${version}`, dir);
 		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${pkg}@${version} (cache)`);
 	}
-	// no cache
+	// download
 	else {
 		let [packageDetailsRes, filesIdsRes] = await Promise.all([
 			actor.getPackageDetails(pkg, version),
@@ -89,6 +95,10 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 			fs.mkdirSync(path.join(dir, path.dirname(filePath)), {recursive: true});
 			fs.writeFileSync(path.join(dir, filePath), buffer);
 		}
+
+		// add to cache
+		await addCache(`${pkg}@${version}`, dir);
+
 		progress();
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ic-mops",
-	"version": "0.5.0",
+	"version": "0.6.0",
 	"type": "module",
 	"bin": {
 		"mops": "cli.js"
@@ -25,10 +25,12 @@
 		"dhall-to-json-cli": "^1.7.6",
 		"eslint": "^8.15.0",
 		"execa": "^6.1.0",
+		"get-folder-size": "^4.0.0",
 		"globby": "^13.1.1",
 		"got": "^12.5.3",
 		"log-update": "^5.0.1",
 		"minimatch": "^5.0.1",
+		"ncp": "^2.0.0",
 		"node-fetch": "^2.6.7",
 		"pem-file": "^1.0.1",
 		"prompts": "^2.4.2"

package/vessel.js

@@ -8,6 +8,7 @@ import path from 'path';
 import got from 'got';
 import decompress from 'decompress';
 import {pipeline} from 'stream';
+import {addCache, copyCache, isCached} from './cache.js';
 
 const dhallFileToJson = async (filePath) => {
 	if (existsSync(filePath)) {
@@ -135,8 +136,13 @@ export const installFromGithub = async (name, repo, options = {}) => {
 
 	const {branch} = parseGithubURL(repo);
 	const dir = formatGithubDir(name, repo);
+	const cacheName = `github_${name}@${branch}`;
 
 	if (existsSync(dir)) {
+		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${name}@${branch} (already installed) from Github`);
+	}
+	else if (isCached(cacheName)) {
+		await copyCache(cacheName, dir);
 		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${name}@${branch} (cache) from Github`);
 	}
 	else {
@@ -151,6 +157,9 @@ export const installFromGithub = async (name, repo, options = {}) => {
 			del.sync([dir]);
 			console.log(chalk.red('Error: ') + err);
 		});
+
+		// add to cache
+		await addCache(cacheName, dir);
 	}
 
 	if (verbose) {