@tblabs/storage 1.0.0 → 1.2.0

package/IRepo.d.ts

@@ -1,11 +1,12 @@
 export interface IRepo<T> {
     Ping(): Promise<boolean>;
-    Delete(folder: string, id: string): Promise<void>;
-    Update(folder: string, id: string, item: T): Promise<void>;
+    Add(folder: string, id: string, item: T): Promise<void>;
+    GetAll(folder: string): Promise<T[]>;
     GetOne(folder: string, id: string): Promise<T | null>;
     FindOne(id: string): Promise<T | null>;
-    GetAll(folder: string): Promise<T[]>;
     GetAllIds(folder: string): Promise<string[]>;
+    Update(folder: string, id: string, item: T): Promise<void>;
+    Delete(folder: string, id: string): Promise<void>;
     Move(id: string, sourceFolder: string, targetFolder: string): Promise<void>;
     Drop(): Promise<void>;
 }

package/Messages/AddCommand.d.ts

@@ -0,0 +1,4 @@
+import { Message } from '../MessageBus/Message';
+export declare class AddCommand extends Message {
+    constructor(Id: string, Folder: string, Content: object);
+}

package/Messages/AddCommand.js

@@ -0,0 +1,12 @@
+import { Message } from '../MessageBus/Message';
+export class AddCommand extends Message {
+    constructor(Id, Folder, Content) {
+        if (!Id) {
+            throw new Error(`Id not specified!`);
+        }
+        if (!Folder) {
+            throw new Error(`Folder not specified!`);
+        }
+        super("Add", { Id, Folder, Content });
+    }
+}

package/Messages/AddDirCommand.d.ts

@@ -0,0 +1,4 @@
+import { Message } from '../MessageBus/Message';
+export declare class AddDirCommand extends Message {
+    constructor(Folder: string);
+}

package/Messages/AddDirCommand.js

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

package/OnlineRepo.d.ts

@@ -1,18 +1,22 @@
 import { IRepo } from "./IRepo";
-import { MessageBus } from "./MessageBus/MessageBus";
+import { ISender } from "./MessageBus/ISender";
 export declare class OnlineRepo<T extends object> implements IRepo<T> {
-    private _bus;
-    private storageFolder;
+    private server;
+    private databaseFolder;
+    private user;
     LOG: boolean;
-    constructor(_bus: MessageBus, storageFolder: string);
+    private readonly _bus;
+    constructor(server: string, databaseFolder: string, user: ISender);
     private Log;
     Ping(): Promise<boolean>;
     GetOne(folder: string, id: string): Promise<T | null>;
     FindOne(id: string): Promise<T | null>;
     GetAll(folder: string): Promise<T[]>;
     GetAllIds(folder: string): Promise<string[]>;
+    Add(folder: string, id: string, item: T): Promise<void>;
     Update(folder: string, id: string, item: T): Promise<void>;
     Delete(folder: string, id: string): Promise<void>;
     Drop(): Promise<void>;
     Move(id: string, sourceFolder: string, targetFolder: string): Promise<void>;
+    AddDir(targetFolder: string): Promise<void>;
 }

package/OnlineRepo.js

@@ -5,13 +5,20 @@ import { ListQuery } from "./Messages/ListQuery";
 import { MoveCommand } from "./Messages/MoveCommand";
 import { ReadQuery } from "./Messages/ReadQuery";
 import { UpdateCommand } from "./Messages/UpdateCommand";
+import { MessageBus } from "./MessageBus/MessageBus";
+import { AddCommand } from "./Messages/AddCommand";
+import { AddDirCommand } from "./Messages/AddDirCommand";
 export class OnlineRepo {
-    _bus;
-    storageFolder;
+    server;
+    databaseFolder;
+    user;
     LOG = false;
-    constructor(_bus, storageFolder) {
-        this._bus = _bus;
-        this.storageFolder = storageFolder;
+    _bus;
+    constructor(server, databaseFolder, user) {
+        this.server = server;
+        this.databaseFolder = databaseFolder;
+        this.user = user;
+        this._bus = new MessageBus(server, user);
     }
     Log(...message) {
         if (this.LOG)
@@ -22,7 +29,7 @@ export class OnlineRepo {
     }
     async GetOne(folder, id) {
         this.Log(`Fetching "${id}"...`);
-        const folderPath = this.storageFolder + "/" + folder;
+        const folderPath = this.databaseFolder + "/" + folder;
         const queryResult = await this._bus.SendMessage(new ReadQuery(id, folderPath));
         if (queryResult.IsSuccess) {
             const item = queryResult.Result;
@@ -33,8 +40,8 @@ export class OnlineRepo {
         return null;
     }
     async FindOne(id) {
-        this.Log(`Fetching "${id}"...`);
-        const queryResult = await this._bus.SendMessage(new FindQuery(id, this.storageFolder));
+        this.Log(`Searching for "${id}"...`);
+        const queryResult = await this._bus.SendMessage(new FindQuery(id, this.databaseFolder));
         if (queryResult.IsSuccess) {
             const item = queryResult.Result;
             this.Log(`Found "${id}".`);
@@ -44,8 +51,8 @@ export class OnlineRepo {
         return null;
     }
     async GetAll(folder) {
-        this.Log(`Fetching all from "${this.storageFolder}"...`);
-        const folderPath = this.storageFolder + "/" + folder;
+        this.Log(`Fetching all from "${this.databaseFolder}"...`);
+        const folderPath = this.databaseFolder + "/" + folder;
         const queryResult = await this._bus.SendMessage(new ListQuery(folderPath, true));
         if (queryResult.IsSuccess) {
             const items = queryResult.Result;
@@ -56,8 +63,8 @@ export class OnlineRepo {
             throw new Error(`Could not fetch all from "${folder}": ${queryResult.ErrorMessage}`);
     }
     async GetAllIds(folder) {
-        this.Log(`Fetching all from "${this.storageFolder}"...`);
-        const folderPath = this.storageFolder + "/" + folder;
+        this.Log(`Fetching all ids from "${this.databaseFolder}"...`);
+        const folderPath = this.databaseFolder + "/" + folder;
         const queryResult = await this._bus.SendMessage(new ListQuery(folderPath, false));
         if (queryResult.IsSuccess) {
             const itemsIds = Object.values(queryResult.Result);
@@ -67,17 +74,26 @@ export class OnlineRepo {
         else
             throw new Error(`Could not fetch all ids from "${folder}": ${queryResult.ErrorMessage}`);
     }
+    async Add(folder, id, item) {
+        this.Log(`Adding "${id}" to "${folder}"...`);
+        const folderPath = this.databaseFolder + "/" + folder;
+        const result = await this._bus.SendMessage(new AddCommand(id, folderPath, item));
+        if (!result.IsSuccess)
+            throw new Error(`Could not add "${id}" to "${folderPath}": ${result.ErrorMessage}`);
+        this.Log(`"${id}" added to "${folderPath}".`);
+    }
+    ;
     async Update(folder, id, item) {
         this.Log(`Updating "${id}"...`);
-        const folderPath = this.storageFolder + "/" + folder;
+        const folderPath = this.databaseFolder + "/" + folder;
         const result = await this._bus.SendMessage(new UpdateCommand(id, folderPath, item));
         if (!result.IsSuccess)
             throw new Error(`Could not update "${id}" in "${folderPath}": ${result.ErrorMessage}`);
-        this.Log(`Updated "${id}" in "${folderPath}".`);
+        this.Log(`"${id}" updated in "${folderPath}".`);
     }
     ;
     async Delete(folder, id) {
-        const folderPath = this.storageFolder + "/" + folder;
+        const folderPath = this.databaseFolder + "/" + folder;
         this.Log(`Deleting "${id}" from "${folderPath}"...`);
         const result = await this._bus.SendMessage(new DeleteCommand(id, folderPath));
         if (!result.IsSuccess)
@@ -85,19 +101,27 @@ export class OnlineRepo {
         this.Log(`Deleted "${id}" from "${folderPath}".`);
     }
     async Drop() {
-        this.Log(`Dropping "${this.storageFolder}"...`);
-        const result = await this._bus.SendMessage(new DropCommand(this.storageFolder));
+        this.Log(`Dropping "${this.databaseFolder}"...`);
+        const result = await this._bus.SendMessage(new DropCommand(this.databaseFolder));
         if (!result.IsSuccess)
-            throw new Error(`Could not drop "${this.storageFolder}": ${result.ErrorMessage}`);
-        this.Log(`Dropped "${this.storageFolder}".`);
+            throw new Error(`Could not drop "${this.databaseFolder}": ${result.ErrorMessage}`);
+        this.Log(`Dropped "${this.databaseFolder}".`);
     }
     async Move(id, sourceFolder, targetFolder) {
-        const source = this.storageFolder + "/" + sourceFolder;
-        const target = this.storageFolder + "/" + targetFolder;
+        const source = this.databaseFolder + "/" + sourceFolder;
+        const target = this.databaseFolder + "/" + targetFolder;
         this.Log(`Moving "${id}" from "${source}" to "${target}"...`);
         const result = await this._bus.SendMessage(new MoveCommand(id, source, target));
         if (!result.IsSuccess)
             throw new Error(`Could not move "${id}" from "${source}" to "${target}": ${result.ErrorMessage}`);
         this.Log(`Moved "${id}" from "${source}" to "${target}".`);
     }
+    async AddDir(targetFolder) {
+        const target = this.databaseFolder + "/" + targetFolder;
+        this.Log(`Adding directory "${target}"...`);
+        const result = await this._bus.SendMessage(new AddDirCommand(target));
+        if (!result.IsSuccess)
+            throw new Error(`Could not add directory "${target}": ${result.ErrorMessage}`);
+        this.Log(`Added directory "${target}".`);
+    }
 }

package/RefConverter.d.ts

@@ -0,0 +1,11 @@
+export declare abstract class RefConverter<R, T> {
+    protected abstract ConvertToRaw(obj: T): R | null;
+    protected abstract ConvertFromRaw(raw: R): T | null;
+    ToRaw(target: T): R | null;
+    FromRaw(raw: R): T | null;
+    protected GetArray<R, T>(value: R[], creator: (raw: R) => T): Array<T>;
+    protected GetString(value: any): string;
+    protected GetNumber(value: any): number;
+    protected GetBool(value: any): boolean;
+    protected GetDate(date: any): Date;
+}

package/RefConverter.js

@@ -0,0 +1,36 @@
+export class RefConverter {
+    ToRaw(target) {
+        try {
+            return this.ConvertToRaw(target);
+        }
+        catch (ex) {
+            console.error(`Conversion from object to raw problem: ${ex.message}\n\nStack trace: ${ex.stack}\n\nObject:`, target);
+            return null;
+        }
+    }
+    FromRaw(raw) {
+        try {
+            return this.ConvertFromRaw(raw);
+        }
+        catch (ex) {
+            console.error(`Conversion from raw to object problem: ${ex.message}\n\nStack trace: ${ex.stack}\n\nRaw:`, raw);
+            return null;
+        }
+    }
+    GetArray(value, creator) {
+        const items = value?.map(x => creator(x));
+        return items || [];
+    }
+    GetString(value) {
+        return value || "";
+    }
+    GetNumber(value) {
+        return +value || 0;
+    }
+    GetBool(value) {
+        return !!value || false;
+    }
+    GetDate(date) {
+        return date ? new Date(date) : new Date(0);
+    }
+}

package/Utils/Delay.d.ts

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

package/Utils/Delay.js

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

package/Utils/OperationRepeater.d.ts

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

package/Utils/OperationRepeater.js

@@ -0,0 +1,19 @@
+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;
+    }
+}

package/index.d.ts

@@ -1,2 +1,4 @@
 export * from "./IRepo";
 export * from "./OnlineRepo";
+export * from "./Utils/OperationRepeater";
+export * from "./RefConverter";

package/index.js

@@ -1,2 +1,4 @@
 export * from "./IRepo";
 export * from "./OnlineRepo";
+export * from "./Utils/OperationRepeater";
+export * from "./RefConverter";

package/package.json

@@ -1,17 +1,21 @@
 {
   "name": "@tblabs/storage",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "online storage module",
   "license": "beerware",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {
-    "pack": "npm pack",
-    "clean": "rm ./bin -rf",
+    "pack": "cd ./bin && npm pack",
+    "clean": "rm ./bin -rf && rm *.tgz -rf",
     "build": "npm run clean && tsc ./src/index.ts --declaration --outDir ./bin && cp ./package.json ./bin/package.json",
-    "publish": "npm run build && npm run pack && cd ./bin && npm publish --access public"
+    "publish": "npm login && npm run build && npm run pack && cd ./bin && npm publish --access public"
   },
   "devDependencies": {
+    "@types/jest": "^30.0.0",
+    "@types/node": "^25.6.0",
+    "jest": "^30.3.0",
+    "ts-jest": "^29.4.9",
     "typescript": "^6.0.2"
   }
 }