fix: "_text" property is removed from json output (#13)

BREAKING CHANGE: accessing data via ._text property is no longer valid

package.json

@@ -40,16 +40,16 @@
   "dependencies": {
     "js-sha1": "^0.6.0",
     "node-fetch": "^2.3.0",
-    "rxjs": "^6.3.3",
+    "rxjs": "^6.4.0",
     "typescript-monads": "^3.10.0",
     "uuid": "^3.3.2",
     "xml-js": "^1.6.9",
     "xmldom": "^0.1.27"
   },
   "devDependencies": {
     "@types/fs-extra": "^5.0.4",
-    "@types/node": "^10.12.19",
-    "@types/node-fetch": "^2.1.4",
+    "@types/node": "^10.12.20",
+    "@types/node-fetch": "^2.1.5",
     "@types/uuid": "^3.4.4",
     "@types/xml-js": "^1.0.0",
     "@types/xmldom": "^0.1.29",

src/config/interfaces.ts

@@ -6,6 +6,7 @@ export interface ITransportPayoad {
   readonly statusMessage: string
   readonly status: number
 }
+
 export type ITransport = (body: string) => (uri: string) => Observable<ITransportPayoad>
 
 export type IEncodeBase64 = (str: string) => string

src/config/universal.ts

@@ -10,7 +10,7 @@ export const FETCH_CONFIG = (body: string) => ({ method: 'POST', body, headers:
 export const sharedFetchWrapper =
   (fetchResponse: Promise<any>) =>
     from(fetchResponse)
-      .pipe(flatMap<Response, ITransportPayoad>(a => a.text().then(body => {
+      .pipe(flatMap<Response, Promise<ITransportPayoad>>(a => a.text().then(body => {
         return {
           body,
           status: a.status,

src/soap/request.ts

@@ -70,6 +70,10 @@ export const soapShell =
         <${SOAP_NODE.Body}>${rawBody}</${SOAP_NODE.Body}>
       </${SOAP_NODE.Envelope}>`
 
+const stringIsBool = (str: string) => str.toLowerCase() === 'true' || str.toLowerCase() === 'false'
+const stringToBool = (str: string) => str.toLowerCase() === 'true' ? true : false
+const typeConversion = (str: string) => stringIsBool(str) ? stringToBool(str) : str
+
 export const mapResponseXmlToJson =
   <T>(node: string) =>
     (source: Observable<IOnvifResult>) =>
@@ -82,8 +86,14 @@ export const mapResponseXmlToJson =
           const parsed = JSON.parse(xml2json(b.xmlString, {
             compact: true,
             spaces: 2,
-            nativeType: true,
-            nativeTypeAttributes: true,
+            textFn: (value: any, parentElement: any) => {
+              try {
+                const keyNo = Object.keys(parentElement._parent).length
+                const keyName = Object.keys(parentElement._parent)[keyNo - 1]
+                // tslint:disable-next-line:no-object-mutation
+                parentElement._parent[keyName] = typeConversion(value)
+              } catch (e) { }
+            },
             elementNameFn: (d: string) => maybe(d.split(':')[1]).valueOr(d)
           } as any))