@didcid/keymaster 0.3.8 → 0.3.10

package/dist/esm/keymaster.js

@@ -581,7 +581,7 @@ export default class Keymaster {
         const cloneData = { ...assetData, cloned: assetDoc.didDocument.id };
         return this.createAsset(cloneData, options);
     }
-    async generateImageAsset(buffer) {
+    async generateImageAsset(filename, buffer) {
         let metadata;
         try {
             metadata = imageSize(buffer);
@@ -590,33 +590,38 @@ export default class Keymaster {
             throw new InvalidParameterError('buffer');
         }
         const cid = await this.gatekeeper.addData(buffer);
-        const image = {
+        const file = {
             cid,
+            filename,
+            type: `image/${metadata.type}`,
             bytes: buffer.length,
-            ...metadata,
-            type: `image/${metadata.type}`
         };
-        return image;
+        const image = {
+            width: metadata.width,
+            height: metadata.height,
+        };
+        return { file, image };
     }
     async createImage(buffer, options = {}) {
-        const image = await this.generateImageAsset(buffer);
-        return this.createAsset({ image }, options);
+        const filename = options.filename || 'image';
+        const { file, image } = await this.generateImageAsset(filename, buffer);
+        return this.createAsset({ file, image }, options);
     }
-    async updateImage(id, buffer) {
-        const image = await this.generateImageAsset(buffer);
-        return this.updateAsset(id, { image });
+    async updateImage(id, buffer, options = {}) {
+        const filename = options.filename || 'image';
+        const { file, image } = await this.generateImageAsset(filename, buffer);
+        return this.mergeData(id, { file, image });
     }
     async getImage(id) {
         const asset = await this.resolveAsset(id);
-        const image = asset.image;
-        if (!image || !image.cid) {
+        if (!asset.file || !asset.file.cid || !asset.image) {
             return null;
         }
-        const buffer = await this.gatekeeper.getData(image.cid);
+        const buffer = await this.gatekeeper.getData(asset.file.cid);
         if (buffer) {
-            image.data = buffer;
+            asset.file.data = buffer;
         }
-        return image;
+        return { file: asset.file, image: asset.image };
     }
     async testImage(id) {
         try {
@@ -659,24 +664,32 @@ export default class Keymaster {
         };
         return file;
     }
-    async createDocument(buffer, options = {}) {
-        const filename = options.filename || 'document';
-        const document = await this.generateFileAsset(filename, buffer);
-        return this.createAsset({ document }, options);
+    async createFile(buffer, options = {}) {
+        const filename = options.filename || 'file';
+        const file = await this.generateFileAsset(filename, buffer);
+        return this.createAsset({ file }, options);
     }
-    async updateDocument(id, buffer, options = {}) {
-        const filename = options.filename || 'document';
-        const document = await this.generateFileAsset(filename, buffer);
-        return this.updateAsset(id, { document });
+    async updateFile(id, buffer, options = {}) {
+        const filename = options.filename || 'file';
+        const file = await this.generateFileAsset(filename, buffer);
+        return this.mergeData(id, { file });
     }
-    async getDocument(id) {
+    async getFile(id) {
         const asset = await this.resolveAsset(id);
-        return asset.document ?? null;
+        const file = asset.file;
+        if (!file || !file.cid) {
+            return null;
+        }
+        const buffer = await this.gatekeeper.getData(file.cid);
+        if (buffer) {
+            file.data = buffer;
+        }
+        return file;
     }
-    async testDocument(id) {
+    async testFile(id) {
         try {
-            const document = await this.getDocument(id);
-            return document !== null;
+            const file = await this.getFile(id);
+            return file !== null;
         }
         catch (error) {
             return false;
@@ -960,13 +973,14 @@ export default class Keymaster {
         }
         return doc.didDocumentData;
     }
-    async updateAsset(did, data) {
+    async mergeData(did, data) {
         const doc = await this.resolveDID(did);
         const currentData = doc.didDocumentData || {};
-        const updatedData = {
-            ...currentData,
-            ...data
-        };
+        const updatedData = { ...currentData, ...data };
+        for (const key of Object.keys(updatedData)) {
+            if (updatedData[key] === null)
+                delete updatedData[key];
+        }
         return this.updateDID(did, { didDocumentData: updatedData });
     }
     async transferAsset(id, controller) {
@@ -1684,7 +1698,7 @@ export default class Keymaster {
         const members = new Set(group.members);
         members.add(memberDID);
         group.members = Array.from(members);
-        return this.updateAsset(groupDID, { group });
+        return this.mergeData(groupDID, { group });
     }
     async removeGroupMember(groupId, memberId) {
         const groupDID = await this.lookupDID(groupId);
@@ -1707,7 +1721,7 @@ export default class Keymaster {
         const members = new Set(group.members);
         members.delete(memberDID);
         group.members = Array.from(members);
-        return this.updateAsset(groupDID, { group });
+        return this.mergeData(groupDID, { group });
     }
     async testGroup(groupId, memberId) {
         try {
@@ -1798,7 +1812,7 @@ export default class Keymaster {
         if (!this.validateSchema(schema)) {
             throw new InvalidParameterError('schema');
         }
-        return this.updateAsset(id, { schema });
+        return this.mergeData(id, { schema });
     }
     // TBD add optional 2nd parameter that will validate JSON against the schema
     async testSchema(id) {
@@ -2074,7 +2088,7 @@ export default class Keymaster {
             ballot: didBallot,
             received: new Date().toISOString(),
         };
-        return this.updateAsset(didPoll, { poll });
+        return this.mergeData(didPoll, { poll });
     }
     async publishPoll(pollId, options = {}) {
         const { reveal = false } = options;
@@ -2096,7 +2110,7 @@ export default class Keymaster {
             throw new InvalidParameterError(pollId);
         }
         poll.results = view.results;
-        return this.updateAsset(pollId, { poll });
+        return this.mergeData(pollId, { poll });
     }
     async unpublishPoll(pollId) {
         const id = await this.fetchIdInfo();
@@ -2110,7 +2124,7 @@ export default class Keymaster {
             throw new InvalidParameterError(pollId);
         }
         delete poll.results;
-        return this.updateAsset(pollId, { poll });
+        return this.mergeData(pollId, { poll });
     }
     async createVault(options = {}) {
         const id = await this.fetchIdInfo();
@@ -2239,7 +2253,7 @@ export default class Keymaster {
             for (const memberDID of Object.keys(members)) {
                 await this.addMemberKey(vault, memberDID, privateJwk);
             }
-            await this.updateAsset(vaultId, { vault });
+            await this.mergeData(vaultId, { vault });
             return;
         }
         throw new KeymasterError('Unsupported vault version');
@@ -2269,7 +2283,7 @@ export default class Keymaster {
         const publicJwk = config.secretMembers ? idKeypair.publicJwk : vault.publicJwk;
         vault.members = this.cipher.encryptMessage(publicJwk, privateJwk, JSON.stringify(members));
         await this.addMemberKey(vault, memberDID, privateJwk);
-        return this.updateAsset(vaultId, { vault });
+        return this.mergeData(vaultId, { vault });
     }
     async removeVaultMember(vaultId, memberId) {
         const owner = await this.checkVaultOwner(vaultId);
@@ -2287,7 +2301,7 @@ export default class Keymaster {
         vault.members = this.cipher.encryptMessage(publicJwk, privateJwk, JSON.stringify(members));
         const memberKeyId = this.generateSaltedId(vault, memberDID);
         delete vault.keys[memberKeyId];
-        return this.updateAsset(vaultId, { vault });
+        return this.mergeData(vaultId, { vault });
     }
     async listVaultMembers(vaultId) {
         const vault = await this.getVault(vaultId);
@@ -2317,7 +2331,7 @@ export default class Keymaster {
         };
         vault.items = this.cipher.encryptMessage(vault.publicJwk, privateJwk, JSON.stringify(items));
         vault.sha256 = this.cipher.hashJSON(items);
-        return this.updateAsset(vaultId, { vault });
+        return this.mergeData(vaultId, { vault });
     }
     async removeVaultItem(vaultId, name) {
         await this.checkVaultOwner(vaultId);
@@ -2326,7 +2340,7 @@ export default class Keymaster {
         delete items[name];
         vault.items = this.cipher.encryptMessage(vault.publicJwk, privateJwk, JSON.stringify(items));
         vault.sha256 = this.cipher.hashJSON(items);
-        return this.updateAsset(vaultId, { vault });
+        return this.mergeData(vaultId, { vault });
     }
     async listVaultItems(vaultId, options) {
         const vault = await this.getVault(vaultId, options);
@@ -2577,7 +2591,7 @@ export default class Keymaster {
     }
     async updateNotice(id, message) {
         const notice = await this.verifyNotice(message);
-        return this.updateAsset(id, { notice });
+        return this.mergeData(id, { notice });
     }
     async addToNotices(did, tags) {
         const verifiedTags = this.verifyTagList(tags);