ic-mops 0.28.0 → 0.28.1

package/dist/commands/bench.d.ts

@@ -0,0 +1,3 @@
+type BenchMode = 'replica' | 'wasi';
+export declare function bench(filter?: string, mode?: BenchMode): Promise<boolean>;
+export {};

package/dist/commands/bench.js

@@ -0,0 +1,130 @@
+import { execSync } from 'node:child_process';
+import path from 'node:path';
+import fs from 'node:fs';
+import os from 'node:os';
+// import chalk from 'chalk';
+import { globSync } from 'glob';
+// import chokidar from 'chokidar';
+// import debounce from 'debounce';
+// import {sources} from './sources.js';
+import { getRootDir } from '../mops.js';
+import { parallel } from '../parallel.js';
+let ignore = [
+    '**/node_modules/**',
+    '**/.mops/**',
+    '**/.vessel/**',
+    '**/.git/**',
+];
+let globConfig = {
+    nocase: true,
+    ignore: ignore,
+};
+let mocPath = process.env.DFX_MOC_PATH;
+export async function bench(filter = '', mode = 'replica') {
+    let rootDir = getRootDir();
+    let globStr = '**/bench?(mark)/**/*.bench.mo';
+    if (filter) {
+        globStr = `**/bench?(mark)/**/*${filter}*.mo`;
+    }
+    let files = globSync(path.join(rootDir, globStr), globConfig);
+    if (!files.length) {
+        if (filter) {
+            console.log(`No benchmark files found for filter '${filter}'`);
+            return false;
+        }
+        console.log('No *.bench.mo files found');
+        console.log('Put your benchmark files in \'bench\' directory in *.bench.mo files');
+        return false;
+    }
+    if (!mocPath) {
+        mocPath = execSync('dfx cache show').toString().trim() + '/moc';
+    }
+    let benchDir = `${getRootDir()}/.mops/.bench/`;
+    fs.mkdirSync(benchDir, { recursive: true });
+    console.log(files);
+    console.log('Running dfx replica...');
+    startDfx();
+    await parallel(os.cpus().length, files, async (file) => {
+        console.log(`Running ${file}...`);
+        await runBenchFile(file, mode);
+    });
+    console.log('Stopping dfx replica...');
+    stopDfx();
+    // fs.rmSync(benchDir, {recursive: true, force: true});
+    return true;
+}
+function dfxJson(canisterName) {
+    return {
+        version: 1,
+        canisters: {
+            [canisterName]: {
+                type: 'motoko',
+                main: 'canister.mo',
+                args: '--force-gc --generational-gc',
+            }
+        },
+        defaults: {
+            build: {
+                packtool: 'mops sources',
+            },
+        },
+        // networks: {
+        // 	local: {
+        // 		type: 'ephemeral',
+        // 		bind: '127.0.0.1:4941',
+        // 	},
+        // },
+    };
+}
+function startDfx() {
+    // stopDfx();
+    // let dir = path.join(getRootDir(), '.mops/.bench');
+    // fs.writeFileSync(path.join(dir, 'dfx.json'), JSON.stringify(dfxJson(''), null, 2));
+    // execSync('dfx start --background', {cwd: dir});
+}
+function stopDfx() {
+    // let dir = path.join(getRootDir(), '.mops/.bench');
+    // execSync('dfx stop', {cwd: dir});
+}
+async function runBenchFile(file, mode = 'replica') {
+    let tempDir = path.join(getRootDir(), '.mops/.bench/', path.parse(file).name);
+    fs.mkdirSync(tempDir, { recursive: true });
+    if (fs.readFileSync(file, 'utf8').startsWith('// @benchmode wasi')) {
+        mode = 'wasi';
+    }
+    if (!mocPath) {
+        mocPath = 'moc';
+    }
+    // replica mode
+    if (mode === 'replica') {
+        let canisterName = Date.now().toString(36);
+        fs.writeFileSync(path.join(tempDir, 'dfx.json'), JSON.stringify(dfxJson(canisterName), null, 2));
+        fs.cpSync(file, path.join(tempDir, 'canister.mo'));
+        execSync(`dfx deploy ${canisterName} --mode reinstall --yes`, { cwd: tempDir });
+        let res = execSync(`dfx canister call ${canisterName} run 1`, { cwd: tempDir });
+        console.log(res.toString());
+    }
+    // wasi mode
+    else if (mode === 'wasi') {
+        // let sourcesArr = await sources();
+        // let mocArgs = ['--hide-warnings', '--error-detail=2', ...sourcesArr.join(' ').split(' '), file].filter(x => x);
+        // let wasmFile = `${path.join(tempDir, path.parse(file).name)}.wasm`;
+        // // build
+        // let buildProc = spawn(mocPath, [`-o=${wasmFile}`, '-wasi-system-api', ...mocArgs]);
+        // buildProc.on('close', (code) => {
+        // 	if (code !== 0) {
+        // 		throw new Error(`unknown exit code: ${code}`);
+        // 	}
+        // 	resolve();
+        // });
+        // // run
+        // let proc = spawn('wasmtime', ['--max-wasm-stack=2000000', wasmFile]);
+        // proc.on('close', (code) => {
+        // 	if (code !== 0) {
+        // 		throw new Error(`unknown exit code: ${code}`);
+        // 	}
+        // 	resolve();
+        // });
+        // fs.rmSync(wasmFile, {force: true});
+    }
+}

package/dist/notify-installs.js

@@ -1,10 +1,10 @@
-import { mainActor } from './mops.js';
+import { getDependencyType, mainActor } from './mops.js';
 import { resolvePackages } from './resolve-packages.js';
 export async function notifyInstalls(names) {
     let resolvedPackages = await resolvePackages();
     let packages = names.map(name => [name, resolvedPackages[name]]);
     if (packages.length) {
         let actor = await mainActor();
-        await actor.notifyInstalls(packages);
+        await actor.notifyInstalls(packages.filter(([_, version]) => getDependencyType(version) === 'mops'));
     }
 }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ic-mops",
-	"version": "0.28.0",
+	"version": "0.28.1",
 	"type": "module",
 	"bin": {
 		"mops": "dist/cli.js"

package/notify-installs.ts

@@ -1,4 +1,4 @@
-import {mainActor} from './mops.js';
+import {getDependencyType, mainActor} from './mops.js';
 import {resolvePackages} from './resolve-packages.js';
 
 export async function notifyInstalls(names: string[]) {
@@ -6,6 +6,6 @@ export async function notifyInstalls(names: string[]) {
 	let packages: [string, string][] = names.map(name => [name, resolvedPackages[name] as string]);
 	if (packages.length) {
 		let actor = await mainActor();
-		await actor.notifyInstalls(packages);
+		await actor.notifyInstalls(packages.filter(([_, version]) => getDependencyType(version) === 'mops'));
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ic-mops",
-	"version": "0.28.0",
+	"version": "0.28.1",
 	"type": "module",
 	"bin": {
 		"mops": "dist/cli.js"