Skip to content

dev/issues-4 #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lzsweb merged 7 commits into from
Jul 24, 2026
+262 −156
Merged

dev/issues-4 #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fd3cf18
fix: handle empty and non-JSON responses in DashScopeResult
Jul 22, 2026
c578bb6
Bump version to 2.22.27
Jul 22, 2026
9083d69
fix: guard all JsonUtils.parse calls in DashScopeResult against malfo…
Jul 24, 2026
2cd6432
refactor: extract private helpers in DashScopeResult to reduce fromRe…
Jul 24, 2026
f4253bf
style: apply lint formatting to DashScopeResult and PublicErrorDef
Jul 24, 2026
99a1111
fix: handle null/empty WebSocket message and refactor JSON field proc…
Jul 24, 2026
c8d94f4
refactor: simplify DashScopeResult field handling helpers
Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<name>DashScope Java SDK</name>
<groupId>com.alibaba</groupId>
<artifactId>dashscope-sdk-java</artifactId>
<version>2.22.26</version>
<version>2.22.27</version>

<properties>
<maven.compiler.source>8</maven.compiler.source>
Expand Down
302 changes: 148 additions & 154 deletions src/main/java/com/alibaba/dashscope/common/DashScopeResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@
import com.alibaba.dashscope.utils.ApiKeywords;
import com.alibaba.dashscope.utils.EncryptionUtils;
import com.alibaba.dashscope.utils.JsonUtils;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import java.nio.ByteBuffer;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;

@Slf4j
@Data
@EqualsAndHashCode(callSuper = true)
public class DashScopeResult extends Result {
Expand All @@ -34,110 +37,37 @@ protected <T extends Result> T fromResponse(Protocol protocol, NetworkResponse r
this.setHeaders(changeHeaders(response.getHeaders()));
if (protocol == Protocol.WEBSOCKET) {
if (response.getBinary() == null) {
JsonObject jsonObject = JsonUtils.parse(response.getMessage());
if (jsonObject.has(ApiKeywords.HEADER)) {
JsonObject headers = jsonObject.get(ApiKeywords.HEADER).getAsJsonObject();
if (headers.has(ApiKeywords.TASKID)) {
this.setRequestId(headers.get(ApiKeywords.TASKID).getAsString());
}
// Extract status_code, code and message from header
if (headers.has(ApiKeywords.STATUS_CODE)) {
this.setStatusCode(
headers.get(ApiKeywords.STATUS_CODE).isJsonNull()
? null
: headers.get(ApiKeywords.STATUS_CODE).getAsInt());
} else {
// Set default status code
this.setStatusCode(200);
}
if (headers.has(ApiKeywords.ERROR_CODE)) {
this.setCode(
headers.get(ApiKeywords.ERROR_CODE).isJsonNull()
? ""
: headers.get(ApiKeywords.ERROR_CODE).getAsString());
} else {
// Set default empty string for successful responses
this.setCode("");
}
if (headers.has(ApiKeywords.ERROR_MESSAGE)) {
this.setMessage(
headers.get(ApiKeywords.ERROR_MESSAGE).isJsonNull()
? ""
: headers.get(ApiKeywords.ERROR_MESSAGE).getAsString());
} else {
// Set default empty string for successful responses
this.setMessage("");
}
}
if (jsonObject.has(ApiKeywords.PAYLOAD)) {
JsonObject payload = jsonObject.getAsJsonObject(ApiKeywords.PAYLOAD);
if (payload.has(ApiKeywords.OUTPUT)) {
this.output =
payload.get(ApiKeywords.OUTPUT).isJsonNull()
? null
: payload.get(ApiKeywords.OUTPUT);
}
if (payload.has(ApiKeywords.USAGE)) {
this.setUsage(
payload.get(ApiKeywords.USAGE).isJsonNull()
? null
: payload.get(ApiKeywords.USAGE));
}
String message = response.getMessage();
if (message == null || message.isEmpty()) {
log.warn(
"WebSocket response message is null or empty, httpStatusCode: {}",
response.getHttpStatusCode());
setInternalError();
return (T) this;
}
fromWebSocketMessage(message);
} else {
this.output = response.getBinary();
}
} else {
JsonObject jsonObject = JsonUtils.parse(response.getMessage());
// Set HTTP status code if available
String message = response.getMessage();
if (message == null || message.isEmpty()) {
log.warn(
"HTTP response message is null or empty, httpStatusCode: {}",
response.getHttpStatusCode());
setInternalError();
return (T) this;
}
JsonObject jsonObject = parseJson(message, "Failed to parse HTTP response as JSON: {}");
if (jsonObject == null) {
return (T) this;
}
if (response.getHttpStatusCode() != null) {
this.setStatusCode(response.getHttpStatusCode());
}
if (jsonObject.has(ApiKeywords.OUTPUT)) {
this.output =
jsonObject.get(ApiKeywords.OUTPUT).isJsonNull()
? null
: jsonObject.get(ApiKeywords.OUTPUT).getAsJsonObject();
}
if (jsonObject.has(ApiKeywords.USAGE)) {
this.setUsage(
jsonObject.get(ApiKeywords.USAGE).isJsonNull()
? null
: jsonObject.get(ApiKeywords.USAGE).getAsJsonObject());
}
if (jsonObject.has(ApiKeywords.REQUEST_ID)) {
this.setRequestId(jsonObject.get(ApiKeywords.REQUEST_ID).getAsString());
}
if (jsonObject.has(ApiKeywords.STATUS_CODE)) {
this.setStatusCode(
jsonObject.get(ApiKeywords.STATUS_CODE).isJsonNull()
? null
: jsonObject.get(ApiKeywords.STATUS_CODE).getAsInt());
}
if (jsonObject.has(ApiKeywords.CODE)) {
this.setCode(
jsonObject.get(ApiKeywords.CODE).isJsonNull()
? ""
: jsonObject.get(ApiKeywords.CODE).getAsString());
} else {
// Set default empty string for successful responses
this.setCode("");
}
if (jsonObject.has(ApiKeywords.MESSAGE)) {
this.setMessage(
jsonObject.get(ApiKeywords.MESSAGE).isJsonNull()
? ""
: jsonObject.get(ApiKeywords.MESSAGE).getAsString());
} else {
// Set default empty string for successful responses
this.setMessage("");
}
if (jsonObject.has(ApiKeywords.DATA)) {
if (jsonObject.has(ApiKeywords.REQUEST_ID)) {
jsonObject.remove(ApiKeywords.REQUEST_ID);
}
this.output = jsonObject;
}
handleOutputField(jsonObject);
populateFromHttpJson(jsonObject);
Comment thread
luk384090-cloud marked this conversation as resolved.
handleDataField(jsonObject);
}
return (T) this;
}
Expand All @@ -148,24 +78,19 @@ public <T extends Result> T fromResponse(
Protocol protocol, NetworkResponse response, boolean isFlattenResult) throws ApiException {
if (!isFlattenResult) {
return fromResponse(protocol, response);
} else {
this.setHeaders(changeHeaders(response.getHeaders()));
// flatten not support websocket.
if (protocol == Protocol.WEBSOCKET) {
if (response.getBinary() == null) {
JsonObject jsonObject = JsonUtils.parse(response.getMessage());
this.output = jsonObject;
// convert to the result
} else {
this.output = response.getBinary();
}
} else { // HTTP
JsonObject jsonObject = JsonUtils.parse(response.getMessage());
this.output = jsonObject;
this.event = response.getEvent();
}
this.setHeaders(changeHeaders(response.getHeaders()));
if (protocol == Protocol.WEBSOCKET) {
if (response.getBinary() == null) {
this.output = parseJson(response.getMessage(), "Failed to parse WebSocket message");
} else {
this.output = response.getBinary();
}
return (T) this;
} else {
this.output = parseJson(response.getMessage(), "Failed to parse HTTP response message");
this.event = response.getEvent();
}
return (T) this;
}

@Override
Expand All @@ -174,15 +99,25 @@ public <T extends Result> T fromResponse(
Protocol protocol, NetworkResponse response, boolean isFlattenResult, HalfDuplexRequest req)
throws ApiException {
this.setHeaders(changeHeaders(response.getHeaders()));
// check it's encrypted output
if ((response.getHeaders().containsKey("X-DashScope-OutputEncrypted".toLowerCase())
|| req.isEncryptRequest())
&& protocol == Protocol.HTTP) {
// Set HTTP status code if available
if (response.getHttpStatusCode() != null) {
this.setStatusCode(response.getHttpStatusCode());
}
JsonObject jsonObject = JsonUtils.parse(response.getMessage());
String encryptedMessage = response.getMessage();
if (encryptedMessage == null || encryptedMessage.isEmpty()) {
log.warn(
"Encrypted HTTP response message is null or empty, httpStatusCode: {}",
response.getHttpStatusCode());
setInternalError();
return (T) this;
}
JsonObject jsonObject =
parseJson(encryptedMessage, "Failed to parse encrypted HTTP response message");
if (jsonObject == null) {
return (T) this;
}
String encryptedOutput =
jsonObject.get(ApiKeywords.OUTPUT).isJsonNull()
? null
Expand All @@ -193,53 +128,112 @@ public <T extends Result> T fromResponse(
encryptedOutput,
req.getEncryptionConfig().getAESEncryptKey(),
req.getEncryptionConfig().getIv());
this.output = JsonUtils.parse(plainOutput);
this.output = parseJson(plainOutput, "Failed to parse decrypted output");
} else {
this.output = null;
}
if (jsonObject.has(ApiKeywords.USAGE)) {
this.setUsage(
jsonObject.get(ApiKeywords.USAGE).isJsonNull()
? null
: jsonObject.get(ApiKeywords.USAGE).getAsJsonObject());
}
if (jsonObject.has(ApiKeywords.REQUEST_ID)) {
this.setRequestId(jsonObject.get(ApiKeywords.REQUEST_ID).getAsString());
}
if (jsonObject.has(ApiKeywords.STATUS_CODE)) {
this.setStatusCode(
jsonObject.get(ApiKeywords.STATUS_CODE).isJsonNull()
? null
: jsonObject.get(ApiKeywords.STATUS_CODE).getAsInt());
}
if (jsonObject.has(ApiKeywords.CODE)) {
this.setCode(
jsonObject.get(ApiKeywords.CODE).isJsonNull()
? ""
: jsonObject.get(ApiKeywords.CODE).getAsString());
} else {
// Set default empty string for successful responses
this.setCode("");
}
if (jsonObject.has(ApiKeywords.MESSAGE)) {
this.setMessage(
jsonObject.get(ApiKeywords.MESSAGE).isJsonNull()
? ""
: jsonObject.get(ApiKeywords.MESSAGE).getAsString());
} else {
// Set default empty string for successful responses
this.setMessage("");
}
if (jsonObject.has(ApiKeywords.DATA)) {
if (jsonObject.has(ApiKeywords.REQUEST_ID)) {
jsonObject.remove(ApiKeywords.REQUEST_ID);
}
}
populateFromHttpJson(jsonObject);
Comment thread
luk384090-cloud marked this conversation as resolved.
return (T) this;
}
return fromResponse(protocol, response, isFlattenResult);
}

private void fromWebSocketMessage(String message) {
JsonObject jsonObject = parseJson(message, "Failed to parse WebSocket message");
if (jsonObject == null) {
return;
}
if (jsonObject.has(ApiKeywords.HEADER)) {
JsonObject headers = jsonObject.get(ApiKeywords.HEADER).getAsJsonObject();
if (headers.has(ApiKeywords.TASKID)) {
this.setRequestId(headers.get(ApiKeywords.TASKID).getAsString());
}
this.setStatusCode(
headers.has(ApiKeywords.STATUS_CODE) && !headers.get(ApiKeywords.STATUS_CODE).isJsonNull()
? headers.get(ApiKeywords.STATUS_CODE).getAsInt()
: 200);
this.setCode(
headers.has(ApiKeywords.ERROR_CODE) && !headers.get(ApiKeywords.ERROR_CODE).isJsonNull()
? headers.get(ApiKeywords.ERROR_CODE).getAsString()
: "");
this.setMessage(
headers.has(ApiKeywords.ERROR_MESSAGE)
&& !headers.get(ApiKeywords.ERROR_MESSAGE).isJsonNull()
? headers.get(ApiKeywords.ERROR_MESSAGE).getAsString()
: "");
}
if (jsonObject.has(ApiKeywords.PAYLOAD)) {
JsonObject payload = jsonObject.getAsJsonObject(ApiKeywords.PAYLOAD);
if (payload.has(ApiKeywords.OUTPUT)) {
this.output =
payload.get(ApiKeywords.OUTPUT).isJsonNull() ? null : payload.get(ApiKeywords.OUTPUT);
}
if (payload.has(ApiKeywords.USAGE)) {
this.setUsage(
payload.get(ApiKeywords.USAGE).isJsonNull() ? null : payload.get(ApiKeywords.USAGE));
}
}
}

private void handleOutputField(JsonObject jsonObject) {
// Handle OUTPUT field first
if (this.output == null && jsonObject.has(ApiKeywords.OUTPUT)) {
JsonElement outputElement = jsonObject.get(ApiKeywords.OUTPUT);
this.output = (outputElement == null || outputElement.isJsonNull()) ? null : outputElement;
}
}

private void handleDataField(JsonObject jsonObject) {
// Handle DATA field only if OUTPUT was not present
if (this.output == null && jsonObject.has(ApiKeywords.DATA)) {
jsonObject.remove(ApiKeywords.REQUEST_ID);
this.output = jsonObject;
}
}

private void populateFromHttpJson(JsonObject jsonObject) {
if (jsonObject.has(ApiKeywords.USAGE)) {
this.setUsage(
jsonObject.get(ApiKeywords.USAGE).isJsonNull()
? null
: jsonObject.get(ApiKeywords.USAGE).getAsJsonObject());
}
if (jsonObject.has(ApiKeywords.REQUEST_ID)) {
this.setRequestId(jsonObject.get(ApiKeywords.REQUEST_ID).getAsString());
}
if (jsonObject.has(ApiKeywords.STATUS_CODE)) {
this.setStatusCode(
jsonObject.get(ApiKeywords.STATUS_CODE).isJsonNull()
? null
: jsonObject.get(ApiKeywords.STATUS_CODE).getAsInt());
}
this.setCode(
jsonObject.has(ApiKeywords.CODE) && !jsonObject.get(ApiKeywords.CODE).isJsonNull()
? jsonObject.get(ApiKeywords.CODE).getAsString()
: "");
this.setMessage(
jsonObject.has(ApiKeywords.MESSAGE) && !jsonObject.get(ApiKeywords.MESSAGE).isJsonNull()
? jsonObject.get(ApiKeywords.MESSAGE).getAsString()
: "");
}

private JsonObject parseJson(String raw, String logMsg) {
try {
return JsonUtils.parse(raw);
} catch (Exception e) {
log.error(logMsg, e);
setInternalError();
return null;
}
}

private void setInternalError() {
this.output = null;
this.setStatusCode(PublicErrorDef.INTERNAL_ERROR.getStatusCode());
this.setCode(PublicErrorDef.INTERNAL_ERROR.getErrorCode());
this.setMessage(PublicErrorDef.INTERNAL_ERROR.getErrorMsg());
}

private Map<String, Object> changeHeaders(Map<String, List<String>> headers) {
if (headers == null || headers.isEmpty()) {
return null;
Expand Down
Loading
Loading