liftie 3.56.5 → 4.0.0

package/lib/routes/data.js

@@ -1,17 +1,15 @@
-const debug = require('debug')('liftie:data');
-const checkNames = require('../checker');
-const database = require('./database');
-const plugins = require('../plugins');
-const loaders = require('../loaders');
-const tags = require('./tags');
-const stats = require('../lifts/stats');
+import Debug from 'debug';
+import checkNames from '../checker.js';
+import { summary } from '../lifts/stats.js';
+import * as loaders from '../loaders.js';
+import * as plugins from '../plugins.js';
+import database from './database.js';
+import tags from './tags.js';
 
-module.exports = data;
-
-/*global setInterval */
+const debug = Debug('liftie:data');
 
 // data structure
-function data() {
+export default function data() {
   const // meta and data for each resort
     cache = {};
 
@@ -146,7 +144,7 @@ function data() {
 
   function getStats(requestedNames) {
     const names = checkNames(requestedNames, cache, my.names);
-    return stats.summary(
+    return summary(
       names.map(id => {
         const lifts = cache[id].data.lifts;
         return lifts?.stats;

package/lib/routes/database.js

@@ -1,13 +1,12 @@
-const path = require('node:path');
-const plugins = require('../plugins');
-const dbCache = require('./cache');
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import * as plugins from '../plugins.js';
+import dbCache from './cache.js';
 
-module.exports = database;
-
-const dbFileName = path.resolve(process.env.LOG_DIR || require('node:os').tmpdir(), 'liftie.db.json');
+const dbFileName = path.resolve(process.env.LOG_DIR || tmpdir(), 'liftie.db.json');
 
 // persistent storage status for each resort
-function database(cache) {
+export default function database(cache) {
   const db = dbCache(dbFileName);
   let loaded;
 

package/lib/routes/headers.js

@@ -1,6 +1,6 @@
-const crypto = require('node:crypto');
+import crypto from 'node:crypto';
 
-module.exports = [csp, referrer, feature, link];
+export default [csp, referrer, feature, link];
 
 const { LIFTIE_STATIC_HOST: staticHost = '', LIFTIE_CSP_ENFORCE, CSP_REPORT_URI } = process.env;
 

package/lib/routes/index.js

@@ -1,13 +1,11 @@
-const sorter = require('./sorter');
-const canonical = require('./canonical');
-const plan = require('./plan');
-const serviceWorker = require('./service-worker');
-const headers = require('./headers');
-const Router = require('@pirxpilot/router');
-const parseurl = require('parseurl');
-const qs = require('qs');
-
-module.exports = routes;
+import Router from '@pirxpilot/router';
+import parseurl from 'parseurl';
+import qs from 'qs';
+import canonical from './canonical.js';
+import headers from './headers.js';
+import plan from './plan.js';
+import serviceWorker from './service-worker.js';
+import sorter from './sorter.js';
 
 function title(suffix) {
   let t = 'Liftie';
@@ -164,7 +162,7 @@ function meta(req, res, next) {
   });
 }
 
-function routes(app) {
+export default function routes(app) {
   const router = new Router();
 
   function reqData(req, _res, next) {

package/lib/routes/plan.js

@@ -1,8 +1,6 @@
-const qs = require('qs');
+import qs from 'qs';
 
-module.exports = addToTrip;
-
-function addToTrip(resort) {
+export default function addToTrip(resort) {
   return qs.stringify({
     stop: {
       name: resort.name,

package/lib/routes/service-worker.js

@@ -1,13 +1,12 @@
-const esbuild = require('esbuild');
-const fs = require('node:fs');
-
-module.exports = renderServiceWorker;
+import fs from 'node:fs';
+import esbuild from 'esbuild';
+import packageJSON from '../../package.json' with { type: 'json' };
 
 const { NODE_ENV, SITE_URL: siteUrl, LIFTIE_STATIC_HOST: staticHost = '' } = process.env;
 
 const DEBUG = NODE_ENV !== 'production';
 
-function renderServiceWorker(_req, res) {
+export default function renderServiceWorker(_req, res) {
   createServiceWorkerScript(res.locals).then(serviceWorkerScript => {
     // do not cache service worker
     res.setHeader('Cache-Control', 'no-cache, max-age=0, must-revalidate');
@@ -47,7 +46,7 @@ let serviceWorkerScriptPromise;
 function createServiceWorkerScript({ cachify }) {
   if (!serviceWorkerScriptPromise) {
     const serviceWorkerOptions = {
-      version: require('../../package.json').version,
+      version: packageJSON.version,
       prefetch: [
         '/img/noaa-logo.svg',
         '/scripts/liftie.js',
@@ -63,7 +62,7 @@ function createServiceWorkerScript({ cachify }) {
     serviceWorkerScriptPromise = minify({
       debug: DEBUG,
       vars: `var options = ${JSON.stringify(serviceWorkerOptions)};`,
-      script: fs.readFileSync(`${__dirname}/sw.template.js`, 'utf-8')
+      script: fs.readFileSync(`${import.meta.dirname}/sw.template.js`, 'utf-8')
     });
   }
   return serviceWorkerScriptPromise;

package/lib/routes/sorter.js

@@ -1,6 +1,4 @@
-const _ = require('lodash');
-
-module.exports = markOpen;
+import _ from 'lodash';
 
 function getOpenResorts(cookie) {
   const open = cookie['resorts-open'];
@@ -20,7 +18,7 @@ function sortByOpen(resorts) {
   return open.concat(closed);
 }
 
-function markOpen(resorts, cookie) {
+export default function markOpen(resorts, cookie) {
   let openList = getOpenResorts(cookie);
   if (!openList && resorts.length > 5) {
     // no cookie and a lot of resorts - display everything as closed

package/lib/routes/tags.js

@@ -1,6 +1,4 @@
-const canonical = require('./canonical');
-
-module.exports = tags;
+import canonical from './canonical.js';
 
 /**
  * Converts an array of objects into tags structure.
@@ -10,7 +8,7 @@ module.exports = tags;
  *
  *  @param {Object} objects to be converted
  */
-function tags(objects) {
+export default function tags(objects) {
   const result = Object.create(null);
 
   Object.keys(objects).forEach(n => {

package/lib/select.js

@@ -1,8 +1,6 @@
-const cssSelect = require('css-select');
+import { selectAll } from 'css-select';
 
 // select we were using before had reverse order of the parameters
-function select(dom, selector) {
-  return cssSelect.selectAll(selector, dom);
+export default function select(dom, selector) {
+  return selectAll(selector, dom);
 }
-
-module.exports = select;

package/lib/tools/aspen.js

@@ -1,9 +1,9 @@
-const debug = require('debug')('liftie:resort:aspen');
-const coerce = require('./coerce');
+import Debug from 'debug';
+import coerce from './coerce.js';
 
-module.exports = parse;
+const debug = Debug('liftie:resort:aspen');
 
-function parse(data) {
+export default function parse(data) {
   const liftStatus = {};
 
   data.liftStatuses.forEach(lift => {

package/lib/tools/boyne.js

@@ -1,9 +1,9 @@
-const coerce = require('./coerce');
-const debug = require('debug')('liftie:resort:boyne');
+import Debug from 'debug';
+import coerce from './coerce.js';
 
-module.exports = parse;
+const debug = Debug('liftie:resort:boyne');
 
-function parse(data) {
+export default function parse(data) {
   const liftStatus = {};
 
   data.forEach(({ name, status }) => {

package/lib/tools/campiglio-dolomiti.js

@@ -1,4 +1,4 @@
-module.exports = index => ({
+export default index => ({
   selector: `.piste-overview:nth-of-type(${index}) .col-6:first-child dt`,
   parse: {
     name: 2,

package/lib/tools/coerce.js

@@ -1,6 +1,6 @@
-const debug = require('debug')('liftie:coerce');
+import Debug from 'debug';
 
-module.exports = coerceStatus;
+const debug = Debug('liftie:coerce');
 
 const map = {
   o: 'open',
@@ -90,12 +90,12 @@ function slice(str, [from, to]) {
  * slice, trim, lowercase and coerce to standard liftie statuses
  * If no usable status is found, return 'scheduled'
  */
-function coerceStatus(status, ...dels) {
+export default function coerceStatus(status, ...dels) {
   if (status) {
     if (dels.length > 0) {
       status = slice(status, dels);
     }
-    status = status.replace(/[\s_\-]+/g, '').toLowerCase();
+    status = status.replace(/[\s_-]+/g, '').toLowerCase();
   }
   let s = map[status];
   if (!s) {

package/lib/tools/dolomitisuperski.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   selector: '.table tbody tr',
   parse: {
     name: '1',

package/lib/tools/domutil.js

@@ -1,9 +1,11 @@
-const debug = require('debug')('liftie:domutil');
+import Debug from 'debug';
 
-const select = require('../select');
-const coerce = require('./coerce');
+const debug = Debug('liftie:domutil');
 
-function findText(node) {
+import select from '../select.js';
+import coerce from './coerce.js';
+
+export function findText(node) {
   while (node && node.type !== 'text') {
     node = node.children?.[0];
   }
@@ -12,7 +14,7 @@ function findText(node) {
   }
 }
 
-function allText(node) {
+export function allText(node) {
   if (node.type === 'text') {
     return node.data;
   }
@@ -25,7 +27,7 @@ function allText(node) {
     .join('');
 }
 
-function child(node, path) {
+export function child(node, path) {
   if (typeof path === 'string') {
     path = path.split('/');
   } else if (typeof path === 'number') {
@@ -61,11 +63,11 @@ function child(node, path) {
   }, node);
 }
 
-function childText(node, path) {
+export function childText(node, path) {
   return findText(child(node, path));
 }
 
-function text(node, descriptor) {
+export function text(node, descriptor) {
   if (typeof descriptor === 'function') {
     return descriptor(node);
   }
@@ -99,7 +101,7 @@ function text(node, descriptor) {
 
 // parseFn can be either a function that calculates { name, status } pair
 // or an object with paths to name and status
-function collect(dom, selector, parse = { name: 0, status: 1 }) {
+export function collect(dom, selector, parse = { name: 0, status: 1 }) {
   const parseFn =
     typeof parse === 'function'
       ? parse
@@ -132,12 +134,3 @@ function collect(dom, selector, parse = { name: 0, status: 1 }) {
 
   return ls;
 }
-
-module.exports = {
-  child,
-  childText,
-  collect,
-  findText,
-  allText,
-  text
-};

package/lib/tools/infosnow.js

@@ -1,8 +1,10 @@
-const domutil = require('./domutil');
-const select = require('../select');
-const debug = require('debug')('liftie:resort:infosnow');
+import Debug from 'debug';
+import select from '../select.js';
+import * as domutil from './domutil.js';
 
-function parse(dom) {
+const debug = Debug('liftie:resort:infosnow');
+
+export default function parse(dom) {
   const nodes = select(dom, '.block table tr');
   let liftStatus;
 
@@ -20,5 +22,3 @@ function parse(dom) {
   debug('Infosnow APGSGA Lift Status:', liftStatus);
   return liftStatus;
 }
-
-module.exports = parse;

package/lib/tools/intrawest.js

@@ -1,8 +1,8 @@
-const coerce = require('./coerce');
+import coerce from './coerce.js';
+
 // common parser for Intrawest http://www.intrawest.com/about-us/who-we-are.aspx
-module.exports = parse;
 
-function parse(lifts) {
+export default function parse(lifts) {
   return lifts.reduce((ls, { Name: name, StatusEnglish: status }) => {
     ls[name] = coerce(status);
     return ls;

package/lib/tools/limiter.js

@@ -1,8 +1,6 @@
-const { RateLimiter } = require('limiter');
+import { RateLimiter } from 'limiter';
 
-module.exports = Limiter;
-
-function Limiter(...args) {
+export default function Limiter(...args) {
   const items = argsToLimiters(args);
   return limit;
 

package/lib/tools/lumiplan.js

@@ -1,6 +1,6 @@
-const toTitleCase = require('to-title-case');
+import toTitleCase from 'to-title-case';
 
-module.exports = {
+export default {
   selector: '.text:contains(Lifts) + .prl_affichage .prl_group',
   parse: {
     name: {

package/lib/tools/millis.js

@@ -1,11 +1,4 @@
-const second = 1000;
-const minute = 60 * second;
-const hour = 60 * minute;
-const day = 24 * hour;
-
-module.exports = {
-  second,
-  minute,
-  hour,
-  day
-};
+export const second = 1000;
+export const minute = 60 * second;
+export const hour = 60 * minute;
+export const day = 24 * hour;

package/lib/tools/powdr.js

@@ -1,9 +1,9 @@
-const coerce = require('./coerce');
-const debug = require('debug')('liftie:resort:powdr');
+import Debug from 'debug';
+import coerce from './coerce.js';
 
-module.exports = parse;
+const debug = Debug('liftie:resort:powdr');
 
-function parse(data) {
+export default function parse(data) {
   const liftStatus = {};
 
   data.forEach(({ name, status }) => {

package/lib/tools/prism.js

@@ -1,7 +1,9 @@
-const domutil = require('./domutil');
-const debug = require('debug')('liftie:resort');
+import Debug from 'debug';
+import * as domutil from './domutil.js';
 
-function parse(dom) {
+const debug = Debug('liftie:resort');
+
+export default function parse(dom) {
   const liftStatus = domutil.collect(dom, '.lift_list_table tbody tr', tr => {
     const last = tr.children[tr.children.length - 1];
     let status = domutil.findText(last);
@@ -21,5 +23,3 @@ function parse(dom) {
   debug('Lift Status:', liftStatus);
   return liftStatus;
 }
-
-module.exports = parse;

package/lib/tools/skiplan.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   selector: '.rm',
   parse: {
     name: 2,

package/lib/tools/turismofvg.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   // Can't use `.c-snowreportdetail__tablerowcontent@landscape` because the @ symbol breaks the selector
   selector: '[class*="c-snowreportdetail__tablerowcontent@landscape"]',
   parse: {
@@ -8,7 +8,7 @@ module.exports = {
     status: {
       child: '0',
       attribute: 'class',
-      regex: /o\-status\-\-(\w+)$/
+      regex: /o-status--(\w+)$/
     }
   }
 };

package/lib/tools/vail.js

@@ -1,13 +1,11 @@
-const vm = require('node:vm');
-const debug = require('debug')('liftie:resort:vail');
+import vm from 'node:vm';
+import Debug from 'debug';
+import { Parser as htmlparser } from 'htmlparser2';
+import request from '../lifts/request.js';
+import select from '../select.js';
+import * as domutil from './domutil.js';
 
-const domutil = require('./domutil');
-const select = require('../select');
-
-const request = require('../lifts/request');
-const htmlparser = require('htmlparser2');
-
-module.exports = parse;
+const debug = Debug('liftie:resort:vail');
 
 const statuses = ['closed', 'open', 'hold', 'scheduled'];
 
@@ -51,7 +49,7 @@ function followWaitingRoom(waitingRoom) {
 }
 
 // common parser for Vail Resorts lift status
-function parse(dom) {
+export default function parse(dom) {
   const waitingRoom = select(dom, 'script')
     .map(script => domutil.allText(script).trim())
     .find(script => script.includes("document.location.href = '/?c=vailresorts"));

package/lib/tools/vialattea.js

@@ -3,7 +3,7 @@ const ICON_MAP = {
   remove_circle: 'close'
 };
 
-module.exports = {
+export default {
   selector: 'h2 + table tbody tr',
   parse: {
     name: 3,

package/lib/weather/icons.js

@@ -1,9 +1,4 @@
-const url = require('node:url');
-
-module.exports = {
-  iconsFromUrl,
-  iconsFrom
-};
+import url from 'node:url';
 
 const DAY = {
   skc: ['basenone', 'icon-sun'],
@@ -74,12 +69,12 @@ const NIGHT = {
 
 const ICONS = { DAY, NIGHT };
 
-function iconsFromUrl(iconUrl) {
+export function iconsFromUrl(iconUrl) {
   const { pathname } = url.parse(iconUrl);
   return iconsFrom(...pathname.split('/').slice(-2));
 }
 
-function iconsFrom(period = '', key = '') {
+export function iconsFrom(period = '', key = '') {
   key = key.split(',')[0];
   period = period.toUpperCase();
 

package/lib/weather/index.js

@@ -1,9 +1,8 @@
-const openweather = require('./openweather');
-const noaa = require('./noaa');
-const { hour } = require('../tools/millis');
+import { hour } from '../tools/millis.js';
+import noaa from './noaa.js';
+import openweather from './openweather.js';
 
-module.exports = fetch;
-module.exports.interval = {
+fetch.interval = {
   active: 2 * hour, // once every 2 hours for active resorts
   inactive: Number.POSITIVE_INFINITY // don't fetch on inactive
 };
@@ -11,7 +10,7 @@ module.exports.interval = {
 // see: https://openweathermap.org/forecast5
 const { OPENWEATHER_API_KEY } = process.env;
 
-function fetch(resort, fn) {
+export default function fetch(resort, fn) {
   if (resort.noaa) {
     noaa(resort, fn);
   } else if (OPENWEATHER_API_KEY) {

package/lib/weather/noaa.js

@@ -1,7 +1,9 @@
-const debug = require('debug')('liftie:weather');
-const { iconsFromUrl } = require('./icons');
+import Debug from 'debug';
 
-module.exports = fetchWeather;
+const debug = Debug('liftie:weather');
+
+import { iconsFromUrl } from './icons.js';
+export default fetchWeather;
 
 const userAgent = 'Mozilla/5.0 (compatible; Liftie/1.0; +https://liftie.info)';
 

package/lib/weather/openweather.js

@@ -1,14 +1,13 @@
-const debug = require('debug')('liftie:weather');
+import Debug from 'debug';
+import limiter from '../tools/limiter.js';
+import * as millis from '../tools/millis.js';
+import { iconsFrom } from './icons.js';
 
-const millis = require('../tools/millis');
-const limiter = require('../tools/limiter');
-const { iconsFrom } = require('./icons');
+const debug = Debug('liftie:weather');
 
 // not more than 30 a minute (60 per documentation)
 const limit = limiter(30, millis.minute);
 
-module.exports = fetchForecast;
-
 function tempInF(kelvins) {
   return Math.round((kelvins - 273.15) * 1.8) + 32;
 }
@@ -73,7 +72,7 @@ function sanitize({ city, list }) {
   };
 }
 
-function fetchForecast(resort, appid, fn) {
+export default function fetchForecast(resort, appid, fn) {
   limit(err => {
     if (err) {
       debug('Weather API limit %s', resort.id);

package/lib/webcams.js

@@ -1,12 +1,12 @@
-const debug = require('debug')('liftie:webcams');
+import Debug from 'debug';
+import limiter from './tools/limiter.js';
+import { minute } from './tools/millis.js';
 
-const { minute } = require('./tools/millis');
-const limiter = require('./tools/limiter');
+const debug = Debug('liftie:webcams');
 
 const userAgent = 'Mozilla/5.0 (compatible; Liftie/1.0; +https://liftie.info)';
 
-module.exports = fetchWebcams;
-module.exports.interval = {
+fetchWebcams.interval = {
   active: 8.5 * minute, // v3 API images are only valid for 10 minutes
   inactive: Number.POSITIVE_INFINITY
 };
@@ -33,7 +33,7 @@ function getStatic({ webcams }) {
   }
 }
 
-function fetchWebcams(resort, fn) {
+export default function fetchWebcams(resort, fn) {
   debug('Fetching webcams for %s', resort.id);
   const { WEBCAMS_API_KEY } = process.env;
   if (!resort.ll || !WEBCAMS_API_KEY) {

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "liftie",
-  "version": "3.56.5",
+  "version": "4.0.0",
   "description": "Clean, simple, easy to read, fast ski resort lift status",
+  "type": "module",
   "keywords": [
     "ski",
     "snowboard"
@@ -57,7 +58,7 @@
     "to-title-case": "^1.0.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.5.1",
+    "@biomejs/biome": "2.2.6",
     "@pirxpilot/stylus": "^1.2.0",
     "commander": "~13",
     "postcss": "~8",