core-3nweb-client-lib 0.27.0 → 0.27.4

package/build/core/storage/synced/obj-status.d.ts

@@ -18,11 +18,11 @@ export interface ObjStatusInfo {
     local?: LocalVersions;
     synced?: SyncMarker;
     remote: VersionsOnServer;
+    upload?: UploadInfo;
 }
 export interface LocalVersions extends VersionsInfo {
     isArchived?: boolean;
     archived?: undefined;
-    upload?: UploadInfo;
 }
 export interface SyncMarker {
     version?: number;
@@ -32,12 +32,19 @@ export interface SyncMarker {
 export interface VersionsOnServer extends VersionsInfo {
     isArchived?: boolean;
 }
-export interface UploadInfo {
+export declare type UploadInfo = NewVersionUpload | RemovalUpload;
+export interface NewVersionUpload {
+    type: 'new-version';
     localVersion: number;
     uploadVersion: number;
     baseVersion?: number;
     needUpload?: WholeVerOrderedUpload | DiffVerOrderedUpload;
 }
+export interface RemovalUpload {
+    type: 'removal';
+    isPostponed: boolean;
+    localVersion?: number;
+}
 export interface WholeVerOrderedUpload {
     type: 'ordered-whole';
     createObj?: boolean;
@@ -74,20 +81,24 @@ export declare class ObjStatus implements SyncedObjStatus, UploadStatusRecorder
     static makeNew(objFolder: string, objId: ObjId, logError: LogError): Promise<ObjStatus>;
     static makeForDownloadedVersion(objFolder: string, objId: ObjId, version: number, currentRemote: number, logError: LogError): Promise<ObjStatus>;
     static fileShowsObjNotInSyncedState(objFolder: string, objId: ObjId): Promise<boolean>;
+    static fileShowsObjNeedsRemovalOnRemote(objFolder: string, objId: ObjId): Promise<boolean>;
+    needsRemovalOnRemote(): boolean;
+    clearPostponeFlagInRemovalOnRemote(): Promise<boolean>;
     private updateStateIndicator;
     isArchived(): boolean;
     getCurrentLocalOrSynced(): number;
     getNonGarbageVersions(): NonGarbage;
     removeCurrentVersion(): Promise<void>;
     private triggerSaveProc;
-    recordUploadStart(info: UploadInfo): Promise<void>;
-    recordUploadInterimState(info: UploadInfo): Promise<void>;
-    recordUploadCancellation(info: UploadInfo): Promise<void>;
+    recordUploadStart(info: NewVersionUpload): Promise<void>;
+    recordUploadInterimState(info: NewVersionUpload): Promise<void>;
+    recordUploadCancellation(info: NewVersionUpload): Promise<void>;
+    recordUploadCompletion(localVersion: number, uploadVersion: number): Promise<void>;
     recordArchVersionRemoval(version: number): Promise<void>;
     recordVersionArchival(version: number): Promise<void>;
     recordRemoteRemoval(): Promise<void>;
+    recordRemoteRemovalCompletion(): Promise<void>;
     recordRemoteChange(version: number): Promise<void>;
-    recordSyncOfObjRemoval(): Promise<void>;
     recordStatusFromServer({ archived, current }: RemoteObjStatus): Promise<void>;
     /**
      * When given object version is a diff on some base, this method returns
@@ -102,7 +113,6 @@ export declare class ObjStatus implements SyncedObjStatus, UploadStatusRecorder
         localBases?: number[];
         syncedBase?: number;
     } | undefined;
-    markLocalVersionSynced(localVersion: number, uploadVersion: number): Promise<void>;
     setLocalCurrentVersion(version: number, baseVer: number | undefined): Promise<void>;
     listVersions(): {
         current?: number;
@@ -113,7 +123,9 @@ export declare class ObjStatus implements SyncedObjStatus, UploadStatusRecorder
     latestSyncedVersion(): number | undefined;
     syncStatus(): SyncStatus;
     neverUploaded(): boolean;
+    versionBeforeUnsyncedRemoval(): number | undefined;
     adoptRemoteVersion(version?: number, dropLocalVer?: boolean): Promise<void>;
+    isAmongRemote(version: number): boolean;
 }
 export declare function readAndCheckStatus(objFolder: string, objId: ObjId): Promise<ObjStatusInfo>;
 export {};

package/build/core/storage/synced/obj-status.js

@@ -22,6 +22,7 @@ const exceptions_1 = require("../../../lib-client/3nstorage/exceptions");
 const json_saving_1 = require("../common/json-saving");
 const obj_info_file_1 = require("../common/obj-info-file");
 const assert_1 = require("../../../lib-common/assert");
+const file_1 = require("../../../lib-common/exceptions/file");
 function makeVersions() {
     return {
         baseToDiff: {},
@@ -81,12 +82,14 @@ function identifyNonGarbage(status) {
     let uploadVersion = undefined;
     if (status.local) {
         local = nonGarbageWithMaxVer(status.local);
-        if (status.local.upload) {
-            const { localVersion } = status.local.upload;
-            if (status.local.current !== localVersion) {
-                (0, obj_info_file_1.addWithBasesTo)(local.nonGarbage, localVersion, status.local);
-            }
-            uploadVersion = status.local.upload.uploadVersion;
+    }
+    if (status.upload) {
+        const { localVersion } = status.upload;
+        if (status.local.current !== localVersion) {
+            (0, obj_info_file_1.addWithBasesTo)(local.nonGarbage, localVersion, status.local);
+        }
+        if (status.upload.type === 'new-version') {
+            uploadVersion = status.upload.uploadVersion;
         }
     }
     const remote = nonGarbageWithMaxVer(status.remote);
@@ -136,6 +139,27 @@ class ObjStatus {
         const status = await readAndCheckStatus(objFolder, objId);
         return (syncStateOf(status) !== 'synced');
     }
+    static async fileShowsObjNeedsRemovalOnRemote(objFolder, objId) {
+        const status = await readAndCheckStatus(objFolder, objId);
+        const upload = status.upload;
+        return (((upload === null || upload === void 0 ? void 0 : upload.type) === 'removal') && !upload.isPostponed);
+    }
+    needsRemovalOnRemote() {
+        const upload = this.status.upload;
+        return (((upload === null || upload === void 0 ? void 0 : upload.type) === 'removal') && !upload.isPostponed);
+    }
+    async clearPostponeFlagInRemovalOnRemote() {
+        const { upload } = this.status;
+        if (!upload) {
+            return false;
+        }
+        if (upload.type !== 'removal') {
+            throw new Error(`No upload removal in obj status`);
+        }
+        upload.isPostponed = false;
+        await this.triggerSaveProc();
+        return true;
+    }
     updateStateIndicator() {
         this.stateIndicator = syncStateOf(this.status);
     }
@@ -162,28 +186,36 @@ class ObjStatus {
         return identifyNonGarbage(this.status);
     }
     async removeCurrentVersion() {
-        let { local, synced } = this.status;
+        let { local, synced, remote, upload } = this.status;
         if ((synced === null || synced === void 0 ? void 0 : synced.isArchived) || (local === null || local === void 0 ? void 0 : local.isArchived)) {
             return;
         }
+        if (upload) {
+            if (upload.type === 'removal') {
+                return;
+            }
+            else {
+                throw (0, file_1.makeFileException)('concurrentUpdate', 'obj-status', `Upload is in progress`);
+            }
+        }
+        if (!remote.isArchived && remote.current) {
+            this.status.upload = {
+                type: 'removal',
+                localVersion: ((local === null || local === void 0 ? void 0 : local.current) || (synced === null || synced === void 0 ? void 0 : synced.version)),
+                isPostponed: true
+            };
+            upload = this.status.upload;
+        }
         if (local) {
-            (0, obj_info_file_1.rmCurrentVersionIn)(local);
+            local.isArchived = true;
+            local.current = undefined;
         }
         else {
-            local = makeVersions();
+            this.status.local = makeVersions();
+            this.status.local.isArchived = true;
         }
-        local.isArchived = true;
         this.updateStateIndicator();
-        ;
-        await this.triggerSaveProc().catch((exc) => {
-            var _a;
-            if (exc.notFound && ((_a = this.status.local) === null || _a === void 0 ? void 0 : _a.isArchived)) {
-                return;
-            }
-            else {
-                throw exc;
-            }
-        });
+        await this.triggerSaveProc().catch(skipNotFoundExc);
     }
     async triggerSaveProc(captureErrors = false, logErr = false) {
         try {
@@ -201,16 +233,17 @@ class ObjStatus {
         }
     }
     recordUploadStart(info) {
-        (0, assert_1.assert)(!!this.status.local);
-        const local = this.status.local;
-        if (local.upload) {
+        var _a;
+        if (this.status.upload) {
+            const upload = this.status.upload;
             throw (0, exceptions_1.makeFSSyncException)('obj-status', {
                 alreadyUploading: true,
-                message: `Status already has upload of version ${local.upload.uploadVersion} and can't start another upload with version ${info.uploadVersion}`
+                message: `Status already has upload of version ${upload.uploadVersion} and can't start another upload with version ${info.uploadVersion}`
             });
         }
-        if (info.localVersion === local.current) {
-            local.upload = info;
+        if (info.localVersion === ((_a = this.status.local) === null || _a === void 0 ? void 0 : _a.current)) {
+            this.status.upload = info;
+            return this.triggerSaveProc();
         }
         else {
             throw (0, exceptions_1.makeFSSyncException)('obj-status', {
@@ -218,22 +251,58 @@ class ObjStatus {
                 versionNotFound: true
             });
         }
-        return this.triggerSaveProc();
     }
     recordUploadInterimState(info) {
-        (0, assert_1.assert)(!!this.status.local);
-        const local = this.status.local;
-        (0, assert_1.assert)(!!local.upload &&
-            (local.upload.uploadVersion === info.uploadVersion));
-        local.upload = info;
-        return this.triggerSaveProc();
+        var _a;
+        if (((_a = this.status.upload) === null || _a === void 0 ? void 0 : _a.type) !== 'new-version') {
+            throw new Error(`No new version upload in object status`);
+        }
+        if (this.status.upload.uploadVersion === info.uploadVersion) {
+            this.status.upload = info;
+            return this.triggerSaveProc();
+        }
+        else {
+            throw new Error(`Upload versions don't match`);
+        }
     }
     recordUploadCancellation(info) {
-        (0, assert_1.assert)(!!this.status.local);
-        const local = this.status.local;
-        (0, assert_1.assert)(!!local.upload &&
-            (local.upload.uploadVersion === info.uploadVersion));
-        local.upload = undefined;
+        var _a;
+        if (((_a = this.status.upload) === null || _a === void 0 ? void 0 : _a.type) !== 'new-version') {
+            throw new Error(`No upload in object status`);
+        }
+        if (this.status.upload.uploadVersion === info.uploadVersion) {
+            this.status.upload = undefined;
+            return this.triggerSaveProc();
+        }
+        else {
+            throw new Error(`Upload versions don't match`);
+        }
+    }
+    recordUploadCompletion(localVersion, uploadVersion) {
+        const { local, synced, remote, upload } = this.status;
+        if (((upload === null || upload === void 0 ? void 0 : upload.type) !== 'new-version')
+            || (upload.uploadVersion !== uploadVersion)) {
+            throw new Error(`Upload versions don't match`);
+        }
+        const syncedBase = upload.baseVersion;
+        if (!remote.current || (remote.current <= uploadVersion)) {
+            (0, obj_info_file_1.setCurrentVersionIn)(remote, uploadVersion, syncedBase);
+        }
+        if (synced) {
+            synced.version = uploadVersion;
+            if (synced.base && (synced.base !== syncedBase)) {
+                (0, obj_info_file_1.rmNonArchVersionsIn)(remote, synced.base);
+            }
+            synced.base = syncedBase;
+        }
+        else {
+            this.status.synced = { version: uploadVersion, base: syncedBase };
+        }
+        if (local.current === localVersion) {
+            this.status.local = undefined;
+        }
+        this.status.upload = undefined;
+        this.updateStateIndicator();
         return this.triggerSaveProc();
     }
     async recordArchVersionRemoval(version) {
@@ -256,31 +325,40 @@ class ObjStatus {
         this.updateStateIndicator();
         return this.triggerSaveProc();
     }
-    async recordRemoteChange(version) {
-        const { local, synced, remote } = this.status;
-        if (((local === null || local === void 0 ? void 0 : local.upload) && (local.upload.uploadVersion === version))
-            || ((synced === null || synced === void 0 ? void 0 : synced.version) && (synced.version >= version))) {
+    async recordRemoteRemovalCompletion() {
+        var _a;
+        const { remote, upload, synced } = this.status;
+        if ((_a = this.status.synced) === null || _a === void 0 ? void 0 : _a.isArchived) {
             return;
         }
-        remote.current = version;
+        if ((upload === null || upload === void 0 ? void 0 : upload.type) !== 'removal') {
+            throw new Error(`Upload of removal is not in status`);
+        }
+        (0, obj_info_file_1.rmCurrentVersionIn)(remote);
+        remote.isArchived = true;
+        if (synced) {
+            synced.isArchived = true;
+            synced.version = undefined;
+            synced.base = undefined;
+        }
+        else {
+            this.status.synced = { isArchived: true };
+        }
+        this.status.local = undefined;
+        this.status.upload = undefined;
         this.updateStateIndicator();
         return this.triggerSaveProc();
     }
-    recordSyncOfObjRemoval() {
-        this.status.local = undefined;
-        (0, obj_info_file_1.rmCurrentVersionIn)(this.status.remote);
-        this.status.remote.isArchived = true;
-        if (this.status.synced) {
-            this.status.synced.isArchived = true;
-            this.status.synced.version = undefined;
-            if (this.status.synced.base) {
-                (0, obj_info_file_1.rmNonArchVersionsIn)(this.status.remote, this.status.synced.base);
-                this.status.synced.base = undefined;
-            }
+    async recordRemoteChange(version) {
+        const { synced, remote, upload } = this.status;
+        if (((upload === null || upload === void 0 ? void 0 : upload.type) === 'new-version')
+            && (upload.uploadVersion === version)) {
+            return;
         }
-        else {
-            this.status.synced = { isArchived: true };
+        if ((synced === null || synced === void 0 ? void 0 : synced.version) && (synced.version >= version)) {
+            return;
         }
+        remote.current = version;
         this.updateStateIndicator();
         return this.triggerSaveProc();
     }
@@ -346,33 +424,6 @@ class ObjStatus {
             return { localBases };
         }
     }
-    markLocalVersionSynced(localVersion, uploadVersion) {
-        const { local, synced, remote } = this.status;
-        (0, assert_1.assert)(!!(local === null || local === void 0 ? void 0 : local.upload) &&
-            ((local === null || local === void 0 ? void 0 : local.upload.uploadVersion) === uploadVersion));
-        const syncedBase = local.upload.baseVersion;
-        if (!remote.current || (remote.current <= uploadVersion)) {
-            (0, obj_info_file_1.setCurrentVersionIn)(remote, uploadVersion, syncedBase);
-        }
-        if (synced) {
-            synced.version = uploadVersion;
-            if (synced.base && (synced.base !== syncedBase)) {
-                (0, obj_info_file_1.rmNonArchVersionsIn)(remote, synced.base);
-            }
-            synced.base = syncedBase;
-        }
-        else {
-            this.status.synced = { version: uploadVersion, base: syncedBase };
-        }
-        if (local.current === localVersion) {
-            this.status.local = undefined;
-        }
-        else {
-            local.upload = undefined;
-        }
-        this.updateStateIndicator();
-        return this.triggerSaveProc();
-    }
     async setLocalCurrentVersion(version, baseVer) {
         if (!this.status.local) {
             this.status.local = makeVersions();
@@ -446,6 +497,15 @@ class ObjStatus {
         const synced = this.status.synced;
         return (!(synced === null || synced === void 0 ? void 0 : synced.version) && !(synced === null || synced === void 0 ? void 0 : synced.isArchived));
     }
+    versionBeforeUnsyncedRemoval() {
+        var _a;
+        if ((this.stateIndicator !== 'synced')
+            && ((_a = this.status.local) === null || _a === void 0 ? void 0 : _a.isArchived)
+            && this.status.upload
+            && (this.status.upload.type === 'removal')) {
+            return this.status.upload.localVersion;
+        }
+    }
     async adoptRemoteVersion(version, dropLocalVer = false) {
         var _a;
         const { local, remote } = this.status;
@@ -491,6 +551,16 @@ class ObjStatus {
         this.updateStateIndicator();
         await this.triggerSaveProc();
     }
+    isAmongRemote(version) {
+        var _a;
+        if (this.status.remote.current === version) {
+            return true;
+        }
+        if ((_a = this.status.remote.archived) === null || _a === void 0 ? void 0 : _a.includes(version)) {
+            return true;
+        }
+        return false;
+    }
 }
 exports.ObjStatus = ObjStatus;
 Object.freeze(ObjStatus.prototype);
@@ -596,4 +666,9 @@ function addArchVersionsFromList(remote, existingVersions) {
     }
     return isAnythingChanged;
 }
+function skipNotFoundExc(exc) {
+    if (!exc.notFound) {
+        throw exc;
+    }
+}
 Object.freeze(exports);

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

@@ -15,7 +15,7 @@ export declare class SyncedStore implements ISyncedStorage {
     private readonly remoteStorage;
     private readonly getStorages;
     readonly cryptor: AsyncSBoxCryptor;
-    private readonly logError;
+    readonly logError: LogError;
     readonly type: web3n.files.FSType;
     readonly versioned = true;
     readonly nodes: NodesContainer;
@@ -27,12 +27,17 @@ export declare class SyncedStore implements ISyncedStorage {
         syncedStore: ISyncedStorage;
         startObjProcs: () => void;
     }>;
+    static makeAndStartWithoutRemote(path: string, user: string, getStorages: StorageGetter, cryptor: AsyncSBoxCryptor, remoteServiceUrl: () => Promise<string>, net: NetClient, logError: LogError): Promise<{
+        syncedStore: ISyncedStorage;
+        setupRemoteAndStartObjProcs: (getSigner: IGetMailerIdSigner) => void;
+    }>;
     getNodeEvents(): Observable<NodeEvent>;
     broadcastNodeEvent(objId: ObjId, parentObjId: ObjId | undefined, childObjId: ObjId | undefined, event: FolderEvent | FileEvent): void;
     storageForLinking(type: web3n.files.FSType, location?: string): IStorage;
     status(objId: ObjId): Promise<SyncedObjStatus>;
     adoptRemote(objId: ObjId, opts: OptionsToAdopteRemote | undefined): Promise<number | undefined>;
     updateStatusInfo(objId: ObjId): Promise<SyncStatus>;
+    isObjOnDisk(objId: ObjId): Promise<boolean>;
     isRemoteVersionOnDisk(objId: ObjId, version: number): Promise<'complete' | 'partial' | 'none'>;
     download(objId: ObjId, version: number): Promise<void>;
     upload(objId: ObjId, localVersion: number, uploadVersion: number, uploadHeader: UploadHeaderChange | undefined, createOnRemote: boolean): Promise<void>;
@@ -43,7 +48,7 @@ export declare class SyncedStore implements ISyncedStorage {
     generateNewObjId(): Promise<string>;
     private objFromDiskOrDownload;
     private getObjOrThrow;
-    getObjSrc(objId: ObjId, version?: number): Promise<ObjSource>;
+    getObjSrc(objId: ObjId, version?: number, allowArchived?: boolean): Promise<ObjSource>;
     getObjSrcOfRemoteVersion(objId: ObjId, version: number): Promise<ObjSource>;
     saveObj(objId: ObjId, version: number, encSub: Subscribe): Promise<void>;
     removeObj(objId: string): Promise<void>;

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

@@ -43,7 +43,7 @@ class SyncedStore {
         Object.seal(this);
     }
     static async makeAndStart(path, user, getSigner, getStorages, cryptor, remoteServiceUrl, net, logError) {
-        const remote = new service_1.StorageOwner(user, getSigner, remoteServiceUrl, net);
+        const remote = service_1.StorageOwner.make(user, getSigner, remoteServiceUrl, net);
         const objFiles = await obj_files_1.ObjFiles.makeFor(path, remote, logError);
         const s = new SyncedStore(objFiles, remote, getStorages, cryptor, logError);
         s.uploader.start();
@@ -54,6 +54,19 @@ class SyncedStore {
             }
         };
     }
+    static async makeAndStartWithoutRemote(path, user, getStorages, cryptor, remoteServiceUrl, net, logError) {
+        const { remote, setMid } = service_1.StorageOwner.makeBeforeMidSetup(user, remoteServiceUrl, net);
+        const objFiles = await obj_files_1.ObjFiles.makeFor(path, remote, logError);
+        const s = new SyncedStore(objFiles, remote, getStorages, cryptor, logError);
+        return {
+            syncedStore: (0, common_1.wrapSyncStorageImplementation)(s),
+            setupRemoteAndStartObjProcs: getSigner => {
+                setMid(getSigner);
+                s.uploader.start();
+                s.remoteEvents.startAbsorbingRemoteEvents();
+            }
+        };
+    }
     getNodeEvents() {
         return this.events.event$;
     }
@@ -72,7 +85,7 @@ class SyncedStore {
         }
     }
     async status(objId) {
-        const obj = await this.getObjOrThrow(objId);
+        const obj = await this.getObjOrThrow(objId, true);
         return obj.syncStatus();
     }
     async adoptRemote(objId, opts) {
@@ -81,6 +94,7 @@ class SyncedStore {
         await objStatus.adoptRemoteVersion(opts === null || opts === void 0 ? void 0 : opts.remoteVersion, opts === null || opts === void 0 ? void 0 : opts.dropLocalVer);
         if (opts && opts.download) {
             // XXX this needs implementation
+            throw new Error('SyncedStore.adoptRemote() with download option needs implementation, probably using SyncedStore.download().');
         }
         this.files.scheduleGC(obj);
         return objStatus.syncStatus().synced.latest;
@@ -103,17 +117,17 @@ class SyncedStore {
             throw exc;
         }
     }
-    isRemoteVersionOnDisk(objId, version) {
-        // XXX
-        //  - check that given version is synced
-        //  - get state of file
-        // But, should this be renamed to isRemoteVersionOnDisk ?
-        // 
-        throw new Error('SyncedStore.isRemoteVersionOnDisk() not implemented.');
+    async isObjOnDisk(objId) {
+        const obj = await this.files.findObj(objId);
+        return !!obj;
     }
-    download(objId, version) {
-        // XXX 
-        throw new Error('SyncedStore.download() not implemented.');
+    async isRemoteVersionOnDisk(objId, version) {
+        const obj = await this.getObjOrThrow(objId, true);
+        return obj.isRemoteVersionOnDisk(version);
+    }
+    async download(objId, version) {
+        const obj = await this.getObjOrThrow(objId, true);
+        return obj.downloadRemoteVersion(version);
     }
     async upload(objId, localVersion, uploadVersion, uploadHeader, createOnRemote) {
         const obj = await this.getObjOrThrow(objId, true);
@@ -134,7 +148,14 @@ class SyncedStore {
         if (!objId) {
             return;
         }
-        await this.remoteStorage.deleteObj(objId);
+        const obj = await this.getObjOrThrow(objId, true);
+        const status = obj.statusObj();
+        if (status.neverUploaded()) {
+            return;
+        }
+        if (await status.clearPostponeFlagInRemovalOnRemote()) {
+            await this.uploader.removeCurrentVersionOf(obj);
+        }
     }
     dropCachedLocalObjVersionsLessOrEqual(objId, version) {
         const obj = this.files.getObjInCache(objId);
@@ -164,6 +185,8 @@ class SyncedStore {
         if (obj) {
             return obj;
         }
+        // XXX
+        //  - can we create object by getting obj status
         return await this.files.makeByDownloadingCurrentVersion(objId);
     }
     async getObjOrThrow(objId, allowArchived = false) {
@@ -175,8 +198,8 @@ class SyncedStore {
             return obj;
         }
     }
-    async getObjSrc(objId, version) {
-        const obj = await this.getObjOrThrow(objId);
+    async getObjSrc(objId, version, allowArchived = false) {
+        const obj = await this.getObjOrThrow(objId, allowArchived);
         if (!version) {
             version = obj.statusObj().getCurrentLocalOrSynced();
         }

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

@@ -3,7 +3,7 @@ import { SyncedObj } from "./obj-files";
 import { MonoTypeOperatorFunction } from "rxjs";
 import { FileWrite } from "../../../lib-client/objs-on-disk/file-writing-proc";
 import { LogError } from "../../../lib-client/logging/log-to-file";
-import { UploadInfo } from "./obj-status";
+import { NewVersionUpload } from "./obj-status";
 export declare type FileWriteTapOperator = MonoTypeOperatorFunction<FileWrite[]>;
 export declare class UpSyncer {
     private readonly remoteStorage;
@@ -21,7 +21,7 @@ export declare class UpSyncer {
     uploadFromDisk(obj: SyncedObj, localVersion: number, uploadVersion: number, uploadHeader: Uint8Array | undefined, syncedBase: number | undefined, createOnRemote: boolean): Promise<void>;
 }
 export interface UploadStatusRecorder {
-    recordUploadStart(info: UploadInfo): Promise<void>;
-    recordUploadCancellation(info: UploadInfo): Promise<void>;
-    recordUploadInterimState(info: UploadInfo): Promise<void>;
+    recordUploadStart(info: NewVersionUpload): Promise<void>;
+    recordUploadCancellation(info: NewVersionUpload): Promise<void>;
+    recordUploadInterimState(info: NewVersionUpload): Promise<void>;
 }

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

@@ -50,12 +50,17 @@ class UpSyncer {
         // return objUploads.tapFileWrite(isNew, newVersion, baseVersion);
     }
     async removeCurrentVersionOf(obj) {
-        throw new Error('UpSyncer.removeCurrentVersionOf() not implemented');
-        // const objUploads = this.getOrMakeUploadsFor(obj);
-        // XXX is removal set in this older code? This may need to change anyway
-        // if (objUploads.neededExecutor()) {
-        // 	this.execPools.add(objUploads);
-        // }
+        try {
+            await this.remoteStorage.deleteObj(obj.objId);
+        }
+        catch (exc) {
+            // XXX
+            //  - we need to distinguish errors and put this work somewhere
+            //    to run when we go online, for example.
+            await this.logError(exc, `Uploading of obj removal failed.`);
+            return;
+        }
+        await obj.recordRemovalUploadAndGC();
     }
     async uploadFromDisk(obj, localVersion, uploadVersion, uploadHeader, syncedBase, createOnRemote) {
         const task = await UploadTask.for(obj, localVersion, uploadVersion, uploadHeader, syncedBase, createOnRemote, this.remoteStorage, this.execPools);
@@ -90,6 +95,7 @@ class UploadTask {
             needUpload = await wholeVerUpload(src, uploadHeader, createObj);
         }
         const info = {
+            type: 'new-version',
             localVersion,
             uploadVersion,
             baseVersion: syncedBase,
@@ -160,13 +166,12 @@ class UploadTask {
         }
         (0, assert_1.assert)(!!segs && (segs.length === segsToUpload));
         const ver = this.info.uploadVersion;
-        const create = (upload.createObj ? true : undefined);
         if (segsToUpload === upload.segsLeft) {
-            await this.remoteStorage.saveNewObjVersion(this.objId, { ver, create, last: true }, undefined, { header, segs });
+            await this.remoteStorage.saveNewObjVersion(this.objId, { ver, last: true }, undefined, { header, segs });
             this.info.needUpload = undefined;
         }
         else {
-            upload.transactionId = await this.remoteStorage.saveNewObjVersion(this.objId, { ver, create }, undefined, { header, segs });
+            upload.transactionId = await this.remoteStorage.saveNewObjVersion(this.objId, { ver }, undefined, { header, segs });
             if (!upload.transactionId) {
                 // XXX should this be runtime exception saying that remote acts badly ?
                 throw new Error(`Server didn't start obj saving transaction`);

package/build/ipc-via-protobuf/file.d.ts

@@ -14,6 +14,7 @@ declare type FileEvent = web3n.files.FileEvent;
 declare type RemoteEvent = web3n.files.RemoteEvent;
 declare type OptionsToAdopteRemote = web3n.files.OptionsToAdopteRemote;
 declare type OptionsToUploadLocal = web3n.files.OptionsToUploadLocal;
+declare type VersionedReadFlags = web3n.files.VersionedReadFlags;
 export declare function makeFileCaller(caller: Caller, fileMsg: FileMsg): File;
 export declare function exposeFileService(file: File, expServices: ExposedServices): FileMsg;
 export interface FileMsg {
@@ -41,6 +42,12 @@ export declare function packJSON(json: any): EnvelopeBody;
 export declare function unpackJSON(buf: EnvelopeBody): any;
 export declare function packFileEvent(e: FileEvent | RemoteEvent): Buffer;
 export declare function unpackFileEvent(buf: EnvelopeBody): FileEvent | RemoteEvent;
+export interface VersionedReadFlagsMsg {
+    archivedVersion?: Value<number>;
+    remoteVersion?: Value<number>;
+}
+export declare function versionedReadFlagsFromMsg(msg: VersionedReadFlagsMsg | undefined): VersionedReadFlags | undefined;
+export declare function versionedReadFlagsToMsg(flags: VersionedReadFlags | undefined): VersionedReadFlagsMsg | undefined;
 export declare namespace vGetXAttr {
     interface Reply {
         version: number;