@ic-reactor/react 0.5.5 → 1.0.1

package/README.md

@@ -1,5 +1,3 @@
-# IC-ReActor - React
-
 `@ic-reactor/react` is a comprehensive React library designed to streamline interactions with the Internet Computer (IC) blockchain. It provides React hooks and utilities for efficient state management, authentication, and interaction with IC actors.
 
 ## Features
@@ -131,24 +129,3 @@ const Login = () => {
 
 export default Login
 ```
-
-## API Reference
-
-The library provides various hooks and utilities for interacting with IC actors:
-
-- `useActorStore`: Hook for managing actor states.
-- `useAuthStore` Hook for managing authentication states.
-- `useAuthClient`: Hook for managing authentication with the IC blockchain.
-- `useQueryCall`: Hook for querying data from an actor.
-- `useUpdateCall`: Hook for updating data in an actor.
-- Additional hooks for handling loading, errors, authentication, and more.
-
-For detailed API usage and options, please refer to the [documentation](#).
-
-## Contributing
-
-Contributions to `@ic-reactor/react` are welcome! Please read our [contributing guidelines](#) for more information.
-
-## License
-
-`@ic-reactor/react` is licensed under the MIT License. See the [LICENSE](LICENSE) file for more details.

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

@@ -0,0 +1,16 @@
+import React from "react";
+import { ActorUseMethodCallArg, ActorUseQueryArgs, ActorUseUpdateArgs } from "../../types";
+import { CreateActorOptions, ActorContextType, ActorProviderProps } from "./types";
+import type { ActorSubclass } from "@dfinity/agent";
+export declare const ActorContext: React.Context<ActorContextType | null>, ActorProvider: React.FC<ActorProviderProps>, useActorContext: <A extends unknown = unknown>() => ActorContextType<A>, useActorState: () => import("../../types").UseActorStoreReturn<unknown>, useQueryCall: <M extends never>(args: ActorUseQueryArgs<unknown, M>) => import("../../types").ActorCallReturn<unknown, M>, useUpdateCall: <M extends never>(args: ActorUseUpdateArgs<unknown, M>) => import("../../types").ActorCallReturn<unknown, M>, useMethodCall: <M extends never>(args: ActorUseMethodCallArg<unknown, M>) => import("../../types").ActorUseMethodCallReturn<unknown, M, true>, useVisitMethod: (functionName: never) => never;
+export declare function createReActorContext<Actor extends ActorSubclass<any>>({ canisterId: defaultCanisterId, ...defaultConfig }?: Partial<CreateActorOptions>): {
+    ActorContext: React.Context<ActorContextType | null>;
+    ActorProvider: React.FC<ActorProviderProps>;
+    useActorContext: <A extends unknown = Actor>() => ActorContextType<A>;
+    useActorState: () => import("../../types").UseActorStoreReturn<Actor>;
+    useQueryCall: <M extends keyof Actor & string>(args: ActorUseQueryArgs<Actor, M>) => import("../../types").ActorCallReturn<Actor, M>;
+    useUpdateCall: <M_1 extends keyof Actor & string>(args: ActorUseUpdateArgs<Actor, M_1>) => import("../../types").ActorCallReturn<Actor, M_1>;
+    useMethodCall: <M_2 extends keyof Actor & string>(args: ActorUseMethodCallArg<Actor, M_2>) => import("../../types").ActorUseMethodCallReturn<Actor, M_2, true>;
+    useVisitMethod: (functionName: keyof Actor & string) => import("@ic-reactor/core/dist/actor/types").VisitService<Actor>[keyof Actor & string];
+    initialize: () => Promise<void>;
+};

package/dist/context/actor/index.js

@@ -0,0 +1,88 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createReActorContext = exports.useVisitMethod = exports.useMethodCall = exports.useUpdateCall = exports.useQueryCall = exports.useActorState = exports.useActorContext = exports.ActorProvider = exports.ActorContext = void 0;
+/* eslint-disable @typescript-eslint/no-explicit-any */
+const react_1 = __importStar(require("react"));
+const actor_1 = require("../../hooks/actor");
+const useActor_1 = require("../../hooks/useActor");
+_a = createReActorContext(), exports.ActorContext = _a.ActorContext, exports.ActorProvider = _a.ActorProvider, exports.useActorContext = _a.useActorContext, exports.useActorState = _a.useActorState, exports.useQueryCall = _a.useQueryCall, exports.useUpdateCall = _a.useUpdateCall, exports.useMethodCall = _a.useMethodCall, exports.useVisitMethod = _a.useVisitMethod;
+function createReActorContext(_a = {}) {
+    var { canisterId: defaultCanisterId } = _a, defaultConfig = __rest(_a, ["canisterId"]);
+    const ActorContext = (0, react_1.createContext)(null);
+    const ActorProvider = (_a) => {
+        var { children, canisterId = defaultCanisterId, loadingComponent = react_1.default.createElement("div", null, "Fetching canister...") } = _a, restConfig = __rest(_a, ["children", "canisterId", "loadingComponent"]);
+        if (!canisterId) {
+            throw new Error("canisterId is required");
+        }
+        const config = (0, react_1.useMemo)(() => (Object.assign(Object.assign({}, defaultConfig), restConfig)), [defaultConfig, restConfig]);
+        const { actorManager, fetchError, fetching } = (0, useActor_1.useActor)(Object.assign({ canisterId }, config));
+        const hooks = (0, react_1.useMemo)(() => {
+            if (actorManager) {
+                return (0, actor_1.getActorHooks)(actorManager);
+            }
+            return null;
+        }, [actorManager === null || actorManager === void 0 ? void 0 : actorManager.canisterId]);
+        return (react_1.default.createElement(ActorContext.Provider, { value: hooks }, fetching || hooks === null ? fetchError !== null && fetchError !== void 0 ? fetchError : loadingComponent : children));
+    };
+    ActorProvider.displayName = "ActorProvider";
+    const useActorContext = () => {
+        const context = (0, react_1.useContext)(ActorContext);
+        if (!context) {
+            throw new Error("useActor must be used within a ActorProvider");
+        }
+        return context;
+    };
+    const initialize = () => useActorContext().initialize();
+    const useActorState = () => useActorContext().useActorState();
+    const useQueryCall = (args) => useActorContext().useQueryCall(args);
+    const useUpdateCall = (args) => useActorContext().useUpdateCall(args);
+    const useMethodCall = (args) => useActorContext().useMethodCall(args);
+    const useVisitMethod = (functionName) => useActorContext().useVisitMethod(functionName);
+    return {
+        ActorContext,
+        ActorProvider,
+        useActorContext,
+        useActorState,
+        useQueryCall,
+        useUpdateCall,
+        useMethodCall,
+        useVisitMethod,
+        initialize,
+    };
+}
+exports.createReActorContext = createReActorContext;

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

@@ -0,0 +1,28 @@
+/// <reference types="react" />
+import { IDL } from "@dfinity/candid";
+import { ActorManagerOptions, BaseActor } from "@ic-reactor/core/dist/types";
+import { ActorHooks, AgentContextType } from "../../types";
+export type ActorContextType<Actor = BaseActor, F extends boolean = true> = ActorHooks<Actor, F> & {
+    ActorContext: React.Context<ActorContextType<Actor, F> | null>;
+    useActorContext: <A = Actor>() => ActorContextType<A>;
+    ActorProvider: React.FC<ActorProviderProps>;
+};
+export type CreateReActorContext = {
+    <A = BaseActor>(options?: Partial<CreateActorOptions> & {
+        withVisitor: true;
+    }): ActorContextType<A, true>;
+    <A = BaseActor>(options?: Partial<CreateActorOptions> & {
+        withVisitor?: false | undefined;
+    }): ActorContextType<A, false>;
+};
+export interface CreateActorOptions extends Omit<ActorManagerOptions, "idlFactory" | "agentManager" | "canisterId"> {
+    didjsId?: string;
+    canisterId?: string;
+    agentContext?: AgentContextType;
+    idlFactory?: IDL.InterfaceFactory;
+    loadingComponent?: React.ReactNode;
+}
+export interface ActorProviderProps extends CreateActorOptions {
+    children?: React.ReactNode | undefined;
+    loadingComponent?: React.ReactNode;
+}

package/dist/context/actor/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/context/agent/context.d.ts

@@ -0,0 +1,5 @@
+import React from "react";
+import type { AgentContextValue, AgentProviderProps } from "./types";
+export declare const AgentContext: React.Context<AgentContextValue | null>;
+declare const AgentProvider: React.FC<AgentProviderProps>;
+export { AgentProvider };

package/dist/context/{agent.js → agent/context.js}

@@ -34,40 +34,22 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AgentProvider = exports.createAgentContext = exports.useAgentManager = exports.useAgent = exports.AgentContext = void 0;
+exports.AgentProvider = exports.AgentContext = void 0;
 const react_1 = __importStar(require("react"));
-const store_1 = require("@ic-reactor/store");
-const auth_1 = require("../hooks/auth");
+const core_1 = require("@ic-reactor/core");
+const agent_1 = require("../../hooks/agent");
+const auth_1 = require("../../hooks/auth");
 exports.AgentContext = (0, react_1.createContext)(null);
-const useAgent = (agentContext) => {
-    const context = (0, react_1.useContext)(agentContext || exports.AgentContext);
-    if (!context) {
-        throw new Error("useAgent must be used within a AgentProvider");
-    }
-    return context;
-};
-exports.useAgent = useAgent;
-const useAgentManager = (agentContext) => {
-    const context = (0, react_1.useContext)(agentContext || exports.AgentContext);
-    if (!context) {
-        throw new Error("useAgentManager must be used within a AgentProvider");
-    }
-    return context.agentManager;
-};
-exports.useAgentManager = useAgentManager;
-const createAgentContext = (config) => {
-    const agentManager = (0, store_1.createAgentManager)(config);
-    const hooks = (0, auth_1.getAuthHooks)(agentManager);
-    return Object.assign(Object.assign({}, hooks), { agentManager });
-};
-exports.createAgentContext = createAgentContext;
 const AgentProvider = (_a) => {
     var { children } = _a, config = __rest(_a, ["children"]);
-    const value = (0, react_1.useMemo)(() => {
-        const agentManager = config.agentManager || (0, store_1.createAgentManager)(config);
-        const hooks = (0, auth_1.getAuthHooks)(agentManager);
-        return Object.assign(Object.assign({}, hooks), { agentManager });
-    }, [config]);
+    const value = (0, react_1.useMemo)(() => createAgentContext(config), [config]);
     return react_1.default.createElement(exports.AgentContext.Provider, { value: value }, children);
 };
 exports.AgentProvider = AgentProvider;
+AgentProvider.displayName = "AgentProvider";
+const createAgentContext = (config) => {
+    const agentManager = (0, core_1.createAgentManager)(config);
+    const agenthooks = (0, agent_1.getAgentHooks)(agentManager);
+    const authHooks = (0, auth_1.getAuthHooks)(agentManager);
+    return Object.assign(Object.assign(Object.assign({}, agenthooks), authHooks), { agentManager });
+};

package/dist/context/agent/hooks.d.ts

@@ -0,0 +1,24 @@
+import { AgentManager } from "@ic-reactor/core/dist/agent";
+import type { AgentContextType } from "./types";
+import { AuthArgs } from "../../types";
+export declare const useAgentManagerContext: (agentContext?: AgentContextType) => import("./types").AgentContextValue;
+export declare const useAgentManager: (agentContext?: AgentContextType) => AgentManager;
+export declare const useAgent: (agentContext?: AgentContextType) => import("@dfinity/agent/lib/cjs/agent/http").HttpAgent | undefined;
+export declare const useAuthStore: (agentContext?: AgentContextType) => import("@ic-reactor/core/dist/agent/types").AuthState;
+export declare const useAgentState: (agentContext?: AgentContextType) => import("@ic-reactor/core/dist/agent/types").AgentState;
+export declare const useAuthClient: ({ agentContext, ...args }: AuthArgs & {
+    agentContext?: AgentContextType | undefined;
+}) => {
+    authClient: import("@dfinity/auth-client").AuthClient | null;
+    authenticated: boolean;
+    authenticating: boolean;
+    identity: import("@dfinity/agent/lib/cjs/auth").Identity | null;
+    login: (options?: import("@dfinity/auth-client").AuthClientLoginOptions | undefined) => Promise<void>;
+    logout: (options?: {
+        returnTo?: string | undefined;
+    } | undefined) => Promise<void>;
+    authenticate: () => Promise<import("@dfinity/agent/lib/cjs/auth").Identity>;
+    loginLoading: boolean;
+    loginError: Error | null;
+};
+export declare const useUserPrincipal: (agentContext?: AgentContextType) => import("@dfinity/principal").Principal | undefined;

package/dist/context/agent/hooks.js

@@ -0,0 +1,43 @@
+"use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useUserPrincipal = exports.useAuthClient = exports.useAgentState = exports.useAuthStore = exports.useAgent = exports.useAgentManager = exports.useAgentManagerContext = void 0;
+const react_1 = require("react");
+const context_1 = require("./context");
+const useAgentManagerContext = (agentContext) => {
+    const context = (0, react_1.useContext)(agentContext || context_1.AgentContext);
+    if (!context) {
+        throw new Error("Agent context must be used within a AgentProvider");
+    }
+    return context;
+};
+exports.useAgentManagerContext = useAgentManagerContext;
+const useAgentManager = (agentContext) => {
+    const context = (0, exports.useAgentManagerContext)(agentContext);
+    return context.agentManager;
+};
+exports.useAgentManager = useAgentManager;
+const useAgent = (agentContext) => (0, exports.useAgentManagerContext)(agentContext).useAgent();
+exports.useAgent = useAgent;
+const useAuthStore = (agentContext) => (0, exports.useAgentManagerContext)(agentContext).useAuthStore();
+exports.useAuthStore = useAuthStore;
+const useAgentState = (agentContext) => (0, exports.useAgentManagerContext)(agentContext).useAgentState();
+exports.useAgentState = useAgentState;
+const useAuthClient = (_a) => {
+    var { agentContext } = _a, args = __rest(_a, ["agentContext"]);
+    const context = (0, exports.useAgentManagerContext)(agentContext);
+    return context.useAuthClient(args);
+};
+exports.useAuthClient = useAuthClient;
+const useUserPrincipal = (agentContext) => (0, exports.useAgentManagerContext)(agentContext).useUserPrincipal();
+exports.useUserPrincipal = useUserPrincipal;

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

@@ -0,0 +1,2 @@
+export * from "./context";
+export * from "./hooks";

package/dist/context/agent/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./context"), exports);
+__exportStar(require("./hooks"), exports);

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

@@ -0,0 +1,12 @@
+import React, { PropsWithChildren } from "react";
+import type { AgentManagerOptions } from "@ic-reactor/core/dist/types";
+import type { AgentManager } from "@ic-reactor/core/dist/agent";
+import type { getAuthHooks } from "../../hooks/auth";
+import type { getAgentHooks } from "../../hooks/agent";
+export type AgentContextValue = ReturnType<typeof getAuthHooks> & ReturnType<typeof getAgentHooks> & {
+    agentManager: AgentManager;
+};
+export type AgentContextType = React.Context<AgentContextValue | null>;
+export interface AgentProviderProps extends PropsWithChildren, AgentManagerOptions {
+    agentManager?: AgentManager;
+}

package/dist/context/agent/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/context/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./actor";
+export * from "./agent";

package/dist/context/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./actor"), exports);
+__exportStar(require("./agent"), exports);

package/dist/hooks/actor.d.ts

@@ -1,3 +1,3 @@
-import type { ActorManager } from "@ic-reactor/store";
-import type { ActorHooks } from "../types";
-export declare const getActorHooks: <A extends unknown>({ initialize, serviceFields, withServiceFields, canisterId, actorStore, callMethod, }: ActorManager<A>) => ActorHooks<A, boolean>;
+import { ActorHooks } from "../types";
+import type { ActorManager } from "@ic-reactor/core/dist/actor";
+export declare const getActorHooks: <A>({ initialize, canisterId, actorStore, callMethod, visitFunction, }: ActorManager<A>) => ActorHooks<A, true>;

package/dist/hooks/actor.js

@@ -21,43 +21,31 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getActorHooks = void 0;
+/* eslint-disable no-console */
 const react_1 = require("react");
 const zustand_1 = require("zustand");
-const getActorHooks = ({ initialize, serviceFields, withServiceFields, canisterId, actorStore, callMethod, }) => {
-    const useActorStore = () => {
+const DEFAULT_STATE = {
+    data: undefined,
+    error: undefined,
+    loading: false,
+};
+const getActorHooks = ({ initialize, canisterId, actorStore, callMethod, visitFunction, }) => {
+    const useActorState = () => {
         const actorState = (0, zustand_1.useStore)(actorStore, (state) => state);
         return Object.assign(Object.assign({}, actorState), { canisterId });
     };
-    const useServiceFields = () => {
-        if (!withServiceFields || !serviceFields) {
-            throw new Error("Service fields not initialized. Pass `withServiceFields` to initialize service fields.");
-        }
-        return serviceFields;
-    };
-    const useMethods = () => {
-        const serviceFields = useServiceFields();
-        return (0, react_1.useMemo)(() => {
-            return Object.values(serviceFields.methods);
-        }, [serviceFields]);
+    const useVisitFunction = () => {
+        return visitFunction;
     };
-    const useMethodFields = () => {
-        const serviceFields = useServiceFields();
+    const useVisitMethod = (functionName) => {
+        const serviceFields = useVisitFunction();
         return (0, react_1.useMemo)(() => {
-            return Object.values(serviceFields.methodFields);
-        }, [serviceFields]);
-    };
-    const useMethodField = (functionName) => {
-        const serviceMethod = useServiceFields();
-        return (0, react_1.useMemo)(() => {
-            return serviceMethod.methodFields[functionName];
-        }, [functionName, serviceMethod]);
+            return serviceFields[functionName];
+        }, [functionName, serviceFields]);
     };
     const useReActorCall = ({ onError, onSuccess, onLoading, args = [], functionName, throwOnError = false, }) => {
-        const [state, setState] = (0, react_1.useState)({
-            data: undefined,
-            error: undefined,
-            loading: false,
-        });
+        const [state, setState] = (0, react_1.useState)(DEFAULT_STATE);
+        const reset = (0, react_1.useCallback)(() => setState(DEFAULT_STATE), []);
         const call = (0, react_1.useCallback)((eventOrReplaceArgs) => __awaiter(void 0, void 0, void 0, function* () {
             onLoading === null || onLoading === void 0 ? void 0 : onLoading(true);
             onError === null || onError === void 0 ? void 0 : onError(undefined);
@@ -83,15 +71,12 @@ const getActorHooks = ({ initialize, serviceFields, withServiceFields, canisterI
                     throw error;
             }
         }), [args, functionName, onError, onSuccess, onLoading]);
-        const field = (0, react_1.useMemo)(() => {
-            return serviceFields === null || serviceFields === void 0 ? void 0 : serviceFields.methodFields[functionName];
-        }, [functionName]);
-        return Object.assign({ call, field }, state);
+        return Object.assign({ call, reset }, state);
     };
     const useQueryCall = (_a) => {
-        var { refetchOnMount = false, refetchInterval = false } = _a, rest = __rest(_a, ["refetchOnMount", "refetchInterval"]);
+        var { refetchOnMount = true, refetchInterval = false } = _a, rest = __rest(_a, ["refetchOnMount", "refetchInterval"]);
         const _b = useReActorCall(rest), { call } = _b, state = __rest(_b, ["call"]);
-        let intervalId = (0, react_1.useRef)(undefined);
+        const intervalId = (0, react_1.useRef)(undefined);
         (0, react_1.useEffect)(() => {
             // Auto-refresh logic
             if (refetchInterval) {
@@ -99,40 +84,31 @@ const getActorHooks = ({ initialize, serviceFields, withServiceFields, canisterI
                     call();
                 }, refetchInterval);
             }
-            // Initial call logic
-            if (refetchOnMount) {
-                call();
-            }
             return () => {
                 clearInterval(intervalId.current);
             };
-        }, [refetchOnMount, refetchInterval]);
+        }, [refetchInterval]);
+        (0, react_1.useLayoutEffect)(() => {
+            if (refetchOnMount) {
+                call();
+            }
+        }, []);
         return Object.assign({ call }, state);
     };
     const useUpdateCall = (args) => {
         return useReActorCall(args);
     };
-    const useMethodCall = (_a) => {
-        var { type } = _a, rest = __rest(_a, ["type"]);
-        switch (type) {
-            case "query":
-                return useQueryCall(rest);
-            case "update":
-                return useUpdateCall(rest);
-            default:
-                throw new Error(`Invalid type: ${type}`);
-        }
+    const useMethodCall = (args) => {
+        const visit = visitFunction[args.functionName];
+        return Object.assign({ visit }, useReActorCall(args));
     };
     return {
         initialize,
         useQueryCall,
         useUpdateCall,
+        useVisitMethod,
+        useActorState,
         useMethodCall,
-        useActorStore,
-        useMethods,
-        useMethodField,
-        useMethodFields,
-        useServiceFields,
     };
 };
 exports.getActorHooks = getActorHooks;

package/dist/hooks/agent.d.ts

@@ -0,0 +1,6 @@
+import type { AgentManager } from "@ic-reactor/core/dist/agent";
+import type { HttpAgent } from "@ic-reactor/core/dist/types";
+export declare const getAgentHooks: (agentManager: AgentManager) => {
+    useAgent: () => HttpAgent | undefined;
+    useAgentState: () => import("@ic-reactor/core/dist/types").AgentState;
+};

package/dist/hooks/agent.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAgentHooks = void 0;
+const react_1 = require("react");
+const zustand_1 = require("zustand");
+const getAgentHooks = (agentManager) => {
+    const { agentStore, getAgent } = agentManager;
+    const useAgentState = () => {
+        return (0, zustand_1.useStore)(agentStore, (state) => state);
+    };
+    const useAgent = () => {
+        const [agent, setAgent] = (0, react_1.useState)(getAgent());
+        (0, react_1.useEffect)(() => agentManager.subscribeAgent(setAgent), []);
+        return agent;
+    };
+    return {
+        useAgent,
+        useAgentState,
+    };
+};
+exports.getAgentHooks = getAgentHooks;

package/dist/hooks/auth.d.ts

@@ -1,11 +1,10 @@
 import type { AuthClientLoginOptions } from "@dfinity/auth-client";
-import type { AgentManager, Identity, Principal } from "@ic-reactor/store";
+import type { Identity, Principal } from "@ic-reactor/core/dist/types";
+import type { AgentManager } from "@ic-reactor/core/dist/agent";
 import { AuthArgs } from "../types";
-export type AuthHooks = ReturnType<typeof getAuthHooks>;
 export declare const getAuthHooks: (agentManager: AgentManager) => {
     useUserPrincipal: () => Principal | undefined;
-    useAgentManager: () => AgentManager;
-    useAuthStore: () => import("@ic-reactor/store").AgentAuthState;
+    useAuthStore: () => import("@ic-reactor/core/dist/types").AuthState;
     useAuthClient: ({ onAuthentication, onAuthenticationSuccess, onAuthenticationFailure, onLogin, onLoginSuccess, onLoginError, onLoggedOut, }?: AuthArgs) => {
         authClient: import("@dfinity/auth-client").AuthClient | null;
         authenticated: boolean;

package/dist/hooks/auth.js

@@ -14,9 +14,6 @@ const react_1 = require("react");
 const zustand_1 = require("zustand");
 const getAuthHooks = (agentManager) => {
     const { authenticate: authenticator, authStore, isLocalEnv } = agentManager;
-    const useAgentManager = () => {
-        return agentManager;
-    };
     const useAuthStore = () => {
         const authState = (0, zustand_1.useStore)(authStore, (state) => state);
         return authState;
@@ -30,17 +27,17 @@ const getAuthHooks = (agentManager) => {
         const [loginError, setLoginError] = (0, react_1.useState)(null);
         const { authClient, authenticated, authenticating, identity } = useAuthStore();
         const authenticate = (0, react_1.useCallback)(() => __awaiter(void 0, void 0, void 0, function* () {
-            const authenticatePromise = new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
-                try {
-                    const identity = yield authenticator();
+            const authenticatePromise = new Promise((resolve, reject) => {
+                authenticator()
+                    .then((identity) => {
                     onAuthenticationSuccess === null || onAuthenticationSuccess === void 0 ? void 0 : onAuthenticationSuccess(identity);
                     resolve(identity);
-                }
-                catch (e) {
+                })
+                    .catch((e) => {
                     onAuthenticationFailure === null || onAuthenticationFailure === void 0 ? void 0 : onAuthenticationFailure(e);
                     reject(e);
-                }
-            }));
+                });
+            });
             onAuthentication === null || onAuthentication === void 0 ? void 0 : onAuthentication(() => authenticatePromise);
             return authenticatePromise;
         }), [
@@ -52,21 +49,28 @@ const getAuthHooks = (agentManager) => {
         const login = (0, react_1.useCallback)((options) => __awaiter(void 0, void 0, void 0, function* () {
             setLoginLoading(true);
             setLoginError(null);
-            const loginPromise = new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
+            const loginPromise = new Promise((resolve, reject) => {
                 try {
                     if (!authClient) {
                         throw new Error("Auth client not initialized");
                     }
-                    yield authClient.login(Object.assign(Object.assign({ identityProvider: isLocalEnv
+                    authClient.login(Object.assign(Object.assign({ identityProvider: isLocalEnv
                             ? "https://identity.ic0.app/#authorize"
-                            : "http://rdmx6-jaaaa-aaaaa-aaadq-cai.localhost:4943/#authorize" }, options), { onSuccess: () => __awaiter(void 0, void 0, void 0, function* () {
-                            var _a;
-                            const identity = yield authenticate();
-                            const principal = identity.getPrincipal();
-                            (_a = options === null || options === void 0 ? void 0 : options.onSuccess) === null || _a === void 0 ? void 0 : _a.call(options);
-                            onLoginSuccess === null || onLoginSuccess === void 0 ? void 0 : onLoginSuccess(principal);
-                            resolve(principal);
-                        }), onError: (e) => {
+                            : "http://rdmx6-jaaaa-aaaaa-aaadq-cai.localhost:4943/#authorize" }, options), { onSuccess: () => {
+                            authenticate()
+                                .then((identity) => {
+                                var _a;
+                                const principal = identity.getPrincipal();
+                                (_a = options === null || options === void 0 ? void 0 : options.onSuccess) === null || _a === void 0 ? void 0 : _a.call(options);
+                                onLoginSuccess === null || onLoginSuccess === void 0 ? void 0 : onLoginSuccess(principal);
+                                resolve(principal);
+                            })
+                                .catch((e) => {
+                                setLoginError(e);
+                                onLoginError === null || onLoginError === void 0 ? void 0 : onLoginError(e);
+                                reject(e);
+                            });
+                        }, onError: (e) => {
                             var _a;
                             (_a = options === null || options === void 0 ? void 0 : options.onError) === null || _a === void 0 ? void 0 : _a.call(options, e);
                             const error = new Error("Login failed: " + e);
@@ -83,7 +87,7 @@ const getAuthHooks = (agentManager) => {
                 finally {
                     setLoginLoading(false);
                 }
-            }));
+            });
             onLogin === null || onLogin === void 0 ? void 0 : onLogin(() => loginPromise);
         }), [
             authClient,
@@ -120,7 +124,6 @@ const getAuthHooks = (agentManager) => {
     };
     return {
         useUserPrincipal,
-        useAgentManager,
         useAuthStore,
         useAuthClient,
     };