@ic-reactor/core 1.0.4 → 1.0.6

package/README.md

@@ -203,7 +203,7 @@ const { agentManager, callMethod } = createReactorStore<Candid>({
 
 // Usage example
 await agentManager.authenticate()
-const authClient = agentManager.getAuthClient()
+const authClient = agentManager.getAuth()
 
 authClient?.login({
   onSuccess: () => {

package/dist/classes/actor/index.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActorManager = void 0;
 /* eslint-disable no-console */
 const agent_1 = require("@dfinity/agent");
-const helper_1 = require("../../tools/helper");
+const helper_1 = require("../../utils/helper");
 const candid_1 = require("@dfinity/candid");
 class ActorManager {
     constructor(actorConfig) {
@@ -92,10 +92,9 @@ class ActorManager {
             return this.actorStore.setState(updater);
         };
         const { agentManager, canisterId, idlFactory, withVisitor = false, withDevtools = false, initializeOnCreate = true, } = actorConfig;
-        this._agentManager = agentManager;
-        this._agentManager.subscribeAgent(this.initializeActor);
         this.canisterId = canisterId;
         this._idlFactory = idlFactory;
+        this._agentManager = agentManager;
         if (withVisitor) {
             this.visitFunction = withVisitor ? this.extractService() : emptyVisitor;
         }
@@ -107,9 +106,7 @@ class ActorManager {
             withDevtools,
             store: `actor-${String(canisterId)}`,
         });
-        if (initializeOnCreate) {
-            this.initializeActor(agentManager.getAgent());
-        }
+        this._agentManager.subscribeAgent(this.initializeActor, initializeOnCreate);
     }
     extractService() {
         return this._idlFactory({ IDL: candid_1.IDL })._fields.reduce((acc, service) => {

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

@@ -6,7 +6,7 @@ export interface DefaultActorType {
     [key: string]: ActorMethod;
 }
 export type BaseActor<T = DefaultActorType> = ActorSubclass<T>;
-export type FunctionName<A = BaseActor> = keyof A & string;
+export type FunctionName<A = BaseActor> = Extract<keyof A, string>;
 export type FunctionType = "query" | "update";
 export type CanisterId = string | Principal;
 export interface ActorManagerParameters {

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

@@ -1,7 +1,8 @@
 import { HttpAgent } from "@dfinity/agent";
-import type { AgentStore, AgentManagerParameters, UpdateAgentParameters, AuthStore } from "./types";
+import type { AgentStore, AgentManagerParameters, UpdateAgentParameters, AuthStore, AuthClient } from "./types";
 export declare class AgentManager {
     private _agent;
+    private _auth;
     private _subscribers;
     agentStore: AgentStore;
     authStore: AuthStore;
@@ -12,7 +13,7 @@ export declare class AgentManager {
     private updateAuthState;
     constructor(options?: AgentManagerParameters);
     private initializeAgent;
-    subscribeAgent: (callback: (agent: HttpAgent) => void) => () => void;
+    subscribeAgent: (callback: (agent: HttpAgent) => void, initialize?: boolean) => () => void;
     unsubscribeAgent: (callback: (agent: HttpAgent) => void) => void;
     private notifySubscribers;
     updateAgent: (options?: UpdateAgentParameters) => Promise<void>;
@@ -22,7 +23,7 @@ export declare class AgentManager {
     subscribeAgentState: AgentStore["subscribe"];
     getAuthState: AuthStore["getState"];
     subscribeAuthState: AuthStore["subscribe"];
-    getAuthClient: () => import("@dfinity/auth-client").AuthClient | null;
+    getAuth: () => AuthClient | null;
     getIdentity: () => import("@dfinity/agent").Identity | null;
     getPrincipal: () => import("@dfinity/principal").Principal | null;
 }

package/dist/classes/agent/index.js

@@ -45,10 +45,11 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentManager = void 0;
 const agent_1 = require("@dfinity/agent");
-const helper_1 = require("../../tools/helper");
-const constants_1 = require("../../tools/constants");
+const helper_1 = require("../../utils/helper");
+const constants_1 = require("../../utils/constants");
 class AgentManager {
     constructor(options) {
+        this._auth = null;
         this._subscribers = [];
         this.initialAgentState = {
             initialized: false,
@@ -57,7 +58,6 @@ class AgentManager {
         };
         this.initialAuthState = {
             identity: null,
-            authClient: null,
             authenticating: false,
             authenticated: false,
             error: undefined,
@@ -80,7 +80,10 @@ class AgentManager {
                 }
             }
         });
-        this.subscribeAgent = (callback) => {
+        this.subscribeAgent = (callback, initialize = true) => {
+            if (initialize) {
+                callback(this._agent);
+            }
             this._subscribers.push(callback);
             return () => this.unsubscribeAgent(callback);
         };
@@ -110,13 +113,12 @@ class AgentManager {
                     console.error("Failed to import @dfinity/auth-client:", error);
                     throw new Error("Authentication failed: @dfinity/auth-client package is missing.");
                 });
-                const authClient = yield AuthClient.create();
-                const authenticated = yield authClient.isAuthenticated();
-                const identity = authClient.getIdentity();
+                this._auth = yield AuthClient.create();
+                const authenticated = yield this._auth.isAuthenticated();
+                const identity = this._auth.getIdentity();
                 this._agent.replaceIdentity(identity);
                 this.notifySubscribers();
                 this.updateAuthState({
-                    authClient,
                     authenticated,
                     identity,
                     authenticating: false,
@@ -145,8 +147,8 @@ class AgentManager {
         this.subscribeAuthState = (listener) => {
             return this.authStore.subscribe(listener);
         };
-        this.getAuthClient = () => {
-            return this.authStore.getState().authClient;
+        this.getAuth = () => {
+            return this._auth;
         };
         this.getIdentity = () => {
             return this.authStore.getState().identity;

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

@@ -14,7 +14,6 @@ export interface AgentState {
 }
 export interface AuthState {
     identity: Identity | null;
-    authClient: AuthClient | null;
     authenticating: boolean;
     authenticated: boolean;
     error: Error | undefined;

package/dist/classes/candid/index.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CandidAdapter = void 0;
 const agent_1 = require("@dfinity/agent");
 const principal_1 = require("@dfinity/principal");
-const constants_1 = require("../../tools/constants");
+const constants_1 = require("../../utils/constants");
 class CandidAdapter {
     constructor({ agentManager, agent, didjsCanisterId, }) {
         if (agent) {

package/dist/createActorManager.d.ts

@@ -0,0 +1,12 @@
+import { ActorManager } from "./classes/actor";
+import { ActorManagerParameters, BaseActor } from "./types";
+/**
+ * Actor manager handles the lifecycle of the actors.
+ * It is responsible for creating and managing the actors.
+ * You can use it to call and visit the actor's methods.
+ * It also provides a way to interact with the actor's state.
+ *
+ * @category Main
+ * @includeExample ./packages/core/README.md:262-277
+ */
+export declare const createActorManager: <A = BaseActor>(config: ActorManagerParameters) => ActorManager<A>;

package/dist/createActorManager.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createActorManager = void 0;
+const actor_1 = require("./classes/actor");
+/**
+ * Actor manager handles the lifecycle of the actors.
+ * It is responsible for creating and managing the actors.
+ * You can use it to call and visit the actor's methods.
+ * It also provides a way to interact with the actor's state.
+ *
+ * @category Main
+ * @includeExample ./packages/core/README.md:262-277
+ */
+const createActorManager = (config) => {
+    return new actor_1.ActorManager(config);
+};
+exports.createActorManager = createActorManager;

package/dist/createAgentManager.d.ts

@@ -0,0 +1,12 @@
+import { AgentManager } from "./classes/agent";
+import { AgentManagerParameters } from "./types";
+/**
+ * Agent manager handles the lifecycle of the `@dfinity/agent`.
+ * It is responsible for creating agent and managing the agent's state.
+ * You can use it to subscribe to the agent changes.
+ * login and logout to the internet identity.
+ *
+ * @category Main
+ * @includeExample ./packages/core/README.md:226-254
+ */
+export declare const createAgentManager: (config?: AgentManagerParameters) => AgentManager;

package/dist/createAgentManager.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAgentManager = void 0;
+const agent_1 = require("./classes/agent");
+/**
+ * Agent manager handles the lifecycle of the `@dfinity/agent`.
+ * It is responsible for creating agent and managing the agent's state.
+ * You can use it to subscribe to the agent changes.
+ * login and logout to the internet identity.
+ *
+ * @category Main
+ * @includeExample ./packages/core/README.md:226-254
+ */
+const createAgentManager = (config) => {
+    return new agent_1.AgentManager(config);
+};
+exports.createAgentManager = createAgentManager;

package/dist/createCandidAdapter.d.ts

@@ -0,0 +1,11 @@
+import { CandidAdapter } from "./classes/candid";
+import { CandidAdapterParameters } from "./types";
+/**
+ * The `CandidAdapter` class is used to interact with a canister and retrieve its Candid interface definition.
+ * It provides methods to fetch the Candid definition either from the canister's metadata or by using a temporary hack method.
+ * If both methods fail, it throws an error.
+ *
+ * @category Main
+ * @includeExample ./packages/core/README.md:145-186
+ */
+export declare const createCandidAdapter: (config: CandidAdapterParameters) => CandidAdapter;

package/dist/createCandidAdapter.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCandidAdapter = void 0;
+const candid_1 = require("./classes/candid");
+/**
+ * The `CandidAdapter` class is used to interact with a canister and retrieve its Candid interface definition.
+ * It provides methods to fetch the Candid definition either from the canister's metadata or by using a temporary hack method.
+ * If both methods fail, it throws an error.
+ *
+ * @category Main
+ * @includeExample ./packages/core/README.md:145-186
+ */
+const createCandidAdapter = (config) => {
+    return new candid_1.CandidAdapter(config);
+};
+exports.createCandidAdapter = createCandidAdapter;

package/dist/{main.js → createReactorCore.js}

@@ -21,9 +21,9 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReactorCore = void 0;
-const constants_1 = require("./tools/constants");
-const tools_1 = require("./tools");
-const store_1 = require("./store");
+const constants_1 = require("./utils/constants");
+const utils_1 = require("./utils");
+const createReactorStore_1 = require("./createReactorStore");
 /**
  * The Core module is the main entry point for the library.
  * Create a new actor manager with the given options.
@@ -33,9 +33,9 @@ const store_1 = require("./store");
  * @includeExample ./packages/core/README.md:26-80
  */
 const createReactorCore = (config) => {
-    const _a = (0, store_1.createReactorStore)(config), { subscribeActorState, updateMethodState, callMethod, getState, agentManager } = _a, rest = __rest(_a, ["subscribeActorState", "updateMethodState", "callMethod", "getState", "agentManager"]);
+    const _a = (0, createReactorStore_1.createReactorStore)(config), { subscribeActorState, updateMethodState, callMethod, getState, agentManager } = _a, rest = __rest(_a, ["subscribeActorState", "updateMethodState", "callMethod", "getState", "agentManager"]);
     const actorMethod = (functionName, ...args) => {
-        const requestHash = (0, tools_1.generateRequestHash)(args);
+        const requestHash = (0, utils_1.generateRequestHash)(args);
         const updateState = (newState = {}) => {
             updateMethodState(functionName, requestHash, newState);
         };
@@ -55,6 +55,7 @@ const createReactorCore = (config) => {
                 }
             });
             const subscribe = (callback) => {
+                callback(methodState());
                 const unsubscribe = subscribeActorState((state) => {
                     const methodState = state.methodState[functionName];
                     const methodStateHash = methodState[requestHash];
@@ -114,7 +115,7 @@ const createReactorCore = (config) => {
         return actorMethod(functionName, ...args);
     };
     const login = (options) => __awaiter(void 0, void 0, void 0, function* () {
-        const authClient = agentManager.getAuthClient();
+        const authClient = agentManager.getAuth();
         if (!authClient) {
             yield agentManager.authenticate();
         }
@@ -122,11 +123,11 @@ const createReactorCore = (config) => {
             throw new Error("Auth client not initialized");
         }
         yield authClient.login(Object.assign({ identityProvider: agentManager.isLocalEnv
-                ? constants_1.IC_INTERNET_IDENTITY_PROVIDER
-                : constants_1.LOCAL_INTERNET_IDENTITY_PROVIDER }, options));
+                ? constants_1.LOCAL_INTERNET_IDENTITY_PROVIDER
+                : constants_1.IC_INTERNET_IDENTITY_PROVIDER }, options));
     });
     const logout = (options) => __awaiter(void 0, void 0, void 0, function* () {
-        const authClient = agentManager.getAuthClient();
+        const authClient = agentManager.getAuth();
         if (!authClient) {
             throw new Error("Auth client not initialized");
         }

package/dist/{store.js → createReactorStore.js}

@@ -12,8 +12,9 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReactorStore = void 0;
-const other_1 = require("./other");
-const tools_1 = require("./tools");
+const utils_1 = require("./utils");
+const createActorManager_1 = require("./createActorManager");
+const createAgentManager_1 = require("./createAgentManager");
 /**
  * Create a new actor manager with the given options.
  * Its create a new agent manager if not provided.
@@ -24,13 +25,13 @@ const tools_1 = require("./tools");
  */
 const createReactorStore = (config) => {
     const isLocalEnv = config.withProcessEnv
-        ? (0, tools_1.isInLocalOrDevelopment)()
+        ? (0, utils_1.isInLocalOrDevelopment)()
         : undefined;
     const { idlFactory, canisterId, withDevtools = false, initializeOnCreate = true, withVisitor = false, agentManager: maybeAgentManager } = config, agentParameters = __rest(config, ["idlFactory", "canisterId", "withDevtools", "initializeOnCreate", "withVisitor", "agentManager"]);
     const agentManager = maybeAgentManager ||
-        (0, other_1.createAgentManager)(Object.assign({ withDevtools,
+        (0, createAgentManager_1.createAgentManager)(Object.assign({ withDevtools,
             isLocalEnv }, agentParameters));
-    const actorManager = (0, other_1.createActorManager)({
+    const actorManager = (0, createActorManager_1.createActorManager)({
         idlFactory,
         canisterId,
         agentManager,

package/dist/index.d.ts

@@ -1,6 +1,8 @@
-export * from "./main";
-export * from "./store";
-export * from "./other";
+export * from "./createReactorCore";
+export * from "./createReactorStore";
+export * from "./createCandidAdapter";
+export * from "./createActorManager";
+export * from "./createAgentManager";
 export * as classes from "./classes";
 export * as types from "./types";
-export * as tools from "./tools";
+export * as utils from "./utils";

package/dist/index.js

@@ -26,10 +26,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tools = exports.types = exports.classes = void 0;
-__exportStar(require("./main"), exports);
-__exportStar(require("./store"), exports);
-__exportStar(require("./other"), exports);
+exports.utils = exports.types = exports.classes = void 0;
+__exportStar(require("./createReactorCore"), exports);
+__exportStar(require("./createReactorStore"), exports);
+__exportStar(require("./createCandidAdapter"), exports);
+__exportStar(require("./createActorManager"), exports);
+__exportStar(require("./createAgentManager"), exports);
 exports.classes = __importStar(require("./classes"));
 exports.types = __importStar(require("./types"));
-exports.tools = __importStar(require("./tools"));
+exports.utils = __importStar(require("./utils"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/core",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "A library for intracting with the Internet Computer canisters",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -43,5 +43,5 @@
   "engines": {
     "node": ">=10"
   },
-  "gitHead": "6b8947ab2611bf7af4f0fadaa33a1fa231cfc26b"
+  "gitHead": "bf69ae06def96cd40814a72535325f7c7a8a6b5a"
 }

package/dist/other.d.ts

@@ -1,33 +0,0 @@
-import { ActorManager } from "./classes/actor";
-import { AgentManager } from "./classes/agent";
-import { CandidAdapter } from "./classes/candid";
-import { CandidAdapterParameters, ActorManagerParameters, AgentManagerParameters, BaseActor } from "./types";
-/**
- * The `CandidAdapter` class is used to interact with a canister and retrieve its Candid interface definition.
- * It provides methods to fetch the Candid definition either from the canister's metadata or by using a temporary hack method.
- * If both methods fail, it throws an error.
- *
- * @category Main
- * @includeExample ./packages/core/README.md:145-186
- */
-export declare const createCandidAdapter: (config: CandidAdapterParameters) => CandidAdapter;
-/**
- * Agent manager handles the lifecycle of the `@dfinity/agent`.
- * It is responsible for creating agent and managing the agent's state.
- * You can use it to subscribe to the agent changes.
- * login and logout to the internet identity.
- *
- * @category Main
- * @includeExample ./packages/core/README.md:226-254
- */
-export declare const createAgentManager: (config?: AgentManagerParameters) => AgentManager;
-/**
- * Actor manager handles the lifecycle of the actors.
- * It is responsible for creating and managing the actors.
- * You can use it to call and visit the actor's methods.
- * It also provides a way to interact with the actor's state.
- *
- * @category Main
- * @includeExample ./packages/core/README.md:262-277
- */
-export declare const createActorManager: <A = BaseActor>(config: ActorManagerParameters) => ActorManager<A>;

package/dist/other.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createActorManager = exports.createAgentManager = exports.createCandidAdapter = void 0;
-const actor_1 = require("./classes/actor");
-const agent_1 = require("./classes/agent");
-const candid_1 = require("./classes/candid");
-/**
- * The `CandidAdapter` class is used to interact with a canister and retrieve its Candid interface definition.
- * It provides methods to fetch the Candid definition either from the canister's metadata or by using a temporary hack method.
- * If both methods fail, it throws an error.
- *
- * @category Main
- * @includeExample ./packages/core/README.md:145-186
- */
-const createCandidAdapter = (config) => {
-    return new candid_1.CandidAdapter(config);
-};
-exports.createCandidAdapter = createCandidAdapter;
-/**
- * Agent manager handles the lifecycle of the `@dfinity/agent`.
- * It is responsible for creating agent and managing the agent's state.
- * You can use it to subscribe to the agent changes.
- * login and logout to the internet identity.
- *
- * @category Main
- * @includeExample ./packages/core/README.md:226-254
- */
-const createAgentManager = (config) => {
-    return new agent_1.AgentManager(config);
-};
-exports.createAgentManager = createAgentManager;
-/**
- * Actor manager handles the lifecycle of the actors.
- * It is responsible for creating and managing the actors.
- * You can use it to call and visit the actor's methods.
- * It also provides a way to interact with the actor's state.
- *
- * @category Main
- * @includeExample ./packages/core/README.md:262-277
- */
-const createActorManager = (config) => {
-    return new actor_1.ActorManager(config);
-};
-exports.createActorManager = createActorManager;