@ic-reactor/core 1.0.7 → 1.0.9

package/README.md

@@ -16,6 +16,12 @@ npm install @ic-reactor/core
 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>
+```
+
 ### Using `createReactorCore`
 
 For ease of use, the `createReactorCore` factory function automatically sets up a new Reactor instance, managing the agent and its state internally, and providing a simple API for authenticating, querying, and updating actors.

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

@@ -5,6 +5,8 @@ export declare class ActorManager<A = BaseActor> {
     private _actor;
     private _idlFactory;
     private _agentManager;
+    private _unsubscribeAgent;
+    private _subscribers;
     canisterId: CanisterId;
     actorStore: ActorStore<A>;
     visitFunction: VisitService<A>;
@@ -25,4 +27,5 @@ export declare class ActorManager<A = BaseActor> {
     getState: ActorStore<A>["getState"];
     subscribeActorState: ActorStore<A>["subscribe"];
     setState: ActorStore<A>["setState"];
+    cleanup: () => void;
 }

package/dist/classes/actor/index.js

@@ -16,14 +16,15 @@ const helper_1 = require("../../utils/helper");
 class ActorManager {
     constructor(actorConfig) {
         this._actor = null;
+        this._subscribers = [];
         this.initialState = {
             methodState: {},
             initializing: false,
             initialized: false,
             error: undefined,
         };
-        this.updateState = (newState) => {
-            this.actorStore.setState((state) => (Object.assign(Object.assign({}, state), newState)));
+        this.updateState = (newState, action) => {
+            this.actorStore.setState((state) => (Object.assign(Object.assign({}, state), newState)), false, action);
         };
         this.updateMethodState = (method, hash, newState) => {
             this.actorStore.setState((state) => {
@@ -31,7 +32,7 @@ class ActorManager {
                 const currentMethodState = methodState[hash] || DEFAULT_STATE;
                 const updatedMethodState = Object.assign(Object.assign({}, methodState), { [hash]: Object.assign(Object.assign({}, currentMethodState), newState) });
                 return Object.assign(Object.assign({}, state), { methodState: Object.assign(Object.assign({}, state.methodState), { [method]: updatedMethodState }) });
-            });
+            }, false, method);
         };
         this.initialize = (options) => __awaiter(this, void 0, void 0, function* () {
             yield this._agentManager.updateAgent(options);
@@ -52,7 +53,7 @@ class ActorManager {
         };
         this.initializeActor = (agent) => {
             console.info(`Initializing actor ${this.canisterId} on ${agent.isLocal() ? "local" : "ic"} network`);
-            const { _idlFactory: idlFactory, canisterId } = this;
+            const { _idlFactory, canisterId } = this;
             this.updateState({
                 initializing: true,
                 initialized: false,
@@ -62,7 +63,7 @@ class ActorManager {
                 if (!agent) {
                     throw new Error("Agent not initialized");
                 }
-                this._actor = agent_1.Actor.createActor(idlFactory, {
+                this._actor = agent_1.Actor.createActor(_idlFactory, {
                     agent,
                     canisterId,
                 });
@@ -99,11 +100,17 @@ class ActorManager {
             return this.actorStore.getState();
         };
         this.subscribeActorState = (listener) => {
-            return this.actorStore.subscribe(listener);
+            const unsubscribe = this.actorStore.subscribe(listener);
+            this._subscribers.push(unsubscribe);
+            return unsubscribe;
         };
         this.setState = (updater) => {
             return this.actorStore.setState(updater);
         };
+        this.cleanup = () => {
+            this._unsubscribeAgent();
+            this._subscribers.forEach((unsubscribe) => unsubscribe());
+        };
         const { agentManager, canisterId, idlFactory, withVisitor = false, withDevtools = false, initializeOnCreate = true, } = actorConfig;
         this.canisterId = canisterId;
         this._idlFactory = idlFactory;
@@ -113,7 +120,7 @@ class ActorManager {
             withDevtools,
             store: `actor-${String(canisterId)}`,
         });
-        this._agentManager.subscribeAgent(this.initializeActor, initializeOnCreate);
+        this._unsubscribeAgent = this._agentManager.subscribeAgent(this.initializeActor, initializeOnCreate);
         if (withVisitor) {
             this.visitFunction = this.extractService();
         }

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

@@ -1,7 +1,7 @@
 import type { IDL } from "@dfinity/candid";
-import type { StoreApi } from "zustand";
 import type { AgentManager } from "../agent";
 import type { ActorMethod, ActorSubclass, Principal } from "../../types";
+import { StoreApiWithDevtools } from "../types";
 export interface DefaultActorType {
     [key: string]: ActorMethod;
 }
@@ -42,5 +42,5 @@ export type ActorState<A = BaseActor> = {
     error: Error | undefined;
     methodState: ActorMethodStates<A>;
 };
-export type ActorStore<A = BaseActor> = StoreApi<ActorState<A>>;
+export type ActorStore<A = BaseActor> = StoreApiWithDevtools<ActorState<A>>;
 export type CallActorMethod<A = BaseActor> = <M extends FunctionName<A> = FunctionName<A>>(functionName: M, ...args: ActorMethodParameters<A[M]>) => Promise<ActorMethodReturnType<A[M]>>;

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

@@ -1,5 +1,7 @@
 import { HttpAgent } from "@dfinity/agent";
-import type { AgentStore, AgentManagerParameters, UpdateAgentParameters, AuthStore, AuthClient } from "./types";
+import { AuthClient } from "@dfinity/auth-client";
+import type { AuthClientLoginOptions } from "../../types";
+import type { AgentStore, AgentManagerParameters, UpdateAgentParameters, AuthStore } from "./types";
 export declare class AgentManager {
     private _agent;
     private _auth;
@@ -18,6 +20,10 @@ export declare class AgentManager {
     private notifySubscribers;
     updateAgent: (options?: UpdateAgentParameters) => Promise<void>;
     authenticate: () => Promise<import("@dfinity/agent").Identity>;
+    login: (options?: AuthClientLoginOptions) => Promise<void>;
+    logout: (options?: {
+        returnTo?: string;
+    }) => Promise<void>;
     getAgent: () => HttpAgent;
     getAgentState: AgentStore["getState"];
     subscribeAgentState: AgentStore["subscribe"];

package/dist/classes/agent/index.js

@@ -1,27 +1,4 @@
 "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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -46,6 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentManager = void 0;
 const agent_1 = require("@dfinity/agent");
 const helper_1 = require("../../utils/helper");
+const auth_client_1 = require("@dfinity/auth-client");
 const constants_1 = require("../../utils/constants");
 class AgentManager {
     constructor(options) {
@@ -62,11 +40,11 @@ class AgentManager {
             authenticated: false,
             error: undefined,
         };
-        this.updateAgentState = (newState) => {
-            this.agentStore.setState((state) => (Object.assign(Object.assign({}, state), newState)));
+        this.updateAgentState = (newState, action) => {
+            this.agentStore.setState((state) => (Object.assign(Object.assign({}, state), newState)), false, action);
         };
-        this.updateAuthState = (newState) => {
-            this.authStore.setState((state) => (Object.assign(Object.assign({}, state), newState)));
+        this.updateAuthState = (newState, action) => {
+            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 });
@@ -108,12 +86,7 @@ class AgentManager {
         this.authenticate = () => __awaiter(this, void 0, void 0, function* () {
             this.updateAuthState({ authenticating: true });
             try {
-                const { AuthClient } = yield Promise.resolve().then(() => __importStar(require("@dfinity/auth-client"))).catch((error) => {
-                    // eslint-disable-next-line no-console
-                    console.error("Failed to import @dfinity/auth-client:", error);
-                    throw new Error("Authentication failed: @dfinity/auth-client package is missing.");
-                });
-                this._auth = yield AuthClient.create();
+                this._auth = yield auth_client_1.AuthClient.create();
                 const authenticated = yield this._auth.isAuthenticated();
                 const identity = this._auth.getIdentity();
                 this._agent.replaceIdentity(identity);
@@ -130,6 +103,29 @@ class AgentManager {
                 throw error;
             }
         });
+        this.login = (options) => __awaiter(this, void 0, void 0, function* () {
+            this.updateAuthState({ authenticating: true });
+            if (!this._auth) {
+                yield this.authenticate();
+            }
+            if (!this._auth) {
+                throw new Error("Auth client not initialized");
+            }
+            yield this._auth.login(Object.assign(Object.assign({ identityProvider: this.isLocalEnv
+                    ? constants_1.LOCAL_INTERNET_IDENTITY_PROVIDER
+                    : constants_1.IC_INTERNET_IDENTITY_PROVIDER }, options), { onSuccess: () => __awaiter(this, void 0, void 0, function* () {
+                    var _b;
+                    yield this.authenticate();
+                    (_b = options === null || options === void 0 ? void 0 : options.onSuccess) === null || _b === void 0 ? void 0 : _b.call(options);
+                }) }));
+        });
+        this.logout = (options) => __awaiter(this, void 0, void 0, function* () {
+            if (!this._auth) {
+                throw new Error("Auth client not initialized");
+            }
+            yield this._auth.logout(options);
+            yield this.authenticate();
+        });
         // agent store
         this.getAgent = () => {
             return this._agent;

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

@@ -1,6 +1,6 @@
 import type { HttpAgent, HttpAgentOptions, Identity } from "@dfinity/agent";
 import type { AuthClient } from "@dfinity/auth-client";
-import type { StoreApi } from "zustand";
+import { StoreApiWithDevtools } from "../types";
 export { HttpAgentOptions, AuthClient, Identity };
 export interface AgentManagerParameters extends HttpAgentOptions {
     port?: number;
@@ -21,5 +21,5 @@ export interface AuthState {
 export interface UpdateAgentParameters extends HttpAgentOptions {
     agent?: HttpAgent;
 }
-export type AgentStore = StoreApi<AgentState>;
-export type AuthStore = StoreApi<AuthState>;
+export type AgentStore = StoreApiWithDevtools<AgentState>;
+export type AuthStore = StoreApiWithDevtools<AuthState>;

package/dist/classes/candid/index.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 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("../../utils/constants");
 class CandidAdapter {
     constructor({ agentManager, agent, didjsCanisterId, }) {
@@ -49,12 +48,9 @@ class CandidAdapter {
     }
     getFromMetadata(canisterId) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (typeof canisterId === "string") {
-                canisterId = principal_1.Principal.fromText(canisterId);
-            }
             const status = yield agent_1.CanisterStatus.request({
                 agent: this.agent,
-                canisterId,
+                canisterId: canisterId,
                 paths: ["candid"],
             });
             const did = status.get("candid");

package/dist/classes/types.d.ts

@@ -0,0 +1,8 @@
+export * from "./agent/types";
+export * from "./actor/types";
+export * from "./candid/types";
+import { NamedSet } from "zustand/middleware";
+import type { StoreApi } from "zustand";
+export interface StoreApiWithDevtools<T> extends StoreApi<T> {
+    setState: NamedSet<T>;
+}

package/dist/classes/types.js

@@ -0,0 +1,19 @@
+"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("./agent/types"), exports);
+__exportStar(require("./actor/types"), exports);
+__exportStar(require("./candid/types"), exports);

package/dist/createReactorCore.js

@@ -21,7 +21,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReactorCore = void 0;
-const constants_1 = require("./utils/constants");
 const utils_1 = require("./utils");
 const createReactorStore_1 = require("./createReactorStore");
 /**
@@ -114,32 +113,10 @@ const createReactorCore = (config) => {
     const updateCall = ({ functionName, args = [] }) => {
         return actorMethod(functionName, ...args);
     };
-    const login = (options) => __awaiter(void 0, void 0, void 0, function* () {
-        const authClient = agentManager.getAuth();
-        if (!authClient) {
-            yield agentManager.authenticate();
-        }
-        if (!authClient) {
-            throw new Error("Auth client not initialized");
-        }
-        yield authClient.login(Object.assign({ identityProvider: agentManager.isLocalEnv
-                ? 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.getAuth();
-        if (!authClient) {
-            throw new Error("Auth client not initialized");
-        }
-        yield authClient.logout(options);
-        yield agentManager.authenticate();
-    });
     return Object.assign(Object.assign({ queryCall,
         updateCall,
         callMethod,
         getState,
-        login,
-        logout,
         subscribeActorState }, agentManager), rest);
 };
 exports.createReactorCore = createReactorCore;

package/dist/types.d.ts

@@ -6,9 +6,7 @@ import type { ActorManagerParameters, ActorMethodParameters, ActorMethodReturnTy
 import type { ActorManager } from "./classes/actor";
 import type { AgentManager } from "./classes/agent";
 import type { AuthClientLoginOptions } from "@dfinity/auth-client";
-export * from "./classes/agent/types";
-export * from "./classes/actor/types";
-export * from "./classes/candid/types";
+export * from "./classes/types";
 export type { ActorManager, AgentManager };
 export type { ActorMethod, AuthClientLoginOptions, HttpAgentOptions, ActorSubclass, Principal, HttpAgent, Identity, IDL, };
 export interface CreateReactorStoreParameters extends HttpAgentOptions, Omit<ActorManagerParameters, "agentManager"> {
@@ -56,10 +54,6 @@ export interface CreateReactorCoreParameters extends CreateReactorStoreParameter
     withProcessEnv?: boolean;
 }
 export interface CreateReactorCoreReturnType<A = BaseActor> extends AgentManager, Omit<ActorManager<A>, "updateMethodState"> {
-    login: (config?: AuthClientLoginOptions) => Promise<void>;
-    logout: (config?: {
-        returnTo?: string;
-    }) => Promise<void>;
     queryCall: ActorQuery<A>;
     updateCall: ActorUpdate<A>;
 }

package/dist/types.js

@@ -14,6 +14,4 @@ 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("./classes/agent/types"), exports);
-__exportStar(require("./classes/actor/types"), exports);
-__exportStar(require("./classes/candid/types"), exports);
+__exportStar(require("./classes/types"), exports);

package/dist/utils/helper.js

@@ -9,6 +9,9 @@ function createStoreWithOptionalDevtools(initialState, config) {
         return (0, vanilla_1.createStore)((0, middleware_1.devtools)(() => initialState, {
             name: "Reactor",
             store: config.store,
+            serialize: {
+                replacer: (_, value) => typeof value === "bigint" ? value.toString() : value,
+            },
         }));
     }
     else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/core",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "A library for intracting with the Internet Computer canisters",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,11 +37,14 @@
   "scripts": {
     "test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest",
     "start": "tsc watch",
-    "build": "npx tsc",
+    "bundle": "npm run bundle:dev && npm run bundle:prod",
+    "bundle:dev": "npx webpack --mode development",
+    "bundle:prod": "npx webpack --mode production",
+    "build": "npx tsc && npm run bundle",
     "clean": "npx rimraf dist"
   },
   "engines": {
     "node": ">=10"
   },
-  "gitHead": "ed812d516651ec01414d9a1a79e959d8cc139a93"
+  "gitHead": "4138171fa438e7db3764c0692e56f71e4bdd452c"
 }