From f696171d2a5f1a1c5ab86ad6c5c859d8cc610277 Mon Sep 17 00:00:00 2001 From: na-trium-144 <100704180+na-trium-144@users.noreply.github.com> Date: Mon, 7 Oct 2024 19:07:06 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E7=84=A1=E5=90=8D=E3=81=AE=E3=82=AF?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=82=A2=E3=83=B3=E3=83=88=E3=81=8C=E8=A4=87?= =?UTF-8?q?=E6=95=B0=E3=81=84=E3=82=8B=E3=81=A8=E3=81=8D=E3=81=AEclient=5F?= =?UTF-8?q?id=E3=81=AE=E6=8C=AF=E3=82=8A=E5=88=86=E3=81=91=E3=83=90?= =?UTF-8?q?=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server-store/src/member_data.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server-store/src/member_data.cc b/server-store/src/member_data.cc index b777562e7..bb2064137 100644 --- a/server-store/src/member_data.cc +++ b/server-store/src/member_data.cc @@ -162,7 +162,8 @@ void MemberData::onRecv(const std::string &message) { auto prev_cli_it = std::find_if( clients_by_id.begin(), clients_by_id.end(), [&](const auto &it) { return it.second->name == this->name; }); - if (prev_cli_it != clients_by_id.end()) { + if (prev_cli_it != clients_by_id.end() && !this->name.empty()) { + // すでに同じ名前のクライアントがいたら & 名前が空でなければ そのidを使う this->member_id = v.member_id = prev_cli_it->first; } else { // コンストラクタですでに一意のidが振られているはず From 2cd00460e16bfbd0d0426e2757555b691994993f Mon Sep 17 00:00:00 2001 From: na-trium-144 <100704180+na-trium-144@users.noreply.github.com> Date: Mon, 7 Oct 2024 19:11:22 +0900 Subject: [PATCH 2/3] v2.4.1 --- CHANGELOG.md | 4 ++++ CMakeLists.txt | 2 +- Doxyfile | 2 +- README.md | 36 ++++++++++++++++++------------------ docs/31_setup.md | 4 ++-- meson.build | 2 +- 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6621899f2..d6c736f55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [2.4.1] - 2024-10-07 +### Fixed +* 無名のクライアントが複数いるときclient_idの振り分けが間違っておりcall_responseが正しく返らないバグを修正 (#412) + ## [2.4.0] - 2024-10-02 ### Changed * Logメッセージを仕様変更、Logに名前をつけて複数送信できるようになった (#410) diff --git a/CMakeLists.txt b/CMakeLists.txt index 917f57641..1e0d58a1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5) -project(webcface VERSION 2.4.0) +project(webcface VERSION 2.4.1) if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) set(IS_MAIN on) diff --git a/Doxyfile b/Doxyfile index d2f9dedbc..52790d5e7 100644 --- a/Doxyfile +++ b/Doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = "WebCFace" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "2.4.0" +PROJECT_NUMBER = "2.4.1" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/README.md b/README.md index 85f02d1c3..646cdf4ad 100644 --- a/README.md +++ b/README.md @@ -195,9 +195,9 @@ Ubuntu20.04でビルドしているため、それより古いUbuntuでは動作
x86_64 ```sh -curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.4.0-1/webcface_2.4.0-1_linux_amd64.zip -sudo unzip webcface_2.4.0-1_linux_amd64.zip -d /opt/webcface -rm webcface_2.4.0-1_linux_amd64.zip +curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.4.1/webcface_2.4.1_linux_amd64.zip +sudo unzip webcface_2.4.1_linux_amd64.zip -d /opt/webcface +rm webcface_2.4.1_linux_amd64.zip echo 'export PATH="/opt/webcface/bin:$PATH"' >> ~/.bashrc echo 'export PKG_CONFIG_PATH="/opt/webcface/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/ @@ -207,9 +207,9 @@ sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/
arm64 ```sh -curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.4.0-1/webcface_2.4.0-1_linux_arm64.zip -sudo unzip webcface_2.4.0-1_linux_arm64.zip -d /opt/webcface -rm webcface_2.4.0-1_linux_arm64.zip +curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.4.1/webcface_2.4.1_linux_arm64.zip +sudo unzip webcface_2.4.1_linux_arm64.zip -d /opt/webcface +rm webcface_2.4.1_linux_arm64.zip echo 'export PATH="/opt/webcface/bin:$PATH"' >> ~/.bashrc echo 'export PKG_CONFIG_PATH="/opt/webcface/lib/aarch64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/ @@ -219,9 +219,9 @@ sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/
armhf ```sh -curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.4.0-1/webcface_2.4.0-1_linux_armhf.zip -sudo unzip webcface_2.4.0-1_linux_armhf.zip -d /opt/webcface -rm webcface_2.4.0-1_linux_armhf.zip +curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.4.1/webcface_2.4.1_linux_armhf.zip +sudo unzip webcface_2.4.1_linux_armhf.zip -d /opt/webcface +rm webcface_2.4.1_linux_armhf.zip echo 'export PATH="/opt/webcface/bin:$PATH"' >> ~/.bashrc echo 'export PKG_CONFIG_PATH="/opt/webcface/lib/arm-linux-gnueabihf/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/ @@ -242,7 +242,7 @@ Ubuntu20.04でビルドしているため、それより古いUbuntuでは動作
x86_64 ```sh -curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.4.0/webcface_2.4.0_amd64.deb +curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.4.1/webcface_2.4.1_amd64.deb curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.0/webcface-tools_2.1.0_amd64.deb curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.0/webcface-webui_1.9.0_all.deb curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.0/webcface-desktop_1.9.0_linux_amd64.deb @@ -254,7 +254,7 @@ rm ./webcface*.deb
arm64 ```sh -curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.4.0/webcface_2.4.0_arm64.deb +curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.4.1/webcface_2.4.1_arm64.deb curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.0/webcface-tools_2.1.0_arm64.deb curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.0/webcface-webui_1.9.0_all.deb curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.0/webcface-desktop_1.9.0_linux_arm64.deb @@ -266,7 +266,7 @@ rm ./webcface*.deb
armhf ```sh -curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.4.0/webcface_2.4.0_armhf.deb +curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.4.1/webcface_2.4.1_armhf.deb curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.0/webcface-tools_2.1.0_armhf.deb curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.0/webcface-webui_1.9.0_all.deb curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.0/webcface-desktop_1.9.0_linux_armv7l.deb @@ -288,16 +288,16 @@ Universalバイナリになっており、IntelMacもAppleシリコンも共通 macOS 12 (Monterey) でビルドしているので、それより古いMacでは動かないかもしれません。 ```sh -curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.4.0-1/webcface_2.4.0-1_macos_universal.zip -curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.4.0-1/webcface-desktop_2.4.0-1_macos_app.zip +curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.4.1/webcface_2.4.1_macos_universal.zip +curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.4.1/webcface-desktop_2.4.1_macos_app.zip ``` sudo権限が使用できれば以下のように webcface_universal を /opt/webcface に、 webcface-desktop_app を /Applications に展開するのがおすすめです。 ```sh -sudo unzip webcface_2.4.0-1_macos_universal.zip -d /opt/webcface -sudo unzip webcface-desktop_2.4.0-1_macos_app.zip -d /Applications -rm webcface_2.4.0-1_macos_universal.zip -rm webcface-desktop_2.4.0-1_macos_app.zip +sudo unzip webcface_2.4.1_macos_universal.zip -d /opt/webcface +sudo unzip webcface-desktop_2.4.1_macos_app.zip -d /Applications +rm webcface_2.4.1_macos_universal.zip +rm webcface-desktop_2.4.1_macos_app.zip ``` また、展開したディレクトリ内の bin/ をPATHに、 lib/pkgconfig/ をPKG_CONFIG_PATHに追加してください。 diff --git a/docs/31_setup.md b/docs/31_setup.md index bfa791890..6deb3310a 100644 --- a/docs/31_setup.md +++ b/docs/31_setup.md @@ -32,7 +32,7 @@ MesonまたはCMakeを使用する場合は、subproject/subdirectoryとしてWe ``` [wrap-git] url = https://github.com/na-trium-144/webcface.git - revision = v2.4.0 + revision = v2.4.1 depth = 1 [provide] dependency_names = webcface @@ -66,7 +66,7 @@ MesonまたはCMakeを使用する場合は、subproject/subdirectoryとしてWe ```cmake FetchContent_Declare(webcface GIT_REPOSITORY https://github.com/na-trium-144/webcface.git - GIT_TAG v2.4.0 + GIT_TAG v2.4.1 ) FetchContent_MakeAvailable(webcface) ``` diff --git a/meson.build b/meson.build index 0e9fb41e2..8e141fb0c 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('webcface', 'c', 'cpp', - version: '2.4.0', + version: '2.4.1', license: 'MIT', meson_version: '>=1.3.0', default_options: [ From 76e40e701c606848ffa25820efde02fe782e6b77 Mon Sep 17 00:00:00 2001 From: na-trium-144 <100704180+na-trium-144@users.noreply.github.com> Date: Mon, 7 Oct 2024 20:31:23 +0900 Subject: [PATCH 3/3] webui 1.9.1 --- README.md | 12 ++++++------ meson.build | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 646cdf4ad..dabdcc22b 100644 --- a/README.md +++ b/README.md @@ -244,8 +244,8 @@ Ubuntu20.04でビルドしているため、それより古いUbuntuでは動作 ```sh curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.4.1/webcface_2.4.1_amd64.deb curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.0/webcface-tools_2.1.0_amd64.deb -curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.0/webcface-webui_1.9.0_all.deb -curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.0/webcface-desktop_1.9.0_linux_amd64.deb +curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.1/webcface-webui_1.9.1_all.deb +curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.1/webcface-desktop_1.9.1_linux_amd64.deb sudo apt install ./webcface*.deb rm ./webcface*.deb ``` @@ -256,8 +256,8 @@ rm ./webcface*.deb ```sh curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.4.1/webcface_2.4.1_arm64.deb curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.0/webcface-tools_2.1.0_arm64.deb -curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.0/webcface-webui_1.9.0_all.deb -curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.0/webcface-desktop_1.9.0_linux_arm64.deb +curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.1/webcface-webui_1.9.1_all.deb +curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.1/webcface-desktop_1.9.1_linux_arm64.deb sudo apt install ./webcface*.deb rm ./webcface*.deb ``` @@ -268,8 +268,8 @@ rm ./webcface*.deb ```sh curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.4.1/webcface_2.4.1_armhf.deb curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.0/webcface-tools_2.1.0_armhf.deb -curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.0/webcface-webui_1.9.0_all.deb -curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.0/webcface-desktop_1.9.0_linux_armv7l.deb +curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.1/webcface-webui_1.9.1_all.deb +curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.9.1/webcface-desktop_1.9.1_linux_armv7l.deb sudo apt install ./webcface*.deb rm ./webcface*.deb ``` diff --git a/meson.build b/meson.build index 8e141fb0c..ae3c19ec5 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,7 @@ py = find_program('python3') webcface_abi_major = '20' # ABIの破壊的変更で1増やす webcface_abi_minor = '3' # ABIの追加で1増やす -webcface_webui_version = '1.9.0' +webcface_webui_version = '1.9.1' webcface_description = 'Web-based IPC & Dashboard-like UI' webcface_contact = 'na-trium-144@users.noreply.github.com'