@didcid/keymaster 0.3.10 → 0.4.0

package/dist/types/types.d.ts

@@ -115,11 +115,10 @@ export interface PollResults {
         count: number;
     }>;
     ballots?: Array<{
-        ballot: string;
-        received: string;
         voter: string;
         vote: number;
         option: string;
+        received: string;
     }>;
     votes?: {
         eligible: number;
@@ -128,18 +127,12 @@ export interface PollResults {
     };
     final?: boolean;
 }
-export interface Poll {
-    type: string;
-    version: number;
+export interface PollConfig {
+    version: 2;
+    name: string;
     description: string;
-    roster: string;
     options: string[];
     deadline: string;
-    ballots?: Record<string, {
-        ballot: string;
-        received: string;
-    }>;
-    results?: PollResults;
 }
 export interface ViewPollResult {
     description: string;
@@ -149,8 +142,15 @@ export interface ViewPollResult {
     isEligible: boolean;
     voteExpired: boolean;
     hasVoted: boolean;
+    ballots?: string[];
     results?: PollResults;
 }
+export interface ViewBallotResult {
+    poll: string;
+    voter?: string;
+    vote?: number;
+    option?: string;
+}
 export interface BinaryAsset {
     cid: string;
     type: string;
@@ -202,8 +202,8 @@ export interface KeymasterOptions {
     maxAliasLength?: number;
 }
 export interface EncryptedMessage {
-    sender: string;
-    created: string;
+    sender?: string;
+    created?: string;
     cipher_hash?: string | null;
     cipher_sender?: string | null;
     cipher_receiver?: string | null;
@@ -324,20 +324,27 @@ export interface KeymasterInterface {
         retries?: number;
         delay?: number;
     }): Promise<ChallengeResponse>;
-    pollTemplate(): Promise<Poll>;
-    createPoll(poll: Poll, options?: CreateAssetOptions): Promise<string>;
-    getPoll(pollId: string): Promise<Poll | null>;
+    pollTemplate(): Promise<PollConfig>;
+    createPoll(config: PollConfig, options?: VaultOptions): Promise<string>;
+    getPoll(pollId: string): Promise<PollConfig | null>;
+    testPoll(id: string): Promise<boolean>;
+    listPolls(owner?: string): Promise<string[]>;
     viewPoll(pollId: string): Promise<ViewPollResult>;
     votePoll(pollId: string, vote: number, options?: {
-        spoil?: boolean;
         registry?: string;
         validUntil?: string;
     }): Promise<string>;
+    sendPoll(pollId: string): Promise<string>;
+    sendBallot(ballotDid: string, pollId: string): Promise<string>;
+    viewBallot(ballotDid: string): Promise<ViewBallotResult>;
     updatePoll(ballot: string): Promise<boolean>;
     publishPoll(pollId: string, options?: {
         reveal?: boolean;
     }): Promise<boolean>;
     unpublishPoll(pollId: string): Promise<boolean>;
+    addPollVoter(pollId: string, memberId: string): Promise<boolean>;
+    removePollVoter(pollId: string, memberId: string): Promise<boolean>;
+    listPollVoters(pollId: string): Promise<Record<string, any>>;
     createImage(data: Buffer, options?: FileAssetOptions): Promise<string>;
     updateImage(did: string, data: Buffer, options?: FileAssetOptions): Promise<boolean>;
     getImage(id: string): Promise<ImageFileAsset | null>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@didcid/keymaster",
-  "version": "0.3.10",
+  "version": "0.4.0",
   "description": "Archon Keymaster",
   "type": "module",
   "module": "./dist/esm/index.js",
@@ -37,11 +37,6 @@
       "require": "./dist/cjs/keymaster-client.cjs",
       "types": "./dist/types/keymaster-client.d.ts"
     },
-    "./encryption": {
-      "import": "./dist/esm/encryption.js",
-      "require": "./dist/cjs/encryption.cjs",
-      "types": "./dist/types/encryption.d.ts"
-    },
     "./wallet/json": {
       "import": "./dist/esm/db/json.js",
       "require": "./dist/cjs/db/json.cjs",
@@ -101,9 +96,6 @@
       "client": [
         "./dist/types/keymaster-client.d.ts"
       ],
-      "encryption": [
-        "./dist/types/encryption.d.ts"
-      ],
       "wallet/json": [
         "./dist/types/db/json.d.ts"
       ],
@@ -149,9 +141,9 @@
   "author": "David McFadzean <davidmc@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "@didcid/cipher": "^0.1.3",
+    "@didcid/cipher": "^0.2.0",
     "@didcid/common": "^0.1.3",
-    "@didcid/gatekeeper": "^0.3.7",
+    "@didcid/gatekeeper": "^0.4.0",
     "axios": "^1.7.7",
     "commander": "^11.1.0",
     "dotenv": "^16.4.5",
@@ -166,5 +158,5 @@
     "type": "git",
     "url": "git+https://github.com/archetech/archon.git"
   },
-  "gitHead": "bd4d25151dfe8e2b940e0691d01a34b2efdc5530"
+  "gitHead": "4692cc18e1377cafc96aaf7a55cd969a0b09b77c"
 }

package/dist/cjs/encryption.cjs

@@ -1,59 +0,0 @@
-'use strict';
-
-const ENC_ALG = 'AES-GCM';
-const ENC_KDF = 'PBKDF2';
-const ENC_HASH = 'SHA-512';
-const ENC_ITER_DEFAULT = 100_000;
-const IV_LEN = 12;
-const SALT_LEN = 16;
-function getIterations() {
-    if (typeof process !== 'undefined' && process.env?.PBKDF2_ITERATIONS) {
-        const parsed = parseInt(process.env.PBKDF2_ITERATIONS, 10);
-        if (!isNaN(parsed) && parsed > 0) {
-            return parsed;
-        }
-    }
-    return ENC_ITER_DEFAULT;
-}
-async function encMnemonic(mnemonic, pass) {
-    if (!hasSubtle()) {
-        throw new Error('Web Cryptography API not available');
-    }
-    const salt = await randBytes(SALT_LEN);
-    const iv = await randBytes(IV_LEN);
-    const key = await deriveKey(pass, salt);
-    const ct = await crypto.subtle.encrypt({ name: ENC_ALG, iv: iv }, key, new TextEncoder().encode(mnemonic));
-    return { salt: b64(salt), iv: b64(iv), data: b64(new Uint8Array(ct)) };
-}
-async function decMnemonic(blob, pass) {
-    if (!hasSubtle()) {
-        throw new Error('Web Cryptography API not available');
-    }
-    const salt = ub64(blob.salt);
-    const iv = ub64(blob.iv);
-    const data = ub64(blob.data);
-    const key = await deriveKey(pass, salt);
-    const pt = await crypto.subtle.decrypt({ name: ENC_ALG, iv }, key, data);
-    return new TextDecoder().decode(pt);
-}
-const b64 = (buf) => {
-    return Buffer.from(buf).toString('base64');
-};
-const ub64 = (b64) => {
-    return new Uint8Array(Buffer.from(b64, 'base64'));
-};
-const hasSubtle = () => typeof globalThis !== 'undefined' &&
-    !!(globalThis.crypto && globalThis.crypto.subtle);
-async function randBytes(len) {
-    const u8 = new Uint8Array(len);
-    crypto.getRandomValues(u8);
-    return u8;
-}
-async function deriveKey(pass, salt) {
-    const enc = new TextEncoder();
-    const passKey = await crypto.subtle.importKey('raw', enc.encode(pass), { name: ENC_KDF }, false, ['deriveKey']);
-    return crypto.subtle.deriveKey({ name: ENC_KDF, salt: salt, iterations: getIterations(), hash: ENC_HASH }, passKey, { name: ENC_ALG, length: 256 }, false, ['encrypt', 'decrypt']);
-}
-
-exports.decMnemonic = decMnemonic;
-exports.encMnemonic = encMnemonic;

package/dist/esm/encryption.js

@@ -1,55 +0,0 @@
-const ENC_ALG = 'AES-GCM';
-const ENC_KDF = 'PBKDF2';
-const ENC_HASH = 'SHA-512';
-const ENC_ITER_DEFAULT = 100_000;
-const IV_LEN = 12;
-const SALT_LEN = 16;
-function getIterations() {
-    if (typeof process !== 'undefined' && process.env?.PBKDF2_ITERATIONS) {
-        const parsed = parseInt(process.env.PBKDF2_ITERATIONS, 10);
-        if (!isNaN(parsed) && parsed > 0) {
-            return parsed;
-        }
-    }
-    return ENC_ITER_DEFAULT;
-}
-export async function encMnemonic(mnemonic, pass) {
-    if (!hasSubtle()) {
-        throw new Error('Web Cryptography API not available');
-    }
-    const salt = await randBytes(SALT_LEN);
-    const iv = await randBytes(IV_LEN);
-    const key = await deriveKey(pass, salt);
-    const ct = await crypto.subtle.encrypt({ name: ENC_ALG, iv: iv }, key, new TextEncoder().encode(mnemonic));
-    return { salt: b64(salt), iv: b64(iv), data: b64(new Uint8Array(ct)) };
-}
-export async function decMnemonic(blob, pass) {
-    if (!hasSubtle()) {
-        throw new Error('Web Cryptography API not available');
-    }
-    const salt = ub64(blob.salt);
-    const iv = ub64(blob.iv);
-    const data = ub64(blob.data);
-    const key = await deriveKey(pass, salt);
-    const pt = await crypto.subtle.decrypt({ name: ENC_ALG, iv }, key, data);
-    return new TextDecoder().decode(pt);
-}
-const b64 = (buf) => {
-    return Buffer.from(buf).toString('base64');
-};
-const ub64 = (b64) => {
-    return new Uint8Array(Buffer.from(b64, 'base64'));
-};
-const hasSubtle = () => typeof globalThis !== 'undefined' &&
-    !!(globalThis.crypto && globalThis.crypto.subtle);
-async function randBytes(len) {
-    const u8 = new Uint8Array(len);
-    crypto.getRandomValues(u8);
-    return u8;
-}
-async function deriveKey(pass, salt) {
-    const enc = new TextEncoder();
-    const passKey = await crypto.subtle.importKey('raw', enc.encode(pass), { name: ENC_KDF }, false, ['deriveKey']);
-    return crypto.subtle.deriveKey({ name: ENC_KDF, salt: salt, iterations: getIterations(), hash: ENC_HASH }, passKey, { name: ENC_ALG, length: 256 }, false, ['encrypt', 'decrypt']);
-}
-//# sourceMappingURL=encryption.js.map

package/dist/esm/encryption.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"encryption.js","sourceRoot":"","sources":["../../src/encryption.ts"],"names":[],"mappings":"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"}

package/dist/types/encryption.d.ts

@@ -1,10 +0,0 @@
-export declare function encMnemonic(mnemonic: string, pass: string): Promise<{
-    salt: string;
-    iv: string;
-    data: string;
-}>;
-export declare function decMnemonic(blob: {
-    salt: string;
-    iv: string;
-    data: string;
-}, pass: string): Promise<string>;