Merge pull request #8 from basti76/master

Use ical.js to parse recieved calendar data

.eslintrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+    "extends": "standard"
+};

nextcloud.html

@@ -45,7 +45,9 @@
 		defaults: {
             nname: {value: ''},
             server: {type: 'nextcloud-credentials', required: true},
-            calendar: {value: '', required: false}
+            calendar: {value: '', required: false},
+            pastWeeks: { type: 'num', value: 0, required: true},
+            futureWeeks: { type: 'num', default: 4, required: true }
         },
         inputs: 1,
         outputs: 1,
@@ -60,7 +62,7 @@
 <script type="text/x-red" data-template-name="nextcloud-caldav">
     <div class="form-row">
         <label for="node-input-nname"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-nname" placeholder="Name">
+        <input type="text" id="node-input-nname" placeholder="Name"  style="width: 70%">
     </div>
 	<div class="form-row">
     	<label for="node-input-server"><i class="fa fa-server"></i> Server</label>
@@ -70,6 +72,14 @@
         <label for="node-input-calendar"><i class="fa fa-calendar"></i> Calendar</label>
         <input type="text" id="node-input-calendar">
     </div>
+    <div class="form-row">
+        <label for="node-input-pastWeeks"><i class="fa fa-check-square"></i> Past weeks to sync</label>
+        <span class="ui-spinner ui-widget ui-widget-content ui-corner-all"><input type="number" id="node-input-pastWeeks"></span>
+    </div>
+    <div class="form-row">
+        <label for="node-input-futureWeeks"><i class="fa fa-random"></i> Upcoming weeks to sync</label>
+        <span class="ui-spinner ui-widget ui-widget-content ui-corner-all"><input type="number" id="node-input-futureWeeks"></span>
+    </div>
 </script>
 
 <script type="text/x-red" data-help-name="nextcloud-caldav">

nextcloud.js

@@ -1,224 +1,277 @@
-module.exports = function(RED) {
+module.exports = function (RED) {
-    let dav = require('dav')
+  const dav = require('dav')
-    let webdav = require('webdav')
+  const webdav = require('webdav')
-    const fs = require('fs')
+  const fs = require('fs')
+  const IcalExpander = require('ical-expander')
+  const moment = require('moment')
 
-    function NextcloudConfigNode(n) {
+  function NextcloudConfigNode (config) {
-        RED.nodes.createNode(this, n)
+    RED.nodes.createNode(this, config)
-        this.address = n.address
+    this.address = config.address
+  }
+  RED.nodes.registerType('nextcloud-credentials', NextcloudConfigNode, {
+    credentials: {
+      user: { type: 'text' },
+      pass: { type: 'password' }
     }
-    RED.nodes.registerType('nextcloud-credentials', NextcloudConfigNode, {
+  })
-        credentials: {
+
-            user: {type: 'text'},
+  function NextcloudCalDav (config) {
-            pass: {type: 'password'}
+    RED.nodes.createNode(this, config)
-        }
+    this.server = RED.nodes.getNode(config.server)
+    this.calendar = config.calendar
+    this.pastWeeks = config.pastWeeks || 0
+    this.futureWeeks = config.futureWeeks || 4
+    const node = this
+
+    node.on('input', (msg) => {
+      let startDate = moment().startOf('day').subtract(this.pastWeeks, 'weeks')
+      let endDate = moment().endOf('day').add(this.futureWeeks, 'weeks')
+      const filters = [{
+        type: 'comp-filter',
+        attrs: { name: 'VCALENDAR' },
+        children: [{
+          type: 'comp-filter',
+          attrs: { name: 'VEVENT' },
+          children: [{
+            type: 'time-range',
+            attrs: {
+              start: startDate.format('YYYYMMDD[T]HHmmss[Z]'),
+              end: endDate.format('YYYYMMDD[T]HHmmss[Z]')
+            }
+          }]
+        }]
+      }]
+      // dav.debug.enabled = true;
+      const xhr = new dav.transport.Basic(
+        new dav.Credentials({
+          username: node.server.credentials.user,
+          password: node.server.credentials.pass
+        })
+      )
+      // Server + Basepath
+      let calDavUri = node.server.address + '/remote.php/dav/calendars/'
+      // User
+      calDavUri += node.server.credentials.user + '/'
+      dav.createAccount({ server: calDavUri, xhr: xhr, loadCollections: true, loadObjects: true })
+        .then(function (account) {
+          if (!account.calendars) {
+            node.error('Nextcloud:CalDAV -> no calendars found.')
+            return
+          }
+          // account instanceof dav.Account
+          account.calendars.forEach(function (calendar) {
+            // Wenn Kalender gesetzt ist, dann nur diesen abrufen
+            let calName = msg.calendar || node.calendar
+            if (!calName || !calName.length || (calName && calName.length && calName === calendar.displayName)) {
+              dav.listCalendarObjects(calendar, { xhr: xhr, filters: filters })
+                .then(function (calendarEntries) {
+                  let msg = { 'payload': { 'name': calendar.displayName, 'data': [] } }
+                  calendarEntries.forEach(function (calendarEntry) {
+                    try {
+                      const ics = calendarEntry.calendarData
+                      const icalExpander = new IcalExpander({ ics, maxIterations: 100 })
+                      const events = icalExpander.between(startDate.toDate(), endDate.toDate())
+                      msg.payload.data = msg.payload.data.concat(convertEvents(events))
+                    } catch (error) {
+                      node.error('Error parsing calendar data: ' + error)
+                    }
+                  })
+                  node.send(msg)
+                }, function () {
+                  node.error('Nextcloud:CalDAV -> get ics went wrong.')
+                })
+            }
+          })
+        }, function () {
+          node.error('Nextcloud:CalDAV -> get calendars went wrong.')
+        })
     })
 
-    function NextcloudCalDav(n) {
+    function convertEvents (events) {
-        RED.nodes.createNode(this, n)
+      const mappedEvents = events.events.map(_convertEvent)
-        this.server = RED.nodes.getNode(n.server)
+      const mappedOccurrences = events.occurrences.map(_convertEvent)
-        this.calendar = n.calendar
+      return [].concat(mappedEvents, mappedOccurrences)
-        let node = this
+    }
 
-        node.on('input', function(msg) {
+    function _convertEvent (e) {
-            const xhr = new dav.transport.Basic (
+      if (e) {
-                new dav.Credentials({
+        let startDate = e.startDate.toString()
-                    username: node.server.credentials.user,
+        let endDate = e.endDate.toString()
-                    password: node.server.credentials.pass
+
-                })
+        if (e.item) {
-            )
+          e = e.item
-            // Server + Basepath
+        }
-            let calDavUri = node.server.address + '/remote.php/dav/calendars/'
+        if (e.duration.wrappedJSObject) {
-            // User
+          delete e.duration.wrappedJSObject
-            calDavUri += node.server.credentials.user + '/'
+        }
-            dav.createAccount({ server: calDavUri, xhr: xhr })
+
-                .then(function(account) {
+        return {
-                    if (!account.calendars) {
+          startDate: startDate,
-                        node.error('Nextcloud:CalDAV -> no calendars found.')
+          endDate: endDate,
-                        return
+          summary: e.summary || '',
+          description: e.description || '',
+          attendees: e.attendees,
+          duration: e.duration.toICALString(),
+          durationSeconds: e.duration.toSeconds(),
+          location: e.location || '',
+          organizer: e.organizer || '',
+          uid: e.uid || '',
+          isRecurring: false,
+          allDay: ((e.duration.toSeconds() % 86400) === 0)
+        }
+      }
+    }
+  }
+  RED.nodes.registerType('nextcloud-caldav', NextcloudCalDav)
+
+  function NextcloudCardDav (config) {
+    RED.nodes.createNode(this, config)
+    this.server = RED.nodes.getNode(config.server)
+    this.addressBook = config.addressBook
+    const node = this
+
+    node.on('input', (msg) => {
+      const xhr = new dav.transport.Basic(
+        new dav.Credentials({
+          username: node.server.credentials.user,
+          password: node.server.credentials.pass
+        })
+      )
+
+      // Server + Basepath
+      let cardDavUri = node.server.address + '/remote.php/dav/addressbooks/users/'
+      // User
+      cardDavUri += node.server.credentials.user + '/'
+      // ToDo Filter ?
+      dav.createAccount({ server: cardDavUri, xhr: xhr, accountType: 'carddav' })
+        .then(function (account) {
+          if (!account.addressBooks) {
+            node.error('Nextcloud:CardDAV -> no addressbooks found.')
+            return
+          }
+          // account instanceof dav.Account
+          account.addressBooks.forEach(function (addressBook) {
+            // Wenn Adressbuch gesetzt ist, dann nur diesen abrufen
+            let c = msg.addressBook || node.addressBook
+            if (!c || !c.length || (c && c.length && c === addressBook.displayName)) {
+              dav.listVCards(addressBook, { xhr: xhr })
+                .then(function (addressBookEntries) {
+                  let vcfList = { 'payload': { 'name': addressBook.displayName, 'data': [] } }
+                  addressBookEntries.forEach(function (addressBookEntry) {
+                    const keyValue = addressBookEntry.addressData.split('\n')
+                    let vcfJson = {}
+                    for (let x = 0; x < keyValue.length; x++) {
+                      const temp = keyValue[x].split(':')
+                      vcfJson[temp[0]] = temp[1]
                     }
-                    // account instanceof dav.Account
+                    vcfList.payload.data.push(vcfJson)
-                    account.calendars.forEach(function(calendar) {
+                  })
-                        // Wenn Kalender gesetzt ist, dann nur diesen abrufen
+                  node.send(vcfList)
-                        let c = msg.calendar || node.calendar
+                }, function () {
-                        if (!c || !c.length || (c && c.length && c === calendar.displayName)) {
+                  node.error('Nextcloud:CardDAV -> get cards went wrong.')
-                            dav.listCalendarObjects(calendar, { xhr: xhr })
-                                .then(function(calendarEntries) {
-                                    let icsList = {'payload': {'name': calendar.displayName, 'data': []}}
-                                    calendarEntries.forEach(function(calendarEntry) {
-                                        const keyValue = calendarEntry.calendarData.split('\n')
-                                        let icsJson = {}
-                                        for (let x = 0; x < keyValue.length; x++) {
-                                            const temp = keyValue[x].split(':')
-                                            icsJson[temp[0]] = temp[1]
-                                        }
-                                        icsList.payload.data.push(icsJson)
-                                    })
-                                    node.send(icsList)
-                                }, function(){
-                                    node.error('Nextcloud:CalDAV -> get ics went wrong.')
-                                })
-                        }
-                    })
-                }, function(){
-                    node.error('Nextcloud:CalDAV -> get calendars went wrong.')
                 })
-        })
-    }
-    RED.nodes.registerType('nextcloud-caldav', NextcloudCalDav)
-
-
-    function NextcloudCardDav(n) {
-        RED.nodes.createNode(this, n)
-        this.server = RED.nodes.getNode(n.server)
-        this.addressBook = n.addressBook
-        let node = this
-
-        node.on('input', function(msg) {
-            const xhr = new dav.transport.Basic (
-                new dav.Credentials({
-                    username: node.server.credentials.user,
-                    password: node.server.credentials.pass
-                })
-            )
-
-            // Server + Basepath
-            let cardDavUri = node.server.address + '/remote.php/dav/addressbooks/users/'
-            // User
-            cardDavUri += node.server.credentials.user + '/'
-// ToDo Filter ?
-            dav.createAccount({ server: cardDavUri, xhr: xhr, accountType: 'carddav' })
-                .then(function(account) {
-                    if (!account.addressBooks) {
-                        node.error('Nextcloud:CardDAV -> no addressbooks found.')
-                        return
-                    }
-                    // account instanceof dav.Account
-                    account.addressBooks.forEach(function(addressBook) {
-                        // Wenn Adressbuch gesetzt ist, dann nur diesen abrufen
-                        let c = msg.addressBook || node.addressBook
-                        if (!c || !c.length || (c && c.length && c === addressBook.displayName)) {
-                            dav.listVCards(addressBook, { xhr: xhr })
-                                .then(function(addressBookEntries) {
-                                    let vcfList = {'payload': {'name': addressBook.displayName, 'data': []}}
-                                    addressBookEntries.forEach(function(addressBookEntry) {
-                                        const keyValue = addressBookEntry.addressData.split('\n')
-                                        let vcfJson = {}
-                                        for (let x = 0; x < keyValue.length; x++) {
-                                            const temp = keyValue[x].split(':')
-                                            vcfJson[temp[0]] = temp[1]
-                                        }
-                                        vcfList.payload.data.push(vcfJson)
-                                    })
-                                    node.send(vcfList)
-                                }, function(){
-                                    node.error('Nextcloud:CardDAV -> get cards went wrong.')
-                                })
-                        }
-                    })
-                }, function(){
-                    node.error('Nextcloud:CardDAV -> get addressBooks went wrong.')
-                })
-
-        })
-    }
-    RED.nodes.registerType('nextcloud-carddav', NextcloudCardDav)
-
-
-    function NextcloudWebDavList(n) {
-        RED.nodes.createNode(this, n)
-        this.server = RED.nodes.getNode(n.server)
-        this.directory = n.directory
-        let node = this
-
-        node.on('input', function(msg) {
-            const webDavUri = node.server.address + '/remote.php/webdav/'
-            const client = webdav(webDavUri, node.server.credentials.user, node.server.credentials.pass)
-            let directory = ''
-            if (msg.directory) {
-                directory = '/' + msg.directory
-            } else if (node.directory && node.directory.length) {
-                directory = '/' + node.directory
             }
-            directory = directory.replace('//', '/')
+          })
-
+        }, function () {
-            client.getDirectoryContents(directory)
+          node.error('Nextcloud:CardDAV -> get addressBooks went wrong.')
-                .then(function (contents) {
-                    node.send({'payload': contents})
-                }, function (error) {
-                    node.error('Nextcloud:WebDAV -> get directory content went wrong.' + JSON.stringify(error))
-                })
         })
-    }
+    })
-    RED.nodes.registerType('nextcloud-webdav-list', NextcloudWebDavList)
+  }
+  RED.nodes.registerType('nextcloud-carddav', NextcloudCardDav)
 
+  function NextcloudWebDavList (config) {
+    RED.nodes.createNode(this, config)
+    this.server = RED.nodes.getNode(config.server)
+    this.directory = config.directory
+    const node = this
 
-    function NextcloudWebDavOut(n) {
+    node.on('input', (msg) => {
-        RED.nodes.createNode(this, n)
+      const webDavUri = node.server.address + '/remote.php/webdav/'
-        this.server = RED.nodes.getNode(n.server)
+      const client = webdav(webDavUri, node.server.credentials.user, node.server.credentials.pass)
-        this.filename = n.filename
+      let directory = ''
-        let node = this
+      if (msg.directory) {
+        directory = '/' + msg.directory
+      } else if (node.directory && node.directory.length) {
+        directory = '/' + node.directory
+      }
+      directory = directory.replace('//', '/')
 
-        node.on('input', function(msg) {
+      client.getDirectoryContents(directory)
-            const webDavUri = node.server.address + '/remote.php/webdav/'
+        .then(function (contents) {
-            const client = webdav(webDavUri, node.server.credentials.user, node.server.credentials.pass)
+          node.send({ 'payload': contents })
-            let filename = ''
+        }, function (error) {
-            if (msg.filename) {
+          node.error('Nextcloud:WebDAV -> get directory content went wrong.' + JSON.stringify(error))
-                filename = '/' + msg.filename
-            } else if (node.filename && node.filename.length) {
-                filename = '/' + node.filename
-            } else {
-                node.error('Nextcloud:WebDAV -> no filename specified.')
-                return
-            }
-            filename = filename.replace('//', '/')
-            node.warn(filename)
-            client.getFileContents(filename)
-                .then(function (contents) {
-                    node.send({'payload': contents})
-                }, function (error) {
-                    node.error('Nextcloud:WebDAV -> get file went wrong.' + JSON.stringify(error))
-                })
         })
-    }
+    })
-    RED.nodes.registerType('nextcloud-webdav-out', NextcloudWebDavOut)
+  }
+  RED.nodes.registerType('nextcloud-webdav-list', NextcloudWebDavList)
 
+  function NextcloudWebDavOut (config) {
+    RED.nodes.createNode(this, config)
+    this.server = RED.nodes.getNode(config.server)
+    this.filename = config.filename
+    const node = this
 
-    function NextcloudWebDavIn(n) {
+    node.on('input', (msg) => {
-        RED.nodes.createNode(this, n)
+      const webDavUri = node.server.address + '/remote.php/webdav/'
-        this.server = RED.nodes.getNode(n.server)
+      const client = webdav(webDavUri, node.server.credentials.user, node.server.credentials.pass)
-        this.directory = n.directory
+      let filename = ''
-        this.filename = n.filename
+      if (msg.filename) {
-        let node = this
+        filename = '/' + msg.filename
-
+      } else if (node.filename && node.filename.length) {
-        node.on('input', function(msg) {
+        filename = '/' + node.filename
-            // Read upload file
+      } else {
-            let filename = node.filename
+        node.error('Nextcloud:WebDAV -> no filename specified.')
-            if (msg.filename) {
+        return
-                filename = msg.filename
+      }
-            }
+      filename = filename.replace('//', '/')
-            const name = filename.substr((filename.lastIndexOf('/') + 1), filename.length)
+      node.warn(filename)
-            const file = fs.readFileSync(filename);
+      client.getFileContents(filename)
-            // Set upload directory
+        .then(function (contents) {
-            let directory = '/'
+          node.send({ 'payload': contents })
-            if (msg.directory) {
+        }, function (error) {
-                directory += msg.directory + '/'
+          node.error('Nextcloud:WebDAV -> get file went wrong.' + JSON.stringify(error))
-            } else if (node.directory && node.directory.length) {
-                directory += node.directory + '/'
-            }
-            directory = directory.replace('//', '/')
-
-            const webDavUri = node.server.address + '/remote.php/webdav/'
-            const client = webdav(webDavUri, node.server.credentials.user, node.server.credentials.pass)
-
-            client.putFileContents(directory + name, file, { format: 'binary' })
-                .then(function(contents) {
-                    console.log(contents)
-                    node.send({'payload': JSON.parse(contents)})
-                }, function() {
-                    node.error('Nextcloud:WebDAV -> send file went wrong.')
-                })
         })
-    }
+    })
-    RED.nodes.registerType('nextcloud-webdav-in', NextcloudWebDavIn)
+  }
+  RED.nodes.registerType('nextcloud-webdav-out', NextcloudWebDavOut)
+
+  function NextcloudWebDavIn (config) {
+    RED.nodes.createNode(this, config)
+    this.server = RED.nodes.getNode(config.server)
+    this.directory = config.directory
+    this.filename = config.filename
+    const node = this
+
+    node.on('input', (msg) => {
+      // Read upload file
+      let filename = node.filename
+      if (msg.filename) {
+        filename = msg.filename
+      }
+      const name = filename.substr((filename.lastIndexOf('/') + 1), filename.length)
+      const file = fs.readFileSync(filename)
+      // Set upload directory
+      let directory = '/'
+      if (msg.directory) {
+        directory += msg.directory + '/'
+      } else if (node.directory && node.directory.length) {
+        directory += node.directory + '/'
+      }
+      directory = directory.replace('//', '/')
+
+      const webDavUri = node.server.address + '/remote.php/webdav/'
+      const client = webdav(webDavUri, node.server.credentials.user, node.server.credentials.pass)
+
+      client.putFileContents(directory + name, file, { format: 'binary' })
+        .then(function (contents) {
+          console.log(contents)
+          node.send({ 'payload': JSON.parse(contents) })
+        }, function () {
+          node.error('Nextcloud:WebDAV -> send file went wrong.')
+        })
+    })
+  }
+  RED.nodes.registerType('nextcloud-webdav-in', NextcloudWebDavIn)
 }

package.json

@@ -17,11 +17,19 @@
     "carddav"
   ],
   "dependencies": {
-    "dav": "^1.7.8",
+    "dav": "^1.8.0",
-    "npm": "^5.8.0",
+    "ical-expander": "^2.0.0",
+    "moment": "^2.22.2",
     "webdav": "^1.5.2"
   },
-  "devDependencies": {},
+  "devDependencies": {
+    "eslint": "^5.6.0",
+    "eslint-config-standard": "^12.0.0",
+    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-node": "^7.0.1",
+    "eslint-plugin-promise": "^4.0.1",
+    "eslint-plugin-standard": "^4.0.0"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },