@tblabs/storage 5.11.0 → 5.12.1

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.1",
   "description": "online storage module with auth",
   "license": "beerware",
   "main": "index.js",

package/DatasetBase.d.ts

@@ -1,13 +0,0 @@
-import { IStorageUserPrivileges } from "./IStorageUserPrivileges";
-import { OnlineStorage } from "./OnlineStorage";
-import { dir } from "./Types/dir";
-export declare class DatasetBase {
-    protected _db: OnlineStorage;
-    protected dataset: dir;
-    constructor(_db: OnlineStorage, dataset: dir);
-    get Name(): string;
-    get Database(): OnlineStorage;
-    protected get DatasetPath(): string;
-    CanUserDo(action: keyof IStorageUserPrivileges): boolean;
-    protected Log(message: string): void;
-}

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;
-    }
-}