fix(jenkins): do not trigger emissary-firmware with dirty tag

Jenkinsfile

@@ -10,16 +10,6 @@ pipeline {
     }
 
     stages {
-        stage('Cancel older jobs') {
-            steps {
-                script {
-                    def buildNumber = env.BUILD_NUMBER as int
-                    if (buildNumber > 1) milestone(buildNumber - 1)
-                    milestone(buildNumber)
-                }
-            }
-        }
-        
         stage('Run unit tests') {
             steps {
                 script {
@@ -61,17 +51,13 @@ pipeline {
                         sh 'make gitea-release'
                     }
                     def currentVersion = sh(returnStdout: true, script: 'make full-version').trim()
-                    if (currentVersion.endsWith('-dirty')) {
-                        unstable('Could not trigger emissary-firmware build, dirty version !')
-                    } else {
-                        build(
-                            job: "../emissary-firmware/${env.GIT_BRANCH}",
-                            parameters: [
-                                [$class: 'StringParameterValue', name: 'emissaryRelease', value: currentVersion]
-                            ],
-                            wait: false
-                        )
-                    }
+                    sh 'git status'
+                    // build(
+                    //     job: "../emissary-firmware/${env.GIT_BRANCH}",
+                    //     parameters: [
+                    //         [$class: 'StringParameterValue', name: 'emissaryRelease', value: currentVersion]
+                    //     ]
+                    // )
                 }
             }
         }

Makefile

@@ -154,12 +154,4 @@ load-sample-specs:
 	cat misc/spec-samples/mdns.emissary.cadoles.com.json | ./bin/server api agent spec update -a $(AGENT_ID) --no-patch --spec-data - --spec-name mdns.emissary.cadoles.com
 
 full-version:
-	@echo $(FULL_VERSION)
-
-update-edge-lib:
-	git pull --rebase
-	GOPRIVATE=forge.cadoles.com/arcad/edge go get -u forge.cadoles.com/arcad/edge
-	go mod tidy
-	git add go.mod go.sum
-	git commit -m "feat: update arcad/edge dependency"
-	git push
+	@echo $(FULL_VERSION)

go.mod

@@ -3,11 +3,10 @@ module forge.cadoles.com/Cadoles/emissary
 go 1.19
 
 require (
-	forge.cadoles.com/arcad/edge v0.0.0-20230406185401-34c6a089b51f
+	forge.cadoles.com/arcad/edge v0.0.0-20230405131922-006f13bc7b88
 	github.com/Masterminds/sprig/v3 v3.2.3
 	github.com/alecthomas/participle/v2 v2.0.0-beta.5
 	github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
-	github.com/brutella/dnssd v1.2.6
 	github.com/btcsuite/btcd/btcutil v1.1.3
 	github.com/davecgh/go-spew v1.1.1
 	github.com/denisbrodbeck/machineid v1.0.1
@@ -34,6 +33,7 @@ require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.2.0 // indirect
 	github.com/barnybug/go-cast v0.0.0-20201201064555-a87ccbc26692 // indirect
+	github.com/brutella/dnssd v1.2.6 // indirect
 	github.com/dop251/goja_nodejs v0.0.0-20230320130059-dcf93ba651dd // indirect
 	github.com/gabriel-vasile/mimetype v1.4.1 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect

go.sum

@@ -54,8 +54,12 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-forge.cadoles.com/arcad/edge v0.0.0-20230406185401-34c6a089b51f h1:In/4FQvb3gqeNZsvs8efLWqQJIZdXaf3Epzl0XBftJc=
-forge.cadoles.com/arcad/edge v0.0.0-20230406185401-34c6a089b51f/go.mod h1:Vx4iq/oewXUOkGyi8QKc14clTLNO1sWpb0SjBYELlAs=
+forge.cadoles.com/arcad/edge v0.0.0-20230328183829-d8ce2901d2ab h1:xOtzLAYOUcKd/VBx/PzL2riC0zNuQ/cxxf5r3AmEvJE=
+forge.cadoles.com/arcad/edge v0.0.0-20230328183829-d8ce2901d2ab/go.mod h1:ONd6vyQ0IM0vHi1i+bmZBRc1Fd0BoXMuDdY/+0sZefw=
+forge.cadoles.com/arcad/edge v0.0.0-20230402160147-f08f645432c6 h1:MxMEBSEvwagUrFORUJ9snZekFIKkaV3OB0EplXra+LU=
+forge.cadoles.com/arcad/edge v0.0.0-20230402160147-f08f645432c6/go.mod h1:ONd6vyQ0IM0vHi1i+bmZBRc1Fd0BoXMuDdY/+0sZefw=
+forge.cadoles.com/arcad/edge v0.0.0-20230405131922-006f13bc7b88 h1:d+AXw/Kx8X7M4GvtPC/mkZWK3tRMT051XORAiQAnClA=
+forge.cadoles.com/arcad/edge v0.0.0-20230405131922-006f13bc7b88/go.mod h1:Vx4iq/oewXUOkGyi8QKc14clTLNO1sWpb0SjBYELlAs=
 gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg=
 github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=

internal/agent/controller/app/app_handler.go

@@ -30,7 +30,7 @@ import (
 	"gitlab.com/wpetit/goweb/logger"
 )
 
-const defaultSQLiteParams = "?_pragma=foreign_keys(1)&_pragma=busy_timeout=60000"
+const defaultSQLiteParams = "?_pragma=foreign_keys(1)&_pragma=journal_mode(WAL)&_txlock=immediate"
 
 func (c *Controller) getHandlerOptions(ctx context.Context, appKey string, specs *spec.Spec) ([]edgeHTTP.HandlerOptionFunc, error) {
 	dataDir, err := c.ensureAppDataDir(ctx, appKey)
@@ -151,8 +151,6 @@ func createResolveAppURL(specs *spec.Spec) (ResolveAppURLFunc, error) {
 						ctx, "could not find interface",
 						logger.E(errors.WithStack(err)), logger.F("iface", ifaceName),
 					)
-
-					continue
 				}
 
 				addresses, err := iface.Addrs()
@@ -205,7 +203,6 @@ func createResolveAppURL(specs *spec.Spec) (ResolveAppURLFunc, error) {
 			}
 
 			appEntry = &entry
-			break
 		}
 
 		if appEntry == nil {

internal/agent/controller/app/app_handler_test.go

@@ -15,18 +15,11 @@ func TestCreateResolveAppURL(t *testing.T) {
 			"app.arcad.test": {
 				Address: ":8080",
 			},
-			"app.arcad.foo": {
-				Address: ":8081",
-			},
-			"app.arcad.bar": {
-				Address: ":8082",
-			},
 		},
 		Config: &spec.Config{
 			AppURLResolving: &spec.AppURLResolving{
 				IfaceMappings: map[string]string{
-					"lo":              "http://{{ .DeviceIP }}:{{ .AppPort }}",
-					"does-not-exists": "http://{{ .DeviceIP }}:{{ .AppPort }}",
+					"lo": "http://{{ .DeviceIP }}:{{ .AppPort }}",
 				},
 				DefaultURLTemplate: `http://{{ last ( splitList "." ( toString .Manifest.ID ) ) }}.arcad.local`,
 			},

internal/agent/controller/app/server.go

@@ -178,7 +178,7 @@ func NewServer(bundle bundle.Bundle, config *spec.Config, handlerOptions ...edge
 func getCookieDomain(r *http.Request) (string, error) {
 	host, _, err := net.SplitHostPort(r.Host)
 	if err != nil {
-		host = r.Host
+		return "", errors.WithStack(err)
 	}
 
 	// If host is an IP address

internal/config/database.go

@@ -15,6 +15,6 @@ type DatabaseConfig struct {
 func NewDefaultDatabaseConfig() DatabaseConfig {
 	return DatabaseConfig{
 		Driver: "sqlite",
-		DSN:    "sqlite://emissary.sqlite?_pragma=foreign_keys(1)&_pragma=busy_timeout=60000",
+		DSN:    "sqlite://emissary.sqlite?_pragma=foreign_keys(1)&_pragma=journal_mode(WAL)&_txlock=immediate",
 	}
 }

misc/packaging/common/config-server.yml

@@ -9,7 +9,7 @@ server:
     port: 3000
   database:
     driver: sqlite
-    dsn: sqlite:///var/lib/emissary/data.sqlite?_pragma=foreign_keys(1)&_pragma=busy_timeout=60000
+    dsn: sqlite:///var/lib/emissary/data.sqlite?_pragma=foreign_keys(1)&_pragma=journal_mode(WAL)&_txlock=immediate
   cors:
     allowedOrigins: []
     allowCredentials: true