move shared code to pkg.

cmd/neko/main.go

@@ -7,7 +7,7 @@ import (
 
 	neko "gitlab.com/demodesk/neko/server"
 	"gitlab.com/demodesk/neko/server/cmd"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 func main() {

internal/api/members/bluk.go

@@ -5,8 +5,8 @@ import (
 	"io"
 	"net/http"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 type MemberBulkUpdatePayload struct {

internal/api/members/controler.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"strconv"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 type MemberDataPayload struct {

internal/api/members/handler.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/go-chi/chi"
 
-	"gitlab.com/demodesk/neko/server/internal/http/auth"
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/auth"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 type key int

internal/api/room/broadcast.go

@@ -3,9 +3,9 @@ package room
 import (
 	"net/http"
 
-	"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/pkg/types/event"
+	"gitlab.com/demodesk/neko/server/pkg/types/message"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 type BroadcastStatusPayload struct {

internal/api/room/clipboard.go

@@ -7,8 +7,8 @@ import (
 
 	"net/http"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 type ClipboardPayload struct {

internal/api/room/control.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/go-chi/chi"
 
-	"gitlab.com/demodesk/neko/server/internal/http/auth"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/auth"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 type ControlStatusPayload struct {

internal/api/room/handler.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"net/http"
 
-	"gitlab.com/demodesk/neko/server/internal/http/auth"
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/auth"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 type RoomHandler struct {

internal/api/room/keyboard.go

@@ -3,8 +3,8 @@ package room
 import (
 	"net/http"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 type KeyboardMapData struct {

internal/api/room/screen.go

@@ -4,10 +4,10 @@ import (
 	"net/http"
 	"strconv"
 
-	"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/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"
 )
 
 type ScreenConfigurationPayload struct {

internal/api/room/upload.go

@@ -7,7 +7,7 @@ import (
 	"path"
 	"strconv"
 
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 // TODO: Extract file uploading to custom utility.

internal/api/router.go

@@ -8,9 +8,9 @@ import (
 	"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"
+	"gitlab.com/demodesk/neko/server/pkg/auth"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 type ApiManagerCtx struct {

internal/api/session.go

@@ -3,9 +3,9 @@ package api
 import (
 	"net/http"
 
-	"gitlab.com/demodesk/neko/server/internal/http/auth"
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/auth"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 type SessionLoginPayload struct {

internal/capture/broadcast.go

@@ -7,8 +7,8 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
-	"gitlab.com/demodesk/neko/server/internal/capture/gst"
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/gst"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 type BroacastManagerCtx struct {

internal/capture/manager.go

@@ -9,8 +9,8 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"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/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/types/codec"
 )
 
 type CaptureManagerCtx struct {

internal/capture/screencast.go

@@ -9,8 +9,8 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
-	"gitlab.com/demodesk/neko/server/internal/capture/gst"
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/gst"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 // timeout between intervals, when screencast pipeline is checked

internal/capture/streamsink.go

@@ -8,9 +8,9 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
-	"gitlab.com/demodesk/neko/server/internal/capture/gst"
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/types/codec"
+	"gitlab.com/demodesk/neko/server/pkg/gst"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/types/codec"
 )
 
 var moveSinkListenerMu = sync.Mutex{}

internal/capture/streamsrc.go

@@ -7,9 +7,9 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
-	"gitlab.com/demodesk/neko/server/internal/capture/gst"
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/types/codec"
+	"gitlab.com/demodesk/neko/server/pkg/gst"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/types/codec"
 )
 
 type StreamSrcManagerCtx struct {

internal/config/capture.go

@@ -8,9 +8,9 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/types/codec"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/types/codec"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 type Capture struct {

internal/config/server.go

@@ -4,7 +4,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 type Server struct {

internal/config/webrtc.go

@@ -8,8 +8,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 // default stun server

internal/desktop/clipboard.go

@@ -6,7 +6,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 func (manager *DesktopManagerCtx) ClipboardGetText() (*types.ClipboardText, error) {

internal/desktop/drop.go

@@ -3,7 +3,7 @@ package desktop
 import (
 	"time"
 
-	"gitlab.com/demodesk/neko/server/internal/desktop/drop"
+	"gitlab.com/demodesk/neko/server/pkg/drop"
 )
 
 // repeat move event multiple times

internal/desktop/filechooserdialog.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"os/exec"
 
-	"gitlab.com/demodesk/neko/server/internal/desktop/xorg"
+	"gitlab.com/demodesk/neko/server/pkg/xorg"
 )
 
 // name of the window that is being controlled

internal/desktop/manager.go

@@ -10,8 +10,8 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"gitlab.com/demodesk/neko/server/internal/config"
-	"gitlab.com/demodesk/neko/server/internal/desktop/xevent"
-	"gitlab.com/demodesk/neko/server/internal/desktop/xorg"
+	"gitlab.com/demodesk/neko/server/pkg/xevent"
+	"gitlab.com/demodesk/neko/server/pkg/xorg"
 )
 
 var mu = sync.Mutex{}

internal/desktop/xevent.go

@@ -1,7 +1,7 @@
 package desktop
 
 import (
-	"gitlab.com/demodesk/neko/server/internal/desktop/xevent"
+	"gitlab.com/demodesk/neko/server/pkg/xevent"
 )
 
 func (manager *DesktopManagerCtx) OnCursorChanged(listener func(serial uint64)) {

internal/desktop/xorg.go

@@ -6,8 +6,8 @@ import (
 	"regexp"
 	"time"
 
-	"gitlab.com/demodesk/neko/server/internal/desktop/xorg"
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/xorg"
 )
 
 func (manager *DesktopManagerCtx) Move(x, y int) {

internal/http/debug.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-chi/chi"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 func pprofHandler(r types.Router) {

internal/http/logger.go

@@ -8,8 +8,8 @@ import (
 	"github.com/go-chi/chi/middleware"
 	"github.com/rs/zerolog"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 type logFormatter struct {

internal/http/manager.go

@@ -10,7 +10,7 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"gitlab.com/demodesk/neko/server/internal/config"
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 type HttpManagerCtx struct {

internal/http/router.go

@@ -7,9 +7,9 @@ import (
 	"github.com/go-chi/chi/middleware"
 	"github.com/rs/zerolog"
 
-	"gitlab.com/demodesk/neko/server/internal/http/auth"
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/auth"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 type router struct {

internal/member/dummy/provider.go

@@ -3,7 +3,7 @@ package dummy
 import (
 	"errors"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 func New() types.MemberProvider {

internal/member/file/provider.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"os"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 func New(config Config) types.MemberProvider {

internal/member/file/types.go

@@ -1,7 +1,7 @@
 package file
 
 import (
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 type MemberEntry struct {

internal/member/manager.go

@@ -11,7 +11,7 @@ import (
 	"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"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 func New(sessions types.SessionManager, config *config.Member) *MemberManagerCtx {

internal/member/object/provider.go

@@ -1,7 +1,7 @@
 package object
 
 import (
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 func New(config Config) types.MemberProvider {

internal/member/object/types.go

@@ -1,7 +1,7 @@
 package object
 
 import (
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 type MemberEntry struct {

internal/session/auth.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 func (manager *SessionManagerCtx) CookieSetToken(w http.ResponseWriter, token string) {

internal/session/manager.go

@@ -9,8 +9,8 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"gitlab.com/demodesk/neko/server/internal/config"
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 func New(config *config.Session) *SessionManagerCtx {

internal/session/session.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/rs/zerolog"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/types/event"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/types/event"
 )
 
 type SessionCtx struct {

internal/webrtc/cursor/image.go

@@ -7,8 +7,8 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 func NewImage(desktop types.DesktopManager) *ImageCtx {

internal/webrtc/handler.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"encoding/binary"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
 	"gitlab.com/demodesk/neko/server/internal/webrtc/payload"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 func (manager *WebRTCManagerCtx) handle(data []byte, session types.Session) error {

internal/webrtc/manager.go

@@ -14,12 +14,12 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"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"
+	"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"
 )
 
 // the duration without network activity before a Agent is considered disconnected. Default is 5 Seconds

internal/webrtc/peer.go

@@ -6,7 +6,7 @@ import (
 	"github.com/pion/webrtc/v3"
 	"github.com/rs/zerolog"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 type WebRTCPeerCtx struct {

internal/webrtc/peerconnection.go

@@ -5,8 +5,8 @@ import (
 	"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"
+	"gitlab.com/demodesk/neko/server/pkg/types/codec"
 )
 
 func (manager *WebRTCManagerCtx) newPeerConnection(codecs []codec.RTPCodec, logger zerolog.Logger) (*webrtc.PeerConnection, error) {

internal/webrtc/peerstreamtrack.go

@@ -9,7 +9,7 @@ import (
 	"github.com/pion/webrtc/v3/pkg/media"
 	"github.com/rs/zerolog"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 func (manager *WebRTCManagerCtx) newPeerStreamTrack(stream types.StreamSinkManager, logger zerolog.Logger) (*PeerStreamTrack, error) {

internal/webrtc/send.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"encoding/binary"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
 	"gitlab.com/demodesk/neko/server/internal/webrtc/payload"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error {

internal/websocket/filechooserdialog.go

@@ -1,9 +1,9 @@
 package websocket
 
 import (
-	"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/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/types/event"
+	"gitlab.com/demodesk/neko/server/pkg/types/message"
 )
 
 func (manager *WebSocketManagerCtx) fileChooserDialogEvents() {

internal/websocket/handler/clipboard.go

@@ -3,8 +3,8 @@ package handler
 import (
 	"errors"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/types/message"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/types/message"
 )
 
 func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message.ClipboardData) error {

internal/websocket/handler/control.go

@@ -3,10 +3,10 @@ package handler
 import (
 	"errors"
 
-	"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"
+	"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"
 )
 
 var (

internal/websocket/handler/handler.go

@@ -4,10 +4,10 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
-	"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/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"
 )
 
 func New(

internal/websocket/handler/keyboard.go

@@ -3,8 +3,8 @@ package handler
 import (
 	"errors"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/types/message"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/types/message"
 )
 
 func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message.KeyboardMap) error {

internal/websocket/handler/screen.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"errors"
 
-	"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/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/types/event"
+	"gitlab.com/demodesk/neko/server/pkg/types/message"
 )
 
 func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenSize) error {

internal/websocket/handler/send.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"errors"
 
-	"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/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/types/event"
+	"gitlab.com/demodesk/neko/server/pkg/types/message"
 )
 
 func (h *MessageHandlerCtx) sendUnicast(session types.Session, payload *message.SendUnicast) error {

internal/websocket/handler/session.go

@@ -1,9 +1,9 @@
 package handler
 
 import (
-	"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/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/types/event"
+	"gitlab.com/demodesk/neko/server/pkg/types/message"
 )
 
 func (h *MessageHandlerCtx) SessionCreated(session types.Session) error {

internal/websocket/handler/signal.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"errors"
 
-	"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/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/types/event"
+	"gitlab.com/demodesk/neko/server/pkg/types/message"
 )
 
 func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *message.SignalVideo) error {

internal/websocket/handler/system.go

@@ -6,9 +6,9 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
-	"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/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/types/event"
+	"gitlab.com/demodesk/neko/server/pkg/types/message"
 )
 
 func (h *MessageHandlerCtx) systemInit(session types.Session) error {

internal/websocket/manager.go

@@ -10,11 +10,11 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
-	"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"
+	"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"
 )
 
 // send pings to peer with this period - must be less than pongWait

internal/websocket/peer.go

@@ -9,9 +9,9 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
-	"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/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/types/event"
+	"gitlab.com/demodesk/neko/server/pkg/types/message"
 )
 
 type WebSocketPeerCtx struct {

pkg/auth/auth.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"net/http"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
-	"gitlab.com/demodesk/neko/server/internal/utils"
+	"gitlab.com/demodesk/neko/server/pkg/types"
+	"gitlab.com/demodesk/neko/server/pkg/utils"
 )
 
 type key int

pkg/gst/gst.go

@@ -13,10 +13,10 @@ import (
 	"time"
 	"unsafe"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
-
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
+
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 type Pipeline struct {

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/internal/types/codec"
+	"gitlab.com/demodesk/neko/server/pkg/types/codec"
 )
 
 var (

pkg/types/message/messages.go

@@ -3,7 +3,7 @@ package message
 import (
 	"github.com/pion/webrtc/v3"
 
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 /////////////////////////////

pkg/xorg/xorg.go

@@ -9,14 +9,13 @@ import "C"
 
 import (
 	"fmt"
+	"image"
+	"image/color"
 	"sync"
 	"time"
 	"unsafe"
 
-	"image"
-	"image/color"
-
-	"gitlab.com/demodesk/neko/server/internal/types"
+	"gitlab.com/demodesk/neko/server/pkg/types"
 )
 
 //go:generate ./keysymdef.sh