@tblabs/storage 5.15.1 → 5.15.4

package/Datasets/File/FileDataset.d.ts

@@ -3,11 +3,15 @@ import { dir } from "../../Types/dir";
 import { DatasetBase } from "../DatasetBase";
 import { DatasetType } from "../../Services/DatasetType";
 import { FilePack } from "./FilePack";
+import { FilesUploadConfig } from "../../Models/FilesUploadConfig";
 export declare class FileDataset extends DatasetBase {
     protected _db: OnlineStorage;
     protected dataset: dir;
     Type: DatasetType;
-    constructor(_db: OnlineStorage, dataset: dir);
+    private config;
+    constructor(_db: OnlineStorage, dataset: dir, config?: Partial<FilesUploadConfig>);
+    SetConfig(config: Partial<FilesUploadConfig>): void;
+    GetConfig(): FilesUploadConfig;
     GetAllIds(): Promise<string[]>;
     GetOne(fileId: string): Promise<FilePack>;
     GetAll(): Promise<FilePack[]>;

package/Datasets/File/FileDataset.js

@@ -4,14 +4,25 @@ import { ListFilesQuery } from "../../Messages/ListFilesQuery";
 import { ListFilesIdsQuery } from "../../Messages/ListFilesIdsQuery";
 import { GetFileQuery } from "../../Messages/GetFileQuery";
 import { DeleteFileCommand } from "../../Messages/DeleteFileCommand";
+import { DefaultFilesUploadConfig } from "../../Models/FilesUploadConfig";
 export class FileDataset extends DatasetBase {
     _db;
     dataset;
     Type = DatasetType.File;
-    constructor(_db, dataset) {
+    config = new DefaultFilesUploadConfig();
+    constructor(_db, dataset, config) {
         super(_db, dataset);
         this._db = _db;
         this.dataset = dataset;
+        if (config) {
+            this.config = { ...this.config, ...config };
+        }
+    }
+    SetConfig(config) {
+        this.config = { ...this.config, ...config };
+    }
+    GetConfig() {
+        return this.config;
     }
     async GetAllIds() {
         const result = await this._db.Send(new ListFilesIdsQuery(this._db.DatabaseDir, this.dataset));
@@ -47,6 +58,7 @@ export class FileDataset extends DatasetBase {
             formData.append('database', this._db.DatabaseDir);
             formData.append('dataset', this.dataset);
             formData.append('userId', this._db.User.Id);
+            formData.append('config', JSON.stringify(this.config));
             let serverUrl = this._db.Server;
             if (serverUrl.endsWith("/")) // Because for local env we use ".../src/" but for prod ".../v5"
              {

package/Datasets/Object/IRepos.d.ts

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

package/Datasets/Object/IRepos.js

@@ -1 +1,2 @@
+// import { IStorageUserPrivileges } from "../../Models/IStorageUserPrivileges";
 export {};

package/Datasets/Object/ObjectDatasets.d.ts

@@ -0,0 +1,20 @@
+import { IConverter } from "../../Converters/IConverter";
+import { IRepos } from "./IRepos";
+import { OnlineStorage } from "../../Services/OnlineStorage";
+import { dir } from "../../Types/dir";
+export declare class ObjectDatasets<T extends object> implements IRepos<T> {
+    private _db;
+    private datasets;
+    private _converter;
+    constructor(_db: OnlineStorage, datasets: dir[], _converter?: IConverter<any, T>);
+    get Names(): string[];
+    get Database(): OnlineStorage;
+    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/Object/ObjectDatasets.js

@@ -0,0 +1,161 @@
+import { DropDatasetCommand } from "../../Messages/DropDatasetCommand";
+import { MoveObjectCommand } from "../../Messages/MoveObjectCommand";
+import { DummyConverter } from "../../Converters/DummyConverter";
+import { AddObjectCommand } from "../../Messages/AddObjectCommand";
+import { UpdateObjectCommand } from "../../Messages/UpdateObjectCommand";
+import { ListObjectsIdsQuery } from "../../Messages/ListObjectsIdsQuery";
+import { ListObjectsQuery } from "../../Messages/ListObjectsQuery";
+import { GetObjectQuery } from "../../Messages/GetObjectQuery";
+import { DeleteObjectCommand } from "../../Messages/DeleteObjectCommand";
+export class ObjectDatasets {
+    _db;
+    datasets;
+    _converter;
+    constructor(_db, datasets, _converter = new DummyConverter()) {
+        this._db = _db;
+        this.datasets = datasets;
+        this._converter = _converter;
+        if (datasets.length <= 1) {
+            throw new Error("Datasets must have at least 2 datasets. If one - use ObjectDataset<T> instead.");
+        }
+    }
+    get Names() {
+        return this.datasets;
+    }
+    get Database() {
+        return this._db;
+    }
+    // public CanUserDo(action: keyof IStorageUserPrivileges): boolean
+    // {
+    // 	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 GetObjectQuery(this._db.DatabaseDir, dataset, id));
+        if (!queryResult.IsSuccess) {
+            throw new Error("Failed to get one object: " + 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 ListObjectsQuery(this._db.DatabaseDir, dataset));
+        if (!queryResult.IsSuccess) {
+            throw new Error("Failed to fetch all objects: " + 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 objects IDs from "${dataset}"...`);
+        const queryResult = await this._db.Send(new ListObjectsIdsQuery(this._db.DatabaseDir, dataset));
+        if (!queryResult.IsSuccess) {
+            throw new Error("Failed to fetch all objects ids: " + queryResult.ErrorMessage);
+        }
+        const ids = queryResult.Result;
+        this._db.Log(`Found ${ids.length} objects 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 AddObjectCommand(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 UpdateObjectCommand(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 MoveObjectCommand(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 DeleteObjectCommand(this._db.DatabaseDir, dataset, id));
+        if (!result.IsSuccess) {
+            throw new Error("Failed to delete object: " + 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/Datasets/Picture/DefaultPicsConfig.d.ts

@@ -1,2 +1,5 @@
 import { PicsConfig } from "./PicsConfig";
-export declare const DefaultPicsConfig: PicsConfig;
+export declare class DefaultPicsConfig implements PicsConfig {
+    KeepSource: boolean;
+    Sizes: {};
+}

package/Datasets/Picture/DefaultPicsConfig.js

@@ -1,4 +1,4 @@
-export const DefaultPicsConfig = {
-    KeepSource: true,
-    Sizes: {}
-};
+export class DefaultPicsConfig {
+    KeepSource = true;
+    Sizes = {};
+}

package/Datasets/Picture/{PicturesDataset.d.ts → PictureDataset.d.ts}

@@ -4,13 +4,13 @@ import { DatasetBase } from "../DatasetBase";
 import { PicsConfig } from "./PicsConfig";
 import { PicturePack } from "./PicturePack";
 import { DatasetType } from "../../Services/DatasetType";
-export declare class PicturesDataset extends DatasetBase {
+export declare class PictureDataset extends DatasetBase {
     protected _db: OnlineStorage;
     protected dataset: dir;
-    protected picsConfig: PicsConfig;
     Type: DatasetType;
-    constructor(_db: OnlineStorage, dataset: dir, picsConfig?: PicsConfig);
-    SetConfig(config: PicsConfig): void;
+    private picsConfig;
+    constructor(_db: OnlineStorage, dataset: dir, config?: Partial<PicsConfig>);
+    SetConfig(config: Partial<PicsConfig>): void;
     GetConfig(): PicsConfig;
     GetAllIds(): Promise<string[]>;
     GetOne(pictureDir: string): Promise<PicturePack>;

package/Datasets/Picture/{PicturesDataset.js → PictureDataset.js}

@@ -5,19 +5,21 @@ import { DefaultPicsConfig } from "./DefaultPicsConfig";
 import { DatasetType } from "../../Services/DatasetType";
 import { ListPicturesIdsQuery } from "../../Messages/ListPicturesIdsQuery";
 import { GetPictureQuery } from "../../Messages/GetPictureQuery";
-export class PicturesDataset extends DatasetBase {
+export class PictureDataset extends DatasetBase {
     _db;
     dataset;
-    picsConfig;
     Type = DatasetType.Picture;
-    constructor(_db, dataset, picsConfig = DefaultPicsConfig) {
+    picsConfig = new DefaultPicsConfig();
+    constructor(_db, dataset, config) {
         super(_db, dataset);
         this._db = _db;
         this.dataset = dataset;
-        this.picsConfig = picsConfig;
+        if (config) {
+            this.picsConfig = { ...this.picsConfig, ...config };
+        }
     }
     SetConfig(config) {
-        this.picsConfig = config;
+        this.picsConfig = { ...this.picsConfig, ...config };
     }
     GetConfig() {
         return this.picsConfig;

package/Models/DatasetMetadata.d.ts

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

package/Models/FileDatasetMetadata.d.ts

@@ -0,0 +1,5 @@
+import { DatasetMetadata } from "./DatasetMetadata";
+import { FilesUploadConfig } from "./FilesUploadConfig";
+export interface FileDatasetMetadata extends DatasetMetadata {
+    Config: FilesUploadConfig;
+}

package/Models/FileDatasetMetadata.js

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

package/Models/FilesUploadConfig.d.ts

@@ -0,0 +1,10 @@
+export interface FilesUploadConfig {
+    MaxDatasetSize: number;
+    SingleFileMaxSize: number;
+    AllowedExtensions: "any" | string[];
+}
+export declare class DefaultFilesUploadConfig implements FilesUploadConfig {
+    MaxDatasetSize: number;
+    SingleFileMaxSize: number;
+    AllowedExtensions: "any" | string[];
+}

package/Models/FilesUploadConfig.js

@@ -0,0 +1,5 @@
+export class DefaultFilesUploadConfig {
+    MaxDatasetSize = 1024 * 1024 * 1024; // 1GB
+    SingleFileMaxSize = 100 * 1024 * 1024; // 100MB
+    AllowedExtensions = "any";
+}

package/Models/PictureDatasetMetadata.d.ts

@@ -0,0 +1,5 @@
+import { PicsConfig } from "../Datasets/Picture/PicsConfig";
+import { DatasetMetadata } from "./DatasetMetadata";
+export interface PictureDatasetMetadata extends DatasetMetadata {
+    Config: PicsConfig;
+}

package/Models/PictureDatasetMetadata.js

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

package/Services/OnlineStorage.d.ts

@@ -13,9 +13,11 @@ import { RawTextDataset } from "../Datasets/Text/RawTextDataset";
 import { TextDataset } from "../Datasets/Text/TextDataset";
 import { ITextConverter } from "../Converters/ITextConverter";
 import { DatasetType } from "./DatasetType";
-import { PicturesDataset } from "../Datasets/Picture/PicturesDataset";
+import { PictureDataset } from "../Datasets/Picture/PictureDataset";
 import { PicsConfig } from "../Datasets/Picture/PicsConfig";
 import { FileDataset } from "../Datasets/File/FileDataset";
+import { FilesUploadConfig } from "../Models/FilesUploadConfig";
+import { ObjectDatasets } from "../Datasets/Object/ObjectDatasets";
 export declare class OnlineStorage {
     private server;
     private database;
@@ -40,9 +42,10 @@ export declare class OnlineStorage {
     UpdateUser(user: IStorageUser): Promise<void>;
     DeleteUser(user: IStorageUser): Promise<void>;
     GetObjectDataset<T extends object>(datasetName: string, converter?: IConverter<any, T>): ObjectDataset<T>;
+    GetObjectDatasets<T extends object>(datasestNames: string[], converter?: IConverter<any, T>): ObjectDatasets<T>;
     GetTextDataset(datasetName: string, converter?: ITextConverter<any>): TextDataset<any> | RawTextDataset;
-    GetPictureDataset(datasetName: string, picsConfig?: PicsConfig): PicturesDataset;
-    GetFileDataset(datasetName: string): FileDataset;
+    GetPictureDataset(datasetName: string, picsConfig?: PicsConfig): PictureDataset;
+    GetFileDataset(datasetName: string, config?: Partial<FilesUploadConfig>): FileDataset;
     private IsBrowserEnvironment;
     private LoadUserFromLocalStorage;
     Login(password: string, login?: string): Promise<IStorageUser>;

package/Services/OnlineStorage.js

@@ -18,8 +18,9 @@ import { ListDatasetsQuery } from '../Messages/ListDatasetsQuery';
 import { DeleteDatabaseCommand } from "../Messages/DeleteDatabaseCommand";
 import { RawTextDataset } from "../Datasets/Text/RawTextDataset";
 import { TextDataset } from "../Datasets/Text/TextDataset";
-import { PicturesDataset } from "../Datasets/Picture/PicturesDataset";
+import { PictureDataset } from "../Datasets/Picture/PictureDataset";
 import { FileDataset } from "../Datasets/File/FileDataset";
+import { ObjectDatasets } from "../Datasets/Object/ObjectDatasets";
 export class OnlineStorage {
     server;
     database;
@@ -111,16 +112,19 @@ export class OnlineStorage {
     GetObjectDataset(datasetName, converter) {
         return new ObjectDataset(this, datasetName, converter);
     }
+    GetObjectDatasets(datasestNames, converter) {
+        return new ObjectDatasets(this, datasestNames, converter);
+    }
     GetTextDataset(datasetName, converter) {
         return converter
             ? new TextDataset(this, datasetName, converter)
             : new RawTextDataset(this, datasetName);
     }
     GetPictureDataset(datasetName, picsConfig) {
-        return new PicturesDataset(this, datasetName, picsConfig);
+        return new PictureDataset(this, datasetName, picsConfig);
     }
-    GetFileDataset(datasetName) {
-        return new FileDataset(this, datasetName);
+    GetFileDataset(datasetName, config) {
+        return new FileDataset(this, datasetName, config);
     }
     IsBrowserEnvironment() {
         return typeof window !== "undefined" && typeof window.localStorage !== "undefined";

package/index.d.ts

@@ -3,25 +3,29 @@ export * from "./Models/IStorageUserPrivileges";
 export * from "./Models/IEntitiesSet";
 export * from "./Models/IStorageUser";
 export * from "./Models/DatabaseInfo";
-export * from "./Models/DatasetMetadata";
 export * from "./Datasets/IRepoBase";
 export * from "./Datasets/Object/IRepo";
 export * from "./Datasets/Text/ITextRepo";
 export * from "./Datasets/Object/IRepos";
+export * from "./Models/DatasetMetadata";
 export * from "./Datasets/DatasetBase";
 export * from "./Services/DatasetType";
 export * from "./Converters/IConverter";
 export * from "./Converters/Converter";
 export * from "./Datasets/Object/ObjectDataset";
+export * from "./Datasets/Object/ObjectDatasets";
 export * from "./Converters/DummyConverter";
 export * from "./Datasets/Text/RawTextDataset";
 export * from "./Datasets/Text/TextDataset";
 export * from "./Converters/ITextConverter";
 export * from "./Converters/JsonTextConverter";
-export * from "./Datasets/Picture/PicturesDataset";
+export * from "./Datasets/Picture/PictureDataset";
 export * from "./Datasets/Picture/PicConfig";
 export * from "./Datasets/Picture/PicsConfig";
 export * from "./Datasets/Picture/PicturePack";
+export * from "./Models/PictureDatasetMetadata";
 export * from "./Datasets/File/FileDataset";
 export * from "./Datasets/File/FilePack";
+export * from "./Models/FileDatasetMetadata";
+export * from "./Models/FilesUploadConfig";
 export * from "./Services/OnlineStorage";

package/index.js

@@ -3,18 +3,19 @@ export * from "./Models/IStorageUserPrivileges";
 export * from "./Models/IEntitiesSet";
 export * from "./Models/IStorageUser";
 export * from "./Models/DatabaseInfo";
-export * from "./Models/DatasetMetadata";
 export * from "./Datasets/IRepoBase";
 export * from "./Datasets/Object/IRepo";
 export * from "./Datasets/Text/ITextRepo";
 export * from "./Datasets/Object/IRepos";
 // Common for datasets
+export * from "./Models/DatasetMetadata";
 export * from "./Datasets/DatasetBase";
 export * from "./Services/DatasetType";
 export * from "./Converters/IConverter";
 export * from "./Converters/Converter";
 // Object datasets
 export * from "./Datasets/Object/ObjectDataset";
+export * from "./Datasets/Object/ObjectDatasets";
 export * from "./Converters/DummyConverter";
 // Text datasets
 export * from "./Datasets/Text/RawTextDataset";
@@ -22,12 +23,15 @@ export * from "./Datasets/Text/TextDataset";
 export * from "./Converters/ITextConverter";
 export * from "./Converters/JsonTextConverter";
 // Picture datasets
-export * from "./Datasets/Picture/PicturesDataset";
+export * from "./Datasets/Picture/PictureDataset";
 export * from "./Datasets/Picture/PicConfig";
 export * from "./Datasets/Picture/PicsConfig";
 export * from "./Datasets/Picture/PicturePack";
+export * from "./Models/PictureDatasetMetadata";
 // File datasets
 export * from "./Datasets/File/FileDataset";
 export * from "./Datasets/File/FilePack";
+export * from "./Models/FileDatasetMetadata";
+export * from "./Models/FilesUploadConfig";
 // Storage
 export * from "./Services/OnlineStorage";

package/package.json

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

package/Messages/DropPicturesCommand.d.ts

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

package/Messages/DropPicturesCommand.js

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