Commit 4aec9ef
committed
feat(cli): add cross-platform socket support for Windows compatibility
- Refactor CLI platform to support both Unix Socket and TCP Socket
- Add platform detection module to auto-detect OS capabilities
- Add socket factory pattern for creating appropriate socket servers
- Split monolithic cli_adapter.py into modular components:
* platform_detector.py: OS and socket capability detection
* socket_abstract.py: Abstract base class for socket servers
* socket_factory.py: Factory for creating socket servers
* tcp_socket_server.py: TCP socket server implementation
* unix_socket_server.py: Unix socket server implementation
* connection_info_writer.py: Connection info file writer
- Update astrbot-cli client to support both socket types
- Fix logger imports to use AstrBot's custom logger system
This enables CLI platform to work on Windows (using TCP Socket)
while maintaining Unix Socket support on Linux/Mac.1 parent 6e2e9b0 commit 4aec9ef
8 files changed
Lines changed: 1371 additions & 52 deletions
File tree
- astrbot/core/platform/sources/cli
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
4 | 6 | | |
5 | 7 | | |
6 | 8 | | |
| |||
14 | 16 | | |
15 | 17 | | |
16 | 18 | | |
| 19 | + | |
17 | 20 | | |
18 | 21 | | |
19 | 22 | | |
| |||
50 | 53 | | |
51 | 54 | | |
52 | 55 | | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
53 | 162 | | |
54 | 163 | | |
55 | 164 | | |
56 | 165 | | |
57 | 166 | | |
| 167 | + | |
| 168 | + | |
58 | 169 | | |
59 | 170 | | |
60 | | - | |
| 171 | + | |
61 | 172 | | |
62 | 173 | | |
63 | 174 | | |
64 | 175 | | |
65 | 176 | | |
66 | | - | |
67 | | - | |
68 | | - | |
| 177 | + | |
| 178 | + | |
69 | 179 | | |
70 | 180 | | |
71 | 181 | | |
| |||
77 | 187 | | |
78 | 188 | | |
79 | 189 | | |
80 | | - | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
81 | 194 | | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
95 | 208 | | |
96 | 209 | | |
97 | 210 | | |
98 | 211 | | |
99 | | - | |
| 212 | + | |
100 | 213 | | |
101 | 214 | | |
102 | 215 | | |
103 | | - | |
| 216 | + | |
104 | 217 | | |
105 | 218 | | |
106 | 219 | | |
| |||
110 | 223 | | |
111 | 224 | | |
112 | 225 | | |
| 226 | + | |
113 | 227 | | |
114 | 228 | | |
115 | 229 | | |
116 | 230 | | |
117 | 231 | | |
118 | 232 | | |
119 | 233 | | |
| 234 | + | |
120 | 235 | | |
121 | 236 | | |
122 | 237 | | |
| 238 | + | |
123 | 239 | | |
124 | 240 | | |
| 241 | + | |
125 | 242 | | |
126 | 243 | | |
127 | 244 | | |
| |||
130 | 247 | | |
131 | 248 | | |
132 | 249 | | |
133 | | - | |
| 250 | + | |
134 | 251 | | |
135 | 252 | | |
136 | 253 | | |
137 | 254 | | |
138 | 255 | | |
139 | 256 | | |
140 | 257 | | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
141 | 262 | | |
142 | 263 | | |
143 | 264 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
30 | 33 | | |
31 | 34 | | |
32 | 35 | | |
| |||
36 | 39 | | |
37 | 40 | | |
38 | 41 | | |
39 | | - | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
40 | 46 | | |
41 | 47 | | |
42 | 48 | | |
| |||
113 | 119 | | |
114 | 120 | | |
115 | 121 | | |
116 | | - | |
| 122 | + | |
| 123 | + | |
117 | 124 | | |
118 | 125 | | |
119 | 126 | | |
| 127 | + | |
| 128 | + | |
120 | 129 | | |
121 | 130 | | |
122 | 131 | | |
| |||
342 | 351 | | |
343 | 352 | | |
344 | 353 | | |
345 | | - | |
| 354 | + | |
346 | 355 | | |
347 | 356 | | |
348 | | - | |
| 357 | + | |
349 | 358 | | |
350 | | - | |
351 | | - | |
| 359 | + | |
352 | 360 | | |
353 | 361 | | |
354 | 362 | | |
355 | | - | |
356 | | - | |
357 | | - | |
358 | | - | |
359 | | - | |
360 | | - | |
361 | | - | |
362 | | - | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
363 | 371 | | |
364 | | - | |
365 | | - | |
366 | | - | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
367 | 381 | | |
368 | | - | |
369 | | - | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
370 | 386 | | |
371 | | - | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
372 | 391 | | |
373 | | - | |
| 392 | + | |
374 | 393 | | |
375 | 394 | | |
376 | | - | |
377 | | - | |
378 | | - | |
| 395 | + | |
| 396 | + | |
379 | 397 | | |
380 | 398 | | |
381 | 399 | | |
382 | 400 | | |
383 | 401 | | |
384 | | - | |
| 402 | + | |
385 | 403 | | |
386 | 404 | | |
387 | 405 | | |
388 | | - | |
| 406 | + | |
389 | 407 | | |
390 | 408 | | |
391 | | - | |
392 | | - | |
393 | | - | |
394 | | - | |
| 409 | + | |
| 410 | + | |
395 | 411 | | |
396 | 412 | | |
397 | 413 | | |
| |||
0 commit comments