@jsm-mit/rabbit-motoko-package 0.4.5 → 0.6.0

package/declarations/rabbit-motoko-backend/rabbit-motoko-backend.did

@@ -1,3 +1,4 @@
+type TaskId = nat;
 type Task = 
  record {
    channel: text;
@@ -5,7 +6,7 @@ type Task =
    completedAt: int;
    createdAt: int;
    expiresAt: int;
-   id: nat;
+   id: TaskId;
    parentIds: opt vec nat;
    payload: text;
    resultMessage: text;
@@ -16,66 +17,64 @@ type Task =
 type Result_4 = 
  variant {
    err: Error;
-   ok: bool;
+   ok: TaskId;
  };
 type Result_3 = 
  variant {
    err: Error;
-   ok: vec nat;
+   ok: bool;
  };
 type Result_2 = 
  variant {
    err: Error;
-   ok: Task;
+   ok: vec TaskId;
  };
 type Result_1 = 
  variant {
    err: Error;
-   ok: vec Task;
+   ok: Task;
  };
 type Result = 
  variant {
    err: Error;
-   ok: nat;
+   ok: vec Task;
  };
 type Error = 
  variant {
    AlreadyExists;
+   ForcedUpdate: text;
    InvalidData: text;
    NotAuthorized: text;
-   NotFound;
+   NotFound: text;
    ReturnsNull;
  };
 type CompleteTaskArgs = 
  record {
-   id: nat;
+   id: TaskId;
    message: text;
  };
 type ClaimTaskArgs = 
  record {
-   id: nat;
+   id: TaskId;
    timeoutNanos: int;
  };
 type AddTaskArgs = 
  record {
    channel: text;
    commonId: text;
-   parentIds: opt vec nat;
+   parentIds: opt vec TaskId;
    payload: text;
  };
 service : {
-  addTask: (args: AddTaskArgs) -> (Result);
-  claimTask: (args: ClaimTaskArgs) -> (Result_2);
-  completeTask: (args: CompleteTaskArgs) -> (Result_4);
-  getAvailableTaskIds: (channel: text) -> (Result_3) query;
-  getTask: (id: nat) -> (Result_2) query;
-  getTasks: () -> (Result_1) query;
+  addTask: (args: AddTaskArgs) -> (Result_4);
+  claimTask: (args: ClaimTaskArgs) -> (Result_1);
+  completeTask: (args: CompleteTaskArgs) -> (Result_3);
+  getAvailableTaskIds: (channel: text) -> (Result_2) query;
+  getTask: (id: nat) -> (Result_1) query;
+  getTasks: () -> (Result) query;
   getTasksByChannelAndCommonId: (channel: text, commonId: text) ->
-   (Result_1) query;
-  getTasksByCommonId: (commonId: text) -> (Result_1) query;
-  getTasksLast24h: () -> (Result_1) query;
-  testErrWithText: () -> (Result) query;
-  testErrWithText2: () -> (Result) query;
-  testError: () -> (Result) query;
+   (Result) query;
+  getTasksByCommonId: (commonId: text) -> (Result) query;
+  getTasksLast24h: () -> (Result) query;
   whoAmI: () -> (principal) query;
 }

package/declarations/rabbit-motoko-backend/rabbit-motoko-backend.did.d.ts

@@ -3,30 +3,31 @@ import type { ActorMethod } from '@icp-sdk/core/agent';
 import type { IDL } from '@icp-sdk/core/candid';
 
 export interface AddTaskArgs {
-  'parentIds' : [] | [Array<bigint>],
+  'parentIds' : [] | [Array<TaskId>],
   'commonId' : string,
   'channel' : string,
   'payload' : string,
 }
-export interface ClaimTaskArgs { 'id' : bigint, 'timeoutNanos' : bigint }
-export interface CompleteTaskArgs { 'id' : bigint, 'message' : string }
-export type Error = { 'NotFound' : null } |
+export interface ClaimTaskArgs { 'id' : TaskId, 'timeoutNanos' : bigint }
+export interface CompleteTaskArgs { 'id' : TaskId, 'message' : string }
+export type Error = { 'NotFound' : string } |
   { 'NotAuthorized' : string } |
   { 'InvalidData' : string } |
   { 'AlreadyExists' : null } |
+  { 'ForcedUpdate' : string } |
   { 'ReturnsNull' : null };
-export type Result = { 'ok' : bigint } |
+export type Result = { 'ok' : Array<Task> } |
   { 'err' : Error };
-export type Result_1 = { 'ok' : Array<Task> } |
+export type Result_1 = { 'ok' : Task } |
   { 'err' : Error };
-export type Result_2 = { 'ok' : Task } |
+export type Result_2 = { 'ok' : Array<TaskId> } |
   { 'err' : Error };
-export type Result_3 = { 'ok' : Array<bigint> } |
+export type Result_3 = { 'ok' : boolean } |
   { 'err' : Error };
-export type Result_4 = { 'ok' : boolean } |
+export type Result_4 = { 'ok' : TaskId } |
   { 'err' : Error };
 export interface Task {
-  'id' : bigint,
+  'id' : TaskId,
   'status' : bigint,
   'completedAt' : bigint,
   'resultMessage' : string,
@@ -39,19 +40,17 @@ export interface Task {
   'channel' : string,
   'payload' : string,
 }
+export type TaskId = bigint;
 export interface _SERVICE {
-  'addTask' : ActorMethod<[AddTaskArgs], Result>,
-  'claimTask' : ActorMethod<[ClaimTaskArgs], Result_2>,
-  'completeTask' : ActorMethod<[CompleteTaskArgs], Result_4>,
-  'getAvailableTaskIds' : ActorMethod<[string], Result_3>,
-  'getTask' : ActorMethod<[bigint], Result_2>,
-  'getTasks' : ActorMethod<[], Result_1>,
-  'getTasksByChannelAndCommonId' : ActorMethod<[string, string], Result_1>,
-  'getTasksByCommonId' : ActorMethod<[string], Result_1>,
-  'getTasksLast24h' : ActorMethod<[], Result_1>,
-  'testErrWithText' : ActorMethod<[], Result>,
-  'testErrWithText2' : ActorMethod<[], Result>,
-  'testError' : ActorMethod<[], Result>,
+  'addTask' : ActorMethod<[AddTaskArgs], Result_4>,
+  'claimTask' : ActorMethod<[ClaimTaskArgs], Result_1>,
+  'completeTask' : ActorMethod<[CompleteTaskArgs], Result_3>,
+  'getAvailableTaskIds' : ActorMethod<[string], Result_2>,
+  'getTask' : ActorMethod<[bigint], Result_1>,
+  'getTasks' : ActorMethod<[], Result>,
+  'getTasksByChannelAndCommonId' : ActorMethod<[string, string], Result>,
+  'getTasksByCommonId' : ActorMethod<[string], Result>,
+  'getTasksLast24h' : ActorMethod<[], Result>,
   'whoAmI' : ActorMethod<[], Principal>,
 }
 export declare const idlFactory: IDL.InterfaceFactory;

package/declarations/rabbit-motoko-backend/rabbit-motoko-backend.did.js

@@ -1,24 +1,23 @@
 export const idlFactory = ({ IDL }) => {
+  const TaskId = IDL.Nat;
   const AddTaskArgs = IDL.Record({
-    'parentIds' : IDL.Opt(IDL.Vec(IDL.Nat)),
+    'parentIds' : IDL.Opt(IDL.Vec(TaskId)),
     'commonId' : IDL.Text,
     'channel' : IDL.Text,
     'payload' : IDL.Text,
   });
   const Error = IDL.Variant({
-    'NotFound' : IDL.Null,
+    'NotFound' : IDL.Text,
     'NotAuthorized' : IDL.Text,
     'InvalidData' : IDL.Text,
     'AlreadyExists' : IDL.Null,
+    'ForcedUpdate' : IDL.Text,
     'ReturnsNull' : IDL.Null,
   });
-  const Result = IDL.Variant({ 'ok' : IDL.Nat, 'err' : Error });
-  const ClaimTaskArgs = IDL.Record({
-    'id' : IDL.Nat,
-    'timeoutNanos' : IDL.Int,
-  });
+  const Result_4 = IDL.Variant({ 'ok' : TaskId, 'err' : Error });
+  const ClaimTaskArgs = IDL.Record({ 'id' : TaskId, 'timeoutNanos' : IDL.Int });
   const Task = IDL.Record({
-    'id' : IDL.Nat,
+    'id' : TaskId,
     'status' : IDL.Nat,
     'completedAt' : IDL.Int,
     'resultMessage' : IDL.Text,
@@ -31,28 +30,25 @@ export const idlFactory = ({ IDL }) => {
     'channel' : IDL.Text,
     'payload' : IDL.Text,
   });
-  const Result_2 = IDL.Variant({ 'ok' : Task, 'err' : Error });
-  const CompleteTaskArgs = IDL.Record({ 'id' : IDL.Nat, 'message' : IDL.Text });
-  const Result_4 = IDL.Variant({ 'ok' : IDL.Bool, 'err' : Error });
-  const Result_3 = IDL.Variant({ 'ok' : IDL.Vec(IDL.Nat), 'err' : Error });
-  const Result_1 = IDL.Variant({ 'ok' : IDL.Vec(Task), 'err' : Error });
+  const Result_1 = IDL.Variant({ 'ok' : Task, 'err' : Error });
+  const CompleteTaskArgs = IDL.Record({ 'id' : TaskId, 'message' : IDL.Text });
+  const Result_3 = IDL.Variant({ 'ok' : IDL.Bool, 'err' : Error });
+  const Result_2 = IDL.Variant({ 'ok' : IDL.Vec(TaskId), 'err' : Error });
+  const Result = IDL.Variant({ 'ok' : IDL.Vec(Task), 'err' : Error });
   return IDL.Service({
-    'addTask' : IDL.Func([AddTaskArgs], [Result], []),
-    'claimTask' : IDL.Func([ClaimTaskArgs], [Result_2], []),
-    'completeTask' : IDL.Func([CompleteTaskArgs], [Result_4], []),
-    'getAvailableTaskIds' : IDL.Func([IDL.Text], [Result_3], ['query']),
-    'getTask' : IDL.Func([IDL.Nat], [Result_2], ['query']),
-    'getTasks' : IDL.Func([], [Result_1], ['query']),
+    'addTask' : IDL.Func([AddTaskArgs], [Result_4], []),
+    'claimTask' : IDL.Func([ClaimTaskArgs], [Result_1], []),
+    'completeTask' : IDL.Func([CompleteTaskArgs], [Result_3], []),
+    'getAvailableTaskIds' : IDL.Func([IDL.Text], [Result_2], ['query']),
+    'getTask' : IDL.Func([IDL.Nat], [Result_1], ['query']),
+    'getTasks' : IDL.Func([], [Result], ['query']),
     'getTasksByChannelAndCommonId' : IDL.Func(
         [IDL.Text, IDL.Text],
-        [Result_1],
+        [Result],
         ['query'],
       ),
-    'getTasksByCommonId' : IDL.Func([IDL.Text], [Result_1], ['query']),
-    'getTasksLast24h' : IDL.Func([], [Result_1], ['query']),
-    'testErrWithText' : IDL.Func([], [Result], ['query']),
-    'testErrWithText2' : IDL.Func([], [Result], ['query']),
-    'testError' : IDL.Func([], [Result], ['query']),
+    'getTasksByCommonId' : IDL.Func([IDL.Text], [Result], ['query']),
+    'getTasksLast24h' : IDL.Func([], [Result], ['query']),
     'whoAmI' : IDL.Func([], [IDL.Principal], ['query']),
   });
 };

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

@@ -5,9 +5,9 @@ export declare class RabbitMotokoActor extends ActorBase {
     private actor;
     constructor(canisterId: string, identity?: Secp256k1KeyIdentity);
     protected initActor(): void;
-    addTaskAsyncUnsafe(args: AddTaskArgs, ensureExecute?: boolean): Promise<bigint>;
-    claimTaskAsyncUnsafe(args: ClaimTaskArgs, ensureExecute?: boolean): Promise<Task>;
-    completeTaskAsyncUnsafe(args: CompleteTaskArgs, ensureExecute?: boolean): Promise<boolean>;
-    getAvailableTaskIdsAsyncUnsafe(channel: string, ensureExecute?: boolean): Promise<bigint[]>;
+    addTaskAsyncUnsafe(args: AddTaskArgs): Promise<bigint>;
+    claimTaskAsyncUnsafe(args: ClaimTaskArgs): Promise<Task>;
+    completeTaskAsyncUnsafe(args: CompleteTaskArgs): Promise<boolean>;
+    getAvailableTaskIdsAsyncUnsafe(channel: string): 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":"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,kBAAkB,CAAC,IAAI,EAAE,WAAW,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,MAAM,CAAC;IAUtF,oBAAoB,CAAC,IAAI,EAAE,aAAa,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAUxF,uBAAuB,CAAC,IAAI,EAAE,gBAAgB,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IAUjG,8BAA8B,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CASlH"}
+{"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,kBAAkB,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAQtD,oBAAoB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxD,uBAAuB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAQjE,8BAA8B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAOlF"}

package/dist/rabbit-motoko-actor.js

@@ -13,16 +13,16 @@ export class RabbitMotokoActor extends ActorBase {
         });
     }
     // --- Public Actor Methods ---
-    async addTaskAsyncUnsafe(args, ensureExecute = false) {
-        return await this.executeFunctionAsyncUnsafe(() => this.actor.addTask(args), "Network error: add task failed", "addTaskAsyncUnsafe", [args, ensureExecute], ensureExecute);
+    async addTaskAsyncUnsafe(args) {
+        return await this.executeFunctionAsyncUnsafe(() => this.actor.addTask(args), "addTaskAsyncUnsafe", [args]);
     }
-    async claimTaskAsyncUnsafe(args, ensureExecute = false) {
-        return await this.executeFunctionAsyncUnsafe(() => this.actor.claimTask(args), "Network error: claim task failed", "claimTaskAsyncUnsafe", [args, ensureExecute], ensureExecute);
+    async claimTaskAsyncUnsafe(args) {
+        return await this.executeFunctionAsyncUnsafe(() => this.actor.claimTask(args), "claimTaskAsyncUnsafe", [args]);
     }
-    async completeTaskAsyncUnsafe(args, ensureExecute = false) {
-        return await this.executeFunctionAsyncUnsafe(() => this.actor.completeTask(args), "Network error: complete task failed", "completeTaskAsyncUnsafe", [args, ensureExecute], ensureExecute);
+    async completeTaskAsyncUnsafe(args) {
+        return await this.executeFunctionAsyncUnsafe(() => this.actor.completeTask(args), "completeTaskAsyncUnsafe", [args]);
     }
-    async getAvailableTaskIdsAsyncUnsafe(channel, ensureExecute = false) {
-        return await this.executeFunctionAsyncUnsafe(() => this.actor.getAvailableTaskIds(channel), "Network error: get available task IDs failed", "getAvailableTaskIdsAsyncUnsafe", [channel, ensureExecute], ensureExecute);
+    async getAvailableTaskIdsAsyncUnsafe(channel) {
+        return await this.executeFunctionAsyncUnsafe(() => this.actor.getAvailableTaskIds(channel), "getAvailableTaskIdsAsyncUnsafe", [channel]);
     }
 }

package/dist/rabbit-task-worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rabbit-task-worker.d.ts","sourceRoot":"","sources":["../src/rabbit-task-worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAW,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAsB,KAAK,IAAI,EAAE,MAAM,gCAAgC,CAAC;AAKlG,qBAAa,gBAAgB;IAYrB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,KAAK;IAbjB,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,YAAY,CAAkB;IACtC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAuB;IAEnD,OAAO,CAAC,uBAAuB,CAAc;IAE7C,IAAW,MAAM,IAAI,UAAU,CAAC,IAAI,CAAC,CAEpC;gBAGW,OAAO,EAAE,MAAM,EACf,mBAAmB,EAAE,MAAM,EAC3B,KAAK,EAAE,iBAAiB;YAItB,YAAY;IAwCnB,GAAG,IAAI,IAAI;IAWX,IAAI,IAAI,IAAI;CAQtB"}
+{"version":3,"file":"rabbit-task-worker.d.ts","sourceRoot":"","sources":["../src/rabbit-task-worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAW,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAsB,KAAK,IAAI,EAAE,MAAM,gCAAgC,CAAC;AAKlG,qBAAa,gBAAgB;IAYrB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,KAAK;IAbjB,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,YAAY,CAAkB;IACtC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAuB;IAEnD,OAAO,CAAC,uBAAuB,CAAc;IAE7C,IAAW,MAAM,IAAI,UAAU,CAAC,IAAI,CAAC,CAEpC;gBAGW,OAAO,EAAE,MAAM,EACf,mBAAmB,EAAE,MAAM,EAC3B,KAAK,EAAE,iBAAiB;YAItB,YAAY;IA4CnB,GAAG,IAAI,IAAI;IAWX,IAAI,IAAI,IAAI;CAQtB"}

package/dist/rabbit-task-worker.js

@@ -26,14 +26,14 @@ export class RabbitTaskWorker {
         }
         try {
             this.isProcessing = true;
-            const availableIds = await this.actor.getAvailableTaskIdsAsyncUnsafe(this.channel, true);
+            const availableIds = await this.actor.getAvailableTaskIdsAsyncUnsafe(this.channel);
             const timeoutNanos = BigInt(5 * 60 * 1000000000);
             for (const taskId of availableIds) {
                 const args = {
                     id: taskId,
                     timeoutNanos: timeoutNanos
                 };
-                const task = await this.actor.claimTaskAsyncUnsafe(args, true);
+                const task = await this.actor.claimTaskAsyncUnsafe(args);
                 if (task) {
                     this.taskSubject.next(task);
                 }
@@ -41,7 +41,13 @@ export class RabbitTaskWorker {
             this.lastSuccessfulProcessTs = Date.now();
         }
         catch (err) {
-            pigeon.reportUrgentAsyncSafe(componentName, "JTQRR", "Unexpected error in processQueue", BetterJSON.stringify(err));
+            const errorMsg = BetterJSON.stringify(err);
+            if (errorMsg.includes("ForcedUpdated")) {
+                pigeon.reportInfoAsyncSafe(componentName, "RZQ9K", "Forced update detected during processQueue, this is ok", errorMsg);
+            }
+            else {
+                pigeon.reportUrgentAsyncSafe(componentName, "JTQRR", "Unexpected error in processQueue", errorMsg);
+            }
         }
         finally {
             this.isProcessing = false;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jsm-mit/rabbit-motoko-package",
-    "version": "0.4.5",
+    "version": "0.6.0",
     "description": "Wrapper TypeScript package for Rabbit Motoko Canister.",
     "license": "ISC",
     "author": "",
@@ -29,7 +29,7 @@
         "@jsm-mit/utils-package": "^0.4.0"
     },
     "peerDependencies": {
-        "@jsm-mit/jsm-framework": "^0.5.1",
+        "@jsm-mit/jsm-framework": "^0.6.0",
         "@icp-sdk/core": "^5.2.0",
         "@jsm-mit/pigeon-package": "^0.9.4"
     },