ic-mops 1.1.0 → 1.1.2-pre.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Mops CLI Changelog
 
+## 1.1.1
+- `moc-wrapper` now adds hostname to the moc path cache(`.mops/moc-*` filename) to avoid errors when running in Dev Containers
+- `mops watch` now deploys canisters with the `--yes` flag to skip data loss confirmation
+
 ## 1.1.0
 - New `mops watch` command to check for syntax errors, show warnings, run tests, generate declarations and deploy canisters ([docs](https://docs.mops.one/cli/mops-watch))
 - New flag `--no-toolchain` in `mops install` command to skip toolchain installation

package/bin/moc-wrapper.sh

@@ -22,7 +22,7 @@ else
     mopsTomlHash=$(shasum $mopsToml -a 256 | awk -F' ' '{print $1}')
   fi;
 
-  cached="$rootDir/.mops/moc-$mopsTomlHash"
+  cached="$rootDir/.mops/moc-$(uname -n)-$mopsTomlHash"
 
   if [ -f $cached ]; then
     mocPath=$(cat $cached)

package/cli.ts

@@ -214,6 +214,7 @@ program
 	.addOption(new Option('--mode <mode>', 'Test mode').choices(['interpreter', 'wasi', 'replica']).default('interpreter'))
 	.addOption(new Option('--replica <replica>', 'Which replica to use to run tests in replica mode').choices(['dfx', 'pocket-ic']))
 	.option('-w, --watch', 'Enable watch mode')
+	.option('--debug', 'Show debug logs')
 	.action(async (filter, options) => {
 		checkConfigFile(true);
 		await installAll({silent: true, lock: 'ignore', installFromLockFile: true});

package/commands/replica.ts

@@ -8,19 +8,21 @@ import {spawn as spawnAsync} from 'promisify-child-process';
 import {IDL} from '@dfinity/candid';
 import {Actor, HttpAgent} from '@dfinity/agent';
 import {PocketIc, PocketIcServer} from 'pic-ic';
+import chalk from 'chalk';
 
 import {readConfig} from '../mops.js';
 import {toolchain} from './toolchain/index.js';
+import {getDfxVersion} from '../helpers/get-dfx-version.js';
 
 type StartOptions = {
-	type ?: 'dfx' | 'pocket-ic';
+	type ?: 'dfx' | 'pocket-ic' | 'dfx-pocket-ic';
 	dir ?: string;
 	verbose ?: boolean;
 	silent ?: boolean;
 };
 
 export class Replica {
-	type : 'dfx' | 'pocket-ic' = 'dfx';
+	type : 'dfx' | 'pocket-ic' | 'dfx-pocket-ic' = 'dfx';
 	verbose = false;
 	canisters : Record<string, {cwd : string; canisterId : string; actor : any; stream : PassThrough;}> = {};
 	pocketIcServer ?: PocketIcServer;
@@ -36,20 +38,33 @@ export class Replica {
 
 		silent || console.log(`Starting ${this.type} replica...`);
 
-		if (this.type == 'dfx') {
+		if (this.type === 'dfx' || this.type === 'dfx-pocket-ic') {
 			fs.mkdirSync(this.dir, {recursive: true});
 			fs.writeFileSync(path.join(this.dir, 'dfx.json'), JSON.stringify(this.dfxJson(''), null, 2));
 			fs.writeFileSync(path.join(this.dir, 'canister.did'), 'service : { runTests: () -> (); }');
 
 			await this.stop();
 
-			this.dfxProcess = spawn('dfx', ['start', '--clean', '--artificial-delay', '0', (this.verbose ? '' : '-qqqq')].filter(x => x), {cwd: this.dir});
+			this.dfxProcess = spawn('dfx', ['start', this.type === 'dfx-pocket-ic' ? '--pocketic' : '', '--clean', (this.verbose ? '' : '-qqqq'), '--artificial-delay', '0'].filter(x => x).flat(), {cwd: this.dir});
 
 			// process canister logs
 			this._attachCanisterLogHandler(this.dfxProcess);
 
 			this.dfxProcess.stdout.on('data', (data) => {
-				console.log('DFX:', data.toString());
+				if (this.verbose) {
+					console.log('DFX:', data.toString());
+				}
+			});
+
+			this.dfxProcess.stderr.on('data', (data) => {
+				if (this.verbose) {
+					console.error('DFX:', data.toString());
+				}
+				if (data.toString().includes('Failed to bind socket to')) {
+					console.error(chalk.red(data.toString()));
+					console.log('Please run again after some time');
+					process.exit(11);
+				}
 			});
 
 			// await for dfx to start
@@ -115,9 +130,22 @@ export class Replica {
 	}
 
 	async stop(sigint = false) {
-		if (this.type == 'dfx') {
-			this.dfxProcess?.kill();
-			// execSync('dfx stop' + (this.verbose ? '' : ' -qqqq'), {cwd: this.dir, timeout: 10_000, stdio: ['pipe', this.verbose ? 'inherit' : 'ignore', 'pipe']});
+		if (this.type === 'dfx' || this.type === 'dfx-pocket-ic') {
+			if (this.dfxProcess) {
+				this.dfxProcess.kill();
+				// give replica some time to stop
+				await new Promise((resolve) => {
+					setTimeout(resolve, 1000);
+				});
+			}
+
+			// if (!this.dfxProcess) {
+			// 	try {
+			// 		execSync('dfx killall', {cwd: this.dir, timeout: 3_000, stdio: ['pipe', this.verbose ? 'inherit' : 'ignore', 'pipe']});
+			//			execSync('dfx stop' + (this.verbose ? '' : ' -qqqq'), {cwd: this.dir, timeout: 10_000, stdio: ['pipe', this.verbose ? 'inherit' : 'ignore', 'pipe']});
+			// 	}
+			// 	catch {}
+			// }
 		}
 		else if (this.pocketIc && this.pocketIcServer) {
 			if (!sigint) {
@@ -128,7 +156,7 @@ export class Replica {
 	}
 
 	async deploy(name : string, wasm : string, idlFactory : IDL.InterfaceFactory, cwd : string = process.cwd(), signal ?: AbortSignal) {
-		if (this.type === 'dfx') {
+		if (this.type === 'dfx' || this.type === 'dfx-pocket-ic') {
 			// prepare dfx.json for current canister
 			let dfxJson = path.join(this.dir, 'dfx.json');
 
@@ -253,6 +281,7 @@ export class Replica {
 		return {
 			version: 1,
 			canisters,
+			dfx: getDfxVersion(),
 			defaults: {
 				build: {
 					packtool: 'mops sources',

package/commands/test/test.ts

@@ -8,6 +8,7 @@ import chalk from 'chalk';
 import {globSync} from 'glob';
 import chokidar from 'chokidar';
 import debounce from 'debounce';
+import {SemVer} from 'semver';
 
 import {sources} from '../sources.js';
 import {getRootDir, readConfig} from '../../mops.js';
@@ -25,6 +26,7 @@ import {Replica} from '../replica.js';
 import {ActorMethod} from '@dfinity/agent';
 import {PassThrough, Readable} from 'node:stream';
 import {TestMode} from '../../types.js';
+import {getDfxVersion} from '../../helpers/get-dfx-version.js';
 
 let ignore = [
 	'**/node_modules/**',
@@ -39,13 +41,14 @@ let globConfig = {
 };
 
 type ReporterName = 'verbose' | 'files' | 'compact' | 'silent';
-type ReplicaName = 'dfx' | 'pocket-ic';
+type ReplicaName = 'dfx' | 'pocket-ic' | 'dfx-pocket-ic';
 
 type TestOptions = {
 	watch : boolean;
 	reporter : ReporterName;
 	mode : TestMode;
 	replica : ReplicaName;
+	debug : boolean;
 };
 
 
@@ -66,7 +69,20 @@ export async function test(filter = '', options : Partial<TestOptions> = {}) {
 	let rootDir = getRootDir();
 
 	let replicaType = options.replica ?? (config.toolchain?.['pocket-ic'] ? 'pocket-ic' : 'dfx' as ReplicaName);
+
+	if (replicaType === 'pocket-ic' && !config.toolchain?.['pocket-ic']) {
+		let dfxVersion = getDfxVersion();
+		if (!dfxVersion || new SemVer(dfxVersion).compare('0.24.1') < 0) {
+			console.log(chalk.red('Please update dfx to the version >=0.24.1 or specify pocket-ic version in mops.toml'));
+			process.exit(1);
+		}
+		else {
+			replicaType = 'dfx-pocket-ic';
+		}
+	}
+
 	replica.type = replicaType;
+	replica.verbose = !!options.debug;
 
 	if (options.watch) {
 		replica.ttl = 60 * 15; // 15 minutes
@@ -202,6 +218,7 @@ export async function testWithReporter(reporterName : ReporterName | Reporter |
 	let testTempDir = path.join(getRootDir(), '.mops/.test/');
 	replica.dir = testTempDir;
 
+	fs.rmSync(testTempDir, {recursive: true, force: true});
 	fs.mkdirSync(testTempDir, {recursive: true});
 
 	await parallel(os.cpus().length, files, async (file : string) => {

package/commands/watch/deployer.ts

@@ -113,7 +113,7 @@ export class Deployer {
 			}
 
 			// install
-			await promisify(execFile)('dfx', ['canister', 'install', '--mode=auto', canister], {cwd: rootDir, signal}).catch((error) => {
+			await promisify(execFile)('dfx', ['canister', 'install', '--mode=auto', '--yes', canister], {cwd: rootDir, signal}).catch((error) => {
 				if (error.code === 'ABORT_ERR') {
 					return {stderr: ''};
 				}

package/dist/bin/moc-wrapper.sh

@@ -22,7 +22,7 @@ else
     mopsTomlHash=$(shasum $mopsToml -a 256 | awk -F' ' '{print $1}')
   fi;
 
-  cached="$rootDir/.mops/moc-$mopsTomlHash"
+  cached="$rootDir/.mops/moc-$(uname -n)-$mopsTomlHash"
 
   if [ -f $cached ]; then
     mocPath=$(cat $cached)

package/dist/cli.js

@@ -183,6 +183,7 @@ program
     .addOption(new Option('--mode <mode>', 'Test mode').choices(['interpreter', 'wasi', 'replica']).default('interpreter'))
     .addOption(new Option('--replica <replica>', 'Which replica to use to run tests in replica mode').choices(['dfx', 'pocket-ic']))
     .option('-w, --watch', 'Enable watch mode')
+    .option('--debug', 'Show debug logs')
     .action(async (filter, options) => {
     checkConfigFile(true);
     await installAll({ silent: true, lock: 'ignore', installFromLockFile: true });

package/dist/commands/replica.d.ts

@@ -3,13 +3,13 @@ import { PassThrough } from 'node:stream';
 import { IDL } from '@dfinity/candid';
 import { PocketIc, PocketIcServer } from 'pic-ic';
 type StartOptions = {
-    type?: 'dfx' | 'pocket-ic';
+    type?: 'dfx' | 'pocket-ic' | 'dfx-pocket-ic';
     dir?: string;
     verbose?: boolean;
     silent?: boolean;
 };
 export declare class Replica {
-    type: 'dfx' | 'pocket-ic';
+    type: 'dfx' | 'pocket-ic' | 'dfx-pocket-ic';
     verbose: boolean;
     canisters: Record<string, {
         cwd: string;
@@ -43,6 +43,7 @@ export declare class Replica {
     dfxJson(canisterName: string, wasmPath?: string, didPath?: string): {
         version: number;
         canisters: Record<string, any>;
+        dfx: string;
         defaults: {
             build: {
                 packtool: string;

package/dist/commands/replica.js

@@ -6,8 +6,10 @@ import { PassThrough } from 'node:stream';
 import { spawn as spawnAsync } from 'promisify-child-process';
 import { Actor, HttpAgent } from '@dfinity/agent';
 import { PocketIc, PocketIcServer } from 'pic-ic';
+import chalk from 'chalk';
 import { readConfig } from '../mops.js';
 import { toolchain } from './toolchain/index.js';
+import { getDfxVersion } from '../helpers/get-dfx-version.js';
 export class Replica {
     constructor() {
         this.type = 'dfx';
@@ -21,16 +23,28 @@ export class Replica {
         this.verbose = verbose ?? this.verbose;
         this.dir = dir ?? this.dir;
         silent || console.log(`Starting ${this.type} replica...`);
-        if (this.type == 'dfx') {
+        if (this.type === 'dfx' || this.type === 'dfx-pocket-ic') {
             fs.mkdirSync(this.dir, { recursive: true });
             fs.writeFileSync(path.join(this.dir, 'dfx.json'), JSON.stringify(this.dfxJson(''), null, 2));
             fs.writeFileSync(path.join(this.dir, 'canister.did'), 'service : { runTests: () -> (); }');
             await this.stop();
-            this.dfxProcess = spawn('dfx', ['start', '--clean', '--artificial-delay', '0', (this.verbose ? '' : '-qqqq')].filter(x => x), { cwd: this.dir });
+            this.dfxProcess = spawn('dfx', ['start', this.type === 'dfx-pocket-ic' ? '--pocketic' : '', '--clean', (this.verbose ? '' : '-qqqq'), '--artificial-delay', '0'].filter(x => x).flat(), { cwd: this.dir });
             // process canister logs
             this._attachCanisterLogHandler(this.dfxProcess);
             this.dfxProcess.stdout.on('data', (data) => {
-                console.log('DFX:', data.toString());
+                if (this.verbose) {
+                    console.log('DFX:', data.toString());
+                }
+            });
+            this.dfxProcess.stderr.on('data', (data) => {
+                if (this.verbose) {
+                    console.error('DFX:', data.toString());
+                }
+                if (data.toString().includes('Failed to bind socket to')) {
+                    console.error(chalk.red(data.toString()));
+                    console.log('Please run again after some time');
+                    process.exit(11);
+                }
             });
             // await for dfx to start
             let ok = false;
@@ -87,9 +101,21 @@ export class Replica {
         });
     }
     async stop(sigint = false) {
-        if (this.type == 'dfx') {
-            this.dfxProcess?.kill();
-            // execSync('dfx stop' + (this.verbose ? '' : ' -qqqq'), {cwd: this.dir, timeout: 10_000, stdio: ['pipe', this.verbose ? 'inherit' : 'ignore', 'pipe']});
+        if (this.type === 'dfx' || this.type === 'dfx-pocket-ic') {
+            if (this.dfxProcess) {
+                this.dfxProcess.kill();
+                // give replica some time to stop
+                await new Promise((resolve) => {
+                    setTimeout(resolve, 1000);
+                });
+            }
+            // if (!this.dfxProcess) {
+            // 	try {
+            // 		execSync('dfx killall', {cwd: this.dir, timeout: 3_000, stdio: ['pipe', this.verbose ? 'inherit' : 'ignore', 'pipe']});
+            //			execSync('dfx stop' + (this.verbose ? '' : ' -qqqq'), {cwd: this.dir, timeout: 10_000, stdio: ['pipe', this.verbose ? 'inherit' : 'ignore', 'pipe']});
+            // 	}
+            // 	catch {}
+            // }
         }
         else if (this.pocketIc && this.pocketIcServer) {
             if (!sigint) {
@@ -99,7 +125,7 @@ export class Replica {
         }
     }
     async deploy(name, wasm, idlFactory, cwd = process.cwd(), signal) {
-        if (this.type === 'dfx') {
+        if (this.type === 'dfx' || this.type === 'dfx-pocket-ic') {
             // prepare dfx.json for current canister
             let dfxJson = path.join(this.dir, 'dfx.json');
             let oldDfxJsonData;
@@ -202,6 +228,7 @@ export class Replica {
         return {
             version: 1,
             canisters,
+            dfx: getDfxVersion(),
             defaults: {
                 build: {
                     packtool: 'mops sources',

package/dist/commands/test/test.d.ts

@@ -1,12 +1,13 @@
 import { Reporter } from './reporters/reporter.js';
 import { TestMode } from '../../types.js';
 type ReporterName = 'verbose' | 'files' | 'compact' | 'silent';
-type ReplicaName = 'dfx' | 'pocket-ic';
+type ReplicaName = 'dfx' | 'pocket-ic' | 'dfx-pocket-ic';
 type TestOptions = {
     watch: boolean;
     reporter: ReporterName;
     mode: TestMode;
     replica: ReplicaName;
+    debug: boolean;
 };
 export declare function test(filter?: string, options?: Partial<TestOptions>): Promise<void>;
 export declare function testWithReporter(reporterName: ReporterName | Reporter | undefined, filter: string | undefined, defaultMode: TestMode | undefined, replicaType: ReplicaName, watch?: boolean, signal?: AbortSignal): Promise<boolean>;

package/dist/commands/test/test.js

@@ -7,6 +7,7 @@ import chalk from 'chalk';
 import { globSync } from 'glob';
 import chokidar from 'chokidar';
 import debounce from 'debounce';
+import { SemVer } from 'semver';
 import { sources } from '../sources.js';
 import { getRootDir, readConfig } from '../../mops.js';
 import { parallel } from '../../parallel.js';
@@ -19,6 +20,7 @@ import { SilentReporter } from './reporters/silent-reporter.js';
 import { toolchain } from '../toolchain/index.js';
 import { Replica } from '../replica.js';
 import { PassThrough } from 'node:stream';
+import { getDfxVersion } from '../../helpers/get-dfx-version.js';
 let ignore = [
     '**/node_modules/**',
     '**/.mops/**',
@@ -43,7 +45,18 @@ export async function test(filter = '', options = {}) {
     let config = readConfig();
     let rootDir = getRootDir();
     let replicaType = options.replica ?? (config.toolchain?.['pocket-ic'] ? 'pocket-ic' : 'dfx');
+    if (replicaType === 'pocket-ic' && !config.toolchain?.['pocket-ic']) {
+        let dfxVersion = getDfxVersion();
+        if (!dfxVersion || new SemVer(dfxVersion).compare('0.24.1') < 0) {
+            console.log(chalk.red('Please update dfx to the version >=0.24.1 or specify pocket-ic version in mops.toml'));
+            process.exit(1);
+        }
+        else {
+            replicaType = 'dfx-pocket-ic';
+        }
+    }
     replica.type = replicaType;
+    replica.verbose = !!options.debug;
     if (options.watch) {
         replica.ttl = 60 * 15; // 15 minutes
         let sigint = false;
@@ -156,6 +169,7 @@ export async function testWithReporter(reporterName, filter = '', defaultMode =
     }
     let testTempDir = path.join(getRootDir(), '.mops/.test/');
     replica.dir = testTempDir;
+    fs.rmSync(testTempDir, { recursive: true, force: true });
     fs.mkdirSync(testTempDir, { recursive: true });
     await parallel(os.cpus().length, files, async (file) => {
         if (signal?.aborted) {

package/dist/commands/watch/deployer.js

@@ -89,7 +89,7 @@ export class Deployer {
                 });
             }
             // install
-            await promisify(execFile)('dfx', ['canister', 'install', '--mode=auto', canister], { cwd: rootDir, signal }).catch((error) => {
+            await promisify(execFile)('dfx', ['canister', 'install', '--mode=auto', '--yes', canister], { cwd: rootDir, signal }).catch((error) => {
                 if (error.code === 'ABORT_ERR') {
                     return { stderr: '' };
                 }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "1.1.0",
+  "version": "1.1.2-pre.0",
   "type": "module",
   "bin": {
     "mops": "bin/mops.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "1.1.0",
+  "version": "1.1.2-pre.0",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",