spec-3nweb-server 1.8.5 → 1.8.7

package/build/3nstorage/routes/owner/put-current-obj.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2017, 2019 - 2020 3NSoft Inc.
+ Copyright (C) 2017, 2019 - 2020, 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,10 +20,10 @@ exports.saveCurrentObj = void 0;
 const users_1 = require("../../resources/users");
 const owner_1 = require("../../../lib-common/service-api/3nstorage/owner");
 const conf_util_1 = require("../../../lib-server/conf-util");
-const body_parsers_1 = require("../../../lib-server/middleware/body-parsers");
 const common_1 = require("../../../lib-common/byte-streaming/common");
 const processes_1 = require("../../../lib-common/processes");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
+const utils_1 = require("../../resources/utils");
 function saveCurrentObj(root, saveObjFunc, chunkLimit) {
     if ('function' !== typeof saveObjFunc) {
         throw new TypeError("Given argument 'saveObjFunc' must be function, but is not.");
@@ -31,38 +31,30 @@ function saveCurrentObj(root, saveObjFunc, chunkLimit) {
     const maxChunkSize = (0, conf_util_1.stringToNumOfBytes)(chunkLimit);
     return async (req, res, next) => {
         if (!req.is(owner_1.BIN_TYPE)) {
-            (0, body_parsers_1.attachByteDrainToRequest)(req);
-            res.status(owner_1.ERR_SC.wrongContentType).json({
-                error: `Content-Type must be ${owner_1.BIN_TYPE} for this call.`
-            });
-            return;
+            return (0, utils_1.replyWithErr)(owner_1.ERR_SC.wrongContentType, `Content-Type must be ${owner_1.BIN_TYPE} for this call.`, res, req);
         }
-        const userId = req.session.params.userId;
-        const objId = (root ? null : 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;
         }
+        const userId = req.session.params.userId;
+        const { objId, objIdParseErr } = (0, utils_1.getObjIdFromParams)(root, req);
+        if (objIdParseErr) {
+            return (0, utils_1.replyWithErr)(owner_1.ERR_SC.malformed, objIdParseErr, res, req);
+        }
         // extract and check query parameters
         const opts = extractQueryOptions(req);
         if (!opts) {
-            return replyToMalformed(req, "Bad query parameters", res);
+            return (0, utils_1.replyWithErr)(owner_1.ERR_SC.malformed, "Bad query parameters", res, req);
         }
         const { fstReq, sndReq } = opts;
         let diff;
         if (fstReq) {
-            if (!root && objId) {
-                if (!buffer_utils_1.base64urlSafe.allCharsFromAlphabet(objId)) {
-                    return replyToMalformed(req, "Bad object id", res);
-                }
-            }
             // cross-check given lengths
-            const diffAndHeader = fstReq.header +
-                (fstReq.diff ? fstReq.diff : 0);
+            const diffAndHeader = fstReq.header + (fstReq.diff ? fstReq.diff : 0);
             if (diffAndHeader > len) {
-                return replyToMalformed(req, "Bad query parameters", res);
+                return (0, utils_1.replyWithErr)(owner_1.ERR_SC.malformed, "Bad query parameters", res, req);
             }
             // read diff, if it is expected
             if (fstReq.diff) {
@@ -71,23 +63,23 @@ function saveCurrentObj(root, saveObjFunc, chunkLimit) {
                     len -= fstReq.diff;
                 }
                 else {
-                    return replyToMalformed(req, "Cannot read diff bytes", res);
+                    return (0, utils_1.replyWithErr)(owner_1.ERR_SC.malformed, "Cannot read diff bytes", res, req);
                 }
                 try {
                     const diffFromReq = JSON.parse(buffer_utils_1.utf8.open(diffBytes));
                     diff = (0, owner_1.sanitizedDiff)(diffFromReq, fstReq.ver);
                     if (!diff) {
-                        return replyToMalformed(req, "Malformed diff info", res);
+                        return (0, utils_1.replyWithErr)(owner_1.ERR_SC.malformed, "Malformed diff info", res, req);
                     }
                 }
                 catch (err) {
-                    return replyToMalformed(req, "Malformed diff info", res);
+                    return (0, utils_1.replyWithErr)(owner_1.ERR_SC.malformed, "Malformed diff info", res, req);
                 }
             }
         }
         else if (sndReq) {
             if ((len === 0) && !sndReq.last) {
-                return replyToMalformed(req, "No segment bytes", res);
+                return (0, utils_1.replyWithErr)(owner_1.ERR_SC.malformed, "No segment bytes", res, req);
             }
         }
         try {
@@ -102,7 +94,7 @@ function saveCurrentObj(root, saveObjFunc, chunkLimit) {
                         error: "Current object version doesn't match assumed one.",
                         current_version: err.current_version
                     };
-                    res.set(owner_1.HTTP_HEADER.objVersion, `${err.current_version}`);
+                    res.set(owner_1.HTTP_HEADER.objVersion, `${rep.current_version}`);
                     res.status(owner_1.currentObj.SC.mismatchedObjVer).json(rep);
                 }
                 else {
@@ -111,41 +103,27 @@ function saveCurrentObj(root, saveObjFunc, chunkLimit) {
             }
             else if ((err === users_1.SC.OBJ_UNKNOWN)
                 || (err === users_1.SC.OBJ_VER_UNKNOWN)) {
-                res.status(owner_1.currentObj.SC.unknownObj).json({
-                    error: `Unknown object ${objId}.`
-                });
+                (0, utils_1.replyWithErr)(owner_1.currentObj.SC.unknownObj, `Unknown object ${objId}.`, res);
             }
             else if (err === users_1.SC.TRANSACTION_UNKNOWN) {
-                res.status(owner_1.currentObj.SC.unknownTransaction).json({
-                    error: "Unknown transaction."
-                });
+                (0, utils_1.replyWithErr)(owner_1.currentObj.SC.unknownTransaction, "Unknown transaction.", res);
             }
             else if ((err === users_1.SC.OBJ_EXIST)
                 || (err === users_1.SC.OBJ_VER_EXIST)) {
-                res.status(owner_1.currentObj.SC.objAlreadyExists).json({
-                    error: "Object already exists."
-                });
+                (0, utils_1.replyWithErr)(owner_1.currentObj.SC.objAlreadyExists, "Object already exists.", res);
             }
             else if (err === users_1.SC.CONCURRENT_TRANSACTION) {
-                res.status(owner_1.currentObj.SC.concurrentTransaction).json({
-                    error: `Object ${objId} is currently under a transaction.`
-                });
+                (0, utils_1.replyWithErr)(owner_1.currentObj.SC.concurrentTransaction, `Object ${objId} is currently under a transaction.`, res);
             }
             else if (err === users_1.SC.USER_UNKNOWN) {
-                res.status(owner_1.ERR_SC.server).json({
-                    error: "Recipient disappeared from the system."
-                });
+                (0, utils_1.replyWithErr)(owner_1.ERR_SC.server, "Recipient disappeared from the system.", res);
                 req.session.close();
             }
             else if (err === users_1.SC.NOT_ENOUGH_SPACE) {
-                res.status(owner_1.ERR_SC.noSpace).json({
-                    error: "Reached storage limits."
-                });
+                (0, utils_1.replyWithErr)(owner_1.ERR_SC.noSpace, "Reached storage limits.", res);
             }
             else if (err === users_1.SC.OBJ_FILE_INCOMPLETE) {
-                res.status(owner_1.currentObj.SC.objIncomplete).json({
-                    error: "Object version file is incomplete."
-                });
+                (0, utils_1.replyWithErr)(owner_1.currentObj.SC.objIncomplete, "Object version file is incomplete.", res);
             }
             else {
                 next(new Error(`Unhandled storage error code: ${err}`));
@@ -192,14 +170,10 @@ function extractQueryOptions(req) {
 function getContentLenOrSendError(req, res, maxChunkSize) {
     const contentLength = parseInt(req.get(owner_1.HTTP_HEADER.contentLength));
     if (isNaN(contentLength)) {
-        res.status(owner_1.ERR_SC.contentLenMissing).json({
-            error: "Content-Length header is required with proper number."
-        });
+        (0, utils_1.replyWithErr)(owner_1.ERR_SC.contentLenMissing, "Content-Length header is required with proper number.", res, req);
     }
     else if (contentLength > maxChunkSize) {
-        res.status(owner_1.ERR_SC.contentTooLong).json({
-            error: "Request body is too long."
-        });
+        (0, utils_1.replyWithErr)(owner_1.ERR_SC.contentTooLong, "Request body is too long.", res, req);
     }
     else {
         return contentLength;
@@ -269,9 +243,5 @@ function readChunkFrom(stream, bytesToRead) {
     stream.on('end', onEnd);
     return deferred.promise;
 }
-function replyToMalformed(req, msg, res) {
-    (0, body_parsers_1.attachByteDrainToRequest)(req);
-    res.status(owner_1.ERR_SC.malformed).json({ error: msg });
-}
 function noop() { }
 Object.freeze(exports);

package/build/3nstorage/routes/owner/session-params.js

@@ -23,6 +23,8 @@ const conf_util_1 = require("../../../lib-server/conf-util");
 function sessionParams(maxChunk) {
     const maxChunkSize = (0, conf_util_1.stringToNumOfBytes)(maxChunk);
     return async (req, res, next) => {
+        // XXX currently session params are same for all, hence, userId is unused, but, this whole
+        //     thing must be within a session
         const userId = req.session.params.userId;
         try {
             const reply = { maxChunkSize };

package/build/asmail/resources/utils.d.ts

@@ -0,0 +1,6 @@
+import { Response, Request } from 'express';
+export declare function getObjIdFromParams(req: Request): {
+    objId: string;
+    objIdParseErr?: string;
+};
+export declare function replyWithErr(status: number, msg: string, res: Response, reqToDrainBytesFrom?: Request): void;

package/build/asmail/resources/utils.js

@@ -0,0 +1,36 @@
+"use strict";
+/*
+ Copyright (C) 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
+ Foundation, either version 3 of the License, or (at your option) any later
+ version.
+ 
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.replyWithErr = exports.getObjIdFromParams = void 0;
+const buffer_utils_1 = require("../../lib-common/buffer-utils");
+const body_parsers_1 = require("../../lib-server/middleware/body-parsers");
+function getObjIdFromParams(req) {
+    const objId = req.params.objId;
+    return ((!!objId && buffer_utils_1.base64urlSafe.allCharsFromAlphabet(objId)) ?
+        { objId } :
+        { objId: undefined, objIdParseErr: "Bad object id" });
+}
+exports.getObjIdFromParams = getObjIdFromParams;
+function replyWithErr(status, msg, res, reqToDrainBytesFrom) {
+    if (reqToDrainBytesFrom) {
+        (0, body_parsers_1.attachByteDrainToRequest)(reqToDrainBytesFrom);
+    }
+    res.status(status).json({ error: msg });
+}
+exports.replyWithErr = replyWithErr;
+Object.freeze(exports);

package/build/asmail/routes/delivery/finalize-delivery.js

@@ -19,6 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.finalizeDelivery = void 0;
 const recipients_1 = require("../../resources/recipients");
 const delivery_1 = require("../../../lib-common/service-api/asmail/delivery");
+const utils_1 = require("../../resources/utils");
 function finalizeDelivery(finDelivFunc) {
     return async (req, res, next) => {
         const session = req.session;
@@ -35,11 +36,11 @@ function finalizeDelivery(finDelivFunc) {
             }
             else if (err === recipients_1.SC.USER_UNKNOWN) {
                 session.close();
-                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);
             }
             else if (err === recipients_1.SC.MSG_UNKNOWN) {
                 session.close();
-                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);
             }
             else {
                 next(new Error("Unhandled storage error code: " + err));

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);