ic-mops 1.11.1 → 2.0.0

package/commands/bench-replica.ts

@@ -1,117 +1,157 @@
-import process from 'node:process';
-import {execSync} from 'node:child_process';
-import path from 'node:path';
-import fs from 'node:fs';
-import {execaCommand} from 'execa';
-import {PocketIc, PocketIcServer} from 'pic-ic';
-import {getRootDir, readConfig} from '../mops.js';
-import {createActor, idlFactory} from '../declarations/bench/index.js';
-import {toolchain} from './toolchain/index.js';
-import {getDfxVersion} from '../helpers/get-dfx-version.js';
+import process from "node:process";
+import { execSync } from "node:child_process";
+import path from "node:path";
+import fs from "node:fs";
+import { execaCommand } from "execa";
+import { PocketIc, PocketIcServer } from "pic-ic";
+import {
+  PocketIc as PocketIcMops,
+  PocketIcServer as PocketIcServerMops,
+} from "pic-js-mops";
+import { getRootDir, readConfig } from "../mops.js";
+import { createActor, idlFactory } from "../declarations/bench/index.js";
+import { toolchain } from "./toolchain/index.js";
+import { getDfxVersion } from "../helpers/get-dfx-version.js";
 
 export class BenchReplica {
-	type : 'dfx' | 'pocket-ic' | 'dfx-pocket-ic';
-	verbose = false;
-	canisters : Record<string, {cwd : string; canisterId : string; actor : any;}> = {};
-	pocketIcServer ?: PocketIcServer;
-	pocketIc ?: PocketIc;
+  type: "dfx" | "pocket-ic" | "dfx-pocket-ic";
+  verbose = false;
+  canisters: Record<string, { cwd: string; canisterId: string; actor: any }> =
+    {};
+  pocketIcServer?: PocketIcServer | PocketIcServerMops;
+  pocketIc?: PocketIc | PocketIcMops;
 
-	constructor(type : 'dfx' | 'pocket-ic' | 'dfx-pocket-ic', verbose = false) {
-		this.type = type;
-		this.verbose = verbose;
-	}
+  constructor(type: "dfx" | "pocket-ic" | "dfx-pocket-ic", verbose = false) {
+    this.type = type;
+    this.verbose = verbose;
+  }
 
-	async start({silent = false} = {}) {
-		if (!process.env.CI && !silent) {
-			console.log(`Starting ${this.type} replica...`);
-		}
+  async start({ silent = false } = {}) {
+    if (!process.env.CI && !silent) {
+      console.log(`Starting ${this.type} replica...`);
+    }
 
-		if (this.type == 'dfx' || this.type === 'dfx-pocket-ic') {
-			await this.stop();
-			let dir = path.join(getRootDir(), '.mops/.bench');
-			fs.writeFileSync(path.join(dir, 'dfx.json'), JSON.stringify(this.dfxJson(''), null, 2));
-			execSync('dfx start --background --clean --artificial-delay 0' + (this.type === 'dfx-pocket-ic' ? ' --pocketic' : '') + (this.verbose ? '' : ' -qqqq'), {cwd: dir, stdio: ['inherit', this.verbose ? 'inherit' : 'ignore', 'inherit']});
-		}
-		else {
-			let pocketIcBin = await toolchain.bin('pocket-ic');
-			let config = readConfig();
-			if (config.toolchain?.['pocket-ic'] !== '4.0.0') {
-				console.error('Current Mops CLI only supports pocket-ic 4.0.0');
-				process.exit(1);
-			}
-			this.pocketIcServer = await PocketIcServer.start({
-				binPath: pocketIcBin,
-			});
-			this.pocketIc = await PocketIc.create(this.pocketIcServer.getUrl());
-		}
-	}
+    if (this.type == "dfx" || this.type === "dfx-pocket-ic") {
+      await this.stop();
+      let dir = path.join(getRootDir(), ".mops/.bench");
+      fs.writeFileSync(
+        path.join(dir, "dfx.json"),
+        JSON.stringify(this.dfxJson(""), null, 2),
+      );
+      execSync(
+        "dfx start --background --clean --artificial-delay 0" +
+          (this.type === "dfx-pocket-ic" ? " --pocketic" : "") +
+          (this.verbose ? "" : " -qqqq"),
+        {
+          cwd: dir,
+          stdio: ["inherit", this.verbose ? "inherit" : "ignore", "inherit"],
+        },
+      );
+    } else {
+      let pocketIcBin = await toolchain.bin("pocket-ic");
+      let config = readConfig();
+      if (
+        config.toolchain?.["pocket-ic"] !== "4.0.0" &&
+        !config.toolchain?.["pocket-ic"]?.startsWith("9.")
+      ) {
+        console.error(
+          "Current Mops CLI only supports pocket-ic 9.x.x and 4.0.0",
+        );
+        process.exit(1);
+      }
+      // pocket-ic 9.x.x
+      if (config.toolchain?.["pocket-ic"]?.startsWith("9.")) {
+        this.pocketIcServer = await PocketIcServerMops.start({
+          binPath: pocketIcBin,
+        });
+        this.pocketIc = await PocketIcMops.create(this.pocketIcServer.getUrl());
+      }
+      // pocket-ic 4.0.0
+      else {
+        this.pocketIcServer = await PocketIcServer.start({
+          binPath: pocketIcBin,
+        });
+        this.pocketIc = await PocketIc.create(this.pocketIcServer.getUrl());
+      }
+    }
+  }
 
-	async stop() {
-		if (this.type == 'dfx' || this.type === 'dfx-pocket-ic') {
-			let dir = path.join(getRootDir(), '.mops/.bench');
-			execSync('dfx stop' + (this.verbose ? '' : ' -qqqq'), {cwd: dir, stdio: ['pipe', this.verbose ? 'inherit' : 'ignore', 'pipe']});
-		}
-		else if (this.pocketIc && this.pocketIcServer) {
-			await this.pocketIc.tearDown();
-			await this.pocketIcServer.stop();
-		}
-	}
+  async stop() {
+    if (this.type == "dfx" || this.type === "dfx-pocket-ic") {
+      let dir = path.join(getRootDir(), ".mops/.bench");
+      execSync("dfx stop" + (this.verbose ? "" : " -qqqq"), {
+        cwd: dir,
+        stdio: ["pipe", this.verbose ? "inherit" : "ignore", "pipe"],
+      });
+    } else if (this.pocketIc && this.pocketIcServer) {
+      await this.pocketIc.tearDown();
+      await this.pocketIcServer.stop();
+    }
+  }
 
-	async deploy(name : string, wasm : string, cwd : string = process.cwd()) {
-		if (this.type === 'dfx' || this.type === 'dfx-pocket-ic') {
-			await execaCommand(`dfx deploy ${name} --mode reinstall --yes --identity anonymous`, {cwd, stdio: this.verbose ? 'pipe' : ['pipe', 'ignore', 'pipe']});
-			let canisterId = execSync(`dfx canister id ${name}`, {cwd}).toString().trim();
-			let actor = await createActor(canisterId, {
-				agentOptions: {
-					host: 'http://127.0.0.1:4944',
-				},
-			});
-			this.canisters[name] = {cwd, canisterId, actor};
-		}
-		else if (this.pocketIc) {
-			let {canisterId, actor} = await this.pocketIc.setupCanister({idlFactory, wasm});
-			this.canisters[name] = {
-				cwd,
-				canisterId: canisterId.toText(),
-				actor,
-			};
-		}
-	}
+  async deploy(name: string, wasm: string, cwd: string = process.cwd()) {
+    if (this.type === "dfx" || this.type === "dfx-pocket-ic") {
+      await execaCommand(
+        `dfx deploy ${name} --mode reinstall --yes --identity anonymous`,
+        { cwd, stdio: this.verbose ? "pipe" : ["pipe", "ignore", "pipe"] },
+      );
+      let canisterId = execSync(`dfx canister id ${name}`, { cwd })
+        .toString()
+        .trim();
+      let actor = await createActor(canisterId, {
+        agentOptions: {
+          host: "http://127.0.0.1:4944",
+        },
+      });
+      this.canisters[name] = { cwd, canisterId, actor };
+    } else if (this.pocketIc) {
+      type PocketIcSetupCanister = PocketIcMops["setupCanister"] &
+        PocketIc["setupCanister"];
+      let { canisterId, actor } = await (
+        this.pocketIc.setupCanister as PocketIcSetupCanister
+      )({ idlFactory, wasm });
+      this.canisters[name] = {
+        cwd,
+        canisterId: canisterId.toText(),
+        actor,
+      };
+    }
+  }
 
-	getActor(name : string) : unknown {
-		return this.canisters[name]?.actor;
-	}
+  getActor(name: string): unknown {
+    return this.canisters[name]?.actor;
+  }
 
-	getCanisterId(name : string) : string {
-		return this.canisters[name]?.canisterId || '';
-	}
+  getCanisterId(name: string): string {
+    return this.canisters[name]?.canisterId || "";
+  }
 
-	dfxJson(canisterName : string) {
-		let canisters : Record<string, any> = {};
-		if (canisterName) {
-			canisters[canisterName] = {
-				type: 'custom',
-				wasm: 'canister.wasm',
-				candid: 'canister.did',
-				optimize: 'cycles',
-			};
-		}
+  dfxJson(canisterName: string) {
+    let canisters: Record<string, any> = {};
+    if (canisterName) {
+      canisters[canisterName] = {
+        type: "custom",
+        wasm: "canister.wasm",
+        candid: "canister.did",
+        optimize: "cycles",
+      };
+    }
 
-		return {
-			version: 1,
-			canisters,
-			dfx: getDfxVersion(),
-			defaults: {
-				build: {
-					packtool: 'mops sources',
-				},
-			},
-			networks: {
-				local: {
-					type: 'ephemeral',
-					bind: '127.0.0.1:4944',
-				},
-			},
-		};
-	}
-}
+    return {
+      version: 1,
+      canisters,
+      dfx: getDfxVersion(),
+      defaults: {
+        build: {
+          packtool: "mops sources",
+        },
+      },
+      networks: {
+        local: {
+          type: "ephemeral",
+          bind: "127.0.0.1:4944",
+        },
+      },
+    };
+  }
+}