@casual-simulation/aux-vm-node 3.2.7-alpha.6411427350 → 3.2.7-alpha.6787395812
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/NodeSimulation.d.ts +2 -3
- package/managers/NodeSimulation.js +4 -4
- package/managers/NodeSimulation.js.map +1 -1
- package/managers/NodeSimulationFactories.d.ts +1 -1
- package/managers/NodeSimulationFactories.js +9 -4
- package/managers/NodeSimulationFactories.js.map +1 -1
- package/package.json +6 -6
- package/vm/AuxVMNode.d.ts +10 -4
- package/vm/AuxVMNode.js +22 -7
- package/vm/AuxVMNode.js.map +1 -1
- package/vm/NodeAuxChannel.d.ts +4 -4
- package/vm/NodeAuxChannel.js +6 -6
- package/vm/NodeAuxChannel.js.map +1 -1
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { BaseSimulation, AuxChannel } from '@casual-simulation/aux-vm';
|
|
2
2
|
import { AuxVM } from '@casual-simulation/aux-vm/vm/AuxVM';
|
|
3
|
-
import { ConnectionIndicator } from '@casual-simulation/aux-common';
|
|
4
3
|
export declare class NodeSimulation extends BaseSimulation {
|
|
5
4
|
get channel(): AuxChannel;
|
|
6
|
-
constructor(id: string, channel: AuxVM | AuxChannel);
|
|
7
|
-
protected _createSubSimulation(
|
|
5
|
+
constructor(id: string, configBotId: string, channel: AuxVM | AuxChannel);
|
|
6
|
+
protected _createSubSimulation(vm: AuxVM): NodeSimulation;
|
|
8
7
|
}
|
|
9
8
|
//# sourceMappingURL=NodeSimulation.d.ts.map
|
|
@@ -5,11 +5,11 @@ export class NodeSimulation extends BaseSimulation {
|
|
|
5
5
|
const vm = this._vm;
|
|
6
6
|
return vm.channel;
|
|
7
7
|
}
|
|
8
|
-
constructor(id, channel) {
|
|
9
|
-
super(
|
|
8
|
+
constructor(id, configBotId, channel) {
|
|
9
|
+
super('id' in channel ? channel : new AuxVMNode(id, configBotId, channel));
|
|
10
10
|
}
|
|
11
|
-
_createSubSimulation(
|
|
12
|
-
return new NodeSimulation(id, vm);
|
|
11
|
+
_createSubSimulation(vm) {
|
|
12
|
+
return new NodeSimulation(vm.id, vm.configBotId, vm);
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=NodeSimulation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeSimulation.js","sourceRoot":"","sources":["NodeSimulation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAc,MAAM,2BAA2B,CAAC;AAEvE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,MAAM,OAAO,cAAe,SAAQ,cAAc;IAC9C,IAAI,OAAO;QACP,MAAM,EAAE,GAAc,IAAI,CAAC,GAAG,CAAC;QAC/B,OAAO,EAAE,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,YAAY,EAAU,EAAE,OAA2B;
|
|
1
|
+
{"version":3,"file":"NodeSimulation.js","sourceRoot":"","sources":["NodeSimulation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAc,MAAM,2BAA2B,CAAC;AAEvE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,MAAM,OAAO,cAAe,SAAQ,cAAc;IAC9C,IAAI,OAAO;QACP,MAAM,EAAE,GAAc,IAAI,CAAC,GAAG,CAAC;QAC/B,OAAO,EAAE,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,YAAY,EAAU,EAAE,WAAmB,EAAE,OAA2B;QACpE,KAAK,CACD,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,CACtE,CAAC;IACN,CAAC;IAES,oBAAoB,CAAC,EAAS;QACpC,OAAO,IAAI,cAAc,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACzD,CAAC;CACJ"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { RemoteSimulationImpl } from '@casual-simulation/aux-vm-client';
|
|
2
2
|
import { AuxConfig } from '@casual-simulation/aux-vm/vm';
|
|
3
3
|
import { InstRecordsClient, ConnectionIndicator, YjsClientPartitionConfig } from '@casual-simulation/aux-common';
|
|
4
|
-
export declare function nodeSimulationForBranch(indicator: ConnectionIndicator, client: InstRecordsClient, branch: string, extraOptions?: Partial<YjsClientPartitionConfig>): RemoteSimulationImpl;
|
|
4
|
+
export declare function nodeSimulationForBranch(id: string, indicator: ConnectionIndicator, client: InstRecordsClient, branch: string, extraOptions?: Partial<YjsClientPartitionConfig>): RemoteSimulationImpl;
|
|
5
5
|
export declare function nodeSimulationForLocalRepo(indicator: ConnectionIndicator, id: string): RemoteSimulationImpl;
|
|
6
6
|
export declare function nodeSimulationWithConfig(indicator: ConnectionIndicator, id: string, config: AuxConfig): RemoteSimulationImpl;
|
|
7
7
|
//# sourceMappingURL=NodeSimulationFactories.d.ts.map
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { RemoteAuxChannel, RemoteSimulationImpl, } from '@casual-simulation/aux-vm-client';
|
|
2
2
|
import { AuxVMNode } from '../vm/AuxVMNode';
|
|
3
3
|
import { TEMPORARY_SHARED_PARTITION_ID, REMOTE_TEMPORARY_SHARED_PARTITION_ID, TEMPORARY_BOT_PARTITION_ID, getConnectionId, DEFAULT_BRANCH_NAME, } from '@casual-simulation/aux-common';
|
|
4
|
-
export function nodeSimulationForBranch(indicator, client, branch, extraOptions) {
|
|
4
|
+
export function nodeSimulationForBranch(id, indicator, client, branch, extraOptions) {
|
|
5
5
|
const connectionId = getConnectionId(indicator);
|
|
6
6
|
const partitions = {
|
|
7
7
|
shared: Object.assign(Object.assign({ type: 'yjs_client' }, (extraOptions || {})), { recordName: null, inst: branch, branch: DEFAULT_BRANCH_NAME, client: client }),
|
|
@@ -27,10 +27,12 @@ export function nodeSimulationForBranch(indicator, client, branch, extraOptions)
|
|
|
27
27
|
client: client,
|
|
28
28
|
},
|
|
29
29
|
};
|
|
30
|
+
const configBotId = getConnectionId(indicator);
|
|
30
31
|
return new RemoteSimulationImpl(branch, {
|
|
31
32
|
recordName: null,
|
|
32
33
|
inst: null,
|
|
33
|
-
}, new AuxVMNode(new RemoteAuxChannel(
|
|
34
|
+
}, new AuxVMNode(id, configBotId, new RemoteAuxChannel({
|
|
35
|
+
configBotId: configBotId,
|
|
34
36
|
config: null,
|
|
35
37
|
partitions,
|
|
36
38
|
}, {})));
|
|
@@ -41,18 +43,21 @@ export function nodeSimulationForLocalRepo(indicator, id) {
|
|
|
41
43
|
type: 'yjs',
|
|
42
44
|
},
|
|
43
45
|
};
|
|
46
|
+
const configBotId = getConnectionId(indicator);
|
|
44
47
|
return new RemoteSimulationImpl(id, {
|
|
45
48
|
recordName: null,
|
|
46
49
|
inst: null,
|
|
47
|
-
}, new AuxVMNode(new RemoteAuxChannel(
|
|
50
|
+
}, new AuxVMNode(id, configBotId, new RemoteAuxChannel({
|
|
51
|
+
configBotId,
|
|
48
52
|
config: null,
|
|
49
53
|
partitions,
|
|
50
54
|
}, {})));
|
|
51
55
|
}
|
|
52
56
|
export function nodeSimulationWithConfig(indicator, id, config) {
|
|
57
|
+
const configBotId = getConnectionId(indicator);
|
|
53
58
|
return new RemoteSimulationImpl(id, {
|
|
54
59
|
recordName: null,
|
|
55
60
|
inst: null,
|
|
56
|
-
}, new AuxVMNode(new RemoteAuxChannel(
|
|
61
|
+
}, new AuxVMNode(id, configBotId, new RemoteAuxChannel(config, {})));
|
|
57
62
|
}
|
|
58
63
|
//# sourceMappingURL=NodeSimulationFactories.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeSimulationFactories.js","sourceRoot":"","sources":["NodeSimulationFactories.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAChB,oBAAoB,GACvB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EACH,6BAA6B,EAC7B,oCAAoC,EACpC,0BAA0B,EAI1B,eAAe,EACf,mBAAmB,GAEtB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,UAAU,uBAAuB,CACnC,SAA8B,EAC9B,MAAyB,EACzB,MAAc,EACd,YAAgD;IAEhD,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAChD,MAAM,UAAU,GAAuB;QACnC,MAAM,gCACF,IAAI,EAAE,YAAY,IACf,CAAC,YAAY,IAAI,EAAE,CAAC,KACvB,UAAU,EAAE,IAAI,EAChB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,GACjB;QACD,CAAC,0BAA0B,CAAC,EAAE;YAC1B,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,IAAI;YACb,YAAY,EAAE,EAAE;SACnB;QACD,CAAC,6BAA6B,CAAC,EAAE;YAC7B,IAAI,EAAE,YAAY;YAClB,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,GAAG,mBAAmB,WAAW,YAAY,EAAE;YACvD,MAAM,EAAE,MAAM;YACd,SAAS,EAAE,IAAI;YACf,YAAY,EAAE,KAAK;SACtB;QACD,CAAC,oCAAoC,CAAC,EAAE;YACpC,IAAI,EAAE,sBAAsB;YAC5B,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,mBAAmB;YAC3B,MAAM,EAAE,MAAM;SACjB;KACJ,CAAC;IACF,OAAO,IAAI,oBAAoB,CAC3B,MAAM,EACN;QACI,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,IAAI;KACb,EACD,IAAI,SAAS,CACT,IAAI,gBAAgB,CAChB,
|
|
1
|
+
{"version":3,"file":"NodeSimulationFactories.js","sourceRoot":"","sources":["NodeSimulationFactories.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAChB,oBAAoB,GACvB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EACH,6BAA6B,EAC7B,oCAAoC,EACpC,0BAA0B,EAI1B,eAAe,EACf,mBAAmB,GAEtB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,UAAU,uBAAuB,CACnC,EAAU,EACV,SAA8B,EAC9B,MAAyB,EACzB,MAAc,EACd,YAAgD;IAEhD,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAChD,MAAM,UAAU,GAAuB;QACnC,MAAM,gCACF,IAAI,EAAE,YAAY,IACf,CAAC,YAAY,IAAI,EAAE,CAAC,KACvB,UAAU,EAAE,IAAI,EAChB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,GACjB;QACD,CAAC,0BAA0B,CAAC,EAAE;YAC1B,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,IAAI;YACb,YAAY,EAAE,EAAE;SACnB;QACD,CAAC,6BAA6B,CAAC,EAAE;YAC7B,IAAI,EAAE,YAAY;YAClB,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,GAAG,mBAAmB,WAAW,YAAY,EAAE;YACvD,MAAM,EAAE,MAAM;YACd,SAAS,EAAE,IAAI;YACf,YAAY,EAAE,KAAK;SACtB;QACD,CAAC,oCAAoC,CAAC,EAAE;YACpC,IAAI,EAAE,sBAAsB;YAC5B,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,mBAAmB;YAC3B,MAAM,EAAE,MAAM;SACjB;KACJ,CAAC;IACF,MAAM,WAAW,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAC/C,OAAO,IAAI,oBAAoB,CAC3B,MAAM,EACN;QACI,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,IAAI;KACb,EACD,IAAI,SAAS,CACT,EAAE,EACF,WAAW,EACX,IAAI,gBAAgB,CAChB;QACI,WAAW,EAAE,WAAW;QACxB,MAAM,EAAE,IAAI;QACZ,UAAU;KACb,EACD,EAAE,CACL,CACJ,CACJ,CAAC;AACN,CAAC;AAED,MAAM,UAAU,0BAA0B,CACtC,SAA8B,EAC9B,EAAU;IAEV,MAAM,UAAU,GAAuB;QACnC,MAAM,EAAE;YACJ,IAAI,EAAE,KAAK;SACd;KACJ,CAAC;IACF,MAAM,WAAW,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAC/C,OAAO,IAAI,oBAAoB,CAC3B,EAAE,EACF;QACI,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,IAAI;KACb,EACD,IAAI,SAAS,CACT,EAAE,EACF,WAAW,EACX,IAAI,gBAAgB,CAChB;QACI,WAAW;QACX,MAAM,EAAE,IAAI;QACZ,UAAU;KACb,EACD,EAAE,CACL,CACJ,CACJ,CAAC;AACN,CAAC;AAED,MAAM,UAAU,wBAAwB,CACpC,SAA8B,EAC9B,EAAU,EACV,MAAiB;IAEjB,MAAM,WAAW,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAC/C,OAAO,IAAI,oBAAoB,CAC3B,EAAE,EACF;QACI,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,IAAI;KACb,EACD,IAAI,SAAS,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,gBAAgB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CACnE,CAAC;AACN,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@casual-simulation/aux-vm-node",
|
|
3
|
-
"version": "3.2.7-alpha.
|
|
3
|
+
"version": "3.2.7-alpha.6787395812",
|
|
4
4
|
"description": "A set of utilities required to security run an AUX in Node.js.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aux"
|
|
@@ -36,15 +36,15 @@
|
|
|
36
36
|
"url": "https://github.com/casual-simulation/casualos/issues"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@casual-simulation/aux-common": "^3.2.7-alpha.
|
|
40
|
-
"@casual-simulation/aux-runtime": "^3.2.7-alpha.
|
|
41
|
-
"@casual-simulation/aux-vm": "^3.2.7-alpha.
|
|
42
|
-
"@casual-simulation/aux-vm-client": "^3.2.7-alpha.
|
|
39
|
+
"@casual-simulation/aux-common": "^3.2.7-alpha.6787395812",
|
|
40
|
+
"@casual-simulation/aux-runtime": "^3.2.7-alpha.6787395812",
|
|
41
|
+
"@casual-simulation/aux-vm": "^3.2.7-alpha.6787395812",
|
|
42
|
+
"@casual-simulation/aux-vm-client": "^3.2.7-alpha.6787395812",
|
|
43
43
|
"@casual-simulation/crypto": "^3.2.0",
|
|
44
44
|
"@casual-simulation/crypto-node": "^3.2.0",
|
|
45
45
|
"lodash": "4.17.21",
|
|
46
46
|
"rxjs": "7.5.7",
|
|
47
47
|
"uuid": "^8.3.2"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "2ee111641df1a80e91dcf53630756d9b0e4d9866"
|
|
50
50
|
}
|
package/vm/AuxVMNode.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AuxVM, AuxChannelErrorType, ChannelActionResult, AuxSubVM, AuxChannel } from '@casual-simulation/aux-vm';
|
|
2
2
|
import { Observable } from 'rxjs';
|
|
3
|
-
import { BotAction, StateUpdatedEvent, StoredAux } from '@casual-simulation/aux-common';
|
|
3
|
+
import { BotAction, StateUpdatedEvent, StoredAux, PartitionAuthMessage } from '@casual-simulation/aux-common';
|
|
4
4
|
import { LoadingProgressCallback, StatusUpdate, DeviceAction } from '@casual-simulation/aux-common';
|
|
5
5
|
import { RuntimeActions, RuntimeStateVersion } from '@casual-simulation/aux-runtime';
|
|
6
6
|
export declare class AuxVMNode implements AuxVM {
|
|
@@ -14,17 +14,22 @@ export declare class AuxVMNode implements AuxVM {
|
|
|
14
14
|
private _subVMAdded;
|
|
15
15
|
private _subVMRemoved;
|
|
16
16
|
private _subVMMap;
|
|
17
|
-
|
|
17
|
+
private _onAuthMessage;
|
|
18
|
+
private _id;
|
|
19
|
+
private _configBotId;
|
|
20
|
+
get id(): string;
|
|
21
|
+
get configBotId(): string;
|
|
18
22
|
get localEvents(): Observable<RuntimeActions[]>;
|
|
19
23
|
get deviceEvents(): Observable<DeviceAction[]>;
|
|
20
24
|
get stateUpdated(): Observable<StateUpdatedEvent>;
|
|
21
25
|
get versionUpdated(): Observable<RuntimeStateVersion>;
|
|
22
26
|
get connectionStateChanged(): Observable<StatusUpdate>;
|
|
23
27
|
get onError(): Observable<AuxChannelErrorType>;
|
|
28
|
+
get onAuthMessage(): Observable<PartitionAuthMessage>;
|
|
24
29
|
get subVMAdded(): Observable<AuxSubVM>;
|
|
25
30
|
get subVMRemoved(): Observable<AuxSubVM>;
|
|
26
31
|
get channel(): AuxChannel;
|
|
27
|
-
constructor(channel: AuxChannel);
|
|
32
|
+
constructor(id: string, configBotId: string, channel: AuxChannel);
|
|
28
33
|
sendEvents(events: BotAction[]): Promise<void>;
|
|
29
34
|
shout(eventName: string, botIds?: string[], arg?: any): Promise<ChannelActionResult>;
|
|
30
35
|
formulaBatch(formulas: string[]): Promise<void>;
|
|
@@ -32,10 +37,11 @@ export declare class AuxVMNode implements AuxVM {
|
|
|
32
37
|
exportBots(botIds: string[]): Promise<StoredAux>;
|
|
33
38
|
export(): Promise<StoredAux>;
|
|
34
39
|
getTags(): Promise<string[]>;
|
|
40
|
+
sendAuthMessage(message: PartitionAuthMessage): Promise<void>;
|
|
35
41
|
init(loadingCallback?: LoadingProgressCallback): Promise<void>;
|
|
36
42
|
unsubscribe(): void;
|
|
37
43
|
closed: boolean;
|
|
38
|
-
protected _createSubVM(channel: AuxChannel): AuxVM;
|
|
44
|
+
protected _createSubVM(id: string, configBotId: string, channel: AuxChannel): AuxVM;
|
|
39
45
|
private _handleAddedSubChannel;
|
|
40
46
|
private _handleRemovedSubChannel;
|
|
41
47
|
}
|
package/vm/AuxVMNode.js
CHANGED
|
@@ -9,6 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import { Subject } from 'rxjs';
|
|
11
11
|
export class AuxVMNode {
|
|
12
|
+
get id() {
|
|
13
|
+
return this._id;
|
|
14
|
+
}
|
|
15
|
+
get configBotId() {
|
|
16
|
+
return this._configBotId;
|
|
17
|
+
}
|
|
12
18
|
get localEvents() {
|
|
13
19
|
return this._localEvents;
|
|
14
20
|
}
|
|
@@ -27,6 +33,9 @@ export class AuxVMNode {
|
|
|
27
33
|
get onError() {
|
|
28
34
|
return this._onError;
|
|
29
35
|
}
|
|
36
|
+
get onAuthMessage() {
|
|
37
|
+
return this._onAuthMessage;
|
|
38
|
+
}
|
|
30
39
|
get subVMAdded() {
|
|
31
40
|
return this._subVMAdded;
|
|
32
41
|
}
|
|
@@ -36,17 +45,21 @@ export class AuxVMNode {
|
|
|
36
45
|
get channel() {
|
|
37
46
|
return this._channel;
|
|
38
47
|
}
|
|
39
|
-
constructor(channel) {
|
|
48
|
+
constructor(id, configBotId, channel) {
|
|
49
|
+
this._id = id;
|
|
50
|
+
this._configBotId = configBotId;
|
|
40
51
|
this._channel = channel;
|
|
41
52
|
this._localEvents = new Subject();
|
|
42
53
|
this._deviceEvents = new Subject();
|
|
43
54
|
this._stateUpdated = new Subject();
|
|
44
55
|
this._versionUpdated = new Subject();
|
|
45
56
|
this._connectionStateChanged = new Subject();
|
|
57
|
+
this._onAuthMessage = new Subject();
|
|
46
58
|
this._onError = new Subject();
|
|
47
59
|
this._subVMAdded = new Subject();
|
|
48
60
|
this._subVMRemoved = new Subject();
|
|
49
61
|
this._subVMMap = new Map();
|
|
62
|
+
this._onAuthMessage = new Subject();
|
|
50
63
|
}
|
|
51
64
|
sendEvents(events) {
|
|
52
65
|
return this._channel.sendEvents(events);
|
|
@@ -69,26 +82,28 @@ export class AuxVMNode {
|
|
|
69
82
|
getTags() {
|
|
70
83
|
return this._channel.getTags();
|
|
71
84
|
}
|
|
85
|
+
sendAuthMessage(message) {
|
|
86
|
+
return this._channel.sendAuthMessage(message);
|
|
87
|
+
}
|
|
72
88
|
init(loadingCallback) {
|
|
73
89
|
return __awaiter(this, void 0, void 0, function* () {
|
|
74
|
-
return yield this._channel.initAndWait((e) => this._localEvents.next(e), (e) => this._deviceEvents.next(e), (state) => this._stateUpdated.next(state), (version) => this._versionUpdated.next(version), (connection) => this._connectionStateChanged.next(connection), (err) => this._onError.next(err), (channel) => this._handleAddedSubChannel(channel), (id) => this._handleRemovedSubChannel(id));
|
|
90
|
+
return yield this._channel.initAndWait((e) => this._localEvents.next(e), (e) => this._deviceEvents.next(e), (state) => this._stateUpdated.next(state), (version) => this._versionUpdated.next(version), (connection) => this._connectionStateChanged.next(connection), (err) => this._onError.next(err), (channel) => this._handleAddedSubChannel(channel), (id) => this._handleRemovedSubChannel(id), (message) => this._onAuthMessage.next(message));
|
|
75
91
|
});
|
|
76
92
|
}
|
|
77
93
|
unsubscribe() {
|
|
78
94
|
this.closed = true;
|
|
79
95
|
this._channel.unsubscribe();
|
|
80
96
|
}
|
|
81
|
-
_createSubVM(channel) {
|
|
82
|
-
return new AuxVMNode(channel);
|
|
97
|
+
_createSubVM(id, configBotId, channel) {
|
|
98
|
+
return new AuxVMNode(id, configBotId, channel);
|
|
83
99
|
}
|
|
84
100
|
_handleAddedSubChannel(subChannel) {
|
|
85
101
|
return __awaiter(this, void 0, void 0, function* () {
|
|
86
|
-
const { id,
|
|
102
|
+
const { id, configBotId } = yield subChannel.getInfo();
|
|
87
103
|
const channel = yield subChannel.getChannel();
|
|
88
104
|
const subVM = {
|
|
89
105
|
id,
|
|
90
|
-
|
|
91
|
-
vm: this._createSubVM(channel),
|
|
106
|
+
vm: this._createSubVM(id, configBotId, channel),
|
|
92
107
|
channel,
|
|
93
108
|
};
|
|
94
109
|
this._subVMMap.set(id, subVM);
|
package/vm/AuxVMNode.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuxVMNode.js","sourceRoot":"","sources":["AuxVMNode.ts"],"names":[],"mappings":";;;;;;;;;AAQA,OAAO,EAAc,OAAO,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"AuxVMNode.js","sourceRoot":"","sources":["AuxVMNode.ts"],"names":[],"mappings":"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"}
|
package/vm/NodeAuxChannel.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { RemoteAction,
|
|
1
|
+
import { RemoteAction, AuxPartitionServices } from '@casual-simulation/aux-common';
|
|
2
2
|
import { PartitionConfig, AuxPartition } from '@casual-simulation/aux-common';
|
|
3
3
|
import { AuxConfig, BaseAuxChannel } from '@casual-simulation/aux-vm';
|
|
4
4
|
import { Observable } from 'rxjs';
|
|
@@ -6,10 +6,10 @@ import { AuxRuntime } from '@casual-simulation/aux-runtime';
|
|
|
6
6
|
export declare class NodeAuxChannel extends BaseAuxChannel {
|
|
7
7
|
private _remoteEvents;
|
|
8
8
|
get remoteEvents(): Observable<RemoteAction[]>;
|
|
9
|
-
constructor(
|
|
10
|
-
protected _createPartition(config: PartitionConfig): Promise<AuxPartition>;
|
|
9
|
+
constructor(config: AuxConfig);
|
|
10
|
+
protected _createPartition(config: PartitionConfig, services: AuxPartitionServices): Promise<AuxPartition>;
|
|
11
11
|
protected _sendRemoteEvents(events: RemoteAction[]): Promise<void>;
|
|
12
12
|
protected _createRuntime(): AuxRuntime;
|
|
13
|
-
protected _createSubChannel(
|
|
13
|
+
protected _createSubChannel(runtime: AuxRuntime, config: AuxConfig): BaseAuxChannel;
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=NodeAuxChannel.d.ts.map
|
package/vm/NodeAuxChannel.js
CHANGED
|
@@ -16,13 +16,13 @@ export class NodeAuxChannel extends BaseAuxChannel {
|
|
|
16
16
|
get remoteEvents() {
|
|
17
17
|
return this._remoteEvents;
|
|
18
18
|
}
|
|
19
|
-
constructor(
|
|
20
|
-
super(
|
|
19
|
+
constructor(config) {
|
|
20
|
+
super(config, {});
|
|
21
21
|
this._remoteEvents = new Subject();
|
|
22
22
|
}
|
|
23
|
-
_createPartition(config) {
|
|
23
|
+
_createPartition(config, services) {
|
|
24
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
25
|
-
return yield createAuxPartition(config, createMemoryPartition, (config) => createYjsPartition(config), (config) => createRemoteYjsPartition(config,
|
|
25
|
+
return yield createAuxPartition(config, services, createMemoryPartition, (config) => createYjsPartition(config), (config) => createRemoteYjsPartition(config, services.authSource), (config) => createRemoteClientYjsPartition(config, services.authSource));
|
|
26
26
|
});
|
|
27
27
|
}
|
|
28
28
|
_sendRemoteEvents(events) {
|
|
@@ -39,8 +39,8 @@ export class NodeAuxChannel extends BaseAuxChannel {
|
|
|
39
39
|
// manager.logFormulaErrors = true;
|
|
40
40
|
return manager;
|
|
41
41
|
}
|
|
42
|
-
_createSubChannel(
|
|
43
|
-
const channel = new NodeAuxChannel(
|
|
42
|
+
_createSubChannel(runtime, config) {
|
|
43
|
+
const channel = new NodeAuxChannel(config);
|
|
44
44
|
channel._runtime = runtime;
|
|
45
45
|
return channel;
|
|
46
46
|
}
|
package/vm/NodeAuxChannel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeAuxChannel.js","sourceRoot":"","sources":["NodeAuxChannel.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAIH,kBAAkB,EAClB,8BAA8B,
|
|
1
|
+
{"version":3,"file":"NodeAuxChannel.js","sourceRoot":"","sources":["NodeAuxChannel.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAIH,kBAAkB,EAClB,8BAA8B,GAEjC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAGH,kBAAkB,EAClB,qBAAqB,GACxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAa,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAc,OAAO,EAAE,MAAM,MAAM,CAAC;AAE3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAE5E,MAAM,OAAO,cAAe,SAAQ,cAAc;IAG9C,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,YAAY,MAAiB;QACzB,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAClB,IAAI,CAAC,aAAa,GAAG,IAAI,OAAO,EAAkB,CAAC;IACvD,CAAC;IAEe,gBAAgB,CAC5B,MAAuB,EACvB,QAA8B;;YAE9B,OAAO,MAAM,kBAAkB,CAC3B,MAAM,EACN,QAAQ,EACR,qBAAqB,EACrB,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;IAEe,iBAAiB,CAAC,MAAsB;;;;;YACpD,MAAM,OAAM,iBAAiB,YAAC,MAAM,CAAC,CAAC;YACtC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;KAAA;IAES,cAAc;QACpB,MAAM,OAAO,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC;QACvC,mCAAmC;QACnC,OAAO,OAAO,CAAC;IACnB,CAAC;IAES,iBAAiB,CACvB,OAAmB,EACnB,MAAiB;QAEjB,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC;QAC3C,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC;QAC3B,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ"}
|