Merge in upstream changes form air-verse/air (#13)

* chore: bump go to 1.23 (air-verse#650)

* docs: update banner (air-verse#651)

* fix proxy retry loop (air-verse#635)

This addresses two bugs:
1) The loop could exit with an error condition present and fail to
   inform the user.
2) On Windows 11, syscall.ECONNREFUSED is not returned. Instead we
   receive net.OpError with a message similar to:

"unable to reach app: Get "http://localhost:7000/": dial tcp [::1]:7000: connectex: No connection could be made because the target machine actively refused it."

The Fix:
Since the retry loop is short; just 1 second maximum, we retry until no
error happens. If an error does occur, we inform the user.

* Use web page address when making request to reload proxy (air-verse#625)

* Use web page address when making request to reload proxy

Signed-off-by: Alexandra Fishova <yopoyka@yopoyka.com>

* Create event source with just a path because browser can handle address on its own.

Signed-off-by: Alexandra Fishova <yopoyka@yopoyka.com>

---------

Signed-off-by: Alexandra Fishova <yopoyka@yopoyka.com>

* fix the stop_on_error is false configuration does not work (air-verse#555)

* fix color output (air-verse#551)

* Set the Via header in proxy requests to origin and in client responses (air-verse#629)

* Set the Via header in proxy requests to origin and in client responses

* Remove pseudonym and use host only

* feat: Make include_file overrule include_ext, fixes: air-verse#350, base_on: air-verse#358 (air-verse#416)

* feat: Make include_file overrule include_ext

* feat: Make include_file overrule include_ext unittest

* fix: broken code (air-verse#652)

* feat: silent flag in .air.toml, suppressing all air prints (air-verse#641)

* feat: silent flag in .air.toml, suppressing all air prints

useful if the app being watched has structured outputs that are being
piped into subsequent program/s.

* update: add silent to air_example.toml

* FIX: Support working directories containing whitespace (air-verse#646)

* encapsulate paths with quotes to escape spaces

* encapsulate paths with quotes to escape spaces

* preprocess error in test

* Revert "FIX: Support working directories containing whitespace (air-verse#646)" (air-verse#665)

This reverts commit df13da5.

* refactor: remove unnecessary var copy in for (air-verse#682)

* docs: fix badge link in README-zh_cn.md (air-verse#681)

* refactor: simplify test asserts; enable testifylint (air-verse#680)

* Update unclear .profile changes in README.md (air-verse#684)

* Fix: typo in air_example.toml (air-verse#706)

* Implement kill delay on Windows (air-verse#552)

* fix color output

* Implement kill delay on Windows

* Revert the change on master

* Remove extra newline

* Handle absolute paths in config (air-verse#318)

* remove a data race by compiling the exclude regexes in the preprocess phase (air-verse#677)

the regex compilation was done lazily on first access but did not properly synchronize
for being accessed by multiple watcher goroutines

between the option of adding a mutex for something that (should) only ever happen
once and removing the potential for a race, this seems like the better choice

* catch and report start cmd failure rather than panicing (air-verse#676)

* do not report the process as running if it failed to start

* change the return values on error to match what the other platforms produce

* chore: fix test case TestRegexes

* air -h will be document of air

* Update README for air help command

* fix: default config override (air-verse#719)

* Avoid duplicating cors header. (air-verse#727)

* fix: typos (air-verse#728)

* wait for killfunc completion when shutting down current app (air-verse#670)

* wait for killfunc completion when shutting down current app

---------

Co-authored-by: jingdi.zhu <jingdi.zhu@bytedance.com>

* Feature: Show build errors when using proxy (air-verse#725)

* proxy: stream reload and error messages

* proxy: Console log on build failure

* proxy: show build errors in a modal

---------

Co-authored-by: xiantang <zhujingdi1998@gmail.com>

* Add exiter to test os.Exit case (air-verse#729)

authored-by: jingdi.zhu <jingdi.zhu@bytedance.com>

* Fix: using powershell instead of cmd /C (air-verse#708)

---------

Signed-off-by: Alexandra Fishova <yopoyka@yopoyka.com>
Co-authored-by: Rick Yu <m@c6k.app>
Co-authored-by: Greg Dietsche <greg@gregd.org>
Co-authored-by: Alexandra Fishova <yopoyka@yopoyka.com>
Co-authored-by: dengdajun <78243198+pyjcode@users.noreply.github.com>
Co-authored-by: 8LWXpg <105704427+8LWXpg@users.noreply.github.com>
Co-authored-by: dedalusj <dedalusj@gmail.com>
Co-authored-by: zhb127 <1224680008@qq.com>
Co-authored-by: ~ jesse ~ <113159758+jesses-code-adventures@users.noreply.github.com>
Co-authored-by: osteensco <86266589+osteensco@users.noreply.github.com>
Co-authored-by: Oleksandr Redko <oleksandr.red+github@gmail.com>
Co-authored-by: Gourav Kolhatkar <gstar1525@gmail.com>
Co-authored-by: Olivia Bahr <ob.bahr@gmail.com>
Co-authored-by: ZipFile <lin.aaa.lin@gmail.com>
Co-authored-by: Isak Styf <isak@styfsoftware.se>
Co-authored-by: xiantang <zhujingdi1998@gmail.com>
Co-authored-by: Nemanja Milićević <the.nemanja.milicevic@gmail.com>
Co-authored-by: Brandon Bloom <brandon.d.bloom@gmail.com>
Co-authored-by: Nathan Baulch <nathan.baulch@gmail.com>
Co-authored-by: jingdi.zhu <jingdi.zhu@bytedance.com>
Co-authored-by: Polo123456789 <57022222+Polo123456789@users.noreply.github.com>
Co-authored-by: Po <73031052+n1vk@users.noreply.github.com>

Author: 22 people

.github/workflows/build.yml

@@ -17,13 +17,13 @@ jobs:
         uses: actions/checkout@v4
       - name: Setup Go
         id: go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version-file: 'go.mod'
+          go-version: ^1.23
       - name: Install golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: latest
+          version: v1.61
       - name: Install dependency
         run: if [ $(uname) == "Darwin" ]; then brew install gnu-sed ;fi
       - name: Build

.github/workflows/release.yml

@@ -14,9 +14,9 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version-file: 'go.mod'
+          go-version: ^1.23
 
       - name: Set GOVERSION
         run: echo "GOVERSION=$(go version | sed -r 's/go version go(.*)\ .*/\1/')" >> $GITHUB_ENV

.github/workflows/smoke_test_reuse_job.yml

@@ -16,9 +16,9 @@ jobs:
         uses: actions/checkout@v4
       - name: Setup Go
         id: go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version-file: 'go.mod'
+          go-version: ^1.23
       - name: Install
         run: make install
       - name: Check rebuild

.github/workflows/smoke_test_reuse_job_windows.yml

@@ -18,7 +18,7 @@ jobs:
         id: go
         uses: actions/setup-go@v4
         with:
-          go-version-file: 'go.mod'
+          go-version: ^1.23
       - name: Setup Python
         uses: actions/setup-python@v5
         with:

.golangci.yml

@@ -4,6 +4,7 @@ run:
 linters:
   disable-all: true
   enable:
+    - copyloopvar # detects places where loop variables are copied
     - errcheck # Errcheck is a program for checking for unchecked errors in go programs.
     - gci # Gci controls Go package import order and makes it always deterministic
     - goimports # checks that goimports was run
@@ -12,5 +13,6 @@ linters:
     - revive # configurable linter for Go. Drop-in replacement of golint
     - staticcheck # go vet on steroids
     - stylecheck # static analysis, finds bugs and performance issues, offers simplifications, and enforces style rules
+    - testifylint # checks usage of github.com/stretchr/testify
     - unconvert # Remove unnecessary type conversions
     - unused # Checks Go code for unused constants, variables, functions and types

Dockerfile

@@ -5,8 +5,8 @@ LABEL maintainer="Rick Yu <cosmtrek@gmail.com>"
 ENV GOPATH /go
 ENV GO111MODULE on
 
-COPY . /go/src/github.com/cosmtrek/air
-WORKDIR /go/src/github.com/cosmtrek/air
+COPY . /go/src/github.com/air-verse/air
+WORKDIR /go/src/github.com/air-verse/air
 
 RUN --mount=type=cache,target=/go/pkg/mod go mod download
 

Makefile

@@ -4,7 +4,7 @@ LDFLAGS += -X "main.airVersion=$(AIRVER)"
 LDFLAGS += -X "main.goVersion=$(shell go version | sed -r 's/go version go(.*)\ .*/\1/')"
 
 GO := GO111MODULE=on CGO_ENABLED=0 go
-GOLANGCI_LINT_VERSION = v1.60.3
+GOLANGCI_LINT_VERSION = v1.61.0
 
 .PHONY: init
 init: install-golangci-lint

README-zh_cn.md

@@ -1,4 +1,4 @@
-# Air [![Go](https://github.com/air-verse/air/workflows/Go/badge.svg)](https://github.com/air-verse/air/actions?query=workflow%3AGo+branch%3Amaster) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/dcb95264cc504cad9c2a3d8b0795a7f8)](https://www.codacy.com/gh/air-verse/air/dashboard?utm_source=github.com&utm_medium=referral&utm_content=air-verse/air&utm_campaign=Badge_Grade) [![Go Report Card](https://goreportcard.com/badge/github.com/air-verse/air)](https://goreportcard.com/report/github.com/air-verse/air) [![codecov](https://codecov.io/gh/air-verse/air/branch/master/graph/badge.svg)](https://codecov.io/gh/air-verse/air)
+# Air [![Go](https://github.com/air-verse/air/actions/workflows/release.yml/badge.svg)](https://github.com/air-verse/air/actions?query=workflow%3AGo+branch%3Amaster) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/dcb95264cc504cad9c2a3d8b0795a7f8)](https://www.codacy.com/gh/air-verse/air/dashboard?utm_source=github.com&utm_medium=referral&utm_content=air-verse/air&utm_campaign=Badge_Grade) [![Go Report Card](https://goreportcard.com/badge/github.com/air-verse/air)](https://goreportcard.com/report/github.com/air-verse/air) [![codecov](https://codecov.io/gh/air-verse/air/branch/master/graph/badge.svg)](https://codecov.io/gh/air-verse/air)
 
 :cloud: 热重载 Go 应用的工具
 
@@ -16,11 +16,11 @@ Air 是为 Go 应用开发设计的另外一个热重载的命令行工具。只
 
 ## 特色
 
-* 彩色的日志输出
-* 自定义构建或必要的命令
-* 支持外部子目录
-* 在 Air 启动之后，允许监听新创建的路径
-* 更棒的构建过程
+- 彩色的日志输出
+- 自定义构建或必要的命令
+- 支持外部子目录
+- 在 Air 启动之后，允许监听新创建的路径
+- 更棒的构建过程
 
 ### 使用参数覆盖指定配置
 
@@ -42,7 +42,7 @@ air --build.cmd "go build -o bin/api cmd/run.go" --build.bin "./bin/api" --build
 
 ### 使用 `go install` （推荐）
 
-使用 go 1.22 或更高版本:
+使用 go 1.23 或更高版本:
 
 ```shell
 go install github.com/air-verse/air@latest
@@ -60,7 +60,6 @@ curl -sSfL https://raw.githubusercontent.com/air-verse/air/master/install.sh | s
 air -v
 ```
 
-
 ### 使用 [goblin.run](https://goblin.run)
 
 ```shell
@@ -122,6 +121,7 @@ AIR_PORT=8080 air -c "config.toml"
 ```
 
 这将用当前目录替换 `$PWD`，`$AIR_PORT` 是要发布的端口，而 `$@` 用于接受应用程序本身的参数，例如 `-c`
+
 </details>
 
 ## 使用方法
@@ -205,7 +205,7 @@ services:
 
 ```Dockerfile
 # 选择你想要的版本，>= 1.16
-FROM golang:1.22-alpine
+FROM golang:1.23-alpine
 
 WORKDIR /app
 
@@ -259,12 +259,11 @@ export PATH=$PATH:$(go env GOPATH)/bin <---- 请确认这行在您的配置信
 
 ### 如何在静态文件更改时自动重新加载浏览器?
 
-
 请参考 [#512](https://github.com/cosmtrek/air/issues/512).
 
-* 确保你的静态文件在 `include_dir`、`include_ext` 或 `include_file` 中。
-* 确保你的 HTML 有一个 `</body>` 标签。
-* 通过配置以下内容开启代理：
+- 确保你的静态文件在 `include_dir`、`include_ext` 或 `include_file` 中。
+- 确保你的 HTML 有一个 `</body>` 标签。
+- 通过配置以下内容开启代理：
 
 ```toml
 [proxy]

README-zh_tw.md

@@ -1,6 +1,6 @@
 # :cloud: Air - Live reload for Go apps
 
-[![Go](https://github.com/air-verse/air/actions/workflows/release.yml/badge.svg)](https://github.com/air-verse/air/actions?query=workflow%3AGo+branch%3Amaster) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/dcb95264cc504cad9c2a3d8b0795a7f8)](https://www.codacy.com/gh/air-verse/air/dashboard?utm_source=github.com&utm_medium=referral&utm_content=air-verse/air&utm_campaign=Badge_Grade) [![Go Report Card](https://goreportcard.com/badge/github.com/air-verse/air)](https://goreportcard.com/report/github.com/air-verse/air) [![codecov](https://codecov.io/gh/air-verse/air/branch/master/graph/badge.svg)](https://codecov.io/gh/air-verse/air)
+[![Go](https://github.com/air-verse/air/actions/workflows/release.yml/badge.svg)](https://github.com/air-verse/air/actions?query=workflow%3AGo+branch%3Amaster) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/dcb95264cc504cad9c2a3d8b0795a7f8)](https://www.codacy.com/gh/air-verse/air/dashboard?utm_source=github.com&utm_medium=referral&utm_content=air-verse/air&utm_campaign=Badge_Grade) [![Go Report Card](https://goreportcard.com/badge/github.com/air-verse/air)](https://goreportcard.com/report/github.com/air-verse/air) [![codecov](https://codecov.io/gh/air-verse/air/branch/master/graph/badge.svg)](https://codecov.io/gh/air-verse/air)
 
 ![air](docs/air.png)
 
@@ -16,11 +16,11 @@ Air 是一個另類的自動重新編譯執行命令列工具，用於開發 Go
 
 ## 功能列表
 
-* 彩色的日誌輸出
-* 自訂建立或任何命令
-* 支援排除子目錄
-* 允許在 Air 開始後監視新目錄
-* 更佳的建置過程
+- 彩色的日誌輸出
+- 自訂建立或任何命令
+- 支援排除子目錄
+- 允許在 Air 開始後監視新目錄
+- 更佳的建置過程
 
 ### 用參數覆寫指定的配置
 
@@ -42,7 +42,7 @@ air --build.cmd "go build -o bin/api cmd/run.go" --build.bin "./bin/api" --build
 
 ### 使用 `go install` （推薦）
 
-需要使用 go 1.22 或更高版本：
+需要使用 go 1.23 或更高版本：
 
 ```bash
 go install github.com/air-verse/air@latest

README.md

@@ -1,6 +1,6 @@
 # :cloud: Air - Live reload for Go apps
 
-[![Go](https://github.com/air-verse/air/actions/workflows/release.yml/badge.svg)](https://github.com/air-verse/air/actions?query=workflow%3AGo+branch%3Amaster) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/dcb95264cc504cad9c2a3d8b0795a7f8)](https://www.codacy.com/gh/air-verse/air/dashboard?utm_source=github.com&utm_medium=referral&utm_content=air-verse/air&utm_campaign=Badge_Grade) [![Go Report Card](https://goreportcard.com/badge/github.com/air-verse/air)](https://goreportcard.com/report/github.com/air-verse/air) [![codecov](https://codecov.io/gh/air-verse/air/branch/master/graph/badge.svg)](https://codecov.io/gh/air-verse/air)
+[![Go](https://github.com/air-verse/air/actions/workflows/release.yml/badge.svg)](https://github.com/air-verse/air/actions?query=workflow%3AGo+branch%3Amaster) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/dcb95264cc504cad9c2a3d8b0795a7f8)](https://www.codacy.com/gh/air-verse/air/dashboard?utm_source=github.com&utm_medium=referral&utm_content=air-verse/air&utm_campaign=Badge_Grade) [![Go Report Card](https://goreportcard.com/badge/github.com/air-verse/air)](https://goreportcard.com/report/github.com/air-verse/air) [![codecov](https://codecov.io/gh/air-verse/air/branch/master/graph/badge.svg)](https://codecov.io/gh/air-verse/air)
 
 ![air](docs/air.png)
 
@@ -20,16 +20,26 @@ Note: This tool has nothing to do with hot-deploy for production.
 
 ## Features
 
-* Colorful log output
-* Customize build or any command
-* Support excluding subdirectories
-* Allow watching new directories after Air started
-* Better building process
+- Colorful log output
+- Customize build or any command
+- Support excluding subdirectories
+- Allow watching new directories after Air started
+- Better building process
 
 ### Overwrite specify configuration from arguments
 
 Support air config fields as arguments:
 
+You can view the available command-line arguments by running the following commands:  
+
+```
+air -h
+```
+or  
+```
+air --help
+```
+
 If you want to config build command and run command, you can use like the following command without the config file:
 
 ```shell
@@ -46,7 +56,7 @@ air --build.cmd "go build -o bin/api cmd/run.go" --build.bin "./bin/api" --build
 
 ### Via `go install` (Recommended)
 
-With go 1.22 or higher:
+With go 1.23 or higher:
 
 ```bash
 go install github.com/air-verse/air@latest
@@ -209,7 +219,7 @@ services:
 
 ```Dockerfile
 # Choose whatever you want, version >= 1.16
-FROM golang:1.22-alpine
+FROM golang:1.23-alpine
 
 WORKDIR /app
 
@@ -245,12 +255,12 @@ services:
 ```shell
 export GOPATH=$HOME/xxxxx
 export PATH=$PATH:$GOROOT/bin:$GOPATH/bin
-export PATH=$PATH:$(go env GOPATH)/bin <---- Confirm this line in you profile!!!
+export PATH=$PATH:$(go env GOPATH)/bin #Confirm this line in your .profile and make sure to source the .profile if you add it!!!
 ```
 
 ### Error under wsl when ' is included in the bin
 
-Should use `\` to escape the `' in the bin. related issue: [#305](https://github.com/air-verse/air/issues/305)
+Should use `\` to escape the `'` in the bin. related issue: [#305](https://github.com/air-verse/air/issues/305)
 
 ### Question: how to do hot compile only and do not run anything?
 
@@ -263,12 +273,11 @@ Should use `\` to escape the `' in the bin. related issue: [#305](https://github
 
 ### How to Reload the Browser Automatically on Static File Changes
 
-
 Refer to issue [#512](https://github.com/air-verse/air/issues/512) for additional details.
 
-* Ensure your static files in `include_dir`, `include_ext`, or `include_file`.
-* Ensure your HTML has a `</body>` tag
-* Activate the proxy by configuring the following config:
+- Ensure your static files in `include_dir`, `include_ext`, or `include_file`.
+- Ensure your HTML has a `</body>` tag
+- Activate the proxy by configuring the following config:
 
 ```toml
 [proxy]