chore: Restructure files.

This commit is contained in:
imterah 2024-12-21 18:27:40 -05:00
parent 559588f726
commit d25da9091e
Signed by: imterah
GPG key ID: 8FA7DD57BA6CEA37
93 changed files with 38 additions and 26 deletions

8
.gitignore vendored
View file

@ -1,10 +1,10 @@
# Go artifacts
api/gosrc/sshbackend/sshbackend
api/gosrc/dummybackend/dummybackend
api/gosrc/externalbackendlauncher/externalbackendlauncher
backend/sshbackend/sshbackend
backend/dummybackend/dummybackend
backend/externalbackendlauncher/externalbackendlauncher
# LOM
lom/keys
sshfrontend/keys
# Output
out

View file

@ -5,7 +5,7 @@ import (
"net"
"os"
"git.greysoh.dev/imterah/nextnet/commonbackend"
"git.terah.dev/imterah/hermes/commonbackend"
"github.com/charmbracelet/log"
)
@ -226,10 +226,10 @@ func (helper *BackendApplicationHelper) Start() error {
}
func NewHelper(backend BackendInterface) *BackendApplicationHelper {
socketPath, ok := os.LookupEnv("NEXTNET_API_SOCK")
socketPath, ok := os.LookupEnv("HERMES_API_SOCK")
if !ok {
log.Warn("NEXTNET_API_SOCK is not defined! This will cause an issue unless the backend manually overwrites it")
log.Warn("HERMES_API_SOCK is not defined! This will cause an issue unless the backend manually overwrites it")
}
helper := &BackendApplicationHelper{

View file

@ -1,6 +1,6 @@
package backendutil
import "git.greysoh.dev/imterah/nextnet/commonbackend"
import "git.terah.dev/imterah/hermes/commonbackend"
type BackendInterface interface {
StartBackend(arguments []byte) (bool, error)

View file

@ -7,7 +7,7 @@ import (
"testing"
)
var logLevel = os.Getenv("NEXTNET_LOG_LEVEL")
var logLevel = os.Getenv("HERMES_LOG_LEVEL")
func TestStartCommandMarshalSupport(t *testing.T) {
commandInput := &Start{

2
backend/dev.env Normal file
View file

@ -0,0 +1,2 @@
HERMES_DATABASE_BACKEND=sqlite
HERMES_SQLITE_FILEPATH=../.tmp/sqlite.db

View file

@ -3,8 +3,8 @@ package main
import (
"os"
"git.greysoh.dev/imterah/nextnet/backendutil"
"git.greysoh.dev/imterah/nextnet/commonbackend"
"git.terah.dev/imterah/hermes/backendutil"
"git.terah.dev/imterah/hermes/commonbackend"
"github.com/charmbracelet/log"
)
@ -51,7 +51,7 @@ func (backend *DummyBackend) CheckParametersForBackend(arguments []byte) *common
func main() {
// When using logging, you should use charmbracelet/log, because that's what everything else uses in this ecosystem of a project. - imterah
logLevel := os.Getenv("NEXTNET_LOG_LEVEL")
logLevel := os.Getenv("HERMES_LOG_LEVEL")
if logLevel != "" {
switch logLevel {

View file

@ -8,8 +8,8 @@ import (
"strings"
"time"
"git.greysoh.dev/imterah/nextnet/backendlauncher"
"git.greysoh.dev/imterah/nextnet/commonbackend"
"git.terah.dev/imterah/hermes/backendlauncher"
"git.terah.dev/imterah/hermes/commonbackend"
"github.com/charmbracelet/log"
"github.com/urfave/cli/v2"
)
@ -25,6 +25,7 @@ type WriteLogger struct {
UseError bool
}
// TODO: deprecate UseError switching
func (writer WriteLogger) Write(p []byte) (n int, err error) {
logSplit := strings.Split(string(p), "\n")
@ -253,7 +254,7 @@ func entrypoint(cCtx *cli.Context) error {
// TODO: can we reuse cmd?
cmd := exec.Command(executablePath)
cmd.Env = append(cmd.Env, fmt.Sprintf("NEXTNET_API_SOCK=%s", sockPath), fmt.Sprintf("NEXTNET_LOG_LEVEL=%s", logLevel))
cmd.Env = append(cmd.Env, fmt.Sprintf("HERMES_API_SOCK=%s", sockPath), fmt.Sprintf("HERMES_LOG_LEVEL=%s", logLevel))
cmd.Stdout = stdout
cmd.Stderr = stderr
@ -276,7 +277,7 @@ func entrypoint(cCtx *cli.Context) error {
}
func main() {
logLevel = os.Getenv("NEXTNET_LOG_LEVEL")
logLevel = os.Getenv("HERMES_LOG_LEVEL")
if logLevel == "" {
logLevel = "fatal"
@ -300,7 +301,7 @@ func main() {
}
var err error
tempDir, err = os.MkdirTemp("", "nextnet-sockets-")
tempDir, err = os.MkdirTemp("", "hermes-sockets-")
if err != nil {
log.Fatalf("failed to create sockets directory: %s", err.Error())
@ -308,7 +309,7 @@ func main() {
app := &cli.App{
Name: "externalbackendlauncher",
Usage: "for development purposes only -- external backend launcher for NextNet",
Usage: "for development purposes only -- external backend launcher for Hermes",
Action: entrypoint,
Flags: []cli.Flag{
&cli.StringFlag{

View file

@ -1,4 +1,4 @@
module git.greysoh.dev/imterah/nextnet
module git.terah.dev/imterah/hermes
go 1.23.3

View file

@ -9,8 +9,8 @@ import (
"strings"
"sync"
"git.greysoh.dev/imterah/nextnet/backendutil"
"git.greysoh.dev/imterah/nextnet/commonbackend"
"git.terah.dev/imterah/hermes/backendutil"
"git.terah.dev/imterah/hermes/commonbackend"
"github.com/charmbracelet/log"
"golang.org/x/crypto/ssh"
)
@ -310,7 +310,7 @@ func (backend *SSHBackend) CheckParametersForBackend(arguments []byte) *commonba
}
func main() {
logLevel := os.Getenv("NEXTNET_LOG_LEVEL")
logLevel := os.Getenv("HERMES_LOG_LEVEL")
if logLevel != "" {
switch logLevel {

17
init.sh
View file

@ -9,18 +9,27 @@ if [ $? -ne 0 ]; then
docker compose -f dev-docker-compose.yml up -d
fi
if [ ! -f "api/.env" ]; then
if [ ! -f "backend/.env" ]; then
cp backend/dev.env backend/.env
fi
if [ ! -d "backend/.tmp" ]; then
mkdir backend/.tmp
fi
if [ ! -f "backend-legacy/.env" ]; then
cp api/dev.env api/.env
fi
if [ ! -d "api/node_modules" ]; then
pushd api > /dev/null
if [ ! -d "backend-legacy/node_modules" ]; then
pushd backend-legacy > /dev/null
npm install --save-dev
npx prisma migrate dev
popd > /dev/null
fi
source api/.env
source backend-legacy/.env
source backend/.env
on_exit() {
cd $(git rev-parse --show-toplevel)