@barumetric/contracts 1.4.9 → 1.4.11

package/dist/events/index.d.ts

@@ -4,3 +4,4 @@ export * from "./balance";
 export * from "./listings";
 export * from "./payment";
 export * from "./images";
+export * from "./messages";

package/dist/events/index.js

@@ -20,3 +20,4 @@ __exportStar(require("./balance"), exports);
 __exportStar(require("./listings"), exports);
 __exportStar(require("./payment"), exports);
 __exportStar(require("./images"), exports);
+__exportStar(require("./messages"), exports);

package/dist/events/messages/index.d.ts

@@ -0,0 +1,5 @@
+export * from './message-types';
+export * from './send-message-command.interface';
+export * from './mark-as-read-command.interface';
+export * from './message-sent-event.interface';
+export * from './message-read-event.interface';

package/dist/events/messages/index.js

@@ -0,0 +1,21 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./message-types"), exports);
+__exportStar(require("./send-message-command.interface"), exports);
+__exportStar(require("./mark-as-read-command.interface"), exports);
+__exportStar(require("./message-sent-event.interface"), exports);
+__exportStar(require("./message-read-event.interface"), exports);

package/dist/events/messages/mark-as-read-command.interface.d.ts

@@ -0,0 +1,9 @@
+/**
+ * RMQ command
+ * pattern: `messages.message.read`
+ */
+export interface MarkAsReadCommand {
+    conversationId: string;
+    userId: string;
+    messageIds?: string[];
+}

package/dist/events/messages/mark-as-read-command.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/events/messages/message-read-event.interface.d.ts

@@ -0,0 +1,13 @@
+/**
+ * RMQ event
+ * pattern: `messages.message.read`
+ *
+ * Emitted by: messages-service
+ * Consumed by: messages-service-ws
+ */
+export interface MessageReadEvent {
+    conversationId: string;
+    userId: string;
+    markedCount: number;
+    messageIds?: string[];
+}

package/dist/events/messages/message-read-event.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/events/messages/message-sent-event.interface.d.ts

@@ -0,0 +1,34 @@
+import type { MessageType } from './message-types';
+export interface MessageDto {
+    id: string;
+    conversationId: string;
+    senderId: string;
+    text?: string | null;
+    type: MessageType;
+    imageUrl?: string | null;
+    fileUrl?: string | null;
+    fileName?: string | null;
+    fileSize?: number | null;
+    mimeType?: string | null;
+    read: boolean;
+    readAt?: string | null;
+    delivered: boolean;
+    deliveredAt?: string | null;
+    replyToIds: string[];
+    createdAt: string;
+    updatedAt: string;
+}
+/**
+ * RMQ event
+ * pattern: `messages.message.sent`
+ *
+ * Emitted by: messages-service
+ * Consumed by: messages-service-ws
+ */
+export interface MessageSentEvent {
+    conversationId: string;
+    message: MessageDto;
+    senderId: string;
+    recipientId: string;
+    clientMessageId?: string | null;
+}

package/dist/events/messages/message-sent-event.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/events/messages/message-types.d.ts

@@ -0,0 +1 @@
+export type MessageType = 'TEXT' | 'IMAGE' | 'FILE' | 'VOICE' | 'LOCATION' | 'SYSTEM';

package/dist/events/messages/message-types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/events/messages/send-message-command.interface.d.ts

@@ -0,0 +1,21 @@
+import type { MessageType } from './message-types';
+/**
+ * RMQ command
+ * pattern: `messages.message.send`
+ */
+export interface SendMessageCommand {
+    conversationId: string;
+    senderId: string;
+    text?: string;
+    type?: MessageType;
+    imageUrl?: string;
+    fileUrl?: string;
+    fileName?: string;
+    fileSize?: number;
+    mimeType?: string;
+    replyToIds?: string[];
+    /**
+     * Optional client correlation/idempotency key
+     */
+    clientMessageId?: string;
+}

package/dist/events/messages/send-message-command.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/proto/paths.d.ts

@@ -10,4 +10,5 @@ export declare const PROTO_PATHS: {
     readonly PRESENCE: string;
     readonly PAYMENT: string;
     readonly BALANCE: string;
+    readonly MESSAGES: string;
 };

package/dist/proto/paths.js

@@ -14,4 +14,5 @@ exports.PROTO_PATHS = {
     PRESENCE: (0, path_1.join)(__dirname, "../../proto/presence.proto"),
     PAYMENT: (0, path_1.join)(__dirname, "../../proto/payment.proto"),
     BALANCE: (0, path_1.join)(__dirname, "../../proto/balance.proto"),
+    MESSAGES: (0, path_1.join)(__dirname, "../../proto/messages.proto"),
 };

package/gen/ts/messages.ts

@@ -0,0 +1,213 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v2.11.0
+//   protoc               v3.21.12
+// source: messages.proto
+
+/* eslint-disable */
+import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
+import { Observable } from "rxjs";
+import { Timestamp } from "./google/protobuf/timestamp";
+
+export const protobufPackage = "messages.v1";
+
+export enum MessageType {
+  MESSAGE_TYPE_UNSPECIFIED = 0,
+  MESSAGE_TYPE_TEXT = 1,
+  MESSAGE_TYPE_IMAGE = 2,
+  MESSAGE_TYPE_FILE = 3,
+  MESSAGE_TYPE_VOICE = 4,
+  MESSAGE_TYPE_LOCATION = 5,
+  MESSAGE_TYPE_SYSTEM = 6,
+  UNRECOGNIZED = -1,
+}
+
+export interface Conversation {
+  id: string;
+  listingId: string;
+  sellerId: string;
+  buyerId: string;
+  lastMessageAt: Timestamp | undefined;
+  lastMessageId: string;
+  lastMessagePreview: string;
+  unreadForSeller: number;
+  unreadForBuyer: number;
+  createdAt: Timestamp | undefined;
+  updatedAt: Timestamp | undefined;
+}
+
+export interface Message {
+  id: string;
+  conversationId: string;
+  senderId: string;
+  text: string;
+  type: MessageType;
+  imageUrl: string;
+  fileUrl: string;
+  fileName: string;
+  fileSize: number;
+  mimeType: string;
+  read: boolean;
+  readAt: Timestamp | undefined;
+  delivered: boolean;
+  deliveredAt: Timestamp | undefined;
+  replyToIds: string[];
+  createdAt: Timestamp | undefined;
+  updatedAt: Timestamp | undefined;
+}
+
+export interface GetConversationsRequest {
+  userId: string;
+  limit: number;
+  cursor: string;
+}
+
+export interface GetConversationsResponse {
+  conversations: Conversation[];
+  nextCursor: string;
+}
+
+export interface GetConversationRequest {
+  conversationId: string;
+  userId: string;
+}
+
+export interface GetConversationResponse {
+  conversation: Conversation | undefined;
+}
+
+export interface CreateConversationRequest {
+  sellerId: string;
+  buyerId: string;
+  listingId: string;
+}
+
+export interface CreateConversationResponse {
+  conversation: Conversation | undefined;
+}
+
+export interface GetMessagesRequest {
+  conversationId: string;
+  userId: string;
+  limit: number;
+  cursor: string;
+}
+
+export interface GetMessagesResponse {
+  messages: Message[];
+  nextCursor: string;
+}
+
+export interface SendMessageRequest {
+  conversationId: string;
+  senderId: string;
+  text: string;
+  type: MessageType;
+  imageUrl: string;
+  fileUrl: string;
+  fileName: string;
+  fileSize: number;
+  mimeType: string;
+  replyToIds: string[];
+  clientMessageId: string;
+}
+
+export interface SendMessageResponse {
+  message: Message | undefined;
+}
+
+export interface MarkAsReadRequest {
+  conversationId: string;
+  userId: string;
+  messageIds: string[];
+}
+
+export interface MarkAsReadResponse {
+  markedCount: number;
+}
+
+export interface SearchMessagesRequest {
+  userId: string;
+  conversationId: string;
+  query: string;
+  limit: number;
+  cursor: string;
+}
+
+export interface SearchMessagesResponse {
+  messages: Message[];
+  nextCursor: string;
+}
+
+export const MESSAGES_V1_PACKAGE_NAME = "messages.v1";
+
+export interface MessagesServiceClient {
+  getConversations(request: GetConversationsRequest): Observable<GetConversationsResponse>;
+
+  getConversation(request: GetConversationRequest): Observable<GetConversationResponse>;
+
+  createConversation(request: CreateConversationRequest): Observable<CreateConversationResponse>;
+
+  getMessages(request: GetMessagesRequest): Observable<GetMessagesResponse>;
+
+  sendMessage(request: SendMessageRequest): Observable<SendMessageResponse>;
+
+  markAsRead(request: MarkAsReadRequest): Observable<MarkAsReadResponse>;
+
+  searchMessages(request: SearchMessagesRequest): Observable<SearchMessagesResponse>;
+}
+
+export interface MessagesServiceController {
+  getConversations(
+    request: GetConversationsRequest,
+  ): Promise<GetConversationsResponse> | Observable<GetConversationsResponse> | GetConversationsResponse;
+
+  getConversation(
+    request: GetConversationRequest,
+  ): Promise<GetConversationResponse> | Observable<GetConversationResponse> | GetConversationResponse;
+
+  createConversation(
+    request: CreateConversationRequest,
+  ): Promise<CreateConversationResponse> | Observable<CreateConversationResponse> | CreateConversationResponse;
+
+  getMessages(
+    request: GetMessagesRequest,
+  ): Promise<GetMessagesResponse> | Observable<GetMessagesResponse> | GetMessagesResponse;
+
+  sendMessage(
+    request: SendMessageRequest,
+  ): Promise<SendMessageResponse> | Observable<SendMessageResponse> | SendMessageResponse;
+
+  markAsRead(
+    request: MarkAsReadRequest,
+  ): Promise<MarkAsReadResponse> | Observable<MarkAsReadResponse> | MarkAsReadResponse;
+
+  searchMessages(
+    request: SearchMessagesRequest,
+  ): Promise<SearchMessagesResponse> | Observable<SearchMessagesResponse> | SearchMessagesResponse;
+}
+
+export function MessagesServiceControllerMethods() {
+  return function (constructor: Function) {
+    const grpcMethods: string[] = [
+      "getConversations",
+      "getConversation",
+      "createConversation",
+      "getMessages",
+      "sendMessage",
+      "markAsRead",
+      "searchMessages",
+    ];
+    for (const method of grpcMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcMethod("MessagesService", method)(constructor.prototype[method], method, descriptor);
+    }
+    const grpcStreamMethods: string[] = [];
+    for (const method of grpcStreamMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcStreamMethod("MessagesService", method)(constructor.prototype[method], method, descriptor);
+    }
+  };
+}
+
+export const MESSAGES_SERVICE_NAME = "MessagesService";

package/gen/ts/users.ts

@@ -95,6 +95,18 @@ export interface PatchUserResponse {
   ok: boolean;
 }
 
+export interface PatchUserLocationRequest {
+  userId: string;
+  city?: string | undefined;
+  region?: string | undefined;
+  latitude?: number | undefined;
+  longitude?: number | undefined;
+}
+
+export interface PatchUserLocationResponse {
+  ok: boolean;
+}
+
 export interface User {
   id: string;
   /** Базовые поля */
@@ -208,6 +220,8 @@ export interface UsersServiceClient {
   createUser(request: CreateUserRequest): Observable<CreateUserResponse>;
 
   patchUser(request: PatchUserRequest): Observable<PatchUserResponse>;
+
+  patchUserLocation(request: PatchUserLocationRequest): Observable<PatchUserLocationResponse>;
 }
 
 export interface UsersServiceController {
@@ -218,11 +232,15 @@ export interface UsersServiceController {
   ): Promise<CreateUserResponse> | Observable<CreateUserResponse> | CreateUserResponse;
 
   patchUser(request: PatchUserRequest): Promise<PatchUserResponse> | Observable<PatchUserResponse> | PatchUserResponse;
+
+  patchUserLocation(
+    request: PatchUserLocationRequest,
+  ): Promise<PatchUserLocationResponse> | Observable<PatchUserLocationResponse> | PatchUserLocationResponse;
 }
 
 export function UsersServiceControllerMethods() {
   return function (constructor: Function) {
-    const grpcMethods: string[] = ["getMe", "createUser", "patchUser"];
+    const grpcMethods: string[] = ["getMe", "createUser", "patchUser", "patchUserLocation"];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
       GrpcMethod("UsersService", method)(constructor.prototype[method], method, descriptor);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@barumetric/contracts",
-	"version": "1.4.9",
+	"version": "1.4.11",
 	"description": "Protobuf definitions and generated TypeScript types",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",

package/proto/messages.proto

@@ -0,0 +1,158 @@
+syntax = "proto3";
+
+package messages.v1;
+
+import "google/protobuf/timestamp.proto";
+
+service MessagesService {
+  rpc GetConversations(GetConversationsRequest) returns (GetConversationsResponse);
+  rpc GetConversation(GetConversationRequest) returns (GetConversationResponse);
+  rpc CreateConversation(CreateConversationRequest) returns (CreateConversationResponse);
+
+  rpc GetMessages(GetMessagesRequest) returns (GetMessagesResponse);
+  rpc SendMessage(SendMessageRequest) returns (SendMessageResponse);
+  rpc MarkAsRead(MarkAsReadRequest) returns (MarkAsReadResponse);
+
+  rpc SearchMessages(SearchMessagesRequest) returns (SearchMessagesResponse);
+}
+
+message Conversation {
+  string id = 1;
+  string listing_id = 2;
+
+  string seller_id = 3;
+  string buyer_id = 4;
+
+  google.protobuf.Timestamp last_message_at = 5;
+  string last_message_id = 6;
+  string last_message_preview = 7;
+
+  int32 unread_for_seller = 8;
+  int32 unread_for_buyer = 9;
+
+  google.protobuf.Timestamp created_at = 10;
+  google.protobuf.Timestamp updated_at = 11;
+}
+
+enum MessageType {
+  MESSAGE_TYPE_UNSPECIFIED = 0;
+  MESSAGE_TYPE_TEXT = 1;
+  MESSAGE_TYPE_IMAGE = 2;
+  MESSAGE_TYPE_FILE = 3;
+  MESSAGE_TYPE_VOICE = 4;
+  MESSAGE_TYPE_LOCATION = 5;
+  MESSAGE_TYPE_SYSTEM = 6;
+}
+
+message Message {
+  string id = 1;
+  string conversation_id = 2;
+  string sender_id = 3;
+
+  string text = 4;
+  MessageType type = 5;
+
+  string image_url = 6;
+  string file_url = 7;
+  string file_name = 8;
+  int64 file_size = 9;
+  string mime_type = 10;
+
+  bool read = 11;
+  google.protobuf.Timestamp read_at = 12;
+  bool delivered = 13;
+  google.protobuf.Timestamp delivered_at = 14;
+
+  repeated string reply_to_ids = 15;
+
+  google.protobuf.Timestamp created_at = 16;
+  google.protobuf.Timestamp updated_at = 17;
+}
+
+message GetConversationsRequest {
+  string user_id = 1;
+  int32 limit = 2;
+  string cursor = 3;
+}
+
+message GetConversationsResponse {
+  repeated Conversation conversations = 1;
+  string next_cursor = 2;
+}
+
+message GetConversationRequest {
+  string conversation_id = 1;
+  string user_id = 2;
+}
+
+message GetConversationResponse {
+  Conversation conversation = 1;
+}
+
+message CreateConversationRequest {
+  string seller_id = 1;
+  string buyer_id = 2;
+  string listing_id = 3;
+}
+
+message CreateConversationResponse {
+  Conversation conversation = 1;
+}
+
+message GetMessagesRequest {
+  string conversation_id = 1;
+  string user_id = 2;
+  int32 limit = 3;
+  string cursor = 4;
+}
+
+message GetMessagesResponse {
+  repeated Message messages = 1;
+  string next_cursor = 2;
+}
+
+message SendMessageRequest {
+  string conversation_id = 1;
+  string sender_id = 2;
+
+  string text = 3;
+  MessageType type = 4;
+
+  string image_url = 5;
+  string file_url = 6;
+  string file_name = 7;
+  int64 file_size = 8;
+  string mime_type = 9;
+
+  repeated string reply_to_ids = 10;
+
+  string client_message_id = 11;
+}
+
+message SendMessageResponse {
+  Message message = 1;
+}
+
+message MarkAsReadRequest {
+  string conversation_id = 1;
+  string user_id = 2;
+  repeated string message_ids = 3;
+}
+
+message MarkAsReadResponse {
+  int32 marked_count = 1;
+}
+
+message SearchMessagesRequest {
+  string user_id = 1;
+  string conversation_id = 2;
+  string query = 3;
+  int32 limit = 4;
+  string cursor = 5;
+}
+
+message SearchMessagesResponse {
+  repeated Message messages = 1;
+  string next_cursor = 2;
+}
+

package/proto/users.proto

@@ -9,6 +9,7 @@ service UsersService {
 
 	rpc CreateUser (CreateUserRequest) returns (CreateUserResponse);
 	rpc PatchUser (PatchUserRequest) returns (PatchUserResponse);
+	rpc PatchUserLocation (PatchUserLocationRequest) returns (PatchUserLocationResponse);
 }
 
 message GetMeRequest {
@@ -54,6 +55,19 @@ message PatchUserResponse {
   bool ok = 1;
 }
 
+message PatchUserLocationRequest {
+  string user_id = 1;
+  
+  optional string city = 2;
+  optional string region = 3;
+  optional double latitude = 4;
+  optional double longitude = 5;
+}
+
+message PatchUserLocationResponse {
+  bool ok = 1;
+}
+
 message User {
 	string id = 1;