@casual-simulation/aux-vm-client 3.4.6-alpha.14668890889 → 3.5.0-alpha.15117651144
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@casual-simulation/aux-vm-client",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.5.0-alpha.15117651144",
|
|
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.
|
|
43
|
-
"@casual-simulation/aux-runtime": "^3.
|
|
44
|
-
"@casual-simulation/aux-vm": "^3.
|
|
45
|
-
"@casual-simulation/aux-websocket": "^3.
|
|
46
|
-
"@casual-simulation/aux-websocket-aws": "^3.
|
|
47
|
-
"@casual-simulation/crypto": "^3.
|
|
48
|
-
"@casual-simulation/timesync": "^3.
|
|
49
|
-
"@casual-simulation/websocket": "^3.
|
|
42
|
+
"@casual-simulation/aux-common": "^3.5.0-alpha.15117651144",
|
|
43
|
+
"@casual-simulation/aux-runtime": "^3.5.0-alpha.15117651144",
|
|
44
|
+
"@casual-simulation/aux-vm": "^3.5.0-alpha.15117651144",
|
|
45
|
+
"@casual-simulation/aux-websocket": "^3.5.0-alpha.15117651144",
|
|
46
|
+
"@casual-simulation/aux-websocket-aws": "^3.5.0-alpha.15117651144",
|
|
47
|
+
"@casual-simulation/crypto": "^3.5.0-alpha.15117651144",
|
|
48
|
+
"@casual-simulation/timesync": "^3.5.0-alpha.15117651144",
|
|
49
|
+
"@casual-simulation/websocket": "^3.5.0-alpha.15117651144",
|
|
50
50
|
"axios": "1.7.7",
|
|
51
51
|
"comlink": "4.3.1",
|
|
52
52
|
"lodash": "4.17.21",
|
|
53
53
|
"rxjs": "8.0.0-alpha.14",
|
|
54
54
|
"uuid": "10.0.0"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "3e2803698d7c87343fb3b3c29a2f27f4b9efe942"
|
|
57
57
|
}
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { AuthenticatedConnectionClient, InstRecordsClient, InstRecordsClientTimeSyncConnection, } from '@casual-simulation/aux-common';
|
|
11
2
|
import { ApiGatewayWebsocketConnectionClient } from '@casual-simulation/aux-websocket-aws';
|
|
12
3
|
import { WebsocketConnectionClient } from '@casual-simulation/aux-websocket';
|
|
@@ -97,46 +88,40 @@ export function getWebSocketClientForHost(host, authSource) {
|
|
|
97
88
|
* Attempts to create a CausalTree2Partition from the given config.
|
|
98
89
|
* @param config The config.
|
|
99
90
|
*/
|
|
100
|
-
export function createRemoteYjsPartition(config, authSource, useCache = true) {
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
return undefined;
|
|
109
|
-
});
|
|
91
|
+
export async function createRemoteYjsPartition(config, authSource, useCache = true) {
|
|
92
|
+
if (config.type === 'remote_yjs') {
|
|
93
|
+
const client = getClientForHostAndProtocol(config.host, authSource, config.connectionProtocol);
|
|
94
|
+
const partition = new RemoteYjsPartitionImpl(client, authSource, config);
|
|
95
|
+
await partition.init();
|
|
96
|
+
return partition;
|
|
97
|
+
}
|
|
98
|
+
return undefined;
|
|
110
99
|
}
|
|
111
100
|
/**
|
|
112
101
|
* Attempts to create a RemoteYjsSharedDocument from the given config.
|
|
113
102
|
* @param config The config.
|
|
114
103
|
* @param authSource The auth source.
|
|
115
104
|
*/
|
|
116
|
-
export function createRemoteYjsSharedDocument(config, authSource) {
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
return undefined;
|
|
125
|
-
});
|
|
105
|
+
export async function createRemoteYjsSharedDocument(config, authSource) {
|
|
106
|
+
if (config.inst) {
|
|
107
|
+
const client = getClientForHostAndProtocol(config.host, authSource, config.connectionProtocol);
|
|
108
|
+
const partition = new RemoteYjsSharedDocument(client, authSource, config);
|
|
109
|
+
await partition.init();
|
|
110
|
+
return partition;
|
|
111
|
+
}
|
|
112
|
+
return undefined;
|
|
126
113
|
}
|
|
127
114
|
/**
|
|
128
115
|
* Attempts to create a CausalTree2Partition from the given config.
|
|
129
116
|
* @param config The config.
|
|
130
117
|
*/
|
|
131
|
-
export function createOtherPlayersRepoPartition(config, authSource, useCache = true) {
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
return undefined;
|
|
139
|
-
});
|
|
118
|
+
export async function createOtherPlayersRepoPartition(config, authSource, useCache = true) {
|
|
119
|
+
if (config.type === 'other_players_repo') {
|
|
120
|
+
const client = getClientForHostAndProtocol(config.host, authSource, config.connectionProtocol);
|
|
121
|
+
const partition = new OtherPlayersPartitionImpl(client, authSource, config);
|
|
122
|
+
return partition;
|
|
123
|
+
}
|
|
124
|
+
return undefined;
|
|
140
125
|
}
|
|
141
126
|
export function createTimeSyncController(config, authSource) {
|
|
142
127
|
if (config.host) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PartitionFactories.js","sourceRoot":"","sources":["PartitionFactories.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PartitionFactories.js","sourceRoot":"","sources":["PartitionFactories.ts"],"names":[],"mappings":"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"}
|
package/vm/RemoteAuxChannel.js
CHANGED
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { createAuxPartition, createMemoryPartition, iteratePartitions, createOtherPlayersClientPartition, createYjsPartition, createRemoteClientYjsPartition, } from '@casual-simulation/aux-common';
|
|
11
2
|
import { BaseAuxChannel } from '@casual-simulation/aux-vm/vm';
|
|
12
3
|
import { createOtherPlayersRepoPartition, createRemoteYjsPartition, createRemoteYjsSharedDocument, createTimeSyncController, } from '../partitions';
|
|
@@ -16,15 +7,11 @@ export class RemoteAuxChannel extends BaseAuxChannel {
|
|
|
16
7
|
constructor(config, options) {
|
|
17
8
|
super(config, options);
|
|
18
9
|
}
|
|
19
|
-
_createPartition(config, services) {
|
|
20
|
-
return
|
|
21
|
-
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));
|
|
22
|
-
});
|
|
10
|
+
async _createPartition(config, services) {
|
|
11
|
+
return await 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));
|
|
23
12
|
}
|
|
24
|
-
_createSharedDocument(config, services) {
|
|
25
|
-
return
|
|
26
|
-
return yield createSharedDocument(config, services, (config, services) => createRemoteYjsSharedDocument(config, services.authSource), createYjsSharedDocument);
|
|
27
|
-
});
|
|
13
|
+
async _createSharedDocument(config, services) {
|
|
14
|
+
return await createSharedDocument(config, services, (config, services) => createRemoteYjsSharedDocument(config, services.authSource), createYjsSharedDocument);
|
|
28
15
|
}
|
|
29
16
|
_createTimeSyncController() {
|
|
30
17
|
var _a, _b, _c;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoteAuxChannel.js","sourceRoot":"","sources":["RemoteAuxChannel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RemoteAuxChannel.js","sourceRoot":"","sources":["RemoteAuxChannel.ts"],"names":[],"mappings":"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"}
|
package/vm/RemoteAuxVM.js
CHANGED
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { remapProgressPercent } from '@casual-simulation/aux-common';
|
|
11
2
|
import { Subject } from 'rxjs';
|
|
12
3
|
import { proxy, createEndpoint } from 'comlink';
|
|
@@ -63,16 +54,12 @@ export class RemoteAuxVM {
|
|
|
63
54
|
/**
|
|
64
55
|
* Initaializes the VM.
|
|
65
56
|
*/
|
|
66
|
-
init() {
|
|
67
|
-
return
|
|
68
|
-
return yield this._init();
|
|
69
|
-
});
|
|
57
|
+
async init() {
|
|
58
|
+
return await this._init();
|
|
70
59
|
}
|
|
71
|
-
_init() {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
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)));
|
|
75
|
-
});
|
|
60
|
+
async _init() {
|
|
61
|
+
let statusMapper = remapProgressPercent(0.2, 1);
|
|
62
|
+
return await 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)));
|
|
76
63
|
}
|
|
77
64
|
/**
|
|
78
65
|
* The observable list of events that should be produced locally.
|
|
@@ -96,12 +83,10 @@ export class RemoteAuxVM {
|
|
|
96
83
|
* Sends the given list of events to the simulation.
|
|
97
84
|
* @param events The events to send to the simulation.
|
|
98
85
|
*/
|
|
99
|
-
sendEvents(events) {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
return yield this._proxy.sendEvents(events);
|
|
104
|
-
});
|
|
86
|
+
async sendEvents(events) {
|
|
87
|
+
if (!this._proxy)
|
|
88
|
+
return null;
|
|
89
|
+
return await this._proxy.sendEvents(events);
|
|
105
90
|
}
|
|
106
91
|
/**
|
|
107
92
|
* Executes a shout with the given event name on the given bot IDs with the given argument.
|
|
@@ -111,57 +96,43 @@ export class RemoteAuxVM {
|
|
|
111
96
|
* @param botIds The IDs of the bots that the shout is being sent to.
|
|
112
97
|
* @param arg The argument to include in the shout.
|
|
113
98
|
*/
|
|
114
|
-
shout(eventName, botIds, arg) {
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
return
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
});
|
|
134
|
-
}
|
|
135
|
-
exportBots(botIds) {
|
|
136
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
137
|
-
if (!this._proxy)
|
|
138
|
-
return null;
|
|
139
|
-
return yield this._proxy.exportBots(botIds);
|
|
140
|
-
});
|
|
99
|
+
async shout(eventName, botIds, arg) {
|
|
100
|
+
if (!this._proxy)
|
|
101
|
+
return null;
|
|
102
|
+
return await this._proxy.shout(eventName, botIds, arg);
|
|
103
|
+
}
|
|
104
|
+
async formulaBatch(formulas) {
|
|
105
|
+
if (!this._proxy)
|
|
106
|
+
return null;
|
|
107
|
+
return await this._proxy.formulaBatch(formulas);
|
|
108
|
+
}
|
|
109
|
+
async forkAux(newId) {
|
|
110
|
+
if (!this._proxy)
|
|
111
|
+
return null;
|
|
112
|
+
return await this._proxy.forkAux(newId);
|
|
113
|
+
}
|
|
114
|
+
async exportBots(botIds) {
|
|
115
|
+
if (!this._proxy)
|
|
116
|
+
return null;
|
|
117
|
+
return await this._proxy.exportBots(botIds);
|
|
141
118
|
}
|
|
142
119
|
/**
|
|
143
120
|
* Exports the causal tree for the simulation.
|
|
144
121
|
*/
|
|
145
|
-
export() {
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
return
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
updateDevice(device) {
|
|
160
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
161
|
-
if (!this._proxy)
|
|
162
|
-
return null;
|
|
163
|
-
return yield this._proxy.updateDevice(device);
|
|
164
|
-
});
|
|
122
|
+
async export() {
|
|
123
|
+
if (!this._proxy)
|
|
124
|
+
return null;
|
|
125
|
+
return await this._proxy.export();
|
|
126
|
+
}
|
|
127
|
+
async getTags() {
|
|
128
|
+
if (!this._proxy)
|
|
129
|
+
return null;
|
|
130
|
+
return await this._proxy.getTags();
|
|
131
|
+
}
|
|
132
|
+
async updateDevice(device) {
|
|
133
|
+
if (!this._proxy)
|
|
134
|
+
return null;
|
|
135
|
+
return await this._proxy.updateDevice(device);
|
|
165
136
|
}
|
|
166
137
|
/**
|
|
167
138
|
* Gets a new endpoint for the aux channel.
|
|
@@ -187,27 +158,23 @@ export class RemoteAuxVM {
|
|
|
187
158
|
_createSubVM(id, origin, configBotId, channel) {
|
|
188
159
|
return new RemoteAuxVM(id, origin, configBotId, channel);
|
|
189
160
|
}
|
|
190
|
-
_handleAddedSubChannel(subChannel) {
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
this._subVMMap.delete(channelId);
|
|
208
|
-
this._subVMRemoved.next(vm);
|
|
209
|
-
}
|
|
210
|
-
});
|
|
161
|
+
async _handleAddedSubChannel(subChannel) {
|
|
162
|
+
const { id, configBotId } = await subChannel.getInfo();
|
|
163
|
+
const channel = (await subChannel.getChannel());
|
|
164
|
+
const subVM = {
|
|
165
|
+
id,
|
|
166
|
+
vm: this._createSubVM(id, this.origin, configBotId, channel),
|
|
167
|
+
channel,
|
|
168
|
+
};
|
|
169
|
+
this._subVMMap.set(id, subVM);
|
|
170
|
+
this._subVMAdded.next(subVM);
|
|
171
|
+
}
|
|
172
|
+
async _handleRemovedSubChannel(channelId) {
|
|
173
|
+
const vm = this._subVMMap.get(channelId);
|
|
174
|
+
if (vm) {
|
|
175
|
+
this._subVMMap.delete(channelId);
|
|
176
|
+
this._subVMRemoved.next(vm);
|
|
177
|
+
}
|
|
211
178
|
}
|
|
212
179
|
}
|
|
213
180
|
//# sourceMappingURL=RemoteAuxVM.js.map
|
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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"}
|