core-3nweb-client-lib 0.43.9 → 0.43.12

package/build/core-ipc/file.js

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vListVersions = exports.vsUpload = exports.vsStartUpload = exports.vGetByteSink = exports.updateXAttrs = exports.vGetByteSource = exports.vReadJSON = exports.vReadTxt = exports.vReadBytes = exports.vListXAttrs = exports.vGetXAttr = exports.vStat = exports.readBytes = exports.fileMsgType = void 0;
+exports.vListVersions = exports.vsUpload = exports.vsStartUpload = exports.vsStartDownload = exports.vGetByteSink = exports.updateXAttrs = exports.vGetByteSource = exports.vReadJSON = exports.vReadTxt = exports.vReadBytes = exports.vListXAttrs = exports.vGetXAttr = exports.vStat = exports.readBytes = exports.fileMsgType = void 0;
 exports.makeFileCaller = makeFileCaller;
 exports.exposeFileService = exposeFileService;
 exports.packStats = packStats;
@@ -98,7 +98,7 @@ function makeFileCaller(caller, fileMsg) {
             file.v.sync = {
                 status: vsStatus.makeCaller(caller, vsPath),
                 isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.makeCaller(caller, vsPath),
-                download: vsDownload.makeCaller(caller, vsPath),
+                startDownload: vsStartDownload.makeCaller(caller, vsPath),
                 adoptRemote: vsAdoptRemote.makeCaller(caller, vsPath),
             };
             if (file.writable) {
@@ -153,7 +153,7 @@ function exposeFileService(file, expServices) {
             implExp.v.sync = {
                 status: vsStatus.wrapService(file.v.sync.status),
                 isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.wrapService(file.v.sync.isRemoteVersionOnDisk),
-                download: vsDownload.wrapService(file.v.sync.download),
+                startDownload: vsStartDownload.wrapService(file.v.sync.startDownload),
                 adoptRemote: vsAdoptRemote.wrapService(file.v.sync.adoptRemote),
             };
             if (file.writable) {
@@ -1119,25 +1119,35 @@ var vsIsRemoteVersionOnDisk;
     vsIsRemoteVersionOnDisk.makeCaller = makeCaller;
 })(vsIsRemoteVersionOnDisk || (vsIsRemoteVersionOnDisk = {}));
 Object.freeze(vsIsRemoteVersionOnDisk);
-var vsDownload;
-(function (vsDownload) {
-    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.FileSyncDownloadRequestBody);
+var vsStartDownload;
+(function (vsStartDownload) {
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.FileSyncStartDownloadRequestBody);
+    vsStartDownload.replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.FileSyncStartDownloadReplyBody);
     function wrapService(fn) {
         return buf => {
             const { version } = requestType.unpack(buf);
-            const promise = fn((0, protobuf_msg_1.fixInt)(version));
+            const promise = fn((0, protobuf_msg_1.fixInt)(version))
+                .then(startedDownload => vsStartDownload.replyType.pack({ startedDownload }));
             return { promise };
         };
     }
-    vsDownload.wrapService = wrapService;
+    vsStartDownload.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'download');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'startDownload');
         return version => caller
-            .startPromiseCall(path, requestType.pack({ version }));
+            .startPromiseCall(path, requestType.pack({ version }))
+            .then(buf => {
+            const { startedDownload } = vsStartDownload.replyType.unpack(buf);
+            if (startedDownload) {
+                return {
+                    downloadTaskId: (0, protobuf_msg_1.fixInt)(startedDownload.downloadTaskId)
+                };
+            }
+        });
     }
-    vsDownload.makeCaller = makeCaller;
-})(vsDownload || (vsDownload = {}));
-Object.freeze(vsDownload);
+    vsStartDownload.makeCaller = makeCaller;
+})(vsStartDownload || (exports.vsStartDownload = vsStartDownload = {}));
+Object.freeze(vsStartDownload);
 function optionsToUploadLocalToMsg(opts) {
     if (!opts) {
         return;

package/build/core-ipc/fs.js

@@ -105,7 +105,7 @@ function makeFSCaller(caller, fsMsg) {
             fs.v.sync = {
                 status: vsStatus.makeCaller(caller, vsPath),
                 isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.makeCaller(caller, vsPath),
-                download: vsDownload.makeCaller(caller, vsPath),
+                startDownload: vsDownload.makeCaller(caller, vsPath),
                 adoptRemote: vsAdoptRemote.makeCaller(caller, vsPath),
                 diffCurrentAndRemoteFolderVersions: vsDiffCurrentAndRemoteFolderVersions.makeCaller(caller, vsPath)
             };
@@ -184,7 +184,7 @@ function exposeFSService(fs, expServices) {
             implExp.v.sync = {
                 status: vsStatus.wrapService(fs.v.sync.status),
                 isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.wrapService(fs.v.sync.isRemoteVersionOnDisk),
-                download: vsDownload.wrapService(fs.v.sync.download),
+                startDownload: vsDownload.wrapService(fs.v.sync.startDownload),
                 adoptRemote: vsAdoptRemote.wrapService(fs.v.sync.adoptRemote),
                 diffCurrentAndRemoteFolderVersions: vsDiffCurrentAndRemoteFolderVersions.wrapService(fs.v.sync.diffCurrentAndRemoteFolderVersions)
             };
@@ -1829,21 +1829,28 @@ var vsIsRemoteVersionOnDisk;
 Object.freeze(vsIsRemoteVersionOnDisk);
 var vsDownload;
 (function (vsDownload) {
-    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSSyncDownloadRequestBody);
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSSyncStartDownloadRequestBody);
     function wrapService(fn) {
         return buf => {
             const { path, version } = requestType.unpack(buf);
-            const promise = fn(path, (0, protobuf_msg_1.fixInt)(version));
+            const promise = fn(path, (0, protobuf_msg_1.fixInt)(version))
+                .then(startedDownload => file.vsStartDownload.replyType.pack({ startedDownload }));
             return { promise };
         };
     }
     vsDownload.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'download');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'startDownload');
         return (path, version) => caller
-            .startPromiseCall(ipcPath, requestType.pack({
-            path, version
-        }));
+            .startPromiseCall(ipcPath, requestType.pack({ path, version }))
+            .then(buf => {
+            const { startedDownload } = file.vsStartDownload.replyType.unpack(buf);
+            if (startedDownload) {
+                return {
+                    downloadTaskId: (0, protobuf_msg_1.fixInt)(startedDownload.downloadTaskId)
+                };
+            }
+        });
     }
     vsDownload.makeCaller = makeCaller;
 })(vsDownload || (vsDownload = {}));

package/build/lib-client/3nstorage/storage-owner.js

@@ -25,6 +25,7 @@ const keyGen = require("../key-derivation");
 const exceptions_1 = require("../xsp-fs/exceptions");
 const ws_ipc_1 = require("../../lib-common/ipc/ws-ipc");
 const assert_1 = require("../../lib-common/assert");
+const http_1 = require("../../lib-common/exceptions/http");
 const storageAccessParams = {
     login: api.midLogin.MID_URL_PART,
     logout: api.closeSession.URL_END,
@@ -54,11 +55,13 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             responseType: 'json'
         });
         if (rep.status !== api.sessionParams.SC.ok) {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
         const keyDerivParams = rep.data;
         if (!keyGen.checkParams(rep.data)) {
-            throw (0, request_utils_1.makeException)(rep, 'Malformed response');
+            throw (0, http_1.makeMalformedReplyHTTPException)(rep, {
+                message: `expected key generation parameters form isn't there`
+            });
         }
         return keyDerivParams;
     }
@@ -69,11 +72,10 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             responseType: 'json'
         });
         if (rep.status !== api.sessionParams.SC.ok) {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
-        if ((typeof rep.data.maxChunkSize !== 'number') ||
-            (rep.data.maxChunkSize < 64 * 1024)) {
-            throw (0, request_utils_1.makeException)(rep, 'Malformed response');
+        if ((typeof rep.data.maxChunkSize !== 'number') || (rep.data.maxChunkSize < 64 * 1024)) {
+            throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'bad maxChunkSize value in reply' });
         }
         this.maxChunkSize = rep.data.maxChunkSize;
     }
@@ -104,7 +106,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             throw (0, exceptions_1.makeUnknownTransactionExc)(objId);
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     /**
@@ -126,30 +128,32 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             appPath,
             method: 'GET',
             responseType: 'arraybuffer',
-            responseHeaders: [api.HTTP_HEADER.objVersion,
-                api.HTTP_HEADER.objSegmentsLength, api.HTTP_HEADER.objHeaderLength]
+            responseHeaders: [
+                api.HTTP_HEADER.objVersion, api.HTTP_HEADER.objSegmentsLength, api.HTTP_HEADER.objHeaderLength
+            ]
         });
         if (rep.status === api.currentObj.SC.okGet) {
-            if (!(rep.data instanceof Uint8Array)) {
-                throw (0, request_utils_1.makeException)(rep, `Malformed response: body is not binary`);
+            const bytes = rep.data;
+            if (!(bytes instanceof Uint8Array)) {
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: `body is not binary` });
             }
             const version = (0, request_utils_1.extractIntHeader)(rep, api.HTTP_HEADER.objVersion);
             const segsTotalLen = (0, request_utils_1.extractIntHeader)(rep, api.HTTP_HEADER.objSegmentsLength);
             const headerLen = (0, request_utils_1.extractIntHeader)(rep, api.HTTP_HEADER.objHeaderLength);
-            if (rep.data.length > (headerLen + segsTotalLen)) {
-                throw (0, request_utils_1.makeException)(rep, `Malformed response: body is too long`);
+            if (bytes.length > (headerLen + segsTotalLen)) {
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: `body is too long` });
             }
             return {
                 version, segsTotalLen,
-                header: rep.data.subarray(0, headerLen),
-                segsChunk: rep.data.subarray(headerLen)
+                header: bytes.subarray(0, headerLen),
+                segsChunk: bytes.subarray(headerLen)
             };
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
             throw (0, exceptions_1.makeObjNotFoundExc)(objId, true);
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     /**
@@ -166,25 +170,28 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
         }
         const limit = end - start;
         const opts = { ofs: start, limit, ver: version };
-        const appPath = (objId ?
-            api.currentObj.getReqUrlEnd(objId, opts) :
-            api.currentRootObj.getReqUrlEnd(opts));
         const rep = await this.doBodylessSessionRequest({
-            appPath,
+            appPath: (objId ?
+                api.currentObj.getReqUrlEnd(objId, opts) :
+                api.currentRootObj.getReqUrlEnd(opts)),
             method: 'GET',
             responseType: 'arraybuffer',
         });
         if (rep.status === api.currentObj.SC.okGet) {
-            if (!(rep.data instanceof Uint8Array)) {
-                throw (0, request_utils_1.makeException)(rep, `Malformed response: body is not binary`);
+            const chunk = rep.data;
+            if (!(chunk instanceof Uint8Array)) {
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: `body is not binary` });
             }
-            return rep.data;
+            if (chunk.length > limit) {
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: `body is too long` });
+            }
+            return chunk;
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
             throw (0, exceptions_1.makeObjNotFoundExc)(objId, true);
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     /**
@@ -264,7 +271,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             throw (0, exceptions_1.makeVersionMismatchExc)(objId, curVer);
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     async archiveObjVersion(objId, currentVer) {
@@ -284,7 +291,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             throw (0, exceptions_1.makeObjVersionNotFoundExc)(objId, currentVer, true);
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     async getObjStatus(objId) {
@@ -303,7 +310,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             throw (0, exceptions_1.makeObjNotFoundExc)(objId, true);
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     /**
@@ -326,7 +333,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             throw (0, exceptions_1.makeConcurrentTransExc)(objId);
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     async openEventSource() {
@@ -335,7 +342,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             return (0, ws_ipc_1.makeSubscriber)(rep.data, undefined);
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
 }

package/build/lib-client/3nweb-signup.js

@@ -20,8 +20,8 @@ exports.checkAvailableDomains = checkAvailableDomains;
 exports.checkAvailableAddressesForName = checkAvailableAddressesForName;
 exports.addUser = addUser;
 exports.sendActivationCheckRequest = sendActivationCheckRequest;
-const request_utils_1 = require("./request-utils");
 const api = require("../lib-common/user-admin-api/signup");
+const http_1 = require("../lib-common/exceptions/http");
 async function checkAvailableDomains(client, serviceUrl, signupToken) {
     const reqData = { signupToken };
     const rep = await client.doJsonRequest({
@@ -34,11 +34,11 @@ async function checkAvailableDomains(client, serviceUrl, signupToken) {
             return rep.data;
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Reply is malformed');
+            throw (0, http_1.makeMalformedReplyHTTPException)(rep);
         }
     }
     else {
-        throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+        throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
     }
 }
 async function checkAvailableAddressesForName(client, serviceUrl, name, signupToken) {
@@ -55,11 +55,11 @@ async function checkAvailableAddressesForName(client, serviceUrl, name, signupTo
             return rep.data;
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Reply is malformed');
+            throw (0, http_1.makeMalformedReplyHTTPException)(rep);
         }
     }
     else {
-        throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+        throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
     }
 }
 async function addUser(client, serviceUrl, userParams) {
@@ -76,7 +76,7 @@ async function addUser(client, serviceUrl, userParams) {
         return false;
     }
     else {
-        throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+        throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
     }
 }
 async function sendActivationCheckRequest(client, serviceUrl, userId) {
@@ -95,7 +95,7 @@ async function sendActivationCheckRequest(client, serviceUrl, userId) {
         return false;
     }
     else {
-        throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+        throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
     }
 }
 Object.freeze(exports);

package/build/lib-client/asmail/recipient.js

@@ -25,6 +25,7 @@ const api = require("../../lib-common/service-api/asmail/retrieval");
 const user_with_mid_session_1 = require("../user-with-mid-session");
 const service_locator_1 = require("../service-locator");
 const ws_ipc_1 = require("../../lib-common/ipc/ws-ipc");
+const http_1 = require("../../lib-common/exceptions/http");
 function makeMsgNotFoundException(msgId) {
     const exc = {
         runtimeException: true,
@@ -74,12 +75,12 @@ class MailRecipient extends user_with_mid_session_1.ServiceUser {
         });
         if (rep.status === api.listMsgs.SC.ok) {
             if (!Array.isArray(rep.data)) {
-                throw (0, request_utils_1.makeException)(rep, 'Malformed response');
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep);
             }
             return rep.data;
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     async getMsgMeta(msgId) {
@@ -91,7 +92,9 @@ class MailRecipient extends user_with_mid_session_1.ServiceUser {
         if (rep.status === api.msgMetadata.SC.ok) {
             const { meta, errMsg } = api.sanitizedMeta(rep.data);
             if (!meta) {
-                throw (0, request_utils_1.makeException)(rep, `Malformed message metadata in a server response: ${errMsg}`);
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, {
+                    message: `Malformed message metadata in a server response: ${errMsg}`
+                });
             }
             return meta;
         }
@@ -99,7 +102,7 @@ class MailRecipient extends user_with_mid_session_1.ServiceUser {
             throw makeMsgNotFoundException(msgId);
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     /**
@@ -124,12 +127,12 @@ class MailRecipient extends user_with_mid_session_1.ServiceUser {
         });
         if (rep.status === api.msgObj.SC.ok) {
             if (!(rep.data instanceof Uint8Array)) {
-                throw (0, request_utils_1.makeException)(rep, `Malformed response: body is not binary`);
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: `body is not binary` });
             }
             const segsTotalLen = (0, request_utils_1.extractIntHeader)(rep, api.HTTP_HEADER.objSegmentsLength);
             const headerLen = (0, request_utils_1.extractIntHeader)(rep, api.HTTP_HEADER.objHeaderLength);
             if (rep.data.length > (headerLen + segsTotalLen)) {
-                throw (0, request_utils_1.makeException)(rep, `Malformed response: body is too long`);
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: `body is too long` });
             }
             return {
                 segsTotalLen,
@@ -141,7 +144,7 @@ class MailRecipient extends user_with_mid_session_1.ServiceUser {
             throw makeObjNotFoundException(msgId, objId);
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     /**
@@ -165,7 +168,7 @@ class MailRecipient extends user_with_mid_session_1.ServiceUser {
         });
         if (rep.status === api.msgObj.SC.ok) {
             if (!(rep.data instanceof Uint8Array)) {
-                throw (0, request_utils_1.makeException)(rep, `Malformed response: body is not binary`);
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: `body is not binary` });
             }
             return rep.data;
         }
@@ -173,7 +176,7 @@ class MailRecipient extends user_with_mid_session_1.ServiceUser {
             throw makeObjNotFoundException(msgId, objId);
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     async removeMsg(msgId) {
@@ -188,7 +191,7 @@ class MailRecipient extends user_with_mid_session_1.ServiceUser {
             throw makeMsgNotFoundException(msgId);
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     async openEventSource() {
@@ -197,7 +200,7 @@ class MailRecipient extends user_with_mid_session_1.ServiceUser {
             return (0, ws_ipc_1.makeSubscriber)(rep.data, undefined);
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
 }

package/build/lib-client/asmail/sender.js

@@ -16,13 +16,10 @@
  this program. If not, see <http://www.gnu.org/licenses/>. */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MailSender = void 0;
-/**
- * This defines functions that implement ASMail delivery protocol.
- */
-const request_utils_1 = require("../request-utils");
 const api = require("../../lib-common/service-api/asmail/delivery");
 const service_locator_1 = require("../service-locator");
 const url_1 = require("url");
+const http_1 = require("../../lib-common/exceptions/http");
 const LIMIT_ON_MAX_CHUNK = 1024 * 1024;
 const TOO_EARLY_RESTART_PERIOD = 5 * 60 * 1000;
 class MailSender {
@@ -195,10 +192,10 @@ class MailSender {
         }, reqData);
         if (rep.status === api.preFlight.SC.ok) {
             if (typeof rep.data.maxMsgLength !== 'number') {
-                throw (0, request_utils_1.makeException)(rep, 'Malformed reply: missing number maxMsgLength');
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'missing number maxMsgLength' });
             }
             if (rep.data.maxMsgLength < 500) {
-                throw (0, request_utils_1.makeException)(rep, 'Malformed reply: maxMsgLength is too short');
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'maxMsgLength is too short' });
             }
             this.maxMsgLength = rep.data.maxMsgLength;
             return rep.data;
@@ -217,7 +214,7 @@ class MailSender {
             throw this.inboxIsFullExc();
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     /**
@@ -245,14 +242,14 @@ class MailSender {
         }, reqData);
         if (rep.status == api.sessionStart.SC.ok) {
             if (typeof rep.data.maxMsgLength !== 'number') {
-                throw (0, request_utils_1.makeException)(rep, 'Malformed reply: missing number maxMsgLength');
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'missing number maxMsgLength' });
             }
             if (rep.data.maxMsgLength < 500) {
-                throw (0, request_utils_1.makeException)(rep, 'Malformed reply: maxMsgLength is too short');
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'maxMsgLength is too short' });
             }
             this.maxMsgLength = rep.data.maxMsgLength;
             if ('string' !== typeof rep.data.sessionId) {
-                throw (0, request_utils_1.makeException)(rep, 'Malformed reply: missing sessionId string');
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'missing sessionId string' });
             }
             this.sessionId = rep.data.sessionId;
             delete rep.data.sessionId;
@@ -272,7 +269,7 @@ class MailSender {
             throw this.inboxIsFullExc();
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     async restartSession() {
@@ -290,14 +287,14 @@ class MailSender {
         }, reqData);
         if (rep.status == api.sessionRestart.SC.ok) {
             if (typeof rep.data.maxMsgLength !== 'number') {
-                throw (0, request_utils_1.makeException)(rep, 'Malformed reply: missing number maxMsgLength');
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'missing number maxMsgLength' });
             }
             if (rep.data.maxMsgLength < 500) {
-                throw (0, request_utils_1.makeException)(rep, 'Malformed reply: maxMsgLength is too short');
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'maxMsgLength is too short' });
             }
             this.maxMsgLength = rep.data.maxMsgLength;
             if (typeof rep.data.sessionId !== 'string') {
-                throw (0, request_utils_1.makeException)(rep, 'Malformed reply: missing sessionId string');
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'missing sessionId string' });
             }
             this.sessionId = rep.data.sessionId;
             if ((typeof rep.data.maxChunkSize === 'number') &&
@@ -314,7 +311,7 @@ class MailSender {
             throw this.unknownRecipientExc();
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     /**
@@ -344,7 +341,7 @@ class MailSender {
             throw this.authFailedOnDeliveryExc();
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     /**
@@ -369,7 +366,7 @@ class MailSender {
             throw this.recipientHasNoPubKeyExc();
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     /**
@@ -389,14 +386,14 @@ class MailSender {
             responseType: 'json'
         }, meta);
         if (rep.status == api.msgMeta.SC.ok) {
-            if (('string' !== typeof rep.data.msgId) ||
-                (rep.data.msgId.length === 0)) {
-                throw (0, request_utils_1.makeException)(rep, 'Malformed reply: msgId string is missing');
+            if (('string' !== typeof rep.data.msgId)
+                || (rep.data.msgId.length === 0)) {
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'msgId string is missing' });
             }
             this.msgId = rep.data.msgId;
             if (typeof rep.data.maxChunkSize === 'number') {
                 if (rep.data.maxChunkSize < 64 * 1024) {
-                    throw (0, request_utils_1.makeException)(rep, 'Malformed reply: maxChunkSize is too small');
+                    throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'maxChunkSize is too small' });
                 }
                 else if (rep.data.maxChunkSize < this.maxChunkSize) {
                     this.maxChunkSize = rep.data.maxChunkSize;
@@ -411,7 +408,7 @@ class MailSender {
             };
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     async trySessionRestart() {
@@ -449,7 +446,9 @@ class MailSender {
                 return this.sendObj(objId, bytes, fstReq, followReq);
             }
             else {
-                throw (0, request_utils_1.makeException)(rep, 'Unexpected status, when session restart is not expected to happen');
+                throw (0, http_1.makeUnexpectedStatusHTTPException)(rep, {
+                    message: 'Unexpected status, when session restart is not expected to happen'
+                });
             }
         }
         else if (rep.status === api.msgObj.SC.ok) {
@@ -457,7 +456,7 @@ class MailSender {
             return;
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     /**
@@ -473,7 +472,7 @@ class MailSender {
             this.sessionId = undefined;
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     async cancelDelivery() {

package/build/lib-client/asmail/service-config.js

@@ -16,13 +16,10 @@
  this program. If not, see <http://www.gnu.org/licenses/>. */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MailConfigurator = void 0;
-/**
- * This defines functions that implement ASMail configuration protocol.
- */
-const request_utils_1 = require("../request-utils");
 const api = require("../../lib-common/service-api/asmail/config");
 const user_with_mid_session_1 = require("../user-with-mid-session");
 const service_locator_1 = require("../service-locator");
+const http_1 = require("../../lib-common/exceptions/http");
 const configAccessParams = {
     login: api.midLogin.MID_URL_PART,
     logout: api.closeSession.URL_END,
@@ -41,7 +38,7 @@ class MailConfigurator extends user_with_mid_session_1.ServiceUser {
             responseType: 'json'
         });
         if (rep.status !== api.PARAM_SC.ok) {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
         return rep.data;
     }
@@ -52,7 +49,7 @@ class MailConfigurator extends user_with_mid_session_1.ServiceUser {
             method: 'PUT',
         }, value);
         if (rep.status !== api.PARAM_SC.ok) {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     makeParamSetterAndGetter(param) {