@cityofzion/bs-electron 0.1.57 → 0.1.59

package/dist/main.d.ts

@@ -1,3 +1,2 @@
-import { TApi, TExposedApi } from './utils';
-export declare function eraseApi(api: any, prefix?: string): TExposedApi;
+import { TApi } from './utils';
 export declare function exposeApiToRenderer<T extends TApi>(api: T): void;

package/dist/main.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eraseApi = eraseApi;
 exports.exposeApiToRenderer = exposeApiToRenderer;
 const utils_1 = require("./utils");
 const utils_2 = require("./utils");
@@ -20,36 +19,6 @@ const electron_1 = require("electron");
 const lodash_clonedeep_1 = __importDefault(require("lodash.clonedeep"));
 const exposedApis = new Map();
 let initialized = false;
-// Erase the api to expose all methods and properties to renderer. It also supports nested objects
-function eraseApi(api, prefix) {
-    const { asyncMethods, syncMethods, properties } = (0, utils_1.getPropertiesAndMethods)(api);
-    // As it is a recursive function, we need to add the prefix to the methods and properties
-    const response = {
-        asyncMethods: asyncMethods.map(method => (prefix ? `${prefix}.${method}` : method)),
-        syncMethods: syncMethods.map(method => (prefix ? `${prefix}.${method}` : method)),
-        properties: properties.map(property => (prefix ? `${prefix}.${property}` : property)),
-    };
-    // Iterate for all properties to discover nested objects
-    properties.forEach(property => {
-        const propertyValue = api[property];
-        // If the property is not an object, we don't need to iterate over it. Array is also considered an object so we need to disconsider it
-        if (typeof propertyValue !== 'object' ||
-            Array.isArray(propertyValue) ||
-            propertyValue instanceof Map ||
-            propertyValue instanceof Set)
-            return;
-        const propertyWithPrefix = prefix ? `${prefix}.${property}` : property;
-        // Recursive call to discover nested properties and methods
-        const nestedPropertiesAndMethods = eraseApi(propertyValue, propertyWithPrefix);
-        // Add the nested properties and methods to the response
-        response.syncMethods.push(...nestedPropertiesAndMethods.syncMethods);
-        response.asyncMethods.push(...nestedPropertiesAndMethods.asyncMethods);
-        response.properties.push(...nestedPropertiesAndMethods.properties);
-        // Remove the actual property because it is a instance and can't be serialized by ipc
-        response.properties.splice(response.properties.indexOf(propertyWithPrefix), 1);
-    });
-    return response;
-}
 function exposeApiToRenderer(api) {
     init();
     // Class name
@@ -60,7 +29,7 @@ function exposeApiToRenderer(api) {
         return;
     }
     const apiClone = (0, lodash_clonedeep_1.default)(api);
-    const { asyncMethods, properties, syncMethods } = eraseApi(apiClone);
+    const { asyncMethods, properties, syncMethods } = (0, utils_1.eraseApi)(apiClone);
     // For each property, we need to create a listener so renderer can request the property value
     properties.forEach(property => {
         electron_1.ipcMain.on((0, utils_2.buildIpcChannelName)(apiName, property), event => {
@@ -69,7 +38,7 @@ function exposeApiToRenderer(api) {
                 event.returnValue = { data: value };
             }
             catch (error) {
-                event.returnValue = { error: error.message };
+                event.returnValue = { error: { message: error.message, stack: error.stack, name: error.name } };
             }
         });
     });
@@ -82,7 +51,7 @@ function exposeApiToRenderer(api) {
                 event.returnValue = { data };
             }
             catch (error) {
-                event.returnValue = { error: error.message };
+                event.returnValue = { error: { message: error.message, stack: error.stack, name: error.name } };
             }
         });
     });
@@ -95,7 +64,7 @@ function exposeApiToRenderer(api) {
                 return { data };
             }
             catch (error) {
-                return { error: error.message };
+                return { error: { message: error.message, stack: error.stack, name: error.name } };
             }
         }));
     });

package/dist/renderer.js

@@ -29,7 +29,10 @@ function bindApiFromMain(apiName) {
             get: () => {
                 const result = window.ipcBsElectron.sendSync((0, utils_1.buildIpcChannelName)(apiName, property));
                 if (result.error) {
-                    throw new Error('Ipc only supports stringified data');
+                    const error = new Error(result.error.message);
+                    error.name = result.error.name;
+                    error.stack = result.error.stack;
+                    throw error;
                 }
                 return result.data;
             },
@@ -42,7 +45,10 @@ function bindApiFromMain(apiName) {
                 const plainArgs = (0, utils_1.toPlainObject)(args);
                 const result = window.ipcBsElectron.sendSync((0, utils_1.buildIpcChannelName)(apiName, method), ...plainArgs);
                 if (result.error) {
-                    throw new Error(result.error);
+                    const error = new Error(result.error.message);
+                    error.name = result.error.name;
+                    error.stack = result.error.stack;
+                    throw error;
                 }
                 return result.data;
             },
@@ -55,7 +61,10 @@ function bindApiFromMain(apiName) {
                 const plainArgs = (0, utils_1.toPlainObject)(args);
                 const result = yield window.ipcBsElectron.invoke((0, utils_1.buildIpcChannelName)(apiName, method), ...plainArgs);
                 if (result.error) {
-                    throw new Error(result.error);
+                    const error = new Error(result.error.message);
+                    error.name = result.error.name;
+                    error.stack = result.error.stack;
+                    throw error;
                 }
                 return result.data;
             }),

package/dist/utils.d.ts

@@ -8,6 +8,8 @@ export type TExposedApi = {
     syncMethods: string[];
     asyncMethods: string[];
 };
+export declare function fixSimpleObject(api: TExposedApi): string[];
+export declare function eraseApi(api: any, prefix?: string): TExposedApi;
 export declare function getPropertiesAndMethods(object: any): {
     properties: string[];
     syncMethods: string[];

package/dist/utils.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GET_EXPOSED_API_CHANNEL = exports.CHANNEL_PREFIX = void 0;
+exports.fixSimpleObject = fixSimpleObject;
+exports.eraseApi = eraseApi;
 exports.getPropertiesAndMethods = getPropertiesAndMethods;
 exports.getValueFromPath = getValueFromPath;
 exports.populateObjectFromPath = populateObjectFromPath;
@@ -8,6 +10,68 @@ exports.buildIpcChannelName = buildIpcChannelName;
 exports.toPlainObject = toPlainObject;
 exports.CHANNEL_PREFIX = 'bsElectron';
 exports.GET_EXPOSED_API_CHANNEL = `${exports.CHANNEL_PREFIX}:getExposedApi`;
+function fixSimpleObject(api) {
+    const methods = [...api.asyncMethods, ...api.syncMethods];
+    const newProperties = new Set();
+    for (const property of api.properties) {
+        const pathSegments = property.split('.');
+        // Handle root level properties (no dots)
+        if (pathSegments.length === 1) {
+            newProperties.add(property);
+            continue;
+        }
+        const pathWithoutLastSegment = pathSegments.slice(0, -1).join('.');
+        // Skip if we already processed this parent path
+        if (newProperties.has(pathWithoutLastSegment)) {
+            continue;
+        }
+        // Check if this path or any of its sub-paths have methods
+        const hasMethod = methods.some(method => method.startsWith(pathWithoutLastSegment));
+        if (hasMethod) {
+            newProperties.add(property);
+            continue;
+        }
+        // If no methods are found in this path, it means it's a simple object, so we add only the parent path
+        newProperties.add(pathWithoutLastSegment);
+    }
+    return Array.from(newProperties);
+}
+// Erase the api to expose all methods and properties to renderer. It also supports nested objects
+function eraseApi(api, prefix) {
+    const { asyncMethods, syncMethods, properties } = getPropertiesAndMethods(api);
+    // As it is a recursive function, we need to add the prefix to the methods and properties
+    const response = {
+        asyncMethods: asyncMethods.map(method => (prefix ? `${prefix}.${method}` : method)),
+        syncMethods: syncMethods.map(method => (prefix ? `${prefix}.${method}` : method)),
+        properties: properties.map(property => (prefix ? `${prefix}.${property}` : property)),
+    };
+    // Iterate for all properties to discover nested objects
+    properties.forEach(property => {
+        const propertyValue = api[property];
+        // If the property is not an object, we don't need to iterate over it. Array is also considered an object so we need to disconsider it
+        if (typeof propertyValue !== 'object' ||
+            Array.isArray(propertyValue) ||
+            propertyValue instanceof Map ||
+            propertyValue instanceof Set) {
+            return;
+        }
+        const propertyWithPrefix = prefix ? `${prefix}.${property}` : property;
+        // Recursive call to discover nested properties and methods
+        const nestedResult = eraseApi(propertyValue, propertyWithPrefix);
+        // Add the nested properties and methods to the response
+        response.syncMethods.push(...nestedResult.syncMethods);
+        response.asyncMethods.push(...nestedResult.asyncMethods);
+        response.properties.push(...nestedResult.properties);
+        // Remove the actual property because it is a instance and can't be serialized by ipc
+        response.properties.splice(response.properties.indexOf(propertyWithPrefix), 1);
+    });
+    response.properties = fixSimpleObject({
+        asyncMethods: response.asyncMethods,
+        syncMethods: response.syncMethods,
+        properties: response.properties,
+    });
+    return response;
+}
 // It returns all properties and methods from an object and its prototype chain, that is, extended classes are also considered
 function getPropertiesAndMethods(object) {
     const syncMethods = new Set();
@@ -15,29 +79,36 @@ function getPropertiesAndMethods(object) {
     const properties = new Set();
     do {
         for (const key of Reflect.ownKeys(object)) {
-            if (key === 'constructor')
-                continue;
-            const keyString = String(key);
-            if (keyString.startsWith('_') || keyString.startsWith('#'))
-                continue;
-            if (typeof object[key] === 'function') {
-                try {
-                    // Get the number of parameters of the function to call it with empty objects
-                    const params = Array.from({ length: object[key].length }, () => ({}));
-                    const funcResponse = object[key].call(object, ...params);
-                    if (funcResponse instanceof Promise) {
-                        funcResponse.catch(() => { }).then(() => { });
+            try {
+                if (key === 'constructor')
+                    continue;
+                const keyString = String(key);
+                if (keyString.startsWith('_') || keyString.startsWith('#'))
+                    continue;
+                if (typeof object[key] === 'function') {
+                    const funcString = object[key].toString();
+                    // Check for async patterns:
+                    // 1. Native async: 'async function' or 'async ('
+                    // 2. TypeScript compiled: '__awaiter' helper
+                    // 3. Babel compiled: '_asyncToGenerator' helper
+                    const isAsync = funcString.includes('__awaiter') ||
+                        funcString.includes('_asyncToGenerator') ||
+                        funcString.startsWith('async ') ||
+                        funcString.startsWith('async(') ||
+                        funcString.includes('async function');
+                    if (isAsync) {
                         asyncMethods.add(keyString);
-                        continue;
                     }
-                    syncMethods.add(keyString);
-                }
-                catch (_a) {
-                    syncMethods.add(keyString);
+                    else {
+                        syncMethods.add(keyString);
+                    }
+                    continue;
                 }
+                properties.add(keyString);
+            }
+            catch (_a) {
                 continue;
             }
-            properties.add(keyString);
         }
     } while ((object = Reflect.getPrototypeOf(object)) && object !== Object.prototype);
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-electron",
-  "version": "0.1.57",
+  "version": "0.1.59",
   "repository": "https://github.com/CityOfZion/blockchain-services",
   "author": "Coz",
   "license": "GPL-3.0-only",