Feature/wlan security

.gitignore

@@ -51,3 +51,6 @@ lib/
 
 # Ignore Jekyll site folder.
 _site/
+
+# Ignore IntelliJ files.
+.idea

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fritzbox.js",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "author": "@lesander",
   "description": "The most powerful Fritz!Box API for NodeJS.",
   "homepage": "https://git.io/fritzbox",

src/format.js

@@ -46,7 +46,7 @@ fritzFormat.callsCsvToJson = (csvData) => {
   // the csv to json module can parse them correctly.
   let parsableCsvData = csvData
                         .replace('sep=;', '')
-                        .replace('Extension;Telephone number', 'Extension;NumberSelf')
+                        .replace('Extension;Telephone Number', 'Extension;NumberSelf')
                         .replace('Telephone number', 'Number')
                         .trim()
 

src/request.js

@@ -38,12 +38,16 @@ fritzRequest.request = async (path, method, options, pipe = false, formData = fa
     options.sid = sessionId
   }
 
+  if (typeof formUrlEncoded === 'object') {
+    formUrlEncoded.sid = options.sid
+  }
+
   if (typeof options.removeSidFromUri === 'undefined') {
     options.removeSidFromUri = false
   }
 
   // Add SID to path if one has been given to us.
-  if (options.sid && options.removeSidFromUri !== true && options.noAuth !== true) {
+  if (options.sid && options.removeSidFromUri !== true && options.noAuth !== true && !formUrlEncoded.hasOwnProperty('sid')) {
     path += '&sid=' + options.sid
   }
 

src/wlan.js

@@ -1,3 +1,42 @@
 /**
  * @module fritzWlan
  */
+
+let fritzWlan = {}
+
+const fritzRequest = require('./request.js')
+
+fritzWlan.getWlanNetwork = async (options) => {
+  const form = {
+    page: 'wSet'
+  }
+
+  const response = await fritzRequest.request('/data.lua', 'POST', options, false, false, form)
+  if (response.error) return response
+
+  return JSON.parse(response.body).data.wlanSettings
+}
+
+fritzWlan.getWlanSecurity = async (options) => {
+  const form = {
+    page: 'wKey'
+  }
+
+  const response = await fritzRequest.request('/data.lua', 'POST', options, false, false, form)
+  if (response.error) return response
+
+  return JSON.parse(response.body).data.wlan
+}
+
+fritzWlan.getWlanGuest = async (options) => {
+  const form = {
+    page: 'wGuest'
+  }
+
+  const response = await fritzRequest.request('/data.lua', 'POST', options, false, false, form)
+  if (response.error) return response
+
+  return JSON.parse(response.body).data.guestAccess
+}
+
+module.exports = fritzWlan

test/ci.sh

@@ -30,5 +30,6 @@ node --harmony-async-await test/activecalls.js  # async ready
 node --harmony-async-await test/markread.js     # async ready
 node --harmony-async-await test/tamdownload.js  # async ready
 node --harmony-async-await test/toggleswitch.js # async ready
+node --harmony-async-await test/wlanSecurity.js # async ready
 
 echo " ✓ Finished with tests."

test/wlanSecurity.js

@@ -0,0 +1,30 @@
+const fritz = require('../index.js')
+const options = require('../package.json').options
+
+async function wlanSecurity () {
+  const network = await fritz.getWlanNetwork(options)
+  const security = await fritz.getWlanSecurity(options)
+  const guest = await fritz.getWlanGuest(options)
+
+  if (network.error) {
+    console.log('Error:', network.error.message)
+    process.exit(1)
+  }
+
+  if (security.error) {
+    console.log('Error:', security.error.message)
+    process.exit(1)
+  }
+
+  console.log(`WLAN Info:\n` +
+    `\tSSID: ${security.ssid}\n` +
+    `\tPSK: ${security.psk}\n` +
+    `\tHidden: ${network.hiddenSSID}`)
+
+  console.log(`Guest WLAN Info:\n` +
+    `\tSSID: ${guest.ssid}\n` +
+    `\tPSK: ${guest.psk}\n` +
+    `\tEnabled: ${guest.isEnabled}`)
+}
+
+wlanSecurity()