diff --git a/cmd/neko/main.go b/cmd/neko/main.go index 88018a1a..6d218b29 100644 --- a/cmd/neko/main.go +++ b/cmd/neko/main.go @@ -5,9 +5,9 @@ import ( "github.com/rs/zerolog/log" - "demodesk/neko" - "demodesk/neko/cmd" - "demodesk/neko/internal/utils" + neko "gitlab.com/demodesk/neko/server" + "gitlab.com/demodesk/neko/server/cmd" + "gitlab.com/demodesk/neko/server/internal/utils" ) func main() { diff --git a/cmd/root.go b/cmd/root.go index 187482ee..d51f8b0a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -15,8 +15,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "demodesk/neko" - "demodesk/neko/internal/config" + neko "gitlab.com/demodesk/neko/server" + "gitlab.com/demodesk/neko/server/internal/config" ) func Execute() error { diff --git a/cmd/serve.go b/cmd/serve.go index fe645719..e7142157 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -8,16 +8,16 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "demodesk/neko/internal/api" - "demodesk/neko/internal/capture" - "demodesk/neko/internal/config" - "demodesk/neko/internal/desktop" - "demodesk/neko/internal/http" - "demodesk/neko/internal/member" - "demodesk/neko/internal/session" - "demodesk/neko/internal/webrtc" - "demodesk/neko/internal/websocket" - "demodesk/neko/modules" + "gitlab.com/demodesk/neko/server/internal/api" + "gitlab.com/demodesk/neko/server/internal/capture" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/desktop" + "gitlab.com/demodesk/neko/server/internal/http" + "gitlab.com/demodesk/neko/server/internal/member" + "gitlab.com/demodesk/neko/server/internal/session" + "gitlab.com/demodesk/neko/server/internal/webrtc" + "gitlab.com/demodesk/neko/server/internal/websocket" + "gitlab.com/demodesk/neko/server/modules" ) func init() { diff --git a/go.mod b/go.mod index b9e07f2c..5b39828d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module demodesk/neko +module gitlab.com/demodesk/neko/server go 1.17 diff --git a/internal/api/members/bluk.go b/internal/api/members/bluk.go index 808db44a..b979f15d 100644 --- a/internal/api/members/bluk.go +++ b/internal/api/members/bluk.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type MemberBulkUpdatePayload struct { diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 6b85f3a7..09e3f0b7 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -5,8 +5,8 @@ import ( "net/http" "strconv" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type MemberDataPayload struct { diff --git a/internal/api/members/handler.go b/internal/api/members/handler.go index 276c3b40..84be7c99 100644 --- a/internal/api/members/handler.go +++ b/internal/api/members/handler.go @@ -7,9 +7,9 @@ import ( "github.com/go-chi/chi" - "demodesk/neko/internal/http/auth" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/http/auth" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type key int diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index c7afef9f..26a99d86 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -3,9 +3,9 @@ package room import ( "net/http" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/utils" ) type BroadcastStatusPayload struct { diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index 203282c4..ccca748b 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -7,8 +7,8 @@ import ( "net/http" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type ClipboardPayload struct { diff --git a/internal/api/room/control.go b/internal/api/room/control.go index 400df38c..524294af 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -5,8 +5,8 @@ import ( "github.com/go-chi/chi" - "demodesk/neko/internal/http/auth" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/http/auth" + "gitlab.com/demodesk/neko/server/internal/utils" ) type ControlStatusPayload struct { diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 254f722f..ab4680af 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -4,9 +4,9 @@ import ( "context" "net/http" - "demodesk/neko/internal/http/auth" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/http/auth" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type RoomHandler struct { diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index 91cccab0..347ddccb 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -3,8 +3,8 @@ package room import ( "net/http" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type KeyboardMapData struct { diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 9cc54b96..2d61daff 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -4,10 +4,10 @@ import ( "net/http" "strconv" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/utils" ) type ScreenConfigurationPayload struct { diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index 894bcead..7538a4e1 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -7,7 +7,7 @@ import ( "path" "strconv" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/utils" ) // TODO: Extract file uploading to custom utility. diff --git a/internal/api/router.go b/internal/api/router.go index c64b9e68..c8b54e50 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -5,12 +5,12 @@ import ( "errors" "net/http" - "demodesk/neko/internal/api/members" - "demodesk/neko/internal/api/room" - "demodesk/neko/internal/config" - "demodesk/neko/internal/http/auth" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/api/members" + "gitlab.com/demodesk/neko/server/internal/api/room" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/http/auth" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type ApiManagerCtx struct { diff --git a/internal/api/session.go b/internal/api/session.go index 7e97434d..048e42e5 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -3,9 +3,9 @@ package api import ( "net/http" - "demodesk/neko/internal/http/auth" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/http/auth" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type SessionLoginPayload struct { diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 22dfe2f2..709f555e 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -7,8 +7,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/capture/gst" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/capture/gst" + "gitlab.com/demodesk/neko/server/internal/types" ) type BroacastManagerCtx struct { diff --git a/internal/capture/gst/gst.go b/internal/capture/gst/gst.go index d2cb1781..60cb90f7 100644 --- a/internal/capture/gst/gst.go +++ b/internal/capture/gst/gst.go @@ -13,7 +13,7 @@ import ( "time" "unsafe" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" "github.com/rs/zerolog" "github.com/rs/zerolog/log" diff --git a/internal/capture/manager.go b/internal/capture/manager.go index 95bde947..ea2670d3 100644 --- a/internal/capture/manager.go +++ b/internal/capture/manager.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/config" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/codec" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/codec" ) type CaptureManagerCtx struct { diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index e73705d8..7d63e612 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/capture/gst" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/capture/gst" + "gitlab.com/demodesk/neko/server/internal/types" ) // timeout between intervals, when screencast pipeline is checked diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index c5e3c9dc..a6290be0 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/capture/gst" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/codec" + "gitlab.com/demodesk/neko/server/internal/capture/gst" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/codec" ) var moveSinkListenerMu = sync.Mutex{} diff --git a/internal/capture/streamsrc.go b/internal/capture/streamsrc.go index 1c4b76bf..80baf72a 100644 --- a/internal/capture/streamsrc.go +++ b/internal/capture/streamsrc.go @@ -7,9 +7,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/capture/gst" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/codec" + "gitlab.com/demodesk/neko/server/internal/capture/gst" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/codec" ) type StreamSrcManagerCtx struct { diff --git a/internal/config/capture.go b/internal/config/capture.go index 0b4289c9..caed4eaa 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -8,9 +8,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/codec" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/codec" + "gitlab.com/demodesk/neko/server/internal/utils" ) type Capture struct { diff --git a/internal/config/member.go b/internal/config/member.go index 13c4261a..003ad154 100644 --- a/internal/config/member.go +++ b/internal/config/member.go @@ -4,8 +4,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "demodesk/neko/internal/member/file" - "demodesk/neko/internal/member/object" + "gitlab.com/demodesk/neko/server/internal/member/file" + "gitlab.com/demodesk/neko/server/internal/member/object" ) type Member struct { diff --git a/internal/config/server.go b/internal/config/server.go index b68df15a..eebe8925 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -4,7 +4,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/utils" ) type Server struct { diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index 2024274c..9396d2bb 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) // default stun server diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go index 4cc6006e..5d681a06 100644 --- a/internal/desktop/clipboard.go +++ b/internal/desktop/clipboard.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) func (manager *DesktopManagerCtx) ClipboardGetText() (*types.ClipboardText, error) { diff --git a/internal/desktop/drop.go b/internal/desktop/drop.go index ff9166d8..3d892937 100644 --- a/internal/desktop/drop.go +++ b/internal/desktop/drop.go @@ -3,7 +3,7 @@ package desktop import ( "time" - "demodesk/neko/internal/desktop/drop" + "gitlab.com/demodesk/neko/server/internal/desktop/drop" ) // repeat move event multiple times diff --git a/internal/desktop/filechooserdialog.go b/internal/desktop/filechooserdialog.go index 339168a4..d61892b3 100644 --- a/internal/desktop/filechooserdialog.go +++ b/internal/desktop/filechooserdialog.go @@ -4,7 +4,7 @@ import ( "errors" "os/exec" - "demodesk/neko/internal/desktop/xorg" + "gitlab.com/demodesk/neko/server/internal/desktop/xorg" ) // name of the window that is being controlled diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 2dc3771e..f65e5f35 100644 --- a/internal/desktop/manager.go +++ b/internal/desktop/manager.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/config" - "demodesk/neko/internal/desktop/xevent" - "demodesk/neko/internal/desktop/xorg" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/desktop/xevent" + "gitlab.com/demodesk/neko/server/internal/desktop/xorg" ) var mu = sync.Mutex{} diff --git a/internal/desktop/xevent.go b/internal/desktop/xevent.go index 4d67905f..110f4ed9 100644 --- a/internal/desktop/xevent.go +++ b/internal/desktop/xevent.go @@ -1,7 +1,7 @@ package desktop import ( - "demodesk/neko/internal/desktop/xevent" + "gitlab.com/demodesk/neko/server/internal/desktop/xevent" ) func (manager *DesktopManagerCtx) OnCursorChanged(listener func(serial uint64)) { diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index ce6c28db..ee211bf2 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -6,8 +6,8 @@ import ( "regexp" "time" - "demodesk/neko/internal/desktop/xorg" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/desktop/xorg" + "gitlab.com/demodesk/neko/server/internal/types" ) func (manager *DesktopManagerCtx) Move(x, y int) { diff --git a/internal/desktop/xorg/xorg.go b/internal/desktop/xorg/xorg.go index cb865a99..7fb671f9 100644 --- a/internal/desktop/xorg/xorg.go +++ b/internal/desktop/xorg/xorg.go @@ -16,7 +16,7 @@ import ( "image" "image/color" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) //go:generate ./keysymdef.sh diff --git a/internal/http/auth/auth.go b/internal/http/auth/auth.go index 2b350e63..e954d4af 100644 --- a/internal/http/auth/auth.go +++ b/internal/http/auth/auth.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type key int diff --git a/internal/http/debug.go b/internal/http/debug.go index ef72b35a..a0a29be0 100644 --- a/internal/http/debug.go +++ b/internal/http/debug.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) func pprofHandler(r types.Router) { diff --git a/internal/http/logger.go b/internal/http/logger.go index 2e946af1..c4dbc87b 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -8,8 +8,8 @@ import ( "github.com/go-chi/chi/middleware" "github.com/rs/zerolog" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type logFormatter struct { diff --git a/internal/http/manager.go b/internal/http/manager.go index 73c4ed25..d8c6520d 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/config" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/types" ) type HttpManagerCtx struct { diff --git a/internal/http/router.go b/internal/http/router.go index 137b986e..932563a1 100644 --- a/internal/http/router.go +++ b/internal/http/router.go @@ -7,9 +7,9 @@ import ( "github.com/go-chi/chi/middleware" "github.com/rs/zerolog" - "demodesk/neko/internal/http/auth" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/http/auth" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) type router struct { diff --git a/internal/member/dummy/provider.go b/internal/member/dummy/provider.go index 88bef7ca..72e59f4e 100644 --- a/internal/member/dummy/provider.go +++ b/internal/member/dummy/provider.go @@ -3,7 +3,7 @@ package dummy import ( "errors" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) func New() types.MemberProvider { diff --git a/internal/member/file/provider.go b/internal/member/file/provider.go index 92a8c687..423f5b69 100644 --- a/internal/member/file/provider.go +++ b/internal/member/file/provider.go @@ -5,7 +5,7 @@ import ( "io" "os" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) func New(config Config) types.MemberProvider { diff --git a/internal/member/file/types.go b/internal/member/file/types.go index 32ed0b0e..cf589aac 100644 --- a/internal/member/file/types.go +++ b/internal/member/file/types.go @@ -1,7 +1,7 @@ package file import ( - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) type MemberEntry struct { diff --git a/internal/member/manager.go b/internal/member/manager.go index 8696cf40..9f3ae0a7 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -7,11 +7,11 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/config" - "demodesk/neko/internal/member/dummy" - "demodesk/neko/internal/member/file" - "demodesk/neko/internal/member/object" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/member/dummy" + "gitlab.com/demodesk/neko/server/internal/member/file" + "gitlab.com/demodesk/neko/server/internal/member/object" + "gitlab.com/demodesk/neko/server/internal/types" ) func New(sessions types.SessionManager, config *config.Member) *MemberManagerCtx { diff --git a/internal/member/object/provider.go b/internal/member/object/provider.go index 80b68b00..12d45287 100644 --- a/internal/member/object/provider.go +++ b/internal/member/object/provider.go @@ -1,7 +1,7 @@ package object import ( - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) func New(config Config) types.MemberProvider { diff --git a/internal/member/object/types.go b/internal/member/object/types.go index e3b1b719..e35e1c99 100644 --- a/internal/member/object/types.go +++ b/internal/member/object/types.go @@ -1,7 +1,7 @@ package object import ( - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) type MemberEntry struct { diff --git a/internal/session/auth.go b/internal/session/auth.go index cc3be871..1593b1bb 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) func (manager *SessionManagerCtx) CookieSetToken(w http.ResponseWriter, token string) { diff --git a/internal/session/manager.go b/internal/session/manager.go index 492e5fbd..54be1e47 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/config" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) func New(config *config.Session) *SessionManagerCtx { diff --git a/internal/session/session.go b/internal/session/session.go index 4ae9249a..42f4b8f4 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -5,8 +5,8 @@ import ( "github.com/rs/zerolog" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" ) type SessionCtx struct { diff --git a/internal/types/capture.go b/internal/types/capture.go index 35d19fe9..2d0126d5 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -10,7 +10,7 @@ import ( "github.com/PaesslerAG/gval" "github.com/pion/webrtc/v3/pkg/media" - "demodesk/neko/internal/types/codec" + "gitlab.com/demodesk/neko/server/internal/types/codec" ) var ( diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 7b8373d7..413bff64 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -3,7 +3,7 @@ package message import ( "github.com/pion/webrtc/v3" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) ///////////////////////////// diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go index fe6d203c..3f1b8730 100644 --- a/internal/webrtc/cursor/image.go +++ b/internal/webrtc/cursor/image.go @@ -7,8 +7,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/types" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/utils" ) func NewImage(desktop types.DesktopManager) *ImageCtx { diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 68020977..1f93ca38 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - "demodesk/neko/internal/types" - "demodesk/neko/internal/webrtc/payload" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/webrtc/payload" ) func (manager *WebRTCManagerCtx) handle(data []byte, session types.Session) error { diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index 3f607a34..ce7e76eb 100644 --- a/internal/webrtc/manager.go +++ b/internal/webrtc/manager.go @@ -13,13 +13,13 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/config" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/codec" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" - "demodesk/neko/internal/webrtc/cursor" - "demodesk/neko/internal/webrtc/pionlog" + "gitlab.com/demodesk/neko/server/internal/config" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/codec" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/webrtc/cursor" + "gitlab.com/demodesk/neko/server/internal/webrtc/pionlog" ) // the duration without network activity before a Agent is considered disconnected. Default is 5 Seconds diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index b338204d..0d01d8d9 100644 --- a/internal/webrtc/peer.go +++ b/internal/webrtc/peer.go @@ -6,7 +6,7 @@ import ( "github.com/pion/webrtc/v3" "github.com/rs/zerolog" - "demodesk/neko/internal/types" + "gitlab.com/demodesk/neko/server/internal/types" ) type WebRTCPeerCtx struct { diff --git a/internal/webrtc/peerconnection.go b/internal/webrtc/peerconnection.go index 6a9683b0..c64f57a1 100644 --- a/internal/webrtc/peerconnection.go +++ b/internal/webrtc/peerconnection.go @@ -1,12 +1,12 @@ package webrtc import ( - "demodesk/neko/internal/types/codec" - "demodesk/neko/internal/webrtc/pionlog" - "github.com/pion/interceptor" "github.com/pion/webrtc/v3" "github.com/rs/zerolog" + + "gitlab.com/demodesk/neko/server/internal/types/codec" + "gitlab.com/demodesk/neko/server/internal/webrtc/pionlog" ) func (manager *WebRTCManagerCtx) newPeerConnection(codecs []codec.RTPCodec, logger zerolog.Logger) (*webrtc.PeerConnection, error) { diff --git a/internal/webrtc/peerstreamtrack.go b/internal/webrtc/peerstreamtrack.go index e204243a..59a3925c 100644 --- a/internal/webrtc/peerstreamtrack.go +++ b/internal/webrtc/peerstreamtrack.go @@ -1,7 +1,6 @@ package webrtc import ( - "demodesk/neko/internal/types" "errors" "io" "sync" @@ -9,6 +8,8 @@ import ( "github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3/pkg/media" "github.com/rs/zerolog" + + "gitlab.com/demodesk/neko/server/internal/types" ) func (manager *WebRTCManagerCtx) newPeerStreamTrack(stream types.StreamSinkManager, logger zerolog.Logger) (*PeerStreamTrack, error) { diff --git a/internal/webrtc/send.go b/internal/webrtc/send.go index e2c9e0f2..e82edeea 100644 --- a/internal/webrtc/send.go +++ b/internal/webrtc/send.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - "demodesk/neko/internal/types" - "demodesk/neko/internal/webrtc/payload" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/webrtc/payload" ) func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go index e753e786..f3c75639 100644 --- a/internal/websocket/filechooserdialog.go +++ b/internal/websocket/filechooserdialog.go @@ -1,9 +1,9 @@ package websocket import ( - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { diff --git a/internal/websocket/handler/clipboard.go b/internal/websocket/handler/clipboard.go index 123c00a7..93e65c1c 100644 --- a/internal/websocket/handler/clipboard.go +++ b/internal/websocket/handler/clipboard.go @@ -3,8 +3,8 @@ package handler import ( "errors" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message.ClipboardData) error { diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go index 3f56edae..938e3e22 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -3,10 +3,10 @@ package handler import ( "errors" - "demodesk/neko/internal/desktop/xorg" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/desktop/xorg" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) var ( diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index 02469ed3..52806c4c 100644 --- a/internal/websocket/handler/handler.go +++ b/internal/websocket/handler/handler.go @@ -4,10 +4,10 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" - "demodesk/neko/internal/utils" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/utils" ) func New( diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index 457b3828..ce97666f 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -3,8 +3,8 @@ package handler import ( "errors" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message.KeyboardMap) error { diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go index a526bc81..4b9f6118 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenSize) error { diff --git a/internal/websocket/handler/send.go b/internal/websocket/handler/send.go index 9c59b14d..6368717d 100644 --- a/internal/websocket/handler/send.go +++ b/internal/websocket/handler/send.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (h *MessageHandlerCtx) sendUnicast(session types.Session, payload *message.SendUnicast) error { diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go index 1d05dcc7..85ffd041 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -1,9 +1,9 @@ package handler import ( - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 2a49fa1e..d67e141b 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *message.SignalVideo) error { diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 59411779..d443483e 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -6,9 +6,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) func (h *MessageHandlerCtx) systemInit(session types.Session) error { diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 3ec44e40..cb10dcac 100644 --- a/internal/websocket/manager.go +++ b/internal/websocket/manager.go @@ -10,11 +10,11 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" - "demodesk/neko/internal/utils" - "demodesk/neko/internal/websocket/handler" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/utils" + "gitlab.com/demodesk/neko/server/internal/websocket/handler" ) // send pings to peer with this period - must be less than pongWait diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 3d76a13a..7f1149f4 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" + "gitlab.com/demodesk/neko/server/internal/types" + "gitlab.com/demodesk/neko/server/internal/types/event" + "gitlab.com/demodesk/neko/server/internal/types/message" ) type WebSocketPeerCtx struct {