emr-bridge 2.0.2 → 2.1.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.
- package/README.md +8 -0
- package/cjs/entries/index.d.ts +1 -0
- package/cjs/entries/index.js +19 -0
- package/cjs/errors.d.ts +18 -0
- package/cjs/errors.js +34 -1
- package/cjs/package.json +3 -0
- package/cjs/scripts/base-bridge.d.ts +15 -8
- package/cjs/scripts/base-bridge.js +88 -42
- package/cjs/scripts/helpers/entities-info.d.ts +20 -0
- package/cjs/scripts/helpers/entities-info.js +38 -0
- package/cjs/scripts/helpers/env.js +1 -1
- package/cjs/scripts/helpers/id.d.ts +9 -0
- package/cjs/scripts/helpers/id.js +15 -1
- package/cjs/scripts/helpers/index.d.ts +3 -0
- package/cjs/scripts/helpers/index.js +7 -1
- package/cjs/scripts/helpers/ipc-channel.d.ts +10 -0
- package/cjs/scripts/helpers/ipc-channel.js +73 -61
- package/cjs/scripts/helpers/ipc-event-in-main.d.ts +7 -1
- package/cjs/scripts/helpers/ipc-event-in-main.js +27 -2
- package/cjs/scripts/helpers/ipc-payload.d.ts +38 -0
- package/cjs/scripts/helpers/ipc-payload.js +82 -0
- package/cjs/scripts/helpers/ipc-result.d.ts +9 -1
- package/cjs/scripts/helpers/ipc-result.js +32 -9
- package/cjs/scripts/helpers/names.d.ts +20 -0
- package/cjs/scripts/helpers/names.js +77 -0
- package/cjs/scripts/helpers/transfer.d.ts +8 -0
- package/cjs/scripts/helpers/transfer.js +24 -10
- package/cjs/scripts/helpers/web-contents-events-container.d.ts +57 -8
- package/cjs/scripts/helpers/web-contents-events-container.js +150 -25
- package/cjs/scripts/main/publish.d.ts +2 -2
- package/cjs/scripts/main/publish.js +177 -78
- package/cjs/scripts/preload/bridge.d.ts +2 -2
- package/cjs/scripts/preload/bridge.js +7 -6
- package/cjs/scripts/preload/provider.js +113 -18
- package/cjs/scripts/renderer/bridge.js +5 -0
- package/cjs/scripts/renderer/tunnels.d.ts +19 -2
- package/cjs/scripts/renderer/tunnels.js +133 -32
- package/cjs/types.d.ts +4 -0
- package/esm/entries/index.d.ts +1 -0
- package/esm/entries/index.js +5 -1
- package/esm/errors.d.ts +18 -0
- package/esm/errors.js +30 -0
- package/esm/scripts/base-bridge.d.ts +15 -8
- package/esm/scripts/base-bridge.js +90 -44
- package/esm/scripts/helpers/entities-info.d.ts +20 -0
- package/esm/scripts/helpers/entities-info.js +35 -0
- package/esm/scripts/helpers/env.js +1 -1
- package/esm/scripts/helpers/id.d.ts +9 -0
- package/esm/scripts/helpers/id.js +15 -1
- package/esm/scripts/helpers/index.d.ts +3 -0
- package/esm/scripts/helpers/index.js +3 -0
- package/esm/scripts/helpers/ipc-channel.d.ts +10 -0
- package/esm/scripts/helpers/ipc-channel.js +74 -63
- package/esm/scripts/helpers/ipc-event-in-main.d.ts +7 -1
- package/esm/scripts/helpers/ipc-event-in-main.js +24 -2
- package/esm/scripts/helpers/ipc-payload.d.ts +38 -0
- package/esm/scripts/helpers/ipc-payload.js +79 -0
- package/esm/scripts/helpers/ipc-result.d.ts +9 -1
- package/esm/scripts/helpers/ipc-result.js +32 -9
- package/esm/scripts/helpers/names.d.ts +20 -0
- package/esm/scripts/helpers/names.js +74 -0
- package/esm/scripts/helpers/transfer.d.ts +8 -0
- package/esm/scripts/helpers/transfer.js +24 -10
- package/esm/scripts/helpers/web-contents-events-container.d.ts +57 -8
- package/esm/scripts/helpers/web-contents-events-container.js +150 -25
- package/esm/scripts/main/publish.d.ts +2 -2
- package/esm/scripts/main/publish.js +179 -80
- package/esm/scripts/preload/bridge.d.ts +2 -2
- package/esm/scripts/preload/bridge.js +8 -7
- package/esm/scripts/preload/provider.js +114 -19
- package/esm/scripts/renderer/bridge.js +5 -0
- package/esm/scripts/renderer/tunnels.d.ts +19 -2
- package/esm/scripts/renderer/tunnels.js +135 -35
- package/esm/types.d.ts +4 -0
- package/package.json +35 -13
package/README.md
CHANGED
|
@@ -266,3 +266,11 @@ bridge.getHuman = bridge.returns(bridge.getHuman, Human)
|
|
|
266
266
|
console.log(bridge.getHuman().name)
|
|
267
267
|
*/
|
|
268
268
|
```
|
|
269
|
+
|
|
270
|
+
## Разработка
|
|
271
|
+
|
|
272
|
+
```bash
|
|
273
|
+
npm test # тесты (Node.js 22.6+)
|
|
274
|
+
npm run typecheck # проверка типов
|
|
275
|
+
npm run compile # сборка esm и cjs
|
|
276
|
+
```
|
package/cjs/entries/index.d.ts
CHANGED
package/cjs/entries/index.js
CHANGED
|
@@ -3,4 +3,23 @@
|
|
|
3
3
|
Главная точка входа.
|
|
4
4
|
Экспорт только типов потому что одновременный импорт для разных процессов приводит к ошибке.
|
|
5
5
|
*/
|
|
6
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
7
|
+
if (k2 === undefined) k2 = k;
|
|
8
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
9
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
10
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
11
|
+
}
|
|
12
|
+
Object.defineProperty(o, k2, desc);
|
|
13
|
+
}) : (function(o, m, k, k2) {
|
|
14
|
+
if (k2 === undefined) k2 = k;
|
|
15
|
+
o[k2] = m[k];
|
|
16
|
+
}));
|
|
17
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
18
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
19
|
+
};
|
|
6
20
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
|
+
/*
|
|
22
|
+
Ошибки не зависят от процессов, поэтому их можно безопасно
|
|
23
|
+
экспортировать из общей точки входа.
|
|
24
|
+
*/
|
|
25
|
+
__exportStar(require("../errors.js"), exports);
|
package/cjs/errors.d.ts
CHANGED
|
@@ -58,3 +58,21 @@ export declare class TryProvideInMainError extends Error {
|
|
|
58
58
|
export declare class TryProvideInRendererError extends Error {
|
|
59
59
|
constructor();
|
|
60
60
|
}
|
|
61
|
+
/**
|
|
62
|
+
* Некорректное имя публикуемой сущности.
|
|
63
|
+
*/
|
|
64
|
+
export declare class InvalidEntityNameError extends Error {
|
|
65
|
+
constructor(name: unknown, reserved?: boolean);
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* Некорректное имя события.
|
|
69
|
+
*/
|
|
70
|
+
export declare class InvalidEventNameError extends Error {
|
|
71
|
+
constructor(name: unknown);
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* Нет ответа от main процесса.
|
|
75
|
+
*/
|
|
76
|
+
export declare class NoResponseFromMainError extends Error {
|
|
77
|
+
constructor(channel: string);
|
|
78
|
+
}
|
package/cjs/errors.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.TryProvideInRendererError = exports.TryProvideInMainError = exports.TryUseBridgeInMainError = exports.WrongBridgeInRendererError = exports.WrongBridgeInPreloadError = exports.TrySetReadonlyError = exports.GlobalProviderNotFoundError = exports.PublishMethodsUnavailableError = exports.NotProvidedFromMainError = exports.NoGetAccessError = void 0;
|
|
3
|
+
exports.NoResponseFromMainError = exports.InvalidEventNameError = exports.InvalidEntityNameError = exports.TryProvideInRendererError = exports.TryProvideInMainError = exports.TryUseBridgeInMainError = exports.WrongBridgeInRendererError = exports.WrongBridgeInPreloadError = exports.TrySetReadonlyError = exports.GlobalProviderNotFoundError = exports.PublishMethodsUnavailableError = exports.NotProvidedFromMainError = exports.NoGetAccessError = void 0;
|
|
4
4
|
/**
|
|
5
5
|
* Нет доступа к получению переменной.
|
|
6
6
|
*/
|
|
@@ -91,3 +91,36 @@ class TryProvideInRendererError extends Error {
|
|
|
91
91
|
}
|
|
92
92
|
}
|
|
93
93
|
exports.TryProvideInRendererError = TryProvideInRendererError;
|
|
94
|
+
/**
|
|
95
|
+
* Некорректное имя публикуемой сущности.
|
|
96
|
+
*/
|
|
97
|
+
class InvalidEntityNameError extends Error {
|
|
98
|
+
constructor(name, reserved = false) {
|
|
99
|
+
const reason = reserved
|
|
100
|
+
? 'Имя зарезервировано мостом.'
|
|
101
|
+
: 'Имя должно быть непустой строкой допустимой длины.';
|
|
102
|
+
super(`Некорректное имя сущности '${String(name)}'. ${reason}`);
|
|
103
|
+
this.name = 'InvalidEntityNameError';
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
exports.InvalidEntityNameError = InvalidEntityNameError;
|
|
107
|
+
/**
|
|
108
|
+
* Некорректное имя события.
|
|
109
|
+
*/
|
|
110
|
+
class InvalidEventNameError extends Error {
|
|
111
|
+
constructor(name) {
|
|
112
|
+
super(`Некорректное имя события '${String(name)}'. Имя должно быть непустой строкой допустимой длины.`);
|
|
113
|
+
this.name = 'InvalidEventNameError';
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
exports.InvalidEventNameError = InvalidEventNameError;
|
|
117
|
+
/**
|
|
118
|
+
* Нет ответа от main процесса.
|
|
119
|
+
*/
|
|
120
|
+
class NoResponseFromMainError extends Error {
|
|
121
|
+
constructor(channel) {
|
|
122
|
+
super(`Нет ответа от main процесса по каналу '${channel}'.`);
|
|
123
|
+
this.name = 'NoResponseFromMainError';
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
exports.NoResponseFromMainError = NoResponseFromMainError;
|
package/cjs/package.json
ADDED
|
@@ -12,11 +12,11 @@ export default abstract class BaseBridge implements IBridge {
|
|
|
12
12
|
*/
|
|
13
13
|
protected readonly target: {
|
|
14
14
|
as: () => any;
|
|
15
|
-
emit: (
|
|
16
|
-
on: (
|
|
17
|
-
once: (
|
|
18
|
-
call: (
|
|
19
|
-
returns: (
|
|
15
|
+
emit: (...args: Parameters<typeof this.emit>) => void;
|
|
16
|
+
on: (...args: Parameters<typeof this.on<any>>) => EventUnsubscribe;
|
|
17
|
+
once: (...args: Parameters<typeof this.once<any>>) => EventUnsubscribe;
|
|
18
|
+
call: (...args: Parameters<typeof this.call<any, any>>) => any;
|
|
19
|
+
returns: (...args: Parameters<typeof this.returns<any, any>>) => any;
|
|
20
20
|
};
|
|
21
21
|
as<TTarget>(): IBridge & TTarget;
|
|
22
22
|
emit(name: string, value: any): void;
|
|
@@ -24,7 +24,7 @@ export default abstract class BaseBridge implements IBridge {
|
|
|
24
24
|
once<TValue = any>(name: string, listener: EventListener<TValue>): EventUnsubscribe;
|
|
25
25
|
call<TFunc extends (...args: any[]) => InstanceType<TClass>, TClass extends {
|
|
26
26
|
new (): IHasSnapshot;
|
|
27
|
-
}>(func: TFunc, Class: TClass, args
|
|
27
|
+
}>(func: TFunc, Class: TClass, args?: Parameters<TFunc>): InstanceType<TClass>;
|
|
28
28
|
returns<TFunc extends (...args: any[]) => InstanceType<TClass>, TClass extends {
|
|
29
29
|
new (): IHasSnapshot;
|
|
30
30
|
}>(func: TFunc, Class: TClass): TFunc;
|
|
@@ -80,16 +80,23 @@ export default abstract class BaseBridge implements IBridge {
|
|
|
80
80
|
protected handlePossibleError(channel: string, error?: string): void | never;
|
|
81
81
|
/**
|
|
82
82
|
* Инициализировать доступ к публичным функциям.
|
|
83
|
+
* @param functions - Имена функций.
|
|
83
84
|
*/
|
|
84
|
-
protected initFunctions(): void;
|
|
85
|
+
protected initFunctions(functions?: Iterable<string>): void;
|
|
85
86
|
/**
|
|
86
87
|
* Инициализировать доступ к публичным переменным.
|
|
88
|
+
* @param variables - Имена переменных.
|
|
87
89
|
*/
|
|
88
|
-
protected initVariables(): void;
|
|
90
|
+
protected initVariables(variables?: Iterable<string>): void;
|
|
89
91
|
/**
|
|
90
92
|
* Добавить сущность в `target`.
|
|
91
93
|
* @param name - Имя.
|
|
92
94
|
* @param descriptor - Дескриптор значения.
|
|
93
95
|
*/
|
|
94
96
|
protected define<TValue = unknown>(name: string, descriptor?: TypedPropertyDescriptor<TValue>): void;
|
|
97
|
+
/**
|
|
98
|
+
* Проверить, что обработчик события является функцией.
|
|
99
|
+
* @param listener - Обработчик.
|
|
100
|
+
*/
|
|
101
|
+
private assertListener;
|
|
95
102
|
}
|
|
@@ -6,42 +6,56 @@ const index_js_1 = require("./helpers/index.js");
|
|
|
6
6
|
* Базовый класс моста до main.
|
|
7
7
|
*/
|
|
8
8
|
class BaseBridge {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
this.
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
};
|
|
21
|
-
}
|
|
9
|
+
/**
|
|
10
|
+
* Объект, который будет использоваться пользователем.
|
|
11
|
+
*/
|
|
12
|
+
target = {
|
|
13
|
+
as: () => this.as(),
|
|
14
|
+
emit: (...args) => this.emit(...args),
|
|
15
|
+
on: (...args) => this.on(...args),
|
|
16
|
+
once: (...args) => this.once(...args),
|
|
17
|
+
call: (...args) => this.call(...args),
|
|
18
|
+
returns: (...args) => this.returns(...args)
|
|
19
|
+
};
|
|
22
20
|
as() {
|
|
23
21
|
return this.target;
|
|
24
22
|
}
|
|
25
23
|
emit(name, value) {
|
|
24
|
+
index_js_1.Names.validateEvent(name);
|
|
26
25
|
this.emitEvent(name, index_js_1.Transfer.toTransferable(value));
|
|
27
26
|
}
|
|
28
27
|
on(name, listener) {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
28
|
+
index_js_1.Names.validateEvent(name);
|
|
29
|
+
this.assertListener(listener);
|
|
30
|
+
return this.handleEvent(name, 'on', (result) => {
|
|
31
|
+
if (!result) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
this.handlePossibleError(`event: ${name}`, result.error);
|
|
35
|
+
listener(result.value);
|
|
32
36
|
});
|
|
33
37
|
}
|
|
34
38
|
once(name, listener) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
39
|
+
index_js_1.Names.validateEvent(name);
|
|
40
|
+
this.assertListener(listener);
|
|
41
|
+
return this.handleEvent(name, 'once', (result) => {
|
|
42
|
+
if (!result) {
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
this.handlePossibleError(`event: ${name}`, result.error);
|
|
46
|
+
listener(result.value);
|
|
38
47
|
});
|
|
39
48
|
}
|
|
40
|
-
call(func, Class, args) {
|
|
49
|
+
call(func, Class, args = []) {
|
|
41
50
|
const value = func(...args);
|
|
42
51
|
if (index_js_1.Transfer.isSnapshotValue(value)) {
|
|
43
52
|
return index_js_1.Transfer.getFromSnapshot(value, Class);
|
|
44
53
|
}
|
|
54
|
+
if (index_js_1.Transfer.isPromiseLike(value)) {
|
|
55
|
+
return value.then(result => (index_js_1.Transfer.isSnapshotValue(result)
|
|
56
|
+
? index_js_1.Transfer.getFromSnapshot(result, Class)
|
|
57
|
+
: result));
|
|
58
|
+
}
|
|
45
59
|
return value;
|
|
46
60
|
}
|
|
47
61
|
returns(func, Class) {
|
|
@@ -51,8 +65,12 @@ class BaseBridge {
|
|
|
51
65
|
* Инициализация моста.
|
|
52
66
|
*/
|
|
53
67
|
init() {
|
|
54
|
-
this.
|
|
55
|
-
|
|
68
|
+
const info = this.entitiesInfo;
|
|
69
|
+
if (!info) {
|
|
70
|
+
throw new errors_js_1.NoResponseFromMainError('entitiesInfo');
|
|
71
|
+
}
|
|
72
|
+
this.initFunctions(info.functions);
|
|
73
|
+
this.initVariables(info.variables);
|
|
56
74
|
}
|
|
57
75
|
/**
|
|
58
76
|
* Обработать возможную ошибку.
|
|
@@ -65,40 +83,54 @@ class BaseBridge {
|
|
|
65
83
|
if (!error) {
|
|
66
84
|
return;
|
|
67
85
|
}
|
|
68
|
-
|
|
86
|
+
const message = error.startsWith('Error: ') ? error.slice(7) : error;
|
|
87
|
+
throw new Error(`Error on ${channel}.\n${message}`);
|
|
69
88
|
}
|
|
70
89
|
/**
|
|
71
90
|
* Инициализировать доступ к публичным функциям.
|
|
91
|
+
* @param functions - Имена функций.
|
|
72
92
|
*/
|
|
73
|
-
initFunctions() {
|
|
74
|
-
for (const name of
|
|
93
|
+
initFunctions(functions) {
|
|
94
|
+
for (const name of functions ?? []) {
|
|
95
|
+
index_js_1.Names.validateEntity(name);
|
|
75
96
|
this.define(name, {
|
|
76
97
|
value: (...args) => {
|
|
77
98
|
const id = index_js_1.Id.new();
|
|
78
99
|
const preparedArgs = args.map(arg => index_js_1.Transfer.toTransferable(arg));
|
|
79
|
-
const
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
100
|
+
const result = this.callFunction(name, id, preparedArgs);
|
|
101
|
+
if (!result) {
|
|
102
|
+
throw new errors_js_1.NoResponseFromMainError(name);
|
|
103
|
+
}
|
|
104
|
+
this.handlePossibleError(name, result.error);
|
|
105
|
+
return result.promiseChannel
|
|
106
|
+
? this.waitPromise(result.promiseChannel, id)
|
|
107
|
+
: result.value;
|
|
84
108
|
}
|
|
85
109
|
});
|
|
86
110
|
}
|
|
87
111
|
}
|
|
88
112
|
/**
|
|
89
113
|
* Инициализировать доступ к публичным переменным.
|
|
114
|
+
* @param variables - Имена переменных.
|
|
90
115
|
*/
|
|
91
|
-
initVariables() {
|
|
92
|
-
for (const name of
|
|
116
|
+
initVariables(variables) {
|
|
117
|
+
for (const name of variables ?? []) {
|
|
118
|
+
index_js_1.Names.validateEntity(name);
|
|
93
119
|
this.define(name, {
|
|
94
120
|
get: () => {
|
|
95
|
-
const
|
|
96
|
-
|
|
97
|
-
|
|
121
|
+
const result = this.getVariable(name);
|
|
122
|
+
if (!result) {
|
|
123
|
+
throw new errors_js_1.NoResponseFromMainError(name);
|
|
124
|
+
}
|
|
125
|
+
this.handlePossibleError(name, result.error);
|
|
126
|
+
return result.value;
|
|
98
127
|
},
|
|
99
128
|
set: (value) => {
|
|
100
|
-
const
|
|
101
|
-
|
|
129
|
+
const result = this.setVariable(name, value);
|
|
130
|
+
if (!result) {
|
|
131
|
+
throw new errors_js_1.NoResponseFromMainError(name);
|
|
132
|
+
}
|
|
133
|
+
this.handlePossibleError(name, result.error);
|
|
102
134
|
}
|
|
103
135
|
});
|
|
104
136
|
}
|
|
@@ -109,20 +141,34 @@ class BaseBridge {
|
|
|
109
141
|
* @param descriptor - Дескриптор значения.
|
|
110
142
|
*/
|
|
111
143
|
define(name, descriptor) {
|
|
112
|
-
|
|
144
|
+
if (!descriptor) {
|
|
145
|
+
throw new TypeError(`Не задан дескриптор сущности '${name}'.`);
|
|
146
|
+
}
|
|
147
|
+
const hasValue = 'value' in descriptor;
|
|
113
148
|
const defaultDescriptor = {
|
|
114
149
|
get: () => descriptor.value,
|
|
115
150
|
set: index_js_1.Errors.getThrower(errors_js_1.TrySetReadonlyError, name),
|
|
116
|
-
enumerable: true
|
|
151
|
+
enumerable: true,
|
|
152
|
+
configurable: true
|
|
117
153
|
};
|
|
118
154
|
const noValueDescriptor = {
|
|
119
|
-
get: descriptor
|
|
120
|
-
set: descriptor
|
|
121
|
-
enumerable: true
|
|
155
|
+
get: descriptor.get || index_js_1.Errors.getThrower(errors_js_1.NoGetAccessError, name),
|
|
156
|
+
set: descriptor.set || index_js_1.Errors.getThrower(errors_js_1.TrySetReadonlyError, name),
|
|
157
|
+
enumerable: true,
|
|
158
|
+
configurable: true
|
|
122
159
|
};
|
|
123
160
|
Object.defineProperty(this.target, name, hasValue
|
|
124
161
|
? defaultDescriptor
|
|
125
162
|
: noValueDescriptor);
|
|
126
163
|
}
|
|
164
|
+
/**
|
|
165
|
+
* Проверить, что обработчик события является функцией.
|
|
166
|
+
* @param listener - Обработчик.
|
|
167
|
+
*/
|
|
168
|
+
assertListener(listener) {
|
|
169
|
+
if (typeof listener !== 'function') {
|
|
170
|
+
throw new TypeError('Обработчик события должен быть функцией.');
|
|
171
|
+
}
|
|
172
|
+
}
|
|
127
173
|
}
|
|
128
174
|
exports.default = BaseBridge;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { IEntitiesInfo } from '../../types.js';
|
|
2
|
+
/**
|
|
3
|
+
* Хелпер для безопасного чтения информации о публичных сущностях из IPC.
|
|
4
|
+
*/
|
|
5
|
+
export default class EntitiesInfo {
|
|
6
|
+
/**
|
|
7
|
+
* Прочитать информацию о сущностях.
|
|
8
|
+
*
|
|
9
|
+
* Значение из IPC недоверенное: неверный формат или мусорные имена
|
|
10
|
+
* должны отбрасываться, а не ломать мост.
|
|
11
|
+
* @param value - Данные из IPC.
|
|
12
|
+
* @returns Информация о сущностях или `null`.
|
|
13
|
+
*/
|
|
14
|
+
static read(value: unknown): IEntitiesInfo | null;
|
|
15
|
+
/**
|
|
16
|
+
* Является ли значение итерируемым.
|
|
17
|
+
* @param value - Значение.
|
|
18
|
+
*/
|
|
19
|
+
private static isIterable;
|
|
20
|
+
}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
/**
|
|
4
|
+
* Хелпер для безопасного чтения информации о публичных сущностях из IPC.
|
|
5
|
+
*/
|
|
6
|
+
class EntitiesInfo {
|
|
7
|
+
/**
|
|
8
|
+
* Прочитать информацию о сущностях.
|
|
9
|
+
*
|
|
10
|
+
* Значение из IPC недоверенное: неверный формат или мусорные имена
|
|
11
|
+
* должны отбрасываться, а не ломать мост.
|
|
12
|
+
* @param value - Данные из IPC.
|
|
13
|
+
* @returns Информация о сущностях или `null`.
|
|
14
|
+
*/
|
|
15
|
+
static read(value) {
|
|
16
|
+
if (!value || typeof value !== 'object') {
|
|
17
|
+
return null;
|
|
18
|
+
}
|
|
19
|
+
const candidate = value;
|
|
20
|
+
if (!EntitiesInfo.isIterable(candidate.functions) || !EntitiesInfo.isIterable(candidate.variables)) {
|
|
21
|
+
return null;
|
|
22
|
+
}
|
|
23
|
+
return {
|
|
24
|
+
functions: new Set(Array.from(candidate.functions).filter((name) => typeof name === 'string')),
|
|
25
|
+
variables: new Set(Array.from(candidate.variables).filter((name) => typeof name === 'string'))
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Является ли значение итерируемым.
|
|
30
|
+
* @param value - Значение.
|
|
31
|
+
*/
|
|
32
|
+
static isIterable(value) {
|
|
33
|
+
return (value !== null
|
|
34
|
+
&& value !== undefined
|
|
35
|
+
&& typeof value[Symbol.iterator] === 'function');
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
exports.default = EntitiesInfo;
|
|
@@ -14,7 +14,7 @@ class Env {
|
|
|
14
14
|
* Есть ли провайдер необходимых методов из `preload` в `renderer`. (`window.__provider__`)
|
|
15
15
|
*/
|
|
16
16
|
static get hasProvider() {
|
|
17
|
-
return Boolean(window.__provider__);
|
|
17
|
+
return Env.hasWindow && Boolean(window.__provider__);
|
|
18
18
|
}
|
|
19
19
|
/**
|
|
20
20
|
* Является ли окружение `preload` процессом.
|
|
@@ -2,8 +2,17 @@
|
|
|
2
2
|
* Хелпер для работы с идентификаторами.
|
|
3
3
|
*/
|
|
4
4
|
export default class Id {
|
|
5
|
+
/**
|
|
6
|
+
* Счётчик для генерации идентификаторов без криптографического API.
|
|
7
|
+
*/
|
|
8
|
+
private static counter;
|
|
5
9
|
/**
|
|
6
10
|
* Создать новый идентификатор.
|
|
11
|
+
*
|
|
12
|
+
* `Math.random` в одиночку не гарантирует уникальность: коллизия
|
|
13
|
+
* идентификаторов может разрешить чужое обещание. Поэтому при наличии
|
|
14
|
+
* используется `crypto.randomUUID`, а запасной вариант содержит
|
|
15
|
+
* монотонный счётчик процесса.
|
|
7
16
|
*/
|
|
8
17
|
static new(): string;
|
|
9
18
|
}
|
|
@@ -4,11 +4,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
4
4
|
* Хелпер для работы с идентификаторами.
|
|
5
5
|
*/
|
|
6
6
|
class Id {
|
|
7
|
+
/**
|
|
8
|
+
* Счётчик для генерации идентификаторов без криптографического API.
|
|
9
|
+
*/
|
|
10
|
+
static counter = 0;
|
|
7
11
|
/**
|
|
8
12
|
* Создать новый идентификатор.
|
|
13
|
+
*
|
|
14
|
+
* `Math.random` в одиночку не гарантирует уникальность: коллизия
|
|
15
|
+
* идентификаторов может разрешить чужое обещание. Поэтому при наличии
|
|
16
|
+
* используется `crypto.randomUUID`, а запасной вариант содержит
|
|
17
|
+
* монотонный счётчик процесса.
|
|
9
18
|
*/
|
|
10
19
|
static new() {
|
|
11
|
-
|
|
20
|
+
const crypto = globalThis.crypto;
|
|
21
|
+
if (crypto && typeof crypto.randomUUID === 'function') {
|
|
22
|
+
return crypto.randomUUID();
|
|
23
|
+
}
|
|
24
|
+
Id.counter = (Id.counter + 1) % Number.MAX_SAFE_INTEGER;
|
|
25
|
+
return `${Date.now().toString(36)}-${Id.counter.toString(36)}-${Math.random().toString(36).slice(2)}`;
|
|
12
26
|
}
|
|
13
27
|
}
|
|
14
28
|
exports.default = Id;
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
+
export { default as EntitiesInfo } from './entities-info.js';
|
|
1
2
|
export { default as Env } from './env.js';
|
|
2
3
|
export { default as Errors } from './errors.js';
|
|
3
4
|
export { default as Id } from './id.js';
|
|
4
5
|
export { default as IpcChannel } from './ipc-channel.js';
|
|
5
6
|
export { default as IpcEventInMain } from './ipc-event-in-main.js';
|
|
7
|
+
export { default as IpcPayload } from './ipc-payload.js';
|
|
6
8
|
export { default as IpcResult } from './ipc-result.js';
|
|
9
|
+
export { default as Names } from './names.js';
|
|
7
10
|
export { default as Transfer } from './transfer.js';
|
|
8
11
|
export { default as WebContentsEventsContainer } from './web-contents-events-container.js';
|
|
@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.WebContentsEventsContainer = exports.Transfer = exports.IpcResult = exports.IpcEventInMain = exports.IpcChannel = exports.Id = exports.Errors = exports.Env = void 0;
|
|
6
|
+
exports.WebContentsEventsContainer = exports.Transfer = exports.Names = exports.IpcResult = exports.IpcPayload = exports.IpcEventInMain = exports.IpcChannel = exports.Id = exports.Errors = exports.Env = exports.EntitiesInfo = void 0;
|
|
7
|
+
var entities_info_js_1 = require("./entities-info.js");
|
|
8
|
+
Object.defineProperty(exports, "EntitiesInfo", { enumerable: true, get: function () { return __importDefault(entities_info_js_1).default; } });
|
|
7
9
|
var env_js_1 = require("./env.js");
|
|
8
10
|
Object.defineProperty(exports, "Env", { enumerable: true, get: function () { return __importDefault(env_js_1).default; } });
|
|
9
11
|
var errors_js_1 = require("./errors.js");
|
|
@@ -14,8 +16,12 @@ var ipc_channel_js_1 = require("./ipc-channel.js");
|
|
|
14
16
|
Object.defineProperty(exports, "IpcChannel", { enumerable: true, get: function () { return __importDefault(ipc_channel_js_1).default; } });
|
|
15
17
|
var ipc_event_in_main_js_1 = require("./ipc-event-in-main.js");
|
|
16
18
|
Object.defineProperty(exports, "IpcEventInMain", { enumerable: true, get: function () { return __importDefault(ipc_event_in_main_js_1).default; } });
|
|
19
|
+
var ipc_payload_js_1 = require("./ipc-payload.js");
|
|
20
|
+
Object.defineProperty(exports, "IpcPayload", { enumerable: true, get: function () { return __importDefault(ipc_payload_js_1).default; } });
|
|
17
21
|
var ipc_result_js_1 = require("./ipc-result.js");
|
|
18
22
|
Object.defineProperty(exports, "IpcResult", { enumerable: true, get: function () { return __importDefault(ipc_result_js_1).default; } });
|
|
23
|
+
var names_js_1 = require("./names.js");
|
|
24
|
+
Object.defineProperty(exports, "Names", { enumerable: true, get: function () { return __importDefault(names_js_1).default; } });
|
|
19
25
|
var transfer_js_1 = require("./transfer.js");
|
|
20
26
|
Object.defineProperty(exports, "Transfer", { enumerable: true, get: function () { return __importDefault(transfer_js_1).default; } });
|
|
21
27
|
var web_contents_events_container_js_1 = require("./web-contents-events-container.js");
|
|
@@ -43,6 +43,11 @@ export default class IpcChannel {
|
|
|
43
43
|
* @returns Канал вызова события.
|
|
44
44
|
*/
|
|
45
45
|
emit: (name: string) => string;
|
|
46
|
+
/**
|
|
47
|
+
* Получить канал отписки от события.
|
|
48
|
+
* @returns Канал отписки от события.
|
|
49
|
+
*/
|
|
50
|
+
off: () => string;
|
|
46
51
|
};
|
|
47
52
|
/**
|
|
48
53
|
* Публичное свойство.
|
|
@@ -71,5 +76,10 @@ export default class IpcChannel {
|
|
|
71
76
|
* @returns Канал обработки обещания.
|
|
72
77
|
*/
|
|
73
78
|
get: (channel: string) => string;
|
|
79
|
+
/**
|
|
80
|
+
* Является ли канал каналом обработки обещания моста.
|
|
81
|
+
* @param channel - Проверяемый канал.
|
|
82
|
+
*/
|
|
83
|
+
is: (channel: unknown) => channel is string;
|
|
74
84
|
};
|
|
75
85
|
}
|