bug of stream is fixed

projects/ucap-webmessenger-protocol-event/src/lib/models/event-send.ts

@@ -20,7 +20,7 @@ export interface EventSendRequest extends ProtocolRequest {
   sentMessage: string;
 }
 
-export interface EventSendResponse {
+export interface EventSendResponse extends ProtocolResponse {
   // 대화방SEQ(s)
   roomSeq: string;
   // 이벤트SEQ(n)

projects/ucap-webmessenger-protocol-event/src/lib/services/event-protocol.service.ts

@@ -37,12 +37,18 @@ export class EventProtocolService {
     return this.protocolService
       .call(SVC_TYPE_EVENT, SSVC_TYPE_EVENT_INFO_REQ, ...encodeInfo(req))
       .pipe(
-        takeWhile(res => SSVC_TYPE_EVENT_INFO_RES !== res.subServiceType),
+        takeWhile(res => SSVC_TYPE_EVENT_INFO_RES !== res.subServiceType, true),
         map(res => {
           if (SSVC_TYPE_EVENT_INFO_DATA === res.subServiceType) {
-            return decodeInfoData(res);
+            return {
+              ...decodeInfoData(res),
+              Type: SSVC_TYPE_EVENT_INFO_DATA
+            };
           }
-          return decodeInfo(res);
+          return {
+            ...decodeInfo(res),
+            Type: SSVC_TYPE_EVENT_INFO_RES
+          };
         })
       );
   }

projects/ucap-webmessenger-protocol-room/src/lib/services/room-protocol.service.ts

@@ -150,7 +150,7 @@ export class RoomProtocolService {
     return this.protocolService
       .call(SVC_TYPE_ROOM, SSVC_TYPE_ROOM_INFO_REQ, ...encodeRoomInfo(req))
       .pipe(
-        takeWhile(res => SSVC_TYPE_ROOM_INFO_RES !== res.subServiceType),
+        takeWhile(res => SSVC_TYPE_ROOM_INFO_RES !== res.subServiceType, true),
         map(res => {
           if (SSVC_TYPE_ROOM_INFO_ROOM === res.subServiceType) {
             return decodeRoomInfoData(res);

projects/ucap-webmessenger-protocol-sync/src/lib/services/sync-protocol.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 
 import { Observable } from 'rxjs';
-import { map, take, takeWhile } from 'rxjs/operators';
+import { map, take, takeWhile, takeUntil } from 'rxjs/operators';
 
 import { ProtocolService } from '@ucap-webmessenger/protocol';
 import {
@@ -75,7 +75,7 @@ export class SyncProtocolService {
     return this.protocolService
       .call(SVC_TYPE_SYNC_BUDDY, SSVC_TYPE_SYNC_BUDDY_REQ, ...encodeBuddy(req))
       .pipe(
-        takeWhile(res => SSVC_TYPE_SYNC_BUDDY_RES !== res.subServiceType),
+        takeWhile(res => SSVC_TYPE_SYNC_BUDDY_RES !== res.subServiceType, true),
         map(res => {
           if (SSVC_TYPE_SYNC_BUDDY_DATA === res.subServiceType) {
             return decodeBuddyData(res);
@@ -92,7 +92,10 @@ export class SyncProtocolService {
     return this.protocolService
       .call(SVC_TYPE_SYNC_BUDDY, SSVC_TYPE_SYNC_BUDDY2_REQ, ...encodeBuddy(req))
       .pipe(
-        takeWhile(res => SSVC_TYPE_SYNC_BUDDY2_RES !== res.subServiceType),
+        takeWhile(
+          res => SSVC_TYPE_SYNC_BUDDY2_RES !== res.subServiceType,
+          true
+        ),
         map(res => {
           if (SSVC_TYPE_SYNC_BUDDY2_DATA === res.subServiceType) {
             return decodeBuddyDataDetail(res);
@@ -109,7 +112,7 @@ export class SyncProtocolService {
     return this.protocolService
       .call(SVC_TYPE_SYNC_GROUP, SSVC_TYPE_SYNC_GROUP_REQ, ...encodeGroup(req))
       .pipe(
-        takeWhile(res => SSVC_TYPE_SYNC_GROUP_RES !== res.subServiceType),
+        takeWhile(res => SSVC_TYPE_SYNC_GROUP_RES !== res.subServiceType, true),
         map(res => {
           if (SSVC_TYPE_SYNC_GROUP_DATA === res.subServiceType) {
             return decodeGroupData(res);
@@ -126,7 +129,10 @@ export class SyncProtocolService {
     return this.protocolService
       .call(SVC_TYPE_SYNC_GROUP, SSVC_TYPE_SYNC_GROUP_REQ2, ...encodeGroup(req))
       .pipe(
-        takeWhile(res => SSVC_TYPE_SYNC_GROUP_RES2 !== res.subServiceType),
+        takeWhile(
+          res => SSVC_TYPE_SYNC_GROUP_RES2 !== res.subServiceType,
+          true
+        ),
         map(res => {
           if (SSVC_TYPE_SYNC_GROUP_DATA2 === res.subServiceType) {
             return decodeGroupDataDetail(res);
@@ -148,7 +154,7 @@ export class SyncProtocolService {
     return this.protocolService
       .call(SVC_TYPE_SYNC_ROOM, SSVC_TYPE_SYNC_ROOM_REQ, ...encodeRoom(req))
       .pipe(
-        takeWhile(res => SSVC_TYPE_SYNC_ROOM_RES !== res.subServiceType),
+        takeWhile(res => SSVC_TYPE_SYNC_ROOM_RES !== res.subServiceType, true),
         map(res => {
           if (SSVC_TYPE_SYNC_ROOM_DATA === res.subServiceType) {
             return decodeRoomData(res);
@@ -174,7 +180,7 @@ export class SyncProtocolService {
     return this.protocolService
       .call(SVC_TYPE_SYNC_ROOM, SSVC_TYPE_SYNC_ROOM2_REQ, ...encodeRoom(req))
       .pipe(
-        takeWhile(res => SSVC_TYPE_SYNC_ROOM2_RES !== res.subServiceType),
+        takeWhile(res => SSVC_TYPE_SYNC_ROOM2_RES !== res.subServiceType, true),
         map(res => {
           if (SSVC_TYPE_SYNC_ROOM2_DATA === res.subServiceType) {
             return decodeRoomData(res);

projects/ucap-webmessenger-protocol/src/lib/models/protocol.ts

@@ -6,10 +6,12 @@ export interface ProtocolRequest {
 
 export interface ProtocolResponse {
   _id?: string;
+  Type?: number;
 }
 
 export interface ProtocolStream {
   _id?: string;
+  Type?: number;
 }
 
 // tslint:disable-next-line: no-empty-interface