Add sync client

mythz · mythz · commit bde61ae574d2 · 2024-11-24T09:19:44.000+08:00
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/FileUpload.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/FileUpload.java
@@ -0,0 +1,20 @@
+package net.servicestack.client;
+
+public class FileUpload {
+    private String fieldName;
+    private String fileName;
+    private String contentType;
+    private byte[] fileBytes;
+
+    public FileUpload(String fieldName, String fileName, String contentType, byte[] fileBytes) {
+        this.fieldName = fieldName;
+        this.fileName = fileName;
+        this.contentType = contentType != null ? contentType : "application/octet-stream";
+        this.fileBytes = fileBytes;
+    }
+
+    public String getFieldName() { return fieldName != null ? fieldName : "upload"; }
+    public String getFileName() { return fileName; }
+    public String getContentType() { return contentType; }
+    public byte[] getFileBytes() { return fileBytes; }
+}
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonServiceClient.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonServiceClient.java
@@ -8,12 +8,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.net.CookieHandler;
@@ -683,4 +678,75 @@ public void clearCookies() {
         CookieManager cookieManager = (CookieManager) CookieHandler.getDefault();
         cookieManager.getCookieStore().removeAll();
     }
+
+    // Add these methods to JsonServiceClient class:
+
+    public <TResponse> TResponse postFilesWithRequest(IReturn<TResponse> request, FileUpload[] filesresponseType) {
+        String requestUrl = this.replyUrl + requestDto.getClass().getSimpleName();
+        return postFilesWithRequest(requestUrl, request, files, request.getResponseType());
+    }
+
+    public <TResponse> TResponse postFilesWithRequest(Object request, FileUpload[] files, Class<TResponse> responseType) {
+        String requestUrl = this.replyUrl + requestDto.getClass().getSimpleName();
+        return postFilesWithRequest(requestUrl, request, files, responseType);
+    }
+
+    private static final String BOUNDARY = "---" + UUID.randomUUID().toString() + "---";
+
+    public <TResponse> TResponse postFilesWithRequest(String path, Object request, FileUpload[] files, Class<TResponse> responseType) {
+        try {
+            // Prepare multipart data
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            DataOutputStream dos = new DataOutputStream(baos);
+
+            // Add request DTO fields
+            for (Field field : Utils.getSerializableFields(request.getClass())) {
+                Object value = field.get(request);
+                if (value != null) {
+                    writeMultipartField(dos, field.getName(), Utils.stripQuotes(getGson().toJson(value)));
+                }
+            }
+
+            // Add files
+            for (FileUpload file : files) {
+                writeMultipartFile(dos, file);
+            }
+
+            // End multipart
+            dos.writeBytes("--" + BOUNDARY + "--\r\n");
+            dos.flush();
+            dos.close();
+
+            byte[] requestBody = baos.toByteArray();
+            String contentType = "multipart/form-data; boundary=" + BOUNDARY;
+
+            return send(resolveUrl(path), HttpMethods.Post, requestBody, contentType, responseType);
+
+        } catch (IOException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void writeMultipartField(DataOutputStream dos, String fieldName, String value) throws IOException {
+        dos.writeBytes("--" + BOUNDARY + "\r\n");
+        dos.writeBytes("Content-Disposition: form-data; name=\"" + fieldName + "\"\r\n");
+        dos.writeBytes("Content-Type: text/plain; charset=" + UTF8.name() + "\r\n");
+        dos.writeBytes("\r\n");
+        dos.writeBytes(value + "\r\n");
+    }
+
+    private void writeMultipartFile(DataOutputStream dos, FileUpload file) throws IOException {
+        dos.writeBytes("--" + BOUNDARY + "\r\n");
+        dos.writeBytes("Content-Disposition: form-data; name=\"" + file.getFieldName() +
+                "\"; filename=\"" + file.getFileName() + "\"\r\n");
+        dos.writeBytes("Content-Type: " + file.getContentType() + "\r\n");
+        dos.writeBytes("\r\n");
+        dos.write(file.getFileBytes());
+        dos.writeBytes("\r\n");
+    }
+
+    // Convenience method for single file upload
+    public <TResponse> TResponse postFileWithRequest(String path, Object request, FileUpload file, Class<TResponse> responseType) {
+        return postFilesWithRequest(path, request, new FileUpload[]{file}, responseType);
+    }
 }
diff --git a/sync-client.sh b/sync-client.sh
@@ -0,0 +1,5 @@
+rm -rf ./src/AndroidClient/android/src/main/java/net/servicestack/func
+cp -rf ./src/AndroidClient/client/src/main/java/net/servicestack/func ./src/AndroidClient/android/src/main/java/net/servicestack/
+
+rm -rf ./src/AndroidClient/android/src/main/java/net/servicestack/client
+cp -rf ./src/AndroidClient/client/src/main/java/net/servicestack/client ./src/AndroidClient/android/src/main/java/net/servicestack/
