-
Notifications
You must be signed in to change notification settings - Fork 11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Charamel ws plugin #191
base: master
Are you sure you want to change the base?
Charamel ws plugin #191
Conversation
* actor id no longer hard coded * generate UUIDs instead of having them statically
…d. Removed some commented out debug messages.
final int port = Integer.parseInt(Objects.requireNonNull(mConfig.getProperty("port"))); | ||
|
||
app = Javalin.create(config -> config.enforceSsl = true).start(port); | ||
app.ws("/ws", ws -> { | ||
ws.onConnect(ctx -> { | ||
this.addWs(ctx); | ||
mLogger.message("Connected to Charamel VuppetMaster"); | ||
ctx.send(Strings.launchString); | ||
// 17.8.2020 PG - deactivated - Do we need a launch string? ctx.send(Strings.launchString); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, it is useful for testing. No point for it beyond that
…tion. Mode debug messages
# Conflicts: # build.gradle
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please address the null pointer case
@@ -125,12 +125,20 @@ public void execute(AbstractActivity activity) { | |||
public void launch() { | |||
mLogger.message("Loading Charamel VuppetMaster Executor (WebSocket) ..."); | |||
final int port = Integer.parseInt(Objects.requireNonNull(mConfig.getProperty("port"))); | |||
final String sceneflowVar =mConfig.getProperty("sceneflowVar"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
May be null
|
||
app = Javalin.create(config -> config.enforceSsl = true).start(port); | ||
app.ws("/ws", ws -> { | ||
ws.onConnect(ctx -> { | ||
this.addWs(ctx); | ||
mLogger.message("Connected to Charamel VuppetMaster"); | ||
|
||
// let sceneflow know that a client has connected | ||
if (mProject.hasVariable(sceneflowVar)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
scenefloVar may be null, which leads to a crash here
… message to sceneflow variable
…option in cases where the REQUEST will lead to multiple instances of radio button inputs. Also contains corresponding updates to the studymaster-web example project where all the REQUEST fields have been doubled to verify and record the functioning of multiple input instances of the same type.
…ight teh right selected option in cases where the REQUEST will lead to multiple instances of radio button inputs.
…empty upon starting and ending the studymaster session i.e. when the play and stop button are pressed in VSM.
…t based studymaser system.
# Conflicts: # plugins/studymaster-web/ExampleProject/studymaster-web/sceneflow.xml
No description provided.