ic-mops 0.18.1 → 0.19.0

package/commands/import-identity.js

@@ -3,13 +3,13 @@ import chalk from 'chalk';
 import path from 'path';
 import prompts from 'prompts';
 import del from 'del';
-import {globalCacheDir} from '../mops.js';
+import {globalConfigDir} from '../mops.js';
 import {encrypt} from '../pem.js';
 
 export async function importPem(data) {
 	try {
-		if (!fs.existsSync(globalCacheDir)) {
-			fs.mkdirSync(globalCacheDir);
+		if (!fs.existsSync(globalConfigDir)) {
+			fs.mkdirSync(globalConfigDir);
 		}
 
 		let res = await prompts({
@@ -31,8 +31,8 @@ export async function importPem(data) {
 			}
 		}
 
-		let identityPem = path.resolve(globalCacheDir, 'identity.pem');
-		let identityPemEncrypted = path.resolve(globalCacheDir, 'identity.pem.encrypted');
+		let identityPem = path.resolve(globalConfigDir, 'identity.pem');
+		let identityPemEncrypted = path.resolve(globalConfigDir, 'identity.pem.encrypted');
 
 		del.sync([identityPem, identityPemEncrypted], {force: true});
 

package/commands/search.js

@@ -4,9 +4,10 @@ import {mainActor} from '../mops.js';
 
 export async function search(text) {
 	let actor = await mainActor();
-	let res = await actor.search(text);
+	let res = await actor.search(text, [], []);
+	let packages = res[0];
 
-	if (!res.length) {
+	if (!packages.length) {
 		console.log('Packages not found');
 		return;
 	}
@@ -20,9 +21,9 @@ export async function search(text) {
 		}
 	};
 
-	let maxNameLength = Math.max(...res.map(a => a.config.name.length));
+	let maxNameLength = Math.max(...packages.map(a => a.config.name.length));
 
-	let table = res.map((item) => {
+	let table = packages.map((item) => {
 		return {
 			NAME: chalk.bold(item.config.name),
 			DESCRIPTION: ellipsis(item.config.description, process.stdout.columns - 40 - maxNameLength),

package/commands/test.js

@@ -190,6 +190,11 @@ function pipeMMF(proc, mmf) {
 				// change absolute file path to relative
 				// change :line:col-line:col to :line:col to work in vscode
 				let res = `${absToRel(m1)}:${m2}:${m3}`;
+
+				if (!fs.existsSync(m1)) {
+					return res;
+				}
+
 				// show failed line
 				let content = fs.readFileSync(m1);
 				let lines = content.toString().split('\n');

package/declarations/main/main.did

@@ -77,6 +77,7 @@ type Result =
  };
 type PublishingId = text;
 type PublishingErr = text;
+type PageCount = nat;
 type PackageSummary__1 = 
  record {
    config: PackageConfigV2__1;
@@ -184,6 +185,7 @@ service : {
   finishPublish: (PublishingId) -> (Result);
   getAirdropAmount: () -> (nat) query;
   getAirdropAmountAll: () -> (nat) query;
+  getAllPackages: (nat, nat) -> (vec PackageSummary, PageCount) query;
   getApiVersion: () -> (Text) query;
   getDefaultPackages: (text) -> (vec record {
                                        PackageName__1;
@@ -197,6 +199,7 @@ service : {
   getHighestVersion: (PackageName__1) -> (Result_5) query;
   getMostDownloadedPackages: () -> (vec PackageSummary) query;
   getMostDownloadedPackagesIn7Days: () -> (vec PackageSummary) query;
+  getNewPackages: () -> (vec PackageSummary) query;
   getPackageDetails: (PackageName__1, Ver) -> (Result_4) query;
   getRecentlyUpdatedPackages: () -> (vec PackageSummary) query;
   getStoragesStats: () -> (vec record {
@@ -207,7 +210,7 @@ service : {
   getTotalPackages: () -> (nat) query;
   getUser: (principal) -> (opt User__1) query;
   notifyInstall: (PackageName__1, Ver) -> () oneway;
-  search: (Text) -> (vec PackageSummary) query;
+  search: (Text, opt nat, opt nat) -> (vec PackageSummary, PageCount) query;
   setUserProp: (text, text) -> (Result_3);
   startFileUpload: (PublishingId, Text, nat, blob) -> (Result_2);
   startPublish: (PackageConfigV2) -> (Result_1);

package/declarations/main/main.did.d.ts

@@ -94,6 +94,7 @@ export interface PackageSummary__1 {
   'config' : PackageConfigV2__1,
   'publication' : PackagePublication,
 }
+export type PageCount = bigint;
 export type PublishingErr = string;
 export type PublishingId = string;
 export type Result = { 'ok' : null } |
@@ -150,6 +151,10 @@ export interface _SERVICE {
   'finishPublish' : ActorMethod<[PublishingId], Result>,
   'getAirdropAmount' : ActorMethod<[], bigint>,
   'getAirdropAmountAll' : ActorMethod<[], bigint>,
+  'getAllPackages' : ActorMethod<
+    [bigint, bigint],
+    [Array<PackageSummary>, PageCount]
+  >,
   'getApiVersion' : ActorMethod<[], Text>,
   'getDefaultPackages' : ActorMethod<
     [string],
@@ -167,6 +172,7 @@ export interface _SERVICE {
   'getHighestVersion' : ActorMethod<[PackageName__1], Result_5>,
   'getMostDownloadedPackages' : ActorMethod<[], Array<PackageSummary>>,
   'getMostDownloadedPackagesIn7Days' : ActorMethod<[], Array<PackageSummary>>,
+  'getNewPackages' : ActorMethod<[], Array<PackageSummary>>,
   'getPackageDetails' : ActorMethod<[PackageName__1, Ver], Result_4>,
   'getRecentlyUpdatedPackages' : ActorMethod<[], Array<PackageSummary>>,
   'getStoragesStats' : ActorMethod<[], Array<[StorageId, StorageStats]>>,
@@ -174,7 +180,10 @@ export interface _SERVICE {
   'getTotalPackages' : ActorMethod<[], bigint>,
   'getUser' : ActorMethod<[Principal], [] | [User__1]>,
   'notifyInstall' : ActorMethod<[PackageName__1, Ver], undefined>,
-  'search' : ActorMethod<[Text], Array<PackageSummary>>,
+  'search' : ActorMethod<
+    [Text, [] | [bigint], [] | [bigint]],
+    [Array<PackageSummary>, PageCount]
+  >,
   'setUserProp' : ActorMethod<[string, string], Result_3>,
   'startFileUpload' : ActorMethod<
     [PublishingId, Text, bigint, Uint8Array | number[]],

package/declarations/main/main.did.js

@@ -2,20 +2,6 @@ export const idlFactory = ({ IDL }) => {
   const PublishingId = IDL.Text;
   const Err = IDL.Text;
   const Result = IDL.Variant({ 'ok' : IDL.Null, 'err' : Err });
-  const Text = IDL.Text;
-  const PackageName__1 = IDL.Text;
-  const Version = IDL.Text;
-  const PackageId = IDL.Text;
-  const Time = IDL.Int;
-  const DownloadsSnapshot__1 = IDL.Record({
-    'startTime' : Time,
-    'endTime' : Time,
-    'downloads' : IDL.Nat,
-  });
-  const Ver = IDL.Text;
-  const FileId = IDL.Text;
-  const Result_6 = IDL.Variant({ 'ok' : IDL.Vec(FileId), 'err' : Err });
-  const Result_5 = IDL.Variant({ 'ok' : Ver, 'err' : Err });
   const User = IDL.Record({
     'id' : IDL.Principal,
     'emailVerified' : IDL.Bool,
@@ -53,6 +39,7 @@ export const idlFactory = ({ IDL }) => {
     'license' : IDL.Text,
     'readme' : IDL.Text,
   });
+  const Time = IDL.Int;
   const PackagePublication = IDL.Record({
     'storage' : IDL.Principal,
     'time' : Time,
@@ -67,6 +54,20 @@ export const idlFactory = ({ IDL }) => {
     'config' : PackageConfigV2__1,
     'publication' : PackagePublication,
   });
+  const PageCount = IDL.Nat;
+  const Text = IDL.Text;
+  const PackageName__1 = IDL.Text;
+  const Version = IDL.Text;
+  const PackageId = IDL.Text;
+  const DownloadsSnapshot__1 = IDL.Record({
+    'startTime' : Time,
+    'endTime' : Time,
+    'downloads' : IDL.Nat,
+  });
+  const Ver = IDL.Text;
+  const FileId = IDL.Text;
+  const Result_6 = IDL.Variant({ 'ok' : IDL.Vec(FileId), 'err' : Err });
+  const Result_5 = IDL.Variant({ 'ok' : Ver, 'err' : Err });
   const PackageSummary__1 = IDL.Record({
     'ownerInfo' : User,
     'owner' : IDL.Principal,
@@ -141,6 +142,11 @@ export const idlFactory = ({ IDL }) => {
     'finishPublish' : IDL.Func([PublishingId], [Result], []),
     'getAirdropAmount' : IDL.Func([], [IDL.Nat], ['query']),
     'getAirdropAmountAll' : IDL.Func([], [IDL.Nat], ['query']),
+    'getAllPackages' : IDL.Func(
+        [IDL.Nat, IDL.Nat],
+        [IDL.Vec(PackageSummary), PageCount],
+        ['query'],
+      ),
     'getApiVersion' : IDL.Func([], [Text], ['query']),
     'getDefaultPackages' : IDL.Func(
         [IDL.Text],
@@ -169,6 +175,7 @@ export const idlFactory = ({ IDL }) => {
         [IDL.Vec(PackageSummary)],
         ['query'],
       ),
+    'getNewPackages' : IDL.Func([], [IDL.Vec(PackageSummary)], ['query']),
     'getPackageDetails' : IDL.Func(
         [PackageName__1, Ver],
         [Result_4],
@@ -188,7 +195,11 @@ export const idlFactory = ({ IDL }) => {
     'getTotalPackages' : IDL.Func([], [IDL.Nat], ['query']),
     'getUser' : IDL.Func([IDL.Principal], [IDL.Opt(User__1)], ['query']),
     'notifyInstall' : IDL.Func([PackageName__1, Ver], [], ['oneway']),
-    'search' : IDL.Func([Text], [IDL.Vec(PackageSummary)], ['query']),
+    'search' : IDL.Func(
+        [Text, IDL.Opt(IDL.Nat), IDL.Opt(IDL.Nat)],
+        [IDL.Vec(PackageSummary), PageCount],
+        ['query'],
+      ),
     'setUserProp' : IDL.Func([IDL.Text, IDL.Text], [Result_3], []),
     'startFileUpload' : IDL.Func(
         [PublishingId, Text, IDL.Nat, IDL.Vec(IDL.Nat8)],

package/mops.js

@@ -5,6 +5,7 @@ import fetch from 'node-fetch';
 import path from 'path';
 import fs from 'fs';
 import prompts from 'prompts';
+import ncp from 'ncp';
 
 import {idlFactory} from './declarations/main/main.did.js';
 import {idlFactory as storageIdlFactory} from './declarations/storage/storage.did.js';
@@ -18,7 +19,57 @@ export let apiVersion = '1.2';
 
 let networkFile = new URL('./network.txt', import.meta.url);
 
-export let globalCacheDir = path.resolve(process.env.HOME || process.env.APPDATA, 'mops');
+export let globalConfigDir;
+export let globalCacheDir;
+
+// OS specific dirs
+if (process.platform == 'win32') {
+	globalConfigDir = path.join(process.env.LOCALAPPDATA, 'mops/config');
+	globalCacheDir = path.join(process.env.LOCALAPPDATA, 'mops/cache');
+}
+else if (process.platform == 'darwin') {
+	globalConfigDir = path.join(process.env.HOME, 'Library/Application Support/mops');
+	globalCacheDir = path.join(process.env.HOME, 'Library/Caches/mops');
+}
+else {
+	globalConfigDir = path.join(process.env.HOME, '.config/mops');
+	globalCacheDir = path.join(process.env.HOME, '.cache/mops');
+}
+// XDG overrides
+if (process.env.XDG_CONFIG_HOME) {
+	globalConfigDir = path.join(process.env.XDG_CONFIG_HOME, 'mops');
+}
+if (process.env.XDG_CACHE_HOME) {
+	globalCacheDir = path.join(process.env.XDG_CACHE_HOME, 'mops');
+}
+
+// temp: move old config to new location
+let oldGlobalConfigDir = path.resolve(process.env.HOME || process.env.APPDATA, 'mops');
+if (fs.existsSync(oldGlobalConfigDir) && !fs.existsSync(globalConfigDir)) {
+	fs.mkdirSync(globalConfigDir);
+	if (fs.existsSync(path.join(oldGlobalConfigDir, 'identity.pem'))) {
+		fs.copyFileSync(path.join(oldGlobalConfigDir, 'identity.pem'), path.join(globalConfigDir, 'identity.pem'));
+	}
+	if (fs.existsSync(path.join(oldGlobalConfigDir, 'identity.pem.encrypted'))) {
+		fs.copyFileSync(path.join(oldGlobalConfigDir, 'identity.pem.encrypted'), path.join(globalConfigDir, 'identity.pem.encrypted'));
+	}
+	console.log('Moved config to ' + chalk.green(globalConfigDir));
+}
+
+// temp: move old cache to new location
+if (fs.existsSync(oldGlobalConfigDir) && !fs.existsSync(globalCacheDir)) {
+	fs.mkdirSync(globalCacheDir);
+	ncp.ncp(path.join(oldGlobalConfigDir, 'packages'), path.join(globalCacheDir, 'packages'), {
+		stopOnErr: true,
+		clobber: false,
+	}, (err) => {
+		if (err) {
+			console.log('Error moving config: ', err);
+			fs.rmSync(globalCacheDir, {recursive: true, force: true});
+		}
+	});
+	console.log('Moved cache to ' + chalk.green(globalCacheDir));
+}
 
 export function setNetwork(network) {
 	fs.writeFileSync(networkFile, network);
@@ -31,11 +82,10 @@ export function getNetwork() {
 	}
 
 	if (network === 'local') {
-		let ids = JSON.parse(fs.readFileSync(new URL('../.dfx/local/canister_ids.json', import.meta.url)).toString());
 		return {
 			network,
 			host: 'http://127.0.0.1:4943',
-			canisterId: ids.main.local,
+			canisterId: '2d2zu-vaaaa-aaaak-qb6pq-cai',
 		};
 	}
 	else if (network === 'staging') {
@@ -55,8 +105,8 @@ export function getNetwork() {
 }
 
 export let getIdentity = async () => {
-	let identityPem = path.resolve(globalCacheDir, 'identity.pem');
-	let identityPemEncrypted = path.resolve(globalCacheDir, 'identity.pem.encrypted');
+	let identityPem = path.resolve(globalConfigDir, 'identity.pem');
+	let identityPemEncrypted = path.resolve(globalConfigDir, 'identity.pem.encrypted');
 	if (fs.existsSync(identityPemEncrypted)) {
 		let res = await prompts({
 			type: 'password',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ic-mops",
-	"version": "0.18.1",
+	"version": "0.19.0",
 	"type": "module",
 	"bin": {
 		"mops": "cli.js"