@nxtedition/lib 23.2.0 → 23.3.0

package/app.js

@@ -7,6 +7,7 @@ import cluster from 'node:cluster'
 import stream from 'node:stream'
 import { Buffer } from 'node:buffer'
 import { getDockerSecretsSync } from './docker-secrets.js'
+import { getUTCRangeForLocalTime } from './time.js'
 import fp from 'lodash/fp.js'
 import {
   isMainThread,
@@ -135,11 +136,12 @@ export function makeApp(appConfig, onTerminate) {
       } (module:${serviceModule}; instance:${serviceInstanceId}) worker:${serviceWorkerId} Node/${process.version}`) ??
     null)
 
-  const dailyOffpeakTime = config.dailyOffpeakTime ?? '00:00-04:00'
+  const dailyOffpeakTime = config.dailyOffpeakTime ?? getUTCRangeForLocalTime('00:00-04:00')
 
   if (dailyOffpeakTime) {
-    const [start, end] = dailyOffpeakTime.split('-')
+    // TODO (fix): This is ugly...
 
+    const [start, end] = dailyOffpeakTime.split('-')
     let wasOffpeak = null
     setInterval(() => {
       if (isTimeBetween(new Date(), start, end)) {

package/http.js

@@ -380,6 +380,7 @@ export async function request(ctx, next) {
 
 export class ServerResponse extends http.ServerResponse {
   #created = 0
+  #bytesWritten = -1
   #timing = {
     connect: -1,
     headers: -1,
@@ -391,6 +392,10 @@ export class ServerResponse extends http.ServerResponse {
     return this.#timing
   }
 
+  get bytesWritten() {
+    return this.#bytesWritten
+  }
+
   constructor(req) {
     super(req)
 
@@ -426,6 +431,14 @@ export class ServerResponse extends http.ServerResponse {
       }
     }
 
+    if (chunk != null) {
+      if (chunk.byteLength != null && this.#bytesWritten >= 0) {
+        this.#bytesWritten += chunk.byteLength
+      } else {
+        this.#bytesWritten = -1
+      }
+    }
+
     return super.write(chunk, encoding, callback)
   }
 
@@ -442,6 +455,14 @@ export class ServerResponse extends http.ServerResponse {
       }
     }
 
+    if (chunk != null) {
+      if (chunk.byteLength != null && this.#bytesWritten >= 0) {
+        this.#bytesWritten += chunk.byteLength
+      } else {
+        this.#bytesWritten = -1
+      }
+    }
+
     return super.end(chunk, encoding, callback)
   }
 
@@ -458,6 +479,7 @@ export class ServerResponse extends http.ServerResponse {
 
 export class Http2ServerResponse extends http2.Http2ServerResponse {
   #created = 0
+  #bytesWritten = -1
   #timing = {
     connect: -1,
     headers: -1,
@@ -469,6 +491,10 @@ export class Http2ServerResponse extends http2.Http2ServerResponse {
     return this.#timing
   }
 
+  get bytesWritten() {
+    return this.#bytesWritten
+  }
+
   constructor(req) {
     super(req)
 
@@ -496,6 +522,14 @@ export class Http2ServerResponse extends http2.Http2ServerResponse {
       }
     }
 
+    if (chunk != null) {
+      if (chunk.byteLength != null && this.#bytesWritten >= 0) {
+        this.#bytesWritten += chunk.byteLength
+      } else {
+        this.#bytesWritten = -1
+      }
+    }
+
     return super.write(chunk, encoding, callback)
   }
 
@@ -512,6 +546,14 @@ export class Http2ServerResponse extends http2.Http2ServerResponse {
       }
     }
 
+    if (chunk != null) {
+      if (chunk.byteLength != null && this.#bytesWritten >= 0) {
+        this.#bytesWritten += chunk.byteLength
+      } else {
+        this.#bytesWritten = -1
+      }
+    }
+
     return super.end(chunk, encoding, callback)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "23.2.0",
+  "version": "23.3.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/time.js

@@ -2,31 +2,86 @@ export function isTimeBetween(date, startTime, endTime) {
   const currentHours = date.getHours()
   const currentMinutes = date.getMinutes()
 
-  let [startHours, startMinutes] = startTime?.split(':').map(Number) ?? [null, 0]
-  let [endHours, endMinutes] = endTime?.split(':').map(Number) ?? [null, 0]
+  // Validate and parse start and end times
+  if (!startTime) startTime = '00:00' // Default start at midnight
+  if (!endTime) endTime = '23:59' // Default end at 23:59
 
-  if (startHours == null) {
-    startHours = -Number.MAX_SAFE_INTEGER
-  }
+  const [startHours, startMinutes] = startTime.split(':').map(Number)
+  const [endHours, endMinutes] = endTime.split(':').map(Number)
 
-  if (endHours == null) {
-    endHours = Number.MAX_SAFE_INTEGER
+  // Ensure valid hour/minute values
+  if (
+    isNaN(startHours) ||
+    isNaN(startMinutes) ||
+    isNaN(endHours) ||
+    isNaN(endMinutes) ||
+    startHours < 0 ||
+    startHours > 23 ||
+    startMinutes < 0 ||
+    startMinutes > 59 ||
+    endHours < 0 ||
+    endHours > 23 ||
+    endMinutes < 0 ||
+    endMinutes > 59
+  ) {
+    throw new Error("Invalid time format. Use 'HH:MM'")
   }
 
   if (startHours < endHours || (startHours === endHours && startMinutes <= endMinutes)) {
-    // The time range is within the same day
-    return (currentHours > startHours ||
-      (currentHours === startHours && currentMinutes >= startMinutes)) &&
+    // Case 1: The time range is within the same day
+    return (
+      (currentHours > startHours ||
+        (currentHours === startHours && currentMinutes >= startMinutes)) &&
       (currentHours < endHours || (currentHours === endHours && currentMinutes <= endMinutes))
-      ? { currentHours, currentMinutes, startHours, startMinutes, endHours, endMinutes }
-      : null
+    )
   } else {
-    // The time range spans across two days
-    return currentHours > startHours ||
+    // Case 2: The time range spans across midnight
+    return (
+      currentHours > startHours ||
       (currentHours === startHours && currentMinutes >= startMinutes) ||
       currentHours < endHours ||
       (currentHours === endHours && currentMinutes <= endMinutes)
-      ? { currentHours, currentMinutes, startHours, startMinutes, endHours, endMinutes }
-      : null
+    )
+  }
+}
+
+export function getUTCRangeForLocalTime(range) {
+  // Validate input format (hh:mm-hh:mm)
+  const timeFormat = /^\d{2}:\d{2}-\d{2}:\d{2}$/
+  if (!timeFormat.test(range)) {
+    throw new Error("Invalid format. Use 'hh:mm-hh:mm' (e.g., '01:00-05:00').")
+  }
+
+  const [startTime, endTime] = range.split('-')
+  const [startHour, startMinute] = startTime.split(':').map(Number)
+  const [endHour, endMinute] = endTime.split(':').map(Number)
+
+  // Validate time values
+  if (
+    startHour < 0 ||
+    startHour > 23 ||
+    startMinute < 0 ||
+    startMinute > 59 ||
+    endHour < 0 ||
+    endHour > 23 ||
+    endMinute < 0 ||
+    endMinute > 59
+  ) {
+    throw new Error('Invalid time values. Hours must be 00-23 and minutes 00-59.')
   }
+
+  const now = new Date()
+
+  // Create local Date objects
+  const start = new Date(now)
+  start.setHours(startHour, startMinute, 0, 0)
+
+  const end = new Date(now)
+  end.setHours(endHour, endMinute, 0, 0)
+
+  // Convert to UTC
+  const startUTC = `${String(start.getUTCHours()).padStart(2, '0')}:${String(start.getUTCMinutes()).padStart(2, '0')}`
+  const endUTC = `${String(end.getUTCHours()).padStart(2, '0')}:${String(end.getUTCMinutes()).padStart(2, '0')}`
+
+  return `${startUTC}-${endUTC}`
 }