@srfnstack/spliffy 1.2.5 → 1.2.6

package/src/staticHandler.mjs

@@ -1,74 +1,74 @@
-import fs from 'fs'
-import etag from 'etag'
-
-const readFile = async (fullPath) => await new Promise(
-  (resolve, reject) =>
-    fs.readFile(fullPath, (err, data) => {
-      if (err) reject(err)
-      else resolve(data)
-    }
-    )
-)
-
-const writeHeaders = (req, res, tag, stat, contentType, staticCacheControl) => {
-  if (req.headers['if-none-match'] === tag) {
-    res.statusCode = 304
-    return
-  }
-  res.writeHead(200, {
-    'Content-Type': contentType,
-    // content-length should not be included because transfer-encoding is chunked
-    // see https://datatracker.ietf.org/doc/html/rfc2616#section-4.4 sub section 3.
-    // Not all clients are compliant (node-fetch) and throw instead of ignoring the header as specified
-    'Cache-Control': staticCacheControl || 'max-age=600',
-    ETag: tag
-  })
-}
-
-const readStat = async path => new Promise((resolve, reject) =>
-  fs.stat(path, (err, stats) =>
-    err ? reject(err) : resolve(stats)
-  ))
-
-export function createStaticHandler (fullPath, contentType, cacheStatic, staticCacheControl) {
-  const cache = {}
-  return {
-    GET: async ({ req, res }) => {
-      if (cacheStatic) {
-        if (!cache.exists || !cache.stat) {
-          cache.exists = fs.existsSync(fullPath)
-          if (cache.exists) {
-            cache.stat = await readStat(fullPath)
-            cache.content = await readFile(fullPath)
-            cache.etag = etag(cache.content)
-          }
-        }
-        if (!cache.exists) {
-          return {
-            statusCode: 404
-          }
-        }
-        writeHeaders(req, res, cache.etag, cache.stat, contentType, staticCacheControl)
-        if (res.statusCode === 304) {
-          return
-        }
-        return cache.content
-      } else {
-        if (!fs.existsSync(fullPath)) {
-          return {
-            statusCode: 404
-          }
-        }
-        const stat = await readStat(fullPath)
-        writeHeaders(req, res, etag(stat), stat, contentType, staticCacheControl)
-        if (res.statusCode === 304) {
-          return
-        }
-        if (stat.size === 0) {
-          return ''
-        }
-        return fs.createReadStream(fullPath)
-      }
-    }
-  }
-}
+import fs from 'fs'
+import etag from 'etag'
+
+const readFile = async (fullPath) => await new Promise(
+  (resolve, reject) =>
+    fs.readFile(fullPath, (err, data) => {
+      if (err) reject(err)
+      else resolve(data)
+    }
+    )
+)
+
+const writeHeaders = (req, res, tag, stat, contentType, staticCacheControl) => {
+  if (req.headers['if-none-match'] === tag) {
+    res.statusCode = 304
+    return
+  }
+  res.writeHead(200, {
+    'Content-Type': contentType,
+    // content-length should not be included because transfer-encoding is chunked
+    // see https://datatracker.ietf.org/doc/html/rfc2616#section-4.4 sub section 3.
+    // Not all clients are compliant (node-fetch) and throw instead of ignoring the header as specified
+    'Cache-Control': staticCacheControl || 'max-age=600',
+    ETag: tag
+  })
+}
+
+const readStat = async path => new Promise((resolve, reject) =>
+  fs.stat(path, (err, stats) =>
+    err ? reject(err) : resolve(stats)
+  ))
+
+export function createStaticHandler (fullPath, contentType, cacheStatic, staticCacheControl) {
+  const cache = {}
+  return {
+    GET: async ({ req, res }) => {
+      if (cacheStatic) {
+        if (!cache.exists || !cache.stat) {
+          cache.exists = fs.existsSync(fullPath)
+          if (cache.exists) {
+            cache.stat = await readStat(fullPath)
+            cache.content = await readFile(fullPath)
+            cache.etag = etag(cache.content)
+          }
+        }
+        if (!cache.exists) {
+          return {
+            statusCode: 404
+          }
+        }
+        writeHeaders(req, res, cache.etag, cache.stat, contentType, staticCacheControl)
+        if (res.statusCode === 304) {
+          return
+        }
+        return cache.content
+      } else {
+        if (!fs.existsSync(fullPath)) {
+          return {
+            statusCode: 404
+          }
+        }
+        const stat = await readStat(fullPath)
+        writeHeaders(req, res, etag(stat), stat, contentType, staticCacheControl)
+        if (res.statusCode === 304) {
+          return
+        }
+        if (stat.size === 0) {
+          return ''
+        }
+        return fs.createReadStream(fullPath)
+      }
+    }
+  }
+}

package/src/url.mjs

@@ -1,24 +1,24 @@
-export function parseQuery (query, decodeQueryParams) {
-  const parsed = {}
-  if (query) {
-    if (decodeQueryParams) {
-      query = decodeURIComponent(query.replace(/\+/g, '%20'))
-    }
-    for (const param of query.split('&')) {
-      const eq = param.indexOf('=')
-      setMultiValueKey(parsed, param.substr(0, eq), param.substr(eq + 1))
-    }
-  }
-  return parsed
-}
-
-export function setMultiValueKey (obj, key, value) {
-  if (key in obj) {
-    if (!Array.isArray(obj[key])) {
-      obj[key] = [obj[key]]
-    }
-    obj[key].push(value)
-  } else {
-    obj[key] = value
-  }
-}
+export function parseQuery (query, decodeQueryParams) {
+  const parsed = {}
+  if (query) {
+    if (decodeQueryParams) {
+      query = decodeURIComponent(query.replace(/\+/g, '%20'))
+    }
+    for (const param of query.split('&')) {
+      const eq = param.indexOf('=')
+      setMultiValueKey(parsed, param.substr(0, eq), param.substr(eq + 1))
+    }
+  }
+  return parsed
+}
+
+export function setMultiValueKey (obj, key, value) {
+  if (key in obj) {
+    if (!Array.isArray(obj[key])) {
+      obj[key] = [obj[key]]
+    }
+    obj[key].push(value)
+  } else {
+    obj[key] = value
+  }
+}