@casual-simulation/aux-vm-client 3.2.7-alpha.6385045848 → 3.2.7-alpha.6777319727
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/managers/RemoteSimulationImpl.js +1 -1
- package/managers/RemoteSimulationImpl.js.map +1 -1
- package/package.json +8 -8
- package/partitions/PartitionFactories.d.ts +7 -7
- package/partitions/PartitionFactories.js +17 -17
- package/partitions/PartitionFactories.js.map +1 -1
- package/vm/RemoteAuxChannel.d.ts +4 -4
- package/vm/RemoteAuxChannel.js +7 -7
- package/vm/RemoteAuxChannel.js.map +1 -1
- package/vm/RemoteAuxVM.d.ts +10 -4
- package/vm/RemoteAuxVM.js +24 -7
- package/vm/RemoteAuxVM.js.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoteSimulationImpl.js","sourceRoot":"","sources":["RemoteSimulationImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,cAAc,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEhF,OAAO,EACH,aAAa,GAEhB,MAAM,oCAAoC,CAAC;AAE5C;;GAEG;AACH,MAAM,OAAO,oBACT,SAAQ,cAAc;IAOtB,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,YAAY,EAAU,EAAE,MAAwB,EAAE,EAAS;QACvD,KAAK,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"RemoteSimulationImpl.js","sourceRoot":"","sources":["RemoteSimulationImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,cAAc,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEhF,OAAO,EACH,aAAa,GAEhB,MAAM,oCAAoC,CAAC;AAE5C;;GAEG;AACH,MAAM,OAAO,oBACT,SAAQ,cAAc;IAOtB,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,YAAY,EAAU,EAAE,MAAwB,EAAE,EAAS;QACvD,KAAK,CAAC,EAAE,CAAC,CAAC;QACV,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;IAClC,CAAC;IAED,IAAI,IAAI;;QACJ,OAAO,MAAA,IAAI,CAAC,MAAM,CAAC,IAAI,mCAAI,IAAI,CAAC,EAAE,CAAC;IACvC,CAAC;IAES,aAAa;QACnB,KAAK,CAAC,aAAa,EAAE,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;CACJ"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@casual-simulation/aux-vm-client",
|
|
3
|
-
"version": "3.2.7-alpha.
|
|
3
|
+
"version": "3.2.7-alpha.6777319727",
|
|
4
4
|
"description": "A set of utilities required to securely run an AUX as a client.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aux"
|
|
@@ -39,19 +39,19 @@
|
|
|
39
39
|
"url": "https://github.com/casual-simulation/casualos/issues"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@casual-simulation/aux-common": "^3.2.7-alpha.
|
|
43
|
-
"@casual-simulation/aux-runtime": "^3.2.7-alpha.
|
|
44
|
-
"@casual-simulation/aux-vm": "^3.2.7-alpha.
|
|
45
|
-
"@casual-simulation/aux-websocket": "^3.2.7-alpha.
|
|
46
|
-
"@casual-simulation/aux-websocket-aws": "^3.2.7-alpha.
|
|
42
|
+
"@casual-simulation/aux-common": "^3.2.7-alpha.6777319727",
|
|
43
|
+
"@casual-simulation/aux-runtime": "^3.2.7-alpha.6777319727",
|
|
44
|
+
"@casual-simulation/aux-vm": "^3.2.7-alpha.6777319727",
|
|
45
|
+
"@casual-simulation/aux-websocket": "^3.2.7-alpha.6777319727",
|
|
46
|
+
"@casual-simulation/aux-websocket-aws": "^3.2.7-alpha.6777319727",
|
|
47
47
|
"@casual-simulation/crypto": "^3.2.0",
|
|
48
48
|
"@casual-simulation/timesync": "^3.1.28",
|
|
49
|
-
"@casual-simulation/websocket": "^3.
|
|
49
|
+
"@casual-simulation/websocket": "^3.2.7-alpha.6777319727",
|
|
50
50
|
"axios": "0.25.0",
|
|
51
51
|
"comlink": "4.3.1",
|
|
52
52
|
"lodash": "4.17.21",
|
|
53
53
|
"rxjs": "7.5.7",
|
|
54
54
|
"uuid": "^8.3.2"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "cb79f312a97a8425a573a851f99f1774f50589ff"
|
|
57
57
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { InstRecordsClient, PartitionAuthSource } from '@casual-simulation/aux-common';
|
|
2
2
|
import { PartitionConfig, OtherPlayersPartition, RemoteCausalRepoProtocol, YjsPartition } from '@casual-simulation/aux-common';
|
|
3
3
|
import { AuxTimeSyncConfiguration } from '@casual-simulation/aux-vm';
|
|
4
4
|
import { TimeSyncController } from '@casual-simulation/timesync';
|
|
@@ -6,27 +6,27 @@ import { TimeSyncController } from '@casual-simulation/timesync';
|
|
|
6
6
|
* Gets the causal repo client that should be used for the given host.
|
|
7
7
|
* @param host The host.
|
|
8
8
|
*/
|
|
9
|
-
export declare function getClientForHostAndProtocol(host: string,
|
|
9
|
+
export declare function getClientForHostAndProtocol(host: string, authSource: PartitionAuthSource, protocol: RemoteCausalRepoProtocol): InstRecordsClient;
|
|
10
10
|
/**
|
|
11
11
|
* Gets the casual repo client that should be used for the given host when connecting over the AWS Apiary protocol.
|
|
12
12
|
* @param host The URl that should be connected to.
|
|
13
13
|
* @param user The user that the connection should be made with.
|
|
14
14
|
*/
|
|
15
|
-
export declare function getAWSApiaryClientForHostAndProtocol(host: string,
|
|
15
|
+
export declare function getAWSApiaryClientForHostAndProtocol(host: string, authSource: PartitionAuthSource): InstRecordsClient;
|
|
16
16
|
/**
|
|
17
17
|
* Gets the causal repo client that should be used for the given host when connecting over the websocket protocol.
|
|
18
18
|
* @param host The host.
|
|
19
19
|
*/
|
|
20
|
-
export declare function getWebSocketClientForHost(host: string,
|
|
20
|
+
export declare function getWebSocketClientForHost(host: string, authSource: PartitionAuthSource): InstRecordsClient;
|
|
21
21
|
/**
|
|
22
22
|
* Attempts to create a CausalTree2Partition from the given config.
|
|
23
23
|
* @param config The config.
|
|
24
24
|
*/
|
|
25
|
-
export declare function createRemoteYjsPartition(config: PartitionConfig,
|
|
25
|
+
export declare function createRemoteYjsPartition(config: PartitionConfig, authSource: PartitionAuthSource, useCache?: boolean): Promise<YjsPartition>;
|
|
26
26
|
/**
|
|
27
27
|
* Attempts to create a CausalTree2Partition from the given config.
|
|
28
28
|
* @param config The config.
|
|
29
29
|
*/
|
|
30
|
-
export declare function createOtherPlayersRepoPartition(config: PartitionConfig,
|
|
31
|
-
export declare function createTimeSyncController(config: AuxTimeSyncConfiguration,
|
|
30
|
+
export declare function createOtherPlayersRepoPartition(config: PartitionConfig, authSource: PartitionAuthSource, useCache?: boolean): Promise<OtherPlayersPartition>;
|
|
31
|
+
export declare function createTimeSyncController(config: AuxTimeSyncConfiguration, authSource: PartitionAuthSource): TimeSyncController;
|
|
32
32
|
//# sourceMappingURL=PartitionFactories.d.ts.map
|
|
@@ -27,12 +27,12 @@ let websocketClientCache = new Map();
|
|
|
27
27
|
* Gets the causal repo client that should be used for the given host.
|
|
28
28
|
* @param host The host.
|
|
29
29
|
*/
|
|
30
|
-
export function getClientForHostAndProtocol(host,
|
|
30
|
+
export function getClientForHostAndProtocol(host, authSource, protocol) {
|
|
31
31
|
if (protocol === 'apiary-aws') {
|
|
32
|
-
return getAWSApiaryClientForHostAndProtocol(host,
|
|
32
|
+
return getAWSApiaryClientForHostAndProtocol(host, authSource);
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
35
|
-
return getWebSocketClientForHost(host,
|
|
35
|
+
return getWebSocketClientForHost(host, authSource);
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
/**
|
|
@@ -40,7 +40,7 @@ export function getClientForHostAndProtocol(host, indicator, protocol) {
|
|
|
40
40
|
* @param host The URl that should be connected to.
|
|
41
41
|
* @param user The user that the connection should be made with.
|
|
42
42
|
*/
|
|
43
|
-
export function getAWSApiaryClientForHostAndProtocol(host,
|
|
43
|
+
export function getAWSApiaryClientForHostAndProtocol(host, authSource) {
|
|
44
44
|
let client = awsApiaryClientCache.get(host);
|
|
45
45
|
if (!client) {
|
|
46
46
|
const url = new URL(host);
|
|
@@ -50,10 +50,10 @@ export function getAWSApiaryClientForHostAndProtocol(host, indicator) {
|
|
|
50
50
|
else if (url.protocol === 'https:') {
|
|
51
51
|
url.protocol = 'wss:';
|
|
52
52
|
}
|
|
53
|
-
const manager = new WebSocketManager(url
|
|
53
|
+
const manager = new WebSocketManager(url);
|
|
54
54
|
manager.init();
|
|
55
55
|
const awsConnection = new ApiGatewayWebsocketConnectionClient(manager.socket);
|
|
56
|
-
const connection = new AuthenticatedConnectionClient(awsConnection,
|
|
56
|
+
const connection = new AuthenticatedConnectionClient(awsConnection, authSource);
|
|
57
57
|
client = new InstRecordsClient(connection);
|
|
58
58
|
awsApiaryClientCache.set(host, client);
|
|
59
59
|
connection.connect();
|
|
@@ -64,7 +64,7 @@ export function getAWSApiaryClientForHostAndProtocol(host, indicator) {
|
|
|
64
64
|
* Gets the causal repo client that should be used for the given host when connecting over the websocket protocol.
|
|
65
65
|
* @param host The host.
|
|
66
66
|
*/
|
|
67
|
-
export function getWebSocketClientForHost(host,
|
|
67
|
+
export function getWebSocketClientForHost(host, authSource) {
|
|
68
68
|
let client = websocketClientCache.get(host);
|
|
69
69
|
if (!client) {
|
|
70
70
|
const url = new URL('/websocket', host);
|
|
@@ -74,10 +74,10 @@ export function getWebSocketClientForHost(host, indicator) {
|
|
|
74
74
|
else if (url.protocol === 'https:') {
|
|
75
75
|
url.protocol = 'wss:';
|
|
76
76
|
}
|
|
77
|
-
const manager = new WebSocketManager(url
|
|
77
|
+
const manager = new WebSocketManager(url);
|
|
78
78
|
manager.init();
|
|
79
79
|
const inner = new WebsocketConnectionClient(manager.socket);
|
|
80
|
-
const connection = new AuthenticatedConnectionClient(inner,
|
|
80
|
+
const connection = new AuthenticatedConnectionClient(inner, authSource);
|
|
81
81
|
client = new InstRecordsClient(connection);
|
|
82
82
|
websocketClientCache.set(host, client);
|
|
83
83
|
connection.connect();
|
|
@@ -88,11 +88,11 @@ export function getWebSocketClientForHost(host, indicator) {
|
|
|
88
88
|
* Attempts to create a CausalTree2Partition from the given config.
|
|
89
89
|
* @param config The config.
|
|
90
90
|
*/
|
|
91
|
-
export function createRemoteYjsPartition(config,
|
|
91
|
+
export function createRemoteYjsPartition(config, authSource, useCache = true) {
|
|
92
92
|
return __awaiter(this, void 0, void 0, function* () {
|
|
93
93
|
if (config.type === 'remote_yjs') {
|
|
94
|
-
const client = getClientForHostAndProtocol(config.host,
|
|
95
|
-
const partition = new RemoteYjsPartitionImpl(client, config);
|
|
94
|
+
const client = getClientForHostAndProtocol(config.host, authSource, config.connectionProtocol);
|
|
95
|
+
const partition = new RemoteYjsPartitionImpl(client, authSource, config);
|
|
96
96
|
yield partition.init();
|
|
97
97
|
return partition;
|
|
98
98
|
}
|
|
@@ -103,19 +103,19 @@ export function createRemoteYjsPartition(config, indicator, useCache = true) {
|
|
|
103
103
|
* Attempts to create a CausalTree2Partition from the given config.
|
|
104
104
|
* @param config The config.
|
|
105
105
|
*/
|
|
106
|
-
export function createOtherPlayersRepoPartition(config,
|
|
106
|
+
export function createOtherPlayersRepoPartition(config, authSource, useCache = true) {
|
|
107
107
|
return __awaiter(this, void 0, void 0, function* () {
|
|
108
108
|
if (config.type === 'other_players_repo') {
|
|
109
|
-
const client = getClientForHostAndProtocol(config.host,
|
|
110
|
-
const partition = new OtherPlayersPartitionImpl(client, config);
|
|
109
|
+
const client = getClientForHostAndProtocol(config.host, authSource, config.connectionProtocol);
|
|
110
|
+
const partition = new OtherPlayersPartitionImpl(client, authSource, config);
|
|
111
111
|
return partition;
|
|
112
112
|
}
|
|
113
113
|
return undefined;
|
|
114
114
|
});
|
|
115
115
|
}
|
|
116
|
-
export function createTimeSyncController(config,
|
|
116
|
+
export function createTimeSyncController(config, authSource) {
|
|
117
117
|
if (config.host) {
|
|
118
|
-
const client = getClientForHostAndProtocol(config.host,
|
|
118
|
+
const client = getClientForHostAndProtocol(config.host, authSource, config.connectionProtocol);
|
|
119
119
|
return new TimeSyncController(new InstRecordsClientTimeSyncConnection(client));
|
|
120
120
|
}
|
|
121
121
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PartitionFactories.js","sourceRoot":"","sources":["PartitionFactories.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACH,6BAA6B,EAE7B,iBAAiB,EACjB,mCAAmC,
|
|
1
|
+
{"version":3,"file":"PartitionFactories.js","sourceRoot":"","sources":["PartitionFactories.ts"],"names":[],"mappings":"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"}
|
package/vm/RemoteAuxChannel.d.ts
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { LocalActions, PartitionConfig, AuxPartition,
|
|
1
|
+
import { LocalActions, PartitionConfig, AuxPartition, AuxPartitionServices } from '@casual-simulation/aux-common';
|
|
2
2
|
import { AuxConfig, BaseAuxChannel, AuxChannelOptions } from '@casual-simulation/aux-vm';
|
|
3
3
|
import { TimeSyncController } from '@casual-simulation/timesync';
|
|
4
4
|
import { AuxRuntime } from '@casual-simulation/aux-runtime';
|
|
5
5
|
export interface RemoteAuxChannelOptions extends AuxChannelOptions {
|
|
6
6
|
}
|
|
7
7
|
export declare class RemoteAuxChannel extends BaseAuxChannel {
|
|
8
|
-
constructor(
|
|
9
|
-
protected _createPartition(config: PartitionConfig): Promise<AuxPartition>;
|
|
8
|
+
constructor(config: AuxConfig, options: RemoteAuxChannelOptions);
|
|
9
|
+
protected _createPartition(config: PartitionConfig, services: AuxPartitionServices): Promise<AuxPartition>;
|
|
10
10
|
protected _createTimeSyncController(): TimeSyncController;
|
|
11
11
|
protected _handleError(error: any): void;
|
|
12
12
|
protected _handleLocalEvents(e: LocalActions[]): void;
|
|
13
|
-
protected _createSubChannel(
|
|
13
|
+
protected _createSubChannel(runtime: AuxRuntime, config: AuxConfig): BaseAuxChannel;
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=RemoteAuxChannel.d.ts.map
|
package/vm/RemoteAuxChannel.js
CHANGED
|
@@ -11,18 +11,18 @@ import { createAuxPartition, createMemoryPartition, iteratePartitions, createOth
|
|
|
11
11
|
import { BaseAuxChannel, } from '@casual-simulation/aux-vm';
|
|
12
12
|
import { createOtherPlayersRepoPartition, createRemoteYjsPartition, createTimeSyncController, } from '../partitions';
|
|
13
13
|
export class RemoteAuxChannel extends BaseAuxChannel {
|
|
14
|
-
constructor(
|
|
15
|
-
super(
|
|
14
|
+
constructor(config, options) {
|
|
15
|
+
super(config, options);
|
|
16
16
|
}
|
|
17
|
-
_createPartition(config) {
|
|
17
|
+
_createPartition(config, services) {
|
|
18
18
|
return __awaiter(this, void 0, void 0, function* () {
|
|
19
|
-
return yield createAuxPartition(config, createMemoryPartition, (config) => createOtherPlayersClientPartition(config), (config) => createOtherPlayersRepoPartition(config,
|
|
19
|
+
return yield createAuxPartition(config, services, createMemoryPartition, (config) => createOtherPlayersClientPartition(config, services.authSource), (config) => createOtherPlayersRepoPartition(config, services.authSource), (config) => createYjsPartition(config), (config) => createRemoteYjsPartition(config, services.authSource), (config) => createRemoteClientYjsPartition(config, services.authSource));
|
|
20
20
|
});
|
|
21
21
|
}
|
|
22
22
|
_createTimeSyncController() {
|
|
23
23
|
var _a, _b, _c;
|
|
24
24
|
if ((_b = (_a = this._config) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.timesync) {
|
|
25
|
-
return ((_c = createTimeSyncController(this._config.config.timesync, this.
|
|
25
|
+
return ((_c = createTimeSyncController(this._config.config.timesync, this._authSource)) !== null && _c !== void 0 ? _c : super._createTimeSyncController());
|
|
26
26
|
}
|
|
27
27
|
return super._createTimeSyncController();
|
|
28
28
|
}
|
|
@@ -49,8 +49,8 @@ export class RemoteAuxChannel extends BaseAuxChannel {
|
|
|
49
49
|
}
|
|
50
50
|
super._handleLocalEvents(e);
|
|
51
51
|
}
|
|
52
|
-
_createSubChannel(
|
|
53
|
-
const channel = new RemoteAuxChannel(
|
|
52
|
+
_createSubChannel(runtime, config) {
|
|
53
|
+
const channel = new RemoteAuxChannel(config, this._options);
|
|
54
54
|
channel._runtime = runtime;
|
|
55
55
|
return channel;
|
|
56
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoteAuxChannel.js","sourceRoot":"","sources":["RemoteAuxChannel.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAIH,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,EACjB,iCAAiC,EACjC,kBAAkB,EAClB,8BAA8B,
|
|
1
|
+
{"version":3,"file":"RemoteAuxChannel.js","sourceRoot":"","sources":["RemoteAuxChannel.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAIH,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,EACjB,iCAAiC,EACjC,kBAAkB,EAClB,8BAA8B,GAGjC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEH,cAAc,GAEjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACH,+BAA+B,EAC/B,wBAAwB,EACxB,wBAAwB,GAC3B,MAAM,eAAe,CAAC;AAOvB,MAAM,OAAO,gBAAiB,SAAQ,cAAc;IAChD,YAAY,MAAiB,EAAE,OAAgC;QAC3D,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3B,CAAC;IAEe,gBAAgB,CAC5B,MAAuB,EACvB,QAA8B;;YAE9B,OAAO,MAAM,kBAAkB,CAC3B,MAAM,EACN,QAAQ,EACR,qBAAqB,EACrB,CAAC,MAAM,EAAE,EAAE,CACP,iCAAiC,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,EAClE,CAAC,MAAM,EAAE,EAAE,CACP,+BAA+B,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,EAChE,CAAC,MAAM,EAAE,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,EACtC,CAAC,MAAM,EAAE,EAAE,CAAC,wBAAwB,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,EACjE,CAAC,MAAM,EAAE,EAAE,CACP,8BAA8B,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,CAClE,CAAC;QACN,CAAC;KAAA;IAES,yBAAyB;;QAC/B,IAAI,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM,0CAAE,QAAQ,EAAE;YAChC,OAAO,CACH,MAAA,wBAAwB,CACpB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAC5B,IAAI,CAAC,WAAW,CACnB,mCAAI,KAAK,CAAC,yBAAyB,EAAE,CACzC,CAAC;SACL;QACD,OAAO,KAAK,CAAC,yBAAyB,EAAE,CAAC;IAC7C,CAAC;IAES,YAAY,CAAC,KAAU;QAC7B,IAAI,KAAK,YAAY,KAAK,EAAE;YACxB,KAAK,CAAC,YAAY,CAAC;gBACf,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAK,CAAC,QAAQ,EAAE;aAC5B,CAAC,CAAC;SACN;aAAM;YACH,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;SAC7B;IACL,CAAC;IAES,kBAAkB,CAAC,CAAiB;QAC1C,KAAK,IAAI,KAAK,IAAI,CAAC,EAAE;YACjB,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAmB,EAAE;gBACpC,KAAK,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,iBAAiB,CAC1C,IAAI,CAAC,WAAW,CACnB,EAAE;oBACC,IAAI,eAAe,IAAI,SAAS,EAAE;wBAC9B,SAAS,CAAC,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC;qBAC3C;iBACJ;aACJ;SACJ;QACD,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC;IAES,iBAAiB,CACvB,OAAmB,EACnB,MAAiB;QAEjB,MAAM,OAAO,GAAG,IAAI,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5D,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC;QAC3B,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ"}
|
package/vm/RemoteAuxVM.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { StateUpdatedEvent, BotAction, StoredAux } from '@casual-simulation/aux-common';
|
|
1
|
+
import { StateUpdatedEvent, BotAction, StoredAux, PartitionAuthMessage } from '@casual-simulation/aux-common';
|
|
2
2
|
import { AuxChannel, AuxChannelErrorType, AuxSubVM, AuxVM, ChannelActionResult } from '@casual-simulation/aux-vm/vm';
|
|
3
3
|
import { DeviceAction, StatusUpdate } from '@casual-simulation/aux-common';
|
|
4
4
|
import { Observable } from 'rxjs';
|
|
@@ -17,20 +17,25 @@ export declare class RemoteAuxVM implements AuxVM {
|
|
|
17
17
|
private _subVMAdded;
|
|
18
18
|
private _subVMRemoved;
|
|
19
19
|
private _subVMMap;
|
|
20
|
+
private _onAuthMessage;
|
|
20
21
|
private _proxy;
|
|
22
|
+
private _id;
|
|
23
|
+
private _configBotId;
|
|
21
24
|
closed: boolean;
|
|
22
25
|
/**
|
|
23
26
|
* The ID of the simulation.
|
|
24
27
|
*/
|
|
25
|
-
id: string;
|
|
28
|
+
get id(): string;
|
|
29
|
+
get configBotId(): string;
|
|
26
30
|
/**
|
|
27
31
|
* Creates a new Simulation VM.
|
|
28
32
|
*/
|
|
29
|
-
constructor(channel: Remote<AuxChannel>);
|
|
33
|
+
constructor(id: string, configBotId: string, channel: Remote<AuxChannel>);
|
|
30
34
|
get subVMAdded(): Observable<AuxSubVM>;
|
|
31
35
|
get subVMRemoved(): Observable<AuxSubVM>;
|
|
32
36
|
get connectionStateChanged(): Observable<StatusUpdate>;
|
|
33
37
|
get onError(): Observable<AuxChannelErrorType>;
|
|
38
|
+
get onAuthMessage(): Observable<PartitionAuthMessage>;
|
|
34
39
|
/**
|
|
35
40
|
* Initaializes the VM.
|
|
36
41
|
*/
|
|
@@ -73,8 +78,9 @@ export declare class RemoteAuxVM implements AuxVM {
|
|
|
73
78
|
* Can then be used with a ConnectableAuxVM.
|
|
74
79
|
*/
|
|
75
80
|
createEndpoint(): Promise<MessagePort>;
|
|
81
|
+
sendAuthMessage(message: PartitionAuthMessage): Promise<void>;
|
|
76
82
|
unsubscribe(): void;
|
|
77
|
-
protected _createSubVM(channel: Remote<AuxChannel>): AuxVM;
|
|
83
|
+
protected _createSubVM(id: string, configBotId: string, channel: Remote<AuxChannel>): AuxVM;
|
|
78
84
|
private _handleAddedSubChannel;
|
|
79
85
|
private _handleRemovedSubChannel;
|
|
80
86
|
}
|
package/vm/RemoteAuxVM.js
CHANGED
|
@@ -14,10 +14,21 @@ import { proxy, createEndpoint } from 'comlink';
|
|
|
14
14
|
* Defines a VM that is able to wrap a remote aux channel.
|
|
15
15
|
*/
|
|
16
16
|
export class RemoteAuxVM {
|
|
17
|
+
/**
|
|
18
|
+
* The ID of the simulation.
|
|
19
|
+
*/
|
|
20
|
+
get id() {
|
|
21
|
+
return this._id;
|
|
22
|
+
}
|
|
23
|
+
get configBotId() {
|
|
24
|
+
return this._configBotId;
|
|
25
|
+
}
|
|
17
26
|
/**
|
|
18
27
|
* Creates a new Simulation VM.
|
|
19
28
|
*/
|
|
20
|
-
constructor(channel) {
|
|
29
|
+
constructor(id, configBotId, channel) {
|
|
30
|
+
this._id = id;
|
|
31
|
+
this._configBotId = configBotId;
|
|
21
32
|
this._localEvents = new Subject();
|
|
22
33
|
this._deviceEvents = new Subject();
|
|
23
34
|
this._stateUpdated = new Subject();
|
|
@@ -27,6 +38,7 @@ export class RemoteAuxVM {
|
|
|
27
38
|
this._subVMAdded = new Subject();
|
|
28
39
|
this._subVMRemoved = new Subject();
|
|
29
40
|
this._subVMMap = new Map();
|
|
41
|
+
this._onAuthMessage = new Subject();
|
|
30
42
|
this._proxy = channel;
|
|
31
43
|
}
|
|
32
44
|
get subVMAdded() {
|
|
@@ -41,6 +53,9 @@ export class RemoteAuxVM {
|
|
|
41
53
|
get onError() {
|
|
42
54
|
return this._onError;
|
|
43
55
|
}
|
|
56
|
+
get onAuthMessage() {
|
|
57
|
+
return this._onAuthMessage;
|
|
58
|
+
}
|
|
44
59
|
/**
|
|
45
60
|
* Initaializes the VM.
|
|
46
61
|
*/
|
|
@@ -52,7 +67,7 @@ export class RemoteAuxVM {
|
|
|
52
67
|
_init() {
|
|
53
68
|
return __awaiter(this, void 0, void 0, function* () {
|
|
54
69
|
let statusMapper = remapProgressPercent(0.2, 1);
|
|
55
|
-
return yield this._proxy.init(proxy((events) => this._localEvents.next(events)), proxy((events) => this._deviceEvents.next(events)), proxy((state) => this._stateUpdated.next(state)), proxy((version) => this._versionUpdated.next(version)), proxy((state) => this._connectionStateChanged.next(statusMapper(state))), proxy((err) => this._onError.next(err)), proxy((channel) => this._handleAddedSubChannel(channel)), proxy((id) => this._handleRemovedSubChannel(id)));
|
|
70
|
+
return yield this._proxy.init(proxy((events) => this._localEvents.next(events)), proxy((events) => this._deviceEvents.next(events)), proxy((state) => this._stateUpdated.next(state)), proxy((version) => this._versionUpdated.next(version)), proxy((state) => this._connectionStateChanged.next(statusMapper(state))), proxy((err) => this._onError.next(err)), proxy((channel) => this._handleAddedSubChannel(channel)), proxy((id) => this._handleRemovedSubChannel(id)), proxy((message) => this._onAuthMessage.next(message)));
|
|
56
71
|
});
|
|
57
72
|
}
|
|
58
73
|
/**
|
|
@@ -144,6 +159,9 @@ export class RemoteAuxVM {
|
|
|
144
159
|
createEndpoint() {
|
|
145
160
|
return this._proxy[createEndpoint]();
|
|
146
161
|
}
|
|
162
|
+
sendAuthMessage(message) {
|
|
163
|
+
return this._proxy.sendAuthMessage(message);
|
|
164
|
+
}
|
|
147
165
|
unsubscribe() {
|
|
148
166
|
if (this.closed) {
|
|
149
167
|
return;
|
|
@@ -155,17 +173,16 @@ export class RemoteAuxVM {
|
|
|
155
173
|
this._localEvents.unsubscribe();
|
|
156
174
|
this._localEvents = null;
|
|
157
175
|
}
|
|
158
|
-
_createSubVM(channel) {
|
|
159
|
-
return new RemoteAuxVM(channel);
|
|
176
|
+
_createSubVM(id, configBotId, channel) {
|
|
177
|
+
return new RemoteAuxVM(id, configBotId, channel);
|
|
160
178
|
}
|
|
161
179
|
_handleAddedSubChannel(subChannel) {
|
|
162
180
|
return __awaiter(this, void 0, void 0, function* () {
|
|
163
|
-
const { id,
|
|
181
|
+
const { id, configBotId } = yield subChannel.getInfo();
|
|
164
182
|
const channel = (yield subChannel.getChannel());
|
|
165
183
|
const subVM = {
|
|
166
184
|
id,
|
|
167
|
-
|
|
168
|
-
vm: this._createSubVM(channel),
|
|
185
|
+
vm: this._createSubVM(id, configBotId, channel),
|
|
169
186
|
channel,
|
|
170
187
|
};
|
|
171
188
|
this._subVMMap.set(id, subVM);
|
package/vm/RemoteAuxVM.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoteAuxVM.js","sourceRoot":"","sources":["RemoteAuxVM.ts"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"RemoteAuxVM.js","sourceRoot":"","sources":["RemoteAuxVM.ts"],"names":[],"mappings":"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"}
|