|
2 | 2 | package app |
3 | 3 |
|
4 | 4 | import ( |
| 5 | + "context" |
| 6 | + "net/http" |
| 7 | + "time" |
| 8 | + |
| 9 | + "github.com/co-browser/agent-browser/internal/backend" |
| 10 | + "github.com/co-browser/agent-browser/internal/backend/database" |
| 11 | + "github.com/co-browser/agent-browser/internal/config" |
| 12 | + "github.com/co-browser/agent-browser/internal/events" |
5 | 13 | "github.com/co-browser/agent-browser/internal/log" |
| 14 | + "github.com/co-browser/agent-browser/internal/mcp/client" |
| 15 | + "github.com/co-browser/agent-browser/internal/updater" |
6 | 16 | "github.com/co-browser/agent-browser/internal/web" |
7 | 17 | "github.com/co-browser/agent-browser/internal/web/handlers" |
| 18 | + |
8 | 19 | "go.uber.org/fx" |
9 | 20 | ) |
10 | 21 |
|
11 | 22 | // CoreModules bundles the main application components for fx. |
12 | 23 | var CoreModules = fx.Options( |
13 | | - CommonModule, |
| 24 | + LogModule, |
| 25 | + DatabaseModule, |
14 | 26 | ConfigModule, |
| 27 | + EventsModule, |
15 | 28 | BackendModule, |
16 | | - MCPModule, |
| 29 | + MCPClientModule, |
17 | 30 | UpdaterModule, |
18 | 31 | WebModule, |
19 | | - // Add other core modules like SyncModule if needed |
| 32 | + // TODO: Add MCP Server Frontend module |
| 33 | + // TODO: Add Sync Daemon module |
20 | 34 | ) |
21 | 35 |
|
22 | | -// CommonModule provides common dependencies like logging. |
23 | | -var CommonModule = fx.Module("common", |
| 36 | +// LogModule provides common dependencies like logging. |
| 37 | +var LogModule = fx.Module("logger", |
24 | 38 | fx.Provide( |
25 | 39 | log.NewLogger, |
26 | 40 | ), |
27 | 41 | ) |
28 | 42 |
|
| 43 | +// DatabaseModule provides the database dependency. |
| 44 | +var DatabaseModule = fx.Module("database", |
| 45 | + fx.Provide( |
| 46 | + func(lc fx.Lifecycle, logger log.Logger) (database.DBInterface, error) { |
| 47 | + dbPath := "agent-browser.db" |
| 48 | + db, err := database.New(dbPath) |
| 49 | + if err != nil { |
| 50 | + logger.Error().Err(err).Str("dbPath", dbPath).Msg("Failed to initialize database") |
| 51 | + return nil, err |
| 52 | + } |
| 53 | + |
| 54 | + lc.Append(fx.Hook{ |
| 55 | + OnStop: func(ctx context.Context) error { |
| 56 | + logger.Info().Msg("Closing database connection...") |
| 57 | + return db.Close() |
| 58 | + }, |
| 59 | + }) |
| 60 | + logger.Info().Str("dbPath", dbPath).Msg("Database initialized") |
| 61 | + return db, nil |
| 62 | + }, |
| 63 | + ), |
| 64 | +) |
| 65 | + |
29 | 66 | // ConfigModule provides configuration loading services. |
30 | 67 | var ConfigModule = fx.Module("config", |
31 | 68 | fx.Provide( |
32 | | - // config.NewConfigLoader, // Example placeholder |
| 69 | + config.NewExporter, |
33 | 70 | ), |
34 | 71 | ) |
35 | 72 |
|
36 | | -// BackendModule provides the backend service and its dependencies (like DB). |
| 73 | +// EventsModule provides the event bus. |
| 74 | +var EventsModule = fx.Module("events", |
| 75 | + fx.Provide(events.NewBus), |
| 76 | +) |
| 77 | + |
| 78 | +// BackendModule provides the backend service. |
37 | 79 | var BackendModule = fx.Module("backend", |
38 | 80 | fx.Provide( |
39 | | - // backend.NewDB, // Example placeholder |
40 | | - // backend.NewService, // Example placeholder |
| 81 | + func(db database.DBInterface, bus events.Bus, logger log.Logger) backend.Service { |
| 82 | + return backend.NewService(db, bus, logger) |
| 83 | + }, |
41 | 84 | ), |
42 | 85 | ) |
43 | 86 |
|
44 | | -// MCPModule provides the MCP server frontend and its dependencies. |
45 | | -var MCPModule = fx.Module("mcp", |
| 87 | +// MCPClientModule provides the MCP client (distinct from server frontend). |
| 88 | +var MCPClientModule = fx.Module("mcp_client", |
46 | 89 | fx.Provide( |
47 | | - // mcp.NewClient, // Example placeholder |
48 | | - // mcp.NewServer, // Example placeholder |
| 90 | + client.NewHTTPClient, |
49 | 91 | ), |
50 | 92 | ) |
51 | 93 |
|
52 | 94 | // UpdaterModule provides the tool and server updater service. |
53 | 95 | var UpdaterModule = fx.Module("updater", |
54 | 96 | fx.Provide( |
55 | | - // updater.NewService, // Example placeholder |
| 97 | + func(bs backend.Service, mc client.Client, bus events.Bus, logger log.Logger) updater.Service { |
| 98 | + pollInterval := 5 * time.Minute |
| 99 | + logger.Info().Dur("pollInterval", pollInterval).Msg("Creating Updater Service") |
| 100 | + return updater.NewService(bs, mc, bus, logger, pollInterval) |
| 101 | + }, |
56 | 102 | ), |
| 103 | + fx.Invoke(func(lc fx.Lifecycle, us updater.Service, logger log.Logger) { |
| 104 | + lc.Append(fx.Hook{ |
| 105 | + OnStart: func(ctx context.Context) error { |
| 106 | + logger.Info().Msg("Registering Updater Service start hook") |
| 107 | + us.Start(ctx) |
| 108 | + return nil |
| 109 | + }, |
| 110 | + OnStop: func(ctx context.Context) error { |
| 111 | + logger.Info().Msg("Registering Updater Service stop hook") |
| 112 | + us.Stop() |
| 113 | + return nil |
| 114 | + }, |
| 115 | + }) |
| 116 | + }), |
57 | 117 | ) |
58 | 118 |
|
59 | | -// WebModule provides the web server, UI handlers, and API handlers. |
| 119 | +// WebModule provides the web server components |
60 | 120 | var WebModule = fx.Module("web", |
61 | 121 | fx.Provide( |
| 122 | + // Provide UI handler |
62 | 123 | handlers.NewUIHandler, |
63 | | - // handlers.NewAPIHandler, |
| 124 | + // Provide API handlers |
| 125 | + func(bs backend.Service, us updater.Service, ce *config.Exporter, logger log.Logger) *handlers.APIHandlers { |
| 126 | + return handlers.NewAPIHandlers(bs, us, ce, logger) |
| 127 | + }, |
| 128 | + // Provide HTTP mux using web package |
64 | 129 | web.NewMux, |
| 130 | + // Provide HTTP server using web package |
65 | 131 | web.NewServer, |
66 | 132 | ), |
| 133 | + // Register API handlers with the router |
| 134 | + fx.Invoke(func(router *http.ServeMux, apiHandlers *handlers.APIHandlers) { |
| 135 | + apiHandlers.RegisterRoutes(router) |
| 136 | + }), |
| 137 | + // Register web server lifecycle hooks |
67 | 138 | fx.Invoke(web.RegisterWebServerHooks), |
68 | 139 | ) |
69 | | - |
70 | | -// --- Placeholders for other modules like Sync --- |
71 | | -// var SyncModule = fx.Module("sync", ...) |
|
0 commit comments