@scrypted/server 0.0.108 → 0.0.109
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.
Potentially problematic release.
This version of @scrypted/server might be problematic. Click here for more details.
- package/dist/plugin/plugin-device.js +1 -0
- package/dist/plugin/plugin-device.js.map +1 -1
- package/dist/plugin/plugin-host-api.js +6 -5
- package/dist/plugin/plugin-host-api.js.map +1 -1
- package/dist/plugin/plugin-npm-dependencies.js +16 -16
- package/dist/plugin/plugin-npm-dependencies.js.map +1 -1
- package/dist/rpc.js +53 -26
- package/dist/rpc.js.map +1 -1
- package/package.json +1 -1
- package/python/plugin-remote.py +4 -4
- package/python/rpc.py +68 -26
- package/src/plugin/plugin-device.ts +1 -0
- package/src/plugin/plugin-host-api.ts +6 -5
- package/src/plugin/plugin-npm-dependencies.ts +19 -18
- package/src/rpc.ts +62 -25
|
@@ -36,6 +36,7 @@ class PluginDeviceProxyHandler {
|
|
|
36
36
|
async isMixin(id, mixinDevice) {
|
|
37
37
|
if (this.releasing.has(mixinDevice))
|
|
38
38
|
return true;
|
|
39
|
+
await this.scrypted.devices[id].handler.ensureProxy();
|
|
39
40
|
for (const mixin of this.scrypted.devices[id].handler.mixinTable) {
|
|
40
41
|
const { proxy } = await mixin.entry;
|
|
41
42
|
if (proxy === mixinDevice) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-device.js","sourceRoot":"","sources":["../../src/plugin/plugin-device.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"plugin-device.js","sourceRoot":"","sources":["../../src/plugin/plugin-device.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,21 +49,22 @@ class PluginHostAPI extends plugin_api_1.PluginAPIManagedListeners {
|
|
|
49
49
|
// nativeId code path has been deprecated in favor of mixin object 12/10/2021
|
|
50
50
|
const device = this.scrypted.findPluginDeviceById(id);
|
|
51
51
|
if (!nativeIdOrMixinDevice || typeof nativeIdOrMixinDevice === 'string') {
|
|
52
|
+
const nativeId = nativeIdOrMixinDevice;
|
|
52
53
|
// todo: deprecate this code path
|
|
53
|
-
const mixinProvider = this.scrypted.findPluginDevice(this.pluginId,
|
|
54
|
+
const mixinProvider = this.scrypted.findPluginDevice(this.pluginId, nativeId);
|
|
54
55
|
const mixins = (0, state_1.getState)(device, types_1.ScryptedInterfaceProperty.mixins) || [];
|
|
55
56
|
if (!mixins.includes(mixinProvider._id))
|
|
56
57
|
throw new Error(`${mixinProvider._id} is not a mixin provider for ${id}`);
|
|
57
|
-
this.scrypted.findPluginDevice(this.pluginId,
|
|
58
|
+
this.scrypted.findPluginDevice(this.pluginId, nativeId);
|
|
58
59
|
const tableEntry = this.scrypted.devices[device._id].handler.mixinTable.find(entry => entry.mixinProviderId === mixinProvider._id);
|
|
59
60
|
const { interfaces } = await tableEntry.entry;
|
|
60
61
|
if (!interfaces.has(eventInterface))
|
|
61
62
|
throw new Error(`${mixinProvider._id} does not mixin ${eventInterface} for ${id}`);
|
|
62
63
|
}
|
|
63
64
|
else {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
throw new Error(`${
|
|
65
|
+
const mixin = nativeIdOrMixinDevice;
|
|
66
|
+
if (!await this.scrypted.devices[device._id]?.handler?.isMixin(id, mixin)) {
|
|
67
|
+
throw new Error(`${mixin} does not mixin ${eventInterface} for ${id}`);
|
|
67
68
|
}
|
|
68
69
|
}
|
|
69
70
|
this.scrypted.stateManager.notifyInterfaceEvent(device, eventInterface, eventData);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-host-api.js","sourceRoot":"","sources":["../../src/plugin/plugin-host-api.ts"],"names":[],"mappings":";;;;;;AAAA,+CAA+M;AAE/M,0CAAqC;AACrC,6CAAoE;AAEpE,oCAAoC;AAEpC,+DAAuC;AACvC,gCAAuD;AAEvD,MAAa,aAAc,SAAQ,sCAAyB;IA2BrC;IAAkD;IAA+B;IA1BpG,QAAQ,CAAS;IAEjB,CAAC,mCAA6B,CAAC,GAAG;QAC9B,cAAc;QACd,eAAe;QACf,YAAY;QACZ,QAAQ;QACR,SAAS;QACT,mBAAmB;QACnB,aAAa;QACb,gBAAgB;QAChB,UAAU;KACb,CAAC;IAEF,gBAAgB,GAAG,IAAA,kBAAQ,EAAC,KAAK,IAAI,EAAE;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,IAAI,CAAC,GAAG,KAAK,IAAI,EAAE;YACnB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,sFAAsF,CAAC,CAAC;YACxG,OAAO;SACV;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,iBAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3E,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC,EAAE,KAAK,CAAC,CAAC;IAEV,YAAmB,QAAyB,EAAE,MAAc,EAAS,UAAsB,EAAS,YAA0B;QAC1H,KAAK,EAAE,CAAC;QADO,aAAQ,GAAR,QAAQ,CAAiB;QAAyB,eAAU,GAAV,UAAU,CAAY;QAAS,iBAAY,GAAZ,YAAY,CAAc;QAE1H,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC;IAC/B,CAAC;IAED,0CAA0C;IAC1C,kDAAkD;IAClD,KAAK,CAAC,YAAY,CAAC,EAAU,EAAE,qBAA2C,EAAE,cAAmB,EAAE,SAAe;QAC5G,6EAA6E;QAC7E,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;QAEtD,IAAI,CAAC,qBAAqB,IAAI,OAAO,qBAAqB,KAAK,QAAQ,EAAE;YACrE,iCAAiC;YACjC,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"plugin-host-api.js","sourceRoot":"","sources":["../../src/plugin/plugin-host-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,12 +9,16 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
9
9
|
const child_process_1 = __importDefault(require("child_process"));
|
|
10
10
|
const path_1 = __importDefault(require("path"));
|
|
11
11
|
const events_1 = require("events");
|
|
12
|
+
const process_1 = __importDefault(require("process"));
|
|
13
|
+
const mkdirp_1 = __importDefault(require("mkdirp"));
|
|
12
14
|
async function installOptionalDependencies(console, packageJson) {
|
|
13
15
|
const pluginVolume = (0, plugin_volume_1.ensurePluginVolume)(packageJson.name);
|
|
14
|
-
const
|
|
16
|
+
const nodePrefix = path_1.default.join(pluginVolume, `${process_1.default.platform}-${process_1.default.arch}`);
|
|
17
|
+
const packageJsonPath = path_1.default.join(nodePrefix, 'package.json');
|
|
18
|
+
const currentInstalledPackageJsonPath = path_1.default.join(nodePrefix, 'package.installed.json');
|
|
15
19
|
let currentPackageJson;
|
|
16
20
|
try {
|
|
17
|
-
currentPackageJson = JSON.parse(fs_1.default.readFileSync(
|
|
21
|
+
currentPackageJson = JSON.parse(fs_1.default.readFileSync(currentInstalledPackageJsonPath).toString());
|
|
18
22
|
}
|
|
19
23
|
catch (e) {
|
|
20
24
|
}
|
|
@@ -33,20 +37,16 @@ async function installOptionalDependencies(console, packageJson) {
|
|
|
33
37
|
reduced.dependencies = reduced.optionalDependencies;
|
|
34
38
|
delete reduced.optionalDependencies;
|
|
35
39
|
delete reduced.devDependencies;
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
catch (e) {
|
|
47
|
-
fs_1.default.rmSync(optPj);
|
|
48
|
-
throw e;
|
|
49
|
-
}
|
|
40
|
+
mkdirp_1.default.sync(nodePrefix);
|
|
41
|
+
fs_1.default.writeFileSync(packageJsonPath, JSON.stringify(reduced));
|
|
42
|
+
const cp = child_process_1.default.spawn('npm', ['--prefix', nodePrefix, 'install'], {
|
|
43
|
+
cwd: nodePrefix,
|
|
44
|
+
stdio: 'inherit',
|
|
45
|
+
});
|
|
46
|
+
await (0, events_1.once)(cp, 'exit');
|
|
47
|
+
if (cp.exitCode !== 0)
|
|
48
|
+
throw new Error('npm installation failed with exit code ' + cp.exitCode);
|
|
49
|
+
fs_1.default.writeFileSync(currentInstalledPackageJsonPath, JSON.stringify(reduced));
|
|
50
50
|
console.log('native dependencies installed.');
|
|
51
51
|
}
|
|
52
52
|
exports.installOptionalDependencies = installOptionalDependencies;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-npm-dependencies.js","sourceRoot":"","sources":["../../src/plugin/plugin-npm-dependencies.ts"],"names":[],"mappings":";;;;;;AAAA,mDAAqD;AACrD,4CAAoB;AACpB,kEAA0C;AAC1C,gDAAwB;AACxB,mCAA8B;
|
|
1
|
+
{"version":3,"file":"plugin-npm-dependencies.js","sourceRoot":"","sources":["../../src/plugin/plugin-npm-dependencies.ts"],"names":[],"mappings":";;;;;;AAAA,mDAAqD;AACrD,4CAAoB;AACpB,kEAA0C;AAC1C,gDAAwB;AACxB,mCAA8B;AAC9B,sDAA8B;AAC9B,oDAA4B;AAErB,KAAK,UAAU,2BAA2B,CAAC,OAAgB,EAAE,WAAgB;IAChF,MAAM,YAAY,GAAG,IAAA,kCAAkB,EAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,iBAAO,CAAC,QAAQ,IAAI,iBAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAClF,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAC9D,MAAM,+BAA+B,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,wBAAwB,CAAC,CAAC;IAExF,IAAI,kBAAuB,CAAC;IAC5B,IAAI;QACA,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,+BAA+B,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;KAChG;IACD,OAAO,CAAC,EAAE;KACT;IAED,MAAM,EAAE,oBAAoB,EAAE,GAAG,WAAW,CAAC;IAC7C,IAAI,CAAC,oBAAoB;QACrB,OAAO;IACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,MAAM;QACzC,OAAO;IACX,MAAM,2BAA2B,GAAG,kBAAkB,EAAE,YAAY,IAAI,EAAE,CAAC;IAE3E,IAAI,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,2BAA2B,CAAC,EAAE;QACtF,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;QACvF,OAAO;KACV;IAED,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAEpF,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;IAC/C,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC;IACpD,OAAO,OAAO,CAAC,oBAAoB,CAAC;IACpC,OAAO,OAAO,CAAC,eAAe,CAAC;IAE/B,gBAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACxB,YAAE,CAAC,aAAa,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAE3D,MAAM,EAAE,GAAG,uBAAa,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE;QACvE,GAAG,EAAE,UAAU;QACf,KAAK,EAAE,SAAS;KACnB,CAAC,CAAC;IAEH,MAAM,IAAA,aAAI,EAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACvB,IAAI,EAAE,CAAC,QAAQ,KAAK,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;IAE7E,YAAE,CAAC,aAAa,CAAC,+BAA+B,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3E,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;AAClD,CAAC;AA9CD,kEA8CC"}
|
package/dist/rpc.js
CHANGED
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.RpcPeer = exports.RPCResultError = exports.PROPERTY_JSON_COPY_SERIALIZE_CHILDREN = exports.PROPERTY_PROXY_PROPERTIES = exports.PROPERTY_JSON_DISABLE_SERIALIZATION = exports.PROPERTY_PROXY_ONEWAY_METHODS = exports.handleFunctionInvocations = void 0;
|
|
7
7
|
const vm_1 = __importDefault(require("vm"));
|
|
8
|
+
const finalizerIdSymbol = Symbol('rpcFinalizerId');
|
|
8
9
|
function getDefaultTransportSafeArgumentTypes() {
|
|
9
10
|
const jsonSerializable = new Set();
|
|
10
11
|
jsonSerializable.add(Number.name);
|
|
@@ -33,24 +34,20 @@ exports.PROPERTY_PROXY_PROPERTIES = '__proxy_props';
|
|
|
33
34
|
exports.PROPERTY_JSON_COPY_SERIALIZE_CHILDREN = '__json_copy_serialize_children';
|
|
34
35
|
class RpcProxy {
|
|
35
36
|
peer;
|
|
36
|
-
|
|
37
|
+
entry;
|
|
37
38
|
constructorName;
|
|
38
39
|
proxyProps;
|
|
39
40
|
proxyOneWayMethods;
|
|
40
|
-
constructor(peer,
|
|
41
|
+
constructor(peer, entry, constructorName, proxyProps, proxyOneWayMethods) {
|
|
41
42
|
this.peer = peer;
|
|
42
|
-
this.
|
|
43
|
+
this.entry = entry;
|
|
43
44
|
this.constructorName = constructorName;
|
|
44
45
|
this.proxyProps = proxyProps;
|
|
45
46
|
this.proxyOneWayMethods = proxyOneWayMethods;
|
|
46
|
-
this.peer = peer;
|
|
47
|
-
this.id = id;
|
|
48
|
-
this.constructorName = constructorName;
|
|
49
|
-
this.proxyProps = proxyProps;
|
|
50
47
|
}
|
|
51
48
|
get(target, p, receiver) {
|
|
52
49
|
if (p === '__proxy_id')
|
|
53
|
-
return this.id;
|
|
50
|
+
return this.entry.id;
|
|
54
51
|
if (p === '__proxy_constructor')
|
|
55
52
|
return this.constructorName;
|
|
56
53
|
if (p === '__proxy_peer')
|
|
@@ -72,6 +69,11 @@ class RpcProxy {
|
|
|
72
69
|
return handled;
|
|
73
70
|
return new Proxy(() => p, this);
|
|
74
71
|
}
|
|
72
|
+
set(target, p, value, receiver) {
|
|
73
|
+
if (p === finalizerIdSymbol)
|
|
74
|
+
this.entry.finalizerId = value;
|
|
75
|
+
return true;
|
|
76
|
+
}
|
|
75
77
|
apply(target, thisArg, argArray) {
|
|
76
78
|
const method = target();
|
|
77
79
|
const args = [];
|
|
@@ -81,7 +83,7 @@ class RpcProxy {
|
|
|
81
83
|
const rpcApply = {
|
|
82
84
|
type: "apply",
|
|
83
85
|
id: undefined,
|
|
84
|
-
proxyId: this.id,
|
|
86
|
+
proxyId: this.entry.id,
|
|
85
87
|
args,
|
|
86
88
|
method,
|
|
87
89
|
};
|
|
@@ -146,7 +148,7 @@ class RpcPeer {
|
|
|
146
148
|
localProxied = new Map();
|
|
147
149
|
localProxyMap = {};
|
|
148
150
|
remoteWeakProxies = {};
|
|
149
|
-
finalizers = new FinalizationRegistry(
|
|
151
|
+
finalizers = new FinalizationRegistry(entry => this.finalize(entry));
|
|
150
152
|
nameDeserializerMap = new Map();
|
|
151
153
|
constructorSerializerMap = new Map();
|
|
152
154
|
transportSafeArgumentTypes = getDefaultTransportSafeArgumentTypes();
|
|
@@ -182,10 +184,11 @@ class RpcPeer {
|
|
|
182
184
|
this.nameDeserializerMap.set(name, serializer);
|
|
183
185
|
this.constructorSerializerMap.set(ctr, name);
|
|
184
186
|
}
|
|
185
|
-
finalize(
|
|
186
|
-
delete this.remoteWeakProxies[id];
|
|
187
|
+
finalize(entry) {
|
|
188
|
+
delete this.remoteWeakProxies[entry.id];
|
|
187
189
|
const rpcFinalize = {
|
|
188
|
-
__local_proxy_id: id,
|
|
190
|
+
__local_proxy_id: entry.id,
|
|
191
|
+
__local_proxy_finalizer_id: entry.finalizerId,
|
|
189
192
|
type: 'finalize',
|
|
190
193
|
};
|
|
191
194
|
this.send(rpcFinalize);
|
|
@@ -230,9 +233,12 @@ class RpcPeer {
|
|
|
230
233
|
}
|
|
231
234
|
return ret;
|
|
232
235
|
}
|
|
233
|
-
const { __remote_proxy_id, __local_proxy_id, __remote_constructor_name, __serialized_value, __remote_proxy_props, __remote_proxy_oneway_methods } = value;
|
|
236
|
+
const { __remote_proxy_id, __remote_proxy_finalizer_id, __local_proxy_id, __remote_constructor_name, __serialized_value, __remote_proxy_props, __remote_proxy_oneway_methods } = value;
|
|
234
237
|
if (__remote_proxy_id) {
|
|
235
|
-
|
|
238
|
+
let proxy = this.remoteWeakProxies[__remote_proxy_id]?.deref();
|
|
239
|
+
if (!proxy)
|
|
240
|
+
proxy = this.newProxy(__remote_proxy_id, __remote_constructor_name, __remote_proxy_props, __remote_proxy_oneway_methods);
|
|
241
|
+
proxy[finalizerIdSymbol] = __remote_proxy_finalizer_id;
|
|
236
242
|
return proxy;
|
|
237
243
|
}
|
|
238
244
|
if (__local_proxy_id) {
|
|
@@ -258,10 +264,13 @@ class RpcPeer {
|
|
|
258
264
|
return value;
|
|
259
265
|
}
|
|
260
266
|
let __remote_constructor_name = value.__proxy_constructor || value.constructor?.name?.toString();
|
|
261
|
-
let
|
|
262
|
-
if (
|
|
267
|
+
let proxiedEntry = this.localProxied.get(value);
|
|
268
|
+
if (proxiedEntry) {
|
|
269
|
+
const __remote_proxy_finalizer_id = (this.proxyCounter++).toString();
|
|
270
|
+
proxiedEntry.finalizerId = __remote_proxy_finalizer_id;
|
|
263
271
|
const ret = {
|
|
264
|
-
__remote_proxy_id:
|
|
272
|
+
__remote_proxy_id: proxiedEntry.id,
|
|
273
|
+
__remote_proxy_finalizer_id,
|
|
265
274
|
__remote_constructor_name,
|
|
266
275
|
__remote_proxy_props: value?.[exports.PROPERTY_PROXY_PROPERTIES],
|
|
267
276
|
__remote_proxy_oneway_methods: value?.[exports.PROPERTY_PROXY_ONEWAY_METHODS],
|
|
@@ -282,6 +291,7 @@ class RpcPeer {
|
|
|
282
291
|
const serialized = serializer.serialize(value);
|
|
283
292
|
const ret = {
|
|
284
293
|
__remote_proxy_id: undefined,
|
|
294
|
+
__remote_proxy_finalizer_id: undefined,
|
|
285
295
|
__remote_constructor_name,
|
|
286
296
|
__remote_proxy_props: value?.[exports.PROPERTY_PROXY_PROPERTIES],
|
|
287
297
|
__remote_proxy_oneway_methods: value?.[exports.PROPERTY_PROXY_ONEWAY_METHODS],
|
|
@@ -289,11 +299,16 @@ class RpcPeer {
|
|
|
289
299
|
};
|
|
290
300
|
return ret;
|
|
291
301
|
}
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
302
|
+
const __remote_proxy_id = (this.proxyCounter++).toString();
|
|
303
|
+
proxiedEntry = {
|
|
304
|
+
id: __remote_proxy_id,
|
|
305
|
+
finalizerId: __remote_proxy_id,
|
|
306
|
+
};
|
|
307
|
+
this.localProxied.set(value, proxiedEntry);
|
|
308
|
+
this.localProxyMap[__remote_proxy_id] = value;
|
|
295
309
|
const ret = {
|
|
296
|
-
__remote_proxy_id
|
|
310
|
+
__remote_proxy_id,
|
|
311
|
+
__remote_proxy_finalizer_id: __remote_proxy_id,
|
|
297
312
|
__remote_constructor_name,
|
|
298
313
|
__remote_proxy_props: value?.[exports.PROPERTY_PROXY_PROPERTIES],
|
|
299
314
|
__remote_proxy_oneway_methods: value?.[exports.PROPERTY_PROXY_ONEWAY_METHODS],
|
|
@@ -301,12 +316,16 @@ class RpcPeer {
|
|
|
301
316
|
return ret;
|
|
302
317
|
}
|
|
303
318
|
newProxy(proxyId, proxyConstructorName, proxyProps, proxyOneWayMethods) {
|
|
304
|
-
const
|
|
319
|
+
const localProxiedEntry = {
|
|
320
|
+
id: proxyId,
|
|
321
|
+
finalizerId: undefined,
|
|
322
|
+
};
|
|
323
|
+
const rpc = new RpcProxy(this, localProxiedEntry, proxyConstructorName, proxyProps, proxyOneWayMethods);
|
|
305
324
|
const target = proxyConstructorName === 'Function' || proxyConstructorName === 'AsyncFunction' ? function () { } : rpc;
|
|
306
325
|
const proxy = new Proxy(target, rpc);
|
|
307
326
|
const weakref = new WeakRef(proxy);
|
|
308
327
|
this.remoteWeakProxies[proxyId] = weakref;
|
|
309
|
-
this.finalizers.register(rpc,
|
|
328
|
+
this.finalizers.register(rpc, localProxiedEntry);
|
|
310
329
|
global.gc?.();
|
|
311
330
|
return proxy;
|
|
312
331
|
}
|
|
@@ -377,8 +396,16 @@ class RpcPeer {
|
|
|
377
396
|
case 'finalize': {
|
|
378
397
|
const rpcFinalize = message;
|
|
379
398
|
const local = this.localProxyMap[rpcFinalize.__local_proxy_id];
|
|
380
|
-
|
|
381
|
-
|
|
399
|
+
if (local) {
|
|
400
|
+
const localProxiedEntry = this.localProxied.get(local);
|
|
401
|
+
// if a finalizer id is specified, it must match.
|
|
402
|
+
if (rpcFinalize.__local_proxy_finalizer_id && rpcFinalize.__local_proxy_finalizer_id !== localProxiedEntry?.finalizerId) {
|
|
403
|
+
console.error(this.selfName, this.peerName, 'finalizer mismatch');
|
|
404
|
+
break;
|
|
405
|
+
}
|
|
406
|
+
delete this.localProxyMap[rpcFinalize.__local_proxy_id];
|
|
407
|
+
this.localProxied.delete(local);
|
|
408
|
+
}
|
|
382
409
|
break;
|
|
383
410
|
}
|
|
384
411
|
case 'oob': {
|
package/dist/rpc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../src/rpc.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../src/rpc.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/python/plugin-remote.py
CHANGED
|
@@ -21,7 +21,7 @@ from asyncio.futures import Future
|
|
|
21
21
|
from asyncio.streams import StreamReader, StreamWriter
|
|
22
22
|
import os
|
|
23
23
|
from os import sys
|
|
24
|
-
|
|
24
|
+
import platform
|
|
25
25
|
|
|
26
26
|
class SystemDeviceState(TypedDict):
|
|
27
27
|
lastEventTime: int
|
|
@@ -164,8 +164,8 @@ class PluginRemote:
|
|
|
164
164
|
|
|
165
165
|
zip = zipfile.ZipFile(zipPath)
|
|
166
166
|
|
|
167
|
-
|
|
168
|
-
|
|
167
|
+
plugin_volume = os.environ.get('SCRYPTED_PLUGIN_VOLUME')
|
|
168
|
+
python_prefix = os.path.join(plugin_volume, 'python-%s-%s' % (platform.system(), platform.machine()))
|
|
169
169
|
if not os.path.exists(python_prefix):
|
|
170
170
|
os.makedirs(python_prefix)
|
|
171
171
|
|
|
@@ -179,7 +179,7 @@ class PluginRemote:
|
|
|
179
179
|
|
|
180
180
|
requirementstxt = os.path.join(python_prefix, 'requirements.txt')
|
|
181
181
|
installed_requirementstxt = os.path.join(
|
|
182
|
-
python_prefix, '
|
|
182
|
+
python_prefix, 'requirements.installed.txt')
|
|
183
183
|
|
|
184
184
|
need_pip = True
|
|
185
185
|
try:
|
package/python/rpc.py
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
from asyncio.futures import Future
|
|
2
|
-
from typing import Callable, Mapping, List
|
|
2
|
+
from typing import Any, Callable, Mapping, List
|
|
3
3
|
import traceback
|
|
4
4
|
import inspect
|
|
5
|
+
from typing_extensions import TypedDict
|
|
5
6
|
import weakref
|
|
7
|
+
import sys
|
|
6
8
|
|
|
7
9
|
jsonSerializable = set()
|
|
8
10
|
jsonSerializable.add(float)
|
|
@@ -45,21 +47,35 @@ class RpcProxyMethod:
|
|
|
45
47
|
return self.__proxy.__apply__(self.__proxy_method_name, args)
|
|
46
48
|
|
|
47
49
|
|
|
50
|
+
class LocalProxiedEntry(TypedDict):
|
|
51
|
+
id: str
|
|
52
|
+
finalizerId: str
|
|
53
|
+
|
|
54
|
+
|
|
48
55
|
class RpcProxy(object):
|
|
49
|
-
def __init__(self, peer,
|
|
50
|
-
self.__dict__['__proxy_id'] =
|
|
56
|
+
def __init__(self, peer, entry: LocalProxiedEntry, proxyConstructorName: str, proxyProps: any, proxyOneWayMethods: List[str]):
|
|
57
|
+
self.__dict__['__proxy_id'] = entry['id']
|
|
58
|
+
self.__dict__['__proxy_entry'] = entry
|
|
51
59
|
self.__dict__['__proxy_constructor'] = proxyConstructorName
|
|
52
60
|
self.__dict__['__proxy_peer'] = peer
|
|
53
61
|
self.__dict__['__proxy_props'] = proxyProps
|
|
54
62
|
self.__dict__['__proxy_oneway_methods'] = proxyOneWayMethods
|
|
55
63
|
|
|
56
64
|
def __getattr__(self, name):
|
|
65
|
+
if name == '__proxy_finalizer_id':
|
|
66
|
+
return self.dict['__proxy_entry']['finalizerId']
|
|
57
67
|
if name in self.__dict__:
|
|
58
68
|
return self.__dict__[name]
|
|
59
69
|
if self.__dict__['__proxy_props'] and name in self.__dict__['__proxy_props']:
|
|
60
70
|
return self.__dict__['__proxy_props'][name]
|
|
61
71
|
return RpcProxyMethod(self, name)
|
|
62
72
|
|
|
73
|
+
def __setattr__(self, name: str, value: Any) -> None:
|
|
74
|
+
if name == '__proxy_finalizer_id':
|
|
75
|
+
self.dict['__proxy_entry']['finalizerId'] = value
|
|
76
|
+
|
|
77
|
+
return super().__setattr__(name, value)
|
|
78
|
+
|
|
63
79
|
def __call__(self, *args, **kwargs):
|
|
64
80
|
print('call')
|
|
65
81
|
pass
|
|
@@ -69,20 +85,18 @@ class RpcProxy(object):
|
|
|
69
85
|
|
|
70
86
|
|
|
71
87
|
class RpcPeer:
|
|
72
|
-
# todo: these are all class statics lol, fix this.
|
|
73
|
-
idCounter = 1
|
|
74
|
-
peerName = 'Unnamed Peer'
|
|
75
|
-
params: Mapping[str, any] = {}
|
|
76
|
-
localProxied: Mapping[any, str] = {}
|
|
77
|
-
localProxyMap: Mapping[str, any] = {}
|
|
78
|
-
constructorSerializerMap = {}
|
|
79
|
-
proxyCounter = 1
|
|
80
|
-
pendingResults: Mapping[str, Future] = {}
|
|
81
|
-
remoteWeakProxies: Mapping[str, any] = {}
|
|
82
|
-
nameDeserializerMap: Mapping[str, RpcSerializer] = {}
|
|
83
|
-
|
|
84
88
|
def __init__(self, send: Callable[[object, Callable[[Exception], None]], None]) -> None:
|
|
85
89
|
self.send = send
|
|
90
|
+
self.idCounter = 1
|
|
91
|
+
self.peerName = 'Unnamed Peer'
|
|
92
|
+
self.params: Mapping[str, any] = {}
|
|
93
|
+
self.localProxied: Mapping[any, LocalProxiedEntry] = {}
|
|
94
|
+
self.localProxyMap: Mapping[str, any] = {}
|
|
95
|
+
self.constructorSerializerMap = {}
|
|
96
|
+
self.proxyCounter = 1
|
|
97
|
+
self.pendingResults: Mapping[str, Future] = {}
|
|
98
|
+
self.remoteWeakProxies: Mapping[str, any] = {}
|
|
99
|
+
self.nameDeserializerMap: Mapping[str, RpcSerializer] = {}
|
|
86
100
|
|
|
87
101
|
def __apply__(self, proxyId: str, oneWayMethods: List[str], method: str, args: list):
|
|
88
102
|
serializedArgs = []
|
|
@@ -120,12 +134,17 @@ class RpcPeer:
|
|
|
120
134
|
def serialize(self, value, requireProxy):
|
|
121
135
|
if (not value or (not requireProxy and type(value) in jsonSerializable)):
|
|
122
136
|
return value
|
|
137
|
+
|
|
123
138
|
__remote_constructor_name = 'Function' if callable(value) else value.__proxy_constructor if hasattr(
|
|
124
139
|
value, '__proxy_constructor') else type(value).__name__
|
|
125
|
-
|
|
126
|
-
|
|
140
|
+
|
|
141
|
+
proxiedEntry = self.localProxied.get(value, None)
|
|
142
|
+
if proxiedEntry:
|
|
143
|
+
proxiedEntry['finalizerId'] = str(self.proxyCounter)
|
|
144
|
+
self.proxyCounter = self.proxyCounter + 1
|
|
127
145
|
ret = {
|
|
128
|
-
'__remote_proxy_id':
|
|
146
|
+
'__remote_proxy_id': proxiedEntry['id'],
|
|
147
|
+
'__remote_proxy_finalizer_id': proxiedEntry['finalizerId'],
|
|
129
148
|
'__remote_constructor_name': __remote_constructor_name,
|
|
130
149
|
'__remote_proxy_props': getattr(value, '__proxy_props', None),
|
|
131
150
|
'__remote_proxy_oneway_methods': getattr(value, '__proxy_oneway_methods', None),
|
|
@@ -140,13 +159,15 @@ class RpcPeer:
|
|
|
140
159
|
}
|
|
141
160
|
return ret
|
|
142
161
|
|
|
143
|
-
serializerMapName = self.constructorSerializerMap.get(
|
|
162
|
+
serializerMapName = self.constructorSerializerMap.get(
|
|
163
|
+
type(value), None)
|
|
144
164
|
if serializerMapName:
|
|
145
165
|
__remote_constructor_name = serializerMapName
|
|
146
166
|
serializer = self.nameDeserializerMap.get(serializerMapName, None)
|
|
147
167
|
serialized = serializer.serialize(value)
|
|
148
168
|
ret = {
|
|
149
169
|
'__remote_proxy_id': None,
|
|
170
|
+
'__remote_proxy_finalizer_id': None,
|
|
150
171
|
'__remote_constructor_name': __remote_constructor_name,
|
|
151
172
|
'__remote_proxy_props': getattr(value, '__proxy_props', None),
|
|
152
173
|
'__remote_proxy_oneway_methods': getattr(value, '__proxy_oneway_methods', None),
|
|
@@ -156,11 +177,16 @@ class RpcPeer:
|
|
|
156
177
|
|
|
157
178
|
proxyId = str(self.proxyCounter)
|
|
158
179
|
self.proxyCounter = self.proxyCounter + 1
|
|
159
|
-
|
|
180
|
+
proxiedEntry = {
|
|
181
|
+
'id': proxyId,
|
|
182
|
+
'finalizerId': proxyId,
|
|
183
|
+
}
|
|
184
|
+
self.localProxied[value] = proxiedEntry
|
|
160
185
|
self.localProxyMap[proxyId] = value
|
|
161
186
|
|
|
162
187
|
ret = {
|
|
163
188
|
'__remote_proxy_id': proxyId,
|
|
189
|
+
'__remote_proxy_finalizer_id': proxyId,
|
|
164
190
|
'__remote_constructor_name': __remote_constructor_name,
|
|
165
191
|
'__remote_proxy_props': getattr(value, '__proxy_props', None),
|
|
166
192
|
'__remote_proxy_oneway_methods': getattr(value, '__proxy_oneway_methods', None),
|
|
@@ -168,20 +194,26 @@ class RpcPeer:
|
|
|
168
194
|
|
|
169
195
|
return ret
|
|
170
196
|
|
|
171
|
-
def finalize(self,
|
|
197
|
+
def finalize(self, localProxiedEntry: LocalProxiedEntry):
|
|
198
|
+
id = localProxiedEntry['id']
|
|
172
199
|
self.remoteWeakProxies.pop(id, None)
|
|
173
200
|
rpcFinalize = {
|
|
174
201
|
'__local_proxy_id': id,
|
|
202
|
+
'__local_proxy_finalizer_id': localProxiedEntry['finalizerId'],
|
|
175
203
|
'type': 'finalize',
|
|
176
204
|
}
|
|
177
205
|
self.send(rpcFinalize)
|
|
178
206
|
|
|
179
207
|
def newProxy(self, proxyId: str, proxyConstructorName: str, proxyProps: any, proxyOneWayMethods: List[str]):
|
|
180
|
-
|
|
208
|
+
localProxiedEntry: LocalProxiedEntry = {
|
|
209
|
+
'id': proxyId,
|
|
210
|
+
'finalizerId': None,
|
|
211
|
+
}
|
|
212
|
+
proxy = RpcProxy(self, localProxiedEntry, proxyConstructorName,
|
|
181
213
|
proxyProps, proxyOneWayMethods)
|
|
182
214
|
wr = weakref.ref(proxy)
|
|
183
215
|
self.remoteWeakProxies[proxyId] = wr
|
|
184
|
-
weakref.finalize(proxy, lambda: self.finalize(
|
|
216
|
+
weakref.finalize(proxy, lambda: self.finalize(localProxiedEntry))
|
|
185
217
|
return proxy
|
|
186
218
|
|
|
187
219
|
def deserialize(self, value):
|
|
@@ -192,6 +224,8 @@ class RpcPeer:
|
|
|
192
224
|
return value
|
|
193
225
|
|
|
194
226
|
__remote_proxy_id = value.get('__remote_proxy_id', None)
|
|
227
|
+
__remote_proxy_finalizer_id = value.get(
|
|
228
|
+
'__remote_proxy_finalizer_id', None)
|
|
195
229
|
__local_proxy_id = value.get('__local_proxy_id', None)
|
|
196
230
|
__remote_constructor_name = value.get(
|
|
197
231
|
'__remote_constructor_name', None)
|
|
@@ -206,6 +240,7 @@ class RpcPeer:
|
|
|
206
240
|
if not proxy:
|
|
207
241
|
proxy = self.newProxy(__remote_proxy_id, __remote_constructor_name,
|
|
208
242
|
__remote_proxy_props, __remote_proxy_oneway_methods)
|
|
243
|
+
proxy.__proxy_finalizer_id = __remote_proxy_finalizer_id
|
|
209
244
|
return proxy
|
|
210
245
|
|
|
211
246
|
if __local_proxy_id:
|
|
@@ -297,9 +332,16 @@ class RpcPeer:
|
|
|
297
332
|
future.set_result(self.deserialize(
|
|
298
333
|
message.get('result', None)))
|
|
299
334
|
elif messageType == 'finalize':
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
self.
|
|
335
|
+
finalizerId = message.get('__local_proxy_finalizer_id', None)
|
|
336
|
+
proxyId = message['__local_proxy_id']
|
|
337
|
+
local = self.localProxyMap.get(proxyId, None)
|
|
338
|
+
if local:
|
|
339
|
+
localProxiedEntry = self.localProxied.get(local)
|
|
340
|
+
if localProxiedEntry and finalizerId and localProxiedEntry['finalizerId'] != finalizerId:
|
|
341
|
+
print('mismatch finalizer id', file=sys.stderr)
|
|
342
|
+
return
|
|
343
|
+
self.localProxied.pop(local, None)
|
|
344
|
+
local = self.localProxyMap.pop(proxyId, None)
|
|
303
345
|
else:
|
|
304
346
|
raise RpcResultException(
|
|
305
347
|
None, 'unknown rpc message type %s' % type)
|
|
@@ -54,6 +54,7 @@ export class PluginDeviceProxyHandler implements ProxyHandler<any>, ScryptedDevi
|
|
|
54
54
|
async isMixin(id: string, mixinDevice: any) {
|
|
55
55
|
if (this.releasing.has(mixinDevice))
|
|
56
56
|
return true;
|
|
57
|
+
await this.scrypted.devices[id].handler.ensureProxy();
|
|
57
58
|
for (const mixin of this.scrypted.devices[id].handler.mixinTable) {
|
|
58
59
|
const { proxy } = await mixin.entry;
|
|
59
60
|
if (proxy === mixinDevice) {
|
|
@@ -47,22 +47,23 @@ export class PluginHostAPI extends PluginAPIManagedListeners implements PluginAP
|
|
|
47
47
|
const device = this.scrypted.findPluginDeviceById(id);
|
|
48
48
|
|
|
49
49
|
if (!nativeIdOrMixinDevice || typeof nativeIdOrMixinDevice === 'string') {
|
|
50
|
+
const nativeId: string = nativeIdOrMixinDevice;
|
|
50
51
|
// todo: deprecate this code path
|
|
51
|
-
const mixinProvider = this.scrypted.findPluginDevice(this.pluginId,
|
|
52
|
+
const mixinProvider = this.scrypted.findPluginDevice(this.pluginId, nativeId);
|
|
52
53
|
const mixins: string[] = getState(device, ScryptedInterfaceProperty.mixins) || [];
|
|
53
54
|
if (!mixins.includes(mixinProvider._id))
|
|
54
55
|
throw new Error(`${mixinProvider._id} is not a mixin provider for ${id}`);
|
|
55
56
|
|
|
56
|
-
this.scrypted.findPluginDevice(this.pluginId,
|
|
57
|
+
this.scrypted.findPluginDevice(this.pluginId, nativeId);
|
|
57
58
|
const tableEntry = this.scrypted.devices[device._id].handler.mixinTable.find(entry => entry.mixinProviderId === mixinProvider._id);
|
|
58
59
|
const { interfaces } = await tableEntry.entry;
|
|
59
60
|
if (!interfaces.has(eventInterface))
|
|
60
61
|
throw new Error(`${mixinProvider._id} does not mixin ${eventInterface} for ${id}`);
|
|
61
62
|
}
|
|
62
63
|
else {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
throw new Error(`${
|
|
64
|
+
const mixin: object = nativeIdOrMixinDevice;
|
|
65
|
+
if (!await this.scrypted.devices[device._id]?.handler?.isMixin(id, mixin)) {
|
|
66
|
+
throw new Error(`${mixin} does not mixin ${eventInterface} for ${id}`);
|
|
66
67
|
}
|
|
67
68
|
}
|
|
68
69
|
this.scrypted.stateManager.notifyInterfaceEvent(device, eventInterface, eventData);
|
|
@@ -3,14 +3,18 @@ import fs from 'fs';
|
|
|
3
3
|
import child_process from 'child_process';
|
|
4
4
|
import path from 'path';
|
|
5
5
|
import { once } from 'events';
|
|
6
|
+
import process from 'process';
|
|
7
|
+
import mkdirp from "mkdirp";
|
|
6
8
|
|
|
7
9
|
export async function installOptionalDependencies(console: Console, packageJson: any) {
|
|
8
10
|
const pluginVolume = ensurePluginVolume(packageJson.name);
|
|
9
|
-
const
|
|
11
|
+
const nodePrefix = path.join(pluginVolume, `${process.platform}-${process.arch}`);
|
|
12
|
+
const packageJsonPath = path.join(nodePrefix, 'package.json');
|
|
13
|
+
const currentInstalledPackageJsonPath = path.join(nodePrefix, 'package.installed.json');
|
|
10
14
|
|
|
11
15
|
let currentPackageJson: any;
|
|
12
16
|
try {
|
|
13
|
-
currentPackageJson = JSON.parse(fs.readFileSync(
|
|
17
|
+
currentPackageJson = JSON.parse(fs.readFileSync(currentInstalledPackageJsonPath).toString());
|
|
14
18
|
}
|
|
15
19
|
catch (e) {
|
|
16
20
|
}
|
|
@@ -34,21 +38,18 @@ export async function installOptionalDependencies(console: Console, packageJson:
|
|
|
34
38
|
delete reduced.optionalDependencies;
|
|
35
39
|
delete reduced.devDependencies;
|
|
36
40
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
fs.rmSync(optPj);
|
|
51
|
-
throw e;
|
|
52
|
-
}
|
|
41
|
+
mkdirp.sync(nodePrefix);
|
|
42
|
+
fs.writeFileSync(packageJsonPath, JSON.stringify(reduced));
|
|
43
|
+
|
|
44
|
+
const cp = child_process.spawn('npm', ['--prefix', nodePrefix, 'install'], {
|
|
45
|
+
cwd: nodePrefix,
|
|
46
|
+
stdio: 'inherit',
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
await once(cp, 'exit');
|
|
50
|
+
if (cp.exitCode !== 0)
|
|
51
|
+
throw new Error('npm installation failed with exit code ' + cp.exitCode);
|
|
52
|
+
|
|
53
|
+
fs.writeFileSync(currentInstalledPackageJsonPath, JSON.stringify(reduced));
|
|
53
54
|
console.log('native dependencies installed.');
|
|
54
55
|
}
|
package/src/rpc.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import vm from 'vm';
|
|
2
2
|
|
|
3
|
+
const finalizerIdSymbol = Symbol('rpcFinalizerId');
|
|
4
|
+
|
|
3
5
|
function getDefaultTransportSafeArgumentTypes() {
|
|
4
6
|
const jsonSerializable = new Set<string>();
|
|
5
7
|
jsonSerializable.add(Number.name);
|
|
@@ -40,6 +42,7 @@ interface RpcOob extends RpcMessage {
|
|
|
40
42
|
|
|
41
43
|
interface RpcRemoteProxyValue {
|
|
42
44
|
__remote_proxy_id: string;
|
|
45
|
+
__remote_proxy_finalizer_id: string;
|
|
43
46
|
__remote_constructor_name: string;
|
|
44
47
|
__remote_proxy_props: any;
|
|
45
48
|
__remote_proxy_oneway_methods: string[];
|
|
@@ -52,6 +55,7 @@ interface RpcLocalProxyValue {
|
|
|
52
55
|
|
|
53
56
|
interface RpcFinalize extends RpcMessage {
|
|
54
57
|
__local_proxy_id: string;
|
|
58
|
+
__local_proxy_finalizer_id: string;
|
|
55
59
|
}
|
|
56
60
|
|
|
57
61
|
interface Deferred {
|
|
@@ -78,20 +82,17 @@ export const PROPERTY_PROXY_PROPERTIES = '__proxy_props';
|
|
|
78
82
|
export const PROPERTY_JSON_COPY_SERIALIZE_CHILDREN = '__json_copy_serialize_children';
|
|
79
83
|
|
|
80
84
|
class RpcProxy implements ProxyHandler<any> {
|
|
85
|
+
|
|
81
86
|
constructor(public peer: RpcPeer,
|
|
82
|
-
public
|
|
87
|
+
public entry: LocalProxiedEntry,
|
|
83
88
|
public constructorName: string,
|
|
84
89
|
public proxyProps: any,
|
|
85
90
|
public proxyOneWayMethods: string[]) {
|
|
86
|
-
this.peer = peer;
|
|
87
|
-
this.id = id;
|
|
88
|
-
this.constructorName = constructorName;
|
|
89
|
-
this.proxyProps = proxyProps;
|
|
90
91
|
}
|
|
91
92
|
|
|
92
93
|
get(target: any, p: PropertyKey, receiver: any): any {
|
|
93
94
|
if (p === '__proxy_id')
|
|
94
|
-
return this.id;
|
|
95
|
+
return this.entry.id;
|
|
95
96
|
if (p === '__proxy_constructor')
|
|
96
97
|
return this.constructorName;
|
|
97
98
|
if (p === '__proxy_peer')
|
|
@@ -114,6 +115,12 @@ class RpcProxy implements ProxyHandler<any> {
|
|
|
114
115
|
return new Proxy(() => p, this);
|
|
115
116
|
}
|
|
116
117
|
|
|
118
|
+
set(target: any, p: string | symbol, value: any, receiver: any): boolean {
|
|
119
|
+
if (p === finalizerIdSymbol)
|
|
120
|
+
this.entry.finalizerId = value;
|
|
121
|
+
return true;
|
|
122
|
+
}
|
|
123
|
+
|
|
117
124
|
apply(target: any, thisArg: any, argArray?: any): any {
|
|
118
125
|
const method = target();
|
|
119
126
|
const args: any[] = [];
|
|
@@ -124,7 +131,7 @@ class RpcProxy implements ProxyHandler<any> {
|
|
|
124
131
|
const rpcApply: RpcApply = {
|
|
125
132
|
type: "apply",
|
|
126
133
|
id: undefined,
|
|
127
|
-
proxyId: this.id,
|
|
134
|
+
proxyId: this.entry.id,
|
|
128
135
|
args,
|
|
129
136
|
method,
|
|
130
137
|
};
|
|
@@ -187,16 +194,21 @@ export interface RpcSerializer {
|
|
|
187
194
|
deserialize(serialized: any): any;
|
|
188
195
|
}
|
|
189
196
|
|
|
197
|
+
interface LocalProxiedEntry {
|
|
198
|
+
id: string;
|
|
199
|
+
finalizerId: string;
|
|
200
|
+
}
|
|
201
|
+
|
|
190
202
|
export class RpcPeer {
|
|
191
203
|
idCounter = 1;
|
|
192
204
|
onOob: (oob: any) => void;
|
|
193
205
|
params: { [name: string]: any } = {};
|
|
194
206
|
pendingResults: { [id: string]: Deferred } = {};
|
|
195
207
|
proxyCounter = 1;
|
|
196
|
-
localProxied = new Map<any,
|
|
208
|
+
localProxied = new Map<any, LocalProxiedEntry>();
|
|
197
209
|
localProxyMap: { [id: string]: any } = {};
|
|
198
210
|
remoteWeakProxies: { [id: string]: WeakRef<any> } = {};
|
|
199
|
-
finalizers = new FinalizationRegistry(
|
|
211
|
+
finalizers = new FinalizationRegistry(entry => this.finalize(entry as LocalProxiedEntry));
|
|
200
212
|
nameDeserializerMap = new Map<string, RpcSerializer>();
|
|
201
213
|
constructorSerializerMap = new Map<string, string>();
|
|
202
214
|
transportSafeArgumentTypes = getDefaultTransportSafeArgumentTypes();
|
|
@@ -238,10 +250,11 @@ export class RpcPeer {
|
|
|
238
250
|
this.constructorSerializerMap.set(ctr, name);
|
|
239
251
|
}
|
|
240
252
|
|
|
241
|
-
finalize(
|
|
242
|
-
delete this.remoteWeakProxies[id];
|
|
253
|
+
finalize(entry: LocalProxiedEntry) {
|
|
254
|
+
delete this.remoteWeakProxies[entry.id];
|
|
243
255
|
const rpcFinalize: RpcFinalize = {
|
|
244
|
-
__local_proxy_id: id,
|
|
256
|
+
__local_proxy_id: entry.id,
|
|
257
|
+
__local_proxy_finalizer_id: entry.finalizerId,
|
|
245
258
|
type: 'finalize',
|
|
246
259
|
}
|
|
247
260
|
this.send(rpcFinalize);
|
|
@@ -294,9 +307,12 @@ export class RpcPeer {
|
|
|
294
307
|
return ret;
|
|
295
308
|
}
|
|
296
309
|
|
|
297
|
-
const { __remote_proxy_id, __local_proxy_id, __remote_constructor_name, __serialized_value, __remote_proxy_props, __remote_proxy_oneway_methods } = value;
|
|
310
|
+
const { __remote_proxy_id, __remote_proxy_finalizer_id, __local_proxy_id, __remote_constructor_name, __serialized_value, __remote_proxy_props, __remote_proxy_oneway_methods } = value;
|
|
298
311
|
if (__remote_proxy_id) {
|
|
299
|
-
|
|
312
|
+
let proxy = this.remoteWeakProxies[__remote_proxy_id]?.deref();
|
|
313
|
+
if (!proxy)
|
|
314
|
+
proxy = this.newProxy(__remote_proxy_id, __remote_constructor_name, __remote_proxy_props, __remote_proxy_oneway_methods);
|
|
315
|
+
proxy[finalizerIdSymbol] = __remote_proxy_finalizer_id;
|
|
300
316
|
return proxy;
|
|
301
317
|
}
|
|
302
318
|
|
|
@@ -329,10 +345,13 @@ export class RpcPeer {
|
|
|
329
345
|
|
|
330
346
|
let __remote_constructor_name = value.__proxy_constructor || value.constructor?.name?.toString();
|
|
331
347
|
|
|
332
|
-
let
|
|
333
|
-
if (
|
|
348
|
+
let proxiedEntry = this.localProxied.get(value);
|
|
349
|
+
if (proxiedEntry) {
|
|
350
|
+
const __remote_proxy_finalizer_id = (this.proxyCounter++).toString();
|
|
351
|
+
proxiedEntry.finalizerId = __remote_proxy_finalizer_id;
|
|
334
352
|
const ret: RpcRemoteProxyValue = {
|
|
335
|
-
__remote_proxy_id:
|
|
353
|
+
__remote_proxy_id: proxiedEntry.id,
|
|
354
|
+
__remote_proxy_finalizer_id,
|
|
336
355
|
__remote_constructor_name,
|
|
337
356
|
__remote_proxy_props: value?.[PROPERTY_PROXY_PROPERTIES],
|
|
338
357
|
__remote_proxy_oneway_methods: value?.[PROPERTY_PROXY_ONEWAY_METHODS],
|
|
@@ -355,6 +374,7 @@ export class RpcPeer {
|
|
|
355
374
|
const serialized = serializer.serialize(value);
|
|
356
375
|
const ret: RpcRemoteProxyValue = {
|
|
357
376
|
__remote_proxy_id: undefined,
|
|
377
|
+
__remote_proxy_finalizer_id: undefined,
|
|
358
378
|
__remote_constructor_name,
|
|
359
379
|
__remote_proxy_props: value?.[PROPERTY_PROXY_PROPERTIES],
|
|
360
380
|
__remote_proxy_oneway_methods: value?.[PROPERTY_PROXY_ONEWAY_METHODS],
|
|
@@ -363,12 +383,17 @@ export class RpcPeer {
|
|
|
363
383
|
return ret;
|
|
364
384
|
}
|
|
365
385
|
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
386
|
+
const __remote_proxy_id = (this.proxyCounter++).toString();
|
|
387
|
+
proxiedEntry = {
|
|
388
|
+
id: __remote_proxy_id,
|
|
389
|
+
finalizerId: __remote_proxy_id,
|
|
390
|
+
};
|
|
391
|
+
this.localProxied.set(value, proxiedEntry);
|
|
392
|
+
this.localProxyMap[__remote_proxy_id] = value;
|
|
369
393
|
|
|
370
394
|
const ret: RpcRemoteProxyValue = {
|
|
371
|
-
__remote_proxy_id
|
|
395
|
+
__remote_proxy_id,
|
|
396
|
+
__remote_proxy_finalizer_id: __remote_proxy_id,
|
|
372
397
|
__remote_constructor_name,
|
|
373
398
|
__remote_proxy_props: value?.[PROPERTY_PROXY_PROPERTIES],
|
|
374
399
|
__remote_proxy_oneway_methods: value?.[PROPERTY_PROXY_ONEWAY_METHODS],
|
|
@@ -378,12 +403,16 @@ export class RpcPeer {
|
|
|
378
403
|
}
|
|
379
404
|
|
|
380
405
|
newProxy(proxyId: string, proxyConstructorName: string, proxyProps: any, proxyOneWayMethods: string[]) {
|
|
381
|
-
const
|
|
406
|
+
const localProxiedEntry: LocalProxiedEntry = {
|
|
407
|
+
id: proxyId,
|
|
408
|
+
finalizerId: undefined,
|
|
409
|
+
}
|
|
410
|
+
const rpc = new RpcProxy(this, localProxiedEntry, proxyConstructorName, proxyProps, proxyOneWayMethods);
|
|
382
411
|
const target = proxyConstructorName === 'Function' || proxyConstructorName === 'AsyncFunction' ? function () { } : rpc;
|
|
383
412
|
const proxy = new Proxy(target, rpc);
|
|
384
413
|
const weakref = new WeakRef(proxy);
|
|
385
414
|
this.remoteWeakProxies[proxyId] = weakref;
|
|
386
|
-
this.finalizers.register(rpc,
|
|
415
|
+
this.finalizers.register(rpc, localProxiedEntry);
|
|
387
416
|
global.gc?.();
|
|
388
417
|
return proxy;
|
|
389
418
|
}
|
|
@@ -460,8 +489,16 @@ export class RpcPeer {
|
|
|
460
489
|
case 'finalize': {
|
|
461
490
|
const rpcFinalize = message as RpcFinalize;
|
|
462
491
|
const local = this.localProxyMap[rpcFinalize.__local_proxy_id];
|
|
463
|
-
|
|
464
|
-
|
|
492
|
+
if (local) {
|
|
493
|
+
const localProxiedEntry = this.localProxied.get(local);
|
|
494
|
+
// if a finalizer id is specified, it must match.
|
|
495
|
+
if (rpcFinalize.__local_proxy_finalizer_id && rpcFinalize.__local_proxy_finalizer_id !== localProxiedEntry?.finalizerId) {
|
|
496
|
+
console.error(this.selfName, this.peerName, 'finalizer mismatch')
|
|
497
|
+
break;
|
|
498
|
+
}
|
|
499
|
+
delete this.localProxyMap[rpcFinalize.__local_proxy_id];
|
|
500
|
+
this.localProxied.delete(local);
|
|
501
|
+
}
|
|
465
502
|
break;
|
|
466
503
|
}
|
|
467
504
|
case 'oob': {
|