| @@ -33,9 +33,6 @@ const ( · 32 unmodified lines |
| 33 | 33 | wsDoneMarker = "[DONE]" |
| 34 | 34 | wsTurnStateHeader = "x-codex-turn-state" |
| 35 | 35 | wsRequestBodyKey = "REQUEST_BODY_OVERRIDE" |
| 36 | | − wsPayloadLogMaxSize = 2048 |
| 37 | | − wsBodyLogMaxSize = 64 * 1024 |
| 38 | | − wsBodyLogTruncated = "\n[websocket log truncated]\n" |
| 39 | 36 | ) |
| 40 | 37 | |
| 41 | 38 | var responsesWebsocketUpgrader = websocket.Upgrader{ |
| @@ -894,71 +891,18 @@ func appendWebsocketEvent(builder *strings.Builder, eventType string, payload [] · 852 unmodified lines |
| 894 | 891 | if builder == nil { |
| 895 | 892 | return |
| 896 | 893 | } |
| 897 | | − if builder.Len() >= wsBodyLogMaxSize { |
| 898 | | − return |
| 899 | | − } |
| 900 | 894 | trimmedPayload := bytes.TrimSpace(payload) |
| 901 | 895 | if len(trimmedPayload) == 0 { |
| 902 | 896 | return |
| 903 | 897 | } |
| 904 | 898 | if builder.Len() > 0 { |
| 905 | | − if !appendWebsocketLogString(builder, "\n") { |
| 906 | | − return |
| 907 | | − } |
| 908 | | − } |
| 909 | | − if !appendWebsocketLogString(builder, "websocket.") { |
| 910 | | − return |
| 911 | | − } |
| 912 | | − if !appendWebsocketLogString(builder, eventType) { |
| 913 | | − return |
| 914 | | − } |
| 915 | | − if !appendWebsocketLogString(builder, "\n") { |
| 916 | | − return |
| 917 | | − } |
| 918 | | − if !appendWebsocketLogBytes(builder, trimmedPayload, len(wsBodyLogTruncated)) { |
| 919 | | − appendWebsocketLogString(builder, wsBodyLogTruncated) |
| 920 | | − return |
| 921 | | − } |
| 922 | | − appendWebsocketLogString(builder, "\n") |
| 923 | | −} |
| 924 | | − |
| 925 | | −func appendWebsocketLogString(builder *strings.Builder, value string) bool { |
| 926 | | − if builder == nil { |
| 927 | | − return false |
| 928 | | − } |
| 929 | | − remaining := wsBodyLogMaxSize - builder.Len() |
| 930 | | − if remaining <= 0 { |
| 931 | | − return false |
| 932 | | − } |
| 933 | | − if len(value) <= remaining { |
| 934 | | − builder.WriteString(value) |
| 935 | | − return true |
| 936 | | − } |
| 937 | | − builder.WriteString(value[:remaining]) |
| 938 | | − return false |
| 939 | | −} |
| 940 | | − |
| 941 | | −func appendWebsocketLogBytes(builder *strings.Builder, value []byte, reserveForSuffix int) bool { |
| 942 | | − if builder == nil { |
| 943 | | − return false |
| 899 | + builder.WriteString("\n") |
| 944 | 900 | } |
| 945 | | − remaining := wsBodyLogMaxSize - builder.Len() |
| 946 | | − if remaining <= 0 { |
| 947 | | − return false |
| 948 | | − } |
| 949 | | − if len(value) <= remaining { |
| 950 | | − builder.Write(value) |
| 951 | | − return true |
| 952 | | − } |
| 953 | | − limit := remaining - reserveForSuffix |
| 954 | | − if limit < 0 { |
| 955 | | − limit = 0 |
| 956 | | − } |
| 957 | | − if limit > len(value) { |
| 958 | | − limit = len(value) |
| 959 | | − } |
| 960 | | − builder.Write(value[:limit]) |
| 961 | | − return false |
| 901 | + builder.WriteString("websocket.") |
| 902 | + builder.WriteString(eventType) |
| 903 | + builder.WriteString("\n") |
| 904 | + builder.Write(trimmedPayload) |
| 905 | + builder.WriteString("\n") |
| 962 | 906 | } |
| 963 | 907 | |
| 964 | 908 | func websocketPayloadEventType(payload []byte) string { |
| @@ -974,15 +918,8 @@ func websocketPayloadPreview(payload []byte) string { · 9 unmodified lines |
| 974 | 918 | if len(trimmedPayload) == 0 { |
| 975 | 919 | return "<empty>" |
| 976 | 920 | } |
| 977 | | − preview := trimmedPayload |
| 978 | | − if len(preview) > wsPayloadLogMaxSize { |
| 979 | | − preview = preview[:wsPayloadLogMaxSize] |
| 980 | | − } |
| 981 | | − previewText := strings.ReplaceAll(string(preview), "\n", "\\n") |
| 921 | + previewText := strings.ReplaceAll(string(trimmedPayload), "\n", "\\n") |
| 982 | 922 | previewText = strings.ReplaceAll(previewText, "\r", "\\r") |
| 983 | | − if len(trimmedPayload) > wsPayloadLogMaxSize { |
| 984 | | − return fmt.Sprintf("%s...(truncated,total=%d)", previewText, len(trimmedPayload)) |
| 985 | | − } |
| 986 | 923 | return previewText |
| 987 | 924 | } |
| 988 | 925 | |