From ca4bfba6cc88aed65ea172f140ab9c5bb51486a5 Mon Sep 17 00:00:00 2001 From: syumai Date: Wed, 17 Apr 2024 00:56:47 +0900 Subject: [PATCH] fix examples --- _examples/cache/main.go | 3 +-- _examples/d1-blog-server/app/handler.go | 2 +- _examples/durable-object-counter/main.go | 5 ++--- _examples/env/main.go | 2 +- _examples/fetch-event/go.mod | 2 +- _examples/fetch-event/main.go | 6 ++---- _examples/kv-counter/main.go | 2 +- _examples/mysql-blog-server/app/handler.go | 6 +++--- _examples/r2-image-server/main.go | 19 +++++++++---------- _examples/r2-image-viewer/main.go | 2 +- _examples/service-bindings/go.mod | 2 +- _examples/service-bindings/main.go | 3 +-- 12 files changed, 24 insertions(+), 30 deletions(-) diff --git a/_examples/cache/main.go b/_examples/cache/main.go index f576a01..8f7c9fd 100644 --- a/_examples/cache/main.go +++ b/_examples/cache/main.go @@ -37,7 +37,6 @@ func (rw *responseWriter) ToHTTPResponse() *http.Response { } func handler(w http.ResponseWriter, req *http.Request) { - ctx := req.Context() rw := responseWriter{ResponseWriter: w} c := cache.New() @@ -64,7 +63,7 @@ func handler(w http.ResponseWriter, req *http.Request) { rw.Write([]byte(text)) // Create cache - cloudflare.WaitUntil(ctx, func() { + cloudflare.WaitUntil(func() { err := c.Put(req, rw.ToHTTPResponse()) if err != nil { fmt.Println(err) diff --git a/_examples/d1-blog-server/app/handler.go b/_examples/d1-blog-server/app/handler.go index 13aaaca..0251f72 100644 --- a/_examples/d1-blog-server/app/handler.go +++ b/_examples/d1-blog-server/app/handler.go @@ -25,7 +25,7 @@ func NewArticleHandler() http.Handler { func (h *articleHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { // initialize DB. // D1 connector requires request's context to initialize DB. - c, err := d1.OpenConnector(req.Context(), "BlogDB") + c, err := d1.OpenConnector("BlogDB") if err != nil { h.handleErr(w, http.StatusInternalServerError, fmt.Sprintf("failed to initialize DB: %v", err)) } diff --git a/_examples/durable-object-counter/main.go b/_examples/durable-object-counter/main.go index 336e2fa..c5ccb41 100644 --- a/_examples/durable-object-counter/main.go +++ b/_examples/durable-object-counter/main.go @@ -12,10 +12,10 @@ func main() { workers.Serve(&MyHandler{}) } -type MyHandler struct {} +type MyHandler struct{} func (_ *MyHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { - COUNTER, err := cloudflare.NewDurableObjectNamespace(req.Context(), "COUNTER") + COUNTER, err := cloudflare.NewDurableObjectNamespace("COUNTER") if err != nil { panic(err) } @@ -38,4 +38,3 @@ func (_ *MyHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { w.Write([]byte("Durable object 'A' count: " + string(count))) } - diff --git a/_examples/env/main.go b/_examples/env/main.go index cf1e10d..bd8aa79 100644 --- a/_examples/env/main.go +++ b/_examples/env/main.go @@ -10,7 +10,7 @@ import ( func main() { handler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { - fmt.Fprintf(w, "MY_ENV: %s", cloudflare.Getenv(req.Context(), "MY_ENV")) + fmt.Fprintf(w, "MY_ENV: %s", cloudflare.Getenv("MY_ENV")) }) workers.Serve(handler) } diff --git a/_examples/fetch-event/go.mod b/_examples/fetch-event/go.mod index d698bb5..00d09bf 100644 --- a/_examples/fetch-event/go.mod +++ b/_examples/fetch-event/go.mod @@ -1,4 +1,4 @@ -module github.com/syumai/workers/_examples/hello +module github.com/syumai/workers/_examples/fetch-event go 1.21.3 diff --git a/_examples/fetch-event/main.go b/_examples/fetch-event/main.go index 3459ca6..8b1e827 100644 --- a/_examples/fetch-event/main.go +++ b/_examples/fetch-event/main.go @@ -12,12 +12,10 @@ import ( ) func handler(w http.ResponseWriter, req *http.Request) { - ctx := req.Context() - - cloudflare.PassThroughOnException(ctx) + cloudflare.PassThroughOnException() // logging after responding - cloudflare.WaitUntil(ctx, func() { + cloudflare.WaitUntil(func() { for i := 0; i < 5; i++ { time.Sleep(time.Second) } diff --git a/_examples/kv-counter/main.go b/_examples/kv-counter/main.go index b3af357..643926a 100644 --- a/_examples/kv-counter/main.go +++ b/_examples/kv-counter/main.go @@ -31,7 +31,7 @@ func main() { } // initialize KV namespace instance - kv, err := cloudflare.NewKVNamespace(req.Context(), counterNamespace) + kv, err := cloudflare.NewKVNamespace(counterNamespace) if err != nil { fmt.Fprintf(os.Stderr, "failed to init KV: %v", err) os.Exit(1) diff --git a/_examples/mysql-blog-server/app/handler.go b/_examples/mysql-blog-server/app/handler.go index aa4228a..132ddc1 100644 --- a/_examples/mysql-blog-server/app/handler.go +++ b/_examples/mysql-blog-server/app/handler.go @@ -27,13 +27,13 @@ func NewArticleHandler() http.Handler { func (h *articleHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { // initialize DB. - mysql.RegisterDialContext("tcp", func(_ context.Context, addr string) (net.Conn, error) { - return sockets.Connect(req.Context(), addr, &sockets.SocketOptions{ + mysql.RegisterDialContext("tcp", func(ctx context.Context, addr string) (net.Conn, error) { + return sockets.Connect(ctx, addr, &sockets.SocketOptions{ SecureTransport: sockets.SecureTransportOff, }) }) db, err := sql.Open("mysql", - cloudflare.Getenv(req.Context(), "MYSQL_DSN")) + cloudflare.Getenv("MYSQL_DSN")) if err != nil { log.Fatalf("failed to connect: %v", err) } diff --git a/_examples/r2-image-server/main.go b/_examples/r2-image-server/main.go index 9d4167c..60b5841 100644 --- a/_examples/r2-image-server/main.go +++ b/_examples/r2-image-server/main.go @@ -1,7 +1,6 @@ package main import ( - "context" "fmt" "io" "log" @@ -24,12 +23,12 @@ func handleErr(w http.ResponseWriter, msg string, err error) { type server struct{} -func (s *server) bucket(ctx context.Context) (*cloudflare.R2Bucket, error) { - return cloudflare.NewR2Bucket(ctx, bucketName) +func (s *server) bucket() (*cloudflare.R2Bucket, error) { + return cloudflare.NewR2Bucket(bucketName) } func (s *server) post(w http.ResponseWriter, req *http.Request, key string) { - bucket, err := s.bucket(req.Context()) + bucket, err := s.bucket() if err != nil { handleErr(w, "failed to initialize R2Bucket\n", err) return @@ -61,9 +60,9 @@ func (s *server) post(w http.ResponseWriter, req *http.Request, key string) { w.Write([]byte("successfully uploaded image")) } -func (s *server) get(w http.ResponseWriter, req *http.Request, key string) { +func (s *server) get(w http.ResponseWriter, key string) { // get image object from R2 - bucket, err := s.bucket(req.Context()) + bucket, err := s.bucket() if err != nil { handleErr(w, "failed to initialize R2Bucket\n", err) return @@ -88,9 +87,9 @@ func (s *server) get(w http.ResponseWriter, req *http.Request, key string) { io.Copy(w, imgObj.Body) } -func (s *server) delete(w http.ResponseWriter, req *http.Request, key string) { +func (s *server) delete(w http.ResponseWriter, key string) { // delete image object from R2 - bucket, err := s.bucket(req.Context()) + bucket, err := s.bucket() if err != nil { handleErr(w, "failed to initialize R2Bucket\n", err) return @@ -107,10 +106,10 @@ func (s *server) ServeHTTP(w http.ResponseWriter, req *http.Request) { key := strings.TrimPrefix(req.URL.Path, "/") switch req.Method { case "GET": - s.get(w, req, key) + s.get(w, key) return case "DELETE": - s.delete(w, req, key) + s.delete(w, key) return case "POST": s.post(w, req, key) diff --git a/_examples/r2-image-viewer/main.go b/_examples/r2-image-viewer/main.go index cc897ab..924281a 100644 --- a/_examples/r2-image-viewer/main.go +++ b/_examples/r2-image-viewer/main.go @@ -23,7 +23,7 @@ func handleErr(w http.ResponseWriter, msg string, err error) { // This example is based on implementation in syumai/workers-playground // - https://github.com/syumai/workers-playground/blob/e32881648ccc055e3690a0d9c750a834261c333e/r2-image-viewer/src/index.ts#L30 func handler(w http.ResponseWriter, req *http.Request) { - bucket, err := cloudflare.NewR2Bucket(req.Context(), bucketName) + bucket, err := cloudflare.NewR2Bucket(bucketName) if err != nil { handleErr(w, "failed to get R2Bucket\n", err) return diff --git a/_examples/service-bindings/go.mod b/_examples/service-bindings/go.mod index 6ec9028..f055062 100644 --- a/_examples/service-bindings/go.mod +++ b/_examples/service-bindings/go.mod @@ -1,4 +1,4 @@ -module github.com/syumai/workers/_examples/fetch +module github.com/syumai/workers/_examples/service-bindings go 1.21.3 diff --git a/_examples/service-bindings/main.go b/_examples/service-bindings/main.go index ab9a23a..22de8d2 100644 --- a/_examples/service-bindings/main.go +++ b/_examples/service-bindings/main.go @@ -12,8 +12,7 @@ import ( func main() { handler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { - ctx := req.Context() - bind := cloudflare.GetBinding(ctx, "hello") + bind := cloudflare.GetBinding("hello") fc := fetch.NewClient(fetch.WithBinding(bind)) hc := fc.HTTPClient(fetch.RedirectModeFollow)