Compare commits
4 Commits
e80aaf7d18
...
dbc831e972
Author | SHA1 | Date |
---|---|---|
Paulo Truta | dbc831e972 | |
Paulo Truta | 19acbcbaad | |
dependabot[bot] | 1e0a5df370 | |
Paulo Truta | 7913be080d |
|
@ -13,7 +13,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
uses: actions/setup-go@v4
|
uses: actions/setup-go@v5
|
||||||
with:
|
with:
|
||||||
go-version: '1.20.2'
|
go-version: '1.20.2'
|
||||||
- name: Check out code
|
- name: Check out code
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
# Changelog
|
||||||
|
|
||||||
|
## [1.3.2] - 08-12-2024
|
||||||
|
|
||||||
|
* Fix to Browser Dev feature:
|
||||||
|
* Checking browser dev url when internet_accessible was checking the incorrect path. This is now fixed.
|
||||||
|
|
||||||
|
## [1.3.1] - 08-12-2024
|
||||||
|
|
||||||
|
* Fixes to Browser Dev feature:
|
||||||
|
* Now edgeboxctl also fetches or generates the browser dev environment url and saves it into an option both when starting, and every time the browser dev status is fetched.
|
||||||
|
|
||||||
|
## [1.3.0] - 05-12-2024
|
||||||
|
|
||||||
|
* Added Edgebox Browser Development Environment Feature Support
|
||||||
|
* Added tasks for handling browser development environment into tasks.go
|
||||||
|
* Added executable tasks to ExecuteTask and scheduled ones to ExecuteSchedules
|
||||||
|
* Other bug fixes and improvements.
|
||||||
|
|
||||||
|
### Missing Past Releases
|
||||||
|
|
||||||
|
Release notes for past versions are not available in this file. Please refer to the [GitHub releases](https://hithub.com/edgebox-iot/edgeboxctl/releases) for more information. Feel free to contribute to this file by adding missing release notes.
|
||||||
|
|
|
@ -18,6 +18,8 @@ import (
|
||||||
"github.com/edgebox-iot/edgeboxctl/internal/system"
|
"github.com/edgebox-iot/edgeboxctl/internal/system"
|
||||||
"github.com/edgebox-iot/edgeboxctl/internal/utils"
|
"github.com/edgebox-iot/edgeboxctl/internal/utils"
|
||||||
|
|
||||||
|
"github.com/joho/godotenv"
|
||||||
|
|
||||||
_ "github.com/go-sql-driver/mysql" // Mysql Driver
|
_ "github.com/go-sql-driver/mysql" // Mysql Driver
|
||||||
_ "github.com/mattn/go-sqlite3" // SQlite Driver
|
_ "github.com/mattn/go-sqlite3" // SQlite Driver
|
||||||
)
|
)
|
||||||
|
@ -531,6 +533,8 @@ func ExecuteSchedules(tick int) {
|
||||||
log.Println("Fetching Browser Dev Environment Information")
|
log.Println("Fetching Browser Dev Environment Information")
|
||||||
taskGetBrowserDevPassword()
|
taskGetBrowserDevPassword()
|
||||||
taskGetBrowserDevStatus()
|
taskGetBrowserDevStatus()
|
||||||
|
|
||||||
|
taskCheckSystemUpdates()
|
||||||
|
|
||||||
ip := taskGetSystemIP()
|
ip := taskGetSystemIP()
|
||||||
log.Println("System IP is: " + ip)
|
log.Println("System IP is: " + ip)
|
||||||
|
@ -560,9 +564,7 @@ func ExecuteSchedules(tick int) {
|
||||||
taskStartWs()
|
taskStartWs()
|
||||||
log.Println(taskGetEdgeApps())
|
log.Println(taskGetEdgeApps())
|
||||||
taskUpdateSystemLoggerServices()
|
taskUpdateSystemLoggerServices()
|
||||||
taskRecoverFromUpdate()
|
taskRecoverFromUpdate()
|
||||||
taskCheckSystemUpdates()
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if tick%5 == 0 {
|
if tick%5 == 0 {
|
||||||
|
@ -571,6 +573,10 @@ func ExecuteSchedules(tick int) {
|
||||||
log.Println(taskGetStorageDevices())
|
log.Println(taskGetStorageDevices())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if tick%15 == 0 {
|
||||||
|
taskGetBrowserDevStatus()
|
||||||
|
}
|
||||||
|
|
||||||
if tick%30 == 0 {
|
if tick%30 == 0 {
|
||||||
// Executing every 30 ticks
|
// Executing every 30 ticks
|
||||||
log.Println(taskGetEdgeApps())
|
log.Println(taskGetEdgeApps())
|
||||||
|
@ -1150,7 +1156,10 @@ func taskGetBrowserDevStatus() string {
|
||||||
if browserDevStatus == "active" {
|
if browserDevStatus == "active" {
|
||||||
fmt.Println("Browser Dev Environment is running")
|
fmt.Println("Browser Dev Environment is running")
|
||||||
utils.WriteOption("BROWSERDEV_STATUS", "running")
|
utils.WriteOption("BROWSERDEV_STATUS", "running")
|
||||||
|
taskGetBrowserDevUrl()
|
||||||
|
|
||||||
return "{\"status\": \"running\"}"
|
return "{\"status\": \"running\"}"
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
fmt.Println("Browser Dev Environment is not running")
|
fmt.Println("Browser Dev Environment is not running")
|
||||||
utils.WriteOption("BROWSERDEV_STATUS", "not_running")
|
utils.WriteOption("BROWSERDEV_STATUS", "not_running")
|
||||||
|
@ -1158,6 +1167,24 @@ func taskGetBrowserDevStatus() string {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func taskGetBrowserDevUrl() string {
|
||||||
|
url := ""
|
||||||
|
myEdgeAppServiceEnv, err := godotenv.Read(utils.GetPath(utils.BrowserDevPath) + "myedgeapp.env")
|
||||||
|
if err != nil {
|
||||||
|
log.Println("No myedge.app environment file found. Status is Network-Only")
|
||||||
|
url = "http://dev." + system.GetHostname() + ".local"
|
||||||
|
} else {
|
||||||
|
if myEdgeAppServiceEnv["INTERNET_URL"] != "" {
|
||||||
|
url = "https://" + myEdgeAppServiceEnv["INTERNET_URL"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println("Browser Dev Url: " + url)
|
||||||
|
|
||||||
|
utils.WriteOption("BROWSERDEV_URL", url)
|
||||||
|
return url
|
||||||
|
}
|
||||||
|
|
||||||
func taskActivateBrowserDev() string {
|
func taskActivateBrowserDev() string {
|
||||||
fmt.Println("Executing taskActivateBrowserDev")
|
fmt.Println("Executing taskActivateBrowserDev")
|
||||||
wsPath := utils.GetPath(utils.WsPath)
|
wsPath := utils.GetPath(utils.WsPath)
|
||||||
|
@ -1170,6 +1197,10 @@ func taskActivateBrowserDev() string {
|
||||||
system.StartWs()
|
system.StartWs()
|
||||||
// Write control option for API
|
// Write control option for API
|
||||||
utils.WriteOption("BROWSERDEV_STATUS", "running")
|
utils.WriteOption("BROWSERDEV_STATUS", "running")
|
||||||
|
|
||||||
|
// Write and refresh the dev environment password option
|
||||||
|
taskGetBrowserDevPassword()
|
||||||
|
|
||||||
return "{\"status\": \"ok\"}"
|
return "{\"status\": \"ok\"}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1189,15 +1220,14 @@ func taskDeactivateBrowserDev() string {
|
||||||
|
|
||||||
func taskGetBrowserDevPassword() string {
|
func taskGetBrowserDevPassword() string {
|
||||||
fmt.Println("Executing taskGetBrowserDevPassword")
|
fmt.Println("Executing taskGetBrowserDevPassword")
|
||||||
password := utils.ReadOption("BROWSERDEV_PASSWORD")
|
|
||||||
if password == "" {
|
password, err := system.FetchBrowserDevPasswordFromFile()
|
||||||
password, err := system.FetchBrowserDevPasswordFromFile()
|
if err == nil {
|
||||||
if err == nil {
|
utils.WriteOption("BROWSERDEV_PASSWORD", password)
|
||||||
utils.WriteOption("BROWSERDEV_PASSWORD", password)
|
} else {
|
||||||
} else {
|
fmt.Println("Error fetching browser dev password from file: " + err.Error())
|
||||||
fmt.Println("Error fetching browser dev password from file: " + err.Error())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return password
|
return password
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -111,6 +111,7 @@ const ApiPath string = "apiPath"
|
||||||
const EdgeAppsPath string = "edgeAppsPath"
|
const EdgeAppsPath string = "edgeAppsPath"
|
||||||
const EdgeAppsBackupPath string = "edgeAppsBackupPath"
|
const EdgeAppsBackupPath string = "edgeAppsBackupPath"
|
||||||
const WsPath string = "wsPath"
|
const WsPath string = "wsPath"
|
||||||
|
const BrowserDevPath string = "browserDevPath"
|
||||||
const LoggerPath string = "loggerPath"
|
const LoggerPath string = "loggerPath"
|
||||||
const BrowserDevPasswordFileLocation string = "browserDevPasswordFileLocation"
|
const BrowserDevPasswordFileLocation string = "browserDevPasswordFileLocation"
|
||||||
const BrowserDevProxyPath string = "browserDevProxyPath"
|
const BrowserDevProxyPath string = "browserDevProxyPath"
|
||||||
|
@ -176,6 +177,14 @@ func GetPath(pathKey string) string {
|
||||||
targetPath = "/home/system/components/ws/"
|
targetPath = "/home/system/components/ws/"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case BrowserDevPath:
|
||||||
|
|
||||||
|
if env["BROWSERDEV_PATH"] != "" {
|
||||||
|
targetPath = env["BROWSERDEV_PATH"]
|
||||||
|
} else {
|
||||||
|
targetPath = "/home/system/components/dev/"
|
||||||
|
}
|
||||||
|
|
||||||
case LoggerPath:
|
case LoggerPath:
|
||||||
if env["LOGGER_PATH"] != "" {
|
if env["LOGGER_PATH"] != "" {
|
||||||
targetPath = env["LOGGER_PATH"]
|
targetPath = env["LOGGER_PATH"]
|
||||||
|
|
Loading…
Reference in New Issue