@fileverse/api 0.0.10 → 0.0.12

package/dist/index.js

@@ -669,7 +669,9 @@ var init_files_model = __esm({
           linkKey: fileRaw.linkKey,
           linkKeyNonce: fileRaw.linkKeyNonce,
           commentKey: fileRaw.commentKey,
-          link: fileRaw.link
+          link: fileRaw.link,
+          derivedKey: fileRaw.derivedKey,
+          secretKey: fileRaw.secretKey
         };
       }
       static async findAll(portalAddress, limit, skip) {
@@ -753,10 +755,20 @@ var init_files_model = __esm({
         const _id = uuidv7();
         const sql = `
       INSERT INTO ${this.TABLE}
-      (_id, title, content, ddocId, portalAddress)
-      VALUES (?, ?, ?, ?, ?)
+      (_id, title, content, ddocId, portalAddress, linkKey, linkKeyNonce, derivedKey, secretKey)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
     `;
-        await QueryBuilder.execute(sql, [_id, input.title, input.content, input.ddocId, input.portalAddress]);
+        await QueryBuilder.execute(sql, [
+          _id,
+          input.title,
+          input.content,
+          input.ddocId,
+          input.portalAddress,
+          input.linkKey ?? null,
+          input.linkKeyNonce ?? null,
+          input.derivedKey ?? null,
+          input.secretKey ?? null
+        ]);
         const created = await this.findById(_id, input.portalAddress);
         if (!created) {
           throw new Error("Failed to create file");
@@ -2573,7 +2585,7 @@ import { fromUint8Array, toUint8Array } from "js-base64";
 import { toAESKey, aesEncrypt } from "@fileverse/crypto/webcrypto";
 import axios from "axios";
 import { encodeFunctionData, parseEventLogs } from "viem";
-var deriveKeyFromAg2Hash, decryptSecretKey, getExistingEncryptionMaterial, getNaclSecretKey, generateLinkKeyMaterial, jsonToFile, appendAuthTagIvToBlob, encryptFile, getNonceAppendedCipherText, jsonToBytes, buildLinklock, encryptTitleWithFileKey, uploadFileToIPFS, getEditFileTrxCalldata, getAddFileTrxCalldata, prepareCallData, prepareDeleteFileCallData, createEncryptedContentFile, buildFileMetadata, parseFileEventLog, uploadAllFilesToIPFS;
+var deriveKeyFromAg2Hash, getExistingEncryptionMaterial, getNaclSecretKey, generateLinkKeyMaterial, jsonToFile, appendAuthTagIvToBlob, encryptFile, getNonceAppendedCipherText, jsonToBytes, buildLinklock, encryptTitleWithFileKey, uploadFileToIPFS, getEditFileTrxCalldata, getAddFileTrxCalldata, prepareCallData, prepareDeleteFileCallData, createEncryptedContentFile, buildFileMetadata, parseFileEventLog, uploadAllFilesToIPFS;
 var init_file_utils = __esm({
   "src/sdk/file-utils.ts"() {
     "use strict";
@@ -2586,16 +2598,18 @@ var init_file_utils = __esm({
         info: Buffer.from("encryptionKey")
       });
     };
-    decryptSecretKey = async (docId, nonce, encryptedSecretKey) => {
-      const derivedKey = await deriveKeyFromAg2Hash(docId, toUint8Array(nonce));
-      return tweetnacl.secretbox.open(toUint8Array(encryptedSecretKey), toUint8Array(nonce), derivedKey);
-    };
     getExistingEncryptionMaterial = async (existingEncryptedSecretKey, existingNonce, docId) => {
-      const secretKey = await decryptSecretKey(docId, existingNonce, existingEncryptedSecretKey);
+      const derivedKey = await deriveKeyFromAg2Hash(docId, toUint8Array(existingNonce));
+      const secretKey = tweetnacl.secretbox.open(
+        toUint8Array(existingEncryptedSecretKey),
+        toUint8Array(existingNonce),
+        derivedKey
+      );
       return {
         encryptedSecretKey: existingEncryptedSecretKey,
         nonce: toUint8Array(existingNonce),
-        secretKey
+        secretKey,
+        derivedKey: new Uint8Array(derivedKey)
       };
     };
     getNaclSecretKey = async (ddocId) => {
@@ -2603,19 +2617,19 @@ var init_file_utils = __esm({
       const nonce = tweetnacl.randomBytes(tweetnacl.secretbox.nonceLength);
       const derivedKey = await deriveKeyFromAg2Hash(ddocId, nonce);
       const encryptedSecretKey = fromUint8Array(tweetnacl.secretbox(secretKey, nonce, derivedKey), true);
-      return { nonce, encryptedSecretKey, secretKey };
+      return { nonce, encryptedSecretKey, secretKey, derivedKey: new Uint8Array(derivedKey) };
     };
     generateLinkKeyMaterial = async (params) => {
       if (params.linkKeyNonce && params.linkKey) {
-        const { encryptedSecretKey: encryptedSecretKey2, nonce: nonce2, secretKey: secretKey2 } = await getExistingEncryptionMaterial(
+        const { encryptedSecretKey: encryptedSecretKey2, nonce: nonce2, secretKey: secretKey2, derivedKey: derivedKey2 } = await getExistingEncryptionMaterial(
           params.linkKey,
           params.linkKeyNonce,
           params.ddocId
         );
-        if (secretKey2) return { encryptedSecretKey: encryptedSecretKey2, nonce: nonce2, secretKey: secretKey2 };
+        if (secretKey2) return { encryptedSecretKey: encryptedSecretKey2, nonce: nonce2, secretKey: secretKey2, derivedKey: derivedKey2 };
       }
-      const { secretKey, nonce, encryptedSecretKey } = await getNaclSecretKey(params.ddocId);
-      return { secretKey, nonce, encryptedSecretKey };
+      const { secretKey, nonce, encryptedSecretKey, derivedKey } = await getNaclSecretKey(params.ddocId);
+      return { secretKey, nonce, encryptedSecretKey, derivedKey };
     };
     jsonToFile = (json2, fileName) => {
       const blob = new Blob([JSON.stringify(json2)], {
@@ -2868,11 +2882,9 @@ var init_file_manager = __esm({
       }
       async submitAddFileTrx(file2) {
         logger.debug(`Preparing to add file ${file2.ddocId}`);
-        const { encryptedSecretKey, nonce, secretKey } = await generateLinkKeyMaterial({
-          ddocId: file2.ddocId,
-          linkKey: file2.linkKey,
-          linkKeyNonce: file2.linkKeyNonce
-        });
+        const encryptedSecretKey = file2.linkKey;
+        const nonce = toUint8Array2(file2.linkKeyNonce);
+        const secretKey = toUint8Array2(file2.secretKey);
         const yJSContent = markdownToYjs(file2.content);
         const { encryptedFile, key } = await createEncryptedContentFile(yJSContent);
         logger.debug(`Generated encrypted content file for file ${file2.ddocId}`);
@@ -2918,11 +2930,9 @@ var init_file_manager = __esm({
       }
       async submitUpdateFile(file2) {
         logger.debug(`Submitting update for file ${file2.ddocId} with onChainFileId ${file2.onChainFileId}`);
-        const { encryptedSecretKey, nonce, secretKey } = await generateLinkKeyMaterial({
-          ddocId: file2.ddocId,
-          linkKey: file2.linkKey,
-          linkKeyNonce: file2.linkKeyNonce
-        });
+        const encryptedSecretKey = file2.linkKey;
+        const nonce = toUint8Array2(file2.linkKeyNonce);
+        const secretKey = toUint8Array2(file2.secretKey);
         const yjsContent = markdownToYjs(file2.content);
         const { encryptedFile, key } = await createEncryptedContentFile(yjsContent);
         const commentKey = toUint8Array2(file2.commentKey);
@@ -2968,11 +2978,9 @@ var init_file_manager = __esm({
       }
       async updateFile(file2) {
         logger.debug(`Updating file ${file2.ddocId} with onChainFileId ${file2.onChainFileId}`);
-        const { encryptedSecretKey, nonce, secretKey } = await generateLinkKeyMaterial({
-          ddocId: file2.ddocId,
-          linkKey: file2.linkKey,
-          linkKeyNonce: file2.linkKeyNonce
-        });
+        const encryptedSecretKey = file2.linkKey;
+        const nonce = toUint8Array2(file2.linkKeyNonce);
+        const secretKey = toUint8Array2(file2.secretKey);
         logger.debug(`Generating encrypted content file for file ${file2.ddocId} with onChainFileId ${file2.onChainFileId}`);
         const yjsContent = markdownToYjs(file2.content);
         const { encryptedFile, key } = await createEncryptedContentFile(yjsContent);
@@ -3644,7 +3652,9 @@ CREATE TABLE IF NOT EXISTS files (
   commentKey TEXT,
   linkKey TEXT,
   linkKeyNonce TEXT,
-  link TEXT
+  link TEXT,
+  derivedKey TEXT,
+  secretKey TEXT
 );
 CREATE INDEX IF NOT EXISTS idx_files_createdAt ON files(createdAt);
 CREATE INDEX IF NOT EXISTS idx_files_syncStatus ON files(syncStatus);
@@ -3838,7 +3848,9 @@ init_esm_shims();
 init_esm_shims();
 init_models();
 init_constants2();
+init_file_utils();
 import { generate } from "short-uuid";
+import { fromUint8Array as fromUint8Array4 } from "js-base64";
 async function listFiles(params) {
   const { limit, skip, portalAddress } = params;
   const effectiveLimit = limit || DEFAULT_LIST_LIMIT;
@@ -3891,11 +3903,20 @@ var createFile = async (input) => {
     throw new Error("title, content, and portalAddress are required");
   }
   const ddocId = generate();
+  const { encryptedSecretKey, nonce, secretKey, derivedKey } = await generateLinkKeyMaterial({
+    ddocId,
+    linkKey: void 0,
+    linkKeyNonce: void 0
+  });
   const file2 = await FilesModel.create({
     title: input.title,
     content: input.content,
     ddocId,
-    portalAddress: input.portalAddress
+    portalAddress: input.portalAddress,
+    linkKey: encryptedSecretKey,
+    linkKeyNonce: fromUint8Array4(nonce),
+    derivedKey: fromUint8Array4(derivedKey),
+    secretKey: fromUint8Array4(secretKey)
   });
   await EventsModel.create({ type: "create", fileId: file2._id, portalAddress: file2.portalAddress });
   return file2;