@tblabs/storage 5.11.0 → 5.12.0

package/{TextConverter.d.ts → Converters/ITextConverter.d.ts}

@@ -1,4 +1,4 @@
-export interface TextConverter<T> {
+export interface ITextConverter<T> {
     ToLine(entry: T): string;
     ToEntry(line: string): T;
 }

package/Converters/JsonTextConverter.d.ts

@@ -0,0 +1,5 @@
+import { ITextConverter } from "./ITextConverter";
+export declare class JsonTextConverter<T> implements ITextConverter<T> {
+    ToLine(entry: T): string;
+    ToEntry(line: string): T;
+}

package/{Dataset.d.ts → Datasets/Dataset.d.ts}

@@ -1,8 +1,8 @@
-import { OnlineStorage } from "./OnlineStorage";
-import { IConverter } from "./IConverter";
-import { IRepo } from "./IRepo";
-import { dir } from "./Types/dir";
-import { DatasetBase } from "./DatasetBase";
+import { OnlineStorage } from "../Services/OnlineStorage";
+import { IConverter } from "../Converters/IConverter";
+import { IRepo } from "../Datasets/IRepo";
+import { dir } from "../Types/dir";
+import { DatasetBase } from "../Datasets/DatasetBase";
 export declare class Dataset<T extends object> extends DatasetBase implements IRepo<T> {
     protected _db: OnlineStorage;
     protected _converter: IConverter<any, T>;

package/{Dataset.js → Datasets/Dataset.js}

@@ -1,11 +1,11 @@
-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 { DatasetBase } from "./DatasetBase";
+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 { DatasetBase } from "../Datasets/DatasetBase";
 export class Dataset extends DatasetBase {
     _db;
     _converter;

package/{DatasetBase.d.ts → Datasets/DatasetBase.d.ts}

@@ -1,6 +1,6 @@
-import { IStorageUserPrivileges } from "./IStorageUserPrivileges";
-import { OnlineStorage } from "./OnlineStorage";
-import { dir } from "./Types/dir";
+import { IStorageUserPrivileges } from "../Models/IStorageUserPrivileges";
+import { OnlineStorage } from "../Services/OnlineStorage";
+import { dir } from "../Types/dir";
 export declare class DatasetBase {
     protected _db: OnlineStorage;
     protected dataset: dir;

package/{IRepoBase.d.ts → Datasets/IRepoBase.d.ts}

@@ -1,5 +1,5 @@
-import { IStorageUserPrivileges } from "./IStorageUserPrivileges";
-import { OnlineStorage } from "./OnlineStorage";
+import { IStorageUserPrivileges } from "../Models/IStorageUserPrivileges";
+import { OnlineStorage } from "../Services/OnlineStorage";
 export interface IRepoBase {
     get Name(): string;
     get Database(): OnlineStorage;

package/{IRepos.d.ts → Datasets/IRepos.d.ts}

@@ -1,4 +1,4 @@
-import { IStorageUserPrivileges } from "./IStorageUserPrivileges";
+import { IStorageUserPrivileges } from "../Models/IStorageUserPrivileges";
 export interface IRepos<T> {
     CanUserDo(action: keyof IStorageUserPrivileges): boolean;
     Add(dataset: string, id: string, item: T): Promise<void>;

package/Datasets/PicturesDataset/DefaultPicsConfig.d.ts

@@ -0,0 +1,2 @@
+import { PicsConfig } from "./PicsConfig";
+export declare const DefaultPicsConfig: PicsConfig;

package/Datasets/PicturesDataset/DefaultPicsConfig.js

@@ -0,0 +1,7 @@
+export const DefaultPicsConfig = {
+    Sizes: {
+        "h1024": { ResizeTo: "height", Height: 1024 },
+        "w256": { ResizeTo: "width", Width: 256 },
+        "w64": { ResizeTo: "width", Width: 64 }
+    }
+};

package/Datasets/PicturesDataset/PicConfig.d.ts

@@ -0,0 +1,5 @@
+export interface PicConfig {
+    ResizeTo: "height" | "width";
+    Height?: number;
+    Width?: number;
+}

package/Datasets/PicturesDataset/PicsConfig.d.ts

@@ -0,0 +1,4 @@
+import { PicConfig } from "./PicConfig";
+export interface PicsConfig {
+    Sizes: Record<string, PicConfig>;
+}

package/Datasets/PicturesDataset/PicturePack.d.ts

@@ -0,0 +1,5 @@
+export interface PicturePack {
+    Name: string;
+    Extension: string;
+    Sizes: string[];
+}

package/Datasets/PicturesDataset/PicturesDataset.d.ts

@@ -0,0 +1,15 @@
+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";
+export declare class PicturesDataset extends DatasetBase {
+    protected _db: OnlineStorage;
+    protected dataset: dir;
+    protected picsConfig: PicsConfig;
+    constructor(_db: OnlineStorage, dataset: dir, picsConfig?: PicsConfig);
+    ListPictures(): Promise<PicturePack[]>;
+    UploadPictures(files: File[]): Promise<PicturesUploadResult>;
+    DeletePicture(id: string): Promise<void>;
+}

package/Datasets/PicturesDataset/PicturesDataset.js

@@ -0,0 +1,55 @@
+import { DeletePictureCommand } from "../../Messages/DeletePictureCommand";
+import { ListPicturesQuery } from "../../Messages/ListPicturesQuery";
+import { DatasetBase } from "../DatasetBase";
+import { DefaultPicsConfig } from "./DefaultPicsConfig";
+import { PicturesUploadResult } from "./PicturesUploadResult";
+export class PicturesDataset extends DatasetBase {
+    _db;
+    dataset;
+    picsConfig;
+    constructor(_db, dataset, picsConfig = DefaultPicsConfig) {
+        super(_db, dataset);
+        this._db = _db;
+        this.dataset = dataset;
+        this.picsConfig = picsConfig;
+    }
+    async ListPictures() {
+        const result = await this._db.Send(new ListPicturesQuery(this._db.DatabaseDir, this.dataset));
+        if (!result.IsSuccess) {
+            throw new Error("Failed to list picture packs: " + result.ErrorMessage);
+        }
+        return result.Result;
+    }
+    async UploadPictures(files) {
+        try {
+            if (!files) {
+                return PicturesUploadResult.Failure("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('database', this._db.DatabaseDir);
+            formData.append('dataset', this.dataset);
+            formData.append('config', JSON.stringify(this.picsConfig));
+            const response = await fetch(this._db.Server + "/picures-upload", {
+                method: 'POST',
+                body: formData,
+            });
+            if (!response.ok) {
+                return PicturesUploadResult.Failure(`Request failed with status ${response.status}`);
+            }
+            const picturePacks = await response.json();
+            return PicturesUploadResult.Success(picturePacks);
+        }
+        catch (ex) {
+            return PicturesUploadResult.Failure(`Can not upload: ${ex.message}`);
+        }
+    }
+    async DeletePicture(id) {
+        const result = await this._db.Send(new DeletePictureCommand(this._db.DatabaseDir, this.dataset, id));
+        if (!result.IsSuccess) {
+            throw new Error("Failed to delete picture: " + result.ErrorMessage);
+        }
+    }
+}

package/Datasets/PicturesDataset/PicturesUploadResult.d.ts

@@ -0,0 +1,9 @@
+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/PicturesDataset/PicturesUploadResult.js

@@ -0,0 +1,16 @@
+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/{RawTextDataset.d.ts → Datasets/RawTextDataset.d.ts}

@@ -1,7 +1,7 @@
-import { DatasetBase } from "./DatasetBase";
-import { ITextRepo } from "./ITextRepo";
-import { OnlineStorage } from "./OnlineStorage";
-import { dir } from "./Types/dir";
+import { DatasetBase } from "../Datasets/DatasetBase";
+import { ITextRepo } from "../Datasets/ITextRepo";
+import { OnlineStorage } from "../Services/OnlineStorage";
+import { dir } from "../Types/dir";
 export declare class RawTextDataset extends DatasetBase implements ITextRepo {
     protected _db: OnlineStorage;
     protected dataset: dir;

package/{RawTextDataset.js → Datasets/RawTextDataset.js}

@@ -1,10 +1,10 @@
-import { DatasetBase } from "./DatasetBase";
-import { AppendCommand } from "./Messages/AppendCommand";
-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 { DatasetBase } from "../Datasets/DatasetBase";
+import { AppendCommand } from "../Messages/AppendCommand";
+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";
 export class RawTextDataset extends DatasetBase {
     _db;
     dataset;

package/{TextDataset.d.ts → Datasets/TextDataset.d.ts}

@@ -1,12 +1,12 @@
-import { OnlineStorage } from "./OnlineStorage";
+import { OnlineStorage } from "../Services/OnlineStorage";
 import { RawTextDataset } from "./RawTextDataset";
-import { TextConverter } from "./TextConverter";
-import { dir } from "./Types/dir";
+import { ITextConverter } from "../Converters/ITextConverter";
+import { dir } from "../Types/dir";
 export declare class TextDataset<T> extends RawTextDataset {
     protected _db: OnlineStorage;
     protected dataset: dir;
-    protected _converter: TextConverter<T>;
-    constructor(_db: OnlineStorage, dataset: dir, _converter?: TextConverter<T>);
+    protected _converter: ITextConverter<T>;
+    constructor(_db: OnlineStorage, dataset: dir, _converter?: ITextConverter<T>);
     Load(id: string, offset?: number, limit?: number): Promise<T[]>;
     Append(id: string, entry: T): Promise<void>;
 }

package/{TextDataset.js → Datasets/TextDataset.js}

@@ -1,4 +1,4 @@
-import { JsonTextConverter } from "./JsonTextConverter";
+import { JsonTextConverter } from "../Converters/JsonTextConverter";
 import { RawTextDataset } from "./RawTextDataset";
 export class TextDataset extends RawTextDataset {
     _db;

package/Messages/AddUserCommand.d.ts

@@ -1,4 +1,4 @@
-import { IStorageUser } from '../IStorageUser';
+import { IStorageUser } from '../Models/IStorageUser';
 import { Message } from '../MessageBus/Message';
 import { dir } from '../Types/dir';
 export declare class AddUserCommand extends Message {

package/{CreateDatabaseCommand.d.ts → Messages/CreateDatabaseCommand.d.ts}

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

package/{CreateDatabaseCommand.js → Messages/CreateDatabaseCommand.js}

@@ -1,4 +1,4 @@
-import { Message } from "./MessageBus/Message";
+import { Message } from "../MessageBus/Message";
 export class CreateDatabaseCommand extends Message {
     constructor(Database) {
         super("CreateDatabase", { Database });

package/Messages/CreateDatasetCommand.d.ts

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

package/Messages/CreateDatasetCommand.js

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

package/{DeleteDatabaseCommand.d.ts → Messages/DeleteDatabaseCommand.d.ts}

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

package/{DeleteDatabaseCommand.js → Messages/DeleteDatabaseCommand.js}

@@ -1,4 +1,4 @@
-import { Message } from "./MessageBus/Message";
+import { Message } from "../MessageBus/Message";
 export class DeleteDatabaseCommand extends Message {
     constructor(Database) {
         super("DeleteDatabase", { Database });

package/Messages/DeletePictureCommand.d.ts

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

package/Messages/DeletePictureCommand.js

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

package/Messages/ListDatabasesQuery.d.ts

@@ -1,5 +1,4 @@
-import { Message } from '../MessageBus/Message';
-import { dir } from '../Types/dir';
-export declare class ListDatasetsQuery extends Message {
-    constructor(Database: dir);
+import { Message } from "../MessageBus/Message";
+export declare class ListDatabasesQuery extends Message {
+    constructor();
 }

package/Messages/ListDatabasesQuery.js

@@ -1,6 +1,6 @@
-import { Message } from '../MessageBus/Message';
-export class ListDatasetsQuery extends Message {
-    constructor(Database) {
-        super("ListDatasets", { Database });
+import { Message } from "../MessageBus/Message";
+export class ListDatabasesQuery extends Message {
+    constructor() {
+        super("ListDatabases", {});
     }
 }

package/Messages/ListDatasetsQuery.d.ts

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

package/Messages/ListDatasetsQuery.js

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

package/Messages/ListPicturesQuery.d.ts

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

package/Messages/ListPicturesQuery.js

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

package/Messages/UpdateUserCommand.d.ts

@@ -1,4 +1,4 @@
-import { IStorageUser } from '../IStorageUser';
+import { IStorageUser } from '../Models/IStorageUser';
 import { Message } from '../MessageBus/Message';
 import { dir } from '../Types/dir';
 export declare class UpdateUserCommand extends Message {

package/Models/DatasetInfo.d.ts

@@ -0,0 +1,8 @@
+import { DatasetType } from "../Services/DatasetType";
+export interface DatasetInfo {
+    Name: string;
+    FilesCount: number;
+    Type: DatasetType;
+    CreatedAt: string;
+    CreatedBy: string;
+}

package/Models/DatasetInfo.js

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

package/Models/IEntitiesSet.js

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

package/{IStorageUser.d.ts → Models/IStorageUser.d.ts}

@@ -1,5 +1,5 @@
 import { IStorageUserPrivileges } from "./IStorageUserPrivileges";
-import { ISender } from "./MessageBus/ISender";
+import { ISender } from "../MessageBus/ISender";
 export interface IStorageUser extends ISender {
     Id: string;
     Database: string;

package/Models/IStorageUser.js

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

package/{IStorageUserPrivileges.d.ts → Models/IStorageUserPrivileges.d.ts}

@@ -25,6 +25,26 @@ export interface IStorageUserPrivileges {
         Datasets: IEntitiesSet;
         Files: IEntitiesSet;
     };
+    CreateFile: {
+        Datasets: IEntitiesSet;
+    };
+    ReadFile: {
+        Datasets: IEntitiesSet;
+        Files: IEntitiesSet;
+    };
+    Append: {
+        Datasets: IEntitiesSet;
+        Files: IEntitiesSet;
+    };
+    ListPictures: {
+        Datasets: IEntitiesSet;
+    };
+    UploadPicture: {
+        Datasets: IEntitiesSet;
+    };
+    DeletePicture: {
+        Datasets: IEntitiesSet;
+    };
     CreateDataset: {
         Datasets: IEntitiesSet;
     };
@@ -34,7 +54,6 @@ export interface IStorageUserPrivileges {
     RemoveDataset: {
         Datasets: IEntitiesSet;
     };
-    Search: boolean;
     ListDatasets: boolean;
     ListUsers: boolean;
     GetLogs: boolean;
@@ -46,4 +65,3 @@ export interface IStorageUserPrivileges {
     AddUser: boolean;
     DeleteUser: boolean;
 }
-export declare const USER_PRIVILEGES_NAMES: (keyof IStorageUserPrivileges)[];

package/Models/IStorageUserPrivileges.js

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

package/Services/DatasetType.d.ts

@@ -0,0 +1,6 @@
+export declare enum DatasetType {
+    Unknown = "unknown",
+    Objects = "objects",
+    Texts = "texts",
+    Pictures = "pictures"
+}

package/Services/DatasetType.js

@@ -0,0 +1,7 @@
+export var DatasetType;
+(function (DatasetType) {
+    DatasetType["Unknown"] = "unknown";
+    DatasetType["Objects"] = "objects";
+    DatasetType["Texts"] = "texts";
+    DatasetType["Pictures"] = "pictures";
+})(DatasetType || (DatasetType = {}));

package/{OnlineStorage.d.ts → Services/OnlineStorage.d.ts}

@@ -1,15 +1,18 @@
-import { dir, url } from "./Types/dir";
-import { IMessage } from "./MessageBus/IMessage";
-import { ISender } from "./MessageBus/ISender";
-import { MessageBus } from "./MessageBus/MessageBus";
-import { MessageBusResponse } from "./MessageBus/MessageBusResponse";
-import { Dataset } from "./Dataset";
-import { IStorageUser } from "./IStorageUser";
-import { IConverter } from "./IConverter";
-import { IStorageUserPrivileges } from "./IStorageUserPrivileges";
-import { DatabaseInfo } from "./DatabaseInfo";
-import { DatasetInfo } from "./DatasetInfo";
-import { RawTextDataset } from "./RawTextDataset";
+import { dir, url } from "../Types/dir";
+import { IMessage } from "../MessageBus/IMessage";
+import { ISender } from "../MessageBus/ISender";
+import { MessageBus } from "../MessageBus/MessageBus";
+import { MessageBusResponse } from "../MessageBus/MessageBusResponse";
+import { Dataset } from "../Datasets/Dataset";
+import { IStorageUser } from "../Models/IStorageUser";
+import { IConverter } from "../Converters/IConverter";
+import { IStorageUserPrivileges } from "../Models/IStorageUserPrivileges";
+import { DatabaseInfo } from "../Models/DatabaseInfo";
+import { DatasetInfo } from "../Models/DatasetInfo";
+import { RawTextDataset } from "../Datasets/RawTextDataset";
+import { TextDataset } from "../Datasets/TextDataset";
+import { ITextConverter } from "../Converters/ITextConverter";
+import { DatasetType } from "./DatasetType";
 export declare class OnlineStorage {
     private server;
     private database;
@@ -19,7 +22,6 @@ export declare class OnlineStorage {
     private readonly _bus;
     private onUserChange;
     private USER_LOCAL_STORAGE_KEY;
-    get AvailableUserPrivileges(): (keyof IStorageUserPrivileges)[];
     get Server(): string;
     get DatabaseDir(): dir;
     constructor(server: url, database: dir, sender?: ISender, bus?: MessageBus);
@@ -32,7 +34,7 @@ export declare class OnlineStorage {
     UpdateUser(user: IStorageUser): Promise<void>;
     DeleteUser(user: IStorageUser): Promise<void>;
     GetDataset<T extends object>(datasetName: string, converter: IConverter<any, T>): Dataset<T>;
-    GetTextDataset(datasetName: string): RawTextDataset;
+    GetTextDataset(datasetName: string, converter?: ITextConverter<any>): TextDataset<any> | RawTextDataset;
     private IsBrowserEnvironment;
     private LoadUserFromLocalStorage;
     get User(): IStorageUser;
@@ -49,7 +51,7 @@ export declare class OnlineStorage {
     Log(...message: any[]): void;
     Ping(): Promise<boolean>;
     Send(message: IMessage): Promise<MessageBusResponse>;
-    CreateDataset(datasetName: string): Promise<void>;
+    CreateDataset(type: DatasetType, datasetName: string): Promise<void>;
     DatasetExists(datasetName: string): Promise<boolean>;
     RemoveDataset(datasetName: string): Promise<void>;
     Move(fileId: string, sourceDataset: Dataset<any>, targetDataset: Dataset<any>): Promise<void>;

package/{OnlineStorage.js → Services/OnlineStorage.js}

@@ -1,23 +1,23 @@
-import { MessageBus } from "./MessageBus/MessageBus";
-import { CreateDatasetCommand } from './Messages/CreateDatasetCommand';
-import { DatasetExistsCommand } from './Messages/DatasetExistsCommand';
-import { RemoveDatasetCommand } from './Messages/RemoveDatasetCommand';
-import { Dataset } from "./Dataset";
-import { MoveFileCommand } from "./Messages/MoveFileCommand";
-import { LoginUserQuery } from "./Messages/LoginUserQuery";
-import { ListUsersQuery } from "./Messages/ListUsersQuery";
-import { UpdateUserCommand } from "./Messages/UpdateUserCommand";
-import { AddUserCommand } from "./Messages/AddUserCommand";
-import { DeleteUserCommand } from "./Messages/DeleteUserCommand";
-import { GetUserQuery } from "./Messages/GetUserQuery";
-import { USER_PRIVILEGES_NAMES } from "./IStorageUserPrivileges";
-import { GetLogQuery } from "./Messages/GetLogQuery";
-import { ListLogsIdsQuery } from "./Messages/GetLogsListQuery";
-import { ListDatabasesQuery } from "./ListDatabasesQuery";
-import { CreateDatabaseCommand } from "./CreateDatabaseCommand";
-import { ListDatasetsQuery } from "./Messages/ListDatabasesQuery";
-import { DeleteDatabaseCommand } from "./DeleteDatabaseCommand";
-import { RawTextDataset } from "./RawTextDataset";
+import { MessageBus } from "../MessageBus/MessageBus";
+import { CreateDatasetCommand } from '../Messages/CreateDatasetCommand';
+import { DatasetExistsCommand } from '../Messages/DatasetExistsCommand';
+import { RemoveDatasetCommand } from '../Messages/RemoveDatasetCommand';
+import { Dataset } from "../Datasets/Dataset";
+import { MoveFileCommand } from "../Messages/MoveFileCommand";
+import { LoginUserQuery } from "../Messages/LoginUserQuery";
+import { ListUsersQuery } from "../Messages/ListUsersQuery";
+import { UpdateUserCommand } from "../Messages/UpdateUserCommand";
+import { AddUserCommand } from "../Messages/AddUserCommand";
+import { DeleteUserCommand } from "../Messages/DeleteUserCommand";
+import { GetUserQuery } from "../Messages/GetUserQuery";
+import { GetLogQuery } from "../Messages/GetLogQuery";
+import { ListLogsIdsQuery } from "../Messages/GetLogsListQuery";
+import { ListDatabasesQuery } from "../Messages/ListDatabasesQuery";
+import { CreateDatabaseCommand } from "../Messages/CreateDatabaseCommand";
+import { ListDatasetsQuery } from '../Messages/ListDatasetsQuery';
+import { DeleteDatabaseCommand } from "../Messages/DeleteDatabaseCommand";
+import { RawTextDataset } from "../Datasets/RawTextDataset";
+import { TextDataset } from "../Datasets/TextDataset";
 export class OnlineStorage {
     server;
     database;
@@ -27,9 +27,6 @@ export class OnlineStorage {
     _bus;
     onUserChange = [];
     USER_LOCAL_STORAGE_KEY = "";
-    get AvailableUserPrivileges() {
-        return USER_PRIVILEGES_NAMES;
-    }
     get Server() {
         return this.server;
     }
@@ -106,8 +103,10 @@ export class OnlineStorage {
     GetDataset(datasetName, converter) {
         return new Dataset(this, converter, datasetName);
     }
-    GetTextDataset(datasetName) {
-        return new RawTextDataset(this, datasetName);
+    GetTextDataset(datasetName, converter) {
+        return converter
+            ? new TextDataset(this, datasetName, converter)
+            : new RawTextDataset(this, datasetName);
     }
     IsBrowserEnvironment() {
         return typeof window !== "undefined" && typeof window.localStorage !== "undefined";
@@ -209,9 +208,9 @@ export class OnlineStorage {
         }
         return result;
     }
-    async CreateDataset(datasetName) {
-        this.Log(`Creating dataset "${datasetName}"...`);
-        const result = await this._bus.SendMessage(new CreateDatasetCommand(this.DatabaseDir, datasetName));
+    async CreateDataset(type, datasetName) {
+        this.Log(`Creating dataset "${datasetName}" of ${type} type...`);
+        const result = await this._bus.SendMessage(new CreateDatasetCommand(this.DatabaseDir, type, datasetName));
         if (!result.IsSuccess) {
             throw new Error(`Failed to add dataset: ${result.ErrorMessage}`);
         }

package/index.d.ts

@@ -1,19 +1,24 @@
 export * from "./Types/dir";
-export * from "./IStorageUserPrivileges";
-export * from "./IEntitiesSet";
-export * from "./IStorageUser";
-export * from "./IConverter";
-export * from "./Converter";
-export * from "./DummyConverter";
-export * from "./TextConverter";
-export * from "./JsonTextConverter";
-export * from "./IRepoBase";
-export * from "./IRepo";
-export * from "./ITextRepo";
-export * from "./IRepos";
-export * from "./Dataset";
-export * from "./RawTextDataset";
-export * from "./TextDataset";
-export * from "./Datasets";
-export * from "./OnlineStorage";
-export * from "./Utils/OperationRepeater";
+export * from "./Models/IStorageUserPrivileges";
+export * from "./Models/IEntitiesSet";
+export * from "./Models/IStorageUser";
+export * from "./Converters/IConverter";
+export * from "./Converters/Converter";
+export * from "./Converters/DummyConverter";
+export * from "./Converters/ITextConverter";
+export * from "./Converters/JsonTextConverter";
+export * from "./Datasets/IRepoBase";
+export * from "./Datasets/IRepo";
+export * from "./Datasets/ITextRepo";
+export * from "./Datasets/IRepos";
+export * from "./Datasets/DatasetBase";
+export * from "./Datasets/Dataset";
+export * from "./Datasets/RawTextDataset";
+export * from "./Datasets/TextDataset";
+export * from "./Datasets/PicturesDataset/PicturesDataset";
+export * from "./Datasets/PicturesDataset/PicConfig";
+export * from "./Datasets/PicturesDataset/PicsConfig";
+export * from "./Datasets/PicturesDataset/PicturePack";
+export * from "./Datasets/PicturesDataset/PicturesUploadResult";
+export * from "./Services/DatasetType";
+export * from "./Services/OnlineStorage";

package/index.js

@@ -1,19 +1,24 @@
 export * from "./Types/dir";
-export * from "./IStorageUserPrivileges";
-export * from "./IEntitiesSet";
-export * from "./IStorageUser";
-export * from "./IConverter";
-export * from "./Converter";
-export * from "./DummyConverter";
-export * from "./TextConverter";
-export * from "./JsonTextConverter";
-export * from "./IRepoBase";
-export * from "./IRepo";
-export * from "./ITextRepo";
-export * from "./IRepos";
-export * from "./Dataset";
-export * from "./RawTextDataset";
-export * from "./TextDataset";
-export * from "./Datasets";
-export * from "./OnlineStorage";
-export * from "./Utils/OperationRepeater";
+export * from "./Models/IStorageUserPrivileges";
+export * from "./Models/IEntitiesSet";
+export * from "./Models/IStorageUser";
+export * from "./Converters/IConverter";
+export * from "./Converters/Converter";
+export * from "./Converters/DummyConverter";
+export * from "./Converters/ITextConverter";
+export * from "./Converters/JsonTextConverter";
+export * from "./Datasets/IRepoBase";
+export * from "./Datasets/IRepo";
+export * from "./Datasets/ITextRepo";
+export * from "./Datasets/IRepos";
+export * from "./Datasets/DatasetBase";
+export * from "./Datasets/Dataset";
+export * from "./Datasets/RawTextDataset";
+export * from "./Datasets/TextDataset";
+export * from "./Datasets/PicturesDataset/PicturesDataset";
+export * from "./Datasets/PicturesDataset/PicConfig";
+export * from "./Datasets/PicturesDataset/PicsConfig";
+export * from "./Datasets/PicturesDataset/PicturePack";
+export * from "./Datasets/PicturesDataset/PicturesUploadResult";
+export * from "./Services/DatasetType";
+export * from "./Services/OnlineStorage";

package/package.json

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

package/DatasetInfo.d.ts

@@ -1,4 +0,0 @@
-export interface DatasetInfo {
-    Name: string;
-    FilesCount: number;
-}

package/Datasets.d.ts

@@ -1,22 +0,0 @@
-import { IConverter } from "./IConverter";
-import { IRepos } from "./IRepos";
-import { IStorageUserPrivileges } from "./IStorageUserPrivileges";
-import { OnlineStorage } from "./OnlineStorage";
-import { dir } from "./Types/dir";
-export declare class Datasets<T extends object> implements IRepos<T> {
-    private _db;
-    private _converter;
-    private datasets;
-    constructor(_db: OnlineStorage, _converter: IConverter<any, T>, datasets: dir[]);
-    get Names(): string[];
-    get Database(): OnlineStorage;
-    CanUserDo(action: keyof IStorageUserPrivileges): boolean;
-    GetOne(dataset: dir, id: string): Promise<T>;
-    GetAll(dataset: dir): Promise<T[]>;
-    GetAllIds(dataset: dir): Promise<string[]>;
-    Add(dataset: dir, id: string, item: T): Promise<void>;
-    Update(dataset: dir, id: string, item: T): Promise<void>;
-    Move(id: string, sourceDataset: dir, targetDataset: dir): Promise<void>;
-    Delete(dataset: dir, id: string): Promise<void>;
-    Drop(datasets?: dir[]): Promise<void>;
-}

package/Datasets.js

@@ -1,147 +0,0 @@
-import { AddFileCommand } from "./Messages/AddFileCommand";
-import { DeleteFileCommand } from "./Messages/DeleteFileCommand";
-import { DropDatasetCommand } from "./Messages/DropDatasetCommand";
-import { GetFileQuery } from "./Messages/GetFileQuery";
-import { ListFilesIdsQuery } from "./Messages/ListFilesIdsQuery";
-import { ListFilesQuery } from "./Messages/ListFilesQuery";
-import { MoveFileCommand } from "./Messages/MoveFileCommand";
-import { UpdateFileCommand } from "./Messages/UpdateFileCommand";
-export class Datasets {
-    _db;
-    _converter;
-    datasets;
-    constructor(_db, _converter, datasets) {
-        this._db = _db;
-        this._converter = _converter;
-        this.datasets = datasets;
-        if (datasets.length <= 1) {
-            throw new Error("Datasets must have at least 2 datasets. If one - use Dataset<T> instead.");
-        }
-    }
-    get Names() {
-        return this.datasets;
-    }
-    get Database() {
-        return this._db;
-    }
-    CanUserDo(action) {
-        if (!this._db.User.Privileges) {
-            return false;
-        }
-        const privilege = this._db.User.Privileges[action];
-        if (!privilege) {
-            return false;
-        }
-        // ex. AddFile: { Datasets: "all" } or AddFile: { Datasets: ["Public"] }
-        if (typeof privilege === "object") {
-            const allowedDatasets = privilege.Datasets;
-            // ex. AddFile: { Datasets: "all" }
-            if (typeof allowedDatasets === "string") {
-                if (allowedDatasets == "all") {
-                    return true;
-                }
-                else if (allowedDatasets == "none") {
-                    return false;
-                }
-                else {
-                    return false;
-                }
-            }
-            // ex. AddFile: { Datasets: ["Public"] }
-            else if (typeof allowedDatasets === "object") {
-                if (Array.isArray(allowedDatasets)) {
-                    for (const dataset of this.datasets) {
-                        if (allowedDatasets.includes(dataset)) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }
-            }
-        }
-        // ex. CreateUser: true
-        else if (typeof privilege === "boolean") {
-            return privilege;
-        }
-        return false;
-    }
-    async GetOne(dataset, id) {
-        this._db.Log(`Fetching "${id}" from "${dataset}"...`);
-        const queryResult = await this._db.Send(new GetFileQuery(this._db.DatabaseDir, dataset, id));
-        if (!queryResult.IsSuccess) {
-            throw new Error("Failed to get one item: " + queryResult.ErrorMessage);
-        }
-        const rawItem = queryResult.Result;
-        const item = this._converter.FromRaw(rawItem);
-        this._db.Log(`Fetched "${id}" from "${dataset}".`);
-        return item;
-    }
-    async GetAll(dataset) {
-        this._db.Log(`Fetching all from "${dataset}"...`);
-        const queryResult = await this._db.Send(new ListFilesQuery(this._db.DatabaseDir, dataset));
-        if (!queryResult.IsSuccess) {
-            throw new Error("Failed to fetch all items: " + queryResult.ErrorMessage);
-        }
-        const rawItems = queryResult.Result;
-        const items = rawItems.map((raw) => this._converter.FromRaw(raw));
-        this._db.Log(`Fetched ${items.length} items from "${dataset}".`);
-        return items;
-    }
-    async GetAllIds(dataset) {
-        this._db.Log(`Fetching all files IDs from "${dataset}"...`);
-        const queryResult = await this._db.Send(new ListFilesIdsQuery(this._db.DatabaseDir, dataset));
-        if (!queryResult.IsSuccess) {
-            throw new Error("Failed to fetch all items ids: " + queryResult.ErrorMessage);
-        }
-        const ids = queryResult.Result;
-        this._db.Log(`Found ${ids.length} files in "${dataset}".`);
-        return ids;
-    }
-    async Add(dataset, id, item) {
-        this._db.Log(`Adding "${id}" to "${dataset}"...`);
-        const rawItem = this._converter.ToRaw(item);
-        const result = await this._db.Send(new AddFileCommand(this._db.DatabaseDir, dataset, id, rawItem));
-        if (!result.IsSuccess) {
-            throw new Error("Failed to add item: " + result.ErrorMessage);
-        }
-        this._db.Log(`"${id}" added to "${dataset}".`);
-    }
-    ;
-    async Update(dataset, id, item) {
-        this._db.Log(`Updating "${id}"...`);
-        const rawItem = this._converter.ToRaw(item);
-        const result = await this._db.Send(new UpdateFileCommand(this._db.DatabaseDir, dataset, id, rawItem));
-        if (!result.IsSuccess) {
-            throw new Error("Failed to update item: " + result.ErrorMessage);
-        }
-        this._db.Log(`"${id}" updated in "${dataset}".`);
-    }
-    ;
-    async Move(id, sourceDataset, targetDataset) {
-        this._db.Log(`Moving "${id}" from "${sourceDataset}" to "${targetDataset}"...`);
-        const result = await this._db.Send(new MoveFileCommand(this._db.DatabaseDir, id, sourceDataset, targetDataset));
-        if (!result.IsSuccess) {
-            throw new Error("Failed to move item: " + result.ErrorMessage);
-        }
-        this._db.Log(`"${id}" moved from "${sourceDataset}" to "${targetDataset}".`);
-    }
-    async Delete(dataset, id) {
-        this._db.Log(`Deleting "${id}" from "${dataset}"...`);
-        const result = await this._db.Send(new DeleteFileCommand(this._db.DatabaseDir, dataset, id));
-        if (!result.IsSuccess) {
-            throw new Error("Failed to delete item: " + result.ErrorMessage);
-        }
-        this._db.Log(`Deleted "${id}" from "${dataset}".`);
-    }
-    async Drop(datasets) {
-        this._db.Log(`Dropping "${(datasets ? datasets.join(", ") : "all")}" datasets...`);
-        for (const dataset of datasets ?? this.datasets) {
-            const result = await this._db.Send(new DropDatasetCommand(this._db.DatabaseDir, dataset));
-            if (!result.IsSuccess) {
-                throw new Error("Failed to drop dataset: " + result.ErrorMessage);
-            }
-            this._db.Log(`"${dataset}" dropped.`);
-        }
-        ;
-    }
-}

package/IStorageUserPrivileges.js

@@ -1,20 +0,0 @@
-export const USER_PRIVILEGES_NAMES = [
-    "GetFile",
-    "AddFile",
-    "DropDataset",
-    "ListFiles",
-    "UpdateFile",
-    "DeleteFile",
-    "CreateDataset",
-    "DatasetExists",
-    "RemoveDataset",
-    "MoveFile",
-    "GetUser",
-    "UpdateUser",
-    "AddUser",
-    "DeleteUser",
-    "ListDatasets",
-    "ListUsers",
-    "Search",
-    "GetLogs",
-];

package/JsonTextConverter.d.ts

@@ -1,5 +0,0 @@
-import { TextConverter } from "./TextConverter";
-export declare class JsonTextConverter<T> implements TextConverter<T> {
-    ToLine(entry: T): string;
-    ToEntry(line: string): T;
-}

package/ListDatabasesQuery.d.ts

@@ -1,4 +0,0 @@
-import { Message } from "./MessageBus/Message";
-export declare class ListDatabasesQuery extends Message {
-    constructor();
-}

package/ListDatabasesQuery.js

@@ -1,6 +0,0 @@
-import { Message } from "./MessageBus/Message";
-export class ListDatabasesQuery extends Message {
-    constructor() {
-        super("ListDatabases", {});
-    }
-}

package/Utils/Delay.d.ts

@@ -1 +0,0 @@
-export declare function Delay(ms: number): Promise<unknown>;

package/Utils/Delay.js

@@ -1,3 +0,0 @@
-export function Delay(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}

package/Utils/OperationRepeater.d.ts

@@ -1,3 +0,0 @@
-export declare class OperationRepeater {
-    RepeatTillSuccess(actionName: string, action: () => Promise<boolean>, attempts?: number, delay?: number): Promise<boolean>;
-}

package/Utils/OperationRepeater.js

@@ -1,19 +0,0 @@
-import { Delay } from "./Delay";
-export class OperationRepeater {
-    async RepeatTillSuccess(actionName, action, attempts = 5, delay = 3000) {
-        for (let i = 1; i <= attempts; i++) {
-            console.log(i == 1 ? `Starting "${actionName}"...` : `Retrying (attempt ${i}/${attempts})...`);
-            const result = await action();
-            if (result == true) {
-                console.log(`Operation "${actionName}" completed successfully.`);
-                return true;
-            }
-            else {
-                console.log(`Operation "${actionName}" failed. Next attempt in ${i * delay}ms...`);
-                await Delay(i * delay);
-            }
-        }
-        console.log(`Could not complete "${actionName}" after ${attempts} attempts. Operation failed.`);
-        return false;
-    }
-}