add support for http proxy

client.go

@@ -11,6 +11,7 @@ import (
  "io"
  "net"
  "net/http"
+ "net/url"
  "time"
 
  "github.com/sideshow/apns2/token"
@@ -37,6 +38,8 @@ var (
  // TCPKeepAlive specifies the keep-alive period for an active network
  // connection. If zero, keep-alives are not enabled.
  TCPKeepAlive = 60 * time.Second
+ // IdleConnTimeout specifies the max idle time of the connection
+ IdleConnTimeout = 300 * time.Second
 )
 
 // DialTLS is the default dial function for creating TLS connections for
@@ -93,6 +96,42 @@ func NewClient(certificate tls.Certificate) *Client {
  }
 }
 
+// NewProxyClient returns a new Client with http proxy enabled
+// Since the transport of http1.1 does not support DialTLS with http proxy enabled
+// The DialTLS (including TLSDialTimeout and TCPKeepAlive) will be disabled if you use this function
+// proxyUrl like http://127.0.0.1:8888
+func NewProxyClient(certificate tls.Certificate, proxyUrl string) *Client {
+ if proxyUrl == "" {
+ return NewClient(certificate)
+ }
+ tlsConfig := &tls.Config{
+ Certificates: []tls.Certificate{certificate},
+ }
+ if len(certificate.Certificate) > 0 {
+ tlsConfig.BuildNameToCertificate()
+ }
+ transport := &http.Transport{
+ TLSClientConfig: tlsConfig,
+ Proxy: func(request *http.Request) (*url.URL, error) {
+ return url.Parse(proxyUrl)
+ },
+ IdleConnTimeout: IdleConnTimeout,
+ }
+ err := http2.ConfigureTransport(transport)
+ //if configure failed
+ if err != nil {
+ return nil
+ }
+ return &Client{
+ HTTPClient: &http.Client{
+ Transport: transport,
+ Timeout: HTTPClientTimeout,
+ },
+ Certificate: certificate,
+ Host: DefaultHost,
+ }
+}
+
 // NewTokenClient returns a new Client with an underlying http.Client configured
 // with the correct APNs HTTP/2 transport settings. It does not connect to the APNs
 // until the first Notification is sent via the Push method.
@@ -115,6 +154,35 @@ func NewTokenClient(token *token.Token) *Client {
  }
 }
 
+// NewProxyTokenClient extends NewTokenClient to support http proxy
+// Since the transport of http1.1 does not support DialTLS with http proxy enabled
+// The DialTLS (including TLSDialTimeout and TCPKeepAlive) will be disabled if you use this function
+// proxyUrl like http://127.0.0.1:8888
+func NewProxyTokenClient(token *token.Token, proxyUrl string) *Client {
+ if proxyUrl == "" {
+ return NewTokenClient(token)
+ }
+ transport := &http.Transport{
+ Proxy: func(request *http.Request) (*url.URL, error) {
+ return url.Parse(proxyUrl)
+ },
+ IdleConnTimeout: IdleConnTimeout,
+ }
+ err := http2.ConfigureTransport(transport)
+ //if configure failed
+ if err != nil {
+ return nil
+ }
+ return &Client{
+ Token: token,
+ HTTPClient: &http.Client{
+ Transport: transport,
+ Timeout: HTTPClientTimeout,
+ },
+ Host: DefaultHost,
+ }
+}
+
 // Development sets the Client to use the APNs development push endpoint.
 func (c *Client) Development() *Client {
  c.Host = HostDevelopment

client_test.go

@@ -66,6 +66,16 @@ func TestTokenDefaultHost(t *testing.T) {
  assert.Equal(t, "https://api.development.push.apple.com", client.Host)
 }
 
+func TestClientProxyDefaultHost(t *testing.T) {
+ client := apns.NewProxyClient(mockCert(), "http://127.0.0.1:8888")
+ assert.Equal(t, "https://api.development.push.apple.com", client.Host)
+}
+
+func TestTokenProxyDefaultHost(t *testing.T) {
+ client := apns.NewProxyTokenClient(mockToken(), "http://127.0.0.1:8888").Development()
+ assert.Equal(t, "https://api.development.push.apple.com", client.Host)
+}
+
 func TestClientDevelopmentHost(t *testing.T) {
  client := apns.NewClient(mockCert()).Development()
  assert.Equal(t, "https://api.development.push.apple.com", client.Host)