refactor(controller): converted to socket.io
This commit is contained in:
@@ -3,16 +3,16 @@ import morgan from "morgan";
|
|||||||
import { createServer } from "http";
|
import { createServer } from "http";
|
||||||
import { setupRoutes } from "./internal/routerHandler/routeHandler.js";
|
import { setupRoutes } from "./internal/routerHandler/routeHandler.js";
|
||||||
import { printers } from "./internal/ocp/printers/printers.js";
|
import { printers } from "./internal/ocp/printers/printers.js";
|
||||||
import path, { dirname, join } from "path";
|
import { dirname, join } from "path";
|
||||||
import { fileURLToPath } from "url";
|
import { fileURLToPath } from "url";
|
||||||
import { db } from "./pkg/db/db.js";
|
import { db } from "./pkg/db/db.js";
|
||||||
import { settings, type Setting } from "./pkg/db/schema/settings.js";
|
import { settings } from "./pkg/db/schema/settings.js";
|
||||||
import { validateEnv } from "./pkg/utils/envValidator.js";
|
import { validateEnv } from "./pkg/utils/envValidator.js";
|
||||||
import { createLogger } from "./pkg/logger/logger.js";
|
import { createLogger } from "./pkg/logger/logger.js";
|
||||||
import { returnFunc } from "./pkg/utils/return.js";
|
import { returnFunc } from "./pkg/utils/return.js";
|
||||||
import { closePool, initializeProdPool } from "./pkg/prodSql/prodSqlConnect.js";
|
import { initializeProdPool } from "./pkg/prodSql/prodSqlConnect.js";
|
||||||
import { tryCatch } from "./pkg/utils/tryCatch.js";
|
import { tryCatch } from "./pkg/utils/tryCatch.js";
|
||||||
import os, { hostname } from "os";
|
import os from "os";
|
||||||
import { sendNotify } from "./pkg/utils/notify.js";
|
import { sendNotify } from "./pkg/utils/notify.js";
|
||||||
|
|
||||||
const main = async () => {
|
const main = async () => {
|
||||||
@@ -24,10 +24,6 @@ const main = async () => {
|
|||||||
// base path
|
// base path
|
||||||
let basePath: string = "";
|
let basePath: string = "";
|
||||||
|
|
||||||
if (process.env.NODE_ENV?.trim() !== "production") {
|
|
||||||
basePath = "/lst";
|
|
||||||
}
|
|
||||||
|
|
||||||
const __filename = fileURLToPath(import.meta.url);
|
const __filename = fileURLToPath(import.meta.url);
|
||||||
const __dirname = dirname(__filename);
|
const __dirname = dirname(__filename);
|
||||||
|
|
||||||
@@ -47,14 +43,14 @@ const main = async () => {
|
|||||||
|
|
||||||
if (res.data.length === 0) {
|
if (res.data.length === 0) {
|
||||||
//return
|
//return
|
||||||
returnFunc({
|
// returnFunc({
|
||||||
success: false,
|
// success: false,
|
||||||
module: "system",
|
// module: "system",
|
||||||
level: "fatal",
|
// level: "fatal",
|
||||||
message: `This seems to be the first time you have started the app please validate the settings have been intiated`,
|
// message: `This seems to be the first time you have started the app please validate the settings have been intiated`,
|
||||||
notify: false,
|
// notify: false,
|
||||||
data: [],
|
// data: [],
|
||||||
});
|
// });
|
||||||
}
|
}
|
||||||
|
|
||||||
// connect to the prod sql
|
// connect to the prod sql
|
||||||
@@ -64,22 +60,22 @@ const main = async () => {
|
|||||||
const app = express();
|
const app = express();
|
||||||
|
|
||||||
// global middleware
|
// global middleware
|
||||||
app.use(express.static(path.join(__dirname, "../lstDocs/build")));
|
app.use(express.json());
|
||||||
app.use(express.static(path.join(__dirname, "../frontend/dist")));
|
|
||||||
|
|
||||||
// global env that run only in dev
|
// global env that run only in dev
|
||||||
if (process.env.NODE_ENV?.trim() !== "production") {
|
if (process.env.NODE_ENV?.trim() !== "production") {
|
||||||
app.use(morgan("tiny"));
|
app.use(morgan("tiny"));
|
||||||
|
basePath = "/lst";
|
||||||
}
|
}
|
||||||
|
|
||||||
// docs and api stuff
|
// docs and api stuff
|
||||||
app.use(
|
app.use(
|
||||||
basePath + "/d",
|
basePath + "/d",
|
||||||
express.static(join(__dirname, "../lstDocs/build"))
|
express.static(join(__dirname, "../../lstDocs/build"))
|
||||||
);
|
);
|
||||||
app.use(
|
app.use(
|
||||||
basePath + "/app",
|
basePath + "/app",
|
||||||
express.static(join(__dirname, "../frontend/dist"))
|
express.static(join(__dirname, "../../frontend/dist"))
|
||||||
);
|
);
|
||||||
|
|
||||||
// register app
|
// register app
|
||||||
@@ -129,7 +125,7 @@ const main = async () => {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
process.exit(1);
|
//process.exit(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
// setInterval(() => {
|
// setInterval(() => {
|
||||||
@@ -145,12 +141,3 @@ const main = async () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
main();
|
main();
|
||||||
|
|
||||||
// .catch((err) => {
|
|
||||||
// const log = createLogger({ module: "system", subModule: "main" });
|
|
||||||
// log.fatal(
|
|
||||||
// { notify: true },
|
|
||||||
// "There was a crash that occured and caused the app to restart."
|
|
||||||
// );
|
|
||||||
// process.exit(1);
|
|
||||||
// });
|
|
||||||
|
|||||||
@@ -3,15 +3,33 @@ package main
|
|||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
|
||||||
|
socketio "github.com/googollee/go-socket.io"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ---- Run npm build ----
|
// runNpmBuild runs npm build and streams logs into the "build" room
|
||||||
func runNpmBuild() error {
|
func runNpmBuild(server *socketio.Server) error {
|
||||||
cmd := exec.Command("npm", "run", "build")
|
cmd := exec.Command("npm", "run", "build")
|
||||||
if os.Getenv("RUNNING_IN_DOCKER") == "true" {
|
if os.Getenv("RUNNING_IN_DOCKER") == "true" {
|
||||||
cmd.Dir = "/app"
|
cmd.Dir = "/app"
|
||||||
}
|
}
|
||||||
cmd.Stdout = os.Stdout
|
|
||||||
cmd.Stderr = os.Stderr
|
stdout, err := cmd.StdoutPipe()
|
||||||
return cmd.Run()
|
if err != nil {
|
||||||
}
|
return err
|
||||||
|
}
|
||||||
|
stderr, err := cmd.StderrPipe()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := cmd.Start(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Launch goroutines to forward output
|
||||||
|
go streamOutput(stdout, server, "build")
|
||||||
|
go streamOutput(stderr, server, "build")
|
||||||
|
|
||||||
|
return cmd.Wait() // Wait until process finishes
|
||||||
|
}
|
||||||
|
|||||||
89
controller/build_channel.go
Normal file
89
controller/build_channel.go
Normal file
@@ -0,0 +1,89 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
socketio "github.com/googollee/go-socket.io"
|
||||||
|
)
|
||||||
|
|
||||||
|
func registerBuildChannel(server *socketio.Server) {
|
||||||
|
// Example: When clients join "build" namespace or room
|
||||||
|
server.OnEvent("/", "subscribe:build", func(s socketio.Conn) {
|
||||||
|
s.Join("build")
|
||||||
|
s.Emit("buildlogs", "👋 Connected to build channel") // this is where all the messages are actually sent to
|
||||||
|
|
||||||
|
})
|
||||||
|
|
||||||
|
// update channel events
|
||||||
|
server.OnEvent("/", "build", func(s socketio.Conn, target string) {
|
||||||
|
fmt.Println("🔨 Build triggered:", target)
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
host, err := os.Hostname()
|
||||||
|
if err != nil {
|
||||||
|
server.BroadcastToRoom("/", "build", "buildlogs", "Could not retrieve hostname")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if strings.Contains(host, "VMS") || strings.Contains(host, "vms") {
|
||||||
|
server.BroadcastToRoom("/", "build", "buildlogs", "You are not allowed to run the build on a production server")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
server.BroadcastToRoom("/", "build", "buildlogs", "🔨 Starting build: Old App")
|
||||||
|
if err := runNpmV2Build(server); err != nil {
|
||||||
|
server.BroadcastToRoom("/", "build", "buildlogs", fmt.Sprintf("❌ Build failed: %v", err))
|
||||||
|
return
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
server.BroadcastToRoom("/", "build", "buildlogs", "🔨 Starting build: App")
|
||||||
|
if err := runNpmBuild(server); err != nil {
|
||||||
|
server.BroadcastToRoom("/", "build", "buildlogs", fmt.Sprintf("❌ Build failed: %v", err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
server.BroadcastToRoom("/", "build", "buildlogs", "Zipping the app up")
|
||||||
|
buildNum, err := bumpBuild()
|
||||||
|
if err != nil {
|
||||||
|
server.BroadcastToRoom("/", "build", "buildlogs", fmt.Sprintf("failed updating build counter, details: %v", err.Error()))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// run the zip
|
||||||
|
includes, _ := loadIncludePatterns("../.include")
|
||||||
|
|
||||||
|
// Name the archive after build number if available
|
||||||
|
data, _ := os.ReadFile("../.build")
|
||||||
|
buildNum1 := strings.TrimSpace(string(data))
|
||||||
|
if buildNum1 == "" {
|
||||||
|
buildNum1 = "0"
|
||||||
|
}
|
||||||
|
|
||||||
|
buildDir, err := getBuildDir()
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
server.BroadcastToRoom("/", "build", "buildlogs", fmt.Sprintf("Build dir error: %v", err))
|
||||||
|
}
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
|
||||||
|
server.BroadcastToRoom("/", "build", "buildlogs", fmt.Sprintf("Build dir error: %v", err.Error()))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
zipPath := filepath.Join(buildDir, fmt.Sprintf("release-%d.zip", buildNum))
|
||||||
|
|
||||||
|
if err := zipProject(server, "..", zipPath, includes); err != nil {
|
||||||
|
server.BroadcastToRoom("/", "build", "buildlogs", fmt.Sprintf("Build zip error: %v", err.Error()))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
server.BroadcastToRoom("/", "build", "buildlogs", fmt.Sprintf("✅ Build finished successfully, current build: %v", buildNum))
|
||||||
|
}()
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -4,23 +4,42 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
|
socketio "github.com/googollee/go-socket.io"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ---- Run npm build ----
|
// ---- Run npm build ----
|
||||||
func runNpmV2Build() error {
|
func runNpmV2Build(server *socketio.Server) error {
|
||||||
cmd := exec.Command("npm", "run", "newBuild")
|
cmd := exec.Command("npm", "run", "newBuild")
|
||||||
if os.Getenv("RUNNING_IN_DOCKER") == "true" {
|
if os.Getenv("RUNNING_IN_DOCKER") == "true" {
|
||||||
cmd.Dir = "/app"
|
cmd.Dir = "/app"
|
||||||
}else {
|
} else {
|
||||||
// Go three directories up from the current working directory
|
// Go three directories up from the current working directory
|
||||||
cwd, err := os.Getwd()
|
cwd, err := os.Getwd()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
dir := filepath.Join(cwd, "..", "..", "lstV2")
|
dir := filepath.Join(cwd, "..", "..", "lstV2")
|
||||||
cmd.Dir = dir
|
cmd.Dir = dir
|
||||||
}
|
}
|
||||||
cmd.Stdout = os.Stdout
|
|
||||||
cmd.Stderr = os.Stderr
|
stdout, err := cmd.StdoutPipe()
|
||||||
return cmd.Run()
|
if err != nil {
|
||||||
}
|
return err
|
||||||
|
}
|
||||||
|
stderr, err := cmd.StderrPipe()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := cmd.Start(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Launch goroutines to forward output
|
||||||
|
go streamOutput(stdout, server, "build")
|
||||||
|
go streamOutput(stderr, server, "build")
|
||||||
|
|
||||||
|
return cmd.Wait() // Wait until process finishes
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user