From f85bbdddca5a4636e20dfd5092b38fff04d9eebb Mon Sep 17 00:00:00 2001
From: aNNiMON <annimon119@gmail.com>
Date: Sun, 3 Mar 2024 15:17:58 +0200
Subject: [PATCH] Move socket to separate module

---
 modules/main/build.gradle                     |  3 ---
 modules/socket/build.gradle                   | 25 +++++++++++++++++++
 .../ownlang/modules/socket/socket.java        |  6 +----
 settings.gradle                               |  2 +-
 4 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 modules/socket/build.gradle
 rename modules/{main => socket}/src/main/java/com/annimon/ownlang/modules/socket/socket.java (97%)

diff --git a/modules/main/build.gradle b/modules/main/build.gradle
index 9bba829..16eb715 100644
--- a/modules/main/build.gradle
+++ b/modules/main/build.gradle
@@ -9,9 +9,6 @@ dependencies {
     compileOnlyApi project(":ownlang-core")
 
     implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
-    implementation ("io.socket:socket.io-client:${versions.socket}") {
-        exclude group: 'org.json', module: 'json'
-    }
     implementation "org.json:json:${versions.json}"
     implementation "org.yaml:snakeyaml:${versions.snakeyaml}"
 
diff --git a/modules/socket/build.gradle b/modules/socket/build.gradle
new file mode 100644
index 0000000..c1acf3c
--- /dev/null
+++ b/modules/socket/build.gradle
@@ -0,0 +1,25 @@
+plugins {
+    id 'java-library'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+}
+
+group = 'com.annimon.module'
+version = '1.0.0'
+
+dependencies {
+    compileOnlyApi project(":ownlang-core")
+
+    implementation ("io.socket:socket.io-client:${versions.socket}") {
+        exclude group: 'org.json', module: 'json'
+        exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+    }
+    compileOnly "com.squareup.okhttp3:okhttp:${versions.okhttp}"
+    compileOnly "org.json:json:${versions.json}"
+
+    testImplementation platform("org.junit:junit-bom:${versions.junit}")
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+}
+
+test {
+    useJUnitPlatform()
+}
\ No newline at end of file
diff --git a/modules/main/src/main/java/com/annimon/ownlang/modules/socket/socket.java b/modules/socket/src/main/java/com/annimon/ownlang/modules/socket/socket.java
similarity index 97%
rename from modules/main/src/main/java/com/annimon/ownlang/modules/socket/socket.java
rename to modules/socket/src/main/java/com/annimon/ownlang/modules/socket/socket.java
index 048c8aa..d4b0982 100644
--- a/modules/main/src/main/java/com/annimon/ownlang/modules/socket/socket.java
+++ b/modules/socket/src/main/java/com/annimon/ownlang/modules/socket/socket.java
@@ -7,6 +7,7 @@ import io.socket.client.IO;
 import io.socket.client.Socket;
 import java.net.URISyntaxException;
 import java.util.Map;
+import static com.annimon.ownlang.lib.ValueUtils.getNumber;
 
 /**
  * socket.io module.
@@ -180,9 +181,4 @@ public final class socket implements Module {
         });
         return result;
     }
-
-    private static Number getNumber(Value value) {
-        if (value.type() != Types.NUMBER) return value.asInt();
-        return ((NumberValue) value).raw();
-    }
 }
diff --git a/settings.gradle b/settings.gradle
index 0f74de4..8796d68 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ include 'ownlang-desktop'
 include 'ownlang-utils'
 include 'docs'
 
-final def modules = ['main', 'canvasfx', 'jdbc', 'server']
+final def modules = ['main', 'canvasfx', 'jdbc', 'server', 'socket']
 
 for (final def module in modules) {
     include "modules:$module"