post megre cleanup.

This commit is contained in:
Miroslav Šedivý
2024-09-06 19:10:08 +02:00
parent 5b96fd5f5e
commit dc1bc2af79
105 changed files with 308 additions and 407 deletions
-44
View File
@@ -1,44 +0,0 @@
name: Create and publish a Docker image
on:
push:
branches:
- 'master'
tags:
- 'v*'
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
jobs:
build-and-push-image:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
-53
View File
@@ -1,53 +0,0 @@
name: Create and publish a Docker image variant
on:
push:
tags:
- 'v*'
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
jobs:
build-and-push-image-variant:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
strategy:
matrix:
include:
- variant: bookworm
dockerfile: Dockerfile.bookworm
- variant: nvidia
dockerfile: Dockerfile.nvidia
- variant: nvidia_bookworm
dockerfile: Dockerfile.nvidia.bookworm
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ matrix.variant }}
- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
file: ${{ matrix.dockerfile }}
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
-21
View File
@@ -1,21 +0,0 @@
name: Build a Docker image
on:
pull_request:
branches:
- master
jobs:
build-image:
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Build Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
-20
View File
@@ -1,20 +0,0 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "launch",
"type": "go",
"debugAdapter": "dlv-dap",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/cmd/neko",
"output": "${workspaceFolder}/bin/debug/neko",
"cwd": "${workspaceFolder}/",
"args": ["serve", "-d", "-c", "dev/runtime/config.yml"],
"envFile": "${workspaceFolder}/.env.development"
}
]
}
+1 -14
View File
@@ -1,14 +1 @@
{
"go.formatTool": "goformat",
"go.inferGopath": false,
"go.autocompleteUnimportedPackages": true,
"go.delveConfig": {
"useApiV1": false
},
"[go]": {
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.organizeImports": "explicit"
}
}
}
{}
+20
View File
@@ -0,0 +1,20 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "launch",
"type": "go",
"debugAdapter": "dlv-dap",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/cmd/neko",
"output": "${workspaceFolder}/bin/debug/neko",
"cwd": "${workspaceFolder}/",
"args": ["serve", "-d", "-c", "dev/runtime/config.yml"],
"envFile": "${workspaceFolder}/.env.development"
}
]
}
+21
View File
@@ -0,0 +1,21 @@
{
"go.formatTool": "goformat",
"go.inferGopath": false,
"go.autocompleteUnimportedPackages": true,
"go.delveConfig": {
"useApiV1": false,
"dlvLoadConfig": {
"followPointers": true,
"maxVariableRecurse": 3,
"maxStringLen": 400,
"maxArrayValues": 400,
"maxStructFields": -1
}
},
"[go]": {
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.organizeImports": "explicit"
}
}
}
+4 -4
View File
@@ -30,10 +30,10 @@ go build \
-o bin/neko \
-ldflags "
-s -w
-X 'github.com/demodesk/neko.buildDate=`date -u +'%Y-%m-%dT%H:%M:%SZ'`'
-X 'github.com/demodesk/neko.gitCommit=${GIT_COMMIT}'
-X 'github.com/demodesk/neko.gitBranch=${GIT_BRANCH}'
-X 'github.com/demodesk/neko.gitTag=${GIT_TAG}'
-X 'm1k1o/neko.buildDate=`date -u +'%Y-%m-%dT%H:%M:%SZ'`'
-X 'm1k1o/neko.gitCommit=${GIT_COMMIT}'
-X 'm1k1o/neko.gitBranch=${GIT_BRANCH}'
-X 'm1k1o/neko.gitTag=${GIT_TAG}'
" \
cmd/neko/main.go;
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"github.com/rs/zerolog/log"
"github.com/demodesk/neko"
"github.com/demodesk/neko/cmd"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko"
"m1k1o/neko/cmd"
"m1k1o/neko/pkg/utils"
)
func main() {
+3 -2
View File
@@ -4,8 +4,9 @@ import (
"encoding/json"
"os"
"github.com/demodesk/neko/internal/config"
"github.com/demodesk/neko/internal/plugins"
"m1k1o/neko/internal/config"
"m1k1o/neko/internal/plugins"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
)
+2 -2
View File
@@ -15,8 +15,8 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/demodesk/neko"
"github.com/demodesk/neko/internal/config"
"m1k1o/neko"
"m1k1o/neko/internal/config"
)
func Execute() error {
+10 -10
View File
@@ -8,16 +8,16 @@ import (
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/demodesk/neko/internal/api"
"github.com/demodesk/neko/internal/capture"
"github.com/demodesk/neko/internal/config"
"github.com/demodesk/neko/internal/desktop"
"github.com/demodesk/neko/internal/http"
"github.com/demodesk/neko/internal/member"
"github.com/demodesk/neko/internal/plugins"
"github.com/demodesk/neko/internal/session"
"github.com/demodesk/neko/internal/webrtc"
"github.com/demodesk/neko/internal/websocket"
"m1k1o/neko/internal/api"
"m1k1o/neko/internal/capture"
"m1k1o/neko/internal/config"
"m1k1o/neko/internal/desktop"
"m1k1o/neko/internal/http"
"m1k1o/neko/internal/member"
"m1k1o/neko/internal/plugins"
"m1k1o/neko/internal/session"
"m1k1o/neko/internal/webrtc"
"m1k1o/neko/internal/websocket"
)
func init() {
+1 -1
View File
@@ -1,4 +1,4 @@
module github.com/demodesk/neko
module m1k1o/neko
go 1.21
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"io"
"net/http"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
type MemberBulkUpdatePayload struct {
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"net/http"
"strconv"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
type MemberDataPayload struct {
+3 -3
View File
@@ -7,9 +7,9 @@ import (
"github.com/go-chi/chi"
"github.com/demodesk/neko/pkg/auth"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/auth"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
type key int
+3 -3
View File
@@ -3,9 +3,9 @@ package room
import (
"net/http"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
"m1k1o/neko/pkg/utils"
)
type BroadcastStatusPayload struct {
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"net/http"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
type ClipboardPayload struct {
+4 -4
View File
@@ -5,10 +5,10 @@ import (
"github.com/go-chi/chi"
"github.com/demodesk/neko/pkg/auth"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/auth"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
"m1k1o/neko/pkg/utils"
)
type ControlStatusPayload struct {
+3 -3
View File
@@ -6,9 +6,9 @@ import (
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/pkg/auth"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/auth"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
type RoomHandler struct {
+2 -2
View File
@@ -3,8 +3,8 @@ package room
import (
"net/http"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
func (h *RoomHandler) keyboardMapSet(w http.ResponseWriter, r *http.Request) error {
+5 -5
View File
@@ -4,11 +4,11 @@ import (
"net/http"
"strconv"
"github.com/demodesk/neko/pkg/auth"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/auth"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
"m1k1o/neko/pkg/utils"
)
func (h *RoomHandler) screenConfiguration(w http.ResponseWriter, r *http.Request) error {
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"io"
"net/http"
"github.com/demodesk/neko/pkg/auth"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/auth"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
func (h *RoomHandler) settingsGet(w http.ResponseWriter, r *http.Request) error {
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"path"
"strconv"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/utils"
)
// TODO: Extract file uploading to custom utility.
+6 -6
View File
@@ -5,12 +5,12 @@ import (
"errors"
"net/http"
"github.com/demodesk/neko/internal/api/members"
"github.com/demodesk/neko/internal/api/room"
"github.com/demodesk/neko/internal/api/sessions"
"github.com/demodesk/neko/pkg/auth"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/internal/api/members"
"m1k1o/neko/internal/api/room"
"m1k1o/neko/internal/api/sessions"
"m1k1o/neko/pkg/auth"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
type ApiManagerCtx struct {
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"errors"
"net/http"
"github.com/demodesk/neko/pkg/auth"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/auth"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
type SessionLoginPayload struct {
+4 -3
View File
@@ -4,9 +4,10 @@ import (
"errors"
"net/http"
"github.com/demodesk/neko/pkg/auth"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/auth"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
"github.com/go-chi/chi"
)
+2 -2
View File
@@ -1,8 +1,8 @@
package sessions
import (
"github.com/demodesk/neko/pkg/auth"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/auth"
"m1k1o/neko/pkg/types"
)
type SessionsHandler struct {
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/pkg/gst"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/gst"
"m1k1o/neko/pkg/types"
)
type BroacastManagerCtx struct {
+3 -3
View File
@@ -8,9 +8,9 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/internal/config"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/codec"
"m1k1o/neko/internal/config"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/codec"
)
type CaptureManagerCtx struct {
+2 -2
View File
@@ -11,8 +11,8 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/pkg/gst"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/gst"
"m1k1o/neko/pkg/types"
)
// timeout between intervals, when screencast pipeline is checked
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/codec"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/codec"
)
type StreamSelectorManagerCtx struct {
+3 -3
View File
@@ -13,9 +13,9 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/pkg/gst"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/codec"
"m1k1o/neko/pkg/gst"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/codec"
)
var moveSinkListenerMu = sync.Mutex{}
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/pkg/gst"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/codec"
"m1k1o/neko/pkg/gst"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/codec"
)
type StreamSrcManagerCtx struct {
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/codec"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/codec"
"m1k1o/neko/pkg/utils"
)
// Legacy capture configuration
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"fmt"
"strings"
"github.com/demodesk/neko/pkg/gst"
"github.com/demodesk/neko/pkg/types/codec"
"m1k1o/neko/pkg/gst"
"m1k1o/neko/pkg/types/codec"
)
/*
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/types"
)
type Desktop struct {
+5 -5
View File
@@ -5,11 +5,11 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/demodesk/neko/internal/member/file"
"github.com/demodesk/neko/internal/member/multiuser"
"github.com/demodesk/neko/internal/member/object"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/internal/member/file"
"m1k1o/neko/internal/member/multiuser"
"m1k1o/neko/internal/member/object"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
type Member struct {
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/utils"
)
type Server struct {
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
// default stun server
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"os/exec"
"strings"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/xevent"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/xevent"
)
func (manager *DesktopManagerCtx) ClipboardGetText() (*types.ClipboardText, error) {
+1 -1
View File
@@ -3,7 +3,7 @@ package desktop
import (
"time"
"github.com/demodesk/neko/pkg/drop"
"m1k1o/neko/pkg/drop"
)
// repeat move event multiple times
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"errors"
"os/exec"
"github.com/demodesk/neko/pkg/xorg"
"m1k1o/neko/pkg/xorg"
)
// name of the window that is being controlled
+5 -5
View File
@@ -8,11 +8,11 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/internal/config"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/xevent"
"github.com/demodesk/neko/pkg/xinput"
"github.com/demodesk/neko/pkg/xorg"
"m1k1o/neko/internal/config"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/xevent"
"m1k1o/neko/pkg/xinput"
"m1k1o/neko/pkg/xorg"
)
var mu = sync.Mutex{}
+1 -1
View File
@@ -1,7 +1,7 @@
package desktop
import (
"github.com/demodesk/neko/pkg/xevent"
"m1k1o/neko/pkg/xevent"
)
func (manager *DesktopManagerCtx) OnCursorChanged(listener func(serial uint64)) {
+1 -1
View File
@@ -1,6 +1,6 @@
package desktop
import "github.com/demodesk/neko/pkg/xinput"
import "m1k1o/neko/pkg/xinput"
func (manager *DesktopManagerCtx) inputRelToAbs(x, y int) (int, int) {
return (x * xinput.AbsX) / manager.screenSize.Width, (y * xinput.AbsY) / manager.screenSize.Height
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"regexp"
"time"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/xorg"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/xorg"
)
func (manager *DesktopManagerCtx) Move(x, y int) {
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"net/http"
"strings"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
type BatchRequest struct {
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/go-chi/chi"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/types"
)
func pprofHandler(r types.Router) {
+7 -6
View File
@@ -5,13 +5,14 @@ import (
"fmt"
"net/http"
oldEvent "github.com/demodesk/neko/internal/http/legacy/event"
oldMessage "github.com/demodesk/neko/internal/http/legacy/message"
oldEvent "m1k1o/neko/internal/http/legacy/event"
oldMessage "m1k1o/neko/internal/http/legacy/message"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
"m1k1o/neko/pkg/utils"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"github.com/demodesk/neko/pkg/utils"
"github.com/gorilla/websocket"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
@@ -1,7 +1,7 @@
package message
import (
"github.com/demodesk/neko/internal/http/legacy/types"
"m1k1o/neko/internal/http/legacy/types"
"github.com/pion/webrtc/v3"
)
+4 -3
View File
@@ -8,10 +8,11 @@ import (
"net/http"
"strings"
oldTypes "github.com/demodesk/neko/internal/http/legacy/types"
oldTypes "m1k1o/neko/internal/http/legacy/types"
"m1k1o/neko/internal/api"
"m1k1o/neko/pkg/types"
"github.com/demodesk/neko/internal/api"
"github.com/demodesk/neko/pkg/types"
"github.com/gorilla/websocket"
"github.com/rs/zerolog"
)
+8 -8
View File
@@ -8,15 +8,15 @@ import (
"github.com/gorilla/websocket"
"github.com/pion/webrtc/v3"
oldEvent "github.com/demodesk/neko/internal/http/legacy/event"
oldMessage "github.com/demodesk/neko/internal/http/legacy/message"
oldEvent "m1k1o/neko/internal/http/legacy/event"
oldMessage "m1k1o/neko/internal/http/legacy/message"
"github.com/demodesk/neko/internal/api/room"
"github.com/demodesk/neko/internal/plugins/chat"
"github.com/demodesk/neko/internal/plugins/filetransfer"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"m1k1o/neko/internal/api/room"
"m1k1o/neko/internal/plugins/chat"
"m1k1o/neko/internal/plugins/filetransfer"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
)
func (s *session) wsToBackend(msg []byte) error {
+8 -8
View File
@@ -7,15 +7,15 @@ import (
"github.com/pion/webrtc/v3"
oldEvent "github.com/demodesk/neko/internal/http/legacy/event"
oldMessage "github.com/demodesk/neko/internal/http/legacy/message"
oldTypes "github.com/demodesk/neko/internal/http/legacy/types"
oldEvent "m1k1o/neko/internal/http/legacy/event"
oldMessage "m1k1o/neko/internal/http/legacy/message"
oldTypes "m1k1o/neko/internal/http/legacy/types"
"github.com/demodesk/neko/internal/plugins/chat"
"github.com/demodesk/neko/internal/plugins/filetransfer"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"m1k1o/neko/internal/plugins/chat"
"m1k1o/neko/internal/plugins/filetransfer"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
)
func profileToMember(id string, profile types.MemberProfile) (*oldTypes.Member, error) {
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"github.com/go-chi/chi/middleware"
"github.com/rs/zerolog"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
type logFormatter struct {
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/internal/config"
"github.com/demodesk/neko/internal/http/legacy"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/internal/config"
"m1k1o/neko/internal/http/legacy"
"m1k1o/neko/pkg/types"
)
type HttpManagerCtx struct {
+3 -3
View File
@@ -8,9 +8,9 @@ import (
"github.com/go-chi/cors"
"github.com/rs/zerolog"
"github.com/demodesk/neko/pkg/auth"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/auth"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
type RouterOption func(*router)
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"io"
"os"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/types"
)
func New(config Config) types.MemberProvider {
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"encoding/json"
"testing"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/utils"
)
// Ensure that hashes are the same after encoding and decoding using json
+1 -1
View File
@@ -1,7 +1,7 @@
package file
import (
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/types"
)
type MemberEntry struct {
+6 -6
View File
@@ -7,12 +7,12 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/internal/config"
"github.com/demodesk/neko/internal/member/file"
"github.com/demodesk/neko/internal/member/multiuser"
"github.com/demodesk/neko/internal/member/noauth"
"github.com/demodesk/neko/internal/member/object"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/internal/config"
"m1k1o/neko/internal/member/file"
"m1k1o/neko/internal/member/multiuser"
"m1k1o/neko/internal/member/noauth"
"m1k1o/neko/internal/member/object"
"m1k1o/neko/pkg/types"
)
func New(sessions types.SessionManager, config *config.Member) *MemberManagerCtx {
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"errors"
"fmt"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
func New(config Config) types.MemberProvider {
+1 -1
View File
@@ -1,6 +1,6 @@
package multiuser
import "github.com/demodesk/neko/pkg/types"
import "m1k1o/neko/pkg/types"
type Config struct {
AdminPassword string
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"errors"
"fmt"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
func New() types.MemberProvider {
+1 -1
View File
@@ -1,7 +1,7 @@
package object
import (
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/types"
)
func New(config Config) types.MemberProvider {
+1 -1
View File
@@ -1,7 +1,7 @@
package object
import (
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/types"
)
type memberEntry struct {
+3 -3
View File
@@ -10,9 +10,9 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/pkg/auth"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/auth"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
func NewManager(
+1 -1
View File
@@ -1,7 +1,7 @@
package chat
import (
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/types"
)
type Plugin struct {
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"github.com/rs/zerolog"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/types"
)
type dependency struct {
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"reflect"
"testing"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/types"
)
func Test_deps_addPlugin(t *testing.T) {
@@ -11,9 +11,10 @@ import (
"sync"
"time"
"github.com/demodesk/neko/pkg/auth"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/auth"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
"github.com/fsnotify/fsnotify"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
@@ -1,7 +1,7 @@
package filetransfer
import (
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/types"
)
type Plugin struct {
+4 -4
View File
@@ -10,10 +10,10 @@ import (
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/demodesk/neko/internal/config"
"github.com/demodesk/neko/internal/plugins/chat"
"github.com/demodesk/neko/internal/plugins/filetransfer"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/internal/config"
"m1k1o/neko/internal/plugins/chat"
"m1k1o/neko/internal/plugins/filetransfer"
"m1k1o/neko/pkg/types"
)
type ManagerCtx struct {
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"strings"
"time"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/types"
)
func (manager *SessionManagerCtx) CookieSetToken(w http.ResponseWriter, token string) {
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/internal/config"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/internal/config"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
func New(config *config.Session) *SessionManagerCtx {
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"errors"
"os"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/types"
)
func (manager *SessionManagerCtx) save() {
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"github.com/rs/zerolog"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
)
// client is expected to reconnect within 5 second
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"github.com/rs/zerolog"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
type ImageListener interface {
+3 -2
View File
@@ -6,8 +6,9 @@ import (
"math"
"time"
"github.com/demodesk/neko/internal/webrtc/payload"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/internal/webrtc/payload"
"m1k1o/neko/pkg/types"
"github.com/pion/webrtc/v3"
"github.com/rs/zerolog"
)
+2 -1
View File
@@ -5,7 +5,8 @@ import (
"encoding/binary"
"strconv"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/types"
"github.com/rs/zerolog"
)
+8 -8
View File
@@ -17,14 +17,14 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/internal/config"
"github.com/demodesk/neko/internal/webrtc/cursor"
"github.com/demodesk/neko/internal/webrtc/pionlog"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/codec"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/internal/config"
"m1k1o/neko/internal/webrtc/cursor"
"m1k1o/neko/internal/webrtc/pionlog"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/codec"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
"m1k1o/neko/pkg/utils"
)
const (
+2 -1
View File
@@ -4,7 +4,8 @@ import (
"sync"
"time"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/types"
"github.com/pion/rtcp"
"github.com/pion/webrtc/v3"
"github.com/prometheus/client_golang/prometheus"
+5 -5
View File
@@ -11,11 +11,11 @@ import (
"github.com/pion/webrtc/v3"
"github.com/rs/zerolog"
"github.com/demodesk/neko/internal/config"
"github.com/demodesk/neko/internal/webrtc/payload"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/internal/config"
"m1k1o/neko/internal/webrtc/payload"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/utils"
)
type WebRTCPeerCtx struct {
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"github.com/pion/webrtc/v3/pkg/media"
"github.com/rs/zerolog"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/codec"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/codec"
)
type Track struct {
@@ -1,9 +1,9 @@
package websocket
import (
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
)
func (manager *WebSocketManagerCtx) fileChooserDialogEvents() {
@@ -3,8 +3,8 @@ package handler
import (
"errors"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/message"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/message"
)
func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message.ClipboardData) error {
+4 -4
View File
@@ -3,10 +3,10 @@ package handler
import (
"errors"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"github.com/demodesk/neko/pkg/xorg"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
"m1k1o/neko/pkg/xorg"
)
var (
+4 -4
View File
@@ -4,10 +4,10 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
"m1k1o/neko/pkg/utils"
)
func New(
@@ -3,8 +3,8 @@ package handler
import (
"errors"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/message"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/message"
)
func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message.KeyboardMap) error {
+3 -3
View File
@@ -3,9 +3,9 @@ package handler
import (
"errors"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
)
func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenSize) error {
+3 -3
View File
@@ -3,9 +3,9 @@ package handler
import (
"errors"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
)
func (h *MessageHandlerCtx) sendUnicast(session types.Session, payload *message.SendUnicast) error {
+3 -3
View File
@@ -1,9 +1,9 @@
package handler
import (
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
)
func (h *MessageHandlerCtx) SessionCreated(session types.Session) error {
+4 -3
View File
@@ -3,9 +3,10 @@ package handler
import (
"errors"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
"github.com/pion/webrtc/v3"
)
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
)
func (h *MessageHandlerCtx) systemInit(session types.Session) error {
+5 -5
View File
@@ -11,11 +11,11 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/internal/websocket/handler"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/internal/websocket/handler"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
"m1k1o/neko/pkg/utils"
)
// send pings to peer with this period - must be less than pongWait
+4 -4
View File
@@ -8,10 +8,10 @@ import (
"github.com/gorilla/websocket"
"github.com/rs/zerolog"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/types/event"
"m1k1o/neko/pkg/types/message"
"m1k1o/neko/pkg/utils"
)
type WebSocketPeerCtx struct {
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"fmt"
"net/http"
"github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/utils"
"m1k1o/neko/pkg/types"
"m1k1o/neko/pkg/utils"
)
type key int
+3 -3
View File
@@ -6,9 +6,9 @@ import (
"reflect"
"testing"
"github.com/demodesk/neko/internal/config"
"github.com/demodesk/neko/internal/session"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/internal/config"
"m1k1o/neko/internal/session"
"m1k1o/neko/pkg/types"
)
var i = 0
+1 -1
View File
@@ -16,7 +16,7 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/demodesk/neko/pkg/types"
"m1k1o/neko/pkg/types"
)
var (
+2 -1
View File
@@ -8,8 +8,9 @@ import (
"strings"
"time"
"m1k1o/neko/pkg/types/codec"
"github.com/PaesslerAG/gval"
"github.com/demodesk/neko/pkg/types/codec"
)
var (

Some files were not shown because too many files have changed in this diff Show More