bedrock-ts-sdk 0.0.6 → 0.0.8

package/README.md

@@ -109,7 +109,7 @@ const signature = await wallet.signMessage({ message: 'Bedrock.im' });
 const client = await BedrockClient.fromSignature(
   signature,
   window.ethereum,
-  { apiServer: 'https://api2.aleph.im' }
+  { apiServer: 'https://poc-aleph-ccn.reza.dev' }
 );
 ```
 
@@ -427,13 +427,13 @@ Bedrock uses a dual encryption approach:
 ```typescript
 const client = await BedrockClient.fromPrivateKey(privateKey, {
   channel: 'MY_CUSTOM_CHANNEL',        // Default: 'bedrock'
-  apiServer: 'https://api2.aleph.im',  // Default: 'https://api2.aleph.im'
+  apiServer: 'https://poc-aleph-ccn.reza.dev',  // Default: 'https://poc-aleph-ccn.reza.dev'
 });
 ```
 
 **Configuration Options:**
 - `channel`: Aleph channel for data isolation (default: `'bedrock'`)
-- `apiServer`: Aleph API server URL (default: `'https://api2.aleph.im'`)
+- `apiServer`: Aleph API server URL (default: `'https://poc-aleph-ccn.reza.dev'`)
 
 ## Development
 

package/dist/index.d.mts

@@ -80,7 +80,9 @@ declare class BedrockCore {
      * @param provider - EIP-1193 provider (for MetaMask/Rabby)
      * @param config - Optional configuration
      */
-    static fromSignature(signatureHash: string, provider: any, config?: BedrockCoreConfig): Promise<BedrockCore>;
+    static fromSignature(signatureHash: string, provider: any, config?: BedrockCoreConfig & {
+        providerSignature?: string;
+    }): Promise<BedrockCore>;
     /**
      * Create BedrockCore from a private key (for testing/CLI)
      * @param privateKey - Ethereum private key (hex string with or without 0x prefix)
@@ -672,6 +674,7 @@ declare class FileService {
      * @param files - Array of files to upload
      * @param directoryPath - Optional directory path prefix
      * @returns Array of uploaded file info
+     * @throws FileConflictError if any file path conflicts with non-trashed file
      */
     uploadFiles(files: FileInput[], directoryPath?: string): Promise<FileFullInfo[]>;
     editFileContent(fileInfo: FileFullInfo, newContent: Buffer): Promise<FileFullInfo>;
@@ -711,6 +714,7 @@ declare class FileService {
     /**
      * Restore soft-deleted files
      * @param filePaths - Paths of files to restore
+     * @throws FileConflictError if any file path conflicts with non-trashed file
      */
     restoreFiles(filePaths: string[]): Promise<void>;
     /**
@@ -721,6 +725,7 @@ declare class FileService {
     /**
      * Move/rename files
      * @param moves - Array of {oldPath, newPath} objects
+     * @throws FileConflictError if any newPath conflicts with non-trashed file
      */
     moveFiles(moves: Array<{
         oldPath: string;
@@ -763,6 +768,12 @@ declare class FileService {
      * @returns File content as ArrayBuffer
      */
     static downloadPublicFile(storeHash: string): Promise<ArrayBuffer>;
+    /**
+     * Check for path conflicts with non-trashed files
+     * @param paths - Paths to check
+     * @throws FileConflictError on first conflict
+     */
+    private checkPathConflicts;
     private saveFileEntries;
     private encryptFileMeta;
     private decryptFileMeta;

package/dist/index.d.ts

@@ -80,7 +80,9 @@ declare class BedrockCore {
      * @param provider - EIP-1193 provider (for MetaMask/Rabby)
      * @param config - Optional configuration
      */
-    static fromSignature(signatureHash: string, provider: any, config?: BedrockCoreConfig): Promise<BedrockCore>;
+    static fromSignature(signatureHash: string, provider: any, config?: BedrockCoreConfig & {
+        providerSignature?: string;
+    }): Promise<BedrockCore>;
     /**
      * Create BedrockCore from a private key (for testing/CLI)
      * @param privateKey - Ethereum private key (hex string with or without 0x prefix)
@@ -672,6 +674,7 @@ declare class FileService {
      * @param files - Array of files to upload
      * @param directoryPath - Optional directory path prefix
      * @returns Array of uploaded file info
+     * @throws FileConflictError if any file path conflicts with non-trashed file
      */
     uploadFiles(files: FileInput[], directoryPath?: string): Promise<FileFullInfo[]>;
     editFileContent(fileInfo: FileFullInfo, newContent: Buffer): Promise<FileFullInfo>;
@@ -711,6 +714,7 @@ declare class FileService {
     /**
      * Restore soft-deleted files
      * @param filePaths - Paths of files to restore
+     * @throws FileConflictError if any file path conflicts with non-trashed file
      */
     restoreFiles(filePaths: string[]): Promise<void>;
     /**
@@ -721,6 +725,7 @@ declare class FileService {
     /**
      * Move/rename files
      * @param moves - Array of {oldPath, newPath} objects
+     * @throws FileConflictError if any newPath conflicts with non-trashed file
      */
     moveFiles(moves: Array<{
         oldPath: string;
@@ -763,6 +768,12 @@ declare class FileService {
      * @returns File content as ArrayBuffer
      */
     static downloadPublicFile(storeHash: string): Promise<ArrayBuffer>;
+    /**
+     * Check for path conflicts with non-trashed files
+     * @param paths - Paths to check
+     * @throws FileConflictError on first conflict
+     */
+    private checkPathConflicts;
     private saveFileEntries;
     private encryptFileMeta;
     private decryptFileMeta;

package/dist/index.js

@@ -121,6 +121,14 @@ var FileNotFoundError = class _FileNotFoundError extends FileError {
     Object.setPrototypeOf(this, _FileNotFoundError.prototype);
   }
 };
+var FileConflictError = class _FileConflictError extends FileError {
+  constructor(path) {
+    super(`File path conflict: ${path} already exists`);
+    this.name = "FileConflictError";
+    this.code = "FILE_CONFLICT";
+    Object.setPrototypeOf(this, _FileConflictError.prototype);
+  }
+};
 var ContactError = class _ContactError extends BedrockError {
   constructor(message) {
     super(message, "CONTACT_ERROR");
@@ -286,7 +294,7 @@ var import_client = require("@aleph-sdk/client");
 var import_message = require("@aleph-sdk/message");
 var import_zod2 = require("zod");
 var AlephService = class {
-  constructor(account, channel = ALEPH_GENERAL_CHANNEL, apiServer = "https://api2.aleph.im") {
+  constructor(account, channel = ALEPH_GENERAL_CHANNEL, apiServer = "https://poc-aleph-ccn.reza.dev") {
     this.account = account;
     this.channel = channel;
     this.subAccountClient = new import_client.AuthenticatedAlephHttpClient(account, apiServer);
@@ -480,7 +488,7 @@ var BedrockCore = class _BedrockCore {
     try {
       const cfg = {
         channel: config?.channel || ALEPH_GENERAL_CHANNEL,
-        apiServer: config?.apiServer || "https://api2.aleph.im"
+        apiServer: config?.apiServer || "https://poc-aleph-ccn.reza.dev"
       };
       const privateKey = import_web3.default.utils.sha3(signatureHash);
       if (!privateKey) {
@@ -494,8 +502,14 @@ var BedrockCore = class _BedrockCore {
         } else {
           throw new AuthenticationError("window.ethereum not available");
         }
+      } else if (config?.providerSignature === void 0) {
+        throw new AuthenticationError("Invalid provider");
       } else {
-        mainAccount = await (0, import_ethereum.getAccountFromProvider)(provider);
+        const externalWalletPrivateKey = import_web3.default.utils.sha3(config.providerSignature);
+        if (externalWalletPrivateKey === void 0) {
+          throw new AuthenticationError("Failed to derive private key from signature");
+        }
+        mainAccount = (0, import_ethereum.importAccountFromPrivateKey)(externalWalletPrivateKey);
       }
       const subAccount = (0, import_ethereum.importAccountFromPrivateKey)(privateKey);
       await _BedrockCore.setupSecurityPermissions(mainAccount, subAccount, cfg);
@@ -514,7 +528,7 @@ var BedrockCore = class _BedrockCore {
     try {
       const cfg = {
         channel: config?.channel || ALEPH_GENERAL_CHANNEL,
-        apiServer: config?.apiServer || "https://api2.aleph.im"
+        apiServer: config?.apiServer || "https://poc-aleph-ccn.reza.dev"
       };
       const key = privateKey.startsWith("0x") ? privateKey : `0x${privateKey}`;
       const mainAccount = (0, import_ethereum.importAccountFromPrivateKey)(key);
@@ -938,21 +952,16 @@ var FileService = class {
    * @param files - Array of files to upload
    * @param directoryPath - Optional directory path prefix
    * @returns Array of uploaded file info
+   * @throws FileConflictError if any file path conflicts with non-trashed file
    */
   async uploadFiles(files, directoryPath = "") {
     const aleph = this.core.getAlephService();
     const publicKey = this.core.getPublicKey();
     const uploadedFiles = [];
-    const existingFiles = await this.listFiles();
-    const filesToUpload = files.filter((file) => {
-      const filterIn = !existingFiles.some(
-        (existingFile) => !existingFile.deleted_at && existingFile.path === (directoryPath ? `${directoryPath}${file.path}` : file.path)
-      );
-      console.log(`Keeping ${file} in ? ${filterIn ? "yes" : "no"}`);
-      return filterIn;
-    });
+    const fullPaths = files.map((f) => directoryPath ? `${directoryPath}${f.path}` : f.path);
+    await this.checkPathConflicts(fullPaths);
     try {
-      for (const file of filesToUpload) {
+      for (const file of files) {
         const key = EncryptionService.generateKey();
         const iv = EncryptionService.generateIv();
         let fileBuffer;
@@ -1152,9 +1161,11 @@ var FileService = class {
   /**
    * Restore soft-deleted files
    * @param filePaths - Paths of files to restore
+   * @throws FileConflictError if any file path conflicts with non-trashed file
    */
   async restoreFiles(filePaths) {
     const aleph = this.core.getAlephService();
+    await this.checkPathConflicts(filePaths);
     try {
       for (const path of filePaths) {
         const file = await this.getFile(path);
@@ -1199,10 +1210,18 @@ var FileService = class {
   /**
    * Move/rename files
    * @param moves - Array of {oldPath, newPath} objects
+   * @throws FileConflictError if any newPath conflicts with non-trashed file
    */
   async moveFiles(moves) {
     const aleph = this.core.getAlephService();
     const publicKey = this.core.getPublicKey();
+    const existingFiles = await this.listFiles(false);
+    const existingPaths = new Set(existingFiles.map((f) => f.path));
+    for (const { oldPath, newPath } of moves) {
+      if (existingPaths.has(newPath) && newPath !== oldPath) {
+        throw new FileConflictError(newPath);
+      }
+    }
     try {
       for (const { oldPath, newPath } of moves) {
         const file = await this.getFile(oldPath);
@@ -1352,7 +1371,7 @@ var FileService = class {
    */
   static async fetchPublicFileMeta(postHash) {
     try {
-      const client = new import_client3.AlephHttpClient("https://api2.aleph.im");
+      const client = new import_client3.AlephHttpClient("https://poc-aleph-ccn.reza.dev");
       const post = await client.getPost({
         channels: [ALEPH_GENERAL_CHANNEL],
         types: [POST_TYPES.PUBLIC_FILE],
@@ -1370,7 +1389,7 @@ var FileService = class {
    */
   static async downloadPublicFile(storeHash) {
     try {
-      const client = new import_client3.AlephHttpClient("https://api2.aleph.im");
+      const client = new import_client3.AlephHttpClient("https://poc-aleph-ccn.reza.dev");
       return await client.downloadFile(storeHash);
     } catch (error) {
       throw new FileError(`Failed to download public file: ${error.message}`);
@@ -1379,6 +1398,20 @@ var FileService = class {
   // ============================================================================
   // Private helper methods
   // ============================================================================
+  /**
+   * Check for path conflicts with non-trashed files
+   * @param paths - Paths to check
+   * @throws FileConflictError on first conflict
+   */
+  async checkPathConflicts(paths) {
+    const existingFiles = await this.listFiles(false);
+    const existingPaths = new Set(existingFiles.map((f) => f.path));
+    for (const path of paths) {
+      if (existingPaths.has(path)) {
+        throw new FileConflictError(path);
+      }
+    }
+  }
   async saveFileEntries(files) {
     const aleph = this.core.getAlephService();
     const publicKey = this.core.getPublicKey();