liftie 4.2.6 → 4.2.8

package/lib/cli/noaa.js

@@ -1,10 +1,9 @@
 import { readFile, writeFile } from 'node:fs/promises';
 import { program } from 'commander';
+import { LIFTIE_USER_AGENT } from '../env.js';
 import { descriptorPath } from './dirs.js';
 import forEachResort from './for-each-resort.js';
 
-const userAgent = 'Mozilla/5.0 (compatible; Liftie/1.0; +https://liftie.info)';
-
 function points([lon, lat]) {
   function shorten(n) {
     return n.toFixed(4).replace(/0+$/, '');
@@ -27,7 +26,7 @@ async function noaaForResort(resortId, { overwrite }) {
   const { ll } = descriptor;
   const res = await fetch(`https://api.weather.gov/points/${points(ll)}`, {
     headers: {
-      'User-Agent': userAgent,
+      'User-Agent': LIFTIE_USER_AGENT,
       Accept: 'application/geo+json'
     }
   });

package/lib/env.js

@@ -4,6 +4,7 @@ const {
   CSP_REPORT_URI,
   LIFTIE_CSP_ENFORCE,
   LIFTIE_STATIC_HOST = '',
+  LIFTIE_USER_AGENT,
   LOG_DIR = tmpdir(),
   NODE_ENV = 'development',
   OPENWEATHER_API_KEY,
@@ -19,6 +20,7 @@ export {
   CSP_REPORT_URI,
   LIFTIE_CSP_ENFORCE,
   LIFTIE_STATIC_HOST,
+  LIFTIE_USER_AGENT,
   LOG_DIR,
   NODE_ENV,
   OPENWEATHER_API_KEY,

package/lib/lifts/request.js

@@ -1,4 +1,4 @@
-const userAgent = 'Mozilla/5.0 (compatible; Liftie/1.0; +https://liftie.info)';
+import { LIFTIE_USER_AGENT } from '../env.js';
 
 export default function request({ host, pathname, query }) {
   const fullUrl = new URL(pathname, host);
@@ -7,7 +7,7 @@ export default function request({ host, pathname, query }) {
   }
   return fetch(fullUrl, {
     headers: {
-      'User-Agent': userAgent,
+      'User-Agent': LIFTIE_USER_AGENT,
       Accept: '*/*'
     }
   });

package/lib/lifts/rest.js

@@ -1,7 +1,6 @@
+import { LIFTIE_USER_AGENT } from '../env.js';
 import { parseHtml } from './parser.js';
 
-const userAgent = 'liftie/1.0.0 (https://liftie.info)';
-
 export default function rest(url, parse, fn) {
   const fullUrl = new URL(url.pathname, url.host);
   if (url.query) {
@@ -9,7 +8,7 @@ export default function rest(url, parse, fn) {
   }
   const reqInit = {
     headers: {
-      'User-Agent': userAgent,
+      'User-Agent': LIFTIE_USER_AGENT,
       Accept: 'application/json'
     }
   };

package/lib/resorts/grand-targhee/index.js

@@ -1,12 +1,10 @@
 export default {
-  selector: '.table:first-of-type th',
-  filter: node => node.children.length >= 2,
+  selector: '.node--type-lift',
   parse: {
-    name: 1,
+    name: '0/0/0',
     status: {
-      child: 0,
-      attribute: 'class',
-      regex: /\s+([a-z]+)$/
+      child: 2,
+      attribute: 'title'
     }
   }
 };

package/lib/resorts/grand-targhee/resort.json

@@ -2,7 +2,7 @@
   "name": "Grand Targhee",
   "url": {
     "host": "https://www.grandtarghee.com",
-    "pathname": "/the-mountain/snow-report/"
+    "pathname": "/the-mountain/cams-conditions/lifts-trails-report"
   },
   "tags": [
     "Wyoming"

package/lib/resorts/sierra/index.js

@@ -1,7 +1,7 @@
 export default {
-  selector: '.lifts-list.active tbody tr',
+  selector: '[data-panel="lift-status"] h4',
   parse: {
-    name: 1,
-    status: 2
+    name: '.',
+    status: '../+'
   }
 };

package/lib/resorts/skiwelt/index.js

@@ -1,11 +1,9 @@
-export default {
-  selector: 'div.wrapper > div.row',
-  parse: {
-    name: '2/0',
-    status: {
-      child: '.',
-      attribute: 'data-state',
-      fn: s => (s === '1' ? 'open' : 'closed')
-    }
-  }
-};
+import coerce from '../../tools/coerce.js';
+
+export default function parse(data = {}) {
+  const { items = [] } = data;
+  return items.reduce((ls, { title, state }) => {
+    ls[title] = coerce(state);
+    return ls;
+  }, {});
+}

package/lib/resorts/skiwelt/resort.json

@@ -2,7 +2,18 @@
   "name": "Skiwelt",
   "url": {
     "host": "https://www.skiwelt.at",
-    "pathname": "/dk/liftstatus.html"
+    "pathname": "/en/lift-status-winter.html"
+  },
+  "dataUrl": {
+    "host": "https://www.skiwelt.at",
+    "pathname": "/webapi/micadoweb",
+    "query": {
+      "api": "Micado.Ski.Web/Micado.Ski.Web.IO.Api.FacilityApi/List.api",
+      "region": "skiwelt",
+      "season": "winter",
+      "typeIDs": 1
+    },
+    "json": true
   },
   "tags": [
     "Alps",

package/lib/resorts/sugarbowl/index.js

@@ -1,7 +1,7 @@
 export default {
-  selector: '.lifts_info',
+  selector: '.lift_status_top',
   parse: {
-    name: 0,
-    status: node => node.prev.children[0].attribs.alt
+    name: '0/0',
+    status: '1/0'
   }
 };

package/lib/resorts/sunshine-village/resort.json

@@ -6,7 +6,7 @@
   },
   "api": {
     "host": "https://www.skibanff.com",
-    "pathname": "/api/data/lifts",
+    "pathname": "/wp-json/sunshine/v1/lifts",
     "json": true
   },
   "tags": [

package/lib/resorts/sunvalley/index.js

@@ -1,3 +1,11 @@
 export default {
-  selector: '.lift-listing .asset-container .asset'
+  selector: '.mc-lifts__table tbody tr',
+  parse: {
+    name: '0',
+    status: {
+      child: '2',
+      attribute: 'class',
+      regex: /mc__icon-(\w+)/
+    }
+  }
 };

package/lib/resorts/sunvalley/resort.json

@@ -2,7 +2,7 @@
   "name": "Sun Valley",
   "url": {
     "host": "https://www.sunvalley.com",
-    "pathname": "/mountain-snow-report"
+    "pathname": "/the-mountain/mountain-report/"
   },
   "tags": [
     "Idaho"

package/lib/weather/noaa.js

@@ -1,11 +1,9 @@
 import Debug from 'debug';
-import { LIFTIE_STATIC_HOST as staticHost } from '../env.js';
+import { LIFTIE_USER_AGENT, LIFTIE_STATIC_HOST as staticHost } from '../env.js';
 import { iconsFromUrl } from './icons.js';
 
 const debug = Debug('liftie:weather');
 
-const userAgent = 'Mozilla/5.0 (compatible; Liftie/1.0; +https://liftie.info)';
-
 function normalize(data, ll) {
   debug('weather %j', data.properties.periods);
 
@@ -40,7 +38,7 @@ export default function fetchWeather(resort, fn) {
   fetch(url, {
     method: 'GET',
     headers: {
-      'User-Agent': userAgent,
+      'User-Agent': LIFTIE_USER_AGENT,
       Accept: 'application/geo+json'
     }
   })

package/lib/webcams.js

@@ -1,11 +1,10 @@
 import Debug from 'debug';
+import { LIFTIE_USER_AGENT } from './env.js';
 import limiter from './tools/limiter.js';
 import { minute } from './tools/millis.js';
 
 const debug = Debug('liftie:webcams');
 
-const userAgent = 'Mozilla/5.0 (compatible; Liftie/1.0; +https://liftie.info)';
-
 fetchWebcams.interval = {
   active: 8.5 * minute, // v3 API images are only valid for 10 minutes
   inactive: Number.POSITIVE_INFINITY
@@ -58,7 +57,7 @@ export default function fetchWebcams(resort, fn) {
     fetch(url, {
       headers: {
         Accept: 'application/json',
-        'User-Agent': userAgent,
+        'User-Agent': LIFTIE_USER_AGENT,
         'x-windy-api-key': WEBCAMS_API_KEY
       }
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "liftie",
-  "version": "4.2.6",
+  "version": "4.2.8",
   "description": "Clean, simple, easy to read, fast ski resort lift status",
   "type": "module",
   "keywords": [