feat: RedData.Json is now optional.

poirierlouis · poirierlouis · commit bd7ddc2aa379 · 2024-07-14T14:09:37.000+02:00
Configure project with red-cli.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- `RedData.Json` is now optional when installing `RedHttpClient`. 
+
 ### Added
 - support in `HttpClient` and `AsyncHttpClient` to send a body with `DELETE` 
   methods.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -84,3 +84,14 @@ target_link_libraries(RedHttpClient PRIVATE
         RedFileSystem
         cpr::cpr
 )
+
+## Debug mode: install scripts (+ tests) and plugin in game folder.
+## Release mode: create archive with bundled scripts and plugin.
+add_custom_command(
+        TARGET RedHttpClient
+        POST_BUILD
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        COMMENT "$<$<CONFIG:Debug>:Install scripts with red-cli>" "$<$<CONFIG:Release>:Build archive with red-cli>"
+        COMMAND "$<$<CONFIG:Debug>:red-cli;install;--debug>" "$<$<CONFIG:Release>:red-cli;pack>"
+        COMMAND_EXPAND_LISTS
+)
diff --git a/README.md b/README.md
@@ -16,8 +16,8 @@ CET.
 ## Installation
 1. Install requirements:
   - [RED4ext] v1.24.3+
-  - [RedData] v0.4.0+
-  - [RedFileSystem] v0.9.0+ is recommended
+  - [RedData] v0.4.0+ (only required for Json data)
+  - [RedFileSystem] v0.9.0+ (recommended)
 2. Extract the [latest archive] into the Cyberpunk 2077 directory.
 
 ## Usage
diff --git a/bundle.mjs b/bundle.mjs
diff --git a/install.mjs b/install.mjs
diff --git a/red.config.json b/red.config.json
@@ -0,0 +1,15 @@
+{
+  "name": "RedHttpClient",
+  "version": "0.3.3",
+  "license": true,
+  "dist": "dist\\",
+  "scripts": {
+    "redscript": {
+      "src": "scripts\\RedHttpClient\\"
+    }
+  },
+  "plugin": {
+    "debug": "build\\Debug\\",
+    "release": "build\\Release\\"
+  }
+}
diff --git a/scripts/RedHttpClient/AsyncHttpClient.reds b/scripts/RedHttpClient/AsyncHttpClient.reds
@@ -1,3 +1,8 @@
+module RedHttpClient
+
+@if(ModuleExists("RedData.Json"))
+import RedData.Json.*
+
 public native class AsyncHttpClient {
 
   public static native func Get(callback: HttpCallback, url: String, opt headers: array<HttpHeader>) -> Void;
diff --git a/scripts/RedHttpClient/HttpCallback.reds b/scripts/RedHttpClient/HttpCallback.reds
@@ -1,3 +1,5 @@
+module RedHttpClient
+
 public native struct HttpCallback {
 
   public static func Create(target: wref<IScriptable>, function: CName, opt data: array<Variant>) -> HttpCallback {
diff --git a/scripts/RedHttpClient/HttpClient.reds b/scripts/RedHttpClient/HttpClient.reds
@@ -1,3 +1,8 @@
+module RedHttpClient
+
+@if(ModuleExists("RedData.Json"))
+import RedData.Json.*
+
 public native class HttpClient {
 
   public static native func Get(url: String, opt headers: array<HttpHeader>) -> ref<HttpResponse>;
diff --git a/scripts/RedHttpClient/HttpHeader.reds b/scripts/RedHttpClient/HttpHeader.reds
@@ -1,3 +1,5 @@
+module RedHttpClient
+
 public native struct HttpHeader {
 
   public static func Create(name: String, value: String) -> HttpHeader {
diff --git a/scripts/RedHttpClient/HttpMultipart.reds b/scripts/RedHttpClient/HttpMultipart.reds
@@ -1,3 +1,5 @@
+module RedHttpClient
+
 public native class HttpMultipart {
 
   public native func AddPart(name: String, value: String) -> Void;
diff --git a/scripts/RedHttpClient/HttpPair.reds b/scripts/RedHttpClient/HttpPair.reds
@@ -1,3 +1,5 @@
+module RedHttpClient
+
 public native struct HttpPair {
 
   public static func Create(key: String, value: String) -> HttpPair {
diff --git a/scripts/RedHttpClient/HttpResponse.reds b/scripts/RedHttpClient/HttpResponse.reds
@@ -1,3 +1,8 @@
+module RedHttpClient
+
+@if(ModuleExists("RedData.Json"))
+import RedData.Json.*
+
 public native class HttpResponse {
 
   public native func GetStatus() -> HttpStatus;
diff --git a/scripts/RedHttpClient/HttpStatus.reds b/scripts/RedHttpClient/HttpStatus.reds
@@ -1,3 +1,5 @@
+module RedHttpClient
+
 enum HttpStatus {
   Continue = 100,
   SwitchingProtocols = 101,
diff --git a/scripts/RedHttpClient/Test/AsyncHttpClientTest.reds b/scripts/RedHttpClient/Test/AsyncHttpClientTest.reds
@@ -1,3 +1,5 @@
+module RedHttpClient.Test
+
 import RedData.Json.*
 import RedHttpClient.*
 
diff --git a/scripts/RedHttpClient/Test/HttpClientTest.reds b/scripts/RedHttpClient/Test/HttpClientTest.reds
@@ -1,3 +1,5 @@
+module RedHttpClient.Test
+
 import RedData.Json.*
 import RedHttpClient.*
 
diff --git a/scripts/RedHttpClient/Test/MainTest.reds b/scripts/RedHttpClient/Test/MainTest.reds
@@ -1,6 +1,9 @@
+module RedHttpClient.Test
+
 import Codeware.*
+import RedHttpClient.*
 
-public class MainTest extends ScriptableEnv {
+public class RedHttpClientTest extends ScriptableEnv {
   private let m_runner: ref<RedTest>;
 
   /// Lifecycle ///
@@ -15,6 +18,6 @@ public class MainTest extends ScriptableEnv {
 
 }
 
-public static func GetMainTest() -> ref<MainTest> {
-  return ScriptableEnv.Get(n"MainTest") as MainTest;
+public static func GetRedHttpClientTest() -> ref<RedHttpClientTest> {
+  return ScriptableEnv.Get(n"RedHttpClientTest") as RedHttpClientTest;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+module RedHttpClient`
	`2`	`+`
`1`	`3`	`public native struct HttpCallback {`
`2`	`4`
`3`	`5`	`public static func Create(target: wref<IScriptable>, function: CName, opt data: array<Variant>) -> HttpCallback {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+module RedHttpClient`
	`2`	`+`
`1`	`3`	`public native struct HttpHeader {`
`2`	`4`
`3`	`5`	`public static func Create(name: String, value: String) -> HttpHeader {`