@casual-simulation/aux-vm-deno 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/managers/DenoSimulation.d.ts +5 -2
- package/managers/DenoSimulation.js +37 -38
- package/managers/DenoSimulation.js.map +1 -1
- package/package.json +8 -8
- package/vm/DenoAuxChannel.d.ts +4 -2
- package/vm/DenoAuxChannel.js +14 -2
- package/vm/DenoAuxChannel.js.map +1 -1
- package/vm/DenoVM.d.ts +11 -2
- package/vm/DenoVM.js +37 -1
- package/vm/DenoVM.js.map +1 -1
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AuxPartitionConfig } from '@casual-simulation/aux-common';
|
|
2
|
+
import { AuxUser, BaseSimulation, LoginManager } from '@casual-simulation/aux-vm';
|
|
3
|
+
import { DenoVM } from '../vm/DenoVM';
|
|
2
4
|
import { PortalManager, ProgressManager } from '@casual-simulation/aux-vm/managers';
|
|
3
5
|
import { RemoteSimulation } from '@casual-simulation/aux-vm-client';
|
|
4
6
|
/**
|
|
@@ -21,7 +23,8 @@ export declare class DenoSimulationImpl extends BaseSimulation implements DenoSi
|
|
|
21
23
|
get login(): LoginManager;
|
|
22
24
|
get progress(): ProgressManager;
|
|
23
25
|
get portals(): PortalManager;
|
|
24
|
-
|
|
26
|
+
static createPartitions(id: string, user: AuxUser, defaultHost: string): AuxPartitionConfig;
|
|
27
|
+
constructor(user: AuxUser, id: string, vm: DenoVM);
|
|
25
28
|
protected _beforeVmInit(): void;
|
|
26
29
|
}
|
|
27
30
|
//# sourceMappingURL=DenoSimulation.d.ts.map
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { parseSimulationId, TEMPORARY_BOT_PARTITION_ID, ADMIN_PARTITION_ID, ADMIN_BRANCH_NAME, TEMPORARY_SHARED_PARTITION_ID, REMOTE_TEMPORARY_SHARED_PARTITION_ID, } from '@casual-simulation/aux-common';
|
|
2
2
|
import { BaseSimulation, LoginManager, } from '@casual-simulation/aux-vm';
|
|
3
|
-
import { DenoVM } from '../vm/DenoVM';
|
|
4
3
|
import { PortalManager, ProgressManager, } from '@casual-simulation/aux-vm/managers';
|
|
5
4
|
import { getFinalUrl } from '@casual-simulation/aux-vm-client';
|
|
6
5
|
/**
|
|
@@ -8,46 +7,11 @@ import { getFinalUrl } from '@casual-simulation/aux-vm-client';
|
|
|
8
7
|
* to reactively edit bots.
|
|
9
8
|
*/
|
|
10
9
|
export class DenoSimulationImpl extends BaseSimulation {
|
|
11
|
-
constructor(user, id,
|
|
12
|
-
super(id,
|
|
10
|
+
constructor(user, id, vm) {
|
|
11
|
+
super(id, vm);
|
|
13
12
|
this.helper.userId = user ? user.id : null;
|
|
14
13
|
this._login = new LoginManager(this._vm);
|
|
15
14
|
this._progress = new ProgressManager(this._vm);
|
|
16
|
-
function createPartitions() {
|
|
17
|
-
const parsedId = parseSimulationId(id);
|
|
18
|
-
const host = getFinalUrl(defaultHost, parsedId.host);
|
|
19
|
-
return {
|
|
20
|
-
shared: {
|
|
21
|
-
type: 'remote_causal_repo',
|
|
22
|
-
branch: parsedId.channel,
|
|
23
|
-
host: host,
|
|
24
|
-
},
|
|
25
|
-
[ADMIN_PARTITION_ID]: {
|
|
26
|
-
type: 'remote_causal_repo',
|
|
27
|
-
branch: ADMIN_BRANCH_NAME,
|
|
28
|
-
host: host,
|
|
29
|
-
private: true,
|
|
30
|
-
static: true,
|
|
31
|
-
},
|
|
32
|
-
[TEMPORARY_BOT_PARTITION_ID]: {
|
|
33
|
-
type: 'memory',
|
|
34
|
-
private: true,
|
|
35
|
-
initialState: {},
|
|
36
|
-
},
|
|
37
|
-
[TEMPORARY_SHARED_PARTITION_ID]: {
|
|
38
|
-
type: 'remote_causal_repo',
|
|
39
|
-
branch: `${parsedId.channel}-player-${user.id}`,
|
|
40
|
-
host: host,
|
|
41
|
-
temporary: true,
|
|
42
|
-
remoteEvents: false,
|
|
43
|
-
},
|
|
44
|
-
[REMOTE_TEMPORARY_SHARED_PARTITION_ID]: {
|
|
45
|
-
type: 'other_players_repo',
|
|
46
|
-
branch: parsedId.channel,
|
|
47
|
-
host: host,
|
|
48
|
-
},
|
|
49
|
-
};
|
|
50
|
-
}
|
|
51
15
|
}
|
|
52
16
|
get login() {
|
|
53
17
|
return this._login;
|
|
@@ -58,6 +22,41 @@ export class DenoSimulationImpl extends BaseSimulation {
|
|
|
58
22
|
get portals() {
|
|
59
23
|
return this._portals;
|
|
60
24
|
}
|
|
25
|
+
static createPartitions(id, user, defaultHost) {
|
|
26
|
+
const parsedId = parseSimulationId(id);
|
|
27
|
+
const host = getFinalUrl(defaultHost, parsedId.host);
|
|
28
|
+
return {
|
|
29
|
+
shared: {
|
|
30
|
+
type: 'remote_causal_repo',
|
|
31
|
+
branch: parsedId.channel,
|
|
32
|
+
host: host,
|
|
33
|
+
},
|
|
34
|
+
[ADMIN_PARTITION_ID]: {
|
|
35
|
+
type: 'remote_causal_repo',
|
|
36
|
+
branch: ADMIN_BRANCH_NAME,
|
|
37
|
+
host: host,
|
|
38
|
+
private: true,
|
|
39
|
+
static: true,
|
|
40
|
+
},
|
|
41
|
+
[TEMPORARY_BOT_PARTITION_ID]: {
|
|
42
|
+
type: 'memory',
|
|
43
|
+
private: true,
|
|
44
|
+
initialState: {},
|
|
45
|
+
},
|
|
46
|
+
[TEMPORARY_SHARED_PARTITION_ID]: {
|
|
47
|
+
type: 'remote_causal_repo',
|
|
48
|
+
branch: `${parsedId.channel}-player-${user.id}`,
|
|
49
|
+
host: host,
|
|
50
|
+
temporary: true,
|
|
51
|
+
remoteEvents: false,
|
|
52
|
+
},
|
|
53
|
+
[REMOTE_TEMPORARY_SHARED_PARTITION_ID]: {
|
|
54
|
+
type: 'other_players_repo',
|
|
55
|
+
branch: parsedId.channel,
|
|
56
|
+
host: host,
|
|
57
|
+
},
|
|
58
|
+
};
|
|
59
|
+
}
|
|
61
60
|
_beforeVmInit() {
|
|
62
61
|
super._beforeVmInit();
|
|
63
62
|
this._portals = new PortalManager(this._vm);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DenoSimulation.js","sourceRoot":"","sources":["DenoSimulation.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,iBAAiB,EAKjB,0BAA0B,EAO1B,kBAAkB,EAClB,iBAAiB,EACjB,6BAA6B,EAC7B,oCAAoC,GACvC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAGH,cAAc,EACd,YAAY,GAIf,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"DenoSimulation.js","sourceRoot":"","sources":["DenoSimulation.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,iBAAiB,EAKjB,0BAA0B,EAO1B,kBAAkB,EAClB,iBAAiB,EACjB,6BAA6B,EAC7B,oCAAoC,GACvC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAGH,cAAc,EACd,YAAY,GAIf,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EACH,aAAa,EACb,eAAe,GAClB,MAAM,oCAAoC,CAAC;AAK5C,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAa/D;;;GAGG;AACH,MAAM,OAAO,kBACT,SAAQ,cAAc;IA2DtB,YAAY,IAAa,EAAE,EAAU,EAAE,EAAU;QAC7C,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAE3C,IAAI,CAAC,MAAM,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnD,CAAC;IA1DD,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,MAAM,CAAC,gBAAgB,CACnB,EAAU,EACV,IAAa,EACb,WAAmB;QAEnB,MAAM,QAAQ,GAAG,iBAAiB,CAAC,EAAE,CAAC,CAAC;QACvC,MAAM,IAAI,GAAG,WAAW,CAAC,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrD,OAAO;YACH,MAAM,EAAE;gBACJ,IAAI,EAAE,oBAAoB;gBAC1B,MAAM,EAAE,QAAQ,CAAC,OAAO;gBACxB,IAAI,EAAE,IAAI;aACb;YACD,CAAC,kBAAkB,CAAC,EAAE;gBAClB,IAAI,EAAE,oBAAoB;gBAC1B,MAAM,EAAE,iBAAiB;gBACzB,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,IAAI;aACf;YACD,CAAC,0BAA0B,CAAC,EAAE;gBAC1B,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,IAAI;gBACb,YAAY,EAAE,EAAE;aACnB;YACD,CAAC,6BAA6B,CAAC,EAAE;gBAC7B,IAAI,EAAE,oBAAoB;gBAC1B,MAAM,EAAE,GAAG,QAAQ,CAAC,OAAO,WAAW,IAAI,CAAC,EAAE,EAAE;gBAC/C,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE,IAAI;gBACf,YAAY,EAAE,KAAK;aACtB;YACD,CAAC,oCAAoC,CAAC,EAAE;gBACpC,IAAI,EAAE,oBAAoB;gBAC1B,MAAM,EAAE,QAAQ,CAAC,OAAO;gBACxB,IAAI,EAAE,IAAI;aACb;SACJ,CAAC;IACN,CAAC;IAUS,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-deno",
|
|
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 Deno.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aux"
|
|
@@ -39,17 +39,17 @@
|
|
|
39
39
|
"url": "https://github.com/casual-simulation/casualos/issues"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@casual-simulation/aux-common": "^3.1.
|
|
43
|
-
"@casual-simulation/aux-vm": "^3.1.
|
|
44
|
-
"@casual-simulation/aux-vm-client": "^3.1.
|
|
45
|
-
"@casual-simulation/causal-trees": "^3.1.
|
|
46
|
-
"@casual-simulation/crypto": "^3.1.
|
|
47
|
-
"@casual-simulation/crypto-browser": "^3.1.
|
|
42
|
+
"@casual-simulation/aux-common": "^3.1.14-alpha.3661157217",
|
|
43
|
+
"@casual-simulation/aux-vm": "^3.1.14-alpha.3661157217",
|
|
44
|
+
"@casual-simulation/aux-vm-client": "^3.1.14-alpha.3661157217",
|
|
45
|
+
"@casual-simulation/causal-trees": "^3.1.14-alpha.3661157217",
|
|
46
|
+
"@casual-simulation/crypto": "^3.1.14-alpha.3661157217",
|
|
47
|
+
"@casual-simulation/crypto-browser": "^3.1.14-alpha.3661157217",
|
|
48
48
|
"comlink": "^4.0.1",
|
|
49
49
|
"deno-vm": "^0.8.1",
|
|
50
50
|
"lodash": "4.17.21",
|
|
51
51
|
"rxjs": "7.5.7",
|
|
52
52
|
"uuid": "^8.3.2"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "1a4688a5c80f36121fd0458346f944ea81fec2dd"
|
|
55
55
|
}
|
package/vm/DenoAuxChannel.d.ts
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
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 DenoAuxChannel extends RemoteAuxChannel {
|
|
6
6
|
constructor(defaultHost: string, user: AuxUser, config: AuxConfig);
|
|
7
7
|
protected _handlePartitionEvents(events: BotAction[]): Promise<void>;
|
|
8
8
|
protected _createPartition(config: PartitionConfig): Promise<AuxPartition>;
|
|
9
|
+
protected _createSubChannel(user: AuxUser, runtime: AuxRuntime, config: AuxConfig): BaseAuxChannel;
|
|
10
|
+
protected _handleSubChannelAdded(subChannel: AuxSubChannel): void;
|
|
9
11
|
}
|
|
10
12
|
//# sourceMappingURL=DenoAuxChannel.d.ts.map
|
package/vm/DenoAuxChannel.js
CHANGED
|
@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
import '@casual-simulation/aux-vm/globalThis-polyfill';
|
|
11
11
|
import { SERVER_ROLE } from '@casual-simulation/causal-trees';
|
|
12
12
|
import { RemoteAuxChannel } from '@casual-simulation/aux-vm-client';
|
|
13
|
+
import { proxy } from 'comlink';
|
|
13
14
|
export class DenoAuxChannel extends RemoteAuxChannel {
|
|
14
15
|
constructor(defaultHost, user, config) {
|
|
15
16
|
super(user, config, {});
|
|
@@ -22,8 +23,8 @@ export class DenoAuxChannel extends RemoteAuxChannel {
|
|
|
22
23
|
});
|
|
23
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
25
|
yield _super._handlePartitionEvents.call(this, events);
|
|
25
|
-
let filtered = events.filter(e => e.type === 'device' && e.device.roles.indexOf(SERVER_ROLE) >= 0);
|
|
26
|
-
let mapped = filtered.map(e => e.event);
|
|
26
|
+
let filtered = events.filter((e) => e.type === 'device' && e.device.roles.indexOf(SERVER_ROLE) >= 0);
|
|
27
|
+
let mapped = filtered.map((e) => e.event);
|
|
27
28
|
if (filtered.length > 0) {
|
|
28
29
|
yield this.sendEvents(mapped);
|
|
29
30
|
}
|
|
@@ -38,5 +39,16 @@ export class DenoAuxChannel extends RemoteAuxChannel {
|
|
|
38
39
|
return partition;
|
|
39
40
|
});
|
|
40
41
|
}
|
|
42
|
+
_createSubChannel(user, runtime, config) {
|
|
43
|
+
const channel = new DenoAuxChannel(null, user, config);
|
|
44
|
+
channel._runtime = runtime;
|
|
45
|
+
return channel;
|
|
46
|
+
}
|
|
47
|
+
_handleSubChannelAdded(subChannel) {
|
|
48
|
+
return super._handleSubChannelAdded(proxy({
|
|
49
|
+
getInfo: subChannel.getInfo,
|
|
50
|
+
getChannel: () => __awaiter(this, void 0, void 0, function* () { return proxy(yield subChannel.getChannel()); }),
|
|
51
|
+
}));
|
|
52
|
+
}
|
|
41
53
|
}
|
|
42
54
|
//# sourceMappingURL=DenoAuxChannel.js.map
|
package/vm/DenoAuxChannel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DenoAuxChannel.js","sourceRoot":"","sources":["DenoAuxChannel.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,+CAA+C,CAAC;
|
|
1
|
+
{"version":3,"file":"DenoAuxChannel.js","sourceRoot":"","sources":["DenoAuxChannel.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,+CAA+C,CAAC;AAQvD,OAAO,EAAE,WAAW,EAAgB,MAAM,iCAAiC,CAAC;AAO5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,OAAO,cAAe,SAAQ,gBAAgB;IAChD,YAAY,WAAmB,EAAE,IAAa,EAAE,MAAiB;QAC7D,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAC5B,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,OAAO,SAAS,CAAC;QACrB,CAAC;KAAA;IAES,iBAAiB,CACvB,IAAa,EACb,OAAmB,EACnB,MAAiB;QAEjB,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACvD,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/DenoVM.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { LocalActions, BotAction, StateUpdatedEvent, RuntimeStateVersion } from '@casual-simulation/aux-common';
|
|
2
2
|
import { Observable } from 'rxjs';
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
3
|
+
import { Remote } from 'comlink';
|
|
4
|
+
import { AuxConfig, AuxVM, AuxUser, ChannelActionResult, AuxSubVM } 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';
|
|
6
7
|
/**
|
|
7
8
|
* Defines an interface for an AUX that is run inside a virtual machine.
|
|
@@ -14,6 +15,9 @@ export declare class DenoVM implements AuxVM {
|
|
|
14
15
|
private _stateUpdated;
|
|
15
16
|
private _versionUpdated;
|
|
16
17
|
private _onError;
|
|
18
|
+
private _subVMAdded;
|
|
19
|
+
private _subVMRemoved;
|
|
20
|
+
private _subVMMap;
|
|
17
21
|
private _config;
|
|
18
22
|
private _worker;
|
|
19
23
|
private _proxy;
|
|
@@ -27,6 +31,8 @@ export declare class DenoVM implements AuxVM {
|
|
|
27
31
|
* Creates a new Simulation VM.
|
|
28
32
|
*/
|
|
29
33
|
constructor(user: AuxUser, config: AuxConfig);
|
|
34
|
+
get subVMAdded(): Observable<AuxSubVM>;
|
|
35
|
+
get subVMRemoved(): Observable<AuxSubVM>;
|
|
30
36
|
get connectionStateChanged(): Observable<StatusUpdate>;
|
|
31
37
|
get onError(): Observable<AuxChannelErrorType>;
|
|
32
38
|
/**
|
|
@@ -69,5 +75,8 @@ export declare class DenoVM implements AuxVM {
|
|
|
69
75
|
export(): Promise<StoredAux>;
|
|
70
76
|
getTags(): Promise<string[]>;
|
|
71
77
|
unsubscribe(): void;
|
|
78
|
+
protected _createSubVM(channel: Remote<AuxChannel>): AuxVM;
|
|
79
|
+
private _handleAddedSubChannel;
|
|
80
|
+
private _handleRemovedSubChannel;
|
|
72
81
|
}
|
|
73
82
|
//# sourceMappingURL=DenoVM.d.ts.map
|
package/vm/DenoVM.js
CHANGED
|
@@ -12,6 +12,7 @@ import { wrap, proxy } from 'comlink';
|
|
|
12
12
|
import { remapProgressPercent, } from '@casual-simulation/causal-trees';
|
|
13
13
|
import { DenoWorker, polyfillMessageChannel } from 'deno-vm';
|
|
14
14
|
import { URL } from 'url';
|
|
15
|
+
import { RemoteAuxVM } from '@casual-simulation/aux-vm-client';
|
|
15
16
|
polyfillMessageChannel();
|
|
16
17
|
let workerCount = 0;
|
|
17
18
|
/**
|
|
@@ -31,6 +32,15 @@ export class DenoVM {
|
|
|
31
32
|
this._versionUpdated = new Subject();
|
|
32
33
|
this._connectionStateChanged = new Subject();
|
|
33
34
|
this._onError = new Subject();
|
|
35
|
+
this._subVMAdded = new Subject();
|
|
36
|
+
this._subVMRemoved = new Subject();
|
|
37
|
+
this._subVMMap = new Map();
|
|
38
|
+
}
|
|
39
|
+
get subVMAdded() {
|
|
40
|
+
return this._subVMAdded;
|
|
41
|
+
}
|
|
42
|
+
get subVMRemoved() {
|
|
43
|
+
return this._subVMRemoved;
|
|
34
44
|
}
|
|
35
45
|
get connectionStateChanged() {
|
|
36
46
|
return this._connectionStateChanged;
|
|
@@ -97,7 +107,7 @@ export class DenoVM {
|
|
|
97
107
|
const wrapper = wrap(this._worker);
|
|
98
108
|
this._proxy = yield new wrapper(null, this._initialUser, this._config);
|
|
99
109
|
let statusMapper = remapProgressPercent(0.2, 1);
|
|
100
|
-
return yield this._proxy.initAndWait(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)));
|
|
110
|
+
return yield this._proxy.initAndWait(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)));
|
|
101
111
|
});
|
|
102
112
|
}
|
|
103
113
|
/**
|
|
@@ -212,6 +222,32 @@ export class DenoVM {
|
|
|
212
222
|
this._localEvents.unsubscribe();
|
|
213
223
|
this._localEvents = null;
|
|
214
224
|
}
|
|
225
|
+
_createSubVM(channel) {
|
|
226
|
+
return new RemoteAuxVM(channel);
|
|
227
|
+
}
|
|
228
|
+
_handleAddedSubChannel(subChannel) {
|
|
229
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
230
|
+
const { id, user } = yield subChannel.getInfo();
|
|
231
|
+
const channel = (yield subChannel.getChannel());
|
|
232
|
+
const subVM = {
|
|
233
|
+
id,
|
|
234
|
+
user,
|
|
235
|
+
vm: this._createSubVM(channel),
|
|
236
|
+
channel,
|
|
237
|
+
};
|
|
238
|
+
this._subVMMap.set(id, subVM);
|
|
239
|
+
this._subVMAdded.next(subVM);
|
|
240
|
+
});
|
|
241
|
+
}
|
|
242
|
+
_handleRemovedSubChannel(channelId) {
|
|
243
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
244
|
+
const vm = this._subVMMap.get(channelId);
|
|
245
|
+
if (vm) {
|
|
246
|
+
this._subVMMap.delete(channelId);
|
|
247
|
+
this._subVMRemoved.next(vm);
|
|
248
|
+
}
|
|
249
|
+
});
|
|
250
|
+
}
|
|
215
251
|
}
|
|
216
252
|
function waitForInit(worker) {
|
|
217
253
|
return new Promise((resolve, reject) => {
|
package/vm/DenoVM.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DenoVM.js","sourceRoot":"","sources":["DenoVM.ts"],"names":[],"mappings":";;;;;;;;;AAOA,OAAO,EAAc,OAAO,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAsC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"DenoVM.js","sourceRoot":"","sources":["DenoVM.ts"],"names":[],"mappings":"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"}
|