@ic-reactor/core 1.1.1 → 1.1.3

package/README.md

@@ -19,7 +19,7 @@ yarn add @ic-reactor/core
 or you can use the UMD version:
 
 ```html
-<script src="https://github.com/B3Pay/ic-reactor/releases/download/1.0.8/ic-reactor-core.min.js"></script>
+<script src="https://github.com/B3Pay/ic-reactor/releases/download/v1.1.2/ic-reactor-core.min.js"></script>
 ```
 
 ### Using `createReactorCore`

package/dist/classes/actor/index.d.ts

@@ -1,4 +1,5 @@
 import type { CanisterId, ActorMethodParameters, ActorMethodReturnType, ActorStore, ActorManagerParameters, FunctionName, VisitService, BaseActor, ActorMethodState } from "./types";
+import { IDL } from "@dfinity/candid";
 import type { AgentManager } from "../agent";
 import type { UpdateAgentParameters } from "../../types";
 export declare class ActorManager<A = BaseActor> {
@@ -20,6 +21,7 @@ export declare class ActorManager<A = BaseActor> {
     constructor(actorConfig: ActorManagerParameters);
     initialize: (options?: UpdateAgentParameters) => Promise<void>;
     extractService: () => VisitService<A>;
+    extractInterface: () => IDL.ServiceClass;
     private initializeActor;
     callMethod: <M extends FunctionName<A>>(functionName: M, ...args: ActorMethodParameters<A[M]>) => Promise<ActorMethodReturnType<A[M]>>;
     get agentManager(): AgentManager;

package/dist/classes/actor/index.js

@@ -38,10 +38,8 @@ class ActorManager {
             yield this._agentManager.updateAgent(options);
         });
         this.extractService = () => {
-            if (this._actor === null) {
-                throw new Error("For extracting service, actor must be initialized");
-            }
-            return agent_1.Actor.interfaceOf(this._actor)._fields.reduce((acc, service) => {
+            const iface = this.extractInterface();
+            return iface._fields.reduce((acc, service) => {
                 const functionName = service[0];
                 const type = service[1];
                 const visit = ((extractorClass, data) => {
@@ -51,6 +49,12 @@ class ActorManager {
                 return acc;
             }, {});
         };
+        this.extractInterface = () => {
+            if (this._actor === null) {
+                throw new Error("For extracting interface, actor must be initialized");
+            }
+            return agent_1.Actor.interfaceOf(this._actor);
+        };
         this.initializeActor = (agent) => {
             console.info(`Initializing actor ${this.canisterId} on ${agent.isLocal() ? "local" : "ic"} network`);
             const { _idlFactory, canisterId } = this;

package/dist/classes/agent/index.js

@@ -33,6 +33,7 @@ class AgentManager {
             initialized: false,
             initializing: false,
             error: undefined,
+            network: "ic",
         };
         this.initialAuthState = {
             identity: null,
@@ -47,7 +48,11 @@ class AgentManager {
             this.authStore.setState((state) => (Object.assign(Object.assign({}, state), newState)), false, action);
         };
         this.initializeAgent = () => __awaiter(this, void 0, void 0, function* () {
-            this.updateAgentState({ initializing: true }, "initializing");
+            this.updateAgentState({
+                initializing: true,
+                error: undefined,
+                network: this.isLocalEnv ? "local" : "ic",
+            }, "initializing");
             if (this.isLocalEnv) {
                 try {
                     yield this._agent.fetchRootKey();

package/dist/classes/agent/types.d.ts

@@ -11,6 +11,7 @@ export interface AgentState {
     initialized: boolean;
     initializing: boolean;
     error: Error | undefined;
+    network: string;
 }
 export interface AuthState {
     identity: Identity | null;

package/dist/classes/candid/index.d.ts

@@ -3,6 +3,7 @@ import type { CanisterId, CandidAdapterParameters, CandidDefenition } from "../.
 export declare class CandidAdapter {
     agent: HttpAgent;
     didjsCanisterId: string;
+    unsubscribeAgent: () => void;
     constructor({ agentManager, agent, didjsCanisterId, }: CandidAdapterParameters);
     private getDefaultDidJsId;
     getCandidDefinition(canisterId: CanisterId): Promise<CandidDefenition>;

package/dist/classes/candid/index.js

@@ -14,12 +14,13 @@ const agent_1 = require("@dfinity/agent");
 const constants_1 = require("../../utils/constants");
 class CandidAdapter {
     constructor({ agentManager, agent, didjsCanisterId, }) {
+        this.unsubscribeAgent = () => { };
         if (agent) {
             this.agent = agent;
         }
         else if (agentManager) {
             this.agent = agentManager.getAgent();
-            agentManager.subscribeAgent((agent) => {
+            this.unsubscribeAgent = agentManager.subscribeAgent((agent) => {
                 this.agent = agent;
                 this.didjsCanisterId = didjsCanisterId || this.getDefaultDidJsId();
             });
@@ -34,16 +35,25 @@ class CandidAdapter {
     }
     getCandidDefinition(canisterId) {
         return __awaiter(this, void 0, void 0, function* () {
-            // First attempt: Try getting Candid definition from metadata
-            const fromMetadata = yield this.getFromMetadata(canisterId);
-            if (fromMetadata)
-                return fromMetadata;
-            // Second attempt: Try the temporary hack method
-            const fromTmpHack = yield this.getFromTmpHack(canisterId);
-            if (fromTmpHack)
-                return fromTmpHack;
-            // If both attempts fail, throw an error
-            throw new Error("Failed to retrieve Candid definition by any method.");
+            try {
+                // First attempt: Try getting Candid definition from metadata
+                const fromMetadata = yield this.getFromMetadata(canisterId).catch(() => {
+                    return undefined;
+                });
+                if (fromMetadata)
+                    return fromMetadata;
+                // Second attempt: Try the temporary hack method
+                const fromTmpHack = yield this.getFromTmpHack(canisterId).catch(() => {
+                    return undefined;
+                });
+                if (fromTmpHack)
+                    return fromTmpHack;
+                // If both attempts fail, throw an error
+                throw "Failed to retrieve Candid definition by any method.";
+            }
+            catch (err) {
+                throw new Error(`Error fetching canister ${canisterId}: ${err}`);
+            }
         });
     }
     getFromMetadata(canisterId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/core",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "A library for intracting with the Internet Computer canisters",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -46,5 +46,5 @@
   "engines": {
     "node": ">=10"
   },
-  "gitHead": "a7b6cc0c3cea60c49e3780af8862eb171506bb2a"
+  "gitHead": "4181bc6228d5efb98f14c48b2855a37bcada97dd"
 }