From 7d7f1b5c4c264a240493247d47822161330aa2e8 Mon Sep 17 00:00:00 2001 From: newbyvector Date: Fri, 22 Mar 2024 21:21:17 +0800 Subject: [PATCH 1/2] fix: get host info from server instead of request host --- docs/guide/secretnote-sf.md | 2 +- .../src/secretnote/server/services/agent/handlers.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/guide/secretnote-sf.md b/docs/guide/secretnote-sf.md index c0add928..89e969e2 100644 --- a/docs/guide/secretnote-sf.md +++ b/docs/guide/secretnote-sf.md @@ -41,7 +41,7 @@ services: docker compose up ``` -在浏览器中（推荐使用 Chrome）通过地址 `http://127.0.0.1:8090` 打开 Web Client，并在右上角节点管理区域将两个计算节点添加进来（两个节点地址为 `127.0.0.1:8090` 和 `127.0.0.1:8092`）。 +在浏览器中（推荐使用 Chrome）通过地址 `http://127.0.0.1:8090` 打开 Web Client，并在右上角节点管理区域将两个计算节点添加进来（两个节点地址为 `本机IP:8090` 和 `本机IP:8092`）。注意这里添加节点的时候需要输入本机的 IP 地址，不能直接输入 `localhost` 或者 `127.0.0.1`，因为它们都指向容器自身的网络接口。 ![image.png](./images/node.png) diff --git a/pyprojects/secretnote/src/secretnote/server/services/agent/handlers.py b/pyprojects/secretnote/src/secretnote/server/services/agent/handlers.py index 07cf143b..53cc44c3 100644 --- a/pyprojects/secretnote/src/secretnote/server/services/agent/handlers.py +++ b/pyprojects/secretnote/src/secretnote/server/services/agent/handlers.py @@ -17,7 +17,9 @@ def get_host_and_port(self, server_id: str): [host_name, port] = address.split(":") return host_name, port - [host_name, port] = self.request.host.split(":") + server_info = self.serverapp.server_info() + host_name = server_info.get("hostname", "localhost") + port = server_info.get("port", 8888) return host_name, port async def http_get(self, server_id: str, proxied_path: str): From 9568e1f5a2f00dd149d47db4a1b2f7590d4ce3ee Mon Sep 17 00:00:00 2001 From: newbyvector Date: Sat, 23 Mar 2024 22:19:47 +0800 Subject: [PATCH 2/2] chore: release secretnote 0.05 --- pyprojects/secretnote/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyprojects/secretnote/package.json b/pyprojects/secretnote/package.json index d4ff2d57..e4431b9c 100644 --- a/pyprojects/secretnote/package.json +++ b/pyprojects/secretnote/package.json @@ -4,7 +4,7 @@ "files": [ "static" ], - "version": "0.0.4", + "version": "0.0.5", "type": "module", "scripts": { "format:black": "python -m black --check src tests",