@barumetric/contracts 1.2.13 → 1.2.15

package/gen/ts/auth.ts

@@ -111,6 +111,34 @@ export interface DeviceInfo {
   type: string;
 }
 
+export interface VkInitResponse {
+  url: string;
+}
+
+export interface VkVerifyRequest {
+  idToken: string;
+  accessToken: string;
+  metadata: SessionMetadata | undefined;
+}
+
+export interface VkVerifyResponse {
+  sessionId?: string | undefined;
+  accessToken?: string | undefined;
+  refreshToken?: string | undefined;
+  sessionToken?: string | undefined;
+}
+
+export interface VkConsumeRequest {
+  sessionId: string;
+  metadata: SessionMetadata | undefined;
+}
+
+export interface VkConsumeResponse {
+  accessToken: string;
+  refreshToken: string;
+  sessionToken: string;
+}
+
 export const AUTH_V1_PACKAGE_NAME = "auth.v1";
 
 export interface AuthServiceClient {
@@ -129,6 +157,12 @@ export interface AuthServiceClient {
   telegramComplete(request: TelegramCompleteRequest): Observable<TelegramCompleteResponse>;
 
   telegramConsume(request: TelegramConsumeRequest): Observable<TelegramConsumeResponse>;
+
+  vkInit(request: Empty): Observable<VkInitResponse>;
+
+  vkVerify(request: VkVerifyRequest): Observable<VkVerifyResponse>;
+
+  vkConsume(request: VkConsumeRequest): Observable<VkConsumeResponse>;
 }
 
 export interface AuthServiceController {
@@ -153,6 +187,12 @@ export interface AuthServiceController {
   telegramConsume(
     request: TelegramConsumeRequest,
   ): Promise<TelegramConsumeResponse> | Observable<TelegramConsumeResponse> | TelegramConsumeResponse;
+
+  vkInit(request: Empty): Promise<VkInitResponse> | Observable<VkInitResponse> | VkInitResponse;
+
+  vkVerify(request: VkVerifyRequest): Promise<VkVerifyResponse> | Observable<VkVerifyResponse> | VkVerifyResponse;
+
+  vkConsume(request: VkConsumeRequest): Promise<VkConsumeResponse> | Observable<VkConsumeResponse> | VkConsumeResponse;
 }
 
 export function AuthServiceControllerMethods() {
@@ -166,6 +206,9 @@ export function AuthServiceControllerMethods() {
       "telegramVerify",
       "telegramComplete",
       "telegramConsume",
+      "vkInit",
+      "vkVerify",
+      "vkConsume",
     ];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);

package/gen/ts/presence.ts

@@ -13,33 +13,15 @@ export const protobufPackage = "presence.v1";
 
 export interface GetUserStatusRequest {
   userId: string;
+  /** WebSocket connection ID */
+  connectionId?: string | undefined;
 }
 
 export interface GetUserStatusResponse {
   /** "online" | "away" | "offline" */
   status: string;
   /** timestamp */
-  lastSeen: number;
-  /** "web" | "mobile" */
-  device: string;
-  updatedAt: Timestamp | undefined;
-}
-
-export interface GetUsersStatusRequest {
-  userIds: string[];
-}
-
-export interface GetUsersStatusResponse {
-  statuses: UserStatus[];
-}
-
-export interface UserStatus {
-  userId: string;
-  /** "online" | "away" | "offline" */
-  status: string;
-  lastSeen: number;
-  device: string;
-  updatedAt: Timestamp | undefined;
+  lastSeen: Timestamp | undefined;
 }
 
 export interface UpdateStatusRequest {
@@ -67,30 +49,6 @@ export interface RemoveConnectionResponse {
   status: string;
 }
 
-export interface SubscribeToStatusRequest {
-  /** кто подписывается */
-  userId: string;
-  /** за какими пользователями следить */
-  contactIds: string[];
-}
-
-export interface StatusUpdate {
-  userId: string;
-  /** "online" | "away" | "offline" */
-  status: string;
-  lastSeen: number;
-  device: string;
-  updatedAt: Timestamp | undefined;
-}
-
-export interface UnsubscribeFromStatusRequest {
-  userId: string;
-}
-
-export interface UnsubscribeFromStatusResponse {
-  ok: boolean;
-}
-
 export const PRESENCE_V1_PACKAGE_NAME = "presence.v1";
 
 export interface PresenceServiceClient {
@@ -98,10 +56,6 @@ export interface PresenceServiceClient {
 
   getUserStatus(request: GetUserStatusRequest): Observable<GetUserStatusResponse>;
 
-  /** Получить статусы нескольких пользователей */
-
-  getUsersStatus(request: GetUsersStatusRequest): Observable<GetUsersStatusResponse>;
-
   /** Обновить статус пользователя (heartbeat) */
 
   updateStatus(request: UpdateStatusRequest): Observable<UpdateStatusResponse>;
@@ -109,14 +63,6 @@ export interface PresenceServiceClient {
   /** Удалить соединение пользователя (при отключении) */
 
   removeConnection(request: RemoveConnectionRequest): Observable<RemoveConnectionResponse>;
-
-  /** Подписаться на изменения статуса (stream) */
-
-  subscribeToStatus(request: SubscribeToStatusRequest): Observable<StatusUpdate>;
-
-  /** Отписаться от изменений статуса */
-
-  unsubscribeFromStatus(request: UnsubscribeFromStatusRequest): Observable<UnsubscribeFromStatusResponse>;
 }
 
 export interface PresenceServiceController {
@@ -126,12 +72,6 @@ export interface PresenceServiceController {
     request: GetUserStatusRequest,
   ): Promise<GetUserStatusResponse> | Observable<GetUserStatusResponse> | GetUserStatusResponse;
 
-  /** Получить статусы нескольких пользователей */
-
-  getUsersStatus(
-    request: GetUsersStatusRequest,
-  ): Promise<GetUsersStatusResponse> | Observable<GetUsersStatusResponse> | GetUsersStatusResponse;
-
   /** Обновить статус пользователя (heartbeat) */
 
   updateStatus(
@@ -143,28 +83,11 @@ export interface PresenceServiceController {
   removeConnection(
     request: RemoveConnectionRequest,
   ): Promise<RemoveConnectionResponse> | Observable<RemoveConnectionResponse> | RemoveConnectionResponse;
-
-  /** Подписаться на изменения статуса (stream) */
-
-  subscribeToStatus(request: SubscribeToStatusRequest): Observable<StatusUpdate>;
-
-  /** Отписаться от изменений статуса */
-
-  unsubscribeFromStatus(
-    request: UnsubscribeFromStatusRequest,
-  ): Promise<UnsubscribeFromStatusResponse> | Observable<UnsubscribeFromStatusResponse> | UnsubscribeFromStatusResponse;
 }
 
 export function PresenceServiceControllerMethods() {
   return function (constructor: Function) {
-    const grpcMethods: string[] = [
-      "getUserStatus",
-      "getUsersStatus",
-      "updateStatus",
-      "removeConnection",
-      "subscribeToStatus",
-      "unsubscribeFromStatus",
-    ];
+    const grpcMethods: string[] = ["getUserStatus", "updateStatus", "removeConnection"];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
       GrpcMethod("PresenceService", method)(constructor.prototype[method], method, descriptor);

package/package.json

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

package/proto/auth.proto

@@ -14,6 +14,10 @@ service AuthService {
 	rpc TelegramVerify (TelegramVerifyRequest) returns  (TelegramVerifyResponse);
 	rpc TelegramComplete (TelegramCompleteRequest) returns (TelegramCompleteResponse);
 	rpc TelegramConsume (TelegramConsumeRequest) returns (TelegramConsumeResponse);
+
+	rpc VkInit (google.protobuf.Empty) returns (VkInitResponse);
+	rpc VkVerify (VkVerifyRequest) returns (VkVerifyResponse);
+	rpc VkConsume (VkConsumeRequest) returns (VkConsumeResponse);
 }
 
 message SendOtpRequest {
@@ -113,3 +117,33 @@ message DeviceInfo {
 	string os = 2;
 	string type = 3;
 }
+
+message VkInitResponse {
+	string url = 1;
+}
+
+message VkVerifyRequest {
+	string id_token = 1;
+	string access_token = 2;
+	SessionMetadata metadata = 3;
+}
+
+message VkVerifyResponse {
+	oneof result {
+		string session_id = 1;
+		string access_token = 2;
+		string refresh_token = 3;
+		string session_token = 4;
+	}
+}
+
+message VkConsumeRequest {
+	string session_id = 1;
+	SessionMetadata metadata = 2;
+}
+
+message VkConsumeResponse {
+	string access_token = 1;
+	string refresh_token = 2;
+	string session_token = 3;
+}

package/proto/presence.proto

@@ -8,47 +8,22 @@ service PresenceService {
   // Получить статус пользователя
   rpc GetUserStatus (GetUserStatusRequest) returns (GetUserStatusResponse);
   
-  // Получить статусы нескольких пользователей
-  rpc GetUsersStatus (GetUsersStatusRequest) returns (GetUsersStatusResponse);
-  
   // Обновить статус пользователя (heartbeat)
   rpc UpdateStatus (UpdateStatusRequest) returns (UpdateStatusResponse);
   
   // Удалить соединение пользователя (при отключении)
   rpc RemoveConnection (RemoveConnectionRequest) returns (RemoveConnectionResponse);
   
-  // Подписаться на изменения статуса (stream)
-  rpc SubscribeToStatus (SubscribeToStatusRequest) returns (stream StatusUpdate);
-  
-  // Отписаться от изменений статуса
-  rpc UnsubscribeFromStatus (UnsubscribeFromStatusRequest) returns (UnsubscribeFromStatusResponse);
 }
 
 message GetUserStatusRequest {
   string user_id = 1;
+  optional string connection_id = 2; // WebSocket connection ID
 }
 
 message GetUserStatusResponse {
   string status = 1; // "online" | "away" | "offline"
-  int64 last_seen = 2; // timestamp
-  string device = 3; // "web" | "mobile"
-  google.protobuf.Timestamp updated_at = 4;
-}
-
-message GetUsersStatusRequest {
-  repeated string user_ids = 1;
-}
-
-message GetUsersStatusResponse {
-  repeated UserStatus statuses = 1;
-}
-
-message UserStatus {
-  string user_id = 1;
-  string status = 2; // "online" | "away" | "offline"
-  int64 last_seen = 3;
-  string device = 4;
-  google.protobuf.Timestamp updated_at = 5;
+  google.protobuf.Timestamp last_seen = 2; // timestamp
 }
 
 message UpdateStatusRequest {
@@ -71,25 +46,3 @@ message RemoveConnectionResponse {
   bool ok = 1;
   string status = 2; // текущий статус после удаления
 }
-
-message SubscribeToStatusRequest {
-  string user_id = 1; // кто подписывается
-  repeated string contact_ids = 2; // за какими пользователями следить
-}
-
-message StatusUpdate {
-  string user_id = 1;
-  string status = 2; // "online" | "away" | "offline"
-  int64 last_seen = 3;
-  string device = 4;
-  google.protobuf.Timestamp updated_at = 5;
-}
-
-message UnsubscribeFromStatusRequest {
-  string user_id = 1;
-}
-
-message UnsubscribeFromStatusResponse {
-  bool ok = 1;
-}
-