ic-mops 0.33.0 → 0.34.0

package/api/actors.ts

@@ -0,0 +1,45 @@
+import {Actor, HttpAgent, Identity} from '@dfinity/agent';
+import {Principal} from '@dfinity/principal';
+
+import {idlFactory} from '../declarations/main/index.js';
+import {_SERVICE} from '../declarations/main/main.did.js';
+import {idlFactory as storageIdlFactory} from '../declarations/storage/index.js';
+import {_SERVICE as _STORAGE_SERVICE} from '../declarations/storage/storage.did.js';
+
+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;
+
+	// @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: 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();
+	}
+
+	return Actor.createActor(storageIdlFactory, {
+		agent,
+		canisterId: storageId,
+	});
+};

package/api/downloadPackageFiles.ts

@@ -0,0 +1,78 @@
+import {Principal} from '@dfinity/principal';
+import {mainActor, storageActor} from './actors.js';
+import {resolveVersion} from './resolveVersion.js';
+import {parallel} from '../parallel.js';
+import {Storage} from '../declarations/storage/storage.did.js';
+
+export async function downloadPackageFiles(pkg: string, version = '', threads = 8, onLoad = (_fileIds: string[], _fileId: string) => {}): Promise<Map<string, Array<number>>> {
+	version = await resolveVersion(pkg, version);
+
+	let {storageId, fileIds} = await getPackageFilesInfo(pkg, version);
+	let storage = await storageActor(storageId);
+
+	let filesData = new Map<string, Array<number>>();
+	await parallel(threads, fileIds, async (fileId: string) => {
+		let {path, data} = await downloadFile(storage, fileId);
+		filesData.set(path, data);
+		onLoad(fileIds, fileId);
+	});
+
+	return filesData;
+}
+
+// get package files meta
+export async function getPackageFilesInfo(pkg: string, version: string): Promise<{ storageId: Principal, fileIds: string[] }> {
+	let actor = await mainActor();
+
+	let [packageDetailsRes, fileIds] = await Promise.all([
+		actor.getPackageDetails(pkg, version),
+		getFileIds(pkg, version),
+	]);
+
+	if ('err' in packageDetailsRes) {
+		throw packageDetailsRes.err;
+	}
+	let packageDetails = packageDetailsRes.ok;
+
+	return {
+		storageId: packageDetails.publication.storage,
+		fileIds,
+	};
+}
+
+// get package files ids
+export async function getFileIds(pkg: string, version: string): Promise<string[]> {
+	let actor = await mainActor();
+	let fileIdsRes = await actor.getFileIds(pkg, version);
+
+	if ('err' in fileIdsRes) {
+		throw fileIdsRes.err;
+	}
+	let filesIds = fileIdsRes.ok;
+
+	return filesIds;
+}
+
+// download single file
+export async function downloadFile(storage: Storage, fileId: string): Promise<{ path: string, data: Array<number> }> {
+	let fileMetaRes = await storage.getFileMeta(fileId);
+	if ('err' in fileMetaRes) {
+		throw fileMetaRes.err;
+	}
+	let fileMeta = fileMetaRes.ok;
+
+	let data: Array<number> = [];
+	for (let i = 0n; i < fileMeta.chunkCount; i++) {
+		let chunkRes = await storage.downloadChunk(fileId, i);
+		if ('err' in chunkRes) {
+			throw chunkRes.err;
+		}
+		let chunk = chunkRes.ok;
+		data = [...data, ...chunk];
+	}
+
+	return {
+		path: fileMeta.path,
+		data: data,
+	};
+}

package/api/getHighestVersion.ts

@@ -0,0 +1,6 @@
+import {mainActor} from './actors.js';
+
+export async function getHighestVersion(pkgName: string) {
+	let actor = await mainActor();
+	return actor.getHighestVersion(pkgName);
+}

package/api/index.ts

@@ -0,0 +1,4 @@
+export {mainActor, storageActor} from './actors.js';
+export {downloadPackageFiles} from './downloadPackageFiles.js';
+export {getEndpoint, getNetwork} from './network.js';
+export {resolveVersion} from './resolveVersion.js';

package/api/network.ts

@@ -0,0 +1,24 @@
+export function getNetwork() {
+	return globalThis.MOPS_NETWORK || 'ic';
+}
+
+export function getEndpoint(network: string) {
+	if (network === 'staging') {
+		return {
+			host: 'https://icp-api.io',
+			canisterId: '2d2zu-vaaaa-aaaak-qb6pq-cai',
+		};
+	}
+	else if (network === 'ic') {
+		return {
+			host: 'https://icp-api.io',
+			canisterId: 'oknww-riaaa-aaaam-qaf6a-cai',
+		};
+	}
+	else {
+		return {
+			host: 'http://127.0.0.1:4943',
+			canisterId: '2d2zu-vaaaa-aaaak-qb6pq-cai',
+		};
+	}
+}

package/api/resolveVersion.ts

@@ -0,0 +1,12 @@
+import {getHighestVersion} from './getHighestVersion.js';
+
+export async function resolveVersion(pkg: string, version = ''): Promise<string> {
+	if (!version) {
+		let versionRes = await getHighestVersion(pkg);
+		if ('err' in versionRes) {
+			throw versionRes.err;
+		}
+		version = versionRes.ok;
+	}
+	return version;
+}

package/cli.ts

@@ -9,7 +9,9 @@ import {init} from './commands/init.js';
 import {publish} from './commands/publish.js';
 import {importPem} from './commands/import-identity.js';
 import {sources} from './commands/sources.js';
-import {checkApiCompatibility, getNetwork, setNetwork, apiVersion, checkConfigFile, mainActor} from './mops.js';
+import {checkApiCompatibility, setNetwork, apiVersion, checkConfigFile, getNetworkFile, getIdentity} from './mops.js';
+import {getNetwork} from './api/network.js';
+import {mainActor} from './api/actors.js';
 import {whoami} from './commands/whoami.js';
 import {installAll} from './commands/install-all.js';
 import {search} from './commands/search.js';
@@ -28,6 +30,17 @@ import {bench} from './commands/bench.js';
 import {transferOwnership} from './commands/transfer-ownership.js';
 // import {docs} from './commands/docs.js';
 
+declare global {
+	// eslint-disable-next-line no-var
+	var MOPS_NETWORK: string;
+}
+
+let networkFile = getNetworkFile();
+if (fs.existsSync(networkFile)) {
+	globalThis.MOPS_NETWORK = fs.readFileSync(networkFile).toString() || 'ic';
+}
+
+
 program.name('mops');
 
 // --version
@@ -132,7 +145,7 @@ program
 	.alias('gn')
 	.description('Get network')
 	.action(async () => {
-		console.log(getNetwork().network);
+		console.log(getNetwork());
 	});
 
 // import-identity
@@ -272,11 +285,12 @@ program
 		}
 	});
 
-// airdrop
+// temp: airdrop
 program
 	.command('airdrop <check|claim> [canister]')
 	.action(async (sub, canister) => {
-		let main = await mainActor(true);
+		let identity = await getIdentity();
+		let main = await mainActor(identity);
 		if (sub === 'check') {
 			let amount = await main.getAirdropAmount();
 			if (amount === 0n) {

package/commands/add.ts

@@ -1,7 +1,8 @@
 import path from 'node:path';
 import chalk from 'chalk';
 import logUpdate from 'log-update';
-import {checkConfigFile, getGithubCommit, getHighestVersion, parseGithubURL, readConfig, writeConfig} from '../mops.js';
+import {checkConfigFile, getGithubCommit, parseGithubURL, readConfig, writeConfig} from '../mops.js';
+import {getHighestVersion} from '../api/getHighestVersion.js';
 import {installFromGithub} from '../vessel.js';
 import {install} from './install.js';
 import {notifyInstalls} from '../notify-installs.js';

package/commands/available-updates.ts

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import {mainActor} from '../mops.js';
+import {mainActor} from '../api/actors.js';
 import {Config} from '../types.js';
 
 // [pkg, oldVersion, newVersion]

package/commands/init.ts

@@ -4,7 +4,8 @@ import {existsSync, readFileSync, writeFileSync} from 'node:fs';
 import chalk from 'chalk';
 import prompts from 'prompts';
 
-import {checkApiCompatibility, mainActor, writeConfig} from '../mops.js';
+import {checkApiCompatibility, writeConfig} from '../mops.js';
+import {mainActor} from '../api/actors.js';
 import {installAll} from './install-all.js';
 import {VesselConfig, readVesselConfig} from '../vessel.js';
 import {Config, Dependencies} from '../types.js';

package/commands/install.ts

@@ -2,10 +2,13 @@ import path from 'node:path';
 import fs from 'node:fs';
 import logUpdate from 'log-update';
 import chalk from 'chalk';
-import {checkConfigFile, formatDir, getHighestVersion, mainActor, progressBar, readConfig, storageActor} from '../mops.js';
+import {checkConfigFile, formatDir, progressBar, readConfig} from '../mops.js';
+import {getHighestVersion} from '../api/getHighestVersion.js';
+import {storageActor} from '../api/actors.js';
 import {parallel} from '../parallel.js';
 import {installFromGithub} from '../vessel.js';
 import {addCache, copyCache, isCached} from '../cache.js';
+import {downloadFile, getPackageFilesInfo} from '../api/downloadPackageFiles.js';
 
 export async function install(pkg: string, version = '', {verbose = false, silent = false, dep = false} = {}): Promise<Record<string, string> | false> {
 	if (!checkConfigFile()) {
@@ -31,7 +34,6 @@ export async function install(pkg: string, version = '', {verbose = false, silen
 	}
 
 	let dir = formatDir(pkg, version);
-	let actor = await mainActor();
 	let alreadyInstalled = false;
 
 	// already installed
@@ -46,28 +48,6 @@ export async function install(pkg: string, version = '', {verbose = false, silen
 	}
 	// download
 	else {
-		let [packageDetailsRes, filesIdsRes] = await Promise.all([
-			actor.getPackageDetails(pkg, version),
-			actor.getFileIds(pkg, version),
-		]);
-
-		if ('err' in packageDetailsRes) {
-			console.log(chalk.red('Error: ') + packageDetailsRes.err);
-			return false;
-		}
-		let packageDetails = packageDetailsRes.ok;
-
-		if ('err' in filesIdsRes) {
-			console.log(chalk.red('Error: ') + filesIdsRes.err);
-			return false;
-		}
-		let filesIds = filesIdsRes.ok;
-		total = filesIds.length + 2;
-
-		let storage = await storageActor(packageDetails.publication.storage);
-
-		// download files
-		let filesData = new Map;
 		let threads = 16;
 
 		// GitHub Actions fails with "fetch failed" if there are multiple concurrent actions
@@ -75,32 +55,29 @@ export async function install(pkg: string, version = '', {verbose = false, silen
 			threads = 4;
 		}
 
-		await parallel(threads, filesIds, async (fileId: string) => {
-			let fileMetaRes = await storage.getFileMeta(fileId);
-			if ('err' in fileMetaRes) {
-				console.log(chalk.red('ERR: ') + fileMetaRes.err);
-				return;
-			}
-			let fileMeta = fileMetaRes.ok;
-
-			let buffer = Buffer.from([]);
-			for (let i = 0n; i < fileMeta.chunkCount; i++) {
-				let chunkRes = await storage.downloadChunk(fileId, i);
-				if ('err' in chunkRes) {
-					console.log(chalk.red('ERR: ') + chunkRes.err);
-					return;
-				}
-				let chunk = chunkRes.ok;
-				buffer = Buffer.concat([buffer, Buffer.from(chunk)]);
+		try {
+			let {storageId, fileIds} = await getPackageFilesInfo(pkg, version);
+
+			total = fileIds.length + 2;
+
+			let filesData = new Map;
+			let storage = await storageActor(storageId);
+
+			await parallel(threads, fileIds, async (fileId: string) => {
+				let {path, data} = await downloadFile(storage, fileId);
+				filesData.set(path, data);
+				progress();
+			});
+
+			// write files to disk
+			for (let [filePath, data] of filesData.entries()) {
+				fs.mkdirSync(path.join(dir, path.dirname(filePath)), {recursive: true});
+				fs.writeFileSync(path.join(dir, filePath), Buffer.from(data));
 			}
-			filesData.set(fileMeta.path, buffer);
-			progress();
-		});
-
-		// write files to disk
-		for (let [filePath, buffer] of filesData.entries()) {
-			fs.mkdirSync(path.join(dir, path.dirname(filePath)), {recursive: true});
-			fs.writeFileSync(path.join(dir, filePath), buffer);
+		}
+		catch (err) {
+			console.error(chalk.red('Error: ') + err);
+			return false;
 		}
 
 		// add to cache

package/commands/publish.ts

@@ -8,7 +8,8 @@ import prompts from 'prompts';
 import {fromMarkdown} from 'mdast-util-from-markdown';
 import {toMarkdown} from 'mdast-util-to-markdown';
 
-import {checkConfigFile, getRootDir, mainActor, progressBar, readConfig} from '../mops.js';
+import {checkConfigFile, getIdentity, getRootDir, progressBar, readConfig} from '../mops.js';
+import {mainActor} from '../api/actors.js';
 import {parallel} from '../parallel.js';
 import {docs} from './docs.js';
 import {DependencyV2, PackageConfigV2} from '../declarations/main/main.did.js';
@@ -266,7 +267,8 @@ export async function publish(options: {docs?: boolean, test?: boolean} = {}) {
 	}
 
 	// upload config
-	let actor = await mainActor(true);
+	let identity = await getIdentity();
+	let actor = await mainActor(identity);
 
 	progress();
 	let publishing = await actor.startPublish(backendPkgConfig);

package/commands/search.ts

@@ -1,11 +1,10 @@
 import asTable from 'as-table';
 import chalk from 'chalk';
-import {mainActor} from '../mops.js';
+import {mainActor} from '../api/actors.js';
 
 export async function search(text: string) {
 	let actor = await mainActor();
-	let res = await actor.search(text, [], []);
-	let packages = res[0];
+	let [packages, _pageCount] = await actor.search(text, [], []);
 
 	if (!packages.length) {
 		console.log('Packages not found');

package/commands/transfer-ownership.ts

@@ -1,5 +1,6 @@
 import chalk from 'chalk';
-import {checkConfigFile, mainActor, readConfig} from '../mops.js';
+import {checkConfigFile, getIdentity, readConfig} from '../mops.js';
+import {mainActor} from '../api/actors.js';
 import {Principal} from '@dfinity/principal';
 import prompts from 'prompts';
 
@@ -30,7 +31,8 @@ export async function transferOwnership(toPrincipal: string) {
 		return;
 	}
 
-	let actor = await mainActor(true);
+	let identity = await getIdentity();
+	let actor = await mainActor(identity);
 
 	let res = await actor.transferOwnership(config.package?.name || '', principal);
 	if ('ok' in res) {

package/commands/user.ts

@@ -1,5 +1,6 @@
 import chalk from 'chalk';
-import {getIdentity, mainActor} from '../mops.js';
+import {getIdentity} from '../mops.js';
+import {mainActor} from '../api/actors.js';
 
 export async function getUserProp(prop: string) {
 	let actor = await mainActor();
@@ -14,7 +15,9 @@ export async function getUserProp(prop: string) {
 }
 
 export async function setUserProp(prop: string, value: string) {
-	let actor = await mainActor(true);
+	let identity = await getIdentity();
+	let actor = await mainActor(identity);
+
 	let res = await actor.setUserProp(prop, value);
 	if ('ok' in res) {
 		console.log(chalk.green('Success!'));

package/dist/api/actors.d.ts

@@ -0,0 +1,6 @@
+import { Identity } from '@dfinity/agent';
+import { Principal } from '@dfinity/principal';
+import { _SERVICE } from '../declarations/main/main.did.js';
+import { _SERVICE as _STORAGE_SERVICE } from '../declarations/storage/storage.did.js';
+export declare let mainActor: (identity?: Identity) => Promise<_SERVICE>;
+export declare let storageActor: (storageId: Principal, identity?: Identity) => Promise<_STORAGE_SERVICE>;

package/dist/api/actors.js

@@ -0,0 +1,32 @@
+import { Actor, HttpAgent } from '@dfinity/agent';
+import { idlFactory } from '../declarations/main/index.js';
+import { idlFactory as storageIdlFactory } from '../declarations/storage/index.js';
+import { getEndpoint } from './network.js';
+import { getNetwork } from './network.js';
+export let mainActor = async (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();
+    }
+    return Actor.createActor(storageIdlFactory, {
+        agent,
+        canisterId: storageId,
+    });
+};

package/dist/api/downloadPackageFiles.d.ts

@@ -0,0 +1,12 @@
+import { Principal } from '@dfinity/principal';
+import { Storage } from '../declarations/storage/storage.did.js';
+export declare function downloadPackageFiles(pkg: string, version?: string, threads?: number, onLoad?: (_fileIds: string[], _fileId: string) => void): Promise<Map<string, Array<number>>>;
+export declare function getPackageFilesInfo(pkg: string, version: string): Promise<{
+    storageId: Principal;
+    fileIds: string[];
+}>;
+export declare function getFileIds(pkg: string, version: string): Promise<string[]>;
+export declare function downloadFile(storage: Storage, fileId: string): Promise<{
+    path: string;
+    data: Array<number>;
+}>;

package/dist/api/downloadPackageFiles.js

@@ -0,0 +1,62 @@
+import { mainActor, storageActor } from './actors.js';
+import { resolveVersion } from './resolveVersion.js';
+import { parallel } from '../parallel.js';
+export async function downloadPackageFiles(pkg, version = '', threads = 8, onLoad = (_fileIds, _fileId) => { }) {
+    version = await resolveVersion(pkg, version);
+    let { storageId, fileIds } = await getPackageFilesInfo(pkg, version);
+    let storage = await storageActor(storageId);
+    let filesData = new Map();
+    await parallel(threads, fileIds, async (fileId) => {
+        let { path, data } = await downloadFile(storage, fileId);
+        filesData.set(path, data);
+        onLoad(fileIds, fileId);
+    });
+    return filesData;
+}
+// get package files meta
+export async function getPackageFilesInfo(pkg, version) {
+    let actor = await mainActor();
+    let [packageDetailsRes, fileIds] = await Promise.all([
+        actor.getPackageDetails(pkg, version),
+        getFileIds(pkg, version),
+    ]);
+    if ('err' in packageDetailsRes) {
+        throw packageDetailsRes.err;
+    }
+    let packageDetails = packageDetailsRes.ok;
+    return {
+        storageId: packageDetails.publication.storage,
+        fileIds,
+    };
+}
+// get package files ids
+export async function getFileIds(pkg, version) {
+    let actor = await mainActor();
+    let fileIdsRes = await actor.getFileIds(pkg, version);
+    if ('err' in fileIdsRes) {
+        throw fileIdsRes.err;
+    }
+    let filesIds = fileIdsRes.ok;
+    return filesIds;
+}
+// download single file
+export async function downloadFile(storage, fileId) {
+    let fileMetaRes = await storage.getFileMeta(fileId);
+    if ('err' in fileMetaRes) {
+        throw fileMetaRes.err;
+    }
+    let fileMeta = fileMetaRes.ok;
+    let data = [];
+    for (let i = 0n; i < fileMeta.chunkCount; i++) {
+        let chunkRes = await storage.downloadChunk(fileId, i);
+        if ('err' in chunkRes) {
+            throw chunkRes.err;
+        }
+        let chunk = chunkRes.ok;
+        data = [...data, ...chunk];
+    }
+    return {
+        path: fileMeta.path,
+        data: data,
+    };
+}

package/dist/api/getHighestVersion.d.ts

@@ -0,0 +1 @@
+export declare function getHighestVersion(pkgName: string): Promise<import("../declarations/main/main.did.js").Result_5>;

package/dist/api/getHighestVersion.js

@@ -0,0 +1,5 @@
+import { mainActor } from './actors.js';
+export async function getHighestVersion(pkgName) {
+    let actor = await mainActor();
+    return actor.getHighestVersion(pkgName);
+}

package/dist/api/index.d.ts

@@ -0,0 +1,4 @@
+export { mainActor, storageActor } from './actors.js';
+export { downloadPackageFiles } from './downloadPackageFiles.js';
+export { getEndpoint, getNetwork } from './network.js';
+export { resolveVersion } from './resolveVersion.js';

package/dist/api/index.js

@@ -0,0 +1,4 @@
+export { mainActor, storageActor } from './actors.js';
+export { downloadPackageFiles } from './downloadPackageFiles.js';
+export { getEndpoint, getNetwork } from './network.js';
+export { resolveVersion } from './resolveVersion.js';

package/dist/api/network.d.ts

@@ -0,0 +1,5 @@
+export declare function getNetwork(): string;
+export declare function getEndpoint(network: string): {
+    host: string;
+    canisterId: string;
+};

package/dist/api/network.js

@@ -0,0 +1,23 @@
+export function getNetwork() {
+    return globalThis.MOPS_NETWORK || 'ic';
+}
+export function getEndpoint(network) {
+    if (network === 'staging') {
+        return {
+            host: 'https://icp-api.io',
+            canisterId: '2d2zu-vaaaa-aaaak-qb6pq-cai',
+        };
+    }
+    else if (network === 'ic') {
+        return {
+            host: 'https://icp-api.io',
+            canisterId: 'oknww-riaaa-aaaam-qaf6a-cai',
+        };
+    }
+    else {
+        return {
+            host: 'http://127.0.0.1:4943',
+            canisterId: '2d2zu-vaaaa-aaaak-qb6pq-cai',
+        };
+    }
+}

package/dist/api/resolveVersion.d.ts

@@ -0,0 +1 @@
+export declare function resolveVersion(pkg: string, version?: string): Promise<string>;

package/dist/api/resolveVersion.js

@@ -0,0 +1,11 @@
+import { getHighestVersion } from './getHighestVersion.js';
+export async function resolveVersion(pkg, version = '') {
+    if (!version) {
+        let versionRes = await getHighestVersion(pkg);
+        if ('err' in versionRes) {
+            throw versionRes.err;
+        }
+        version = versionRes.ok;
+    }
+    return version;
+}

package/dist/cli.d.ts

@@ -1,2 +1,5 @@
 #!/usr/bin/env node
+declare global {
+    var MOPS_NETWORK: string;
+}
 export {};