@tblabs/storage 5.14.0 → 5.15.0

package/Datasets/DatasetBase.d.ts

@@ -8,13 +8,13 @@ export declare abstract class DatasetBase {
     protected dataset: dir;
     abstract Type: DatasetType;
     abstract GetAllIds(): Promise<string[]>;
-    abstract Drop(): Promise<void>;
     abstract Delete(id: string): Promise<void>;
     constructor(_db: OnlineStorage, dataset: dir);
     get Name(): string;
     get Database(): OnlineStorage;
-    protected get DatasetPath(): string;
+    get DatasetPath(): string;
     GetMetadata(): Promise<DatasetMetadata>;
     CanUserDo(action: keyof IStorageUserPrivileges): boolean;
     protected Log(message: string): void;
+    Drop(): Promise<void>;
 }

package/Datasets/DatasetBase.js

@@ -1,4 +1,5 @@
 import { GetMetadataQuery } from "../Messages/GetMetadataQuery";
+import { DropDatasetCommand } from "../Messages/DropDatasetCommand";
 export class DatasetBase {
     _db;
     dataset;
@@ -26,10 +27,10 @@ export class DatasetBase {
         if (!this._db.User.Privileges) {
             return false;
         }
-        if (typeof this._db.User.Privileges[action] === "object" && this._db.User.Privileges[action]) {
+        if (this._db.User.Privileges?.[action] && typeof this._db.User.Privileges[action] === "object") {
             return (this._db.User.Privileges[action].Datasets == "all" || this._db.User.Privileges[action].Datasets?.includes(this.dataset)) ?? false;
         }
-        if (typeof this._db.User.Privileges[action] === "boolean" && this._db.User.Privileges[action]) {
+        if (this._db.User.Privileges?.[action] && typeof this._db.User.Privileges[action] === "boolean") {
             return this._db.User.Privileges[action];
         }
         return false;
@@ -37,4 +38,12 @@ export class DatasetBase {
     Log(message) {
         this._db.Log(message);
     }
+    async Drop() {
+        this.Log(`Dropping "${this.DatasetPath}"...`);
+        const result = await this._db.Send(new DropDatasetCommand(this._db.DatabaseDir, this.dataset));
+        if (!result.IsSuccess) {
+            throw new Error("Failed to drop dataset: " + result.ErrorMessage);
+        }
+        this.Log(`"${this.DatasetPath}" dropped successfully.`);
+    }
 }

package/Datasets/File/FileDataset.d.ts

@@ -0,0 +1,16 @@
+import { OnlineStorage } from "../../Services/OnlineStorage";
+import { dir } from "../../Types/dir";
+import { DatasetBase } from "../DatasetBase";
+import { DatasetType } from "../../Services/DatasetType";
+import { FilePack } from "./FilePack";
+export declare class FileDataset extends DatasetBase {
+    protected _db: OnlineStorage;
+    protected dataset: dir;
+    Type: DatasetType;
+    constructor(_db: OnlineStorage, dataset: dir);
+    GetAllIds(): Promise<string[]>;
+    GetOne(fileId: string): Promise<FilePack>;
+    GetAll(): Promise<FilePack[]>;
+    Add(files: File[]): Promise<FilePack[]>;
+    Delete(fileId: string): Promise<void>;
+}

package/Datasets/File/FileDataset.js

@@ -0,0 +1,80 @@
+import { DatasetBase } from "../DatasetBase";
+import { DatasetType } from "../../Services/DatasetType";
+import { ListFilesQuery } from "../../Messages/ListFilesQuery";
+import { ListFilesIdsQuery } from "../../Messages/ListFilesIdsQuery";
+import { GetFileQuery } from "../../Messages/GetFileQuery";
+import { DeleteFileCommand } from "../../Messages/DeleteFileCommand";
+export class FileDataset extends DatasetBase {
+    _db;
+    dataset;
+    Type = DatasetType.File;
+    constructor(_db, dataset) {
+        super(_db, dataset);
+        this._db = _db;
+        this.dataset = dataset;
+    }
+    async GetAllIds() {
+        const result = await this._db.Send(new ListFilesIdsQuery(this._db.DatabaseDir, this.dataset));
+        if (!result.IsSuccess) {
+            throw new Error("Failed to list files ids: " + result.ErrorMessage);
+        }
+        return result.Result;
+    }
+    async GetOne(fileId) {
+        const result = await this._db.Send(new GetFileQuery(this._db.Server, this._db.DatabaseDir, this.dataset, fileId));
+        if (!result.IsSuccess) {
+            throw new Error("Failed to get picture: " + result.ErrorMessage);
+        }
+        return result.Result;
+    }
+    async GetAll() {
+        const result = await this._db.Send(new ListFilesQuery(this._db.Server, this._db.DatabaseDir, this.dataset));
+        if (!result.IsSuccess) {
+            throw new Error("Failed to list file packs: " + result.ErrorMessage);
+        }
+        return result.Result;
+    }
+    async Add(files) {
+        try {
+            if (!files) {
+                throw new Error("No files provided");
+            }
+            const formData = new FormData();
+            for (let i = 0; i < files.length; i++) {
+                formData.append('files[]', files[i]); // Tak, te [] w nazwie zmiennej są konieczne! bez tego php (mimo że odbiera przez $_FILES["files"]) nie jest w stanie odebrać wielu plików xd
+            }
+            formData.append('server', this._db.Server);
+            formData.append('database', this._db.DatabaseDir);
+            formData.append('dataset', this.dataset);
+            formData.append('userId', this._db.User.Id);
+            let serverUrl = this._db.Server;
+            if (serverUrl.endsWith("/")) // Because for local env we use ".../src/" but for prod ".../v5"
+             {
+                serverUrl = serverUrl.slice(0, -1);
+            }
+            const response = await fetch(serverUrl + "/files-upload", {
+                method: 'POST',
+                body: formData,
+            });
+            if (!response.ok) {
+                throw new Error(`Request failed with status ${response.status}`);
+            }
+            // const t = await response.text();
+            // console.log(t);
+            const result = await response.json();
+            if (!result.IsSuccess) {
+                throw new Error("Failed to upload files: " + result.ErrorMessage);
+            }
+            return result.Result ?? [];
+        }
+        catch (ex) {
+            throw new Error(`Can not upload file: ${ex.message}`);
+        }
+    }
+    async Delete(fileId) {
+        const result = await this._db.Send(new DeleteFileCommand(this._db.DatabaseDir, this.dataset, fileId));
+        if (!result.IsSuccess) {
+            throw new Error("Failed to delete file: " + result.ErrorMessage);
+        }
+    }
+}

package/Datasets/File/FilePack.d.ts

@@ -0,0 +1,7 @@
+export interface FilePack {
+    Id: string;
+    Name: string;
+    OryginalName: number;
+    Extension: string;
+    Url: string;
+}

package/Datasets/File/FilePack.js

@@ -0,0 +1 @@
+export {};

package/Datasets/Object/ObjectDataset.d.ts

@@ -16,5 +16,4 @@ export declare class ObjectDataset<T extends object> extends DatasetBase impleme
     Add(id: string, item: T): Promise<void>;
     Update(id: string, item: T): Promise<void>;
     Delete(id: string): Promise<void>;
-    Drop(): Promise<void>;
 }

package/Datasets/Object/ObjectDataset.js

@@ -1,13 +1,12 @@
-import { AddFileCommand } from "../../Messages/AddFileCommand";
-import { DeleteFileCommand } from "../../Messages/DeleteFileCommand";
-import { DropDatasetCommand } from "../../Messages/DropDatasetCommand";
-import { ListFilesQuery } from "../../Messages/ListFilesQuery";
-import { GetFileQuery } from "../../Messages/GetFileQuery";
-import { UpdateFileCommand } from "../../Messages/UpdateFileCommand";
-import { ListFilesIdsQuery } from "../../Messages/ListFilesIdsQuery";
+import { AddObjectCommand } from "../../Messages/AddObjectCommand";
+import { ListObjectsQuery } from "../../Messages/ListObjectsQuery";
+import { UpdateObjectCommand } from "../../Messages/UpdateObjectCommand";
+import { ListObjectsIdsQuery } from '../../Messages/ListObjectsIdsQuery';
 import { DatasetBase } from "../DatasetBase";
 import { DatasetType } from "../../Services/DatasetType";
 import { DummyConverter } from "../../Converters/DummyConverter";
+import { GetObjectQuery } from "../../Messages/GetObjectQuery";
+import { DeleteObjectCommand } from "../../Messages/DeleteObjectCommand";
 export class ObjectDataset extends DatasetBase {
     _db;
     dataset;
@@ -21,9 +20,9 @@ export class ObjectDataset extends DatasetBase {
     }
     async GetOne(id) {
         this.Log(`Fetching "${id}"...`);
-        const queryResult = await this._db.Send(new GetFileQuery(this._db.DatabaseDir, this.dataset, id));
+        const queryResult = await this._db.Send(new GetObjectQuery(this._db.DatabaseDir, this.dataset, id));
         if (!queryResult.IsSuccess) {
-            throw new Error("Failed to get one item: " + queryResult.ErrorMessage);
+            throw new Error("Failed to get one object: " + queryResult.ErrorMessage);
         }
         const rawItem = queryResult.Result;
         const item = this._converter.FromRaw(rawItem);
@@ -32,7 +31,7 @@ export class ObjectDataset extends DatasetBase {
     }
     async GetAll() {
         this.Log(`Fetching all from "${this.DatasetPath}"...`);
-        const queryResult = await this._db.Send(new ListFilesQuery(this._db.DatabaseDir, this.dataset));
+        const queryResult = await this._db.Send(new ListObjectsQuery(this._db.DatabaseDir, this.dataset));
         if (!queryResult.IsSuccess) {
             throw new Error("Failed to fetch all items: " + queryResult.ErrorMessage);
         }
@@ -42,19 +41,19 @@ export class ObjectDataset extends DatasetBase {
         return items;
     }
     async GetAllIds() {
-        this.Log(`Fetching all files IDs from "${this.DatasetPath}"...`);
-        const queryResult = await this._db.Send(new ListFilesIdsQuery(this._db.DatabaseDir, this.dataset));
+        this.Log(`Fetching all objects IDs from "${this.DatasetPath}"...`);
+        const queryResult = await this._db.Send(new ListObjectsIdsQuery(this._db.DatabaseDir, this.dataset));
         if (!queryResult.IsSuccess) {
-            throw new Error("Failed to fetch all items ids: " + queryResult.ErrorMessage);
+            throw new Error("Failed to fetch all objects ids: " + queryResult.ErrorMessage);
         }
         const ids = queryResult.Result;
-        this.Log(`Found ${ids.length} files in "${this.DatasetPath}".`);
+        this.Log(`Found ${ids.length} objects in "${this.DatasetPath}".`);
         return ids;
     }
     async Add(id, item) {
         this.Log(`Adding "${id}" to "${this.DatasetPath}"...`);
         const rawItem = this._converter.ToRaw(item);
-        const result = await this._db.Send(new AddFileCommand(this._db.DatabaseDir, this.dataset, id, rawItem));
+        const result = await this._db.Send(new AddObjectCommand(this._db.DatabaseDir, this.dataset, id, rawItem));
         if (!result.IsSuccess) {
             throw new Error("Failed to add item: " + result.ErrorMessage);
         }
@@ -64,7 +63,7 @@ export class ObjectDataset extends DatasetBase {
     async Update(id, item) {
         this.Log(`Updating "${id}"...`);
         const rawItem = this._converter.ToRaw(item);
-        const result = await this._db.Send(new UpdateFileCommand(this._db.DatabaseDir, this.dataset, id, rawItem));
+        const result = await this._db.Send(new UpdateObjectCommand(this._db.DatabaseDir, this.dataset, id, rawItem));
         if (!result.IsSuccess) {
             throw new Error("Failed to update item: " + result.ErrorMessage);
         }
@@ -73,18 +72,10 @@ export class ObjectDataset extends DatasetBase {
     ;
     async Delete(id) {
         this.Log(`Deleting "${id}" from "${this.DatasetPath}"...`);
-        const result = await this._db.Send(new DeleteFileCommand(this._db.DatabaseDir, this.dataset, id));
+        const result = await this._db.Send(new DeleteObjectCommand(this._db.DatabaseDir, this.dataset, id));
         if (!result.IsSuccess) {
-            throw new Error("Failed to delete item: " + result.ErrorMessage);
+            throw new Error("Failed to delete object: " + result.ErrorMessage);
         }
         this.Log(`Deleted "${id}" from "${this.DatasetPath}".`);
     }
-    async Drop() {
-        this.Log(`Dropping "${this.DatasetPath}"...`);
-        const result = await this._db.Send(new DropDatasetCommand(this._db.DatabaseDir, this.dataset));
-        if (!result.IsSuccess) {
-            throw new Error("Failed to drop dataset: " + result.ErrorMessage);
-        }
-        this.Log(`"${this.DatasetPath}" dropped.`);
-    }
 }

package/Datasets/Picture/PicturePack.d.ts

@@ -3,5 +3,5 @@ export interface PicturePack {
     Name: string;
     Sizes: string[];
     Extension: string;
-    Files: string[];
+    Files: Record<string, string>;
 }

package/Datasets/Picture/PicturesDataset.d.ts

@@ -1,7 +1,6 @@
 import { OnlineStorage } from "../../Services/OnlineStorage";
 import { dir } from "../../Types/dir";
 import { DatasetBase } from "../DatasetBase";
-import { PicturesUploadResult } from "./PicturesUploadResult";
 import { PicsConfig } from "./PicsConfig";
 import { PicturePack } from "./PicturePack";
 import { DatasetType } from "../../Services/DatasetType";
@@ -16,7 +15,6 @@ export declare class PicturesDataset extends DatasetBase {
     GetAllIds(): Promise<string[]>;
     GetOne(pictureDir: string): Promise<PicturePack>;
     GetAll(): Promise<PicturePack[]>;
-    Add(files: File[]): Promise<PicturesUploadResult>;
+    Add(files: File[]): Promise<PicturePack[]>;
     Delete(pictureDir: string): Promise<void>;
-    Drop(): Promise<void>;
 }

package/Datasets/Picture/PicturesDataset.js

@@ -2,11 +2,9 @@ import { DeletePictureCommand } from "../../Messages/DeletePictureCommand";
 import { ListPicturesQuery } from "../../Messages/ListPicturesQuery";
 import { DatasetBase } from "../DatasetBase";
 import { DefaultPicsConfig } from "./DefaultPicsConfig";
-import { PicturesUploadResult } from "./PicturesUploadResult";
 import { DatasetType } from "../../Services/DatasetType";
 import { ListPicturesIdsQuery } from "../../Messages/ListPicturesIdsQuery";
 import { GetPictureQuery } from "../../Messages/GetPictureQuery";
-import { DropPicturesCommand } from "../../Messages/DropPicturesCommand";
 export class PicturesDataset extends DatasetBase {
     _db;
     dataset;
@@ -39,7 +37,7 @@ export class PicturesDataset extends DatasetBase {
         return result.Result;
     }
     async GetAll() {
-        const result = await this._db.Send(new ListPicturesQuery(this._db.DatabaseDir, this.dataset));
+        const result = await this._db.Send(new ListPicturesQuery(this._db.Server, this._db.DatabaseDir, this.dataset));
         if (!result.IsSuccess) {
             throw new Error("Failed to list picture packs: " + result.ErrorMessage);
         }
@@ -48,7 +46,7 @@ export class PicturesDataset extends DatasetBase {
     async Add(files) {
         try {
             if (!files) {
-                return PicturesUploadResult.Failure("No files provided");
+                throw new Error("No files provided");
             }
             const formData = new FormData();
             for (let i = 0; i < files.length; i++) {
@@ -69,13 +67,16 @@ export class PicturesDataset extends DatasetBase {
                 body: formData,
             });
             if (!response.ok) {
-                return PicturesUploadResult.Failure(`Request failed with status ${response.status}`);
+                throw new Error(`Request failed with status ${response.status}`);
             }
-            const picturePacks = await response.json();
-            return PicturesUploadResult.Success(picturePacks);
+            const result = await response.json();
+            if (!result.IsSuccess) {
+                throw new Error("Failed to upload pictures: " + result.ErrorMessage);
+            }
+            return result.Result ?? [];
         }
         catch (ex) {
-            return PicturesUploadResult.Failure(`Can not upload: ${ex.message}`);
+            throw new Error(`Can not upload: ${ex.message}`);
         }
     }
     async Delete(pictureDir) {
@@ -84,10 +85,4 @@ export class PicturesDataset extends DatasetBase {
             throw new Error("Failed to delete picture: " + result.ErrorMessage);
         }
     }
-    async Drop() {
-        const result = await this._db.Send(new DropPicturesCommand(this._db.DatabaseDir, this.dataset));
-        if (!result.IsSuccess) {
-            throw new Error("Failed to drop pictures: " + result.ErrorMessage);
-        }
-    }
 }

package/Datasets/Text/ITextRepo.d.ts

@@ -5,6 +5,8 @@ export interface ITextRepo extends IRepoBase {
     GetAllIds(): Promise<string[]>;
     AppendText(id: string, text: string): Promise<void>;
     AppendLine(id: string, line: string): Promise<void>;
+    Clear(id: string): Promise<void>;
+    ReplaceText(id: string, text: string): Promise<void>;
     Delete(id: string): Promise<void>;
     Drop(): Promise<void>;
 }

package/Datasets/Text/RawTextDataset.d.ts

@@ -16,5 +16,4 @@ export declare class RawTextDataset extends DatasetBase implements ITextRepo {
     ReplaceText(id: string, text: string): Promise<void>;
     AppendLine(id: string, line: string): Promise<void>;
     Delete(id: string): Promise<void>;
-    Drop(): Promise<void>;
 }

package/Datasets/Text/RawTextDataset.js

@@ -1,11 +1,10 @@
 import { DatasetBase } from "../DatasetBase";
-import { AppendCommand } from "../../Messages/AppendCommand";
+import { AppendTextCommand } from "../../Messages/AppendTextCommand";
 import { ClearCommand } from "../../Messages/ClearCommand";
 import { CreateFileCommand } from "../../Messages/CreateFileCommand";
 import { DeleteFileCommand } from "../../Messages/DeleteFileCommand";
-import { DropDatasetCommand } from "../../Messages/DropDatasetCommand";
-import { ListFilesIdsQuery } from "../../Messages/ListFilesIdsQuery";
-import { ReadFileQuery } from "../../Messages/ReadFileQuery";
+import { ListObjectsIdsQuery } from '../../Messages/ListObjectsIdsQuery';
+import { ReadTextQuery } from "../../Messages/ReadTextQuery";
 import { DatasetType } from "../../Services/DatasetType";
 export class RawTextDataset extends DatasetBase {
     _db;
@@ -21,7 +20,7 @@ export class RawTextDataset extends DatasetBase {
         if (limit < 0) {
             throw new Error("Limit cannot be negative number. 0 = no limit.");
         }
-        const queryResult = await this._db.Send(new ReadFileQuery(this._db.DatabaseDir, this.dataset, id, offset, limit));
+        const queryResult = await this._db.Send(new ReadTextQuery(this._db.DatabaseDir, this.dataset, id, offset, limit));
         if (!queryResult.IsSuccess) {
             throw new Error("Failed to read: " + queryResult.ErrorMessage);
         }
@@ -31,7 +30,7 @@ export class RawTextDataset extends DatasetBase {
     }
     async GetAllIds() {
         this.Log(`Fetching all files IDs from "${this.DatasetPath}"...`);
-        const queryResult = await this._db.Send(new ListFilesIdsQuery(this._db.DatabaseDir, this.dataset));
+        const queryResult = await this._db.Send(new ListObjectsIdsQuery(this._db.DatabaseDir, this.dataset));
         if (!queryResult.IsSuccess) {
             throw new Error("Failed to fetch all items ids: " + queryResult.ErrorMessage);
         }
@@ -50,7 +49,7 @@ export class RawTextDataset extends DatasetBase {
     ;
     async AppendText(id, text) {
         this.Log(`Appending ${text.length} characters to "${id}" in "${this.DatasetPath}"...`);
-        const result = await this._db.Send(new AppendCommand(this._db.DatabaseDir, this.dataset, id, text));
+        const result = await this._db.Send(new AppendTextCommand(this._db.DatabaseDir, this.dataset, id, text));
         if (!result.IsSuccess) {
             throw new Error("Failed to append: " + result.ErrorMessage);
         }
@@ -84,12 +83,4 @@ export class RawTextDataset extends DatasetBase {
         }
         this.Log(`Deleted "${id}" from "${this.DatasetPath}".`);
     }
-    async Drop() {
-        this.Log(`Dropping "${this.DatasetPath}"...`);
-        const result = await this._db.Send(new DropDatasetCommand(this._db.DatabaseDir, this.dataset));
-        if (!result.IsSuccess) {
-            throw new Error("Failed to drop dataset: " + result.ErrorMessage);
-        }
-        this.Log(`"${this.DatasetPath}" dropped.`);
-    }
 }

package/Datasets/UploadResult.d.ts

@@ -0,0 +1,8 @@
+export declare class UploadResult<T extends object> {
+    IsSuccess: boolean;
+    Result: T | null;
+    ErrorMessage: string;
+    constructor(IsSuccess?: boolean, Result?: T | null, ErrorMessage?: string);
+    static Success<T extends object>(result: T): UploadResult<T>;
+    static Failure<T extends object>(reason: string): UploadResult<T>;
+}

package/Datasets/UploadResult.js

@@ -0,0 +1,16 @@
+export class UploadResult {
+    IsSuccess;
+    Result;
+    ErrorMessage;
+    constructor(IsSuccess = false, Result = null, ErrorMessage = "") {
+        this.IsSuccess = IsSuccess;
+        this.Result = Result;
+        this.ErrorMessage = ErrorMessage;
+    }
+    static Success(result) {
+        return new UploadResult(true, result, "");
+    }
+    static Failure(reason) {
+        return new UploadResult(false, null, reason);
+    }
+}

package/Messages/AddObjectCommand.d.ts

@@ -0,0 +1,5 @@
+import { Message } from '../MessageBus/Message';
+import { dir } from '../Types/dir';
+export declare class AddObjectCommand extends Message {
+    constructor(Database: dir, Dataset: dir, ObjectId: string, Content: object);
+}

package/Messages/AddObjectCommand.js

@@ -0,0 +1,6 @@
+import { Message } from '../MessageBus/Message';
+export class AddObjectCommand extends Message {
+    constructor(Database, Dataset, ObjectId, Content) {
+        super("AddObject", { Database, Dataset, ObjectId, Content });
+    }
+}

package/Messages/{AppendCommand.d.ts → AppendTextCommand.d.ts}

@@ -1,5 +1,5 @@
 import { Message } from '../MessageBus/Message';
 import { dir } from '../Types/dir';
-export declare class AppendCommand extends Message {
+export declare class AppendTextCommand extends Message {
     constructor(Database: dir, Dataset: dir, FileId: string, Content: string);
 }

package/Messages/{UpdateFileCommand.js → AppendTextCommand.js}

@@ -1,6 +1,6 @@
 import { Message } from '../MessageBus/Message';
-export class UpdateFileCommand extends Message {
+export class AppendTextCommand extends Message {
     constructor(Database, Dataset, FileId, Content) {
-        super("UpdateFile", { Database, Dataset, FileId, Content });
+        super("AppendText", { Database, Dataset, FileId, Content });
     }
 }

package/Messages/DeleteObjectCommand.d.ts

@@ -0,0 +1,5 @@
+import { Message } from '../MessageBus/Message';
+import { dir } from '../Types/dir';
+export declare class DeleteObjectCommand extends Message {
+    constructor(Database: dir, Dataset: dir, ObjectId: string);
+}

package/Messages/DeleteObjectCommand.js

@@ -0,0 +1,6 @@
+import { Message } from '../MessageBus/Message';
+export class DeleteObjectCommand extends Message {
+    constructor(Database, Dataset, ObjectId) {
+        super("DeleteObject", { Database, Dataset, ObjectId });
+    }
+}

package/Messages/GetFileQuery.d.ts

@@ -1,5 +1,5 @@
 import { Message } from '../MessageBus/Message';
 import { dir } from '../Types/dir';
 export declare class GetFileQuery extends Message {
-    constructor(Database: dir, Dataset: dir, FileId: string);
+    constructor(Server: string, Database: dir, Dataset: dir, FileId: string);
 }

package/Messages/GetFileQuery.js

@@ -1,6 +1,6 @@
 import { Message } from '../MessageBus/Message';
 export class GetFileQuery extends Message {
-    constructor(Database, Dataset, FileId) {
-        super("GetFile", { Database, Dataset, FileId });
+    constructor(Server, Database, Dataset, FileId) {
+        super("GetFile", { Server, Database, Dataset, FileId });
     }
 }

package/Messages/GetObjectQuery.d.ts

@@ -0,0 +1,5 @@
+import { Message } from '../MessageBus/Message';
+import { dir } from '../Types/dir';
+export declare class GetObjectQuery extends Message {
+    constructor(Database: dir, Dataset: dir, ObjectId: string);
+}

package/Messages/GetObjectQuery.js

@@ -0,0 +1,6 @@
+import { Message } from '../MessageBus/Message';
+export class GetObjectQuery extends Message {
+    constructor(Database, Dataset, ObjectId) {
+        super("GetObject", { Database, Dataset, ObjectId });
+    }
+}

package/Messages/ListFilesQuery.d.ts

@@ -1,5 +1,5 @@
 import { Message } from '../MessageBus/Message';
 import { dir } from '../Types/dir';
 export declare class ListFilesQuery extends Message {
-    constructor(Database: dir, Dataset: dir);
+    constructor(Server: string, Database: dir, Dataset: dir);
 }

package/Messages/ListFilesQuery.js

@@ -1,6 +1,6 @@
 import { Message } from '../MessageBus/Message';
 export class ListFilesQuery extends Message {
-    constructor(Database, Dataset) {
-        super("ListFiles", { Database, Dataset });
+    constructor(Server, Database, Dataset) {
+        super("ListFiles", { Server, Database, Dataset });
     }
 }

package/Messages/ListObjectsIdsQuery.d.ts

@@ -0,0 +1,5 @@
+import { Message } from '../MessageBus/Message';
+import { dir } from '../Types/dir';
+export declare class ListObjectsIdsQuery extends Message {
+    constructor(Database: dir, Dataset: dir);
+}

package/Messages/ListObjectsIdsQuery.js

@@ -0,0 +1,6 @@
+import { Message } from '../MessageBus/Message';
+export class ListObjectsIdsQuery extends Message {
+    constructor(Database, Dataset) {
+        super("ListObjectsIds", { Database, Dataset });
+    }
+}

package/Messages/ListObjectsQuery.d.ts

@@ -0,0 +1,5 @@
+import { Message } from '../MessageBus/Message';
+import { dir } from '../Types/dir';
+export declare class ListObjectsQuery extends Message {
+    constructor(Database: dir, Dataset: dir);
+}

package/Messages/ListObjectsQuery.js

@@ -0,0 +1,6 @@
+import { Message } from '../MessageBus/Message';
+export class ListObjectsQuery extends Message {
+    constructor(Database, Dataset) {
+        super("ListObjects", { Database, Dataset });
+    }
+}

package/Messages/ListPicturesQuery.d.ts

@@ -1,5 +1,5 @@
 import { Message } from '../MessageBus/Message';
 import { dir } from '../Types/dir';
 export declare class ListPicturesQuery extends Message {
-    constructor(Database: dir, Dataset: dir);
+    constructor(Server: string, Database: dir, Dataset: dir);
 }

package/Messages/ListPicturesQuery.js

@@ -1,6 +1,6 @@
 import { Message } from '../MessageBus/Message';
 export class ListPicturesQuery extends Message {
-    constructor(Database, Dataset) {
-        super("ListPictures", { Database, Dataset });
+    constructor(Server, Database, Dataset) {
+        super("ListPictures", { Server, Database, Dataset });
     }
 }

package/Messages/MoveObjectCommand.d.ts

@@ -0,0 +1,5 @@
+import { Message } from '../MessageBus/Message';
+import { dir } from '../Types/dir';
+export declare class MoveObjectCommand extends Message {
+    constructor(Database: dir, ObjectId: string, Source: dir, Target: dir);
+}

package/Messages/MoveObjectCommand.js

@@ -0,0 +1,6 @@
+import { Message } from '../MessageBus/Message';
+export class MoveObjectCommand extends Message {
+    constructor(Database, ObjectId, Source, Target) {
+        super("MoveObject", { Database, ObjectId, Source, Target });
+    }
+}

package/Messages/{ReadFileQuery.d.ts → ReadTextQuery.d.ts}

@@ -1,5 +1,5 @@
 import { Message } from '../MessageBus/Message';
 import { dir } from '../Types/dir';
-export declare class ReadFileQuery extends Message {
+export declare class ReadTextQuery extends Message {
     constructor(Database: dir, Dataset: dir, FileId: string, Offset?: number, Limit?: number);
 }

package/Messages/{ReadFileQuery.js → ReadTextQuery.js}

@@ -1,6 +1,6 @@
 import { Message } from '../MessageBus/Message';
-export class ReadFileQuery extends Message {
+export class ReadTextQuery extends Message {
     constructor(Database, Dataset, FileId, Offset = 0, Limit = 0) {
-        super("ReadFile", { Database, Dataset, FileId, Offset, Limit });
+        super("ReadText", { Database, Dataset, FileId, Offset, Limit });
     }
 }

package/Messages/UpdateObjectCommand.d.ts

@@ -0,0 +1,5 @@
+import { Message } from '../MessageBus/Message';
+import { dir } from '../Types/dir';
+export declare class UpdateObjectCommand extends Message {
+    constructor(Database: dir, Dataset: dir, ObjectId: string, Content: object);
+}

package/Messages/UpdateObjectCommand.js

@@ -0,0 +1,6 @@
+import { Message } from '../MessageBus/Message';
+export class UpdateObjectCommand extends Message {
+    constructor(Database, Dataset, ObjectId, Content) {
+        super("UpdateObject", { Database, Dataset, ObjectId, Content });
+    }
+}

package/Models/DatasetMetadata.d.ts

@@ -1,5 +1,9 @@
+import { PicsConfig } from "../Datasets/Picture/PicsConfig";
 export interface DatasetMetadata {
     Type: string;
     CreatedBy: string;
     CreatedAt: Date;
 }
+export interface PictureDatasetMetadata extends DatasetMetadata {
+    Config: PicsConfig;
+}

package/Services/DatasetType.d.ts

@@ -2,5 +2,6 @@ export declare enum DatasetType {
     Unknown = "Unknown",
     Object = "Object",
     Text = "Text",
-    Picture = "Picture"
+    Picture = "Picture",
+    File = "File"
 }

package/Services/DatasetType.js

@@ -4,4 +4,5 @@ export var DatasetType;
     DatasetType["Object"] = "Object";
     DatasetType["Text"] = "Text";
     DatasetType["Picture"] = "Picture";
+    DatasetType["File"] = "File";
 })(DatasetType || (DatasetType = {}));

package/Services/OnlineStorage.d.ts

@@ -15,6 +15,7 @@ import { ITextConverter } from "../Converters/ITextConverter";
 import { DatasetType } from "./DatasetType";
 import { PicturesDataset } from "../Datasets/Picture/PicturesDataset";
 import { PicsConfig } from "../Datasets/Picture/PicsConfig";
+import { FileDataset } from "../Datasets/File/FileDataset";
 export declare class OnlineStorage {
     private server;
     private database;
@@ -40,7 +41,8 @@ export declare class OnlineStorage {
     DeleteUser(user: IStorageUser): Promise<void>;
     GetObjectDataset<T extends object>(datasetName: string, converter?: IConverter<any, T>): ObjectDataset<T>;
     GetTextDataset(datasetName: string, converter?: ITextConverter<any>): TextDataset<any> | RawTextDataset;
-    GetPicturesDataset(datasetName: string, picsConfig?: PicsConfig): PicturesDataset;
+    GetPictureDataset(datasetName: string, picsConfig?: PicsConfig): PicturesDataset;
+    GetFileDataset(datasetName: string): FileDataset;
     private IsBrowserEnvironment;
     private LoadUserFromLocalStorage;
     Login(password: string, login?: string): Promise<IStorageUser>;

package/Services/OnlineStorage.js

@@ -3,7 +3,7 @@ import { CreateDatasetCommand } from '../Messages/CreateDatasetCommand';
 import { DatasetExistsCommand } from '../Messages/DatasetExistsCommand';
 import { RemoveDatasetCommand } from '../Messages/RemoveDatasetCommand';
 import { ObjectDataset } from "../Datasets/Object/ObjectDataset";
-import { MoveFileCommand } from "../Messages/MoveFileCommand";
+import { MoveObjectCommand } from "../Messages/MoveObjectCommand";
 import { LoginUserQuery } from "../Messages/LoginUserQuery";
 import { ListUsersQuery } from "../Messages/ListUsersQuery";
 import { UpdateUserCommand } from "../Messages/UpdateUserCommand";
@@ -19,6 +19,7 @@ import { DeleteDatabaseCommand } from "../Messages/DeleteDatabaseCommand";
 import { RawTextDataset } from "../Datasets/Text/RawTextDataset";
 import { TextDataset } from "../Datasets/Text/TextDataset";
 import { PicturesDataset } from "../Datasets/Picture/PicturesDataset";
+import { FileDataset } from "../Datasets/File/FileDataset";
 export class OnlineStorage {
     server;
     database;
@@ -115,9 +116,12 @@ export class OnlineStorage {
             ? new TextDataset(this, datasetName, converter)
             : new RawTextDataset(this, datasetName);
     }
-    GetPicturesDataset(datasetName, picsConfig) {
+    GetPictureDataset(datasetName, picsConfig) {
         return new PicturesDataset(this, datasetName, picsConfig);
     }
+    GetFileDataset(datasetName) {
+        return new FileDataset(this, datasetName);
+    }
     IsBrowserEnvironment() {
         return typeof window !== "undefined" && typeof window.localStorage !== "undefined";
     }
@@ -135,7 +139,7 @@ export class OnlineStorage {
     async Login(password, login) {
         const result = await this._bus.SendMessage(new LoginUserQuery(this.DatabaseDir, password, login));
         if (!result.IsSuccess) {
-            throw new Error(result.ErrorMessage);
+            throw new Error("Failed to login: " + result.ErrorMessage);
         }
         this.user = result.Result || this.ANONYMOUS_USER;
         this.SetUser(this.user);
@@ -242,7 +246,7 @@ export class OnlineStorage {
     }
     async Move(fileId, sourceDataset, targetDataset) {
         this.Log(`Moving "${fileId}" from "${sourceDataset.Name}" to "${targetDataset.Name}"...`);
-        const result = await this._bus.SendMessage(new MoveFileCommand(this.DatabaseDir, fileId, sourceDataset.Name, targetDataset.Name));
+        const result = await this._bus.SendMessage(new MoveObjectCommand(this.DatabaseDir, fileId, sourceDataset.Name, targetDataset.Name));
         if (!result.IsSuccess) {
             throw new Error(`Failed to move "${fileId}" from "${sourceDataset.Name}" to "${targetDataset.Name}": ${result.ErrorMessage}`);
         }

package/index.d.ts

@@ -13,6 +13,8 @@ export * from "./Datasets/IRepoBase";
 export * from "./Datasets/Object/IRepo";
 export * from "./Datasets/Text/ITextRepo";
 export * from "./Datasets/Object/IRepos";
+export * from "./Datasets/File/FileDataset";
+export * from "./Datasets/File/FilePack";
 export * from "./Datasets/DatasetBase";
 export * from "./Datasets/Object/ObjectDataset";
 export * from "./Datasets/Text/RawTextDataset";
@@ -21,6 +23,5 @@ export * from "./Datasets/Picture/PicturesDataset";
 export * from "./Datasets/Picture/PicConfig";
 export * from "./Datasets/Picture/PicsConfig";
 export * from "./Datasets/Picture/PicturePack";
-export * from "./Datasets/Picture/PicturesUploadResult";
 export * from "./Services/DatasetType";
 export * from "./Services/OnlineStorage";

package/index.js

@@ -13,6 +13,8 @@ export * from "./Datasets/IRepoBase";
 export * from "./Datasets/Object/IRepo";
 export * from "./Datasets/Text/ITextRepo";
 export * from "./Datasets/Object/IRepos";
+export * from "./Datasets/File/FileDataset";
+export * from "./Datasets/File/FilePack";
 export * from "./Datasets/DatasetBase";
 export * from "./Datasets/Object/ObjectDataset";
 export * from "./Datasets/Text/RawTextDataset";
@@ -21,6 +23,5 @@ export * from "./Datasets/Picture/PicturesDataset";
 export * from "./Datasets/Picture/PicConfig";
 export * from "./Datasets/Picture/PicsConfig";
 export * from "./Datasets/Picture/PicturePack";
-export * from "./Datasets/Picture/PicturesUploadResult";
 export * from "./Services/DatasetType";
 export * from "./Services/OnlineStorage";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tblabs/storage",
-  "version": "5.14.0",
+  "version": "5.15.0",
   "description": "online storage module with auth",
   "license": "beerware",
   "main": "index.js",

package/Datasets/Picture/PicturesUploadResult.d.ts

@@ -1,9 +0,0 @@
-import { PicturePack } from "./PicturePack";
-export declare class PicturesUploadResult {
-    IsSuccess: boolean;
-    PicturePacks: PicturePack[] | null;
-    ErrorMessage: string;
-    constructor(IsSuccess?: boolean, PicturePacks?: PicturePack[] | null, ErrorMessage?: string);
-    static Success(packs: PicturePack[]): PicturesUploadResult;
-    static Failure(reason: string): PicturesUploadResult;
-}

package/Datasets/Picture/PicturesUploadResult.js

@@ -1,16 +0,0 @@
-export class PicturesUploadResult {
-    IsSuccess;
-    PicturePacks;
-    ErrorMessage;
-    constructor(IsSuccess = false, PicturePacks = null, ErrorMessage = "") {
-        this.IsSuccess = IsSuccess;
-        this.PicturePacks = PicturePacks;
-        this.ErrorMessage = ErrorMessage;
-    }
-    static Success(packs) {
-        return new PicturesUploadResult(true, packs, "");
-    }
-    static Failure(reason) {
-        return new PicturesUploadResult(false, null, reason);
-    }
-}

package/Messages/AddFileCommand.d.ts

@@ -1,5 +0,0 @@
-import { Message } from '../MessageBus/Message';
-import { dir } from '../Types/dir';
-export declare class AddFileCommand extends Message {
-    constructor(Database: dir, Dataset: dir, FileId: string, Content: object);
-}

package/Messages/AddFileCommand.js

@@ -1,6 +0,0 @@
-import { Message } from '../MessageBus/Message';
-export class AddFileCommand extends Message {
-    constructor(Database, Dataset, FileId, Content) {
-        super("AddFile", { Database, Dataset, FileId, Content });
-    }
-}

package/Messages/AppendCommand.js

@@ -1,6 +0,0 @@
-import { Message } from '../MessageBus/Message';
-export class AppendCommand extends Message {
-    constructor(Database, Dataset, FileId, Content) {
-        super("Append", { Database, Dataset, FileId, Content });
-    }
-}

package/Messages/MoveFileCommand.d.ts

@@ -1,5 +0,0 @@
-import { Message } from '../MessageBus/Message';
-import { dir } from '../Types/dir';
-export declare class MoveFileCommand extends Message {
-    constructor(Database: dir, FileId: string, Source: dir, Target: dir);
-}

package/Messages/MoveFileCommand.js

@@ -1,6 +0,0 @@
-import { Message } from '../MessageBus/Message';
-export class MoveFileCommand extends Message {
-    constructor(Database, FileId, Source, Target) {
-        super("MoveFile", { Database, FileId, Source, Target });
-    }
-}

package/Messages/UpdateFileCommand.d.ts

@@ -1,5 +0,0 @@
-import { Message } from '../MessageBus/Message';
-import { dir } from '../Types/dir';
-export declare class UpdateFileCommand extends Message {
-    constructor(Database: dir, Dataset: dir, FileId: string, Content: object);
-}