spec-3nweb-server 1.8.6 → 1.8.8

package/build/asmail/routes/delivery/pre-flight.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2025 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2025 - 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -20,6 +20,7 @@ exports.preFlight = void 0;
 const recipients_1 = require("../../resources/recipients");
 const delivery_1 = require("../../../lib-common/service-api/asmail/delivery");
 const canonical_address_1 = require("../../../lib-common/canonical-address");
+const utils_1 = require("../../resources/utils");
 /**
  * This creates a pre-flight route handler.
  * @param allowedMsgSizeFunc is a function returning promises, that may resolve to
@@ -41,14 +42,10 @@ function preFlight(allowedMsgSizeFunc, redirectFunc) {
             });
         }
         else if (msgSize === 0) {
-            res.status(delivery_1.preFlight.SC.senderNotAllowed).json({
-                error: `${sender ? sender : "Anonymous sender "} is not allowed to leave mail for ${recipient}`
-            });
+            (0, utils_1.replyWithErr)(delivery_1.preFlight.SC.senderNotAllowed, `${sender ? sender : "Anonymous sender "} is not allowed to leave mail for ${recipient}`, res);
         }
         else if (msgSize === -1) {
-            res.status(delivery_1.preFlight.SC.inboxFull).json({
-                error: `Mail box for ${recipient} is full.`
-            });
+            (0, utils_1.replyWithErr)(delivery_1.preFlight.SC.inboxFull, `Mail box for ${recipient} is full.`, res);
         }
         else {
             throw new Error(`Unrecognized code ${msgSize} for message size limits.`);
@@ -62,34 +59,22 @@ function preFlight(allowedMsgSizeFunc, redirectFunc) {
         const session = req.session;
         // already existing session indicates repeated call, which should be bounced off
         if (session) {
-            res.status(delivery_1.ERR_SC.duplicateReq).json({
-                error: "This protocol request has already been served."
-            });
-            return;
+            return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.duplicateReq, "This protocol request has already been served.", res);
         }
         // missing recipient makes a bad request
         if (!recipient) {
-            res.status(delivery_1.ERR_SC.malformed).json({
-                error: "Recipient is either missing in the request, or is malformed"
-            });
-            return;
+            return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, "Recipient is either missing in the request, or is malformed", res);
         }
         // if sender is given, we canonicalize the address
         if (sender) {
             sender = (0, canonical_address_1.checkAndTransformAddress)(sender);
             if (!sender) {
-                res.status(delivery_1.ERR_SC.malformed).json({
-                    error: "Sender field is malformed"
-                });
-                return;
+                return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, "Sender field is malformed", res);
             }
         }
         // check invitation field
         if ((invitation !== undefined) && (typeof invitation !== 'string')) {
-            res.status(delivery_1.ERR_SC.malformed).json({
-                error: "Inviation field is malformed"
-            });
-            return;
+            return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, "Inviation field is malformed", res);
         }
         try {
             if (redirectFunc) {
@@ -109,9 +94,7 @@ function preFlight(allowedMsgSizeFunc, redirectFunc) {
         }
         catch (err) {
             if (err === recipients_1.SC.USER_UNKNOWN) {
-                res.status(delivery_1.preFlight.SC.unknownRecipient).json({
-                    error: `Recipient ${recipient} is unknown.`
-                });
+                (0, utils_1.replyWithErr)(delivery_1.preFlight.SC.unknownRecipient, `Recipient ${recipient} is unknown.`, res);
             }
             else {
                 next(err);

package/build/asmail/routes/delivery/provide-recipient-pubkey.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2016, 2025 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2025 - 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -19,6 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRecipientPubKey = void 0;
 const recipients_1 = require("../../resources/recipients");
 const delivery_1 = require("../../../lib-common/service-api/asmail/delivery");
+const utils_1 = require("../../resources/utils");
 /**
  * This creates a get-init-pub-key route handler.
  * @param pkeyProvidingFunc is a function that provides recipient's public key
@@ -33,7 +34,7 @@ function getRecipientPubKey(pkeyProvidingFunc) {
                 res.status(delivery_1.initPubKey.SC.ok).json(certs);
             }
             else {
-                res.status(delivery_1.initPubKey.SC.pkeyNotRegistered).send('No public key registered for the recipient.');
+                (0, utils_1.replyWithErr)(delivery_1.initPubKey.SC.pkeyNotRegistered, 'No public key registered for the recipient.', res);
                 session.close();
             }
         }
@@ -42,7 +43,7 @@ function getRecipientPubKey(pkeyProvidingFunc) {
                 next(err);
             }
             else if (err === recipients_1.SC.USER_UNKNOWN) {
-                res.status(delivery_1.ERR_SC.server).send("Recipient disappeared from the system.");
+                (0, utils_1.replyWithErr)(delivery_1.ERR_SC.server, "Recipient disappeared from the system.", res);
                 session.close();
             }
             else {

package/build/asmail/routes/delivery/put-metadata.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2016, 2025 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2025 - 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -21,23 +21,18 @@ const recipients_1 = require("../../resources/recipients");
 const delivery_1 = require("../../../lib-common/service-api/asmail/delivery");
 const confUtil = require("../../../lib-server/conf-util");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
+const utils_1 = require("../../resources/utils");
 function findProblemWithObjIds(ids) {
     if (!Array.isArray(ids)) {
-        return {
-            error: "Object ids are missing."
-        };
+        return "Object ids are missing.";
     }
     const checkedIds = new Set();
     for (const objId of ids) {
         if (checkedIds.has(objId)) {
-            return {
-                error: "Duplication of object ids."
-            };
+            return "Duplication of object ids.";
         }
         if (!buffer_utils_1.base64urlSafe.allCharsFromAlphabet(objId)) {
-            return {
-                error: "Object id is invalid."
-            };
+            return "Object id is invalid.";
         }
         checkedIds.add(objId);
     }
@@ -47,18 +42,15 @@ function saveMetadata(setMsgStorageFunc, maxChunk) {
     const maxChunkSize = confUtil.stringToNumOfBytes(maxChunk);
     return async (req, res, next) => {
         const session = req.session;
-        const msgMeta = req.body;
-        const recipient = session.params.recipient;
-        const objIds = msgMeta.objIds;
         if (session.params.msgId) {
-            res.status(delivery_1.ERR_SC.duplicateReq).json({
-                error: "This protocol request has already been served."
-            });
-            return;
+            return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.duplicateReq, "This protocol request has already been served.", res);
         }
-        if (findProblemWithObjIds(objIds)) {
-            res.status(delivery_1.ERR_SC.malformed).json(findProblemWithObjIds(objIds));
-            return;
+        const recipient = session.params.recipient;
+        const msgMeta = req.body;
+        const objIds = msgMeta.objIds;
+        const errWithWithObjIds = findProblemWithObjIds(objIds);
+        if (errWithWithObjIds) {
+            return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, errWithWithObjIds, res);
         }
         try {
             const msgId = await setMsgStorageFunc(recipient, msgMeta, session.params.sender, session.params.invite, session.params.maxMsgLength);
@@ -73,7 +65,7 @@ function saveMetadata(setMsgStorageFunc, maxChunk) {
                 next(err);
             }
             else if (err === recipients_1.SC.USER_UNKNOWN) {
-                res.status(delivery_1.ERR_SC.server).send("Recipient disappeared from the system.");
+                (0, utils_1.replyWithErr)(delivery_1.ERR_SC.server, "Recipient disappeared from the system.", res);
                 session.close();
             }
         }

package/build/asmail/routes/delivery/put-obj.js

@@ -20,44 +20,43 @@ exports.saveMsgObj = void 0;
 const recipients_1 = require("../../resources/recipients");
 const delivery_1 = require("../../../lib-common/service-api/asmail/delivery");
 const confUtil = require("../../../lib-server/conf-util");
-const body_parsers_1 = require("../../../lib-server/middleware/body-parsers");
+const utils_1 = require("../../resources/utils");
 function saveMsgObj(saveObjFunc, chunkLimit) {
     const maxChunkSize = confUtil.stringToNumOfBytes(chunkLimit);
     return async (req, res, next) => {
         if (!req.is(recipients_1.BIN_TYPE)) {
-            (0, body_parsers_1.attachByteDrainToRequest)(req);
-            res.status(delivery_1.ERR_SC.wrongContentType).send(`Content-Type must be ${recipients_1.BIN_TYPE} for this call.`);
-            return;
+            return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.wrongContentType, `Content-Type must be ${recipients_1.BIN_TYPE} for this call.`, res, req);
         }
         const session = req.session;
         const recipient = session.params.recipient;
         const msgId = session.params.msgId;
         if (!msgId) {
-            res.status(delivery_1.ERR_SC.earlyReq).send("Metadata has not been sent, yet.");
-            return;
+            return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.earlyReq, "Metadata has not been sent, yet.", res, req);
+        }
+        const { objId, objIdParseErr } = (0, utils_1.getObjIdFromParams)(req);
+        if (objIdParseErr) {
+            return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, objIdParseErr, res);
         }
-        const objId = req.params.objId;
         // get and check Content-Length, implicitly sending replies for bad length
         let len = getContentLenOrSendError(req, res, maxChunkSize);
         if (len === undefined) {
-            (0, body_parsers_1.attachByteDrainToRequest)(req);
             return;
         }
         // extract and check query parameters
         const opts = extractQueryOptions(req);
         if (!opts) {
-            return replyToMalformed(req, "Bad query parameters", res);
+            return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, "Bad query parameters", res, req);
         }
         if (opts.fstReq) {
             // check options versus chunk length
             if (opts.fstReq.header > len) {
-                return replyToMalformed(req, "Bad query parameters", res);
+                return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, "Bad query parameters", res, req);
             }
         }
         else if (opts.sndReq) {
             // check options versus chunk length
             if ((len === 0) && !opts.sndReq.last) {
-                return replyToMalformed(req, "No segment bytes", res);
+                return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, "No segment bytes", res, req);
             }
         }
         else {
@@ -69,8 +68,7 @@ function saveMsgObj(saveObjFunc, chunkLimit) {
             session.params.currentMsgLength += len;
         }
         else {
-            res.status(delivery_1.ERR_SC.contentTooLong).send("This request goes over the message limit.");
-            return;
+            return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.contentTooLong, "This request goes over the message limit.", res, req);
         }
         try {
             await saveObjFunc(recipient, msgId, objId, opts.fstReq, opts.sndReq, len, req);
@@ -82,24 +80,24 @@ function saveMsgObj(saveObjFunc, chunkLimit) {
                 next(err);
             }
             else if (err === recipients_1.SC.USER_UNKNOWN) {
-                res.status(delivery_1.ERR_SC.server).send("Recipient disappeared from the system.");
+                (0, utils_1.replyWithErr)(delivery_1.ERR_SC.server, "Recipient disappeared from the system.", res);
                 session.close();
             }
             else if (err === recipients_1.SC.OBJ_EXIST) {
-                res.status(delivery_1.msgObj.SC.objAlreadyExists).send(`Object ${objId} already exists.`);
+                (0, utils_1.replyWithErr)(delivery_1.msgObj.SC.objAlreadyExists, `Object ${objId} already exists.`, res);
             }
             else if (err === recipients_1.SC.MSG_UNKNOWN) {
-                res.status(delivery_1.ERR_SC.server).send("Message disappeared from the system.");
+                (0, utils_1.replyWithErr)(delivery_1.ERR_SC.server, "Message disappeared from the system.", res);
                 session.close();
             }
             else if (err === recipients_1.SC.OBJ_UNKNOWN) {
-                res.status(delivery_1.msgObj.SC.unknownObj).send(`Object ${objId} is unknown.`);
+                (0, utils_1.replyWithErr)(delivery_1.msgObj.SC.unknownObj, `Object ${objId} is unknown.`, res);
             }
             else if (err === recipients_1.SC.WRONG_OBJ_STATE) {
-                res.status(delivery_1.ERR_SC.malformed).send(`Object ${objId} is not in a different state.`);
+                (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, `Object ${objId} is not in a different state.`, res);
             }
             else if (err === recipients_1.SC.OBJ_FILE_INCOMPLETE) {
-                res.status(delivery_1.ERR_SC.objIncomplete).send(`Object ${objId} is not complete.`);
+                (0, utils_1.replyWithErr)(delivery_1.ERR_SC.objIncomplete, `Object ${objId} is not complete.`, res);
             }
             else {
                 next(new Error(`Unhandled storage error code: ${err}`));
@@ -135,18 +133,14 @@ function extractQueryOptions(req) {
 function getContentLenOrSendError(req, res, maxChunkSize) {
     const contentLength = parseInt(req.get(delivery_1.HTTP_HEADER.contentLength));
     if (isNaN(contentLength)) {
-        res.status(delivery_1.ERR_SC.contentLenMissing).send("Content-Length header is required with proper number.");
+        (0, utils_1.replyWithErr)(delivery_1.ERR_SC.contentLenMissing, "Content-Length header is required with proper number.", res, req);
     }
     else if (contentLength > maxChunkSize) {
-        res.status(delivery_1.ERR_SC.contentTooLong).send("Request body is too long.");
+        (0, utils_1.replyWithErr)(delivery_1.ERR_SC.contentTooLong, "Request body is too long.", res, req);
     }
     else {
         return contentLength;
     }
     return;
 }
-function replyToMalformed(req, msg, res) {
-    (0, body_parsers_1.attachByteDrainToRequest)(req);
-    res.status(delivery_1.ERR_SC.malformed).send(msg);
-}
 Object.freeze(exports);

package/build/asmail/routes/delivery/restart-session.d.ts

@@ -4,14 +4,10 @@ import { GenerateSession, GetSessionForMsg } from '../../resources/delivery-sess
 import { Redirect } from './start-session';
 /**
  * This creates a session restart route handler.
- * @param sessionGenFunc is a promise returning function that generates new
- * session objects.
- * @param sessionForMsgFunc is a function that promises existing session for
- * a known message in delivery.
- * @param incompleteMsgFunc is a function that promises parameters of a message
- * that is still in delivery.
- * @param redirectFunc is an optional function that returns a promise,
- * resolvable to
+ * @param sessionGenFunc is a promise returning function that generates new session objects.
+ * @param sessionForMsgFunc is a function that promises existing session for a known message in delivery.
+ * @param incompleteMsgFunc is a function that promises parameters of a message that is still in delivery.
+ * @param redirectFunc is an optional function that returns a promise, resolvable to
  * (1) string with URI for ASMail service, which is serving given recipient,
  * (2) undefined, if it is this server should service given recipient.
  */

package/build/asmail/routes/delivery/restart-session.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2017, 2025 3NSoft Inc.
+ Copyright (C) 2017, 2025 - 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -21,16 +21,13 @@ const recipients_1 = require("../../resources/recipients");
 const delivery_1 = require("../../../lib-common/service-api/asmail/delivery");
 const canonical_address_1 = require("../../../lib-common/canonical-address");
 const confUtil = require("../../../lib-server/conf-util");
+const utils_1 = require("../../resources/utils");
 /**
  * This creates a session restart route handler.
- * @param sessionGenFunc is a promise returning function that generates new
- * session objects.
- * @param sessionForMsgFunc is a function that promises existing session for
- * a known message in delivery.
- * @param incompleteMsgFunc is a function that promises parameters of a message
- * that is still in delivery.
- * @param redirectFunc is an optional function that returns a promise,
- * resolvable to
+ * @param sessionGenFunc is a promise returning function that generates new session objects.
+ * @param sessionForMsgFunc is a function that promises existing session for a known message in delivery.
+ * @param incompleteMsgFunc is a function that promises parameters of a message that is still in delivery.
+ * @param redirectFunc is an optional function that returns a promise, resolvable to
  * (1) string with URI for ASMail service, which is serving given recipient,
  * (2) undefined, if it is this server should service given recipient.
  */
@@ -69,17 +66,11 @@ function restartSession(sessionGenFunc, sessionForMsgFunc, incompleteMsgFunc, ma
         }
         // missing recipient makes a bad request
         if (!recipient) {
-            res.status(delivery_1.ERR_SC.malformed).json({
-                error: "Recipient is either missing in the request, or is malformed"
-            });
-            return;
+            return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, "Recipient is either missing in the request, or is malformed", res);
         }
         // check message id
         if (typeof msgId !== 'string') {
-            res.status(delivery_1.ERR_SC.malformed).json({
-                error: "Message id is either missing, or is malformed"
-            });
-            return;
+            return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, "Message id is either missing, or is malformed", res);
         }
         try {
             if (redirectFunc) {
@@ -99,14 +90,10 @@ function restartSession(sessionGenFunc, sessionForMsgFunc, incompleteMsgFunc, ma
         }
         catch (err) {
             if (err === recipients_1.SC.USER_UNKNOWN) {
-                res.status(delivery_1.sessionRestart.SC.unknownRecipient).json({
-                    error: `Recipient ${recipient} is unknown.`
-                });
+                (0, utils_1.replyWithErr)(delivery_1.sessionRestart.SC.unknownRecipient, `Recipient ${recipient} is unknown.`, res);
             }
             else if (err === recipients_1.SC.MSG_UNKNOWN) {
-                res.status(delivery_1.sessionRestart.SC.unknownMsg).json({
-                    error: `Recipient ${recipient} is unknown.`
-                });
+                (0, utils_1.replyWithErr)(delivery_1.sessionRestart.SC.unknownMsg, `Recipient ${recipient} is unknown.`, res);
             }
             else {
                 next(err);

package/build/asmail/routes/delivery/sender-authorization.js

@@ -18,6 +18,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = void 0;
 const delivery_1 = require("../../../lib-common/service-api/asmail/delivery");
+const utils_1 = require("../../resources/utils");
 /**
  * This creates an authorize-sender route handler.
  * @param relyingPartyDomain at which this service operates, as seen by client
@@ -28,8 +29,7 @@ const delivery_1 = require("../../../lib-common/service-api/asmail/delivery");
 function authorize(relyingPartyDomain, midAuthorizingFunc) {
     return async (req, res, next) => {
         if (req.session.isAuthorized) {
-            res.status(delivery_1.ERR_SC.duplicateReq).send("This protocol request has already been served.");
-            return;
+            return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.duplicateReq, "This protocol request has already been served.", res);
         }
         const rb = req.body;
         const sender = req.session.params.sender;
@@ -37,12 +37,12 @@ function authorize(relyingPartyDomain, midAuthorizingFunc) {
         if (!sender) {
             // This case must be rejected, because place for authorizing
             // anonymous connection is at the session start.
-            res.status(delivery_1.authSender.SC.authFailed).send("Server is not accepting provided credentials.");
+            (0, utils_1.replyWithErr)(delivery_1.authSender.SC.authFailed, "Server is not accepting provided credentials.", res);
             req.session.close();
             return;
         }
         if (!rb.assertion || !rb.userCert || !rb.provCert) {
-            res.status(delivery_1.ERR_SC.malformed).send("No credentials given.");
+            (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, "No credentials given.", res);
             req.session.close();
             return;
         }
@@ -53,7 +53,7 @@ function authorize(relyingPartyDomain, midAuthorizingFunc) {
                 res.status(delivery_1.authSender.SC.ok).send();
             }
             else {
-                res.status(delivery_1.authSender.SC.authFailed).send("Server is not accepting provided credentials.");
+                (0, utils_1.replyWithErr)(delivery_1.authSender.SC.authFailed, "Server is not accepting provided credentials.", res);
                 req.session.close();
             }
         }

package/build/asmail/routes/delivery/start-session.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2016, 2025 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2025 - 2026  3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -20,6 +20,7 @@ exports.startSession = void 0;
 const recipients_1 = require("../../resources/recipients");
 const delivery_1 = require("../../../lib-common/service-api/asmail/delivery");
 const canonical_address_1 = require("../../../lib-common/canonical-address");
+const utils_1 = require("../../resources/utils");
 /**
  * This creates a start-session route handler.
  * @param allowedMsgSizeFunc is a function returning promises, that
@@ -55,14 +56,10 @@ function startSession(allowedMsgSizeFunc, sessionGenFunc, redirectFunc) {
             });
         }
         else if (msgSize === 0) {
-            res.status(delivery_1.sessionStart.SC.senderNotAllowed).json({
-                error: `${sender ? sender : "Anonymous sender "} is not allowed to leave mail for ${recipient}`
-            });
+            (0, utils_1.replyWithErr)(delivery_1.sessionStart.SC.senderNotAllowed, `${sender ? sender : "Anonymous sender "} is not allowed to leave mail for ${recipient}`, res);
         }
         else if (msgSize === -1) {
-            res.status(delivery_1.sessionStart.SC.inboxFull).json({
-                error: `Mail box for ${recipient} is full.`
-            });
+            (0, utils_1.replyWithErr)(delivery_1.sessionStart.SC.inboxFull, `Mail box for ${recipient} is full.`, res);
         }
         else {
             throw new Error(`Unrecognized code ${msgSize} for message size limits.`);
@@ -76,34 +73,24 @@ function startSession(allowedMsgSizeFunc, sessionGenFunc, redirectFunc) {
         const session = req.session;
         // already existing session indicates repeated call, which should be bounced off
         if (session) {
-            res.status(delivery_1.ERR_SC.duplicateReq).json({
-                error: "This protocol request has already been served."
-            });
+            (0, utils_1.replyWithErr)(delivery_1.ERR_SC.duplicateReq, "This protocol request has already been served.", res);
             return;
         }
         // missing recipient makes a bad request
         if (!recipient) {
-            res.status(delivery_1.ERR_SC.malformed).json({
-                error: "Recipient is either missing in the request, or is malformed"
-            });
+            (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, "Recipient is either missing in the request, or is malformed", res);
             return;
         }
         // if sender is given, we canonicalize the address
         if (sender) {
             sender = (0, canonical_address_1.checkAndTransformAddress)(sender);
             if (!sender) {
-                res.status(delivery_1.ERR_SC.malformed).json({
-                    error: "Sender field is malformed"
-                });
-                return;
+                return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, "Sender field is malformed", res);
             }
         }
         // check invitation field
         if ((invitation !== undefined) && (typeof invitation !== 'string')) {
-            res.status(delivery_1.ERR_SC.malformed).json({
-                error: "Inviation field is malformed"
-            });
-            return;
+            return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, "Inviation field is malformed", res);
         }
         try {
             if (redirectFunc) {
@@ -123,9 +110,7 @@ function startSession(allowedMsgSizeFunc, sessionGenFunc, redirectFunc) {
         }
         catch (err) {
             if (err === recipients_1.SC.USER_UNKNOWN) {
-                res.status(delivery_1.sessionStart.SC.unknownRecipient).json({
-                    error: `Recipient ${recipient} is unknown.`
-                });
+                (0, utils_1.replyWithErr)(delivery_1.sessionStart.SC.unknownRecipient, `Recipient ${recipient} is unknown.`, res);
             }
             else {
                 next(err);

package/build/asmail/routes/retrieval/get-message-meta.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2016, 2025 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2025 - 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -19,6 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMsgMeta = void 0;
 const recipients_1 = require("../../resources/recipients");
 const retrieval_1 = require("../../../lib-common/service-api/asmail/retrieval");
+const utils_1 = require("../../resources/utils");
 function getMsgMeta(getMsgMetaFunc) {
     return async (req, res, next) => {
         const userId = req.session.params.userId;
@@ -32,14 +33,10 @@ function getMsgMeta(getMsgMetaFunc) {
                 next(err);
             }
             else if (err === recipients_1.SC.MSG_UNKNOWN) {
-                res.status(retrieval_1.msgMetadata.SC.unknownMsg).json({
-                    error: "Message " + msgId + " is unknown."
-                });
+                (0, utils_1.replyWithErr)(retrieval_1.msgMetadata.SC.unknownMsg, "Message " + msgId + " is unknown.", res);
             }
             else if (err === recipients_1.SC.USER_UNKNOWN) {
-                res.status(retrieval_1.ERR_SC.server).json({
-                    error: "Recipient disappeared from the system."
-                });
+                (0, utils_1.replyWithErr)(retrieval_1.ERR_SC.server, "Recipient disappeared from the system.", res);
                 req.session.close();
             }
             else {

package/build/asmail/routes/retrieval/get-message-obj.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2025 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2025 - 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -21,6 +21,7 @@ const recipients_1 = require("../../resources/recipients");
 const retrieval_1 = require("../../../lib-common/service-api/asmail/retrieval");
 const error_1 = require("../../../lib-common/exceptions/error");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
+const utils_1 = require("../../resources/utils");
 function extractQueryOptions(req) {
     // query fields are string or undefined, yet, type info helps the show
     const query = req.query;
@@ -41,11 +42,13 @@ function getMsgObj(getMsgObjFunc) {
     return async (req, res, next) => {
         const userId = req.session.params.userId;
         const msgId = req.params.msgId;
-        const objId = req.params.objId;
+        const { objId, objIdParseErr } = (0, utils_1.getObjIdFromParams)(req);
+        if (objIdParseErr) {
+            return (0, utils_1.replyWithErr)(retrieval_1.ERR_SC.malformed, objIdParseErr, res);
+        }
         const opts = extractQueryOptions(req);
         if (!opts) {
-            res.status(retrieval_1.ERR_SC.malformed).send("Bad query parameters");
-            return;
+            return (0, utils_1.replyWithErr)(retrieval_1.ERR_SC.malformed, "Bad query parameters", res);
         }
         try {
             const reader = await getMsgObjFunc(userId, msgId, objId, opts.header, opts.ofs, opts.limit);
@@ -76,13 +79,13 @@ function getMsgObj(getMsgObjFunc) {
                 next(err);
             }
             else if (err === recipients_1.SC.OBJ_UNKNOWN) {
-                res.status(retrieval_1.msgObj.SC.unknownMsgOrObj).send(`Object ${objId} is unknown.`);
+                (0, utils_1.replyWithErr)(retrieval_1.msgObj.SC.unknownMsgOrObj, `Object ${objId} is unknown.`, res);
             }
             else if (err === recipients_1.SC.MSG_UNKNOWN) {
-                res.status(retrieval_1.msgObj.SC.unknownMsgOrObj).send(`Message ${msgId} is unknown.`);
+                (0, utils_1.replyWithErr)(retrieval_1.msgObj.SC.unknownMsgOrObj, `Message ${msgId} is unknown.`, res);
             }
             else if (err === recipients_1.SC.USER_UNKNOWN) {
-                res.status(retrieval_1.ERR_SC.server).send(`Recipient disappeared from the system.`);
+                (0, utils_1.replyWithErr)(retrieval_1.ERR_SC.server, `Recipient disappeared from the system.`, res);
                 req.session.close();
             }
             else {

package/build/asmail/routes/retrieval/list-messages.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2016, 2025 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2025 - 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -19,13 +19,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.listMsgIds = void 0;
 const recipients_1 = require("../../resources/recipients");
 const retrieval_1 = require("../../../lib-common/service-api/asmail/retrieval");
+const utils_1 = require("../../resources/utils");
 function listMsgIds(listMsgIdsFunc) {
     return async (req, res, next) => {
         const userId = req.session.params.userId;
         const opts = extractQueryOptions(req);
         if (!opts) {
-            res.status(retrieval_1.ERR_SC.malformed).send("Bad query parameters");
-            return;
+            return (0, utils_1.replyWithErr)(retrieval_1.ERR_SC.malformed, "Bad query parameters", res);
         }
         try {
             const { from, to } = opts;
@@ -37,7 +37,7 @@ function listMsgIds(listMsgIdsFunc) {
                 next(err);
             }
             else if (err === recipients_1.SC.USER_UNKNOWN) {
-                res.status(retrieval_1.ERR_SC.server).send("Recipient disappeared from the system.");
+                (0, utils_1.replyWithErr)(retrieval_1.ERR_SC.server, "Recipient disappeared from the system.", res);
                 req.session.close();
             }
             else {