ws优化

zyy

2025-10-25 f4374f91ad562a357702e2ab4faeb1428d1172b1

ws优化

 pom.xml

@@ -265,6 +265,14 @@
            <groupId>org.springframework.security</groupId>
            <artifactId>spring-security-core</artifactId>
        </dependency>

        <!-- Maven依赖 -->
        <dependency>
            <groupId>com.squareup.okhttp3</groupId>
            <artifactId>okhttp</artifactId>
            <version>4.12.0</version> <!-- 最新稳定版 -->
        </dependency>

    </dependencies>

    <build>

 trading-order-huobi/pom.xml

@@ -17,6 +17,13 @@
            <groupId>com.alibaba</groupId>
            <artifactId>fastjson</artifactId>
            <version>${fastjson.version}</version>
            <exclusions>
                <!-- 排除 fastjson 带的 okhttp 依赖 -->
                <exclusion>
                    <groupId>com.squareup.okhttp3</groupId>
                    <artifactId>okhttp</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>

 trading-order-huobi/src/main/java/com.yami.trading.huobi/data/websocket/service/huobi/connection/HuobiWebSocketConnection.java

@@ -108,7 +108,7 @@
    }

    void connect() {
        if (state == ConnectionStateEnum.CONNECTED) {
        if (state == ConnectionStateEnum.CONNECTED || webSocket != null) {
            log.info("[Connection][" + this.getId() + "] Already connected");
            return;
        }
@@ -119,7 +119,8 @@
    public void reConnect(int delayInSecond) {
        log.warn("[Sub][" + this.getId() + "] Reconnecting after " + delayInSecond + " seconds later");
        if (webSocket != null) {
            webSocket.cancel();
            // 发送重连关闭帧（1001：端点离开）
            webSocket.close(1001, "Reconnecting");
            webSocket = null;
        }
        this.delayInSecond = delayInSecond;
@@ -292,17 +293,20 @@

    public void close() {
        log.error("[Connection close][" + this.getId() + "] Closing normally");
        webSocket.cancel();
        webSocket = null;
        if (webSocket != null) {
            // 发送正常关闭帧（1000：正常关闭）
            webSocket.close(1000, "Normal close");
            webSocket = null; // 置空，避免重复操作
        }
        WebSocketWatchDog.onClosedNormally(this);
    }

    @Override
    public void onClosed(WebSocket webSocket, int code, String reason) {
        super.onClosed(webSocket, code, reason);
        if (state == ConnectionStateEnum.CONNECTED) {
            state = ConnectionStateEnum.IDLE;
        }
        log.info("[Connection closed][" + this.getId() + "] Code: " + code + ", Reason: " + reason);
        this.webSocket = null; // 确保旧连接引用被清除
        state = ConnectionStateEnum.IDLE;
    }

    @SuppressWarnings("unchecked")
@@ -335,14 +339,20 @@
    @Override
    public void onFailure(WebSocket webSocket, Throwable t, Response response) {
        onError("Unexpected error: " + t.getMessage(), t);
        // 关键：关闭可能存在的响应体
        if (response != null) {
            response.close();
        }
        closeOnError();
    }

    private void closeOnError() {
        if (webSocket != null) {
            this.webSocket.cancel();
            // 发送错误关闭帧（1011：服务器内部错误）
            webSocket.close(1011, "Error close");
            state = ConnectionStateEnum.CLOSED_ON_ERROR;
            log.error("[Connection error][" + this.getId() + "] Connection is closing due to error");
            webSocket = null; // 置空，避免重复操作
        }
    }