IDEMPIERE-4512 zk9.5 - Timeout page is not working (#384)

org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java

@@ -236,11 +236,18 @@ public class AtmosphereServerPush implements ServerPush {
             return;
         }
 
-        this.resource.set(null);
+        AtmosphereResource currentResource = this.resource.getAndSet(null);
         synchronized (schedules) {
         	schedules.clear();
 		}
         
+        if (currentResource != null ) {
+        	try {
+				currentResource.close();
+			} catch (IOException e) {
+			}
+        }
+                
         if (Executions.getCurrent() != null) {
 	        if (log.isDebugEnabled())
 	        	log.debug("Stopping server push for " + desktop);

org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml

@@ -47,15 +47,15 @@ Copyright (C) 2007 Ashley G Ramdass (ADempiere WebUI).
 	<javascript src="/js/calc.js" charset="UTF-8"/>
 	<javascript src="/js/layout.js" charset="UTF-8"/>
 	<javascript src="/js/report.js" charset="UTF-8"/>	
-	<!-- <javascript src="/js/persist-min.js" charset="UTF-8"/>  -->
-	<javascript src="/js/token.js" charset="UTF-8"/>
 	<javascript src="/js/window.js" charset="UTF-8"/>
 	<javascript src="/js/html2canvas.js" charset="UTF-8"/>
 	<javascript src="/js/jquery.maskedinput.js" charset="UTF-8"/>
 	<javascript src="/js/photobooth_min.js" charset="UTF-8"/>
 
-
 	<javascript package="jawwa.atmosphere" merge="false" />
 	<javascript package="org.idempiere.websocket" merge="false" />
+	<javascript package="adempiere.local.storage" merge="false" />
 	
+	<javascript-module name="jawwa.atmosphere" version="202011161530"/>
+	<javascript-module name="adempiere.local.storage" version="202011151100"/>
 </language>

org.adempiere.ui.zk/WEB-INF/src/web/js/adempiere/local/storage/token.js

@@ -11,7 +11,9 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,    *
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
  *****************************************************************************/
-var adempiere = {};
+
+window.adempiere = {};
+var adempiere = window.adempiere;
 adempiere.isSupportSavePass=typeof(Storage) !== "undefined";
 
 adempiere.saveUserToken = function (key, hash, sessionId)

org.adempiere.ui.zk/WEB-INF/src/web/js/adempiere/local/storage/zk.wpd

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package name="adempiere.local.storage" language="xul/html">
+	<script src="token.js" />
+</package>

org.adempiere.ui.zk/WEB-INF/src/web/js/jawwa/atmosphere/serverpush.js

@@ -59,7 +59,7 @@
     	  if (me.trace)
     		  console.log("complete"+ " dtid: " + me.desktop.id);
     	  if (me._req && me._req.statusText == "SessionNotFound" && me._req.status == 400) {
-    		  ;//stop sent request:IDEMPIERE-4237
+    		  me._timeout();
     	  } else {
     		  me._schedule();
     	  }
@@ -71,6 +71,7 @@
         setTimeout(this.proxy(this._send), this.delay);
       } else {
         this.stop();
+        this._serverError();
       }
     },
     _send: function() {
@@ -99,6 +100,19 @@
         this._req.abort();
         this._req = null;
       }
+    },
+    _timeout: function() {
+    	_serverError();
+    },
+    _serverError: function() {
+    	zk.confirmClose = false;
+    	adempiere.get("zkTimeoutText", function(ok, val) {
+			if (ok && !!val)
+			{
+				alert(val);
+			}
+			window.location.href="index.zul";
+		});
     }
   });
 })();

org.adempiere.ui.zk/WEB-INF/web.xml

@@ -85,11 +85,11 @@
 	<!-- /////////// -->
 	<!-- Miscellaneous -->
 	<session-config>
-		<cookie-config>
-                        <http-only>true</http-only>
-                        <secure>true</secure>
-                </cookie-config>
 		<session-timeout>60</session-timeout>
+		<cookie-config>
+                <http-only>true</http-only>
+                <secure>true</secure>
+        </cookie-config>	
 	</session-config>
 
 	<!-- MIME mapping -->

org.adempiere.ui.zk/WEB-INF/zk.xml

@@ -38,7 +38,7 @@
 
 	<session-config>
 		<device-type>ajax</device-type>
-		<automatic-timeout/> <!-- the same as <automatic-timeout>true</automatic-timeout> -->
+		<automatic-timeout>true</automatic-timeout>
 		<timeout-uri>/timeout.zul</timeout-uri>
 	</session-config>
 

org.adempiere.ui.zk/index.zul

@@ -15,6 +15,8 @@ Copyright (C) 2007 Ashley G Ramdass.
 <?link rel="manifest" href="manifest.json"?>
 <zk>
 	<script><![CDATA[
+		zk.load("adempiere.local.storage");	
+		
 		zk.afterLoad(function() {
 			zk._Erbx.push = function(msg) {
 				if (console) console.log(msg);

org.adempiere.ui.zk/sessiontimeout.zul

@@ -15,7 +15,7 @@
 
 <div id="timeoutText"></div>
 <div style="margin-top: 10px">
-	<toolbarbutton id="continueText" href="/index.zul" label="Continue"/>
+	<button id="continueText" href="/index.zul" label="Continue"/>
 </div>
 </vbox>
 <script defer="true">