Use new public JSON streams endpoint

src/node/data.js

@@ -1,24 +1,20 @@
-import zip from 'lodash/zip'
 import { promisify } from 'util'
 import fetch from 'node-fetch'
-import csv from 'csvtojson'
-import { GoogleSpreadsheet } from 'google-spreadsheet'
 
 const sleep = promisify(setTimeout)
 
 function filterLive(data) {
-  return data.filter((d) => d.Link && d.Status === 'Live')
+  return data.filter((d) => d.status === 'Live')
 }
 
 export async function* pollPublicData() {
-  const publicDataURL = 'https://woke.net/csv'
-  const refreshInterval = 5 * 60 * 1000
+  const publicDataURL = 'https://woke.net/api/streams.json'
+  const refreshInterval = 5 * 1000
   while (true) {
     let data
     try {
       const resp = await fetch(publicDataURL)
-      const text = await resp.text()
-      data = await csv().fromString(text)
+      data = await resp.json()
     } catch (err) {
       console.warn('error loading stream data', err)
     }
@@ -27,30 +23,6 @@ export async function* pollPublicData() {
   }
 }
 
-export async function* pollSpreadsheetData(creds, sheetId, tabName) {
-  const refreshInterval = 10 * 1000
-
-  const doc = new GoogleSpreadsheet(sheetId)
-  await doc.useServiceAccountAuth(creds)
-  await doc.loadInfo()
-  const sheet = Object.values(doc.sheetsById).find((s) => s.title === tabName)
-  await sheet.loadHeaderRow()
-
-  while (true) {
-    let rows
-    try {
-      rows = await sheet.getRows()
-      const data = rows.map((row) =>
-        Object.fromEntries(zip(row._sheet.headerValues, row._rawData)),
-      )
-      yield filterLive(data)
-    } catch (err) {
-      console.warn('error fetching rows', err)
-    }
-    await sleep(refreshInterval)
-  }
-}
-
 export class StreamIDGenerator {
   constructor(parent) {
     this.idMap = new Map(parent ? parent.idMap : null)
@@ -60,11 +32,11 @@ export class StreamIDGenerator {
   process(streams) {
     const { idMap, idSet } = this
     for (const stream of streams) {
-      const { Link, Source, Label } = stream
-      if (!idMap.has(Link)) {
+      const { link, source, label } = stream
+      if (!idMap.has(link)) {
         let counter = 0
         let newId
-        const normalizedText = (Source || Label || Link)
+        const normalizedText = (source || label || link)
           .toLowerCase()
           .replace(/[^\w]/g, '')
           .replace(/^the|^https?(www)?/, '')
@@ -74,10 +46,10 @@ export class StreamIDGenerator {
           newId = `${textPart}${counterPart}`
           counter++
         } while (idSet.has(newId))
-        idMap.set(Link, newId)
+        idMap.set(link, newId)
         idSet.add(newId)
       }
-      stream._id = idMap.get(Link)
+      stream._id = idMap.get(link)
     }
     return streams
   }

src/node/index.js

@@ -3,7 +3,7 @@ import yargs from 'yargs'
 import { app, shell, session, BrowserWindow } from 'electron'
 
 import { ensureValidURL } from '../util'
-import { pollPublicData, pollSpreadsheetData, StreamIDGenerator } from './data'
+import { pollPublicData, StreamIDGenerator } from './data'
 import StreamWindow from './StreamWindow'
 import initWebServer from './server'
 
@@ -12,17 +12,6 @@ async function main() {
     .config('config', (configPath) => {
       return JSON.parse(fs.readFileSync(configPath, 'utf-8'))
     })
-    .group(['gs-creds', 'gs-id', 'gs-tab'], 'Spreadsheet Configuration')
-    .option('gs-creds', {
-      describe: 'credentials file for Google Spreadsheet access',
-      implies: ['gs-id', 'gs-tab'],
-    })
-    .option('gs-id', {
-      describe: 'Google Spreadsheet id',
-    })
-    .option('gs-tab', {
-      describe: 'Google Spreadsheet tab name',
-    })
     .group(
       ['webserver', 'cert-dir', 'cert-email', 'hostname', 'port'],
       'Web Server Configuration',
@@ -151,14 +140,7 @@ async function main() {
     broadcastState(clientState)
   })
 
-  let dataGen
-  if (argv.gsCreds) {
-    dataGen = pollSpreadsheetData(argv.gsCreds, argv.gsId, argv.gsTab)
-  } else {
-    dataGen = pollPublicData()
-  }
-
-  for await (const rawStreams of dataGen) {
+  for await (const rawStreams of pollPublicData()) {
     const streams = idGen.process(rawStreams)
     clientState.streams = streams
     streamWindow.send('state', clientState)