liftie 3.56.4 → 4.0.0

package/Makefile

@@ -77,10 +77,10 @@ node_modules: package.json pnpm-lock.yaml
 .NOTPARALLEL: node_modules
 
 lint: | node_modules
-	$(NODE_BIN)/biome check $(LINT_SRC)
+	$(NODE_BIN)/biome ci $(LINT_SRC)
 
 format: | node_modules
-	$(NODE_BIN)/biome format --write $(LINT_SRC)
+	$(NODE_BIN)/biome check --write $(LINT_SRC)
 
 test: | node_modules
 	node --test $(TESTS)

package/app.js

@@ -1,23 +1,31 @@
-const connect = require('@pirxpilot/connect');
-const cachifyStatic = require('connect-cachify-static');
-const gzip = require('connect-gzip-static');
-const http = require('node:http');
-const path = require('node:path');
-const loaders = require('./lib/loaders');
-const plugins = require('./lib/plugins');
-
-const cookieParser = require('@pirxpilot/cookie-parser');
-const logger = require('morgan');
-const errorHandler = require('errorhandler');
-const renderer = require('connect-renderer');
-
-const app = (module.exports = connect());
+import http from 'node:http';
+import path from 'node:path';
+import connect from '@pirxpilot/connect';
+import cookieParser from '@pirxpilot/cookie-parser';
+import { compile } from '@pirxpilot/jade-core';
+import cachifyStatic from 'connect-cachify-static';
+import gzip from 'connect-gzip-static';
+import renderer from 'connect-renderer';
+import errorHandler from 'errorhandler';
+import logger from 'morgan';
+import lifts from './lib/lifts/index.js';
+import loader from './lib/loader.js';
+import * as loaders from './lib/loaders.js';
+import opening from './lib/opening.js';
+import * as plugins from './lib/plugins.js';
+import dataRoutes from './lib/routes/data.js';
+import routes from './lib/routes/index.js';
+import weather from './lib/weather/index.js';
+import webcams from './lib/webcams.js';
+
+const app = connect();
+export default app;
 
 process.env.PORT ??= 3000;
 process.env.SITE_URL ??= `http://localhost:${process.env.PORT}`;
 process.env.NODE_ENV ??= 'development';
 
-const root = path.join(__dirname, 'public');
+const root = path.join(path.dirname(new URL(import.meta.url).pathname), 'public');
 const { SITE_URL: siteUrl, LIFTIE_STATIC_HOST: staticHost = '' } = process.env;
 
 const cachify = cachifyStatic(root);
@@ -34,8 +42,8 @@ app.locals = {
 };
 
 app.use(
-  renderer(`${__dirname}/views`).engine('jade', {
-    compile: require('@pirxpilot/jade-core').compile,
+  renderer(`${path.dirname(new URL(import.meta.url).pathname)}/views`).engine('jade', {
+    compile,
     options: { compileDebug: process.env.NODE_ENV !== 'production' }
   })
 );
@@ -59,17 +67,17 @@ if (process.env.NODE_ENV === 'development') {
 }
 
 app.loaders = loaders;
-app.loaders.register(require('./lib/loader'));
+app.loaders.register(loader);
 
 app.plugins = plugins;
-app.plugins.register('lifts', require('./lib/lifts'));
-app.plugins.register('opening', require('./lib/opening'));
-app.plugins.register('weather', require('./lib/weather'));
-app.plugins.register('webcams', require('./lib/webcams'));
+app.plugins.register('lifts', lifts);
+app.plugins.register('opening', opening);
+app.plugins.register('weather', weather);
+app.plugins.register('webcams', webcams);
 
-app.data = require('./lib/routes/data')();
+app.data = dataRoutes();
 
-require('./lib/routes')(app);
+routes(app);
 
 app.run = function run() {
   app.data.init(err => {
@@ -84,6 +92,6 @@ app.run = function run() {
   });
 };
 
-if (!module.parent) {
+if (import.meta.main) {
   app.run();
 }

package/lib/checker.js

@@ -1,4 +1,4 @@
-module.exports = checkNames;
+export default checkNames;
 
 /**
  * Converts comma separated list of resort names to an array of valid resort names

package/lib/cli/curl.js

@@ -1,14 +1,14 @@
-const path = require('node:path');
-const fs = require('node:fs');
-const request = require('../lifts/request');
-const dirs = require('./dirs');
+import fs from 'node:fs';
+import path from 'node:path';
+import { pipeline } from 'node:stream/promises';
+import request from '../lifts/request.js';
+import * as dirs from './dirs.js';
 
-module.exports = curl;
-
-function curl(url, resortId) {
+export default async function curl(url, resortId) {
   const dst = path.join(dirs.test, 'example', `${resortId}.html`);
   const dstStream = fs.createWriteStream(dst);
 
   console.log('Fetching %s to %s...', url.host + url.pathname, dst);
-  request(url).pipe(dstStream);
+  const res = await request(url);
+  return pipeline(res.body, dstStream);
 }

package/lib/cli/dirs.js

@@ -1,7 +1,9 @@
-const path = require('node:path');
+import { resolve } from 'node:path';
 
-module.exports = {
-  templates: path.resolve(__dirname, '../../templates'),
-  lib: path.resolve(__dirname, '../resorts'),
-  test: path.resolve(__dirname, '../../test/resorts')
-};
+export const templates = resolve(import.meta.dirname, '../../templates');
+export const lib = resolve(import.meta.dirname, '../resorts');
+export const test = resolve(import.meta.dirname, '../../test/resorts');
+
+export function descriptorPath(resortId) {
+  return resolve(import.meta.dirname, '..', 'resorts', resortId, 'resort.json');
+}

package/lib/cli/fetch.js

@@ -1,17 +1,17 @@
-const { program } = require('commander');
-const curl = require('./curl');
+import { readFileSync } from 'node:fs';
+import { program } from 'commander';
+import curl from './curl.js';
+import { descriptorPath } from './dirs.js';
 
 let done;
 
-function fetchExample(resortId) {
-  let resort;
-
+async function fetchExample(resortId) {
   try {
-    resort = require(`../resorts/${resortId}/resort.json`);
-    curl(resort.dataUrl || resort.api || resort.url, resortId);
+    const resort = JSON.parse(readFileSync(descriptorPath(resortId), 'utf8'));
     done = true;
-  } catch {
-    console.error(resortId, 'is not a valid resort ID');
+    await curl(resort.dataUrl || resort.api || resort.url, resortId);
+  } catch (e) {
+    console.error(resortId, 'is not a valid resort ID', e);
     process.exit(1);
   }
 }

package/lib/cli/for-each-resort.js

@@ -1,7 +1,6 @@
-const { readdir } = require('node:fs');
-const { lib } = require('./dirs');
-
-module.exports = forEachResort;
+import { readdir } from 'node:fs';
+import { lib } from './dirs.js';
+export default forEachResort;
 
 function forEachResort(fn) {
   console.log('Reading:', lib);

package/lib/cli/generate.js

@@ -1,11 +1,11 @@
-const { program } = require('commander');
-const prompt = require('prompt');
-const url = require('node:url');
-const fs = require('node:fs');
-const path = require('node:path');
-const template = require('lodash').template;
-const curl = require('./curl');
-const dirs = require('./dirs');
+import fs from 'node:fs';
+import path from 'node:path';
+import url from 'node:url';
+import { program } from 'commander';
+import _ from 'lodash';
+import prompt from 'prompt';
+import curl from './curl.js';
+import * as dirs from './dirs.js';
 
 let fname;
 const schema = [
@@ -84,7 +84,7 @@ if (program.json) {
 
 function generate(resort) {
   console.log('Generating files for %s', resort.name);
-  const resortDir = path.join(dirs.lib, resort.id);
+  const resortDir = path.resolve(import.meta.dirname, '..', 'resorts', resort.id);
 
   fs.mkdirSync(resortDir);
   copy(path.join(dirs.templates, 'index.js'), path.join(resortDir, 'index.js'), resort);
@@ -113,7 +113,7 @@ function write(dst, json) {
 function copy(src, dst, params) {
   console.log('Generating %s...', dst);
   fs.readFile(src, 'utf8', (_err, data) => {
-    data = template(data)(params);
+    data = _.template(data)(params);
     fs.writeFileSync(dst, data);
   });
 }

package/lib/cli/noaa.js

@@ -1,8 +1,7 @@
-const { program } = require('commander');
-const { writeFileSync } = require('node:fs');
-const { resolve } = require('node:path');
-
-const forEachResort = require('./for-each-resort');
+import { readFileSync, writeFileSync } from 'node:fs';
+import { program } from 'commander';
+import { descriptorPath } from './dirs.js';
+import forEachResort from './for-each-resort.js';
 
 let done = false;
 
@@ -51,19 +50,15 @@ function noaaForResort(resortId, { overwrite }) {
     .catch(e => console.error('Cannot find NOAA station for:', resortId, e));
 }
 
-function descriptorPath(resortId, absolute) {
-  const p = `../resorts/${resortId}/resort.json`;
-  return absolute ? resolve(__dirname, p) : p;
-}
-
 function writeDescriptor(resortId, descriptor) {
-  const filename = descriptorPath(resortId, true);
+  const filename = descriptorPath(resortId);
   writeFileSync(filename, `${JSON.stringify(descriptor, null, 2)}\n`);
 }
 
 function readDescriptor(resortId) {
   try {
-    return require(`../resorts/${resortId}/resort.json`);
+    const filename = descriptorPath(resortId);
+    return JSON.parse(readFileSync(filename, 'utf8'));
   } catch {
     console.error(resortId, 'is not a valid resort ID');
     process.exit(1);

package/lib/client/about/index.js

@@ -1,10 +1,6 @@
-const cookie = require('js-cookie');
+import cookie from 'js-cookie';
 
-/*global document, window*/
-
-module.exports = about;
-
-function about() {
+export default function about() {
   const s = document.querySelector('.hidden .about');
   if (!s) {
     // no hidden 'about' section - nothing to do

package/lib/client/boot/height.js

@@ -1,8 +1,4 @@
-const debounce = require('debounce');
-
-module.exports = postHeight;
-
-/*global window, document*/
+import debounce from 'debounce';
 
 function notify() {
   const widget = document.querySelector('.widget');
@@ -18,7 +14,7 @@ function notify() {
   );
 }
 
-function postHeight() {
+export default function postHeight() {
   if (window === window.parent) {
     // we are not embedded - nothing to do
     return;

package/lib/client/boot/index.js

@@ -1,14 +1,11 @@
-const minimax = require('../minimax');
-const resort = require('../resort');
-const state = require('../state');
-const tag = require('../tag');
-const about = require('../about');
-const stats = require('../stats');
-const height = require('./height');
-const serviceWorker = require('./service-worker');
-
-/*global document */
-/*global window */
+import about from '../about/index.js';
+import minimax from '../minimax/index.js';
+import resort from '../resort/index.js';
+import state from '../state/index.js';
+import stats from '../stats/index.js';
+import tag from '../tag/index.js';
+import height from './height.js';
+import serviceWorker from './service-worker.js';
 
 serviceWorker();
 init();

package/lib/client/boot/service-worker.js

@@ -1,7 +1,3 @@
-module.exports = register;
-
-/* global navigator, console */
-
 function registrationHandler({ scope, installing, waiting, active }) {
   console.log('SW', scope);
 
@@ -16,7 +12,7 @@ function registrationHandler({ scope, installing, waiting, active }) {
   }
 }
 
-function register(url = '/sw.js') {
+export default function register(url = '/sw.js') {
   if (navigator.serviceWorker && document.documentElement.hasAttribute('data-service-worker')) {
     return navigator.serviceWorker
       .register(url)

package/lib/client/minimax/index.js

@@ -1,10 +1,8 @@
-module.exports = minimax;
-
 /**
  * @param {Array} elements list of affected element
  * @param {Element} trigger button|link that flips min, max state
  */
-function minimax(node, selector) {
+export default function minimax(node, selector) {
   const my = {
     trigger: node.querySelector(selector),
     state: 'open', // by default trigger 'open' state

package/lib/client/resort/dom.js

@@ -1,14 +1,9 @@
-function removeAllChildren(node) {
+export function removeAllChildren(node) {
   while (node.hasChildNodes()) {
     node.removeChild(node.lastChild);
   }
 }
 
-function next({ nextElementSibling, nextSibling }) {
+export function next({ nextElementSibling, nextSibling }) {
   return nextElementSibling || nextSibling;
 }
-
-module.exports = {
-  next,
-  removeAllChildren
-};

package/lib/client/resort/index.js

@@ -1,6 +1,8 @@
-const dom = require('./dom');
-
-module.exports = resort;
+import * as dom from './dom.js';
+import lifts from './lifts.js';
+import snow from './snow.js';
+import weather from './weather.js';
+import webcams from './webcams.js';
 
 function renderOpening(node, opening) {
   if (opening) {
@@ -13,12 +15,7 @@ function renderOpening(node, opening) {
   }
 }
 
-const plugins = [
-  require('../resort/lifts'),
-  require('../resort/weather'),
-  require('../resort/webcams'),
-  require('../resort/snow')
-];
+const plugins = [lifts, weather, webcams, snow];
 
 function renderPlugins(node, getData) {
   const sec = dom.next(node); // extras section
@@ -60,7 +57,7 @@ function render(node, resort) {
 
 const MAX = 12; // update every 12th time
 
-function resort(node) {
+export default function resort(node) {
   let updateCounter = MAX;
 
   function updateTimeToRefresh(counter) {

package/lib/client/resort/lifts.js

@@ -1,8 +1,7 @@
-const dom = require('./dom');
+import * as dom from './dom.js';
 
-module.exports = render;
-module.exports.section = 0;
-module.exports.type = 'lifts';
+render.section = 0;
+render.type = 'lifts';
 
 const states = ['open', 'hold', 'scheduled', 'closed'];
 
@@ -29,7 +28,7 @@ function renderColorBar(node, percentage) {
   });
 }
 
-function render(node, { status, stats }) {
+export default function render(node, { status, stats }) {
   renderStatus(node.querySelector('.lifts'), status);
   renderStats(node.querySelector('.summary'), stats);
   renderColorBar(node.querySelector('.summary-color-bar'), stats.percentage);

package/lib/client/resort/snow.js

@@ -1,8 +1,7 @@
 const day = 24 * 60 * 60 * 1000;
 
-module.exports = render;
-module.exports.section = 1;
-module.exports.type = 'snow';
+render.section = 1;
+render.type = 'snow';
 
 // .snow
 //   .snowfall= resort.snow.snowfall
@@ -17,7 +16,7 @@ function renderField(div, field, snow) {
   el.classList.toggle('hidden', !value);
 }
 
-function render(div, snow) {
+export default function render(div, snow) {
   if (Date.now() - snow.timestamp > day) {
     return false;
   }

package/lib/client/resort/weather.js

@@ -1,8 +1,7 @@
 const day = 24 * 60 * 60 * 1000;
 
-module.exports = render;
-module.exports.section = 1;
-module.exports.type = 'weather';
+render.section = 1;
+render.type = 'weather';
 
 // .weather
 //   .weather-icon
@@ -37,7 +36,7 @@ function renderNotice(el, notice) {
   el.setAttribute('alt', notice.site);
 }
 
-function render(div, weather) {
+export default function render(div, weather) {
   if (Date.now() - weather.timestamp > day) {
     return false;
   }

package/lib/client/resort/webcams.js

@@ -1,11 +1,8 @@
-const swipe = require('@pirxpilot/swipe');
-const pager = require('tiny-pager');
+import swipe from '@pirxpilot/swipe';
+import pager from 'tiny-pager';
 
-/*global setInterval,clearInterval */
-
-module.exports = render;
-module.exports.section = 1;
-module.exports.type = 'webcams';
+render.section = 1;
+render.type = 'webcams';
 
 const DELAY = 15 * 60 * 1000; // update every 15 minutes
 
@@ -44,7 +41,7 @@ function swiper(el) {
   };
 }
 
-function render(div, webcams) {
+export default function render(div, webcams) {
   let cams;
   let timer;
   let ui;

package/lib/client/state/index.js

@@ -1,12 +1,9 @@
-const cookie = require('js-cookie');
+import K from '@pirxpilot/k';
+import cookie from 'js-cookie';
 
-/*global window*/
+const k = K(window);
 
-const k = require('@pirxpilot/k')(window);
-
-module.exports = state;
-
-function state(nodes, st, keys) {
+export default function state(nodes, st, keys) {
   const cookieName = `resorts-${st}`;
 
   const self = {

package/lib/client/stats/index.js

@@ -1,8 +1,4 @@
-module.exports = stats;
-
-/* global document */
-
-function stats() {
+export default function stats() {
   const pie = document.querySelector('.stats .pie');
   if (!pie) {
     return;

package/lib/client/tag/index.js

@@ -1,6 +1,4 @@
-module.exports = tag;
-
-function tag(node) {
+export default function tag(node) {
   let count;
 
   function update(c) {

package/lib/embed/index.js

@@ -1,5 +1,3 @@
-/*global document, window */
-
 function el(attrs) {
   const attrStr = Object.keys(attrs)
     .map(attr => `${attr}="${attrs[attr]}"`)

package/lib/lifts/index.js

@@ -1,16 +1,16 @@
-const debug = require('debug')('liftie:lifts');
+import Debug from 'debug';
+import getParseFn from './parse.js';
+import pipe from './pipe.js';
+import rest from './rest.js';
+import stats from './stats.js';
 
-const pipe = require('./pipe');
-const rest = require('./rest');
-const stats = require('./stats');
-const getParseFn = require('./parse');
+const debug = Debug('liftie:lifts');
 
-const interval = 60 * 1000; // once a minute - fetch status if there were requests
-const longInterval = 30 * interval; // once every 30 minutes - fetch even if there wasn't any requests
+const shortInterval = 60 * 1000; // once a minute - fetch status if there were requests
+const longInterval = 30 * shortInterval; // once every 30 minutes - fetch even if there wasn't any requests
 
-module.exports = fetch;
-module.exports.interval = {
-  active: interval,
+fetch.interval = {
+  active: shortInterval,
   inactive: longInterval
 };
 
@@ -39,12 +39,12 @@ function getRequestFnAndUrl(resort) {
   };
 }
 
-function fetch(resort, fn) {
+export default async function fetch(resort, fn) {
   if (!resort._rfau) {
     resort._rfau = getRequestFnAndUrl(resort);
   }
   if (!resort._parseFn) {
-    resort._parseFn = getParseFn(resort.id);
+    resort._parseFn = await getParseFn(resort.id);
   }
   debug('Fetch lift status for %s', resort.id);
   const rfau = resort._rfau;

package/lib/lifts/parse.js

@@ -1,13 +1,13 @@
-const domutil = require('../tools/domutil');
-const debug = require('debug')('liftie:lifts');
+import Debug from 'debug';
+import * as domutil from '../tools/domutil.js';
 
-module.exports = getParseFn;
+const debug = Debug('liftie:lifts');
 
 /**
  * catch exceptions thrown by parse
  */
-function getParseFn(resortId) {
-  const descriptor = require(`../resorts/${resortId}`);
+export default async function getParseFn(resortId) {
+  const { default: descriptor } = await import(`../resorts/${resortId}/index.js`);
   const parse = typeof descriptor === 'function' ? descriptor : collectParse;
 
   wrappedParse.isAsync = parse.length > 1;

package/lib/lifts/parser.js

@@ -1,13 +1,9 @@
-const { nextTick } = require('node:process');
-const { DomHandler, Text } = require('domhandler');
-const { ElementType } = require('domelementtype');
-const { WritableStream } = require('htmlparser2/WritableStream');
+import { nextTick } from 'node:process';
+import { ElementType } from 'domelementtype';
+import { DomHandler, Text } from 'domhandler';
+import { WritableStream } from 'htmlparser2/WritableStream';
 
-module.exports = parserStream;
-
-parserStream.html = parseHtml;
-
-function parseHtml(html, parse, fn) {
+export function parseHtml(html, parse, fn) {
   const stream = parserStream(parse, fn);
   stream.write(html);
   stream.end();
@@ -43,7 +39,7 @@ class IgnoreEmptiesDomHandler extends DomHandler {
  * @param fn(err, data) - callback that receives identified data pieces (or error),
  *    first error should stop parsing
  */
-function parserStream(parse, fn) {
+export default function parserStream(parse, fn) {
   function handle(err, dom) {
     return err ? fn(err) : nextTick(fn, null, parse(dom));
   }

package/lib/lifts/pipe.js

@@ -1,7 +1,7 @@
-const request = require('./request');
-const { html: parseHtml } = require('./parser');
+import { parseHtml } from './parser.js';
+import request from './request.js';
 
-module.exports = (url, parse, fn) => {
+export default (url, parse, fn) => {
   request(url)
     .then(async res => {
       if (res.status < 200 || res.status >= 300) {