core-3nweb-client-lib 0.43.7 → 0.43.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.43.7",
+  "version": "0.43.9",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",
@@ -36,10 +36,10 @@
     "xsp-files": "^4.2.1"
   },
   "devDependencies": {
-    "@types/jasmine": "^3.9.1",
-    "@types/node": "^16.11.7",
+    "@types/jasmine": "^5.1.13",
+    "@types/node": "^22.13.14",
     "@types/ws": "^8.18.1",
-    "jasmine": "^3.9.0",
+    "jasmine": "^5.13.0",
     "protobufjs-cli": "^1.0.2",
     "spec-3nweb-server": "^1.8.0",
     "tsuml2": "^0.17.1",

package/protos/file.proto

@@ -33,9 +33,9 @@ message SyncVersionsBranchMsg {
 }
 
 message UploadingStateMsg {
-	common.UInt64Value local_version = 1;
-	common.UInt64Value remote_version = 2;
-	common.UInt64Value bytes_left_to_upload = 3;
+	uint64 local_version = 1;
+	uint64 remote_version = 2;
+	uint64 bytes_left_to_upload = 3;
 	bool upload_started = 4;
 }
 
@@ -53,7 +53,8 @@ message StatsMsg {
 	common.UInt64Value mtime = 6;
 	common.UInt64Value ctime = 7;
 	common.UInt64Value version = 8;
-	SyncStatusMsg sync = 9;
+	common.UInt64Value bytes_need_download = 9;
+	common.StringValue version_sync_branch = 10;
 }
 
 // --- ReadonlyFile.getXAttr ---
@@ -95,16 +96,7 @@ message ReadBytesReplyBody {
 
 // --- ReadonlyFile.watch ---
 // Its an observable call, and initial request is empty.
-// Observer expects FileEvent in next.
-
-message FileEventMsg {
-	string type = 1;
-	string path = 2;
-	common.StringValue src = 3;
-	common.UInt64Value new_version = 4;
-	common.UInt64Value removed_arch_ver = 5;
-	common.UInt64Value archived_version = 6;
-}
+// Observer expects common.StringValue in next.
 
 
 // ==== ReadonlyFileVersionedAPI referable object ====
@@ -118,6 +110,10 @@ message RequestWithVersionedReadFlags {
 	VersionedReadFlags flags = 1;
 }
 
+// --- ReadonlyFileVersionedAPI.stat ---
+// Request body is RequestWithVersionedReadFlags
+// Reply body is StatsMsg
+
 // --- ReadonlyFileVersionedAPI.getXAttr ---
 message VersionedGetXAttrRequestBody {
 	string xa_name = 1;
@@ -305,7 +301,6 @@ message OptionsToAdopteRemote {
 // ==== WritableFileSyncAPI referable object ====
 
 // --- WritableFileSyncAPI.upload ---
-// Reply body is common.UInt64Value
 message FileSyncUploadRequestBody {
 	OptionsToUploadLocal opts = 1;
 }
@@ -313,7 +308,28 @@ message FileSyncUploadReplyBody {
 	common.UInt64Value uploaded_version = 1;
 }
 
+// --- WritableFileSyncAPI.startUpload ---
+// Request body is FileSyncUploadRequestBody
+message FileSyncStartUploadReplyBody {
+	message UploadInfo {
+		uint64 upload_version = 1;
+		uint64 upload_task_id = 2;
+	}
+	UploadInfo started_upload = 1;
+}
+
 message OptionsToUploadLocal {
 	common.UInt64Value local_version = 1;
 	common.UInt64Value upload_version = 2;
 }
+
+// --- WritableFileSyncAPI.watchUpload ---
+message WatchUploadRequestBody {
+	uint64 upload_task_id = 1;
+}
+message UploadEventMsg {
+	string type = 1;
+	uint64 upload_task_id = 2;
+	uint64 local_version = 3;
+	uint64 upload_version = 4;
+}

package/protos/fs.proto

@@ -39,7 +39,7 @@ message CheckPresenceRequestBody {
 
 // --- ReadonlyFS.stat ---
 // Request body is PathOnlyRequestBody
-// Reply body is File.Stats
+// Reply body is file.StatsMsg
 
 message PathOnlyRequestBody {
 	string path = 1;
@@ -74,29 +74,15 @@ message SymLinkTargetReplyBody {
 
 // --- ReadonlyFS.watchFolder ---
 // Its an observable call, and initial request is PathOnlyRequestBody
-// Observer expects FSEventMsg in next.
-
-message FSEventMsg {
-	string type = 1;
-	string path = 2;
-	common.StringValue src = 3;
-	common.UInt64Value new_version = 4;
-	common.StringValue name = 5;
-	common.StringValue old_name = 6;
-	common.StringValue new_name = 7;
-	ListingEntryMsg entry = 8;
-	common.UInt64Value move_label = 9;
-	common.UInt64Value removed_arch_ver = 10;
-	common.UInt64Value archived_version = 11;
-}
+// Observer expects common.StringValue in next.
 
 // --- ReadonlyFS.watchFile ---
 // Its an observable call, and initial request is PathOnlyRequestBody
-// Observer expects FSEventMsg in next.
+// Observer expects common.StringValue in next.
 
 // --- ReadonlyFS.watchTree ---
 // Its an observable call, and initial request is PathOnlyRequestBody
-// Observer expects FSEventMsg in next.
+// Observer expects common.StringValue in next.
 message WatchTreeRequestBody {
 	string path = 1;
 	common.UInt32Value depth = 2;
@@ -230,6 +216,10 @@ message CollectionEvent {
 
 // ==== ReadonlyFSVersionedAPI referable object ====
 
+// --- ReadonlyFSVersionedAPI.stat ---
+// Request body is PathAndFlagsRequestBody
+// Reply body is file.StatsMsg
+
 // --- ReadonlyFSVersionedAPI.getXAttr ---
 message VersionedGetXAttrRequestBody {
 	string path = 1;
@@ -526,14 +516,15 @@ message FolderDiff {
 // ==== WritableFSSyncAPI referable object ====
 
 // --- WritableFSSyncAPI.upload ---
-// Reply body is common.UInt64Value
+// Reply body is file.FileSyncUploadReplyBody
 message FSSyncUploadRequestBody {
 	string path = 1;
 	file.OptionsToUploadLocal opts = 2;
 }
-message FSSyncUploadReplyBody {
-	common.UInt64Value uploaded_version = 1;
-}
+
+// --- WritableFSSyncAPI.startUpload ---
+// Request body is FSSyncUploadRequestBody
+// Reply body is file.FileSyncStartUploadReplyBody
 
 // --- WritableFSSyncAPI.adoptRemoteFolderItem ---
 message AdoptRemoteFolderItemRequestBody {