Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allows server to serve binaries for download #80

Merged
merged 2 commits into from
Mar 8, 2024
Merged

allows server to serve binaries for download #80

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77b1c55
allows server to serve binaries for download
jordan-rash Mar 8, 2024
cdf3425
thanks ci
jordan-rash Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions natster-io/public/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ get_version() {
command curl -L -s \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
https://api.github.com/repos/synadia-labs/natster/releases/latest |
https://natster.io/dl/latest |
command jq -r '.name'
)
}
Expand Down Expand Up @@ -89,16 +89,20 @@ echo "
os=$(get_os)
arch=$(get_arch)
binary_version=$(get_version)
file_name="nex_${binary_version}_${os}_${arch}"
asset_uri="https://github.com/synadia-labs/natster/releases/download/${binary_version}/${file_name}"
# file_name="natster_${binary_version}_${os}_${arch}"
# asset_uri="https://github.com/synadia-labs/natster/releases/download/${binary_version}/${file_name}"
file_name="natster"
asset_uri="https://natster.io/dl/natster_${os}_${arch}/${file_name}"

downloadFolder="${TMPDIR:-/tmp}"
mkdir -p ${downloadFolder}
downloadFolder="${TMPDIR:-/tmp}/natster_installer"
executable_folder="${HOME}/.natster/bin"
downloaded_file="${downloadFolder}/natster"
executable_folder="/usr/local/bin"

mkdir -p ${downloadFolder}
mkdir -p ${executable_folder}

echo "[1/3] Download ${asset_uri} to ${downloadFolder}"
rm -f ${downloaded_file}
rm -f ${downloadedFolder}
curl --silent --fail --location --output "${downloaded_file}" "${asset_uri}"

echo "[2/3] Install natster to ${executable_folder}"
Expand Down
34 changes: 32 additions & 2 deletions natster-io/server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ var static embed.FS
type Options struct {
servePort int
serveHost string

binDir string
logging bool
}

var (
Expand All @@ -37,6 +40,8 @@ func main() {
serve := natsterServer.Command("serve", "Serve webapp")
serve.Flag("host", "Host to serve on").StringVar(&Opts.serveHost)
serve.Flag("port", "Port to listen on").Default("8080").IntVar(&Opts.servePort)
serve.Flag("binDir", "Directory holding natster binaries").Default("/tmp/natster_binaries/").StringVar(&Opts.binDir)
serve.Flag("withLogging", "Logs web request").Default("false").UnNegatableBoolVar(&Opts.logging)
serve.Action(func(_ *fisk.ParseContext) error {
return RunServer()
})
Expand All @@ -45,13 +50,38 @@ func main() {
}

func RunServer() error {
muxer := http.NewServeMux()

info, err := os.Stat(Opts.binDir)
if err != nil {
fmt.Println("WARN no bin dir, not serving")
} else {
if info.IsDir() {
binServe := http.FileServer(http.Dir(Opts.binDir))
muxer.Handle("/dl/", http.StripPrefix("/dl", binServe))
} else {
fmt.Println("WARN user did not provide directory, not serving")
}
}

var staticFS = fs.FS(static)
htmlContent, err := fs.Sub(staticFS, "dist")
if err != nil {
log.Fatal(err)
}
fs := http.FileServer(http.FS(htmlContent))
muxer.Handle("/", http.FileServer(http.FS(htmlContent)))

fmt.Printf("Server started %s:%d\n", Opts.serveHost, Opts.servePort)
return http.ListenAndServe(fmt.Sprintf("%s:%d", Opts.serveHost, Opts.servePort), fs)
if Opts.logging {
return http.ListenAndServe(fmt.Sprintf("%s:%d", Opts.serveHost, Opts.servePort), logger(muxer))
} else {
return http.ListenAndServe(fmt.Sprintf("%s:%d", Opts.serveHost, Opts.servePort), muxer)
}
}

func logger(handler http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
fmt.Printf("Host: %s | Path: %s | Query: %s\n", r.Host, r.URL.Path, r.URL.RawQuery)
handler.ServeHTTP(w, r)
})
}
Loading