@ic-reactor/core 1.5.4-beta.1 → 1.6.0-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.3/ic-reactor-core.min.js"></script>
+<script src="https://github.com/B3Pay/ic-reactor/releases/download/v1.5.4-beta.2/ic-reactor-core.min.js"></script>
 ```
 
 ### Using `createReactorCore`

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

@@ -1,13 +1,18 @@
+/// <reference path="../../../src/classes/candid/parser.d.ts" />
 import { HttpAgent } from "@dfinity/agent";
 import type { CanisterId, CandidAdapterParameters, CandidDefenition } from "../../types";
 export declare class CandidAdapter {
     agent: HttpAgent;
     didjsCanisterId: string;
+    parserModule?: typeof import("@ic-reactor/parser");
     unsubscribeAgent: () => void;
     constructor({ agentManager, agent, didjsCanisterId, }: CandidAdapterParameters);
+    initializeParser(): Promise<void>;
     private getDefaultDidJsId;
     getCandidDefinition(canisterId: CanisterId): Promise<CandidDefenition>;
-    getFromMetadata(canisterId: CanisterId): Promise<CandidDefenition | undefined>;
-    getFromTmpHack(canisterId: CanisterId): Promise<CandidDefenition | undefined>;
-    didTojs(candidSource: string): Promise<CandidDefenition>;
+    getFromMetadata(canisterId: CanisterId): Promise<string | undefined>;
+    getFromTmpHack(canisterId: CanisterId): Promise<string | undefined>;
+    dynamicEvalJs(data: string): Promise<CandidDefenition>;
+    fetchDidTojs(candidSource: string): Promise<[string]>;
+    parseDidToJs(candidSource: string): string;
 }

package/dist/classes/candid/index.js

@@ -1,4 +1,27 @@
 "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) {
@@ -12,6 +35,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CandidAdapter = void 0;
 const agent_1 = require("@dfinity/agent");
 const constants_1 = require("../../utils/constants");
+const utils_1 = require("../../utils");
 class CandidAdapter {
     constructor({ agentManager, agent, didjsCanisterId, }) {
         this.unsubscribeAgent = () => { };
@@ -30,6 +54,17 @@ class CandidAdapter {
         }
         this.didjsCanisterId = didjsCanisterId || this.getDefaultDidJsId();
     }
+    initializeParser() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.parserModule = yield Promise.resolve().then(() => __importStar(require("@ic-reactor/parser")));
+                yield this.parserModule.default();
+            }
+            catch (error) {
+                throw new Error(`Error initializing parser: ${error}`);
+            }
+        });
+    }
     getDefaultDidJsId() {
         var _a, _b;
         return ((_b = (_a = this.agent).isLocal) === null || _b === void 0 ? void 0 : _b.call(_a)) === true
@@ -44,13 +79,13 @@ class CandidAdapter {
                     return undefined;
                 });
                 if (fromMetadata)
-                    return fromMetadata;
+                    return this.dynamicEvalJs(fromMetadata);
                 // Second attempt: Try the temporary hack method
                 const fromTmpHack = yield this.getFromTmpHack(canisterId).catch(() => {
                     return undefined;
                 });
                 if (fromTmpHack)
-                    return fromTmpHack;
+                    return this.dynamicEvalJs(fromTmpHack);
                 // If both attempts fail, throw an error
                 throw "Failed to retrieve Candid definition by any method.";
             }
@@ -66,8 +101,7 @@ class CandidAdapter {
                 canisterId: canisterId,
                 paths: ["candid"],
             });
-            const did = status.get("candid");
-            return did ? this.didTojs(did) : undefined;
+            return status.get("candid");
         });
     }
     getFromTmpHack(canisterId) {
@@ -79,11 +113,30 @@ class CandidAdapter {
                 agent: this.agent,
                 canisterId,
             });
-            const data = (yield actor.__get_candid_interface_tmp_hack());
-            return data ? this.didTojs(data) : undefined;
+            return (yield actor.__get_candid_interface_tmp_hack());
         });
     }
-    didTojs(candidSource) {
+    dynamicEvalJs(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let candidDef = "";
+                try {
+                    candidDef = this.parseDidToJs(data);
+                }
+                catch (error) {
+                    candidDef = (yield this.fetchDidTojs(data))[0];
+                }
+                if (JSON.stringify(candidDef) === JSON.stringify([])) {
+                    throw new Error("Cannot compile Candid to JavaScript");
+                }
+                return (0, utils_1.importCandidDefinition)(candidDef);
+            }
+            catch (error) {
+                throw new Error(`Error evaluating Candid definition: ${error}`);
+            }
+        });
+    }
+    fetchDidTojs(candidSource) {
         return __awaiter(this, void 0, void 0, function* () {
             const didjsInterface = ({ IDL }) => IDL.Service({
                 did_to_js: IDL.Func([IDL.Text], [IDL.Opt(IDL.Text)], ["query"]),
@@ -92,14 +145,14 @@ class CandidAdapter {
                 agent: this.agent,
                 canisterId: this.didjsCanisterId,
             });
-            const js = yield didjs.did_to_js(candidSource);
-            if (JSON.stringify(js) === JSON.stringify([])) {
-                throw new Error("Cannot compile Candid to JavaScript");
-            }
-            const dataUri = "data:text/javascript;charset=utf-8," +
-                encodeURIComponent(js[0]);
-            return eval('import("' + dataUri + '")');
+            return didjs.did_to_js(candidSource);
         });
     }
+    parseDidToJs(candidSource) {
+        if (!this.parserModule) {
+            throw new Error("Parser module not available");
+        }
+        return this.parserModule.did_to_js(candidSource);
+    }
 }
 exports.CandidAdapter = CandidAdapter;

package/dist/utils/helper.d.ts

@@ -5,6 +5,7 @@ export declare function createStoreWithOptionalDevtools<T>(initialState: T, conf
         type: string;
     }>(partial: T | Partial<T> | ((state: T) => T | Partial<T>), replace?: boolean | undefined, action?: A | undefined): void;
 };
+export declare const importCandidDefinition: (candidDef: string) => any;
 export declare const isInLocalOrDevelopment: () => boolean;
 export declare const getProcessEnvNetwork: () => string;
 export declare function isQuery(func: IDL.FuncClass): boolean;

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.getProcessEnvNetwork = exports.isInLocalOrDevelopment = exports.createStoreWithOptionalDevtools = void 0;
+exports.stringToHash = exports.generateActorHash = exports.generateHash = exports.generateRequestHash = exports.jsonToString = exports.isQuery = exports.getProcessEnvNetwork = exports.isInLocalOrDevelopment = exports.importCandidDefinition = exports.createStoreWithOptionalDevtools = void 0;
 const agent_1 = require("@dfinity/agent");
 const middleware_1 = require("zustand/middleware");
 const vanilla_1 = require("zustand/vanilla");
@@ -15,6 +15,16 @@ function createStoreWithOptionalDevtools(initialState, config) {
     }
 }
 exports.createStoreWithOptionalDevtools = createStoreWithOptionalDevtools;
+const importCandidDefinition = (candidDef) => {
+    try {
+        const dataUri = "data:text/javascript;charset=utf-8," + encodeURIComponent(candidDef);
+        return eval('import("' + dataUri + '")');
+    }
+    catch (error) {
+        throw new Error("Error importing Candid definition");
+    }
+};
+exports.importCandidDefinition = importCandidDefinition;
 const isInLocalOrDevelopment = () => {
     return typeof process !== "undefined" && process.env.DFX_NETWORK === "local";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/core",
-  "version": "1.5.4-beta.1",
+  "version": "1.6.0-beta.0",
   "description": "A library for intracting with the Internet Computer canisters",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -40,6 +40,9 @@
     "@dfinity/principal": "^1.2",
     "zustand": "^4.5"
   },
+  "devDependencies": {
+    "@ic-reactor/parser": "^0.1.0-beta.0"
+  },
   "scripts": {
     "test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest",
     "start": "tsc watch",
@@ -52,5 +55,5 @@
   "engines": {
     "node": ">=10"
   },
-  "gitHead": "8ebd455fbb68d838b5bd5a477c004306560397bb"
+  "gitHead": "4911f0639b420406550150f789f34ecf3e6167c1"
 }