Merge pull request #11 from comatory/fix-non-existent-event

Fix non existent event

lib/frontend/actions/events.js

@@ -1,7 +1,12 @@
 import { postURL } from '../services'
 import { eventStore, parseStatusStore, requestStore } from '../stores'
 import { Request } from '../records'
-import { uuidv4, parseStartTimeFromiCalString, promptDownload } from '../utils'
+import {
+  uuidv4,
+  parseStartTimeFromiCalString,
+  promptDownload,
+  encodeIcalString,
+} from '../utils'
 import { extractEventDataFromHTML } from '../../../lib/services/ics-retriever'
 import generateICS from '../../../lib/services/ics-generator'
 
@@ -35,7 +40,7 @@ const createICS = async (html, url, { logger }) => {
 
     const eventData = extractEventDataFromHTML(html, url, { logger })
     const text = await generateICS(eventData)
-    const dataUri = encodeURIComponent(text)
+    const dataUri = encodeIcalString(text)
     const uri = `data:text/calendar;charset=utf-8,${dataUri}`
 
     const summaryMatch = text.match(/SUMMARY:.*/)[0]
@@ -59,10 +64,19 @@ const createICS = async (html, url, { logger }) => {
     promptDownload(uri)
   } catch (err) {
     parseStatusStore.set(err)
+    throw err
   }
 }
 
 export const createEvent = async (url, { logger }) => {
-  const html = await getEventHTML(url)
+  try {
-  const ics = await createICS(html, url, { logger })
+    const html = await getEventHTML(url)
+    const ics = await createICS(html, url, { logger })
+  } catch(error) {
+    logger.log({
+      message: error.toString(),
+      level: 'error',
+      service: 'parser',
+    })
+  }
 }

lib/frontend/utils.js

@@ -1,3 +1,5 @@
+const UNICODE_RE = /[\ud800-\udbff][\udc00-\udfff]|[\ud800-\udfff]/g
+
 export const migrateRecord = (record) => {
   // NOTE: v3 records
   const id = record.id || record.order
@@ -55,3 +57,13 @@ export const promptDownload = (uri) => {
 
   link.setAttribute('href', '')
 }
+
+export const encodeIcalString = (string) => {
+  try {
+    return encodeURIComponent(string)
+  } catch {
+    return string.replace(UNICODE_RE , ($0) => {
+      return $0.length > 1 ? $0 : '\ufffd';
+    })
+  }
+}

lib/services/dom-parser.js

@@ -2,6 +2,10 @@ const cheerio = require('cheerio')
 const dayjs = require('dayjs')
 const { parseDates } = require('../parser-utils')
 
+const TITLE_BLACKLIST = [
+  'Content Not Found',
+]
+
 const parseDate = (timeText = '') => {
   const parts = timeText.split('at')
   const datePart = parts[0] || null
@@ -48,7 +52,8 @@ const parseUsingDOM = (html, { logger }) => {
   }
 
   const $ = cheerio.load(html)
-  const title = $('title').text()
+  const titleText = $('title').text()
+  const title = TITLE_BLACKLIST.includes(titleText) ? null : titleText
 
   const $eventSummary = $('#event_summary')
   const $eventNode = $eventSummary ? $eventSummary.children()[1] : null

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "facebook-events-ical-converter",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "facebook-events-ical-converter",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "private": true,
   "description": "App that converts events on Facebook event page to iCal file.",
   "main": "lib/index.js",
@@ -17,7 +17,7 @@
     "deploy:firebase": "npm run build:firebase:hosting && firebase deploy",
     "start": "npm run build && node lib/index.js",
     "start:dev": "concurrently \"npm run build:dev\" \"NODE_ENV=development PORT=3000 nodemon lib/index.js\"",
-    "start:dev:inspect": "npm run build:dev && NODE_ENV=development PORT=3000 nodemon --inspect lib/index.js",
+    "start:dev:inspect": "concurrently \"npm run build:dev\" \"NODE_ENV=development PORT=3000 nodemon --inspect lib/index.js\"",
     "start:dev:firebase": "concurrently \"npm run build:firebase:hosting:dev\" \"NODE_ENV=development firebase emulators:start\"",
     "test": "jest"
   },

test/services/dom-parser.spec.js

@@ -258,6 +258,20 @@ describe(parseUsingDOM, () => {
     })
 
 
+    it('should return null if title was blacklisted', () => {
+      const html = `
+        <html>
+          <head>
+            <title>Content Not Found</title>
+          </head>
+        </html>
+      `
+      const eventData = parseUsingDOM(html, { logger })
+
+      expect(eventData).to.be.null
+    })
+
+
     it('should NOT return start time without title', () => {
       const html = `
         <html>