core-3nweb-client-lib 0.25.6 → 0.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.25.6",
+  "version": "0.26.0",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",
@@ -27,10 +27,10 @@
   "license": "GPL-3.0-or-later",
   "dependencies": {
     "ecma-nacl": "^2.5.1",
-    "protobufjs": "^6.10.1",
+    "protobufjs": "^6.11.3",
     "punycode": "^2.1.1",
     "rxjs": "^6.5.2",
-    "ws": "^7.0.0",
+    "ws": "^7.4.6",
     "xsp-files": "^4.0.0"
   },
   "devDependencies": {
@@ -38,7 +38,7 @@
     "@types/node": "^12.0.4",
     "@types/ws": "^4.0.0",
     "jasmine": "^3.9.0",
-    "spec-3nweb-server": "^1.3.8",
+    "spec-3nweb-server": "^1.4.0",
     "typescript": "^3.7.3"
   }
 }

package/protos/file.proto

@@ -22,6 +22,14 @@ message File {
 // Request body is empty
 // Reply body is StatsMsg
 message StatsMsg {
+	message SyncInfo {
+		string state = 1;
+		common.UInt64Value latest = 2;
+		common.UInt64Value remote = 3;
+		repeated uint64 conflicting_remote = 4;
+		common.BooleanValue deleted_on_remote = 5;
+	}
+
 	common.BooleanValue is_file = 1;
 	common.BooleanValue is_folder = 2;
 	common.BooleanValue is_link = 3;
@@ -30,6 +38,7 @@ message StatsMsg {
 	common.UInt64Value mtime = 6;
 	common.UInt64Value ctime = 7;
 	common.UInt64Value version = 8;
+	SyncInfo sync = 9;
 }
 
 // --- ReadonlyFile.getXAttr ---
@@ -79,8 +88,7 @@ message FileEventMsg {
 	common.BooleanValue is_remote = 3;
 	common.UInt64Value new_version = 4;
 	common.UInt64Value current = 14;
-	common.UInt64Value last_synced = 15;
-	common.UInt64Value remote_version = 16;
+	common.UInt64Value uploaded = 15;
 }
 
 

package/protos/fs.proto

@@ -85,8 +85,8 @@ message FSEventMsg {
 	common.StringValue new_name = 12;
 	ListingEntryMsg entry = 13;
 	common.UInt64Value current = 14;
-	common.UInt64Value last_synced = 15;
-	common.UInt64Value remote_version = 16;
+	common.UInt64Value uploaded = 15;
+	common.UInt64Value move_label = 16;
 }
 
 // --- ReadonlyFS.watchFile ---

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

@@ -1,41 +0,0 @@
-import { LogError } from '../../../lib-client/logging/log-to-file';
-export interface UploadInfo {
-    type: 'upload';
-    transactionId?: string;
-    awaiting?: {
-        header?: true;
-        segs: BytesSection[];
-        allByteOnDisk?: true;
-    };
-    version: number;
-    baseVersion?: number;
-    done: boolean;
-}
-export interface BytesSection {
-    ofs: number;
-    len: number;
-}
-export interface RemovalInfo {
-    type: 'removal';
-    archivedVersions?: number[] | number;
-    currentVersion?: true;
-}
-export interface ArchivalInfo {
-    type: 'archiving';
-    archivalOfCurrent?: true;
-}
-export declare type UpSyncTaskInfo = UploadInfo | RemovalInfo | ArchivalInfo;
-export declare function makeUploadInfo(version: number, baseVersion: number | undefined): UploadInfo;
-export declare class UpSyncTasks {
-    private readonly objFolder;
-    private readonly saveProc;
-    private status;
-    private initProc;
-    private tasksAwaitingInit;
-    constructor(objFolder: string, logError: LogError);
-    queueTask(t: UpSyncTaskInfo): void;
-    nextTask(): Promise<UpSyncTaskInfo | undefined>;
-    recordInterimStateOfCurrentTask(t: UploadInfo): Promise<void>;
-    recordTaskCompletion(t: UpSyncTaskInfo): Promise<void>;
-    isDone(): boolean;
-}

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

@@ -1,158 +0,0 @@
-"use strict";
-/*
- Copyright (C) 2020 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
- Foundation, either version 3 of the License, or (at your option) any later
- version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>. */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UpSyncTasks = exports.makeUploadInfo = void 0;
-const processes_1 = require("../../../lib-common/processes");
-const fs = require("../../../lib-common/async-fs-node");
-const path_1 = require("path");
-const obj_info_file_1 = require("../common/obj-info-file");
-function makeUploadInfo(version, baseVersion) {
-    return {
-        type: 'upload',
-        done: false,
-        version,
-        baseVersion
-    };
-}
-exports.makeUploadInfo = makeUploadInfo;
-const UPSYNC_FILE_NAME = 'upsync';
-class UpSyncTasks {
-    constructor(objFolder, logError) {
-        this.objFolder = objFolder;
-        this.saveProc = new processes_1.DeduppedRunner(async () => {
-            if (this.isDone()) {
-                await fs.unlink(path_1.join(this.objFolder, UPSYNC_FILE_NAME)).catch((e) => { if (!e.notFound) {
-                    throw e;
-                } });
-            }
-            else {
-                await fs.writeFile(path_1.join(this.objFolder, UPSYNC_FILE_NAME), JSON.stringify(this.status), { encoding: 'utf8' });
-            }
-        });
-        this.status = undefined;
-        this.initProc = undefined;
-        this.tasksAwaitingInit = undefined;
-        this.initProc = readOrMakeUpSyncInfo(this.objFolder).then(status => {
-            this.status = status;
-            if (this.tasksAwaitingInit) {
-                for (const t of this.tasksAwaitingInit) {
-                    this.queueTask(t);
-                }
-                this.tasksAwaitingInit = undefined;
-            }
-            this.initProc = undefined;
-        }, err => {
-            logError(err, `Can't setup upsync status.`);
-            this.initProc = undefined;
-        });
-        Object.seal(this);
-    }
-    queueTask(t) {
-        if (this.status) {
-            addTaskToQueue(this.status.queued, t);
-            this.saveProc.trigger();
-        }
-        else {
-            if (!this.tasksAwaitingInit) {
-                this.tasksAwaitingInit = [];
-            }
-            this.tasksAwaitingInit.push(t);
-        }
-    }
-    async nextTask() {
-        if (!this.status) {
-            await this.initProc;
-            if (!this.status) {
-                throw new Error(`Status not set after wait`);
-            }
-        }
-        if (this.status.current) {
-            return this.status.current;
-        }
-        this.status.current = this.status.queued.shift();
-        if (this.status.current) {
-            await this.saveProc.trigger();
-        }
-        return this.status.current;
-    }
-    async recordInterimStateOfCurrentTask(t) {
-        if (!this.status) {
-            throw new Error(`This method is called too early.`);
-        }
-        if (this.status.current === t) {
-            await this.saveProc.trigger();
-        }
-        else {
-            throw new Error(`Can save interim state of a current task only`);
-        }
-    }
-    async recordTaskCompletion(t) {
-        if (!this.status) {
-            throw new Error(`This method is called too early.`);
-        }
-        if (this.status.current === t) {
-            this.status.current = undefined;
-            await this.saveProc.trigger();
-        }
-    }
-    isDone() {
-        if (!this.status) {
-            return false;
-        }
-        else {
-            return (!this.status.current && (this.status.queued.length === 0));
-        }
-    }
-}
-exports.UpSyncTasks = UpSyncTasks;
-Object.freeze(UpSyncTasks.prototype);
-Object.freeze(UpSyncTasks);
-function addTaskToQueue(q, t) {
-    if (t.type === 'upload') {
-        addUploadToQueue(q, t);
-    }
-    else if (t.type === 'removal') {
-        addRemovalToQueue(q, t);
-    }
-    else if (t.type === 'archiving') {
-        addArchivalToQueue(q, t);
-    }
-    else {
-        throw new Error(`Unsupported upsync task type`);
-    }
-}
-function addUploadToQueue(q, u) {
-    // XXX
-    q.push(u);
-}
-function addRemovalToQueue(q, r) {
-    // XXX
-    q.push(r);
-}
-function addArchivalToQueue(q, a) {
-    // XXX
-    q.push(a);
-}
-async function readOrMakeUpSyncInfo(objFolder) {
-    const status = await obj_info_file_1.readJSONInfoFileIn(objFolder, UPSYNC_FILE_NAME);
-    if (!status) {
-        return { queued: [] };
-    }
-    // XXX we may do some checks and sanitization here
-    return status;
-}
-Object.freeze(exports);