core-3nweb-client-lib 0.43.9 → 0.43.12

package/build/lib-client/fs-utils/files.js

@@ -87,7 +87,7 @@ function wrapWritableFileSyncAPI(sImpl) {
     }
     const w = {
         status: sImpl.status.bind(sImpl),
-        download: sImpl.download.bind(sImpl),
+        startDownload: sImpl.startDownload.bind(sImpl),
         isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),
         startUpload: sImpl.startUpload.bind(sImpl),
         upload: sImpl.upload.bind(sImpl),
@@ -140,7 +140,7 @@ function wrapReadonlyFileSyncAPI(sImpl) {
     }
     const w = {
         status: sImpl.status.bind(sImpl),
-        download: sImpl.download.bind(sImpl),
+        startDownload: sImpl.startDownload.bind(sImpl),
         isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),
         adoptRemote: sImpl.adoptRemote.bind(sImpl),
     };
@@ -234,7 +234,7 @@ function wrapWritableFSSyncAPI(sImpl) {
     }
     const w = {
         status: sImpl.status.bind(sImpl),
-        download: sImpl.download.bind(sImpl),
+        startDownload: sImpl.startDownload.bind(sImpl),
         isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),
         adoptRemote: sImpl.adoptRemote.bind(sImpl),
         diffCurrentAndRemoteFolderVersions: sImpl.diffCurrentAndRemoteFolderVersions.bind(sImpl),
@@ -296,7 +296,7 @@ function wrapReadonlyFSSyncAPI(sImpl) {
     }
     const w = {
         status: sImpl.status.bind(sImpl),
-        download: sImpl.download.bind(sImpl),
+        startDownload: sImpl.startDownload.bind(sImpl),
         isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),
         adoptRemote: sImpl.adoptRemote.bind(sImpl),
         diffCurrentAndRemoteFolderVersions: sImpl.diffCurrentAndRemoteFolderVersions.bind(sImpl),

package/build/lib-client/mailer-id/login.js

@@ -19,7 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.startMidSession = startMidSession;
 exports.authenticateMidSession = authenticateMidSession;
 const api = require("../../lib-common/service-api/mailer-id/login");
-const request_utils_1 = require("../request-utils");
+const http_1 = require("../../lib-common/exceptions/http");
 const url_1 = require("url");
 async function startMidSession(userId, net, loginUrl) {
     const reqData = { userId };
@@ -34,24 +34,24 @@ async function startMidSession(userId, net, loginUrl) {
     if (rep.status === api.startSession.SC.ok) {
         const r = rep.data;
         if (!r || (typeof r.sessionId !== 'string') || !r.sessionId) {
-            throw (0, request_utils_1.makeException)(rep, 'Malformed reply to starting session');
+            throw (0, http_1.makeMalformedReplyHTTPException)(rep);
         }
         return { sessionId: r.sessionId };
     }
     else if (rep.status === api.startSession.SC.redirect) {
         const rd = rep.data;
         if (!rd || ('string' !== typeof rd.redirect) || !rd.redirect) {
-            throw (0, request_utils_1.makeException)(rep, 'Malformed redirect reply to starting session');
+            throw (0, http_1.makeMalformedReplyHTTPException)(rep);
         }
         return { redirect: rd.redirect };
     }
     else if (rep.status === api.startSession.SC.unknownUser) {
-        const exc = (0, request_utils_1.makeException)(rep);
+        const exc = (0, http_1.makeHTTPException)(rep.url, rep.method, rep.status, {});
         exc.unknownUser = true;
         throw exc;
     }
     else {
-        throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+        throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
     }
 }
 async function authenticateMidSession(sessionId, midSigner, net, loginUrl) {
@@ -73,12 +73,12 @@ async function authenticateMidSession(sessionId, midSigner, net, loginUrl) {
         return;
     }
     else if (rep.status === api.authSession.SC.authFailed) {
-        const exc = (0, request_utils_1.makeException)(rep);
+        const exc = (0, http_1.makeHTTPException)(rep.url, rep.method, rep.status, {});
         exc.loginFailed = true;
         throw exc;
     }
     else {
-        throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+        throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
     }
 }
 Object.freeze(exports);

package/build/lib-client/mailer-id/provisioner.js

@@ -17,7 +17,6 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MailerIdProvisioner = void 0;
-const request_utils_1 = require("../request-utils");
 const service_locator_1 = require("../service-locator");
 const user_with_pkl_session_1 = require("../user-with-pkl-session");
 const jwkeys_1 = require("../../lib-common/jwkeys");
@@ -29,6 +28,7 @@ const url_1 = require("url");
 const assert_1 = require("../../lib-common/assert");
 const user_1 = require("../../lib-common/mailerid-sigs/user");
 const relying_party_1 = require("../../lib-common/mailerid-sigs/relying-party");
+const http_1 = require("../../lib-common/exceptions/http");
 const DEFAULT_ASSERTION_VALIDITY = 20 * 60;
 /**
  * Certificate provisioner is an object that can do all MailerId's provisioning
@@ -87,10 +87,10 @@ class MailerIdProvisioner extends user_with_pkl_session_1.ServiceUser {
                     certs = this.encryptor.openJSON(rep.data);
                 }
                 catch (err) {
-                    throw (0, request_utils_1.makeException)(rep, 'Malformed reply: ' + err.message);
+                    throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: err.message });
                 }
                 if (!certs.userCert || !certs.provCert) {
-                    throw (0, request_utils_1.makeException)(rep, 'Malformed reply: Certificates are missing.');
+                    throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'Certificates are missing.' });
                 }
                 if (certs.provCert.kid !== this.rootCert.kid) {
                     const { currentCert, previousCerts } = await (0, service_locator_1.mailerIdInfoAt)(this.net, this.entryURI);
@@ -100,22 +100,24 @@ class MailerIdProvisioner extends user_with_pkl_session_1.ServiceUser {
                         this.rootCert = rootCert;
                     }
                     else {
-                        throw (0, request_utils_1.makeException)(rep, 'Malformed reply: referenced root MailerId certificate id is unknown.');
+                        throw (0, http_1.makeMalformedReplyHTTPException)(rep, {
+                            message: 'referenced root MailerId certificate id is unknown.'
+                        });
                     }
                 }
                 const pkeyAndId = (0, relying_party_1.verifyChainAndGetUserKey)({ user: certs.userCert, prov: certs.provCert, root: this.rootCert }, this.midDomain, (0, jwkeys_1.getKeyCert)(certs.userCert).issuedAt + 1);
                 if (pkeyAndId.address !== (0, canonical_address_1.toCanonicalAddress)(this.userId)) {
-                    throw (0, request_utils_1.makeException)(rep, 'Malformed reply: Certificate is for a wrong address.');
+                    throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'Certificate is for a wrong address.' });
                 }
                 const keyInCert = (0, jwkeys_1.keyToJson)(pkeyAndId.pkey);
                 if (!(0, json_utils_1.deepEqual)(keyInCert, pkey)) {
-                    throw (0, request_utils_1.makeException)(rep, 'Malformed reply: Certificate is for a wrong key.');
+                    throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'Certificate is for a wrong key.' });
                 }
                 this.userCert = certs.userCert;
                 this.provCert = certs.provCert;
             }
             else {
-                throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+                throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
             }
         }
         finally {

package/build/lib-client/objs-on-disk/file-writing-proc.d.ts

@@ -1,6 +1,6 @@
 import { Subscribe } from 'xsp-files';
 import { Observable } from 'rxjs';
-import { ObjVersionFile } from '../../lib-common/objs-on-disk/obj-file';
+import { ObjVersionFile } from '../../lib-common/objs-on-disk/obj-version-file';
 export declare class FileWritingProc {
     private readonly objFile;
     private readonly pValve;

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

@@ -1,7 +1,8 @@
-import { ObjId } from '../xsp-fs/common';
+import { DownloadEventSink, ObjId } from '../xsp-fs/common';
 import { ObjSource, Subscribe, Layout } from 'xsp-files';
 import { FileWrite } from './file-writing-proc';
 import { Observable } from 'rxjs';
+import { ObjVersionFile } from '../../lib-common/objs-on-disk/obj-version-file';
 import { NotOnDiskFiniteChunk, FiniteChunk } from '../../lib-common/objs-on-disk/file-layout';
 import { DiffInfo } from '../../lib-common/service-api/3nstorage/owner';
 export type GetBaseSegsOnDisk = (version: number, ofs: number, len: number) => Promise<(Uint8Array | NotOnDiskFiniteChunk)[]>;
@@ -12,6 +13,7 @@ export declare class ObjOnDisk {
     private readonly downloader;
     private readable;
     private readonly getBaseSegsOnDisk;
+    private downloadsInProgress;
     private proxiedHeader;
     private constructor();
     static forExistingFile(objId: ObjId, version: number, path: string, downloader?: ObjDownloader, getBase?: GetBaseSegsOnDisk): Promise<ObjOnDisk>;
@@ -28,9 +30,9 @@ export declare class ObjOnDisk {
     removeFile(): Promise<void>;
     private readHeader;
     private readSegs;
+    private downloads;
     readSegsOnlyFromDisk(offset: number, len: number): Promise<(Uint8Array | NotOnDiskFiniteChunk)[]>;
     private readBaseBytesFromOtherFilesOnDisk;
-    private downloadAndSaveSegsChunk;
     getSrc(): ObjSource;
     getBaseVersion(): number | undefined;
     absorbImmediateBaseVersion(baseVer: number, path: string): Promise<void>;
@@ -41,14 +43,60 @@ export declare class ObjOnDisk {
     private segsThatNeedDownload;
     doesFileNeedDownload(): boolean;
     numOfBytesNeedingDownload(): number;
-    downloadMissingSections(): Promise<void>;
+    startDownloadInBackground(eventSink: DownloadEventSink): number | undefined;
+}
+export declare class Download {
+    readonly objId: ObjId;
+    readonly version: number;
+    private readonly downloader;
+    saveSegs?: ObjVersionFile["saveSegs"] | undefined;
+    segsThatNeedDownload?: ObjOnDisk["segsThatNeedDownload"] | undefined;
+    private readonly segsAsapRequest;
+    private initDataRequest;
+    private inBkgrnd;
+    constructor(objId: ObjId, version: number, downloader: ObjDownloader, saveSegs?: ObjVersionFile["saveSegs"] | undefined, segsThatNeedDownload?: ObjOnDisk["segsThatNeedDownload"] | undefined);
+    getInitParts(): Promise<InitDownloadParts>;
+    downloadAndSaveSegsChunk(chunk: NotOnDiskFiniteChunk): Promise<Uint8Array>;
+    downloadAllInBackground(eventSink: DownloadEventSink): number | undefined;
+    nextActionType(): {
+        runASAP: boolean;
+    } | undefined;
+    startNextAction(): Promise<void> | undefined;
+    private processInitDataRequest;
+    private processSomeAsapSegs;
+    private processBkgrnd;
+    private completeBkgrnd;
+    private emitDownloadEvent;
 }
 export interface ObjDownloader {
     getLayoutWithHeaderAndFirstSegs: (objId: ObjId, version: number) => Promise<InitDownloadParts>;
     getSegs: (objId: ObjId, version: number, start: number, end: number) => Promise<Uint8Array>;
+    splitSegsDownloads: (start: number, end: number) => Section[];
+    schedule: (download: Download) => void;
 }
 export interface InitDownloadParts {
     layout: Layout;
     header: Uint8Array;
     segs?: Uint8Array;
 }
+export declare class DownloadsRunner {
+    private readonly downloads;
+    private readonly longRunsPool;
+    private readonly asapPool;
+    constructor(asapPoolMax?: number, longPoolMax?: number);
+    schedule(download: Download): void;
+    private removeDownload;
+    private triggerRuns;
+    private triggerRunsInPool;
+}
+export interface Section {
+    ofs: number;
+    len: number;
+    repeatCount?: number;
+    repeatLen?: number;
+}
+export declare function splitSegsDownloads(start: number, end: number, max: number): Section[];
+export declare function generateSectionsFrom(sections: Section[]): Generator<{
+    ofs: number;
+    len: number;
+}, void, unknown>;