odit/npm-cache-proxy
4
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Releases Activity

feat: database as plugin

Browse Source
This commit is contained in:
 Ilya Atamas 2019-04-22 12:49:19 +03:00
parent ab36f4f081
commit 838154ce9c
10 changed files with 82 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/list.go
View File

@ -14,7 +14,7 @@ var listCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
proxy := getProxy(func() (npmproxy.Options, error) {
return npmproxy.Options{
RedisPrefix: persistentOptions.RedisPrefix,
DatabasePrefix: persistentOptions.RedisPrefix,
}, nil
})

4
cli/main.go
View File

@ -27,11 +27,13 @@ func init() {
func getProxy(getOptions func() (npmproxy.Options, error)) *npmproxy.Proxy {
return &npmproxy.Proxy{
RedisClient: redis.NewClient(&redis.Options{
Database: npmproxy.DatabaseRedis{
Client: redis.NewClient(&redis.Options{
Addr: persistentOptions.RedisAddress,
DB: persistentOptions.RedisDatabase,
Password: persistentOptions.RedisPassword,
}),
},
HttpClient: &http.Client{
Transport: http.DefaultTransport,
},

2
cli/purge.go
View File

@ -12,7 +12,7 @@ var purgeCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
proxy := getProxy(func() (npmproxy.Options, error) {
return npmproxy.Options{
RedisPrefix: persistentOptions.RedisPrefix,
DatabasePrefix: persistentOptions.RedisPrefix,
}, nil
})

4
cli/root.go
View File

@ -31,8 +31,8 @@ func init() {
func run(cmd *cobra.Command, args []string) {
proxy := getProxy(func() (npmproxy.Options, error) {
return npmproxy.Options{
RedisPrefix: persistentOptions.RedisPrefix,
RedisExpireTimeout: time.Duration(rootOptions.CacheTTL) * time.Second,
DatabasePrefix: persistentOptions.RedisPrefix,
DatabaseExpiration: time.Duration(rootOptions.CacheTTL) * time.Second,
UpstreamAddress: rootOptions.UpstreamAddress,
}, nil
})

8
example/main.go
View File

@ -10,16 +10,18 @@ import (
func main() {
proxy := npmproxy.Proxy{
RedisClient: redis.NewClient(&redis.Options{
Database: npmproxy.DatabaseRedis{
Client: redis.NewClient(&redis.Options{
Addr: "localhost:6379",
DB: 0,
Password: "",
}),
},
HttpClient: &http.Client{},
GetOptions: func() (npmproxy.Options, error) {
return npmproxy.Options{
RedisPrefix: "ncp-",
RedisExpireTimeout: 1 * time.Hour,
DatabasePrefix: "ncp-",
DatabaseExpiration: 1 * time.Hour,
UpstreamAddress: "https://registry.npmjs.org",
}, nil
},

20
proxy/cache.go
View File

@ -13,8 +13,8 @@ func (proxy Proxy) GetMetadata(name string, originalPath string, header http.Hea
return nil, err
}
// get package from redis
pkg, err := proxy.RedisClient.Get(options.RedisPrefix + name).Result()
// get package from database
pkg, err := proxy.Database.Get(options.DatabasePrefix + name)
// either package doesn't exist or there's some other problem
if err != nil {
@ -50,11 +50,11 @@ func (proxy Proxy) GetMetadata(name string, originalPath string, header http.Hea
pkg = string(body)
// save to redis
_, err = proxy.RedisClient.Set(
options.RedisPrefix+name,
err = proxy.Database.Set(
options.DatabasePrefix+name,
pkg,
options.RedisExpireTimeout,
).Result()
options.DatabaseExpiration,
)
if err != nil {
return nil, err
}
@ -74,14 +74,14 @@ func (proxy Proxy) ListMetadata() ([]string, error) {
return nil, err
}
metadata, err := proxy.RedisClient.Keys(options.RedisPrefix + "*").Result()
metadata, err := proxy.Database.Keys(options.DatabasePrefix)
if err != nil {
return nil, err
}
deprefixedMetadata := make([]string, 0)
for _, record := range metadata {
deprefixedMetadata = append(deprefixedMetadata, strings.Replace(record, options.RedisPrefix, "", 1))
deprefixedMetadata = append(deprefixedMetadata, strings.Replace(record, options.DatabasePrefix, "", 1))
}
return deprefixedMetadata, nil
@ -94,13 +94,13 @@ func (proxy Proxy) PurgeMetadata() error {
return err
}
metadata, err := proxy.RedisClient.Keys(options.RedisPrefix + "*").Result()
metadata, err := proxy.Database.Keys(options.DatabasePrefix)
if err != nil {
return err
}
for _, record := range metadata {
_, err := proxy.RedisClient.Del(record).Result()
err := proxy.Database.Delete(record)
if err != nil {
return err
}

31
proxy/database_redis.go Normal file
View File

@ -0,0 +1,31 @@
package proxy
import (
"time"
"github.com/go-redis/redis"
)
type DatabaseRedis struct {
Client *redis.Client
}
func (db DatabaseRedis) Get(key string) (string, error) {
return db.Client.Get(key).Result()
}
func (db DatabaseRedis) Set(key string, value string, expiration time.Duration) error {
return db.Client.Set(key, value, expiration).Err()
}
func (db DatabaseRedis) Delete(key string) error {
return db.Client.Del(key).Err()
}
func (db DatabaseRedis) Keys(prefix string) ([]string, error) {
return db.Client.Keys(prefix + "*").Result()
}
func (db DatabaseRedis) Health() error {
return db.Client.Ping().Err()
}

16
proxy/main.go
View File

@ -3,19 +3,25 @@ package proxy
import (
"net/http"
"time"
"github.com/go-redis/redis"
)
type Proxy struct {
RedisClient *redis.Client
Database Database
HttpClient *http.Client
GetOptions func() (Options, error)
}
type Options struct {
RedisPrefix string
RedisExpireTimeout time.Duration
DatabasePrefix string
DatabaseExpiration time.Duration
UpstreamAddress string
}
type Database interface {
Get(key string) (string, error)
Set(key string, value string, ttl time.Duration) error
Delete(key string) error
Keys(prefix string) ([]string, error)
Health() error
}

2
proxy/server.go
View File

@ -52,7 +52,7 @@ func (proxy Proxy) NoRouteHandler(c *gin.Context) {
// } else
if c.Request.URL.Path == "/" {
_, err := proxy.RedisClient.Ping().Result()
err := proxy.Database.Health()
if err != nil {
c.AbortWithStatusJSON(503, err)

10
readme.md
View File

@ -54,16 +54,16 @@ import (
func main() {
proxy := npmproxy.Proxy{
RedisClient: redis.NewClient(&redis.Options{
Database: npmproxy.DatabaseRedis{
Client: redis.NewClient(&redis.Options{
Addr: "localhost:6379",
DB: 0,
Password: "",
}),
},
HttpClient: &http.Client{},
GetOptions: func() (npmproxy.Options, error) {
return npmproxy.Options{
RedisPrefix: "ncp-",
RedisExpireTimeout: 1 * time.Hour,
DatabasePrefix: "ncp-",
DatabaseExpiration: 1 * time.Hour,
UpstreamAddress: "https://registry.npmjs.org",
}, nil
},