guru/uBrowserSync
guru
/
uBrowserSync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Rename package syncstore

This commit is contained in:
Maurizio Porrato 2021-05-22 00:13:50 +01:00
parent 1ff1ecdd1d
commit e7206d431c
Signed by: guru
GPG Key ID: C622977DF024AC24
7 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syncstore/driver_fs.go → bsync/driver_fs.go
View File

@ -1,4 +1,4 @@
package syncstore package bsync
import ( import (
"encoding/json" "encoding/json"

2
syncstore/driver_mem.go → bsync/driver_mem.go
View File

@ -1,4 +1,4 @@
package syncstore package bsync
type MemStore map[string]Blob type MemStore map[string]Blob

2
syncstore/errors.go → bsync/errors.go
View File

@ -1,4 +1,4 @@
package syncstore package bsync
import ( import (
"fmt" "fmt"

2
syncstore/models.go → bsync/models.go
View File

@ -1,4 +1,4 @@
package syncstore package bsync
import "time" import "time"

2
syncstore/store.go → bsync/store.go
View File

@ -1,4 +1,4 @@
package syncstore package bsync
import ( import (
"crypto/rand" "crypto/rand"

2
syncstore/store_test.go → bsync/store_test.go
View File

@ -1,4 +1,4 @@
package syncstore package bsync
import ( import (
"fmt" "fmt"

52
cmd/ubsserver/main.go
View File

@ -10,7 +10,7 @@ import (
"strings" "strings"
"time" "time"
"gitlab.com/mporrato/uBrowserSync/syncstore" "gitlab.com/mporrato/uBrowserSync/bsync"
) )
const ( const (
@ -27,14 +27,14 @@ const (
) )
var ( var (
store syncstore.Store store bsync.Store
maxSyncSize = defaultMaxSyncSize maxSyncSize = defaultMaxSyncSize
maxSyncs = defaultMaxSyncs maxSyncs = defaultMaxSyncs
listen string listen string
serviceStatus = statusOnline serviceStatus = statusOnline
sidRe = regexp.MustCompile("^[[:xdigit:]]{32}$") sidRe = regexp.MustCompile("^[[:xdigit:]]{32}$")
invalidRequestError = syncstore.NewSyncError( invalidRequestError = bsync.NewSyncError(
"Invalid request", "Invalid request",
"Malformed request body", "Malformed request body",
http.StatusBadRequest) http.StatusBadRequest)
@ -60,11 +60,11 @@ func sendJSONOk(w http.ResponseWriter, data interface{}) {
func sendJSONError(w http.ResponseWriter, err error) { func sendJSONError(w http.ResponseWriter, err error) {
switch e := err.(type) { switch e := err.(type) {
case syncstore.SyncError: case bsync.SyncError:
sendJSON(w, e.StatusCode, e.Payload) sendJSON(w, e.StatusCode, e.Payload)
default: default:
sendJSON(w, http.StatusInternalServerError, sendJSON(w, http.StatusInternalServerError,
syncstore.ErrorPayload{ bsync.ErrorPayload{
Code: "Internal server error", Code: "Internal server error",
Message: e.Error()}) Message: e.Error()})
} }
@ -72,10 +72,10 @@ func sendJSONError(w http.ResponseWriter, err error) {
func info(w http.ResponseWriter, req *http.Request) { func info(w http.ResponseWriter, req *http.Request) {
if req.Method != "GET" || req.URL.Path != "/info" { if req.Method != "GET" || req.URL.Path != "/info" {
sendJSONError(w, syncstore.NotImplementedError) sendJSONError(w, bsync.NotImplementedError)
} else { } else {
log.Println("info()") log.Println("info()")
serviceInfo := syncstore.ServiceInfoResp{ serviceInfo := bsync.ServiceInfoResp{
Version: apiVersion, Version: apiVersion,
Message: infoMessage, Message: infoMessage,
Status: serviceStatus, Status: serviceStatus,
@ -86,7 +86,7 @@ func info(w http.ResponseWriter, req *http.Request) {
func ensureJSONRequest(w http.ResponseWriter, req *http.Request) bool { func ensureJSONRequest(w http.ResponseWriter, req *http.Request) bool {
if strings.ToLower(req.Header["Content-Type"][0]) != "application/json" { if strings.ToLower(req.Header["Content-Type"][0]) != "application/json" {
sendJSONError(w, syncstore.RequiredDataNotFoundError) sendJSONError(w, bsync.RequiredDataNotFoundError)
return false return false
} }
return true return true
@ -94,13 +94,13 @@ func ensureJSONRequest(w http.ResponseWriter, req *http.Request) bool {
func createSync(w http.ResponseWriter, req *http.Request) { func createSync(w http.ResponseWriter, req *http.Request) {
if serviceStatus != statusOnline { if serviceStatus != statusOnline {
sendJSONError(w, syncstore.NewSyncsForbiddenError) sendJSONError(w, bsync.NewSyncsForbiddenError)
return return
} }
if !ensureJSONRequest(w, req) { if !ensureJSONRequest(w, req) {
return return
} }
body := new(syncstore.CreateReq) body := new(bsync.CreateReq)
req.Body = http.MaxBytesReader(w, req.Body, 10000) req.Body = http.MaxBytesReader(w, req.Body, 10000)
err := json.NewDecoder(req.Body).Decode(&body) err := json.NewDecoder(req.Body).Decode(&body)
if err != nil { if err != nil {
@ -137,7 +137,7 @@ func getLastUpdated(syncId string, w http.ResponseWriter, _ *http.Request) {
sendJSONError(w, err) sendJSONError(w, err)
return return
} }
sendJSONOk(w, syncstore.LastUpdatedResp{LastUpdated: resp}) sendJSONOk(w, bsync.LastUpdatedResp{LastUpdated: resp})
} }
func getVersion(syncId string, w http.ResponseWriter, _ *http.Request) { func getVersion(syncId string, w http.ResponseWriter, _ *http.Request) {
@ -146,14 +146,14 @@ func getVersion(syncId string, w http.ResponseWriter, _ *http.Request) {
sendJSONError(w, err) sendJSONError(w, err)
return return
} }
sendJSONOk(w, syncstore.GetSyncVerResp{Version: resp}) sendJSONOk(w, bsync.GetSyncVerResp{Version: resp})
} }
func updateSync(syncId string, w http.ResponseWriter, req *http.Request) { func updateSync(syncId string, w http.ResponseWriter, req *http.Request) {
if !ensureJSONRequest(w, req) { if !ensureJSONRequest(w, req) {
return return
} }
body := new(syncstore.UpdateReq) body := new(bsync.UpdateReq)
req.Body = http.MaxBytesReader(w, req.Body, int64(10000+maxSyncSize)) req.Body = http.MaxBytesReader(w, req.Body, int64(10000+maxSyncSize))
err := json.NewDecoder(req.Body).Decode(&body) err := json.NewDecoder(req.Body).Decode(&body)
if err != nil { if err != nil {
@ -161,7 +161,7 @@ func updateSync(syncId string, w http.ResponseWriter, req *http.Request) {
return return
} }
if len(body.Bookmarks) > maxSyncSize { if len(body.Bookmarks) > maxSyncSize {
sendJSONError(w, syncstore.SyncDataLimitExceededError) sendJSONError(w, bsync.SyncDataLimitExceededError)
return return
} }
resp, err := store.Update(syncId, body.Bookmarks, body.LastUpdated) resp, err := store.Update(syncId, body.Bookmarks, body.LastUpdated)
@ -169,7 +169,7 @@ func updateSync(syncId string, w http.ResponseWriter, req *http.Request) {
sendJSONError(w, err) sendJSONError(w, err)
return return
} }
sendJSONOk(w, syncstore.UpdateResp{LastUpdated: resp}) sendJSONOk(w, bsync.UpdateResp{LastUpdated: resp})
} }
func bookmarks(w http.ResponseWriter, req *http.Request) { func bookmarks(w http.ResponseWriter, req *http.Request) {
@ -181,13 +181,13 @@ func bookmarks(w http.ResponseWriter, req *http.Request) {
createSync(w, req) createSync(w, req)
return return
} else { } else {
sendJSONError(w, syncstore.MethodNotImplementedError) sendJSONError(w, bsync.MethodNotImplementedError)
return return
} }
} }
syncId := elements[1] syncId := elements[1]
if !sidRe.MatchString(syncId) { if !sidRe.MatchString(syncId) {
sendJSONError(w, syncstore.NotImplementedError) sendJSONError(w, bsync.NotImplementedError)
return return
} }
if len(elements) == 2 { if len(elements) == 2 {
@ -202,7 +202,7 @@ func bookmarks(w http.ResponseWriter, req *http.Request) {
return return
} }
// TODO: Handle HEAD requests // TODO: Handle HEAD requests
sendJSONError(w, syncstore.MethodNotImplementedError) sendJSONError(w, bsync.MethodNotImplementedError)
return return
} }
if len(elements) == 3 { if len(elements) == 3 {
@ -212,7 +212,7 @@ func bookmarks(w http.ResponseWriter, req *http.Request) {
getLastUpdated(syncId, w, req) getLastUpdated(syncId, w, req)
return return
} }
sendJSONError(w, syncstore.MethodNotImplementedError) sendJSONError(w, bsync.MethodNotImplementedError)
return return
} }
if elements[2] == "version" { if elements[2] == "version" {
@ -221,22 +221,22 @@ func bookmarks(w http.ResponseWriter, req *http.Request) {
getVersion(syncId, w, req) getVersion(syncId, w, req)
return return
} }
sendJSONError(w, syncstore.MethodNotImplementedError) sendJSONError(w, bsync.MethodNotImplementedError)
return return
} }
} }
sendJSONError(w, syncstore.NotImplementedError) sendJSONError(w, bsync.NotImplementedError)
} }
func notFound(w http.ResponseWriter, _ *http.Request) { func notFound(w http.ResponseWriter, _ *http.Request) {
sendJSONError(w, syncstore.NotImplementedError) sendJSONError(w, bsync.NotImplementedError)
} }
func init() { func init() {
var ( var (
err error err error
storeFlag string storeFlag string
storeDrv syncstore.StoreDriver storeDrv bsync.StoreDriver
) )
flag.StringVar(&listen, "listen", ":8090", "listen address and port") flag.StringVar(&listen, "listen", ":8090", "listen address and port")
@ -252,17 +252,17 @@ func init() {
if len(storeFlagTokens) != 2 { if len(storeFlagTokens) != 2 {
err = fmt.Errorf("argument required for fs store driver") err = fmt.Errorf("argument required for fs store driver")
} else { } else {
storeDrv, err = syncstore.NewFSStore(storeFlagTokens[1]) storeDrv, err = bsync.NewFSStore(storeFlagTokens[1])
} }
case "mem": case "mem":
storeDrv, err = syncstore.NewMemStore() storeDrv, err = bsync.NewMemStore()
default: default:
err = fmt.Errorf("Invalid store driver: " + storeFlagTokens[0]) err = fmt.Errorf("Invalid store driver: " + storeFlagTokens[0])
} }
if err != nil { if err != nil {
log.Fatalf("store initialization failed: %v", err) log.Fatalf("store initialization failed: %v", err)
} }
store = syncstore.NewStore(storeDrv) store = bsync.NewStore(storeDrv)
} }
func main() { func main() {