From 7405db81daafd1c64e732eab96e0d3674c4c1e54 Mon Sep 17 00:00:00 2001
From: serega6531 <S.Shkurov@bssys.com>
Date: Sun, 5 Apr 2020 00:59:14 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BE=D0=BF=D1=86=D0=B8=D1=8F=20=D1=80=D0=B0?=
 =?UTF-8?q?=D1=81=D0=BF=D0=B0=D0=BA=D0=BE=D0=B2=D0=BA=D0=B8=20WebSockets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Packet.vue  |  5 +++--
 src/views/AddPattern.vue   |  2 +-
 src/views/AddService.vue   | 17 ++++++++++++++---
 src/views/ServiceModal.vue |  1 +
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/Packet.vue b/src/components/Packet.vue
index 08298ce..9e8333d 100644
--- a/src/components/Packet.vue
+++ b/src/components/Packet.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="packet" :class="{'packet-incoming': packet.incoming}">
-		<div>#{{ packet.id }} at {{ dateToText(packet.timestamp) }}, {{ packet.ungzipped ? 'GZIP' : 'Non-GZIP' }}
+		<div>#{{ packet.id }} at {{ dateToText(packet.timestamp) }}, {{ packet.ungzipped ? 'GZIP ' : '' }}{{ packet.webSocketDeflated ? 'WS' : '' }}
 			<button @click.prevent="copyRaw" class="btn btn-link">Copy HEX</button>
 			<button @click.prevent="copyText" class="btn btn-link">Copy text</button>
 			<button @click.prevent="copyPythonBytes" class="btn btn-link">Copy as Python bytes</button>
@@ -25,6 +25,7 @@
 				timestamp: Number(),
 				incoming: Boolean(),
 				ungzipped: Boolean(),
+				webSocketDeflated: Boolean(),
 				content: String(),
 			},
 		},
@@ -88,7 +89,7 @@
 					return $1 ? $1 : entityMap[$0];
 				});
 			},
-			highlightPatterns(raw) { // FIXME: Пересекающиеся паттерны приводят к неожиданным результатам
+			highlightPatterns(raw) {
 				const patterns = this.$store.state.patterns.reduce((obj, item) => {
 					obj[item.id] = item;
 					return obj;
diff --git a/src/views/AddPattern.vue b/src/views/AddPattern.vue
index 48a864e..7a510ff 100644
--- a/src/views/AddPattern.vue
+++ b/src/views/AddPattern.vue
@@ -38,7 +38,7 @@
 				<b-form-select id="pattern-searchType" required v-model="newPattern.searchType">
 					<option value="REGEX" selected>Regular expression</option>
 					<option value="SUBSTRING">Substring</option>
-					<option value="SUBBYTES">Bytes (WIP)</option>
+					<option value="SUBBYTES">Bytes</option>
 				</b-form-select>
 			</b-form-group>
 			<b-form-group
diff --git a/src/views/AddService.vue b/src/views/AddService.vue
index 62e4ca8..2d9e457 100644
--- a/src/views/AddService.vue
+++ b/src/views/AddService.vue
@@ -19,25 +19,32 @@
 			</b-form-group>
 			<b-form-group
 					label-cols-sm="4"
-					label="Decompress GZIP?"
+					label="Decompress GZIP"
 					label-for="addSvc-ungzip">
 				<b-form-checkbox id="addSvc-ungzip" required
 								 v-model="ungzipHttp"/>
 			</b-form-group>
 			<b-form-group
 					label-cols-sm="4"
-					label="Apply urldecode?"
+					label="Apply urldecode"
 					label-for="addSvc-urldecode">
 				<b-form-checkbox id="addSvc-urldecode" required
 								 v-model="urldecodeHttpRequests"/>
 			</b-form-group>
 			<b-form-group
 					label-cols-sm="4"
-					label="Merge adjacent packets?"
+					label="Merge adjacent packets"
 					label-for="addSvc-mergeAdjacent">
 				<b-form-checkbox id="addSvc-mergeAdjacent" required
 								 v-model="mergeAdjacentPackets"/>
 			</b-form-group>
+			<b-form-group
+					label-cols-sm="4"
+					label="Deflate WebSockets"
+					label-for="addSvc-deflateWS">
+				<b-form-checkbox id="addSvc-deflateWS" required
+								 v-model="mergeAdjacentPackets"/>
+			</b-form-group>
 		</form>
 	</b-modal>
 </template>
@@ -52,6 +59,7 @@
 				ungzipHttp: Boolean(),
 				urldecodeHttpRequests: Boolean(),
 				mergeAdjacentPackets: Boolean(),
+				inflateWebSockets: Boolean(),
 			};
 		},
 		methods: {
@@ -67,6 +75,7 @@
 				this.ungzipHttp = false;
 				this.urldecodeHttpRequests = false;
 				this.mergeAdjacentPackets = false;
+				this.inflateWebSockets = false;
 			},
 
 			createService(ev) {
@@ -75,6 +84,7 @@
 				const ungzipHttp = this.ungzipHttp;
 				const urldecodeHttpRequests = this.urldecodeHttpRequests;
 				const mergeAdjacentPackets = this.mergeAdjacentPackets;
+				const inflateWebSockets = this.inflateWebSockets;
 				if (!this.checkValidity()) {
 					ev.preventDefault();
 					console.debug('Form is invalid');
@@ -88,6 +98,7 @@
 					ungzipHttp,
 					urldecodeHttpRequests,
 					mergeAdjacentPackets,
+					inflateWebSockets,
 				}).then(response => {
 					const data = response.data;
 					console.debug('Done adding service', data);
diff --git a/src/views/ServiceModal.vue b/src/views/ServiceModal.vue
index 168549a..98d567b 100644
--- a/src/views/ServiceModal.vue
+++ b/src/views/ServiceModal.vue
@@ -53,6 +53,7 @@
 				ungzipHttp: Boolean,
 				urldecodeHttpRequests: Boolean,
 				mergeAdjacentPackets: Boolean,
+				inflateWebSockets: Boolean,
 			},
 		},
 		data() {