Fix package defaults and timeout handling

Author: AndroidPoet

cmd/playconsole-cli/commands/apps/apps.go

@@ -71,7 +71,8 @@ func runList(cmd *cobra.Command, args []string) error {
 }
 
 func fetchApps() ([]AppInfo, error) {
-	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(context.Background(), cli.ResolveTimeout(60*time.Second))
+	defer cancel()
 
 	// Get credentials
 	creds, err := config.GetCredentials()

cmd/playconsole-cli/commands/root.go

@@ -62,7 +62,11 @@ Design Philosophy:
 		// Sync flags to cli package
 		cli.SetPackageName(packageName)
 		cli.SetProfile(profile)
-		cli.SetTimeout(timeout)
+		if cmd.Flags().Changed("timeout") || os.Getenv("GPC_TIMEOUT") != "" {
+			cli.SetTimeout(timeout)
+		} else {
+			cli.SetTimeout("")
+		}
 		cli.SetDryRun(dryRun)
 
 		// Initialize config

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/viper v1.21.0
 	golang.org/x/oauth2 v0.35.0
+	golang.org/x/term v0.39.0
 	google.golang.org/api v0.267.0
 	gopkg.in/yaml.v3 v3.0.1
 )

go.sum

@@ -92,6 +92,8 @@ golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
 golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
 golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
+golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
 golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
 golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=

internal/api/client.go

@@ -10,6 +10,7 @@ import (
 	"google.golang.org/api/androidpublisher/v3"
 	"google.golang.org/api/option"
 
+	"github.com/AndroidPoet/playconsole-cli/internal/cli"
 	"github.com/AndroidPoet/playconsole-cli/internal/config"
 )
 
@@ -28,12 +29,19 @@ type debugTransport struct {
 
 func (t *debugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	fmt.Printf("DEBUG: %s %s\n", req.Method, req.URL)
-	return t.base.RoundTrip(req)
+	resp, err := t.base.RoundTrip(req)
+	if err != nil {
+		fmt.Printf("DEBUG: request failed: %v\n", err)
+		return nil, err
+	}
+	fmt.Printf("DEBUG: response %s\n", resp.Status)
+	return resp, nil
 }
 
 // NewClient creates a new API client
 func NewClient(packageName string, timeout time.Duration) (*Client, error) {
 	ctx := context.Background()
+	timeout = cli.ResolveTimeout(timeout)
 
 	// Get credentials
 	creds, err := config.GetCredentials()
@@ -151,10 +159,10 @@ func (c *Client) SystemAPKs() *androidpublisher.SystemapksService {
 
 // Edit represents an active edit session
 type Edit struct {
-	client  *Client
-	editID  string
-	ctx     context.Context
-	cancel  context.CancelFunc
+	client *Client
+	editID string
+	ctx    context.Context
+	cancel context.CancelFunc
 }
 
 // CreateEdit creates a new edit session

internal/api/enablement.go

@@ -8,6 +8,8 @@ import (
 	"regexp"
 	"runtime"
 	"strings"
+
+	"golang.org/x/term"
 )
 
 // APIEnablementError represents an error when an API needs to be enabled
@@ -73,6 +75,14 @@ func ParseAPIEnablementError(err error) *APIEnablementError {
 
 // HandleAPIEnablement provides an interactive flow to enable a required API
 func HandleAPIEnablement(apiErr *APIEnablementError) error {
+	if !isInteractiveSession() {
+		return fmt.Errorf(
+			"API '%s' must be enabled before retrying. Enable it here: %s",
+			apiErr.APITitle,
+			apiErr.ActivationURL,
+		)
+	}
+
 	fmt.Println()
 	fmt.Println("╔══════════════════════════════════════════════════════════════════╗")
 	fmt.Println("║                     API ENABLEMENT REQUIRED                       ║")
@@ -134,6 +144,10 @@ func HandleAPIEnablement(apiErr *APIEnablementError) error {
 	}
 }
 
+func isInteractiveSession() bool {
+	return term.IsTerminal(int(os.Stdin.Fd())) && term.IsTerminal(int(os.Stdout.Fd()))
+}
+
 func waitForEnablement() error {
 	fmt.Println()
 	fmt.Println("After enabling the API in Google Cloud Console:")
@@ -194,8 +208,8 @@ func copyToClipboard(text string) error {
 
 // RequiredAPIs lists all APIs that might be needed by the CLI
 var RequiredAPIs = map[string]string{
-	"androidpublisher.googleapis.com":        "Google Play Android Developer API",
-	"playdeveloperreporting.googleapis.com":  "Google Play Developer Reporting API",
+	"androidpublisher.googleapis.com":       "Google Play Android Developer API",
+	"playdeveloperreporting.googleapis.com": "Google Play Developer Reporting API",
 }
 
 // CheckAndEnableAPI wraps an API call and handles enablement if needed

internal/api/enablement_test.go

@@ -0,0 +1,26 @@
+package api
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestHandleAPIEnablementReturnsURLWhenNonInteractive(t *testing.T) {
+	apiErr := &APIEnablementError{
+		APITitle:      "Google Play Android Developer API",
+		ActivationURL: "https://console.cloud.google.com/apis/api/androidpublisher.googleapis.com/overview?project=123456",
+	}
+
+	err := HandleAPIEnablement(apiErr)
+	if err == nil {
+		t.Fatal("expected non-interactive enablement error")
+	}
+
+	message := err.Error()
+	if !strings.Contains(message, apiErr.APITitle) {
+		t.Fatalf("expected API title in error, got %q", message)
+	}
+	if !strings.Contains(message, apiErr.ActivationURL) {
+		t.Fatalf("expected activation URL in error, got %q", message)
+	}
+}

internal/api/reporting.go

@@ -9,6 +9,7 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/playdeveloperreporting/v1beta1"
 
+	"github.com/AndroidPoet/playconsole-cli/internal/cli"
 	"github.com/AndroidPoet/playconsole-cli/internal/config"
 )
 
@@ -22,6 +23,7 @@ type ReportingClient struct {
 // NewReportingClient creates a new Reporting API client
 func NewReportingClient(packageName string, timeout time.Duration) (*ReportingClient, error) {
 	ctx := context.Background()
+	timeout = cli.ResolveTimeout(timeout)
 
 	// Get credentials
 	creds, err := config.GetCredentials()

internal/cli/shared.go

@@ -2,9 +2,12 @@ package cli
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+
+	"github.com/AndroidPoet/playconsole-cli/internal/config"
 )
 
 var (
@@ -39,7 +42,13 @@ func GetPackageName() string {
 	if packageName != "" {
 		return packageName
 	}
-	return viper.GetString("package")
+	if pkg := viper.GetString("package"); pkg != "" {
+		return pkg
+	}
+	if profile := config.GetProfile(); profile != nil {
+		return profile.DefaultPackage
+	}
+	return ""
 }
 
 // GetProfile returns the profile name from flag, env, or config
@@ -66,6 +75,20 @@ func GetTimeout() string {
 	return t
 }
 
+// ResolveTimeout returns an explicit user timeout when present, otherwise fallback.
+func ResolveTimeout(fallback time.Duration) time.Duration {
+	if timeout == "" {
+		return fallback
+	}
+
+	parsed, err := time.ParseDuration(timeout)
+	if err != nil || parsed <= 0 {
+		return fallback
+	}
+
+	return parsed
+}
+
 // IsDryRun returns whether dry-run mode is enabled
 func IsDryRun() bool {
 	return dryRun

internal/cli/shared_test.go

@@ -0,0 +1,73 @@
+package cli
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"github.com/spf13/viper"
+
+	"github.com/AndroidPoet/playconsole-cli/internal/config"
+)
+
+func TestGetPackageNameFallsBackToProfileDefault(t *testing.T) {
+	previousPackageName := packageName
+	previousTimeout := timeout
+	packageName = ""
+	timeout = ""
+	viper.Set("package", "")
+	t.Cleanup(func() {
+		packageName = previousPackageName
+		timeout = previousTimeout
+		viper.Set("package", "")
+	})
+
+	configFile := filepath.Join(t.TempDir(), "config.json")
+	configJSON := `{
+  "default_profile": "default",
+  "profiles": {
+    "default": {
+      "name": "default",
+      "credentials_path": "/tmp/creds.json",
+      "default_package": "com.example.profile"
+    }
+  }
+}`
+	if err := os.WriteFile(configFile, []byte(configJSON), 0o600); err != nil {
+		t.Fatalf("WriteFile returned error: %v", err)
+	}
+
+	if err := config.Init(configFile, ""); err != nil {
+		t.Fatalf("Init returned error: %v", err)
+	}
+
+	if got := GetPackageName(); got != "com.example.profile" {
+		t.Fatalf("expected default package from profile, got %q", got)
+	}
+}
+
+func TestResolveTimeoutUsesFallbackWithoutExplicitOverride(t *testing.T) {
+	previousTimeout := timeout
+	timeout = ""
+	t.Cleanup(func() {
+		timeout = previousTimeout
+	})
+
+	fallback := 5 * time.Minute
+	if got := ResolveTimeout(fallback); got != fallback {
+		t.Fatalf("expected fallback timeout %s, got %s", fallback, got)
+	}
+}
+
+func TestResolveTimeoutUsesExplicitOverride(t *testing.T) {
+	previousTimeout := timeout
+	timeout = "90s"
+	t.Cleanup(func() {
+		timeout = previousTimeout
+	})
+
+	if got := ResolveTimeout(5 * time.Minute); got != 90*time.Second {
+		t.Fatalf("expected explicit timeout override, got %s", got)
+	}
+}