diff --git a/unity-client/Assets/Scripts/Services/ApiClient.cs b/unity-client/Assets/Scripts/Services/ApiClient.cs index 9ba8e1f..2f145ba 100644 --- a/unity-client/Assets/Scripts/Services/ApiClient.cs +++ b/unity-client/Assets/Scripts/Services/ApiClient.cs @@ -1,5 +1,6 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Text; using UnityEngine; using UnityEngine.Networking; @@ -35,7 +36,7 @@ namespace CommanderAILab.Services baseUrl = PlayerPrefs.GetString("ApiBaseUrl", baseUrl); } - // ── Generic Helpers ────────────────────────────────────── + // -- Generic Helpers ------------------------------------------------ public Coroutine Get(string path, Action onSuccess, Action onError = null) { @@ -47,6 +48,11 @@ namespace CommanderAILab.Services return StartCoroutine(PostCoroutine(path, body, onSuccess, onError)); } + public Coroutine PostRaw(string path, string json, Action onSuccess, Action onError = null) + { + return StartCoroutine(PostRawCoroutine(path, json, onSuccess, onError)); + } + private IEnumerator GetCoroutine(string path, Action onSuccess, Action onError) { var url = $"{baseUrl}{path}"; @@ -60,6 +66,7 @@ namespace CommanderAILab.Services onError?.Invoke(request.error); yield break; } + var obj = JsonUtility.FromJson(request.downloadHandler.text); onSuccess?.Invoke(obj); } @@ -81,11 +88,32 @@ namespace CommanderAILab.Services onError?.Invoke(request.error); yield break; } + var obj = JsonUtility.FromJson(request.downloadHandler.text); onSuccess?.Invoke(obj); } - // ── Health Check ───────────────────────────────────────── + private IEnumerator PostRawCoroutine(string path, string json, Action onSuccess, Action onError) + { + var url = $"{baseUrl}{path}"; + using var request = new UnityWebRequest(url, "POST"); + request.uploadHandler = new UploadHandlerRaw(Encoding.UTF8.GetBytes(json)); + request.downloadHandler = new DownloadHandlerBuffer(); + request.SetRequestHeader("Content-Type", "application/json"); + request.timeout = (int)timeoutSeconds; + yield return request.SendWebRequest(); + + if (request.result != UnityWebRequest.Result.Success) + { + Debug.LogWarning($"[ApiClient] POST {path} failed: {request.error}"); + onError?.Invoke(request.error); + yield break; + } + + onSuccess?.Invoke(request.downloadHandler.text); + } + + // -- Health Check --------------------------------------------------- public Coroutine HealthCheck(Action callback) { @@ -94,40 +122,131 @@ namespace CommanderAILab.Services private IEnumerator HealthCheckCoroutine(Action callback) { - using var request = UnityWebRequest.Get($"{baseUrl}/docs"); + using var request = UnityWebRequest.Get($"{baseUrl}/api/health"); request.timeout = 5; yield return request.SendWebRequest(); callback?.Invoke(request.result == UnityWebRequest.Result.Success); } - // ── Collection ─────────────────────────────────────────── + // -- Collection ----------------------------------------------------- // GET /api/collection - // GET /api/collection?search=... - // ── Decks ──────────────────────────────────────────────── - // GET /api/decks + public Coroutine GetCollection(Action onSuccess, Action onError = null, string search = null) + { + var path = string.IsNullOrEmpty(search) + ? "/api/collection" + : $"/api/collection?search={UnityWebRequest.EscapeURL(search)}"; + return StartCoroutine(GetRawCoroutine(path, onSuccess, onError)); + } + + // -- Decks ---------------------------------------------------------- + // GET /api/decks + + public Coroutine GetDecks(Action onSuccess, Action onError = null) + { + return StartCoroutine(GetRawCoroutine("/api/decks", onSuccess, onError)); + } + // POST /api/decks - // GET /api/decks/{id} - // PATCH /api/decks/{id} - // DELETE /api/decks/{id} + public Coroutine CreateDeck(string deckJson, Action onSuccess, Action onError = null) + { + return PostRaw("/api/decks", deckJson, onSuccess, onError); + } - // ── Simulator ──────────────────────────────────────────── + // -- Simulator ------------------------------------------------------ // POST /api/lab/start - // GET /api/lab/status/{id} - // GET /api/lab/results/{id} - // ── Coach ──────────────────────────────────────────────── + public Coroutine StartSim(string configJson, Action onSuccess, Action onError = null) + { + return PostRaw("/api/lab/start", configJson, onSuccess, onError); + } + + // GET /api/lab/status/{id} + public Coroutine GetSimStatus(string simId, Action onSuccess, Action onError = null) + { + return StartCoroutine(GetRawCoroutine($"/api/lab/status/{simId}", onSuccess, onError)); + } + + // GET /api/lab/results/{id} + public Coroutine GetSimResults(string simId, Action onSuccess, Action onError = null) + { + return StartCoroutine(GetRawCoroutine($"/api/lab/results/{simId}", onSuccess, onError)); + } + + // -- Coach ---------------------------------------------------------- // POST /api/coach/chat - // ── Deck Generator ─────────────────────────────────────── + public Coroutine CoachChat(string messageJson, Action onSuccess, Action onError = null) + { + return PostRaw("/api/coach/chat", messageJson, onSuccess, onError); + } + + // -- Deck Generator ------------------------------------------------- // POST /api/deckgen/v3 - // ── Scanner ────────────────────────────────────────────── + public Coroutine GenerateDeck(string requestJson, Action onSuccess, Action onError = null) + { + return PostRaw("/api/deckgen/v3", requestJson, onSuccess, onError); + } + + // -- Meta ----------------------------------------------------------- + // GET /api/lab/meta/commanders + + public Coroutine GetCommanders(Action onSuccess, Action onError = null) + { + return StartCoroutine(GetRawCoroutine("/api/lab/meta/commanders", onSuccess, onError)); + } + + // GET /api/lab/precons + public Coroutine GetPrecons(Action onSuccess, Action onError = null) + { + return StartCoroutine(GetRawCoroutine("/api/lab/precons", onSuccess, onError)); + } + + // -- Scanner -------------------------------------------------------- // POST /api/scanner/scan - // ── Meta ───────────────────────────────────────────────── - // GET /api/lab/meta/commanders - // GET /api/lab/meta/search?q=... - // GET /api/lab/precons + public Coroutine ScanCard(byte[] imageBytes, Action onSuccess, Action onError = null) + { + return StartCoroutine(ScanCardCoroutine(imageBytes, onSuccess, onError)); + } + + private IEnumerator ScanCardCoroutine(byte[] imageBytes, Action onSuccess, Action onError) + { + var url = $"{baseUrl}/api/scanner/scan"; + var form = new WWWForm(); + form.AddBinaryData("file", imageBytes, "card.jpg", "image/jpeg"); + using var request = UnityWebRequest.Post(url, form); + request.timeout = (int)timeoutSeconds; + yield return request.SendWebRequest(); + + if (request.result != UnityWebRequest.Result.Success) + { + Debug.LogWarning($"[ApiClient] POST /api/scanner/scan failed: {request.error}"); + onError?.Invoke(request.error); + yield break; + } + + onSuccess?.Invoke(request.downloadHandler.text); + } + + // -- Raw GET helper (returns JSON string) --------------------------- + + private IEnumerator GetRawCoroutine(string path, Action onSuccess, Action onError) + { + var url = $"{baseUrl}{path}"; + using var request = UnityWebRequest.Get(url); + request.timeout = (int)timeoutSeconds; + yield return request.SendWebRequest(); + + if (request.result != UnityWebRequest.Result.Success) + { + Debug.LogWarning($"[ApiClient] GET {path} failed: {request.error}"); + onError?.Invoke(request.error); + yield break; + } + + onSuccess?.Invoke(request.downloadHandler.text); + } } }