emr-bridge 1.6.0 → 1.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -298,7 +298,7 @@ For _preload_, use **Main**
298
298
 
299
299
  ```ts
300
300
  // Preload process
301
- import { Main, provideFromMain } from 'emr-bridge'
301
+ import { Main, provideFromMain } from 'emr-bridge/preload'
302
302
 
303
303
  provideFromMain()
304
304
 
@@ -319,7 +319,7 @@ For _renderer_, use **Bridge**
319
319
 
320
320
  ```ts
321
321
  // Renderer process
322
- import { Bridge } from 'emr-bridge'
322
+ import { Bridge } from 'emr-bridge/renderer'
323
323
 
324
324
  interface IProvidedPublic {
325
325
  getUserName(): string
@@ -351,7 +351,7 @@ publicFunction('delay1s', () => {
351
351
 
352
352
  ```ts
353
353
  // Renderer process
354
- import { Bridge } from 'emr-bridge'
354
+ import { Bridge } from 'emr-bridge/renderer'
355
355
 
356
356
  interface IPublic {
357
357
  delay1s(): Promise<void>
@@ -401,7 +401,7 @@ events.pay(200)
401
401
 
402
402
  ```ts
403
403
  // Renderer process
404
- import { Bridge, MainEvent } from 'emr-bridge'
404
+ import { Bridge, MainEvent } from 'emr-bridge/renderer'
405
405
 
406
406
  interface IPublic {
407
407
  onTick: MainEvent<string>
@@ -445,7 +445,7 @@ events.onMessageWithReceiver(message => console.log(message))
445
445
 
446
446
  ```ts
447
447
  // Renderer process
448
- import { Bridge } from 'emr-bridge'
448
+ import { Bridge } from 'emr-bridge/renderer'
449
449
 
450
450
  interface IPublic {
451
451
  message(message: string): void
package/cjs/index.d.ts CHANGED
@@ -1,6 +1,4 @@
1
1
  export { Access, Scope } from './enums';
2
- export * from './preload';
3
- export * from './renderer';
4
2
  export { publicClassMainEvent, publicClassRendererEvent, publicGetter, publicMethod, publicProperty, publicSetter } from './scripts/newDecorators';
5
3
  export { publicFunction, publicMainEvent, publicRendererEvent, publicVariable } from './scripts/publish';
6
4
  export type { EventEmitter, EventHandler, EventReceiver, EventUnsubscriber, IPublishMainEventArgs, IPublishMethodArgs, IPublishPropertyArgs, IPublishRendererEventArgs, MainEvent, PublicFunction, PublicProperty, RendererEvent } from './types';
package/cjs/index.js CHANGED
@@ -1,25 +1,9 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
- for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
- };
16
2
  Object.defineProperty(exports, "__esModule", { value: true });
17
3
  exports.publicVariable = exports.publicRendererEvent = exports.publicMainEvent = exports.publicFunction = exports.publicSetter = exports.publicProperty = exports.publicMethod = exports.publicGetter = exports.publicClassRendererEvent = exports.publicClassMainEvent = exports.Scope = exports.Access = void 0;
18
4
  var enums_1 = require("./enums");
19
5
  Object.defineProperty(exports, "Access", { enumerable: true, get: function () { return enums_1.Access; } });
20
6
  Object.defineProperty(exports, "Scope", { enumerable: true, get: function () { return enums_1.Scope; } });
21
- __exportStar(require("./preload"), exports);
22
- __exportStar(require("./renderer"), exports);
23
7
  var newDecorators_1 = require("./scripts/newDecorators");
24
8
  Object.defineProperty(exports, "publicClassMainEvent", { enumerable: true, get: function () { return newDecorators_1.publicClassMainEvent; } });
25
9
  Object.defineProperty(exports, "publicClassRendererEvent", { enumerable: true, get: function () { return newDecorators_1.publicClassRendererEvent; } });
package/cjs/preload.d.ts CHANGED
@@ -1,2 +1,3 @@
1
1
  export { default as Main } from './scripts/Main';
2
2
  export { default as provideFromMain } from './scripts/preloadProvider';
3
+ export type { EventEmitter, EventHandler, EventReceiver, EventUnsubscriber, IPublishMainEventArgs, IPublishMethodArgs, IPublishPropertyArgs, IPublishRendererEventArgs, MainEvent, PublicFunction, PublicProperty, RendererEvent } from './types';
package/cjs/renderer.d.ts CHANGED
@@ -1 +1,2 @@
1
1
  export { default as Bridge } from './scripts/Bridge';
2
+ export type { EventEmitter, EventHandler, EventReceiver, EventUnsubscriber, IPublishMainEventArgs, IPublishMethodArgs, IPublishPropertyArgs, IPublishRendererEventArgs, MainEvent, PublicFunction, PublicProperty, RendererEvent } from './types';
@@ -21,7 +21,7 @@ let throwError;
21
21
  if (typeof window !== 'undefined') {
22
22
  throwError = () => { throw new Error('"Main" is unavailable in renderer process. Use "Bridge" instead'); };
23
23
  }
24
- else if (!electron_1.default.ipcRenderer) {
24
+ else if (!('ipcRenderer' in electron_1.default)) {
25
25
  throwError = () => { throw new Error('"Main" is unavailable in main process.'); };
26
26
  }
27
27
  else {
@@ -58,7 +58,7 @@ function initInNode() {
58
58
  ipcRenderer.sendSync(emitChannel, { promiseChannel });
59
59
  arg
60
60
  .then(value => ipcRenderer.send(promiseChannel, { value }))
61
- .catch(reason => ipcRenderer.send(promiseChannel, { error: String(reason) }));
61
+ .catch(reason => ipcRenderer.send(promiseChannel, { error: String(reason?.stack || reason) }));
62
62
  }
63
63
  else {
64
64
  ipcRenderer.send(emitChannel, { value: arg });
@@ -10,7 +10,7 @@ let mayThrowError = () => { };
10
10
  if (typeof window === 'undefined') {
11
11
  mayThrowError = () => { throw new Error('"provideFromMain" is unavailable in main process.'); };
12
12
  }
13
- else if (!electron_1.default.contextBridge) {
13
+ else if (!('contextBridge' in electron_1.default)) {
14
14
  mayThrowError = () => { throw new Error('"provideFromMain" is unavailable in renderer process.'); };
15
15
  }
16
16
  /**
@@ -16,7 +16,7 @@ const publicInfo = {
16
16
  };
17
17
  /** Выбрасывает ошибку если используется не в том процессе */
18
18
  let mayThrowError = () => { };
19
- if (typeof window !== 'undefined' || !electron_1.default.ipcMain) {
19
+ if (typeof window !== 'undefined' || !('ipcMain' in electron_1.default)) {
20
20
  mayThrowError = () => { throw new Error('Publish methods is available only in main process.'); };
21
21
  }
22
22
  else {
@@ -67,7 +67,7 @@ function publicMainEvent(name, procFn = ((...args) => args[0]), scopes = [enums_
67
67
  })
68
68
  .catch(reason => {
69
69
  filterSenders();
70
- [...senders, ...sendersOnce].forEach(sender => sender.send(mainEmitChannel, { error: String(reason) }));
70
+ [...senders, ...sendersOnce].forEach(sender => sender.send(mainEmitChannel, { error: String(reason?.stack || reason) }));
71
71
  sendersOnce = [];
72
72
  });
73
73
  }
@@ -77,7 +77,7 @@ function publicMainEvent(name, procFn = ((...args) => args[0]), scopes = [enums_
77
77
  }
78
78
  }
79
79
  catch (error) {
80
- allSenders.forEach(sender => sender.send(mainEmitChannel, { error: String(error) }));
80
+ allSenders.forEach(sender => sender.send(mainEmitChannel, { error: String(error?.stack || error) }));
81
81
  sendersOnce = [];
82
82
  }
83
83
  };
@@ -150,7 +150,7 @@ function publicFunction(name, func, scopes = [enums_1.Scope.preload, enums_1.Sco
150
150
  const promiseChannel = channel + enums_1.IPCChannel.promisePostfix;
151
151
  result
152
152
  .then(value => e.sender.send(promiseChannel, { value }))
153
- .catch(reason => e.sender.send(promiseChannel, { error: String(reason) }));
153
+ .catch(reason => e.sender.send(promiseChannel, { error: String(reason?.stack || reason) }));
154
154
  e.returnValue = { promiseChannel };
155
155
  }
156
156
  else {
@@ -158,7 +158,7 @@ function publicFunction(name, func, scopes = [enums_1.Scope.preload, enums_1.Sco
158
158
  }
159
159
  }
160
160
  catch (error) {
161
- e.returnValue = { error: String(error) };
161
+ e.returnValue = { error: String(error?.stack || error) };
162
162
  }
163
163
  });
164
164
  }
package/esm/index.d.ts CHANGED
@@ -1,6 +1,4 @@
1
1
  export { Access, Scope } from './enums';
2
- export * from './preload';
3
- export * from './renderer';
4
2
  export { publicClassMainEvent, publicClassRendererEvent, publicGetter, publicMethod, publicProperty, publicSetter } from './scripts/newDecorators';
5
3
  export { publicFunction, publicMainEvent, publicRendererEvent, publicVariable } from './scripts/publish';
6
4
  export type { EventEmitter, EventHandler, EventReceiver, EventUnsubscriber, IPublishMainEventArgs, IPublishMethodArgs, IPublishPropertyArgs, IPublishRendererEventArgs, MainEvent, PublicFunction, PublicProperty, RendererEvent } from './types';
package/esm/index.js CHANGED
@@ -1,5 +1,3 @@
1
1
  export { Access, Scope } from './enums';
2
- export * from './preload';
3
- export * from './renderer';
4
2
  export { publicClassMainEvent, publicClassRendererEvent, publicGetter, publicMethod, publicProperty, publicSetter } from './scripts/newDecorators';
5
3
  export { publicFunction, publicMainEvent, publicRendererEvent, publicVariable } from './scripts/publish';
package/esm/preload.d.ts CHANGED
@@ -1,2 +1,3 @@
1
1
  export { default as Main } from './scripts/Main';
2
2
  export { default as provideFromMain } from './scripts/preloadProvider';
3
+ export type { EventEmitter, EventHandler, EventReceiver, EventUnsubscriber, IPublishMainEventArgs, IPublishMethodArgs, IPublishPropertyArgs, IPublishRendererEventArgs, MainEvent, PublicFunction, PublicProperty, RendererEvent } from './types';
package/esm/renderer.d.ts CHANGED
@@ -1 +1,2 @@
1
1
  export { default as Bridge } from './scripts/Bridge';
2
+ export type { EventEmitter, EventHandler, EventReceiver, EventUnsubscriber, IPublishMainEventArgs, IPublishMethodArgs, IPublishPropertyArgs, IPublishRendererEventArgs, MainEvent, PublicFunction, PublicProperty, RendererEvent } from './types';
@@ -1,4 +1,4 @@
1
- import Electron from 'electron';
1
+ import electron from 'electron';
2
2
  import { IPCChannel, Scope } from '../enums';
3
3
  import createProvider from './provider';
4
4
  /**
@@ -16,7 +16,7 @@ let throwError;
16
16
  if (typeof window !== 'undefined') {
17
17
  throwError = () => { throw new Error('"Main" is unavailable in renderer process. Use "Bridge" instead'); };
18
18
  }
19
- else if (!Electron.ipcRenderer) {
19
+ else if (!('ipcRenderer' in electron)) {
20
20
  throwError = () => { throw new Error('"Main" is unavailable in main process.'); };
21
21
  }
22
22
  else {
@@ -24,7 +24,7 @@ else {
24
24
  }
25
25
  /** Выполняется только в NodeJS */
26
26
  function initInNode() {
27
- const { ipcRenderer } = Electron;
27
+ const { ipcRenderer } = electron;
28
28
  const info = ipcRenderer.sendSync(IPCChannel.getPublicInfo);
29
29
  if (!info)
30
30
  throw new Error('Public methods from main is not provided. Call any publish methods to provide it from main process.');
@@ -53,7 +53,7 @@ function initInNode() {
53
53
  ipcRenderer.sendSync(emitChannel, { promiseChannel });
54
54
  arg
55
55
  .then(value => ipcRenderer.send(promiseChannel, { value }))
56
- .catch(reason => ipcRenderer.send(promiseChannel, { error: String(reason) }));
56
+ .catch(reason => ipcRenderer.send(promiseChannel, { error: String(reason?.stack || reason) }));
57
57
  }
58
58
  else {
59
59
  ipcRenderer.send(emitChannel, { value: arg });
@@ -1,11 +1,11 @@
1
- import Electron from 'electron';
1
+ import electron from 'electron';
2
2
  import { IPCChannel } from '../enums';
3
3
  /** Выбрасывает ошибку если используется не в том процессе */
4
4
  let mayThrowError = () => { };
5
5
  if (typeof window === 'undefined') {
6
6
  mayThrowError = () => { throw new Error('"provideFromMain" is unavailable in main process.'); };
7
7
  }
8
- else if (!Electron.contextBridge) {
8
+ else if (!('contextBridge' in electron)) {
9
9
  mayThrowError = () => { throw new Error('"provideFromMain" is unavailable in renderer process.'); };
10
10
  }
11
11
  /**
@@ -15,7 +15,7 @@ else if (!Electron.contextBridge) {
15
15
  */
16
16
  function provideFromMain(contextIsolation = true) {
17
17
  mayThrowError();
18
- const { contextBridge, ipcRenderer } = Electron;
18
+ const { contextBridge, ipcRenderer } = electron;
19
19
  const info = ipcRenderer.sendSync(IPCChannel.getPublicInfo);
20
20
  const provider = {
21
21
  getInfo() {
@@ -1,4 +1,4 @@
1
- import Electron from 'electron';
1
+ import electron from 'electron';
2
2
  import { Access, IPCChannel, Scope } from '../enums';
3
3
  const publicInfo = {
4
4
  properties: new Set(),
@@ -10,11 +10,11 @@ const publicInfo = {
10
10
  };
11
11
  /** Выбрасывает ошибку если используется не в том процессе */
12
12
  let mayThrowError = () => { };
13
- if (typeof window !== 'undefined' || !Electron.ipcMain) {
13
+ if (typeof window !== 'undefined' || !('ipcMain' in electron)) {
14
14
  mayThrowError = () => { throw new Error('Publish methods is available only in main process.'); };
15
15
  }
16
16
  else {
17
- Electron.ipcMain.on(IPCChannel.getPublicInfo, e => e.returnValue = publicInfo);
17
+ electron.ipcMain.on(IPCChannel.getPublicInfo, e => e.returnValue = publicInfo);
18
18
  }
19
19
  /**
20
20
  * Makes the event from **main** available for **renderer** and **preload** processes.
@@ -25,7 +25,7 @@ else {
25
25
  */
26
26
  export function publicMainEvent(name, procFn = ((...args) => args[0]), scopes = [Scope.preload, Scope.renderer]) {
27
27
  mayThrowError();
28
- const { ipcMain } = Electron;
28
+ const { ipcMain } = electron;
29
29
  const { mainEvents } = publicInfo;
30
30
  const mainEmitChannel = IPCChannel.mainEventEmit + name;
31
31
  const mainHandleChannel = IPCChannel.mainEventOn + name;
@@ -61,7 +61,7 @@ export function publicMainEvent(name, procFn = ((...args) => args[0]), scopes =
61
61
  })
62
62
  .catch(reason => {
63
63
  filterSenders();
64
- [...senders, ...sendersOnce].forEach(sender => sender.send(mainEmitChannel, { error: String(reason) }));
64
+ [...senders, ...sendersOnce].forEach(sender => sender.send(mainEmitChannel, { error: String(reason?.stack || reason) }));
65
65
  sendersOnce = [];
66
66
  });
67
67
  }
@@ -71,7 +71,7 @@ export function publicMainEvent(name, procFn = ((...args) => args[0]), scopes =
71
71
  }
72
72
  }
73
73
  catch (error) {
74
- allSenders.forEach(sender => sender.send(mainEmitChannel, { error: String(error) }));
74
+ allSenders.forEach(sender => sender.send(mainEmitChannel, { error: String(error?.stack || error) }));
75
75
  sendersOnce = [];
76
76
  }
77
77
  };
@@ -85,7 +85,7 @@ export function publicMainEvent(name, procFn = ((...args) => args[0]), scopes =
85
85
  */
86
86
  export function publicRendererEvent(name, procFn = ((v) => v), scopes = [Scope.preload, Scope.renderer]) {
87
87
  mayThrowError();
88
- const { ipcMain } = Electron;
88
+ const { ipcMain } = electron;
89
89
  if (name.startsWith('on')) {
90
90
  name = name.replace('on', '');
91
91
  name = `${name[0].toLowerCase()}${name.slice(1)}`;
@@ -128,7 +128,7 @@ export function publicRendererEvent(name, procFn = ((v) => v), scopes = [Scope.p
128
128
  */
129
129
  export function publicFunction(name, func, scopes = [Scope.preload, Scope.renderer]) {
130
130
  mayThrowError();
131
- const { ipcMain } = Electron;
131
+ const { ipcMain } = electron;
132
132
  const { functions } = publicInfo;
133
133
  const channel = IPCChannel.functionCall + name;
134
134
  functions.add(name);
@@ -142,7 +142,7 @@ export function publicFunction(name, func, scopes = [Scope.preload, Scope.render
142
142
  const promiseChannel = channel + IPCChannel.promisePostfix;
143
143
  result
144
144
  .then(value => e.sender.send(promiseChannel, { value }))
145
- .catch(reason => e.sender.send(promiseChannel, { error: String(reason) }));
145
+ .catch(reason => e.sender.send(promiseChannel, { error: String(reason?.stack || reason) }));
146
146
  e.returnValue = { promiseChannel };
147
147
  }
148
148
  else {
@@ -150,7 +150,7 @@ export function publicFunction(name, func, scopes = [Scope.preload, Scope.render
150
150
  }
151
151
  }
152
152
  catch (error) {
153
- e.returnValue = { error: String(error) };
153
+ e.returnValue = { error: String(error?.stack || error) };
154
154
  }
155
155
  });
156
156
  }
@@ -165,7 +165,7 @@ export function publicFunction(name, func, scopes = [Scope.preload, Scope.render
165
165
  */
166
166
  export function publicVariable(name, value, scopes = [Scope.renderer, Scope.preload]) {
167
167
  mayThrowError();
168
- const { ipcMain } = Electron;
168
+ const { ipcMain } = electron;
169
169
  const { properties } = publicInfo;
170
170
  const getChannel = IPCChannel.propertyGet + name;
171
171
  const setChannel = IPCChannel.propertySet + name;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "emr-bridge",
3
- "version": "1.6.0",
3
+ "version": "1.6.2",
4
4
  "description": "Allows you to easily give access to main methods from the renderer process",
5
5
  "main": "esm/index.js",
6
6
  "scripts": {
@@ -16,12 +16,24 @@
16
16
  ".": [
17
17
  "./esm/index.d.ts"
18
18
  ],
19
+ "renderer": [
20
+ "./esm/renderer.d.ts"
21
+ ],
22
+ "preload": [
23
+ "./esm/preload.d.ts"
24
+ ],
19
25
  "exp": [
20
26
  "./esm/exp.d.ts"
21
27
  ],
22
28
  "cjs": [
23
29
  "./cjs/index.d.ts"
24
30
  ],
31
+ "cjs/renderer": [
32
+ "./cjs/renderer.d.ts"
33
+ ],
34
+ "cjs/preload": [
35
+ "./cjs/preload.d.ts"
36
+ ],
25
37
  "cjs/exp": [
26
38
  "./cjs/exp.d.ts"
27
39
  ]
@@ -29,10 +41,14 @@
29
41
  },
30
42
  "exports": {
31
43
  ".": "./esm/index.js",
44
+ "./renderer": "./esm/renderer.js",
45
+ "./preload": "./esm/preload.js",
32
46
  "./exp": "./esm/exp.js",
33
47
  "./package.json": "./package.json",
34
48
  "./cjs": "./cjs/index.js",
35
- "./cjs/exp": "./cjs/exp.js"
49
+ "./cjs/exp": "./cjs/exp.js",
50
+ "./cjs/renderer": "./cjs/renderer.js",
51
+ "./cjs/preload": "./cjs/preload.js"
36
52
  },
37
53
  "repository": {
38
54
  "type": "git",