shelving 1.160.0 → 1.160.2

package/api/util.js

@@ -45,8 +45,8 @@ async function handleEndpoint(endpoint, callback, params, request) {
     const content = await getRequestContent(request, handleEndpoints);
     // If content is undefined, it means the request has no body, so params are the only payload.
     // - If the content is a plain object, merge if with the params.
-    // - If the content is anything else (e.g. string, number, array), set it as a single `content` property.
-    const payload = content === undefined ? params : isPlainObject(content) ? { ...content, ...params } : { content, ...params };
+    // - If the content is anything else (e.g. string, number, array), return it directly (but you'll have no way to access the other params).
+    const payload = content === undefined ? params : isPlainObject(content) ? { ...content, ...params } : content;
     // Call `endpoint.handle()` with the payload and request.
     return endpoint.handle(callback, payload, request);
 }

package/package.json

@@ -11,7 +11,7 @@
 		"state-management",
 		"query-builder"
 	],
-	"version": "1.160.0",
+	"version": "1.160.2",
 	"repository": "https://github.com/dhoulb/shelving",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"license": "0BSD",

package/util/http.js

@@ -1,7 +1,6 @@
 import { RequestError } from "../error/RequestError.js";
 import { ResponseError } from "../error/ResponseError.js";
 import { Feedback } from "../feedback/Feedback.js";
-import { getDictionary } from "./dictionary.js";
 import { isError } from "./error.js";
 export async function _getMessageJSON(message, MessageError, caller) {
     const trimmed = (await message.text()).trim();
@@ -16,7 +15,7 @@ export async function _getMessageJSON(message, MessageError, caller) {
 }
 export async function _getMessageFormData(message, MessageError, caller) {
     try {
-        return getDictionary(await message.formData());
+        return await message.formData();
     }
     catch {
         throw new MessageError("Body must be valid valid form multipart data", { caller });
@@ -30,7 +29,7 @@ export function _getMessageContent(message, MessageError, caller) {
         return _getMessageJSON(message, MessageError, caller);
     if (type?.startsWith("multipart/form-data"))
         return _getMessageFormData(message, MessageError, caller);
-    throw new MessageError("Content-Type must be text/*, application/json, or multipart/form-data", { received: type, caller });
+    return Promise.resolve();
 }
 /**
  * Get the body content of an HTTP `Request` based on its content type, or throw `RequestError` if the content could not be parsed.

package/util/jwt.js

@@ -34,9 +34,9 @@ export async function encodeToken({ nbf = "now", iat = "now", exp = DAY * 30, ..
     const header = encodeBase64URL(JSON.stringify(HEADER));
     // Encode payload.
     const payload = encodeBase64URL(JSON.stringify({
-        nbf: requireDate(nbf).getTime() / 1000, // By JWT convention, times are in seconds.
-        iat: requireDate(iat).getTime() / 1000, // By JWT convention, times are in seconds.
-        exp: (Date.now() + exp) / 1000, // By JWT convention, times are in seconds.
+        nbf: Math.round(requireDate(nbf).getTime() / 1000), // By JWT convention, times are in seconds.
+        iat: Math.round(requireDate(iat).getTime() / 1000), // By JWT convention, times are in seconds.
+        exp: Math.round((Date.now() + exp) / 1000), // By JWT convention, times are in seconds.
         ...claims,
     }));
     // Create signature.