Skip to content

fix: download compressed function from local api #3709

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

Merged
sweatybridge merged 3 commits into from
Jun 12, 2025
Merged

fix: download compressed function from local api #3709

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fee8fc
fix: download compressed function from local api
sweatybridge Jun 12, 2025
ae31f6d
chore: bump api spec
sweatybridge Jun 12, 2025
f919e84
Merge branch 'develop' into encoding
sweatybridge Jun 12, 2025
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
21 changes: 15 additions & 6 deletions internal/functions/download/download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ import (
"os/exec"
"path"
"path/filepath"
"strings"

"github.com/andybalholm/brotli"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network"
"github.com/go-errors/errors"
"github.com/spf13/afero"
"github.com/spf13/viper"
"github.com/supabase/cli/internal/utils"
"github.com/supabase/cli/internal/utils/flags"
"github.com/supabase/cli/pkg/api"
Expand Down Expand Up @@ -121,11 +124,13 @@ func Run(ctx context.Context, slug string, projectRef string, useLegacyBundle bo
if err != nil {
return err
}
defer func() {
if err := fsys.Remove(eszipPath); err != nil {
fmt.Fprintln(os.Stderr, err)
}
}()
if !viper.GetBool("DEBUG") {
defer func() {
if err := fsys.Remove(eszipPath); err != nil {
fmt.Fprintln(os.Stderr, err)
}
}()
}
// Extract eszip to functions directory
err = extractOne(ctx, slug, eszipPath)
if err != nil {
Expand All @@ -148,12 +153,16 @@ func downloadOne(ctx context.Context, slug, projectRef string, fsys afero.Fs) (s
}
return "", errors.Errorf("Error status %d: %s", resp.StatusCode, string(body))
}
r := io.Reader(resp.Body)
if strings.EqualFold(resp.Header.Get("Content-Encoding"), "br") {
r = brotli.NewReader(resp.Body)
}
// Create temp file to store downloaded eszip
eszipPath := filepath.Join(utils.TempDir, fmt.Sprintf("output_%s.eszip", slug))
if err := utils.MkdirIfNotExistFS(fsys, utils.TempDir); err != nil {
return "", err
}
if err := afero.WriteReader(fsys, eszipPath, resp.Body); err != nil {
if err := afero.WriteReader(fsys, eszipPath, r); err != nil {
return "", errors.Errorf("failed to download file: %w", err)
}
return eszipPath, nil
Expand Down