Merge pull request #2 from vincent99/main

CORS support

Author: ibuildthecloud

go.mod

@@ -42,6 +42,7 @@ require (
 	github.com/onsi/gomega v1.29.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	github.com/rs/cors v1.10.1 // indirect
 	github.com/samber/lo v1.38.1 // indirect
 	github.com/samber/slog-logrus v1.0.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect

go.sum

@@ -87,6 +87,8 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
+github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo=
+github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM=
 github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=

pkg/server/server.go

@@ -20,6 +20,7 @@ import (
 	"github.com/acorn-io/gptscript/pkg/runner"
 	"github.com/acorn-io/gptscript/pkg/types"
 	"github.com/olahol/melody"
+	"github.com/rs/cors"
 )
 
 type Options struct {
@@ -37,7 +38,7 @@ func complete(opts []Options) (runnerOpts []runner.Options, result Options) {
 		})
 	}
 	if result.ListenAddress == "" {
-		result.ListenAddress = "127.0.0.1:89090"
+		result.ListenAddress = "127.0.0.1:9090"
 	}
 	return
 }
@@ -149,6 +150,7 @@ func (s *Server) run(rw http.ResponseWriter, req *http.Request) {
 		go func() {
 			_, _ = s.runner.Run(ctx, prg, os.Environ(), string(body))
 		}()
+		rw.Header().Set("Content-Type", "application/json")
 		err := json.NewEncoder(rw).Encode(map[string]any{
 			"id": id,
 		})
@@ -169,12 +171,14 @@ func (s *Server) Start(ctx context.Context) error {
 	s.melody.HandleConnect(s.Connect)
 	go s.events.Start(ctx)
 	log.Infof("Listening on http://%s", s.listenAddress)
-	server := &http.Server{Addr: s.listenAddress, Handler: s}
+	handler := cors.Default().Handler(s)
+	server := &http.Server{Addr: s.listenAddress, Handler: handler}
 	context.AfterFunc(ctx, func() {
 		ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
 		defer cancel()
 		_ = server.Shutdown(ctx)
 	})
+
 	return server.ListenAndServe()
 }