bedrock-ts-sdk 0.0.7 → 0.0.9

package/dist/index.d.mts

@@ -674,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>;
@@ -713,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>;
     /**
@@ -723,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;
@@ -765,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

@@ -674,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>;
@@ -713,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>;
     /**
@@ -723,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;
@@ -765,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");
@@ -670,6 +678,7 @@ var BedrockCore = class _BedrockCore {
 
 // src/services/file-service.ts
 var import_client3 = require("@aleph-sdk/client");
+var import_zod3 = require("zod");
 
 // src/crypto/encryption.ts
 var import_eciesjs2 = require("eciesjs");
@@ -944,21 +953,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;
@@ -1158,9 +1162,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);
@@ -1205,10 +1211,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);
@@ -1359,12 +1373,13 @@ var FileService = class {
   static async fetchPublicFileMeta(postHash) {
     try {
       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],
-        hashes: [postHash]
-      });
-      return PublicFileMetaSchema.parse(post.content);
+      const message = await client.getMessage(postHash);
+      try {
+        return PublicFileMetaSchema.parse(message.content);
+      } catch {
+        const postContent = message.content;
+        return PublicFileMetaSchema.parse(postContent.content);
+      }
     } catch {
       return null;
     }
@@ -1377,7 +1392,16 @@ var FileService = class {
   static async downloadPublicFile(storeHash) {
     try {
       const client = new import_client3.AlephHttpClient("https://poc-aleph-ccn.reza.dev");
-      return await client.downloadFile(storeHash);
+      const storeMessage = await client.getMessage(storeHash);
+      const ContentSchema = import_zod3.z.object({
+        address: import_zod3.z.string(),
+        item_type: import_zod3.z.string(),
+        item_hash: import_zod3.z.string(),
+        time: import_zod3.z.number()
+      });
+      const { success, data } = ContentSchema.safeParse(storeMessage.content);
+      if (!success) throw new Error("Invalid STORE message structure");
+      return await client.downloadFile(data.item_hash);
     } catch (error) {
       throw new FileError(`Failed to download public file: ${error.message}`);
     }
@@ -1385,6 +1409,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();