diff --git a/.gitignore b/.gitignore index 0174ac0..0a2431e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ data/ node_modules/ -webapp/static/clients/beercss-3.12.3/ \ No newline at end of file +webapp/static/clients/beercss-3.12.3/ +webapp/static/clients/quietui@1.6.2/ \ No newline at end of file diff --git a/compose.yaml b/compose.yaml index d2f366c..61c7887 100644 --- a/compose.yaml +++ b/compose.yaml @@ -10,9 +10,9 @@ services: volumes: - ./data:/srv/basex/data # - ./webapp/web.xml:/srv/basex/webapp/WEB-INF/web.xml # set websocket options 12.1+ - - ./webapp/custom:/srv/basex/lib/custom # jars + - ./webapp/custom:/srv/basex/lib/custom:ro # jars - ./webapp/lsp:/srv/basex/webapp/lsp - - ./webapp/static/clients:/srv/basex/webapp/static/clients + - ./webapp/static/clients:/srv/basex/webapp/static/clients:ro - ./webapp/lsp-manager:/srv/basex/webapp/lsp-manager # - ./repo:/srv/basex/repo environment: diff --git a/data/.logs/2025-07-17.log b/data/.logs/2025-07-17.log deleted file mode 100644 index 8984b71..0000000 --- a/data/.logs/2025-07-17.log +++ /dev/null @@ -1,151 +0,0 @@ -13:46:33.043 SERVER admin OK Server was started (port: 1984). -13:46:33.076 SERVER admin INFO Initial admin password (change after first login): c980aed4-8234-48e0-84b9-195d0ef6b049 -13:46:33.110 SERVER admin OK HTTP Server was started (port: 8080). -13:49:38.435 172.19.0.1:33068 admin REQUEST [GET] /dba/logs -13:49:40.374 172.19.0.1:33068 admin 302 Location: login?_page=logs 1942.58 ms -13:49:40.401 172.19.0.1:33068 admin REQUEST [GET] /dba/login?_page=logs -13:49:40.527 172.19.0.1:33068 public 200 126.37 ms -13:50:11.142 172.19.0.1:33068 admin REQUEST [POST] /dba/login -13:50:11.255 172.19.0.1:33068 public DBA Login: admin -13:50:11.256 172.19.0.1:33068 public 302 Location: logs 114.16 ms -13:50:11.281 172.19.0.1:33068 admin REQUEST [GET] /dba/logs -13:50:11.485 172.19.0.1:33068 admin 200 205.03 ms -13:50:11.677 172.19.0.1:33068 admin REQUEST [POST] /dba/logs?date=2025-07-17&page=1 -13:50:11.828 172.19.0.1:33068 admin 200 150.97 ms -13:51:01.795 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -13:51:01.806 SERVER admin TRACE CONNECT: "websocket0" -13:51:20.443 172.19.0.1:33068 admin REQUEST [GET] /dba/logs?input= -13:51:20.535 172.19.0.1:33068 admin 200 105.53 ms -13:51:20.619 172.19.0.1:33068 admin REQUEST [POST] /dba/logs?date=2025-07-17&page=1 -13:51:20.712 172.19.0.1:33068 admin 200 92.72 ms -13:54:21.878 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -13:54:21.886 SERVER admin TRACE CONNECT: "websocket1" -13:54:38.250 172.19.0.1:54556 admin REQUEST [GET] /dba/logs?input= -13:54:38.304 172.19.0.1:54556 admin 200 54.29 ms -13:54:38.386 172.19.0.1:54556 admin REQUEST [POST] /dba/logs?date=2025-07-17&page=1 -13:54:38.467 172.19.0.1:54556 admin 200 81.02 ms -13:59:11.360 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -13:59:11.369 SERVER admin TRACE CONNECT: "websocket2" -14:03:40.821 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -14:03:40.829 SERVER admin TRACE CONNECT: "websocket3" -14:52:02.807 SERVER admin OK Server was started (port: 1984). -14:52:02.852 SERVER admin OK HTTP Server was started (port: 8080). -14:54:26.641 172.19.0.1:46432 admin REQUEST [GET] /favicon.ico -14:54:28.835 172.19.0.1:46432 admin 404 Service not found. 2195.32 ms -14:59:48.126 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -14:59:48.159 SERVER admin TRACE CONNECT: "websocket0" -15:03:35.640 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -15:03:35.655 SERVER admin TRACE CONNECT: "websocket1" -15:03:35.846 172.19.0.1:49788 admin REQUEST [GET] /favicon.ico -15:03:35.847 172.19.0.1:49788 admin 404 Service not found. 1.8 ms -15:08:19.471 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -15:08:19.484 SERVER admin TRACE CONNECT: "websocket2" -15:10:06.561 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -15:10:06.573 SERVER admin TRACE CONNECT: "websocket3" -15:10:52.549 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -15:10:52.559 SERVER admin TRACE CONNECT: "websocket4" -15:11:06.125 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -15:11:06.134 SERVER admin TRACE CONNECT: "websocket5" -15:11:06.211 172.19.0.1:49234 admin REQUEST [GET] /favicon.ico -15:11:06.212 172.19.0.1:49234 admin 404 Service not found. 1.32 ms -15:12:53.901 172.19.0.1:38688 admin REQUEST [GET] /exampleServer -15:12:53.922 172.19.0.1:38688 admin 404 Service not found. 24.36 ms -15:14:19.235 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -15:14:19.247 SERVER admin TRACE CONNECT: "websocket6" -15:18:53.916 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -15:18:53.932 SERVER admin TRACE CONNECT: "websocket7" -15:21:07.983 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -15:21:07.993 SERVER admin TRACE CONNECT: "websocket8" -15:23:42.106 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -15:23:42.116 SERVER admin TRACE CONNECT: "websocket9" -15:34:19.447 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -15:34:19.464 SERVER admin TRACE CONNECT: "websocket10" -15:54:25.526 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -15:54:25.549 SERVER admin TRACE CONNECT: "websocket11" -16:20:28.642 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -16:20:28.671 SERVER admin TRACE CONNECT: "websocket12" -16:20:28.945 172.19.0.1:51002 admin REQUEST [GET] /favicon.ico -16:20:28.948 172.19.0.1:51002 admin 404 Service not found. 3.59 ms -16:28:00.399 172.19.0.1:43084 admin REQUEST [GET] /favicon.ico -16:28:00.412 172.19.0.1:43084 admin 404 Service not found. 13.71 ms -16:31:26.564 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -16:31:26.582 SERVER admin TRACE CONNECT: "websocket13" -16:36:32.978 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -16:36:32.999 SERVER admin TRACE CONNECT: "websocket14" -16:51:00.861 172.19.0.1:51754 admin REQUEST [GET] /favicon.ico -16:51:00.877 172.19.0.1:51754 admin 404 Service not found. 16.12 ms -16:51:52.441 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -16:51:52.456 SERVER admin TRACE CONNECT: "websocket15" -16:53:31.048 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -16:53:31.065 SERVER admin TRACE CONNECT: "websocket16" -16:55:51.056 172.19.0.1:38764 admin REQUEST [GET] /exampleServer -16:55:51.073 172.19.0.1:38764 admin 404 Service not found. 16.8 ms -16:58:22.121 172.19.0.1:52126 admin REQUEST [GET] /favicon.ico -16:58:22.135 172.19.0.1:52126 admin 404 Service not found. 14.19 ms -17:03:25.464 172.19.0.1:46446 admin REQUEST [GET] /favicon.ico -17:03:25.479 172.19.0.1:46446 admin 404 Service not found. 15.21 ms -17:05:15.288 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -17:05:15.305 SERVER admin TRACE CONNECT: "websocket17" -19:55:27.736 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -19:55:27.789 SERVER admin TRACE CONNECT: "websocket18" -19:55:27.841 172.19.0.1:37328 admin REQUEST [GET] /favicon.ico -19:55:27.843 172.19.0.1:37328 admin 404 Service not found. 2.82 ms -20:21:49.709 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -20:21:49.741 SERVER admin TRACE CONNECT: "websocket19" -20:21:49.837 172.19.0.1:50254 admin REQUEST [GET] /favicon.ico -20:21:49.839 172.19.0.1:50254 admin 404 Service not found. 2.69 ms -20:24:33.730 172.19.0.1:58644 admin REQUEST [GET] /dba/logs?input= -20:24:33.907 172.19.0.1:58644 admin 302 Location: login?input=&_page=logs 176.8 ms -20:24:33.919 172.19.0.1:58644 admin REQUEST [GET] /dba/login?input=&_page=logs -20:24:34.022 172.19.0.1:58644 public 200 104.28 ms -20:24:34.083 172.19.0.1:58644 admin REQUEST [GET] /dba/static/style.css -20:24:34.091 172.19.0.1:58646 admin REQUEST [GET] /dba/static/codemirror/codemirror.css -20:24:34.093 172.19.0.1:58654 admin REQUEST [GET] /dba/static/codemirror/codemirror.js -20:24:34.093 172.19.0.1:58668 admin REQUEST [GET] /dba/static/js.js -20:24:34.095 172.19.0.1:58660 admin REQUEST [GET] /dba/static/editor.js -20:24:34.096 172.19.0.1:58674 admin REQUEST [GET] /dba/static/codemirror/xquery.js -20:24:34.203 172.19.0.1:58646 public 200 112.16 ms -20:24:34.204 172.19.0.1:58668 public 200 110.64 ms -20:24:34.204 172.19.0.1:58654 public 200 112.02 ms -20:24:34.205 172.19.0.1:58644 public 200 121.63 ms -20:24:34.205 172.19.0.1:58660 public 200 111.5 ms -20:24:34.211 172.19.0.1:58674 public 200 114.72 ms -20:24:34.211 172.19.0.1:58644 admin REQUEST [GET] /dba/static/codemirror/xml.js -20:24:34.270 172.19.0.1:58644 public 200 59.21 ms -20:24:34.276 172.19.0.1:58654 admin REQUEST [GET] /dba/static/basex.svg -20:24:34.334 172.19.0.1:58654 public 200 58.07 ms -20:24:36.041 172.19.0.1:58654 admin REQUEST [POST] /dba/login -20:24:36.091 172.19.0.1:58654 public DBA Login: admin -20:24:36.092 172.19.0.1:58654 public 302 Location: logs?input= 50.85 ms -20:24:36.099 172.19.0.1:58654 admin REQUEST [GET] /dba/logs?input= -20:24:36.206 172.19.0.1:58654 admin 200 108.58 ms -20:24:36.275 172.19.0.1:58654 admin REQUEST [POST] /dba/logs?date=2025-07-17&page=1 -20:24:36.377 172.19.0.1:58674 admin REQUEST [GET] /dba/static/basex.svg -20:24:36.415 172.19.0.1:58674 public 200 38.1 ms -20:24:36.439 172.19.0.1:58654 admin 200 164.58 ms -20:25:53.749 172.19.0.1:38538 admin REQUEST [GET] /dba/editor -20:25:53.814 172.19.0.1:38538 admin 200 65.59 ms -20:25:57.907 172.19.0.1:38538 admin REQUEST [GET] /dba/files -20:25:57.994 172.19.0.1:38538 admin 200 87.0 ms -20:26:03.620 172.19.0.1:38538 admin REQUEST [GET] /dba/sessions -20:26:03.668 172.19.0.1:38538 admin 200 48.32 ms -20:26:05.752 172.19.0.1:38538 admin REQUEST [GET] /dba/settings -20:26:05.795 172.19.0.1:38538 admin 200 43.28 ms -20:26:09.100 172.19.0.1:38538 admin REQUEST [GET] /dba/jobs -20:26:09.165 172.19.0.1:38538 admin 200 65.06 ms -20:26:13.623 172.19.0.1:38538 admin REQUEST [GET] /dba/editor -20:26:13.659 172.19.0.1:38538 admin 200 36.22 ms -20:26:18.147 172.19.0.1:38538 admin REQUEST [GET] /dba/databases -20:26:18.211 172.19.0.1:38538 admin 200 64.37 ms -20:45:26.245 172.19.0.1:51432 admin REQUEST [GET] /dba/logs -20:45:26.319 172.19.0.1:51432 admin 200 74.87 ms -20:45:26.407 172.19.0.1:51432 admin REQUEST [POST] /dba/logs?date=2025-07-17&page=1 -20:45:26.496 172.19.0.1:51432 admin 200 89.92 ms -20:46:15.411 172.19.0.1:51432 admin REQUEST [GET] /lsp -20:46:15.426 172.19.0.1:51432 admin 404 Service not found. 14.85 ms -20:46:42.266 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -20:46:42.278 SERVER admin TRACE CONNECT: "websocket20" -20:47:31.865 172.19.0.1 admin REQUEST [WS-OPEN] http://127.0.0.1:3000/ws/lsp -20:47:31.879 SERVER admin TRACE CONNECT: "websocket21" -21:05:38.659 172.19.0.1:43870 admin REQUEST [GET] /exampleServer -21:05:38.677 172.19.0.1:43870 admin 404 Service not found. 17.6 ms diff --git a/data/users.xml b/data/users.xml index 6f25e18..274543c 100644 --- a/data/users.xml +++ b/data/users.xml @@ -1,11 +1,11 @@ - 304bdfb0383c16f070a897fc1eb25cb4 + 05046894a29a453d86cdc0f8cd9521f7 - 75523049164421 - 5c55c7b22d7ed8c64067932a753161ec5c198b020f015493de8ccf13afbb5db2 + 1915937843295 + d04377d5b8d0d44fbeec5d0b44db704908a4e5a4a3f889177c2c72bb9128152a \ No newline at end of file diff --git a/webapp/lsp-manager/app.xqm b/webapp/lsp-manager/app.xqm index 28f32e6..4b96d43 100644 --- a/webapp/lsp-manager/app.xqm +++ b/webapp/lsp-manager/app.xqm @@ -76,6 +76,10 @@ function app:dev() { cm:htmx2("dev/home.htm", map{}) }; +(:~ log as strings :) declare function app:logs() { -(admin:logs()=>foot()=>admin:logs())[@type eq 'LSP'] +(admin:logs()=>foot()=>admin:logs()) +[@type eq 'LSP'] +[starts-with(.,"⬅️")] +/substring(.,2) }; \ No newline at end of file diff --git a/webapp/static/clients/codemirror/grail.html b/webapp/static/clients/codemirror/grail.html index d82db25..75b1aa1 100644 --- a/webapp/static/clients/codemirror/grail.html +++ b/webapp/static/clients/codemirror/grail.html @@ -1,5 +1,6 @@ - + @@ -9,10 +10,10 @@ - + - - + + diff --git a/webapp/static/clients/codemirror/icons.js b/webapp/static/clients/codemirror/icons.js index 2c6b352..06a958f 100644 --- a/webapp/static/clients/codemirror/icons.js +++ b/webapp/static/clients/codemirror/icons.js @@ -1,4 +1,4 @@ -import { registerIconLibrary } from 'https://cdn.jsdelivr.net/npm/@quietui/quiet-browser@1.6.1/dist/quiet.loader.js'; +import { registerIconLibrary } from '/static/clients/quietui@1.6.2/dist/quiet.loader.js'; registerIconLibrary('codicon', { resolve: (name, family) => {