liftie 4.2.0 → 4.2.2

package/app.js

@@ -8,6 +8,7 @@ import gzip from 'connect-gzip-static';
 import renderer from 'connect-renderer';
 import errorHandler from 'errorhandler';
 import logger from 'morgan';
+import { NODE_ENV, PORT, SITE_URL as siteUrl, LIFTIE_STATIC_HOST as staticHost } from './lib/env.js';
 import lifts from './lib/lifts/index.js';
 import loader from './lib/loader.js';
 import * as loaders from './lib/loaders.js';
@@ -21,12 +22,8 @@ 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(path.dirname(new URL(import.meta.url).pathname), 'public');
-const { SITE_URL: siteUrl, LIFTIE_STATIC_HOST: staticHost = '' } = process.env;
+const root = path.resolve(import.meta.dirname, 'public');
+const views = path.resolve(import.meta.dirname, 'views');
 
 const cachify = cachifyStatic(root, { format: 'name' });
 
@@ -42,9 +39,9 @@ app.locals = {
 };
 
 app.use(
-  renderer(`${path.dirname(new URL(import.meta.url).pathname)}/views`).engine('jade', {
+  renderer(views).engine('jade', {
     compile,
-    options: { compileDebug: process.env.NODE_ENV !== 'production' }
+    options: { compileDebug: NODE_ENV !== 'production' }
   })
 );
 
@@ -61,7 +58,7 @@ app.use(async (req, res, next) => {
 
 app.use(gzip(root));
 
-if (process.env.NODE_ENV === 'development') {
+if (NODE_ENV === 'development') {
   app.locals.min = '';
   app.use(errorHandler());
 }
@@ -86,8 +83,8 @@ app.run = function run() {
       process.exit(1);
       return;
     }
-    http.createServer(app).listen(process.env.PORT, () => {
-      console.log(`Running on: http://localhost:${process.env.PORT}`);
+    http.createServer(app).listen(PORT, () => {
+      console.log(`Running on: http://localhost:${PORT}`);
     });
   });
 };

package/lib/env.js

@@ -0,0 +1,28 @@
+import { tmpdir } from 'node:os';
+
+const {
+  CSP_REPORT_URI,
+  LIFTIE_CSP_ENFORCE,
+  LIFTIE_STATIC_HOST = '',
+  LOG_DIR = tmpdir(),
+  NODE_ENV = 'development',
+  OPENWEATHER_API_KEY,
+  PORT = 3000,
+  WEBCAMS_API_KEY
+} = process.env;
+
+process.env.SITE_URL ??= `http://localhost:${PORT}`;
+
+const { SITE_URL } = process.env;
+
+export {
+  CSP_REPORT_URI,
+  LIFTIE_CSP_ENFORCE,
+  LIFTIE_STATIC_HOST,
+  LOG_DIR,
+  NODE_ENV,
+  OPENWEATHER_API_KEY,
+  PORT,
+  SITE_URL,
+  WEBCAMS_API_KEY
+};

package/lib/routes/database.js

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

package/lib/routes/headers.js

@@ -1,9 +1,8 @@
 import crypto from 'node:crypto';
+import { CSP_REPORT_URI, LIFTIE_CSP_ENFORCE, LIFTIE_STATIC_HOST as staticHost } from '../env.js';
 
 export default [csp, referrer, feature, link];
 
-const { LIFTIE_STATIC_HOST: staticHost = '', LIFTIE_CSP_ENFORCE, CSP_REPORT_URI } = process.env;
-
 const scriptHost = staticHost ? staticHost : `'self'`;
 
 const CSP_HEADER_NAME = toBoolean(LIFTIE_CSP_ENFORCE)
@@ -40,7 +39,10 @@ function referrer(_req, res, next) {
 }
 
 function feature(_req, res, next) {
-  res.setHeader('Permissions-Policy', `fullscreen 'self'`);
+  res.setHeader(
+    'Permissions-Policy',
+    'camera=(), microphone=(), geolocation=(), usb=(), payment=(), autoplay=(), fullscreen=(self), ch-ua=(self), ch-ua-platform=(self), ch-ua-mobile=(self), ch-ua-arch=(self), ch-ua-model=(self)'
+  );
   next();
 }
 

package/lib/routes/index.js

@@ -1,6 +1,6 @@
+import querystring from 'node:querystring';
 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';
@@ -189,7 +189,7 @@ export default function routes(app) {
   });
 
   router.use((req, _res, next) => {
-    req.query = qs.parse(parseurl(req).query);
+    req.query = querystring.parse(parseurl(req).query);
     next();
   });
   router.get('/', reqData, headers, index, renderResorts);

package/lib/routes/plan.js

@@ -1,12 +1,9 @@
-import qs from 'qs';
-
 export default function addToTrip(resort) {
-  return qs.stringify({
-    stop: {
-      name: resort.name,
-      coordinates: { lon: resort.ll[0], lat: resort.ll[1] },
-      url: resort.href,
-      duration: 7 * 60 * 60 * 1000
-    }
-  });
+  const params = new URLSearchParams();
+  params.set('stop[name]', resort.name);
+  params.set('stop[coordinates][lon]', resort.ll[0]);
+  params.set('stop[coordinates][lat]', resort.ll[1]);
+  params.set('stop[url]', resort.href);
+  params.set('stop[duration]', 7 * 60 * 60 * 1000);
+  return params.toString();
 }

package/lib/routes/service-worker.js

@@ -1,8 +1,7 @@
 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;
+import { NODE_ENV, SITE_URL as siteUrl, LIFTIE_STATIC_HOST as staticHost } from '../env.js';
 
 const DEBUG = NODE_ENV !== 'production';
 

package/lib/weather/index.js

@@ -1,3 +1,4 @@
+import { OPENWEATHER_API_KEY } from '../env.js';
 import { hour } from '../tools/millis.js';
 import noaa from './noaa.js';
 import openweather from './openweather.js';
@@ -7,10 +8,9 @@ fetch.interval = {
   inactive: Number.POSITIVE_INFINITY // don't fetch on inactive
 };
 
-// see: https://openweathermap.org/forecast5
-const { OPENWEATHER_API_KEY } = process.env;
-
 export default function fetch(resort, fn) {
+  // see: https://openweathermap.org/forecast5
+
   if (resort.noaa) {
     noaa(resort, fn);
   } else if (OPENWEATHER_API_KEY) {

package/lib/weather/noaa.js

@@ -1,14 +1,11 @@
 import Debug from 'debug';
+import { LIFTIE_STATIC_HOST as staticHost } from '../env.js';
+import { iconsFromUrl } from './icons.js';
 
 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)';
 
-const { LIFTIE_STATIC_HOST: staticHost = '' } = process.env;
-
 function normalize(data, ll) {
   debug('weather %j', data.properties.periods);
 
@@ -31,7 +28,7 @@ function normalize(data, ll) {
   };
 }
 
-function fetchWeather(resort, fn) {
+export default function fetchWeather(resort, fn) {
   debug('fetch weather from NOAA for %s', resort.id);
 
   const { ll } = resort;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "liftie",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "Clean, simple, easy to read, fast ski resort lift status",
   "type": "module",
   "keywords": [
@@ -52,13 +52,12 @@
     "lodash": "^4.16.6",
     "morgan": "^1.9.0",
     "parseurl": "^1.3.3",
-    "qs": "^6.13.1",
     "ro-rating": "~2",
     "tiny-pager": "^2.0.0",
     "to-title-case": "^1.0.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.3.10",
+    "@biomejs/biome": "2.3.11",
     "@pirxpilot/stylus": "^1.2.0",
     "commander": "~14",
     "postcss": "~8",