@tblabs/storage 5.15.0 → 5.15.3

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"
              {
@@ -59,8 +71,6 @@ export class FileDataset extends DatasetBase {
             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);

package/Datasets/File/FilePack.d.ts

@@ -1,7 +1,10 @@
 export interface FilePack {
     Id: string;
     Name: string;
-    OryginalName: number;
+    OriginalName: string;
     Extension: string;
     Url: string;
+    Size: number;
+    CreatedAt: Date;
+    CreatedBy: string;
 }

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,10 @@ 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";
 export declare class OnlineStorage {
     private server;
     private database;
@@ -41,8 +42,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;
-    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,7 +18,7 @@ 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";
 export class OnlineStorage {
     server;
@@ -117,10 +117,10 @@ export class OnlineStorage {
             : 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,28 @@ export * from "./Models/IStorageUserPrivileges";
 export * from "./Models/IEntitiesSet";
 export * from "./Models/IStorageUser";
 export * from "./Models/DatabaseInfo";
-export * from "./Models/DatasetMetadata";
-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/Object/IRepo";
 export * from "./Datasets/Text/ITextRepo";
 export * from "./Datasets/Object/IRepos";
-export * from "./Datasets/File/FileDataset";
-export * from "./Datasets/File/FilePack";
+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 "./Converters/DummyConverter";
 export * from "./Datasets/Text/RawTextDataset";
 export * from "./Datasets/Text/TextDataset";
-export * from "./Datasets/Picture/PicturesDataset";
+export * from "./Converters/ITextConverter";
+export * from "./Converters/JsonTextConverter";
+export * from "./Datasets/Picture/PictureDataset";
 export * from "./Datasets/Picture/PicConfig";
 export * from "./Datasets/Picture/PicsConfig";
 export * from "./Datasets/Picture/PicturePack";
-export * from "./Services/DatasetType";
+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,25 +3,34 @@ export * from "./Models/IStorageUserPrivileges";
 export * from "./Models/IEntitiesSet";
 export * from "./Models/IStorageUser";
 export * from "./Models/DatabaseInfo";
-export * from "./Models/DatasetMetadata";
-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/Object/IRepo";
 export * from "./Datasets/Text/ITextRepo";
 export * from "./Datasets/Object/IRepos";
-export * from "./Datasets/File/FileDataset";
-export * from "./Datasets/File/FilePack";
+// 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 "./Converters/DummyConverter";
+// Text datasets
 export * from "./Datasets/Text/RawTextDataset";
 export * from "./Datasets/Text/TextDataset";
-export * from "./Datasets/Picture/PicturesDataset";
+export * from "./Converters/ITextConverter";
+export * from "./Converters/JsonTextConverter";
+// Picture datasets
+export * from "./Datasets/Picture/PictureDataset";
 export * from "./Datasets/Picture/PicConfig";
 export * from "./Datasets/Picture/PicsConfig";
 export * from "./Datasets/Picture/PicturePack";
-export * from "./Services/DatasetType";
+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.0",
+  "version": "5.15.3",
   "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 });
-    }
-}