ic-mops 0.45.3 → 0.45.4-pre.0

package/CHANGELOG.md

@@ -1,6 +1,7 @@
 # Mops CLI Changelog
 
 ## unreleased
+- `mops cache clean` now cleans local cache too (`.mops` folder)
 
 ## 0.45.3
 - Fixed bug with missing `tar` package

package/api/actors.ts

@@ -8,18 +8,34 @@ import {_SERVICE as _STORAGE_SERVICE} from '../declarations/storage/storage.did.
 import {getEndpoint} from './network.js';
 import {getNetwork} from './network.js';
 
-export let mainActor = async (identity ?: Identity) : Promise<_SERVICE> => {
-	let network = getNetwork();
-	let host = getEndpoint(network).host;
-	let canisterId = getEndpoint(network).canisterId;
+let agentPromiseByPrincipal = new Map <string, Promise<HttpAgent>>();
+
+let getAgent = async (identity ?: Identity) : Promise<HttpAgent> => {
+	let principal = identity ? identity?.getPrincipal().toText() : '';
+	let agentPromise = agentPromiseByPrincipal.get(principal);
 
-	// @ts-ignore exactOptionalPropertyTypes
-	let agent = new HttpAgent({host, identity});
+	if (!agentPromise) {
+		let network = getNetwork();
+		let host = getEndpoint(network).host;
 
-	if (network === 'local') {
-		await agent.fetchRootKey();
+		agentPromise = HttpAgent.create({
+			host,
+			identity,
+			shouldFetchRootKey: network === 'local',
+			verifyQuerySignatures: process.env.MOPS_VERIFY_QUERY_SIGNATURES !== 'false',
+		});
+
+		agentPromiseByPrincipal.set(principal, agentPromise);
 	}
 
+	return agentPromise;
+};
+
+export let mainActor = async (identity ?: Identity) : Promise<_SERVICE> => {
+	let agent = await getAgent(identity);
+	let network = getNetwork();
+	let canisterId = getEndpoint(network).canisterId;
+
 	return Actor.createActor(idlFactory, {
 		agent,
 		canisterId,
@@ -27,15 +43,7 @@ export let mainActor = async (identity ?: Identity) : Promise<_SERVICE> => {
 };
 
 export let storageActor = async (storageId : Principal, identity ?: Identity) : Promise<_STORAGE_SERVICE> => {
-	let network = getNetwork();
-	let host = getEndpoint(network).host;
-
-	// @ts-ignore exactOptionalPropertyTypes
-	let agent = new HttpAgent({host, identity});
-
-	if (network === 'local') {
-		await agent.fetchRootKey();
-	}
+	let agent = await getAgent(identity);
 
 	return Actor.createActor(storageIdlFactory, {
 		agent,

package/cache.ts

@@ -3,7 +3,7 @@ import path from 'node:path';
 import ncp from 'ncp';
 import getFolderSize from 'get-folder-size';
 
-import {getDependencyType, globalCacheDir, parseGithubURL} from './mops.js';
+import {getDependencyType, getRootDir, globalCacheDir, parseGithubURL} from './mops.js';
 import {getPackageId} from './helpers/get-package-id.js';
 
 export let show = () => {
@@ -73,6 +73,13 @@ export let cacheSize = async () => {
 };
 
 export let cleanCache = async () => {
-	let dir = path.join(globalCacheDir);
-	fs.rmSync(dir, {recursive: true, force: true});
+	if (!globalCacheDir.endsWith('mops/cache') && !globalCacheDir.endsWith('/mops')) {
+		throw new Error('Invalid cache directory: ' + globalCacheDir);
+	}
+
+	// local cache
+	fs.rmSync(path.join(getRootDir(), '.mops'), {recursive: true, force: true});
+
+	// global cache
+	fs.rmSync(globalCacheDir, {recursive: true, force: true});
 };

package/dist/api/actors.js

@@ -3,28 +3,34 @@ import { idlFactory } from '../declarations/main/main.did.js';
 import { idlFactory as storageIdlFactory } from '../declarations/storage/storage.did.js';
 import { getEndpoint } from './network.js';
 import { getNetwork } from './network.js';
+let agentPromiseByPrincipal = new Map();
+let getAgent = async (identity) => {
+    let principal = identity ? identity?.getPrincipal().toText() : '';
+    let agentPromise = agentPromiseByPrincipal.get(principal);
+    if (!agentPromise) {
+        let network = getNetwork();
+        let host = getEndpoint(network).host;
+        agentPromise = HttpAgent.create({
+            host,
+            identity,
+            shouldFetchRootKey: network === 'local',
+            verifyQuerySignatures: process.env.MOPS_VERIFY_QUERY_SIGNATURES !== 'false',
+        });
+        agentPromiseByPrincipal.set(principal, agentPromise);
+    }
+    return agentPromise;
+};
 export let mainActor = async (identity) => {
+    let agent = await getAgent(identity);
     let network = getNetwork();
-    let host = getEndpoint(network).host;
     let canisterId = getEndpoint(network).canisterId;
-    // @ts-ignore exactOptionalPropertyTypes
-    let agent = new HttpAgent({ host, identity });
-    if (network === 'local') {
-        await agent.fetchRootKey();
-    }
     return Actor.createActor(idlFactory, {
         agent,
         canisterId,
     });
 };
 export let storageActor = async (storageId, identity) => {
-    let network = getNetwork();
-    let host = getEndpoint(network).host;
-    // @ts-ignore exactOptionalPropertyTypes
-    let agent = new HttpAgent({ host, identity });
-    if (network === 'local') {
-        await agent.fetchRootKey();
-    }
+    let agent = await getAgent(identity);
     return Actor.createActor(storageIdlFactory, {
         agent,
         canisterId: storageId,

package/dist/cache.js

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import ncp from 'ncp';
 import getFolderSize from 'get-folder-size';
-import { getDependencyType, globalCacheDir, parseGithubURL } from './mops.js';
+import { getDependencyType, getRootDir, globalCacheDir, parseGithubURL } from './mops.js';
 import { getPackageId } from './helpers/get-package-id.js';
 export let show = () => {
     return globalCacheDir;
@@ -59,6 +59,11 @@ export let cacheSize = async () => {
     return (size / 1024 / 1024).toFixed(2) + ' MB';
 };
 export let cleanCache = async () => {
-    let dir = path.join(globalCacheDir);
-    fs.rmSync(dir, { recursive: true, force: true });
+    if (!globalCacheDir.endsWith('mops/cache') && !globalCacheDir.endsWith('/mops')) {
+        throw new Error('Invalid cache directory: ' + globalCacheDir);
+    }
+    // local cache
+    fs.rmSync(path.join(getRootDir(), '.mops'), { recursive: true, force: true });
+    // global cache
+    fs.rmSync(globalCacheDir, { recursive: true, force: true });
 };

package/dist/package.json

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

package/package.json

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

package/bundle/bench/bench-canister.mo

@@ -1,87 +0,0 @@
-import Nat64 "mo:base/Nat64";
-import Nat "mo:base/Nat";
-import Debug "mo:base/Debug";
-import ExperimentalInternetComputer "mo:base/ExperimentalInternetComputer";
-import Prim "mo:prim";
-import Bench "mo:bench";
-
-import UserBench "./user-bench"; // file path will be replaced with the *.bench.mo file path
-
-actor class() {
-	var benchOpt : ?Bench.Bench = null;
-
-	public func init() : async Bench.BenchSchema {
-		let bench = UserBench.init();
-		benchOpt := ?bench;
-		bench.getSchema();
-	};
-
-	public query func getSchema() : async Bench.BenchSchema {
-		let ?bench = benchOpt else Debug.trap("bench not initialized");
-		bench.getSchema();
-	};
-
-	func _getStats() : Bench.BenchResult {
-		{
-			instructions = 0;
-			rts_heap_size = Prim.rts_heap_size();
-			rts_memory_size = Prim.rts_memory_size();
-			rts_total_allocation = Prim.rts_total_allocation();
-			rts_mutator_instructions = Prim.rts_mutator_instructions();
-			rts_collector_instructions = Prim.rts_collector_instructions();
-		}
-	};
-
-	func _diffStats(before : Bench.BenchResult, after : Bench.BenchResult) : Bench.BenchResult {
-		{
-			instructions = after.instructions - before.instructions;
-			rts_heap_size = after.rts_heap_size - before.rts_heap_size;
-			rts_memory_size = after.rts_memory_size - before.rts_memory_size;
-			rts_total_allocation = after.rts_total_allocation - before.rts_total_allocation;
-			rts_mutator_instructions = after.rts_mutator_instructions - before.rts_mutator_instructions;
-			rts_collector_instructions = after.rts_collector_instructions - before.rts_collector_instructions;
-		}
-	};
-
-	func _runCell(rowIndex : Nat, colIndex : Nat) : Bench.BenchResult {
-		let ?bench = benchOpt else Debug.trap("bench not initialized");
-		let statsBefore = _getStats();
-
-		let instructions = Nat64.toNat(ExperimentalInternetComputer.countInstructions(func() {
-			bench.runCell(rowIndex, colIndex);
-		}));
-
-		let statsAfter = _getStats();
-		_diffStats(statsBefore, { statsAfter with instructions });
-	};
-
-	func _runCellAwait(rowIndex : Nat, colIndex : Nat) : async Bench.BenchResult {
-		let ?bench = benchOpt else Debug.trap("bench not initialized");
-		let statsBefore = _getStats();
-
-		let instructions = Nat64.toNat(ExperimentalInternetComputer.countInstructions(func() {
-			bench.runCell(rowIndex, colIndex);
-		}));
-
-		await (func() : async () {})();
-
-		let statsAfter = _getStats();
-		_diffStats(statsBefore, { statsAfter with instructions });
-	};
-
-	public query func getStats() : async Bench.BenchResult {
-		_getStats();
-	};
-
-	public query func runCellQuery(rowIndex : Nat, colIndex : Nat) : async Bench.BenchResult {
-		_runCell(rowIndex, colIndex);
-	};
-
-	public func runCellUpdate(rowIndex : Nat, colIndex : Nat) : async Bench.BenchResult {
-		_runCell(rowIndex, colIndex);
-	};
-
-	public func runCellUpdateAwait(rowIndex : Nat, colIndex : Nat) : async Bench.BenchResult {
-		await _runCellAwait(rowIndex, colIndex);
-	};
-};

package/bundle/bench/user-bench.mo

@@ -1,14 +0,0 @@
-import Nat "mo:base/Nat";
-import Iter "mo:base/Iter";
-import Buffer "mo:base/Buffer";
-import Vector "mo:vector/Class";
-import Bench "mo:bench";
-
-// placeholder file that will be replaced with the *.bench.mo file
-module {
-	public func init() : Bench.Bench {
-		let bench = Bench.Bench();
-		// benchmark code goes here...
-		bench;
-	};
-};

package/bundle/bin/moc-wrapper.sh

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# set -e
-
-findRootDir() {
-  dir="$(pwd)"
-  while [[ "$dir" != "" && ! -e "$dir/mops.toml" ]]; do
-    dir=${dir%/*}
-  done
-  echo "$dir"
-}
-
-rootDir=$(findRootDir)
-mopsToml="$rootDir/mops.toml"
-
-if [[ $rootDir == "" ]] || [[ ! -f $mopsToml ]]; then
-  mocPath="$(mops toolchain bin moc --fallback)"
-else
-  if command -v openssl >/dev/null 2>&1; then
-    mopsTomlHash=$(openssl sha256 $mopsToml | awk -F'= ' '{print $2}')
-  else
-    mopsTomlHash=$(shasum $mopsToml -a 256 | awk -F' ' '{print $1}')
-  fi;
-
-  cached="$rootDir/.mops/moc-$mopsTomlHash"
-
-  if [ -f $cached ]; then
-    mocPath=$(cat $cached)
-    if [[ "$mocPath" != *"/moc" ]] ; then
-      mocPath="$(mops toolchain bin moc --fallback)"
-      echo -n $mocPath > "$cached"
-    fi;
-  else
-    mkdir -p "$(dirname $cached)"
-    mocPath="$(mops toolchain bin moc --fallback)"
-    echo -n $mocPath > "$cached"
-  fi;
-fi;
-
-$mocPath "$@"

package/bundle/bin/mops.js

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-import '../cli.js';