liftie 3.56.2 → 3.56.4

package/lib/cli/noaa.js

@@ -1,7 +1,6 @@
 const { program } = require('commander');
 const { writeFileSync } = require('node:fs');
 const { resolve } = require('node:path');
-const superagent = require('superagent');
 
 const forEachResort = require('./for-each-resort');
 
@@ -31,28 +30,25 @@ function noaaForResort(resortId, { overwrite }) {
   const descriptor = readDescriptor(resortId);
 
   const { ll } = descriptor;
-  const url = `https://api.weather.gov/points/${points(ll)}`;
-  superagent(url)
-    .accept('application/geo+json')
-    .set('User-Agent', userAgent)
-    .then(
-      res => {
-        const {
-          body: {
-            properties: { gridId, gridX, gridY }
-          }
-        } = res;
-        const noaa = `${gridId}/${gridX},${gridY}`;
-        if (overwrite) {
-          descriptor.noaa = noaa;
-          writeDescriptor(resortId, descriptor);
-        }
-        console.log(resortId, noaa);
-      },
-      e => {
-        console.error('Cannot find NOAA station for:', resortId, e.response.text);
+  fetch(`https://api.weather.gov/points/${points(ll)}`, {
+    headers: {
+      'User-Agent': userAgent,
+      Accept: 'application/geo+json'
+    }
+  })
+    .then(res => res.json())
+    .then(body => {
+      const {
+        properties: { gridId, gridX, gridY }
+      } = body;
+      const noaa = `${gridId}/${gridX},${gridY}`;
+      if (overwrite) {
+        descriptor.noaa = noaa;
+        writeDescriptor(resortId, descriptor);
       }
-    );
+      console.log(resortId, noaa);
+    })
+    .catch(e => console.error('Cannot find NOAA station for:', resortId, e));
 }
 
 function descriptorPath(resortId, absolute) {

package/lib/lifts/pipe.js

@@ -1,19 +1,21 @@
 const request = require('./request');
-const parseHtml = require('./parser').html;
+const { html: parseHtml } = require('./parser');
 
 module.exports = (url, parse, fn) => {
   request(url)
-    .buffer(true)
-    .on('error', fn)
-    .end((err, res) => {
-      if (err && !url.ignoreErrors) {
-        console.error('Error', url, err.status);
-        return fn(err.status);
+    .then(async res => {
+      if (res.status < 200 || res.status >= 300) {
+        console.error('Error', url, res.status);
+        if (!url.ignoreErrors) {
+          return fn(res.status);
+        }
       }
-      if (!res.text) {
+      const text = await res.text();
+      if (!text) {
         console.error('Empty response', url);
         return fn('empty response');
       }
-      parseHtml(res.text, parse, fn);
-    });
+      parseHtml(text, parse, fn);
+    })
+    .catch(fn);
 };

package/lib/lifts/request.js

@@ -1,19 +1,16 @@
-const superagent = require('superagent');
-
 const userAgent = 'Mozilla/5.0 (compatible; Liftie/1.0; +https://liftie.info)';
 
-module.exports = ({ host, pathname, query, http2 }) => {
-  const req = superagent
-    .agent()
-    .get(host + pathname)
-    .redirects(4)
-    .set('User-Agent', userAgent)
-    .set('Accept', '*/*');
+module.exports = request;
+
+function request({ host, pathname, query }) {
+  const fullUrl = new URL(pathname, host);
   if (query) {
-    req.query(query);
-  }
-  if (http2) {
-    req.http2(true);
+    fullUrl.search = new URLSearchParams(query).toString();
   }
-  return req;
-};
+  return fetch(fullUrl, {
+    headers: {
+      'User-Agent': userAgent,
+      Accept: '*/*'
+    }
+  });
+}

package/lib/lifts/rest.js

@@ -1,46 +1,39 @@
-const superagent = require('superagent');
+const { html: parseHtml } = require('./parser');
+
 const userAgent = 'liftie/1.0.0 (https://liftie.info)';
-const parseHtml = require('./parser').html;
 
 module.exports = rest;
 
 function rest(url, parse, fn) {
-  const fullUrl = url.host + url.pathname;
-
-  const request = url.body ? superagent.post(fullUrl).send(url.body) : superagent.get(fullUrl);
-
+  const fullUrl = new URL(url.pathname, url.host);
   if (url.query) {
-    request.query(url.query);
+    fullUrl.search = new URLSearchParams(url.query).toString();
   }
-  if (url.http2) {
-    request.http2(true);
+  const reqInit = {
+    headers: {
+      'User-Agent': userAgent,
+      Accept: 'application/json'
+    }
+  };
+  if (url.body) {
+    reqInit.body = JSON.stringify(url.body);
+    reqInit.method = 'POST';
   }
 
-  request.set('User-Agent', userAgent).set('Accept', 'application/json').on('error', fn);
-
-  request.then(
-    res => {
-      let { body, text } = res;
-      if (url.html) {
-        return parseHtml(body, parse, fn);
+  fetch(fullUrl, reqInit)
+    .then(async res => {
+      if (res.status < 200 || res.status >= 300) {
+        return fn(res.status);
       }
-      if (url.json) {
-        // used when client does not send proper Content-Type
-        try {
-          body = JSON.parse(text);
-        } catch {
-          console.error('cannot parse', url);
-          body = {};
-        }
+      if (url.html) {
+        return parseHtml(await res.text(), parse, fn);
       }
+      const body = await res.json();
       if (parse.isAsync) {
         parse(body, fn);
       } else {
         fn(null, parse(body));
       }
-    },
-    ({ status }) => {
-      fn(status);
-    }
-  );
+    })
+    .catch(fn);
 }

package/lib/resorts/jackson-hole/resort.json

@@ -6,8 +6,7 @@
   },
   "api": {
     "host": "https://www.jacksonhole.com",
-    "pathname": "/api/all.json",
-    "http2": true
+    "pathname": "/api/all.json"
   },
   "tags": [
     "Wyoming"

package/lib/weather/noaa.js

@@ -1,8 +1,7 @@
-const superagent = require('superagent');
 const debug = require('debug')('liftie:weather');
 const { iconsFromUrl } = require('./icons');
 
-module.exports = fetch;
+module.exports = fetchWeather;
 
 const userAgent = 'Mozilla/5.0 (compatible; Liftie/1.0; +https://liftie.info)';
 
@@ -30,7 +29,7 @@ function normalize(data, ll) {
   };
 }
 
-function fetch(resort, fn) {
+function fetchWeather(resort, fn) {
   debug('fetch weather from NOAA for %s', resort.id);
 
   const { ll } = resort;
@@ -39,14 +38,17 @@ function fetch(resort, fn) {
     return process.nextTick(fn);
   }
   const url = `https://api.weather.gov/gridpoints/${resort.noaa}/forecast`;
-  superagent(url).redirects(0).accept('application/geo+json').set('User-Agent', userAgent).then(onData, onError);
-
-  function onError(err) {
-    debug('NOAA API error', err);
-    fn();
-  }
-
-  function onData({ body }) {
-    fn(null, normalize(body, ll));
-  }
+  fetch(url, {
+    method: 'GET',
+    headers: {
+      'User-Agent': userAgent,
+      Accept: 'application/geo+json'
+    }
+  })
+    .then(res => res.json())
+    .then(body => fn(null, normalize(body, ll)))
+    .catch(err => {
+      debug('NOAA API error', err);
+      fn();
+    });
 }

package/lib/weather/openweather.js

@@ -1,4 +1,3 @@
-const superagent = require('superagent');
 const debug = require('debug')('liftie:weather');
 
 const millis = require('../tools/millis');
@@ -8,7 +7,7 @@ const { iconsFrom } = require('./icons');
 // not more than 30 a minute (60 per documentation)
 const limit = limiter(30, millis.minute);
 
-module.exports = fetch;
+module.exports = fetchForecast;
 
 function tempInF(kelvins) {
   return Math.round((kelvins - 273.15) * 1.8) + 32;
@@ -74,26 +73,25 @@ function sanitize({ city, list }) {
   };
 }
 
-function fetch(resort, appid, fn) {
+function fetchForecast(resort, appid, fn) {
   limit(err => {
     if (err) {
       debug('Weather API limit %s', resort.id);
       return fn(err);
     }
     debug('request weather for %s', resort.id);
-    superagent
-      .get('https://api.openweathermap.org/data/2.5/forecast')
-      .query({
-        lon: resort.ll[0],
-        lat: resort.ll[1],
-        appid
-      })
-      .end((err, res) => {
-        if (err) {
-          console.error('Weather fetch error', resort.name, err.status);
-          return fn(err.status);
-        }
-        fn(null, sanitize(res.body));
+
+    const url = new URL('https://api.openweathermap.org/data/2.5/forecast');
+    url.searchParams.set('lon', resort.ll[0]);
+    url.searchParams.set('lat', resort.ll[1]);
+    url.searchParams.set('appid', appid);
+
+    fetch(url)
+      .then(res => res.json())
+      .then(body => fn(null, sanitize(body)))
+      .catch(err => {
+        console.error('Weather fetch error', resort.name, err.status);
+        return fn(err.status);
       });
   });
 }

package/lib/webcams.js

@@ -1,4 +1,3 @@
-const superagent = require('superagent');
 const debug = require('debug')('liftie:webcams');
 
 const { minute } = require('./tools/millis');
@@ -6,7 +5,7 @@ const limiter = require('./tools/limiter');
 
 const userAgent = 'Mozilla/5.0 (compatible; Liftie/1.0; +https://liftie.info)';
 
-module.exports = fetch;
+module.exports = fetchWebcams;
 module.exports.interval = {
   active: 8.5 * minute, // v3 API images are only valid for 10 minutes
   inactive: Number.POSITIVE_INFINITY
@@ -34,7 +33,7 @@ function getStatic({ webcams }) {
   }
 }
 
-function fetch(resort, fn) {
+function fetchWebcams(resort, fn) {
   debug('Fetching webcams for %s', resort.id);
   const { WEBCAMS_API_KEY } = process.env;
   if (!resort.ll || !WEBCAMS_API_KEY) {
@@ -56,19 +55,23 @@ function fetch(resort, fn) {
     sp.set('limit', 5);
     sp.set('nearby', `${lat},${lon},5`);
     sp.set('include', 'images,urls');
-    superagent(url)
-      .set('User-Agent', userAgent)
-      .accept('application/json')
-      .set('x-windy-api-key', WEBCAMS_API_KEY)
-      .then(onData, onError);
+    fetch(url, {
+      headers: {
+        Accept: 'application/json',
+        'User-Agent': userAgent,
+        'x-windy-api-key': WEBCAMS_API_KEY
+      }
+    })
+      .then(res => res.json())
+      .then(onData)
+      .catch(onError);
 
     function onError(err) {
       debug('Webcam API error', err);
       fn(null, getStatic(resort));
     }
 
-    function onData({ body }) {
-      const { webcams } = body;
+    function onData({ webcams }) {
       if (webcams.length < 1) {
         return fn(null, getStatic(resort));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "liftie",
-  "version": "3.56.2",
+  "version": "3.56.4",
   "description": "Clean, simple, easy to read, fast ski resort lift status",
   "keywords": [
     "ski",
@@ -53,19 +53,21 @@
     "parseurl": "^1.3.3",
     "qs": "^6.13.1",
     "ro-rating": "~2",
-    "superagent": "~10",
     "tiny-pager": "^1.0.0",
     "to-title-case": "^1.0.0"
   },
   "devDependencies": {
     "@biomejs/biome": "^1.5.1",
-    "@pirxpilot/replay": "^2.2.1",
+    "@pirxpilot/stylus": "^1.2.0",
     "commander": "~13",
     "postcss": "~8",
     "postcss-cachify": "^4.0.0",
     "postcss-cli-simple": "~4.0.0",
     "prompt": "~1",
-    "stylus": "^0.64.0"
+    "undici": "^7.10.0"
+  },
+  "resolutions": {
+    "on-headers": "npm:@pirxpilot/on-headers@2.0.0"
   },
   "pnpm": {
     "overrides": {