refine ZK-4485 (dynamic loading wpd)

zk/src/main/java/org/zkoss/zk/ui/http/WpdExtendlet.java

@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -94,6 +95,7 @@ public class WpdExtendlet extends AbstractExtendlet<Object> {
 	private static final String SOURCE_MAP_DIVIDED_WPDS_NUMBER = "$zk$dividedWPDsNum";
 	private ConcurrentMap<String, List<Element>> _dividedWpds = new ConcurrentHashMap<>(1); // store xml node for later parsing (ex. zk1 -> <script> ...)
 	private ConcurrentMap<String, Integer> _dividedPackageCnt = new ConcurrentHashMap<>(1); // store package count for dependency (ex. zul.wgt -> 2)
+	private Set<String> _lastDynamicWpds = ConcurrentHashMap.newKeySet(1); // store last dynamic wpd for not setting loaded
 
 	public void init(ExtendletConfig config) {
 		init(config, new WpdLoader());
@@ -169,7 +171,7 @@ protected byte[] retrieve(HttpServletRequest request, HttpServletResponse respon
 				dividedElements = _dividedWpds.get(lastPart);
 				if (dividedElements == null) { // dynamic
 					try {
-						return processDynamicWpdWithSourceMapIfAny(request, response, path);
+						return processDynamicWpdWithSourceMapIfAny(request, response, pkgName, path);
 					} catch (Exception e) {
 						log.error("fail to process source for source map", e);
 						return new byte[]{};
@@ -489,13 +491,15 @@ private Object parse(RequestContext reqctx, InputStream is, String path) throws
 			}
 			if (depends != null) {
 				write(out, "});");
-				write(out, "zk.setLoaded('");
-				if (processingPartial && totalPartialCount > 1 && partialNum < totalPartialCount) {
-					write(out, name + partialNum);
-				} else {
-					write(out, name);
+				if (!processingPartial || !_lastDynamicWpds.contains(name + partialNum + ".wpd")) {
+					write(out, "zk.setLoaded('");
+					if (processingPartial && totalPartialCount > 1 && partialNum < totalPartialCount) {
+						write(out, name + partialNum);
+					} else {
+						write(out, name);
+					}
+					write(out, "',1);");
 				}
-				write(out, "',1);");
 			} else if (!processingPartial) {
 				write(out, "})();");
 			}
@@ -1023,10 +1027,11 @@ private String processWpdForSourcemapIfAny(List<String> paths, String originalPa
 		return name;
 	}
 
-	private byte[] processDynamicWpdWithSourceMapIfAny(HttpServletRequest request, HttpServletResponse response, String path) throws Exception {
+	private byte[] processDynamicWpdWithSourceMapIfAny(HttpServletRequest request, HttpServletResponse response, String pkgWpd, String path) throws Exception {
 		List<String> dividedPaths = splitSourceMapJsPathIfAny(path);
 		StringBuilder sb = new StringBuilder();
 		int index = 0;
+		String lastWpd = null;
 		for (String dividedPath : dividedPaths) {
 			String scriptVariableName = "script" + index++;
 			sb.append("var ").append(scriptVariableName).append("=document.createElement('script');");
@@ -1039,6 +1044,12 @@ private byte[] processDynamicWpdWithSourceMapIfAny(HttpServletRequest request, H
 			}
 			sb.append(scriptVariableName).append(".src='").append(url).append("';");
 			sb.append("\ndocument.getElementsByTagName('head')[0].appendChild(").append(scriptVariableName).append(");");
+			lastWpd = dividedPath.substring(dividedPath.lastIndexOf("/") + 1);
+		}
+		if (!Strings.isEmpty(lastWpd)) {
+			_lastDynamicWpds.add(lastWpd);
+			// mark loading
+			sb.append("\nzk.setLoaded('").append(pkgWpd.replace(".wpd", "")).append("',1);");
 		}
 		return sb.toString().getBytes();
 	}

zktest/src/test/java/org/zkoss/zktest/zats/test2/B90_ZK_4485Test.java

@@ -31,6 +31,7 @@ public class B90_ZK_4485Test extends WebDriverTestCase {
 	@Test
 	public void test() {
 		connect();
+		waitResponse();
 		click(jq("@button"));
 		waitResponse();
 		assertEquals("true", getZKLog());