patch of knotserver: simplify json response boilerplate · round #0 · pull #566 · tangled.org/core

+1 -10

knotserver/xrpc/list_keys.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       5
        
       	"strconv"

     

       7
       6
        
       

     
···

       46
       45
        
       		response.Cursor = &nextCursor

     

       47
       46
        
       	}

     

       48
       47
        
       

     

       49
       49
       -
       	w.Header().Set("Content-Type", "application/json")

     

       50
       50
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       51
       51
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       52
       52
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       53
       53
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       54
       54
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       55
       55
       -
       		), http.StatusInternalServerError)

     

       56
       56
       -
       		return

     

       57
       57
       -
       	}

     

       48
       48
       +
       	writeJson(w, response)

     

       58
       49
        
       }

+1 -10

knotserver/xrpc/owner.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       5
        
       

     

       7
       6
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     
···

       19
       18
        
       		Owner: owner,

     

       20
       19
        
       	}

     

       21
       20
        
       

     

       22
       22
       -
       	w.Header().Set("Content-Type", "application/json")

     

       23
       23
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       24
       24
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       25
       25
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       26
       26
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       27
       27
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       28
       28
       -
       		), http.StatusInternalServerError)

     

       29
       29
       -
       		return

     

       30
       30
       -
       	}

     

       21
       21
       +
       	writeJson(w, response)

     

       31
       22
        
       }

+1 -10

knotserver/xrpc/repo_blob.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"crypto/sha256"

     

       5
       5
        
       	"encoding/base64"

     

       6
       6
       -
       	"encoding/json"

     

       7
       6
        
       	"fmt"

     

       8
       7
        
       	"net/http"

     

       9
       8
        
       	"path/filepath"

     
···

       124
       123
        
       		response.MimeType = &mimeType

     

       125
       124
        
       	}

     

       126
       125
        
       

     

       127
       127
       -
       	w.Header().Set("Content-Type", "application/json")

     

       128
       128
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       129
       129
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       130
       130
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       131
       131
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       132
       132
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       133
       133
       -
       		), http.StatusInternalServerError)

     

       134
       134
       -
       		return

     

       135
       135
       -
       	}

     

       126
       126
       +
       	writeJson(w, response)

     

       136
       127
        
       }

     

       137
       128
        
       

     

       138
       129
        
       // isTextualMimeType returns true if the MIME type represents textual content

+1 -10

knotserver/xrpc/repo_branch.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       5
        
       	"net/url"

     

       7
       6
        
       	"time"

     
···

       82
       81
        
       		When:  commit.Author.When.Format(time.RFC3339),

     

       83
       82
        
       	}

     

       84
       83
        
       

     

       85
       85
       -
       	w.Header().Set("Content-Type", "application/json")

     

       86
       86
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       87
       87
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       88
       88
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       89
       89
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       90
       90
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       91
       91
       -
       		), http.StatusInternalServerError)

     

       92
       92
       -
       		return

     

       93
       93
       -
       	}

     

       84
       84
       +
       	writeJson(w, response)

     

       94
       85
        
       }

+1 -11

knotserver/xrpc/repo_branches.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       5
        
       	"strconv"

     

       7
       6
        
       

     
···

       53
       52
        
       		Branches: paginatedBranches,

     

       54
       53
        
       	}

     

       55
       54
        
       

     

       56
       56
       -
       	// Write JSON response directly

     

       57
       57
       -
       	w.Header().Set("Content-Type", "application/json")

     

       58
       58
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       59
       59
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       60
       60
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       61
       61
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       62
       62
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       63
       63
       -
       		), http.StatusInternalServerError)

     

       64
       64
       -
       		return

     

       65
       65
       -
       	}

     

       55
       55
       +
       	writeJson(w, response)

     

       66
       56
        
       }

+2 -11

knotserver/xrpc/repo_compare.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"fmt"

     

       6
       5
        
       	"net/http"

     

       7
       6
        
       

     
···

       72
       71
        
       		return

     

       73
       72
        
       	}

     

       74
       73
        
       

     

       75
       75
       -
       	resp := types.RepoFormatPatchResponse{

     

       74
       74
       +
       	response := types.RepoFormatPatchResponse{

     

       76
       75
        
       		Rev1:        commit1.Hash.String(),

     

       77
       76
        
       		Rev2:        commit2.Hash.String(),

     

       78
       77
        
       		FormatPatch: formatPatch,

     

       79
       78
        
       		Patch:       rawPatch,

     

       80
       79
        
       	}

     

       81
       80
        
       

     

       82
       82
       -
       	w.Header().Set("Content-Type", "application/json")

     

       83
       83
       -
       	if err := json.NewEncoder(w).Encode(resp); err != nil {

     

       84
       84
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       85
       85
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       86
       86
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       87
       87
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       88
       88
       -
       		), http.StatusInternalServerError)

     

       89
       89
       -
       		return

     

       90
       90
       -
       	}

     

       81
       81
       +
       	writeJson(w, response)

     

       91
       82
        
       }

+2 -11

knotserver/xrpc/repo_diff.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       5
        
       

     

       7
       6
        
       	"tangled.sh/tangled.sh/core/knotserver/git"

     
···

       33
       32
        
       		return

     

       34
       33
        
       	}

     

       35
       34
        
       

     

       36
       36
       -
       	resp := types.RepoCommitResponse{

     

       35
       35
       +
       	response := types.RepoCommitResponse{

     

       37
       36
        
       		Ref:  ref,

     

       38
       37
        
       		Diff: diff,

     

       39
       38
        
       	}

     

       40
       39
        
       

     

       41
       41
       -
       	w.Header().Set("Content-Type", "application/json")

     

       42
       42
       -
       	if err := json.NewEncoder(w).Encode(resp); err != nil {

     

       43
       43
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       44
       44
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       45
       45
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       46
       46
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       47
       47
       -
       		), http.StatusInternalServerError)

     

       48
       48
       -
       		return

     

       49
       49
       -
       	}

     

       40
       40
       +
       	writeJson(w, response)

     

       50
       41
        
       }

+1 -10

knotserver/xrpc/repo_get_default_branch.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       5
        
       	"time"

     

       7
       6
        
       

     
···

       36
       35
        
       		When: time.UnixMicro(0).Format(time.RFC3339),

     

       37
       36
        
       	}

     

       38
       37
        
       

     

       39
       39
       -
       	w.Header().Set("Content-Type", "application/json")

     

       40
       40
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       41
       41
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       42
       42
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       43
       43
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       44
       44
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       45
       45
       -
       		), http.StatusInternalServerError)

     

       46
       46
       -
       		return

     

       47
       47
       -
       	}

     

       38
       38
       +
       	writeJson(w, response)

     

       48
       39
        
       }

+1 -10

knotserver/xrpc/repo_languages.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
       -
       	"encoding/json"

     

       6
       5
        
       	"math"

     

       7
       6
        
       	"net/http"

     

       8
       7
        
       	"time"

     
···

       73
       72
        
       		response.TotalFiles = &totalFiles

     

       74
       73
        
       	}

     

       75
       74
        
       

     

       76
       76
       -
       	w.Header().Set("Content-Type", "application/json")

     

       77
       77
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       78
       78
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       79
       79
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       80
       80
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       81
       81
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       82
       82
       -
       		), http.StatusInternalServerError)

     

       83
       83
       -
       		return

     

       84
       84
       -
       	}

     

       75
       75
       +
       	writeJson(w, response)

     

       85
       76
        
       }

+1 -11

knotserver/xrpc/repo_log.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       5
        
       	"strconv"

     

       7
       6
        
       

     
···

       78
       77
        
       

     

       79
       78
        
       	response.Log = true

     

       80
       79
        
       

     

       81
       81
       -
       	// Write JSON response directly

     

       82
       82
       -
       	w.Header().Set("Content-Type", "application/json")

     

       83
       83
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       84
       84
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       85
       85
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       86
       86
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       87
       87
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       88
       88
       -
       		), http.StatusInternalServerError)

     

       89
       89
       -
       		return

     

       90
       90
       -
       	}

     

       80
       80
       +
       	writeJson(w, response)

     

       91
       81
        
       }

+1 -11

knotserver/xrpc/repo_tags.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       5
        
       	"strconv"

     

       7
       6
        
       

     
···

       83
       82
        
       		Tags: paginatedTags,

     

       84
       83
        
       	}

     

       85
       84
        
       

     

       86
       86
       -
       	// Write JSON response directly

     

       87
       87
       -
       	w.Header().Set("Content-Type", "application/json")

     

       88
       88
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       89
       89
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       90
       90
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       91
       91
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       92
       92
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       93
       93
       -
       		), http.StatusInternalServerError)

     

       94
       94
       -
       		return

     

       95
       95
       -
       	}

     

       85
       85
       +
       	writeJson(w, response)

     

       96
       86
        
       }

+1 -10

knotserver/xrpc/repo_tree.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       5
        
       	"path/filepath"

     

       7
       6
        
       	"time"

     
···

       86
       85
        
       		Files:  treeEntries,

     

       87
       86
        
       	}

     

       88
       87
        
       

     

       89
       89
       -
       	w.Header().Set("Content-Type", "application/json")

     

       90
       90
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       91
       91
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       92
       92
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       93
       93
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       94
       94
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       95
       95
       -
       		), http.StatusInternalServerError)

     

       96
       96
       -
       		return

     

       97
       97
       -
       	}

     

       88
       88
       +
       	writeJson(w, response)

     

       98
       89
        
       }

+1 -11

knotserver/xrpc/version.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"fmt"

     

       6
       5
        
       	"net/http"

     

       7
       6
        
       	"runtime/debug"

     

       8
       7
        
       

     

       9
       8
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       10
       10
       -
       	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"

     

       11
       9
        
       )

     

       12
       10
        
       

     

       13
       11
        
       // version is set during build time.

     
···

       58
       56
        
       		Version: version,

     

       59
       57
        
       	}

     

       60
       58
        
       

     

       61
       61
       -
       	w.Header().Set("Content-Type", "application/json")

     

       62
       62
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       63
       63
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       64
       64
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       65
       65
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       66
       66
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       67
       67
       -
       		), http.StatusInternalServerError)

     

       68
       68
       -
       		return

     

       69
       69
       -
       	}

     

       59
       59
       +
       	writeJson(w, response)

     

       70
       60
        
       }

+8

knotserver/xrpc/xrpc.go

···

       117
       117
        
       	w.WriteHeader(status)

     

       118
       118
        
       	json.NewEncoder(w).Encode(e)

     

       119
       119
        
       }

     

       120
       120
       +
       

     

       121
       121
       +
       func writeJson(w http.ResponseWriter, response any) {

     

       122
       122
       +
       	w.Header().Set("Content-Type", "application/json")

     

       123
       123
       +
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       124
       124
       +
       		writeError(w, xrpcerr.GenericError(err), http.StatusInternalServerError)

     

       125
       125
       +
       		return

     

       126
       126
       +
       	}

     

       127
       127
       +
       }