Merge pull request #53 from praxis-live/netty-hub

New network hub based on Netty and Ion
praxis-live · Sep 20, 2023 · 71c962b · 71c962b
2 parents c10a6e7 + 2a412b8
commit 71c962b
Show file tree

Hide file tree

Showing 31 changed files with 2,924 additions and 3,609 deletions.
diff --git a/pom.xml b/pom.xml
@@ -39,7 +39,6 @@
     <module>praxiscore-video-pgl-natives</module>
     <module>praxiscore-video-pgl-code</module>
     <module>praxiscore-internal-osc</module>
-    <module>praxiscore-internal-httpd</module>
     <module>praxiscore-hub-net</module>
     <module>praxiscore-audio</module>
     <module>praxiscore-audio-code</module>
@@ -154,6 +153,11 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>3.1.2</version>
+          <configuration>
+            <systemPropertyVariables>
+              <junit.jupiter.execution.timeout.mode>disabled_on_debug</junit.jupiter.execution.timeout.mode>
+            </systemPropertyVariables>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

diff --git a/praxiscore-hub-net/pom.xml b/praxiscore-hub-net/pom.xml
@@ -17,14 +17,49 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>praxiscore-internal-httpd</artifactId>
-      <version>${project.version}</version>
+      <groupId>com.amazon.ion</groupId>
+      <artifactId>ion-java</artifactId>
+      <version>1.9.5</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>praxiscore-internal-osc</artifactId>
-      <version>${project.version}</version>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+      <version>4.1.96.Final</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+      <version>4.1.96.Final</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+      <version>4.1.96.Final</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
+      <version>4.1.96.Final</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec-http</artifactId>
+      <version>4.1.96.Final</version>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

diff --git a/praxiscore-hub-net/src/main/java/module-info.java b/praxiscore-hub-net/src/main/java/module-info.java
@@ -1,18 +1,21 @@
 module org.praxislive.hub.net {
-
-    requires java.logging;
-
+
     requires org.praxislive.hub;
     requires org.praxislive.core;
     requires org.praxislive.base;
     requires org.praxislive.script;
-
-    requires org.praxislive.internal.httpd;
-    requires org.praxislive.internal.osc;
-
+
+    requires com.amazon.ion;
+    requires io.netty.common;
+    requires io.netty.buffer;
+    requires io.netty.codec;
+    requires io.netty.codec.http;
+    requires io.netty.handler;
+    requires io.netty.transport;
+
     exports org.praxislive.hub.net;
-    
+
     provides org.praxislive.script.CommandInstaller with
             org.praxislive.hub.net.internal.HubNetCommands;
-    
+
 }