core-3nweb-client-lib 0.44.1 → 0.44.3

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

@@ -622,6 +622,12 @@ declare namespace web3n.files {
 
 	interface ReadonlyFileSyncAPI {
 
+		/**
+		 * When connection exception is caught, use this to await connection to continue.
+		 * This returns a promise, resolvable when connected to storage server.
+		 */
+		whenConnected(): Promise<void>;
+
 		/**
 		 * Returns synchronization status of this object.
 		 * @param skipServerCheck is optional parameter to skip server check, that may be handy in offline 
@@ -1404,6 +1410,12 @@ declare namespace web3n.files {
 
 	interface ReadonlyFSSyncAPI {
 
+		/**
+		 * When connection exception is caught, use this to await connection to continue.
+		 * This returns a promise, resolvable when connected to storage server.
+		 */
+		whenConnected(): Promise<void>;
+
 		/**
 		 * Returns synchronization status of item at given path.
 		 * @param path
@@ -1481,7 +1493,7 @@ declare namespace web3n.files {
 		 */
 		getRemoteFolderItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ReadonlyFS>;
 
-		// XXX method to work around demaged files
+		// XXX method to work around damaged files
 		// reloadFromServer(path: string): Promise<SyncStatus>;
 
 	}
@@ -1559,16 +1571,16 @@ declare namespace web3n.files {
 	interface FolderDiff extends CommonDiff {
 
 		/**
-		 * Items that were removed. Pointing to where removal is done in remote (r), or local (l) branches.
+		 * Items that were removed.
 		 * 
 		 * Consider the following example.
 		 * Item that is removed in local version is present in both remote and synced versions.
 		 * Hence, difference between local and remote versions is due to removal in local branch.
 		 */
 		removed?: {
-			name: string;
-			removedIn: 'l'|'r';
-		}[];
+			inRemote?: string[];
+			inLocal?: string[];
+		};
 
 		/**
 		 * Items that were renamed. Pointing to where renaming is done in remote (r), or local (l) branches.
@@ -1583,15 +1595,15 @@ declare namespace web3n.files {
 		}[];
 
 		/**
-		 * Items that were added. Pointing to where addition is done in remote (r), or local (l) branches.
+		 * Items that were added.
 		 * 
 		 * When item added in remote branch, then it is present in remote version under the referenced name.
 		 * Synced (older) state of folder doesn't have it, and neither does local.
 		 */
 		added?: {
-			name: string;
-			addedIn: 'l'|'r';
-		}[];
+			inRemote?: string[];
+			inLocal?: string[];
+		};
 
 		/**
 		 * Items that reencrypted and now have different keys.

package/build/core/id-manager/key-storage.d.ts

@@ -17,5 +17,6 @@ export declare class IdKeysStorage {
     };
     getSavedKey(): Promise<JsonKey | undefined>;
     private setStorageFS;
+    private ensureDataFolderIsUploaded;
 }
 export {};

package/build/core/id-manager/key-storage.js

@@ -72,9 +72,6 @@ class IdKeysStorage {
         this.fs = fs;
         if (keysToSave) {
             await this.fs.writeJSONFile(LOGIN_KEY_FILE_NAME, keysToSave);
-            // XXX must add work with not-online condition
-            await this.fs.v.sync.upload(LOGIN_KEY_FILE_NAME);
-            await this.fs.v.sync.upload('');
         }
         else {
             try {
@@ -84,6 +81,24 @@ class IdKeysStorage {
                 throw (0, error_1.errWithCause)(exc, `Fail expection read of login MailerId keys from the storage`);
             }
         }
+        this.ensureDataFolderIsUploaded();
+    }
+    async ensureDataFolderIsUploaded() {
+        try {
+            const fileStatus = await this.fs.v.sync.status(LOGIN_KEY_FILE_NAME, false);
+            if (fileStatus.state === 'unsynced') {
+                await this.fs.v.sync.upload(LOGIN_KEY_FILE_NAME);
+            }
+            const folderStatus = await this.fs.v.sync.status('', true);
+            if (folderStatus.state === 'unsynced') {
+                await this.fs.v.sync.upload('');
+            }
+        }
+        catch (exc) {
+            if (exc.type === 'connect') {
+                return this.fs.v.sync.whenConnected().then(() => this.ensureDataFolderIsUploaded());
+            }
+        }
     }
 }
 exports.IdKeysStorage = IdKeysStorage;

package/build/core/storage/synced/remote-events.d.ts

@@ -19,10 +19,13 @@ export declare class RemoteEvents {
     private readonly connectionEvents;
     readonly connectionEvent$: Observable<StorageConnectionStatus>;
     private readonly wsProc;
+    private deferredConnection;
     constructor(remoteStorage: StorageOwner, files: ObjFiles, broadcastNodeEvent: Storage['broadcastNodeEvent'], logError: LogError);
     private makeProc;
     startListening(): void;
     close(): Promise<void>;
+    whenConnected(): Promise<void>;
+    private signalConnected;
     private absorbObjChange;
     private absorbObjRemoval;
     private absorbObjVersionArchival;

package/build/core/storage/synced/remote-events.js

@@ -21,6 +21,7 @@ const rxjs_1 = require("rxjs");
 const owner_1 = require("../../../lib-common/service-api/3nstorage/owner");
 const operators_1 = require("rxjs/operators");
 const ws_ipc_1 = require("../../../lib-common/ipc/ws-ipc");
+const deferred_1 = require("../../../lib-common/processes/deferred");
 function toStorageConnectionStatus(status, params) {
     return (0, ws_ipc_1.addToStatus)(status, {
         service: 'storage',
@@ -40,13 +41,25 @@ class RemoteEvents {
         this.logError = logError;
         this.connectionEvents = new rxjs_1.Subject();
         this.connectionEvent$ = this.connectionEvents.asObservable().pipe((0, operators_1.share)());
+        this.deferredConnection = (0, deferred_1.defer)();
         this.wsProc = new ws_ipc_1.WebSocketListening(SERVER_EVENTS_RESTART_WAIT_SECS, this.makeProc.bind(this));
         Object.seal(this);
     }
     makeProc() {
         return (0, rxjs_1.from)(this.remoteStorage.openEventSource().then(({ client, heartbeat }) => {
+            this.signalConnected();
             heartbeat.subscribe({
-                next: ev => this.connectionEvents.next(toStorageConnectionStatus(ev))
+                next: ev => {
+                    this.connectionEvents.next(toStorageConnectionStatus(ev));
+                    if (ev.type === 'heartbeat') {
+                        this.signalConnected();
+                    }
+                    else if ((ev.type === 'heartbeat-skip') || (ev.type === 'disconnected')) {
+                        if (!this.deferredConnection) {
+                            this.deferredConnection = (0, deferred_1.defer)();
+                        }
+                    }
+                }
             });
             return [
                 this.absorbObjChange(client),
@@ -65,6 +78,16 @@ class RemoteEvents {
         this.connectionEvents.complete();
         this.wsProc.close();
     }
+    async whenConnected() {
+        var _a;
+        return (_a = this.deferredConnection) === null || _a === void 0 ? void 0 : _a.promise;
+    }
+    signalConnected() {
+        if (this.deferredConnection) {
+            this.deferredConnection.resolve();
+            this.deferredConnection = undefined;
+        }
+    }
     absorbObjChange(client) {
         return (new rxjs_1.Observable(obs => client.subscribe(owner_1.events.objChanged.EVENT_NAME, obs)))
             .pipe((0, operators_1.mergeMap)(async ({ newVer: newRemoteVersion, objId }) => {

package/build/core/storage/synced/storage.d.ts

@@ -62,5 +62,6 @@ export declare class SyncedStore implements ISyncedStorage {
     suspendNetworkActivity(): void;
     resumeNetworkActivity(): void;
     get connectionEvent$(): Observable<import("./remote-events").StorageConnectionStatus>;
+    whenConnected(): Promise<void>;
 }
 export {};

package/build/core/storage/synced/storage.js

@@ -248,6 +248,9 @@ class SyncedStore {
     get connectionEvent$() {
         return this.remoteEvents.connectionEvent$;
     }
+    whenConnected() {
+        return this.remoteEvents.whenConnected();
+    }
 }
 exports.SyncedStore = SyncedStore;
 Object.freeze(SyncedStore.prototype);

package/build/core-ipc/file.d.ts

@@ -151,6 +151,10 @@ export declare namespace vGetByteSink {
     function wrapService(fn: WritableFileVersionedAPI['getByteSink'], expServices: CoreSideServices): ExposedFn;
     function makeCaller(caller: Caller, objPath: string[]): WritableFileVersionedAPI['getByteSink'];
 }
+export declare namespace vsWhenConnected {
+    function wrapService(fn: ReadonlyFileSyncAPI['whenConnected']): ExposedFn;
+    function makeCaller(caller: Caller, objPath: string[]): ReadonlyFileSyncAPI['whenConnected'];
+}
 export declare namespace vsStartDownload {
     const replyType: ProtoType<{
         startedDownload?: {

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.vsDiffCurrentAndRemoteVersions = 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.vsDiffCurrentAndRemoteVersions = exports.vListVersions = exports.vsUpload = exports.vsStartUpload = exports.vsStartDownload = exports.vsWhenConnected = 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;
@@ -100,6 +100,7 @@ function makeFileCaller(caller, fileMsg) {
         if (fileMsg.isSynced) {
             const vsPath = (0, protobuf_msg_1.methodPathFor)(vPath, 'sync');
             file.v.sync = {
+                whenConnected: vsWhenConnected.makeCaller(caller, vsPath),
                 status: vsStatus.makeCaller(caller, vsPath),
                 isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.makeCaller(caller, vsPath),
                 startDownload: vsStartDownload.makeCaller(caller, vsPath),
@@ -156,6 +157,7 @@ function exposeFileService(file, expServices) {
         }
         if (file.v.sync) {
             implExp.v.sync = {
+                whenConnected: vsWhenConnected.wrapService(file.v.sync.whenConnected),
                 status: vsStatus.wrapService(file.v.sync.status),
                 isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.wrapService(file.v.sync.isRemoteVersionOnDisk),
                 startDownload: vsStartDownload.wrapService(file.v.sync.startDownload),
@@ -1084,6 +1086,25 @@ var vGetByteSink;
     vGetByteSink.makeCaller = makeCaller;
 })(vGetByteSink || (exports.vGetByteSink = vGetByteSink = {}));
 Object.freeze(vGetByteSink);
+var vsWhenConnected;
+(function (vsWhenConnected) {
+    function wrapService(fn) {
+        return buf => {
+            const promise = fn();
+            return { promise };
+        };
+    }
+    vsWhenConnected.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'whenConnected');
+        return () => caller
+            .startPromiseCall(path, undefined)
+            .then(noop);
+    }
+    vsWhenConnected.makeCaller = makeCaller;
+})(vsWhenConnected || (exports.vsWhenConnected = vsWhenConnected = {}));
+Object.freeze(vsWhenConnected);
+function noop() { }
 var vsStatus;
 (function (vsStatus) {
     function wrapService(fn) {

package/build/core-ipc/fs.js

@@ -101,6 +101,7 @@ function makeFSCaller(caller, fsMsg) {
         if (fsMsg.isSynced) {
             const vsPath = (0, protobuf_msg_1.methodPathFor)(vPath, 'sync');
             fs.v.sync = {
+                whenConnected: file.vsWhenConnected.makeCaller(caller, vsPath),
                 status: vsStatus.makeCaller(caller, vsPath),
                 isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.makeCaller(caller, vsPath),
                 startDownload: vsDownload.makeCaller(caller, vsPath),
@@ -186,6 +187,7 @@ function exposeFSService(fs, expServices) {
         }
         if (fs.v.sync) {
             implExp.v.sync = {
+                whenConnected: file.vsWhenConnected.wrapService(fs.v.sync.whenConnected),
                 status: vsStatus.wrapService(fs.v.sync.status),
                 isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.wrapService(fs.v.sync.isRemoteVersionOnDisk),
                 startDownload: vsDownload.wrapService(fs.v.sync.startDownload),
@@ -2213,10 +2215,8 @@ function folderDiffToMsg(diff) {
     }
     return {
         ...file.commonDiffToMsg(diff),
-        added: (diff.added && (diff.added.length > 0) ?
-            diff.added.map(({ name, addedIn }) => ({ name, addedIn })) : undefined),
-        removed: (diff.removed && (diff.removed.length > 0) ?
-            diff.removed.map(({ name, removedIn }) => ({ name, removedIn })) : undefined),
+        added: diff.added,
+        removed: diff.removed,
         renamed: (diff.renamed && (diff.renamed.length > 0) ?
             diff.renamed.map(({ local, remote, renamedIn }) => ({ local, remote, renamedIn })) : undefined),
         rekeyed: (diff.rekeyed && (diff.rekeyed.length > 0) ?
@@ -2230,13 +2230,37 @@ function folderDiffFromMsg(msg) {
     }
     return {
         ...file.commonDiffFromMsg(msg),
-        added: (msg.added ? msg.added : undefined),
-        removed: (msg.removed ? msg.removed : undefined),
-        renamed: (msg.renamed ? msg.renamed : undefined),
-        rekeyed: (msg.rekeyed ? msg.rekeyed : undefined),
-        nameOverlaps: (msg.nameOverlaps ? msg.nameOverlaps : undefined),
+        added: reduceEmptyIn(msg.added),
+        removed: reduceEmptyIn(msg.removed),
+        renamed: reduceEmptyArr(msg.renamed),
+        rekeyed: reduceEmptyArr(msg.rekeyed),
+        nameOverlaps: reduceEmptyArr(msg.nameOverlaps),
     };
 }
+function reduceEmptyIn(c) {
+    if (!c) {
+        return;
+    }
+    if (c.inLocal && (c.inLocal.length > 0)) {
+        if (c.inRemote && (c.inRemote.length > 0)) {
+            return c;
+        }
+        else {
+            return { inLocal: c.inLocal };
+        }
+    }
+    else {
+        if (c.inRemote && (c.inRemote.length > 0)) {
+            return { inRemote: c.inRemote };
+        }
+        else {
+            return;
+        }
+    }
+}
+function reduceEmptyArr(arr) {
+    return (arr && (arr.length > 0) ? arr : undefined);
+}
 var vsDiffCurrentAndRemoteFolderVersions;
 (function (vsDiffCurrentAndRemoteFolderVersions) {
     const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.DiffCurrentAndRemoteFolderVersionsRequestBody);

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

@@ -86,6 +86,7 @@ function wrapWritableFileSyncAPI(sImpl) {
         return;
     }
     const w = {
+        whenConnected: sImpl.whenConnected.bind(sImpl),
         status: sImpl.status.bind(sImpl),
         startDownload: sImpl.startDownload.bind(sImpl),
         isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),
@@ -140,6 +141,7 @@ function wrapReadonlyFileSyncAPI(sImpl) {
         return;
     }
     const w = {
+        whenConnected: sImpl.whenConnected.bind(sImpl),
         status: sImpl.status.bind(sImpl),
         startDownload: sImpl.startDownload.bind(sImpl),
         isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),
@@ -235,6 +237,7 @@ function wrapWritableFSSyncAPI(sImpl) {
         return;
     }
     const w = {
+        whenConnected: sImpl.whenConnected.bind(sImpl),
         status: sImpl.status.bind(sImpl),
         startDownload: sImpl.startDownload.bind(sImpl),
         isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),
@@ -303,6 +306,7 @@ function wrapReadonlyFSSyncAPI(sImpl) {
         return;
     }
     const w = {
+        whenConnected: sImpl.whenConnected.bind(sImpl),
         status: sImpl.status.bind(sImpl),
         startDownload: sImpl.startDownload.bind(sImpl),
         isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),

package/build/lib-client/xsp-fs/common.d.ts

@@ -121,6 +121,7 @@ export interface SyncedStorage extends Storage {
     suspendNetworkActivity(): void;
     resumeNetworkActivity(): void;
     connectionEvent$: Observable<StorageConnectionStatus>;
+    whenConnected(): Promise<void>;
 }
 export interface SyncedObjStatus extends LocalObjStatus {
     syncStatus(): SyncStatus;

package/build/lib-client/xsp-fs/common.js

@@ -127,6 +127,7 @@ function wrapSyncStorageImplementation(impl) {
     wrap.resumeNetworkActivity = impl.resumeNetworkActivity.bind(impl);
     wrap.getNumOfBytesNeedingDownload = impl.getNumOfBytesNeedingDownload.bind(impl);
     wrap.connectionEvent$ = impl.connectionEvent$;
+    wrap.whenConnected = impl.whenConnected.bind(impl);
     return Object.freeze(wrap);
 }
 function isSyncedStorage(storage) {

package/build/lib-client/xsp-fs/file-node.d.ts

@@ -44,6 +44,7 @@ export declare class FileNode extends NodeInFS<FilePersistance> {
     private static initWithAttrs;
     protected setCurrentStateFrom(src: ObjSource): Promise<void>;
     private setUpdatedState;
+    getStorage(): Storage;
     getStats(flags?: VersionedReadFlags): Promise<Stats>;
     readSrc(flags: VersionedReadFlags | undefined): Promise<{
         src: FileByteSource;

package/build/lib-client/xsp-fs/file-node.js

@@ -126,6 +126,9 @@ class FileNode extends node_in_fs_1.NodeInFS {
         this.fileSize = fileAttrs.size;
         super.setUpdatedParams(version, fileAttrs.attrs, fileAttrs.xattrs);
     }
+    getStorage() {
+        return this.storage;
+    }
     async getStats(flags) {
         const { stats, attrs } = await this.getStatsAndSize(flags);
         stats.size = (attrs ? attrs.size : this.fileSize);

package/build/lib-client/xsp-fs/file.d.ts

@@ -100,6 +100,7 @@ declare class V implements WritableFileVersionedAPI, N {
 declare class S implements WritableFileSyncAPI {
     private readonly n;
     constructor(n: N);
+    whenConnected(): Promise<void>;
     startUpload(opts?: OptionsToUploadLocal): Promise<{
         uploadVersion: number;
         uploadTaskId: number;

package/build/lib-client/xsp-fs/file.js

@@ -224,6 +224,9 @@ class S {
         this.n = n;
         Object.freeze(this);
     }
+    async whenConnected() {
+        return (await this.n.getNode()).getStorage().whenConnected();
+    }
     async startUpload(opts) {
         this.n.ensureIsWritable();
         const node = await this.n.getNode();

package/build/lib-client/xsp-fs/folder-node.js

@@ -1096,13 +1096,11 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             const nodes = state.nodes;
             const remoteNodes = remote.folderInfo.nodes;
             const events = [];
-            if (removed) {
-                for (const { name, removedIn } of removed) {
-                    if (removedIn === 'r') {
-                        const node = nodes[name];
-                        delete nodes[name];
-                        events.push(this.makeEntryRemovalEvent(newVersion, 'sync', node));
-                    }
+            if (removed === null || removed === void 0 ? void 0 : removed.inRemote) {
+                for (const name of removed.inRemote) {
+                    const node = nodes[name];
+                    delete nodes[name];
+                    events.push(this.makeEntryRemovalEvent(newVersion, 'sync', node));
                 }
             }
             if (renamed) {
@@ -1122,19 +1120,17 @@ class FolderNode extends node_in_fs_1.NodeInFS {
                     }
                 }
             }
-            if (added) {
-                for (const { name, addedIn } of added) {
-                    if (addedIn === 'r') {
-                        const node = remoteNodes[name];
-                        (0, assert_1.assert)(!!node);
-                        if (nameOverlaps === null || nameOverlaps === void 0 ? void 0 : nameOverlaps.includes(name)) {
-                            while (nodes[node.name]) {
-                                node.name = `${node.name}${opts === null || opts === void 0 ? void 0 : opts.postfixForNameOverlaps}`;
-                            }
+            if (added === null || added === void 0 ? void 0 : added.inRemote) {
+                for (const name of added.inRemote) {
+                    const node = remoteNodes[name];
+                    (0, assert_1.assert)(!!node);
+                    if (nameOverlaps === null || nameOverlaps === void 0 ? void 0 : nameOverlaps.includes(name)) {
+                        while (nodes[node.name]) {
+                            node.name = `${node.name}${opts === null || opts === void 0 ? void 0 : opts.postfixForNameOverlaps}`;
                         }
-                        nodes[node.name] = node;
-                        events.push(this.makeEntryAdditionEvent(newVersion, 'sync', node));
                     }
+                    nodes[node.name] = node;
+                    events.push(this.makeEntryAdditionEvent(newVersion, 'sync', node));
                 }
             }
             return events;
@@ -1188,9 +1184,9 @@ function addToTransitionState(state, f, key) {
 function diffNodes(current, remote, synced) {
     const currentNodesById = orderByIds(current.nodes);
     const syncedNodesById = orderByIds(synced.nodes);
-    const removed = [];
+    const removed = { inLocal: [], inRemote: [] };
     const renamed = [];
-    const added = [];
+    const added = { inLocal: [], inRemote: [] };
     const rekeyed = [];
     const nameOverlaps = [];
     for (const remoteNode of Object.values(remote.nodes)) {
@@ -1229,10 +1225,10 @@ function diffNodes(current, remote, synced) {
         else {
             const syncedNode = syncedNodesById.get(remoteNode.objId);
             if (syncedNode) {
-                removed.push({ name: remoteNode.name, removedIn: 'l' });
+                removed.inLocal.push(remoteNode.name);
             }
             else {
-                added.push({ name: remoteNode.name, addedIn: 'r' });
+                added.inRemote.push(remoteNode.name);
             }
             if (current.nodes[remoteNode.name]) {
                 nameOverlaps.push(remoteNode.name);
@@ -1242,13 +1238,13 @@ function diffNodes(current, remote, synced) {
     for (const localNode of currentNodesById.values()) {
         const syncedNode = syncedNodesById.get(localNode.objId);
         if (!syncedNode) {
-            added.push({ name: localNode.name, addedIn: 'l' });
+            added.inLocal.push(localNode.name);
         }
     }
     return {
-        removed: ((removed.length > 0) ? removed : undefined),
+        removed: reduceEmptyIn(removed),
         renamed: ((renamed.length > 0) ? renamed : undefined),
-        added: ((added.length > 0) ? added : undefined),
+        added: reduceEmptyIn(added),
         rekeyed: ((rekeyed.length > 0) ? rekeyed : undefined),
         nameOverlaps: ((nameOverlaps.length > 0) ? nameOverlaps : undefined),
     };
@@ -1291,4 +1287,22 @@ function identifyChanges(originalNodes, newNodes) {
     }
     return { addedNodes, removedNodes, renamedNodes };
 }
+function reduceEmptyIn(c) {
+    if (c.inLocal.length > 0) {
+        if (c.inRemote.length > 0) {
+            return c;
+        }
+        else {
+            return { inLocal: c.inLocal };
+        }
+    }
+    else {
+        if (c.inRemote.length > 0) {
+            return { inRemote: c.inRemote };
+        }
+        else {
+            return;
+        }
+    }
+}
 Object.freeze(exports);

package/build/lib-client/xsp-fs/fs.d.ts

@@ -166,6 +166,7 @@ declare class V implements WritableFSVersionedAPI, N {
 declare class S implements WritableFSSyncAPI {
     private readonly n;
     constructor(n: N);
+    whenConnected(): Promise<void>;
     startUpload(path: string, opts?: OptionsToUploadLocal): Promise<{
         uploadVersion: number;
         uploadTaskId: number;

package/build/lib-client/xsp-fs/fs.js

@@ -708,6 +708,9 @@ class S {
         this.n = n;
         Object.freeze(this);
     }
+    whenConnected() {
+        return this.n.getRootIfNotClosed('').getStorage().whenConnected();
+    }
     async startUpload(path, opts) {
         this.n.ensureIsWritable();
         const node = await this.n.get(path);
@@ -859,24 +862,9 @@ class S {
             throw (0, file_1.makeFileException)('notDirectory', `${path}/${remoteItemName}`);
         }
     }
-    // async adoptAllRemoteItems(
-    // 	path: string, opts?: OptionsToAdoptAllRemoteItems
-    // ): Promise<number|undefined> {
-    // 	const folderNode = await this.getFolderNode(path);
-    // 	return await folderNode.adoptItemsFromRemoteVersion(opts);
-    // }
     async mergeFolderCurrentAndRemoteVersions(path, opts) {
         const folderNode = await this.getFolderNode(path);
-        const newLocalVersion = await folderNode.mergeCurrentAndRemoteVersions(opts);
-        if (newLocalVersion && (newLocalVersion < 0)) {
-            const { folderPath } = split(path);
-            if (folderPath.length > 0) {
-                const parent = await this.n.get(folderPath.join('/'));
-                // XXX removing folder in parent -- what happens with children?
-                await parent.removeChild(folderNode);
-            }
-        }
-        return newLocalVersion;
+        return await folderNode.mergeCurrentAndRemoteVersions(opts);
     }
 }
 Object.freeze(S.prototype);