fix(controller,app): update app repository on spec changes

internal/agent/controller/app/app_handler.go

@@ -51,10 +51,8 @@ func (c *Controller) getHandlerOptions(ctx context.Context, appKey string, specs
 		bundles = append(bundles, path)
 	}
 
-	getAppURL := createGetAppURL(specs)
-
 	bus := memory.NewBus()
-	modules := getAppModules(bus, db, specs, keySet, getAppURL, bundles)
+	modules := c.getAppModules(bus, db, specs, keySet)
 
 	options := []edgeHTTP.HandlerOptionFunc{
 		edgeHTTP.WithBus(bus),
@@ -148,7 +146,7 @@ func createGetAppURL(specs *spec.Spec) GetURLFunc {
 	}
 }
 
-func getAppModules(bus bus.Bus, db *sql.DB, spec *appSpec.Spec, keySet jwk.Set, getAppURL GetURLFunc, bundles []string) []app.ServerModuleFactory {
+func (c *Controller) getAppModules(bus bus.Bus, db *sql.DB, spec *appSpec.Spec, keySet jwk.Set) []app.ServerModuleFactory {
 	ds := sqlite.NewDocumentStoreWithDB(db)
 	bs := sqlite.NewBlobStoreWithDB(db)
 
@@ -185,6 +183,6 @@ func getAppModules(bus bus.Bus, db *sql.DB, spec *appSpec.Spec, keySet jwk.Set,
 				}
 			},
 		),
-		appModule.ModuleFactory(NewAppRepository(getAppURL, bundles...)),
+		appModule.ModuleFactory(c.appRepository),
 	}
 }

internal/agent/controller/app/app_repository.go

@@ -2,6 +2,7 @@ package app
 
 import (
 	"context"
+	"sync"
 
 	"forge.cadoles.com/arcad/edge/pkg/app"
 	"forge.cadoles.com/arcad/edge/pkg/bundle"
@@ -15,10 +16,14 @@ type GetURLFunc func(context.Context, *app.Manifest) (string, error)
 type AppRepository struct {
 	getURL  GetURLFunc
 	bundles []string
+	mutex   sync.RWMutex
 }
 
 // Get implements app.Repository
 func (r *AppRepository) Get(ctx context.Context, id app.ID) (*app.Manifest, error) {
+	r.mutex.RLock()
+	defer r.mutex.RUnlock()
+
 	manifest, err := r.findManifest(ctx, id)
 	if err != nil {
 		return nil, errors.WithStack(err)
@@ -29,6 +34,9 @@ func (r *AppRepository) Get(ctx context.Context, id app.ID) (*app.Manifest, erro
 
 // GetURL implements app.Repository
 func (r *AppRepository) GetURL(ctx context.Context, id app.ID) (string, error) {
+	r.mutex.RLock()
+	defer r.mutex.RUnlock()
+
 	manifest, err := r.findManifest(ctx, id)
 	if err != nil {
 		return "", errors.WithStack(err)
@@ -44,6 +52,9 @@ func (r *AppRepository) GetURL(ctx context.Context, id app.ID) (string, error) {
 
 // List implements app.Repository
 func (r *AppRepository) List(ctx context.Context) ([]*app.Manifest, error) {
+	r.mutex.RLock()
+	defer r.mutex.RUnlock()
+
 	manifests := make([]*app.Manifest, 0)
 
 	for _, path := range r.bundles {
@@ -69,6 +80,14 @@ func (r *AppRepository) List(ctx context.Context) ([]*app.Manifest, error) {
 	return manifests, nil
 }
 
+func (r *AppRepository) Update(getURL GetURLFunc, bundles []string) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+
+	r.getURL = getURL
+	r.bundles = bundles
+}
+
 func (r *AppRepository) findManifest(ctx context.Context, id app.ID) (*app.Manifest, error) {
 	for _, path := range r.bundles {
 		bundleCtx := logger.With(ctx, logger.F("path", path))
@@ -97,8 +116,13 @@ func (r *AppRepository) findManifest(ctx context.Context, id app.ID) (*app.Manif
 	return nil, errors.WithStack(appModule.ErrNotFound)
 }
 
-func NewAppRepository(getURL GetURLFunc, bundles ...string) *AppRepository {
+func NewAppRepository() *AppRepository {
-	return &AppRepository{getURL, bundles}
+	return &AppRepository{
+		getURL: func(ctx context.Context, m *app.Manifest) (string, error) {
+			return "", errors.New("unavailable")
+		},
+		bundles: []string{},
+	}
 }
 
 var _ appModule.Repository = &AppRepository{}

internal/agent/controller/app/controller.go

@@ -25,6 +25,7 @@ type Controller struct {
 	downloadDir   string
 	dataDir       string
 	servers       map[string]*serverEntry
+	appRepository *AppRepository
 }
 
 // Name implements node.Controller.
@@ -95,7 +96,9 @@ func (c *Controller) updateApps(ctx context.Context, specs *spec.Spec) {
 		}
 	}
 
-	// (Re)start apps
+	c.updateAppRepository(ctx, specs)
+
+	// (Re)start apps if necessary
 	for appKey := range specs.Apps {
 		appCtx := logger.With(ctx, logger.F("appKey", appKey))
 
@@ -106,6 +109,18 @@ func (c *Controller) updateApps(ctx context.Context, specs *spec.Spec) {
 	}
 }
 
+func (c *Controller) updateAppRepository(ctx context.Context, specs *spec.Spec) {
+	bundles := make([]string, 0, len(specs.Apps))
+	for appKey, app := range specs.Apps {
+		path := c.getAppBundlePath(appKey, app.Format)
+		bundles = append(bundles, path)
+	}
+
+	getURL := createGetAppURL(specs)
+
+	c.appRepository.Update(getURL, bundles)
+}
+
 func (c *Controller) updateApp(ctx context.Context, specs *spec.Spec, appKey string) (err error) {
 	appEntry := specs.Apps[appKey]
 
@@ -298,6 +313,7 @@ func NewController(funcs ...OptionFunc) *Controller {
 		downloadDir:   opts.DownloadDir,
 		dataDir:       opts.DataDir,
 		servers:       make(map[string]*serverEntry),
+		appRepository: NewAppRepository(),
 	}
 }
 

misc/spec-samples/app.emissary.cadoles.com.json

@@ -17,6 +17,12 @@
             "sha256sum": "e97b7b79159bb5d6a13b05644c091272b02a1a3cbb1b613dd5eda37e1eb84623",
             "address": "127.0.0.1:8084",
             "format": "zip"
+        },
+        "diffusion": {
+            "url": "https://emissary.cadol.es/files/apps/arcad.diffusion_v2023.3.29-5b3fab4.zip",
+            "sha256sum": "1282e75719beedbc7c7e67879389d0f3e11c86d3d2c37cf13da624a66faaeb58",
+            "address": "127.0.0.1:8085",
+            "format": "zip"
         }
     },
     "config": {

misc/spec-samples/proxy.emissary.cadoles.com.json

@@ -15,6 +15,10 @@
                     "hostPattern": "test.arcad.local:*",
                     "target": "http://localhost:8084"
                 },
+                {
+                    "hostPattern": "diffusion.arcad.local:*",
+                    "target": "http://localhost:8085"
+                },
                 {
                     "hostPattern": "*",
                     "target": "http://localhost:8082"