@fileverse/api 0.0.10 → 0.0.12

package/dist/worker.js

@@ -649,7 +649,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) {
@@ -733,10 +735,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");
@@ -2406,50 +2418,13 @@ 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 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";
     init_esm_shims();
     init_file_encryption();
     init_constants3();
-    deriveKeyFromAg2Hash = async (pass, salt) => {
-      const key = await getArgon2idHash(pass, salt);
-      return hkdf(Buffer.from(key), tweetnacl.secretbox.keyLength, {
-        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);
-      return {
-        encryptedSecretKey: existingEncryptedSecretKey,
-        nonce: toUint8Array(existingNonce),
-        secretKey
-      };
-    };
-    getNaclSecretKey = async (ddocId) => {
-      const { secretKey } = tweetnacl.box.keyPair();
-      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 };
-    };
-    generateLinkKeyMaterial = async (params) => {
-      if (params.linkKeyNonce && params.linkKey) {
-        const { encryptedSecretKey: encryptedSecretKey2, nonce: nonce2, secretKey: secretKey2 } = await getExistingEncryptionMaterial(
-          params.linkKey,
-          params.linkKeyNonce,
-          params.ddocId
-        );
-        if (secretKey2) return { encryptedSecretKey: encryptedSecretKey2, nonce: nonce2, secretKey: secretKey2 };
-      }
-      const { secretKey, nonce, encryptedSecretKey } = await getNaclSecretKey(params.ddocId);
-      return { secretKey, nonce, encryptedSecretKey };
-    };
     jsonToFile = (json, fileName) => {
       const blob = new Blob([JSON.stringify(json)], {
         type: "application/json"
@@ -2701,11 +2676,9 @@ var init_file_manager = __esm({
       }
       async submitAddFileTrx(file) {
         logger.debug(`Preparing to add file ${file.ddocId}`);
-        const { encryptedSecretKey, nonce, secretKey } = await generateLinkKeyMaterial({
-          ddocId: file.ddocId,
-          linkKey: file.linkKey,
-          linkKeyNonce: file.linkKeyNonce
-        });
+        const encryptedSecretKey = file.linkKey;
+        const nonce = toUint8Array2(file.linkKeyNonce);
+        const secretKey = toUint8Array2(file.secretKey);
         const yJSContent = markdownToYjs(file.content);
         const { encryptedFile, key } = await createEncryptedContentFile(yJSContent);
         logger.debug(`Generated encrypted content file for file ${file.ddocId}`);
@@ -2751,11 +2724,9 @@ var init_file_manager = __esm({
       }
       async submitUpdateFile(file) {
         logger.debug(`Submitting update for file ${file.ddocId} with onChainFileId ${file.onChainFileId}`);
-        const { encryptedSecretKey, nonce, secretKey } = await generateLinkKeyMaterial({
-          ddocId: file.ddocId,
-          linkKey: file.linkKey,
-          linkKeyNonce: file.linkKeyNonce
-        });
+        const encryptedSecretKey = file.linkKey;
+        const nonce = toUint8Array2(file.linkKeyNonce);
+        const secretKey = toUint8Array2(file.secretKey);
         const yjsContent = markdownToYjs(file.content);
         const { encryptedFile, key } = await createEncryptedContentFile(yjsContent);
         const commentKey = toUint8Array2(file.commentKey);
@@ -2801,11 +2772,9 @@ var init_file_manager = __esm({
       }
       async updateFile(file) {
         logger.debug(`Updating file ${file.ddocId} with onChainFileId ${file.onChainFileId}`);
-        const { encryptedSecretKey, nonce, secretKey } = await generateLinkKeyMaterial({
-          ddocId: file.ddocId,
-          linkKey: file.linkKey,
-          linkKeyNonce: file.linkKeyNonce
-        });
+        const encryptedSecretKey = file.linkKey;
+        const nonce = toUint8Array2(file.linkKeyNonce);
+        const secretKey = toUint8Array2(file.secretKey);
         logger.debug(`Generating encrypted content file for file ${file.ddocId} with onChainFileId ${file.onChainFileId}`);
         const yjsContent = markdownToYjs(file.content);
         const { encryptedFile, key } = await createEncryptedContentFile(yjsContent);
@@ -3464,7 +3433,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);