@momo2555/koppeliajs 0.0.104 → 0.0.105
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.
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { KoppeliaWebsocket, type Callback } from './koppeliaWebsocket.js';
|
|
2
2
|
import { Message, type MessageData, PeerType } from './message.js';
|
|
3
3
|
import type { AnyState } from './state.js';
|
|
4
|
-
export type ChangeStateCallback = (from: string, state: AnyState) => void;
|
|
4
|
+
export type ChangeStateCallback = (from: string, state: AnyState, update: boolean) => void;
|
|
5
5
|
export type ChangeStageCallback = (from: string, stage: string) => void;
|
|
6
6
|
export type DataExchangeCallback = (from: string, data: any) => void;
|
|
7
7
|
export type DeviceEventCallback = (device: string, from_addr: string, event: string) => void;
|
package/dist/scripts/console.js
CHANGED
|
@@ -127,7 +127,8 @@ export class Console {
|
|
|
127
127
|
if (type == MessageType.REQUEST) {
|
|
128
128
|
switch (request.request.exec) {
|
|
129
129
|
case "changeState":
|
|
130
|
-
|
|
130
|
+
let update = request.getParam("update", false);
|
|
131
|
+
this._execChangeStateHandlers(request.header.from, request.request.params.state, update);
|
|
131
132
|
break;
|
|
132
133
|
case "changeStage":
|
|
133
134
|
this._execChangeStageHandlers(request.header.from, request.request.params.stage);
|
|
@@ -160,9 +161,9 @@ export class Console {
|
|
|
160
161
|
handler(device, from_addr, event);
|
|
161
162
|
}
|
|
162
163
|
}
|
|
163
|
-
_execChangeStateHandlers(from, state) {
|
|
164
|
+
_execChangeStateHandlers(from, state, update) {
|
|
164
165
|
for (let handler of this._changeStateHandlers) {
|
|
165
|
-
handler(from, state);
|
|
166
|
+
handler(from, state, update);
|
|
166
167
|
}
|
|
167
168
|
}
|
|
168
169
|
_execChangeStageHandlers(from, stage) {
|
package/dist/scripts/state.js
CHANGED
|
@@ -23,7 +23,7 @@ export class State {
|
|
|
23
23
|
req.setRequest("getState");
|
|
24
24
|
this._console.sendMessage(req, (response) => {
|
|
25
25
|
let state = response.getParam('state', {});
|
|
26
|
-
this._onReceiveState(response.header.from, state);
|
|
26
|
+
this._onReceiveState(response.header.from, state, false);
|
|
27
27
|
});
|
|
28
28
|
}
|
|
29
29
|
/**
|
|
@@ -55,17 +55,28 @@ export class State {
|
|
|
55
55
|
this.updateFromServer();
|
|
56
56
|
});
|
|
57
57
|
// update the state when receive a change from console
|
|
58
|
-
this._console.onStateChange((from, state) => {
|
|
59
|
-
this._onReceiveState(from, state);
|
|
58
|
+
this._console.onStateChange((from, state, update) => {
|
|
59
|
+
this._onReceiveState(from, state, update);
|
|
60
60
|
});
|
|
61
61
|
// Send a change state request when detect a state change
|
|
62
62
|
this._globalState.subscribe((newState) => {
|
|
63
63
|
if (this._access) {
|
|
64
|
+
let currentState = get(this._globalState);
|
|
65
|
+
let update = {};
|
|
66
|
+
for (let entry in newState) {
|
|
67
|
+
if (!Object.hasOwn(currentState, entry)) {
|
|
68
|
+
update[entry] = newState[entry];
|
|
69
|
+
}
|
|
70
|
+
else if (currentState[entry] != newState[entry]) {
|
|
71
|
+
update[entry] = newState[entry];
|
|
72
|
+
}
|
|
73
|
+
}
|
|
64
74
|
this._console.onReady(() => {
|
|
65
75
|
console.log("change state new state", newState);
|
|
66
76
|
let req = new Message();
|
|
67
77
|
req.setRequest("changeState");
|
|
68
|
-
req.addParam("state",
|
|
78
|
+
req.addParam("state", update);
|
|
79
|
+
req.addParam("update", true);
|
|
69
80
|
this._console.sendMessage(req);
|
|
70
81
|
});
|
|
71
82
|
}
|
|
@@ -74,9 +85,18 @@ export class State {
|
|
|
74
85
|
/**
|
|
75
86
|
* callback when a new state
|
|
76
87
|
*/
|
|
77
|
-
_onReceiveState(from, receivedState) {
|
|
88
|
+
_onReceiveState(from, receivedState, update) {
|
|
78
89
|
this._access = false;
|
|
79
|
-
|
|
90
|
+
if (update) {
|
|
91
|
+
let state = get(this._globalState);
|
|
92
|
+
for (let entry in receivedState) {
|
|
93
|
+
state[entry] = receivedState[entry];
|
|
94
|
+
}
|
|
95
|
+
this._globalState.set(state);
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
this._globalState.set(receivedState);
|
|
99
|
+
}
|
|
80
100
|
this._access = true;
|
|
81
101
|
}
|
|
82
102
|
}
|