@fileverse/api 0.0.14 → 0.0.16

package/dist/cloudflare.js

@@ -2282,62 +2282,20 @@ var init_file_encryption = __esm({
 });
 
 // src/sdk/file-utils.ts
-import { getArgon2idHash } from "@fileverse/crypto/argon";
 import { bytesToBase64, generateRandomBytes as generateRandomBytes2 } from "@fileverse/crypto/utils";
 import { derivePBKDF2Key, encryptAesCBC } from "@fileverse/crypto/kdf";
 import { secretBoxEncrypt } from "@fileverse/crypto/nacl";
-import hkdf from "futoin-hkdf";
 import tweetnacl from "tweetnacl";
 import { fromUint8Array, toUint8Array as toUint8Array2 } from "js-base64";
 import { toAESKey, aesEncrypt } from "@fileverse/crypto/webcrypto";
-import axios from "axios";
 import { encodeFunctionData, parseEventLogs } from "viem";
-var deriveKeyFromAg2Hash, 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_constants2();
-    deriveKeyFromAg2Hash = async (pass, salt) => {
-      const key = await getArgon2idHash(pass, salt);
-      return hkdf(Buffer.from(key), tweetnacl.secretbox.keyLength, {
-        info: Buffer.from("encryptionKey")
-      });
-    };
-    getExistingEncryptionMaterial = async (existingEncryptedSecretKey, existingNonce, docId) => {
-      const derivedKey = await deriveKeyFromAg2Hash(docId, toUint8Array2(existingNonce));
-      const secretKey = tweetnacl.secretbox.open(
-        toUint8Array2(existingEncryptedSecretKey),
-        toUint8Array2(existingNonce),
-        derivedKey
-      );
-      return {
-        encryptedSecretKey: existingEncryptedSecretKey,
-        nonce: toUint8Array2(existingNonce),
-        secretKey,
-        derivedKey: new Uint8Array(derivedKey)
-      };
-    };
-    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, derivedKey: new Uint8Array(derivedKey) };
-    };
-    generateLinkKeyMaterial = async (params) => {
-      if (params.linkKeyNonce && params.linkKey) {
-        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, derivedKey: derivedKey2 };
-      }
-      const { secretKey, nonce, encryptedSecretKey, derivedKey } = await getNaclSecretKey(params.ddocId);
-      return { secretKey, nonce, encryptedSecretKey, derivedKey };
-    };
     jsonToFile = (json2, fileName) => {
       const blob = new Blob([JSON.stringify(json2)], {
         type: "application/json"
@@ -2428,16 +2386,21 @@ var init_file_utils = __esm({
       body.append("ipfsType", ipfsType);
       body.append("appFileId", appFileId);
       body.append("sourceApp", "ddoc");
-      const uploadEndpoint = UPLOAD_SERVER_URL + "upload";
-      const response = await axios.post(uploadEndpoint, body, {
+      const response = await fetch(UPLOAD_SERVER_URL + "upload", {
+        method: "POST",
         headers: {
           Authorization: `Bearer ${token}`,
           contract: contractAddress,
           invoker,
-          chain: process.env.chainId
-        }
+          chain: NETWORK_NAME
+        },
+        body
       });
-      return response.data.ipfsHash;
+      if (!response.ok) {
+        throw new Error(`Upload failed: ${response.status} ${response.statusText}`);
+      }
+      const data = await response.json();
+      return data.ipfsHash;
     };
     getEditFileTrxCalldata = (args) => {
       return encodeFunctionData({
@@ -2534,7 +2497,6 @@ var init_file_utils = __esm({
 // src/sdk/file-manager.ts
 import { fromUint8Array as fromUint8Array2, toUint8Array as toUint8Array3 } from "js-base64";
 import { generateAESKey, exportAESKey } from "@fileverse/crypto/webcrypto";
-import { markdownToYjs } from "@fileverse/content-processor";
 var FileManager;
 var init_file_manager = __esm({
   "src/sdk/file-manager.ts"() {
@@ -2551,6 +2513,32 @@ var init_file_manager = __esm({
         this.keyStore = keyStore;
         this.agentClient = agentClient;
       }
+      async convertMarkdown(content) {
+        const g = globalThis;
+        const saved = {
+          window: g.window,
+          navigator: g.navigator,
+          document: g.document,
+          Node: g.Node,
+          HTMLElement: g.HTMLElement,
+          Text: g.Text,
+          DOMParser: g.DOMParser,
+          Element: g.Element,
+          DocumentFragment: g.DocumentFragment,
+          getComputedStyle: g.getComputedStyle,
+          MutationObserver: g.MutationObserver,
+          Range: g.Range
+        };
+        try {
+          const { markdownToYjs } = await import("@fileverse/content-processor");
+          return markdownToYjs(content);
+        } finally {
+          for (const [key, value] of Object.entries(saved)) {
+            if (value === void 0) delete g[key];
+            else g[key] = value;
+          }
+        }
+      }
       createLocks(key, encryptedSecretKey, commentKey) {
         const appLock = {
           lockedFileKey: this.keyStore.encryptData(toUint8Array3(key)),
@@ -2594,7 +2582,7 @@ var init_file_manager = __esm({
         const nonce = toUint8Array3(file2.linkKeyNonce);
         const secretKey = toUint8Array3(file2.secretKey);
         console.log("Got encrypted secret key, nonce, and secret key");
-        const yJSContent = markdownToYjs(file2.content);
+        const yJSContent = await this.convertMarkdown(file2.content);
         console.log("Generated yjs content");
         const { encryptedFile, key } = await createEncryptedContentFile(yJSContent);
         console.log("Generated encrypted content file");
@@ -2654,7 +2642,7 @@ var init_file_manager = __esm({
         const encryptedSecretKey = file2.linkKey;
         const nonce = toUint8Array3(file2.linkKeyNonce);
         const secretKey = toUint8Array3(file2.secretKey);
-        const yjsContent = markdownToYjs(file2.content);
+        const yjsContent = await this.convertMarkdown(file2.content);
         const { encryptedFile, key } = await createEncryptedContentFile(yjsContent);
         const commentKey = toUint8Array3(file2.commentKey);
         const { appLock, ownerLock } = this.createLocks(key, encryptedSecretKey, commentKey);
@@ -2703,7 +2691,7 @@ var init_file_manager = __esm({
         const nonce = toUint8Array3(file2.linkKeyNonce);
         const secretKey = toUint8Array3(file2.secretKey);
         logger.debug(`Generating encrypted content file for file ${file2.ddocId} with onChainFileId ${file2.onChainFileId}`);
-        const yjsContent = markdownToYjs(file2.content);
+        const yjsContent = await this.convertMarkdown(file2.content);
         const { encryptedFile, key } = await createEncryptedContentFile(yjsContent);
         const commentKey = toUint8Array3(file2.commentKey);
         const { appLock, ownerLock } = this.createLocks(key, encryptedSecretKey, commentKey);
@@ -2800,11 +2788,17 @@ var init_publish = __esm({
     init_config();
     init_pimlico_utils();
     createFileManager = async (portalSeed, portalAddress, ucanSecret, privateAccountKey) => {
+      console.log("Creating file manager");
       const keyPair = EdKeypair.fromSecretKey(fromUint8Array3(ucanSecret));
+      console.log("Created key pair");
       const authTokenProvider = new AuthTokenProvider(keyPair, portalAddress);
+      console.log("Created auth token provider");
       const keyStore = new KeyStore(toUint8Array4(portalSeed), portalAddress, authTokenProvider);
+      console.log("Created key store");
       const agentClient = new AgentClient(authTokenProvider);
+      console.log("Created agent client");
       await agentClient.initializeAgentClient(privateAccountKey);
+      console.log("Initialized agent client");
       return new FileManager(keyStore, agentClient);
     };
     executeOperation = async (fileManager, file2, operation) => {
@@ -3057,9 +3051,6 @@ var init_eventProcessor = __esm({
           const result = await handleNewFileOp(fileId);
           console.log("New file op submitted");
           await EventsModel.setEventPendingOp(event._id, result.userOpHash, {
-            linkKey: result.linkKey,
-            linkKeyNonce: result.linkKeyNonce,
-            commentKey: result.commentKey,
             metadata: result.metadata
           });
           logger.info(`File ${file2.ddocId} create op submitted (hash: ${result.userOpHash})`);
@@ -3837,9 +3828,56 @@ init_models();
 init_esm_shims();
 init_models();
 init_constants3();
-init_file_utils();
 import { generate } from "short-uuid";
-import { fromUint8Array as fromUint8Array4 } from "js-base64";
+import { fromUint8Array as fromUint8Array5 } from "js-base64";
+
+// src/sdk/link-key-utils.ts
+init_esm_shims();
+import { getArgon2idHash } from "@fileverse/crypto/argon";
+import hkdf from "futoin-hkdf";
+import tweetnacl2 from "tweetnacl";
+import { fromUint8Array as fromUint8Array4, toUint8Array as toUint8Array5 } from "js-base64";
+var deriveKeyFromAg2Hash = async (pass, salt) => {
+  const key = await getArgon2idHash(pass, salt);
+  return hkdf(Buffer.from(key), tweetnacl2.secretbox.keyLength, {
+    info: Buffer.from("encryptionKey")
+  });
+};
+var getExistingEncryptionMaterial = async (existingEncryptedSecretKey, existingNonce, docId) => {
+  const derivedKey = await deriveKeyFromAg2Hash(docId, toUint8Array5(existingNonce));
+  const secretKey = tweetnacl2.secretbox.open(
+    toUint8Array5(existingEncryptedSecretKey),
+    toUint8Array5(existingNonce),
+    derivedKey
+  );
+  return {
+    encryptedSecretKey: existingEncryptedSecretKey,
+    nonce: toUint8Array5(existingNonce),
+    secretKey,
+    derivedKey: new Uint8Array(derivedKey)
+  };
+};
+var getNaclSecretKey = async (ddocId) => {
+  const { secretKey } = tweetnacl2.box.keyPair();
+  const nonce = tweetnacl2.randomBytes(tweetnacl2.secretbox.nonceLength);
+  const derivedKey = await deriveKeyFromAg2Hash(ddocId, nonce);
+  const encryptedSecretKey = fromUint8Array4(tweetnacl2.secretbox(secretKey, nonce, derivedKey), true);
+  return { nonce, encryptedSecretKey, secretKey, derivedKey: new Uint8Array(derivedKey) };
+};
+var generateLinkKeyMaterial = async (params) => {
+  if (params.linkKeyNonce && params.linkKey) {
+    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, derivedKey: derivedKey2 };
+  }
+  const { secretKey, nonce, encryptedSecretKey, derivedKey } = await getNaclSecretKey(params.ddocId);
+  return { secretKey, nonce, encryptedSecretKey, derivedKey };
+};
+
+// src/domain/file/index.ts
 async function listFiles(params) {
   const { limit, skip, portalAddress } = params;
   const effectiveLimit = limit || DEFAULT_LIST_LIMIT;
@@ -3903,9 +3941,9 @@ var createFile = async (input) => {
     ddocId,
     portalAddress: input.portalAddress,
     linkKey: encryptedSecretKey,
-    linkKeyNonce: fromUint8Array4(nonce),
-    derivedKey: fromUint8Array4(derivedKey),
-    secretKey: fromUint8Array4(secretKey)
+    linkKeyNonce: fromUint8Array5(nonce),
+    derivedKey: fromUint8Array5(derivedKey),
+    secretKey: fromUint8Array5(secretKey)
   });
   await EventsModel.create({ type: "create", fileId: file2._id, portalAddress: file2.portalAddress });
   return file2;
@@ -4047,18 +4085,18 @@ init_esm_shims();
 // src/cli/fetch-api-key.ts
 init_esm_shims();
 init_constants();
-import axios2 from "axios";
-import { toUint8Array as toUint8Array5 } from "js-base64";
+import axios from "axios";
+import { toUint8Array as toUint8Array6 } from "js-base64";
 import { sha256 } from "viem";
 var fetchApiKeyData = async (apiKey) => {
   try {
-    const keyHash = sha256(toUint8Array5(apiKey));
+    const keyHash = sha256(toUint8Array6(apiKey));
     const fullUrl = BASE_CONFIG.API_URL + `api-access/${keyHash}`;
-    const response = await axios2.get(fullUrl);
+    const response = await axios.get(fullUrl);
     const { encryptedKeyMaterial, encryptedAppMaterial, id } = response.data;
     return { encryptedKeyMaterial, encryptedAppMaterial, id };
   } catch (error48) {
-    if (axios2.isAxiosError(error48)) {
+    if (axios.isAxiosError(error48)) {
       if (error48.response?.status === 401) {
         throw new Error("Invalid API key");
       }
@@ -4080,7 +4118,7 @@ init_saveApiKey();
 init_apikeys_model();
 init_infra();
 import { deriveHKDFKey as deriveHKDFKey2 } from "@fileverse/crypto/hkdf";
-import { toUint8Array as toUint8Array6 } from "js-base64";
+import { toUint8Array as toUint8Array7 } from "js-base64";
 import { stringToBytes as stringToBytes2 } from "viem";
 import { toAESKey as toAESKey2, aesDecrypt } from "@fileverse/crypto/webcrypto";
 var SAVED_DATA_ENCRYPTION_KEY_INFO = "SAVED_DATA_ENCRYPTION_KEY";
@@ -4105,7 +4143,7 @@ async function initializeWithData(data) {
 }
 var getAesKeyFromApiKey = async (apiKey) => {
   const rawSecret = deriveHKDFKey2(
-    toUint8Array6(apiKey),
+    toUint8Array7(apiKey),
     new Uint8Array([0]),
     stringToBytes2(SAVED_DATA_ENCRYPTION_KEY_INFO)
   );
@@ -4116,7 +4154,7 @@ var bytestToJSON = (bytes) => {
 };
 var decryptSavedData = async (apiKey, encryptedData) => {
   const aesKey = await getAesKeyFromApiKey(apiKey);
-  const decryptedBytes = await aesDecrypt(aesKey, toUint8Array6(encryptedData));
+  const decryptedBytes = await aesDecrypt(aesKey, toUint8Array7(encryptedData));
   const data = bytestToJSON(decryptedBytes);
   return data;
 };