core-3nweb-client-lib 0.28.2 → 0.28.4

package/build/api-defs/asmail.d.ts

@@ -36,21 +36,28 @@ declare namespace web3n.asmail {
 
 	interface DeliveryProgress {
 		notConnected?: true;
-		allDone: boolean;
+		allDone?: 'all-ok' | 'with-errors';
 		msgSize: number;
 		localMeta?: any;
 		recipients: {
 			[address: string]: {
 				done: boolean;
 				idOnDelivery?: string;
-				err?: any;
+				deliveryTS?: number;
+				err?: DeliveryException | RuntimeException | Error;
 				bytesSent: number;
 				// XXX
-				nonFstAttempt?: boolean;
+				awaitingRetry?: boolean;
+				failedAttempts?: {
+					attemptTS: number;
+					err: any;
+				}[];
 			}
 		};
 	}
 
+	type DeliveryException = ASMailSendException | ServLocException | ASMailSendException;
+
 	interface DeliveryOptions {
 		/**
 		 * sendImmediately flag forces immediate delivery with true value.
@@ -63,9 +70,11 @@ declare namespace web3n.asmail {
 		 */
 		localMeta?: any;
 
+		// XXX
+		
 		retryRecipient?: {
 			numOfAttempts: number;
-			// XXX default client says "ASAP" => figgure it out
+			// XXX default client says "ASAP" => core applies own sane default
 			timeBetweenAttempts?: number;
 		};
 	}
@@ -229,25 +238,25 @@ declare namespace web3n.asmail {
 		carbonCopy?: string[];
 		recipients?: string[];
 	}
-	
+
 	interface MsgInfo {
 		msgId: string;
 		msgType: string;
 		deliveryTS: number;
 	}
-	
+
 	interface IncomingMessage extends MsgInfo, MsgStruct {
 		sender: string;
 		establishedSenderKeyChain: boolean;
 		attachments?: files.ReadonlyFS;
 		// XXX info if not from the first attempt
 	}
-	
+
 	interface OutgoingMessage extends MsgStruct {
 		msgId?: string;
 		attachments?: AttachmentsContainer;
 	}
-	
+
 	/**
 	 * This container is for entities that will be present in attachments
 	 * fs/folder of recipient's incoming message.
@@ -260,7 +269,7 @@ declare namespace web3n.asmail {
 			[name: string]: files.FS;
 		};
 	}
-	
+
 	interface InboxException extends RuntimeException {
 		type: "inbox";
 		msgId: string;
@@ -269,14 +278,23 @@ declare namespace web3n.asmail {
 		objId?: string;
 		msgIsBroken?: true;
 	}
-	
+
 	interface ServLocException extends RuntimeException {
 		type: 'service-locating';
 		address: string;
+
+		/**
+		 * domainNotFound flag indicates that domain in the address doesn't exist.
+		 */
 		domainNotFound?: true;
+
+		/**
+		 * noServiceRecord flag indicates that 3NWeb services are not set at
+		 * domain in the address.
+		 */
 		noServiceRecord?: true;
 	}
-	
+
 	interface ASMailSendException extends RuntimeException {
 		type: 'asmail-delivery';
 		address?: string;
@@ -297,5 +315,5 @@ declare namespace web3n.asmail {
 		// errors that are due to this side
 		msgCancelled?: true;
 	}
-	
+
 }

package/build/{ipc-via-protobuf/asmail-cap.d.ts → core/asmail/asmail-cap-ipc.d.ts}

@@ -1,4 +1,4 @@
-import { ExposedObj, Caller, ExposedServices } from './connector';
+import { ExposedObj, Caller, ExposedServices } from '../../ipc-via-protobuf/connector';
 declare type ASMailService = web3n.asmail.Service;
 export declare function exposeASMailCAP(cap: ASMailService, expServices: ExposedServices): ExposedObj<ASMailService>;
 export declare function makeASMailCaller(caller: Caller, objPath: string[]): ASMailService;

package/build/{ipc-via-protobuf/asmail-cap.js → core/asmail/asmail-cap-ipc.js}

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 - 2022 3NSoft Inc.
+ Copyright (C) 2020 - 2023 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
@@ -17,14 +17,14 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeASMailCaller = exports.exposeASMailCAP = void 0;
-const protobuf_msg_1 = require("./protobuf-msg");
-const protobuf_type_1 = require("../lib-client/protobuf-type");
-const asmail_proto_1 = require("../protos/asmail.proto");
-const connector_1 = require("./connector");
+const protobuf_msg_1 = require("../../ipc-via-protobuf/protobuf-msg");
+const protobuf_type_1 = require("../../lib-client/protobuf-type");
+const asmail_proto_1 = require("../../protos/asmail.proto");
+const connector_1 = require("../../ipc-via-protobuf/connector");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const fs_1 = require("./fs");
-const utils_for_observables_1 = require("../lib-common/utils-for-observables");
+const fs_1 = require("../../core-ipc/fs");
+const utils_for_observables_1 = require("../../lib-common/utils-for-observables");
 function exposeASMailCAP(cap, expServices) {
     const out = cap.delivery;
     const box = cap.inbox;
@@ -328,12 +328,33 @@ var addMsg;
         }
         return msg;
     }
+    function retryOptToMsg(opt) {
+        if (!opt) {
+            return;
+        }
+        return {
+            numOfAttempts: opt.numOfAttempts,
+            timeBetweenAttempts: (!!opt.timeBetweenAttempts ?
+                opt.timeBetweenAttempts : 0)
+        };
+    }
+    function retryOptFromMsg(msg) {
+        if (!msg) {
+            return;
+        }
+        return {
+            numOfAttempts: msg.numOfAttempts,
+            timeBetweenAttempts: (!!msg.timeBetweenAttempts ?
+                msg.timeBetweenAttempts : undefined)
+        };
+    }
     function wrapService(fn, expServices) {
         return (reqBody) => {
-            const { id, recipients, msg, localMeta, sendImmediately } = requestType.unpack(reqBody);
+            const { id, recipients, msg, localMeta, sendImmediately, retryRecipient } = requestType.unpack(reqBody);
             const promise = fn((0, protobuf_msg_1.fixArray)(recipients), unpackMsg(msg, expServices), id, {
                 localMeta: (0, protobuf_msg_1.valOfOptAny)(localMeta),
-                sendImmediately: (0, protobuf_msg_1.valOfOpt)(sendImmediately)
+                sendImmediately: (0, protobuf_msg_1.valOfOpt)(sendImmediately),
+                retryRecipient: retryOptFromMsg(retryRecipient)
             });
             return { promise };
         };
@@ -346,6 +367,7 @@ var addMsg;
             if (opts) {
                 req.sendImmediately = (0, protobuf_msg_1.toOptVal)(opts.sendImmediately);
                 req.localMeta = (0, protobuf_msg_1.toOptAny)(opts.localMeta);
+                req.retryRecipient = retryOptToMsg(opts.retryRecipient);
             }
             await caller.startPromiseCall(path, requestType.pack(req));
         };
@@ -383,7 +405,7 @@ const deliveryProgressMsgType = protobuf_type_1.ProtoType.for(asmail_proto_1.asm
 function packDeliveryProgress(p) {
     const m = {
         notConnected: (0, protobuf_msg_1.toOptVal)(p.notConnected),
-        allDone: p.allDone,
+        allDone: (0, protobuf_msg_1.toOptVal)(p.allDone),
         msgSize: p.msgSize,
         localMeta: (0, protobuf_msg_1.toOptAny)(p.localMeta),
         recipients: []
@@ -403,7 +425,7 @@ function packDeliveryProgress(p) {
 }
 function unpackDeliveryProgress(m) {
     const p = {
-        allDone: m.allDone,
+        allDone: (0, protobuf_msg_1.valOfOpt)(m.allDone),
         msgSize: (0, protobuf_msg_1.fixInt)(m.msgSize),
         notConnected: (0, protobuf_msg_1.valOfOpt)(m.notConnected),
         localMeta: (0, protobuf_msg_1.valOfOptAny)(m.localMeta),

package/build/core/asmail/delivery/common.d.ts

@@ -9,6 +9,7 @@ import { LogWarning, LogError } from '../../../lib-client/logging/log-to-file';
 import { ServiceLocator } from '../../../lib-client/service-locator';
 declare type OutgoingMessage = web3n.asmail.OutgoingMessage;
 declare type DeliveryProgress = web3n.asmail.DeliveryProgress;
+declare type DeliveryOptions = web3n.asmail.DeliveryOptions;
 declare type AttachmentsContainer = web3n.asmail.AttachmentsContainer;
 declare type FS = web3n.files.FS;
 declare type WritableFS = web3n.files.WritableFS;
@@ -84,6 +85,7 @@ export interface SavedMsgToSend {
     msgToSend: OutgoingMessage;
     sender: string;
     recipients: string[];
+    retryOpts: DeliveryOptions['retryRecipient'];
 }
 /**
  * This is a utility function that adds a number into given number line

package/build/core/asmail/delivery/index.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2017, 2020 - 2022 3NSoft Inc.
+ Copyright (C) 2016 - 2017, 2020 - 2023 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
@@ -51,10 +51,10 @@ class Delivery {
          */
         this.queuedDelivery = [];
         this.allDeliveries = new rxjs_1.Subject();
-        this.allDeliveries$ = this.allDeliveries.asObservable().pipe((0, operators_1.share)());
+        this.allDeliveries$ = this.allDeliveries.asObservable()
+            .pipe((0, operators_1.share)());
         (0, file_1.ensureCorrectFS)(fs, 'local', true);
-        this.r.notifyMsgProgress =
-            (id, progress) => this.allDeliveries.next({ id, progress });
+        this.r.notifyMsgProgress = (id, progress) => this.allDeliveries.next({ id, progress });
         Object.freeze(this.r);
         Object.freeze(this);
     }
@@ -152,12 +152,12 @@ class Delivery {
             throw new Error(`Message with id ${id} has already been added for delivery`);
         }
         const attachments = common_1.Attachments.fromMsg(msgToSend);
-        const localMeta = (opts ? opts.localMeta : undefined);
+        const localMeta = opts === null || opts === void 0 ? void 0 : opts.localMeta;
         // save msg, in case delivery should be restarted
         const msgFS = await this.makeFSForNewMsg(id);
-        const msg = await msg_1.Msg.forNew(id, msgFS, msgToSend, sender, recipients, this.r, attachments, localMeta);
+        const msg = await msg_1.Msg.forNew(id, msgFS, msgToSend, sender, recipients, this.r, attachments, localMeta, opts === null || opts === void 0 ? void 0 : opts.retryRecipient);
         // add and schedule
-        const sendImmediately = (opts ? !!opts.sendImmediately : false);
+        const sendImmediately = !!(opts === null || opts === void 0 ? void 0 : opts.sendImmediately);
         this.addMsgAndSchedule(msg, sendImmediately);
     }
     async makeFSForNewMsg(id) {
@@ -187,6 +187,7 @@ class Delivery {
                     this.performQueuedDelivery();
                 }
             }, async (err) => {
+                // XXX add to retries queue with some timestamp
                 await this.r.logWarning('Got error when sending a message', err);
                 this.immediateDelivery.delete(msg);
                 this.performQueuedDelivery();
@@ -217,6 +218,7 @@ class Delivery {
                 }
             }
         }, async (err) => {
+            // XXX add to retries queue with some timestamp
             await this.r.logWarning('Got error when sending a message', err);
             if (msg === this.queuedDelivery[0]) {
                 this.queuedDelivery.shift();

package/build/core/asmail/delivery/msg.d.ts

@@ -5,6 +5,7 @@ import { Observable } from 'rxjs';
 declare type WritableFS = web3n.files.WritableFS;
 declare type DeliveryProgress = web3n.asmail.DeliveryProgress;
 declare type OutgoingMessage = web3n.asmail.OutgoingMessage;
+declare type DeliveryOptions = web3n.asmail.DeliveryOptions;
 export declare class Msg {
     readonly id: string;
     readonly r: ResourcesForSending;
@@ -16,6 +17,7 @@ export declare class Msg {
     private cancelled;
     private sender;
     private recipients;
+    private retryOpts;
     private msgToSend;
     private attachments;
     private sequentialWIP;
@@ -25,10 +27,10 @@ export declare class Msg {
     private readonly progressPublisher;
     get progress$(): Observable<DeliveryProgress>;
     private constructor();
-    static forNew(id: string, msgFS: WritableFS, msgToSend: OutgoingMessage, sender: string, recipients: string[], r: ResourcesForSending, attachments: Attachments | undefined, localMeta: any | undefined): Promise<Msg>;
+    static forNew(id: string, msgFS: WritableFS, msgToSend: OutgoingMessage, sender: string, recipients: string[], r: ResourcesForSending, attachments: Attachments | undefined, localMeta: any | undefined, retryOpts: DeliveryOptions['retryRecipient']): Promise<Msg>;
     static forRestart(id: string, msgFS: WritableFS, r: ResourcesForSending): Promise<Msg>;
     private save;
-    notifyOfChanges(saveProgress: boolean, saveWIPs: boolean): void;
+    notifyOfChangesInProgress(saveProgress: boolean, saveWIPs: boolean): void;
     msgPacker(pack?: PackJSON): Promise<MsgPacker>;
     isDone(): boolean;
     isSendingNow(): boolean;

package/build/core/asmail/delivery/msg.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2018, 2020 3NSoft Inc.
+ Copyright (C) 2016 - 2018, 2020, 2023 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
@@ -28,6 +28,8 @@ const MAIN_OBJ_FILE_NAME = 'msg.json';
 const PROGRESS_INFO_FILE_NAME = 'progress.json';
 const WIPS_INFO_FILE_NAME = 'wips.json';
 function checkIfAllRecipientsDone(progress) {
+    // XXX this is missing info about already attempted sending, producing
+    ///    true, when retries are needed.
     for (const recipient of Object.keys(progress.recipients)) {
         const recInfo = progress.recipients[recipient];
         if (!recInfo.done) {
@@ -36,6 +38,15 @@ function checkIfAllRecipientsDone(progress) {
     }
     return true;
 }
+function hasError(progress) {
+    for (const recipient of Object.keys(progress.recipients)) {
+        const recInfo = progress.recipients[recipient];
+        if (recInfo.err) {
+            return true;
+        }
+    }
+    return false;
+}
 async function estimatedPackedSize(msgToSend, attachments) {
     let totalSize = (0, common_1.estimatePackedSizeOf)(buffer_utils_1.utf8.pack(JSON.stringify(msgToSend)).length);
     if (attachments) {
@@ -55,6 +66,7 @@ class Msg {
         this.cancelled = false;
         this.sender = undefined;
         this.recipients = undefined;
+        this.retryOpts = undefined;
         this.msgToSend = undefined;
         this.attachments = undefined;
         this.sequentialWIP = undefined;
@@ -65,9 +77,8 @@ class Msg {
     get progress$() {
         return this.progressPublisher.asObservable();
     }
-    static async forNew(id, msgFS, msgToSend, sender, recipients, r, attachments, localMeta) {
+    static async forNew(id, msgFS, msgToSend, sender, recipients, r, attachments, localMeta, retryOpts) {
         const progress = {
-            allDone: false,
             msgSize: await estimatedPackedSize(msgToSend, attachments),
             recipients: {}
         };
@@ -81,6 +92,7 @@ class Msg {
         msg.msgToSend = msgToSend;
         msg.sender = sender;
         msg.recipients = recipients;
+        msg.retryOpts = retryOpts;
         msg.attachments = attachments;
         if (localMeta !== undefined) {
             msg.progress.localMeta = localMeta;
@@ -100,7 +112,7 @@ class Msg {
         msg.recipients = main.recipients;
         msg.attachments = await common_1.Attachments.readFrom(msgFS);
         if (await msgFS.checkFilePresence(WIPS_INFO_FILE_NAME)) {
-            msg.wipsInfo = (await msgFS.readJSONFile(WIPS_INFO_FILE_NAME)).json;
+            msg.wipsInfo = (await msgFS.readJSONFile(WIPS_INFO_FILE_NAME));
         }
         return msg;
     }
@@ -108,7 +120,8 @@ class Msg {
         const main = {
             msgToSend: this.msgToSend,
             sender: this.sender,
-            recipients: this.recipients
+            recipients: this.recipients,
+            retryOpts: this.retryOpts
         };
         await this.msgFS.writeJSONFile(MAIN_OBJ_FILE_NAME, main, { create: true, exclusive: true });
         await this.msgFS.writeJSONFile(PROGRESS_INFO_FILE_NAME, this.progress, { create: true, exclusive: true });
@@ -116,28 +129,31 @@ class Msg {
             await this.attachments.linkIn(this.msgFS);
         }
     }
-    notifyOfChanges(saveProgress, saveWIPs) {
+    notifyOfChangesInProgress(saveProgress, saveWIPs) {
         if (this.cancelled) {
             return;
         }
         if (this.progress.allDone) {
             return;
         }
+        // XXX check progress differently
+        //     Indicate need for restart ?
+        //     In recipient's part, awaitingRestart flag ?
+        //		 retryRecipients ?
         if (checkIfAllRecipientsDone(this.progress)) {
-            this.progress.allDone = true;
+            this.progress.allDone = (hasError(this.progress) ?
+                'with-errors' : 'all-ok');
             saveProgress = true;
         }
         this.r.notifyMsgProgress(this.id, (0, json_utils_1.copy)(this.progress));
         this.progressPublisher.next((0, json_utils_1.copy)(this.progress));
         if (saveProgress) {
-            this.progressSavingProc.startOrChain(async () => {
-                await this.msgFS.writeJSONFile(PROGRESS_INFO_FILE_NAME, this.progress, {});
-            });
+            this.progressSavingProc.startOrChain(() => this.msgFS.writeJSONFile(PROGRESS_INFO_FILE_NAME, this.progress, {}));
         }
         if (this.isDone()) {
             this.progressPublisher.complete();
             this.progressSavingProc.startOrChain(async () => {
-                await this.msgFS.deleteFile(WIPS_INFO_FILE_NAME).catch(() => { });
+                await this.msgFS.deleteFile(WIPS_INFO_FILE_NAME).catch(noop);
                 if (this.attachments) {
                     await this.attachments.deleteFrom(this.msgFS);
                 }
@@ -174,7 +190,7 @@ class Msg {
         return msg;
     }
     isDone() {
-        return this.progress.allDone;
+        return !!this.progress.allDone;
     }
     isSendingNow() {
         return !!this.sendingProc.isProcessing();
@@ -261,12 +277,12 @@ class Msg {
                 }
             });
             await Promise.all(wipPromises);
-        }).then(() => {
+            // XXX ???
             if (this.completionPromise && this.isDone()) {
                 this.completionPromise.resolve(this.progress);
                 this.completionPromise = undefined;
             }
-        }, (err) => {
+        }).catch(err => {
             if (this.completionPromise) {
                 this.completionPromise.reject(err);
                 this.completionPromise = undefined;
@@ -311,12 +327,12 @@ class Msg {
             if (this.sequentialWIP.isDone()) {
                 this.sequentialWIP = undefined;
             }
-        }).then(() => {
+            // XXX ???
             if (this.completionPromise && this.isDone()) {
                 this.completionPromise.resolve(this.progress);
                 this.completionPromise = undefined;
             }
-        }, (err) => {
+        }).catch(err => {
             if (this.completionPromise) {
                 this.completionPromise.reject(err);
                 this.completionPromise = undefined;
@@ -327,4 +343,5 @@ class Msg {
 exports.Msg = Msg;
 Object.freeze(Msg.prototype);
 Object.freeze(Msg);
+function noop() { }
 Object.freeze(exports);

package/build/core/asmail/delivery/per-recipient-wip.js

@@ -112,7 +112,7 @@ class WIP {
             throw new Error(`Unknown wip stage ${stage}`);
         }
         return proc.catch(async (err) => {
-            await this.updateInfo(0, true, err);
+            this.updateInfo(0, true, err);
             this.state.stage = undefined;
         });
     }
@@ -238,7 +238,7 @@ class WIP {
             }
             recInfo.done = true;
             delete this.msg.wipsInfo[this.state.recipient];
-            this.msg.notifyOfChanges(true, this.doStateRecording);
+            this.msg.notifyOfChangesInProgress(true, this.doStateRecording);
         }
         else {
             this.state.bytesUploaded += bytesSent;
@@ -250,7 +250,7 @@ class WIP {
             else {
                 saveWIPs = false;
             }
-            this.msg.notifyOfChanges(false, saveWIPs);
+            this.msg.notifyOfChangesInProgress(false, saveWIPs);
         }
     }
     async sendMeta() {

package/build/core/asmail/inbox/msg-indexing.js

@@ -17,6 +17,7 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MsgIndex = void 0;
+const synced_1 = require("../../../lib-common/processes/synced");
 const timed_cache_1 = require("../../../lib-common/timed-cache");
 const lib_sqlite_on_3nstorage_1 = require("../../../lib-sqlite-on-3nstorage");
 const file_1 = require("../../../lib-common/exceptions/file");
@@ -271,6 +272,8 @@ class LogAndStructFiles {
         this.logsFS = logsFS;
         this.dbsFS = dbsFS;
         this.syncing = undefined;
+        // XXX synchronize file saving
+        this.logsFSaccessProc = new synced_1.SingleProc();
         (0, file_1.ensureCorrectFS)(this.logsFS, 'synced', true);
         Object.seal(this);
     }
@@ -319,33 +322,35 @@ class LogAndStructFiles {
         logNums.sort();
         return logNums;
     }
-    async createNewLogFile(logNum, jsonStr = '[]') {
-        const logFile = this.logFileName(logNum);
-        const version = await this.logsFS.v.writeTxtFile(logFile, jsonStr, { create: true, exclusive: true });
-        await this.logsFS.v.sync.upload(logFile);
-        await this.logsFS.v.sync.upload('');
-        return {
-            num: logNum,
-            version,
-            writeOfs: jsonStr.length - 1
-        };
+    createNewLogFile(logNum, jsonStr = '[]') {
+        return this.logsFSaccessProc.startOrChain(async () => {
+            const logFile = this.logFileName(logNum);
+            const version = await this.logsFS.v.writeTxtFile(logFile, jsonStr, { create: true, exclusive: true });
+            // XXX sync disabled for now, and may be need another structure
+            // await this.logsFS.v!.sync!.upload(logFile);
+            // await this.logsFS.v!.sync!.upload('');
+            return {
+                num: logNum,
+                version,
+                writeOfs: jsonStr.length - 1
+            };
+        });
     }
     async statLogFile(logNum) {
         const logFile = this.logFileName(logNum);
-        const { state: syncState } = await this.logsFS.v.sync.status(logFile);
-        if (syncState === 'behind') {
-            await this.logsFS.v.sync.adoptRemote(logFile);
-        }
-        else if (syncState === 'unsynced') {
-            await this.logsFS.v.sync.upload(logFile);
-        }
-        else if (syncState === 'conflicting') {
-            // XXX
-            throw new Error(`conflict resolution needs implementation`);
-        }
+        // XXX sync disabled for now, and may be need another structure
+        // const { state: syncState } = await this.logsFS.v!.sync!.status(logFile);
+        // if (syncState === 'behind') {
+        // 	await this.logsFS.v!.sync!.adoptRemote(logFile);
+        // } else if (syncState === 'unsynced') {
+        // 	await this.logsFS.v!.sync!.upload(logFile);
+        // } else if (syncState === 'conflicting') {
+        // 	// XXX
+        // 	throw new Error(`conflict resolution needs implementation`);
+        // }
         const { size, version } = await this.logsFS.stat(logFile);
         return {
-            syncState,
+            syncState: 'unsynced',
             tail: {
                 num: logNum,
                 version: version,
@@ -354,32 +359,36 @@ class LogAndStructFiles {
         };
     }
     async appendLogFile(logNum, bytes) {
-        const logFile = this.logFileName(logNum);
-        const { state } = await this.logsFS.v.sync.status(logFile);
-        if (state === 'behind') {
-            await this.logsFS.v.sync.adoptRemote(logFile);
-        }
-        else if (state === 'conflicting') {
-            // XXX
-            throw new Error(`conflict resolution needs implementation`);
-        }
-        const sink = await this.logsFS.getByteSink(logFile, { truncate: false });
-        const len = await sink.getSize();
-        let writeOfs;
-        if (len === 2) {
-            await sink.splice(len - 1, 1);
-            writeOfs = len - 1;
-        }
-        else {
-            await sink.splice(len - 1, 1, COMMA_BYTE);
-            writeOfs = len;
-        }
-        await sink.splice(writeOfs, 0, bytes);
-        writeOfs += bytes.length;
-        await sink.splice(writeOfs, 0, SQ_BRACKET_BYTE);
-        await sink.done();
-        const uploadedVersion = (await this.logsFS.v.sync.upload(logFile));
-        return { uploadedVersion, writeOfs };
+        return this.logsFSaccessProc.startOrChain(async () => {
+            const logFile = this.logFileName(logNum);
+            // XXX sync disabled for now, and may be need another structure
+            // const { state } = await this.logsFS.v!.sync!.status(logFile);
+            // if (state === 'behind') {
+            // 	await this.logsFS.v!.sync!.adoptRemote(logFile);
+            // } else if (state === 'conflicting') {
+            // 	// XXX
+            // 	throw new Error(`conflict resolution needs implementation`);
+            // }
+            const sink = await this.logsFS.getByteSink(logFile, { truncate: false });
+            const len = await sink.getSize();
+            let writeOfs;
+            if (len === 2) {
+                await sink.splice(len - 1, 1);
+                writeOfs = len - 1;
+            }
+            else {
+                await sink.splice(len - 1, 1, COMMA_BYTE);
+                writeOfs = len;
+            }
+            await sink.splice(writeOfs, 0, bytes);
+            writeOfs += bytes.length;
+            await sink.splice(writeOfs, 0, SQ_BRACKET_BYTE);
+            await sink.done();
+            // XXX sync disabled for now, and may be need another structure
+            // const uploadedVersion = (await this.logsFS.v!.sync!.upload(logFile))!;
+            const uploadedVersion = logNum;
+            return { uploadedVersion, writeOfs };
+        });
     }
     dbFileName(fileTS) {
         return `${fileTS}${DB_EXT}`;

package/build/core/id-manager/index.d.ts

@@ -1,6 +1,6 @@
 import { user as mid } from '../../lib-common/mid-sigs-NaCl-Ed';
 import { JsonKey } from '../../lib-common/jwkeys';
-import { GenerateKey } from '../sign-in';
+import { GenerateKey } from '../startup/sign-in';
 import { LogError, LogWarning } from '../../lib-client/logging/log-to-file';
 import { NetClient } from '../../lib-client/request-utils';
 import { ServiceLocator } from '../../lib-client/service-locator';

package/build/{ipc-via-protobuf/mailerid.d.ts → core/id-manager/mailerid-cap-ipc.d.ts}

@@ -1,4 +1,4 @@
-import { Caller, ExposedObj } from "./connector";
+import { Caller, ExposedObj } from "../../ipc-via-protobuf/connector";
 declare type MailerId = web3n.mailerid.Service;
 export declare function exposeMailerIdCAP(cap: MailerId): ExposedObj<MailerId>;
 export declare function makeMailerIdCaller(caller: Caller, objPath: string[]): MailerId;