mirror of
https://github.com/m1k1o/neko.git
synced 2024-07-24 14:40:50 +12:00
Compare commits
45 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c8c39b0f83 | |||
| 61ea7b2940 | |||
| 4d4e6eaeb7 | |||
| 2debd4c3f3 | |||
| c7885e3a90 | |||
| 8c54585f2d | |||
| e067894e02 | |||
| 407a85fffb | |||
| e0366cf1ef | |||
| 04a0ce17de | |||
| db87229f16 | |||
| 3df319e071 | |||
| ad5abb6054 | |||
| ac822a2531 | |||
| e25e9c2b24 | |||
| 1666693c25 | |||
| d17a7e8d82 | |||
| cdb9b185f2 | |||
| 76b44b949c | |||
| 950cb118cc | |||
| 3703d2b73d | |||
| fac8700192 | |||
| 04cd943eb4 | |||
| 472a3c3355 | |||
| 5d41048695 | |||
| 42ee7477a0 | |||
| bbfa0d5834 | |||
| 4885c2d69e | |||
| b65df3e3bf | |||
| 57e89bb1cc | |||
| 19af921913 | |||
| 5ba4019e36 | |||
| e3963736ad | |||
| b9f31cc19c | |||
| 7c6029aa99 | |||
| cfc7b15211 | |||
| 70e84c5840 | |||
| 1505abb703 | |||
| 758879ef84 | |||
| afd0925cfc | |||
| 7d3a888c79 | |||
| cfbda6ec97 | |||
| 44e891331e | |||
| 8ab2943126 | |||
| fa45619dbb |
.docker
base
brave
chromium
firefox
google-chrome
microsoft-edge
opera
ungoogled-chromium
vivaldi
client
docs
server
@ -81,8 +81,14 @@ RUN set -eux; \
|
|||||||
gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-pulseaudio \
|
gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-pulseaudio \
|
||||||
gstreamer1.0-vaapi ;\
|
gstreamer1.0-vaapi ;\
|
||||||
#
|
#
|
||||||
# fonts
|
# install fonts
|
||||||
apt-get install -y --no-install-recommends fonts-takao-mincho fonts-wqy-zenhei; \
|
apt-get install -y --no-install-recommends \
|
||||||
|
# Google emojis
|
||||||
|
fonts-noto-color-emoji \
|
||||||
|
# Japanese fonts
|
||||||
|
fonts-takao-mincho \
|
||||||
|
# Chinese fonts
|
||||||
|
fonts-wqy-zenhei; \
|
||||||
#
|
#
|
||||||
# create a non-root user
|
# create a non-root user
|
||||||
groupadd --gid $USER_GID $USERNAME; \
|
groupadd --gid $USER_GID $USERNAME; \
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
<applications>
|
<applications>
|
||||||
<!-- Match all windows and remove their decorations (obxprop | grep "^_OB_APP") -->
|
<!-- Match all windows and remove their decorations (obxprop | grep "^_OB_APP") -->
|
||||||
<application class="Brave-browser*" name="brave-browser*">
|
<application class="Brave-browser*" name="brave-browser*" role="browser">
|
||||||
<decor>no</decor>
|
<decor>no</decor>
|
||||||
<maximized>true</maximized>
|
<maximized>true</maximized>
|
||||||
<focus>yes</focus>
|
<focus>yes</focus>
|
||||||
|
|||||||
@ -18,6 +18,9 @@
|
|||||||
"PromptForDownloadLocation": false,
|
"PromptForDownloadLocation": false,
|
||||||
"BookmarkBarEnabled": false,
|
"BookmarkBarEnabled": false,
|
||||||
"PasswordManagerEnabled": false,
|
"PasswordManagerEnabled": false,
|
||||||
|
"URLAllowlist": [
|
||||||
|
"file:///home/neko/Downloads"
|
||||||
|
],
|
||||||
"URLBlocklist": [
|
"URLBlocklist": [
|
||||||
"file://*",
|
"file://*",
|
||||||
"chrome://policy"
|
"chrome://policy"
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
<applications>
|
<applications>
|
||||||
<!-- Match all windows and remove their decorations (obxprop | grep "^_OB_APP") -->
|
<!-- Match all windows and remove their decorations (obxprop | grep "^_OB_APP") -->
|
||||||
<application class="Chromium*" name="chromium*">
|
<application class="Chromium*" name="chromium*" role="browser">
|
||||||
<decor>no</decor>
|
<decor>no</decor>
|
||||||
<maximized>true</maximized>
|
<maximized>true</maximized>
|
||||||
<focus>yes</focus>
|
<focus>yes</focus>
|
||||||
|
|||||||
@ -19,6 +19,9 @@
|
|||||||
"BookmarkBarEnabled": false,
|
"BookmarkBarEnabled": false,
|
||||||
"PasswordManagerEnabled": false,
|
"PasswordManagerEnabled": false,
|
||||||
"BrowserLabsEnabled": false,
|
"BrowserLabsEnabled": false,
|
||||||
|
"URLAllowlist": [
|
||||||
|
"file:///home/neko/Downloads"
|
||||||
|
],
|
||||||
"URLBlocklist": [
|
"URLBlocklist": [
|
||||||
"file://*",
|
"file://*",
|
||||||
"chrome://policy"
|
"chrome://policy"
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
<applications>
|
<applications>
|
||||||
<!-- Match all windows and remove their decorations (obxprop | grep "^_OB_APP") -->
|
<!-- Match all windows and remove their decorations (obxprop | grep "^_OB_APP") -->
|
||||||
<application class="firefox" name="Navigator">
|
<application class="firefox" name="Navigator" role="browser">
|
||||||
<decor>no</decor>
|
<decor>no</decor>
|
||||||
<maximized>true</maximized>
|
<maximized>true</maximized>
|
||||||
<focus>yes</focus>
|
<focus>yes</focus>
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
<applications>
|
<applications>
|
||||||
<!-- Match all windows and remove their decorations (obxprop | grep "^_OB_APP") -->
|
<!-- Match all windows and remove their decorations (obxprop | grep "^_OB_APP") -->
|
||||||
<application class="Google-chrome*" name="google-chrome*">
|
<application class="Google-chrome*" name="google-chrome*" role="browser">
|
||||||
<decor>no</decor>
|
<decor>no</decor>
|
||||||
<maximized>true</maximized>
|
<maximized>true</maximized>
|
||||||
<focus>yes</focus>
|
<focus>yes</focus>
|
||||||
|
|||||||
@ -18,6 +18,9 @@
|
|||||||
"PromptForDownloadLocation": false,
|
"PromptForDownloadLocation": false,
|
||||||
"BookmarkBarEnabled": false,
|
"BookmarkBarEnabled": false,
|
||||||
"PasswordManagerEnabled": false,
|
"PasswordManagerEnabled": false,
|
||||||
|
"URLAllowlist": [
|
||||||
|
"file:///home/neko/Downloads"
|
||||||
|
],
|
||||||
"URLBlocklist": [
|
"URLBlocklist": [
|
||||||
"file://*",
|
"file://*",
|
||||||
"chrome://policy"
|
"chrome://policy"
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
<applications>
|
<applications>
|
||||||
<!-- Match all windows and remove their decorations (obxprop | grep "^_OB_APP") -->
|
<!-- Match all windows and remove their decorations (obxprop | grep "^_OB_APP") -->
|
||||||
<application class="Microsoft-edge*" name="microsoft-edge*">
|
<application class="Microsoft-edge*" name="microsoft-edge*" role="browser">
|
||||||
<decor>no</decor>
|
<decor>no</decor>
|
||||||
<maximized>true</maximized>
|
<maximized>true</maximized>
|
||||||
<focus>yes</focus>
|
<focus>yes</focus>
|
||||||
|
|||||||
@ -18,6 +18,9 @@
|
|||||||
"PromptForDownloadLocation": false,
|
"PromptForDownloadLocation": false,
|
||||||
"BookmarkBarEnabled": false,
|
"BookmarkBarEnabled": false,
|
||||||
"PasswordManagerEnabled": false,
|
"PasswordManagerEnabled": false,
|
||||||
|
"URLAllowlist": [
|
||||||
|
"file:///home/neko/Downloads"
|
||||||
|
],
|
||||||
"URLBlocklist": [
|
"URLBlocklist": [
|
||||||
"file://*",
|
"file://*",
|
||||||
"edge://policy"
|
"edge://policy"
|
||||||
|
|||||||
@ -1,24 +1,28 @@
|
|||||||
ARG BASE_IMAGE=m1k1o/neko:base
|
ARG BASE_IMAGE=m1k1o/neko:base
|
||||||
FROM $BASE_IMAGE
|
FROM $BASE_IMAGE
|
||||||
|
|
||||||
ARG SRC_URL="https://download.opera.com/download/get/?id=58545&location=415¬hanks=yes&sub=marine&utm_tryagain=yes"
|
ARG API_URL="https://download5.operacdn.com/pub/opera/desktop/"
|
||||||
|
ARG LIBFFMPEG_API_URL="https://api.github.com/repos/nwjs-ffmpeg-prebuilt/nwjs-ffmpeg-prebuilt/releases/latest"
|
||||||
ARG LIBFFMPEG_URL="https://github.com/nwjs-ffmpeg-prebuilt/nwjs-ffmpeg-prebuilt/releases/download/0.67.1/0.67.1-linux-x64.zip"
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# install opera
|
# install opera
|
||||||
RUN apt-get update
|
RUN set -eux; apt-get update; \
|
||||||
RUN wget -O /tmp/opera.deb $SRC_URL
|
#
|
||||||
RUN apt-get install -y --no-install-recommends openbox unzip /tmp/opera.deb
|
# fetch latest release
|
||||||
|
VERSION="$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"/]*\).*/\1/p' | tail -1)"; \
|
||||||
## install libffmpeg
|
wget -O /tmp/opera.deb "${API_URL}${VERSION}/linux/opera-stable_${VERSION}_amd64.deb"; \
|
||||||
RUN wget -O /tmp/libffmpeg.zip $LIBFFMPEG_URL
|
apt-get install -y --no-install-recommends openbox jq unzip /tmp/opera.deb; \
|
||||||
RUN unzip -o /tmp/libffmpeg.zip libffmpeg.so -d /usr/lib/x86_64-linux-gnu/opera/lib_extra
|
#
|
||||||
RUN echo '[]' > /usr/lib/x86_64-linux-gnu/opera/resources/ffmpeg_preload_config.json
|
# install libffmpeg
|
||||||
#
|
LIBFFMPEG_URL="$(wget -O - "${LIBFFMPEG_API_URL}" 2>/dev/null | jq -r "[.assets[] | select(.browser_download_url | contains(\"linux-x64.zip\"))][-1] | .browser_download_url")"; \
|
||||||
# clean up
|
wget -O /tmp/libffmpeg.zip $LIBFFMPEG_URL; \
|
||||||
RUN apt-get clean -y
|
unzip -o /tmp/libffmpeg.zip libffmpeg.so -d /usr/lib/x86_64-linux-gnu/opera/lib_extra; \
|
||||||
RUN rm -rf /var/lib/apt/lists/* /var/cache/apt/*
|
echo '[]' > /usr/lib/x86_64-linux-gnu/opera/resources/ffmpeg_preload_config.json; \
|
||||||
|
#
|
||||||
|
# clean up
|
||||||
|
apt-get --purge autoremove -y unzip jq; \
|
||||||
|
apt-get clean -y; \
|
||||||
|
rm -rf /var/lib/apt/lists/* /var/cache/apt/*
|
||||||
|
|
||||||
#
|
#
|
||||||
# copy configuation files
|
# copy configuation files
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
<applications>
|
<applications>
|
||||||
<!-- Match all windows and remove their decorations (obxprop | grep "^_OB_APP") -->
|
<!-- Match all windows and remove their decorations (obxprop | grep "^_OB_APP") -->
|
||||||
<application class="Opera" name="Opera">
|
<application class="Opera" name="Opera" role="browser">
|
||||||
<decor>no</decor>
|
<decor>no</decor>
|
||||||
<maximized>true</maximized>
|
<maximized>true</maximized>
|
||||||
<focus>yes</focus>
|
<focus>yes</focus>
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
<applications>
|
<applications>
|
||||||
<!-- Match all windows and remove their decorations (obxprop | grep "^_OB_APP") -->
|
<!-- Match all windows and remove their decorations (obxprop | grep "^_OB_APP") -->
|
||||||
<application class="Chromium*" name="chromium-devel">
|
<application class="Chromium*" name="chromium-devel" role="browser">
|
||||||
<decor>no</decor>
|
<decor>no</decor>
|
||||||
<maximized>true</maximized>
|
<maximized>true</maximized>
|
||||||
<focus>yes</focus>
|
<focus>yes</focus>
|
||||||
|
|||||||
@ -18,6 +18,9 @@
|
|||||||
"PromptForDownloadLocation": false,
|
"PromptForDownloadLocation": false,
|
||||||
"BookmarkBarEnabled": false,
|
"BookmarkBarEnabled": false,
|
||||||
"PasswordManagerEnabled": false,
|
"PasswordManagerEnabled": false,
|
||||||
|
"URLAllowlist": [
|
||||||
|
"file:///home/neko/Downloads"
|
||||||
|
],
|
||||||
"URLBlocklist": [
|
"URLBlocklist": [
|
||||||
"file://*",
|
"file://*",
|
||||||
"chrome://policy"
|
"chrome://policy"
|
||||||
|
|||||||
@ -18,6 +18,9 @@
|
|||||||
"PromptForDownloadLocation": false,
|
"PromptForDownloadLocation": false,
|
||||||
"BookmarkBarEnabled": false,
|
"BookmarkBarEnabled": false,
|
||||||
"PasswordManagerEnabled": false,
|
"PasswordManagerEnabled": false,
|
||||||
|
"URLAllowlist": [
|
||||||
|
"file:///home/neko/Downloads"
|
||||||
|
],
|
||||||
"URLBlocklist": [
|
"URLBlocklist": [
|
||||||
"file://*",
|
"file://*",
|
||||||
"chrome://policy"
|
"chrome://policy"
|
||||||
|
|||||||
14
README.md
14
README.md
@ -25,7 +25,7 @@
|
|||||||
<img src="https://github.com/m1k1o/neko/actions/workflows/build.yml/badge.svg" alt="build">
|
<img src="https://github.com/m1k1o/neko/actions/workflows/build.yml/badge.svg" alt="build">
|
||||||
</a>
|
</a>
|
||||||
</p>
|
</p>
|
||||||
<img src="https://i.imgur.com/ZSzbQr7.gif" width="650" height="auto"/>
|
<img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/intro.gif" width="650" height="auto"/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
# n.eko
|
# n.eko
|
||||||
@ -44,11 +44,11 @@ Neko started as a virtual browser that is streamed using WebRTC to multiple user
|
|||||||
- Like implementing RDP or VNC protocol, where neko would only act as WebRTC relay server. This is currently only future.
|
- Like implementing RDP or VNC protocol, where neko would only act as WebRTC relay server. This is currently only future.
|
||||||
|
|
||||||
Primary use case is connecting with multiple people, leveraging real time synchronization and interactivity:
|
Primary use case is connecting with multiple people, leveraging real time synchronization and interactivity:
|
||||||
- **Watch party** - watching video content together with multiple people and reacting to it (chat, emotes) - open source alternative to [giggl.app](https://giggl.app/).
|
- **Watch party** - watching video content together with multiple people and reacting to it (chat, emotes) - open source alternative to [giggl.app](https://giggl.app/) or [hyperbeam](https://watch.hyperbeam.com).
|
||||||
- **Interactive presentation** - not only screen sharing, but others can control the screen.
|
- **Interactive presentation** - not only screen sharing, but others can control the screen.
|
||||||
- **Collaborative tool** - brainstorming ideas, cobrowsing, code debugging together.
|
- **Collaborative tool** - brainstorming ideas, cobrowsing, code debugging together.
|
||||||
- **Support/Teaching** - interactively guiding people in controlled environment.
|
- **Support/Teaching** - interactively guiding people in controlled environment.
|
||||||
- **Embed anything** - embed virtual browser in your web app - open source alternative to [hyperbeam](https://hyperbeam.com/).
|
- **Embed anything** - embed virtual browser in your web app - open source alternative to [hyperbeam API](https://hyperbeam.com/).
|
||||||
- open any third-party website or application, synchronize audio and video flawlessly among multiple participants.
|
- open any third-party website or application, synchronize audio and video flawlessly among multiple participants.
|
||||||
- request rooms using API with [neko-rooms](https://github.com/m1k1o/neko-rooms).
|
- request rooms using API with [neko-rooms](https://github.com/m1k1o/neko-rooms).
|
||||||
|
|
||||||
@ -105,6 +105,14 @@ Compared to clientless remote desktop gateway (e.g. [Apache Guacamole](https://g
|
|||||||
* Persistent settings
|
* Persistent settings
|
||||||
* Automatic Login with custom url args. (add `?usr=<your-user-name>&pwd=<room-pass>` to the url.)
|
* Automatic Login with custom url args. (add `?usr=<your-user-name>&pwd=<room-pass>` to the url.)
|
||||||
* Broadcasting room content using RTMP (to e.g. twitch or youtube...)
|
* Broadcasting room content using RTMP (to e.g. twitch or youtube...)
|
||||||
|
* Bidirectional file transfer (if enabled)
|
||||||
|
|
||||||
|
<div align="center">
|
||||||
|
|
||||||
|
With `NEKO_FILE_TRANSFER_ENABLED=true`:
|
||||||
|
|
||||||
|
<img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/file-transfer.gif" width="650" height="auto"/>
|
||||||
|
</div>
|
||||||
|
|
||||||
### Why n.eko?
|
### Why n.eko?
|
||||||
|
|
||||||
|
|||||||
@ -20,18 +20,18 @@
|
|||||||
"lint": "vue-cli-service lint"
|
"lint": "vue-cli-service lint"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fortawesome/fontawesome-free": "^6.1.2",
|
"@fortawesome/fontawesome-free": "^6.2.0",
|
||||||
"animejs": "^3.2.0",
|
"animejs": "^3.2.0",
|
||||||
"axios": "^0.21.4",
|
"axios": "^0.24.0",
|
||||||
"date-fns": "^2.29.1",
|
"date-fns": "^2.29.3",
|
||||||
"emoji-datasource": "^6.0.1",
|
"emoji-datasource": "^6.0.1",
|
||||||
"eventemitter3": "^4.0.7",
|
"eventemitter3": "^4.0.7",
|
||||||
"resize-observer-polyfill": "^1.5.1",
|
"resize-observer-polyfill": "^1.5.1",
|
||||||
"simple-markdown": "^0.7.2",
|
"simple-markdown": "^0.7.2",
|
||||||
"sweetalert2": "^11.4.24",
|
"sweetalert2": "11.4.8",
|
||||||
"typed-vuex": "^0.1.21",
|
"typed-vuex": "^0.1.21",
|
||||||
"v-tooltip": "^2.0.3",
|
"v-tooltip": "^2.0.3",
|
||||||
"vue": "^2.7.8",
|
"vue": "^2.7.13",
|
||||||
"vue-class-component": "^7.2.6",
|
"vue-class-component": "^7.2.6",
|
||||||
"vue-clickaway": "^2.2.2",
|
"vue-clickaway": "^2.2.2",
|
||||||
"vue-context": "^5.2.0",
|
"vue-context": "^5.2.0",
|
||||||
@ -41,8 +41,8 @@
|
|||||||
"vuex": "^3.5.1"
|
"vuex": "^3.5.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/animejs": "^3.1.5",
|
"@types/animejs": "^3.1.6",
|
||||||
"@types/node": "^14.18.23",
|
"@types/node": "^14.18.32",
|
||||||
"@types/vue": "^2.0.0",
|
"@types/vue": "^2.0.0",
|
||||||
"@types/vue-clickaway": "^2.2.0",
|
"@types/vue-clickaway": "^2.2.0",
|
||||||
"@typescript-eslint/eslint-plugin": "^4.33.0",
|
"@typescript-eslint/eslint-plugin": "^4.33.0",
|
||||||
@ -54,16 +54,16 @@
|
|||||||
"@vue/cli-service": "^4.5.19",
|
"@vue/cli-service": "^4.5.19",
|
||||||
"@vue/eslint-config-prettier": "^6.0.0",
|
"@vue/eslint-config-prettier": "^6.0.0",
|
||||||
"@vue/eslint-config-typescript": "^7.0.0",
|
"@vue/eslint-config-typescript": "^7.0.0",
|
||||||
"core-js": "^3.24.1",
|
"core-js": "^3.26.0",
|
||||||
"emojilib": "^3.0.7",
|
"emojilib": "^3.0.7",
|
||||||
"eslint": "^6.8.0",
|
"eslint": "^6.8.0",
|
||||||
"eslint-plugin-prettier": "^3.4.1",
|
"eslint-plugin-prettier": "^3.4.1",
|
||||||
"eslint-plugin-vue": "^7.20.0",
|
"eslint-plugin-vue": "^7.20.0",
|
||||||
"prettier": "^2.7.1",
|
"prettier": "^2.7.1",
|
||||||
"sass": "^1.54.0",
|
"sass": "^1.55.0",
|
||||||
"sass-loader": "^10.3.1",
|
"sass-loader": "^10.3.1",
|
||||||
"ts-node": "^9.1.1",
|
"ts-node": "^9.1.1",
|
||||||
"typescript": "^4.7.4",
|
"typescript": "^4.8.4",
|
||||||
"vue-template-compiler": "^2.7.8"
|
"vue-template-compiler": "^2.7.13"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
520
client/src/components/files.vue
Normal file
520
client/src/components/files.vue
Normal file
@ -0,0 +1,520 @@
|
|||||||
|
<template>
|
||||||
|
<div class="files">
|
||||||
|
<div class="files-cwd">
|
||||||
|
<p>{{ cwd }}</p>
|
||||||
|
<i class="fas fa-rotate-right refresh" @click="refresh" />
|
||||||
|
</div>
|
||||||
|
<div class="files-list">
|
||||||
|
<div v-for="item in files" :key="item.name" class="files-list-item">
|
||||||
|
<i :class="fileIcon(item)" />
|
||||||
|
<p class="file-name" :title="item.name">{{ item.name }}</p>
|
||||||
|
<p class="file-size">{{ fileSize(item.size) }}</p>
|
||||||
|
<i v-if="item.type !== 'dir'" class="fas fa-download download" @click="download(item)" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="transfer-area">
|
||||||
|
<div class="transfers" v-if="transfers.length > 0">
|
||||||
|
<p v-if="downloads.length > 0" class="transfers-list-header">
|
||||||
|
<span>{{ $t('files.downloads') }}</span>
|
||||||
|
<i class="fas fa-xmark remove-transfer" @click="downloads.forEach((t) => removeTransfer(t))"></i>
|
||||||
|
</p>
|
||||||
|
<div v-for="download in downloads" :key="download.id" class="transfers-list-item">
|
||||||
|
<div class="transfer-info">
|
||||||
|
<i
|
||||||
|
class="fas transfer-status"
|
||||||
|
:class="{
|
||||||
|
'fa-clock': download.status === 'pending',
|
||||||
|
'fa-arrows-rotate': download.status === 'inprogress',
|
||||||
|
'fa-check': download.status === 'completed',
|
||||||
|
'fa-warning': download.status === 'failed',
|
||||||
|
}"
|
||||||
|
></i>
|
||||||
|
<p class="file-name" :title="download.name">{{ download.name }}</p>
|
||||||
|
<p class="file-size">{{ Math.min(100, Math.round((download.progress / download.size) * 100)) }}%</p>
|
||||||
|
<i class="fas fa-xmark remove-transfer" @click="removeTransfer(download)"></i>
|
||||||
|
</div>
|
||||||
|
<div v-if="download.status === 'failed'" class="transfer-error">{{ download.error }}</div>
|
||||||
|
<progress
|
||||||
|
v-else
|
||||||
|
class="transfer-progress"
|
||||||
|
:aria-label="download.name + ' progress'"
|
||||||
|
:value="download.progress"
|
||||||
|
:max="download.size"
|
||||||
|
></progress>
|
||||||
|
</div>
|
||||||
|
<p v-if="uploads.length > 0" class="transfers-list-header">
|
||||||
|
<span>{{ $t('files.uploads') }}</span>
|
||||||
|
<i class="fas fa-xmark remove-transfer" @click="uploads.forEach((t) => removeTransfer(t))"></i>
|
||||||
|
</p>
|
||||||
|
<div v-for="upload in uploads" :key="upload.id" class="transfers-list-item">
|
||||||
|
<div class="transfer-info">
|
||||||
|
<i
|
||||||
|
class="fas transfer-status"
|
||||||
|
:title="upload.status"
|
||||||
|
:class="{
|
||||||
|
'fa-clock': upload.status === 'pending',
|
||||||
|
'fa-arrows-rotate': upload.status === 'inprogress',
|
||||||
|
'fa-check': upload.status === 'completed',
|
||||||
|
'fa-warning': upload.status === 'failed',
|
||||||
|
}"
|
||||||
|
></i>
|
||||||
|
<p class="file-name" :title="upload.name">{{ upload.name }}</p>
|
||||||
|
<p class="file-size">{{ Math.min(100, Math.round((upload.progress / upload.size) * 100)) }}%</p>
|
||||||
|
<i class="fas fa-xmark remove-transfer" @click="removeTransfer(upload)"></i>
|
||||||
|
</div>
|
||||||
|
<div v-if="upload.status === 'failed'" class="transfer-error">{{ upload.error }}</div>
|
||||||
|
<progress
|
||||||
|
v-else
|
||||||
|
class="transfer-progress"
|
||||||
|
:aria-label="upload.name + ' progress'"
|
||||||
|
:value="upload.progress"
|
||||||
|
:max="upload.size"
|
||||||
|
></progress>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="upload-area"
|
||||||
|
:class="{ 'upload-area-drag': uploadAreaDrag }"
|
||||||
|
@dragover.prevent="uploadAreaDrag = true"
|
||||||
|
@dragleave.prevent="uploadAreaDrag = false"
|
||||||
|
@drop.prevent="(e) => upload(e.dataTransfer)"
|
||||||
|
@click="openFileBrowser"
|
||||||
|
>
|
||||||
|
<i class="fas fa-file-arrow-up" />
|
||||||
|
<p>{{ $t('files.upload_here') }}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.files {
|
||||||
|
flex: 1;
|
||||||
|
flex-direction: column;
|
||||||
|
display: flex;
|
||||||
|
max-width: 100%;
|
||||||
|
|
||||||
|
.files-cwd {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
margin: 10px 10px 0px 10px;
|
||||||
|
padding: 0.5em;
|
||||||
|
font-weight: 600;
|
||||||
|
background-color: rgba($color: #fff, $alpha: 0.05);
|
||||||
|
border-radius: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.files-list {
|
||||||
|
margin: 10px 10px 10px 10px;
|
||||||
|
background-color: rgba($color: #fff, $alpha: 0.05);
|
||||||
|
border-radius: 5px;
|
||||||
|
overflow-y: scroll;
|
||||||
|
scrollbar-width: thin;
|
||||||
|
scrollbar-color: $background-tertiary transparent;
|
||||||
|
|
||||||
|
&::-webkit-scrollbar {
|
||||||
|
width: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::-webkit-scrollbar-track {
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::-webkit-scrollbar-thumb {
|
||||||
|
background-color: $background-tertiary;
|
||||||
|
border: 2px solid $background-primary;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::-webkit-scrollbar-thumb:hover {
|
||||||
|
background-color: $background-floating;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.files-list-item {
|
||||||
|
padding: 0.5em;
|
||||||
|
border-bottom: 2px solid rgba($color: #fff, $alpha: 0.1);
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
line-height: 1.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.transfers-list-header {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
border-bottom: 2px solid rgba($color: #fff, $alpha: 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.file-icon,
|
||||||
|
.transfer-status {
|
||||||
|
width: 14px;
|
||||||
|
margin-right: 0.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.transfer-error {
|
||||||
|
border: 1px solid $style-error;
|
||||||
|
border-radius: 5px;
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.files-list-item:last-child {
|
||||||
|
border-bottom: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.refresh {
|
||||||
|
margin-left: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.file-name {
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.file-size {
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: 0.5em;
|
||||||
|
color: rgba($color: #fff, $alpha: 0.4);
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.refresh:hover,
|
||||||
|
.download:hover,
|
||||||
|
.remove-transfer:hover {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.transfer-area {
|
||||||
|
margin-top: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.transfers {
|
||||||
|
margin: 10px 10px 10px 10px;
|
||||||
|
background-color: rgba($color: #fff, $alpha: 0.05);
|
||||||
|
border-radius: 5px;
|
||||||
|
max-height: 50vh;
|
||||||
|
overflow-y: scroll;
|
||||||
|
overflow-x: hidden;
|
||||||
|
scrollbar-width: thin;
|
||||||
|
scrollbar-color: $background-tertiary transparent;
|
||||||
|
|
||||||
|
&::-webkit-scrollbar {
|
||||||
|
width: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::-webkit-scrollbar-track {
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::-webkit-scrollbar-thumb {
|
||||||
|
background-color: $background-tertiary;
|
||||||
|
border: 2px solid $background-primary;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::-webkit-scrollbar-thumb:hover {
|
||||||
|
background-color: $background-floating;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.transfers > p {
|
||||||
|
padding: 10px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.transfer-info {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
max-width: 100%;
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.transfer-progress {
|
||||||
|
margin: 0px 10px 10px 10px;
|
||||||
|
width: 95%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.upload-area {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
text-align: center;
|
||||||
|
justify-content: center;
|
||||||
|
margin: 10px 10px 10px 10px;
|
||||||
|
background-color: rgba($color: #fff, $alpha: 0.05);
|
||||||
|
border-radius: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.upload-area:hover {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.upload-area-drag,
|
||||||
|
.upload-area:hover {
|
||||||
|
background-color: rgba($color: #fff, $alpha: 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.upload-area > i {
|
||||||
|
font-size: 4em;
|
||||||
|
margin: 10px 10px 10px 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.upload-area > p {
|
||||||
|
margin: 0px 10px 10px 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<script lang="ts">
|
||||||
|
import { Component, Vue } from 'vue-property-decorator'
|
||||||
|
|
||||||
|
import Markdown from './markdown'
|
||||||
|
import Content from './context.vue'
|
||||||
|
import { FileTransfer, FileListItem } from '~/neko/types'
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
name: 'neko-files',
|
||||||
|
components: {
|
||||||
|
'neko-markdown': Markdown,
|
||||||
|
'neko-context': Content,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
export default class extends Vue {
|
||||||
|
public uploadAreaDrag: boolean = false
|
||||||
|
|
||||||
|
get cwd() {
|
||||||
|
return this.$accessor.files.cwd
|
||||||
|
}
|
||||||
|
|
||||||
|
get files() {
|
||||||
|
return this.$accessor.files.files
|
||||||
|
}
|
||||||
|
|
||||||
|
get transfers() {
|
||||||
|
return this.$accessor.files.transfers
|
||||||
|
}
|
||||||
|
|
||||||
|
get downloads() {
|
||||||
|
return this.$accessor.files.transfers.filter((t) => t.direction === 'download')
|
||||||
|
}
|
||||||
|
|
||||||
|
get uploads() {
|
||||||
|
return this.$accessor.files.transfers.filter((t) => t.direction === 'upload')
|
||||||
|
}
|
||||||
|
|
||||||
|
refresh() {
|
||||||
|
this.$accessor.files.refresh()
|
||||||
|
}
|
||||||
|
|
||||||
|
download(item: FileListItem) {
|
||||||
|
if (this.downloads.map((t) => t.name).includes(item.name)) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const url =
|
||||||
|
'/file?pwd=' + encodeURIComponent(this.$accessor.password) + '&filename=' + encodeURIComponent(item.name)
|
||||||
|
const abortController = new AbortController()
|
||||||
|
|
||||||
|
let transfer: FileTransfer = {
|
||||||
|
id: Math.round(Math.random() * 10000),
|
||||||
|
name: item.name,
|
||||||
|
direction: 'download',
|
||||||
|
// this may be smaller than the actual transfer amount, but for large files the
|
||||||
|
// content length is not sent (chunked transfer)
|
||||||
|
size: item.size,
|
||||||
|
progress: 0,
|
||||||
|
status: 'pending',
|
||||||
|
abortController: abortController,
|
||||||
|
}
|
||||||
|
|
||||||
|
this.$http
|
||||||
|
.get(url, {
|
||||||
|
responseType: 'blob',
|
||||||
|
signal: abortController.signal,
|
||||||
|
withCredentials: false,
|
||||||
|
onDownloadProgress: (x) => {
|
||||||
|
transfer.progress = x.loaded
|
||||||
|
|
||||||
|
if (x.lengthComputable && transfer.size !== x.total) {
|
||||||
|
transfer.size = x.total
|
||||||
|
}
|
||||||
|
if (transfer.progress === transfer.size) {
|
||||||
|
transfer.status = 'completed'
|
||||||
|
} else if (transfer.status !== 'inprogress') {
|
||||||
|
transfer.status = 'inprogress'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.then((res) => {
|
||||||
|
const url = window.URL.createObjectURL(new Blob([res.data]))
|
||||||
|
const link = document.createElement('a')
|
||||||
|
link.href = url
|
||||||
|
link.setAttribute('download', item.name)
|
||||||
|
document.body.appendChild(link)
|
||||||
|
link.click()
|
||||||
|
document.body.removeChild(link)
|
||||||
|
|
||||||
|
transfer.progress = transfer.size
|
||||||
|
transfer.status = 'completed'
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
this.$log.error(error)
|
||||||
|
|
||||||
|
transfer.status = 'failed'
|
||||||
|
transfer.error = error.message
|
||||||
|
})
|
||||||
|
|
||||||
|
this.$accessor.files.addTransfer(transfer)
|
||||||
|
}
|
||||||
|
|
||||||
|
upload(dt: DataTransfer) {
|
||||||
|
const url = '/file?pwd=' + encodeURIComponent(this.$accessor.password)
|
||||||
|
this.uploadAreaDrag = false
|
||||||
|
|
||||||
|
for (const file of dt.files) {
|
||||||
|
const abortController = new AbortController()
|
||||||
|
|
||||||
|
const formdata = new FormData()
|
||||||
|
formdata.append('files', file, file.name)
|
||||||
|
|
||||||
|
let transfer: FileTransfer = {
|
||||||
|
id: Math.round(Math.random() * 10000),
|
||||||
|
name: file.name,
|
||||||
|
direction: 'upload',
|
||||||
|
size: file.size,
|
||||||
|
progress: 0,
|
||||||
|
status: 'pending',
|
||||||
|
abortController: abortController,
|
||||||
|
}
|
||||||
|
|
||||||
|
this.$http
|
||||||
|
.post(url, formdata, {
|
||||||
|
signal: abortController.signal,
|
||||||
|
withCredentials: false,
|
||||||
|
onUploadProgress: (x: any) => {
|
||||||
|
transfer.progress = x.loaded
|
||||||
|
|
||||||
|
if (transfer.size !== x.total) {
|
||||||
|
transfer.size = x.total
|
||||||
|
}
|
||||||
|
if (transfer.progress === transfer.size) {
|
||||||
|
transfer.status = 'completed'
|
||||||
|
} else if (transfer.status !== 'inprogress') {
|
||||||
|
transfer.status = 'inprogress'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
this.$log.error(error)
|
||||||
|
|
||||||
|
transfer.status = 'failed'
|
||||||
|
transfer.error = error.message
|
||||||
|
})
|
||||||
|
|
||||||
|
this.$accessor.files.addTransfer(transfer)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
openFileBrowser() {
|
||||||
|
const input = document.createElement('input')
|
||||||
|
input.type = 'file'
|
||||||
|
input.setAttribute('multiple', 'true')
|
||||||
|
input.onchange = (e: Event) => {
|
||||||
|
if (e === null) return
|
||||||
|
|
||||||
|
const dt = new DataTransfer()
|
||||||
|
const target = e.target as HTMLInputElement
|
||||||
|
if (target.files === null) return
|
||||||
|
|
||||||
|
for (const f of target.files) {
|
||||||
|
dt.items.add(f)
|
||||||
|
}
|
||||||
|
|
||||||
|
this.upload(dt)
|
||||||
|
}
|
||||||
|
input.click()
|
||||||
|
}
|
||||||
|
|
||||||
|
removeTransfer(transfer: FileTransfer) {
|
||||||
|
if (transfer.status !== 'completed') {
|
||||||
|
transfer.abortController?.abort()
|
||||||
|
}
|
||||||
|
this.$accessor.files.removeTransfer(transfer)
|
||||||
|
}
|
||||||
|
|
||||||
|
fileIcon(file: FileListItem) {
|
||||||
|
let className = 'file-icon fas '
|
||||||
|
// if is directory
|
||||||
|
if (file.type === 'dir') {
|
||||||
|
className += 'fa-folder'
|
||||||
|
return className
|
||||||
|
}
|
||||||
|
// try to get file extension
|
||||||
|
const ext = file.name.split('.').pop()
|
||||||
|
if (ext === undefined) {
|
||||||
|
className += 'fa-file'
|
||||||
|
return className
|
||||||
|
}
|
||||||
|
// try to find icon
|
||||||
|
switch (ext.toLowerCase()) {
|
||||||
|
case 'txt':
|
||||||
|
case 'md':
|
||||||
|
className += 'fa-file-text'
|
||||||
|
break
|
||||||
|
case 'pdf':
|
||||||
|
className += 'fa-file-pdf'
|
||||||
|
break
|
||||||
|
case 'zip':
|
||||||
|
case 'rar':
|
||||||
|
case '7z':
|
||||||
|
case 'gz':
|
||||||
|
className += 'fa-archive'
|
||||||
|
break
|
||||||
|
case 'aac':
|
||||||
|
case 'flac':
|
||||||
|
case 'midi':
|
||||||
|
case 'mp3':
|
||||||
|
case 'ogg':
|
||||||
|
case 'wav':
|
||||||
|
className += 'fa-music'
|
||||||
|
break
|
||||||
|
case 'avi':
|
||||||
|
case 'mkv':
|
||||||
|
case 'mov':
|
||||||
|
case 'mpeg':
|
||||||
|
case 'mp4':
|
||||||
|
case 'webm':
|
||||||
|
className += 'fa-film'
|
||||||
|
break
|
||||||
|
case 'bmp':
|
||||||
|
case 'gif':
|
||||||
|
case 'jpeg':
|
||||||
|
case 'jpg':
|
||||||
|
case 'png':
|
||||||
|
case 'svg':
|
||||||
|
case 'tiff':
|
||||||
|
case 'webp':
|
||||||
|
className += 'fa-image'
|
||||||
|
break
|
||||||
|
default:
|
||||||
|
className += 'fa-file'
|
||||||
|
}
|
||||||
|
return className
|
||||||
|
}
|
||||||
|
|
||||||
|
fileSize(size: number) {
|
||||||
|
if (size < 1024) {
|
||||||
|
return size + ' B'
|
||||||
|
}
|
||||||
|
if (size < 1024 * 1024) {
|
||||||
|
return Math.round(size / 1024) + ' KB'
|
||||||
|
}
|
||||||
|
if (size < 1024 * 1024 * 1024) {
|
||||||
|
return Math.round(size / (1024 * 1024)) + ' MB'
|
||||||
|
}
|
||||||
|
if (size < 1024 * 1024 * 1024 * 1024) {
|
||||||
|
return Math.round(size / (1024 * 1024 * 1024)) + ' GB'
|
||||||
|
}
|
||||||
|
return Math.round(size / (1024 * 1024 * 1024 * 1024)) + ' TB'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@ -31,6 +31,19 @@
|
|||||||
}"
|
}"
|
||||||
/>
|
/>
|
||||||
</li>
|
</li>
|
||||||
|
<li v-if="fileTransfer">
|
||||||
|
<i
|
||||||
|
:class="[{ disabled: !admin }, { locked: isLocked('file_transfer') }, 'fas', 'fa-file']"
|
||||||
|
@click="toggleLock('file_transfer')"
|
||||||
|
v-tooltip="{
|
||||||
|
content: lockedTooltip('file_transfer'),
|
||||||
|
placement: 'bottom',
|
||||||
|
offset: 5,
|
||||||
|
boundariesElement: 'body',
|
||||||
|
delay: { show: 300, hide: 100 },
|
||||||
|
}"
|
||||||
|
/>
|
||||||
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<span v-if="showBadge" class="badge">•</span>
|
<span v-if="showBadge" class="badge">•</span>
|
||||||
<i class="fas fa-bars toggle" @click="toggleMenu" />
|
<i class="fas fa-bars toggle" @click="toggleMenu" />
|
||||||
@ -169,26 +182,24 @@
|
|||||||
return !this.side && this.readTexts != this.texts
|
return !this.side && this.readTexts != this.texts
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get fileTransfer() {
|
||||||
|
return this.$accessor.remote.fileTransfer
|
||||||
|
}
|
||||||
|
|
||||||
|
toggleLock(resource: AdminLockResource) {
|
||||||
|
this.$accessor.toggleLock(resource)
|
||||||
|
}
|
||||||
|
|
||||||
|
isLocked(resource: AdminLockResource): boolean {
|
||||||
|
return this.$accessor.isLocked(resource)
|
||||||
|
}
|
||||||
|
|
||||||
readTexts: number = 0
|
readTexts: number = 0
|
||||||
toggleMenu() {
|
toggleMenu() {
|
||||||
this.$accessor.client.toggleSide()
|
this.$accessor.client.toggleSide()
|
||||||
this.readTexts = this.texts
|
this.readTexts = this.texts
|
||||||
}
|
}
|
||||||
|
|
||||||
toggleLock(resource: AdminLockResource) {
|
|
||||||
if (!this.admin) return
|
|
||||||
|
|
||||||
if (this.isLocked(resource)) {
|
|
||||||
this.$accessor.unlock(resource)
|
|
||||||
} else {
|
|
||||||
this.$accessor.lock(resource)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
isLocked(resource: AdminLockResource): boolean {
|
|
||||||
return resource in this.locked && this.locked[resource]
|
|
||||||
}
|
|
||||||
|
|
||||||
lockedTooltip(resource: AdminLockResource) {
|
lockedTooltip(resource: AdminLockResource) {
|
||||||
if (this.admin) {
|
if (this.admin) {
|
||||||
return this.$t(`locks.${resource}.` + (this.isLocked(resource) ? `unlock` : `lock`))
|
return this.$t(`locks.${resource}.` + (this.isLocked(resource) ? `unlock` : `lock`))
|
||||||
|
|||||||
@ -6,6 +6,10 @@
|
|||||||
<i class="fas fa-comment-alt" />
|
<i class="fas fa-comment-alt" />
|
||||||
<span>{{ $t('side.chat') }}</span>
|
<span>{{ $t('side.chat') }}</span>
|
||||||
</li>
|
</li>
|
||||||
|
<li v-if="filetransferAllowed" :class="{ active: tab === 'files' }" @click.stop.prevent="change('files')">
|
||||||
|
<i class="fas fa-file" />
|
||||||
|
<span>{{ $t('side.files') }}</span>
|
||||||
|
</li>
|
||||||
<li :class="{ active: tab === 'settings' }" @click.stop.prevent="change('settings')">
|
<li :class="{ active: tab === 'settings' }" @click.stop.prevent="change('settings')">
|
||||||
<i class="fas fa-sliders-h" />
|
<i class="fas fa-sliders-h" />
|
||||||
<span>{{ $t('side.settings') }}</span>
|
<span>{{ $t('side.settings') }}</span>
|
||||||
@ -14,6 +18,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="page-container">
|
<div class="page-container">
|
||||||
<neko-chat v-if="tab === 'chat'" />
|
<neko-chat v-if="tab === 'chat'" />
|
||||||
|
<neko-files v-if="tab === 'files'" />
|
||||||
<neko-settings v-if="tab === 'settings'" />
|
<neko-settings v-if="tab === 'settings'" />
|
||||||
</div>
|
</div>
|
||||||
</aside>
|
</aside>
|
||||||
@ -74,23 +79,47 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Vue, Component } from 'vue-property-decorator'
|
import { Vue, Component, Watch } from 'vue-property-decorator'
|
||||||
|
|
||||||
import Settings from '~/components/settings.vue'
|
import Settings from '~/components/settings.vue'
|
||||||
import Chat from '~/components/chat.vue'
|
import Chat from '~/components/chat.vue'
|
||||||
|
import Files from '~/components/files.vue'
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
name: 'neko',
|
name: 'neko',
|
||||||
components: {
|
components: {
|
||||||
'neko-settings': Settings,
|
'neko-settings': Settings,
|
||||||
'neko-chat': Chat,
|
'neko-chat': Chat,
|
||||||
|
'neko-files': Files,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
export default class extends Vue {
|
export default class extends Vue {
|
||||||
|
get filetransferAllowed() {
|
||||||
|
return (
|
||||||
|
this.$accessor.remote.fileTransfer && (this.$accessor.user.admin || !this.$accessor.isLocked('file_transfer'))
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
get tab() {
|
get tab() {
|
||||||
return this.$accessor.client.tab
|
return this.$accessor.client.tab
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Watch('tab', { immediate: true })
|
||||||
|
@Watch('filetransferAllowed', { immediate: true })
|
||||||
|
onTabChange() {
|
||||||
|
// do not show the files tab if file transfer is disabled
|
||||||
|
if (this.tab === 'files' && !this.filetransferAllowed) {
|
||||||
|
this.change('chat')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Watch('filetransferAllowed')
|
||||||
|
onFileTransferAllowedChange() {
|
||||||
|
if (this.filetransferAllowed) {
|
||||||
|
this.$accessor.files.refresh()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
change(tab: string) {
|
change(tab: string) {
|
||||||
this.$accessor.client.setTab(tab)
|
this.$accessor.client.setTab(tab)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -38,9 +38,9 @@ const exportMixin = {
|
|||||||
$accessor() {
|
$accessor() {
|
||||||
return neko
|
return neko
|
||||||
},
|
},
|
||||||
$client () {
|
$client() {
|
||||||
return window.$client
|
return window.$client
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -52,15 +52,8 @@ const plugini18n: PluginObject<undefined> = {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
function extend (component: any) {
|
function extend(component: any) {
|
||||||
return component
|
return component.use(plugini18n).use(Logger).use(Axios).use(Swal).use(Anime).use(Client).extend(exportMixin)
|
||||||
.use(plugini18n)
|
|
||||||
.use(Logger)
|
|
||||||
.use(Axios)
|
|
||||||
.use(Swal)
|
|
||||||
.use(Anime)
|
|
||||||
.use(Client)
|
|
||||||
.extend(exportMixin)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const NekoConnect = extend(Connect)
|
export const NekoConnect = extend(Connect)
|
||||||
|
|||||||
@ -7,6 +7,7 @@ export const send_a_message = 'Sende eine Nachricht'
|
|||||||
|
|
||||||
export const side = {
|
export const side = {
|
||||||
chat: 'Chat',
|
chat: 'Chat',
|
||||||
|
files: 'Dateien',
|
||||||
settings: 'Einstellungen',
|
settings: 'Einstellungen',
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -68,6 +69,14 @@ export const locks = {
|
|||||||
notif_locked: 'Raum gesperrt',
|
notif_locked: 'Raum gesperrt',
|
||||||
notif_unlocked: 'Raum entsperrt',
|
notif_unlocked: 'Raum entsperrt',
|
||||||
},
|
},
|
||||||
|
file_transfer: {
|
||||||
|
lock: 'Dateiübertragung sperren (für Nutzer)',
|
||||||
|
unlock: 'Dateiübertragung entsperren (für Nutzer)',
|
||||||
|
locked: 'Dateiübertragung gesperrt (für Nutzer)',
|
||||||
|
unlocked: 'Dateiübertragung entsperrt (für Nutzer)',
|
||||||
|
notif_locked: 'Dateiübertragung gesperrt',
|
||||||
|
notif_unlocked: 'Dateiübertragung entsperrt',
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
export const setting = {
|
export const setting = {
|
||||||
@ -108,3 +117,9 @@ export const notifications = {
|
|||||||
muted: '{name} stummgeschaltet',
|
muted: '{name} stummgeschaltet',
|
||||||
unmuted: '{name} stummschaltung aufgehoben',
|
unmuted: '{name} stummschaltung aufgehoben',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const files = {
|
||||||
|
downloads: 'Herunterladen',
|
||||||
|
uploads: 'Hochladen',
|
||||||
|
upload_here: 'Klicken oder ziehen Sie Dateien zum Hochladen hierher',
|
||||||
|
}
|
||||||
|
|||||||
@ -7,6 +7,7 @@ export const send_a_message = 'Send a message'
|
|||||||
|
|
||||||
export const side = {
|
export const side = {
|
||||||
chat: 'Chat',
|
chat: 'Chat',
|
||||||
|
files: 'Files',
|
||||||
settings: 'Settings',
|
settings: 'Settings',
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,6 +71,14 @@ export const locks = {
|
|||||||
notif_locked: 'locked the room',
|
notif_locked: 'locked the room',
|
||||||
notif_unlocked: 'unlocked the room',
|
notif_unlocked: 'unlocked the room',
|
||||||
},
|
},
|
||||||
|
file_transfer: {
|
||||||
|
lock: 'Lock File Transfer (for users)',
|
||||||
|
unlock: 'Unlock File Transfer (for users)',
|
||||||
|
locked: 'File Transfer Locked (for users)',
|
||||||
|
unlocked: 'File Transfer Unlocked (for users)',
|
||||||
|
notif_locked: 'locked file transfer',
|
||||||
|
notif_unlocked: 'unlocked file transfer',
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
export const setting = {
|
export const setting = {
|
||||||
@ -110,3 +119,9 @@ export const notifications = {
|
|||||||
muted: 'muted {name}',
|
muted: 'muted {name}',
|
||||||
unmuted: 'unmuted {name}',
|
unmuted: 'unmuted {name}',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const files = {
|
||||||
|
downloads: 'Downloads',
|
||||||
|
uploads: 'Uploads',
|
||||||
|
upload_here: 'Click or drag files here to upload',
|
||||||
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ export const send_a_message = 'Enviar un mensaje'
|
|||||||
|
|
||||||
export const side = {
|
export const side = {
|
||||||
chat: 'Chat',
|
chat: 'Chat',
|
||||||
|
files: 'Archivos',
|
||||||
settings: 'Configuración',
|
settings: 'Configuración',
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -74,6 +75,15 @@ export const locks = {
|
|||||||
notif_locked: 'bloqueó la sala',
|
notif_locked: 'bloqueó la sala',
|
||||||
notif_unlocked: 'desbloqueó la sala',
|
notif_unlocked: 'desbloqueó la sala',
|
||||||
},
|
},
|
||||||
|
// TODO
|
||||||
|
//file_transfer: {
|
||||||
|
// lock: 'Lock File Transfer (for users)',
|
||||||
|
// unlock: 'Unlock File Transfer (for users)',
|
||||||
|
// locked: 'File Transfer Locked (for users)',
|
||||||
|
// unlocked: 'File Transfer Unlocked (for users)',
|
||||||
|
// notif_locked: 'locked file transfer',
|
||||||
|
// notif_unlocked: 'unlocked file transfer',
|
||||||
|
//},
|
||||||
}
|
}
|
||||||
|
|
||||||
export const setting = {
|
export const setting = {
|
||||||
@ -117,3 +127,9 @@ export const notifications = {
|
|||||||
muted: '{name} silenciado',
|
muted: '{name} silenciado',
|
||||||
unmuted: '{name} no silenciado',
|
unmuted: '{name} no silenciado',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const files = {
|
||||||
|
downloads: 'Descargas',
|
||||||
|
uploads: 'Cargar',
|
||||||
|
upload_here: 'Haga clic o arrastre los archivos aquí para cargarlos',
|
||||||
|
}
|
||||||
|
|||||||
@ -7,6 +7,7 @@ export const send_a_message = 'Lähetä viesti'
|
|||||||
|
|
||||||
export const side = {
|
export const side = {
|
||||||
chat: 'Chatti',
|
chat: 'Chatti',
|
||||||
|
files: 'Tiedostot',
|
||||||
settings: 'Asetukset',
|
settings: 'Asetukset',
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,6 +71,15 @@ export const locks = {
|
|||||||
notif_locked: 'lukittu huone',
|
notif_locked: 'lukittu huone',
|
||||||
notif_unlocked: 'vapautettu huone',
|
notif_unlocked: 'vapautettu huone',
|
||||||
},
|
},
|
||||||
|
// TODO
|
||||||
|
//file_transfer: {
|
||||||
|
// lock: 'Lock File Transfer (for users)',
|
||||||
|
// unlock: 'Unlock File Transfer (for users)',
|
||||||
|
// locked: 'File Transfer Locked (for users)',
|
||||||
|
// unlocked: 'File Transfer Unlocked (for users)',
|
||||||
|
// notif_locked: 'locked file transfer',
|
||||||
|
// notif_unlocked: 'unlocked file transfer',
|
||||||
|
//},
|
||||||
}
|
}
|
||||||
|
|
||||||
export const setting = {
|
export const setting = {
|
||||||
@ -110,3 +120,9 @@ export const notifications = {
|
|||||||
muted: 'mykistetty {name}',
|
muted: 'mykistetty {name}',
|
||||||
unmuted: 'poistettu mykistys {name}',
|
unmuted: 'poistettu mykistys {name}',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const files = {
|
||||||
|
downloads: 'Lataukset',
|
||||||
|
uploads: 'Lataa',
|
||||||
|
upload_here: 'Klikkaa tai vedä tiedostoja tähän ladataksesi',
|
||||||
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ export const send_a_message = 'Envoyer un message'
|
|||||||
|
|
||||||
export const side = {
|
export const side = {
|
||||||
chat: 'Chat',
|
chat: 'Chat',
|
||||||
|
files: 'Fichiers',
|
||||||
settings: 'Paramètres',
|
settings: 'Paramètres',
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -74,6 +75,15 @@ export const locks = {
|
|||||||
notif_locked: 'a vérouillé la salle',
|
notif_locked: 'a vérouillé la salle',
|
||||||
notif_unlocked: 'a dévérouillé la salle',
|
notif_unlocked: 'a dévérouillé la salle',
|
||||||
},
|
},
|
||||||
|
// TODO
|
||||||
|
//file_transfer: {
|
||||||
|
// lock: 'Lock File Transfer (for users)',
|
||||||
|
// unlock: 'Unlock File Transfer (for users)',
|
||||||
|
// locked: 'File Transfer Locked (for users)',
|
||||||
|
// unlocked: 'File Transfer Unlocked (for users)',
|
||||||
|
// notif_locked: 'locked file transfer',
|
||||||
|
// notif_unlocked: 'unlocked file transfer',
|
||||||
|
//},
|
||||||
}
|
}
|
||||||
|
|
||||||
export const setting = {
|
export const setting = {
|
||||||
@ -117,3 +127,9 @@ export const notifications = {
|
|||||||
muted: 'a mute {name}',
|
muted: 'a mute {name}',
|
||||||
unmuted: 'a démute {name}',
|
unmuted: 'a démute {name}',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const files = {
|
||||||
|
downloads: 'Téléchargements',
|
||||||
|
uploads: 'Télécharger',
|
||||||
|
upload_here: 'Cliquez ou faites glisser les fichiers ici pour les télécharger',
|
||||||
|
}
|
||||||
|
|||||||
@ -7,6 +7,7 @@ export const send_a_message = '메세지 보내기'
|
|||||||
|
|
||||||
export const side = {
|
export const side = {
|
||||||
chat: '채팅',
|
chat: '채팅',
|
||||||
|
files: '파일',
|
||||||
settings: '설정',
|
settings: '설정',
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -68,6 +69,15 @@ export const locks = {
|
|||||||
notif_locked: '방이 잠겼습니다',
|
notif_locked: '방이 잠겼습니다',
|
||||||
notif_unlocked: '방 잠금이 해제됐습니다',
|
notif_unlocked: '방 잠금이 해제됐습니다',
|
||||||
},
|
},
|
||||||
|
// TODO
|
||||||
|
//file_transfer: {
|
||||||
|
// lock: 'Lock File Transfer (for users)',
|
||||||
|
// unlock: 'Unlock File Transfer (for users)',
|
||||||
|
// locked: 'File Transfer Locked (for users)',
|
||||||
|
// unlocked: 'File Transfer Unlocked (for users)',
|
||||||
|
// notif_locked: 'locked file transfer',
|
||||||
|
// notif_unlocked: 'unlocked file transfer',
|
||||||
|
//},
|
||||||
}
|
}
|
||||||
|
|
||||||
export const setting = {
|
export const setting = {
|
||||||
@ -108,3 +118,9 @@ export const notifications = {
|
|||||||
muted: '{name} 님이 뮤트됐습니다',
|
muted: '{name} 님이 뮤트됐습니다',
|
||||||
unmuted: '{name} 님의 뮤트가 해제됐습니다',
|
unmuted: '{name} 님의 뮤트가 해제됐습니다',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const files = {
|
||||||
|
downloads: '다운로드',
|
||||||
|
uploads: '업로드',
|
||||||
|
upload_here: '업로드할 파일을 여기로 클릭하거나 드래그하세요.',
|
||||||
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ export const send_a_message = 'Send en melding'
|
|||||||
|
|
||||||
export const side = {
|
export const side = {
|
||||||
chat: 'Sludring',
|
chat: 'Sludring',
|
||||||
|
files: 'Filer',
|
||||||
settings: 'Innstillinger',
|
settings: 'Innstillinger',
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -74,6 +75,15 @@ export const locks = {
|
|||||||
notif_locked: 'låste rommet',
|
notif_locked: 'låste rommet',
|
||||||
notif_unlocked: 'låste opp rommet',
|
notif_unlocked: 'låste opp rommet',
|
||||||
},
|
},
|
||||||
|
// TODO
|
||||||
|
//file_transfer: {
|
||||||
|
// lock: 'Lock File Transfer (for users)',
|
||||||
|
// unlock: 'Unlock File Transfer (for users)',
|
||||||
|
// locked: 'File Transfer Locked (for users)',
|
||||||
|
// unlocked: 'File Transfer Unlocked (for users)',
|
||||||
|
// notif_locked: 'locked file transfer',
|
||||||
|
// notif_unlocked: 'unlocked file transfer',
|
||||||
|
//},
|
||||||
}
|
}
|
||||||
|
|
||||||
export const setting = {
|
export const setting = {
|
||||||
@ -117,3 +127,9 @@ export const notifications = {
|
|||||||
muted: 'forstummet {name}',
|
muted: 'forstummet {name}',
|
||||||
unmuted: 'opphevet forstummingen av {name}',
|
unmuted: 'opphevet forstummingen av {name}',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const files = {
|
||||||
|
downloads: 'Overførsler',
|
||||||
|
uploads: 'Overfør',
|
||||||
|
upload_here: 'Klik eller træk filer her for at uploade',
|
||||||
|
}
|
||||||
|
|||||||
@ -7,6 +7,7 @@ export const send_a_message = 'Отправить сообщение'
|
|||||||
|
|
||||||
export const side = {
|
export const side = {
|
||||||
chat: 'Чат',
|
chat: 'Чат',
|
||||||
|
files: 'Файлы',
|
||||||
settings: 'Настройки',
|
settings: 'Настройки',
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,6 +71,15 @@ export const locks = {
|
|||||||
notif_locked: 'комната закрыта',
|
notif_locked: 'комната закрыта',
|
||||||
notif_unlocked: 'комната открыта',
|
notif_unlocked: 'комната открыта',
|
||||||
},
|
},
|
||||||
|
// TODO
|
||||||
|
//file_transfer: {
|
||||||
|
// lock: 'Lock File Transfer (for users)',
|
||||||
|
// unlock: 'Unlock File Transfer (for users)',
|
||||||
|
// locked: 'File Transfer Locked (for users)',
|
||||||
|
// unlocked: 'File Transfer Unlocked (for users)',
|
||||||
|
// notif_locked: 'locked file transfer',
|
||||||
|
// notif_unlocked: 'unlocked file transfer',
|
||||||
|
//},
|
||||||
}
|
}
|
||||||
|
|
||||||
export const setting = {
|
export const setting = {
|
||||||
@ -110,3 +120,9 @@ export const notifications = {
|
|||||||
muted: 'заглушен {name}',
|
muted: 'заглушен {name}',
|
||||||
unmuted: 'не заглушен {name}',
|
unmuted: 'не заглушен {name}',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const files = {
|
||||||
|
downloads: 'Загрузки',
|
||||||
|
uploads: 'Загрузить',
|
||||||
|
upload_here: 'Нажмите или перетащите сюда файлы для загрузки',
|
||||||
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ export const send_a_message = 'Odoslať správu'
|
|||||||
|
|
||||||
export const side = {
|
export const side = {
|
||||||
chat: 'Chat',
|
chat: 'Chat',
|
||||||
|
files: 'Súbory',
|
||||||
settings: 'Nastavenia',
|
settings: 'Nastavenia',
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -73,6 +74,15 @@ export const locks = {
|
|||||||
notif_locked: 'miestnosť bola zamknutá',
|
notif_locked: 'miestnosť bola zamknutá',
|
||||||
notif_unlocked: 'miestnosť bola odomknutá',
|
notif_unlocked: 'miestnosť bola odomknutá',
|
||||||
},
|
},
|
||||||
|
// TODO
|
||||||
|
//file_transfer: {
|
||||||
|
// lock: 'Lock File Transfer (for users)',
|
||||||
|
// unlock: 'Unlock File Transfer (for users)',
|
||||||
|
// locked: 'File Transfer Locked (for users)',
|
||||||
|
// unlocked: 'File Transfer Unlocked (for users)',
|
||||||
|
// notif_locked: 'locked file transfer',
|
||||||
|
// notif_unlocked: 'unlocked file transfer',
|
||||||
|
//},
|
||||||
}
|
}
|
||||||
|
|
||||||
export const setting = {
|
export const setting = {
|
||||||
@ -113,3 +123,9 @@ export const notifications = {
|
|||||||
muted: 'zakázal chat používateľovi {name}',
|
muted: 'zakázal chat používateľovi {name}',
|
||||||
unmuted: 'povolil chat používateľovi {name}',
|
unmuted: 'povolil chat používateľovi {name}',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const files = {
|
||||||
|
downloads: 'Stiahnutia',
|
||||||
|
uploads: 'Nahrávanie',
|
||||||
|
upload_here: 'Kliknutím alebo pretiahnutím súborov sem ich môžete nahrať',
|
||||||
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ export const send_a_message = 'Skicka ett meddelande'
|
|||||||
|
|
||||||
export const side = {
|
export const side = {
|
||||||
chat: 'Chatt',
|
chat: 'Chatt',
|
||||||
|
files: 'Filer',
|
||||||
settings: 'Inställningar',
|
settings: 'Inställningar',
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -74,6 +75,15 @@ export const locks = {
|
|||||||
notif_locked: 'låste rummet',
|
notif_locked: 'låste rummet',
|
||||||
notif_unlocked: 'låste upp rummet',
|
notif_unlocked: 'låste upp rummet',
|
||||||
},
|
},
|
||||||
|
// TODO
|
||||||
|
//file_transfer: {
|
||||||
|
// lock: 'Lock File Transfer (for users)',
|
||||||
|
// unlock: 'Unlock File Transfer (for users)',
|
||||||
|
// locked: 'File Transfer Locked (for users)',
|
||||||
|
// unlocked: 'File Transfer Unlocked (for users)',
|
||||||
|
// notif_locked: 'locked file transfer',
|
||||||
|
// notif_unlocked: 'unlocked file transfer',
|
||||||
|
//},
|
||||||
}
|
}
|
||||||
|
|
||||||
export const setting = {
|
export const setting = {
|
||||||
@ -117,3 +127,9 @@ export const notifications = {
|
|||||||
muted: 'tystade {name}',
|
muted: 'tystade {name}',
|
||||||
unmuted: 'tog bort tystningen på {name}',
|
unmuted: 'tog bort tystningen på {name}',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const files = {
|
||||||
|
downloads: 'Nedladdningar',
|
||||||
|
uploads: 'Ladda upp',
|
||||||
|
upload_here: 'Klicka eller dra filer hit för att ladda upp dem',
|
||||||
|
}
|
||||||
|
|||||||
@ -7,6 +7,7 @@ export const send_a_message = '发送消息'
|
|||||||
|
|
||||||
export const side = {
|
export const side = {
|
||||||
chat: '聊天',
|
chat: '聊天',
|
||||||
|
files: '文件',
|
||||||
settings: '设置',
|
settings: '设置',
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,6 +71,15 @@ export const locks = {
|
|||||||
notif_locked: '锁上房间',
|
notif_locked: '锁上房间',
|
||||||
notif_unlocked: '解锁房间',
|
notif_unlocked: '解锁房间',
|
||||||
},
|
},
|
||||||
|
// TODO
|
||||||
|
//file_transfer: {
|
||||||
|
// lock: 'Lock File Transfer (for users)',
|
||||||
|
// unlock: 'Unlock File Transfer (for users)',
|
||||||
|
// locked: 'File Transfer Locked (for users)',
|
||||||
|
// unlocked: 'File Transfer Unlocked (for users)',
|
||||||
|
// notif_locked: 'locked file transfer',
|
||||||
|
// notif_unlocked: 'unlocked file transfer',
|
||||||
|
//},
|
||||||
}
|
}
|
||||||
|
|
||||||
export const setting = {
|
export const setting = {
|
||||||
@ -110,3 +120,9 @@ export const notifications = {
|
|||||||
muted: '鸟粪 {name}',
|
muted: '鸟粪 {name}',
|
||||||
unmuted: '取消静音 {name}',
|
unmuted: '取消静音 {name}',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const files = {
|
||||||
|
downloads: '下载',
|
||||||
|
uploads: '上传',
|
||||||
|
upload_here: '点击或拖动文件到这里来上传',
|
||||||
|
}
|
||||||
|
|||||||
@ -38,6 +38,10 @@ export const EVENT = {
|
|||||||
MESSAGE: 'chat/message',
|
MESSAGE: 'chat/message',
|
||||||
EMOTE: 'chat/emote',
|
EMOTE: 'chat/emote',
|
||||||
},
|
},
|
||||||
|
FILETRANSFER: {
|
||||||
|
LIST: 'filetransfer/list',
|
||||||
|
REFRESH: 'filetransfer/refresh',
|
||||||
|
},
|
||||||
SCREEN: {
|
SCREEN: {
|
||||||
CONFIGURATIONS: 'screen/configurations',
|
CONFIGURATIONS: 'screen/configurations',
|
||||||
RESOLUTION: 'screen/resolution',
|
RESOLUTION: 'screen/resolution',
|
||||||
@ -69,6 +73,7 @@ export type WebSocketEvents =
|
|||||||
| MemberEvents
|
| MemberEvents
|
||||||
| SignalEvents
|
| SignalEvents
|
||||||
| ChatEvents
|
| ChatEvents
|
||||||
|
| FileTransferEvents
|
||||||
| ScreenEvents
|
| ScreenEvents
|
||||||
| BroadcastEvents
|
| BroadcastEvents
|
||||||
| AdminEvents
|
| AdminEvents
|
||||||
@ -91,6 +96,9 @@ export type SignalEvents =
|
|||||||
| typeof EVENT.SIGNAL.CANDIDATE
|
| typeof EVENT.SIGNAL.CANDIDATE
|
||||||
|
|
||||||
export type ChatEvents = typeof EVENT.CHAT.MESSAGE | typeof EVENT.CHAT.EMOTE
|
export type ChatEvents = typeof EVENT.CHAT.MESSAGE | typeof EVENT.CHAT.EMOTE
|
||||||
|
|
||||||
|
export type FileTransferEvents = typeof EVENT.FILETRANSFER.LIST | typeof EVENT.FILETRANSFER.REFRESH
|
||||||
|
|
||||||
export type ScreenEvents = typeof EVENT.SCREEN.CONFIGURATIONS | typeof EVENT.SCREEN.RESOLUTION | typeof EVENT.SCREEN.SET
|
export type ScreenEvents = typeof EVENT.SCREEN.CONFIGURATIONS | typeof EVENT.SCREEN.RESOLUTION | typeof EVENT.SCREEN.SET
|
||||||
|
|
||||||
export type BroadcastEvents =
|
export type BroadcastEvents =
|
||||||
|
|||||||
@ -24,6 +24,7 @@ import {
|
|||||||
AdminLockMessage,
|
AdminLockMessage,
|
||||||
SystemInitPayload,
|
SystemInitPayload,
|
||||||
AdminLockResource,
|
AdminLockResource,
|
||||||
|
FileTransferListPayload,
|
||||||
} from './messages'
|
} from './messages'
|
||||||
|
|
||||||
interface NekoEvents extends BaseEvents {}
|
interface NekoEvents extends BaseEvents {}
|
||||||
@ -46,6 +47,8 @@ export class NekoClient extends BaseClient implements EventEmitter<NekoEvents> {
|
|||||||
this.$vue = vue
|
this.$vue = vue
|
||||||
this.$accessor = vue.$accessor
|
this.$accessor = vue.$accessor
|
||||||
this.url = url
|
this.url = url
|
||||||
|
// convert ws url to http url
|
||||||
|
this.$vue.$http.defaults.baseURL = url.replace(/^ws/, 'http').replace(/\/ws$/, '')
|
||||||
}
|
}
|
||||||
|
|
||||||
private cleanup() {
|
private cleanup() {
|
||||||
@ -133,8 +136,9 @@ export class NekoClient extends BaseClient implements EventEmitter<NekoEvents> {
|
|||||||
/////////////////////////////
|
/////////////////////////////
|
||||||
// System Events
|
// System Events
|
||||||
/////////////////////////////
|
/////////////////////////////
|
||||||
protected [EVENT.SYSTEM.INIT]({ implicit_hosting, locks }: SystemInitPayload) {
|
protected [EVENT.SYSTEM.INIT]({ implicit_hosting, locks, file_transfer }: SystemInitPayload) {
|
||||||
this.$accessor.remote.setImplicitHosting(implicit_hosting)
|
this.$accessor.remote.setImplicitHosting(implicit_hosting)
|
||||||
|
this.$accessor.remote.setFileTransfer(file_transfer)
|
||||||
|
|
||||||
for (const resource in locks) {
|
for (const resource in locks) {
|
||||||
this[EVENT.ADMIN.LOCK]({
|
this[EVENT.ADMIN.LOCK]({
|
||||||
@ -351,6 +355,14 @@ export class NekoClient extends BaseClient implements EventEmitter<NekoEvents> {
|
|||||||
this.$accessor.chat.newEmote({ type: emote })
|
this.$accessor.chat.newEmote({ type: emote })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/////////////////////////////
|
||||||
|
// File Transfer Events
|
||||||
|
/////////////////////////////
|
||||||
|
protected [EVENT.FILETRANSFER.LIST]({ cwd, files }: FileTransferListPayload) {
|
||||||
|
this.$accessor.files.setCwd(cwd)
|
||||||
|
this.$accessor.files.setFileList(files)
|
||||||
|
}
|
||||||
|
|
||||||
/////////////////////////////
|
/////////////////////////////
|
||||||
// Screen Events
|
// Screen Events
|
||||||
/////////////////////////////
|
/////////////////////////////
|
||||||
|
|||||||
@ -8,8 +8,9 @@ import {
|
|||||||
ChatEvents,
|
ChatEvents,
|
||||||
ScreenEvents,
|
ScreenEvents,
|
||||||
AdminEvents,
|
AdminEvents,
|
||||||
|
FileTransferEvents,
|
||||||
} from './events'
|
} from './events'
|
||||||
import { Member, ScreenConfigurations, ScreenResolution } from './types'
|
import { FileListItem, Member, ScreenConfigurations, ScreenResolution } from './types'
|
||||||
|
|
||||||
export type WebSocketMessages =
|
export type WebSocketMessages =
|
||||||
| WebSocketMessage
|
| WebSocketMessage
|
||||||
@ -59,6 +60,7 @@ export interface SystemInit extends WebSocketMessage, SystemInitPayload {
|
|||||||
export interface SystemInitPayload {
|
export interface SystemInitPayload {
|
||||||
implicit_hosting: boolean
|
implicit_hosting: boolean
|
||||||
locks: Record<string, string>
|
locks: Record<string, string>
|
||||||
|
file_transfer: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
// system/disconnect
|
// system/disconnect
|
||||||
@ -192,6 +194,18 @@ export interface EmojiSendPayload {
|
|||||||
emote: string
|
emote: string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
FILE TRANSFER PAYLOADS
|
||||||
|
*/
|
||||||
|
export interface FileTransferListMessage extends WebSocketMessage, FileTransferListPayload {
|
||||||
|
event: FileTransferEvents
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface FileTransferListPayload {
|
||||||
|
cwd: string
|
||||||
|
files: FileListItem[]
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
SCREEN PAYLOADS
|
SCREEN PAYLOADS
|
||||||
*/
|
*/
|
||||||
@ -215,11 +229,11 @@ export interface ScreenConfigurationsPayload {
|
|||||||
BROADCAST PAYLOADS
|
BROADCAST PAYLOADS
|
||||||
*/
|
*/
|
||||||
export interface BroadcastCreatePayload {
|
export interface BroadcastCreatePayload {
|
||||||
url: string
|
url: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface BroadcastStatusPayload {
|
export interface BroadcastStatusPayload {
|
||||||
url: string
|
url: string
|
||||||
isActive: boolean
|
isActive: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -248,7 +262,7 @@ export interface AdminLockMessage extends WebSocketMessage, AdminLockPayload {
|
|||||||
id: string
|
id: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export type AdminLockResource = 'login' | 'control'
|
export type AdminLockResource = 'login' | 'control' | 'file_transfer'
|
||||||
|
|
||||||
export interface AdminLockPayload {
|
export interface AdminLockPayload {
|
||||||
resource: AdminLockResource
|
resource: AdminLockResource
|
||||||
|
|||||||
@ -22,3 +22,20 @@ export interface ScreenResolution {
|
|||||||
height: number
|
height: number
|
||||||
rate: number
|
rate: number
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface FileListItem {
|
||||||
|
name: string
|
||||||
|
type: 'file' | 'dir'
|
||||||
|
size: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface FileTransfer {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
direction: 'upload' | 'download'
|
||||||
|
size: number
|
||||||
|
progress: number
|
||||||
|
status: 'pending' | 'inprogress' | 'completed' | 'failed'
|
||||||
|
error?: string
|
||||||
|
abortController?: AbortController
|
||||||
|
}
|
||||||
|
|||||||
72
client/src/store/files.ts
Normal file
72
client/src/store/files.ts
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
import { actionTree, getterTree, mutationTree } from 'typed-vuex'
|
||||||
|
import { FileListItem, FileTransfer } from '~/neko/types'
|
||||||
|
import { EVENT } from '~/neko/events'
|
||||||
|
import { accessor } from '~/store'
|
||||||
|
|
||||||
|
export const state = () => ({
|
||||||
|
cwd: '',
|
||||||
|
files: [] as FileListItem[],
|
||||||
|
transfers: [] as FileTransfer[],
|
||||||
|
})
|
||||||
|
|
||||||
|
export const getters = getterTree(state, {
|
||||||
|
//
|
||||||
|
})
|
||||||
|
|
||||||
|
export const mutations = mutationTree(state, {
|
||||||
|
_setCwd(state, cwd: string) {
|
||||||
|
state.cwd = cwd
|
||||||
|
},
|
||||||
|
|
||||||
|
_setFileList(state, files: FileListItem[]) {
|
||||||
|
state.files = files
|
||||||
|
},
|
||||||
|
|
||||||
|
_addTransfer(state, transfer: FileTransfer) {
|
||||||
|
state.transfers = [...state.transfers, transfer]
|
||||||
|
},
|
||||||
|
|
||||||
|
_removeTransfer(state, transfer: FileTransfer) {
|
||||||
|
state.transfers = state.transfers.filter((t) => t.id !== transfer.id)
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
export const actions = actionTree(
|
||||||
|
{ state, getters, mutations },
|
||||||
|
{
|
||||||
|
setCwd(store, cwd: string) {
|
||||||
|
accessor.files._setCwd(cwd)
|
||||||
|
},
|
||||||
|
|
||||||
|
setFileList(store, files: FileListItem[]) {
|
||||||
|
accessor.files._setFileList(files)
|
||||||
|
},
|
||||||
|
|
||||||
|
addTransfer(store, transfer: FileTransfer) {
|
||||||
|
if (transfer.status !== 'pending') {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
accessor.files._addTransfer(transfer)
|
||||||
|
},
|
||||||
|
|
||||||
|
removeTransfer(store, transfer: FileTransfer) {
|
||||||
|
accessor.files._removeTransfer(transfer)
|
||||||
|
},
|
||||||
|
|
||||||
|
cancelAllTransfers(store) {
|
||||||
|
for (const t of accessor.files.transfers) {
|
||||||
|
if (t.status !== 'completed') {
|
||||||
|
t.abortController?.abort()
|
||||||
|
}
|
||||||
|
accessor.files.removeTransfer(t)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
refresh(store) {
|
||||||
|
if (!accessor.connected) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
$client.sendMessage(EVENT.FILETRANSFER.REFRESH)
|
||||||
|
},
|
||||||
|
},
|
||||||
|
)
|
||||||
@ -1,12 +1,13 @@
|
|||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
import Vuex from 'vuex'
|
import Vuex from 'vuex'
|
||||||
import { useAccessor, mutationTree, actionTree } from 'typed-vuex'
|
import { useAccessor, mutationTree, getterTree, actionTree } from 'typed-vuex'
|
||||||
import { EVENT } from '~/neko/events'
|
import { EVENT } from '~/neko/events'
|
||||||
import { AdminLockResource } from '~/neko/messages'
|
import { AdminLockResource } from '~/neko/messages'
|
||||||
import { get, set } from '~/utils/localstorage'
|
import { get, set } from '~/utils/localstorage'
|
||||||
|
|
||||||
import * as video from './video'
|
import * as video from './video'
|
||||||
import * as chat from './chat'
|
import * as chat from './chat'
|
||||||
|
import * as files from './files'
|
||||||
import * as remote from './remote'
|
import * as remote from './remote'
|
||||||
import * as user from './user'
|
import * as user from './user'
|
||||||
import * as settings from './settings'
|
import * as settings from './settings'
|
||||||
@ -55,8 +56,12 @@ export const mutations = mutationTree(state, {
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
export const getters = getterTree(state, {
|
||||||
|
isLocked: (state) => (resource: AdminLockResource) => resource in state.locked && state.locked[resource],
|
||||||
|
})
|
||||||
|
|
||||||
export const actions = actionTree(
|
export const actions = actionTree(
|
||||||
{ state, mutations },
|
{ state, getters, mutations },
|
||||||
{
|
{
|
||||||
initialise(store) {
|
initialise(store) {
|
||||||
accessor.emoji.initialise()
|
accessor.emoji.initialise()
|
||||||
@ -79,6 +84,14 @@ export const actions = actionTree(
|
|||||||
$client.sendMessage(EVENT.ADMIN.UNLOCK, { resource })
|
$client.sendMessage(EVENT.ADMIN.UNLOCK, { resource })
|
||||||
},
|
},
|
||||||
|
|
||||||
|
toggleLock(_, resource: AdminLockResource) {
|
||||||
|
if (accessor.isLocked(resource)) {
|
||||||
|
accessor.unlock(resource)
|
||||||
|
} else {
|
||||||
|
accessor.lock(resource)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
login({ state }, { displayname, password }: { displayname: string; password: string }) {
|
login({ state }, { displayname, password }: { displayname: string; password: string }) {
|
||||||
accessor.setLogin({ displayname, password })
|
accessor.setLogin({ displayname, password })
|
||||||
$client.login(password, displayname)
|
$client.login(password, displayname)
|
||||||
@ -97,7 +110,8 @@ export const storePattern = {
|
|||||||
state,
|
state,
|
||||||
mutations,
|
mutations,
|
||||||
actions,
|
actions,
|
||||||
modules: { video, chat, user, remote, settings, client, emoji },
|
getters,
|
||||||
|
modules: { video, chat, files, user, remote, settings, client, emoji },
|
||||||
}
|
}
|
||||||
|
|
||||||
Vue.use(Vuex)
|
Vue.use(Vuex)
|
||||||
|
|||||||
@ -13,6 +13,7 @@ export const state = () => ({
|
|||||||
clipboard: '',
|
clipboard: '',
|
||||||
locked: false,
|
locked: false,
|
||||||
implicitHosting: true,
|
implicitHosting: true,
|
||||||
|
fileTransfer: true,
|
||||||
keyboardModifierState: -1,
|
keyboardModifierState: -1,
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -53,6 +54,10 @@ export const mutations = mutationTree(state, {
|
|||||||
state.implicitHosting = val
|
state.implicitHosting = val
|
||||||
},
|
},
|
||||||
|
|
||||||
|
setFileTransfer(state, val: boolean) {
|
||||||
|
state.fileTransfer = val
|
||||||
|
},
|
||||||
|
|
||||||
reset(state) {
|
reset(state) {
|
||||||
state.id = ''
|
state.id = ''
|
||||||
state.clipboard = ''
|
state.clipboard = ''
|
||||||
|
|||||||
@ -23,5 +23,5 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
devServer: {
|
devServer: {
|
||||||
disableHostCheck: true,
|
disableHostCheck: true,
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,8 +1,12 @@
|
|||||||
<div align="center">
|
<div align="center">
|
||||||
<a href="https://neko.m1k1o.net/#/" ><img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/logo.png" width="450" height="auto"/></a>
|
<a href="https://neko.m1k1o.net/#/" ><img src="./_media/logo.png" width="450" height="auto"/></a>
|
||||||
<br/>
|
<br/>
|
||||||
<br/>
|
<br/>
|
||||||
<img src="https://i.imgur.com/ZSzbQr7.gif" width="650" height="auto"/>
|
<img src="./_media/intro.gif" width="650" height="auto"/>
|
||||||
|
|
||||||
|
With `NEKO_FILE_TRANSFER_ENABLED=true`:
|
||||||
|
|
||||||
|
<img src="./_media/file-transfer.gif" width="650" height="auto"/>
|
||||||
<br/>
|
<br/>
|
||||||
<br/>
|
<br/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
BIN
docs/_media/file-transfer.gif
Normal file
BIN
docs/_media/file-transfer.gif
Normal file
Binary file not shown.
|
After 
(image error) Size: 2.9 MiB |
BIN
docs/_media/intro.gif
Normal file
BIN
docs/_media/intro.gif
Normal file
Binary file not shown.
|
After 
(image error) Size: 3.4 MiB |
@ -2,16 +2,22 @@
|
|||||||
|
|
||||||
## master branch
|
## master branch
|
||||||
|
|
||||||
|
## [n.eko v2.7](https://github.com/m1k1o/neko/releases/tag/v2.7)
|
||||||
|
|
||||||
### New Features
|
### New Features
|
||||||
- Added `m1k1o/neko:vivaldi` tag (thanks @Xeddius).
|
- Added `m1k1o/neko:vivaldi` tag (thanks @Xeddius).
|
||||||
- Added `m1k1o/neko:opera` tag (thanks @prophetofxenu).
|
- Added `m1k1o/neko:opera` tag (thanks @prophetofxenu).
|
||||||
- Added `NEKO_PATH_PREFIX`.
|
- Added `NEKO_PATH_PREFIX`.
|
||||||
- Added screenshot function `/screenshot.jpg?pwd=<admin>`, works only for unlocked rooms.
|
- Added screenshot function `/screenshot.jpg?pwd=<admin>`, works only for unlocked rooms.
|
||||||
|
- Added emoji support (by @yesBad).
|
||||||
|
- Added file transfer (by @prophetofxenu).
|
||||||
|
|
||||||
### Misc
|
### Misc
|
||||||
- Server: Split `remote` to `desktop` and `capture`.
|
- Server: Split `remote` to `desktop` and `capture`.
|
||||||
- Server: Refactored `xorg` - added `xevent` and clipboard is handled as event (no looped polling anymore).
|
- Server: Refactored `xorg` - added `xevent` and clipboard is handled as event (no looped polling anymore).
|
||||||
- Introduced `NEKO_AUDIO_CODEC=` and `NEKO_VIDEO_CODEC=` as a new way of setting codecs.
|
- Introduced `NEKO_AUDIO_CODEC=` and `NEKO_VIDEO_CODEC=` as a new way of setting codecs.
|
||||||
|
- Added CORS.
|
||||||
|
- Opera versions are not hardcoded in Dockerfile anymore but automatically are fetch latest.
|
||||||
|
|
||||||
## [n.eko v2.6](https://github.com/m1k1o/neko/releases/tag/v2.6)
|
## [n.eko v2.6](https://github.com/m1k1o/neko/releases/tag/v2.6)
|
||||||
|
|
||||||
|
|||||||
@ -78,8 +78,10 @@ services:
|
|||||||
```
|
```
|
||||||
|
|
||||||
- When using mux, `NEKO_EPR` is ignored.
|
- When using mux, `NEKO_EPR` is ignored.
|
||||||
|
- Mux accepts only one port, not a range.
|
||||||
- You only need to expose maximum two ports for WebRTC on your router/firewall and have many users connected.
|
- You only need to expose maximum two ports for WebRTC on your router/firewall and have many users connected.
|
||||||
- It can even be the same port number, so e.g. `NEKO_TCPMUX: 8081` and `NEKO_UDPMUX: 8081`.
|
- It can even be the same port number, so e.g. `NEKO_TCPMUX: 8081` and `NEKO_UDPMUX: 8081`.
|
||||||
|
- The same port must be exposed from docker container, you can't map them to different ports. So `8082:8082` is OK, but `"5454:8082` will not work.
|
||||||
- You can use them alone (either TCP or UDP) when needed.
|
- You can use them alone (either TCP or UDP) when needed.
|
||||||
- UDP is generally better for latency. But some networks block UDP so it is good to have TCP available as fallback.
|
- UDP is generally better for latency. But some networks block UDP so it is good to have TCP available as fallback.
|
||||||
- Still, using `NEKO_ICELITE=true` is recommended.
|
- Still, using `NEKO_ICELITE=true` is recommended.
|
||||||
@ -90,6 +92,31 @@ services:
|
|||||||
- For Chromium, copy [this](https://github.com/m1k1o/neko/blob/master/.docker/chromium/policies.json) file, modify and mount it as: ` -v '${PWD}/policies.json:/etc/chromium/policies/managed/policies.json'`
|
- For Chromium, copy [this](https://github.com/m1k1o/neko/blob/master/.docker/chromium/policies.json) file, modify and mount it as: ` -v '${PWD}/policies.json:/etc/chromium/policies/managed/policies.json'`
|
||||||
- For others, see where existing `policies.json` is placed in their `Dockerfile`.
|
- For others, see where existing `policies.json` is placed in their `Dockerfile`.
|
||||||
|
|
||||||
|
#### Allow file uploading & downloading
|
||||||
|
- From security perespective, browser is not enabled to access local file data.
|
||||||
|
- If you want to enable this, you need to modify following policies:
|
||||||
|
```json
|
||||||
|
"DownloadRestrictions": 0,
|
||||||
|
"AllowFileSelectionDialogs": true,
|
||||||
|
"URLAllowlist": [
|
||||||
|
"file:///home/neko/Downloads"
|
||||||
|
],
|
||||||
|
```
|
||||||
|
|
||||||
|
### Want to preserve browser data between restarts?
|
||||||
|
- You need to mount browser profile as volume.
|
||||||
|
- For Firefox, that is this `/home/neko/.mozilla/firefox/profile.default` folder, mount it as: ` -v '${PWD}/data:/home/neko/.mozilla/firefox/profile.default'`
|
||||||
|
- For Chromium, that is this `/home/neko/.config/chromium` folder, mount it as: ` -v '${PWD}/data:/home/neko/.config/chromium'`
|
||||||
|
- For other chromium based browsers, see in `supervisord.conf` folder that is specified in `--user-data-dir`.
|
||||||
|
|
||||||
|
#### Allow persistent data in policies
|
||||||
|
- From security perespective, browser is set up to forget all cookies and brwosing history when its closed.
|
||||||
|
- If you want to enable this, you need to modify following policies:
|
||||||
|
```json
|
||||||
|
"DefaultCookiesSetting": 1,
|
||||||
|
"RestoreOnStartup": 1,
|
||||||
|
```
|
||||||
|
|
||||||
### Want to use VPN for your n.eko browsing?
|
### Want to use VPN for your n.eko browsing?
|
||||||
- Check this out: https://github.com/m1k1o/neko-vpn
|
- Check this out: https://github.com/m1k1o/neko-vpn
|
||||||
|
|
||||||
|
|||||||
@ -32,6 +32,7 @@ nat1to1: <ip>
|
|||||||
- Currently supported:
|
- Currently supported:
|
||||||
- `control`
|
- `control`
|
||||||
- `login`
|
- `login`
|
||||||
|
- `file_transfer`
|
||||||
- e.g. `control`
|
- e.g. `control`
|
||||||
|
|
||||||
### WebRTC
|
### WebRTC
|
||||||
@ -125,6 +126,19 @@ nat1to1: <ip>
|
|||||||
#### `NEKO_PATH_PREFIX`:
|
#### `NEKO_PATH_PREFIX`:
|
||||||
- Path prefix for HTTP requests.
|
- Path prefix for HTTP requests.
|
||||||
- e.g. `/neko/`
|
- e.g. `/neko/`
|
||||||
|
#### `NEKO_CORS`:
|
||||||
|
- Cross origin request sharing, whitespace separated list of allowed hosts, `*` for all.
|
||||||
|
- e.g. `127.0.0.1 neko.example.com`
|
||||||
|
|
||||||
|
### File Transfer
|
||||||
|
|
||||||
|
#### `NEKO_FILE_TRANSFER_ENABLED`:
|
||||||
|
- Enable file transfer feature.
|
||||||
|
- e.g. `true`
|
||||||
|
#### `NEKO_FILE_TRANSFER_PATH`:
|
||||||
|
- Path where files will be transferred between the host and users. By default this is
|
||||||
|
`/home/neko/Downloads`. If the path doesn't exist, it will be created.
|
||||||
|
- e.g. `/home/neko/Desktop`
|
||||||
|
|
||||||
### Expert settings
|
### Expert settings
|
||||||
|
|
||||||
@ -152,9 +166,12 @@ Flags:
|
|||||||
--broadcast_url string URL for broadcasting, setting this value will automatically enable broadcasting
|
--broadcast_url string URL for broadcasting, setting this value will automatically enable broadcasting
|
||||||
--cert string path to the SSL cert used to secure the neko server
|
--cert string path to the SSL cert used to secure the neko server
|
||||||
--control_protection control protection means, users can gain control only if at least one admin is in the room
|
--control_protection control protection means, users can gain control only if at least one admin is in the room
|
||||||
|
--cors strings list of allowed origins for CORS (default [*])
|
||||||
--device string audio device to capture (default "auto_null.monitor")
|
--device string audio device to capture (default "auto_null.monitor")
|
||||||
--display string XDisplay to capture (default ":99.0")
|
--display string XDisplay to capture (default ":99.0")
|
||||||
--epr string limits the pool of ephemeral ports that ICE UDP connections can allocate from (default "59000-59100")
|
--epr string limits the pool of ephemeral ports that ICE UDP connections can allocate from (default "59000-59100")
|
||||||
|
--file_transfer_enabled enable file transfer feature (default false)
|
||||||
|
--file_transfer_path string path to use for file transfer (default "/home/neko/Downloads")
|
||||||
--g722 DEPRECATED: use audio_codec
|
--g722 DEPRECATED: use audio_codec
|
||||||
--h264 DEPRECATED: use video_codec
|
--h264 DEPRECATED: use video_codec
|
||||||
-h, --help help for serve
|
-h, --help help for serve
|
||||||
|
|||||||
@ -3,55 +3,56 @@ module m1k1o/neko
|
|||||||
go 1.18
|
go 1.18
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/fsnotify/fsnotify v1.5.4 // indirect
|
github.com/fsnotify/fsnotify v1.6.0
|
||||||
github.com/go-chi/chi v4.1.2+incompatible
|
github.com/go-chi/chi v4.1.2+incompatible
|
||||||
|
github.com/go-chi/cors v1.2.1
|
||||||
github.com/gorilla/websocket v1.5.0
|
github.com/gorilla/websocket v1.5.0
|
||||||
github.com/kataras/go-events v0.0.3
|
github.com/kataras/go-events v0.0.3
|
||||||
github.com/pion/ice/v2 v2.2.7 // indirect
|
github.com/pion/ice/v2 v2.2.11 // indirect
|
||||||
github.com/pion/interceptor v0.1.12
|
github.com/pion/interceptor v0.1.12
|
||||||
github.com/pion/logging v0.2.2
|
github.com/pion/logging v0.2.2
|
||||||
github.com/pion/rtp v1.7.13 // indirect
|
github.com/pion/rtp v1.7.13 // indirect
|
||||||
github.com/pion/srtp/v2 v2.0.10 // indirect
|
github.com/pion/srtp/v2 v2.0.10 // indirect
|
||||||
github.com/pion/webrtc/v3 v3.1.43
|
github.com/pion/webrtc/v3 v3.1.47
|
||||||
github.com/pkg/errors v0.9.1
|
github.com/pkg/errors v0.9.1
|
||||||
github.com/rs/zerolog v1.27.0
|
github.com/rs/zerolog v1.28.0
|
||||||
github.com/spf13/cast v1.5.0 // indirect
|
github.com/spf13/cast v1.5.0 // indirect
|
||||||
github.com/spf13/cobra v1.5.0
|
github.com/spf13/cobra v1.6.0
|
||||||
github.com/spf13/viper v1.12.0
|
github.com/spf13/viper v1.13.0
|
||||||
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
|
golang.org/x/crypto v0.1.0 // indirect
|
||||||
golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 // indirect
|
golang.org/x/net v0.1.0 // indirect
|
||||||
golang.org/x/sys v0.0.0-20220730100132-1609e554cd39 // indirect
|
golang.org/x/sys v0.1.0 // indirect
|
||||||
golang.org/x/text v0.3.7 // indirect
|
golang.org/x/text v0.4.0 // indirect
|
||||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/google/uuid v1.3.0 // indirect
|
github.com/google/uuid v1.3.0 // indirect
|
||||||
github.com/hashicorp/hcl v1.0.0 // indirect
|
github.com/hashicorp/hcl v1.0.0 // indirect
|
||||||
github.com/inconshreveable/mousetrap v1.0.0 // indirect
|
github.com/inconshreveable/mousetrap v1.0.1 // indirect
|
||||||
|
github.com/kr/pretty v0.3.1 // indirect
|
||||||
github.com/magiconair/properties v1.8.6 // indirect
|
github.com/magiconair/properties v1.8.6 // indirect
|
||||||
github.com/mattn/go-colorable v0.1.12 // indirect
|
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||||
github.com/mattn/go-isatty v0.0.14 // indirect
|
github.com/mattn/go-isatty v0.0.16 // indirect
|
||||||
github.com/mitchellh/mapstructure v1.5.0 // indirect
|
github.com/mitchellh/mapstructure v1.5.0 // indirect
|
||||||
github.com/pelletier/go-toml v1.9.5 // indirect
|
github.com/pelletier/go-toml v1.9.5 // indirect
|
||||||
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
|
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
|
||||||
github.com/pion/datachannel v1.5.2 // indirect
|
github.com/pion/datachannel v1.5.2 // indirect
|
||||||
github.com/pion/dtls/v2 v2.1.5 // indirect
|
github.com/pion/dtls/v2 v2.1.5 // indirect
|
||||||
github.com/pion/mdns v0.0.5 // indirect
|
github.com/pion/mdns v0.0.5 // indirect
|
||||||
github.com/pion/randutil v0.1.0 // indirect
|
github.com/pion/randutil v0.1.0 // indirect
|
||||||
github.com/pion/rtcp v1.2.10 // indirect
|
github.com/pion/rtcp v1.2.10 // indirect
|
||||||
github.com/pion/sctp v1.8.2 // indirect
|
github.com/pion/sctp v1.8.3 // indirect
|
||||||
github.com/pion/sdp/v3 v3.0.5 // indirect
|
github.com/pion/sdp/v3 v3.0.6 // indirect
|
||||||
github.com/pion/stun v0.3.5 // indirect
|
github.com/pion/stun v0.3.5 // indirect
|
||||||
github.com/pion/transport v0.13.1 // indirect
|
github.com/pion/transport v0.13.1 // indirect
|
||||||
github.com/pion/turn/v2 v2.0.8 // indirect
|
github.com/pion/turn/v2 v2.0.8 // indirect
|
||||||
github.com/pion/udp v0.1.1 // indirect
|
github.com/pion/udp v0.1.1 // indirect
|
||||||
github.com/rogpeppe/go-internal v1.8.1 // indirect
|
|
||||||
github.com/spf13/afero v1.9.2 // indirect
|
github.com/spf13/afero v1.9.2 // indirect
|
||||||
github.com/spf13/jwalterweatherman v1.1.0 // indirect
|
github.com/spf13/jwalterweatherman v1.1.0 // indirect
|
||||||
github.com/spf13/pflag v1.0.5 // indirect
|
github.com/spf13/pflag v1.0.5 // indirect
|
||||||
github.com/subosito/gotenv v1.4.0 // indirect
|
github.com/subosito/gotenv v1.4.1 // indirect
|
||||||
gopkg.in/ini.v1 v1.66.6 // indirect
|
gopkg.in/ini.v1 v1.67.0 // indirect
|
||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
101
server/go.sum
101
server/go.sum
@ -48,6 +48,7 @@ github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnht
|
|||||||
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
|
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
|
||||||
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
||||||
|
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
@ -60,10 +61,12 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
|
|||||||
github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
|
github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
|
||||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||||
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
|
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
|
||||||
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
|
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
|
||||||
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
|
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
|
||||||
github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec=
|
github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec=
|
||||||
github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
|
github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
|
||||||
|
github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
|
||||||
|
github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
|
||||||
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
|
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
|
||||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
||||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
||||||
@ -138,8 +141,8 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
|
|||||||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||||
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
||||||
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
||||||
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
|
github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
|
||||||
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
|
github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
||||||
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
|
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
|
||||||
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
|
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
|
||||||
github.com/kataras/go-events v0.0.3 h1:o5YK53uURXtrlg7qE/vovxd/yKOJcLuFtPQbf1rYMC4=
|
github.com/kataras/go-events v0.0.3 h1:o5YK53uURXtrlg7qE/vovxd/yKOJcLuFtPQbf1rYMC4=
|
||||||
@ -148,16 +151,20 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
|
|||||||
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
|
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
|
||||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||||
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
||||||
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
|
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||||
|
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||||
|
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||||
github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
|
github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
|
||||||
github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
|
github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
|
||||||
github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
|
|
||||||
github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
|
github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
|
||||||
github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
|
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
|
||||||
|
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
|
||||||
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
|
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
|
||||||
|
github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
|
||||||
|
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
||||||
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
|
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
|
||||||
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
|
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
|
||||||
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
|
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
|
||||||
@ -171,16 +178,14 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
|
|||||||
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
|
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
|
||||||
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
|
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
|
||||||
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
|
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
|
||||||
github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw=
|
github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg=
|
||||||
github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI=
|
github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas=
|
||||||
github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E=
|
github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E=
|
||||||
github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ=
|
github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ=
|
||||||
github.com/pion/dtls/v2 v2.1.3/go.mod h1:o6+WvyLDAlXF7YiPB/RlskRoeK+/JtuaZa5emwQcWus=
|
|
||||||
github.com/pion/dtls/v2 v2.1.5 h1:jlh2vtIyUBShchoTDqpCCqiYCyRFJ/lvf/gQ8TALs+c=
|
github.com/pion/dtls/v2 v2.1.5 h1:jlh2vtIyUBShchoTDqpCCqiYCyRFJ/lvf/gQ8TALs+c=
|
||||||
github.com/pion/dtls/v2 v2.1.5/go.mod h1:BqCE7xPZbPSubGasRoDFJeTsyJtdD1FanJYL0JGheqY=
|
github.com/pion/dtls/v2 v2.1.5/go.mod h1:BqCE7xPZbPSubGasRoDFJeTsyJtdD1FanJYL0JGheqY=
|
||||||
github.com/pion/ice/v2 v2.2.6/go.mod h1:SWuHiOGP17lGromHTFadUe1EuPgFh/oCU6FCMZHooVE=
|
github.com/pion/ice/v2 v2.2.11 h1:wiAy7TSrVZ4KdyjC0CcNTkwltz9ywetbe4wbHLKUbIg=
|
||||||
github.com/pion/ice/v2 v2.2.7 h1:kG9tux3WdYUSqqqnf+O5zKlpy41PdlvLUBlYJeV2emQ=
|
github.com/pion/ice/v2 v2.2.11/go.mod h1:NqUDUao6SjSs1+4jrqpexDmFlptlVhGxQjcymXLaVvE=
|
||||||
github.com/pion/ice/v2 v2.2.7/go.mod h1:Ckj7cWZ717rtU01YoDQA9ntGWCk95D42uVZ8sI0EL+8=
|
|
||||||
github.com/pion/interceptor v0.1.11/go.mod h1:tbtKjZY14awXd7Bq0mmWvgtHB5MDaRN7HV3OZ/uy7s8=
|
github.com/pion/interceptor v0.1.11/go.mod h1:tbtKjZY14awXd7Bq0mmWvgtHB5MDaRN7HV3OZ/uy7s8=
|
||||||
github.com/pion/interceptor v0.1.12 h1:CslaNriCFUItiXS5o+hh5lpL0t0ytQkFnUcbbCs2Zq8=
|
github.com/pion/interceptor v0.1.12 h1:CslaNriCFUItiXS5o+hh5lpL0t0ytQkFnUcbbCs2Zq8=
|
||||||
github.com/pion/interceptor v0.1.12/go.mod h1:bDtgAD9dRkBZpWHGKaoKb42FhDHTG2rX8Ii9LRALLVA=
|
github.com/pion/interceptor v0.1.12/go.mod h1:bDtgAD9dRkBZpWHGKaoKb42FhDHTG2rX8Ii9LRALLVA=
|
||||||
@ -196,10 +201,11 @@ github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL
|
|||||||
github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA=
|
github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA=
|
||||||
github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
|
github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
|
||||||
github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
|
github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
|
||||||
github.com/pion/sctp v1.8.2 h1:yBBCIrUMJ4yFICL3RIvR4eh/H2BTTvlligmSTy+3kiA=
|
|
||||||
github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
|
github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
|
||||||
github.com/pion/sdp/v3 v3.0.5 h1:ouvI7IgGl+V4CrqskVtr3AaTrPvPisEOxwgpdktctkU=
|
github.com/pion/sctp v1.8.3 h1:LWcciN2ptLkw9Ugp/Ks2E76fiWy7yk3Wm79D6oFbFNo=
|
||||||
github.com/pion/sdp/v3 v3.0.5/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw=
|
github.com/pion/sctp v1.8.3/go.mod h1:OHbDjdk7kg+L+7TJim9q/qGVefdEJohuA2SZyihccgI=
|
||||||
|
github.com/pion/sdp/v3 v3.0.6 h1:WuDLhtuFUUVpTfus9ILC4HRyHsW6TdugjEX/QY9OiUw=
|
||||||
|
github.com/pion/sdp/v3 v3.0.6/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw=
|
||||||
github.com/pion/srtp/v2 v2.0.10 h1:b8ZvEuI+mrL8hbr/f1YiJFB34UMrOac3R3N1yq2UN0w=
|
github.com/pion/srtp/v2 v2.0.10 h1:b8ZvEuI+mrL8hbr/f1YiJFB34UMrOac3R3N1yq2UN0w=
|
||||||
github.com/pion/srtp/v2 v2.0.10/go.mod h1:XEeSWaK9PfuMs7zxXyiN252AHPbH12NX5q/CFDWtUuA=
|
github.com/pion/srtp/v2 v2.0.10/go.mod h1:XEeSWaK9PfuMs7zxXyiN252AHPbH12NX5q/CFDWtUuA=
|
||||||
github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg=
|
github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg=
|
||||||
@ -213,8 +219,8 @@ github.com/pion/turn/v2 v2.0.8 h1:KEstL92OUN3k5k8qxsXHpr7WWfrdp7iJZHx99ud8muw=
|
|||||||
github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw=
|
github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw=
|
||||||
github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o=
|
github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o=
|
||||||
github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M=
|
github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M=
|
||||||
github.com/pion/webrtc/v3 v3.1.43 h1:YT3ZTO94UT4kSBvZnRAH82+0jJPUruiKr9CEstdlQzk=
|
github.com/pion/webrtc/v3 v3.1.47 h1:2dFEKRI1rzFvehXDq43hK9OGGyTGJSusUi3j6QKHC5s=
|
||||||
github.com/pion/webrtc/v3 v3.1.43/go.mod h1:G/J8k0+grVsjC/rjCZ24AKoCCxcFFODgh7zThNZGs0M=
|
github.com/pion/webrtc/v3 v3.1.47/go.mod h1:8U39MYZCLVV4sIBn01htASVNkWQN2zDa/rx5xisEXWs=
|
||||||
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
||||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||||
@ -223,36 +229,37 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
|
|||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
||||||
github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
|
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
|
||||||
github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
|
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
||||||
github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
|
github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
|
||||||
github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs=
|
github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY=
|
||||||
github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U=
|
github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
|
||||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||||
github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
|
github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
|
||||||
github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
|
github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
|
||||||
github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
|
github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
|
||||||
github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
|
github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
|
||||||
github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
|
github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
|
||||||
github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU=
|
github.com/spf13/cobra v1.6.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI=
|
||||||
github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM=
|
github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
|
||||||
github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
|
github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
|
||||||
github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
|
github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
|
||||||
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
|
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
|
||||||
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||||
github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ=
|
github.com/spf13/viper v1.13.0 h1:BWSJ/M+f+3nmdz9bxB+bWX28kkALN2ok11D0rSo8EJU=
|
||||||
github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI=
|
github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw=
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
|
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||||
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
||||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
|
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
|
||||||
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
|
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||||
github.com/subosito/gotenv v1.4.0 h1:yAzM1+SmVcz5R4tXGsNMu1jUl2aOJXoiWUCEwwnGrvs=
|
github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs=
|
||||||
github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo=
|
github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
|
||||||
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
@ -270,11 +277,10 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
|
|||||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
|
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
|
||||||
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||||
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
|
||||||
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
|
golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
|
||||||
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
|
||||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
||||||
@ -346,13 +352,12 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
|
|||||||
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
|
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
|
||||||
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
|
||||||
golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
|
||||||
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
||||||
golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||||
golang.org/x/net v0.0.0-20220630215102-69896b714898/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
|
||||||
golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 h1:UreQrH7DbFXSi9ZFox6FNT3WBooWmdANpU+IfkT1T4I=
|
golang.org/x/net v0.0.0-20221004154528-8021a29435af/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
|
||||||
golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
|
golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
|
||||||
|
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
|
||||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
@ -415,12 +420,15 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
|
|||||||
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220730100132-1609e554cd39 h1:aNCnH+Fiqs7ZDTFH6oEFjIfbX2HvgQXJ6uQuUbTobjk=
|
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220730100132-1609e554cd39/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
|
||||||
|
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
@ -430,8 +438,9 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
|||||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
|
|
||||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||||
|
golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
|
||||||
|
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
@ -584,8 +593,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
|
|||||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
|
||||||
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
||||||
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
|
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
|
||||||
gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI=
|
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
|
||||||
gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
||||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
|
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
|
||||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
|
|||||||
@ -1,10 +1,13 @@
|
|||||||
package config
|
package config
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"net/http"
|
||||||
"path"
|
"path"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"github.com/spf13/viper"
|
"github.com/spf13/viper"
|
||||||
|
|
||||||
|
"m1k1o/neko/internal/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Server struct {
|
type Server struct {
|
||||||
@ -13,6 +16,7 @@ type Server struct {
|
|||||||
Bind string
|
Bind string
|
||||||
Static string
|
Static string
|
||||||
PathPrefix string
|
PathPrefix string
|
||||||
|
CORS []string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (Server) Init(cmd *cobra.Command) error {
|
func (Server) Init(cmd *cobra.Command) error {
|
||||||
@ -41,6 +45,11 @@ func (Server) Init(cmd *cobra.Command) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cmd.PersistentFlags().StringSlice("cors", []string{"*"}, "list of allowed origins for CORS")
|
||||||
|
if err := viper.BindPFlag("cors", cmd.PersistentFlags().Lookup("cors")); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -50,4 +59,15 @@ func (s *Server) Set() {
|
|||||||
s.Bind = viper.GetString("bind")
|
s.Bind = viper.GetString("bind")
|
||||||
s.Static = viper.GetString("static")
|
s.Static = viper.GetString("static")
|
||||||
s.PathPrefix = path.Join("/", path.Clean(viper.GetString("path_prefix")))
|
s.PathPrefix = path.Join("/", path.Clean(viper.GetString("path_prefix")))
|
||||||
|
|
||||||
|
s.CORS = viper.GetStringSlice("cors")
|
||||||
|
in, _ := utils.ArrayIn("*", s.CORS)
|
||||||
|
if len(s.CORS) == 0 || in {
|
||||||
|
s.CORS = []string{"*"}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) AllowOrigin(r *http.Request, origin string) bool {
|
||||||
|
in, _ := utils.ArrayIn(origin, s.CORS)
|
||||||
|
return in || s.CORS[0] == "*"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,8 @@
|
|||||||
package config
|
package config
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"path/filepath"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"github.com/spf13/viper"
|
"github.com/spf13/viper"
|
||||||
)
|
)
|
||||||
@ -12,6 +14,9 @@ type WebSocket struct {
|
|||||||
Locks []string
|
Locks []string
|
||||||
|
|
||||||
ControlProtection bool
|
ControlProtection bool
|
||||||
|
|
||||||
|
FileTransferEnabled bool
|
||||||
|
FileTransferPath string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (WebSocket) Init(cmd *cobra.Command) error {
|
func (WebSocket) Init(cmd *cobra.Command) error {
|
||||||
@ -40,6 +45,18 @@ func (WebSocket) Init(cmd *cobra.Command) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// File transfer
|
||||||
|
|
||||||
|
cmd.PersistentFlags().Bool("file_transfer_enabled", false, "enable file transfer feature")
|
||||||
|
if err := viper.BindPFlag("file_transfer_enabled", cmd.PersistentFlags().Lookup("file_transfer_enabled")); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd.PersistentFlags().String("file_transfer_path", "/home/neko/Downloads", "path to use for file transfer")
|
||||||
|
if err := viper.BindPFlag("file_transfer_path", cmd.PersistentFlags().Lookup("file_transfer_path")); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -50,4 +67,8 @@ func (s *WebSocket) Set() {
|
|||||||
s.Locks = viper.GetStringSlice("locks")
|
s.Locks = viper.GetStringSlice("locks")
|
||||||
|
|
||||||
s.ControlProtection = viper.GetBool("control_protection")
|
s.ControlProtection = viper.GetBool("control_protection")
|
||||||
|
|
||||||
|
s.FileTransferEnabled = viper.GetBool("file_transfer_enabled")
|
||||||
|
s.FileTransferPath = viper.GetString("file_transfer_path")
|
||||||
|
s.FileTransferPath = filepath.Clean(s.FileTransferPath)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -79,45 +79,3 @@ void XEventLoop(char *name) {
|
|||||||
|
|
||||||
XCloseDisplay(display);
|
XCloseDisplay(display);
|
||||||
}
|
}
|
||||||
|
|
||||||
void XFileChooserHide(Display *display, Window window) {
|
|
||||||
Window root = RootWindow(display, 0);
|
|
||||||
|
|
||||||
// The WM_TRANSIENT_FOR property is defined by the [ICCCM] for managed windows.
|
|
||||||
// This specification extends the use of the property to override-redirect windows.
|
|
||||||
// If an override-redirect is a pop-up on behalf of another window, then the Client
|
|
||||||
// SHOULD set WM_TRANSIENT_FOR on the override-redirect to this other window.
|
|
||||||
//
|
|
||||||
// As an example, a Client should set WM_TRANSIENT_FOR on dropdown menus to the
|
|
||||||
// toplevel application window that contains the menubar.
|
|
||||||
|
|
||||||
// Remove WM_TRANSIENT_FOR
|
|
||||||
Atom WM_TRANSIENT_FOR = XInternAtom(display, "WM_TRANSIENT_FOR", 0);
|
|
||||||
XDeleteProperty(display, window, WM_TRANSIENT_FOR);
|
|
||||||
|
|
||||||
// Add _NET_WM_STATE_BELOW
|
|
||||||
XClientMessageEvent clientMessageEvent;
|
|
||||||
memset(&clientMessageEvent, 0, sizeof(clientMessageEvent));
|
|
||||||
|
|
||||||
// window = the respective client window
|
|
||||||
// message_type = _NET_WM_STATE
|
|
||||||
// format = 32
|
|
||||||
// data.l[0] = the action, as listed below
|
|
||||||
// _NET_WM_STATE_REMOVE 0 // remove/unset property
|
|
||||||
// _NET_WM_STATE_ADD 1 // add/set property
|
|
||||||
// _NET_WM_STATE_TOGGLE 2 // toggle property
|
|
||||||
// data.l[1] = first property to alter
|
|
||||||
// data.l[2] = second property to alter
|
|
||||||
// data.l[3] = source indication
|
|
||||||
// other data.l[] elements = 0
|
|
||||||
|
|
||||||
clientMessageEvent.type = ClientMessage;
|
|
||||||
clientMessageEvent.window = window;
|
|
||||||
clientMessageEvent.message_type = XInternAtom(display, "_NET_WM_STATE", 0);
|
|
||||||
clientMessageEvent.format = 32;
|
|
||||||
clientMessageEvent.data.l[0] = 1;
|
|
||||||
clientMessageEvent.data.l[1] = XInternAtom(display, "_NET_WM_STATE_BELOW", 0);
|
|
||||||
clientMessageEvent.data.l[3] = 1;
|
|
||||||
|
|
||||||
XSendEvent(display, root, 0, SubstructureRedirectMask | SubstructureNotifyMask, (XEvent *)&clientMessageEvent);
|
|
||||||
}
|
|
||||||
|
|||||||
@ -8,15 +8,12 @@ package xevent
|
|||||||
import "C"
|
import "C"
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
"unsafe"
|
"unsafe"
|
||||||
|
|
||||||
"github.com/kataras/go-events"
|
"github.com/kataras/go-events"
|
||||||
)
|
)
|
||||||
|
|
||||||
var Emmiter events.EventEmmiter
|
var Emmiter events.EventEmmiter
|
||||||
var file_chooser_dialog_window uint32 = 0
|
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
Emmiter = events.New()
|
Emmiter = events.New()
|
||||||
@ -41,36 +38,12 @@ func goXEventClipboardUpdated() {
|
|||||||
|
|
||||||
//export goXEventConfigureNotify
|
//export goXEventConfigureNotify
|
||||||
func goXEventConfigureNotify(display *C.Display, window C.Window, name *C.char, role *C.char) {
|
func goXEventConfigureNotify(display *C.Display, window C.Window, name *C.char, role *C.char) {
|
||||||
if C.GoString(role) != "GtkFileChooserDialog" {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Refactor. Right now processing of this dialog relies on identifying
|
|
||||||
// via its name. When that changes to role, this condition should be removed.
|
|
||||||
if !strings.HasPrefix(C.GoString(name), "Open File") {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
C.XFileChooserHide(display, window)
|
|
||||||
|
|
||||||
// Because first dialog is not put properly to background
|
|
||||||
time.Sleep(10 * time.Millisecond)
|
|
||||||
C.XFileChooserHide(display, window)
|
|
||||||
|
|
||||||
if file_chooser_dialog_window == 0 {
|
|
||||||
file_chooser_dialog_window = uint32(window)
|
|
||||||
Emmiter.Emit("file-chooser-dialog-opened")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//export goXEventUnmapNotify
|
//export goXEventUnmapNotify
|
||||||
func goXEventUnmapNotify(window C.Window) {
|
func goXEventUnmapNotify(window C.Window) {
|
||||||
if uint32(window) != file_chooser_dialog_window {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
file_chooser_dialog_window = 0
|
|
||||||
Emmiter.Emit("file-chooser-dialog-closed")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//export goXEventError
|
//export goXEventError
|
||||||
|
|||||||
@ -3,13 +3,17 @@ package http
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
"image/jpeg"
|
"image/jpeg"
|
||||||
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/go-chi/chi"
|
"github.com/go-chi/chi"
|
||||||
"github.com/go-chi/chi/middleware"
|
"github.com/go-chi/chi/middleware"
|
||||||
|
"github.com/go-chi/cors"
|
||||||
"github.com/rs/zerolog"
|
"github.com/rs/zerolog"
|
||||||
"github.com/rs/zerolog/log"
|
"github.com/rs/zerolog/log"
|
||||||
|
|
||||||
@ -17,6 +21,8 @@ import (
|
|||||||
"m1k1o/neko/internal/types"
|
"m1k1o/neko/internal/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const FILE_UPLOAD_BUF_SIZE = 65000
|
||||||
|
|
||||||
type Server struct {
|
type Server struct {
|
||||||
logger zerolog.Logger
|
logger zerolog.Logger
|
||||||
router *chi.Mux
|
router *chi.Mux
|
||||||
@ -31,6 +37,16 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler, desktop t
|
|||||||
router.Use(middleware.RequestID) // Create a request ID for each request
|
router.Use(middleware.RequestID) // Create a request ID for each request
|
||||||
router.Use(middleware.RequestLogger(&logformatter{logger}))
|
router.Use(middleware.RequestLogger(&logformatter{logger}))
|
||||||
router.Use(middleware.Recoverer) // Recover from panics without crashing server
|
router.Use(middleware.Recoverer) // Recover from panics without crashing server
|
||||||
|
router.Use(middleware.Compress(5, "application/octet-stream"))
|
||||||
|
|
||||||
|
router.Use(cors.Handler(cors.Options{
|
||||||
|
AllowOriginFunc: conf.AllowOrigin,
|
||||||
|
AllowedMethods: []string{"GET", "POST", "DELETE", "OPTIONS"},
|
||||||
|
AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
|
||||||
|
ExposedHeaders: []string{"Link"},
|
||||||
|
AllowCredentials: true,
|
||||||
|
MaxAge: 300, // Maximum value not ignored by any of major browsers
|
||||||
|
}))
|
||||||
|
|
||||||
if conf.PathPrefix != "/" {
|
if conf.PathPrefix != "/" {
|
||||||
router.Use(func(h http.Handler) http.Handler {
|
router.Use(func(h http.Handler) http.Handler {
|
||||||
@ -99,6 +115,78 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler, desktop t
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// allow downloading and uploading files
|
||||||
|
if webSocketHandler.FileTransferEnabled() {
|
||||||
|
router.Get("/file", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
password := r.URL.Query().Get("pwd")
|
||||||
|
isAuthorized, err := webSocketHandler.CanTransferFiles(password)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isAuthorized {
|
||||||
|
http.Error(w, "bad authorization", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
filename := r.URL.Query().Get("filename")
|
||||||
|
badChars, _ := regexp.MatchString(`(?m)\.\.(?:\/|$)`, filename)
|
||||||
|
if filename == "" || badChars {
|
||||||
|
http.Error(w, "bad filename", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
filePath := webSocketHandler.FileTransferPath(filename)
|
||||||
|
f, err := os.Open(filePath)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "not found or unable to open", http.StatusNotFound)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
|
||||||
|
w.Header().Set("Content-Type", "application/octet-stream")
|
||||||
|
w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=%q", filename))
|
||||||
|
io.Copy(w, f)
|
||||||
|
})
|
||||||
|
|
||||||
|
router.Post("/file", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
password := r.URL.Query().Get("pwd")
|
||||||
|
isAuthorized, err := webSocketHandler.CanTransferFiles(password)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isAuthorized {
|
||||||
|
http.Error(w, "bad authorization", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
r.ParseMultipartForm(32 << 20)
|
||||||
|
for _, formheader := range r.MultipartForm.File["files"] {
|
||||||
|
filePath := webSocketHandler.FileTransferPath(formheader.Filename)
|
||||||
|
|
||||||
|
formfile, err := formheader.Open()
|
||||||
|
if err != nil {
|
||||||
|
logger.Warn().Err(err).Msg("failed to open formdata file")
|
||||||
|
http.Error(w, "error writing file", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer formfile.Close()
|
||||||
|
|
||||||
|
f, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE, 0644)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "unable to open file for writing", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
|
||||||
|
io.Copy(f, formfile)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
router.Get("/health", func(w http.ResponseWriter, r *http.Request) {
|
router.Get("/health", func(w http.ResponseWriter, r *http.Request) {
|
||||||
_, _ = w.Write([]byte("true"))
|
_, _ = w.Write([]byte("true"))
|
||||||
})
|
})
|
||||||
|
|||||||
@ -34,6 +34,11 @@ const (
|
|||||||
CHAT_EMOTE = "chat/emote"
|
CHAT_EMOTE = "chat/emote"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
FILETRANSFER_LIST = "filetransfer/list"
|
||||||
|
FILETRANSFER_REFRESH = "filetransfer/refresh"
|
||||||
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
SCREEN_CONFIGURATIONS = "screen/configurations"
|
SCREEN_CONFIGURATIONS = "screen/configurations"
|
||||||
SCREEN_RESOLUTION = "screen/resolution"
|
SCREEN_RESOLUTION = "screen/resolution"
|
||||||
|
|||||||
@ -14,6 +14,7 @@ type SystemInit struct {
|
|||||||
Event string `json:"event"`
|
Event string `json:"event"`
|
||||||
ImplicitHosting bool `json:"implicit_hosting"`
|
ImplicitHosting bool `json:"implicit_hosting"`
|
||||||
Locks map[string]string `json:"locks"`
|
Locks map[string]string `json:"locks"`
|
||||||
|
FileTransfer bool `json:"file_transfer"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type SystemMessage struct {
|
type SystemMessage struct {
|
||||||
@ -47,8 +48,8 @@ type SignalCandidate struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type MembersList struct {
|
type MembersList struct {
|
||||||
Event string `json:"event"`
|
Event string `json:"event"`
|
||||||
Memebers []*types.Member `json:"members"`
|
Members []*types.Member `json:"members"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type Member struct {
|
type Member struct {
|
||||||
@ -106,6 +107,12 @@ type EmoteSend struct {
|
|||||||
Emote string `json:"emote"`
|
Emote string `json:"emote"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type FileTransferList struct {
|
||||||
|
Event string `json:"event"`
|
||||||
|
Cwd string `json:"cwd"`
|
||||||
|
Files []types.FileListItem `json:"files"`
|
||||||
|
}
|
||||||
|
|
||||||
type Admin struct {
|
type Admin struct {
|
||||||
Event string `json:"event"`
|
Event string `json:"event"`
|
||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
|
|||||||
@ -34,4 +34,15 @@ type WebSocketHandler interface {
|
|||||||
Stats() Stats
|
Stats() Stats
|
||||||
IsLocked(resource string) bool
|
IsLocked(resource string) bool
|
||||||
IsAdmin(password string) (bool, error)
|
IsAdmin(password string) (bool, error)
|
||||||
|
|
||||||
|
// File Transfer
|
||||||
|
CanTransferFiles(password string) (bool, error)
|
||||||
|
FileTransferPath(filename string) string
|
||||||
|
FileTransferEnabled() bool
|
||||||
|
}
|
||||||
|
|
||||||
|
type FileListItem struct {
|
||||||
|
Filename string `json:"name"`
|
||||||
|
Type string `json:"type"`
|
||||||
|
Size int64 `json:"size"`
|
||||||
}
|
}
|
||||||
|
|||||||
36
server/internal/utils/files.go
Normal file
36
server/internal/utils/files.go
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
package utils
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"m1k1o/neko/internal/types"
|
||||||
|
)
|
||||||
|
|
||||||
|
func ListFiles(path string) ([]types.FileListItem, error) {
|
||||||
|
items, err := os.ReadDir(path)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
out := make([]types.FileListItem, len(items))
|
||||||
|
for i, item := range items {
|
||||||
|
var itemType string = ""
|
||||||
|
var size int64 = 0
|
||||||
|
if item.IsDir() {
|
||||||
|
itemType = "dir"
|
||||||
|
} else {
|
||||||
|
itemType = "file"
|
||||||
|
info, err := item.Info()
|
||||||
|
if err == nil {
|
||||||
|
size = info.Size()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out[i] = types.FileListItem{
|
||||||
|
Filename: item.Name(),
|
||||||
|
Type: itemType,
|
||||||
|
Size: size,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
@ -19,7 +19,12 @@ func (h *MessageHandler) adminLock(id string, session types.Session, payload *me
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if payload.Resource != "login" && payload.Resource != "control" {
|
// allow only known resources
|
||||||
|
switch payload.Resource {
|
||||||
|
case "login":
|
||||||
|
case "control":
|
||||||
|
case "file_transfer":
|
||||||
|
default:
|
||||||
h.logger.Debug().Msg("unknown lock resource")
|
h.logger.Debug().Msg("unknown lock resource")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
47
server/internal/websocket/handler/filetransfer.go
Normal file
47
server/internal/websocket/handler/filetransfer.go
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"m1k1o/neko/internal/types"
|
||||||
|
"m1k1o/neko/internal/types/event"
|
||||||
|
"m1k1o/neko/internal/types/message"
|
||||||
|
"m1k1o/neko/internal/utils"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (h *MessageHandler) FileTransferRefresh(session types.Session) error {
|
||||||
|
if !h.state.FileTransferEnabled() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
fileTransferPath := h.state.FileTransferPath("") // root
|
||||||
|
|
||||||
|
// allow users only if file transfer is not locked
|
||||||
|
if session != nil && !(session.Admin() || !h.state.IsLocked("file_transfer")) {
|
||||||
|
h.logger.Debug().Msg("file transfer is locked for users")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: keep list of files in memory and update it on file changes
|
||||||
|
files, err := utils.ListFiles(fileTransferPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
message := message.FileTransferList{
|
||||||
|
Event: event.FILETRANSFER_LIST,
|
||||||
|
Cwd: fileTransferPath,
|
||||||
|
Files: files,
|
||||||
|
}
|
||||||
|
|
||||||
|
// send to just one user
|
||||||
|
if session != nil {
|
||||||
|
return session.Send(message)
|
||||||
|
}
|
||||||
|
|
||||||
|
// broadcast to all admins
|
||||||
|
if h.state.IsLocked("file_transfer") {
|
||||||
|
return h.sessions.AdminBroadcast(message, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
// broadcast to all users
|
||||||
|
return h.sessions.Broadcast(message, nil)
|
||||||
|
}
|
||||||
@ -126,6 +126,10 @@ func (h *MessageHandler) Message(id string, raw []byte) error {
|
|||||||
return h.chatEmote(id, session, payload)
|
return h.chatEmote(id, session, payload)
|
||||||
}), "%s failed", header.Event)
|
}), "%s failed", header.Event)
|
||||||
|
|
||||||
|
// File Transfer Events
|
||||||
|
case event.FILETRANSFER_REFRESH:
|
||||||
|
return errors.Wrapf(h.FileTransferRefresh(session), "%s failed", header.Event)
|
||||||
|
|
||||||
// Screen Events
|
// Screen Events
|
||||||
case event.SCREEN_RESOLUTION:
|
case event.SCREEN_RESOLUTION:
|
||||||
return errors.Wrapf(h.screenResolution(id, session), "%s failed", header.Event)
|
return errors.Wrapf(h.screenResolution(id, session), "%s failed", header.Event)
|
||||||
|
|||||||
@ -17,6 +17,7 @@ func (h *MessageHandler) SessionCreated(id string, session types.Session) error
|
|||||||
Event: event.SYSTEM_INIT,
|
Event: event.SYSTEM_INIT,
|
||||||
ImplicitHosting: h.webrtc.ImplicitControl(),
|
ImplicitHosting: h.webrtc.ImplicitControl(),
|
||||||
Locks: h.state.AllLocked(),
|
Locks: h.state.AllLocked(),
|
||||||
|
FileTransfer: h.state.FileTransferEnabled(),
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
h.logger.Warn().Str("id", id).Err(err).Msgf("sending event %s has failed", event.SYSTEM_INIT)
|
h.logger.Warn().Str("id", id).Err(err).Msgf("sending event %s has failed", event.SYSTEM_INIT)
|
||||||
return err
|
return err
|
||||||
@ -34,14 +35,21 @@ func (h *MessageHandler) SessionCreated(id string, session types.Session) error
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// send file list if file transfer is enabled
|
||||||
|
if h.state.FileTransferEnabled() && (session.Admin() || !h.state.IsLocked("file_transfer")) {
|
||||||
|
if err := h.FileTransferRefresh(session); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *MessageHandler) SessionConnected(id string, session types.Session) error {
|
func (h *MessageHandler) SessionConnected(id string, session types.Session) error {
|
||||||
// send list of members to session
|
// send list of members to session
|
||||||
if err := session.Send(message.MembersList{
|
if err := session.Send(message.MembersList{
|
||||||
Event: event.MEMBER_LIST,
|
Event: event.MEMBER_LIST,
|
||||||
Memebers: h.sessions.Members(),
|
Members: h.sessions.Members(),
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
h.logger.Warn().Str("id", id).Err(err).Msgf("sending event %s has failed", event.MEMBER_LIST)
|
h.logger.Warn().Str("id", id).Err(err).Msgf("sending event %s has failed", event.MEMBER_LIST)
|
||||||
return err
|
return err
|
||||||
|
|||||||
@ -1,14 +1,22 @@
|
|||||||
package state
|
package state
|
||||||
|
|
||||||
|
import "path/filepath"
|
||||||
|
|
||||||
type State struct {
|
type State struct {
|
||||||
banned map[string]string // IP -> session ID (that banned it)
|
banned map[string]string // IP -> session ID (that banned it)
|
||||||
locked map[string]string // resource name -> session ID (that locked it)
|
locked map[string]string // resource name -> session ID (that locked it)
|
||||||
|
|
||||||
|
fileTransferEnabled bool
|
||||||
|
fileTransferPath string // path where files are located
|
||||||
}
|
}
|
||||||
|
|
||||||
func New() *State {
|
func New(fileTransferEnabled bool, fileTransferPath string) *State {
|
||||||
return &State{
|
return &State{
|
||||||
banned: make(map[string]string),
|
banned: make(map[string]string),
|
||||||
locked: make(map[string]string),
|
locked: make(map[string]string),
|
||||||
|
|
||||||
|
fileTransferEnabled: fileTransferEnabled,
|
||||||
|
fileTransferPath: fileTransferPath,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -59,3 +67,18 @@ func (s *State) GetLocked(resource string) (string, bool) {
|
|||||||
func (s *State) AllLocked() map[string]string {
|
func (s *State) AllLocked() map[string]string {
|
||||||
return s.locked
|
return s.locked
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// File transfer
|
||||||
|
|
||||||
|
func (s *State) FileTransferPath(filename string) string {
|
||||||
|
if filename == "" {
|
||||||
|
return s.fileTransferPath
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanPath := filepath.Clean(filename)
|
||||||
|
return filepath.Join(s.fileTransferPath, cleanPath)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *State) FileTransferEnabled() bool {
|
||||||
|
return s.fileTransferEnabled
|
||||||
|
}
|
||||||
|
|||||||
@ -3,10 +3,12 @@ package websocket
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"os"
|
||||||
"sync"
|
"sync"
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/fsnotify/fsnotify"
|
||||||
"github.com/gorilla/websocket"
|
"github.com/gorilla/websocket"
|
||||||
"github.com/rs/zerolog"
|
"github.com/rs/zerolog"
|
||||||
"github.com/rs/zerolog/log"
|
"github.com/rs/zerolog/log"
|
||||||
@ -25,7 +27,7 @@ const CONTROL_PROTECTION_SESSION = "by_control_protection"
|
|||||||
func New(sessions types.SessionManager, desktop types.DesktopManager, capture types.CaptureManager, webrtc types.WebRTCManager, conf *config.WebSocket) *WebSocketHandler {
|
func New(sessions types.SessionManager, desktop types.DesktopManager, capture types.CaptureManager, webrtc types.WebRTCManager, conf *config.WebSocket) *WebSocketHandler {
|
||||||
logger := log.With().Str("module", "websocket").Logger()
|
logger := log.With().Str("module", "websocket").Logger()
|
||||||
|
|
||||||
state := state.New()
|
state := state.New(conf.FileTransferEnabled, conf.FileTransferPath)
|
||||||
|
|
||||||
// if control protection is enabled
|
// if control protection is enabled
|
||||||
if conf.ControlProtection {
|
if conf.ControlProtection {
|
||||||
@ -33,6 +35,14 @@ func New(sessions types.SessionManager, desktop types.DesktopManager, capture ty
|
|||||||
logger.Info().Msgf("control locked on behalf of control protection")
|
logger.Info().Msgf("control locked on behalf of control protection")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// create file transfer directory if not exists
|
||||||
|
if conf.FileTransferEnabled {
|
||||||
|
if _, err := os.Stat(conf.FileTransferPath); os.IsNotExist(err) {
|
||||||
|
err = os.Mkdir(conf.FileTransferPath, os.ModePerm)
|
||||||
|
logger.Err(err).Msg("creating file transfer directory")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// apply default locks
|
// apply default locks
|
||||||
for _, lock := range conf.Locks {
|
for _, lock := range conf.Locks {
|
||||||
state.Lock(lock, "") // empty session ID
|
state.Lock(lock, "") // empty session ID
|
||||||
@ -187,6 +197,37 @@ func (ws *WebSocketHandler) Start() {
|
|||||||
|
|
||||||
ws.logger.Err(err).Msg("sync clipboard")
|
ws.logger.Err(err).Msg("sync clipboard")
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// watch for file changes and send file list if file transfer is enabled
|
||||||
|
if ws.conf.FileTransferEnabled {
|
||||||
|
watcher, err := fsnotify.NewWatcher()
|
||||||
|
if err != nil {
|
||||||
|
ws.logger.Err(err).Msg("unable to start file transfer dir watcher")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case e, ok := <-watcher.Events:
|
||||||
|
if !ok {
|
||||||
|
ws.logger.Info().Msg("file transfer dir watcher closed")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if e.Has(fsnotify.Create) || e.Has(fsnotify.Remove) || e.Has(fsnotify.Rename) {
|
||||||
|
ws.logger.Debug().Str("event", e.String()).Msg("file transfer dir watcher event")
|
||||||
|
ws.handler.FileTransferRefresh(nil)
|
||||||
|
}
|
||||||
|
case err := <-watcher.Errors:
|
||||||
|
ws.logger.Err(err).Msg("error in file transfer dir watcher")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
if err := watcher.Add(ws.conf.FileTransferPath); err != nil {
|
||||||
|
ws.logger.Err(err).Msg("unable to add file transfer path to watcher")
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ws *WebSocketHandler) Shutdown() error {
|
func (ws *WebSocketHandler) Shutdown() error {
|
||||||
@ -384,3 +425,28 @@ func (ws *WebSocketHandler) handle(connection *websocket.Conn, id string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// File transfer
|
||||||
|
//
|
||||||
|
|
||||||
|
func (ws *WebSocketHandler) CanTransferFiles(password string) (bool, error) {
|
||||||
|
if !ws.conf.FileTransferEnabled {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
isAdmin, err := ws.IsAdmin(password)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return isAdmin || !ws.state.IsLocked("file_transfer"), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ws *WebSocketHandler) FileTransferPath(filename string) string {
|
||||||
|
return ws.state.FileTransferPath(filename)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ws *WebSocketHandler) FileTransferEnabled() bool {
|
||||||
|
return ws.conf.FileTransferEnabled
|
||||||
|
}
|
||||||
|
|||||||
@ -39,7 +39,7 @@ var (
|
|||||||
// Major version when you make incompatible API changes,
|
// Major version when you make incompatible API changes,
|
||||||
major = "2"
|
major = "2"
|
||||||
// Minor version when you add functionality in a backwards-compatible manner, and
|
// Minor version when you add functionality in a backwards-compatible manner, and
|
||||||
minor = "6"
|
minor = "7"
|
||||||
// Patch version when you make backwards-compatible bug fixes.
|
// Patch version when you make backwards-compatible bug fixes.
|
||||||
patch = "0"
|
patch = "0"
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user