mirror of
https://github.com/safedep/pmg.git
synced 2026-08-03 07:24:09 +02:00
Add support for package executors and support for PTY handling (#100)
* define contract for package executors * introduce npx executor * add npx and pnpx cmd support * fix typo * rm PackageExecutor and depend on PackageManager interface * add support for PTY to handle parent-child process interaction * refactor PTY handling in proxy flow * enforce interactiveSession interface check * close reader explicitly and clean npm version for pkg executors * rm interaction from interceptors * add docs and wait for outputRouter before exit * add support for non interactive TTY for proxy mode * add support for CI env var check for non interactive tty proxy mode * update readme to include npx, pnpx support * Update internal/flows/proxy_flow.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Sahil Bansal <bansalsahil315@gmail.com> * update ptyx lib * fix docs typo --------- Signed-off-by: Sahil Bansal <bansalsahil315@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
@@ -0,0 +1,59 @@
|
||||
package executors
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/safedep/pmg/config"
|
||||
"github.com/safedep/pmg/internal/analytics"
|
||||
"github.com/safedep/pmg/internal/flows"
|
||||
"github.com/safedep/pmg/internal/ui"
|
||||
"github.com/safedep/pmg/packagemanager"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
func NewNpxCommand() *cobra.Command {
|
||||
return &cobra.Command{
|
||||
Use: "npx [package] [action]",
|
||||
Short: "Guard npx package executor",
|
||||
DisableFlagParsing: true,
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
err := executeNpxFlow(cmd.Context(), args)
|
||||
if err != nil {
|
||||
ui.ErrorExit(err)
|
||||
}
|
||||
|
||||
return nil
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func executeNpxFlow(ctx context.Context, args []string) error {
|
||||
analytics.TrackCommandNpx()
|
||||
packageExecutor, err := packagemanager.NewNpmPackageExecutor(packagemanager.DefaultNpxPackageExecutorConfig())
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create npx package executor proxy: %w", err)
|
||||
}
|
||||
|
||||
config := config.Get()
|
||||
parsedCommand, err := packageExecutor.ParseCommand(args)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to parse command: %w", err)
|
||||
}
|
||||
|
||||
packageResolverConfig := packagemanager.NewDefaultNpmDependencyResolverConfig()
|
||||
packageResolverConfig.IncludeTransitiveDependencies = config.Config.Transitive
|
||||
packageResolverConfig.TransitiveDepth = config.Config.TransitiveDepth
|
||||
packageResolverConfig.IncludeDevDependencies = config.Config.IncludeDevDependencies
|
||||
|
||||
packageResolver, err := packagemanager.NewNpmDependencyResolver(packageResolverConfig)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create dependency resolver: %w", err)
|
||||
}
|
||||
|
||||
if config.Config.ExperimentalProxyMode {
|
||||
return flows.ProxyFlow(packageExecutor, packageResolver).Run(ctx, args, parsedCommand)
|
||||
}
|
||||
|
||||
return flows.Common(packageExecutor, packageResolver).Run(ctx, args, parsedCommand)
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
package executors
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/safedep/pmg/config"
|
||||
"github.com/safedep/pmg/internal/analytics"
|
||||
"github.com/safedep/pmg/internal/flows"
|
||||
"github.com/safedep/pmg/internal/ui"
|
||||
"github.com/safedep/pmg/packagemanager"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
func NewPnpxCommand() *cobra.Command {
|
||||
return &cobra.Command{
|
||||
Use: "pnpx [package] [action]",
|
||||
Short: "Guard pnpx package executor",
|
||||
DisableFlagParsing: true,
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
err := executePnpxFlow(cmd.Context(), args)
|
||||
if err != nil {
|
||||
ui.ErrorExit(err)
|
||||
}
|
||||
|
||||
return nil
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func executePnpxFlow(ctx context.Context, args []string) error {
|
||||
analytics.TrackCommandPnpx()
|
||||
packageExecutor, err := packagemanager.NewNpmPackageExecutor(packagemanager.DefaultPnpxPackageExecutorConfig())
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create pnpx package executor proxy: %w", err)
|
||||
}
|
||||
|
||||
config := config.Get()
|
||||
parsedCommand, err := packageExecutor.ParseCommand(args)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to parse command: %w", err)
|
||||
}
|
||||
|
||||
packageResolverConfig := packagemanager.NewDefaultNpmDependencyResolverConfig()
|
||||
packageResolverConfig.IncludeTransitiveDependencies = config.Config.Transitive
|
||||
packageResolverConfig.TransitiveDepth = config.Config.TransitiveDepth
|
||||
packageResolverConfig.IncludeDevDependencies = config.Config.IncludeDevDependencies
|
||||
|
||||
packageResolver, err := packagemanager.NewNpmDependencyResolver(packageResolverConfig)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create dependency resolver: %w", err)
|
||||
}
|
||||
|
||||
if config.Config.ExperimentalProxyMode {
|
||||
return flows.ProxyFlow(packageExecutor, packageResolver).Run(ctx, args, parsedCommand)
|
||||
}
|
||||
|
||||
return flows.Common(packageExecutor, packageResolver).Run(ctx, args, parsedCommand)
|
||||
}
|
||||
Reference in New Issue
Block a user