diff --git a/.gitignore b/.gitignore index 71b4ac0..df99423 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/api/Dockerfile b/backend-legacy/Dockerfile similarity index 100% rename from api/Dockerfile rename to backend-legacy/Dockerfile diff --git a/api/dev.env b/backend-legacy/dev.env similarity index 100% rename from api/dev.env rename to backend-legacy/dev.env diff --git a/api/docker-entrypoint.sh b/backend-legacy/docker-entrypoint.sh similarity index 100% rename from api/docker-entrypoint.sh rename to backend-legacy/docker-entrypoint.sh diff --git a/api/eslint.config.js b/backend-legacy/eslint.config.js similarity index 100% rename from api/eslint.config.js rename to backend-legacy/eslint.config.js diff --git a/api/package-lock.json b/backend-legacy/package-lock.json similarity index 100% rename from api/package-lock.json rename to backend-legacy/package-lock.json diff --git a/api/package.json b/backend-legacy/package.json similarity index 100% rename from api/package.json rename to backend-legacy/package.json diff --git a/api/prisma/migrations/20240421200334_init/migration.sql b/backend-legacy/prisma/migrations/20240421200334_init/migration.sql similarity index 100% rename from api/prisma/migrations/20240421200334_init/migration.sql rename to backend-legacy/prisma/migrations/20240421200334_init/migration.sql diff --git a/api/prisma/migrations/20240421210417_fix_remove_destip/migration.sql b/backend-legacy/prisma/migrations/20240421210417_fix_remove_destip/migration.sql similarity index 100% rename from api/prisma/migrations/20240421210417_fix_remove_destip/migration.sql rename to backend-legacy/prisma/migrations/20240421210417_fix_remove_destip/migration.sql diff --git a/api/prisma/migrations/20240425125737_fix_adds_protocol_field/migration.sql b/backend-legacy/prisma/migrations/20240425125737_fix_adds_protocol_field/migration.sql similarity index 100% rename from api/prisma/migrations/20240425125737_fix_adds_protocol_field/migration.sql rename to backend-legacy/prisma/migrations/20240425125737_fix_adds_protocol_field/migration.sql diff --git a/api/prisma/migrations/20240505233740_feature_adds_username_support/migration.sql b/backend-legacy/prisma/migrations/20240505233740_feature_adds_username_support/migration.sql similarity index 100% rename from api/prisma/migrations/20240505233740_feature_adds_username_support/migration.sql rename to backend-legacy/prisma/migrations/20240505233740_feature_adds_username_support/migration.sql diff --git a/api/prisma/migrations/migration_lock.toml b/backend-legacy/prisma/migrations/migration_lock.toml similarity index 100% rename from api/prisma/migrations/migration_lock.toml rename to backend-legacy/prisma/migrations/migration_lock.toml diff --git a/api/prisma/schema.prisma b/backend-legacy/prisma/schema.prisma similarity index 100% rename from api/prisma/schema.prisma rename to backend-legacy/prisma/schema.prisma diff --git a/api/routes/NextNet API/Backend/Create.bru b/backend-legacy/routes/NextNet API/Backend/Create.bru similarity index 100% rename from api/routes/NextNet API/Backend/Create.bru rename to backend-legacy/routes/NextNet API/Backend/Create.bru diff --git a/api/routes/NextNet API/Backend/Lookup.bru b/backend-legacy/routes/NextNet API/Backend/Lookup.bru similarity index 100% rename from api/routes/NextNet API/Backend/Lookup.bru rename to backend-legacy/routes/NextNet API/Backend/Lookup.bru diff --git a/api/routes/NextNet API/Backend/Remove.bru b/backend-legacy/routes/NextNet API/Backend/Remove.bru similarity index 100% rename from api/routes/NextNet API/Backend/Remove.bru rename to backend-legacy/routes/NextNet API/Backend/Remove.bru diff --git a/api/routes/NextNet API/Forward/Create.bru b/backend-legacy/routes/NextNet API/Forward/Create.bru similarity index 100% rename from api/routes/NextNet API/Forward/Create.bru rename to backend-legacy/routes/NextNet API/Forward/Create.bru diff --git a/api/routes/NextNet API/Forward/Get Inbound Connections.bru b/backend-legacy/routes/NextNet API/Forward/Get Inbound Connections.bru similarity index 100% rename from api/routes/NextNet API/Forward/Get Inbound Connections.bru rename to backend-legacy/routes/NextNet API/Forward/Get Inbound Connections.bru diff --git a/api/routes/NextNet API/Forward/Lookup.bru b/backend-legacy/routes/NextNet API/Forward/Lookup.bru similarity index 100% rename from api/routes/NextNet API/Forward/Lookup.bru rename to backend-legacy/routes/NextNet API/Forward/Lookup.bru diff --git a/api/routes/NextNet API/Forward/Remove.bru b/backend-legacy/routes/NextNet API/Forward/Remove.bru similarity index 100% rename from api/routes/NextNet API/Forward/Remove.bru rename to backend-legacy/routes/NextNet API/Forward/Remove.bru diff --git a/api/routes/NextNet API/Forward/Start.bru b/backend-legacy/routes/NextNet API/Forward/Start.bru similarity index 100% rename from api/routes/NextNet API/Forward/Start.bru rename to backend-legacy/routes/NextNet API/Forward/Start.bru diff --git a/api/routes/NextNet API/Forward/Stop.bru b/backend-legacy/routes/NextNet API/Forward/Stop.bru similarity index 100% rename from api/routes/NextNet API/Forward/Stop.bru rename to backend-legacy/routes/NextNet API/Forward/Stop.bru diff --git a/api/routes/NextNet API/Get Permissions.bru b/backend-legacy/routes/NextNet API/Get Permissions.bru similarity index 100% rename from api/routes/NextNet API/Get Permissions.bru rename to backend-legacy/routes/NextNet API/Get Permissions.bru diff --git a/api/routes/NextNet API/Users/Create.bru b/backend-legacy/routes/NextNet API/Users/Create.bru similarity index 100% rename from api/routes/NextNet API/Users/Create.bru rename to backend-legacy/routes/NextNet API/Users/Create.bru diff --git a/api/routes/NextNet API/Users/Log In.bru b/backend-legacy/routes/NextNet API/Users/Log In.bru similarity index 100% rename from api/routes/NextNet API/Users/Log In.bru rename to backend-legacy/routes/NextNet API/Users/Log In.bru diff --git a/api/routes/NextNet API/Users/Lookup.bru b/backend-legacy/routes/NextNet API/Users/Lookup.bru similarity index 100% rename from api/routes/NextNet API/Users/Lookup.bru rename to backend-legacy/routes/NextNet API/Users/Lookup.bru diff --git a/api/routes/NextNet API/Users/Remove.bru b/backend-legacy/routes/NextNet API/Users/Remove.bru similarity index 100% rename from api/routes/NextNet API/Users/Remove.bru rename to backend-legacy/routes/NextNet API/Users/Remove.bru diff --git a/api/routes/NextNet API/bruno.json b/backend-legacy/routes/NextNet API/bruno.json similarity index 100% rename from api/routes/NextNet API/bruno.json rename to backend-legacy/routes/NextNet API/bruno.json diff --git a/api/routes/NextNet API/runroute.sh b/backend-legacy/routes/NextNet API/runroute.sh similarity index 100% rename from api/routes/NextNet API/runroute.sh rename to backend-legacy/routes/NextNet API/runroute.sh diff --git a/api/routes/Passyfire Base Routes/Passyfire Base Routes/Get All Scopes.bru b/backend-legacy/routes/Passyfire Base Routes/Passyfire Base Routes/Get All Scopes.bru similarity index 100% rename from api/routes/Passyfire Base Routes/Passyfire Base Routes/Get All Scopes.bru rename to backend-legacy/routes/Passyfire Base Routes/Passyfire Base Routes/Get All Scopes.bru diff --git a/api/routes/Passyfire Base Routes/Passyfire Base Routes/Get Tunnels.bru b/backend-legacy/routes/Passyfire Base Routes/Passyfire Base Routes/Get Tunnels.bru similarity index 100% rename from api/routes/Passyfire Base Routes/Passyfire Base Routes/Get Tunnels.bru rename to backend-legacy/routes/Passyfire Base Routes/Passyfire Base Routes/Get Tunnels.bru diff --git a/api/routes/Passyfire Base Routes/Passyfire Base Routes/Log In.bru b/backend-legacy/routes/Passyfire Base Routes/Passyfire Base Routes/Log In.bru similarity index 100% rename from api/routes/Passyfire Base Routes/Passyfire Base Routes/Log In.bru rename to backend-legacy/routes/Passyfire Base Routes/Passyfire Base Routes/Log In.bru diff --git a/api/routes/Passyfire Base Routes/Passyfire Base Routes/bruno.json b/backend-legacy/routes/Passyfire Base Routes/Passyfire Base Routes/bruno.json similarity index 100% rename from api/routes/Passyfire Base Routes/Passyfire Base Routes/bruno.json rename to backend-legacy/routes/Passyfire Base Routes/Passyfire Base Routes/bruno.json diff --git a/api/src/backendimpl/base.ts b/backend-legacy/src/backendimpl/base.ts similarity index 100% rename from api/src/backendimpl/base.ts rename to backend-legacy/src/backendimpl/base.ts diff --git a/api/src/backendimpl/index.ts b/backend-legacy/src/backendimpl/index.ts similarity index 100% rename from api/src/backendimpl/index.ts rename to backend-legacy/src/backendimpl/index.ts diff --git a/api/src/backendimpl/passyfire-reimpl/index.ts b/backend-legacy/src/backendimpl/passyfire-reimpl/index.ts similarity index 100% rename from api/src/backendimpl/passyfire-reimpl/index.ts rename to backend-legacy/src/backendimpl/passyfire-reimpl/index.ts diff --git a/api/src/backendimpl/passyfire-reimpl/routes.ts b/backend-legacy/src/backendimpl/passyfire-reimpl/routes.ts similarity index 100% rename from api/src/backendimpl/passyfire-reimpl/routes.ts rename to backend-legacy/src/backendimpl/passyfire-reimpl/routes.ts diff --git a/api/src/backendimpl/passyfire-reimpl/socket.ts b/backend-legacy/src/backendimpl/passyfire-reimpl/socket.ts similarity index 100% rename from api/src/backendimpl/passyfire-reimpl/socket.ts rename to backend-legacy/src/backendimpl/passyfire-reimpl/socket.ts diff --git a/api/src/backendimpl/ssh.ts b/backend-legacy/src/backendimpl/ssh.ts similarity index 100% rename from api/src/backendimpl/ssh.ts rename to backend-legacy/src/backendimpl/ssh.ts diff --git a/api/src/index.ts b/backend-legacy/src/index.ts similarity index 100% rename from api/src/index.ts rename to backend-legacy/src/index.ts diff --git a/api/src/libs/backendInit.ts b/backend-legacy/src/libs/backendInit.ts similarity index 100% rename from api/src/libs/backendInit.ts rename to backend-legacy/src/libs/backendInit.ts diff --git a/api/src/libs/generateRandom.ts b/backend-legacy/src/libs/generateRandom.ts similarity index 100% rename from api/src/libs/generateRandom.ts rename to backend-legacy/src/libs/generateRandom.ts diff --git a/api/src/libs/permissions.ts b/backend-legacy/src/libs/permissions.ts similarity index 100% rename from api/src/libs/permissions.ts rename to backend-legacy/src/libs/permissions.ts diff --git a/api/src/libs/types.ts b/backend-legacy/src/libs/types.ts similarity index 100% rename from api/src/libs/types.ts rename to backend-legacy/src/libs/types.ts diff --git a/api/src/routes/ROUTE_PLAN.md b/backend-legacy/src/routes/ROUTE_PLAN.md similarity index 100% rename from api/src/routes/ROUTE_PLAN.md rename to backend-legacy/src/routes/ROUTE_PLAN.md diff --git a/api/src/routes/backends/create.ts b/backend-legacy/src/routes/backends/create.ts similarity index 100% rename from api/src/routes/backends/create.ts rename to backend-legacy/src/routes/backends/create.ts diff --git a/api/src/routes/backends/lookup.ts b/backend-legacy/src/routes/backends/lookup.ts similarity index 100% rename from api/src/routes/backends/lookup.ts rename to backend-legacy/src/routes/backends/lookup.ts diff --git a/api/src/routes/backends/remove.ts b/backend-legacy/src/routes/backends/remove.ts similarity index 100% rename from api/src/routes/backends/remove.ts rename to backend-legacy/src/routes/backends/remove.ts diff --git a/api/src/routes/forward/connections.ts b/backend-legacy/src/routes/forward/connections.ts similarity index 100% rename from api/src/routes/forward/connections.ts rename to backend-legacy/src/routes/forward/connections.ts diff --git a/api/src/routes/forward/create.ts b/backend-legacy/src/routes/forward/create.ts similarity index 100% rename from api/src/routes/forward/create.ts rename to backend-legacy/src/routes/forward/create.ts diff --git a/api/src/routes/forward/lookup.ts b/backend-legacy/src/routes/forward/lookup.ts similarity index 100% rename from api/src/routes/forward/lookup.ts rename to backend-legacy/src/routes/forward/lookup.ts diff --git a/api/src/routes/forward/remove.ts b/backend-legacy/src/routes/forward/remove.ts similarity index 100% rename from api/src/routes/forward/remove.ts rename to backend-legacy/src/routes/forward/remove.ts diff --git a/api/src/routes/forward/start.ts b/backend-legacy/src/routes/forward/start.ts similarity index 100% rename from api/src/routes/forward/start.ts rename to backend-legacy/src/routes/forward/start.ts diff --git a/api/src/routes/forward/stop.ts b/backend-legacy/src/routes/forward/stop.ts similarity index 100% rename from api/src/routes/forward/stop.ts rename to backend-legacy/src/routes/forward/stop.ts diff --git a/api/src/routes/getPermissions.ts b/backend-legacy/src/routes/getPermissions.ts similarity index 100% rename from api/src/routes/getPermissions.ts rename to backend-legacy/src/routes/getPermissions.ts diff --git a/api/src/routes/user/create.ts b/backend-legacy/src/routes/user/create.ts similarity index 100% rename from api/src/routes/user/create.ts rename to backend-legacy/src/routes/user/create.ts diff --git a/api/src/routes/user/login.ts b/backend-legacy/src/routes/user/login.ts similarity index 100% rename from api/src/routes/user/login.ts rename to backend-legacy/src/routes/user/login.ts diff --git a/api/src/routes/user/lookup.ts b/backend-legacy/src/routes/user/lookup.ts similarity index 100% rename from api/src/routes/user/lookup.ts rename to backend-legacy/src/routes/user/lookup.ts diff --git a/api/src/routes/user/remove.ts b/backend-legacy/src/routes/user/remove.ts similarity index 100% rename from api/src/routes/user/remove.ts rename to backend-legacy/src/routes/user/remove.ts diff --git a/api/src/tools/exportDBContents.ts b/backend-legacy/src/tools/exportDBContents.ts similarity index 100% rename from api/src/tools/exportDBContents.ts rename to backend-legacy/src/tools/exportDBContents.ts diff --git a/api/srcpatch.sh b/backend-legacy/srcpatch.sh similarity index 100% rename from api/srcpatch.sh rename to backend-legacy/srcpatch.sh diff --git a/api/tsconfig.json b/backend-legacy/tsconfig.json similarity index 100% rename from api/tsconfig.json rename to backend-legacy/tsconfig.json diff --git a/api/gosrc/backendlauncher/backendlauncher.go b/backend/backendlauncher/backendlauncher.go similarity index 100% rename from api/gosrc/backendlauncher/backendlauncher.go rename to backend/backendlauncher/backendlauncher.go diff --git a/api/gosrc/backendutil/application.go b/backend/backendutil/application.go similarity index 96% rename from api/gosrc/backendutil/application.go rename to backend/backendutil/application.go index b463381..926f000 100644 --- a/api/gosrc/backendutil/application.go +++ b/backend/backendutil/application.go @@ -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{ diff --git a/api/gosrc/backendutil/structure.go b/backend/backendutil/structure.go similarity index 90% rename from api/gosrc/backendutil/structure.go rename to backend/backendutil/structure.go index 1d3036e..5bdcfa4 100644 --- a/api/gosrc/backendutil/structure.go +++ b/backend/backendutil/structure.go @@ -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) diff --git a/api/gosrc/commonbackend/constants.go b/backend/commonbackend/constants.go similarity index 100% rename from api/gosrc/commonbackend/constants.go rename to backend/commonbackend/constants.go diff --git a/api/gosrc/commonbackend/marshal.go b/backend/commonbackend/marshal.go similarity index 100% rename from api/gosrc/commonbackend/marshal.go rename to backend/commonbackend/marshal.go diff --git a/api/gosrc/commonbackend/marshalling_test.go b/backend/commonbackend/marshalling_test.go similarity index 99% rename from api/gosrc/commonbackend/marshalling_test.go rename to backend/commonbackend/marshalling_test.go index 770e4f3..605878b 100644 --- a/api/gosrc/commonbackend/marshalling_test.go +++ b/backend/commonbackend/marshalling_test.go @@ -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{ diff --git a/api/gosrc/commonbackend/unmarshal.go b/backend/commonbackend/unmarshal.go similarity index 100% rename from api/gosrc/commonbackend/unmarshal.go rename to backend/commonbackend/unmarshal.go diff --git a/backend/dev.env b/backend/dev.env new file mode 100644 index 0000000..f9c0512 --- /dev/null +++ b/backend/dev.env @@ -0,0 +1,2 @@ +HERMES_DATABASE_BACKEND=sqlite +HERMES_SQLITE_FILEPATH=../.tmp/sqlite.db diff --git a/api/gosrc/dummybackend/main.go b/backend/dummybackend/main.go similarity index 93% rename from api/gosrc/dummybackend/main.go rename to backend/dummybackend/main.go index 95d8126..893944d 100644 --- a/api/gosrc/dummybackend/main.go +++ b/backend/dummybackend/main.go @@ -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 { diff --git a/api/gosrc/externalbackendlauncher/main.go b/backend/externalbackendlauncher/main.go similarity index 95% rename from api/gosrc/externalbackendlauncher/main.go rename to backend/externalbackendlauncher/main.go index e7339ff..443b789 100644 --- a/api/gosrc/externalbackendlauncher/main.go +++ b/backend/externalbackendlauncher/main.go @@ -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{ diff --git a/api/gosrc/go.mod b/backend/go.mod similarity index 95% rename from api/gosrc/go.mod rename to backend/go.mod index 13f7b5e..16b90c9 100644 --- a/api/gosrc/go.mod +++ b/backend/go.mod @@ -1,4 +1,4 @@ -module git.greysoh.dev/imterah/nextnet +module git.terah.dev/imterah/hermes go 1.23.3 diff --git a/api/gosrc/go.sum b/backend/go.sum similarity index 100% rename from api/gosrc/go.sum rename to backend/go.sum diff --git a/api/gosrc/sshbackend/main.go b/backend/sshbackend/main.go similarity index 98% rename from api/gosrc/sshbackend/main.go rename to backend/sshbackend/main.go index ec9b88b..5fd9118 100644 --- a/api/gosrc/sshbackend/main.go +++ b/backend/sshbackend/main.go @@ -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 { diff --git a/init.sh b/init.sh index 31f4e2f..66330a0 100644 --- a/init.sh +++ b/init.sh @@ -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) diff --git a/lom/.gitignore b/sshfrontend/.gitignore similarity index 100% rename from lom/.gitignore rename to sshfrontend/.gitignore diff --git a/lom/Dockerfile b/sshfrontend/Dockerfile similarity index 100% rename from lom/Dockerfile rename to sshfrontend/Dockerfile diff --git a/lom/LICENSE b/sshfrontend/LICENSE similarity index 100% rename from lom/LICENSE rename to sshfrontend/LICENSE diff --git a/lom/README.md b/sshfrontend/README.md similarity index 100% rename from lom/README.md rename to sshfrontend/README.md diff --git a/lom/docker-entrypoint.sh b/sshfrontend/docker-entrypoint.sh similarity index 100% rename from lom/docker-entrypoint.sh rename to sshfrontend/docker-entrypoint.sh diff --git a/lom/eslint.config.js b/sshfrontend/eslint.config.js similarity index 100% rename from lom/eslint.config.js rename to sshfrontend/eslint.config.js diff --git a/lom/package-lock.json b/sshfrontend/package-lock.json similarity index 100% rename from lom/package-lock.json rename to sshfrontend/package-lock.json diff --git a/lom/package.json b/sshfrontend/package.json similarity index 100% rename from lom/package.json rename to sshfrontend/package.json diff --git a/lom/src/commands.ts b/sshfrontend/src/commands.ts similarity index 100% rename from lom/src/commands.ts rename to sshfrontend/src/commands.ts diff --git a/lom/src/commands/backends.ts b/sshfrontend/src/commands/backends.ts similarity index 100% rename from lom/src/commands/backends.ts rename to sshfrontend/src/commands/backends.ts diff --git a/lom/src/commands/connections.ts b/sshfrontend/src/commands/connections.ts similarity index 100% rename from lom/src/commands/connections.ts rename to sshfrontend/src/commands/connections.ts diff --git a/lom/src/commands/users.ts b/sshfrontend/src/commands/users.ts similarity index 100% rename from lom/src/commands/users.ts rename to sshfrontend/src/commands/users.ts diff --git a/lom/src/copyID.ts b/sshfrontend/src/copyID.ts similarity index 100% rename from lom/src/copyID.ts rename to sshfrontend/src/copyID.ts diff --git a/lom/src/index.ts b/sshfrontend/src/index.ts similarity index 100% rename from lom/src/index.ts rename to sshfrontend/src/index.ts diff --git a/lom/src/libs/patchCommander.ts b/sshfrontend/src/libs/patchCommander.ts similarity index 100% rename from lom/src/libs/patchCommander.ts rename to sshfrontend/src/libs/patchCommander.ts diff --git a/lom/src/libs/readFromKeyboard.ts b/sshfrontend/src/libs/readFromKeyboard.ts similarity index 100% rename from lom/src/libs/readFromKeyboard.ts rename to sshfrontend/src/libs/readFromKeyboard.ts diff --git a/lom/tsconfig.json b/sshfrontend/tsconfig.json similarity index 100% rename from lom/tsconfig.json rename to sshfrontend/tsconfig.json