Skip to content

Commit 92699ec

Browse files
committed
change the proxy address
1 parent 52bf0e0 commit 92699ec

File tree

3 files changed

+7
-18
lines changed

3 files changed

+7
-18
lines changed

cmd/server.go

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,8 @@ func (o *serverOption) runE(cmd *cobra.Command, args []string) (err error) {
367367
mux.HandlePath(http.MethodGet, "/favicon.ico", frontEndHandlerWithLocation(o.consolePath))
368368
mux.HandlePath(http.MethodGet, "/swagger.json", frontEndHandlerWithLocation(o.consolePath))
369369
mux.HandlePath(http.MethodGet, "/data/{data}", o.dataFromExtension(remoteServer.(server.UIExtensionServer)))
370-
mux.HandlePath(http.MethodPost, "/extensionProxy/{extension}/{path}", func(w http.ResponseWriter, r *http.Request, pathParams map[string]string) {
371-
fmt.Println(pathParams)
370+
mux.HandlePath(http.MethodPost, "/extensionProxy/{extension}", func(w http.ResponseWriter, r *http.Request, pathParams map[string]string) {
372371
extServer := remoteServer.(server.UIExtensionServer)
373-
fmt.Println(extServer)
374372

375373
ctx := r.Context()
376374
for k, v := range r.Header {
@@ -385,26 +383,24 @@ func (o *serverOption) runE(cmd *cobra.Command, args []string) (err error) {
385383
fmt.Println(err)
386384
return
387385
}
388-
fmt.Println(resp)
389386
if !resp.Success {
390387
w.WriteHeader(http.StatusInternalServerError)
391388
return
392389
}
393390

391+
fmt.Println("redirect to", resp.Message)
394392
req, err := http.NewRequestWithContext(ctx, http.MethodPost, resp.Message, r.Body)
395393
if err != nil {
396394
fmt.Println(err)
397395
return
398396
}
399397
req.Header = r.Header
400-
fmt.Println("request url", req.URL)
401398

402399
rsp, err := http.DefaultClient.Do(req)
403400
if err != nil {
404401
fmt.Println(err)
405402
return
406403
}
407-
fmt.Println("response status", rsp.Status)
408404
defer rsp.Body.Close()
409405
for k, v := range rsp.Header {
410406
w.Header().Add(k, v[0])
@@ -416,21 +412,16 @@ func (o *serverOption) runE(cmd *cobra.Command, args []string) (err error) {
416412
return
417413
}
418414

419-
fmt.Println("start to read response body", rsp.Header)
420415
data := make([]byte, 1024)
421416
var count int
422417
for {
423418
count, err = rsp.Body.Read(data)
424-
if count == -1 || err != nil {
419+
if count == -1 || count == 0 || err != nil {
425420
fmt.Println("failed to read response body", err)
426421
break
427422
}
428-
if count == 0 {
429-
break
430-
}
431423
w.Write(data[:count])
432424
flusher.Flush()
433-
fmt.Print(string(data[:count]))
434425
}
435426
})
436427
mux.HandlePath(http.MethodGet, "/get", o.getAtestBinary)

console/atest-ui/vite.config.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ export default defineConfig({
6868
target: 'http://127.0.0.1:8080',
6969
changeOrigin: true,
7070
},
71+
'/extensionProxy': {
72+
target: 'http://127.0.0.1:8080',
73+
changeOrigin: true,
74+
},
7175
'/data': {
7276
target: 'http://127.0.0.1:8080',
7377
changeOrigin: true,

pkg/server/server.proto

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -354,12 +354,6 @@ service UIExtension {
354354
}
355355
}
356356

357-
message ServerProxyRequest {
358-
}
359-
360-
message ServerProxyResponse {
361-
}
362-
363357
message Menu {
364358
string name = 1;
365359
string index = 2;

0 commit comments

Comments
 (0)