@casual-simulation/aux-vm-browser 3.1.12 → 3.1.14-alpha.3661157217
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +17 -5
- package/managers/AuthEndpointHelper.d.ts +1 -0
- package/managers/AuthEndpointHelper.js +4 -0
- package/managers/AuthEndpointHelper.js.map +1 -1
- package/managers/AuthHelper.d.ts +1 -0
- package/managers/AuthHelper.js +5 -2
- package/managers/AuthHelper.js.map +1 -1
- package/managers/BotManager.d.ts +5 -2
- package/managers/BotManager.js +122 -116
- package/managers/BotManager.js.map +1 -1
- package/package.json +9 -9
- package/vm/AuxVMImpl.d.ts +11 -1
- package/vm/AuxVMImpl.js +37 -1
- package/vm/AuxVMImpl.js.map +1 -1
- package/vm/BrowserAuxChannel.d.ts +4 -2
- package/vm/BrowserAuxChannel.js +12 -0
- package/vm/BrowserAuxChannel.js.map +1 -1
- package/vm/ConnectableAuxVM.d.ts +12 -1
- package/vm/ConnectableAuxVM.js +40 -1
- package/vm/ConnectableAuxVM.js.map +1 -1
package/README.md
CHANGED
|
@@ -52,7 +52,7 @@ new HtmlWebpackPlugin({
|
|
|
52
52
|
#### Connect to an AUX
|
|
53
53
|
|
|
54
54
|
```javascript
|
|
55
|
-
import { BotManager } from '@casual-simulation/aux-vm-browser';
|
|
55
|
+
import { BotManager, AuxVMImpl } from '@casual-simulation/aux-vm-browser';
|
|
56
56
|
import { AuxUser } from '@casual-simulation/aux-vm';
|
|
57
57
|
|
|
58
58
|
start();
|
|
@@ -75,12 +75,24 @@ async function start() {
|
|
|
75
75
|
// - 'https://example.com/*/channelId' - This will load 'channelId' from example.com over https
|
|
76
76
|
const id = 'channelId';
|
|
77
77
|
|
|
78
|
-
|
|
79
|
-
// This represents an in-browser AUX simulation.
|
|
80
|
-
const sim = new BotManager(user, id, {
|
|
78
|
+
const config = {
|
|
81
79
|
isBuilder: false,
|
|
82
80
|
isPlayer: false,
|
|
83
|
-
}
|
|
81
|
+
};
|
|
82
|
+
|
|
83
|
+
const partitions = BotManager.createPartitions(id, user, config);
|
|
84
|
+
|
|
85
|
+
// Create a file manager.
|
|
86
|
+
// This represents an in-browser AUX simulation.
|
|
87
|
+
const sim = new BotManager(
|
|
88
|
+
user,
|
|
89
|
+
id,
|
|
90
|
+
config,
|
|
91
|
+
new AuxVMImpl(user, {
|
|
92
|
+
config,
|
|
93
|
+
partitions,
|
|
94
|
+
})
|
|
95
|
+
);
|
|
84
96
|
|
|
85
97
|
// Initialize the simulation.
|
|
86
98
|
// This will setup a web worker and pipe
|
|
@@ -25,6 +25,7 @@ export declare class AuthEndpointHelper implements AuthHelperInterface {
|
|
|
25
25
|
*/
|
|
26
26
|
constructor(iframeOrigin?: string, defaultRecordsOrigin?: string);
|
|
27
27
|
get origin(): string;
|
|
28
|
+
get recordsOrigin(): string;
|
|
28
29
|
get loginStatus(): BehaviorSubject<LoginStatus>;
|
|
29
30
|
get loginUIStatus(): BehaviorSubject<LoginUIStatus>;
|
|
30
31
|
/**
|
|
@@ -37,6 +37,10 @@ export class AuthEndpointHelper {
|
|
|
37
37
|
get origin() {
|
|
38
38
|
return this._origin;
|
|
39
39
|
}
|
|
40
|
+
get recordsOrigin() {
|
|
41
|
+
var _a, _b;
|
|
42
|
+
return ((_b = (_a = this._recordsOrigin) !== null && _a !== void 0 ? _a : this._defaultRecordsOrigin) !== null && _b !== void 0 ? _b : this._origin);
|
|
43
|
+
}
|
|
40
44
|
get loginStatus() {
|
|
41
45
|
return this._loginStatus;
|
|
42
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthEndpointHelper.js","sourceRoot":"","sources":["AuthEndpointHelper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AuthEndpointHelper.js","sourceRoot":"","sources":["AuthEndpointHelper.ts"],"names":[],"mappings":"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"}
|
package/managers/AuthHelper.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ export declare class AuthHelper {
|
|
|
6
6
|
private _loginUIStatus;
|
|
7
7
|
private _auths;
|
|
8
8
|
private _useCustomUI;
|
|
9
|
+
get primaryAuthOrigin(): string;
|
|
9
10
|
constructor(primaryAuthOrigin: string, primaryRecordsOrigin: string);
|
|
10
11
|
get primary(): AuthHelperInterface;
|
|
11
12
|
get loginUIStatus(): Observable<LoginUIStatus & {
|
package/managers/AuthHelper.js
CHANGED
|
@@ -8,10 +8,13 @@ export class AuthHelper {
|
|
|
8
8
|
this._auths = new Map();
|
|
9
9
|
this._loginUIStatus = new Subject();
|
|
10
10
|
this._primary.loginUIStatus
|
|
11
|
-
.pipe(map(s => (Object.assign(Object.assign({}, s), { endpoint: primaryAuthOrigin }))))
|
|
11
|
+
.pipe(map((s) => (Object.assign(Object.assign({}, s), { endpoint: primaryAuthOrigin }))))
|
|
12
12
|
.subscribe(this._loginUIStatus);
|
|
13
13
|
this._auths.set(primaryAuthOrigin, this._primary);
|
|
14
14
|
}
|
|
15
|
+
get primaryAuthOrigin() {
|
|
16
|
+
return this._primary.origin;
|
|
17
|
+
}
|
|
15
18
|
get primary() {
|
|
16
19
|
return this._primary;
|
|
17
20
|
}
|
|
@@ -24,7 +27,7 @@ export class AuthHelper {
|
|
|
24
27
|
createEndpoint(endpoint) {
|
|
25
28
|
const helper = new AuthEndpointHelper(endpoint);
|
|
26
29
|
helper.loginUIStatus
|
|
27
|
-
.pipe(map(s => (Object.assign(Object.assign({}, s), { endpoint }))))
|
|
30
|
+
.pipe(map((s) => (Object.assign(Object.assign({}, s), { endpoint }))))
|
|
28
31
|
.subscribe(this._loginUIStatus);
|
|
29
32
|
this._auths.set(endpoint, helper);
|
|
30
33
|
helper.setUseCustomUI(this._useCustomUI);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHelper.js","sourceRoot":"","sources":["AuthHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,OAAO,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,MAAM,OAAO,UAAU;
|
|
1
|
+
{"version":3,"file":"AuthHelper.js","sourceRoot":"","sources":["AuthHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,OAAO,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,MAAM,OAAO,UAAU;IAUnB,YAAY,iBAAyB,EAAE,oBAA4B;QAN3D,iBAAY,GAAY,KAAK,CAAC;QAOlC,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAkB,CAClC,iBAAiB,EACjB,oBAAoB,CACvB,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,cAAc,GAAG,IAAI,OAAO,EAAE,CAAC;QACpC,IAAI,CAAC,QAAQ,CAAC,aAAa;aACtB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCAAM,CAAC,KAAE,QAAQ,EAAE,iBAAiB,IAAG,CAAC,CAAC;aACzD,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACtD,CAAC;IAfD,IAAI,iBAAiB;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAChC,CAAC;IAeD,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED,WAAW,CAAC,QAAgB;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAED,cAAc,CAAC,QAAgB;QAC3B,MAAM,MAAM,GAAG,IAAI,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAChD,MAAM,CAAC,aAAa;aACf,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCAAM,CAAC,KAAE,QAAQ,IAAG,CAAC,CAAC;aACtC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAClC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzC,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,cAAc,CAAC,WAAoB;QAC/B,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAEhC,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE;YACnC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;SACpC;IACL,CAAC;CACJ"}
|
package/managers/BotManager.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Bot, BotTags } from '@casual-simulation/aux-common';
|
|
1
|
+
import { Bot, BotTags, AuxPartitionConfig } from '@casual-simulation/aux-common';
|
|
2
2
|
import { AuxUser, AuxVM, BaseSimulation, LoginManager, AuxConfig, RecordsManager } from '@casual-simulation/aux-vm';
|
|
3
3
|
import { BotPanelManager } from './BotPanelManager';
|
|
4
4
|
import { BrowserSimulation } from './BrowserSimulation';
|
|
@@ -23,6 +23,7 @@ export declare class BotManager extends BaseSimulation implements BrowserSimulat
|
|
|
23
23
|
private _authHelper;
|
|
24
24
|
private _recordsManager;
|
|
25
25
|
private _livekitManager;
|
|
26
|
+
private _config;
|
|
26
27
|
/**
|
|
27
28
|
* Gets the bots panel manager.
|
|
28
29
|
*/
|
|
@@ -36,9 +37,11 @@ export declare class BotManager extends BaseSimulation implements BrowserSimulat
|
|
|
36
37
|
get livekit(): LivekitManager;
|
|
37
38
|
get consoleMessages(): Observable<ConsoleMessages>;
|
|
38
39
|
get portals(): PortalManager;
|
|
39
|
-
|
|
40
|
+
static createPartitions(id: string, user: AuxUser, config: AuxConfig['config'], defaultHost?: string): AuxPartitionConfig;
|
|
41
|
+
constructor(user: AuxUser, id: string, config: AuxConfig['config'], vm: AuxVM);
|
|
40
42
|
editBot(bot: Bot | BotTags, tag: string, value: any, space?: string): Promise<void>;
|
|
41
43
|
protected _beforeVmInit(): void;
|
|
44
|
+
protected _createSubSimulation(user: AuxUser, id: string, vm: AuxVM): BotManager;
|
|
42
45
|
private _getAuthEndpointHelper;
|
|
43
46
|
}
|
|
44
47
|
//# sourceMappingURL=BotManager.d.ts.map
|
package/managers/BotManager.js
CHANGED
|
@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
import { parseSimulationId, createBot, TEMPORARY_BOT_PARTITION_ID, COOKIE_BOT_PARTITION_ID, isBot, ADMIN_PARTITION_ID, ADMIN_BRANCH_NAME, TEMPORARY_SHARED_PARTITION_ID, REMOTE_TEMPORARY_SHARED_PARTITION_ID, BOOTSTRAP_PARTITION_ID, getTagValueForSpace, getUpdateForTagAndSpace, } from '@casual-simulation/aux-common';
|
|
11
11
|
import { BaseSimulation, LoginManager, RecordsManager, } from '@casual-simulation/aux-vm';
|
|
12
12
|
import { BotPanelManager } from './BotPanelManager';
|
|
13
|
-
import { AuxVMImpl } from '../vm/AuxVMImpl';
|
|
14
13
|
import { PortalManager, ProgressManager } from '@casual-simulation/aux-vm';
|
|
15
14
|
import { filter, tap } from 'rxjs/operators';
|
|
16
15
|
import { getFinalUrl } from '@casual-simulation/aux-vm-client';
|
|
@@ -25,124 +24,13 @@ import { LivekitManager } from './LivekitManager';
|
|
|
25
24
|
* to reactively edit bots.
|
|
26
25
|
*/
|
|
27
26
|
export class BotManager extends BaseSimulation {
|
|
28
|
-
constructor(user, id, config,
|
|
29
|
-
super(id,
|
|
27
|
+
constructor(user, id, config, vm) {
|
|
28
|
+
super(id, vm);
|
|
29
|
+
this._config = config;
|
|
30
30
|
this.helper.userId = user ? user.id : null;
|
|
31
31
|
this._authHelper = new AuthHelper(config.authOrigin, config.recordsOrigin);
|
|
32
32
|
this._login = new LoginManager(this._vm);
|
|
33
33
|
this._progress = new ProgressManager(this._vm);
|
|
34
|
-
function createPartitions() {
|
|
35
|
-
var _a;
|
|
36
|
-
const parsedId = parseSimulationId(id);
|
|
37
|
-
const host = getFinalUrl(defaultHost, parsedId.host);
|
|
38
|
-
const causalRepoHost = getFinalUrl(config.causalRepoConnectionUrl || defaultHost, parsedId.host);
|
|
39
|
-
const protocol = config.causalRepoConnectionProtocol;
|
|
40
|
-
const versions = config.sharedPartitionsVersion;
|
|
41
|
-
const isV2 = versions === 'v2';
|
|
42
|
-
const isCollaborative = !!((_a = config.device) === null || _a === void 0 ? void 0 : _a.isCollaborative);
|
|
43
|
-
if (!isCollaborative) {
|
|
44
|
-
console.log('[BotManager] Disabling Collaboration Features');
|
|
45
|
-
}
|
|
46
|
-
else {
|
|
47
|
-
if (isV2) {
|
|
48
|
-
console.log('[BotManager] Using v2 shared partitions');
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
let partitions = {
|
|
52
|
-
// Use a memory partition instead of a shared partition
|
|
53
|
-
// when collaboration is disabled.
|
|
54
|
-
shared: isCollaborative
|
|
55
|
-
? isV2
|
|
56
|
-
? {
|
|
57
|
-
type: 'remote_yjs',
|
|
58
|
-
branch: parsedId.channel,
|
|
59
|
-
host: causalRepoHost,
|
|
60
|
-
connectionProtocol: protocol,
|
|
61
|
-
}
|
|
62
|
-
: {
|
|
63
|
-
type: 'remote_causal_repo',
|
|
64
|
-
branch: parsedId.channel,
|
|
65
|
-
host: causalRepoHost,
|
|
66
|
-
connectionProtocol: protocol,
|
|
67
|
-
}
|
|
68
|
-
: {
|
|
69
|
-
type: 'memory',
|
|
70
|
-
initialState: {},
|
|
71
|
-
},
|
|
72
|
-
[COOKIE_BOT_PARTITION_ID]: {
|
|
73
|
-
type: 'proxy',
|
|
74
|
-
partition: new LocalStoragePartitionImpl({
|
|
75
|
-
type: 'local_storage',
|
|
76
|
-
namespace: `aux/${parsedId.channel}`,
|
|
77
|
-
private: true,
|
|
78
|
-
}),
|
|
79
|
-
},
|
|
80
|
-
[TEMPORARY_BOT_PARTITION_ID]: {
|
|
81
|
-
type: 'memory',
|
|
82
|
-
private: true,
|
|
83
|
-
initialState: {
|
|
84
|
-
[user.id]: createBot(user.id, {
|
|
85
|
-
inst: id,
|
|
86
|
-
}),
|
|
87
|
-
},
|
|
88
|
-
},
|
|
89
|
-
[TEMPORARY_SHARED_PARTITION_ID]: isCollaborative
|
|
90
|
-
? isV2
|
|
91
|
-
? {
|
|
92
|
-
type: 'remote_yjs',
|
|
93
|
-
branch: `${parsedId.channel}-player-${user.id}`,
|
|
94
|
-
host: causalRepoHost,
|
|
95
|
-
connectionProtocol: protocol,
|
|
96
|
-
temporary: true,
|
|
97
|
-
remoteEvents: false,
|
|
98
|
-
}
|
|
99
|
-
: {
|
|
100
|
-
type: 'remote_causal_repo',
|
|
101
|
-
branch: `${parsedId.channel}-player-${user.id}`,
|
|
102
|
-
host: causalRepoHost,
|
|
103
|
-
connectionProtocol: protocol,
|
|
104
|
-
temporary: true,
|
|
105
|
-
remoteEvents: false,
|
|
106
|
-
}
|
|
107
|
-
: {
|
|
108
|
-
type: 'memory',
|
|
109
|
-
initialState: {},
|
|
110
|
-
},
|
|
111
|
-
[REMOTE_TEMPORARY_SHARED_PARTITION_ID]: isCollaborative
|
|
112
|
-
? {
|
|
113
|
-
type: 'other_players_repo',
|
|
114
|
-
branch: parsedId.channel,
|
|
115
|
-
host: causalRepoHost,
|
|
116
|
-
connectionProtocol: protocol,
|
|
117
|
-
childPartitionType: isV2
|
|
118
|
-
? 'yjs_client'
|
|
119
|
-
: 'causal_repo_client',
|
|
120
|
-
}
|
|
121
|
-
: null,
|
|
122
|
-
[BOOTSTRAP_PARTITION_ID]: {
|
|
123
|
-
type: 'memory',
|
|
124
|
-
initialState: config.bootstrapState
|
|
125
|
-
? getBotsStateFromStoredAux(config.bootstrapState)
|
|
126
|
-
: {},
|
|
127
|
-
private: true,
|
|
128
|
-
},
|
|
129
|
-
};
|
|
130
|
-
// Enable the admin partition and error partition when using the websocket protocol.
|
|
131
|
-
if (!config.causalRepoConnectionProtocol ||
|
|
132
|
-
config.causalRepoConnectionProtocol === 'websocket') {
|
|
133
|
-
partitions[ADMIN_PARTITION_ID] = isCollaborative
|
|
134
|
-
? {
|
|
135
|
-
type: 'remote_causal_repo',
|
|
136
|
-
branch: ADMIN_BRANCH_NAME,
|
|
137
|
-
host: causalRepoHost,
|
|
138
|
-
connectionProtocol: protocol,
|
|
139
|
-
private: true,
|
|
140
|
-
static: true,
|
|
141
|
-
}
|
|
142
|
-
: null;
|
|
143
|
-
}
|
|
144
|
-
return partitions;
|
|
145
|
-
}
|
|
146
34
|
}
|
|
147
35
|
/**
|
|
148
36
|
* Gets the bots panel manager.
|
|
@@ -179,6 +67,118 @@ export class BotManager extends BaseSimulation {
|
|
|
179
67
|
get portals() {
|
|
180
68
|
return this._portals;
|
|
181
69
|
}
|
|
70
|
+
static createPartitions(id, user, config, defaultHost = location.origin) {
|
|
71
|
+
var _a;
|
|
72
|
+
const parsedId = parseSimulationId(id);
|
|
73
|
+
const host = getFinalUrl(defaultHost, parsedId.host);
|
|
74
|
+
const causalRepoHost = getFinalUrl(config.causalRepoConnectionUrl || defaultHost, parsedId.host);
|
|
75
|
+
const protocol = config.causalRepoConnectionProtocol;
|
|
76
|
+
const versions = config.sharedPartitionsVersion;
|
|
77
|
+
const isV2 = versions === 'v2';
|
|
78
|
+
const isCollaborative = !!((_a = config.device) === null || _a === void 0 ? void 0 : _a.isCollaborative);
|
|
79
|
+
if (!isCollaborative) {
|
|
80
|
+
console.log('[BotManager] Disabling Collaboration Features');
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
if (isV2) {
|
|
84
|
+
console.log('[BotManager] Using v2 shared partitions');
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
let partitions = {
|
|
88
|
+
// Use a memory partition instead of a shared partition
|
|
89
|
+
// when collaboration is disabled.
|
|
90
|
+
shared: isCollaborative
|
|
91
|
+
? isV2
|
|
92
|
+
? {
|
|
93
|
+
type: 'remote_yjs',
|
|
94
|
+
branch: parsedId.channel,
|
|
95
|
+
host: causalRepoHost,
|
|
96
|
+
connectionProtocol: protocol,
|
|
97
|
+
}
|
|
98
|
+
: {
|
|
99
|
+
type: 'remote_causal_repo',
|
|
100
|
+
branch: parsedId.channel,
|
|
101
|
+
host: causalRepoHost,
|
|
102
|
+
connectionProtocol: protocol,
|
|
103
|
+
}
|
|
104
|
+
: {
|
|
105
|
+
type: 'memory',
|
|
106
|
+
initialState: {},
|
|
107
|
+
},
|
|
108
|
+
[COOKIE_BOT_PARTITION_ID]: {
|
|
109
|
+
type: 'proxy',
|
|
110
|
+
partition: new LocalStoragePartitionImpl({
|
|
111
|
+
type: 'local_storage',
|
|
112
|
+
namespace: `aux/${parsedId.channel}`,
|
|
113
|
+
private: true,
|
|
114
|
+
}),
|
|
115
|
+
},
|
|
116
|
+
[TEMPORARY_BOT_PARTITION_ID]: {
|
|
117
|
+
type: 'memory',
|
|
118
|
+
private: true,
|
|
119
|
+
initialState: {
|
|
120
|
+
[user.id]: createBot(user.id, {
|
|
121
|
+
inst: id,
|
|
122
|
+
}),
|
|
123
|
+
},
|
|
124
|
+
},
|
|
125
|
+
[TEMPORARY_SHARED_PARTITION_ID]: isCollaborative
|
|
126
|
+
? isV2
|
|
127
|
+
? {
|
|
128
|
+
type: 'remote_yjs',
|
|
129
|
+
branch: `${parsedId.channel}-player-${user.id}`,
|
|
130
|
+
host: causalRepoHost,
|
|
131
|
+
connectionProtocol: protocol,
|
|
132
|
+
temporary: true,
|
|
133
|
+
remoteEvents: false,
|
|
134
|
+
}
|
|
135
|
+
: {
|
|
136
|
+
type: 'remote_causal_repo',
|
|
137
|
+
branch: `${parsedId.channel}-player-${user.id}`,
|
|
138
|
+
host: causalRepoHost,
|
|
139
|
+
connectionProtocol: protocol,
|
|
140
|
+
temporary: true,
|
|
141
|
+
remoteEvents: false,
|
|
142
|
+
}
|
|
143
|
+
: {
|
|
144
|
+
type: 'memory',
|
|
145
|
+
initialState: {},
|
|
146
|
+
},
|
|
147
|
+
[REMOTE_TEMPORARY_SHARED_PARTITION_ID]: isCollaborative
|
|
148
|
+
? {
|
|
149
|
+
type: 'other_players_repo',
|
|
150
|
+
branch: parsedId.channel,
|
|
151
|
+
host: causalRepoHost,
|
|
152
|
+
connectionProtocol: protocol,
|
|
153
|
+
childPartitionType: isV2
|
|
154
|
+
? 'yjs_client'
|
|
155
|
+
: 'causal_repo_client',
|
|
156
|
+
}
|
|
157
|
+
: null,
|
|
158
|
+
[BOOTSTRAP_PARTITION_ID]: {
|
|
159
|
+
type: 'memory',
|
|
160
|
+
initialState: config.bootstrapState
|
|
161
|
+
? getBotsStateFromStoredAux(config.bootstrapState)
|
|
162
|
+
: {},
|
|
163
|
+
private: true,
|
|
164
|
+
},
|
|
165
|
+
};
|
|
166
|
+
// Enable the admin partition and error partition when using the websocket protocol.
|
|
167
|
+
if (!config.causalRepoConnectionProtocol ||
|
|
168
|
+
config.causalRepoConnectionProtocol === 'websocket') {
|
|
169
|
+
partitions[ADMIN_PARTITION_ID] = isCollaborative
|
|
170
|
+
? {
|
|
171
|
+
type: 'remote_causal_repo',
|
|
172
|
+
branch: ADMIN_BRANCH_NAME,
|
|
173
|
+
host: causalRepoHost,
|
|
174
|
+
connectionProtocol: protocol,
|
|
175
|
+
private: true,
|
|
176
|
+
static: true,
|
|
177
|
+
}
|
|
178
|
+
: null;
|
|
179
|
+
}
|
|
180
|
+
return partitions;
|
|
181
|
+
}
|
|
182
182
|
editBot(bot, tag, value, space = null) {
|
|
183
183
|
return __awaiter(this, void 0, void 0, function* () {
|
|
184
184
|
const val = getTagValueForSpace(this.helper.botsState[bot.id], tag, space);
|
|
@@ -209,11 +209,17 @@ export class BotManager extends BaseSimulation {
|
|
|
209
209
|
.pipe(tap((e) => this._livekitManager.handleEvents(e)))
|
|
210
210
|
.subscribe());
|
|
211
211
|
}
|
|
212
|
+
_createSubSimulation(user, id, vm) {
|
|
213
|
+
return new BotManager(user, id, {
|
|
214
|
+
version: this._config.version,
|
|
215
|
+
versionHash: this._config.versionHash,
|
|
216
|
+
}, vm);
|
|
217
|
+
}
|
|
212
218
|
_getAuthEndpointHelper(endpoint) {
|
|
213
219
|
if (!endpoint) {
|
|
214
220
|
return null;
|
|
215
221
|
}
|
|
216
|
-
if (endpoint === this.
|
|
222
|
+
if (endpoint === this._authHelper.primaryAuthOrigin) {
|
|
217
223
|
return this._authHelper.primary;
|
|
218
224
|
}
|
|
219
225
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BotManager.js","sourceRoot":"","sources":["BotManager.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAGH,iBAAiB,EACjB,SAAS,EAIT,0BAA0B,EAC1B,uBAAuB,EAIvB,KAAK,EAEL,kBAAkB,EAClB,iBAAiB,EACjB,6BAA6B,EAC7B,oCAAoC,EACpC,sBAAsB,EACtB,mBAAmB,EACnB,uBAAuB,GAC1B,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAGH,cAAc,EACd,YAAY,EAIZ,cAAc,GACjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"BotManager.js","sourceRoot":"","sources":["BotManager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@casual-simulation/aux-vm-browser",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.14-alpha.3661157217",
|
|
4
4
|
"description": "A set of utilities required to securely run an AUX in a web browser.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aux"
|
|
@@ -40,18 +40,18 @@
|
|
|
40
40
|
"url": "https://github.com/casual-simulation/casualos/issues"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@casual-simulation/aux-common": "^3.1.
|
|
44
|
-
"@casual-simulation/aux-records": "^3.1.
|
|
45
|
-
"@casual-simulation/aux-vm": "^3.1.
|
|
46
|
-
"@casual-simulation/aux-vm-client": "^3.1.
|
|
47
|
-
"@casual-simulation/causal-trees": "^3.1.
|
|
48
|
-
"@casual-simulation/crypto": "^3.1.
|
|
49
|
-
"@casual-simulation/crypto-browser": "^3.1.
|
|
43
|
+
"@casual-simulation/aux-common": "^3.1.14-alpha.3661157217",
|
|
44
|
+
"@casual-simulation/aux-records": "^3.1.14-alpha.3661157217",
|
|
45
|
+
"@casual-simulation/aux-vm": "^3.1.14-alpha.3661157217",
|
|
46
|
+
"@casual-simulation/aux-vm-client": "^3.1.14-alpha.3661157217",
|
|
47
|
+
"@casual-simulation/causal-trees": "^3.1.14-alpha.3661157217",
|
|
48
|
+
"@casual-simulation/crypto": "^3.1.14-alpha.3661157217",
|
|
49
|
+
"@casual-simulation/crypto-browser": "^3.1.14-alpha.3661157217",
|
|
50
50
|
"comlink": "^4.0.1",
|
|
51
51
|
"livekit-client": "1.4.2",
|
|
52
52
|
"lodash": "4.17.21",
|
|
53
53
|
"rxjs": "7.5.7",
|
|
54
54
|
"uuid": "^8.3.2"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "1a4688a5c80f36121fd0458346f944ea81fec2dd"
|
|
57
57
|
}
|
package/vm/AuxVMImpl.d.ts
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { LocalActions, BotAction, StateUpdatedEvent, RuntimeStateVersion } from '@casual-simulation/aux-common';
|
|
2
2
|
import { Observable } from 'rxjs';
|
|
3
|
+
import { Remote } from 'comlink';
|
|
3
4
|
import { AuxConfig, AuxVM, AuxUser, ChannelActionResult } from '@casual-simulation/aux-vm';
|
|
4
|
-
import { AuxChannelErrorType, StoredAux } from '@casual-simulation/aux-vm';
|
|
5
|
+
import { AuxChannel, AuxChannelErrorType, StoredAux } from '@casual-simulation/aux-vm';
|
|
5
6
|
import { StatusUpdate, DeviceAction } from '@casual-simulation/causal-trees';
|
|
7
|
+
import { AuxSubVM } from '@casual-simulation/aux-vm/vm';
|
|
6
8
|
export declare const DEFAULT_IFRAME_ALLOW_ATTRIBUTE = "accelerometer; ambient-light-sensor; camera; encrypted-media; geolocation; gyroscope; hid; microphone; midi; payment; usb; vr; xr-spatial-tracking";
|
|
7
9
|
export declare const DEFAULT_IFRAME_SANDBOX_ATTRIBUTE = "allow-forms allow-modals allow-popups allow-presentation allow-same-origin allow-scripts allow-downloads";
|
|
8
10
|
/**
|
|
@@ -16,6 +18,9 @@ export declare class AuxVMImpl implements AuxVM {
|
|
|
16
18
|
private _stateUpdated;
|
|
17
19
|
private _versionUpdated;
|
|
18
20
|
private _onError;
|
|
21
|
+
private _subVMAdded;
|
|
22
|
+
private _subVMRemoved;
|
|
23
|
+
private _subVMMap;
|
|
19
24
|
private _config;
|
|
20
25
|
private _iframe;
|
|
21
26
|
private _channel;
|
|
@@ -30,6 +35,8 @@ export declare class AuxVMImpl implements AuxVM {
|
|
|
30
35
|
* Creates a new Simulation VM.
|
|
31
36
|
*/
|
|
32
37
|
constructor(user: AuxUser, config: AuxConfig);
|
|
38
|
+
get subVMAdded(): Observable<AuxSubVM>;
|
|
39
|
+
get subVMRemoved(): Observable<AuxSubVM>;
|
|
33
40
|
get connectionStateChanged(): Observable<StatusUpdate>;
|
|
34
41
|
get onError(): Observable<AuxChannelErrorType>;
|
|
35
42
|
/**
|
|
@@ -77,5 +84,8 @@ export declare class AuxVMImpl implements AuxVM {
|
|
|
77
84
|
*/
|
|
78
85
|
createEndpoint(): Promise<MessagePort>;
|
|
79
86
|
unsubscribe(): void;
|
|
87
|
+
protected _createSubVM(channel: Remote<AuxChannel>): AuxVM;
|
|
88
|
+
private _handleAddedSubChannel;
|
|
89
|
+
private _handleRemovedSubChannel;
|
|
80
90
|
}
|
|
81
91
|
//# sourceMappingURL=AuxVMImpl.d.ts.map
|
package/vm/AuxVMImpl.js
CHANGED
|
@@ -13,6 +13,7 @@ import { wrap, proxy, expose, transfer, createEndpoint } from 'comlink';
|
|
|
13
13
|
import { loadScript, setupChannel, waitForLoad } from '../html/IFrameHelpers';
|
|
14
14
|
import { remapProgressPercent, } from '@casual-simulation/causal-trees';
|
|
15
15
|
import axios from 'axios';
|
|
16
|
+
import { RemoteAuxVM } from '@casual-simulation/aux-vm-client';
|
|
16
17
|
export const DEFAULT_IFRAME_ALLOW_ATTRIBUTE = 'accelerometer; ambient-light-sensor; camera; encrypted-media; geolocation; gyroscope; hid; microphone; midi; payment; usb; vr; xr-spatial-tracking';
|
|
17
18
|
export const DEFAULT_IFRAME_SANDBOX_ATTRIBUTE = 'allow-forms allow-modals allow-popups allow-presentation allow-same-origin allow-scripts allow-downloads';
|
|
18
19
|
/**
|
|
@@ -32,6 +33,15 @@ export class AuxVMImpl {
|
|
|
32
33
|
this._versionUpdated = new Subject();
|
|
33
34
|
this._connectionStateChanged = new Subject();
|
|
34
35
|
this._onError = new Subject();
|
|
36
|
+
this._subVMAdded = new Subject();
|
|
37
|
+
this._subVMRemoved = new Subject();
|
|
38
|
+
this._subVMMap = new Map();
|
|
39
|
+
}
|
|
40
|
+
get subVMAdded() {
|
|
41
|
+
return this._subVMAdded;
|
|
42
|
+
}
|
|
43
|
+
get subVMRemoved() {
|
|
44
|
+
return this._subVMRemoved;
|
|
35
45
|
}
|
|
36
46
|
get connectionStateChanged() {
|
|
37
47
|
return this._connectionStateChanged;
|
|
@@ -78,7 +88,7 @@ export class AuxVMImpl {
|
|
|
78
88
|
const wrapper = wrap(this._channel.port1);
|
|
79
89
|
this._proxy = yield new wrapper(location.origin, this._initialUser, processPartitions(this._config));
|
|
80
90
|
let statusMapper = remapProgressPercent(0.2, 1);
|
|
81
|
-
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)));
|
|
91
|
+
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)));
|
|
82
92
|
});
|
|
83
93
|
}
|
|
84
94
|
/**
|
|
@@ -198,6 +208,32 @@ export class AuxVMImpl {
|
|
|
198
208
|
this._localEvents.unsubscribe();
|
|
199
209
|
this._localEvents = null;
|
|
200
210
|
}
|
|
211
|
+
_createSubVM(channel) {
|
|
212
|
+
return new RemoteAuxVM(channel);
|
|
213
|
+
}
|
|
214
|
+
_handleAddedSubChannel(subChannel) {
|
|
215
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
216
|
+
const { id, user } = yield subChannel.getInfo();
|
|
217
|
+
const channel = (yield subChannel.getChannel());
|
|
218
|
+
const subVM = {
|
|
219
|
+
id: id,
|
|
220
|
+
user: user,
|
|
221
|
+
vm: this._createSubVM(channel),
|
|
222
|
+
channel,
|
|
223
|
+
};
|
|
224
|
+
this._subVMMap.set(id, subVM);
|
|
225
|
+
this._subVMAdded.next(subVM);
|
|
226
|
+
});
|
|
227
|
+
}
|
|
228
|
+
_handleRemovedSubChannel(channelId) {
|
|
229
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
230
|
+
const vm = this._subVMMap.get(channelId);
|
|
231
|
+
if (vm) {
|
|
232
|
+
this._subVMMap.delete(channelId);
|
|
233
|
+
this._subVMRemoved.next(vm);
|
|
234
|
+
}
|
|
235
|
+
});
|
|
236
|
+
}
|
|
201
237
|
}
|
|
202
238
|
function processPartitions(config) {
|
|
203
239
|
let transferrables = [];
|
package/vm/AuxVMImpl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuxVMImpl.js","sourceRoot":"","sources":["AuxVMImpl.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAIH,wBAAwB,GAE3B,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;AAahF,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAEH,oBAAoB,GAGvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,MAAM,8BAA8B,GACvC,oJAAoJ,CAAC;AACzJ,MAAM,CAAC,MAAM,gCAAgC,GACzC,0GAA0G,CAAC;AAE/G;;;GAGG;AACH,MAAM,OAAO,SAAS;
|
|
1
|
+
{"version":3,"file":"AuxVMImpl.js","sourceRoot":"","sources":["AuxVMImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import '@casual-simulation/aux-vm/globalThis-polyfill';
|
|
2
|
-
import { BotAction, PartitionConfig, AuxPartition } from '@casual-simulation/aux-common';
|
|
3
|
-
import { AuxConfig, AuxUser } from '@casual-simulation/aux-vm';
|
|
2
|
+
import { BotAction, PartitionConfig, AuxPartition, AuxRuntime } from '@casual-simulation/aux-common';
|
|
3
|
+
import { AuxConfig, AuxSubChannel, AuxUser, BaseAuxChannel } from '@casual-simulation/aux-vm';
|
|
4
4
|
import { RemoteAuxChannel } from '@casual-simulation/aux-vm-client';
|
|
5
5
|
export declare class BrowserAuxChannel extends RemoteAuxChannel {
|
|
6
6
|
static defaultHost: string;
|
|
7
7
|
constructor(defaultHost: string, user: AuxUser, config: AuxConfig);
|
|
8
8
|
protected _handlePartitionEvents(events: BotAction[]): Promise<void>;
|
|
9
9
|
protected _createPartition(config: PartitionConfig): Promise<AuxPartition>;
|
|
10
|
+
protected _createSubChannel(user: AuxUser, runtime: AuxRuntime, config: AuxConfig): BaseAuxChannel;
|
|
11
|
+
protected _handleSubChannelAdded(subChannel: AuxSubChannel): void;
|
|
10
12
|
}
|
|
11
13
|
//# sourceMappingURL=BrowserAuxChannel.d.ts.map
|
package/vm/BrowserAuxChannel.js
CHANGED
|
@@ -12,6 +12,7 @@ import { createAuxPartition, } from '@casual-simulation/aux-common';
|
|
|
12
12
|
import { SERVER_ROLE } from '@casual-simulation/causal-trees';
|
|
13
13
|
import { RemoteAuxChannel } from '@casual-simulation/aux-vm-client';
|
|
14
14
|
import { createProxyClientPartition } from '../partitions/ProxyClientPartition';
|
|
15
|
+
import { proxy } from 'comlink';
|
|
15
16
|
export class BrowserAuxChannel extends RemoteAuxChannel {
|
|
16
17
|
constructor(defaultHost, user, config) {
|
|
17
18
|
super(user, config, {});
|
|
@@ -44,5 +45,16 @@ export class BrowserAuxChannel extends RemoteAuxChannel {
|
|
|
44
45
|
return partition;
|
|
45
46
|
});
|
|
46
47
|
}
|
|
48
|
+
_createSubChannel(user, runtime, config) {
|
|
49
|
+
const channel = new BrowserAuxChannel(BrowserAuxChannel.defaultHost, user, config);
|
|
50
|
+
channel._runtime = runtime;
|
|
51
|
+
return channel;
|
|
52
|
+
}
|
|
53
|
+
_handleSubChannelAdded(subChannel) {
|
|
54
|
+
return super._handleSubChannelAdded(proxy({
|
|
55
|
+
getInfo: subChannel.getInfo,
|
|
56
|
+
getChannel: () => __awaiter(this, void 0, void 0, function* () { return proxy(yield subChannel.getChannel()); }),
|
|
57
|
+
}));
|
|
58
|
+
}
|
|
47
59
|
}
|
|
48
60
|
//# sourceMappingURL=BrowserAuxChannel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrowserAuxChannel.js","sourceRoot":"","sources":["BrowserAuxChannel.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,+CAA+C,CAAC;AACvD,OAAO,EAEH,kBAAkB,
|
|
1
|
+
{"version":3,"file":"BrowserAuxChannel.js","sourceRoot":"","sources":["BrowserAuxChannel.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,+CAA+C,CAAC;AACvD,OAAO,EAEH,kBAAkB,GAIrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,WAAW,EAAgB,MAAM,iCAAiC,CAAC;AAO5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,OAAO,iBAAkB,SAAQ,gBAAgB;IAGnD,YAAY,WAAmB,EAAE,IAAa,EAAE,MAAiB;QAC7D,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACxB,iBAAiB,CAAC,WAAW,GAAG,WAAW,CAAC;IAChD,CAAC;IAED,wCAAwC;IACxC,8DAA8D;IAC9C,sBAAsB,CAAC,MAAmB;;;;;YACtD,MAAM,OAAM,sBAAsB,YAAC,MAAM,CAAC,CAAC;YAC3C,IAAI,QAAQ,GAAG,MAAM,CAAC,MAAM,CACxB,CAAC,CAAC,EAAE,EAAE,CACF,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CACpD,CAAC;YACpB,IAAI,MAAM,GAAgB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACvD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrB,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;aACjC;QACL,CAAC;KAAA;IAEe,gBAAgB,CAC5B,MAAuB;;;;;YAEvB,IAAI,SAAS,GAAG,MAAM,OAAM,gBAAgB,YAAC,MAAM,CAAC,CAAC;YACrD,IAAI,CAAC,SAAS,EAAE;gBACZ,SAAS,GAAG,MAAM,kBAAkB,CAChC,MAAM,EACN,0BAA0B,CAC7B,CAAC;aACL;YAED,OAAO,SAAS,CAAC;QACrB,CAAC;KAAA;IAES,iBAAiB,CACvB,IAAa,EACb,OAAmB,EACnB,MAAiB;QAEjB,MAAM,OAAO,GAAG,IAAI,iBAAiB,CACjC,iBAAiB,CAAC,WAAW,EAC7B,IAAI,EACJ,MAAM,CACT,CAAC;QACF,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC;QAC3B,OAAO,OAAO,CAAC;IACnB,CAAC;IAES,sBAAsB,CAAC,UAAyB;QACtD,OAAO,KAAK,CAAC,sBAAsB,CAC/B,KAAK,CAAC;YACF,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,UAAU,EAAE,GAAS,EAAE,gDAAC,OAAA,KAAK,CAAC,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC,CAAA,GAAA;SAC/D,CAAC,CACL,CAAC;IACN,CAAC;CACJ"}
|
package/vm/ConnectableAuxVM.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { BotAction, LocalActions, RuntimeStateVersion, StateUpdatedEvent } from '@casual-simulation/aux-common';
|
|
2
|
-
import { AuxVM, AuxChannelErrorType, AuxUser, StoredAux, ChannelActionResult } from '@casual-simulation/aux-vm';
|
|
2
|
+
import { AuxVM, AuxChannel, AuxChannelErrorType, AuxUser, StoredAux, ChannelActionResult } from '@casual-simulation/aux-vm';
|
|
3
|
+
import { AuxSubVM } from '@casual-simulation/aux-vm/vm';
|
|
3
4
|
import { DeviceAction, StatusUpdate } from '@casual-simulation/causal-trees';
|
|
5
|
+
import { Remote } from 'comlink';
|
|
4
6
|
import { Observable } from 'rxjs';
|
|
5
7
|
/**
|
|
6
8
|
* Gets an AUX VM that is able to communicate with a proxied aux channel.
|
|
@@ -12,10 +14,16 @@ export declare class ConnectableAuxVM implements AuxVM {
|
|
|
12
14
|
private _stateUpdated;
|
|
13
15
|
private _versionUpdated;
|
|
14
16
|
private _onError;
|
|
17
|
+
private _subVMAdded;
|
|
18
|
+
private _subVMRemoved;
|
|
19
|
+
private _subVMMap;
|
|
15
20
|
private _proxy;
|
|
16
21
|
private _port;
|
|
17
22
|
private _sub;
|
|
18
23
|
constructor(id: string, port: MessagePort);
|
|
24
|
+
get subVMAdded(): Observable<AuxSubVM>;
|
|
25
|
+
get subVMRemoved(): Observable<AuxSubVM>;
|
|
26
|
+
createEndpoint?(): Promise<MessagePort>;
|
|
19
27
|
id: string;
|
|
20
28
|
get connectionStateChanged(): Observable<StatusUpdate>;
|
|
21
29
|
get onError(): Observable<AuxChannelErrorType>;
|
|
@@ -56,5 +64,8 @@ export declare class ConnectableAuxVM implements AuxVM {
|
|
|
56
64
|
*/
|
|
57
65
|
export(): Promise<StoredAux>;
|
|
58
66
|
getTags(): Promise<string[]>;
|
|
67
|
+
protected _createSubVM(channel: Remote<AuxChannel>): AuxVM;
|
|
68
|
+
private _handleAddedSubChannel;
|
|
69
|
+
private _handleRemovedSubChannel;
|
|
59
70
|
}
|
|
60
71
|
//# sourceMappingURL=ConnectableAuxVM.d.ts.map
|
package/vm/ConnectableAuxVM.js
CHANGED
|
@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
+
import { RemoteAuxVM } from '@casual-simulation/aux-vm-client';
|
|
10
11
|
import { proxy, releaseProxy, wrap } from 'comlink';
|
|
11
12
|
import { Subject, Subscription } from 'rxjs';
|
|
12
13
|
/**
|
|
@@ -22,10 +23,22 @@ export class ConnectableAuxVM {
|
|
|
22
23
|
this._versionUpdated = new Subject();
|
|
23
24
|
this._connectionStateChanged = new Subject();
|
|
24
25
|
this._onError = new Subject();
|
|
26
|
+
this._subVMAdded = new Subject();
|
|
27
|
+
this._subVMRemoved = new Subject();
|
|
28
|
+
this._subVMMap = new Map();
|
|
25
29
|
this._sub = new Subscription(() => {
|
|
26
30
|
this._proxy[releaseProxy]();
|
|
27
31
|
});
|
|
28
32
|
}
|
|
33
|
+
get subVMAdded() {
|
|
34
|
+
return this._subVMAdded;
|
|
35
|
+
}
|
|
36
|
+
get subVMRemoved() {
|
|
37
|
+
return this._subVMRemoved;
|
|
38
|
+
}
|
|
39
|
+
createEndpoint() {
|
|
40
|
+
throw new Error('Method not implemented.');
|
|
41
|
+
}
|
|
29
42
|
get connectionStateChanged() {
|
|
30
43
|
return this._connectionStateChanged;
|
|
31
44
|
}
|
|
@@ -34,7 +47,7 @@ export class ConnectableAuxVM {
|
|
|
34
47
|
}
|
|
35
48
|
init() {
|
|
36
49
|
return __awaiter(this, void 0, void 0, function* () {
|
|
37
|
-
yield this._proxy.registerListeners(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(state)), proxy((err) => this._onError.next(err)));
|
|
50
|
+
yield this._proxy.registerListeners(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(state)), proxy((err) => this._onError.next(err)), proxy((channel) => this._handleAddedSubChannel(channel)), proxy((id) => this._handleRemovedSubChannel(id)));
|
|
38
51
|
});
|
|
39
52
|
}
|
|
40
53
|
unsubscribe() {
|
|
@@ -139,5 +152,31 @@ export class ConnectableAuxVM {
|
|
|
139
152
|
return yield this._proxy.getTags();
|
|
140
153
|
});
|
|
141
154
|
}
|
|
155
|
+
_createSubVM(channel) {
|
|
156
|
+
return new RemoteAuxVM(channel);
|
|
157
|
+
}
|
|
158
|
+
_handleAddedSubChannel(subChannel) {
|
|
159
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
160
|
+
const { id, user } = yield subChannel.getInfo();
|
|
161
|
+
const channel = (yield subChannel.getChannel());
|
|
162
|
+
const subVM = {
|
|
163
|
+
id,
|
|
164
|
+
user,
|
|
165
|
+
vm: this._createSubVM(channel),
|
|
166
|
+
channel,
|
|
167
|
+
};
|
|
168
|
+
this._subVMMap.set(id, subVM);
|
|
169
|
+
this._subVMAdded.next(subVM);
|
|
170
|
+
});
|
|
171
|
+
}
|
|
172
|
+
_handleRemovedSubChannel(channelId) {
|
|
173
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
174
|
+
const vm = this._subVMMap.get(channelId);
|
|
175
|
+
if (vm) {
|
|
176
|
+
this._subVMMap.delete(channelId);
|
|
177
|
+
this._subVMRemoved.next(vm);
|
|
178
|
+
}
|
|
179
|
+
});
|
|
180
|
+
}
|
|
142
181
|
}
|
|
143
182
|
//# sourceMappingURL=ConnectableAuxVM.js.map
|
|
@@ -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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"}
|