core-3nweb-client-lib 0.25.6 → 0.27.0

package/build/lib-client/objs-on-disk/obj-folders.js

@@ -18,7 +18,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjFolders = exports.makeAlreadyExistExc = exports.makeNotFoundExc = void 0;
 const fs = require("../../lib-common/async-fs-node");
-const processes_1 = require("../../lib-common/processes");
+const synced_1 = require("../../lib-common/processes/synced");
 const xsp_files_1 = require("xsp-files");
 const assert_1 = require("../../lib-common/assert");
 const error_1 = require("../../lib-common/exceptions/error");
@@ -74,20 +74,20 @@ class ObjFolders {
         /**
          * Process ids here are values of the first section in each folder tree.
          */
-        this.syncProcs = new processes_1.NamedProcs();
+        this.syncProcs = new synced_1.NamedProcs();
         this.saveCfg = () => writeCfgTo(this.path, {
             charsInSplit: this.charsInSplit,
             numOfSplits: this.numOfSplits,
             generations: this.generations
         });
-        assert_1.assert(Number.isInteger(this.numOfSplits) && (this.numOfSplits > 0) &&
+        (0, assert_1.assert)(Number.isInteger(this.numOfSplits) && (this.numOfSplits > 0) &&
             Number.isInteger(this.charsInSplit) && (this.charsInSplit > 0));
-        this.accessFolder = path_1.join(this.path, ACCESS_DIR);
+        this.accessFolder = (0, path_1.join)(this.path, ACCESS_DIR);
         if (this.generations) {
             if (!canMove) {
                 throw new Error(`Missing a can-move predicate when generations are present`);
             }
-            this.generationsFolder = path_1.join(this.path, GENERATIONS_DIR);
+            this.generationsFolder = (0, path_1.join)(this.path, GENERATIONS_DIR);
             this.rotationsProc = new RotationsProc(this.accessFolder, this.generationsFolder, this.generations, this.syncProcs, canMove, this.saveCfg, this.logError);
             this.rotationsProc.scheduleStart(10 * 60);
         }
@@ -100,8 +100,8 @@ class ObjFolders {
             await writeCfgTo(path, cfg);
         }
         checkCfg(cfg);
-        await fs.mkdir(path_1.join(path, ACCESS_DIR)).catch(alreadyExistsOrReThrow);
-        await fs.mkdir(path_1.join(path, GENERATIONS_DIR)).catch(alreadyExistsOrReThrow);
+        await fs.mkdir((0, path_1.join)(path, ACCESS_DIR)).catch(alreadyExistsOrReThrow);
+        await fs.mkdir((0, path_1.join)(path, GENERATIONS_DIR)).catch(alreadyExistsOrReThrow);
         return new ObjFolders(path, cfg.numOfSplits, cfg.charsInSplit, logError, cfg.generations, canMove);
     }
     static async makeSimple(path, logError) {
@@ -111,7 +111,7 @@ class ObjFolders {
             await writeCfgTo(path, cfg);
         }
         checkCfg(cfg);
-        await fs.mkdir(path_1.join(path, ACCESS_DIR)).catch(alreadyExistsOrReThrow);
+        await fs.mkdir((0, path_1.join)(path, ACCESS_DIR)).catch(alreadyExistsOrReThrow);
         return new ObjFolders(path, cfg.numOfSplits, cfg.charsInSplit, logError);
     }
     idToPathSections(objId) {
@@ -127,10 +127,10 @@ class ObjFolders {
         return path;
     }
     genBucketPath(bucketIndex) {
-        return path_1.join(this.generationsFolder, `${bucketIndex}`);
+        return (0, path_1.join)(this.generationsFolder, `${bucketIndex}`);
     }
     async findObjFolder(pathSections) {
-        const folder = path_1.join(this.accessFolder, ...pathSections);
+        const folder = (0, path_1.join)(this.accessFolder, ...pathSections);
         if (await folderExists(folder)) {
             return { folder };
         }
@@ -138,7 +138,7 @@ class ObjFolders {
             return;
         }
         for (let i = 0; i < this.generations.length; i += 1) {
-            const folder = path_1.join(this.genBucketPath(i), ...pathSections);
+            const folder = (0, path_1.join)(this.genBucketPath(i), ...pathSections);
             if (await folderExists(folder)) {
                 return { folder, genBacket: i };
             }
@@ -146,7 +146,7 @@ class ObjFolders {
     }
     getFolderAccessFor(objId, createIfMissing = false) {
         if (!objId) {
-            const folder = path_1.join(this.accessFolder, ROOT_OBJ_DIR);
+            const folder = (0, path_1.join)(this.accessFolder, ROOT_OBJ_DIR);
             return this.syncProcs.startOrChain(ROOT_OBJ_DIR, async () => {
                 if (await folderExists(folder)) {
                     return folder;
@@ -176,7 +176,7 @@ class ObjFolders {
         });
     }
     removeFolderOf(objId) {
-        assert_1.assert(!!objId, `Root object can't be removed.`);
+        (0, assert_1.assert)(!!objId, `Root object can't be removed.`);
         const pathSections = this.idToPathSections(objId);
         return this.syncProcs.startOrChain(pathSections[0], async () => {
             const found = await this.findObjFolder(pathSections);
@@ -191,10 +191,10 @@ class ObjFolders {
     async listRecent() {
         const lst = (await allTreePaths(this.accessFolder, this.numOfSplits, this.logError))
             .map(pathSections => ({
-            path: path_1.join(this.accessFolder, ...pathSections),
+            path: (0, path_1.join)(this.accessFolder, ...pathSections),
             objId: pathSections.join('')
         }));
-        const rootObjPath = path_1.join(this.accessFolder, ROOT_OBJ_DIR);
+        const rootObjPath = (0, path_1.join)(this.accessFolder, ROOT_OBJ_DIR);
         if (await fs.existsFolder(rootObjPath)) {
             lst.unshift({ objId: null, path: rootObjPath });
         }
@@ -219,7 +219,7 @@ class RotationsProc {
         this.setNextCacheRotation(secs);
     }
     genBacketPath(backetIndex) {
-        return path_1.join(this.generationsFolder, `${backetIndex}`);
+        return (0, path_1.join)(this.generationsFolder, `${backetIndex}`);
     }
     setNextCacheRotation(secs) {
         setTimeout(async () => {
@@ -251,7 +251,7 @@ class RotationsProc {
         for (let i = 0; i < objPathSections.length; i += 1) {
             const sections = objPathSections[i];
             const objId = sections.join('');
-            const objFolderPath = path_1.join(srcBacket, ...sections);
+            const objFolderPath = (0, path_1.join)(srcBacket, ...sections);
             await this.syncProcs.startOrChain(sections[0], async () => {
                 if (!(await this.canMove(objId, objFolderPath))) {
                     return;
@@ -266,7 +266,7 @@ class RotationsProc {
         const objPathSections = await allTreePaths(srcBacket, this.numOfSplits, this.logError);
         for (let i = 0; i < objPathSections.length; i += 1) {
             const sections = objPathSections[i];
-            const srcObjPath = path_1.join(srcBacket, ...sections);
+            const srcObjPath = (0, path_1.join)(srcBacket, ...sections);
             await this.syncProcs.startOrChain(sections[0], async () => {
                 if (!(await folderExists(srcObjPath))) {
                     return;
@@ -287,7 +287,7 @@ Object.freeze(RotationsProc);
  * @param pathSections
  */
 async function makeTreeExclusively(base, pathSections) {
-    assert_1.assert(pathSections.length > 0);
+    (0, assert_1.assert)(pathSections.length > 0);
     const treePaths = treePathsFor(base, pathSections);
     const intermediateFolders = treePaths.slice(0, treePaths.length - 1);
     await makeFoldersNonexclusively(intermediateFolders);
@@ -306,7 +306,7 @@ async function makeTreeExclusively(base, pathSections) {
  * @param pathSections
  */
 async function deleteTree(base, pathSections) {
-    assert_1.assert(pathSections.length > 0);
+    (0, assert_1.assert)(pathSections.length > 0);
     const treePaths = treePathsFor(base, pathSections);
     const intermediateFolders = treePaths.slice(0, treePaths.length - 1);
     const leafFolder = treePaths[treePaths.length - 1];
@@ -387,7 +387,7 @@ function treePathsFor(base, pathSections) {
     const paths = [];
     let path = base;
     for (let i = 0; i < pathSections.length; i += 1) {
-        path = path_1.join(path, pathSections[i]);
+        path = (0, path_1.join)(path, pathSections[i]);
         paths.push(path);
     }
     return paths;
@@ -430,14 +430,14 @@ async function readJSONFile(path) {
         return JSON.parse(jsonStr);
     }
     catch (err) {
-        throw error_1.errWithCause(err, `Can't parse json file ${path}`);
+        throw (0, error_1.errWithCause)(err, `Can't parse json file ${path}`);
     }
 }
 async function readCfgFrom(path) {
-    const cfg = await readJSONFile(path_1.join(path, CONFIG_FILE));
-    const accessDir = path_1.join(path, ACCESS_DIR);
+    const cfg = await readJSONFile((0, path_1.join)(path, CONFIG_FILE));
+    const accessDir = (0, path_1.join)(path, ACCESS_DIR);
     const accessDirFound = await folderExists(accessDir);
-    const gensDir = path_1.join(path, GENERATIONS_DIR);
+    const gensDir = (0, path_1.join)(path, GENERATIONS_DIR);
     const gensDirFound = await folderExists(gensDir);
     if (cfg === undefined) {
         if (accessDirFound || (gensDirFound)) {
@@ -455,24 +455,24 @@ async function readCfgFrom(path) {
 }
 async function writeCfgTo(path, cfg) {
     try {
-        await fs.writeFile(path_1.join(path, CONFIG_FILE), JSON.stringify(cfg), { encoding: 'utf8' });
+        await fs.writeFile((0, path_1.join)(path, CONFIG_FILE), JSON.stringify(cfg), { encoding: 'utf8' });
     }
     catch (err) {
         if (!err.notFound) {
             throw err;
         }
         await fs.ensureFolderExists(path);
-        await fs.writeFile(path_1.join(path, CONFIG_FILE), JSON.stringify(cfg), { encoding: 'utf8' });
+        await fs.writeFile((0, path_1.join)(path, CONFIG_FILE), JSON.stringify(cfg), { encoding: 'utf8' });
     }
 }
 function checkCfg(cfg, needGens = false) {
-    assert_1.assert(Number.isInteger(cfg.numOfSplits) && (cfg.numOfSplits > 0), `Invalid numOfSplits in object folders' configuration: ${cfg.numOfSplits}`);
-    assert_1.assert(Number.isInteger(cfg.charsInSplit) && (cfg.charsInSplit > 0), `Invalid charsInSplit in object folders' configuration: ${cfg.charsInSplit}`);
-    assert_1.assert(cfg.numOfSplits * cfg.charsInSplit < Math.floor(xsp_files_1.NONCE_LENGTH / 3 * 4), `Invalid splits configuration, expecting too many letters in object id`);
+    (0, assert_1.assert)(Number.isInteger(cfg.numOfSplits) && (cfg.numOfSplits > 0), `Invalid numOfSplits in object folders' configuration: ${cfg.numOfSplits}`);
+    (0, assert_1.assert)(Number.isInteger(cfg.charsInSplit) && (cfg.charsInSplit > 0), `Invalid charsInSplit in object folders' configuration: ${cfg.charsInSplit}`);
+    (0, assert_1.assert)(cfg.numOfSplits * cfg.charsInSplit < Math.floor(xsp_files_1.NONCE_LENGTH / 3 * 4), `Invalid splits configuration, expecting too many letters in object id`);
     if (needGens) {
         const gens = cfg.generations;
-        assert_1.assert(Array.isArray(gens), `Invalid generations in object folders' configuration: ${gens}`);
-        assert_1.assert(gens.length > 0, `Config must have at least one generation`);
+        (0, assert_1.assert)(Array.isArray(gens), `Invalid generations in object folders' configuration: ${gens}`);
+        (0, assert_1.assert)(gens.length > 0, `Config must have at least one generation`);
     }
 }
 async function allTreePaths(path, numOfSplits, logError) {
@@ -495,7 +495,7 @@ async function allTreePaths(path, numOfSplits, logError) {
         if (f === ROOT_OBJ_DIR) {
             continue;
         }
-        const treePaths = await allTreePaths(path_1.join(path, f), numOfSplits - 1, logError);
+        const treePaths = await allTreePaths((0, path_1.join)(path, f), numOfSplits - 1, logError);
         for (let j = 0; j < treePaths.length; j += 1) {
             const branch = treePaths[j];
             branch.unshift(f);

package/build/lib-client/objs-on-disk/obj-on-disk.d.ts

@@ -2,7 +2,8 @@ import { ObjId } from '../3nstorage/xsp-fs/common';
 import { ObjSource, Subscribe, Layout } from 'xsp-files';
 import { FileWrite } from './file-writing-proc';
 import { Observable } from 'rxjs';
-import { NotOnDiskFiniteChunk } from '../../lib-common/objs-on-disk/file-layout';
+import { NotOnDiskFiniteChunk, FiniteChunk } from '../../lib-common/objs-on-disk/file-layout';
+import { DiffInfo } from '../../lib-common/service-api/3nstorage/owner';
 export declare type GetBaseSegsOnDisk = (version: number, ofs: number, len: number) => Promise<(Uint8Array | NotOnDiskFiniteChunk)[]>;
 export declare class ObjOnDisk {
     readonly objId: ObjId;
@@ -11,6 +12,7 @@ export declare class ObjOnDisk {
     private readonly downloader;
     private readable;
     private readonly getBaseSegsOnDisk;
+    private proxiedHeader;
     private constructor();
     static forExistingFile(objId: ObjId, version: number, path: string, downloader?: ObjDownloader, getBase?: GetBaseSegsOnDisk): Promise<ObjOnDisk>;
     static createFileForExistingVersion(objId: ObjId, version: number, path: string, downloader: ObjDownloader, getBase?: GetBaseSegsOnDisk, initDownload?: InitDownloadParts): Promise<ObjOnDisk>;
@@ -18,7 +20,11 @@ export declare class ObjOnDisk {
         obj: ObjOnDisk;
         write$: Observable<FileWrite[]>;
     }>;
-    moveFile(newPath: string): Promise<void>;
+    moveFileAndProxyThis(newPath: string, objVersionChange: {
+        version: number;
+        newHeader: Uint8Array;
+        originalHeader: Uint8Array;
+    } | undefined): Promise<ObjOnDisk>;
     removeFile(): Promise<void>;
     private readHeader;
     private readSegs;
@@ -27,6 +33,11 @@ export declare class ObjOnDisk {
     private downloadAndSaveSegsChunk;
     getSrc(): ObjSource;
     getBaseVersion(): number | undefined;
+    absorbImmediateBaseVersion(baseVer: number, path: string): Promise<void>;
+    diffFromBase(): {
+        diff: DiffInfo;
+        newSegsPackOrder: FiniteChunk[];
+    };
 }
 export interface ObjDownloader {
     getLayoutWithHeaderAndFirstSegs(objId: ObjId, version: number): Promise<InitDownloadParts>;

package/build/lib-client/objs-on-disk/obj-on-disk.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2018 - 2020 3NSoft Inc.
+ Copyright (C) 2018 - 2020, 2022 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
@@ -32,6 +32,7 @@ class ObjOnDisk {
         this.downloader = downloader;
         this.readable = readable;
         this.getBaseSegsOnDisk = getBaseSegsOnDisk;
+        this.proxiedHeader = undefined;
         Object.seal(this);
     }
     static async forExistingFile(objId, version, path, downloader, getBase) {
@@ -61,20 +62,28 @@ class ObjOnDisk {
         const objFile = await obj_file_1.ObjVersionFile.createNew(path);
         const obj = new ObjOnDisk(objId, version, objFile, downloader, false, getBase);
         const write$ = file_writing_proc_1.FileWritingProc.makeFor(objFile, encSub)
-            .pipe(operators_1.tap({
+            .pipe((0, operators_1.tap)({
             complete: () => {
                 obj.readable = true;
             }
-        }), utils_for_observables_1.flatTap(undefined, () => objFile.removeFile()), utils_for_observables_1.allowOnlySingleStart());
+        }), (0, utils_for_observables_1.flatTap)(undefined, () => objFile.removeFile()), (0, utils_for_observables_1.allowOnlySingleStart)());
         return { obj, write$ };
     }
-    async moveFile(newPath) {
-        await this.objFile.moveFile(newPath);
+    async moveFileAndProxyThis(newPath, objVersionChange) {
+        const newObjOnDisk = new ObjOnDisk(this.objId, (objVersionChange ? objVersionChange.version : this.version), this.objFile, this.downloader, this.readable, this.getBaseSegsOnDisk);
+        if (objVersionChange) {
+            this.proxiedHeader = objVersionChange.originalHeader;
+        }
+        await this.objFile.moveFile(newPath, objVersionChange === null || objVersionChange === void 0 ? void 0 : objVersionChange.newHeader);
+        return newObjOnDisk;
     }
     async removeFile() {
         await this.objFile.removeFile();
     }
     async readHeader() {
+        if (this.proxiedHeader) {
+            return this.proxiedHeader;
+        }
         let h = await this.objFile.readHeader();
         if (h) {
             return h;
@@ -99,7 +108,7 @@ class ObjOnDisk {
                 bytes.push(chunkBytes);
             }
         }
-        return buffer_utils_1.joinByteArrs(bytes);
+        return (0, buffer_utils_1.joinByteArrs)(bytes);
     }
     async readSegsOnlyFromDisk(offset, len) {
         const segsLocations = this.objFile.segsLocations(offset, len);
@@ -166,7 +175,7 @@ class ObjOnDisk {
         if (!this.readable) {
             throw new Error(`Version ${this.version} of obj ${this.objId} is not readable, yet`);
         }
-        const segSrc = wrapping_1.wrapAndSyncSource(new ByteSourceFromObjOnDisk((ofs, len) => this.readSegs(ofs, len), () => this.objFile.getTotalSegsLen()));
+        const segSrc = (0, wrapping_1.wrapAndSyncSource)(new ByteSourceFromObjOnDisk((ofs, len) => this.readSegs(ofs, len), () => this.objFile.getTotalSegsLen()));
         const objSrc = {
             readHeader: () => this.readHeader(),
             segSrc,
@@ -177,6 +186,12 @@ class ObjOnDisk {
     getBaseVersion() {
         return this.objFile.getBaseVersion();
     }
+    absorbImmediateBaseVersion(baseVer, path) {
+        return this.objFile.absorbImmediateBaseVersion(baseVer, path);
+    }
+    diffFromBase() {
+        return this.objFile.diffFromBase();
+    }
 }
 exports.ObjOnDisk = ObjOnDisk;
 Object.freeze(ObjOnDisk.prototype);
@@ -189,7 +204,7 @@ class ByteSourceFromObjOnDisk {
         Object.seal(this);
     }
     async read(len) {
-        assert_1.assert((Number.isInteger(len) && (len >= 0)) || (len === undefined), 'Illegal length parameter given: ' + len);
+        (0, assert_1.assert)((Number.isInteger(len) && (len >= 0)) || (len === undefined), 'Illegal length parameter given: ' + len);
         const start = this.segsPointer;
         if (len === undefined) {
             const segsLen = this.totalSegsLen();
@@ -211,7 +226,7 @@ class ByteSourceFromObjOnDisk {
             { size, isEndless: false } : { size: 0, isEndless: true });
     }
     async seek(offset) {
-        assert_1.assert(Number.isInteger(offset) && (offset >= 0), 'Illegal offset is given to seek: ' + offset);
+        (0, assert_1.assert)(Number.isInteger(offset) && (offset >= 0), 'Illegal offset is given to seek: ' + offset);
         const segsLen = this.totalSegsLen();
         if (segsLen === undefined) {
             this.segsPointer = offset;

package/build/lib-client/request-utils.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { HTTPException } from '../lib-common/exceptions/http';
 import * as https from 'https';
 import { ClientRequest } from 'http';

package/build/lib-client/request-utils.js

@@ -22,7 +22,7 @@ const https = require("https");
 const url_1 = require("url");
 const rxjs_1 = require("rxjs");
 const buffer_utils_1 = require("../lib-common/buffer-utils");
-const processes_1 = require("../lib-common/processes");
+const deferred_1 = require("../lib-common/processes/deferred");
 const operators_1 = require("rxjs/operators");
 exports.SESSION_ID_HEADER = "X-Session-Id";
 exports.CONTENT_TYPE_HEADER = 'Content-Type';
@@ -30,7 +30,7 @@ async function processRequest(requester, httpsOpts, opts, reqBody, attempt = 0)
     try {
         const req = requester(httpsOpts);
         const resPromise = attachRequestReaders(req, opts);
-        req.end(reqBody ? buffer_utils_1.toBuffer(reqBody) : undefined);
+        req.end(reqBody ? (0, buffer_utils_1.toBuffer)(reqBody) : undefined);
         const { res, resBody } = await resPromise;
         const rep = formReply(res, resBody, opts);
         return rep;
@@ -51,7 +51,7 @@ function formHttpsReqOpts(opts, contentType, reqBody) {
     if (reqBody && (opts.method !== 'POST') && (opts.method !== 'PUT')) {
         throw new Error(`Cannot have body in ${opts.method} request.`);
     }
-    const url = url_1.parse(opts.url);
+    const url = (0, url_1.parse)(opts.url);
     const netReqOpts = {
         protocol: url.protocol,
         method: opts.method,
@@ -78,14 +78,14 @@ function attachRequestReaders(clReq, opts) {
     // note that we attach reading of body to response as close as possible to
     // its appearance, so as not to miss any incoming data, which may happen if
     // next tick occurs in between.
-    const response$ = rxjs_1.fromEvent(clReq, 'response', (res) => ({ res, resBodyPromise: readAllBytesFrom(res) }))
-        .pipe(operators_1.take(1));
-    const err$ = rxjs_1.fromEvent(clReq, 'error')
-        .pipe(operators_1.map(e => {
-        throw http_1.makeConnectionException(opts.url, opts.method, 'Cannot connect', e);
-    }), operators_1.takeUntil(response$));
-    return rxjs_1.merge(response$, err$)
-        .pipe(operators_1.mergeMap(async (resAndBodyProm) => {
+    const response$ = (0, rxjs_1.fromEvent)(clReq, 'response', (res) => ({ res, resBodyPromise: readAllBytesFrom(res) }))
+        .pipe((0, operators_1.take)(1));
+    const err$ = (0, rxjs_1.fromEvent)(clReq, 'error')
+        .pipe((0, operators_1.map)(e => {
+        throw (0, http_1.makeConnectionException)(opts.url, opts.method, 'Cannot connect', e);
+    }), (0, operators_1.takeUntil)(response$));
+    return (0, rxjs_1.merge)(response$, err$)
+        .pipe((0, operators_1.mergeMap)(async (resAndBodyProm) => {
         const { res, resBodyPromise } = resAndBodyProm;
         const resBody = await resBodyPromise;
         return { res, resBody };
@@ -109,7 +109,7 @@ function isTimeoutErr(err, opts, currentAttempt) {
 }
 async function readAllBytesFrom(stream) {
     const buf = new bytes_fifo_buffer_1.BytesFIFOBuffer();
-    const deferred = processes_1.defer();
+    const deferred = (0, deferred_1.defer)();
     stream.on('error', e => deferred.reject(e));
     stream.on('data', chunk => buf.push(chunk));
     stream.on('end', () => deferred.resolve(buf.getBytes(undefined)));
@@ -131,7 +131,7 @@ function formReply(res, resBody, reqOpts) {
         }
         catch (err) {
             if (resContentType === 'application/json') {
-                throw http_1.makeHTTPException(reqOpts.url, reqOpts.method, status, `Cannot parse received bytes`, err);
+                throw (0, http_1.makeHTTPException)(reqOpts.url, reqOpts.method, status, `Cannot parse received bytes`, err);
             }
         }
     }
@@ -171,7 +171,7 @@ function makeHeaders(headers) {
  * @return http exception based on given reply, with an optional message
  */
 function makeException(rep, errMsg) {
-    return http_1.makeHTTPException(rep.url, rep.method, rep.status, errMsg);
+    return (0, http_1.makeHTTPException)(rep.url, rep.method, rep.status, errMsg);
 }
 exports.makeException = makeException;
 function extractIntHeader(rep, headerName) {

package/build/lib-client/server-events.d.ts

@@ -1,6 +1,6 @@
 import { SubscribingClient } from '../lib-common/ipc/generic-ipc';
 import { Observable } from 'rxjs';
-export declare class ServerEvents {
+export declare class ServerEvents<N extends string, T> {
     private subscribeToServer;
     private restartWaitSecs;
     private server;
@@ -8,9 +8,9 @@ export declare class ServerEvents {
     constructor(subscribeToServer: () => Promise<SubscribingClient>, restartWaitSecs: number);
     /**
      * This method creates an observable of server's events.
-     * @param serverEvent is an event on server, to which to subscribe.
+     * @param event is an event on server, to which to subscribe.
      */
-    observe<T>(event: string): Observable<T>;
+    observe(event: N): Observable<T>;
     private setServer;
     private shouldRestartAfterErr;
     private restartObservation;

package/build/lib-client/server-events.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2017, 2019 3NSoft Inc.
+ Copyright (C) 2017, 2019, 2022 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
@@ -13,11 +13,13 @@
  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/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerEvents = void 0;
 const rxjs_1 = require("rxjs");
-const processes_1 = require("../lib-common/processes");
+const synced_1 = require("../lib-common/processes/synced");
+const sleep_1 = require("../lib-common/processes/sleep");
 const operators_1 = require("rxjs/operators");
 const error_1 = require("../lib-common/exceptions/error");
 class ServerEvents {
@@ -25,12 +27,12 @@ class ServerEvents {
         this.subscribeToServer = subscribeToServer;
         this.restartWaitSecs = restartWaitSecs;
         this.server = undefined;
-        this.openningServer = new processes_1.SingleProc();
+        this.openningServer = new synced_1.SingleProc();
         Object.seal(this);
     }
     /**
      * This method creates an observable of server's events.
-     * @param serverEvent is an event on server, to which to subscribe.
+     * @param event is an event on server, to which to subscribe.
      */
     observe(event) {
         const event$ = new rxjs_1.Observable(observer => {
@@ -69,13 +71,13 @@ class ServerEvents {
                 }
             };
         })
-            .pipe(operators_1.catchError(err => {
+            .pipe((0, operators_1.catchError)(err => {
             if (this.shouldRestartAfterErr(err)) {
-                console.error(error_1.stringifyErr(err));
+                console.error((0, error_1.stringifyErr)(err));
                 return this.restartObservation(event);
             }
             else {
-                return rxjs_1.throwError(err);
+                return (0, rxjs_1.throwError)(err);
             }
         }));
         return event$;
@@ -106,8 +108,8 @@ class ServerEvents {
         }
     }
     restartObservation(event) {
-        return rxjs_1.from(processes_1.sleep(this.restartWaitSecs * 1000))
-            .pipe(operators_1.mergeMap(() => this.observe(event)));
+        return (0, rxjs_1.from)((0, sleep_1.sleep)(this.restartWaitSecs * 1000))
+            .pipe((0, operators_1.mergeMap)(() => this.observe(event)));
     }
 }
 exports.ServerEvents = ServerEvents;

package/build/lib-client/service-locator.js

@@ -21,7 +21,7 @@ const jwkeys_1 = require("../lib-common/jwkeys");
 const url_1 = require("url");
 const request_utils_1 = require("./request-utils");
 async function readJSONLocatedAt(client, url) {
-    if (url_1.parse(url).protocol !== 'https:') {
+    if ((0, url_1.parse)(url).protocol !== 'https:') {
         throw new Error("Url protocol must be https.");
     }
     const rep = await client.doBodylessRequest({
@@ -31,20 +31,20 @@ async function readJSONLocatedAt(client, url) {
     });
     if (rep.status === 200) {
         if (!rep.data) {
-            throw request_utils_1.makeException(rep, 'Malformed reply');
+            throw (0, request_utils_1.makeException)(rep, 'Malformed reply');
         }
         return rep;
     }
     else {
-        throw request_utils_1.makeException(rep, 'Unexpected status');
+        throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
     }
 }
 function transformPathToCompleteUri(url, path, rep) {
-    const uInit = url_1.parse(url);
+    const uInit = (0, url_1.parse)(url);
     const protoAndHost = `${uInit.protocol}//${uInit.host}`;
-    const uPath = url_1.parse(path);
+    const uPath = (0, url_1.parse)(path);
     if (!uPath.path || !uPath.href || !uPath.href.startsWith(uPath.path)) {
-        throw request_utils_1.makeException(rep, `Malformed path parameter ${path}`);
+        throw (0, request_utils_1.makeException)(rep, `Malformed path parameter ${path}`);
     }
     if (uPath.href.startsWith('/')) {
         return `${protoAndHost}${uPath.href}`;
@@ -88,15 +88,15 @@ async function mailerIdInfoAt(client, url) {
         transform.provisioning = transformPathToCompleteUri(url, json.provisioning, rep);
     }
     else {
-        throw request_utils_1.makeException(rep, 'Malformed reply');
+        throw (0, request_utils_1.makeException)(rep, 'Malformed reply');
     }
     if (('object' === typeof json["current-cert"]) &&
-        jwkeys_1.isLikeSignedKeyCert(json["current-cert"])) {
+        (0, jwkeys_1.isLikeSignedKeyCert)(json["current-cert"])) {
         transform.currentCert = json["current-cert"];
         transform.previousCerts = json["previous-certs"];
     }
     else {
-        throw request_utils_1.makeException(rep, 'Malformed reply');
+        throw (0, request_utils_1.makeException)(rep, 'Malformed reply');
     }
     Object.freeze(transform);
     return transform;
@@ -223,7 +223,7 @@ exports.makeServiceLocator = makeServiceLocator;
  */
 async function getMailerIdInfoFor(resolver, client, address) {
     const serviceURL = await resolver(address);
-    const rootAddr = url_1.parse(serviceURL).hostname;
+    const rootAddr = (0, url_1.parse)(serviceURL).hostname;
     const info = await mailerIdInfoAt(client, serviceURL);
     return {
         info: info,

package/build/lib-client/user-with-mid-session.js

@@ -49,7 +49,7 @@ class ServiceUser {
         return this.uri;
     }
     set serviceURI(uriString) {
-        const u = url_1.parse(uriString);
+        const u = (0, url_1.parse)(uriString);
         if (u.protocol !== 'https:') {
             throw new Error("Url protocol must be https.");
         }
@@ -86,7 +86,7 @@ class ServiceUser {
     async startSession() {
         this.throwOnBadServiceURI();
         // make first call
-        const fstReply = await login_1.startMidSession(this.userId, this.net, this.loginUrl);
+        const fstReply = await (0, login_1.startMidSession)(this.userId, this.net, this.loginUrl);
         if (fstReply.sessionId) {
             return fstReply.sessionId;
         }
@@ -94,10 +94,10 @@ class ServiceUser {
             throw new Error(`Service ${this.serviceURI} redirects on MailerId login, while redirect is not allowed`);
         }
         // following redirect
-        assert_1.assert(!!fstReply.redirect);
+        (0, assert_1.assert)(!!fstReply.redirect);
         this.redirectedFrom = this.serviceURI;
         this.serviceURI = fstReply.redirect;
-        const sndReply = await login_1.startMidSession(this.userId, this.net, this.loginUrl);
+        const sndReply = await (0, login_1.startMidSession)(this.userId, this.net, this.loginUrl);
         if (sndReply.sessionId) {
             return sndReply.sessionId;
         }
@@ -107,7 +107,7 @@ class ServiceUser {
     }
     async authenticateSession(sessionId, midSigner) {
         this.throwOnBadServiceURI();
-        await login_1.authenticateMidSession(sessionId, midSigner, this.net, this.loginUrl);
+        await (0, login_1.authenticateMidSession)(sessionId, midSigner, this.net, this.loginUrl);
     }
     /**
      * This starts and authorizes a new session.
@@ -156,7 +156,7 @@ class ServiceUser {
             this.sessionId = undefined;
         }
         else {
-            throw request_utils_1.makeException(rep, 'Unexpected status');
+            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
         }
     }
     async callEnsuringLogin(func) {
@@ -215,7 +215,7 @@ class ServiceUser {
         };
         return this.callEnsuringLogin(() => {
             this.prepCallOpts(opts, true);
-            return ws_utils_1.openSocket(opts.url, opts.sessionId);
+            return (0, ws_utils_1.openSocket)(opts.url, opts.sessionId);
         });
     }
 }