fix(platform): fix idl relative bug

platform/server/cmd/agent/internal/biz/service/add_idl.go

@@ -25,6 +25,7 @@ import (
 	agent "github.com/cloudwego/cwgo/platform/server/shared/kitex_gen/agent"
 	"github.com/cloudwego/cwgo/platform/server/shared/kitex_gen/model"
 	"github.com/cloudwego/cwgo/platform/server/shared/parser"
+	"github.com/cloudwego/cwgo/platform/server/shared/repository"
 	"github.com/cloudwego/cwgo/platform/server/shared/utils"
 	"net/http"
 	"path/filepath"
@@ -47,6 +48,14 @@ func (s *AddIDLService) Run(req *agent.AddIDLReq) (resp *agent.AddIDLRes, err er
 	// check main idl path
 	repoClient, err := s.svcCtx.RepoManager.GetClient(req.RepositoryId)
 	if err != nil {
+		if err == repository.ErrTokenInvalid {
+			// repo token is invalid or expired
+			return &agent.AddIDLRes{
+				Code: http.StatusBadRequest,
+				Msg:  err.Error(),
+			}, nil
+		}
+
 		return &agent.AddIDLRes{
 			Code: http.StatusBadRequest,
 			Msg:  "can not get the client",

platform/server/cmd/api/internal/biz/logic/idl/add_idl.go

@@ -64,9 +64,10 @@ func (l *AddIDLLogic) AddIDL(req *idl.AddIDLReq) (res *idl.AddIDLRes) {
 	}
 
 	rpcRes, err := client.AddIDL(l.ctx, &agent.AddIDLReq{
-		RepositoryId: req.RepositoryID,
-		MainIdlPath:  req.MainIdlPath,
-		ServiceName:  req.ServiceName,
+		RepositoryId:          req.RepositoryID,
+		MainIdlPath:           req.MainIdlPath,
+		ServiceName:           req.ServiceName,
+		ServiceRepositoryName: req.ServiceRepositoryName,
 	})
 	if err != nil {
 		logger.Logger.Error("connect to rpc client failed", zap.Error(err))

platform/server/shared/config/app/config.go

@@ -21,6 +21,7 @@ package app
 import "time"
 
 type Config struct {
+	ProxyUrl                 string `mapstructure:"proxyUrl"`
 	SyncAgentServiceInterval string `mapstructure:"syncAgentServiceInterval"`
 	SyncRepositoryInterval   string `mapstructure:"syncRepositoryInterval"`
 	SyncIdlInterval          string `mapstructure:"syncIdlInterval"`

platform/server/shared/config/manager.go

@@ -92,6 +92,9 @@ func InitManager(serverType consts.ServerType, serverMode consts.ServerMode, con
 
 	}
 
+	// init consts in config
+	consts.ProxyUrl = config.App.ProxyUrl
+
 	// get service id
 	var serviceId string
 	_, err := os.Stat(consts.AgentMetadataFile)

platform/server/shared/consts/app.go

@@ -0,0 +1,23 @@
+/*
+ *
+ *  * Copyright 2022 CloudWeGo Authors
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  *     http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package consts
+
+var (
+	ProxyUrl string
+)

platform/server/shared/repository/manager.go

@@ -3,6 +3,8 @@ package repository
 import (
 	"context"
 	"errors"
+	"net/http"
+	"net/url"
 	"strconv"
 	"strings"
 	"sync"
@@ -48,8 +50,6 @@ func NewRepoManager(daoManager *dao.Manager) (*Manager, error) {
 }
 
 func (rm *Manager) AddClient(repository *model.Repository) error {
-	rm.Lock()
-	defer rm.Unlock()
 
 	switch repository.RepositoryType {
 	case consts.RepositoryTypeNumGitLab:
@@ -62,14 +62,18 @@ func (rm *Manager) AddClient(repository *model.Repository) error {
 			}
 		}
 
+		rm.Lock()
 		rm.repositoryClientsCache.SetDefault(strconv.FormatInt(repository.Id, 10), NewGitLabApi(gitlabClient))
+		rm.Unlock()
 	case consts.RepositoryTypeNumGithub:
 		githubClient, err := NewGithubClient(repository.Token)
 		if err != nil {
 			return err
 		}
 
+		rm.Lock()
 		rm.repositoryClientsCache.SetDefault(strconv.FormatInt(repository.Id, 10), NewGitHubApi(githubClient))
+		rm.Unlock()
 	default:
 		return errors.New("invalid repository type")
 	}
@@ -86,9 +90,8 @@ func (rm *Manager) DelClient(repository *model.Repository) {
 
 func (rm *Manager) GetClient(repoId int64) (IRepository, error) {
 	rm.RLock()
-	defer rm.RUnlock()
-
 	if clientIface, ok := rm.repositoryClientsCache.Get(strconv.FormatInt(repoId, 10)); !ok {
+		rm.RUnlock()
 		repo, err := rm.daoManager.Repository.GetRepository(context.Background(), repoId)
 		if err != nil {
 			return nil, err
@@ -109,12 +112,23 @@ func (rm *Manager) GetClient(repoId int64) (IRepository, error) {
 
 		return rm.GetClient(repoId)
 	} else {
+		rm.RUnlock()
 		return clientIface.(IRepository), nil
 	}
 }
 
 func NewGitlabClient(token string) (*gitlab.Client, error) {
-	client, err := gitlab.NewClient(token)
+	var client *gitlab.Client
+	var err error
+
+	if consts.ProxyUrl != "" {
+		proxyUrl, _ := url.Parse(consts.ProxyUrl)
+		httpClient := &http.Client{Transport: &http.Transport{Proxy: http.ProxyURL(proxyUrl)}}
+		client, err = gitlab.NewClient(token, gitlab.WithHTTPClient(httpClient))
+	} else {
+		client, err = gitlab.NewClient(token)
+	}
+
 	if err != nil {
 		if strings.Contains(err.Error(), "401 Unauthorized") {
 			return nil, ErrTokenInvalid
@@ -127,7 +141,14 @@ func NewGitlabClient(token string) (*gitlab.Client, error) {
 }
 
 func NewGithubClient(token string) (*github.Client, error) {
-	client := github.NewClient(nil).WithAuthToken(token)
+	var httpClient *http.Client
+
+	if consts.ProxyUrl != "" {
+		proxyUrl, _ := url.Parse(consts.ProxyUrl)
+		httpClient = &http.Client{Transport: &http.Transport{Proxy: http.ProxyURL(proxyUrl)}}
+	}
+
+	client := github.NewClient(httpClient).WithAuthToken(token)
 
 	_, _, err := client.Meta.Get(context.Background())
 	if err != nil {