diff --git a/build b/build index 0788e5a6..ea3ccae9 100755 --- a/build +++ b/build @@ -30,10 +30,10 @@ go build \ -o bin/neko \ -ldflags " -s -w - -X 'gitlab.com/demodesk/neko/server.buildDate=`date -u +'%Y-%m-%dT%H:%M:%SZ'`' - -X 'gitlab.com/demodesk/neko/server.gitCommit=${GIT_COMMIT}' - -X 'gitlab.com/demodesk/neko/server.gitBranch=${GIT_BRANCH}' - -X 'gitlab.com/demodesk/neko/server.gitTag=${GIT_TAG}' + -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}' " \ cmd/neko/main.go; diff --git a/cmd/neko/main.go b/cmd/neko/main.go index 47e1eadd..dec9df74 100644 --- a/cmd/neko/main.go +++ b/cmd/neko/main.go @@ -5,9 +5,9 @@ import ( "github.com/rs/zerolog/log" - neko "gitlab.com/demodesk/neko/server" - "gitlab.com/demodesk/neko/server/cmd" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko" + "github.com/demodesk/neko/cmd" + "github.com/demodesk/neko/pkg/utils" ) func main() { diff --git a/cmd/root.go b/cmd/root.go index d51f8b0a..79c91229 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -15,8 +15,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - neko "gitlab.com/demodesk/neko/server" - "gitlab.com/demodesk/neko/server/internal/config" + "github.com/demodesk/neko" + "github.com/demodesk/neko/internal/config" ) func Execute() error { diff --git a/cmd/serve.go b/cmd/serve.go index 1ab011d3..1d5fd9dc 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -8,16 +8,16 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "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/plugins" - "gitlab.com/demodesk/neko/server/internal/session" - "gitlab.com/demodesk/neko/server/internal/webrtc" - "gitlab.com/demodesk/neko/server/internal/websocket" + "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" ) func init() { diff --git a/go.mod b/go.mod index 703050b2..116de496 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gitlab.com/demodesk/neko/server +module github.com/demodesk/neko go 1.18 diff --git a/internal/api/members/bluk.go b/internal/api/members/bluk.go index 36a6f5f8..a7a4552e 100644 --- a/internal/api/members/bluk.go +++ b/internal/api/members/bluk.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type MemberBulkUpdatePayload struct { diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go index 6bb40db4..b1814ce3 100644 --- a/internal/api/members/controler.go +++ b/internal/api/members/controler.go @@ -5,8 +5,8 @@ import ( "net/http" "strconv" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type MemberDataPayload struct { diff --git a/internal/api/members/handler.go b/internal/api/members/handler.go index b6a8c71c..45d022a5 100644 --- a/internal/api/members/handler.go +++ b/internal/api/members/handler.go @@ -7,9 +7,9 @@ import ( "github.com/go-chi/chi" - "gitlab.com/demodesk/neko/server/pkg/auth" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/auth" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type key int diff --git a/internal/api/room/broadcast.go b/internal/api/room/broadcast.go index f0bd8664..1dde70df 100644 --- a/internal/api/room/broadcast.go +++ b/internal/api/room/broadcast.go @@ -3,9 +3,9 @@ package room import ( "net/http" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" + "github.com/demodesk/neko/pkg/utils" ) type BroadcastStatusPayload struct { diff --git a/internal/api/room/clipboard.go b/internal/api/room/clipboard.go index f0a8bfdd..00cf8031 100644 --- a/internal/api/room/clipboard.go +++ b/internal/api/room/clipboard.go @@ -7,8 +7,8 @@ import ( "net/http" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type ClipboardPayload struct { diff --git a/internal/api/room/control.go b/internal/api/room/control.go index cf0300e9..7395db33 100644 --- a/internal/api/room/control.go +++ b/internal/api/room/control.go @@ -5,8 +5,8 @@ import ( "github.com/go-chi/chi" - "gitlab.com/demodesk/neko/server/pkg/auth" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/auth" + "github.com/demodesk/neko/pkg/utils" ) type ControlStatusPayload struct { diff --git a/internal/api/room/handler.go b/internal/api/room/handler.go index 50707b55..e3c9428e 100644 --- a/internal/api/room/handler.go +++ b/internal/api/room/handler.go @@ -6,9 +6,9 @@ import ( "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/auth" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/auth" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type RoomHandler struct { diff --git a/internal/api/room/keyboard.go b/internal/api/room/keyboard.go index f75c9291..ab15c2bd 100644 --- a/internal/api/room/keyboard.go +++ b/internal/api/room/keyboard.go @@ -3,8 +3,8 @@ package room import ( "net/http" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type KeyboardMapData struct { diff --git a/internal/api/room/screen.go b/internal/api/room/screen.go index 9be8c20b..bb5bf78b 100644 --- a/internal/api/room/screen.go +++ b/internal/api/room/screen.go @@ -4,11 +4,11 @@ import ( "net/http" "strconv" - "gitlab.com/demodesk/neko/server/pkg/auth" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" - "gitlab.com/demodesk/neko/server/pkg/utils" + "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" ) type ScreenConfigurationPayload struct { diff --git a/internal/api/room/settings.go b/internal/api/room/settings.go index 468b4168..33e41552 100644 --- a/internal/api/room/settings.go +++ b/internal/api/room/settings.go @@ -3,7 +3,7 @@ package room import ( "net/http" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/utils" ) func (h *RoomHandler) settingsGet(w http.ResponseWriter, r *http.Request) error { diff --git a/internal/api/room/upload.go b/internal/api/room/upload.go index edb5cae4..bba7b989 100644 --- a/internal/api/room/upload.go +++ b/internal/api/room/upload.go @@ -7,7 +7,7 @@ import ( "path" "strconv" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/utils" ) // TODO: Extract file uploading to custom utility. diff --git a/internal/api/router.go b/internal/api/router.go index b05115fd..3cf1d218 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -5,11 +5,11 @@ import ( "errors" "net/http" - "gitlab.com/demodesk/neko/server/internal/api/members" - "gitlab.com/demodesk/neko/server/internal/api/room" - "gitlab.com/demodesk/neko/server/pkg/auth" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/internal/api/members" + "github.com/demodesk/neko/internal/api/room" + "github.com/demodesk/neko/pkg/auth" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type ApiManagerCtx struct { diff --git a/internal/api/session.go b/internal/api/session.go index f22cf199..3ea6cc41 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -3,9 +3,9 @@ package api import ( "net/http" - "gitlab.com/demodesk/neko/server/pkg/auth" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/auth" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type SessionLoginPayload struct { diff --git a/internal/capture/broadcast.go b/internal/capture/broadcast.go index 70f955de..6f032b33 100644 --- a/internal/capture/broadcast.go +++ b/internal/capture/broadcast.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/gst" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/gst" + "github.com/demodesk/neko/pkg/types" ) type BroacastManagerCtx struct { diff --git a/internal/capture/manager.go b/internal/capture/manager.go index d4496e9f..61ef8edb 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" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/codec" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/codec" ) type CaptureManagerCtx struct { diff --git a/internal/capture/screencast.go b/internal/capture/screencast.go index 7bb73e60..0383c7f9 100644 --- a/internal/capture/screencast.go +++ b/internal/capture/screencast.go @@ -11,8 +11,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/gst" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/gst" + "github.com/demodesk/neko/pkg/types" ) // timeout between intervals, when screencast pipeline is checked diff --git a/internal/capture/streamsink.go b/internal/capture/streamsink.go index 354e829b..954ed452 100644 --- a/internal/capture/streamsink.go +++ b/internal/capture/streamsink.go @@ -11,9 +11,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/gst" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/codec" + "github.com/demodesk/neko/pkg/gst" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/codec" ) var moveSinkListenerMu = sync.Mutex{} diff --git a/internal/capture/streamsrc.go b/internal/capture/streamsrc.go index 59e2632b..89abca08 100644 --- a/internal/capture/streamsrc.go +++ b/internal/capture/streamsrc.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/gst" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/codec" + "github.com/demodesk/neko/pkg/gst" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/codec" ) type StreamSrcManagerCtx struct { diff --git a/internal/config/capture.go b/internal/config/capture.go index e0c8d110..315735b8 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -8,9 +8,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/codec" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/codec" + "github.com/demodesk/neko/pkg/utils" ) type Capture struct { diff --git a/internal/config/member.go b/internal/config/member.go index 003ad154..8ef083d5 100644 --- a/internal/config/member.go +++ b/internal/config/member.go @@ -4,8 +4,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "gitlab.com/demodesk/neko/server/internal/member/file" - "gitlab.com/demodesk/neko/server/internal/member/object" + "github.com/demodesk/neko/internal/member/file" + "github.com/demodesk/neko/internal/member/object" ) type Member struct { diff --git a/internal/config/server.go b/internal/config/server.go index 1fe656a7..12ae00e4 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -4,7 +4,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/utils" ) type Server struct { diff --git a/internal/config/webrtc.go b/internal/config/webrtc.go index 50a2a642..126f1d5e 100644 --- a/internal/config/webrtc.go +++ b/internal/config/webrtc.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) // default stun server diff --git a/internal/desktop/clipboard.go b/internal/desktop/clipboard.go index c7431b87..fcfce03d 100644 --- a/internal/desktop/clipboard.go +++ b/internal/desktop/clipboard.go @@ -6,8 +6,8 @@ import ( "os/exec" "strings" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/xevent" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/xevent" ) func (manager *DesktopManagerCtx) ClipboardGetText() (*types.ClipboardText, error) { diff --git a/internal/desktop/drop.go b/internal/desktop/drop.go index 4efd8420..ff6d9d0f 100644 --- a/internal/desktop/drop.go +++ b/internal/desktop/drop.go @@ -3,7 +3,7 @@ package desktop import ( "time" - "gitlab.com/demodesk/neko/server/pkg/drop" + "github.com/demodesk/neko/pkg/drop" ) // repeat move event multiple times diff --git a/internal/desktop/filechooserdialog.go b/internal/desktop/filechooserdialog.go index 5c4e5952..e5db4af6 100644 --- a/internal/desktop/filechooserdialog.go +++ b/internal/desktop/filechooserdialog.go @@ -4,7 +4,7 @@ import ( "errors" "os/exec" - "gitlab.com/demodesk/neko/server/pkg/xorg" + "github.com/demodesk/neko/pkg/xorg" ) // name of the window that is being controlled diff --git a/internal/desktop/manager.go b/internal/desktop/manager.go index 289904bf..0dac38c9 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" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/pkg/xevent" - "gitlab.com/demodesk/neko/server/pkg/xorg" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/pkg/xevent" + "github.com/demodesk/neko/pkg/xorg" ) var mu = sync.Mutex{} diff --git a/internal/desktop/xevent.go b/internal/desktop/xevent.go index 8abcb03f..bbc4b46c 100644 --- a/internal/desktop/xevent.go +++ b/internal/desktop/xevent.go @@ -1,7 +1,7 @@ package desktop import ( - "gitlab.com/demodesk/neko/server/pkg/xevent" + "github.com/demodesk/neko/pkg/xevent" ) func (manager *DesktopManagerCtx) OnCursorChanged(listener func(serial uint64)) { diff --git a/internal/desktop/xorg.go b/internal/desktop/xorg.go index 0de6b74b..8912d13b 100644 --- a/internal/desktop/xorg.go +++ b/internal/desktop/xorg.go @@ -6,8 +6,8 @@ import ( "regexp" "time" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/xorg" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/xorg" ) func (manager *DesktopManagerCtx) Move(x, y int) { diff --git a/internal/http/debug.go b/internal/http/debug.go index af63ded2..5e40e147 100644 --- a/internal/http/debug.go +++ b/internal/http/debug.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) func pprofHandler(r types.Router) { diff --git a/internal/http/logger.go b/internal/http/logger.go index 783caede..ae804e97 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" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type logFormatter struct { diff --git a/internal/http/manager.go b/internal/http/manager.go index 63c767d2..07e10067 100644 --- a/internal/http/manager.go +++ b/internal/http/manager.go @@ -10,8 +10,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/pkg/types" ) type HttpManagerCtx struct { diff --git a/internal/http/router.go b/internal/http/router.go index 636cc4ca..ab7bd535 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" - "gitlab.com/demodesk/neko/server/pkg/auth" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/auth" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type router struct { diff --git a/internal/member/dummy/provider.go b/internal/member/dummy/provider.go index 2f3cbee3..4ab0dd4a 100644 --- a/internal/member/dummy/provider.go +++ b/internal/member/dummy/provider.go @@ -3,7 +3,7 @@ package dummy import ( "errors" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) func New() types.MemberProvider { diff --git a/internal/member/file/provider.go b/internal/member/file/provider.go index 1f1f6707..04acd191 100644 --- a/internal/member/file/provider.go +++ b/internal/member/file/provider.go @@ -5,7 +5,7 @@ import ( "io" "os" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) func New(config Config) types.MemberProvider { diff --git a/internal/member/file/types.go b/internal/member/file/types.go index dc4a02d2..739e0814 100644 --- a/internal/member/file/types.go +++ b/internal/member/file/types.go @@ -1,7 +1,7 @@ package file import ( - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) type MemberEntry struct { diff --git a/internal/member/manager.go b/internal/member/manager.go index 83aeae0f..965ccf17 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" - "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/pkg/types" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/internal/member/dummy" + "github.com/demodesk/neko/internal/member/file" + "github.com/demodesk/neko/internal/member/object" + "github.com/demodesk/neko/pkg/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 c3cef2a7..7410ff39 100644 --- a/internal/member/object/provider.go +++ b/internal/member/object/provider.go @@ -1,7 +1,7 @@ package object import ( - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) func New(config Config) types.MemberProvider { diff --git a/internal/member/object/types.go b/internal/member/object/types.go index b29894fa..ca1e519a 100644 --- a/internal/member/object/types.go +++ b/internal/member/object/types.go @@ -1,7 +1,7 @@ package object import ( - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) type MemberEntry struct { diff --git a/internal/plugins/dependency.go b/internal/plugins/dependency.go index 31f2dddc..b9f19388 100644 --- a/internal/plugins/dependency.go +++ b/internal/plugins/dependency.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) type dependency struct { diff --git a/internal/plugins/dependency_test.go b/internal/plugins/dependency_test.go index 259eba3c..7075450f 100644 --- a/internal/plugins/dependency_test.go +++ b/internal/plugins/dependency_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) func Test_deps_addPlugin(t *testing.T) { diff --git a/internal/plugins/manager.go b/internal/plugins/manager.go index ea88ca61..027d9314 100644 --- a/internal/plugins/manager.go +++ b/internal/plugins/manager.go @@ -10,8 +10,8 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/pkg/types" ) type ManagerCtx struct { diff --git a/internal/session/auth.go b/internal/session/auth.go index 50b749dd..1248fad9 100644 --- a/internal/session/auth.go +++ b/internal/session/auth.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) func (manager *SessionManagerCtx) CookieSetToken(w http.ResponseWriter, token string) { diff --git a/internal/session/manager.go b/internal/session/manager.go index c7f43c1d..edfad97d 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" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) func New(config *config.Session) *SessionManagerCtx { diff --git a/internal/session/session.go b/internal/session/session.go index 445391ef..9590a1cd 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -5,8 +5,8 @@ import ( "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" ) type SessionCtx struct { diff --git a/internal/webrtc/cursor/image.go b/internal/webrtc/cursor/image.go index 4411e324..ddfdcc18 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" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) func NewImage(desktop types.DesktopManager) *ImageCtx { diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go index 88cbe74d..34df576e 100644 --- a/internal/webrtc/handler.go +++ b/internal/webrtc/handler.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - "gitlab.com/demodesk/neko/server/internal/webrtc/payload" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/internal/webrtc/payload" + "github.com/demodesk/neko/pkg/types" ) func (manager *WebRTCManagerCtx) handle(data []byte, session types.Session) error { diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go index cc8523a9..ccba66a8 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" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/internal/webrtc/cursor" - "gitlab.com/demodesk/neko/server/internal/webrtc/pionlog" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/codec" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "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" ) // the duration without network activity before a Agent is considered disconnected. Default is 5 Seconds diff --git a/internal/webrtc/metrics.go b/internal/webrtc/metrics.go index 69498ed1..aad26491 100644 --- a/internal/webrtc/metrics.go +++ b/internal/webrtc/metrics.go @@ -3,11 +3,11 @@ package webrtc import ( "sync" + "github.com/demodesk/neko/pkg/types" "github.com/pion/rtcp" "github.com/pion/webrtc/v3" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/demodesk/neko/server/pkg/types" ) type metrics struct { diff --git a/internal/webrtc/peer.go b/internal/webrtc/peer.go index 7bb3c668..0c38cd27 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" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) type WebRTCPeerCtx struct { diff --git a/internal/webrtc/peerconnection.go b/internal/webrtc/peerconnection.go index 6554d113..bf8d013c 100644 --- a/internal/webrtc/peerconnection.go +++ b/internal/webrtc/peerconnection.go @@ -5,8 +5,8 @@ import ( "github.com/pion/webrtc/v3" "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/internal/webrtc/pionlog" - "gitlab.com/demodesk/neko/server/pkg/types/codec" + "github.com/demodesk/neko/internal/webrtc/pionlog" + "github.com/demodesk/neko/pkg/types/codec" ) 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 2d2fa59b..423b21e0 100644 --- a/internal/webrtc/peerstreamtrack.go +++ b/internal/webrtc/peerstreamtrack.go @@ -10,7 +10,7 @@ import ( "github.com/pion/webrtc/v3/pkg/media" "github.com/rs/zerolog" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/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 f42f5867..c2d0b992 100644 --- a/internal/webrtc/send.go +++ b/internal/webrtc/send.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - "gitlab.com/demodesk/neko/server/internal/webrtc/payload" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/internal/webrtc/payload" + "github.com/demodesk/neko/pkg/types" ) func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error { diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go index 0c02d082..3ee39238 100644 --- a/internal/websocket/filechooserdialog.go +++ b/internal/websocket/filechooserdialog.go @@ -1,9 +1,9 @@ package websocket import ( - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" ) func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { diff --git a/internal/websocket/handler/clipboard.go b/internal/websocket/handler/clipboard.go index 5b9eac9d..97935cea 100644 --- a/internal/websocket/handler/clipboard.go +++ b/internal/websocket/handler/clipboard.go @@ -3,8 +3,8 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/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 e0cb2a52..0b3ff7a1 100644 --- a/internal/websocket/handler/control.go +++ b/internal/websocket/handler/control.go @@ -3,10 +3,10 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" - "gitlab.com/demodesk/neko/server/pkg/xorg" + "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" ) var ( diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go index d87935b8..04b3f9dd 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" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" - "gitlab.com/demodesk/neko/server/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" ) func New( diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index e8124fb3..02f7ff57 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -3,8 +3,8 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/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 01a2c256..189f5b52 100644 --- a/internal/websocket/handler/screen.go +++ b/internal/websocket/handler/screen.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/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 df4f873b..211e5c83 100644 --- a/internal/websocket/handler/send.go +++ b/internal/websocket/handler/send.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/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 64346807..2c759776 100644 --- a/internal/websocket/handler/session.go +++ b/internal/websocket/handler/session.go @@ -1,9 +1,9 @@ package handler import ( - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/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 1b61e0ea..d994ffd8 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/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 90440a1d..6d0f2f66 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" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" ) func (h *MessageHandlerCtx) systemInit(session types.Session) error { diff --git a/internal/websocket/manager.go b/internal/websocket/manager.go index 824da0a2..5963d9ab 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" - "gitlab.com/demodesk/neko/server/internal/websocket/handler" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" - "gitlab.com/demodesk/neko/server/pkg/utils" + "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" ) // 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 6ba83ce6..d4176ef9 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" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/types/event" - "gitlab.com/demodesk/neko/server/pkg/types/message" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/types/event" + "github.com/demodesk/neko/pkg/types/message" ) type WebSocketPeerCtx struct { diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index 12c24155..24c5b2fc 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "gitlab.com/demodesk/neko/server/pkg/types" - "gitlab.com/demodesk/neko/server/pkg/utils" + "github.com/demodesk/neko/pkg/types" + "github.com/demodesk/neko/pkg/utils" ) type key int diff --git a/pkg/auth/auth_test.go b/pkg/auth/auth_test.go index 94f242ad..fa9b89e3 100644 --- a/pkg/auth/auth_test.go +++ b/pkg/auth/auth_test.go @@ -6,9 +6,9 @@ import ( "reflect" "testing" - "gitlab.com/demodesk/neko/server/internal/config" - "gitlab.com/demodesk/neko/server/internal/session" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/internal/config" + "github.com/demodesk/neko/internal/session" + "github.com/demodesk/neko/pkg/types" ) var i = 0 diff --git a/pkg/gst/gst.go b/pkg/gst/gst.go index dc1a1c04..80498dcb 100644 --- a/pkg/gst/gst.go +++ b/pkg/gst/gst.go @@ -16,7 +16,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) type Pipeline struct { diff --git a/pkg/types/capture.go b/pkg/types/capture.go index a2bf961b..0f599765 100644 --- a/pkg/types/capture.go +++ b/pkg/types/capture.go @@ -10,7 +10,7 @@ import ( "github.com/PaesslerAG/gval" "github.com/pion/webrtc/v3/pkg/media" - "gitlab.com/demodesk/neko/server/pkg/types/codec" + "github.com/demodesk/neko/pkg/types/codec" ) var ( diff --git a/pkg/types/message/messages.go b/pkg/types/message/messages.go index 8c6bfe61..24bfb67c 100644 --- a/pkg/types/message/messages.go +++ b/pkg/types/message/messages.go @@ -3,7 +3,7 @@ package message import ( "github.com/pion/webrtc/v3" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) ///////////////////////////// diff --git a/pkg/xorg/xorg.go b/pkg/xorg/xorg.go index 94a8126c..05e60ca7 100644 --- a/pkg/xorg/xorg.go +++ b/pkg/xorg/xorg.go @@ -15,7 +15,7 @@ import ( "time" "unsafe" - "gitlab.com/demodesk/neko/server/pkg/types" + "github.com/demodesk/neko/pkg/types" ) //go:generate ./keysymdef.sh