emr-bridge 1.4.0 → 1.5.0

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.
@@ -1,157 +1,110 @@
1
- import { Access, Scope } from '../enums';
1
+ import { Access } from '../enums';
2
2
  function errorHandler(error, channel) {
3
3
  console.error(`Error on ${channel}.\n${error}`.replace('Error: ', ''));
4
4
  }
5
5
  function createProvider(args) {
6
6
  const { info, scope, getVariable, setVariable, callFunction, handleMainEvent, waitPromise, emitRendererEvent } = args;
7
7
  const target = {
8
- as: () => proxy
8
+ as: () => target
9
9
  };
10
+ function define(name, attrs) {
11
+ let descriptor;
12
+ if (!info.scopes.get(name).has(scope)) {
13
+ descriptor = {
14
+ get() { throw new Error(`'${name}' is not provided into ${scope} scope`); },
15
+ set() { throw new Error(`'${name}' is not provided into ${scope} scope`); }
16
+ };
17
+ }
18
+ else if (attrs?.value) {
19
+ descriptor = {
20
+ get: () => attrs.value,
21
+ set: () => { throw new Error(`'${name}' is readonly`); },
22
+ enumerable: true
23
+ };
24
+ }
25
+ else {
26
+ descriptor = {
27
+ get: attrs?.get || (() => { throw new Error(`No access to getting '${name}'`); }),
28
+ set: attrs?.set || (() => { throw new Error(`'${name}' is readonly`); }),
29
+ enumerable: true
30
+ };
31
+ }
32
+ Object.defineProperty(target, name, descriptor);
33
+ }
10
34
  info.functions.forEach(funcName => {
11
- if (!info.scopes[funcName].has(scope))
12
- return;
13
- Object.defineProperty(target, funcName, {
14
- get() {
15
- return (...args) => {
16
- const result = callFunction(funcName, ...args);
17
- if (result.error) {
18
- errorHandler(result.error, funcName);
19
- return;
20
- }
21
- if (result.promiseChannel)
22
- return waitPromise(result.promiseChannel);
23
- return result.value;
24
- };
25
- },
26
- set() {
27
- throw new Error(`Function '${funcName}' is readonly`);
28
- },
29
- enumerable: true
35
+ define(funcName, {
36
+ value(...args) {
37
+ const result = callFunction(funcName, ...args);
38
+ if (result.error) {
39
+ errorHandler(result.error, funcName);
40
+ return;
41
+ }
42
+ if (result.promiseChannel)
43
+ return waitPromise(result.promiseChannel);
44
+ return result.value;
45
+ }
30
46
  });
31
47
  });
32
- info.rendererEvents.forEach(rendererEventName => {
33
- if (!info.scopes[rendererEventName].has(scope))
34
- return;
35
- Object.defineProperty(target, rendererEventName, {
36
- get() {
37
- return (arg) => emitRendererEvent(rendererEventName, arg);
38
- },
39
- set() {
40
- throw new Error(`Function '${rendererEventName}' is readonly`);
41
- },
42
- enumerable: true
48
+ info.rendererEvents.forEach(eventName => {
49
+ define(eventName, {
50
+ value(arg) {
51
+ emitRendererEvent(eventName, arg);
52
+ }
43
53
  });
44
54
  });
45
55
  info.mainEvents.forEach(mainEventName => {
46
- if (!info.scopes[mainEventName].has(scope))
47
- return;
48
56
  const eventNameOn = `on${mainEventName[0].toUpperCase()}${mainEventName.slice(1)}`;
49
57
  const eventNameOnce = `once${mainEventName[0].toUpperCase()}${mainEventName.slice(1)}`;
50
- Object.defineProperty(target, eventNameOn, {
51
- get() {
52
- return (handler) => {
53
- return handleMainEvent(mainEventName, 'on', (result) => {
54
- if (result.error) {
55
- errorHandler(result.error, mainEventName);
56
- return;
57
- }
58
- if (result.promiseChannel)
59
- waitPromise(result.promiseChannel).then(handler);
60
- handler(result.value);
61
- });
62
- };
63
- },
64
- set() {
65
- throw new Error(`Function '${eventNameOn}' is readonly`);
66
- },
67
- enumerable: true
58
+ define(eventNameOn, {
59
+ value(handler) {
60
+ return handleMainEvent(mainEventName, 'on', (result) => {
61
+ if (result.error) {
62
+ errorHandler(result.error, mainEventName);
63
+ return;
64
+ }
65
+ if (result.promiseChannel)
66
+ waitPromise(result.promiseChannel).then(handler);
67
+ handler(result.value);
68
+ });
69
+ }
68
70
  });
69
- Object.defineProperty(target, eventNameOnce, {
70
- get() {
71
- return (handler) => {
72
- return handleMainEvent(mainEventName, 'once', (result) => {
73
- if (result.error) {
74
- errorHandler(result.error, mainEventName);
75
- return;
76
- }
77
- if (result.promiseChannel)
78
- waitPromise(result.promiseChannel).then(handler);
79
- handler(result.value);
80
- });
81
- };
82
- },
83
- set() {
84
- throw new Error(`Function '${eventNameOnce}' is readonly`);
85
- },
86
- enumerable: true
71
+ define(eventNameOnce, {
72
+ value(handler) {
73
+ return handleMainEvent(mainEventName, 'once', (result) => {
74
+ if (result.error) {
75
+ errorHandler(result.error, mainEventName);
76
+ return;
77
+ }
78
+ if (result.promiseChannel)
79
+ waitPromise(result.promiseChannel).then(handler);
80
+ handler(result.value);
81
+ });
82
+ }
87
83
  });
88
84
  });
89
85
  info.properties.forEach(propName => {
90
- if (!info.scopes[propName].has(scope))
91
- return;
92
- let getter = () => {
93
- const result = getVariable(propName);
94
- if (result.error) {
95
- errorHandler(result.error, propName);
96
- return;
97
- }
98
- return result.value;
99
- };
100
- let setter = (value) => {
101
- const result = setVariable(propName, value);
102
- if (result?.error) {
103
- errorHandler(result.error, propName);
104
- return;
105
- }
106
- };
107
- if (!info.accesses[propName].has(Access.get))
108
- getter = () => { throw new Error(`No access to getting the '${propName}' property`); };
109
- if (!info.accesses[propName].has(Access.set))
110
- setter = () => { throw new Error(`No access to setting the '${propName}' property`); };
111
- Object.defineProperty(target, propName, {
112
- get: getter,
113
- set: setter,
114
- enumerable: true
86
+ define(propName, {
87
+ get: info.accesses.get(propName).has(Access.get)
88
+ ? () => {
89
+ const result = getVariable(propName);
90
+ if (result.error) {
91
+ errorHandler(result.error, propName);
92
+ return;
93
+ }
94
+ return result.value;
95
+ }
96
+ : () => { throw new Error(`No access to getting the '${propName}' property`); },
97
+ set: info.accesses.get(propName).has(Access.set)
98
+ ? (value) => {
99
+ const result = setVariable(propName, value);
100
+ if (result?.error) {
101
+ errorHandler(result.error, propName);
102
+ return;
103
+ }
104
+ }
105
+ : () => { throw new Error(`No access to setting the '${propName}' property`); }
115
106
  });
116
107
  });
117
- const proxy = new Proxy(target, {
118
- get(target, key) {
119
- if (key in target)
120
- return target[key];
121
- const isFunction = info.functions.has(key);
122
- const isProperty = info.properties.has(key);
123
- if (!isFunction && !isProperty)
124
- throw new Error(`'${key}' is not provided from main`);
125
- if (!info.scopes[key].has(Scope.renderer))
126
- throw new Error(`'${key}' is not provided into renderer scope`);
127
- if (isProperty && !info.accesses[key].has(Access.get))
128
- throw new Error(`No access to getting the '${key}' property`);
129
- throw new Error(`Unknown error on get '${key}'`);
130
- },
131
- set(target, key, newValue) {
132
- if (key in target) {
133
- target[key] = newValue;
134
- return true;
135
- }
136
- const isFunction = info.functions.has(key);
137
- const isProperty = info.properties.has(key);
138
- if (isFunction)
139
- throw new Error(`Function '${key}' is readonly`);
140
- if (!isProperty)
141
- throw new Error(`Property '${key}' is not provided from main`);
142
- if (!info.scopes[key].has(Scope.renderer))
143
- throw new Error(`'${key}' is not provided into renderer scope`);
144
- if (!info.accesses[key].has(Access.set))
145
- throw new Error(`No access to setting the '${key}' property`);
146
- throw new Error(`Unknown error on set '${key}'`);
147
- },
148
- ownKeys(target) {
149
- return Object.keys(target);
150
- },
151
- has(target, key) {
152
- return key in target;
153
- }
154
- });
155
- return proxy;
108
+ return target;
156
109
  }
157
110
  export default createProvider;
@@ -5,8 +5,8 @@ const publicInfo = {
5
5
  functions: new Set(),
6
6
  mainEvents: new Set(),
7
7
  rendererEvents: new Set(),
8
- accesses: {},
9
- scopes: {}
8
+ accesses: new Map(),
9
+ scopes: new Map()
10
10
  };
11
11
  ipcMain.on(IPCChannel.getPublicInfo, e => e.returnValue = publicInfo);
12
12
  /**
@@ -23,8 +23,12 @@ export function publicMainEvent(name, receiver = ((v = undefined) => v), scopes
23
23
  let senders = [];
24
24
  let sendersOnce = [];
25
25
  mainEvents.add(name);
26
- if (!publicInfo.scopes[name])
27
- publicInfo.scopes[name] = new Set(scopes);
26
+ const rendererNameOn = `on${name[0].toUpperCase()}${name.slice(1)}`;
27
+ const rendererNameOnce = `once${name[0].toUpperCase()}${name.slice(1)}`;
28
+ if (!publicInfo.scopes.has(rendererNameOn)) {
29
+ publicInfo.scopes.set(rendererNameOn, new Set(scopes));
30
+ publicInfo.scopes.set(rendererNameOnce, new Set(scopes));
31
+ }
28
32
  ipcMain.removeAllListeners(mainHandleChannel);
29
33
  ipcMain.removeAllListeners(mainHandleChannelOnce);
30
34
  ipcMain.on(mainHandleChannel, ({ sender }) => !senders.includes(sender) && senders.push(sender));
@@ -78,8 +82,8 @@ export function publicRendererEvent(name, receiver = ((v = undefined) => v), sco
78
82
  const handlers = new Set();
79
83
  const handlersOnce = new Set();
80
84
  rendererEvents.add(name);
81
- if (!publicInfo.scopes[name])
82
- publicInfo.scopes[name] = new Set(scopes);
85
+ if (!publicInfo.scopes.has(name))
86
+ publicInfo.scopes.set(name, new Set(scopes));
83
87
  ipcMain.removeAllListeners(rendererEmitChannel);
84
88
  ipcMain.on(rendererEmitChannel, (_, result) => {
85
89
  if (result.error)
@@ -112,8 +116,8 @@ export function publicFunction(name, func, scopes = [Scope.preload, Scope.render
112
116
  const { functions } = publicInfo;
113
117
  const channel = IPCChannel.functionCall + name;
114
118
  functions.add(name);
115
- if (!publicInfo.scopes[name])
116
- publicInfo.scopes[name] = new Set(scopes);
119
+ if (!publicInfo.scopes.has(name))
120
+ publicInfo.scopes.set(name, new Set(scopes));
117
121
  ipcMain.removeAllListeners(channel);
118
122
  ipcMain.on(channel, (e, ...args) => {
119
123
  try {
@@ -148,16 +152,16 @@ export function publicVariable(name, value, scopes = [Scope.renderer, Scope.prel
148
152
  const setChannel = IPCChannel.propertySet + name;
149
153
  const { get: getter, set: setter } = value;
150
154
  properties.add(name);
151
- if (!publicInfo.scopes[name])
152
- publicInfo.scopes[name] = new Set(scopes);
153
- if (!publicInfo.accesses[name]) {
155
+ if (!publicInfo.scopes.has(name))
156
+ publicInfo.scopes.set(name, new Set(scopes));
157
+ if (!publicInfo.accesses.has(name)) {
154
158
  const accesses = [];
155
159
  getter && accesses.push(Access.get);
156
160
  setter && accesses.push(Access.set);
157
- publicInfo.accesses[name] = new Set(accesses);
161
+ publicInfo.accesses.set(name, new Set(accesses));
158
162
  }
159
163
  else {
160
- const accesses = publicInfo.accesses[name];
164
+ const accesses = publicInfo.accesses.get(name);
161
165
  getter && accesses.add(Access.get);
162
166
  setter && accesses.add(Access.set);
163
167
  }
@@ -187,8 +191,8 @@ export function publicVariable(name, value, scopes = [Scope.renderer, Scope.prel
187
191
  }
188
192
  }
189
193
  export function addScope(key, scope) {
190
- publicInfo.scopes[key] = new Set([scope]);
194
+ publicInfo.scopes.set(key, new Set([scope]));
191
195
  }
192
196
  export function addAccess(key, access) {
193
- publicInfo.accesses[key] = new Set([access]);
197
+ publicInfo.accesses.set(key, new Set([access]));
194
198
  }
package/esm/types.d.ts CHANGED
@@ -42,8 +42,8 @@ export interface ICreateProviderArgs {
42
42
  setVariable(name: string, value: any): IIPCResult | undefined;
43
43
  waitPromise(channel: string): Promise<any>;
44
44
  }
45
- export type Scopes = Record<string, Set<Scope>>;
46
- export type Accesses = Record<string, Set<Access>>;
45
+ export type Scopes = Map<string, Set<Scope>>;
46
+ export type Accesses = Map<string, Set<Access>>;
47
47
  export type RendererEvent<T = undefined> = (handler: EventHandler<T>, isOnce?: boolean) => EventUnsubscriber;
48
48
  export type MainEvent<T = undefined> = (handler: EventHandler<T>) => EventUnsubscriber;
49
49
  export type EventEmitter = (...args: any[]) => any;
@@ -60,7 +60,10 @@ export interface IProvider {
60
60
  functions: Record<string, (...args: any[]) => IIPCResult>;
61
61
  mainEvents: Record<string, (type: 'on' | 'once', handler: EventHandler<IIPCResult>) => EventUnsubscriber>;
62
62
  rendererEvents: Record<string, (arg: any) => void>;
63
- properties: Record<string, IIPCResult>;
63
+ properties: Record<string, {
64
+ get(): IIPCResult;
65
+ set(val: any): void;
66
+ }>;
64
67
  };
65
68
  }
66
69
  export type PublicFunction = (...args: any[]) => any;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "emr-bridge",
3
- "version": "1.4.0",
3
+ "version": "1.5.0",
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": {