mirror of
https://github.com/v2fly/v2ray-core.git
synced 2026-08-02 13:10:31 -04:00
* stat show json refactor
> will show {} since scripts should expect it, its the json style of blank value
* combine statistics commands to one
* code optimize
* fix runtime flag
* remove json indent
* change overridden to override
* api bi -json
* convert stdin support
code optimize
* writeRow() code optimize
add stats tittle
revert back to restartlogger
* api log -restart
* follow log
* codeql
* move -json to shared flags
* flags optimize
* update flag descriptions
* change "-v" of "api bo" to duration
* change "-expire" of "tls cert" to days
* cmds short description optimize
* fix multiple log followers
* Format loader refactor
* "infra/conf/merge" refactor
* "LoadConfig" refactor
* add "infra/conf/mergers"
* contribute to it will benifit `v2ray run`,`v2ray test`,`v2ray convert`
* easily add new formats, by just adding a converter like json.FromTOML
* default format auto, to all cmds above
* auto detect input format
* mixed formats support
* better stdin behavior
* don't wait if no content
* don't use 'stdin:' placeholder
* `v2ray test` now behaves exactly the same with `v2ray run`, including stdin reading
* api ado, adi, rmo, rmi refactor
* support folders to files resolving, mixed formats
* remove remaining 'stdin:' placeholders
* fix tests
* os.Stdin.Stat() behaves different in platforms, removed
* code optimize
Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
74 lines
1.6 KiB
Go
74 lines
1.6 KiB
Go
package cmdarg
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/v2fly/v2ray-core/v4/common/buf"
|
|
)
|
|
|
|
// LoadArg loads one arg, maybe an remote url, or local file path
|
|
func LoadArg(arg string) (out io.Reader, err error) {
|
|
bs, err := LoadArgToBytes(arg)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out = bytes.NewBuffer(bs)
|
|
return
|
|
}
|
|
|
|
// LoadArgToBytes loads one arg to []byte, maybe an remote url, or local file path
|
|
func LoadArgToBytes(arg string) (out []byte, err error) {
|
|
switch {
|
|
case strings.HasPrefix(arg, "http://"), strings.HasPrefix(arg, "https://"):
|
|
out, err = FetchHTTPContent(arg)
|
|
default:
|
|
out, err = ioutil.ReadFile(arg)
|
|
}
|
|
if err != nil {
|
|
return
|
|
}
|
|
return
|
|
}
|
|
|
|
// FetchHTTPContent dials https for remote content
|
|
func FetchHTTPContent(target string) ([]byte, error) {
|
|
parsedTarget, err := url.Parse(target)
|
|
if err != nil {
|
|
return nil, newError("invalid URL: ", target).Base(err)
|
|
}
|
|
|
|
if s := strings.ToLower(parsedTarget.Scheme); s != "http" && s != "https" {
|
|
return nil, newError("invalid scheme: ", parsedTarget.Scheme)
|
|
}
|
|
|
|
client := &http.Client{
|
|
Timeout: 30 * time.Second,
|
|
}
|
|
resp, err := client.Do(&http.Request{
|
|
Method: "GET",
|
|
URL: parsedTarget,
|
|
Close: true,
|
|
})
|
|
if err != nil {
|
|
return nil, newError("failed to dial to ", target).Base(err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
if resp.StatusCode != 200 {
|
|
return nil, newError("unexpected HTTP status code: ", resp.StatusCode)
|
|
}
|
|
|
|
content, err := buf.ReadAllToBytes(resp.Body)
|
|
if err != nil {
|
|
return nil, newError("failed to read HTTP response").Base(err)
|
|
}
|
|
|
|
return content, nil
|
|
}
|