Merge pull request #82 from beclab/hertz_recons

feat: http hertz recons

Author: lovehunter9

pkg/drivers/base/handler.go

@@ -2,12 +2,9 @@ package base
 
 import (
 	"context"
-	"net/http"
 )
 
 type HandlerParam struct {
-	Ctx            context.Context
-	Owner          string `json:"owner"`
-	ResponseWriter http.ResponseWriter
-	Request        *http.Request
+	Ctx   context.Context
+	Owner string `json:"owner"`
 }

pkg/drivers/clouds/cloud.go

@@ -502,7 +502,7 @@ func (s *CloudStorage) generateListingData(fileParam *models.FileParam,
 			firstItem.FsType = fileParam.FileType
 			firstItem.FsExtend = fileParam.Extend
 			firstItem.FsPath = firstItem.Path
-			dataChan <- fmt.Sprintf("data: %s\n\n", common.ToJson(firstItem))
+			dataChan <- common.ToJson(firstItem)
 			streamFiles = streamFiles[1:]
 		}
 

pkg/drivers/posix/posix/posix.go

@@ -141,6 +141,7 @@ func (s *PosixStorage) Raw(contextArgs *models.HttpContextArgs) (*models.RawHand
 		FileName:     fileData.Name,
 		FileModified: fileData.ModTime,
 		Reader:       r,
+		FileLength:   fileData.Size,
 	}, nil
 }
 
@@ -457,7 +458,7 @@ func (s *PosixStorage) generateListingData(fs afero.Fs, fileParam *models.FilePa
 			}
 			streamFiles = append(nestedItems, streamFiles[1:]...)
 		} else {
-			dataChan <- fmt.Sprintf("data: %s\n\n", common.ToJson(firstItem))
+			dataChan <- common.ToJson(firstItem)
 			streamFiles = streamFiles[1:]
 		}
 

pkg/drivers/sync/seahub/callback.go

@@ -1,16 +1,13 @@
 package seahub
 
 import (
-	"encoding/json"
 	"errors"
 	"files/pkg/common"
 	"files/pkg/drivers/sync/seahub/seaserv"
 	"k8s.io/klog/v2"
-	"net/http"
-	"strings"
 )
 
-func createDefaultLibrary(newUsername string) (string, error) {
+func CreateDefaultLibrary(newUsername string) (string, error) {
 	username := newUsername
 	if username == "" {
 		return "", errors.New("username is empty")
@@ -55,45 +52,7 @@ func createDefaultLibrary(newUsername string) (string, error) {
 	return defaultRepo, nil
 }
 
-func CallbackCreateHandler(w http.ResponseWriter, r *http.Request) (int, error) {
-	var data map[string]interface{}
-	if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
-		klog.Infof("Error parsing request body: %v", err)
-		return http.StatusBadRequest, err
-	}
-	klog.Infof("Received data: %v", data)
-
-	bflName, ok := data["name"].(string)
-	if !ok {
-		klog.Infoln("Name field is missing or not a string")
-		return http.StatusBadRequest, nil
-	}
-
-	bflName = strings.TrimSpace(bflName)
-	if bflName != "" {
-		newUsername := bflName + "@auth.local"
-		klog.Infof("Try to create user for %s", newUsername)
-
-		isNew, err := createUser(newUsername)
-		if err != nil {
-			klog.Infof("Error creating user: %v", err)
-			return http.StatusInternalServerError, err
-		}
-
-		if isNew {
-			repoId, err := createDefaultLibrary(newUsername)
-			if err != nil {
-				klog.Infof("Create default library for %s failed: %v", newUsername, err)
-			} else {
-				klog.Infof("Create default library %s for %s successfully!", repoId, newUsername)
-			}
-		}
-	}
-
-	return 0, nil
-}
-
-func createUser(username string) (bool, error) {
+func CreateUser(username string) (bool, error) {
 	allUsers, err := seaserv.ListAllUsers()
 	if err != nil {
 		klog.Errorf("Error listing users: %v", err)
@@ -119,27 +78,7 @@ func createUser(username string) (bool, error) {
 	return true, nil
 }
 
-func CallbackDeleteHandler(w http.ResponseWriter, r *http.Request) (int, error) {
-	var requestData map[string]string
-	if err := json.NewDecoder(r.Body).Decode(&requestData); err != nil {
-		return http.StatusBadRequest, err
-	}
-	defer r.Body.Close()
-
-	bflName, exists := requestData["name"]
-	if !exists {
-		return http.StatusBadRequest, errors.New("Missing name field")
-	}
-	username := bflName + "@auth.local"
-
-	err := removeUser(username)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	return 0, nil
-}
-
-func removeUser(username string) error {
+func RemoveUser(username string) error {
 	allUsers, err := seaserv.ListAllUsers()
 	if err != nil {
 		klog.Errorf("Error listing users: %v", err)

pkg/drivers/sync/seahub/searpc/rpcclient.go

@@ -62,8 +62,8 @@ func (c *SeafServerThreadedRpcClient) SeafileGetCommitList(repoId string, offset
 		repoId, offset, limit)
 }
 
-func (c *SeafServerThreadedRpcClient) SeafileGanarateRepoToken(repoId, email string) (interface{}, error) {
-	return CreateRPCMethod(c, "seafile_ganarate_repo_token", "string", []string{"string", "string"})(repoId, email)
+func (c *SeafServerThreadedRpcClient) SeafileGenerateRepoToken(repoId, email string) (interface{}, error) {
+	return CreateRPCMethod(c, "seafile_generate_repo_token", "string", []string{"string", "string"})(repoId, email)
 }
 
 func (c *SeafServerThreadedRpcClient) DeleteRepoTokensByEmail(email string) (interface{}, error) {

pkg/drivers/sync/seahub/seaserv/api.go

@@ -183,7 +183,7 @@ func (s *SeafileAPI) GetOwnedRepoList(username string, retCorrupted bool, start
 }
 
 func (s *SeafileAPI) GenerateRepoToken(repoId, username string) (string, error) {
-	ret, err := s.rpcClient.SeafileGanarateRepoToken(repoId, username)
+	ret, err := s.rpcClient.SeafileGenerateRepoToken(repoId, username)
 	if err != nil {
 		return "", fmt.Errorf("generate repo token failed: %v", err)
 	}

pkg/drivers/sync/service.go

@@ -11,6 +11,7 @@ import (
 	"files/pkg/models"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"mime/multipart"
 	"net/http"
 	"net/url"
@@ -23,7 +24,6 @@ import (
 
 type SyncStorage struct {
 	handler *base.HandlerParam
-	service *Service
 	paste   *models.PasteParam
 }
 
@@ -55,7 +55,6 @@ type File struct {
 func NewSyncStorage(handler *base.HandlerParam) *SyncStorage {
 	return &SyncStorage{
 		handler: handler,
-		service: NewService(handler),
 	}
 }
 
@@ -177,14 +176,18 @@ func (s *SyncStorage) Raw(contextArgs *models.HttpContextArgs) (*models.RawHandl
 			if err != nil {
 				return nil, err
 			}
-			http.Redirect(s.service.ResponseWriter, s.service.Request, string(data), http.StatusFound)
+			return &models.RawHandlerResponse{
+				FileName: string(data),
+				Redirect: true,
+			}, nil
 		}
 	}
 
 	return &models.RawHandlerResponse{
 		FileName:     fileName,
 		FileModified: time.Time{},
 		Reader:       bytes.NewReader(data),
+		FileLength:   int64(len(data)),
 	}, nil
 }
 
@@ -327,12 +330,40 @@ func (s *SyncStorage) Edit(contextArgs *models.HttpContextArgs) (*models.EditHan
 		return nil, err
 	}
 
-	postBody, err := s.service.Get(updateUrl, "POST", body.Bytes())
+	client := &http.Client{}
+	req, err := http.NewRequest("POST", updateUrl, bytes.NewReader(body.Bytes()))
+	if err != nil {
+		return nil, err
+	}
+	req.Header = contextArgs.QueryParam.Header.Clone()
+
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	if resp == nil {
+		klog.Errorf("not get response from %s", updateUrl)
+		return nil, err
+	}
+
+	respBody, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	var responseMap map[string]interface{}
+	err = json.Unmarshal(respBody, &responseMap)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
 	if err != nil {
 		klog.Errorf("Sync edit, path: %s, error: %v", fileParam.Path, err)
 		return nil, err
 	}
-	klog.Infof("Sync edit, path: %s, resp: %s", fileParam.Path, string(postBody))
+	klog.Infof("Sync edit, path: %s, resp: %s", fileParam.Path, string(respBody))
 
 	return nil, nil
 }
@@ -368,7 +399,7 @@ func (s *SyncStorage) generateDirentsData(fileParam *models.FileParam, filesData
 
 			streamFiles = append(nestFilesData.Items, streamFiles[1:]...)
 		} else {
-			dataChan <- fmt.Sprintf("data: %s\n\n", common.ToJson(firstItem))
+			dataChan <- common.ToJson(firstItem)
 			streamFiles = streamFiles[1:]
 		}