From 2c0365d67da3a59113333814fc803a1196fd753c Mon Sep 17 00:00:00 2001 From: Mohammad Nejati Date: Tue, 10 Feb 2026 11:51:06 +0000 Subject: [PATCH] Update repository configuration --- .drone/drone.bat | 10 +- .drone/drone.sh | 20 +- .github/workflows/ci.yml | 1027 ++------ CMakeLists.txt | 78 +- README.adoc | 42 +- build/Jamfile | 32 +- doc/antora.yml | 7 +- doc/build_antora.bat | 2 +- doc/build_antora.sh | 8 +- doc/local-playbook.yml | 15 +- doc/modules/ROOT/nav.adoc | 2 +- doc/modules/ROOT/pages/design.adoc | 4 +- doc/modules/ROOT/pages/index.adoc | 8 +- .../ROOT/pages/sans_io_philosophy.adoc | 2 +- doc/mrdocs.yml | 11 +- doc/package-lock.json | 2082 ++++++----------- doc/package.json | 18 +- include/boost/{ws_proto.hpp => websocket.hpp} | 8 +- .../boost/{ws_proto => websocket}/client.hpp | 12 +- .../{ws_proto => websocket}/close_code.hpp | 12 +- include/boost/websocket/detail/config.hpp | 87 + .../boost/{ws_proto => websocket}/error.hpp | 14 +- .../{ws_proto => websocket}/handshake.hpp | 24 +- .../{ws_proto => websocket}/impl/error.hpp | 22 +- .../boost/{ws_proto => websocket}/parser.hpp | 16 +- .../{ws_proto => websocket}/serializer.hpp | 12 +- include/boost/ws_proto/detail/config.hpp | 87 - index.html | 4 +- meta/explicit-failures-markup.xml | 4 +- meta/libraries.json | 4 +- src/error.cpp | 8 +- src/handshake.cpp | 28 +- src/impl/base64.cpp | 6 +- src/impl/base64.hpp | 10 +- src/impl/chacha.hpp | 42 +- src/impl/hybi13.cpp | 6 +- src/impl/hybi13.hpp | 10 +- src/impl/pcg.hpp | 10 +- src/impl/prng.cpp | 6 +- src/impl/prng.hpp | 10 +- src/impl/sha1.cpp | 6 +- src/impl/sha1.hpp | 10 +- src/parser.cpp | 8 +- src/serializer.cpp | 8 +- test/CMakeLists.txt | 2 +- test/Jamfile | 2 +- test/cmake_test/CMakeLists.txt | 44 +- test/cmake_test/main.cpp | 2 +- test/unit/CMakeLists.txt | 18 +- test/unit/Jamfile | 8 +- test/unit/client.cpp | 10 +- test/unit/close_code.cpp | 4 +- test/unit/error.cpp | 4 +- test/unit/handshake.cpp | 10 +- test/unit/parser.cpp | 4 +- test/unit/serializer.cpp | 4 +- 56 files changed, 1312 insertions(+), 2642 deletions(-) rename include/boost/{ws_proto.hpp => websocket.hpp} (58%) rename include/boost/{ws_proto => websocket}/client.hpp (72%) rename include/boost/{ws_proto => websocket}/close_code.hpp (93%) create mode 100644 include/boost/websocket/detail/config.hpp rename include/boost/{ws_proto => websocket}/error.hpp (65%) rename include/boost/{ws_proto => websocket}/handshake.hpp (56%) rename include/boost/{ws_proto => websocket}/impl/error.hpp (79%) rename include/boost/{ws_proto => websocket}/parser.hpp (58%) rename include/boost/{ws_proto => websocket}/serializer.hpp (58%) delete mode 100644 include/boost/ws_proto/detail/config.hpp diff --git a/.drone/drone.bat b/.drone/drone.bat index c7b4c51..ecda022 100644 --- a/.drone/drone.bat +++ b/.drone/drone.bat @@ -43,20 +43,20 @@ echo using zlib : : : ^off ^; >> !BOOST_ROOT!\project-config.jam REM Customizations cd pushd !BOOST_ROOT!\libs -git clone https://github.com/cppalliance/rts -b !BOOST_BRANCH! --depth 1 +git clone https://github.com/cppalliance/capy -b !BOOST_BRANCH! --depth 1 popd pushd !BOOST_ROOT!\libs git clone https://github.com/cppalliance/buffers -b !BOOST_BRANCH! --depth 1 popd pushd !BOOST_ROOT!\libs -git clone https://github.com/cppalliance/http_proto -b !BOOST_BRANCH! --depth 1 +git clone https://github.com/cppalliance/http -b !BOOST_BRANCH! --depth 1 popd pushd !BOOST_ROOT! -python tools/boostdep/depinst/depinst.py rts +python tools/boostdep/depinst/depinst.py capy python tools/boostdep/depinst/depinst.py buffers -python tools/boostdep/depinst/depinst.py http_proto -python tools/boostdep/depinst/depinst.py ws_proto +python tools/boostdep/depinst/depinst.py http +python tools/boostdep/depinst/depinst.py websocket popd echo '==================================> COMPILE' diff --git a/.drone/drone.sh b/.drone/drone.sh index 16a076f..268b297 100644 --- a/.drone/drone.sh +++ b/.drone/drone.sh @@ -35,9 +35,9 @@ common_install () { . ./ci/common_install.sh - if [ ! -d "$BOOST_ROOT/libs/rts" ]; then + if [ ! -d "$BOOST_ROOT/libs/capy" ]; then pushd $BOOST_ROOT/libs - git clone https://github.com/cppalliance/rts -b $BOOST_BRANCH --depth 1 + git clone https://github.com/cppalliance/capy -b $BOOST_BRANCH --depth 1 popd fi @@ -47,16 +47,16 @@ common_install () { popd fi - if [ ! -d "$BOOST_ROOT/libs/http_proto" ]; then + if [ ! -d "$BOOST_ROOT/libs/http" ]; then pushd $BOOST_ROOT/libs - git clone https://github.com/cppalliance/http_proto -b $BOOST_BRANCH --depth 1 + git clone https://github.com/cppalliance/http -b $BOOST_BRANCH --depth 1 popd fi pushd $BOOST_ROOT $pythonexecutable tools/boostdep/depinst/depinst.py buffers - $pythonexecutable tools/boostdep/depinst/depinst.py http_proto - $pythonexecutable tools/boostdep/depinst/depinst.py ws_proto + $pythonexecutable tools/boostdep/depinst/depinst.py http + $pythonexecutable tools/boostdep/depinst/depinst.py websocket popd } @@ -133,9 +133,9 @@ cp -r $DRONE_BUILD_DIR/* libs/$SELF git submodule update --init --recursive # Customizations -if [ ! -d "$BOOST_ROOT/libs/rts" ]; then +if [ ! -d "$BOOST_ROOT/libs/capy" ]; then pushd $BOOST_ROOT/libs - git clone https://github.com/cppalliance/rts -b $BOOST_BRANCH --depth 1 + git clone https://github.com/cppalliance/capy -b $BOOST_BRANCH --depth 1 popd fi @@ -145,9 +145,9 @@ if [ ! -d "$BOOST_ROOT/libs/buffers" ]; then popd fi -if [ ! -d "$BOOST_ROOT/libs/http_proto" ]; then +if [ ! -d "$BOOST_ROOT/libs/http" ]; then pushd $BOOST_ROOT/libs - git clone https://github.com/cppalliance/http_proto -b $BOOST_BRANCH --depth 1 + git clone https://github.com/cppalliance/http -b $BOOST_BRANCH --depth 1 popd fi diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9c20ce..f35a829 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,13 +8,15 @@ # Distributed under the Boost Software License, Version 1.0. (See accompanying # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # -# Official repository: https://github.com/cppalliance/ws_proto/ +# Official repository: https://github.com/cppalliance/websocket/ # name: CI on: pull_request: + branches: [ master, develop ] + workflow_dispatch: push: branches: - master @@ -34,21 +36,27 @@ env: NET_RETRY_COUNT: 5 DEFAULT_BUILD_VARIANT: debug,release UBSAN_OPTIONS: "print_stacktrace=1" - ASAN_OPTIONS: "detect_invalid_pointer_pairs=2" + DEBIAN_FRONTEND: "noninteractive" + TZ: "Europe/London" jobs: - runner-selection: - name: Runner Selection - runs-on: ${{ github.repository_owner == 'boostorg' && fromJSON('[ "self-hosted", "linux", "x64", "ubuntu-latest-aws" ]') || 'ubuntu-latest' }} - outputs: - labelmatrix: ${{ steps.aws_hosted_runners.outputs.labelmatrix }} - steps: - - name: AWS Hosted Runners - id: aws_hosted_runners - uses: cppalliance/aws-hosted-runners@v1.0.0 + # Self-hosted runner selection is disabled to allow re-running individual + # failed jobs from the GitHub Actions UI. When using dynamic runner selection, + # the runs-on value depends on this job's output, which isn't available when + # re-running a subset of jobs. + # + # runner-selection: + # name: Runner Selection + # runs-on: ${{ github.repository_owner == 'boostorg' && fromJSON('[ "self-hosted", "linux", "x64", "ubuntu-latest-aws" ]') || 'ubuntu-latest' }} + # outputs: + # labelmatrix: ${{ steps.aws_hosted_runners.outputs.labelmatrix }} + # steps: + # - name: AWS Hosted Runners + # id: aws_hosted_runners + # uses: cppalliance/aws-hosted-runners@v1.0.0 build: - needs: [ runner-selection ] + # needs: [ runner-selection ] defaults: run: shell: bash @@ -57,331 +65,108 @@ jobs: fail-fast: false matrix: include: - # Windows compilers - # + # Windows (3 configurations) - compiler: "msvc" version: "14.42" - cxxstd: "17,20" + cxxstd: "20" latest-cxxstd: "20" runs-on: "windows-2022" b2-toolset: "msvc-14.4" generator: "Visual Studio 17 2022" is-latest: true - name: "MSVC 14.42: C++17-20" + name: "MSVC 14.42: C++20" shared: false build-type: "Release" build-cmake: true - compiler: "msvc" version: "14.34" - cxxstd: "17,20" - latest-cxxstd: "20" - runs-on: "windows-2022" - b2-toolset: "msvc-14.3" - generator: "Visual Studio 17 2022" - is-latest: true - name: "MSVC 14.34: C++17-20" - shared: true - build-type: "Release" - build-cmake: true - - - compiler: "msvc" - version: "14.34" - cxxstd: "17,20" - latest-cxxstd: "20" - runs-on: "windows-2022" - b2-toolset: "msvc-14.3" - generator: "Visual Studio 17 2022" - is-latest: true - name: "MSVC 14.34: C++17-20 (x86)" - shared: false - x86: true - build-type: "Release" - - - compiler: "msvc" - version: "14.34" - cxxstd: "17,20" + cxxstd: "20" latest-cxxstd: "20" runs-on: "windows-2022" b2-toolset: "msvc-14.3" generator: "Visual Studio 17 2022" - is-latest: true - name: "MSVC 14.34: C++17-20" - shared: true - build-type: "Release" - build-cmake: true - - - compiler: "clang-cl" - version: "*" - cxx: "clang++-cl" - cc: "clang-cl" - runs-on: "windows-2022" - b2-toolset: "clang-win" - generator-toolset: "ClangCL" - is-latest: true - is-earliest: true - name: "Windows-Clang" - shared: false - build-type: "Release" - build-cmake: true - - - compiler: "mingw" - version: "*" - cxx: "g++" - cc: "gcc" - runs-on: "windows-2022" - b2-toolset: "gcc" - generator: "MinGW Makefiles" - is-latest: false - is-earliest: true - name: "MinGW" + name: "MSVC 14.34: C++20 (shared)" shared: true build-type: "Release" - build-cmake: true - compiler: "mingw" version: "*" + cxxstd: "20" + latest-cxxstd: "20" cxx: "g++" cc: "gcc" runs-on: "windows-2022" b2-toolset: "gcc" generator: "MinGW Makefiles" - is-latest: false - is-earliest: true - name: "MinGW" - shared: false - build-type: "Release" - build-cmake: true - - # OSX compilers - # - - - compiler: "apple-clang" - version: "*" - cxx: "clang++" - cc: "clang" - runs-on: "macos-15" - b2-toolset: "clang" - is-latest: true - name: "Apple-Clang (macOS 15)" - shared: true - build-type: "Release" - build-cmake: true - - - compiler: "apple-clang" - version: "*" - cxx: "clang++" - cc: "clang" - runs-on: "macos-15" - b2-toolset: "clang" is-latest: true - name: "Apple-Clang (macOS 15, ubsan)" - shared: false - build-type: "RelWithDebInfo" - ubsan: true - - - compiler: "apple-clang" - version: "*" - cxx: "clang++" - cc: "clang" - runs-on: "macos-15" - b2-toolset: "clang" - is-latest: true - name: "Apple-Clang (macOS 15, asan)" - shared: true - build-type: "RelWithDebInfo" - asan: true - - - compiler: "apple-clang" - version: "*" - cxx: "clang++" - cc: "clang" - runs-on: "macos-14" - b2-toolset: "clang" - name: "Apple-Clang (macOS 14)" + is-earliest: true + name: "MinGW: C++20" shared: false build-type: "Release" build-cmake: true - - compiler: "apple-clang" - version: "*" - cxx: "clang++" - cc: "clang" - runs-on: "macos-13" - b2-toolset: "clang" - name: "Apple-Clang (macOS 13)" - shared: true - build-type: "Release" - build-cmake: true - - # Linux compilers + # macOS (1 configuration) + # TODO: Re-enable when BSD/kqueue support is implemented # + # - compiler: "apple-clang" + # version: "*" + # cxxstd: "20" + # latest-cxxstd: "20" + # cxx: "clang++" + # cc: "clang" + # runs-on: "macos-26" + # b2-toolset: "clang" + # is-latest: true + # name: "Apple-Clang (macOS 26, asan+ubsan): C++20" + # shared: true + # build-type: "RelWithDebInfo" + # asan: true + # ubsan: true + + # Linux GCC (4 configurations) - compiler: "gcc" - version: "14" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "g++-14" - cc: "gcc-14" - runs-on: "ubuntu-latest" - container: "ubuntu:24.04" - b2-toolset: "gcc" - is-latest: true - name: "GCC 14: C++17-20" - shared: false - build-type: "Release" - build-cmake: true - - - compiler: "gcc" - version: "14" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "g++-14" - cc: "gcc-14" - runs-on: "ubuntu-latest" - container: "ubuntu:24.04" - b2-toolset: "gcc" - is-latest: true - name: "GCC 14: C++17-20 (no zlib)" - shared: true - build-type: "Release" - build-cmake: true - - - compiler: "gcc" - version: "14" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "g++-14" - cc: "gcc-14" - runs-on: "ubuntu-latest" - container: "ubuntu:24.04" - b2-toolset: "gcc" - is-latest: true - name: "GCC 14: C++17-20 (x86)" - shared: false - x86: true - build-type: "Release" - install: "gcc-14-multilib g++-14-multilib" - - - compiler: "gcc" - version: "14" - cxxstd: "17,20" + version: "15" + cxxstd: "20" latest-cxxstd: "20" - cxx: "g++-14" - cc: "gcc-14" + cxx: "g++-15" + cc: "gcc-15" runs-on: "ubuntu-latest" - container: "ubuntu:24.04" + container: "ubuntu:25.04" b2-toolset: "gcc" is-latest: true - name: "GCC 14: C++17-20" + name: "GCC 15: C++20" shared: true build-type: "Release" build-cmake: true - compiler: "gcc" - version: "14" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "g++-14" - cc: "gcc-14" - runs-on: "ubuntu-latest" - container: "ubuntu:24.04" - b2-toolset: "gcc" - is-latest: true - name: "GCC 14: C++17-20 (x86)" - shared: false - x86: true - build-type: "Release" - install: "gcc-14-multilib g++-14-multilib" - build-cmake: true - - - compiler: "gcc" - version: "14" - cxxstd: "17,20" + version: "15" + cxxstd: "20" latest-cxxstd: "20" - cxx: "g++-14" - cc: "gcc-14" + cxx: "g++-15" + cc: "gcc-15" runs-on: "ubuntu-latest" - container: "ubuntu:24.04" + container: "ubuntu:25.04" b2-toolset: "gcc" is-latest: true - name: "GCC 14: C++17-20 (asan)" + name: "GCC 15: C++20 (asan+ubsan)" shared: true asan: true - build-type: "RelWithDebInfo" - - - compiler: "gcc" - version: "14" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "g++-14" - cc: "gcc-14" - runs-on: "ubuntu-latest" - container: "ubuntu:24.04" - b2-toolset: "gcc" - is-latest: true - name: "GCC 14: C++17-20 (asan, x86)" - shared: false - asan: true - x86: true - build-type: "RelWithDebInfo" - install: "gcc-14-multilib g++-14-multilib" - - - compiler: "gcc" - version: "14" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "g++-14" - cc: "gcc-14" - runs-on: "ubuntu-latest" - container: "ubuntu:24.04" - b2-toolset: "gcc" - is-latest: true - name: "GCC 14: C++17-20 (ubsan)" - shared: true - ubsan: true - build-type: "RelWithDebInfo" - - - compiler: "gcc" - version: "14" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "g++-14" - cc: "gcc-14" - runs-on: "ubuntu-latest" - container: "ubuntu:24.04" - b2-toolset: "gcc" - is-latest: true - name: "GCC 14: C++17-20 (ubsan, x86)" - shared: false ubsan: true - x86: true build-type: "RelWithDebInfo" - install: "gcc-14-multilib g++-14-multilib" - - - compiler: "gcc" - version: "13" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "g++-13" - cc: "gcc-13" - runs-on: "ubuntu-24.04" - b2-toolset: "gcc" - name: "GCC 13: C++17-20" - shared: true - build-type: "Release" - compiler: "gcc" version: "13" - cxxstd: "17,20" + cxxstd: "20" latest-cxxstd: "20" cxx: "g++-13" cc: "gcc-13" runs-on: "ubuntu-24.04" b2-toolset: "gcc" - is-latest: true - name: "GCC 13: C++17-20 (coverage)" + name: "GCC 13: C++20 (coverage)" shared: false coverage: true build-type: "Debug" @@ -389,510 +174,141 @@ jobs: ccflags: "--coverage -fprofile-arcs -ftest-coverage" install: "lcov wget unzip" - - compiler: "gcc" - version: "12" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "g++-12" - cc: "gcc-12" - runs-on: "ubuntu-latest" - container: "ubuntu:22.04" - b2-toolset: "gcc" - name: "GCC 12: C++17-20" - shared: true - build-type: "Release" - - - compiler: "gcc" - version: "11" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "g++-11" - cc: "gcc-11" - runs-on: "ubuntu-latest" - container: "ubuntu:22.04" - b2-toolset: "gcc" - name: "GCC 11: C++17-20" - shared: false - build-type: "Release" - - - compiler: "gcc" - version: "10" - cxxstd: "14,17" - latest-cxxstd: "17" - cxx: "g++-10" - cc: "gcc-10" - runs-on: "ubuntu-latest" - container: "ubuntu:20.04" - b2-toolset: "gcc" - name: "GCC 10: C++14-17" - shared: true - build-type: "Release" - - - compiler: "gcc" - version: "9" - cxxstd: "14,17" - latest-cxxstd: "17" - cxx: "g++-9" - cc: "gcc-9" - runs-on: "ubuntu-latest" - container: "ubuntu:20.04" - b2-toolset: "gcc" - name: "GCC 9: C++14-17" - shared: false - build-type: "Release" - - - compiler: "gcc" - version: "8" - cxxstd: "14,17" - latest-cxxstd: "17" - cxx: "g++-8" - cc: "gcc-8" - runs-on: "ubuntu-latest" - container: "ubuntu:20.04" - b2-toolset: "gcc" - name: "GCC 8: C++14-17" - shared: true - build-type: "Release" - - - compiler: "gcc" - version: "7" - cxxstd: "14,17" - latest-cxxstd: "17" - cxx: "g++-7" - cc: "gcc-7" - runs-on: "ubuntu-latest" - container: "ubuntu:20.04" - b2-toolset: "gcc" - name: "GCC 7: C++14-17" - shared: false - build-type: "Release" - - - compiler: "gcc" - version: "6" - cxxstd: "11,14" - latest-cxxstd: "14" - cxx: "g++-6" - cc: "gcc-6" - runs-on: "ubuntu-latest" - container: "ubuntu:18.04" - b2-toolset: "gcc" - name: "GCC 6: C++11-14" - shared: true - build-type: "Release" - - - compiler: "gcc" - version: "5" - cxxstd: "11" - latest-cxxstd: "11" - cxx: "g++-5" - cc: "gcc-5" - runs-on: "ubuntu-latest" - container: "ubuntu:18.04" - b2-toolset: "gcc" - is-earliest: true - name: "GCC 5: C++11" - shared: false - build-type: "Release" + # Linux Clang (5 configurations) - compiler: "clang" - version: "18" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "clang++-18" - cc: "clang-18" + version: "20" + cxxstd: "20,23" + latest-cxxstd: "23" + cxx: "clang++-20" + cc: "clang-20" runs-on: "ubuntu-latest" container: "ubuntu:24.04" b2-toolset: "clang" is-latest: true - name: "Clang 18: C++17-20" + name: "Clang 20: C++20-23" shared: true build-type: "Release" build-cmake: true - compiler: "clang" - version: "18" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "clang++-18" - cc: "clang-18" - runs-on: "ubuntu-latest" - container: "ubuntu:24.04" - b2-toolset: "clang" - is-latest: true - name: "Clang 18: C++17-20 (x86)" - shared: false - x86: true - build-type: "Release" - install: "gcc-multilib g++-multilib" - - - compiler: "clang" - version: "18" + version: "20" cxxstd: "20" latest-cxxstd: "20" - cxx: "clang++-18" - cc: "clang-18" - runs-on: "ubuntu-latest" - container: "ubuntu:24.04" - b2-toolset: "clang" - is-latest: true - name: "Clang 18: C++20 (time-trace)" - shared: true - time-trace: true - build-type: "Release" - cxxflags: "-ftime-trace" - ccflags: "-ftime-trace" - install: " wget unzip" - - - compiler: "clang" - version: "18" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "clang++-18" - cc: "clang-18" + cxx: "clang++-20" + cc: "clang-20" runs-on: "ubuntu-latest" container: "ubuntu:24.04" b2-toolset: "clang" is-latest: true - name: "Clang 18: C++17-20 (asan)" + name: "Clang 20: C++20 (asan+ubsan)" shared: false asan: true - build-type: "RelWithDebInfo" - - - compiler: "clang" - version: "18" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "clang++-18" - cc: "clang-18" - runs-on: "ubuntu-latest" - container: "ubuntu:24.04" - b2-toolset: "clang" - is-latest: true - name: "Clang 18: C++17-20 (asan, x86)" - shared: true - asan: true - x86: true - build-type: "RelWithDebInfo" - install: "gcc-multilib g++-multilib" - - - compiler: "clang" - version: "18" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "clang++-18" - cc: "clang-18" - runs-on: "ubuntu-latest" - container: "ubuntu:24.04" - b2-toolset: "clang" - is-latest: true - name: "Clang 18: C++17-20 (ubsan)" - shared: false - ubsan: true - build-type: "RelWithDebInfo" - - - compiler: "clang" - version: "18" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "clang++-18" - cc: "clang-18" - runs-on: "ubuntu-latest" - container: "ubuntu:24.04" - b2-toolset: "clang" - is-latest: true - name: "Clang 18: C++17-20 (ubsan, x86)" - shared: true ubsan: true - x86: true build-type: "RelWithDebInfo" - install: "gcc-multilib g++-multilib" - compiler: "clang" version: "17" - cxxstd: "17,20" + cxxstd: "20" latest-cxxstd: "20" cxx: "clang++-17" cc: "clang-17" runs-on: "ubuntu-24.04" b2-toolset: "clang" - name: "Clang 17: C++17-20" - shared: false - build-type: "Release" - - - compiler: "clang" - version: "16" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "clang++-16" - cc: "clang-16" - runs-on: "ubuntu-24.04" - b2-toolset: "clang" - name: "Clang 16: C++17-20" - shared: true - build-type: "Release" - - - compiler: "clang" - version: "15" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "clang++-15" - cc: "clang-15" - runs-on: "ubuntu-latest" - container: "ubuntu:22.04" - b2-toolset: "clang" - name: "Clang 15: C++17-20" - shared: false - build-type: "Release" - - - compiler: "clang" - version: "14" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "clang++-14" - cc: "clang-14" - runs-on: "ubuntu-latest" - container: "ubuntu:22.04" - b2-toolset: "clang" - name: "Clang 14: C++17-20" - shared: true - build-type: "Release" - - - compiler: "clang" - version: "13" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "clang++-13" - cc: "clang-13" - runs-on: "ubuntu-latest" - container: "ubuntu:22.04" - b2-toolset: "clang" - name: "Clang 13: C++17-20" - shared: false - build-type: "Release" - - - compiler: "clang" - version: "12" - cxxstd: "17,20" - latest-cxxstd: "20" - cxx: "clang++-12" - cc: "clang-12" - runs-on: "ubuntu-latest" - container: "ubuntu:22.04" - b2-toolset: "clang" - name: "Clang 12: C++17-20" - shared: true - build-type: "Release" - - - compiler: "clang" - version: "11" - cxxstd: "14,17" - latest-cxxstd: "17" - cxx: "clang++-11" - cc: "clang-11" - runs-on: "ubuntu-latest" - container: "ubuntu:22.04" - b2-toolset: "clang" - name: "Clang 11: C++14-17" - shared: false - build-type: "Release" - - - compiler: "clang" - version: "10" - cxxstd: "14,17" - latest-cxxstd: "17" - cxx: "clang++-10" - cc: "clang-10" - runs-on: "ubuntu-latest" - container: "ubuntu:20.04" - b2-toolset: "clang" - name: "Clang 10: C++14-17" - shared: true - build-type: "Release" - - - compiler: "clang" - version: "9" - cxxstd: "14,17" - latest-cxxstd: "17" - cxx: "clang++-9" - cc: "clang-9" - runs-on: "ubuntu-latest" - container: "ubuntu:20.04" - b2-toolset: "clang" - name: "Clang 9: C++14-17" - shared: false - build-type: "Release" - - - compiler: "clang" - version: "8" - cxxstd: "14,17" - latest-cxxstd: "17" - cxx: "clang++-8" - cc: "clang-8" - runs-on: "ubuntu-latest" - container: "ubuntu:20.04" - b2-toolset: "clang" - name: "Clang 8: C++14-17" - shared: true - build-type: "Release" - - - compiler: "clang" - version: "7" - cxxstd: "14,17" - latest-cxxstd: "17" - cxx: "clang++-7" - cc: "clang-7" - runs-on: "ubuntu-latest" - container: "ubuntu:20.04" - b2-toolset: "clang" - name: "Clang 7: C++14-17" - shared: false - build-type: "Release" - - - compiler: "clang" - version: "6" - cxxstd: "14,17" - latest-cxxstd: "17" - cxx: "clang++-6.0" - cc: "clang-6.0" - runs-on: "ubuntu-latest" - container: "ubuntu:20.04" - b2-toolset: "clang" - name: "Clang 6: C++14-17" - shared: true - build-type: "Release" - - - compiler: "clang" - version: "5" - cxxstd: "11,14" - latest-cxxstd: "14" - cxx: "clang++-5.0" - cc: "clang-5.0" - runs-on: "ubuntu-latest" - container: "ubuntu:18.04" - b2-toolset: "clang" - name: "Clang 5: C++11-14" + name: "Clang 17: C++20" shared: false build-type: "Release" - compiler: "clang" - version: "4" - cxxstd: "11,14" - latest-cxxstd: "14" - cxx: "clang++-4.0" - cc: "clang-4.0" - runs-on: "ubuntu-latest" - container: "ubuntu:18.04" - b2-toolset: "clang" - name: "Clang 4: C++11-14" - shared: true - build-type: "Release" - - - compiler: "clang" - version: "3.9" - cxxstd: "11" - latest-cxxstd: "11" - cxx: "clang++-3.9" - cc: "clang-3.9" + version: "20" + cxxstd: "20,23" + latest-cxxstd: "23" + cxx: "clang++-20" + cc: "clang-20" runs-on: "ubuntu-latest" - container: "ubuntu:18.04" + container: "ubuntu:24.04" b2-toolset: "clang" - is-earliest: true - name: "Clang 3.9: C++11" + is-latest: true + name: "Clang 20: C++20-23 (x86)" shared: false + x86: true build-type: "Release" + install: "gcc-multilib g++-multilib" name: ${{ matrix.name }} - runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)[matrix.runs-on] }} + # Skip self-hosted runner selection for now + # runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)[matrix.runs-on] }} + runs-on: ${{ matrix.runs-on }} container: image: ${{ matrix.container }} options: --privileged - volumes: - - /node20217:/node20217:rw,rshared - - ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }} + timeout-minutes: 120 steps: - - name: install nodejs20glibc2.17 - if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }} - run: | - apt-get update - apt-get -yqq install xz-utils curl - curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz - tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217 - ldd /__e/node20/bin/node - - - name: Clone Boost.WS.Proto - uses: actions/checkout@v3 - with: - path: ws-proto-root - - - name: Clone Boost.Http.Proto - uses: actions/checkout@v3 - with: - repository: cppalliance/http_proto - path: http-proto-root - ref: develop - - - name: Clone Boost.Buffers - uses: actions/checkout@v3 + - name: Clone Boost.Websocket + uses: actions/checkout@v4 with: - path: buffers-root - repository: cppalliance/buffers - ref: develop - - - name: Clone Boost.RunTimeServices - uses: actions/checkout@v3 - with: - path: rts-root - repository: cppalliance/rts - ref: develop + path: websocket-root - name: Setup C++ - uses: alandefreitas/cpp-actions/setup-cpp@v1.8.10 + uses: alandefreitas/cpp-actions/setup-cpp@v1.9.0 id: setup-cpp with: compiler: ${{ matrix.compiler }} version: ${{ matrix.version }} - check-latest: ${{ matrix.compiler != 'clang' || matrix.version != '^3.8' }} + check-latest: true trace-commands: true - name: Install packages - uses: alandefreitas/cpp-actions/package-install@v1.8.10 + uses: alandefreitas/cpp-actions/package-install@v1.9.0 id: package-install with: apt-get-add-architecture: ${{ matrix.x86 && 'i386' || '' }} apt-get: >- ${{ matrix.install }} - build-essential zlib1g-dev - ${{ matrix.x86 && 'zlib1g-dev:i386' || '' }} + build-essential libssl-dev zlib1g-dev libbrotli-dev + ${{ matrix.x86 && 'libssl-dev:i386 zlib1g-dev:i386 libbrotli-dev:i386' || '' }} + + - name: Clone Buffers + uses: actions/checkout@v4 + with: + repository: cppalliance/buffers + ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }} + path: buffers-root + + - name: Clone HTTP + uses: actions/checkout@v4 + with: + repository: cppalliance/http + ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }} + path: http-root + + - name: Clone Capy + uses: actions/checkout@v4 + with: + repository: cppalliance/capy + ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }} + path: capy-root - name: Clone Boost - uses: alandefreitas/cpp-actions/boost-clone@v1.8.10 + uses: alandefreitas/cpp-actions/boost-clone@v1.9.0 id: boost-clone with: branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }} boost-dir: boost-source - cache: false modules-exclude-paths: '' - scan-modules-dir: | - ws-proto-root - http-proto-root - buffers-root - rts-root - scan-modules-ignore: | - ws_proto - http_proto - buffers - rts - - - name: Install packages (Windows) - uses: alandefreitas/cpp-actions/package-install@v1.8.10 + scan-modules-dir: http-root + scan-modules-ignore: websocket,buffers,http,capy + + - name: Install Packages (Windows) + uses: alandefreitas/cpp-actions/package-install@v1.9.0 if: ${{ startsWith(matrix.runs-on, 'windows') }} id: package-install-windows with: - vcpkg: "zlib" + vcpkg: zlib brotli openssl vcpkg-dir: vcpkg-root - vcpkg-triplet: ${{ matrix.x86 && 'x86-windows' || 'x64-windows' }} + vcpkg-triplet: ${{ matrix.x86 && 'x86-windows-static' || 'x64-windows' }} - name: Patch user-config.jam (Windows) id: patch-user-config @@ -902,18 +318,26 @@ jobs: set -xe home=$(pwd) - triplet=${{ matrix.x86 && 'x86-windows' || 'x64-windows' }} + triplet=${{ matrix.x86 && 'x86-windows-static' || 'x64-windows' }} addrmdl=${{ matrix.x86 && '32' || '64' }} - # This is temporary until we move rts/build/brotli.jam to boost/tools/build - echo "import-search ${home}/boost-root/libs/rts/build ;" | sed 's/\/d\//D:\//g' >> user-config.jam + # This is temporary until we move http/build/brotli.jam to boost/tools/build + echo "import-search ${home}/boost-root/libs/http/build ;" | sed 's/\/d\//D:\//g' >> user-config.jam - echo "using zlib : : \"${home}/vcpkg-root/installed/${triplet}/include\" \"${home}/vcpkg-root/installed/${triplet}/lib\" \"${home}/vcpkg-root/installed/${triplet}/bin\" zlib : ${addrmdl} ;" | sed 's/\/d\//D:\//g' >> user-config.jam + echo "using zlib : : \"${home}/vcpkg-root/installed/${triplet}/include\" \"${home}/vcpkg-root/installed/${triplet}/lib\" \"${home}/vcpkg-root/installed/${triplet}/bin\" zlib : ${addrmdl} ;" | sed 's/\/d\//D:\//g' >> user-config.jam + echo "using brotli : : \"${home}/vcpkg-root/installed/${triplet}/include\" \"${home}/vcpkg-root/installed/${triplet}/lib\" \"${home}/vcpkg-root/installed/${triplet}/bin\" : ${addrmdl} ;" | sed 's/\/d\//D:\//g' >> user-config.jam + echo "using openssl : : \"${home}/vcpkg-root/installed/${triplet}/include\" \"${home}/vcpkg-root/installed/${triplet}/lib\" \"${home}/vcpkg-root/installed/${triplet}/bin\" libssl libcrypto : ${addrmdl} ;" | sed 's/\/d\//D:\//g' >> user-config.jam + + cat user-config.jam toolchain=$(echo "$GITHUB_WORKSPACE/vcpkg-root/scripts/buildsystems/vcpkg.cmake" | sed 's/\/d\//D:\//g' ) - cat ${toolchain} echo "toolchain=${toolchain}" >> $GITHUB_OUTPUT + - name: Patch user-config.jam (macOS) + if: ${{ startsWith(matrix.runs-on, 'macOS') }} + run: | + echo "using openssl : : \"$(brew --prefix openssl)/include\" \"$(brew --prefix openssl)/lib\" ;" >> user-config.jam + - name: ASLR Fix if: ${{ startsWith(matrix.runs-on, 'ubuntu' )}} run: | @@ -938,6 +362,9 @@ jobs: # Remove module from boost-source rm -r "boost-source/libs/$module" || true + rm -r "boost-source/libs/buffers" || true + rm -r "boost-source/libs/http" || true + rm -r "boost-source/libs/capy" || true # Copy cached boost-source to an isolated boost-root cp -r boost-source boost-root @@ -949,19 +376,21 @@ jobs: echo -E "boost_root=$boost_root" >> $GITHUB_OUTPUT # Patch boost-root with workspace module - cp -r "$workspace_root"/rts-root libs/rts - cp -r "$workspace_root"/buffers-root libs/buffers - cp -r "$workspace_root"/http-proto-root libs/http_proto - cp -r "$workspace_root"/ws-proto-root libs/ws_proto + cp -r "$workspace_root"/websocket-root "libs/$module" + + # Patch boost-root with dependencies + cp -r "$workspace_root"/buffers-root "libs/buffers" + cp -r "$workspace_root"/http-root "libs/http" + cp -r "$workspace_root"/capy-root "libs/capy" - name: Boost B2 Workflow - uses: alandefreitas/cpp-actions/b2-workflow@v1.8.10 - if: ${{ !matrix.coverage && !matrix.time-trace }} + uses: alandefreitas/cpp-actions/b2-workflow@v1.9.0 + if: ${{ !matrix.coverage }} env: - ASAN_OPTIONS: ${{ (startsWith(matrix.compiler, 'apple-clang') && 'detect_invalid_pointer_pairs=0') || 'detect_invalid_pointer_pairs=2' }} + ASAN_OPTIONS: ${{ ((matrix.compiler == 'apple-clang' || matrix.compiler == 'clang') && 'detect_invalid_pointer_pairs=0:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1') || 'detect_invalid_pointer_pairs=2:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1' }} with: source-dir: boost-root - modules: ws_proto + modules: websocket toolset: ${{ matrix.b2-toolset }} build-variant: ${{ matrix.build-type }} cxx: ${{ steps.setup-cpp.outputs.cxx || matrix.cxx || '' }} @@ -970,21 +399,23 @@ jobs: asan: ${{ matrix.asan }} ubsan: ${{ matrix.ubsan }} shared: ${{ matrix.shared }} - rtti: ${{ (matrix.is-latest && 'on,off') || 'on' }} - cxxflags: ${{ (matrix.asan && '-fsanitize=pointer-subtract') || '' }} - user-config: ${{ (startsWith(matrix.runs-on, 'windows') && format('{0}/user-config.jam', steps.patch.outputs.workspace_root)) || '' }} + rtti: on + cxxflags: ${{ (matrix.asan && '-fsanitize-address-use-after-scope -fsanitize=pointer-subtract') || '' }} + user-config: ${{ ((startsWith(matrix.runs-on, 'windows') || startsWith(matrix.runs-on, 'macOS')) && format('{0}/user-config.jam', steps.patch.outputs.workspace_root)) || '' }} stop-on-error: true - name: Boost CMake Workflow - uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.10 - if: ${{ matrix.coverage || matrix.time-trace || matrix.build-cmake || matrix.is-earliest }} + uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0 + if: ${{ matrix.coverage || matrix.build-cmake || matrix.is-earliest }} with: source-dir: boost-root build-dir: __build_cmake_test__ generator: ${{ matrix.generator }} generator-toolset: ${{ matrix.generator-toolset }} build-type: ${{ matrix.build-type }} + build-target: tests run-tests: true + install: true install-prefix: .local cxxstd: ${{ matrix.latest-cxxstd }} cc: ${{ steps.setup-cpp.outputs.cc || matrix.cc }} @@ -992,15 +423,13 @@ jobs: cxx: ${{ steps.setup-cpp.outputs.cxx || matrix.cxx }} cxxflags: ${{ matrix.cxxflags }} shared: ${{ matrix.shared }} - cmake-version: '>=3.15' + cmake-version: '>=3.20' extra-args: | -D Boost_VERBOSE=ON -D BOOST_INCLUDE_LIBRARIES="${{ steps.patch.outputs.module }}" - -D BOOST_WS_PROTO_BUILD_TESTS=ON - export-compile-commands: ${{ matrix.time-trace }} package: false package-artifact: false - ref-source-dir: boost-root/libs/ws_proto + ref-source-dir: boost-root/libs/websocket toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }} - name: Set Path @@ -1012,9 +441,13 @@ jobs: run: | echo "LD_LIBRARY_PATH=$GITHUB_WORKSPACE/.local/lib:$LD_LIBRARY_PATH" >> "$GITHUB_ENV" + # Disabled: Boost's CMake infrastructure does not generate install rules for + # the "main" library in BOOST_INCLUDE_LIBRARIES, only for its dependencies. + # This causes find_package(Boost COMPONENTS burl) to fail because + # boost_burlConfig.cmake is never installed. - name: Find Package Integration Workflow - uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.10 - if: ${{ matrix.build-cmake || matrix.is-earliest }} + uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0 + if: false # ${{ matrix.build-cmake || matrix.is-earliest }} with: source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test build-dir: __build_cmake_install_test__ @@ -1028,16 +461,16 @@ jobs: cxxflags: ${{ matrix.cxxflags }} shared: ${{ matrix.shared }} install: false - cmake-version: '>=3.20' + cmake-version: '>=3.15' extra-args: | -D BOOST_CI_INSTALL_TEST=ON -D CMAKE_PREFIX_PATH=${{ steps.patch.outputs.workspace_root }}/.local - ref-source-dir: boost-root/libs/ws_proto + ref-source-dir: boost-root/libs/websocket trace-commands: true toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }} - name: Subdirectory Integration Workflow - uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.10 + uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0 if: ${{ matrix.build-cmake || matrix.is-earliest }} with: source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test @@ -1052,13 +485,13 @@ jobs: cxxflags: ${{ matrix.cxxflags }} shared: ${{ matrix.shared }} install: false - cmake-version: '>=3.20' + cmake-version: '>=3.15' extra-args: -D BOOST_CI_INSTALL_TEST=OFF - ref-source-dir: boost-root/libs/ws_proto/test/cmake_test + ref-source-dir: boost-root/libs/websocket/test/cmake_test toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }} - name: Root Project CMake Workflow - uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.10 + uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0 if: ${{ matrix.build-cmake || matrix.is-earliest }} with: source-dir: boost-root/libs/${{ steps.patch.outputs.module }} @@ -1081,14 +514,6 @@ jobs: ref-source-dir: boost-root toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }} - - name: FlameGraph - uses: alandefreitas/cpp-actions/flamegraph@v1.8.10 - if: matrix.time-trace - with: - source-dir: boost-root/libs/ws_proto - build-dir: boost-root/__build_cmake_test__ - github_token: ${{ secrets.GITHUB_TOKEN }} - - name: Codecov if: ${{ matrix.coverage }} run: | @@ -1118,24 +543,26 @@ jobs: echo "" >> $GITHUB_STEP_SUMMARY changelog: - needs: [ runner-selection ] + # needs: [ runner-selection ] defaults: run: shell: bash name: Changelog Summary - runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)['ubuntu-22.04'] }} + # Skip self-hosted runner selection for now + # runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)['ubuntu-22.04'] }} + runs-on: 'ubuntu-22.04' timeout-minutes: 120 steps: - - name: Clone WS.Proto - uses: actions/checkout@v3 + - name: Clone Boost.Websocket + uses: actions/checkout@v4 with: # Avoid the common API rate limit exceeded error in boostorg by including 100 latest commits in any case fetch-depth: 100 - name: Changelog - uses: alandefreitas/cpp-actions/create-changelog@v1.8.10 + uses: alandefreitas/cpp-actions/create-changelog@v1.9.0 with: thank-non-regular: ${{ startsWith(github.ref, 'refs/tags/') }} github-token: ${{ secrets.GITHUB_TOKEN }} @@ -1143,68 +570,55 @@ jobs: tag-pattern: 'boost-.*\..*\..*' antora: - needs: [ runner-selection ] - strategy: - matrix: - include: - - { name: Windows, os: windows-latest } - - { name: Ubuntu, os: ubuntu-latest } - - { name: MacOS, os: macos-15 } - name: Antora Docs (${{ matrix.name }}) - runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)[matrix.os] }} + # needs: [ runner-selection ] + name: Antora Docs + # Skip self-hosted runner selection for now + # runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)['ubuntu-latest'] }} + runs-on: 'ubuntu-latest' defaults: run: shell: bash steps: - name: Install packages - uses: alandefreitas/cpp-actions/package-install@v1.8.7 + uses: alandefreitas/cpp-actions/package-install@v1.9.0 with: apt-get: git cmake - - name: Clone Boost.WS.Proto - uses: actions/checkout@v3 + - name: Clone Boost.Websocket + uses: actions/checkout@v4 with: - path: ws-proto-root + path: websocket-root - - name: Clone Boost.Http.Proto - uses: actions/checkout@v3 + - name: Clone Buffers + uses: actions/checkout@v4 with: - repository: cppalliance/http_proto - path: http-proto-root - ref: develop + repository: cppalliance/buffers + ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }} + path: buffers-root - - name: Clone Boost.Buffers - uses: actions/checkout@v3 + - name: Clone HTTP + uses: actions/checkout@v4 with: - path: buffers-root - repository: cppalliance/buffers - ref: develop + repository: cppalliance/http + ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }} + path: http-root - - name: Clone Boost.RunTimeServices - uses: actions/checkout@v3 + - name: Clone Capy + uses: actions/checkout@v4 with: - path: rts-root - repository: cppalliance/rts - ref: develop + repository: cppalliance/capy + ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }} + path: capy-root - name: Clone Boost - uses: alandefreitas/cpp-actions/boost-clone@v1.8.10 + uses: alandefreitas/cpp-actions/boost-clone@v1.9.0 id: boost-clone with: branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }} boost-dir: boost-source - cache: false modules-exclude-paths: '' - scan-modules-dir: | - ws-proto-root - http-proto-root - buffers-root - rts-root - scan-modules-ignore: | - ws_proto - http_proto - buffers - rts + scan-modules-dir: http-root + scan-modules-ignore: websocket,buffers,http,capy - name: Patch Boost id: patch @@ -1225,6 +639,9 @@ jobs: # Remove module from boost-source rm -r "boost-source/libs/$module" || true + rm -r "boost-source/libs/buffers" || true + rm -r "boost-source/libs/http" || true + rm -r "boost-source/libs/capy" || true # Copy cached boost-source to an isolated boost-root cp -r boost-source boost-root @@ -1236,32 +653,30 @@ jobs: echo -E "boost_root=$boost_root" >> $GITHUB_OUTPUT # Patch boost-root with workspace module - cp -r "$workspace_root"/rts-root libs/rts - cp -r "$workspace_root"/buffers-root libs/buffers - cp -r "$workspace_root"/http-proto-root libs/http_proto - cp -r "$workspace_root"/ws-proto-root libs/ws_proto + cp -r "$workspace_root"/websocket-root "libs/$module" + + # Patch boost-root with dependencies + cp -r "$workspace_root"/buffers-root "libs/buffers" + cp -r "$workspace_root"/http-root "libs/http" + cp -r "$workspace_root"/capy-root "libs/capy" - uses: actions/setup-node@v4 with: node-version: 18 - - name: Setup Ninja - if: runner.os == 'Windows' - uses: seanmiddleditch/gha-setup-ninja@v5 - - name: Build Antora Docs env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | git config --global --add safe.directory "$(pwd)" - + BOOST_SRC_DIR="$(pwd)/boost-root" export BOOST_SRC_DIR - cd boost-root/libs/ws_proto - + cd boost-root/libs/websocket + cd doc bash ./build_antora.sh - + # Antora returns zero even if it fails, so we check if the site directory exists if [ ! -d "build/site" ]; then echo "Antora build failed" @@ -1271,5 +686,5 @@ jobs: - name: Create Antora Docs Artifact uses: actions/upload-artifact@v4 with: - name: antora-docs-${{ matrix.name }} - path: boost-root/libs/ws_proto/doc/build/site + name: antora-docs + path: boost-root/libs/websocket/doc/build/site diff --git a/CMakeLists.txt b/CMakeLists.txt index 804d950..cafa893 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ # Distributed under the Boost Software License, Version 1.0. (See accompanying # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # -# Official repository: https://github.com/cppalliance/ws_proto +# Official repository: https://github.com/cppalliance/websocket # #------------------------------------------------- @@ -16,14 +16,14 @@ # #------------------------------------------------- cmake_minimum_required(VERSION 3.8...3.20) -set(BOOST_WS_PROTO_VERSION 1) +set(BOOST_WEBSOCKET_VERSION 1) if (BOOST_SUPERPROJECT_VERSION) - set(BOOST_WS_PROTO_VERSION ${BOOST_SUPERPROJECT_VERSION}) + set(BOOST_WEBSOCKET_VERSION ${BOOST_SUPERPROJECT_VERSION}) endif () -project(boost_ws_proto VERSION "${BOOST_WS_PROTO_VERSION}" LANGUAGES CXX) -set(BOOST_WS_PROTO_IS_ROOT OFF) +project(boost_websocket VERSION "${BOOST_WEBSOCKET_VERSION}" LANGUAGES CXX) +set(BOOST_WEBSOCKET_IS_ROOT OFF) if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - set(BOOST_WS_PROTO_IS_ROOT ON) + set(BOOST_WEBSOCKET_IS_ROOT ON) endif () set(__ignore__ ${CMAKE_C_COMPILER}) @@ -32,11 +32,11 @@ set(__ignore__ ${CMAKE_C_COMPILER}) # Options # #------------------------------------------------- -if (BOOST_WS_PROTO_IS_ROOT) +if (BOOST_WEBSOCKET_IS_ROOT) include(CTest) endif () -option(BOOST_WS_PROTO_BUILD_TESTS "Build boost::ws_proto tests" ${BUILD_TESTING}) -option(BOOST_WS_PROTO_BUILD_EXAMPLES "Build boost::ws_proto examples" ${BOOST_WS_PROTO_IS_ROOT}) +option(BOOST_WEBSOCKET_BUILD_TESTS "Build boost::websocket tests" ${BUILD_TESTING}) +option(BOOST_WEBSOCKET_BUILD_EXAMPLES "Build boost::websocket examples" ${BOOST_WEBSOCKET_IS_ROOT}) # Check if environment variable BOOST_SRC_DIR is set @@ -53,33 +53,33 @@ set(BOOST_SRC_DIR ${DEFAULT_BOOST_SRC_DIR} CACHE STRING "Boost source dir to use # #------------------------------------------------- # The boost super-project requires one explicit dependency per-line. -set(BOOST_WS_PROTO_DEPENDENCIES - Boost::http_proto +set(BOOST_WEBSOCKET_DEPENDENCIES + Boost::http Boost::url ) -foreach (BOOST_WS_PROTO_DEPENDENCY ${BOOST_WS_PROTO_DEPENDENCIES}) - if (BOOST_WS_PROTO_DEPENDENCY MATCHES "^[ ]*Boost::([A-Za-z0-9_]+)[ ]*$") - list(APPEND BOOST_WS_PROTO_INCLUDE_LIBRARIES ${CMAKE_MATCH_1}) +foreach (BOOST_WEBSOCKET_DEPENDENCY ${BOOST_WEBSOCKET_DEPENDENCIES}) + if (BOOST_WEBSOCKET_DEPENDENCY MATCHES "^[ ]*Boost::([A-Za-z0-9_]+)[ ]*$") + list(APPEND BOOST_WEBSOCKET_INCLUDE_LIBRARIES ${CMAKE_MATCH_1}) endif () endforeach () # Conditional dependencies -if (BOOST_WS_PROTO_BUILD_TESTS) - # set(BOOST_WS_PROTO_UNIT_TEST_LIBRARIES filesystem) +if (BOOST_WEBSOCKET_BUILD_TESTS) + # set(BOOST_WEBSOCKET_UNIT_TEST_LIBRARIES filesystem) endif () -if (BOOST_WS_PROTO_BUILD_EXAMPLES) - # set(BOOST_WS_PROTO_EXAMPLE_LIBRARIES json) +if (BOOST_WEBSOCKET_BUILD_EXAMPLES) + # set(BOOST_WEBSOCKET_EXAMPLE_LIBRARIES json) endif () # Complete dependency list -set(BOOST_INCLUDE_LIBRARIES ${BOOST_WS_PROTO_INCLUDE_LIBRARIES} ${BOOST_WS_PROTO_UNIT_TEST_LIBRARIES} ${BOOST_WS_PROTO_EXAMPLE_LIBRARIES}) -set(BOOST_EXCLUDE_LIBRARIES ws_proto) +set(BOOST_INCLUDE_LIBRARIES ${BOOST_WEBSOCKET_INCLUDE_LIBRARIES} ${BOOST_WEBSOCKET_UNIT_TEST_LIBRARIES} ${BOOST_WEBSOCKET_EXAMPLE_LIBRARIES}) +set(BOOST_EXCLUDE_LIBRARIES websocket) #------------------------------------------------- # # Add Boost Subdirectory # #------------------------------------------------- -if (BOOST_WS_PROTO_IS_ROOT) +if (BOOST_WEBSOCKET_IS_ROOT) set(CMAKE_FOLDER Dependencies) # Find absolute BOOST_SRC_DIR if (NOT IS_ABSOLUTE ${BOOST_SRC_DIR}) @@ -110,7 +110,7 @@ if (BOOST_WS_PROTO_IS_ROOT) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${BOOST_SRC_DIR}/tools/cmake/include") else () # From Boost Package - find_package(Boost REQUIRED COMPONENTS http_proto) + find_package(Boost REQUIRED COMPONENTS http) foreach (BOOST_INCLUDE_LIBRARY ${BOOST_INCLUDE_LIBRARIES}) if (NOT TARGET Boost::${BOOST_INCLUDE_LIBRARY}) add_library(Boost::${BOOST_INCLUDE_LIBRARY} ALIAS Boost::headers) @@ -127,25 +127,25 @@ endif () #------------------------------------------------- set_property(GLOBAL PROPERTY USE_FOLDERS ON) -file(GLOB_RECURSE BOOST_WS_PROTO_HEADERS CONFIGURE_DEPENDS include/boost/ws_proto/*.hpp include/boost/ws_proto/*.natvis) -file(GLOB_RECURSE BOOST_WS_PROTO_SOURCES CONFIGURE_DEPENDS src/*.cpp src/*.hpp) +file(GLOB_RECURSE BOOST_WEBSOCKET_HEADERS CONFIGURE_DEPENDS include/boost/websocket/*.hpp include/boost/websocket/*.natvis) +file(GLOB_RECURSE BOOST_WEBSOCKET_SOURCES CONFIGURE_DEPENDS src/*.cpp src/*.hpp) -source_group("" FILES "include/boost/ws_proto.hpp" "build/Jamfile") -source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include/boost/ws_proto PREFIX "include" FILES ${BOOST_WS_PROTO_HEADERS}) -source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX "src" FILES ${BOOST_WS_PROTO_SOURCES}) +source_group("" FILES "include/boost/websocket.hpp" "build/Jamfile") +source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include/boost/websocket PREFIX "include" FILES ${BOOST_WEBSOCKET_HEADERS}) +source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX "src" FILES ${BOOST_WEBSOCKET_SOURCES}) -add_library(boost_ws_proto include/boost/ws_proto.hpp build/Jamfile ${BOOST_WS_PROTO_HEADERS} ${BOOST_WS_PROTO_SOURCES}) -add_library(Boost::ws_proto ALIAS boost_ws_proto) -target_compile_features(boost_ws_proto PUBLIC cxx_constexpr) -target_include_directories(boost_ws_proto PUBLIC "${PROJECT_SOURCE_DIR}/include") -target_include_directories(boost_ws_proto PRIVATE "${PROJECT_SOURCE_DIR}") -target_link_libraries(boost_ws_proto PUBLIC ${BOOST_WS_PROTO_DEPENDENCIES}) -target_compile_definitions(boost_ws_proto PUBLIC BOOST_WS_PROTO_NO_LIB) -target_compile_definitions(boost_ws_proto PRIVATE BOOST_WS_PROTO_SOURCE) +add_library(boost_websocket include/boost/websocket.hpp build/Jamfile ${BOOST_WEBSOCKET_HEADERS} ${BOOST_WEBSOCKET_SOURCES}) +add_library(Boost::websocket ALIAS boost_websocket) +target_compile_features(boost_websocket PUBLIC cxx_constexpr) +target_include_directories(boost_websocket PUBLIC "${PROJECT_SOURCE_DIR}/include") +target_include_directories(boost_websocket PRIVATE "${PROJECT_SOURCE_DIR}") +target_link_libraries(boost_websocket PUBLIC ${BOOST_WEBSOCKET_DEPENDENCIES}) +target_compile_definitions(boost_websocket PUBLIC BOOST_WEBSOCKET_NO_LIB) +target_compile_definitions(boost_websocket PRIVATE BOOST_WEBSOCKET_SOURCE) if (BUILD_SHARED_LIBS) - target_compile_definitions(boost_ws_proto PUBLIC BOOST_WS_PROTO_DYN_LINK) + target_compile_definitions(boost_websocket PUBLIC BOOST_WEBSOCKET_DYN_LINK) else () - target_compile_definitions(boost_ws_proto PUBLIC BOOST_WS_PROTO_STATIC_LINK) + target_compile_definitions(boost_websocket PUBLIC BOOST_WEBSOCKET_STATIC_LINK) endif () #------------------------------------------------- @@ -153,7 +153,7 @@ endif () # Tests # #------------------------------------------------- -if (BOOST_WS_PROTO_BUILD_TESTS) +if (BOOST_WEBSOCKET_BUILD_TESTS) add_subdirectory(test) endif () @@ -162,6 +162,6 @@ endif () # Examples # #------------------------------------------------- -if (BOOST_WS_PROTO_BUILD_EXAMPLES) +if (BOOST_WEBSOCKET_BUILD_EXAMPLES) # add_subdirectory(example) endif () diff --git a/README.adoc b/README.adoc index 189778d..17fc95b 100644 --- a/README.adoc +++ b/README.adoc @@ -1,42 +1,42 @@ -http://master.ws-proto.cpp.al/[image:doc/modules/ROOT/images/repo-logo.png[Boost.WS.Proto]] +http://master.websocket.cpp.al/[image:doc/modules/ROOT/images/repo-logo.png[Boost.Websocket]] [width="100%",cols="7%,66%,27%",options="header",] |=== |Branch -|https://github.com/cppalliance/ws_proto/tree/master[`master`] -|https://github.com/cppalliance/ws_proto/tree/develop[`develop`] +|https://github.com/cppalliance/websocket/tree/master[`master`] +|https://github.com/cppalliance/websocket/tree/develop[`develop`] -|https://develop.ws-proto.cpp.al/[Docs] -|https://master.ws-proto.cpp.al/[image:https://img.shields.io/badge/docs-master-brightgreen.svg[Documentation]] -|https://develop.ws-proto.cpp.al/[image:https://img.shields.io/badge/docs-develop-brightgreen.svg[Documentation]] +|https://develop.websocket.cpp.al/[Docs] +|https://master.websocket.cpp.al/[image:https://img.shields.io/badge/docs-master-brightgreen.svg[Documentation]] +|https://develop.websocket.cpp.al/[image:https://img.shields.io/badge/docs-develop-brightgreen.svg[Documentation]] |https://github.com/[GitHub Actions] -|https://github.com/cppalliance/ws_proto/actions/workflows/ci.yml?query=branch%3Amaster[image:https://github.com/cppalliance/ws_proto/actions/workflows/ci.yml/badge.svg?branch=master[CI]] -|https://github.com/cppalliance/ws_proto/actions/workflows/ci.yml?query=branch%3Adevelop[image:https://github.com/cppalliance/ws_proto/actions/workflows/ci.yml/badge.svg?branch=develop[CI]] +|https://github.com/cppalliance/websocket/actions/workflows/ci.yml?query=branch%3Amaster[image:https://github.com/cppalliance/websocket/actions/workflows/ci.yml/badge.svg?branch=master[CI]] +|https://github.com/cppalliance/websocket/actions/workflows/ci.yml?query=branch%3Adevelop[image:https://github.com/cppalliance/websocket/actions/workflows/ci.yml/badge.svg?branch=develop[CI]] |https://drone.io/[Drone] -|https://drone.cpp.al/cppalliance/ws_proto/branches[image:https://drone.cpp.al/api/badges/cppalliance/ws_proto/status.svg?ref=refs/heads/master[Build Status]] -|https://drone.cpp.al/cppalliance/ws_proto/branches[image:https://drone.cpp.al/api/badges/cppalliance/ws_proto/status.svg?ref=refs/heads/develop[Build Status]] +|https://drone.cpp.al/cppalliance/websocket/branches[image:https://drone.cpp.al/api/badges/cppalliance/websocket/status.svg?ref=refs/heads/master[Build Status]] +|https://drone.cpp.al/cppalliance/websocket/branches[image:https://drone.cpp.al/api/badges/cppalliance/websocket/status.svg?ref=refs/heads/develop[Build Status]] |https://codecov.io[Codecov] -|https://app.codecov.io/gh/cppalliance/ws_proto/tree/master[image:https://codecov.io/gh/cppalliance/ws_proto/branch/master/graph/badge.svg[codecov]] -|https://app.codecov.io/gh/cppalliance/ws_proto/tree/develop[image:https://codecov.io/gh/cppalliance/ws_proto/branch/develop/graph/badge.svg[codecov]] +|https://app.codecov.io/gh/cppalliance/websocket/tree/master[image:https://codecov.io/gh/cppalliance/websocket/branch/master/graph/badge.svg[codecov]] +|https://app.codecov.io/gh/cppalliance/websocket/tree/develop[image:https://codecov.io/gh/cppalliance/websocket/branch/develop/graph/badge.svg[codecov]] |=== -== Boost.WS.Proto +== Boost.Websocket === This is currently **NOT** an official Boost library. === Overview -Boost.WS.Proto is a portable, low-level C++ library which provides containers +Boost.Websocket is a portable, low-level C++ library which provides containers and algorithms for implementing the WebSocket protocol described in the document https://datatracker.ietf.org/doc/html/rfc6455[The WebSocket Protocol]. -Boost.WS.Proto offers these features: +Boost.Websocket offers these features: * Require only C++11 * Works without exceptions @@ -53,20 +53,20 @@ Boost.WS.Proto offers these features: ==== Header-Only To eliminate the requirement to link a program to a static or dynamic -Boost.WS.Proto library, simply place the following line in *exactly one* +Boost.Websocket library, simply place the following line in *exactly one* source file in your project. ``` -#include +#include ``` ==== Embedded -Boost.WS.Proto works great on embedded devices. +Boost.Websocket works great on embedded devices. It is designed to work without exceptions if desired. ==== Supported Compilers -Boost.WS.Proto has been tested with the following compilers: +Boost.Websocket has been tested with the following compilers: * clang: 3.8, 4, 5, 6, 7, 8, 9, 10, 11, 12 * gcc: 5, 6, 7, 8, 9, 10, 11, 12 @@ -85,8 +85,8 @@ these per-commit analyses: === Visual Studio Solution Generation ``` -cmake -G "Visual Studio 17 2022" -A win32 -B bin -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE="C:/Users/vinnie/src/boost/libs/ws_proto/cmake/toolchains/msvc.cmake" -cmake -G "Visual Studio 17 2022" -A x64 -B bin64 -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE="C:/Users/vinnie/src/boost/libs/ws_proto/cmake/toolchains/msvc.cmake" +cmake -G "Visual Studio 17 2022" -A win32 -B bin -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE="C:/Users/vinnie/src/boost/libs/websocket/cmake/toolchains/msvc.cmake" +cmake -G "Visual Studio 17 2022" -A x64 -B bin64 -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE="C:/Users/vinnie/src/boost/libs/websocket/cmake/toolchains/msvc.cmake" ``` === License diff --git a/build/Jamfile b/build/Jamfile index 364d237..7f0d6a4 100644 --- a/build/Jamfile +++ b/build/Jamfile @@ -4,7 +4,7 @@ # Distributed under the Boost Software License, Version 1.0. (See accompanying # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # -# Official repository: https://github.com/cppalliance/ws_proto +# Official repository: https://github.com/cppalliance/websocket # import ac ; @@ -22,34 +22,34 @@ constant c11-requires : ] ; -path-constant WS_PROTO_ROOT : .. ; +path-constant WEBSOCKET_ROOT : .. ; -project boost/ws_proto +project boost/websocket : requirements $(c11-requires) - shared:BOOST_WS_PROTO_DYN_LINK=1 - static:BOOST_WS_PROTO_STATIC_LINK=1 + shared:BOOST_WEBSOCKET_DYN_LINK=1 + static:BOOST_WEBSOCKET_STATIC_LINK=1 : usage-requirements - shared:BOOST_WS_PROTO_DYN_LINK=1 - static:BOOST_WS_PROTO_STATIC_LINK=1 - : source-location $(WS_PROTO_ROOT) + shared:BOOST_WEBSOCKET_DYN_LINK=1 + static:BOOST_WEBSOCKET_STATIC_LINK=1 + : source-location $(WEBSOCKET_ROOT) ; -alias ws_proto_sources : [ glob-tree-ex ./src : *.cpp ] ; +alias websocket_sources : [ glob-tree-ex ./src : *.cpp ] ; -explicit ws_proto_sources ; +explicit websocket_sources ; -lib boost_ws_proto - : ws_proto_sources +lib boost_websocket + : websocket_sources : requirements /boost//buffers - /boost//http_proto + /boost//http /boost//url ../ - BOOST_WS_PROTO_SOURCE + BOOST_WEBSOCKET_SOURCE : usage-requirements /boost//buffers - /boost//http_proto + /boost//http ; -boost-install boost_ws_proto ; +boost-install boost_websocket ; diff --git a/doc/antora.yml b/doc/antora.yml index 1ffd33f..cfdf13a 100644 --- a/doc/antora.yml +++ b/doc/antora.yml @@ -1,6 +1,6 @@ -name: ws_proto +name: websocket version: ~ -title: Boost.WS.Proto +title: Boost.Websocket start_page: index.adoc asciidoc: attributes: @@ -11,3 +11,6 @@ nav: ext: cpp-reference: config: doc/mrdocs.yml + cpp-tagfiles: + using-namespaces: + - boost::websocket diff --git a/doc/build_antora.bat b/doc/build_antora.bat index 69d7d40..829f46d 100644 --- a/doc/build_antora.bat +++ b/doc/build_antora.bat @@ -17,5 +17,5 @@ call "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 set "PATH=%PATH%;C:\Program Files\7-Zip" set "PATH=%PATH%;%CD%\node_modules\.bin" -call npx antora --clean --fetch "%PLAYBOOK%" --stacktrace --log-level all +call npx antora --clean --fetch "%PLAYBOOK%" echo Done diff --git a/doc/build_antora.sh b/doc/build_antora.sh index 93901b3..5a5f1fe 100755 --- a/doc/build_antora.sh +++ b/doc/build_antora.sh @@ -1,10 +1,10 @@ # -# Copyright (c) 2023 Alan de Freitas (alandefreitas@gmail.com) +# Copyright (c) 2024 Mohammad Nejati # # Distributed under the Boost Software License, Version 1.0. (See accompanying # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # -# Official repository: https://github.com/boostorg/url +# Official repository: https://github.com/cppalliance/websocket # set -xe @@ -19,11 +19,11 @@ fi echo "Building documentation with Antora..." echo "Installing npm dependencies..." -npm ci +npm install echo "Building docs in custom dir..." PATH="$(pwd)/node_modules/.bin:${PATH}" export PATH -npx antora --clean --fetch "$PLAYBOOK" --stacktrace --log-level all +npx antora --clean --fetch "$PLAYBOOK" echo "Done" diff --git a/doc/local-playbook.yml b/doc/local-playbook.yml index 3ff579e..edc09cf 100644 --- a/doc/local-playbook.yml +++ b/doc/local-playbook.yml @@ -1,16 +1,16 @@ site: - title: Boost.WS.Proto + title: Boost.Websocket url: https://antora.cppalliance.org/develop/lib/doc - start_page: ws_proto::index.adoc + start_page: websocket::index.adoc robots: allow keys: - repo_url: 'https://github.com/cppalliance/ws_proto' + repo_url: 'https://github.com/cppalliance/websocket' content: sources: - url: .. start_path: doc - edit_url: 'https://github.com/cppalliance/ws_proto/edit/{refname}/{path}' + edit_url: 'https://github.com/cppalliance/websocket/edit/{refname}/{path}' ui: bundle: @@ -19,8 +19,11 @@ ui: antora: extensions: - - require: '@antora/lunr-extension' # https://gitlab.com/antora/antora-lunr-extension - index_latest_only: true + - require: '@sntke/antora-mermaid-extension' + mermaid_library_url: https://cdn.jsdelivr.net/npm/mermaid@10/dist/mermaid.esm.min.mjs + script_stem: header-scripts + mermaid_initialize_options: + start_on_load: true - require: '@cppalliance/antora-cpp-tagfiles-extension' cpp-tagfiles: using-namespaces: diff --git a/doc/modules/ROOT/nav.adoc b/doc/modules/ROOT/nav.adoc index fbe3bca..678b380 100644 --- a/doc/modules/ROOT/nav.adoc +++ b/doc/modules/ROOT/nav.adoc @@ -1,3 +1,3 @@ * xref:sans_io_philosophy.adoc[] * xref:design.adoc[] -* xref:reference:boost/ws_proto.adoc[Reference] +* xref:reference:boost/websocket.adoc[Reference] diff --git a/doc/modules/ROOT/pages/design.adoc b/doc/modules/ROOT/pages/design.adoc index 3379b3f..b38ce92 100644 --- a/doc/modules/ROOT/pages/design.adoc +++ b/doc/modules/ROOT/pages/design.adoc @@ -4,7 +4,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // @@ -31,7 +31,7 @@ fixed cost for each I/O. The fraction of resources lost to overhead can be reduced by using the largest practically sized buffer possible in each read operation. -The `ws_proto::frame_stream` decoder uses a persistent, fixed-size internal +The `websocket::frame_stream` decoder uses a persistent, fixed-size internal buffer to hold incoming bytes from the peer and decode the frames inside. Because the buffer does not resize, this can produce zero or more complete frames and up to two partial frames. At the beginning of a session, the first diff --git a/doc/modules/ROOT/pages/index.adoc b/doc/modules/ROOT/pages/index.adoc index eb975b3..77d5d80 100644 --- a/doc/modules/ROOT/pages/index.adoc +++ b/doc/modules/ROOT/pages/index.adoc @@ -4,12 +4,12 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -= Boost.WS.Proto += Boost.Websocket -Boost.WS.Proto is a portable C++ library which provides containers and +Boost.Websocket is a portable C++ library which provides containers and algorithms which implement the HTTP/1.1 protocol, widely used to deliver content on the Internet. It adheres strictly to the HTTP/1.1 RFC specification (henceforth referred to as https://datatracker.ietf.org/doc/html/rfc9110[rfc9110,window=blank_]). @@ -27,7 +27,7 @@ Standard types such as `error_code` or `string_view` use their Boost equivalents == Tested Compilers -Boost.WS.Proto has been tested with the following compilers: +Boost.Websocket has been tested with the following compilers: * clang: * gcc: diff --git a/doc/modules/ROOT/pages/sans_io_philosophy.adoc b/doc/modules/ROOT/pages/sans_io_philosophy.adoc index 9aa8395..f59a3ec 100644 --- a/doc/modules/ROOT/pages/sans_io_philosophy.adoc +++ b/doc/modules/ROOT/pages/sans_io_philosophy.adoc @@ -4,7 +4,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // diff --git a/doc/mrdocs.yml b/doc/mrdocs.yml index ec1ceda..f1e87be 100644 --- a/doc/mrdocs.yml +++ b/doc/mrdocs.yml @@ -9,20 +9,21 @@ file-patterns: # Filters include-symbols: - - 'boost::ws_proto::**' + - 'boost::websocket::**' implementation-defined: - - 'boost::ws_proto::detail' - - 'boost::ws_proto::*::detail' + - 'boost::websocket::detail' + - 'boost::websocket::*::detail' inaccessible-members: never inaccessible-bases: never # Generator generate: adoc -base-url: https://www.github.com/cppalliance/ws_proto/blob/develop/include/ +base-url: https://www.github.com/cppalliance/websocket/blob/develop/include/ # Style verbose: true multipage: true use-system-libc: true +use-system-stdlib: true -cmake: '-DCMAKE_CXX_STANDARD=20 -DBOOST_WS_PROTO_BUILD_TESTS=OFF -DBOOST_WS_PROTO_BUILD_EXAMPLES=OFF' +cmake: '-DCMAKE_CXX_STANDARD=20 -DBOOST_WEBSOCKET_BUILD_TESTS=OFF -DBOOST_WEBSOCKET_BUILD_EXAMPLES=OFF' diff --git a/doc/package-lock.json b/doc/package-lock.json index 5d48843..89b7458 100644 --- a/doc/package-lock.json +++ b/doc/package-lock.json @@ -5,28 +5,29 @@ "packages": { "": { "dependencies": { - "@antora/expand-path-helper": "^2.0.0", - "@antora/lunr-extension": "^1.0.0-alpha.8", - "@asciidoctor/tabs": "^1.0.0-beta.3", - "@cppalliance/antora-cpp-reference-extension": "^0.0.6", - "@cppalliance/antora-cpp-tagfiles-extension": "^0.0.4", + "@antora/expand-path-helper": "^3.0.0", + "@antora/lunr-extension": "^1.0.0-alpha.12", + "@asciidoctor/tabs": "^1.0.0-beta.6", + "@cppalliance/antora-cpp-reference-extension": "^0.1.0", + "@cppalliance/antora-cpp-tagfiles-extension": "^0.1.0", + "@cppalliance/antora-downloads-extension": "^0.0.2", "@cppalliance/asciidoctor-boost-links": "^0.0.2" }, "devDependencies": { - "@antora/cli": "3.1.3", - "@antora/site-generator": "3.1.3", - "antora": "3.1.3" + "@antora/cli": "3.1.14", + "@antora/site-generator": "3.1.14", + "antora": "3.1.14" } }, "node_modules/@antora/asciidoc-loader": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-3.1.3.tgz", - "integrity": "sha512-nCmfdxPSBW3rwZ6Aa+xZH9XRDSHOkx28B5VJ2gHlZr8Nl1cx3nvwcP7l/FqYCW/q4mke/ozj/PpjsyC1K5BZVQ==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-3.1.14.tgz", + "integrity": "sha512-4xxisnoBFrlLNY6f3xZtyyfgm+tBLsqesTcEStfc8jtXUMYJ4b2DWIzo1vULmxvZ7yY5+Q7YqEvS5o6kIWAG0A==", "dev": true, "license": "MPL-2.0", "dependencies": { - "@antora/logger": "3.1.3", - "@antora/user-require-helper": "~2.0", + "@antora/logger": "3.1.14", + "@antora/user-require-helper": "~3.0", "@asciidoctor/core": "~2.2" }, "engines": { @@ -34,16 +35,16 @@ } }, "node_modules/@antora/cli": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@antora/cli/-/cli-3.1.3.tgz", - "integrity": "sha512-ABngPywk4yZfUE/gaej7ApFeB/0cr5bkW7S4wqObzU5m29q2wDcvrtn/c2mrzFSeSDNAf9y7RCRnudAV5SteBA==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/@antora/cli/-/cli-3.1.14.tgz", + "integrity": "sha512-I6WcygMU2bFInjdURJjkYjo7K5M8B3lBB53v9OO0IcY0LhEY8Wa7IlZ7wVinf5qEjHvaYzRGTZVl6RsJtVt7Sw==", "dev": true, "license": "MPL-2.0", "dependencies": { - "@antora/logger": "3.1.3", - "@antora/playbook-builder": "3.1.3", - "@antora/user-require-helper": "~2.0", - "commander": "~9.4" + "@antora/logger": "3.1.14", + "@antora/playbook-builder": "3.1.14", + "@antora/user-require-helper": "~3.0", + "commander": "~11.1" }, "bin": { "antora": "bin/antora" @@ -53,140 +54,140 @@ } }, "node_modules/@antora/content-aggregator": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-3.1.3.tgz", - "integrity": "sha512-c+Z+7RVmgu2rvVDRzG8yqSJEmJHnpmTC24aVgvFbb/oU7+YRAVifacgzRl2khOmuky7qKiQxLYmyXJBtRgb37w==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-3.1.14.tgz", + "integrity": "sha512-FVuBgnrGPiktYqK1WHbGF8O8l4m5KHlkxoJumrbacgFo8SKuiRFEo31zalxrCUsv8QM3UBEgX+LdHrve/9CGLg==", "dev": true, "license": "MPL-2.0", "dependencies": { - "@antora/expand-path-helper": "~2.0", - "@antora/logger": "3.1.3", - "@antora/user-require-helper": "~2.0", + "@antora/expand-path-helper": "~3.0", + "@antora/logger": "3.1.14", + "@antora/user-require-helper": "~3.0", "braces": "~3.0", "cache-directory": "~2.0", - "glob-stream": "~7.0", - "hpagent": "~1.1", - "isomorphic-git": "~1.21", + "fast-glob": "~3.3", + "hpagent": "~1.2", + "isomorphic-git": "~1.25", "js-yaml": "~4.1", "multi-progress": "~4.0", - "picomatch": "~2.3", + "picomatch": "~4.0", "progress": "~2.0", "should-proxy": "~1.0", "simple-get": "~4.0", - "vinyl": "~2.2" + "vinyl": "~3.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@antora/content-classifier": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-3.1.3.tgz", - "integrity": "sha512-auPS1WVRa1khhY7EpEkP+strR+6A6UOm23skEUKzQKESKl6j9KRqxxurvMMKDUmtrAeZ1GqjX5dC/bPfUPNpmw==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-3.1.14.tgz", + "integrity": "sha512-y8Fk+KU1lqD3aawOu3ZFK92YfOZ1k3YBJhLI9QIFM6Ck4STPnf7AwYbhfOtjODlwer5/OhFmfhjUB2hn7onGnA==", "dev": true, "license": "MPL-2.0", "dependencies": { - "@antora/asciidoc-loader": "3.1.3", - "@antora/logger": "3.1.3", + "@antora/asciidoc-loader": "3.1.14", + "@antora/logger": "3.1.14", "mime-types": "~2.1", - "vinyl": "~2.2" + "vinyl": "~3.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@antora/document-converter": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@antora/document-converter/-/document-converter-3.1.3.tgz", - "integrity": "sha512-9h8jCsf3C1YNMpmKX141kY4WD/W8Roo8T4Y6OToIIKRjNSPnT8KWLFB8NzHXyLNhV1H9EeS/eNdbvxDzBd/VvQ==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/@antora/document-converter/-/document-converter-3.1.14.tgz", + "integrity": "sha512-f6wFnL+489DI0ZDgoxYWzbxxWqPviRiJ56OHS1NixEfvJ7OpRBDPEbX1xnsIeiyFBgqX4+nY92MsCWKTa+Gf3w==", "dev": true, "license": "MPL-2.0", "dependencies": { - "@antora/asciidoc-loader": "3.1.3" + "@antora/asciidoc-loader": "3.1.14" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@antora/expand-path-helper": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@antora/expand-path-helper/-/expand-path-helper-2.0.0.tgz", - "integrity": "sha512-CSMBGC+tI21VS2kGW3PV7T2kQTM5eT3f2GTPVLttwaNYbNxDve08en/huzszHJfxo11CcEs26Ostr0F2c1QqeA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@antora/expand-path-helper/-/expand-path-helper-3.0.0.tgz", + "integrity": "sha512-7PdEIhk97v85/CSm3HynCsX14TR6oIVz1s233nNLsiWubE8tTnpPt4sNRJR+hpmIZ6Bx9c6QDp3XIoiyu/WYYA==", + "license": "MPL-2.0", "engines": { - "node": ">=10.17.0" + "node": ">=16.0.0" } }, "node_modules/@antora/file-publisher": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@antora/file-publisher/-/file-publisher-3.1.3.tgz", - "integrity": "sha512-4c2RVaJkLvYXbUZP2VF/hFVSZ6UAPNPgt/iurexr3D7OqKrYJnYqchXsLhut2yCLYVOzedXGMst0y2XaEi52qA==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/@antora/file-publisher/-/file-publisher-3.1.14.tgz", + "integrity": "sha512-fTaAnkyKSOlsxQM1TBFCAmiERA6Q67XleDCD2bMPVgfcENmo0Xfx59KwCHaA92IcRSmMftydlXHPaFxNh0UVsg==", "dev": true, "license": "MPL-2.0", "dependencies": { - "@antora/expand-path-helper": "~2.0", - "@antora/user-require-helper": "~2.0", - "gulp-vinyl-zip": "~2.5", - "vinyl": "~2.2", - "vinyl-fs": "~3.0" + "@antora/expand-path-helper": "~3.0", + "@antora/user-require-helper": "~3.0", + "vinyl": "~3.0", + "yazl": "~2.5" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@antora/logger": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@antora/logger/-/logger-3.1.3.tgz", - "integrity": "sha512-6h0PTYHF9C/I9CiYJmlTME7H9dEkMI1luGMQdYhPL9OicbZ5/HsUPKOvGfLNHzw2iyG0yp5bLVvcr9K69ArgtQ==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/@antora/logger/-/logger-3.1.14.tgz", + "integrity": "sha512-kVEeGqZbXR903hPIm+BlN97fLdQ3LoUzE/BOPZ6vRp9m9Mmbnm67Kg7fSYkfTMLB0S2UWpAPFg22RdsU5ZoAzA==", "dev": true, "license": "MPL-2.0", "dependencies": { - "@antora/expand-path-helper": "~2.0", - "pino": "~8.7", - "pino-pretty": "~9.1", - "sonic-boom": "~3.2" + "@antora/expand-path-helper": "~3.0", + "pino": "~9.2", + "pino-pretty": "~11.2", + "sonic-boom": "~4.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@antora/lunr-extension": { - "version": "1.0.0-alpha.8", - "resolved": "https://registry.npmjs.org/@antora/lunr-extension/-/lunr-extension-1.0.0-alpha.8.tgz", - "integrity": "sha512-vdBgW3rsvbnmA236kT2Dckh9n0Db5za2/WxiLnFLgZ05ZO1KJQa9+R2WHaIFuGE7bKKbY+lqfM/i3KiezbL9YQ==", + "version": "1.0.0-alpha.12", + "resolved": "https://registry.npmjs.org/@antora/lunr-extension/-/lunr-extension-1.0.0-alpha.12.tgz", + "integrity": "sha512-iiEXpJae8tCH22ao7kZ4I+eyQ/3IeFIFK1G5I9QLpkCezaVPotI8eLFY7e0xDI+zsqJEfCOsfoZGYXso6xCYlA==", + "license": "MPL-2.0", "workspaces": [ "." ], "dependencies": { - "cheerio": "1.0.0-rc.10", - "html-entities": "~2.3", + "htmlparser2": "~9.1", "lunr": "~2.3", - "lunr-languages": "~1.9" + "lunr-languages": "~1.10" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@antora/navigation-builder": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-3.1.3.tgz", - "integrity": "sha512-t7xHXdK6YjmB79FlsKTGPWHHcEhRzLGZEp9Qjg45S1UphPWWCWEhz6nC/if+MKyoRPGn3aoiSh3n33XC/eYxew==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-3.1.14.tgz", + "integrity": "sha512-/637YLGD7oUHGSfEfszXkk4ASfIhDAg5Xs9035J1dV07XYRlGqmtUb15rtapbcECpcQFjCyM5jFQYSNNvLrGcQ==", "dev": true, "license": "MPL-2.0", "dependencies": { - "@antora/asciidoc-loader": "3.1.3" + "@antora/asciidoc-loader": "3.1.14" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@antora/page-composer": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@antora/page-composer/-/page-composer-3.1.3.tgz", - "integrity": "sha512-X0qrJ1x6jReNjzPtenbgnxfVMbsc5RbuVzBEOqWnX9i+PI4dSYUJ9dKZW9rXE6Vv7Yq6vjOn7JlgHXcvo/RCzQ==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/@antora/page-composer/-/page-composer-3.1.14.tgz", + "integrity": "sha512-RfA+67TxCqUPrQbZdrfjgLpHh8MR2z2du7cyF3HGX4N6DpqEBvz81NHHl3rA3fj6BQZPQbGm2OYAMU6wzJ6Pog==", "dev": true, "license": "MPL-2.0", "dependencies": { - "@antora/logger": "3.1.3", + "@antora/logger": "3.1.14", "handlebars": "~4.7", "require-from-string": "~2.0" }, @@ -195,9 +196,9 @@ } }, "node_modules/@antora/playbook-builder": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-3.1.3.tgz", - "integrity": "sha512-EjkTrXwFAhFxDFU6eHRuExqvuvoHxyR1IbCAgjyj6Pi6hvGIZoGbH9cu1Gy1sWE6XmZl5yA5Gwi++LMyQPmuuA==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-3.1.14.tgz", + "integrity": "sha512-Ss2r7In00u/n9Da+JOxEqIE8NeRosf+f+agzH3Te09JV/mpgZKxEOE5V/VuP+TNNq4ww1eu5aOS8DiU2PYwj4Q==", "dev": true, "license": "MPL-2.0", "dependencies": { @@ -211,111 +212,113 @@ } }, "node_modules/@antora/redirect-producer": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-3.1.3.tgz", - "integrity": "sha512-SLa8HkDSeH45KUjpID7exv8yvDYcsgup4FKP9xtGJsEH4Ikv4uRmSqrL55jwliCwvuU6Wojt+PFHKtnZVwKKIg==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-3.1.14.tgz", + "integrity": "sha512-5koAwRk1cZrvE/qfOWKXqb3jtxrZbWA5EYHYGFEoato5By3cbC42blH4Bre9/48pjyS6znFpbZhYUBpT7PRhZA==", "dev": true, "license": "MPL-2.0", "dependencies": { - "vinyl": "~2.2" + "vinyl": "~3.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@antora/site-generator": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@antora/site-generator/-/site-generator-3.1.3.tgz", - "integrity": "sha512-sT8EWKZd8u6KRgUpTd/8j33+G5mON4VX7C7e2MEI8gVBCaPutUPuYO/2IycmN3n294Nua+szI/1Aqt6uVfksHg==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/@antora/site-generator/-/site-generator-3.1.14.tgz", + "integrity": "sha512-hQIUVtM9+xwleYWc4fIRZmiKl2p+ItOJuUm2+Hkdh07BZsySxkMOxxCyZsvTn9rc+4R94CYqDQCYElwFwdB2WA==", "dev": true, "license": "MPL-2.0", "dependencies": { - "@antora/asciidoc-loader": "3.1.3", - "@antora/content-aggregator": "3.1.3", - "@antora/content-classifier": "3.1.3", - "@antora/document-converter": "3.1.3", - "@antora/file-publisher": "3.1.3", - "@antora/logger": "3.1.3", - "@antora/navigation-builder": "3.1.3", - "@antora/page-composer": "3.1.3", - "@antora/playbook-builder": "3.1.3", - "@antora/redirect-producer": "3.1.3", - "@antora/site-mapper": "3.1.3", - "@antora/site-publisher": "3.1.3", - "@antora/ui-loader": "3.1.3", - "@antora/user-require-helper": "~2.0" + "@antora/asciidoc-loader": "3.1.14", + "@antora/content-aggregator": "3.1.14", + "@antora/content-classifier": "3.1.14", + "@antora/document-converter": "3.1.14", + "@antora/file-publisher": "3.1.14", + "@antora/logger": "3.1.14", + "@antora/navigation-builder": "3.1.14", + "@antora/page-composer": "3.1.14", + "@antora/playbook-builder": "3.1.14", + "@antora/redirect-producer": "3.1.14", + "@antora/site-mapper": "3.1.14", + "@antora/site-publisher": "3.1.14", + "@antora/ui-loader": "3.1.14", + "@antora/user-require-helper": "~3.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@antora/site-mapper": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-3.1.3.tgz", - "integrity": "sha512-egyuCTgGVCcvNfH0BaWSsG5zJon3smXDjlRbIODqI6zu99HXsNqrVLMP62Z3lzEibKYXc/7XY/q5Ggm+prh0Sw==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-3.1.14.tgz", + "integrity": "sha512-3qbETtwadl+fWREjzrBUxPUorMcMiZ+hdkB1El9z7it9KzKh0Yp7Je0+2uTxGX+Lov9uik48dZJ9e/mr5PeaRQ==", "dev": true, "license": "MPL-2.0", "dependencies": { - "@antora/content-classifier": "3.1.3", - "vinyl": "~2.2" + "@antora/content-classifier": "3.1.14", + "vinyl": "~3.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@antora/site-publisher": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-3.1.3.tgz", - "integrity": "sha512-dSHyyKj5l3ZIRo0EjNxmpZ+G3OgPQ4fgwdmA8xOWtX+eiU4sV3MQ9j6tlc4lloAzUVIumt7LOd0n9Quie6yCNA==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-3.1.14.tgz", + "integrity": "sha512-8apyEmgepUc7ms9CTEIPwN3tGtWwLqR6fbLMLs7hibqmOSR880Ut/4GRGb97sqcGQXSHdIyWK2oJKzRl1Akb6Q==", "dev": true, "license": "MPL-2.0", "dependencies": { - "@antora/file-publisher": "3.1.3" + "@antora/file-publisher": "3.1.14" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@antora/ui-loader": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-3.1.3.tgz", - "integrity": "sha512-xaOUn5vOb9RR6LVsCCwROvvWXTADvC/ITO1yKAiJtV9xNrI08szzmWXjgvb07PpRDRPD5QgYoZFmqFPk+0WE2w==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-3.1.14.tgz", + "integrity": "sha512-LVvTdKQOB44CmJ1JQDu8sJf6rrLZMxPAWWackdg2JtGyGHHpd80/MBcv4BSFk7//cJQ13Oqm/7JCbhD51KAFjg==", "dev": true, "license": "MPL-2.0", "dependencies": { - "@antora/expand-path-helper": "~2.0", + "@antora/expand-path-helper": "~3.0", "braces": "~3.0", "cache-directory": "~2.0", - "glob-stream": "~7.0", - "gulp-vinyl-zip": "~2.5", - "hpagent": "~1.1", + "fast-glob": "~3.3", + "hpagent": "~1.2", "js-yaml": "~4.1", - "picomatch": "~2.3", + "picomatch": "~4.0", "should-proxy": "~1.0", "simple-get": "~4.0", - "vinyl": "~2.2" + "vinyl": "~3.0", + "yauzl": "~3.1" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@antora/user-require-helper": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@antora/user-require-helper/-/user-require-helper-2.0.0.tgz", - "integrity": "sha512-5fMfBZfw4zLoFdDAPMQX6Frik90uvfD8rXOA4UpXPOUikkX4uT1Rk6m0/4oi8oS3fcjiIl0k/7Nc+eTxW5TcQQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@antora/user-require-helper/-/user-require-helper-3.0.0.tgz", + "integrity": "sha512-KIXb8WYhnrnwH7Jj21l1w+et9k5GvcgcqvLOwxqWLEd0uVZOiMFdqFjqbVm3M+zcrs1JXWMeh2LLvxBbQs3q/Q==", "dev": true, + "license": "MPL-2.0", "dependencies": { - "@antora/expand-path-helper": "~2.0" + "@antora/expand-path-helper": "~3.0" }, "engines": { - "node": ">=10.17.0" + "node": ">=16.0.0" } }, "node_modules/@asciidoctor/core": { - "version": "2.2.7", - "resolved": "https://registry.npmjs.org/@asciidoctor/core/-/core-2.2.7.tgz", - "integrity": "sha512-63cfnV606vXNUnh/zcuUi5e3tY5qTzaYY5pGP4p9sRk8CcCmX4Z8OfU0BkfM8/k2Y7Cz/jZqxL+vzHjrLQa8tw==", + "version": "2.2.8", + "resolved": "https://registry.npmjs.org/@asciidoctor/core/-/core-2.2.8.tgz", + "integrity": "sha512-oozXk7ZO1RAd/KLFLkKOhqTcG4GO3CV44WwOFg2gMcCsqCUTarvMT7xERIoWW2WurKbB0/ce+98r01p8xPOlBw==", "dev": true, + "license": "MIT", "dependencies": { "asciidoctor-opal-runtime": "0.3.3", "unxhr": "1.0.1" @@ -330,29 +333,30 @@ "version": "1.0.0-beta.6", "resolved": "https://registry.npmjs.org/@asciidoctor/tabs/-/tabs-1.0.0-beta.6.tgz", "integrity": "sha512-gGZnW7UfRXnbiyKNd9PpGKtSuD8+DsqaaTSbQ1dHVkZ76NaolLhdQg8RW6/xqN3pX1vWZEcF4e81+Oe9rNRWxg==", + "license": "MIT", "engines": { "node": ">=16.0.0" } }, "node_modules/@cppalliance/antora-cpp-reference-extension": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@cppalliance/antora-cpp-reference-extension/-/antora-cpp-reference-extension-0.0.6.tgz", - "integrity": "sha512-Weud5Cn9KAoU3+fSA4IZM7THAEA8VPhclH7EfU6SiKSp/Iy92vSItpZioTmVrn0DIVo9tIxxrJXBp5GpSFk6hg==", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@cppalliance/antora-cpp-reference-extension/-/antora-cpp-reference-extension-0.1.0.tgz", + "integrity": "sha512-3VD/gAFebR06GiBWAy2PgEHNqyRNrvAE0FfFvotLvA0RQmHn0q+ct+j0z53N64yxuvJVj8Hl0bRRPdhh2BGjXg==", "license": "BSL-1.0", "dependencies": { - "@antora/expand-path-helper": "^2.0.0", - "axios": "^1.7.2", + "@antora/expand-path-helper": "^3.0.0", + "axios": "^1.13.2", "cache-directory": "^2.0.0", - "fast-glob": "^3.3.2", - "isomorphic-git": "^1.27.1", + "fast-glob": "^3.3.3", + "isomorphic-git": "^1.35.0", "js-yaml": "^4.1.0", - "semver": "^7.6.3" + "semver": "^7.7.3" } }, "node_modules/@cppalliance/antora-cpp-reference-extension/node_modules/isomorphic-git": { - "version": "1.29.0", - "resolved": "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-1.29.0.tgz", - "integrity": "sha512-zWGqk8901cicvVEhVpN76AwKrS/TzHak2NQCtNXIAavpMIy/yqh+d/JtC9A8AUKZAauUdOyEWKI29tuCLAL+Zg==", + "version": "1.35.0", + "resolved": "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-1.35.0.tgz", + "integrity": "sha512-+pRiwWDld5yAjdTFFh9+668kkz4uzCZBs+mw+ZFxPAxJBX8KCqd/zAP7Zak0BK5BQ+dXVqEurR5DkEnqrLpHlQ==", "license": "MIT", "dependencies": { "async-lock": "^1.4.1", @@ -362,36 +366,51 @@ "ignore": "^5.1.4", "minimisted": "^2.0.0", "pako": "^1.0.10", - "path-browserify": "^1.0.1", "pify": "^4.0.1", - "readable-stream": "^3.4.0", - "sha.js": "^2.4.9", + "readable-stream": "^4.0.0", + "sha.js": "^2.4.12", "simple-get": "^4.0.1" }, "bin": { "isogit": "cli.cjs" }, "engines": { - "node": ">=12" + "node": ">=14.17" + } + }, + "node_modules/@cppalliance/antora-cpp-reference-extension/node_modules/readable-stream": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", + "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", + "license": "MIT", + "dependencies": { + "abort-controller": "^3.0.0", + "buffer": "^6.0.3", + "events": "^3.3.0", + "process": "^0.11.10", + "string_decoder": "^1.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@cppalliance/antora-cpp-tagfiles-extension": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/@cppalliance/antora-cpp-tagfiles-extension/-/antora-cpp-tagfiles-extension-0.0.4.tgz", - "integrity": "sha512-dzb/QDZ+a5yk7vaEb2jNQ5p02XjA6LfPmLRWcxqb/MvpA9DHZKsPunFDy+yqY3eGy9zqNppunljy9TZUbeoczg==", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@cppalliance/antora-cpp-tagfiles-extension/-/antora-cpp-tagfiles-extension-0.1.0.tgz", + "integrity": "sha512-YKCRpqv8srMhqwlUcY3704H6U5DHzQ8Q73JVUv1TF+MsGdUP60DDNR6v8+Xj6PLe93K/MAo6ZUgtJ+RN40YoZQ==", "license": "BSL-1.0", "dependencies": { - "@antora/expand-path-helper": "^2.0.0", + "@antora/expand-path-helper": "^3.0.0", "cache-directory": "^2.0.0", - "fast-xml-parser": "^4.4.1", + "fast-xml-parser": "^5.3.1", "he": "^1.2.0", - "isomorphic-git": "^1.27.1" + "isomorphic-git": "^1.35.0" } }, "node_modules/@cppalliance/antora-cpp-tagfiles-extension/node_modules/isomorphic-git": { - "version": "1.29.0", - "resolved": "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-1.29.0.tgz", - "integrity": "sha512-zWGqk8901cicvVEhVpN76AwKrS/TzHak2NQCtNXIAavpMIy/yqh+d/JtC9A8AUKZAauUdOyEWKI29tuCLAL+Zg==", + "version": "1.35.0", + "resolved": "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-1.35.0.tgz", + "integrity": "sha512-+pRiwWDld5yAjdTFFh9+668kkz4uzCZBs+mw+ZFxPAxJBX8KCqd/zAP7Zak0BK5BQ+dXVqEurR5DkEnqrLpHlQ==", "license": "MIT", "dependencies": { "async-lock": "^1.4.1", @@ -401,19 +420,40 @@ "ignore": "^5.1.4", "minimisted": "^2.0.0", "pako": "^1.0.10", - "path-browserify": "^1.0.1", "pify": "^4.0.1", - "readable-stream": "^3.4.0", - "sha.js": "^2.4.9", + "readable-stream": "^4.0.0", + "sha.js": "^2.4.12", "simple-get": "^4.0.1" }, "bin": { "isogit": "cli.cjs" }, "engines": { - "node": ">=12" + "node": ">=14.17" + } + }, + "node_modules/@cppalliance/antora-cpp-tagfiles-extension/node_modules/readable-stream": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", + "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", + "license": "MIT", + "dependencies": { + "abort-controller": "^3.0.0", + "buffer": "^6.0.3", + "events": "^3.3.0", + "process": "^0.11.10", + "string_decoder": "^1.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/@cppalliance/antora-downloads-extension": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@cppalliance/antora-downloads-extension/-/antora-downloads-extension-0.0.2.tgz", + "integrity": "sha512-2wXahlvRz9J75ZSfzDeP4XpIZiqIm+w/YjmCWJxFPp6oWgP7e8f6ps7HqdtHNGxnK5mG38OjiCFdHjmHYfgbDA==", + "license": "BSL-1.0" + }, "node_modules/@cppalliance/asciidoctor-boost-links": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/@cppalliance/asciidoctor-boost-links/-/asciidoctor-boost-links-0.0.2.tgz", @@ -466,7 +506,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "dev": true, "license": "MIT", "dependencies": { "event-target-shim": "^5.0.0" @@ -476,14 +515,14 @@ } }, "node_modules/antora": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/antora/-/antora-3.1.3.tgz", - "integrity": "sha512-TRQJgGA9YcugI2yx9iaiEu9HPYUG5+DQdTcjp9CYWCyzH/+fT9dY53NJU0xsTzWPaYv8DE6m1Rt/J4u/7lCw9A==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/antora/-/antora-3.1.14.tgz", + "integrity": "sha512-z8HshJsT6pUfdDOUJ15RGtpOM9LmL6JXU5JBshoR/9/xd+1qLmKPkOnUv+HrijAk93r1imxZOdkmIqhLcv8B8A==", "dev": true, "license": "MPL-2.0", "dependencies": { - "@antora/cli": "3.1.3", - "@antora/site-generator": "3.1.3" + "@antora/cli": "3.1.14", + "@antora/site-generator": "3.1.14" }, "bin": { "antora": "bin/antora" @@ -492,29 +531,18 @@ "node": ">=16.0.0" } }, - "node_modules/append-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz", - "integrity": "sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer-equal": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "license": "Python-2.0" }, "node_modules/asciidoctor-opal-runtime": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/asciidoctor-opal-runtime/-/asciidoctor-opal-runtime-0.3.3.tgz", "integrity": "sha512-/CEVNiOia8E5BMO9FLooo+Kv18K4+4JBFRJp8vUy/N5dMRAg+fRNV4HA+o6aoSC79jVU/aT5XvUpxSxSsTS8FQ==", "dev": true, + "license": "MIT", "dependencies": { "glob": "7.1.3", "unxhr": "1.0.1" @@ -526,12 +554,14 @@ "node_modules/async-lock": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.4.1.tgz", - "integrity": "sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ==" + "integrity": "sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ==", + "license": "MIT" }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" }, "node_modules/atomic-sleep": { "version": "1.0.0", @@ -543,42 +573,73 @@ "node": ">=8.0.0" } }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "license": "MIT", + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/axios": { - "version": "1.7.9", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", - "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz", + "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", - "form-data": "^4.0.0", + "form-data": "^4.0.4", "proxy-from-env": "^1.1.0" } }, - "node_modules/axios/node_modules/form-data": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", - "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", - "license": "MIT", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" + "node_modules/b4a": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.7.3.tgz", + "integrity": "sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==", + "dev": true, + "license": "Apache-2.0", + "peerDependencies": { + "react-native-b4a": "*" }, - "engines": { - "node": ">= 6" + "peerDependenciesMeta": { + "react-native-b4a": { + "optional": true + } } }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "dev": true, + "license": "MIT" + }, + "node_modules/bare-events": { + "version": "2.8.2", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz", + "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==", + "dev": true, + "license": "Apache-2.0", + "peerDependencies": { + "bare-abort-controller": "*" + }, + "peerDependenciesMeta": { + "bare-abort-controller": { + "optional": true + } + } }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, "funding": [ { "type": "github", @@ -595,16 +656,12 @@ ], "license": "MIT" }, - "node_modules/boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" - }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -626,7 +683,6 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "dev": true, "funding": [ { "type": "github", @@ -657,23 +713,11 @@ "node": "*" } }, - "node_modules/buffer-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz", - "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/cache-directory": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/cache-directory/-/cache-directory-2.0.0.tgz", "integrity": "sha512-7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA==", + "license": "LGPL-3.0+", "dependencies": { "xdg-basedir": "^3.0.0" }, @@ -685,7 +729,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.0", @@ -701,10 +744,9 @@ } }, "node_modules/call-bind-apply-helpers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", - "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", - "dev": true, + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -715,14 +757,13 @@ } }, "node_modules/call-bound": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", - "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", - "dev": true, + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", "license": "MIT", "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "get-intrinsic": "^1.2.6" + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" }, "engines": { "node": ">= 0.4" @@ -731,45 +772,11 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/cheerio": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz", - "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==", - "dependencies": { - "cheerio-select": "^1.5.0", - "dom-serializer": "^1.3.2", - "domhandler": "^4.2.0", - "htmlparser2": "^6.1.0", - "parse5": "^6.0.1", - "parse5-htmlparser2-tree-adapter": "^6.0.1", - "tslib": "^2.2.0" - }, - "engines": { - "node": ">= 6" - }, - "funding": { - "url": "https://github.com/cheeriojs/cheerio?sponsor=1" - } - }, - "node_modules/cheerio-select": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.6.0.tgz", - "integrity": "sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==", - "dependencies": { - "css-select": "^4.3.0", - "css-what": "^6.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.3.1", - "domutils": "^2.8.0" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, "node_modules/clean-git-ref": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/clean-git-ref/-/clean-git-ref-2.0.1.tgz", - "integrity": "sha512-bLSptAy2P0s6hU4PzuIMKmMJJSE6gLXGH1cntDu7bWJUksvuM+7ReOK61mozULErYvP6a15rnYl0zFDef+pyPw==" + "integrity": "sha512-bLSptAy2P0s6hU4PzuIMKmMJJSE6gLXGH1cntDu7bWJUksvuM+7ReOK61mozULErYvP6a15rnYl0zFDef+pyPw==", + "license": "Apache-2.0" }, "node_modules/clone": { "version": "2.1.2", @@ -781,68 +788,6 @@ "node": ">=0.8" } }, - "node_modules/clone-buffer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz", - "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/clone-stats": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", - "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==", - "dev": true, - "license": "MIT" - }, - "node_modules/cloneable-readable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz", - "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.1", - "process-nextick-args": "^2.0.0", - "readable-stream": "^2.3.5" - } - }, - "node_modules/cloneable-readable/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/cloneable-readable/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "license": "MIT" - }, - "node_modules/cloneable-readable/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, "node_modules/colorette": { "version": "2.0.20", "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", @@ -854,6 +799,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" }, @@ -862,25 +808,19 @@ } }, "node_modules/commander": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz", - "integrity": "sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", + "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", "dev": true, "license": "MIT", "engines": { - "node": "^12.20.0 || >=14" + "node": ">=16" } }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, - "node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", "dev": true, "license": "MIT" }, @@ -898,16 +838,11 @@ "node": ">=6" } }, - "node_modules/core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "dev": true - }, "node_modules/crc-32": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", + "license": "Apache-2.0", "bin": { "crc32": "bin/crc32.njs" }, @@ -915,32 +850,6 @@ "node": ">=0.8" } }, - "node_modules/css-select": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", - "dependencies": { - "boolbase": "^1.0.0", - "css-what": "^6.0.1", - "domhandler": "^4.3.1", - "domutils": "^2.8.0", - "nth-check": "^2.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, - "node_modules/css-what": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", - "engines": { - "node": ">= 6" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, "node_modules/dateformat": { "version": "4.6.3", "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz", @@ -955,6 +864,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "license": "MIT", "dependencies": { "mimic-response": "^3.1.0" }, @@ -969,7 +879,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "dev": true, + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -982,28 +892,11 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/define-properties": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", - "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", - "dev": true, - "license": "MIT", - "dependencies": { - "define-data-property": "^1.0.1", - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", "engines": { "node": ">=0.4.0" } @@ -1011,16 +904,18 @@ "node_modules/diff3": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/diff3/-/diff3-0.0.3.tgz", - "integrity": "sha512-iSq8ngPOt0K53A6eVr4d5Kn6GNrM2nQZtC740pzIriHtn4pOQ2lyzEXQMBeVcWERN0ye7fhBsk9PbLLQOnUx/g==" + "integrity": "sha512-iSq8ngPOt0K53A6eVr4d5Kn6GNrM2nQZtC740pzIriHtn4pOQ2lyzEXQMBeVcWERN0ye7fhBsk9PbLLQOnUx/g==", + "license": "MIT" }, "node_modules/dom-serializer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", - "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "license": "MIT", "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" }, "funding": { "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" @@ -1035,14 +930,16 @@ "type": "github", "url": "https://github.com/sponsors/fb55" } - ] + ], + "license": "BSD-2-Clause" }, "node_modules/domhandler": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", - "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "license": "BSD-2-Clause", "dependencies": { - "domelementtype": "^2.2.0" + "domelementtype": "^2.3.0" }, "engines": { "node": ">= 4" @@ -1052,13 +949,14 @@ } }, "node_modules/domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", + "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", + "license": "BSD-2-Clause", "dependencies": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" }, "funding": { "url": "https://github.com/fb55/domutils?sponsor=1" @@ -1068,7 +966,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", @@ -1079,31 +976,24 @@ "node": ">= 0.4" } }, - "node_modules/duplexify": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.3.tgz", - "integrity": "sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==", - "dev": true, - "dependencies": { - "end-of-stream": "^1.4.1", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1", - "stream-shift": "^1.0.2" - } - }, "node_modules/end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", + "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==", "dev": true, + "license": "MIT", "dependencies": { "once": "^1.4.0" } }, "node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } @@ -1112,7 +1002,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -1122,16 +1011,15 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" } }, "node_modules/es-object-atoms": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", - "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", - "dev": true, + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", "license": "MIT", "dependencies": { "es-errors": "^1.3.0" @@ -1140,11 +1028,25 @@ "node": ">= 0.4" } }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/event-target-shim": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -1154,17 +1056,20 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.8.x" } }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true + "node_modules/events-universal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz", + "integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.7.0" + } }, "node_modules/fast-copy": { "version": "3.0.2", @@ -1173,6 +1078,13 @@ "dev": true, "license": "MIT" }, + "node_modules/fast-fifo": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", + "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", + "dev": true, + "license": "MIT" + }, "node_modules/fast-glob": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", @@ -1189,18 +1101,6 @@ "node": ">=8.6.0" } }, - "node_modules/fast-glob/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/fast-redact": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/fast-redact/-/fast-redact-3.5.0.tgz", @@ -1219,46 +1119,32 @@ "license": "MIT" }, "node_modules/fast-xml-parser": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.1.tgz", - "integrity": "sha512-y655CeyUQ+jj7KBbYMc4FG01V8ZQqjN+gDYGJ50RtfsUB8iG9AmwmwoAgeKLJdmueKKMrH1RJ7yXHTSoczdv5w==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.3.1.tgz", + "integrity": "sha512-jbNkWiv2Ec1A7wuuxk0br0d0aTMUtQ4IkL+l/i1r9PRf6pLXjDgsBsWwO+UyczmQlnehi4Tbc8/KIvxGQe+I/A==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/NaturalIntelligence" - }, - { - "type": "paypal", - "url": "https://paypal.me/naturalintelligence" } ], "license": "MIT", "dependencies": { - "strnum": "^1.0.5" + "strnum": "^2.1.0" }, "bin": { "fxparser": "src/cli/cli.js" } }, "node_modules/fastq": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz", - "integrity": "sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", + "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", "license": "ISC", "dependencies": { "reusify": "^1.0.4" } }, - "node_modules/fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "pend": "~1.2.0" - } - }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", @@ -1271,54 +1157,10 @@ "node": ">=8" } }, - "node_modules/flush-write-stream": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", - "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "readable-stream": "^2.3.6" - } - }, - "node_modules/flush-write-stream/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/flush-write-stream/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "license": "MIT" - }, - "node_modules/flush-write-stream/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, "node_modules/follow-redirects": { - "version": "1.15.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", - "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "version": "1.15.11", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz", + "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==", "funding": [ { "type": "individual", @@ -1335,48 +1177,65 @@ } } }, - "node_modules/fs-mkdirp-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", - "integrity": "sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==", - "dev": true, + "node_modules/for-each": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", + "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", "license": "MIT", "dependencies": { - "graceful-fs": "^4.1.11", - "through2": "^2.0.3" + "is-callable": "^1.2.7" }, "engines": { - "node": ">= 0.10" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/form-data": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", + "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" } }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/get-intrinsic": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", - "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", - "dev": true, + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", "license": "MIT", "dependencies": { - "call-bind-apply-helpers": "^1.0.1", + "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", + "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", - "get-proto": "^1.0.0", + "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", @@ -1393,7 +1252,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", @@ -1407,7 +1265,9 @@ "version": "7.1.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -1421,63 +1281,21 @@ } }, "node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/glob-stream": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-7.0.0.tgz", - "integrity": "sha512-evR4kvr6s0Yo5t4CD4H171n4T8XcnPFznvsbeN8K9FPzc0Q0wYqcOWyGtck2qcvJSLXKnU6DnDyfmbDDabYvRQ==", - "dev": true, - "dependencies": { - "extend": "^3.0.2", - "glob": "^7.2.0", - "glob-parent": "^6.0.2", - "is-negated-glob": "^1.0.0", - "ordered-read-streams": "^1.0.1", - "pumpify": "^2.0.1", - "readable-stream": "^3.6.0", - "remove-trailing-separator": "^1.1.0", - "to-absolute-glob": "^2.0.2", - "unique-stream": "^2.3.1" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/glob-stream/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "license": "ISC", "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "is-glob": "^4.0.1" }, "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">= 6" } }, "node_modules/gopd": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -1486,38 +1304,12 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/gulp-vinyl-zip": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.5.0.tgz", - "integrity": "sha512-KPi5/2SUmkXXDvKU4L2U1dkPOP03SbhONTOgNZlL23l9Yopt+euJ1bBXwWrSMbsyh3JLW/TYuC8CI4c4Kq4qrw==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "dev": true, - "license": "MIT", - "dependencies": { - "queue": "^4.2.1", - "through": "^2.3.8", - "through2": "^2.0.3", - "vinyl": "^2.0.2", - "vinyl-fs": "^3.0.3", - "yauzl": "^2.2.1", - "yazl": "^2.2.1" - }, - "engines": { - "node": ">= 10" - } - }, "node_modules/handlebars": { "version": "4.7.8", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", "dev": true, + "license": "MIT", "dependencies": { "minimist": "^1.2.5", "neo-async": "^2.6.2", @@ -1538,7 +1330,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "dev": true, + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0" }, @@ -1550,7 +1342,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -1559,11 +1350,26 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/hasown": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, + "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -1581,89 +1387,26 @@ } }, "node_modules/help-me": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/help-me/-/help-me-4.2.0.tgz", - "integrity": "sha512-TAOnTB8Tz5Dw8penUuzHVrKNKlCIbwwbHnXraNJxPwf8LRtE2HlM84RYuezMFcwOJmoYOCWVDyJ8TQGxn9PgxA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz", + "integrity": "sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==", "dev": true, - "license": "MIT", - "dependencies": { - "glob": "^8.0.0", - "readable-stream": "^3.6.0" - } - }, - "node_modules/help-me/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/help-me/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/help-me/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } + "license": "MIT" }, "node_modules/hpagent": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/hpagent/-/hpagent-1.1.0.tgz", - "integrity": "sha512-bgJcBmNTZaJO03xtXOTNfoFEf/3VwoZ/gJ2O4ekTCZu4LSFtfzQFrJ0kjq8ZSS0+IdghXqQIiDUnpp0eUR9IJg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/hpagent/-/hpagent-1.2.0.tgz", + "integrity": "sha512-A91dYTeIB6NoXG+PxTQpCCDDnfHsW9kc06Lvpu1TEe9gnd6ZFeiBoRO9JvzEv6xK7EX97/dUE8g/vBMTqTS3CA==", "dev": true, "license": "MIT", "engines": { "node": ">=14" } }, - "node_modules/html-entities": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.6.tgz", - "integrity": "sha512-9o0+dcpIw2/HxkNuYKxSJUF/MMRZQECK4GnF+oQOmJ83yCVHTWgCH5aOXxK5bozNRmM8wtgryjHD3uloPBDEGw==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/mdevils" - }, - { - "type": "patreon", - "url": "https://patreon.com/mdevils" - } - ] - }, "node_modules/htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz", + "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==", "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", { @@ -1671,18 +1414,18 @@ "url": "https://github.com/sponsors/fb55" } ], + "license": "MIT", "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.1.0", + "entities": "^4.5.0" } }, "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, "funding": [ { "type": "github", @@ -1700,9 +1443,10 @@ "license": "BSD-3-Clause" }, "node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "license": "MIT", "engines": { "node": ">= 4" } @@ -1711,7 +1455,9 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dev": true, + "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -1720,32 +1466,26 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" }, - "node_modules/is-absolute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", - "dev": true, - "dependencies": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" - }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "license": "MIT", "engines": { - "node": ">=0.10.0" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true, - "license": "MIT" - }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -1754,6 +1494,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -1761,15 +1502,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-negated-glob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", - "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -1779,69 +1511,35 @@ "node": ">=0.12.0" } }, - "node_modules/is-relative": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", - "dev": true, + "node_modules/is-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "license": "MIT", "dependencies": { - "is-unc-path": "^1.0.0" + "which-typed-array": "^1.1.16" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-unc-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", - "dev": true, - "dependencies": { - "unc-path-regex": "^0.1.2" + "node": ">= 0.4" }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/is-valid-glob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz", - "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true, - "engines": { - "node": ">=0.10.0" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "license": "MIT" }, "node_modules/isomorphic-git": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-1.21.0.tgz", - "integrity": "sha512-ZqCAUM63CYepA3fB8H7NVyPSiOkgzIbQ7T+QPrm9xtYgQypN9JUJ5uLMjB5iTfomdJf3mdm6aSxjZwnT6ubvEA==", + "version": "1.25.10", + "resolved": "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-1.25.10.tgz", + "integrity": "sha512-IxGiaKBwAdcgBXwIcxJU6rHLk+NrzYaaPKXXQffcA0GW3IUrQXdUPDXDo+hkGVcYruuz/7JlGBiuaeTCgIgivQ==", "dev": true, + "license": "MIT", "dependencies": { - "async-lock": "^1.1.0", + "async-lock": "^1.4.1", "clean-git-ref": "^2.0.1", "crc-32": "^1.2.0", "diff3": "0.0.3", @@ -1874,6 +1572,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -1881,12 +1580,6 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true - }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", @@ -1900,65 +1593,6 @@ "node": ">=6" } }, - "node_modules/lazystream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", - "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", - "dev": true, - "license": "MIT", - "dependencies": { - "readable-stream": "^2.0.5" - }, - "engines": { - "node": ">= 0.6.3" - } - }, - "node_modules/lazystream/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/lazystream/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "license": "MIT" - }, - "node_modules/lazystream/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/lead": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz", - "integrity": "sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==", - "dev": true, - "license": "MIT", - "dependencies": { - "flush-write-stream": "^1.0.2" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", @@ -1969,18 +1603,19 @@ "node_modules/lunr": { "version": "2.3.9", "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz", - "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==" + "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==", + "license": "MIT" }, "node_modules/lunr-languages": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/lunr-languages/-/lunr-languages-1.9.0.tgz", - "integrity": "sha512-Be5vFuc8NAheOIjviCRms3ZqFFBlzns3u9DXpPSZvALetgnydAN0poV71pVLFn0keYy/s4VblMMkqewTLe+KPg==" + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/lunr-languages/-/lunr-languages-1.10.0.tgz", + "integrity": "sha512-BBjKKcwrieJlzwwc9M5H/MRXGJ2qyOSDx/NXYiwkuKjiLOOoouh0WsDzeqcLoUWcX31y7i8sb8IgsZKObdUCkw==", + "license": "MPL-1.1" }, "node_modules/math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -2008,10 +1643,23 @@ "node": ">=8.6" } }, + "node_modules/micromatch/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -2020,6 +1668,7 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", "dependencies": { "mime-db": "1.52.0" }, @@ -2031,6 +1680,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "license": "MIT", "engines": { "node": ">=10" }, @@ -2043,6 +1693,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -2054,6 +1705,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -2062,6 +1714,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/minimisted/-/minimisted-2.0.1.tgz", "integrity": "sha512-1oPjfuLQa2caorJUM8HV8lGgWCc0qqAO1MNv/k05G4qslmsndV/5WdNZrqCiyqiz3wohia2Ij2B7w2Dr7/IyrA==", + "license": "MIT", "dependencies": { "minimist": "^1.2.5" } @@ -2080,75 +1733,8 @@ "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true - }, - "node_modules/normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==", "dev": true, - "license": "MIT", - "dependencies": { - "remove-trailing-separator": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/now-and-later": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz", - "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "once": "^1.3.2" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/nth-check": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", - "dependencies": { - "boolbase": "^1.0.0" - }, - "funding": { - "url": "https://github.com/fb55/nth-check?sponsor=1" - } - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.assign": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", - "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind": "^1.0.8", - "call-bound": "^1.0.3", - "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0", - "has-symbols": "^1.1.0", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } + "license": "MIT" }, "node_modules/on-exit-leak-free": { "version": "2.1.2", @@ -2164,85 +1750,23 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", "dependencies": { - "wrappy": "1" - } - }, - "node_modules/ordered-read-streams": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz", - "integrity": "sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==", - "dev": true, - "dependencies": { - "readable-stream": "^2.0.1" - } - }, - "node_modules/ordered-read-streams/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/ordered-read-streams/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "node_modules/ordered-read-streams/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/pako": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" - }, - "node_modules/parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" - }, - "node_modules/parse5-htmlparser2-tree-adapter": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", - "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", - "dependencies": { - "parse5": "^6.0.1" + "wrappy": "1" } }, - "node_modules/path-browserify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", - "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", - "license": "MIT" - }, - "node_modules/path-dirname": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", - "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==", - "dev": true, - "license": "MIT" + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "license": "(MIT AND Zlib)" }, "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -2255,12 +1779,13 @@ "license": "MIT" }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", + "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "dev": true, "license": "MIT", "engines": { - "node": ">=8.6" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/jonschlinkert" @@ -2270,37 +1795,38 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/pino": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/pino/-/pino-8.7.0.tgz", - "integrity": "sha512-l9sA5uPxmZzwydhMWUcm1gI0YxNnYl8MfSr2h8cwLvOAzQLBLewzF247h/vqHe3/tt6fgtXeG9wdjjoetdI/vA==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/pino/-/pino-9.2.0.tgz", + "integrity": "sha512-g3/hpwfujK5a4oVbaefoJxezLzsDgLcNJeITvC6yrfwYeT9la+edCK42j5QpEQSQCZgTKapXvnQIdgZwvRaZug==", "dev": true, "license": "MIT", "dependencies": { "atomic-sleep": "^1.0.0", "fast-redact": "^3.1.1", "on-exit-leak-free": "^2.1.0", - "pino-abstract-transport": "v1.0.0", - "pino-std-serializers": "^6.0.0", - "process-warning": "^2.0.0", + "pino-abstract-transport": "^1.2.0", + "pino-std-serializers": "^7.0.0", + "process-warning": "^3.0.0", "quick-format-unescaped": "^4.0.3", "real-require": "^0.2.0", "safe-stable-stringify": "^2.3.1", - "sonic-boom": "^3.1.0", - "thread-stream": "^2.0.0" + "sonic-boom": "^4.0.1", + "thread-stream": "^3.0.0" }, "bin": { "pino": "bin.js" } }, "node_modules/pino-abstract-transport": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.0.0.tgz", - "integrity": "sha512-c7vo5OpW4wIS42hUVcT5REsL8ZljsUfBjqV/e2sFxmFEFZiq1XLUp5EYLtuDH6PEHq9W1egWqRbnLUP5FuZmOA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.2.0.tgz", + "integrity": "sha512-Guhh8EZfPCfH+PMXAb6rKOjGQEoy0xlAIn+irODG5kgfYV+BQ0rGYYWTIel3P5mmyXqkYkPmdIkywsn6QKUR1Q==", "dev": true, "license": "MIT", "dependencies": { @@ -2309,9 +1835,9 @@ } }, "node_modules/pino-abstract-transport/node_modules/readable-stream": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.6.0.tgz", - "integrity": "sha512-cbAdYt0VcnpN2Bekq7PU+k363ZRsPwJoEEJOEtSJQlJXzwaxt3FIo/uL+KeDSGIjJqtkwyge4KQgD2S2kd+CQw==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", + "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", "dev": true, "license": "MIT", "dependencies": { @@ -2326,17 +1852,17 @@ } }, "node_modules/pino-pretty": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-9.1.1.tgz", - "integrity": "sha512-iJrnjgR4FWQIXZkUF48oNgoRI9BpyMhaEmihonHeCnZ6F50ZHAS4YGfGBT/ZVNsPmd+hzkIPGzjKdY08+/yAXw==", + "version": "11.2.2", + "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-11.2.2.tgz", + "integrity": "sha512-2FnyGir8nAJAqD3srROdrF1J5BIcMT4nwj7hHSc60El6Uxlym00UbCCd8pYIterstVBFlMyF1yFV8XdGIPbj4A==", "dev": true, "license": "MIT", "dependencies": { "colorette": "^2.0.7", "dateformat": "^4.6.3", - "fast-copy": "^3.0.0", + "fast-copy": "^3.0.2", "fast-safe-stringify": "^2.1.1", - "help-me": "^4.0.1", + "help-me": "^5.0.0", "joycon": "^3.1.1", "minimist": "^1.2.6", "on-exit-leak-free": "^2.1.0", @@ -2344,7 +1870,7 @@ "pump": "^3.0.0", "readable-stream": "^4.0.0", "secure-json-parse": "^2.4.0", - "sonic-boom": "^3.0.0", + "sonic-boom": "^4.0.1", "strip-json-comments": "^3.1.1" }, "bin": { @@ -2352,9 +1878,9 @@ } }, "node_modules/pino-pretty/node_modules/readable-stream": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.6.0.tgz", - "integrity": "sha512-cbAdYt0VcnpN2Bekq7PU+k363ZRsPwJoEEJOEtSJQlJXzwaxt3FIo/uL+KeDSGIjJqtkwyge4KQgD2S2kd+CQw==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", + "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", "dev": true, "license": "MIT", "dependencies": { @@ -2369,32 +1895,34 @@ } }, "node_modules/pino-std-serializers": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz", - "integrity": "sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz", + "integrity": "sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==", "dev": true, "license": "MIT" }, + "node_modules/possible-typed-array-names": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6.0" } }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true - }, "node_modules/process-warning": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-2.3.2.tgz", - "integrity": "sha512-n9wh8tvBe5sFmsqlg+XQhaQLumwpqoAUruLwjCopgTmUBjJ/fjtBsJzKleCaIGBOMXYEhp1YfKl4d7rJ5ZKJGA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-3.0.0.tgz", + "integrity": "sha512-mqn0kFRl0EoqhnL0GQ0veqFHyIN1yig9RHh/InzORTUiZHFRAur+aMtRkELNwGs9aNwKS6tg/An4NYBPGwvtzQ==", "dev": true, "license": "MIT" }, @@ -2415,36 +1943,16 @@ "license": "MIT" }, "node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz", + "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==", "dev": true, + "license": "MIT", "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" } }, - "node_modules/pumpify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-2.0.1.tgz", - "integrity": "sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw==", - "dev": true, - "dependencies": { - "duplexify": "^4.1.1", - "inherits": "^2.0.3", - "pump": "^3.0.0" - } - }, - "node_modules/queue": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/queue/-/queue-4.5.1.tgz", - "integrity": "sha512-AMD7w5hRXcFSb8s9u38acBZ+309u6GsiibP4/0YacJeaurRshogB7v/ZcVPxP5gD5+zIw6ixRHdutiYUJfwKHw==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "~2.0.0" - } - }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -2476,6 +1984,8 @@ "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "license": "MIT", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -2495,49 +2005,21 @@ "node": ">= 12.13.0" } }, - "node_modules/remove-bom-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz", - "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-buffer": "^1.1.5", - "is-utf8": "^0.2.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/remove-bom-stream": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz", - "integrity": "sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==", - "dev": true, - "license": "MIT", - "dependencies": { - "remove-bom-buffer": "^3.0.0", - "safe-buffer": "^5.1.0", - "through2": "^2.0.3" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/replace-ext": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz", - "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", + "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", "dev": true, "license": "MIT", "engines": { - "node": ">= 0.10" + "node": ">= 10" } }, "node_modules/require-from-string": { @@ -2550,23 +2032,10 @@ "node": ">=0.10.0" } }, - "node_modules/resolve-options": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz", - "integrity": "sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==", - "dev": true, - "license": "MIT", - "dependencies": { - "value-or-function": "^3.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", "license": "MIT", "engines": { "iojs": ">=1.0.0", @@ -2613,7 +2082,8 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/safe-stable-stringify": { "version": "2.5.0", @@ -2633,9 +2103,9 @@ "license": "BSD-3-Clause" }, "node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -2648,7 +2118,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", - "dev": true, + "license": "MIT", "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -2662,15 +2132,23 @@ } }, "node_modules/sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "version": "2.4.12", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.12.tgz", + "integrity": "sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==", + "license": "(MIT AND BSD-3-Clause)", "dependencies": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "^2.0.4", + "safe-buffer": "^5.2.1", + "to-buffer": "^1.2.0" }, "bin": { "sha.js": "bin.js" + }, + "engines": { + "node": ">= 0.10" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/should-proxy": { @@ -2697,7 +2175,8 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/simple-get": { "version": "4.0.1", @@ -2717,6 +2196,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "decompress-response": "^6.0.0", "once": "^1.3.1", @@ -2724,9 +2204,9 @@ } }, "node_modules/sonic-boom": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.2.1.tgz", - "integrity": "sha512-iITeTHxy3B9FGu8aVdiDXUVAcHMF9Ss0cCsAOo2HfCrmVGT3/DT5oYaeu0M/YKZDlKTvChEyPq0zI9Hf33EX6A==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.0.1.tgz", + "integrity": "sha512-hTSD/6JMLyT4r9zeof6UtuBDpjJ9sO08/nmS5djaA9eozT9oOlNdpXSnzcgj4FTqpk3nkLrs61l4gip9r1HCrQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2738,6 +2218,7 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -2752,16 +2233,23 @@ "node": ">= 10.x" } }, - "node_modules/stream-shift": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz", - "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==", - "dev": true + "node_modules/streamx": { + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz", + "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==", + "dev": true, + "license": "MIT", + "dependencies": { + "events-universal": "^1.0.0", + "fast-fifo": "^1.3.2", + "text-decoder": "^1.1.0" + } }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" } @@ -2780,89 +2268,59 @@ } }, "node_modules/strnum": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", - "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.1.tgz", + "integrity": "sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], "license": "MIT" }, - "node_modules/thread-stream": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-2.7.0.tgz", - "integrity": "sha512-qQiRWsU/wvNolI6tbbCKd9iKaTnCXsTwVxhhKM6nctPdujTyztjlbUkUTUymidWcMnZ5pWR0ej4a0tjsW021vw==", + "node_modules/teex": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz", + "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==", "dev": true, "license": "MIT", "dependencies": { - "real-require": "^0.2.0" - } - }, - "node_modules/through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true, - "license": "MIT" - }, - "node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "node_modules/through2-filter": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz", - "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==", - "dev": true, - "dependencies": { - "through2": "~2.0.0", - "xtend": "~4.0.0" + "streamx": "^2.12.5" } }, - "node_modules/through2/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "node_modules/text-decoder": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz", + "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "b4a": "^1.6.4" } }, - "node_modules/through2/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "node_modules/through2/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "node_modules/thread-stream": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-3.1.0.tgz", + "integrity": "sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==", "dev": true, + "license": "MIT", "dependencies": { - "safe-buffer": "~5.1.0" + "real-require": "^0.2.0" } }, - "node_modules/to-absolute-glob": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", - "integrity": "sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==", - "dev": true, + "node_modules/to-buffer": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.2.2.tgz", + "integrity": "sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw==", + "license": "MIT", "dependencies": { - "is-absolute": "^1.0.0", - "is-negated-glob": "^1.0.0" + "isarray": "^2.0.5", + "safe-buffer": "^5.2.1", + "typed-array-buffer": "^1.0.3" }, "engines": { - "node": ">=0.10.0" + "node": ">= 0.4" } }, "node_modules/to-regex-range": { @@ -2877,29 +2335,26 @@ "node": ">=8.0" } }, - "node_modules/to-through": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz", - "integrity": "sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==", - "dev": true, + "node_modules/typed-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", "license": "MIT", "dependencies": { - "through2": "^2.0.3" + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.14" }, "engines": { - "node": ">= 0.10" + "node": ">= 0.4" } }, - "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" - }, "node_modules/uglify-js": { - "version": "3.17.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", - "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", "dev": true, + "license": "BSD-2-Clause", "optional": true, "bin": { "uglifyjs": "bin/uglifyjs" @@ -2908,30 +2363,12 @@ "node": ">=0.8.0" } }, - "node_modules/unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unique-stream": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz", - "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==", - "dev": true, - "dependencies": { - "json-stable-stringify-without-jsonify": "^1.0.1", - "through2-filter": "^3.0.0" - } - }, "node_modules/unxhr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/unxhr/-/unxhr-1.0.1.tgz", "integrity": "sha512-MAhukhVHyaLGDjyDYhy8gVjWJyhTECCdNsLwlMoGFoNJ3o79fpQhtQuzmAE4IxCMDwraF4cW8ZjpAV0m9CRQbg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.11" } @@ -2939,227 +2376,69 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" - }, - "node_modules/value-or-function": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz", - "integrity": "sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.10" - } + "license": "MIT" }, "node_modules/vinyl": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz", - "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==", - "dev": true, - "license": "MIT", - "dependencies": { - "clone": "^2.1.1", - "clone-buffer": "^1.0.0", - "clone-stats": "^1.0.0", - "cloneable-readable": "^1.0.0", - "remove-trailing-separator": "^1.0.1", - "replace-ext": "^1.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/vinyl-fs": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz", - "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==", - "dev": true, - "license": "MIT", - "dependencies": { - "fs-mkdirp-stream": "^1.0.0", - "glob-stream": "^6.1.0", - "graceful-fs": "^4.0.0", - "is-valid-glob": "^1.0.0", - "lazystream": "^1.0.0", - "lead": "^1.0.0", - "object.assign": "^4.0.4", - "pumpify": "^1.3.5", - "readable-stream": "^2.3.3", - "remove-bom-buffer": "^3.0.0", - "remove-bom-stream": "^1.2.0", - "resolve-options": "^1.1.0", - "through2": "^2.0.0", - "to-through": "^2.0.0", - "value-or-function": "^3.0.0", - "vinyl": "^2.0.0", - "vinyl-sourcemap": "^1.1.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/vinyl-fs/node_modules/duplexify": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", - "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", - "dev": true, - "license": "MIT", - "dependencies": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" - } - }, - "node_modules/vinyl-fs/node_modules/glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - } - }, - "node_modules/vinyl-fs/node_modules/glob-stream": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz", - "integrity": "sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz", + "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==", "dev": true, "license": "MIT", "dependencies": { - "extend": "^3.0.0", - "glob": "^7.1.1", - "glob-parent": "^3.1.0", - "is-negated-glob": "^1.0.0", - "ordered-read-streams": "^1.0.0", - "pumpify": "^1.3.5", - "readable-stream": "^2.1.5", - "remove-trailing-separator": "^1.0.1", - "to-absolute-glob": "^2.0.0", - "unique-stream": "^2.0.2" + "clone": "^2.1.2", + "remove-trailing-separator": "^1.1.0", + "replace-ext": "^2.0.0", + "teex": "^1.0.1" }, "engines": { - "node": ">= 0.10" + "node": ">=10.13.0" } }, - "node_modules/vinyl-fs/node_modules/is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==", - "dev": true, + "node_modules/which-typed-array": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", + "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", "license": "MIT", "dependencies": { - "is-extglob": "^2.1.0" + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/vinyl-fs/node_modules/pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "dev": true, - "license": "MIT", - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "node_modules/vinyl-fs/node_modules/pumpify": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", - "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "duplexify": "^3.6.0", - "inherits": "^2.0.3", - "pump": "^2.0.0" - } - }, - "node_modules/vinyl-fs/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/vinyl-fs/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "license": "MIT" - }, - "node_modules/vinyl-fs/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/vinyl-sourcemap": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz", - "integrity": "sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==", - "dev": true, - "license": "MIT", - "dependencies": { - "append-buffer": "^1.0.2", - "convert-source-map": "^1.5.0", - "graceful-fs": "^4.1.6", - "normalize-path": "^2.1.1", - "now-and-later": "^2.0.0", - "remove-bom-buffer": "^3.0.0", - "vinyl": "^2.0.0" + "node": ">= 0.4" }, - "engines": { - "node": ">= 0.10" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" }, "node_modules/xdg-basedir": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", "integrity": "sha512-1Dly4xqlulvPD3fZUQJLY+FUIeqN3N2MM3uqe4rCJftAvOjFa3jFGfctOgluGx4ahPbUCsZkmJILiP0Vi4T6lQ==", + "license": "MIT", "engines": { "node": ">=4" } }, - "node_modules/xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true, - "engines": { - "node": ">=0.4" - } - }, "node_modules/yargs-parser": { "version": "20.2.9", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", @@ -3171,14 +2450,17 @@ } }, "node_modules/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.1.3.tgz", + "integrity": "sha512-JCCdmlJJWv7L0q/KylOekyRaUrdEoUxWkWVcgorosTROCFWiS9p2NNPE9Yb91ak7b1N5SxAZEliWpspbZccivw==", "dev": true, "license": "MIT", "dependencies": { "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" + "pend": "~1.2.0" + }, + "engines": { + "node": ">=12" } }, "node_modules/yazl": { diff --git a/doc/package.json b/doc/package.json index fdc1849..87db166 100644 --- a/doc/package.json +++ b/doc/package.json @@ -1,15 +1,17 @@ { "devDependencies": { - "@antora/cli": "3.1.3", - "@antora/site-generator": "3.1.3", - "antora": "3.1.3" + "@antora/cli": "3.1.14", + "@antora/site-generator": "3.1.14", + "antora": "3.1.14" }, "dependencies": { - "@cppalliance/antora-cpp-reference-extension": "^0.0.6", - "@cppalliance/antora-cpp-tagfiles-extension": "^0.0.4", + "@antora/expand-path-helper": "^3.0.0", + "@antora/lunr-extension": "^1.0.0-alpha.12", + "@asciidoctor/tabs": "^1.0.0-beta.6", + "@cppalliance/antora-cpp-reference-extension": "^0.1.0", + "@cppalliance/antora-cpp-tagfiles-extension": "^0.1.0", + "@cppalliance/antora-downloads-extension": "^0.0.2", "@cppalliance/asciidoctor-boost-links": "^0.0.2", - "@antora/expand-path-helper": "^2.0.0", - "@antora/lunr-extension": "^1.0.0-alpha.8", - "@asciidoctor/tabs": "^1.0.0-beta.3" + "@sntke/antora-mermaid-extension": "^0.0.8" } } diff --git a/include/boost/ws_proto.hpp b/include/boost/websocket.hpp similarity index 58% rename from include/boost/ws_proto.hpp rename to include/boost/websocket.hpp index 0cd5d0f..ba84411 100644 --- a/include/boost/ws_proto.hpp +++ b/include/boost/websocket.hpp @@ -4,12 +4,12 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#ifndef BOOST_WS_PROTO_HPP -#define BOOST_WS_PROTO_HPP +#ifndef BOOST_WEBSOCKET_HPP +#define BOOST_WEBSOCKET_HPP -#include +#include #endif diff --git a/include/boost/ws_proto/client.hpp b/include/boost/websocket/client.hpp similarity index 72% rename from include/boost/ws_proto/client.hpp rename to include/boost/websocket/client.hpp index 9fdfce7..0047078 100644 --- a/include/boost/ws_proto/client.hpp +++ b/include/boost/websocket/client.hpp @@ -4,16 +4,16 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#ifndef BOOST_WS_PROTO_CLIENT_HPP -#define BOOST_WS_PROTO_CLIENT_HPP +#ifndef BOOST_WEBSOCKET_CLIENT_HPP +#define BOOST_WEBSOCKET_CLIENT_HPP -#include +#include namespace boost { -namespace ws_proto { +namespace websocket { enum class frame_type { @@ -38,7 +38,7 @@ class client ConstBufferSequence const& payload); }; -} // ws_proto +} // websocket } // boost #endif diff --git a/include/boost/ws_proto/close_code.hpp b/include/boost/websocket/close_code.hpp similarity index 93% rename from include/boost/ws_proto/close_code.hpp rename to include/boost/websocket/close_code.hpp index 14b3669..442a26c 100644 --- a/include/boost/ws_proto/close_code.hpp +++ b/include/boost/websocket/close_code.hpp @@ -4,17 +4,17 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#ifndef BOOST_WS_PROTO_CLOSE_CODE_HPP -#define BOOST_WS_PROTO_CLOSE_CODE_HPP +#ifndef BOOST_WEBSOCKET_CLOSE_CODE_HPP +#define BOOST_WEBSOCKET_CLOSE_CODE_HPP -#include +#include #include namespace boost { -namespace ws_proto { +namespace websocket { /** Close status codes. @@ -104,7 +104,7 @@ enum close_code : std::uint16_t //last = 5000 // satisfy warnings }; -} // ws_proto +} // websocket } // boost #endif diff --git a/include/boost/websocket/detail/config.hpp b/include/boost/websocket/detail/config.hpp new file mode 100644 index 0000000..7772a97 --- /dev/null +++ b/include/boost/websocket/detail/config.hpp @@ -0,0 +1,87 @@ +// +// Copyright (c) 2023 Vinnie Falco (vinnie.falco@gmail.com) +// +// Distributed under the Boost Software License, Version 1.0. (See accompanying +// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +// +// Official repository: https://github.com/cppalliance/websocket +// + +#ifndef BOOST_WEBSOCKET_DETAIL_CONFIG_HPP +#define BOOST_WEBSOCKET_DETAIL_CONFIG_HPP + +#include +#include + +namespace boost { + +namespace websocket { + +//------------------------------------------------ + +# if (defined(BOOST_WEBSOCKET_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)) && !defined(BOOST_WEBSOCKET_STATIC_LINK) +# if defined(BOOST_WEBSOCKET_SOURCE) +# define BOOST_WEBSOCKET_DECL BOOST_SYMBOL_EXPORT +# define BOOST_WEBSOCKET_BUILD_DLL +# else +# define BOOST_WEBSOCKET_DECL BOOST_SYMBOL_IMPORT +# endif + +# if defined(BOOST_WEBSOCKET_ZLIB_SOURCE) +# define BOOST_WEBSOCKET_ZLIB_DECL BOOST_SYMBOL_EXPORT +# define BOOST_WEBSOCKET_ZLIB_BUILD_DLL +# else +# define BOOST_WEBSOCKET_ZLIB_DECL BOOST_SYMBOL_IMPORT +# endif + +# if defined(BOOST_WEBSOCKET_EXT_SOURCE) +# define BOOST_WEBSOCKET_EXT_DECL BOOST_SYMBOL_EXPORT +# define BOOST_WEBSOCKET_EXT_BUILD_DLL +# else +# define BOOST_WEBSOCKET_EXT_DECL BOOST_SYMBOL_IMPORT +# endif +# endif // shared lib + +# ifndef BOOST_WEBSOCKET_DECL +# define BOOST_WEBSOCKET_DECL +# endif + +# ifndef BOOST_WEBSOCKET_ZLIB_DECL +# define BOOST_WEBSOCKET_ZLIB_DECL +# endif + +# ifndef BOOST_WEBSOCKET_EXT_DECL +# define BOOST_WEBSOCKET_EXT_DECL +# endif + +# if !defined(BOOST_WEBSOCKET_SOURCE) && !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_WEBSOCKET_NO_LIB) +# define BOOST_LIB_NAME boost_websocket +# if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_WEBSOCKET_DYN_LINK) +# define BOOST_DYN_LINK +# endif +# include +# endif + +//------------------------------------------------ + +// Add source location to error codes +#ifdef BOOST_WEBSOCKET_NO_SOURCE_LOCATION +# define BOOST_WEBSOCKET_ERR(ev) (::boost::system::error_code(ev)) +# define BOOST_WEBSOCKET_RETURN_EC(ev) return (ev) +#else +# define BOOST_WEBSOCKET_ERR(ev) ( \ + ::boost::system::error_code( (ev), [] { \ + static constexpr auto loc((BOOST_CURRENT_LOCATION)); \ + return &loc; }())) +# define BOOST_WEBSOCKET_RETURN_EC(ev) \ + do { \ + static constexpr auto loc ## __LINE__((BOOST_CURRENT_LOCATION)); \ + return ::boost::system::error_code((ev), &loc ## __LINE__); \ + } while(0) +#endif + +} // websocket + +} // boost + +#endif diff --git a/include/boost/ws_proto/error.hpp b/include/boost/websocket/error.hpp similarity index 65% rename from include/boost/ws_proto/error.hpp rename to include/boost/websocket/error.hpp index 7eae887..194cfbf 100644 --- a/include/boost/ws_proto/error.hpp +++ b/include/boost/websocket/error.hpp @@ -4,17 +4,17 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#ifndef BOOST_WS_PROTO_ERROR_HPP -#define BOOST_WS_PROTO_ERROR_HPP +#ifndef BOOST_WEBSOCKET_ERROR_HPP +#define BOOST_WEBSOCKET_ERROR_HPP -#include +#include #include namespace boost { -namespace ws_proto { +namespace websocket { /** Error codes returned the library */ @@ -29,9 +29,9 @@ enum class error success = 0, }; -} // ws_proto +} // websocket } // boost -#include +#include #endif diff --git a/include/boost/ws_proto/handshake.hpp b/include/boost/websocket/handshake.hpp similarity index 56% rename from include/boost/ws_proto/handshake.hpp rename to include/boost/websocket/handshake.hpp index 37f54b0..03eee07 100644 --- a/include/boost/ws_proto/handshake.hpp +++ b/include/boost/websocket/handshake.hpp @@ -4,36 +4,36 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#ifndef BOOST_WS_PROTO_HANDSHAKE_HPP -#define BOOST_WS_PROTO_HANDSHAKE_HPP +#ifndef BOOST_WEBSOCKET_HANDSHAKE_HPP +#define BOOST_WEBSOCKET_HANDSHAKE_HPP -#include -#include -#include +#include +#include +#include #include #include namespace boost { -namespace ws_proto { +namespace websocket { /** Return true if the request is a valid Websocket Upgrade handshake. */ -BOOST_WS_PROTO_DECL +BOOST_WEBSOCKET_DECL system::result is_upgrade( - http_proto::request_view const& req) noexcept; + http::request const& req) noexcept; /** Return a Websocket Upgrade HTTP request */ -BOOST_WS_PROTO_DECL -http_proto::request +BOOST_WEBSOCKET_DECL +http::request make_upgrade( urls::url_view target); -} // ws_proto +} // websocket } // boost #endif diff --git a/include/boost/ws_proto/impl/error.hpp b/include/boost/websocket/impl/error.hpp similarity index 79% rename from include/boost/ws_proto/impl/error.hpp rename to include/boost/websocket/impl/error.hpp index eb6bfeb..15d5306 100644 --- a/include/boost/ws_proto/impl/error.hpp +++ b/include/boost/websocket/impl/error.hpp @@ -4,11 +4,11 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#ifndef BOOST_WS_PROTO_IMPL_ERROR_HPP -#define BOOST_WS_PROTO_IMPL_ERROR_HPP +#ifndef BOOST_WEBSOCKET_IMPL_ERROR_HPP +#define BOOST_WEBSOCKET_IMPL_ERROR_HPP #include #include @@ -19,14 +19,14 @@ namespace boost { //----------------------------------------------- namespace system { template<> -struct is_error_code_enum<::boost::ws_proto::error> +struct is_error_code_enum<::boost::websocket::error> { static bool const value = true; }; } // system //----------------------------------------------- -namespace ws_proto { +namespace websocket { namespace detail { @@ -34,20 +34,20 @@ struct BOOST_SYMBOL_VISIBLE error_cat_type : system::error_category { - BOOST_WS_PROTO_DECL + BOOST_WEBSOCKET_DECL const char* name( ) const noexcept override; - BOOST_WS_PROTO_DECL + BOOST_WEBSOCKET_DECL std::string message( int) const override; - BOOST_WS_PROTO_DECL + BOOST_WEBSOCKET_DECL char const* message( int, char*, std::size_t ) const noexcept override; - BOOST_WS_PROTO_DECL + BOOST_WEBSOCKET_DECL system::error_condition default_error_condition( int code) const noexcept override; @@ -58,7 +58,7 @@ struct BOOST_SYMBOL_VISIBLE } }; -BOOST_WS_PROTO_DECL extern +BOOST_WEBSOCKET_DECL extern error_cat_type error_cat; } // detail @@ -75,7 +75,7 @@ make_error_code( detail::error_cat}; } -} // ws_proto +} // websocket } // boost #endif \ No newline at end of file diff --git a/include/boost/ws_proto/parser.hpp b/include/boost/websocket/parser.hpp similarity index 58% rename from include/boost/ws_proto/parser.hpp rename to include/boost/websocket/parser.hpp index 1c0eb44..2b32e9a 100644 --- a/include/boost/ws_proto/parser.hpp +++ b/include/boost/websocket/parser.hpp @@ -4,33 +4,33 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#ifndef BOOST_WS_PROTO_PARSER_HPP -#define BOOST_WS_PROTO_PARSER_HPP +#ifndef BOOST_WEBSOCKET_PARSER_HPP +#define BOOST_WEBSOCKET_PARSER_HPP -#include +#include #include namespace boost { -namespace ws_proto { +namespace websocket { class parser { public: - BOOST_WS_PROTO_DECL + BOOST_WEBSOCKET_DECL explicit parser( std::size_t n); - BOOST_WS_PROTO_DECL + BOOST_WEBSOCKET_DECL ~parser(); }; -} // ws_proto +} // websocket } // boost #endif diff --git a/include/boost/ws_proto/serializer.hpp b/include/boost/websocket/serializer.hpp similarity index 58% rename from include/boost/ws_proto/serializer.hpp rename to include/boost/websocket/serializer.hpp index 86738e9..4ae1fa0 100644 --- a/include/boost/ws_proto/serializer.hpp +++ b/include/boost/websocket/serializer.hpp @@ -4,24 +4,24 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#ifndef BOOST_WS_PROTO_SERIALIZER_HPP -#define BOOST_WS_PROTO_SERIALIZER_HPP +#ifndef BOOST_WEBSOCKET_SERIALIZER_HPP +#define BOOST_WEBSOCKET_SERIALIZER_HPP -#include +#include #include namespace boost { -namespace ws_proto { +namespace websocket { class serializer { public: }; -} // ws_proto +} // websocket } // boost #endif diff --git a/include/boost/ws_proto/detail/config.hpp b/include/boost/ws_proto/detail/config.hpp deleted file mode 100644 index a17872b..0000000 --- a/include/boost/ws_proto/detail/config.hpp +++ /dev/null @@ -1,87 +0,0 @@ -// -// Copyright (c) 2023 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/ws_proto -// - -#ifndef BOOST_WS_PROTO_DETAIL_CONFIG_HPP -#define BOOST_WS_PROTO_DETAIL_CONFIG_HPP - -#include -#include - -namespace boost { - -namespace ws_proto { - -//------------------------------------------------ - -# if (defined(BOOST_WS_PROTO_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)) && !defined(BOOST_WS_PROTO_STATIC_LINK) -# if defined(BOOST_WS_PROTO_SOURCE) -# define BOOST_WS_PROTO_DECL BOOST_SYMBOL_EXPORT -# define BOOST_WS_PROTO_BUILD_DLL -# else -# define BOOST_WS_PROTO_DECL BOOST_SYMBOL_IMPORT -# endif - -# if defined(BOOST_WS_PROTO_ZLIB_SOURCE) -# define BOOST_WS_PROTO_ZLIB_DECL BOOST_SYMBOL_EXPORT -# define BOOST_WS_PROTO_ZLIB_BUILD_DLL -# else -# define BOOST_WS_PROTO_ZLIB_DECL BOOST_SYMBOL_IMPORT -# endif - -# if defined(BOOST_WS_PROTO_EXT_SOURCE) -# define BOOST_WS_PROTO_EXT_DECL BOOST_SYMBOL_EXPORT -# define BOOST_WS_PROTO_EXT_BUILD_DLL -# else -# define BOOST_WS_PROTO_EXT_DECL BOOST_SYMBOL_IMPORT -# endif -# endif // shared lib - -# ifndef BOOST_WS_PROTO_DECL -# define BOOST_WS_PROTO_DECL -# endif - -# ifndef BOOST_WS_PROTO_ZLIB_DECL -# define BOOST_WS_PROTO_ZLIB_DECL -# endif - -# ifndef BOOST_WS_PROTO_EXT_DECL -# define BOOST_WS_PROTO_EXT_DECL -# endif - -# if !defined(BOOST_WS_PROTO_SOURCE) && !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_WS_PROTO_NO_LIB) -# define BOOST_LIB_NAME boost_ws_proto -# if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_WS_PROTO_DYN_LINK) -# define BOOST_DYN_LINK -# endif -# include -# endif - -//------------------------------------------------ - -// Add source location to error codes -#ifdef BOOST_WS_PROTO_NO_SOURCE_LOCATION -# define BOOST_WS_PROTO_ERR(ev) (::boost::system::error_code(ev)) -# define BOOST_WS_PROTO_RETURN_EC(ev) return (ev) -#else -# define BOOST_WS_PROTO_ERR(ev) ( \ - ::boost::system::error_code( (ev), [] { \ - static constexpr auto loc((BOOST_CURRENT_LOCATION)); \ - return &loc; }())) -# define BOOST_WS_PROTO_RETURN_EC(ev) \ - do { \ - static constexpr auto loc ## __LINE__((BOOST_CURRENT_LOCATION)); \ - return ::boost::system::error_code((ev), &loc ## __LINE__); \ - } while(0) -#endif - -} // ws_proto - -} // boost - -#endif diff --git a/index.html b/index.html index e9f574d..cc738da 100644 --- a/index.html +++ b/index.html @@ -1,6 +1,6 @@ - Boost.WS.Proto + Boost.Websocket @@ -8,7 +8,7 @@ ./doc/html/index.html
- Boost.WS.Proto
+ Boost.Websocket

Copyright (C) 2019 Vinnie Falco

diff --git a/meta/explicit-failures-markup.xml b/meta/explicit-failures-markup.xml index 6166594..8867d7d 100644 --- a/meta/explicit-failures-markup.xml +++ b/meta/explicit-failures-markup.xml @@ -1,7 +1,7 @@ - - + + diff --git a/meta/libraries.json b/meta/libraries.json index 269a327..ea0b9e2 100644 --- a/meta/libraries.json +++ b/meta/libraries.json @@ -1,6 +1,6 @@ { - "key": "ws_proto", - "name": "Websockets Proto", + "key": "websocket", + "name": "Websocket", "authors": [ "Vinnie Falco" ], diff --git a/src/error.cpp b/src/error.cpp index a3026d1..24be54c 100644 --- a/src/error.cpp +++ b/src/error.cpp @@ -4,13 +4,13 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#include +#include namespace boost { -namespace ws_proto { +namespace websocket { -} // ws_proto +} // websocket } // boost diff --git a/src/handshake.cpp b/src/handshake.cpp index 34b7d2d..3142ef7 100644 --- a/src/handshake.cpp +++ b/src/handshake.cpp @@ -4,40 +4,40 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#include +#include #include "src/impl/hybi13.hpp" namespace boost { -namespace ws_proto { +namespace websocket { system::result is_upgrade( - http_proto::request_view const& /*req*/) noexcept + http::request const& /*req*/) noexcept { return false; } -http_proto::request +http::request make_upgrade( urls::url_view target) { - http_proto::request req; + http::request req; req.set_start_line( - http_proto::method::get, + http::method::get, target.buffer(), - http_proto::version::http_1_1); - req.set(http_proto::field::host, "host"); - req.set(http_proto::field::connection, "Upgrade"); - req.set(http_proto::field::upgrade, "websocket"); + http::version::http_1_1); + req.set(http::field::host, "host"); + req.set(http::field::connection, "Upgrade"); + req.set(http::field::upgrade, "websocket"); detail::request_key key; detail::make_request_key(key); - req.set(http_proto::field::sec_websocket_key, + req.set(http::field::sec_websocket_key, core::string_view(key.data, key.size)); - req.set(http_proto::field::sec_websocket_version, "13"); + req.set(http::field::sec_websocket_version, "13"); /* this->build_request_pmd(req); @@ -48,5 +48,5 @@ make_upgrade( return req; } -} // ws_proto +} // websocket } // boost diff --git a/src/impl/base64.cpp b/src/impl/base64.cpp index 33a0e6b..71a9b60 100644 --- a/src/impl/base64.cpp +++ b/src/impl/base64.cpp @@ -4,7 +4,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // /* @@ -42,7 +42,7 @@ #include namespace boost { -namespace ws_proto { +namespace websocket { char const* base64_alphabet() noexcept @@ -175,5 +175,5 @@ base64_decode(void* dest, char const* src, std::size_t len) in - reinterpret_cast(src)}; } -} // ws_proto +} // websocket } // boost diff --git a/src/impl/base64.hpp b/src/impl/base64.hpp index 7d1e9a2..f96fabb 100644 --- a/src/impl/base64.hpp +++ b/src/impl/base64.hpp @@ -4,17 +4,17 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#ifndef BOOST_WS_PROTO_SRC_IMPL_BASE64_HPP -#define BOOST_WS_PROTO_SRC_IMPL_BASE64_HPP +#ifndef BOOST_WEBSOCKET_SRC_IMPL_BASE64_HPP +#define BOOST_WEBSOCKET_SRC_IMPL_BASE64_HPP #include #include namespace boost { -namespace ws_proto { +namespace websocket { char const* base64_alphabet() noexcept; @@ -67,7 +67,7 @@ base64_encode(void* dest, void const* src, std::size_t len); std::pair base64_decode(void* dest, char const* src, std::size_t len); -} // ws_proto +} // websocket } // boost #endif diff --git a/src/impl/chacha.hpp b/src/impl/chacha.hpp index e377728..22f20be 100644 --- a/src/impl/chacha.hpp +++ b/src/impl/chacha.hpp @@ -4,7 +4,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // // @@ -30,14 +30,14 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BOOST_WS_PROTO_SRC_IMPL_CHACHA_HPP -#define BOOST_WS_PROTO_SRC_IMPL_CHACHA_HPP +#ifndef BOOST_WEBSOCKET_SRC_IMPL_CHACHA_HPP +#define BOOST_WEBSOCKET_SRC_IMPL_CHACHA_HPP #include #include namespace boost { -namespace ws_proto { +namespace websocket { namespace detail { template @@ -69,28 +69,28 @@ class chacha void chacha_core() { - #define BOOST_WS_PROTO_CHACHA_ROTL32(x, n) (((x) << (n)) | ((x) >> (32 - (n)))) + #define BOOST_WEBSOCKET_CHACHA_ROTL32(x, n) (((x) << (n)) | ((x) >> (32 - (n)))) - #define BOOST_WS_PROTO_CHACHA_QUARTERROUND(x, a, b, c, d) \ - x[a] = x[a] + x[b]; x[d] ^= x[a]; x[d] = BOOST_WS_PROTO_CHACHA_ROTL32(x[d], 16); \ - x[c] = x[c] + x[d]; x[b] ^= x[c]; x[b] = BOOST_WS_PROTO_CHACHA_ROTL32(x[b], 12); \ - x[a] = x[a] + x[b]; x[d] ^= x[a]; x[d] = BOOST_WS_PROTO_CHACHA_ROTL32(x[d], 8); \ - x[c] = x[c] + x[d]; x[b] ^= x[c]; x[b] = BOOST_WS_PROTO_CHACHA_ROTL32(x[b], 7) + #define BOOST_WEBSOCKET_CHACHA_QUARTERROUND(x, a, b, c, d) \ + x[a] = x[a] + x[b]; x[d] ^= x[a]; x[d] = BOOST_WEBSOCKET_CHACHA_ROTL32(x[d], 16); \ + x[c] = x[c] + x[d]; x[b] ^= x[c]; x[b] = BOOST_WEBSOCKET_CHACHA_ROTL32(x[b], 12); \ + x[a] = x[a] + x[b]; x[d] ^= x[a]; x[d] = BOOST_WEBSOCKET_CHACHA_ROTL32(x[d], 8); \ + x[c] = x[c] + x[d]; x[b] ^= x[c]; x[b] = BOOST_WEBSOCKET_CHACHA_ROTL32(x[b], 7) for (unsigned i = 0; i < R; i += 2) { - BOOST_WS_PROTO_CHACHA_QUARTERROUND(block_, 0, 4, 8, 12); - BOOST_WS_PROTO_CHACHA_QUARTERROUND(block_, 1, 5, 9, 13); - BOOST_WS_PROTO_CHACHA_QUARTERROUND(block_, 2, 6, 10, 14); - BOOST_WS_PROTO_CHACHA_QUARTERROUND(block_, 3, 7, 11, 15); - BOOST_WS_PROTO_CHACHA_QUARTERROUND(block_, 0, 5, 10, 15); - BOOST_WS_PROTO_CHACHA_QUARTERROUND(block_, 1, 6, 11, 12); - BOOST_WS_PROTO_CHACHA_QUARTERROUND(block_, 2, 7, 8, 13); - BOOST_WS_PROTO_CHACHA_QUARTERROUND(block_, 3, 4, 9, 14); + BOOST_WEBSOCKET_CHACHA_QUARTERROUND(block_, 0, 4, 8, 12); + BOOST_WEBSOCKET_CHACHA_QUARTERROUND(block_, 1, 5, 9, 13); + BOOST_WEBSOCKET_CHACHA_QUARTERROUND(block_, 2, 6, 10, 14); + BOOST_WEBSOCKET_CHACHA_QUARTERROUND(block_, 3, 7, 11, 15); + BOOST_WEBSOCKET_CHACHA_QUARTERROUND(block_, 0, 5, 10, 15); + BOOST_WEBSOCKET_CHACHA_QUARTERROUND(block_, 1, 6, 11, 12); + BOOST_WEBSOCKET_CHACHA_QUARTERROUND(block_, 2, 7, 8, 13); + BOOST_WEBSOCKET_CHACHA_QUARTERROUND(block_, 3, 4, 9, 14); } - #undef BOOST_WS_PROTO_CHACHA_QUARTERROUND - #undef BOOST_WS_PROTO_CHACHA_ROTL32 + #undef BOOST_WEBSOCKET_CHACHA_QUARTERROUND + #undef BOOST_WEBSOCKET_CHACHA_ROTL32 } public: @@ -120,7 +120,7 @@ class chacha }; } // detail -} // ws_proto +} // websocket } // boost #endif diff --git a/src/impl/hybi13.cpp b/src/impl/hybi13.cpp index faf93ef..ea9c831 100644 --- a/src/impl/hybi13.cpp +++ b/src/impl/hybi13.cpp @@ -4,7 +4,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // #include "src/impl/hybi13.hpp" @@ -17,7 +17,7 @@ #include namespace boost { -namespace ws_proto { +namespace websocket { namespace detail { void @@ -51,6 +51,6 @@ make_response_key( } } // detail -} // ws_proto +} // websocket } // boost diff --git a/src/impl/hybi13.hpp b/src/impl/hybi13.hpp index cce1e4e..ee33356 100644 --- a/src/impl/hybi13.hpp +++ b/src/impl/hybi13.hpp @@ -4,18 +4,18 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#ifndef BOOST_WS_PROTO_SRC_IMPL_HYBI13_HPP -#define BOOST_WS_PROTO_SRC_IMPL_HYBI13_HPP +#ifndef BOOST_WEBSOCKET_SRC_IMPL_HYBI13_HPP +#define BOOST_WEBSOCKET_SRC_IMPL_HYBI13_HPP #include #include "src/impl/base64.hpp" #include namespace boost { -namespace ws_proto { +namespace websocket { namespace detail { struct request_key @@ -42,7 +42,7 @@ void make_response_key( core::string_view in); } // detail -} // ws_proto +} // websocket } // boost #endif diff --git a/src/impl/pcg.hpp b/src/impl/pcg.hpp index add4cee..2efe986 100644 --- a/src/impl/pcg.hpp +++ b/src/impl/pcg.hpp @@ -4,18 +4,18 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#ifndef BOOST_WS_PROTO_SRC_IMPL_PCG_HPP -#define BOOST_WS_PROTO_SRC_IMPL_PCG_HPP +#ifndef BOOST_WEBSOCKET_SRC_IMPL_PCG_HPP +#define BOOST_WEBSOCKET_SRC_IMPL_PCG_HPP #include #include #include namespace boost { -namespace ws_proto { +namespace websocket { namespace detail { class pcg @@ -59,7 +59,7 @@ class pcg }; } // detail -} // ws_proto +} // websocket } // boost #endif diff --git a/src/impl/prng.cpp b/src/impl/prng.cpp index 3ea48da..19cf480 100644 --- a/src/impl/prng.cpp +++ b/src/impl/prng.cpp @@ -4,7 +4,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // #include "src/impl/prng.hpp" @@ -16,7 +16,7 @@ #include namespace boost { -namespace ws_proto { +namespace websocket { namespace detail { //------------------------------------------------------------------------------ @@ -138,5 +138,5 @@ make_prng(bool secure) } } // detail -} // ws_proto +} // websocket } // boost diff --git a/src/impl/prng.hpp b/src/impl/prng.hpp index 05cbc99..70857d6 100644 --- a/src/impl/prng.hpp +++ b/src/impl/prng.hpp @@ -4,18 +4,18 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#ifndef BOOST_WS_PROTO_SRC_IMPL_PRNG_HPP -#define BOOST_WS_PROTO_SRC_IMPL_PRNG_HPP +#ifndef BOOST_WEBSOCKET_SRC_IMPL_PRNG_HPP +#define BOOST_WEBSOCKET_SRC_IMPL_PRNG_HPP #include #include #include namespace boost { -namespace ws_proto { +namespace websocket { namespace detail { using generator = std::uint32_t(*)(); @@ -35,7 +35,7 @@ generator make_prng(bool secure); } // detail -} // ws_proto +} // websocket } // boost #endif diff --git a/src/impl/sha1.cpp b/src/impl/sha1.cpp index 79f53ed..2828830 100644 --- a/src/impl/sha1.cpp +++ b/src/impl/sha1.cpp @@ -4,7 +4,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // #include "src/impl/sha1.hpp" @@ -24,7 +24,7 @@ */ namespace boost { -namespace ws_proto { +namespace websocket { namespace sha1 { namespace { @@ -289,5 +289,5 @@ finish( } } // sha1 -} // ws_proto +} // websocket } // boost diff --git a/src/impl/sha1.hpp b/src/impl/sha1.hpp index ecb5a57..580ba17 100644 --- a/src/impl/sha1.hpp +++ b/src/impl/sha1.hpp @@ -4,11 +4,11 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#ifndef BOOST_WS_PROTO_IMPL_SHA1_HPP -#define BOOST_WS_PROTO_IMPL_SHA1_HPP +#ifndef BOOST_WEBSOCKET_IMPL_SHA1_HPP +#define BOOST_WEBSOCKET_IMPL_SHA1_HPP #include #include @@ -24,7 +24,7 @@ */ namespace boost { -namespace ws_proto { +namespace websocket { namespace sha1 { static std::size_t constexpr BLOCK_INTS = 16; @@ -57,7 +57,7 @@ finish( void* digest) noexcept; } // sha1 -} // ws_proto +} // websocket } // boost #endif diff --git a/src/parser.cpp b/src/parser.cpp index 153ad9b..b7a0ecb 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -4,13 +4,13 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#include +#include namespace boost { -namespace ws_proto { +namespace websocket { -} // ws_proto +} // websocket } // boost diff --git a/src/serializer.cpp b/src/serializer.cpp index 25f3172..ea6b57d 100644 --- a/src/serializer.cpp +++ b/src/serializer.cpp @@ -4,13 +4,13 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // -#include +#include namespace boost { -namespace ws_proto { +namespace websocket { -} // ws_proto +} // websocket } // boost diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8e43ca5..64b3b87 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -4,7 +4,7 @@ # Distributed under the Boost Software License, Version 1.0. (See accompanying # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # -# Official repository: https://github.com/cppalliance/ws_proto +# Official repository: https://github.com/cppalliance/websocket # if(NOT TARGET tests) diff --git a/test/Jamfile b/test/Jamfile index e1da959..f03adc0 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -4,7 +4,7 @@ # Distributed under the Boost Software License, Version 1.0. (See accompanying # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # -# Official repository: https://github.com/cppalliance/ws_proto +# Official repository: https://github.com/cppalliance/websocket # build-project unit ; diff --git a/test/cmake_test/CMakeLists.txt b/test/cmake_test/CMakeLists.txt index d1ada5c..71a6668 100644 --- a/test/cmake_test/CMakeLists.txt +++ b/test/cmake_test/CMakeLists.txt @@ -13,51 +13,15 @@ set(__ignore__ ${CMAKE_C_COMPILER}) set(__ignore__ ${CMAKE_C_FLAGS}) if(BOOST_CI_INSTALL_TEST) - find_package(Boost CONFIG REQUIRED COMPONENTS ws_proto) + find_package(Boost CONFIG REQUIRED COMPONENTS websocket) else() set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) - add_subdirectory(../.. boostorg/ws_proto) - - set(BOOST_URL_BUILD_TESTS OFF CACHE BOOL "" FORCE) - - set(deps - # Primary dependencies - - assert - buffers - config - container_hash - core - http_proto - mp11 - static_assert - system - rts - throw_exception - type_traits - url - winapi - - # Secondary dependencies - - describe - variant2 - align - optional - predef - detail - utility - preprocessor - io - ) - - foreach(dep IN LISTS deps) - add_subdirectory(../../../${dep} boostorg/${dep} EXCLUDE_FROM_ALL) - endforeach() + set(BOOST_INCLUDE_LIBRARIES websocket) + add_subdirectory(../../../.. boostorg/boost) endif() add_executable(main main.cpp) -target_link_libraries(main Boost::ws_proto) +target_link_libraries(main Boost::websocket) enable_testing() add_test(NAME main COMMAND main) diff --git a/test/cmake_test/main.cpp b/test/cmake_test/main.cpp index 58f3d3a..1865e52 100644 --- a/test/cmake_test/main.cpp +++ b/test/cmake_test/main.cpp @@ -1,4 +1,4 @@ -#include +#include int main() { diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 02cd640..4ef6753 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -4,7 +4,7 @@ # Distributed under the Boost Software License, Version 1.0. (See accompanying # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # -# Official repository: https://github.com/cppalliance/ws_proto +# Official repository: https://github.com/cppalliance/websocket # set(EXTRAFILES @@ -21,15 +21,15 @@ list(APPEND PFILES source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "" FILES ${PFILES}) source_group("_extra" FILES ${EXTRAFILES}) -add_executable(boost_ws_proto_tests ${PFILES} ${EXTRAFILES}) -target_include_directories(boost_ws_proto_tests PRIVATE . ../../../url/extra/test_suite) -target_link_libraries(boost_ws_proto_tests PRIVATE - boost_ws_proto) +add_executable(boost_websocket_tests ${PFILES} ${EXTRAFILES}) +target_include_directories(boost_websocket_tests PRIVATE . ../../../url/extra/test_suite) +target_link_libraries(boost_websocket_tests PRIVATE + boost_websocket) -if (TARGET boost_rts_zlib) - target_link_libraries(boost_ws_proto_tests PRIVATE boost_rts_zlib) +if (TARGET boost_http_zlib) + target_link_libraries(boost_websocket_tests PRIVATE boost_http_zlib) endif () -add_test(NAME boost_ws_proto_tests COMMAND boost_ws_proto_tests) -add_dependencies(tests boost_ws_proto_tests) +add_test(NAME boost_websocket_tests COMMAND boost_websocket_tests) +add_dependencies(tests boost_websocket_tests) diff --git a/test/unit/Jamfile b/test/unit/Jamfile index 48e980d..8aa6f63 100644 --- a/test/unit/Jamfile +++ b/test/unit/Jamfile @@ -4,7 +4,7 @@ # Distributed under the Boost Software License, Version 1.0. (See accompanying # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # -# Official repository: https://github.com/cppalliance/ws_proto +# Official repository: https://github.com/cppalliance/websocket # import testing ; @@ -15,14 +15,14 @@ using zlib ; project : requirements $(c11-requires) - /boost/ws_proto//boost_ws_proto - [ ac.check-library /boost/rts//boost_rts_zlib : /boost/rts//boost_rts_zlib : ] + /boost/websocket//boost_websocket + [ ac.check-library /boost/http//boost_http_zlib : /boost/http//boost_http_zlib : ] ../../../url/extra/test_suite/test_main.cpp ../../../url/extra/test_suite/test_suite.cpp . ../../../url/extra/test_suite extra - on + # on darwin,norecover:static ; diff --git a/test/unit/client.cpp b/test/unit/client.cpp index 3330c93..f84728c 100644 --- a/test/unit/client.cpp +++ b/test/unit/client.cpp @@ -4,16 +4,16 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // // Test that header file is self-contained. -#include +#include #include "test_suite.hpp" namespace boost { -namespace ws_proto { +namespace websocket { struct client_test { @@ -25,7 +25,7 @@ struct client_test TEST_SUITE( client_test, - "boost.ws_proto.client"); + "boost.websocket.client"); -} // ws_proto +} // websocket } // boost diff --git a/test/unit/close_code.cpp b/test/unit/close_code.cpp index 69de2f1..7279587 100644 --- a/test/unit/close_code.cpp +++ b/test/unit/close_code.cpp @@ -4,8 +4,8 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // // Test that header file is self-contained. -#include +#include diff --git a/test/unit/error.cpp b/test/unit/error.cpp index a10c5df..249bba1 100644 --- a/test/unit/error.cpp +++ b/test/unit/error.cpp @@ -4,8 +4,8 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // // Test that header file is self-contained. -#include +#include diff --git a/test/unit/handshake.cpp b/test/unit/handshake.cpp index 1f76c7d..9d3419e 100644 --- a/test/unit/handshake.cpp +++ b/test/unit/handshake.cpp @@ -4,16 +4,16 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // // Test that header file is self-contained. -#include +#include #include "test_suite.hpp" namespace boost { -namespace ws_proto { +namespace websocket { struct handshake_test { @@ -25,7 +25,7 @@ struct handshake_test TEST_SUITE( handshake_test, - "boost.ws_proto.handshake"); + "boost.websocket.handshake"); -} // ws_proto +} // websocket } // boost diff --git a/test/unit/parser.cpp b/test/unit/parser.cpp index fdd702c..21ca63d 100644 --- a/test/unit/parser.cpp +++ b/test/unit/parser.cpp @@ -4,8 +4,8 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // // Test that header file is self-contained. -#include +#include diff --git a/test/unit/serializer.cpp b/test/unit/serializer.cpp index d10e14a..25667dd 100644 --- a/test/unit/serializer.cpp +++ b/test/unit/serializer.cpp @@ -4,8 +4,8 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/ws_proto +// Official repository: https://github.com/cppalliance/websocket // // Test that header file is self-contained. -#include +#include