Remove Echo framework, upgrade to Go 1.24 and PocketBase v0.36.2 #877
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,12 +16,10 @@ package cmd | |
|
|
||
| import ( | ||
| "io/fs" | ||
| "os" | ||
| "path/filepath" | ||
|
|
||
| "github.com/kindlyops/vbs/embeddy" | ||
| "github.com/muesli/coral" | ||
| "github.com/pocketbase/pocketbase" | ||
| "github.com/pocketbase/pocketbase/apis" | ||
|
|
@@ -52,54 +50,33 @@ func flyServer(cmd *coral.Command, args []string) { | |
| } | ||
|
|
||
| log.Debug().Msgf("running pocketbase with data dir %s\n", configDir) | ||
| app := pocketbase.NewWithConfig(pocketbase.Config{ | ||
| DefaultDataDir: configDir, | ||
| }) | ||
|
|
||
| migrationsDir := "" // default to "pb_migrations" (for js) and "migrations" (for go) | ||
|
|
||
| // register the `migrate` command | ||
| migratecmd.MustRegister(app, app.RootCmd, migratecmd.Config{ | ||
| TemplateLang: migratecmd.TemplateLangGo, // or migratecmd.TemplateLangJS | ||
| Dir: migrationsDir, | ||
| Automigrate: true, | ||
| }) | ||
|
|
||
| app.OnServe().BindFunc(func(e *core.ServeEvent) error { | ||
|
Member
There was a problem hiding this comment. 🚫 [golangci] reported by reviewdog 🐶 |
||
| public, err := fs.Sub(embeddy.GetNextFS(), "public") | ||
| if err != nil { | ||
| log.Fatal().Err(err).Msg("Could not access embedded public directory") | ||
| } | ||
|
|
||
| // Serve static files | ||
| e.Router.GET("/*", apis.Static(public, true)) | ||
|
|
||
| // Custom API routes | ||
| e.Router.POST("/api/switcher/*", apis.WrapStdHandler(&Switcher{})) | ||
| e.Router.POST("/api/light/*", apis.WrapStdHandler(&Lighting{})) | ||
|
|
||
| return e.Next() | ||
| }) | ||
|
|
||
| if err := app.Start(); err != nil { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,6 @@ import ( | |
|
|
||
| "github.com/hypebeast/go-osc/osc" | ||
| "github.com/kindlyops/vbs/embeddy" | ||
| "github.com/muesli/coral" | ||
| "github.com/rs/zerolog/log" | ||
| "github.com/spf13/viper" | ||
|
|
@@ -53,14 +52,21 @@ func lightingBridge(cmd *coral.Command, args []string) { | |
| assetHandler := http.FileServer(http.FS(public)) | ||
|
|
||
| log.Debug().Msgf("Starting HTTP server at: http://%s\n", listenAddr) | ||
|
|
||
| mux := http.NewServeMux() | ||
| mux.Handle("/", assetHandler) | ||
| mux.Handle("/api/switcher/", &Switcher{}) | ||
| mux.Handle("/api/light/", &Lighting{}) | ||
|
|
||
| server := &http.Server{ | ||
|
Member
There was a problem hiding this comment. 🚫 [golangci] reported by reviewdog 🐶 |
||
| Addr: listenAddr, | ||
| Handler: mux, | ||
| } | ||
|
|
||
| err = server.ListenAndServe() | ||
|
|
||
| if err != nil { | ||
| log.Error().Err(err).Msg("error from http server") | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,16 +2,26 @@ package embeddy | |
|
|
||
| import ( | ||
| "embed" | ||
| "fmt" | ||
| "io/fs" | ||
| ) | ||
|
|
||
| //go:embed public | ||
| var publicDir embed.FS | ||
|
|
||
| // DistDirFS contains the embedded public directory files (without the "public" prefix) | ||
| var DistDirFS = MustSubFS(publicDir, "public") | ||
|
|
||
| func GetNextFS() embed.FS { | ||
| return publicDir | ||
| } | ||
|
|
||
| // MustSubFS returns an fs.FS corresponding to the subtree rooted at dir. | ||
| // It panics if there's an error. | ||
| func MustSubFS(fsys fs.FS, dir string) fs.FS { | ||
| sub, err := fs.Sub(fsys, dir) | ||
| if err != nil { | ||
| panic(fmt.Errorf("failed to create sub FS: %w", err)) | ||
| } | ||
| return sub | ||
|
Member
There was a problem hiding this comment. 🚫 [golangci] reported by reviewdog 🐶 |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [golangci] reported by reviewdog 🐶
pocketbase.Config is missing fields HideStartBanner, DefaultDev, DefaultEncryptionEnv, DefaultQueryTimeout, DataMaxOpenConns, DataMaxIdleConns, AuxMaxOpenConns, AuxMaxIdleConns, DBConnect (exhaustruct)