diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 12cc9a8..81f9749 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v6 with: - node-version: 24 + node-version: 25 - name: Install dependencies and build frontend run: | cd frontend diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 488f0d3..16d0c08 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,11 +19,10 @@ on: - 's-ui.service' env: - NODE_VERSION: "24" - CRONET_GO_VERSION: "cba7b9ac0399055aa49fbdc57c03c374f58e1597" + NODE_VERSION: "25" + CRONET_GO_VERSION: "2fef65f9dba90ddb89a87d00a6eb6165487c10c1" CRONET_GO_REPO: https://github.com/sagernet/cronet-go.git BOOTLIN_BASE_URL: https://toolchains.bootlin.com/downloads/releases/toolchains - CHROMIUM_CACHE_KEY_SUFFIX: musl-cba7b9ac0399055aa49fbdc57c03c374f58e1597 jobs: build-frontend: @@ -45,7 +44,7 @@ jobs: - name: Build frontend run: | cd frontend - npm ci + npm install npm run build cd .. @@ -115,7 +114,7 @@ jobs: ~/cronet-go/naiveproxy/src/gn/out/ ~/cronet-go/naiveproxy/src/chrome/build/pgo_profiles/ ~/cronet-go/naiveproxy/src/out/sysroot-build/ - key: chromium-toolchain-${{ matrix.platform }}-${{ env.CHROMIUM_CACHE_KEY_SUFFIX }} + key: chromium-toolchain-${{ matrix.platform }}-musl-${{ env.CRONET_GO_VERSION }} - name: Build cronet lib and set toolchain env (CC, CXX, CGO_LDFLAGS, PATH) if: matrix.naive diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3410eaf..565afa7 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -18,7 +18,7 @@ on: - 'windows/**' env: - NODE_VERSION: "24" + NODE_VERSION: "25" TAGS: "with_quic,with_grpc,with_utls,with_acme,with_gvisor,with_naive_outbound,with_purego,badlinkname,tfogo_checklinkname0,with_tailscale" LIBCRONET_BASE_URL: "https://github.com/SagerNet/cronet-go/releases/latest/download" diff --git a/config/version b/config/version index e21e727..13175fd 100644 --- a/config/version +++ b/config/version @@ -1 +1 @@ -1.4.0 \ No newline at end of file +1.4.1 \ No newline at end of file diff --git a/core/box.go b/core/box.go index f9797f8..7e41ffd 100644 --- a/core/box.go +++ b/core/box.go @@ -560,7 +560,7 @@ func (s *Box) Close() error { } func (s *Box) Uptime() uint32 { - return uint32(time.Now().Sub(s.createdAt).Seconds()) + return uint32(time.Since(s.createdAt).Seconds()) } func (s *Box) Network() adapter.NetworkManager { diff --git a/frontend b/frontend index 1a62b65..f65f58e 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 1a62b655138c13b77a20da939233cb22b642a511 +Subproject commit f65f58efbd12b8c1eed6f3ca15a09f05746b6819