mirror of
https://github.com/akyaiy/GoSally-mvp.git
synced 2026-01-03 04:52:26 +00:00
some changes
This commit is contained in:
2
Makefile
2
Makefile
@@ -29,7 +29,7 @@ build:
|
|||||||
@echo "Building..."
|
@echo "Building..."
|
||||||
@# @echo "CGO_CFLAGS is: '$(CGO_CFLAGS)'"
|
@# @echo "CGO_CFLAGS is: '$(CGO_CFLAGS)'"
|
||||||
@# @echo "CGO_LDFLAGS is: '$(CGO_LDFLAGS)'"
|
@# @echo "CGO_LDFLAGS is: '$(CGO_LDFLAGS)'"
|
||||||
@# CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)"
|
@# CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)"
|
||||||
@go build -trimpath -ldflags "-w -s $(LDFLAGS)" -o $(BIN_DIR)/$(APP_NAME) ./
|
@go build -trimpath -ldflags "-w -s $(LDFLAGS)" -o $(BIN_DIR)/$(APP_NAME) ./
|
||||||
# @if ! command -v upx >/dev/null 2>&1; then \
|
# @if ! command -v upx >/dev/null 2>&1; then \
|
||||||
# echo "upx not found, skipping compression."; \
|
# echo "upx not found, skipping compression."; \
|
||||||
|
|||||||
@@ -7,9 +7,9 @@ import (
|
|||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/hooks"
|
"github.com/akyaiy/GoSally-mvp/src/hooks"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/colors"
|
"github.com/akyaiy/GoSally-mvp/src/internal/colors"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/corestate"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/corestate"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package cmd
|
package cmd
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/akyaiy/GoSally-mvp/hooks"
|
"github.com/akyaiy/GoSally-mvp/src/hooks"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/config"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/config"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
module github.com/akyaiy/GoSally-mvp
|
module github.com/akyaiy/GoSally-mvp/src
|
||||||
|
|
||||||
go 1.24.4
|
go 1.24.4
|
||||||
|
|
||||||
@@ -18,13 +18,13 @@ import (
|
|||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/colors"
|
"github.com/akyaiy/GoSally-mvp/src/internal/colors"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/corestate"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/corestate"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/run_manager"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/run_manager"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/utils"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/utils"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/app"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/app"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/config"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/config"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/logs"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/logs"
|
||||||
"gopkg.in/ini.v1"
|
"gopkg.in/ini.v1"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -11,17 +11,17 @@ import (
|
|||||||
"regexp"
|
"regexp"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/colors"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/corestate"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/corestate"
|
"github.com/akyaiy/GoSally-mvp/src/internal/colors"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/run_manager"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/run_manager"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/update"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/update"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/utils"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/utils"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/app"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/app"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/config"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/config"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/logs"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/logs"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/server/gateway"
|
"github.com/akyaiy/GoSally-mvp/src/internal/server/gateway"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/server/session"
|
"github.com/akyaiy/GoSally-mvp/src/internal/server/session"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/server/sv1"
|
"github.com/akyaiy/GoSally-mvp/src/internal/server/sv1"
|
||||||
"github.com/go-chi/chi/v5"
|
"github.com/go-chi/chi/v5"
|
||||||
"github.com/go-chi/cors"
|
"github.com/go-chi/cors"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/utils"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/utils"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/config"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
// GetNodeUUID outputs the correct uuid from the file at the path specified in the arguments.
|
// GetNodeUUID outputs the correct uuid from the file at the path specified in the arguments.
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/utils"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
type RunManagerContract interface {
|
type RunManagerContract interface {
|
||||||
|
|||||||
@@ -13,10 +13,10 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/run_manager"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/run_manager"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/utils"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/utils"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/app"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/app"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/config"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/config"
|
||||||
"golang.org/x/net/context"
|
"golang.org/x/net/context"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/config"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewUUIDRaw(length int) ([]byte, error) {
|
func NewUUIDRaw(length int) ([]byte, error) {
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/corestate"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/corestate"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/config"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
type AppContract interface {
|
type AppContract interface {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"reflect"
|
"reflect"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/colors"
|
"github.com/akyaiy/GoSally-mvp/src/internal/colors"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (c *Compositor) Print(v any) {
|
func (c *Compositor) Print(v any) {
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/config"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/config"
|
||||||
"gopkg.in/natefinch/lumberjack.v2"
|
"gopkg.in/natefinch/lumberjack.v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ package lua
|
|||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/corestate"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/corestate"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/app"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/app"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/server/rpc"
|
"github.com/akyaiy/GoSally-mvp/src/internal/server/rpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
type LuaEngineDeps struct {
|
type LuaEngineDeps struct {
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/corestate"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/corestate"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/app"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/app"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/server/rpc"
|
"github.com/akyaiy/GoSally-mvp/src/internal/server/rpc"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/server/session"
|
"github.com/akyaiy/GoSally-mvp/src/internal/server/session"
|
||||||
)
|
)
|
||||||
|
|
||||||
// serversApiVer is a type alias for string, used to represent API version strings in the GeneralServer.
|
// serversApiVer is a type alias for string, used to represent API version strings in the GeneralServer.
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ package gateway
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/corestate"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/corestate"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/app"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/app"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/server/session"
|
"github.com/akyaiy/GoSally-mvp/src/internal/server/session"
|
||||||
)
|
)
|
||||||
|
|
||||||
// GeneralServerInit structure only for initialization general server.
|
// GeneralServerInit structure only for initialization general server.
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/utils"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/utils"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/server/rpc"
|
"github.com/akyaiy/GoSally-mvp/src/internal/server/rpc"
|
||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/corestate"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/corestate"
|
||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/server/rpc"
|
"github.com/akyaiy/GoSally-mvp/src/internal/server/rpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (h *HandlerV1) Handle(_ context.Context, sid string, r *http.Request, req *rpc.RPCRequest) *rpc.RPCResponse {
|
func (h *HandlerV1) Handle(_ context.Context, sid string, r *http.Request, req *rpc.RPCRequest) *rpc.RPCResponse {
|
||||||
|
|||||||
@@ -17,8 +17,8 @@ import (
|
|||||||
|
|
||||||
"golang.org/x/crypto/bcrypt"
|
"golang.org/x/crypto/bcrypt"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/colors"
|
"github.com/akyaiy/GoSally-mvp/src/internal/colors"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/server/rpc"
|
"github.com/akyaiy/GoSally-mvp/src/internal/server/rpc"
|
||||||
lua "github.com/yuin/gopher-lua"
|
lua "github.com/yuin/gopher-lua"
|
||||||
_ "modernc.org/sqlite"
|
_ "modernc.org/sqlite"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/server/rpc"
|
"github.com/akyaiy/GoSally-mvp/src/internal/server/rpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
var RPCMethodSeparator = "."
|
var RPCMethodSeparator = "."
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ package sv1
|
|||||||
import (
|
import (
|
||||||
"regexp"
|
"regexp"
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/core/corestate"
|
"github.com/akyaiy/GoSally-mvp/src/internal/core/corestate"
|
||||||
"github.com/akyaiy/GoSally-mvp/internal/engine/app"
|
"github.com/akyaiy/GoSally-mvp/src/internal/engine/app"
|
||||||
)
|
)
|
||||||
|
|
||||||
// HandlerV1InitStruct structure is only for initialization
|
// HandlerV1InitStruct structure is only for initialization
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/akyaiy/GoSally-mvp/cmd"
|
"github.com/akyaiy/GoSally-mvp/src/cmd"
|
||||||
_ "modernc.org/sqlite"
|
_ "modernc.org/sqlite"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user