I will not apologize for art. (C) whatthecommit.com

Author: daggerok

.gitignore

@@ -11,6 +11,7 @@ out/
 src/main/resources/static/
 package-lock.json
 node_modules/
+.cache/
 
 ### STS ###
 .apt_generated

README.md

@@ -2,7 +2,7 @@
 From end to end full-stack communication by using RSocket protocol example application.
 
 ```bash
-./gradlew ' java -jar ./build/libs/*jar
+./gradlew ; java -jar ./build/libs/*jar
 ```
 
 open http://127.0.0.1:8080

build.gradle.kts

@@ -71,8 +71,6 @@ tasks {
   }
 }
 
-defaultTasks("clean", "build")
-
 reckon {
   scopeFromProp()
   // stageFromProp()
@@ -102,8 +100,8 @@ node {
   download = true
   version = projectNodeVersion
   npmVersion = projectNpmVersion
-  workDir = file("$buildDir/nodejs")
-  npmWorkDir = file("$buildDir/npm")
+  workDir = file("$buildDir/.gradle/nodejs")
+  npmWorkDir = file("$buildDir/.gradle/npm")
   nodeModulesDir = file("$projectDir/src/main/js")
 }
 
@@ -112,8 +110,10 @@ tasks {
     delete("$projectDir/src/main/js/.cache")
     delete("$projectDir/src/main/resources/static")
   }
-  assemble {
-    shouldRunAfter("clean")
+  processResources {
+    shouldRunAfter("clean", "npm_i", "npm_run_build")
+    dependsOn("npm_i", "npm_run_build")
   }
-  assemble.get().dependsOn("npm_i", "npm_run_build")
 }
+
+defaultTasks("clean", "npm_i", "npm_run_build", "build")

src/main/js/main.js

@@ -2,31 +2,12 @@ const { RSocketClient, JsonSerializer, IdentitySerializer } = require('rsocket-c
 const RSocketWebSocketClient = require('rsocket-websocket-client').default;
 let client = undefined;
 
-function addErrorMessage(prefix, error) {
-  const ul = document.getElementById('app');
-  const li = document.createElement('li');
-  li.appendChild(document.createTextNode(prefix + error));
-  ul.prepend(li);
-}
-
-function reloadMessages(message) {
-  const ul = document.getElementById('app');
-  const all_li = ul.getElementsByTagName('li');
-
-  for (let i = 0; i < all_li.length; i++) {
-    const li = all_li[i];
-    if (li.innerText.includes(message['id'])) return;
-  }
-
-  const li = document.createElement('li');
-  li.appendChild(document.createTextNode(JSON.stringify(message)));
-  ul.appendChild(li);
-}
+document.addEventListener('DOMContentLoaded', main);
 
 function main() {
   if (client !== undefined) {
     client.close();
-    document.getElementById('app').innerHTML = '';
+    ul().innerHTML = '';
   }
 
   // Create an instance of a client
@@ -64,7 +45,7 @@ function main() {
         onComplete: () => console.log('complete'),
         onError: error => {
           console.log(error);
-          addErrorMessage('Connection has been closed due to ', error);
+          addListItem(ul(), 'Connection has been closed due to ' + error);
         },
         onNext: payload => {
           console.log(payload.data);
@@ -77,12 +58,30 @@ function main() {
     },
     onError: error => {
       console.log(error);
-      addErrorMessage('Connection has been refused due to ', error);
+      addListItem(ul(), 'Connection has been refused due to ', error);
     },
     onSubscribe: cancel => {
       /* call cancel() to abort */
     }
   });
 }
 
-document.addEventListener('DOMContentLoaded', main);
+function ul() {
+  return document.getElementById('app');
+}
+
+function reloadMessages(message) {
+  const listItems = ul().getElementsByTagName('li');
+
+  for (let i = 0; i < listItems.length; i++) {
+    if (listItems[i].innerText.includes(message['id'])) return;
+  }
+
+  addListItem(JSON.stringify(message));
+}
+
+function addListItem(text) {
+  const li = document.createElement('li');
+  li.appendChild(document.createTextNode(text));
+  ul().prepend(li);
+}