Skip to content

Commit 9a8d096

Browse files
committed
v0.1.2 update
fixed premature timeout bug in frontend
1 parent cbde672 commit 9a8d096

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

config/BUILD_DETAILS

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
JDK Version:
2-
openjdk 22.0.1 2024-04-16
3-
OpenJDK Runtime Environment (build 22.0.1+8-16)
4-
OpenJDK 64-Bit Server VM (build 22.0.1+8-16, mixed mode, sharing)
2+
openjdk 24.0.1 2025-04-15
3+
OpenJDK Runtime Environment (build 24.0.1+9-30)
4+
OpenJDK 64-Bit Server VM (build 24.0.1+9-30, mixed mode, sharing)
55

66
Compilation Flags:
77
--release 11
@@ -10,7 +10,10 @@ Runtime Dependencies:
1010
addonsupport-api-addon-1.10.0
1111
alarmmanager-api-addon-1.10.0
1212
bacnet-api-core-1.10.007-20240227.1003r
13+
datatable-api-addon-1.10.0
1314
directaccess-api-addon-1.10.0
15+
logicbuilder-api-addon-1.10.0
16+
semantics-api-addon-1.10.0
1417
tomcat-embed-core-9.0.87
1518
webaccess-api-addon-1.10.0
1619
xdatabase-api-addon-1.10.0

root/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<extension version="1">
22
<name>CLI_Web_Terminal</name>
33
<description>Web interface to access the local shell environment of the WebCTRL server.</description>
4-
<version>0.1.1</version>
4+
<version>0.1.2</version>
55
<vendor>Automatic Controls Equipment Systems, Inc.</vendor>
66
<system-menu-provider>aces.webctrl.cli.web.SystemMenuEditor</system-menu-provider>
77
</extension>

src/aces/webctrl/cli/resources/MainPage.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
const req = new XMLHttpRequest();
104104
req.open("POST","__PREFIX__/index?type=get");
105105
req.setRequestHeader("content-type", "application/x-www-form-urlencoded");
106-
req.timeout = 900000;
106+
req.timeout = 60000;
107107
req.onreadystatechange = function(){
108108
if (this.readyState===4){
109109
if (this.status===200){
@@ -113,6 +113,8 @@
113113
setTimeout(retrieve, 0);
114114
}else if (this.status==0){
115115
setStatus("red", "Request timed out.");
116+
}else if (this.status==504){
117+
setTimeout(retrieve, 0);
116118
}else{
117119
setStatus("red", "HTTP Error "+this.status);
118120
}
@@ -187,6 +189,7 @@
187189
}
188190
}
189191
});
192+
cmd.focus();
190193
window.onbeforeunload = ()=>{
191194
const req = new XMLHttpRequest();
192195
req.open("POST","__PREFIX__/index?type=kill");

src/aces/webctrl/cli/web/MainPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class MainPage extends ServletBase {
3434
}
3535
case "get":{
3636
try{
37-
if (p.waitForContent(System.currentTimeMillis()+700000L)){
37+
if (p.waitForContent(System.currentTimeMillis()+50000L)){
3838
if (Initializer.stop){
3939
res.sendError(500, "Add-on is shutting down.");
4040
return;

0 commit comments

Comments
 (0)