@casual-simulation/aux-vm-browser 3.2.14 → 3.2.16
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/LICENSE.txt +1 -1
- package/package.json +9 -9
- package/vm/AuxVMImpl.d.ts +6 -3
- package/vm/AuxVMImpl.js +9 -4
- package/vm/AuxVMImpl.js.map +1 -1
- package/vm/ConnectableAuxVM.d.ts +5 -3
- package/vm/ConnectableAuxVM.js +8 -4
- package/vm/ConnectableAuxVM.js.map +1 -1
package/LICENSE.txt
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
MIT License
|
|
2
2
|
|
|
3
|
-
Copyright (c) 2019 Casual Simulation, Inc.
|
|
3
|
+
Copyright (c) 2019-2024 Casual Simulation, Inc.
|
|
4
4
|
|
|
5
5
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
6
|
of this software and associated documentation files (the "Software"), to deal
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@casual-simulation/aux-vm-browser",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.16",
|
|
4
4
|
"description": "A set of utilities required to securely run an AUX in a web browser.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aux"
|
|
@@ -40,13 +40,13 @@
|
|
|
40
40
|
"url": "https://github.com/casual-simulation/casualos/issues"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@casual-simulation/aux-common": "^3.2.
|
|
44
|
-
"@casual-simulation/aux-records": "^3.2.
|
|
45
|
-
"@casual-simulation/aux-runtime": "^3.2.
|
|
46
|
-
"@casual-simulation/aux-vm": "^3.2.
|
|
47
|
-
"@casual-simulation/aux-vm-client": "^3.2.
|
|
48
|
-
"@casual-simulation/aux-websocket": "^3.2.
|
|
49
|
-
"@casual-simulation/aux-websocket-aws": "^3.2.
|
|
43
|
+
"@casual-simulation/aux-common": "^3.2.16",
|
|
44
|
+
"@casual-simulation/aux-records": "^3.2.16",
|
|
45
|
+
"@casual-simulation/aux-runtime": "^3.2.16",
|
|
46
|
+
"@casual-simulation/aux-vm": "^3.2.16",
|
|
47
|
+
"@casual-simulation/aux-vm-client": "^3.2.16",
|
|
48
|
+
"@casual-simulation/aux-websocket": "^3.2.16",
|
|
49
|
+
"@casual-simulation/aux-websocket-aws": "^3.2.16",
|
|
50
50
|
"@casual-simulation/crypto": "^3.2.7",
|
|
51
51
|
"@casual-simulation/crypto-browser": "^3.2.7",
|
|
52
52
|
"@casual-simulation/websocket": "^3.2.7",
|
|
@@ -58,5 +58,5 @@
|
|
|
58
58
|
"rxjs": "7.5.7",
|
|
59
59
|
"uuid": "^8.3.2"
|
|
60
60
|
},
|
|
61
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "f4cd3294dc7b32a1844f6997be23eee7654131f7"
|
|
62
62
|
}
|
package/vm/AuxVMImpl.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { BotAction, StateUpdatedEvent, StoredAux, PartitionAuthMessage } from '@casual-simulation/aux-common';
|
|
2
2
|
import { Observable } from 'rxjs';
|
|
3
3
|
import { Remote } from 'comlink';
|
|
4
|
-
import { AuxConfig, AuxVM, ChannelActionResult } from '@casual-simulation/aux-vm';
|
|
4
|
+
import { AuxConfig, AuxVM, ChannelActionResult, SimulationOrigin } from '@casual-simulation/aux-vm';
|
|
5
5
|
import { AuxChannel, AuxChannelErrorType } from '@casual-simulation/aux-vm';
|
|
6
6
|
import { StatusUpdate, DeviceAction } from '@casual-simulation/aux-common';
|
|
7
7
|
import { AuxSubVM } from '@casual-simulation/aux-vm/vm';
|
|
@@ -29,6 +29,7 @@ export declare class AuxVMImpl implements AuxVM {
|
|
|
29
29
|
private _proxy;
|
|
30
30
|
private _id;
|
|
31
31
|
private _relaxOrigin;
|
|
32
|
+
private _origin;
|
|
32
33
|
closed: boolean;
|
|
33
34
|
/**
|
|
34
35
|
* The ID of the simulation.
|
|
@@ -38,10 +39,12 @@ export declare class AuxVMImpl implements AuxVM {
|
|
|
38
39
|
/**
|
|
39
40
|
* Creates a new Simulation VM.
|
|
40
41
|
* @param id The ID of the simulation.
|
|
42
|
+
* @param origin The origin of the simulation.
|
|
41
43
|
* @param config The config that should be used.
|
|
42
44
|
* @param relaxOrigin Whether to relax the origin of the VM.
|
|
43
45
|
*/
|
|
44
|
-
constructor(id: string, config: AuxConfig, relaxOrigin?: boolean);
|
|
46
|
+
constructor(id: string, origin: SimulationOrigin, config: AuxConfig, relaxOrigin?: boolean);
|
|
47
|
+
get origin(): SimulationOrigin;
|
|
45
48
|
get subVMAdded(): Observable<AuxSubVM>;
|
|
46
49
|
get subVMRemoved(): Observable<AuxSubVM>;
|
|
47
50
|
get connectionStateChanged(): Observable<StatusUpdate>;
|
|
@@ -92,7 +95,7 @@ export declare class AuxVMImpl implements AuxVM {
|
|
|
92
95
|
createEndpoint(): Promise<MessagePort>;
|
|
93
96
|
sendAuthMessage(message: PartitionAuthMessage): Promise<void>;
|
|
94
97
|
unsubscribe(): void;
|
|
95
|
-
protected _createSubVM(id: string, configBotId: string, channel: Remote<AuxChannel>): AuxVM;
|
|
98
|
+
protected _createSubVM(id: string, origin: SimulationOrigin, configBotId: string, channel: Remote<AuxChannel>): AuxVM;
|
|
96
99
|
private _handleAddedSubChannel;
|
|
97
100
|
private _handleRemovedSubChannel;
|
|
98
101
|
}
|
package/vm/AuxVMImpl.js
CHANGED
|
@@ -34,11 +34,13 @@ export class AuxVMImpl {
|
|
|
34
34
|
/**
|
|
35
35
|
* Creates a new Simulation VM.
|
|
36
36
|
* @param id The ID of the simulation.
|
|
37
|
+
* @param origin The origin of the simulation.
|
|
37
38
|
* @param config The config that should be used.
|
|
38
39
|
* @param relaxOrigin Whether to relax the origin of the VM.
|
|
39
40
|
*/
|
|
40
|
-
constructor(id, config, relaxOrigin = false) {
|
|
41
|
+
constructor(id, origin, config, relaxOrigin = false) {
|
|
41
42
|
this._id = id;
|
|
43
|
+
this._origin = origin;
|
|
42
44
|
this._config = config;
|
|
43
45
|
this._relaxOrigin = relaxOrigin;
|
|
44
46
|
this._localEvents = new Subject();
|
|
@@ -52,6 +54,9 @@ export class AuxVMImpl {
|
|
|
52
54
|
this._subVMMap = new Map();
|
|
53
55
|
this._onAuthMessage = new Subject();
|
|
54
56
|
}
|
|
57
|
+
get origin() {
|
|
58
|
+
return this._origin;
|
|
59
|
+
}
|
|
55
60
|
get subVMAdded() {
|
|
56
61
|
return this._subVMAdded;
|
|
57
62
|
}
|
|
@@ -227,8 +232,8 @@ export class AuxVMImpl {
|
|
|
227
232
|
this._localEvents.unsubscribe();
|
|
228
233
|
this._localEvents = null;
|
|
229
234
|
}
|
|
230
|
-
_createSubVM(id, configBotId, channel) {
|
|
231
|
-
return new RemoteAuxVM(id, configBotId, channel);
|
|
235
|
+
_createSubVM(id, origin, configBotId, channel) {
|
|
236
|
+
return new RemoteAuxVM(id, origin, configBotId, channel);
|
|
232
237
|
}
|
|
233
238
|
_handleAddedSubChannel(subChannel) {
|
|
234
239
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -236,7 +241,7 @@ export class AuxVMImpl {
|
|
|
236
241
|
const channel = (yield subChannel.getChannel());
|
|
237
242
|
const subVM = {
|
|
238
243
|
id: id,
|
|
239
|
-
vm: this._createSubVM(id, configBotId, channel),
|
|
244
|
+
vm: this._createSubVM(id, this.origin, configBotId, channel),
|
|
240
245
|
channel,
|
|
241
246
|
};
|
|
242
247
|
this._subVMMap.set(id, subVM);
|
package/vm/AuxVMImpl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuxVMImpl.js","sourceRoot":"","sources":["AuxVMImpl.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAIH,wBAAwB,GAI3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAc,OAAO,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAU,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"AuxVMImpl.js","sourceRoot":"","sources":["AuxVMImpl.ts"],"names":[],"mappings":"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"}
|
package/vm/ConnectableAuxVM.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BotAction, PartitionAuthMessage, StateUpdatedEvent, StoredAux } from '@casual-simulation/aux-common';
|
|
2
2
|
import { AuxDevice, RuntimeActions, RuntimeStateVersion } from '@casual-simulation/aux-runtime';
|
|
3
|
-
import { AuxVM, AuxChannel, AuxChannelErrorType, ChannelActionResult } from '@casual-simulation/aux-vm';
|
|
3
|
+
import { AuxVM, AuxChannel, AuxChannelErrorType, ChannelActionResult, SimulationOrigin } from '@casual-simulation/aux-vm';
|
|
4
4
|
import { AuxSubVM } from '@casual-simulation/aux-vm/vm';
|
|
5
5
|
import { DeviceAction, StatusUpdate } from '@casual-simulation/aux-common';
|
|
6
6
|
import { Remote } from 'comlink';
|
|
@@ -24,9 +24,11 @@ export declare class ConnectableAuxVM implements AuxVM {
|
|
|
24
24
|
private _proxy;
|
|
25
25
|
private _port;
|
|
26
26
|
private _sub;
|
|
27
|
+
private _origin;
|
|
27
28
|
get id(): string;
|
|
29
|
+
get origin(): SimulationOrigin;
|
|
28
30
|
get configBotId(): string;
|
|
29
|
-
constructor(id: string, configBotId: string, port: MessagePort);
|
|
31
|
+
constructor(id: string, origin: SimulationOrigin, configBotId: string, port: MessagePort);
|
|
30
32
|
get subVMAdded(): Observable<AuxSubVM>;
|
|
31
33
|
get subVMRemoved(): Observable<AuxSubVM>;
|
|
32
34
|
createEndpoint?(): Promise<MessagePort>;
|
|
@@ -69,7 +71,7 @@ export declare class ConnectableAuxVM implements AuxVM {
|
|
|
69
71
|
export(): Promise<StoredAux>;
|
|
70
72
|
getTags(): Promise<string[]>;
|
|
71
73
|
updateDevice(device: AuxDevice): Promise<void>;
|
|
72
|
-
protected _createSubVM(id: string, configBotId: string, channel: Remote<AuxChannel>): AuxVM;
|
|
74
|
+
protected _createSubVM(id: string, origin: SimulationOrigin, configBotId: string, channel: Remote<AuxChannel>): AuxVM;
|
|
73
75
|
sendAuthMessage(message: PartitionAuthMessage): Promise<void>;
|
|
74
76
|
private _handleAddedSubChannel;
|
|
75
77
|
private _handleRemovedSubChannel;
|
package/vm/ConnectableAuxVM.js
CHANGED
|
@@ -17,11 +17,15 @@ export class ConnectableAuxVM {
|
|
|
17
17
|
get id() {
|
|
18
18
|
return this._id;
|
|
19
19
|
}
|
|
20
|
+
get origin() {
|
|
21
|
+
return this._origin;
|
|
22
|
+
}
|
|
20
23
|
get configBotId() {
|
|
21
24
|
return this._configBotId;
|
|
22
25
|
}
|
|
23
|
-
constructor(id, configBotId, port) {
|
|
26
|
+
constructor(id, origin, configBotId, port) {
|
|
24
27
|
this._id = id;
|
|
28
|
+
this._origin = origin;
|
|
25
29
|
this._configBotId = configBotId;
|
|
26
30
|
this._proxy = wrap(port);
|
|
27
31
|
this._localEvents = new Subject();
|
|
@@ -156,8 +160,8 @@ export class ConnectableAuxVM {
|
|
|
156
160
|
return yield this._proxy.updateDevice(device);
|
|
157
161
|
});
|
|
158
162
|
}
|
|
159
|
-
_createSubVM(id, configBotId, channel) {
|
|
160
|
-
return new RemoteAuxVM(id, configBotId, channel);
|
|
163
|
+
_createSubVM(id, origin, configBotId, channel) {
|
|
164
|
+
return new RemoteAuxVM(id, origin, configBotId, channel);
|
|
161
165
|
}
|
|
162
166
|
sendAuthMessage(message) {
|
|
163
167
|
return this._proxy.sendAuthMessage(message);
|
|
@@ -168,7 +172,7 @@ export class ConnectableAuxVM {
|
|
|
168
172
|
const channel = (yield subChannel.getChannel());
|
|
169
173
|
const subVM = {
|
|
170
174
|
id,
|
|
171
|
-
vm: this._createSubVM(id, configBotId, channel),
|
|
175
|
+
vm: this._createSubVM(id, this.origin, configBotId, channel),
|
|
172
176
|
channel,
|
|
173
177
|
};
|
|
174
178
|
this._subVMMap.set(id, subVM);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectableAuxVM.js","sourceRoot":"","sources":["ConnectableAuxVM.ts"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"ConnectableAuxVM.js","sourceRoot":"","sources":["ConnectableAuxVM.ts"],"names":[],"mappings":"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"}
|