@ic-reactor/core 1.5.3 → 1.5.4-beta.0

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/v1.5.2/ic-reactor-core.min.js"></script>
+<script src="https://github.com/B3Pay/ic-reactor/releases/download/v1.5.3/ic-reactor-core.min.js"></script>
 ```
 
 ### Using `createReactorCore`

package/dist/classes/actor/index.js

@@ -75,8 +75,7 @@ class ActorManager {
             }, {});
         };
         this.initializeActor = (agent) => {
-            var _a;
-            console.info(`Initializing actor ${this.canisterId} on ${((_a = agent.isLocal) === null || _a === void 0 ? void 0 : _a.call(agent)) === true ? "local" : "ic"} network`);
+            console.info(`Initializing actor ${this.canisterId} on ${this._agentManager.getNetwork()} network`);
             const { _idlFactory, canisterId } = this;
             this.updateState({
                 initializing: true,

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

@@ -24,7 +24,9 @@ export declare class AgentManager {
         returnTo?: string;
     }) => Promise<void>;
     getAgent: () => HttpAgent;
+    getAgentHost: () => URL;
     getIsLocal: () => boolean;
+    getNetwork: () => "ic" | "local" | "remote";
     getAgentState: AgentStore["getState"];
     subscribeAgentState: AgentStore["subscribe"];
     getAuthState: AuthStore["getState"];

package/dist/classes/agent/index.js

@@ -49,13 +49,13 @@ class AgentManager {
             this.authStore.setState((state) => (Object.assign(Object.assign({}, state), newState)), false, action);
         };
         this.initializeAgent = () => __awaiter(this, void 0, void 0, function* () {
-            const isLocalEnv = this.getIsLocal();
+            const network = this.getNetwork();
             this.updateAgentState({
                 initializing: true,
                 error: undefined,
-                network: isLocalEnv ? "local" : "ic",
+                network,
             }, "initializing");
-            if (isLocalEnv) {
+            if (network !== "ic") {
                 try {
                     yield this._agent.fetchRootKey();
                 }
@@ -90,7 +90,7 @@ class AgentManager {
             yield this.notifySubscribers();
         });
         this.authenticate = () => __awaiter(this, void 0, void 0, function* () {
-            console.log(`Authenticating on ${this.getIsLocal() ? "local" : "ic"} network`);
+            console.log(`Authenticating on ${this.getNetwork()} network`);
             this.updateAuthState({ authenticating: true }, "authenticating");
             try {
                 this._auth = yield auth_client_1.AuthClient.create();
@@ -137,10 +137,25 @@ class AgentManager {
         this.getAgent = () => {
             return this._agent;
         };
+        this.getAgentHost = () => {
+            return this._agent._host;
+        };
         this.getIsLocal = () => {
             var _a, _b;
             return ((_b = (_a = this._agent).isLocal) === null || _b === void 0 ? void 0 : _b.call(_a)) === true;
         };
+        this.getNetwork = () => {
+            const hostname = this.getAgentHost().hostname;
+            if (hostname === "127.0.0.1" || hostname.endsWith("127.0.0.1")) {
+                return "local";
+            }
+            else if (constants_1.REMOTE_HOSTS.some((host) => hostname.endsWith(host))) {
+                return "remote";
+            }
+            else {
+                return "ic";
+            }
+        };
         this.getAgentState = () => {
             return this.agentStore.getState();
         };
@@ -164,14 +179,18 @@ class AgentManager {
             const identity = this.authStore.getState().identity;
             return identity ? identity.getPrincipal() : null;
         };
-        const _a = options || {}, { withDevtools, port = 4943, withLocalEnv, host: optionHost } = _a, agentOptions = __rest(_a, ["withDevtools", "port", "withLocalEnv", "host"]);
-        const host = withLocalEnv
-            ? `http://127.0.0.1:${port}`
-            : optionHost
-                ? optionHost.includes("localhost")
-                    ? optionHost.replace("localhost", "127.0.0.1")
-                    : optionHost
-                : constants_1.IC_HOST_NETWORK_URI;
+        const _a = options || {}, { withDevtools, port = 4943, withLocalEnv, withProcessEnv, host: optionHost } = _a, agentOptions = __rest(_a, ["withDevtools", "port", "withLocalEnv", "withProcessEnv", "host"]);
+        let host;
+        if (withProcessEnv) {
+            const processNetwork = (0, helper_1.getProcessEnvNetwork)();
+            host = processNetwork === "ic" ? constants_1.IC_HOST_NETWORK_URI : undefined;
+        }
+        else if (withLocalEnv) {
+            host = `http://127.0.0.1:${port}`;
+        }
+        else {
+            host = optionHost !== null && optionHost !== void 0 ? optionHost : constants_1.IC_HOST_NETWORK_URI;
+        }
         this.agentStore = (0, helper_1.createStoreWithOptionalDevtools)(this.initialAgentState, {
             withDevtools,
             name: "Reactor-Agent",

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

@@ -6,6 +6,7 @@ export interface AgentManagerParameters extends HttpAgentOptions {
     port?: number;
     withLocalEnv?: boolean;
     withDevtools?: boolean;
+    withProcessEnv?: boolean;
 }
 export interface AgentState {
     initialized: boolean;

package/dist/createReactorStore.js

@@ -12,7 +12,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReactorStore = void 0;
-const utils_1 = require("./utils");
 const createActorManager_1 = require("./createActorManager");
 const createAgentManager_1 = require("./createAgentManager");
 /**
@@ -24,13 +23,9 @@ const createAgentManager_1 = require("./createAgentManager");
  * @includeExample ./packages/core/README.md:200-225
  */
 const createReactorStore = (config) => {
-    const withLocalEnv = config.withProcessEnv
-        ? (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, createAgentManager_1.createAgentManager)(Object.assign({ withDevtools,
-            withLocalEnv }, agentParameters));
+        (0, createAgentManager_1.createAgentManager)(Object.assign({ withDevtools }, agentParameters));
     const actorManager = (0, createActorManager_1.createActorManager)({
         idlFactory,
         canisterId,

package/dist/types.d.ts

@@ -51,7 +51,6 @@ export type ActorMethodCall<A = Record<string, ActorMethod>> = <M extends Functi
 export type ActorQuery<A = Record<string, ActorMethod>> = <M extends FunctionName<A>>(config: ActorQueryParameters<A, M>) => ActorQueryReturnType<A, M>;
 export type ActorUpdate<A = Record<string, ActorMethod>> = <M extends FunctionName<A>>(config: ActorUpdateParameters<A, M>) => ActorUpdateReturnType<A, M>;
 export interface CreateReactorCoreParameters extends CreateReactorStoreParameters {
-    withProcessEnv?: boolean;
 }
 export interface CreateReactorCoreReturnType<A = BaseActor> extends AgentManager, Omit<ActorManager<A>, "updateMethodState"> {
     queryCall: ActorQuery<A>;

package/dist/utils/constants.d.ts

@@ -1,3 +1,4 @@
+export declare const REMOTE_HOSTS: string[];
 export declare const IC_HOST_NETWORK_URI = "https://ic0.app";
 export declare const LOCAL_HOST_NETWORK_URI = "http://127.0.0.1:4943";
 export declare const DEFAULT_LOCAL_DIDJS_ID = "bd3sg-teaaa-aaaaa-qaaba-cai";

package/dist/utils/constants.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LOCAL_INTERNET_IDENTITY_PROVIDER = exports.IC_INTERNET_IDENTITY_PROVIDER = exports.DEFAULT_IC_DIDJS_ID = exports.DEFAULT_LOCAL_DIDJS_ID = exports.LOCAL_HOST_NETWORK_URI = exports.IC_HOST_NETWORK_URI = void 0;
+exports.LOCAL_INTERNET_IDENTITY_PROVIDER = exports.IC_INTERNET_IDENTITY_PROVIDER = exports.DEFAULT_IC_DIDJS_ID = exports.DEFAULT_LOCAL_DIDJS_ID = exports.LOCAL_HOST_NETWORK_URI = exports.IC_HOST_NETWORK_URI = exports.REMOTE_HOSTS = void 0;
+exports.REMOTE_HOSTS = [".github.dev", ".gitpod.io"];
 exports.IC_HOST_NETWORK_URI = "https://ic0.app";
 exports.LOCAL_HOST_NETWORK_URI = "http://127.0.0.1:4943";
 exports.DEFAULT_LOCAL_DIDJS_ID = "bd3sg-teaaa-aaaaa-qaaba-cai";

package/dist/utils/helper.d.ts

@@ -6,6 +6,7 @@ export declare function createStoreWithOptionalDevtools<T>(initialState: T, conf
     }>(partial: T | Partial<T> | ((state: T) => T | Partial<T>), replace?: boolean | undefined, action?: A | undefined): void;
 };
 export declare const isInLocalOrDevelopment: () => boolean;
+export declare const getProcessEnvNetwork: () => string;
 export declare function isQuery(func: IDL.FuncClass): boolean;
 export declare const jsonToString: (json: unknown, space?: number) => string;
 export declare const generateRequestHash: (args?: unknown[]) => `0x${string}`;

package/dist/utils/helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringToHash = exports.generateActorHash = exports.generateHash = exports.generateRequestHash = exports.jsonToString = exports.isQuery = exports.isInLocalOrDevelopment = exports.createStoreWithOptionalDevtools = void 0;
+exports.stringToHash = exports.generateActorHash = exports.generateHash = exports.generateRequestHash = exports.jsonToString = exports.isQuery = exports.getProcessEnvNetwork = exports.isInLocalOrDevelopment = exports.createStoreWithOptionalDevtools = void 0;
 const agent_1 = require("@dfinity/agent");
 const middleware_1 = require("zustand/middleware");
 const vanilla_1 = require("zustand/vanilla");
@@ -19,6 +19,14 @@ const isInLocalOrDevelopment = () => {
     return typeof process !== "undefined" && process.env.DFX_NETWORK === "local";
 };
 exports.isInLocalOrDevelopment = isInLocalOrDevelopment;
+const getProcessEnvNetwork = () => {
+    var _a;
+    if (typeof process === "undefined")
+        return "ic";
+    else
+        return (_a = process.env.DFX_NETWORK) !== null && _a !== void 0 ? _a : "ic";
+};
+exports.getProcessEnvNetwork = getProcessEnvNetwork;
 function isQuery(func) {
     return (func.annotations.includes("query") ||
         func.annotations.includes("composite_query"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/core",
-  "version": "1.5.3",
+  "version": "1.5.4-beta.0",
   "description": "A library for intracting with the Internet Computer canisters",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -52,5 +52,5 @@
   "engines": {
     "node": ">=10"
   },
-  "gitHead": "8a92edfc841cfd1899f008a094846166886e8f33"
+  "gitHead": "dfc8ce03a6a0f8aadf28bba2b21c70729278b5fd"
 }