From 61dca22a01ae8f3c317c7e7f312d94ec8a770596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=A0Ilya=20Atamas?= Date: Thu, 18 Apr 2019 01:14:20 +0300 Subject: [PATCH] feat: add cli - start server, list packages, purge packages --- cli/list.go | 34 ++++++++++++++ cli/main.go | 17 +++++++ cli/purge.go | 29 ++++++++++++ cli/root.go | 40 +++++++++++++++++ go.mod | 5 +++ go.sum | 50 +++++++++++++++++++++ main.go | 29 +----------- proxy/cache.go | 110 ++++++++++++++++++++++++++++++++++++++++++++++ proxy/metadata.go | 68 ---------------------------- proxy/server.go | 18 +++++--- readme.md | 2 +- 11 files changed, 300 insertions(+), 102 deletions(-) create mode 100644 cli/list.go create mode 100644 cli/main.go create mode 100644 cli/purge.go create mode 100644 cli/root.go create mode 100644 proxy/cache.go delete mode 100644 proxy/metadata.go diff --git a/cli/list.go b/cli/list.go new file mode 100644 index 0000000..7c60c40 --- /dev/null +++ b/cli/list.go @@ -0,0 +1,34 @@ +package cli + +import ( + "fmt" + "net/http" + + "github.com/emeralt/npm-cache-proxy/proxy" + "github.com/go-redis/redis" + "github.com/spf13/cobra" +) + +// start a server +var listCmd = &cobra.Command{ + Use: "list", + Short: "List all cached packages", + Run: func(cmd *cobra.Command, args []string) { + prx := proxy.Proxy{ + RedisClient: redis.NewClient(&redis.Options{}), + HttpClient: &http.Client{ + Transport: http.DefaultTransport, + }, + GetOptions: getOptions, + } + + metadatas, err := prx.ListMetadata() + if err != nil { + panic(err) + } + + for _, metadata := range metadatas { + fmt.Println(metadata) + } + }, +} diff --git a/cli/main.go b/cli/main.go new file mode 100644 index 0000000..78fc7bc --- /dev/null +++ b/cli/main.go @@ -0,0 +1,17 @@ +package cli + +import ( + "fmt" + "os" +) + +// Run starts the CLI +func Run() { + rootCmd.AddCommand(listCmd) + rootCmd.AddCommand(purgeCmd) + + if err := rootCmd.Execute(); err != nil { + fmt.Println(err) + os.Exit(1) + } +} diff --git a/cli/purge.go b/cli/purge.go new file mode 100644 index 0000000..fd1506a --- /dev/null +++ b/cli/purge.go @@ -0,0 +1,29 @@ +package cli + +import ( + "net/http" + + npmproxy "github.com/emeralt/npm-cache-proxy/proxy" + "github.com/go-redis/redis" + "github.com/spf13/cobra" +) + +// start a server +var purgeCmd = &cobra.Command{ + Use: "purge", + Short: "Purge all cached packages", + Run: func(cmd *cobra.Command, args []string) { + proxy := npmproxy.Proxy{ + RedisClient: redis.NewClient(&redis.Options{}), + HttpClient: &http.Client{ + Transport: http.DefaultTransport, + }, + GetOptions: getOptions, + } + + err := proxy.PurgeMetadata() + if err != nil { + panic(err) + } + }, +} diff --git a/cli/root.go b/cli/root.go new file mode 100644 index 0000000..03f5a2c --- /dev/null +++ b/cli/root.go @@ -0,0 +1,40 @@ +package cli + +import ( + "net/http" + "time" + + npmproxy "github.com/emeralt/npm-cache-proxy/proxy" + "github.com/go-redis/redis" + "github.com/spf13/cobra" +) + +// start a server +var rootCmd = &cobra.Command{ + Use: "ncp", + Short: "ncp is a fast npm cache proxy that stores data in Redis", + Run: func(cmd *cobra.Command, args []string) { + proxy := npmproxy.Proxy{ + RedisClient: redis.NewClient(&redis.Options{}), + HttpClient: &http.Client{ + Transport: http.DefaultTransport, + }, + GetOptions: getOptions, + } + + proxy.Server(npmproxy.ServerOptions{ + ListenAddress: "localhost:8080", + }).ListenAndServe() + }, +} + +func getOptions() (npmproxy.Options, error) { + return npmproxy.Options{ + RedisPrefix: "ncp-", + RedisExpireTimeout: 1 * time.Hour, + + UpstreamAddress: "http://registry.npmjs.org", + ReplaceAddress: "https://registry.npmjs.org", + StaticServerAddress: "http://localhost:8080", + }, nil +} diff --git a/go.mod b/go.mod index 0056447..25c2173 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,12 @@ require ( github.com/golang/protobuf v1.3.1 // indirect github.com/json-iterator/go v1.1.6 // indirect github.com/mattn/go-isatty v0.0.7 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/onsi/ginkgo v1.8.0 // indirect + github.com/onsi/gomega v1.5.0 // indirect github.com/pkg/errors v0.8.1 // indirect + github.com/spf13/cobra v0.0.3 + github.com/spf13/viper v1.3.2 // indirect github.com/stretchr/objx v0.2.0 // indirect go.uber.org/zap v1.9.1 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a // indirect diff --git a/go.sum b/go.sum index 19a9290..048c069 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,11 @@ +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 h1:AzN37oI0cOS+cougNAV9szl6CVoj2RYwzS3DpUQNtlY= github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 h1:t8FVkw33L+wilf2QiWkw0UV77qRpcH/JHPKGpKa2E8g= @@ -14,45 +20,89 @@ github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w= +github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo= +github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2 h1:EICbibRW4JNKMcY+LsWmuwob+CRS1BmdRdjphAm9mH4= github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.9.1 h1:XCJQEf3W6eZaVwhRBof6ImoYGJSITeKWsyeh3HFu/5o= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190415214537-1da14a5a36f2 h1:iC0Y6EDq+rhnAePxGvJs2kzUAYcwESqdcGRPzEUfzTU= golang.org/x/net v0.0.0-20190415214537-1da14a5a36f2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190415145633-3fd5a3612ccd h1:MNN7PRW7zYXd8upVO5qfKeOnQG74ivRNv7sz4k4cQMs= golang.org/x/sys v0.0.0-20190415145633-3fd5a3612ccd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ= gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/main.go b/main.go index 40f7358..97a17c7 100644 --- a/main.go +++ b/main.go @@ -1,34 +1,9 @@ package main import ( - "net/http" - "time" - - npmproxy "github.com/emeralt/npm-cache-proxy/proxy" - "github.com/go-redis/redis" + "github.com/emeralt/npm-cache-proxy/cli" ) -func getOptions() (npmproxy.Options, error) { - return npmproxy.Options{ - RedisPrefix: "", - RedisExpireTimeout: 1 * time.Hour, - - UpstreamAddress: "http://registry.npmjs.org", - ReplaceAddress: "https://registry.npmjs.org", - StaticServerAddress: "http://localhost:8080", - }, nil -} - func main() { - proxy := npmproxy.Proxy{ - RedisClient: redis.NewClient(&redis.Options{}), - HttpClient: &http.Client{ - Transport: http.DefaultTransport, - }, - GetOptions: getOptions, - } - - proxy.Server(npmproxy.ServerOptions{ - ListenAddress: "localhost:8080", - }).ListenAndServe() + cli.Run() } diff --git a/proxy/cache.go b/proxy/cache.go new file mode 100644 index 0000000..2bcacd7 --- /dev/null +++ b/proxy/cache.go @@ -0,0 +1,110 @@ +package proxy + +import ( + "io/ioutil" + "net/http" + "strings" +) + +// GetMetadata returns NPM response for a given package path +func (proxy Proxy) GetMetadata(name string, originalPath string, header http.Header) ([]byte, error) { + options, err := proxy.GetOptions() + if err != nil { + return nil, err + } + + // get package from redis + pkg, err := proxy.RedisClient.Get(options.RedisPrefix + name).Result() + + // either package doesn't exist or there's some other problem + if err != nil { + + // check if error is caused by nonexistend package + // if no, return error + if err.Error() != "redis: nil" { + return nil, err + } + + // error is caused by nonexistent package + // fetch package + req, err := http.NewRequest("GET", options.UpstreamAddress+originalPath, nil) + + // inherit headers from request + req.Header = header + if err != nil { + return nil, err + } + + res, err := proxy.HttpClient.Do(req) + if err != nil { + return nil, err + } + + defer res.Body.Close() + body, err := ioutil.ReadAll(res.Body) + if err != nil { + return nil, err + } + + // convert body to string + pkg = string(body) + + // save to redis + _, err = proxy.RedisClient.Set( + options.RedisPrefix+name, + pkg, + options.RedisExpireTimeout, + ).Result() + if err != nil { + return nil, err + } + } + + // replace tarball urls + // FIXME: unmarshall and replace only necessary fields + // convertedPkg := strings.ReplaceAll(string(pkg), options.ReplaceAddress, options.StaticServerAddress) + + return []byte(pkg), nil +} + +// ListMetadata returns a list of all cached packages +func (proxy Proxy) ListMetadata() ([]string, error) { + options, err := proxy.GetOptions() + if err != nil { + return nil, err + } + + metadata, err := proxy.RedisClient.Keys(options.RedisPrefix + "*").Result() + if err != nil { + return nil, err + } + + deprefixedMetadata := make([]string, 0) + for _, record := range metadata { + deprefixedMetadata = append(deprefixedMetadata, strings.Replace(record, options.RedisPrefix, "", 1)) + } + + return deprefixedMetadata, nil +} + +// Purge deletes all cached packages +func (proxy Proxy) PurgeMetadata() error { + options, err := proxy.GetOptions() + if err != nil { + return err + } + + metadata, err := proxy.RedisClient.Keys(options.RedisPrefix + "*").Result() + if err != nil { + return err + } + + for _, record := range metadata { + _, err := proxy.RedisClient.Del(record).Result() + if err != nil { + return err + } + } + + return nil +} diff --git a/proxy/metadata.go b/proxy/metadata.go deleted file mode 100644 index 3a76a18..0000000 --- a/proxy/metadata.go +++ /dev/null @@ -1,68 +0,0 @@ -package proxy - -import ( - "io/ioutil" - "net/http" - "strings" -) - -// GetMetadata returns NPM response for a given package path -func (proxy Proxy) GetMetadata(path string, header http.Header) ([]byte, error) { - options, err := proxy.GetOptions() - if err != nil { - return nil, err - } - - // get package from redis - pkg, err := proxy.RedisClient.Get(options.RedisPrefix + path).Result() - - // either package doesn't exist or there's some other problem - if err != nil { - - // check if error is caused by nonexistend package - // if no, return error - if err.Error() != "redis: nil" { - return nil, err - } - - // error is caused by nonexistent package - // fetch package - req, err := http.NewRequest("GET", options.UpstreamAddress+path, nil) - - // inherit headers from request - req.Header = header - if err != nil { - return nil, err - } - - res, err := proxy.HttpClient.Do(req) - if err != nil { - return nil, err - } - - defer res.Body.Close() - body, err := ioutil.ReadAll(res.Body) - if err != nil { - return nil, err - } - - // convert body to string - pkg = string(body) - - // save to redis - _, err = proxy.RedisClient.Set( - options.RedisPrefix+path, - pkg, - options.RedisExpireTimeout, - ).Result() - if err != nil { - return nil, err - } - } - - // replace tarball urls - // FIXME: unmarshall and replace only necessary fields - convertedPkg := strings.ReplaceAll(string(pkg), options.ReplaceAddress, options.StaticServerAddress) - - return []byte(convertedPkg), nil -} diff --git a/proxy/server.go b/proxy/server.go index 89306b1..3695b0b 100644 --- a/proxy/server.go +++ b/proxy/server.go @@ -2,7 +2,6 @@ package proxy import ( "net/http" - "strings" "time" ginzap "github.com/gin-contrib/zap" @@ -31,9 +30,14 @@ func (proxy Proxy) Server(options ServerOptions) *http.Server { } func (proxy Proxy) GetPackageHandler(c *gin.Context) { - key := c.Request.URL.Path + var name string + if c.Param("name") != "" { + name = c.Param("scope") + "/" + c.Param("name") + } else { + name = c.Param("scope") + } - pkg, err := proxy.GetMetadata(key, c.Request.Header) + pkg, err := proxy.GetMetadata(name, c.Request.URL.Path, c.Request.Header) if err != nil { c.AbortWithError(500, err) @@ -43,9 +47,11 @@ func (proxy Proxy) GetPackageHandler(c *gin.Context) { } func (proxy Proxy) NoRouteHandler(c *gin.Context) { - if strings.Contains(c.Request.URL.Path, ".tgz") { - proxy.GetPackageHandler(c) - } else if c.Request.URL.Path == "/" { + // if strings.Contains(c.Request.URL.Path, ".tgz") { + // proxy.GetPackageHandler(c) + // } else + + if c.Request.URL.Path == "/" { _, err := proxy.RedisClient.Ping().Result() if err != nil { diff --git a/readme.md b/readme.md index 2f6d3d7..b3aa501 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,7 @@ # npm-cache-proxy ![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/emeralt/npm-cache-proxy.svg?style=for-the-badge) -## Installation +## Usage ... ## Configuration