subscription()/parseSubscription [fixup]

public-transport · Jan 13, 2022 · caaf72d · caaf72d
1 parent 402654d
commit caaf72d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/index.js b/index.js
@@ -836,13 +836,7 @@ const createClient = (profile, userAgent, opt = {}) => {
 		})
 		const ctx = {profile, opt, common, res}
 
-		const {details} = res
-		return {
-			subscription: profile.parseSubscription(ctx, subscriptionId, details.conSubscr),
-			// todo: parse & give a proper name
-			rtEvents: details.eventHistory && details.eventHistory.rtEvents || [],
-			himEvents: details.eventHistory && details.eventHistory.himEvents || [],
-		}
+		return profile.parseSubscription(ctx, res.details)
 	}
 
 	const subscribeToJourney = async (userId, channelIds, journeyRefreshToken, opt = {}) => {

diff --git a/parse/subscription.js b/parse/subscription.js
@@ -2,11 +2,19 @@
 
 const {gunzipSync} = require('zlib')
 
-const parseSubscription = (ctx, id, s) => {
+const parseSubscription = (ctx, _) => {
 	const {profile, opt} = ctx
+	const s = _.conSubscr
 
 	const res = {
-		id,
+		id: _.subscrId,
+		status: _.status,
+		// todo: _.channels
+
+		// todo: parse & give a proper name
+		rtEvents: _.eventHistory && _.eventHistory.rtEvents || [],
+		himEvents: _.eventHistory && _.eventHistory.himEvents || [],
+
 		hysteresis: s.hysteresis,
 		monitorFlags: s.monitorFlags,
 		connectionInfo: s.connectionInfo,