@jsm-mit/rabbit-motoko-package 0.2.17 → 0.2.19

package/dist/rabbit-motoko-actor.d.ts

@@ -1,35 +1,13 @@
 import { Secp256k1KeyIdentity } from "@icp-sdk/core/identity/secp256k1";
 import type { AddTaskArgs, ClaimTaskArgs, CompleteTaskArgs, Task } from "../declarations/rabbit-motoko-backend/rabbit-motoko-backend.did.js";
-export declare class RabbitMotokoActor {
-    private readonly canisterId;
-    private readonly identity?;
-    private readonly host;
+import { ActorBase } from "@jsm-mit/jsm-framework";
+export declare class RabbitMotokoActor extends ActorBase {
     private actor;
-    private agent;
-    constructor(canisterId: string, identity?: Secp256k1KeyIdentity | undefined);
-    reinitializeAgent(): void;
-    private initActor;
-    private setupAgent;
-    private runFunctionAndSyncTimeIfNecessaryAsyncUnsafe;
-    private handleResultErrors;
-    syncTimeAsync(throwError: boolean): Promise<void>;
-    testErrWithText(): Promise<import("../declarations/rabbit-motoko-backend/rabbit-motoko-backend.did.js").Result>;
-    testError(): Promise<import("../declarations/rabbit-motoko-backend/rabbit-motoko-backend.did.js").Result>;
-    /**
-     * Adds a new task to the queue.
-     */
+    constructor(canisterId: string, identity?: Secp256k1KeyIdentity);
+    protected initActor(): void;
     addTaskAsync(args: AddTaskArgs, throwException: boolean): Promise<bigint | null>;
-    /**
-     * Claims a task for a specific worker.
-     */
     claimTaskAsync(args: ClaimTaskArgs, throwException: boolean): Promise<Task | null>;
-    /**
-     * Completes a previously claimed task.
-     */
     completeTaskAsync(args: CompleteTaskArgs, throwException: boolean): Promise<boolean>;
-    /**
-     * Fetches IDs of tasks available in a specific channel.
-     */
     getAvailableTaskIdsAsync(channel: string, throwException: boolean): Promise<bigint[]>;
 }
 //# sourceMappingURL=rabbit-motoko-actor.d.ts.map

package/dist/rabbit-motoko-actor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rabbit-motoko-actor.d.ts","sourceRoot":"","sources":["../src/rabbit-motoko-actor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,KAAK,EAAY,WAAW,EAAE,aAAa,EAAE,gBAAgB,EAAS,IAAI,EAAE,MAAM,oEAAoE,CAAC;AAI9J,qBAAa,iBAAiB;IAKd,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAU,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAJ3E,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA6B;IAClD,OAAO,CAAC,KAAK,CAA2B;IACxC,OAAO,CAAC,KAAK,CAAa;gBAEG,UAAU,EAAE,MAAM,EAAmB,QAAQ,CAAC,EAAE,oBAAoB,YAAA;IAK1F,iBAAiB;IAYxB,OAAO,CAAC,SAAS;YAOH,UAAU;YAWV,4CAA4C;IA4B1D,OAAO,CAAC,kBAAkB;IAWb,aAAa,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAajD,eAAe;IAIf,SAAS;IAItB;;OAEG;IACU,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAwB7F;;OAEG;IACU,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAwB/F;;OAEG;IACU,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAwBjG;;OAEG;IACU,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAwBrG"}
+{"version":3,"file":"rabbit-motoko-actor.d.ts","sourceRoot":"","sources":["../src/rabbit-motoko-actor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,KAAK,EAAY,WAAW,EAAE,aAAa,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,oEAAoE,CAAC;AACvJ,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,qBAAa,iBAAkB,SAAQ,SAAS;IAC5C,OAAO,CAAC,KAAK,CAA2B;gBAE5B,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,oBAAoB;IAI/D,SAAS,CAAC,SAAS;IASN,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAWhF,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAWlF,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAWpF,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAUrG"}

package/dist/rabbit-motoko-actor.js

@@ -1,24 +1,10 @@
-import { Actor, HttpAgent } from "@icp-sdk/core/agent";
+import { Actor } from "@icp-sdk/core/agent";
 import { Secp256k1KeyIdentity } from "@icp-sdk/core/identity/secp256k1";
 import { idlFactory } from "../declarations/rabbit-motoko-backend/index.js";
-import { BetterJSON, logErrorLocallyAndPublishOnErrorSubject } from "@jsm-mit/utils-package";
-import { pigeon } from "@jsm-mit/pigeon-package";
-export class RabbitMotokoActor {
+import { ActorBase } from "@jsm-mit/jsm-framework";
+export class RabbitMotokoActor extends ActorBase {
     constructor(canisterId, identity) {
-        this.canisterId = canisterId;
-        this.identity = identity;
-        this.host = "https://icp0.io";
-        this.reinitializeAgent();
-        this.setupAgent();
-    }
-    reinitializeAgent() {
-        console.log("Agent reinitialization");
-        this.agent = HttpAgent.createSync({
-            host: this.host,
-            ingressExpiryInMinutes: 1,
-            identity: this.identity
-        });
-        this.initActor();
+        super(canisterId, identity);
     }
     initActor() {
         this.actor = Actor.createActor(idlFactory, {
@@ -26,166 +12,17 @@ export class RabbitMotokoActor {
             canisterId: this.canisterId,
         });
     }
-    async setupAgent() {
-        try {
-            // Synchronizacja czasu z siecią IC - rozwiązuje błąd "certificate is still too far in the future"
-            await this.agent.syncTime();
-            console.log("✅ Agent IC zsynchronizowany pomyślnie.");
-        }
-        catch (err) {
-            console.error("❌ Błąd podczas konfiguracji Agenta:", err);
-        }
-    }
-    async runFunctionAndSyncTimeIfNecessaryAsyncUnsafe(fnAsync) {
-        try {
-            return await fnAsync();
-        }
-        catch (error) {
-            const errorMsg = BetterJSON.stringify(error);
-            pigeon.debugEmailAsyncSafe("Problem at runFunctionAndSyncTimeIfNecessaryAsyncUnsafe", "runFunctionAndSyncTimeIfNecessaryAsyncUnsafe", [], errorMsg);
-            if (errorMsg.includes("certificate") || errorMsg.includes("TrustError") || errorMsg.includes("ingress_expiry")) {
-                console.warn("⚠️ Wykryto problem z zaufaniem/czasem. Próbuję synchronizacji...");
-                await this.syncTimeAsync(false);
-                try {
-                    return await fnAsync();
-                }
-                catch (err) {
-                    console.error(BetterJSON.stringify(err));
-                    throw err;
-                }
-            }
-            else {
-                console.error(`Error at runFunctionAndSyncTimeIfNecessaryAsyncUnsafe: ${errorMsg}`);
-                throw error;
-            }
-        }
-    }
-    handleResultErrors(functionName, params, error) {
-        pigeon.debugEmailAsyncSafe("debug", functionName, params, BetterJSON.stringify(error));
-        const errorKey = Object.keys(error)[0];
-        const errorMessage = error[errorKey];
-        return {
-            errorKey,
-            errorMessage
-        };
-    }
-    async syncTimeAsync(throwError) {
-        try {
-            await this.agent.syncTime();
-            console.log("🔄 Czas agenta został zsynchronizowany ponownie.");
-        }
-        catch (err) {
-            console.error("❌ Nie udało się zsynchronizować czasu:", err);
-            if (throwError) {
-                throw err;
-            }
-        }
-    }
-    async testErrWithText() {
-        return this.actor.testErrWithText();
-    }
-    async testError() {
-        return this.actor.testError();
-    }
-    /**
-     * Adds a new task to the queue.
-     */
+    // --- Public Actor Methods ---
     async addTaskAsync(args, throwException) {
-        const errorMessage = "Network error: add task failed";
-        try {
-            const result = await this.runFunctionAndSyncTimeIfNecessaryAsyncUnsafe(() => this.actor.addTask(args));
-            if ('ok' in result) {
-                return result.ok;
-            }
-            else {
-                this.handleResultErrors("addTaskAsync", [args, throwException], result.err);
-                return null;
-            }
-        }
-        catch (err) {
-            logErrorLocallyAndPublishOnErrorSubject(errorMessage, err);
-            if (throwException) {
-                throw err;
-            }
-            else {
-                return null;
-            }
-        }
+        return await this.executeFunction(() => this.actor.addTask(args), "Network error: add task failed", "addTaskAsync", [args, throwException], null, throwException);
     }
-    /**
-     * Claims a task for a specific worker.
-     */
     async claimTaskAsync(args, throwException) {
-        const errorMessage = "Network error: claim task failed";
-        try {
-            const result = await this.runFunctionAndSyncTimeIfNecessaryAsyncUnsafe(() => this.actor.claimTask(args));
-            if ('ok' in result) {
-                return result.ok;
-            }
-            else {
-                this.handleResultErrors("claimTaskAsync", [args, throwException], result.err);
-                return null;
-            }
-        }
-        catch (err) {
-            logErrorLocallyAndPublishOnErrorSubject(errorMessage, err);
-            if (throwException) {
-                throw err;
-            }
-            else {
-                return null;
-            }
-        }
+        return await this.executeFunction(() => this.actor.claimTask(args), "Network error: claim task failed", "claimTaskAsync", [args, throwException], null, throwException);
     }
-    /**
-     * Completes a previously claimed task.
-     */
     async completeTaskAsync(args, throwException) {
-        const errorMessage = "Network error: complete task failed";
-        try {
-            const result = await this.runFunctionAndSyncTimeIfNecessaryAsyncUnsafe(() => this.actor.completeTask(args));
-            if ('ok' in result) {
-                return result.ok;
-            }
-            else {
-                this.handleResultErrors("completeTaskAsync", [args, throwException], result.err);
-                return false;
-            }
-        }
-        catch (err) {
-            logErrorLocallyAndPublishOnErrorSubject(errorMessage, err);
-            if (throwException) {
-                throw err;
-            }
-            else {
-                return false;
-            }
-        }
+        return await this.executeFunction(() => this.actor.completeTask(args), "Network error: complete task failed", "completeTaskAsync", [args, throwException], false, throwException);
     }
-    /**
-     * Fetches IDs of tasks available in a specific channel.
-     */
     async getAvailableTaskIdsAsync(channel, throwException) {
-        const errorMessage = "Network error: get available task IDs failed";
-        try {
-            const result = await this.runFunctionAndSyncTimeIfNecessaryAsyncUnsafe(() => this.actor.getAvailableTaskIds(channel));
-            if ('ok' in result) {
-                return result.ok;
-            }
-            else {
-                this.handleResultErrors("getAvailableTaskIdsAsync", [channel, throwException], result.err);
-                return [];
-            }
-        }
-        catch (err) {
-            console.log("catch getAvailableTaskIdsAsync catch");
-            logErrorLocallyAndPublishOnErrorSubject(errorMessage, err);
-            if (throwException) {
-                throw err;
-            }
-            else {
-                return [];
-            }
-        }
+        return await this.executeFunction(() => this.actor.getAvailableTaskIds(channel), "Network error: get available task IDs failed", "getAvailableTaskIdsAsync", [channel, throwException], [], throwException);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jsm-mit/rabbit-motoko-package",
-    "version": "0.2.17",
+    "version": "0.2.19",
     "description": "Wrapper TypeScript package for Rabbit Motoko Canister.",
     "license": "ISC",
     "author": "",
@@ -27,8 +27,9 @@
     },
     "peerDependencies": {
         "@icp-sdk/core": "^5.2.0",
-        "@jsm-mit/pigeon-package": "^0.6.1",
-        "@jsm-mit/utils-package": "^0.2.2"
+        "@jsm-mit/pigeon-package": "^0.6.4",
+        "@jsm-mit/utils-package": "^0.2.2",
+        "@jsm-mit/jsm-framework": "^0.0.6"
     },
     "devDependencies": {
         "@types/node": "^25.5.2",