diff --git a/cmd/skywire-services/commands/root.go b/cmd/skywire-services/commands/root.go new file mode 100644 index 00000000..69157ef5 --- /dev/null +++ b/cmd/skywire-services/commands/root.go @@ -0,0 +1,71 @@ +// Package commands cmd/skywire-services/commands/services.go +package commands + +import ( + "fmt" + "log" + "os" + "path/filepath" + "strings" + + "github.com/skycoin/skywire-utilities/pkg/buildinfo" + "github.com/spf13/cobra" + + ar "github.com/skycoin/skywire-services/cmd/address-resolver/commands" + confbs "github.com/skycoin/skywire-services/cmd/config-bootstrapper/commands" + kg "github.com/skycoin/skywire-services/cmd/keys-gen/commands" + nv "github.com/skycoin/skywire-services/cmd/node-visualizer/commands" + rf "github.com/skycoin/skywire-services/cmd/route-finder/commands" + se "github.com/skycoin/skywire-services/cmd/sw-env/commands" + tpd "github.com/skycoin/skywire-services/cmd/transport-discovery/commands" + tps "github.com/skycoin/skywire-services/cmd/transport-setup/commands" + ut "github.com/skycoin/skywire-services/cmd/uptime-tracker/commands" +) + +func init() { + RootCmd.AddCommand( + tpd.RootCmd, + tps.RootCmd, + ar.RootCmd, + rf.RootCmd, + confbs.RootCmd, + kg.RootCmd, + nv.RootCmd, + se.RootCmd, + ut.RootCmd, + ) + tpd.RootCmd.Use = "tpd" + tps.RootCmd.Use = "tps" + ar.RootCmd.Use = "ar" + rf.RootCmd.Use = "rf" + confbs.RootCmd.Use = "confbs" + kg.RootCmd.Use = "kg" + nv.RootCmd.Use = "nv" + se.RootCmd.Use = "se" + ut.RootCmd.Use = "ut" +} + +// RootCmd contains all subcommands +var RootCmd = &cobra.Command{ + Use: func() string { + return strings.Split(filepath.Base(strings.ReplaceAll(strings.ReplaceAll(fmt.Sprintf("%v", os.Args), "[", ""), "]", "")), " ")[0] + }(), + Short: "Skywire services", + Long: ` + ┌─┐┬┌─┬ ┬┬ ┬┬┬─┐┌─┐ ┌─┐┌─┐┬─┐┬ ┬┬┌─┐┌─┐┌─┐ + └─┐├┴┐└┬┘││││├┬┘├┤───└─┐├┤ ├┬┘└┐┌┘││ ├┤ └─┐ + └─┘┴ ┴ ┴ └┴┘┴┴└─└─┘ └─┘└─┘┴└─ └┘ ┴└─┘└─┘└─┘ + Skywire services`, + SilenceErrors: true, + SilenceUsage: true, + DisableSuggestions: true, + DisableFlagsInUseLine: true, + Version: buildinfo.Version(), +} + +// Execute executes root CLI command. +func Execute() { + if err := RootCmd.Execute(); err != nil { + log.Fatal("Failed to execute command: ", err) + } +} diff --git a/cmd/skywire-services/services.go b/cmd/skywire-services/services.go index 37142cce..3fc00013 100644 --- a/cmd/skywire-services/services.go +++ b/cmd/skywire-services/services.go @@ -2,79 +2,23 @@ package main import ( - "fmt" - "log" - "os" - "path/filepath" - "strings" - cc "github.com/ivanpirog/coloredcobra" - "github.com/skycoin/skywire-utilities/pkg/buildinfo" "github.com/spf13/cobra" - ar "github.com/skycoin/skywire-services/cmd/address-resolver/commands" - confbs "github.com/skycoin/skywire-services/cmd/config-bootstrapper/commands" - kg "github.com/skycoin/skywire-services/cmd/keys-gen/commands" - nv "github.com/skycoin/skywire-services/cmd/node-visualizer/commands" - rf "github.com/skycoin/skywire-services/cmd/route-finder/commands" - se "github.com/skycoin/skywire-services/cmd/sw-env/commands" - tpd "github.com/skycoin/skywire-services/cmd/transport-discovery/commands" - tps "github.com/skycoin/skywire-services/cmd/transport-setup/commands" - ut "github.com/skycoin/skywire-services/cmd/uptime-tracker/commands" + "github.com/skycoin/skywire-services/cmd/skywire-services/commands" ) func init() { - RootCmd.AddCommand( - tpd.RootCmd, - tps.RootCmd, - ar.RootCmd, - rf.RootCmd, - confbs.RootCmd, - kg.RootCmd, - nv.RootCmd, - se.RootCmd, - ut.RootCmd, - ) - tpd.RootCmd.Use = "tpd" - tps.RootCmd.Use = "tps" - ar.RootCmd.Use = "ar" - rf.RootCmd.Use = "rf" - confbs.RootCmd.Use = "confbs" - kg.RootCmd.Use = "kg" - nv.RootCmd.Use = "nv" - se.RootCmd.Use = "se" - ut.RootCmd.Use = "ut" - var helpflag bool - RootCmd.SetUsageTemplate(help) - RootCmd.PersistentFlags().BoolVarP(&helpflag, "help", "h", false, "help for skywire-services") - RootCmd.SetHelpCommand(&cobra.Command{Hidden: true}) - RootCmd.PersistentFlags().MarkHidden("help") //nolint - RootCmd.CompletionOptions.DisableDefaultCmd = true - -} - -// RootCmd contains all subcommands -var RootCmd = &cobra.Command{ - Use: func() string { - return strings.Split(filepath.Base(strings.ReplaceAll(strings.ReplaceAll(fmt.Sprintf("%v", os.Args), "[", ""), "]", "")), " ")[0] - }(), - Short: "Skywire services", - Long: ` - ┌─┐┬┌─┬ ┬┬ ┬┬┬─┐┌─┐ ┌─┐┌─┐┬─┐┬ ┬┬┌─┐┌─┐┌─┐ - └─┐├┴┐└┬┘││││├┬┘├┤───└─┐├┤ ├┬┘└┐┌┘││ ├┤ └─┐ - └─┘┴ ┴ ┴ └┴┘┴┴└─└─┘ └─┘└─┘┴└─ └┘ ┴└─┘└─┘└─┘ - Skywire services`, - SilenceErrors: true, - SilenceUsage: true, - DisableSuggestions: true, - DisableFlagsInUseLine: true, - Version: buildinfo.Version(), + commands.RootCmd.SetUsageTemplate(help) + commands.RootCmd.PersistentFlags().BoolVarP(&helpflag, "help", "h", false, "help menu") + commands.RootCmd.SetHelpCommand(&cobra.Command{Hidden: true}) + commands.RootCmd.PersistentFlags().MarkHidden("help") //nolint } func main() { cc.Init(&cc.Config{ - RootCmd: RootCmd, + RootCmd: commands.RootCmd, Headings: cc.HiBlue + cc.Bold, Commands: cc.HiBlue + cc.Bold, CmdShortDescr: cc.HiBlue, @@ -85,15 +29,12 @@ func main() { NoExtraNewlines: true, NoBottomNewline: true, }) - if err := RootCmd.Execute(); err != nil { - log.Fatal(err) - } + commands.Execute() } -const help = "Usage:\r\n" + - " {{.UseLine}}{{if .HasAvailableSubCommands}}{{end}} {{if gt (len .Aliases) 0}}\r\n\r\n" + - "{{.NameAndAliases}}{{end}}{{if .HasAvailableSubCommands}}\r\n\r\n" + - "Available Commands:{{range .Commands}}{{if (or .IsAvailableCommand)}}\r\n " + +const help = "{{if .HasAvailableSubCommands}}{{end}} {{if gt (len .Aliases) 0}}\r\n\r\n" + + "{{.NameAndAliases}}{{end}}{{if .HasAvailableSubCommands}}" + + "Available Commands:{{range .Commands}} {{if and (ne .Name \"completion\") .IsAvailableCommand}}\r\n " + "{{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{if .HasAvailableLocalFlags}}\r\n\r\n" + "Flags:\r\n" + "{{.LocalFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}{{if .HasAvailableInheritedFlags}}\r\n\r\n" + diff --git a/docs/skywire-services-goda-graph.svg b/docs/skywire-services-goda-graph.svg index 41881c7d..fcb01cff 100644 --- a/docs/skywire-services-goda-graph.svg +++ b/docs/skywire-services-goda-graph.svg @@ -4,18 +4,18 @@ - - + + G - + github.com/skycoin/skywire-services - -github.com/skycoin/skywire-services -5 / 115B + +github.com/skycoin/skywire-services +5 / 115B @@ -23,83 +23,83 @@ github.com/skycoin/skywire-services/cmd/address-resolver - -github.com/skycoin/skywire-services/cmd/address-resolver -36 / 1.4KB + +github.com/skycoin/skywire-services/cmd/address-resolver +36 / 1.4KB github.com/skycoin/skywire-services/cmd/address-resolver/commands - - -github.com/skycoin/skywire-services/cmd/address-resolver/commands -218 / 8.3KB + + +github.com/skycoin/skywire-services/cmd/address-resolver/commands +190 / 7.0KB github.com/skycoin/skywire-services/cmd/address-resolver:e->github.com/skycoin/skywire-services/cmd/address-resolver/commands - - + + - + github.com/skycoin/skywire-services/internal/armetrics - - -github.com/skycoin/skywire-services/internal/armetrics -33 / 1.0KB + + +github.com/skycoin/skywire-services/internal/armetrics +33 / 1.0KB github.com/skycoin/skywire-services/cmd/address-resolver/commands:e->github.com/skycoin/skywire-services/internal/armetrics - - + + - + github.com/skycoin/skywire-services/pkg/address-resolver/api - - -github.com/skycoin/skywire-services/pkg/address-resolver/api -501 / 17.1KB + + +github.com/skycoin/skywire-services/pkg/address-resolver/api +501 / 17.1KB github.com/skycoin/skywire-services/cmd/address-resolver/commands:e->github.com/skycoin/skywire-services/pkg/address-resolver/api - - + + - + github.com/skycoin/skywire-services/pkg/address-resolver/store - - -github.com/skycoin/skywire-services/pkg/address-resolver/store -219 / 6.8KB + + +github.com/skycoin/skywire-services/pkg/address-resolver/store +219 / 6.8KB github.com/skycoin/skywire-services/cmd/address-resolver/commands:e->github.com/skycoin/skywire-services/pkg/address-resolver/store - - + + github.com/skycoin/skywire-services/cmd/config-bootstrapper - -github.com/skycoin/skywire-services/cmd/config-bootstrapper -38 / 1.5KB + +github.com/skycoin/skywire-services/cmd/config-bootstrapper +38 / 1.5KB @@ -107,41 +107,41 @@ github.com/skycoin/skywire-services/cmd/config-bootstrapper/commands - -github.com/skycoin/skywire-services/cmd/config-bootstrapper/commands -140 / 5.0KB + +github.com/skycoin/skywire-services/cmd/config-bootstrapper/commands +140 / 5.0KB github.com/skycoin/skywire-services/cmd/config-bootstrapper:e->github.com/skycoin/skywire-services/cmd/config-bootstrapper/commands - - + + - + github.com/skycoin/skywire-services/pkg/config-bootstrapper/api - - -github.com/skycoin/skywire-services/pkg/config-bootstrapper/api -176 / 5.8KB + + +github.com/skycoin/skywire-services/pkg/config-bootstrapper/api +176 / 5.8KB github.com/skycoin/skywire-services/cmd/config-bootstrapper/commands:e->github.com/skycoin/skywire-services/pkg/config-bootstrapper/api - - + + github.com/skycoin/skywire-services/cmd/keys-gen - -github.com/skycoin/skywire-services/cmd/keys-gen -38 / 1.5KB + +github.com/skycoin/skywire-services/cmd/keys-gen +38 / 1.5KB @@ -149,25 +149,25 @@ github.com/skycoin/skywire-services/cmd/keys-gen/commands - -github.com/skycoin/skywire-services/cmd/keys-gen/commands -39 / 1.2KB + +github.com/skycoin/skywire-services/cmd/keys-gen/commands +39 / 1.2KB github.com/skycoin/skywire-services/cmd/keys-gen:e->github.com/skycoin/skywire-services/cmd/keys-gen/commands - - + + github.com/skycoin/skywire-services/cmd/network-monitor - -github.com/skycoin/skywire-services/cmd/network-monitor -38 / 1.5KB + +github.com/skycoin/skywire-services/cmd/network-monitor +38 / 1.5KB @@ -175,73 +175,73 @@ github.com/skycoin/skywire-services/cmd/network-monitor/commands - -github.com/skycoin/skywire-services/cmd/network-monitor/commands -148 / 5.5KB + +github.com/skycoin/skywire-services/cmd/network-monitor/commands +148 / 5.5KB github.com/skycoin/skywire-services/cmd/network-monitor:e->github.com/skycoin/skywire-services/cmd/network-monitor/commands - - + + - + github.com/skycoin/skywire-services/internal/nmmetrics - - -github.com/skycoin/skywire-services/internal/nmmetrics -54 / 2.2KB + + +github.com/skycoin/skywire-services/internal/nmmetrics +54 / 2.2KB github.com/skycoin/skywire-services/cmd/network-monitor/commands:e->github.com/skycoin/skywire-services/internal/nmmetrics - - + + - + github.com/skycoin/skywire-services/pkg/network-monitor/api - - -github.com/skycoin/skywire-services/pkg/network-monitor/api -510 / 15.8KB + + +github.com/skycoin/skywire-services/pkg/network-monitor/api +510 / 15.8KB github.com/skycoin/skywire-services/cmd/network-monitor/commands:e->github.com/skycoin/skywire-services/pkg/network-monitor/api - - + + - + github.com/skycoin/skywire-services/pkg/network-monitor/store - - -github.com/skycoin/skywire-services/pkg/network-monitor/store -159 / 4.2KB + + +github.com/skycoin/skywire-services/pkg/network-monitor/store +159 / 4.2KB github.com/skycoin/skywire-services/cmd/network-monitor/commands:e->github.com/skycoin/skywire-services/pkg/network-monitor/store - - + + github.com/skycoin/skywire-services/cmd/node-visualizer - -github.com/skycoin/skywire-services/cmd/node-visualizer -38 / 1.5KB + +github.com/skycoin/skywire-services/cmd/node-visualizer +38 / 1.5KB @@ -249,99 +249,99 @@ github.com/skycoin/skywire-services/cmd/node-visualizer/commands - -github.com/skycoin/skywire-services/cmd/node-visualizer/commands -88 / 3.0KB + +github.com/skycoin/skywire-services/cmd/node-visualizer/commands +88 / 3.0KB github.com/skycoin/skywire-services/cmd/node-visualizer:e->github.com/skycoin/skywire-services/cmd/node-visualizer/commands - - + + - + github.com/skycoin/skywire-services/internal/tpdiscmetrics - - -github.com/skycoin/skywire-services/internal/tpdiscmetrics -61 / 2.0KB + + +github.com/skycoin/skywire-services/internal/tpdiscmetrics +61 / 2.0KB github.com/skycoin/skywire-services/cmd/node-visualizer/commands:e->github.com/skycoin/skywire-services/internal/tpdiscmetrics - - + + - + github.com/skycoin/skywire-services/pkg/node-visualizer/api - - -github.com/skycoin/skywire-services/pkg/node-visualizer/api -346 / 9.5KB + + +github.com/skycoin/skywire-services/pkg/node-visualizer/api +346 / 9.5KB github.com/skycoin/skywire-services/cmd/node-visualizer/commands:e->github.com/skycoin/skywire-services/pkg/node-visualizer/api - - + + github.com/skycoin/skywire-services/cmd/public-visor-monitor - -github.com/skycoin/skywire-services/cmd/public-visor-monitor -38 / 1.5KB + +github.com/skycoin/skywire-services/cmd/public-visor-monitor +38 / 1.5KB github.com/skycoin/skywire-services/cmd/public-visor-monitor/commands - - -github.com/skycoin/skywire-services/cmd/public-visor-monitor/commands -93 / 3.5KB + + +github.com/skycoin/skywire-services/cmd/public-visor-monitor/commands +93 / 3.4KB github.com/skycoin/skywire-services/cmd/public-visor-monitor:e->github.com/skycoin/skywire-services/cmd/public-visor-monitor/commands - - + + - + github.com/skycoin/skywire-services/pkg/public-visor-monitor/api - - -github.com/skycoin/skywire-services/pkg/public-visor-monitor/api -288 / 8.9KB + + +github.com/skycoin/skywire-services/pkg/public-visor-monitor/api +288 / 8.9KB github.com/skycoin/skywire-services/cmd/public-visor-monitor/commands:e->github.com/skycoin/skywire-services/pkg/public-visor-monitor/api - - + + github.com/skycoin/skywire-services/cmd/route-finder - -github.com/skycoin/skywire-services/cmd/route-finder -38 / 1.5KB + +github.com/skycoin/skywire-services/cmd/route-finder +38 / 1.5KB @@ -349,73 +349,73 @@ github.com/skycoin/skywire-services/cmd/route-finder/commands - -github.com/skycoin/skywire-services/cmd/route-finder/commands -164 / 6.0KB + +github.com/skycoin/skywire-services/cmd/route-finder/commands +164 / 6.0KB github.com/skycoin/skywire-services/cmd/route-finder:e->github.com/skycoin/skywire-services/cmd/route-finder/commands - - + + - + github.com/skycoin/skywire-services/internal/pg - - -github.com/skycoin/skywire-services/internal/pg -16 / 385B + + +github.com/skycoin/skywire-services/internal/pg +16 / 385B github.com/skycoin/skywire-services/cmd/route-finder/commands:e->github.com/skycoin/skywire-services/internal/pg - - + + - + github.com/skycoin/skywire-services/pkg/route-finder/api - - -github.com/skycoin/skywire-services/pkg/route-finder/api -164 / 5.2KB + + +github.com/skycoin/skywire-services/pkg/route-finder/api +164 / 5.2KB github.com/skycoin/skywire-services/cmd/route-finder/commands:e->github.com/skycoin/skywire-services/pkg/route-finder/api - - + + - + github.com/skycoin/skywire-services/pkg/transport-discovery/store - - -github.com/skycoin/skywire-services/pkg/transport-discovery/store -270 / 7.8KB + + +github.com/skycoin/skywire-services/pkg/transport-discovery/store +270 / 7.8KB github.com/skycoin/skywire-services/cmd/route-finder/commands:e->github.com/skycoin/skywire-services/pkg/transport-discovery/store - - + + github.com/skycoin/skywire-services/cmd/setup-node - -github.com/skycoin/skywire-services/cmd/setup-node -38 / 1.5KB + +github.com/skycoin/skywire-services/cmd/setup-node +38 / 1.5KB @@ -423,35 +423,35 @@ github.com/skycoin/skywire-services/cmd/skysocks-lite-client - -github.com/skycoin/skywire-services/cmd/skysocks-lite-client -110 / 3.5KB + +github.com/skycoin/skywire-services/cmd/skysocks-lite-client +110 / 3.5KB - + github.com/skycoin/skywire-services/internal/skysocks - - -github.com/skycoin/skywire-services/internal/skysocks -173 / 4.1KB + + +github.com/skycoin/skywire-services/internal/skysocks +173 / 4.1KB github.com/skycoin/skywire-services/cmd/skysocks-lite-client:e->github.com/skycoin/skywire-services/internal/skysocks - - + + github.com/skycoin/skywire-services/cmd/skysocks-monitor - -github.com/skycoin/skywire-services/cmd/skysocks-monitor -38 / 1.5KB + +github.com/skycoin/skywire-services/cmd/skysocks-monitor +38 / 1.5KB @@ -459,593 +459,615 @@ github.com/skycoin/skywire-services/cmd/skysocks-monitor/commands - -github.com/skycoin/skywire-services/cmd/skysocks-monitor/commands -86 / 3.1KB + +github.com/skycoin/skywire-services/cmd/skysocks-monitor/commands +86 / 3.1KB github.com/skycoin/skywire-services/cmd/skysocks-monitor:e->github.com/skycoin/skywire-services/cmd/skysocks-monitor/commands - - + + - + github.com/skycoin/skywire-services/pkg/skysocks-monitor/api - - -github.com/skycoin/skywire-services/pkg/skysocks-monitor/api -355 / 11.2KB + + +github.com/skycoin/skywire-services/pkg/skysocks-monitor/api +355 / 11.2KB github.com/skycoin/skywire-services/cmd/skysocks-monitor/commands:e->github.com/skycoin/skywire-services/pkg/skysocks-monitor/api - - + + github.com/skycoin/skywire-services/cmd/skywire-services - - -github.com/skycoin/skywire-services/cmd/skywire-services -87 / 3.2KB + + +github.com/skycoin/skywire-services/cmd/skywire-services +37 / 1.5KB + + + + + +github.com/skycoin/skywire-services/cmd/skywire-services/commands + + +github.com/skycoin/skywire-services/cmd/skywire-services/commands +65 / 2.2KB - + -github.com/skycoin/skywire-services/cmd/skywire-services:e->github.com/skycoin/skywire-services/cmd/address-resolver/commands - - +github.com/skycoin/skywire-services/cmd/skywire-services:e->github.com/skycoin/skywire-services/cmd/skywire-services/commands + + - + -github.com/skycoin/skywire-services/cmd/skywire-services:e->github.com/skycoin/skywire-services/cmd/config-bootstrapper/commands - - +github.com/skycoin/skywire-services/cmd/skywire-services/commands:e->github.com/skycoin/skywire-services/cmd/address-resolver/commands + + - + -github.com/skycoin/skywire-services/cmd/skywire-services:e->github.com/skycoin/skywire-services/cmd/keys-gen/commands - - +github.com/skycoin/skywire-services/cmd/skywire-services/commands:e->github.com/skycoin/skywire-services/cmd/config-bootstrapper/commands + + - + -github.com/skycoin/skywire-services/cmd/skywire-services:e->github.com/skycoin/skywire-services/cmd/node-visualizer/commands - - +github.com/skycoin/skywire-services/cmd/skywire-services/commands:e->github.com/skycoin/skywire-services/cmd/keys-gen/commands + + - + -github.com/skycoin/skywire-services/cmd/skywire-services:e->github.com/skycoin/skywire-services/cmd/route-finder/commands - - +github.com/skycoin/skywire-services/cmd/skywire-services/commands:e->github.com/skycoin/skywire-services/cmd/node-visualizer/commands + + + + + +github.com/skycoin/skywire-services/cmd/skywire-services/commands:e->github.com/skycoin/skywire-services/cmd/route-finder/commands + + - + github.com/skycoin/skywire-services/cmd/sw-env/commands - - -github.com/skycoin/skywire-services/cmd/sw-env/commands -82 / 2.5KB + + +github.com/skycoin/skywire-services/cmd/sw-env/commands +82 / 2.5KB - - -github.com/skycoin/skywire-services/cmd/skywire-services:e->github.com/skycoin/skywire-services/cmd/sw-env/commands - - + + +github.com/skycoin/skywire-services/cmd/skywire-services/commands:e->github.com/skycoin/skywire-services/cmd/sw-env/commands + + - + github.com/skycoin/skywire-services/cmd/transport-discovery/commands - - -github.com/skycoin/skywire-services/cmd/transport-discovery/commands -212 / 8.0KB + + +github.com/skycoin/skywire-services/cmd/transport-discovery/commands +212 / 8.0KB - - -github.com/skycoin/skywire-services/cmd/skywire-services:e->github.com/skycoin/skywire-services/cmd/transport-discovery/commands - - + + +github.com/skycoin/skywire-services/cmd/skywire-services/commands:e->github.com/skycoin/skywire-services/cmd/transport-discovery/commands + + - + github.com/skycoin/skywire-services/cmd/transport-setup/commands - - -github.com/skycoin/skywire-services/cmd/transport-setup/commands -209 / 6.8KB + + +github.com/skycoin/skywire-services/cmd/transport-setup/commands +209 / 6.9KB - - -github.com/skycoin/skywire-services/cmd/skywire-services:e->github.com/skycoin/skywire-services/cmd/transport-setup/commands - - + + +github.com/skycoin/skywire-services/cmd/skywire-services/commands:e->github.com/skycoin/skywire-services/cmd/transport-setup/commands + + + + + +github.com/skycoin/skywire-services/cmd/uptime-tracker/commands + + +github.com/skycoin/skywire-services/cmd/uptime-tracker/commands +197 / 7.5KB + + + + + +github.com/skycoin/skywire-services/cmd/skywire-services/commands:e->github.com/skycoin/skywire-services/cmd/uptime-tracker/commands + + - + github.com/skycoin/skywire-services/cmd/sw-env - - -github.com/skycoin/skywire-services/cmd/sw-env -38 / 1.5KB + + +github.com/skycoin/skywire-services/cmd/sw-env +38 / 1.5KB - + github.com/skycoin/skywire-services/cmd/sw-env:e->github.com/skycoin/skywire-services/cmd/sw-env/commands - - + + - + github.com/skycoin/skywire-services/internal/config - - -github.com/skycoin/skywire-services/internal/config -509 / 19.0KB + + +github.com/skycoin/skywire-services/internal/config +509 / 19.0KB - + github.com/skycoin/skywire-services/cmd/sw-env/commands:e->github.com/skycoin/skywire-services/internal/config - - + + - + github.com/skycoin/skywire-services/cmd/tpd-monitor - - -github.com/skycoin/skywire-services/cmd/tpd-monitor -38 / 1.5KB + + +github.com/skycoin/skywire-services/cmd/tpd-monitor +38 / 1.5KB - + github.com/skycoin/skywire-services/cmd/tpd-monitor/commands - - -github.com/skycoin/skywire-services/cmd/tpd-monitor/commands -105 / 3.8KB + + +github.com/skycoin/skywire-services/cmd/tpd-monitor/commands +105 / 3.8KB - + github.com/skycoin/skywire-services/cmd/tpd-monitor:e->github.com/skycoin/skywire-services/cmd/tpd-monitor/commands - - + + - + github.com/skycoin/skywire-services/pkg/tpd-monitor/api - - -github.com/skycoin/skywire-services/pkg/tpd-monitor/api -370 / 10.8KB + + +github.com/skycoin/skywire-services/pkg/tpd-monitor/api +370 / 10.8KB - + github.com/skycoin/skywire-services/cmd/tpd-monitor/commands:e->github.com/skycoin/skywire-services/pkg/tpd-monitor/api - - + + - + github.com/skycoin/skywire-services/cmd/transport-discovery - - -github.com/skycoin/skywire-services/cmd/transport-discovery -38 / 1.5KB + + +github.com/skycoin/skywire-services/cmd/transport-discovery +38 / 1.5KB - + github.com/skycoin/skywire-services/cmd/transport-discovery:e->github.com/skycoin/skywire-services/cmd/transport-discovery/commands - - + + - + github.com/skycoin/skywire-services/cmd/transport-discovery/commands:e->github.com/skycoin/skywire-services/internal/pg - - + + - + github.com/skycoin/skywire-services/cmd/transport-discovery/commands:e->github.com/skycoin/skywire-services/internal/tpdiscmetrics - - + + - + github.com/skycoin/skywire-services/pkg/transport-discovery/api - - -github.com/skycoin/skywire-services/pkg/transport-discovery/api -362 / 12.2KB + + +github.com/skycoin/skywire-services/pkg/transport-discovery/api +362 / 12.2KB - + github.com/skycoin/skywire-services/cmd/transport-discovery/commands:e->github.com/skycoin/skywire-services/pkg/transport-discovery/api - - + + - + github.com/skycoin/skywire-services/cmd/transport-discovery/commands:e->github.com/skycoin/skywire-services/pkg/transport-discovery/store - - + + - + github.com/skycoin/skywire-services/cmd/transport-setup - - -github.com/skycoin/skywire-services/cmd/transport-setup -38 / 1.5KB + + +github.com/skycoin/skywire-services/cmd/transport-setup +38 / 1.5KB - + github.com/skycoin/skywire-services/cmd/transport-setup:e->github.com/skycoin/skywire-services/cmd/transport-setup/commands - - + + - + github.com/skycoin/skywire-services/pkg/transport-setup/api - - -github.com/skycoin/skywire-services/pkg/transport-setup/api -188 / 6.1KB + + +github.com/skycoin/skywire-services/pkg/transport-setup/api +188 / 6.1KB - + github.com/skycoin/skywire-services/cmd/transport-setup/commands:e->github.com/skycoin/skywire-services/pkg/transport-setup/api - - + + - + github.com/skycoin/skywire-services/pkg/transport-setup/config - - -github.com/skycoin/skywire-services/pkg/transport-setup/config -34 / 1.0KB + + +github.com/skycoin/skywire-services/pkg/transport-setup/config +34 / 1.0KB - + github.com/skycoin/skywire-services/cmd/transport-setup/commands:e->github.com/skycoin/skywire-services/pkg/transport-setup/config - - + + - -github.com/skycoin/skywire-services/cmd/uptime-tracker - - -github.com/skycoin/skywire-services/cmd/uptime-tracker -38 / 1.5KB - - - - -github.com/skycoin/skywire-services/cmd/uptime-tracker/commands - - -github.com/skycoin/skywire-services/cmd/uptime-tracker/commands -197 / 7.3KB +github.com/skycoin/skywire-services/cmd/uptime-tracker + + +github.com/skycoin/skywire-services/cmd/uptime-tracker +38 / 1.5KB - + github.com/skycoin/skywire-services/cmd/uptime-tracker:e->github.com/skycoin/skywire-services/cmd/uptime-tracker/commands - - + + - + github.com/skycoin/skywire-services/cmd/uptime-tracker/commands:e->github.com/skycoin/skywire-services/internal/pg - - + + - + github.com/skycoin/skywire-services/internal/utmetrics - - -github.com/skycoin/skywire-services/internal/utmetrics -33 / 1.0KB + + +github.com/skycoin/skywire-services/internal/utmetrics +33 / 1.0KB - + github.com/skycoin/skywire-services/cmd/uptime-tracker/commands:e->github.com/skycoin/skywire-services/internal/utmetrics - - + + - + github.com/skycoin/skywire-services/pkg/uptime-tracker/api - - -github.com/skycoin/skywire-services/pkg/uptime-tracker/api -653 / 21.1KB + + +github.com/skycoin/skywire-services/pkg/uptime-tracker/api +653 / 21.1KB - + github.com/skycoin/skywire-services/cmd/uptime-tracker/commands:e->github.com/skycoin/skywire-services/pkg/uptime-tracker/api - - + + - + github.com/skycoin/skywire-services/pkg/uptime-tracker/store - - -github.com/skycoin/skywire-services/pkg/uptime-tracker/store -601 / 20.3KB + + +github.com/skycoin/skywire-services/pkg/uptime-tracker/store +601 / 20.3KB - + github.com/skycoin/skywire-services/cmd/uptime-tracker/commands:e->github.com/skycoin/skywire-services/pkg/uptime-tracker/store - - + + - + github.com/skycoin/skywire-services/cmd/visor-map/commands - - -github.com/skycoin/skywire-services/cmd/visor-map/commands -128 / 4.0KB + + +github.com/skycoin/skywire-services/cmd/visor-map/commands +128 / 4.0KB - + github.com/skycoin/skywire-services/cmd/vpn-lite-client - - -github.com/skycoin/skywire-services/cmd/vpn-lite-client -68 / 2.0KB + + +github.com/skycoin/skywire-services/cmd/vpn-lite-client +68 / 2.0KB - + github.com/skycoin/skywire-services/internal/vpn - - -github.com/skycoin/skywire-services/internal/vpn -502 / 14.8KB + + +github.com/skycoin/skywire-services/internal/vpn +502 / 14.8KB - + github.com/skycoin/skywire-services/cmd/vpn-lite-client:e->github.com/skycoin/skywire-services/internal/vpn - - + + - + github.com/skycoin/skywire-services/cmd/vpn-monitor - - -github.com/skycoin/skywire-services/cmd/vpn-monitor -38 / 1.5KB + + +github.com/skycoin/skywire-services/cmd/vpn-monitor +38 / 1.5KB - + github.com/skycoin/skywire-services/cmd/vpn-monitor/commands - - -github.com/skycoin/skywire-services/cmd/vpn-monitor/commands -86 / 3.0KB + + +github.com/skycoin/skywire-services/cmd/vpn-monitor/commands +86 / 3.0KB - + github.com/skycoin/skywire-services/cmd/vpn-monitor:e->github.com/skycoin/skywire-services/cmd/vpn-monitor/commands - - + + - + github.com/skycoin/skywire-services/pkg/vpn-monitor/api - - -github.com/skycoin/skywire-services/pkg/vpn-monitor/api -358 / 10.9KB + + +github.com/skycoin/skywire-services/pkg/vpn-monitor/api +358 / 10.9KB - + github.com/skycoin/skywire-services/cmd/vpn-monitor/commands:e->github.com/skycoin/skywire-services/pkg/vpn-monitor/api - - + + - + github.com/skycoin/skywire-services/internal/integration - - -github.com/skycoin/skywire-services/internal/integration -0 / 0B + + +github.com/skycoin/skywire-services/internal/integration +0 / 0B - + github.com/skycoin/skywire-services/internal/lc - - -github.com/skycoin/skywire-services/internal/lc -18 / 0.7KB + + +github.com/skycoin/skywire-services/internal/lc +18 / 0.7KB - + github.com/skycoin/skywire-services/internal/nm - - -github.com/skycoin/skywire-services/internal/nm -12 / 314B + + +github.com/skycoin/skywire-services/internal/nm +12 / 314B - + github.com/skycoin/skywire-services/pkg/address-resolver/api:e->github.com/skycoin/skywire-services/internal/armetrics - - + + - + github.com/skycoin/skywire-services/pkg/address-resolver/api:e->github.com/skycoin/skywire-services/pkg/address-resolver/store - - + + - + github.com/skycoin/skywire-services/pkg/network-monitor/api:e->github.com/skycoin/skywire-services/internal/nm - - + + - + github.com/skycoin/skywire-services/pkg/network-monitor/api:e->github.com/skycoin/skywire-services/internal/nmmetrics - - + + - + github.com/skycoin/skywire-services/pkg/network-monitor/api:e->github.com/skycoin/skywire-services/pkg/network-monitor/store - - + + - + github.com/skycoin/skywire-services/pkg/network-monitor/store:e->github.com/skycoin/skywire-services/internal/nm - - + + - + github.com/skycoin/skywire-services/pkg/node-visualizer/api:e->github.com/skycoin/skywire-services/internal/tpdiscmetrics - - + + - + github.com/skycoin/skywire-services/pkg/route-finder/store - - -github.com/skycoin/skywire-services/pkg/route-finder/store -320 / 9.5KB + + +github.com/skycoin/skywire-services/pkg/route-finder/store +320 / 9.5KB - + github.com/skycoin/skywire-services/pkg/route-finder/api:e->github.com/skycoin/skywire-services/pkg/route-finder/store - - + + - + github.com/skycoin/skywire-services/pkg/route-finder/api:e->github.com/skycoin/skywire-services/pkg/transport-discovery/store - - + + - + github.com/skycoin/skywire-services/pkg/route-finder/store:e->github.com/skycoin/skywire-services/pkg/transport-discovery/store - - + + - + github.com/skycoin/skywire-services/pkg/skysocks-monitor/api:e->github.com/skycoin/skywire-services/internal/vpn - - + + - + github.com/skycoin/skywire-services/pkg/transport-discovery/api:e->github.com/skycoin/skywire-services/internal/tpdiscmetrics - - + + - + github.com/skycoin/skywire-services/pkg/transport-discovery/api:e->github.com/skycoin/skywire-services/pkg/transport-discovery/store - - + + - + github.com/skycoin/skywire-services/pkg/transport-setup/api:e->github.com/skycoin/skywire-services/pkg/transport-setup/config - - + + - + github.com/skycoin/skywire-services/pkg/uptime-tracker/api:e->github.com/skycoin/skywire-services/internal/utmetrics - - + + - + github.com/skycoin/skywire-services/pkg/uptime-tracker/api:e->github.com/skycoin/skywire-services/pkg/uptime-tracker/store - - + + - + github.com/skycoin/skywire-services/pkg/vpn-monitor/api:e->github.com/skycoin/skywire-services/internal/vpn - - + + diff --git a/go.mod b/go.mod index 3c524e3f..048195d1 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/json-iterator/go v1.1.12 github.com/rs/cors v1.8.2 github.com/sirupsen/logrus v1.9.3 - github.com/skycoin/dmsg v1.3.26-0.20240922174815-ced25b343ec5 + github.com/skycoin/dmsg v1.3.26-0.20240924024628-ed5195787d40 github.com/skycoin/skywire v1.3.26-0.20240922162315-789cef41c9a1 github.com/skycoin/skywire-utilities v1.3.25 github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 diff --git a/go.sum b/go.sum index 9ea6a64f..93bc362e 100644 --- a/go.sum +++ b/go.sum @@ -391,8 +391,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/skycoin/dmsg v1.3.26-0.20240922174815-ced25b343ec5 h1:992WLADQdKjZbpJYdw0EYuOaI7mKHQQ57jDFebvUYPs= -github.com/skycoin/dmsg v1.3.26-0.20240922174815-ced25b343ec5/go.mod h1:qfF8cAig3JHLAojmfYEWn8ttV4aHsiitkZeD1TH8Wrg= +github.com/skycoin/dmsg v1.3.26-0.20240924024628-ed5195787d40 h1:GKUDgXHWahO45dDuivC36h6rRVfg6R02d8oDhQp2t74= +github.com/skycoin/dmsg v1.3.26-0.20240924024628-ed5195787d40/go.mod h1:qfF8cAig3JHLAojmfYEWn8ttV4aHsiitkZeD1TH8Wrg= github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 h1:1Nc5EBY6pjfw1kwW0duwyG+7WliWz5u9kgk1h5MnLuA= github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:UXghlricA7J3aRD/k7p/zBObQfmBawwCxIVPVjz2Q3o= github.com/skycoin/skycoin v0.27.1 h1:HatxsRwVSPaV4qxH6290xPBmkH/HgiuAoY2qC+e8C9I= diff --git a/vendor/modules.txt b/vendor/modules.txt index f6a4f40f..41607148 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -457,7 +457,7 @@ github.com/rs/cors ## explicit; go 1.13 github.com/sirupsen/logrus github.com/sirupsen/logrus/hooks/syslog -# github.com/skycoin/dmsg v1.3.26-0.20240922174815-ced25b343ec5 +# github.com/skycoin/dmsg v1.3.26-0.20240924024628-ed5195787d40 ## explicit; go 1.21 github.com/skycoin/dmsg/internal/servermetrics github.com/skycoin/dmsg/pkg/direct