fix(gateway): share NATS and session ownership

This commit is contained in:
sam committed 2026-09-06 22:49:39 +10:00
1 parent 5bd553d8ed
commit 9eba9be2e5
9 files changed
+1999 -101

No files matched your search

+37 -16
View File
@@ -43,6 +43,7 @@ import (
"github.com/samcharles93/archie-core/internal/infrastructure/configuration"
"github.com/samcharles93/archie-core/internal/infrastructure/configuration/overlay"
"github.com/samcharles93/archie-core/internal/infrastructure/eventbus/nats"
"github.com/samcharles93/archie-core/internal/infrastructure/gatewayrpc"
infraMemory "github.com/samcharles93/archie-core/internal/infrastructure/memory"
"github.com/samcharles93/archie-core/internal/infrastructure/modelcatalog"
"github.com/samcharles93/archie-core/internal/infrastructure/sessioncurator"
@@ -272,21 +273,18 @@ func (b *boot) openStores(ctx context.Context) error {
log.Error("close store", "err", err)
}
})
// The conversation store is Gateway-owned data, but Phase 1 keeps the
// daemon's own Telegram/email routers and the session-memory curator
// reading the same SQLite file directly (Messaging extraction is
// Phase 4). Both processes opening the same file is the accepted
// Phase 1 shape; remote consumers of the conversation store arrive
// when a process that cannot open the file needs it.
chatSessionStore, err := makeTelegramSessionStore(cfg) //nolint:contextcheck // the session store opener takes no context by design; its schema init must complete at boot regardless of cancellation
return nil
}
func (b *boot) openChatSessions(_ context.Context) error { //nolint:unparam // context keeps the composition phase contract aligned with other openers
chatSessionStore, err := makeTelegramSessionStore(b.cfg) //nolint:contextcheck // SQLite schema initialization is synchronous and has no context-aware API
if err != nil {
log.Error("open conversation store", "path", conversationDBPath(cfg.DBPath), "err", err)
return err
return fmt.Errorf("open conversation store: %w", err)
}
b.chatSessionStore = chatSessionStore
b.addCleanup(func() {
if err := chatSessionStore.Close(); err != nil {
log.Error("close conversation store", "err", err)
b.log.Error("close conversation store", "err", err)
}
})
return nil
@@ -409,11 +407,11 @@ func (b *boot) wireWebStoreSurfaces() {
// embedded mode starts an in-process nats-server and dials it, so single-
// process deployments get task distribution and reaction delivery without a
// separate server. Broker deployment never changes the worker executor.
func (b *boot) connectNATS(ctx context.Context) error {
func (b *boot) connectNATS(ctx context.Context) error { //nolint:nestif // embedded broker discovery and startup require explicit fallback branches
cfg, log := b.cfg, b.log
url := cfg.NATS.URL
var natsToken string
if cfg.NATS.Mode == config.NATSModeExternal {
if cfg.NATS.Mode == config.NATSModeExternal { //nolint:nestif // embedded broker discovery and startup require explicit fallback branches
if url == "" {
return fmt.Errorf("nats.url is required when nats.mode is external")
}
@@ -424,10 +422,26 @@ func (b *boot) connectNATS(ctx context.Context) error {
return err
}
} else {
var err error
url, natsToken, err = b.startEmbeddedNATS(ctx)
if err != nil {
return err
endpoint, readErr := readEmbeddedNATSEndpoint(cfg.DBPath)
if readErr == nil {
url, natsToken = endpoint.URL, endpoint.Token
if probe, err := nats.Connect(ctx, nats.Config{URL: url, Token: natsToken, Subjects: []string{workintake.SubjectTaskWildcard}, FilterSubject: workintake.SubjectTaskWildcard}, log); err == nil {
probe.Close()
// The endpoint is live; the connection is recreated below with the
// same subject configuration and becomes the daemon's owner.
url, natsToken = endpoint.URL, endpoint.Token
} else {
url, natsToken, err = b.startEmbeddedNATS(ctx)
if err != nil {
return err
}
}
} else {
var err error
url, natsToken, err = b.startEmbeddedNATS(ctx)
if err != nil {
return err
}
}
}
@@ -470,6 +484,10 @@ func (b *boot) startEmbeddedNATS(ctx context.Context) (string, string, error) {
}
b.addCleanup(func() { srv.Shutdown() })
log.Info("embedded nats started", "url", srv.ClientURL())
if err := writeEmbeddedNATSEndpoint(cfg.DBPath, srv.ClientURL(), srv.Token()); err != nil {
srv.Shutdown()
return "", "", err
}
return srv.ClientURL(), srv.Token(), nil
}
@@ -499,6 +517,9 @@ func (b *boot) setupLLMAndChat() error {
return err
}
b.addCleanup(cleanup)
if remote, ok := contract.(*gatewayrpc.Client); ok {
b.chatSessionStore = remote
}
b.web.Chat = &webui.ChatService{Contract: contract, Updates: b.updateService}
b.web.WorkRequests = b.chatTasks
b.setupReadinessProbes()
+30 -10
View File
@@ -10,6 +10,7 @@ import (
natsio "github.com/nats-io/nats.go"
"google.golang.org/grpc"
"github.com/samcharles93/archie-core/internal/config"
"github.com/samcharles93/archie-core/internal/events"
"github.com/samcharles93/archie-core/internal/gateway"
"github.com/samcharles93/archie-core/internal/infrastructure/gatewayrpc"
@@ -37,15 +38,34 @@ func RunGateway(ctx context.Context, options GatewayOptions) error {
if err := b.openStores(ctx); err != nil {
return err
}
b.loadCatalog(ctx, options.Config)
if b.cfg.NATS.URL == "" {
return fmt.Errorf("archie-gateway requires nats.url pointing to the daemon's shared NATS server")
}
token, err := configuredNATSToken(b.cfg.NATS, os.Getenv)
if err != nil {
if err := b.openChatSessions(ctx); err != nil {
return err
}
nc, err := natsio.Connect(b.cfg.NATS.URL, natsio.Token(token))
b.loadCatalog(ctx, options.Config)
url, token := b.cfg.NATS.URL, ""
var nc *natsio.Conn
var err error
if b.cfg.NATS.Mode == config.NATSModeExternal { //nolint:nestif // external and embedded transports have distinct credential and discovery flows
token, err = configuredNATSToken(b.cfg.NATS, os.Getenv)
if err != nil {
return err
}
nc, err = natsio.Connect(url, natsio.Token(token))
} else {
var endpoint embeddedNATSEndpoint
endpoint, err = readEmbeddedNATSEndpoint(b.cfg.DBPath)
if err == nil {
url, token = endpoint.URL, endpoint.Token
nc, err = natsio.Connect(url, natsio.Token(token))
}
if nc == nil || err != nil {
url, token, err = b.startEmbeddedNATS(ctx)
if err != nil {
return err
}
nc, err = natsio.Connect(url, natsio.Token(token))
}
}
if err != nil {
return fmt.Errorf("connect gateway task actions: %w", err)
}
@@ -64,7 +84,7 @@ func RunGateway(ctx context.Context, options GatewayOptions) error {
}
defer listener.Close()
b.log.Info("archie-gateway running", "addr", listener.Addr().String())
return serveGateway(ctx, listener, contract)
return serveGateway(ctx, listener, contract, b.chatSessionStore)
}
func (b *boot) startGatewayRuntime(ctx context.Context, actor gateway.ChatTaskActor) (gateway.ChatContract, error) {
@@ -93,9 +113,9 @@ func (b *boot) startGatewayRuntime(ctx context.Context, actor gateway.ChatTaskAc
return contract, nil
}
func serveGateway(ctx context.Context, listener net.Listener, contract gateway.ChatContract) error {
func serveGateway(ctx context.Context, listener net.Listener, contract gateway.ChatContract, sessions gateway.SessionStore) error {
server := grpc.NewServer()
gatewayrpc.RegisterServer(server, contract)
gatewayrpc.RegisterServer(server, contract, sessions)
serveErr := make(chan error, 1)
go func() { serveErr <- server.Serve(listener) }()
select {
+64
View File
@@ -0,0 +1,64 @@
package archied
import (
"encoding/json"
"fmt"
"os"
"path/filepath"
)
type embeddedNATSEndpoint struct {
URL string `json:"url"`
Token string `json:"token"`
}
func embeddedNATSEndpointPath(dbPath string) string {
return filepath.Join(filepath.Dir(dbPath), "nats", "endpoint.json")
}
func writeEmbeddedNATSEndpoint(dbPath, url, token string) error {
path := embeddedNATSEndpointPath(dbPath)
data, err := json.Marshal(embeddedNATSEndpoint{URL: url, Token: token})
if err != nil {
return fmt.Errorf("marshal embedded NATS endpoint: %w", err)
}
if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil {
return fmt.Errorf("create embedded NATS directory: %w", err)
}
tmp, err := os.CreateTemp(filepath.Dir(path), ".endpoint-*")
if err != nil {
return fmt.Errorf("create embedded NATS endpoint: %w", err)
}
tmpName := tmp.Name()
defer os.Remove(tmpName)
if err := tmp.Chmod(0o600); err != nil {
tmp.Close()
return fmt.Errorf("protect embedded NATS endpoint: %w", err)
}
if _, err := tmp.Write(data); err != nil {
tmp.Close()
return fmt.Errorf("write embedded NATS endpoint: %w", err)
}
if err := tmp.Close(); err != nil {
return fmt.Errorf("close embedded NATS endpoint: %w", err)
}
if err := os.Rename(tmpName, path); err != nil {
return fmt.Errorf("publish embedded NATS endpoint: %w", err)
}
return nil
}
func readEmbeddedNATSEndpoint(dbPath string) (embeddedNATSEndpoint, error) {
data, err := os.ReadFile(embeddedNATSEndpointPath(dbPath))
if err != nil {
return embeddedNATSEndpoint{}, err
}
var endpoint embeddedNATSEndpoint
if err := json.Unmarshal(data, &endpoint); err != nil {
return embeddedNATSEndpoint{}, fmt.Errorf("decode embedded NATS endpoint: %w", err)
}
if endpoint.URL == "" || endpoint.Token == "" {
return embeddedNATSEndpoint{}, fmt.Errorf("embedded NATS endpoint is incomplete")
}
return endpoint, nil
}
@@ -0,0 +1,28 @@
package archied
import (
"os"
"path/filepath"
"testing"
)
func TestEmbeddedNATSEndpointRoundTripIsPrivateAndAtomic(t *testing.T) {
dbPath := filepath.Join(t.TempDir(), "archie.db")
if err := writeEmbeddedNATSEndpoint(dbPath, "nats://127.0.0.1:4222", "secret"); err != nil {
t.Fatal(err)
}
got, err := readEmbeddedNATSEndpoint(dbPath)
if err != nil {
t.Fatal(err)
}
if got.URL != "nats://127.0.0.1:4222" || got.Token != "secret" {
t.Fatalf("endpoint = %+v", got)
}
info, err := os.Stat(embeddedNATSEndpointPath(dbPath))
if err != nil {
t.Fatal(err)
}
if info.Mode().Perm() != 0o600 {
t.Fatalf("endpoint permissions = %o, want 600", info.Mode().Perm())
}
}
File diff suppressed because it is too large. Load diff
+427 -9
View File
@@ -19,15 +19,26 @@ import (
const _ = grpc.SupportPackageIsVersion9
const (
ChatService_Snapshot_FullMethodName = "/gateway.v1.ChatService/Snapshot"
ChatService_GetSession_FullMethodName = "/gateway.v1.ChatService/GetSession"
ChatService_RecentMessages_FullMethodName = "/gateway.v1.ChatService/RecentMessages"
ChatService_RecentTurns_FullMethodName = "/gateway.v1.ChatService/RecentTurns"
ChatService_Route_FullMethodName = "/gateway.v1.ChatService/Route"
ChatService_Stream_FullMethodName = "/gateway.v1.ChatService/Stream"
ChatService_Cancel_FullMethodName = "/gateway.v1.ChatService/Cancel"
ChatService_SetPersona_FullMethodName = "/gateway.v1.ChatService/SetPersona"
ChatService_ApplyTaskAction_FullMethodName = "/gateway.v1.ChatService/ApplyTaskAction"
ChatService_Snapshot_FullMethodName = "/gateway.v1.ChatService/Snapshot"
ChatService_GetSession_FullMethodName = "/gateway.v1.ChatService/GetSession"
ChatService_RecentMessages_FullMethodName = "/gateway.v1.ChatService/RecentMessages"
ChatService_RecentTurns_FullMethodName = "/gateway.v1.ChatService/RecentTurns"
ChatService_Route_FullMethodName = "/gateway.v1.ChatService/Route"
ChatService_Stream_FullMethodName = "/gateway.v1.ChatService/Stream"
ChatService_Cancel_FullMethodName = "/gateway.v1.ChatService/Cancel"
ChatService_SetPersona_FullMethodName = "/gateway.v1.ChatService/SetPersona"
ChatService_ApplyTaskAction_FullMethodName = "/gateway.v1.ChatService/ApplyTaskAction"
ChatService_SaveSession_FullMethodName = "/gateway.v1.ChatService/SaveSession"
ChatService_GetSessionsByChannel_FullMethodName = "/gateway.v1.ChatService/GetSessionsByChannel"
ChatService_DeleteSession_FullMethodName = "/gateway.v1.ChatService/DeleteSession"
ChatService_TouchSession_FullMethodName = "/gateway.v1.ChatService/TouchSession"
ChatService_ListSessions_FullMethodName = "/gateway.v1.ChatService/ListSessions"
ChatService_SaveMessage_FullMethodName = "/gateway.v1.ChatService/SaveMessage"
ChatService_DeleteRecentMessages_FullMethodName = "/gateway.v1.ChatService/DeleteRecentMessages"
ChatService_MessageCount_FullMethodName = "/gateway.v1.ChatService/MessageCount"
ChatService_SaveMessages_FullMethodName = "/gateway.v1.ChatService/SaveMessages"
ChatService_ReplaceMessages_FullMethodName = "/gateway.v1.ChatService/ReplaceMessages"
ChatService_SearchMessages_FullMethodName = "/gateway.v1.ChatService/SearchMessages"
)
// ChatServiceClient is the client API for ChatService service.
@@ -43,6 +54,17 @@ type ChatServiceClient interface {
Cancel(ctx context.Context, in *CancelRequest, opts ...grpc.CallOption) (*CancelResponse, error)
SetPersona(ctx context.Context, in *SetPersonaRequest, opts ...grpc.CallOption) (*SetPersonaResponse, error)
ApplyTaskAction(ctx context.Context, in *ApplyTaskActionRequest, opts ...grpc.CallOption) (*ApplyTaskActionResponse, error)
SaveSession(ctx context.Context, in *SaveSessionRequest, opts ...grpc.CallOption) (*SaveSessionResponse, error)
GetSessionsByChannel(ctx context.Context, in *GetSessionsByChannelRequest, opts ...grpc.CallOption) (*GetSessionsByChannelResponse, error)
DeleteSession(ctx context.Context, in *DeleteSessionRequest, opts ...grpc.CallOption) (*DeleteSessionResponse, error)
TouchSession(ctx context.Context, in *TouchSessionRequest, opts ...grpc.CallOption) (*TouchSessionResponse, error)
ListSessions(ctx context.Context, in *ListSessionsRequest, opts ...grpc.CallOption) (*ListSessionsResponse, error)
SaveMessage(ctx context.Context, in *SaveMessageRequest, opts ...grpc.CallOption) (*SaveMessageResponse, error)
DeleteRecentMessages(ctx context.Context, in *DeleteRecentMessagesRequest, opts ...grpc.CallOption) (*DeleteRecentMessagesResponse, error)
MessageCount(ctx context.Context, in *MessageCountRequest, opts ...grpc.CallOption) (*MessageCountResponse, error)
SaveMessages(ctx context.Context, in *SaveMessagesRequest, opts ...grpc.CallOption) (*SaveMessagesResponse, error)
ReplaceMessages(ctx context.Context, in *ReplaceMessagesRequest, opts ...grpc.CallOption) (*ReplaceMessagesResponse, error)
SearchMessages(ctx context.Context, in *SearchMessagesRequest, opts ...grpc.CallOption) (*SearchMessagesResponse, error)
}
type chatServiceClient struct {
@@ -152,6 +174,116 @@ func (c *chatServiceClient) ApplyTaskAction(ctx context.Context, in *ApplyTaskAc
return out, nil
}
func (c *chatServiceClient) SaveSession(ctx context.Context, in *SaveSessionRequest, opts ...grpc.CallOption) (*SaveSessionResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(SaveSessionResponse)
err := c.cc.Invoke(ctx, ChatService_SaveSession_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *chatServiceClient) GetSessionsByChannel(ctx context.Context, in *GetSessionsByChannelRequest, opts ...grpc.CallOption) (*GetSessionsByChannelResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(GetSessionsByChannelResponse)
err := c.cc.Invoke(ctx, ChatService_GetSessionsByChannel_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *chatServiceClient) DeleteSession(ctx context.Context, in *DeleteSessionRequest, opts ...grpc.CallOption) (*DeleteSessionResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(DeleteSessionResponse)
err := c.cc.Invoke(ctx, ChatService_DeleteSession_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *chatServiceClient) TouchSession(ctx context.Context, in *TouchSessionRequest, opts ...grpc.CallOption) (*TouchSessionResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(TouchSessionResponse)
err := c.cc.Invoke(ctx, ChatService_TouchSession_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *chatServiceClient) ListSessions(ctx context.Context, in *ListSessionsRequest, opts ...grpc.CallOption) (*ListSessionsResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(ListSessionsResponse)
err := c.cc.Invoke(ctx, ChatService_ListSessions_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *chatServiceClient) SaveMessage(ctx context.Context, in *SaveMessageRequest, opts ...grpc.CallOption) (*SaveMessageResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(SaveMessageResponse)
err := c.cc.Invoke(ctx, ChatService_SaveMessage_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *chatServiceClient) DeleteRecentMessages(ctx context.Context, in *DeleteRecentMessagesRequest, opts ...grpc.CallOption) (*DeleteRecentMessagesResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(DeleteRecentMessagesResponse)
err := c.cc.Invoke(ctx, ChatService_DeleteRecentMessages_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *chatServiceClient) MessageCount(ctx context.Context, in *MessageCountRequest, opts ...grpc.CallOption) (*MessageCountResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(MessageCountResponse)
err := c.cc.Invoke(ctx, ChatService_MessageCount_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *chatServiceClient) SaveMessages(ctx context.Context, in *SaveMessagesRequest, opts ...grpc.CallOption) (*SaveMessagesResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(SaveMessagesResponse)
err := c.cc.Invoke(ctx, ChatService_SaveMessages_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *chatServiceClient) ReplaceMessages(ctx context.Context, in *ReplaceMessagesRequest, opts ...grpc.CallOption) (*ReplaceMessagesResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(ReplaceMessagesResponse)
err := c.cc.Invoke(ctx, ChatService_ReplaceMessages_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *chatServiceClient) SearchMessages(ctx context.Context, in *SearchMessagesRequest, opts ...grpc.CallOption) (*SearchMessagesResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(SearchMessagesResponse)
err := c.cc.Invoke(ctx, ChatService_SearchMessages_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
// ChatServiceServer is the server API for ChatService service.
// All implementations must embed UnimplementedChatServiceServer
// for forward compatibility.
@@ -165,6 +297,17 @@ type ChatServiceServer interface {
Cancel(context.Context, *CancelRequest) (*CancelResponse, error)
SetPersona(context.Context, *SetPersonaRequest) (*SetPersonaResponse, error)
ApplyTaskAction(context.Context, *ApplyTaskActionRequest) (*ApplyTaskActionResponse, error)
SaveSession(context.Context, *SaveSessionRequest) (*SaveSessionResponse, error)
GetSessionsByChannel(context.Context, *GetSessionsByChannelRequest) (*GetSessionsByChannelResponse, error)
DeleteSession(context.Context, *DeleteSessionRequest) (*DeleteSessionResponse, error)
TouchSession(context.Context, *TouchSessionRequest) (*TouchSessionResponse, error)
ListSessions(context.Context, *ListSessionsRequest) (*ListSessionsResponse, error)
SaveMessage(context.Context, *SaveMessageRequest) (*SaveMessageResponse, error)
DeleteRecentMessages(context.Context, *DeleteRecentMessagesRequest) (*DeleteRecentMessagesResponse, error)
MessageCount(context.Context, *MessageCountRequest) (*MessageCountResponse, error)
SaveMessages(context.Context, *SaveMessagesRequest) (*SaveMessagesResponse, error)
ReplaceMessages(context.Context, *ReplaceMessagesRequest) (*ReplaceMessagesResponse, error)
SearchMessages(context.Context, *SearchMessagesRequest) (*SearchMessagesResponse, error)
mustEmbedUnimplementedChatServiceServer()
}
@@ -202,6 +345,39 @@ func (UnimplementedChatServiceServer) SetPersona(context.Context, *SetPersonaReq
func (UnimplementedChatServiceServer) ApplyTaskAction(context.Context, *ApplyTaskActionRequest) (*ApplyTaskActionResponse, error) {
return nil, status.Error(codes.Unimplemented, "method ApplyTaskAction not implemented")
}
func (UnimplementedChatServiceServer) SaveSession(context.Context, *SaveSessionRequest) (*SaveSessionResponse, error) {
return nil, status.Error(codes.Unimplemented, "method SaveSession not implemented")
}
func (UnimplementedChatServiceServer) GetSessionsByChannel(context.Context, *GetSessionsByChannelRequest) (*GetSessionsByChannelResponse, error) {
return nil, status.Error(codes.Unimplemented, "method GetSessionsByChannel not implemented")
}
func (UnimplementedChatServiceServer) DeleteSession(context.Context, *DeleteSessionRequest) (*DeleteSessionResponse, error) {
return nil, status.Error(codes.Unimplemented, "method DeleteSession not implemented")
}
func (UnimplementedChatServiceServer) TouchSession(context.Context, *TouchSessionRequest) (*TouchSessionResponse, error) {
return nil, status.Error(codes.Unimplemented, "method TouchSession not implemented")
}
func (UnimplementedChatServiceServer) ListSessions(context.Context, *ListSessionsRequest) (*ListSessionsResponse, error) {
return nil, status.Error(codes.Unimplemented, "method ListSessions not implemented")
}
func (UnimplementedChatServiceServer) SaveMessage(context.Context, *SaveMessageRequest) (*SaveMessageResponse, error) {
return nil, status.Error(codes.Unimplemented, "method SaveMessage not implemented")
}
func (UnimplementedChatServiceServer) DeleteRecentMessages(context.Context, *DeleteRecentMessagesRequest) (*DeleteRecentMessagesResponse, error) {
return nil, status.Error(codes.Unimplemented, "method DeleteRecentMessages not implemented")
}
func (UnimplementedChatServiceServer) MessageCount(context.Context, *MessageCountRequest) (*MessageCountResponse, error) {
return nil, status.Error(codes.Unimplemented, "method MessageCount not implemented")
}
func (UnimplementedChatServiceServer) SaveMessages(context.Context, *SaveMessagesRequest) (*SaveMessagesResponse, error) {
return nil, status.Error(codes.Unimplemented, "method SaveMessages not implemented")
}
func (UnimplementedChatServiceServer) ReplaceMessages(context.Context, *ReplaceMessagesRequest) (*ReplaceMessagesResponse, error) {
return nil, status.Error(codes.Unimplemented, "method ReplaceMessages not implemented")
}
func (UnimplementedChatServiceServer) SearchMessages(context.Context, *SearchMessagesRequest) (*SearchMessagesResponse, error) {
return nil, status.Error(codes.Unimplemented, "method SearchMessages not implemented")
}
func (UnimplementedChatServiceServer) mustEmbedUnimplementedChatServiceServer() {}
func (UnimplementedChatServiceServer) testEmbeddedByValue() {}
@@ -378,6 +554,204 @@ func _ChatService_ApplyTaskAction_Handler(srv interface{}, ctx context.Context,
return interceptor(ctx, in, info, handler)
}
func _ChatService_SaveSession_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(SaveSessionRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ChatServiceServer).SaveSession(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: ChatService_SaveSession_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ChatServiceServer).SaveSession(ctx, req.(*SaveSessionRequest))
}
return interceptor(ctx, in, info, handler)
}
func _ChatService_GetSessionsByChannel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(GetSessionsByChannelRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ChatServiceServer).GetSessionsByChannel(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: ChatService_GetSessionsByChannel_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ChatServiceServer).GetSessionsByChannel(ctx, req.(*GetSessionsByChannelRequest))
}
return interceptor(ctx, in, info, handler)
}
func _ChatService_DeleteSession_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(DeleteSessionRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ChatServiceServer).DeleteSession(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: ChatService_DeleteSession_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ChatServiceServer).DeleteSession(ctx, req.(*DeleteSessionRequest))
}
return interceptor(ctx, in, info, handler)
}
func _ChatService_TouchSession_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(TouchSessionRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ChatServiceServer).TouchSession(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: ChatService_TouchSession_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ChatServiceServer).TouchSession(ctx, req.(*TouchSessionRequest))
}
return interceptor(ctx, in, info, handler)
}
func _ChatService_ListSessions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(ListSessionsRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ChatServiceServer).ListSessions(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: ChatService_ListSessions_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ChatServiceServer).ListSessions(ctx, req.(*ListSessionsRequest))
}
return interceptor(ctx, in, info, handler)
}
func _ChatService_SaveMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(SaveMessageRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ChatServiceServer).SaveMessage(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: ChatService_SaveMessage_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ChatServiceServer).SaveMessage(ctx, req.(*SaveMessageRequest))
}
return interceptor(ctx, in, info, handler)
}
func _ChatService_DeleteRecentMessages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(DeleteRecentMessagesRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ChatServiceServer).DeleteRecentMessages(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: ChatService_DeleteRecentMessages_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ChatServiceServer).DeleteRecentMessages(ctx, req.(*DeleteRecentMessagesRequest))
}
return interceptor(ctx, in, info, handler)
}
func _ChatService_MessageCount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(MessageCountRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ChatServiceServer).MessageCount(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: ChatService_MessageCount_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ChatServiceServer).MessageCount(ctx, req.(*MessageCountRequest))
}
return interceptor(ctx, in, info, handler)
}
func _ChatService_SaveMessages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(SaveMessagesRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ChatServiceServer).SaveMessages(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: ChatService_SaveMessages_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ChatServiceServer).SaveMessages(ctx, req.(*SaveMessagesRequest))
}
return interceptor(ctx, in, info, handler)
}
func _ChatService_ReplaceMessages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(ReplaceMessagesRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ChatServiceServer).ReplaceMessages(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: ChatService_ReplaceMessages_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ChatServiceServer).ReplaceMessages(ctx, req.(*ReplaceMessagesRequest))
}
return interceptor(ctx, in, info, handler)
}
func _ChatService_SearchMessages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(SearchMessagesRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ChatServiceServer).SearchMessages(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: ChatService_SearchMessages_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ChatServiceServer).SearchMessages(ctx, req.(*SearchMessagesRequest))
}
return interceptor(ctx, in, info, handler)
}
// ChatService_ServiceDesc is the grpc.ServiceDesc for ChatService service.
// It's only intended for direct use with grpc.RegisterService,
// and not to be introspected or modified (even as a copy)
@@ -417,6 +791,50 @@ var ChatService_ServiceDesc = grpc.ServiceDesc{
MethodName: "ApplyTaskAction",
Handler: _ChatService_ApplyTaskAction_Handler,
},
{
MethodName: "SaveSession",
Handler: _ChatService_SaveSession_Handler,
},
{
MethodName: "GetSessionsByChannel",
Handler: _ChatService_GetSessionsByChannel_Handler,
},
{
MethodName: "DeleteSession",
Handler: _ChatService_DeleteSession_Handler,
},
{
MethodName: "TouchSession",
Handler: _ChatService_TouchSession_Handler,
},
{
MethodName: "ListSessions",
Handler: _ChatService_ListSessions_Handler,
},
{
MethodName: "SaveMessage",
Handler: _ChatService_SaveMessage_Handler,
},
{
MethodName: "DeleteRecentMessages",
Handler: _ChatService_DeleteRecentMessages_Handler,
},
{
MethodName: "MessageCount",
Handler: _ChatService_MessageCount_Handler,
},
{
MethodName: "SaveMessages",
Handler: _ChatService_SaveMessages_Handler,
},
{
MethodName: "ReplaceMessages",
Handler: _ChatService_ReplaceMessages_Handler,
},
{
MethodName: "SearchMessages",
Handler: _ChatService_SearchMessages_Handler,
},
},
Streams: []grpc.StreamDesc{
{
+77 -1
View File
@@ -13,10 +13,86 @@ import (
"github.com/samcharles93/archie-core/internal/taskstate"
)
var _ gateway.ChatContract = (*Client)(nil)
var (
_ gateway.ChatContract = (*Client)(nil)
_ gateway.SessionStore = (*Client)(nil)
)
type Client struct{ client pb.ChatServiceClient }
func (c *Client) Get(ctx context.Context, id string) (*gateway.SessionContext, error) {
s, found, err := c.GetSession(ctx, id)
if err != nil || !found {
return nil, err
}
return &s, nil
}
func (c *Client) Save(ctx context.Context, s gateway.SessionContext) error {
_, e := c.client.SaveSession(ctx, &pb.SaveSessionRequest{Session: sessionProto(s)})
return e
}
func (c *Client) GetByChannel(ctx context.Context, p, ch string) ([]gateway.SessionContext, error) {
v, e := c.client.GetSessionsByChannel(ctx, &pb.GetSessionsByChannelRequest{Platform: p, ChannelId: ch})
if e != nil {
return nil, e
}
return mapValues(v.Sessions, sessionValue), nil
}
func (c *Client) Delete(ctx context.Context, id string) error {
_, e := c.client.DeleteSession(ctx, &pb.DeleteSessionRequest{SessionId: id})
return e
}
func (c *Client) Touch(ctx context.Context, id string) error {
_, e := c.client.TouchSession(ctx, &pb.TouchSessionRequest{SessionId: id})
return e
}
func (c *Client) List(ctx context.Context) ([]gateway.SessionContext, error) {
v, e := c.client.ListSessions(ctx, &pb.ListSessionsRequest{})
if e != nil {
return nil, e
}
return mapValues(v.Sessions, sessionValue), nil
}
func (c *Client) SaveMessage(ctx context.Context, id string, m gateway.Message) error {
_, e := c.client.SaveMessage(ctx, &pb.SaveMessageRequest{SessionId: id, Message: messageProto(m)})
return e
}
func (c *Client) DeleteRecentMessages(ctx context.Context, id string, n int) (int, error) {
v, e := c.client.DeleteRecentMessages(ctx, &pb.DeleteRecentMessagesRequest{SessionId: id, Limit: int64(n)})
return int(v.Deleted), e
}
func (c *Client) MessageCount(ctx context.Context, id string) (int, error) {
v, e := c.client.MessageCount(ctx, &pb.MessageCountRequest{SessionId: id})
return int(v.Count), e
}
func (c *Client) SaveMessages(ctx context.Context, id string, m []gateway.Message) error {
_, e := c.client.SaveMessages(ctx, &pb.SaveMessagesRequest{SessionId: id, Messages: mapValues(m, messageProto)})
return e
}
func (c *Client) ReplaceMessages(ctx context.Context, id string, m []gateway.Message, s []string) error {
_, e := c.client.ReplaceMessages(ctx, &pb.ReplaceMessagesRequest{SessionId: id, Messages: mapValues(m, messageProto), Superseded: s})
return e
}
func (c *Client) SearchMessages(ctx context.Context, id string, q gateway.MessageQuery) (gateway.MessagePage, error) {
v, e := c.client.SearchMessages(ctx, &pb.SearchMessagesRequest{SessionId: id, Query: q.Query, Limit: int64(q.Limit), Offset: int64(q.Offset)})
if e != nil {
return gateway.MessagePage{}, e
}
return gateway.MessagePage{Messages: mapValues(v.Messages, messageValue), NextOffset: int(v.NextOffset), HasMore: v.HasMore, Truncated: v.Truncated}, nil
}
func (c *Client) Close() error { return nil }
func NewClient(conn grpc.ClientConnInterface) *Client {
return &Client{client: pb.NewChatServiceClient(conn)}
}
+110 -3
View File
@@ -4,6 +4,8 @@ import (
"context"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
pb "github.com/samcharles93/archie-core/internal/contracts/gateway/v1"
"github.com/samcharles93/archie-core/internal/gateway"
@@ -12,11 +14,23 @@ import (
type server struct {
pb.UnimplementedChatServiceServer
chat gateway.ChatContract
chat gateway.ChatContract
sessions gateway.SessionStore
}
func RegisterServer(registrar grpc.ServiceRegistrar, chat gateway.ChatContract) {
pb.RegisterChatServiceServer(registrar, &server{chat: chat})
func RegisterServer(registrar grpc.ServiceRegistrar, chat gateway.ChatContract, sessions ...gateway.SessionStore) {
var ss gateway.SessionStore
if len(sessions) > 0 {
ss = sessions[0]
}
pb.RegisterChatServiceServer(registrar, &server{chat: chat, sessions: ss})
}
func (s *server) sessionStore() (gateway.SessionStore, error) {
if s.sessions == nil {
return nil, status.Error(codes.Unavailable, "session store unavailable")
}
return s.sessions, nil
}
func (s *server) Snapshot(ctx context.Context, _ *pb.SnapshotRequest) (*pb.SnapshotResponse, error) {
@@ -83,6 +97,99 @@ func (s *server) ApplyTaskAction(ctx context.Context, r *pb.ApplyTaskActionReque
return &pb.ApplyTaskActionResponse{TaskId: v.TaskID, Action: v.Action, Message: v.Message}, nil
}
func (s *server) SaveSession(ctx context.Context, r *pb.SaveSessionRequest) (*pb.SaveSessionResponse, error) {
ss, e := s.sessionStore()
if e != nil {
return nil, e
}
return &pb.SaveSessionResponse{}, ss.Save(ctx, sessionValue(r.Session))
}
func (s *server) GetSessionsByChannel(ctx context.Context, r *pb.GetSessionsByChannelRequest) (*pb.GetSessionsByChannelResponse, error) {
ss, e := s.sessionStore()
if e != nil {
return nil, e
}
v, e := ss.GetByChannel(ctx, r.Platform, r.ChannelId)
return &pb.GetSessionsByChannelResponse{Sessions: mapValues(v, sessionProto)}, e
}
func (s *server) DeleteSession(ctx context.Context, r *pb.DeleteSessionRequest) (*pb.DeleteSessionResponse, error) {
ss, e := s.sessionStore()
if e != nil {
return nil, e
}
return &pb.DeleteSessionResponse{}, ss.Delete(ctx, r.SessionId)
}
func (s *server) TouchSession(ctx context.Context, r *pb.TouchSessionRequest) (*pb.TouchSessionResponse, error) {
ss, e := s.sessionStore()
if e != nil {
return nil, e
}
return &pb.TouchSessionResponse{}, ss.Touch(ctx, r.SessionId)
}
func (s *server) ListSessions(ctx context.Context, _ *pb.ListSessionsRequest) (*pb.ListSessionsResponse, error) {
ss, e := s.sessionStore()
if e != nil {
return nil, e
}
v, e := ss.List(ctx)
return &pb.ListSessionsResponse{Sessions: mapValues(v, sessionProto)}, e
}
func (s *server) SaveMessage(ctx context.Context, r *pb.SaveMessageRequest) (*pb.SaveMessageResponse, error) {
ss, e := s.sessionStore()
if e != nil {
return nil, e
}
return &pb.SaveMessageResponse{}, ss.SaveMessage(ctx, r.SessionId, messageValue(r.Message))
}
func (s *server) DeleteRecentMessages(ctx context.Context, r *pb.DeleteRecentMessagesRequest) (*pb.DeleteRecentMessagesResponse, error) {
ss, e := s.sessionStore()
if e != nil {
return nil, e
}
v, e := ss.DeleteRecentMessages(ctx, r.SessionId, int(r.Limit))
return &pb.DeleteRecentMessagesResponse{Deleted: int64(v)}, e
}
func (s *server) MessageCount(ctx context.Context, r *pb.MessageCountRequest) (*pb.MessageCountResponse, error) {
ss, e := s.sessionStore()
if e != nil {
return nil, e
}
v, e := ss.MessageCount(ctx, r.SessionId)
return &pb.MessageCountResponse{Count: int64(v)}, e
}
func (s *server) SaveMessages(ctx context.Context, r *pb.SaveMessagesRequest) (*pb.SaveMessagesResponse, error) {
ss, e := s.sessionStore()
if e != nil {
return nil, e
}
return &pb.SaveMessagesResponse{}, ss.SaveMessages(ctx, r.SessionId, mapValues(r.Messages, messageValue))
}
func (s *server) ReplaceMessages(ctx context.Context, r *pb.ReplaceMessagesRequest) (*pb.ReplaceMessagesResponse, error) {
ss, e := s.sessionStore()
if e != nil {
return nil, e
}
return &pb.ReplaceMessagesResponse{}, ss.ReplaceMessages(ctx, r.SessionId, mapValues(r.Messages, messageValue), r.Superseded)
}
func (s *server) SearchMessages(ctx context.Context, r *pb.SearchMessagesRequest) (*pb.SearchMessagesResponse, error) {
ss, e := s.sessionStore()
if e != nil {
return nil, e
}
v, e := ss.SearchMessages(ctx, r.SessionId, gateway.MessageQuery{Query: r.Query, Limit: int(r.Limit), Offset: int(r.Offset)})
return &pb.SearchMessagesResponse{Messages: mapValues(v.Messages, messageProto), NextOffset: int64(v.NextOffset), HasMore: v.HasMore, Truncated: v.Truncated}, e
}
func (s *server) Stream(r *pb.StreamRequest, out grpc.ServerStreamingServer[pb.StreamResponse]) error {
events, err := s.chat.Stream(out.Context(), messageValue(r.Message))
if err != nil {
+33
View File
@@ -14,6 +14,17 @@ service ChatService {
rpc Cancel(CancelRequest) returns (CancelResponse);
rpc SetPersona(SetPersonaRequest) returns (SetPersonaResponse);
rpc ApplyTaskAction(ApplyTaskActionRequest) returns (ApplyTaskActionResponse);
rpc SaveSession(SaveSessionRequest) returns (SaveSessionResponse);
rpc GetSessionsByChannel(GetSessionsByChannelRequest) returns (GetSessionsByChannelResponse);
rpc DeleteSession(DeleteSessionRequest) returns (DeleteSessionResponse);
rpc TouchSession(TouchSessionRequest) returns (TouchSessionResponse);
rpc ListSessions(ListSessionsRequest) returns (ListSessionsResponse);
rpc SaveMessage(SaveMessageRequest) returns (SaveMessageResponse);
rpc DeleteRecentMessages(DeleteRecentMessagesRequest) returns (DeleteRecentMessagesResponse);
rpc MessageCount(MessageCountRequest) returns (MessageCountResponse);
rpc SaveMessages(SaveMessagesRequest) returns (SaveMessagesResponse);
rpc ReplaceMessages(ReplaceMessagesRequest) returns (ReplaceMessagesResponse);
rpc SearchMessages(SearchMessagesRequest) returns (SearchMessagesResponse);
}
message Session {
@@ -111,3 +122,25 @@ message SetPersonaRequest { string session_id = 1; string name = 2; }
message SetPersonaResponse { bool found = 1; }
message ApplyTaskActionRequest { string identity = 1; int64 task_id = 2; string action = 3; }
message ApplyTaskActionResponse { int64 task_id = 1; string action = 2; string message = 3; }
message SaveSessionResponse {}
message SaveSessionRequest { Session session = 1; }
message GetSessionsByChannelRequest { string platform = 1; string channel_id = 2; }
message GetSessionsByChannelResponse { repeated Session sessions = 1; }
message ListSessionsResponse { repeated Session sessions = 1; }
message DeleteSessionResponse {}
message TouchSessionResponse {}
message SaveMessageResponse {}
message SaveMessagesResponse {}
message ReplaceMessagesResponse {}
message DeleteSessionRequest { string session_id = 1; }
message TouchSessionRequest { string session_id = 1; }
message ListSessionsRequest {}
message SaveMessageRequest { string session_id = 1; Message message = 2; }
message DeleteRecentMessagesRequest { string session_id = 1; int64 limit = 2; }
message DeleteRecentMessagesResponse { int64 deleted = 1; }
message MessageCountRequest { string session_id = 1; }
message MessageCountResponse { int64 count = 1; }
message SaveMessagesRequest { string session_id = 1; repeated Message messages = 2; }
message ReplaceMessagesRequest { string session_id = 1; repeated Message messages = 2; repeated string superseded = 3; }
message SearchMessagesRequest { string session_id = 1; string query = 2; int64 limit = 3; int64 offset = 4; }
message SearchMessagesResponse { repeated Message messages = 1; int64 next_offset = 2; bool has_more = 3; bool truncated = 4; }