@vrtmrz/livesync-commonlib 0.1.16 → 0.1.18

package/dist/rpc/transports/trysteroUtils.js

@@ -1,3 +1,9 @@
+import { P2PConnectionPaths } from "../../common/models/setting.const.js";
+import {
+  hasValidP2PTurnServerUrl,
+  normaliseP2PConnectionPath,
+  splitP2PTurnServerUrls
+} from "../../common/models/setting.p2p.js";
 import { mixedHash } from "octagonal-wheels/hash/purejs";
 import { compatGlobal } from "../../common/coreEnvFunctions.js";
 import { createDiagRTCPeerConnectionConstructor } from "./DiagRTCPeerConnections.js";
@@ -5,7 +11,7 @@ function generateJoinRoomOptions(settings) {
   const passphraseNumbers = mixedHash(settings.P2P_passphrase, 0);
   const passphrase = passphraseNumbers[0].toString(36) + passphraseNumbers[1].toString(36);
   const relays = settings.P2P_relays.split(",").map((e) => e.trim()).filter((e) => e.length > 0);
-  const turnServers = settings.P2P_turnServers.split(",").map((e) => e.trim()).filter((e) => e.length > 0);
+  const turnServers = splitP2PTurnServerUrls(settings.P2P_turnServers);
   const relayConfig = {
     manualReconnection: true,
     urls: relays
@@ -30,6 +36,11 @@ function generateJoinRoomOptions(settings) {
       }
     ];
   }
+  if (normaliseP2PConnectionPath(settings.P2P_connectionPath) === P2PConnectionPaths.Relay && hasValidP2PTurnServerUrl(settings.P2P_turnServers)) {
+    options.rtcConfig = {
+      iceTransportPolicy: "relay"
+    };
+  }
   return options;
 }
 export {

package/dist/serviceModules/ServiceDatabaseFileAccessBase.d.ts

@@ -27,6 +27,7 @@ export declare class ServiceDatabaseFileAccessBase extends ServiceModuleBase<Ser
     createChunks(file: UXFileInfo, force?: boolean, skipCheck?: boolean): Promise<boolean>;
     store(file: UXFileInfo, force?: boolean, skipCheck?: boolean): Promise<boolean>;
     storeWithBaseRevision(file: UXFileInfo, baseRevision: string | undefined, skipCheck?: boolean): Promise<string | false>;
+    storeWithLiveBaseRevision(file: UXFileInfo, baseRevision: string, skipCheck?: boolean): Promise<string | false>;
     storeAsConflictedRevision(file: UXFileInfo, currentRev: string, skipCheck?: boolean): Promise<boolean>;
     storeAsConflictedRevisionWithResult(file: UXFileInfo, currentRev: string, skipCheck?: boolean): Promise<string | false>;
     storeDeletionWithBaseRevision(file: UXFileInfoStub | FilePathWithPrefix, baseRevision: string): Promise<string | false>;

package/dist/serviceModules/ServiceDatabaseFileAccessBase.js

@@ -53,7 +53,17 @@ class ServiceDatabaseFileAccessBase extends ServiceModuleBase {
     return await this.__store(file, force, skipCheck, false) !== false;
   }
   async storeWithBaseRevision(file, baseRevision, skipCheck) {
-    const result = await this.__store(file, true, skipCheck, false, baseRevision);
+    const result = await this.__store(file, true, skipCheck, false, {
+      mode: "force-base",
+      baseRevision
+    });
+    return result !== null && typeof result === "object" && "rev" in result ? result.rev : false;
+  }
+  async storeWithLiveBaseRevision(file, baseRevision, skipCheck) {
+    const result = await this.__store(file, true, skipCheck, false, {
+      mode: "live-base",
+      baseRevision
+    });
     return result !== null && typeof result === "object" && "rev" in result ? result.rev : false;
   }
   async storeAsConflictedRevision(file, currentRev, skipCheck) {
@@ -97,7 +107,7 @@ class ServiceDatabaseFileAccessBase extends ServiceModuleBase {
     };
     return await this.__store(dummyUXFileInfo, true, false, false) !== false;
   }
-  async __store(file, force = false, skipCheck, onlyChunks, conflictBaseRev) {
+  async __store(file, force = false, skipCheck, onlyChunks, revisionTarget = { mode: "default" }) {
     if (!skipCheck) {
       if (!await this.checkIsTargetFile(file)) {
         return true;
@@ -148,7 +158,7 @@ class ServiceDatabaseFileAccessBase extends ServiceModuleBase {
     };
     const msg = `STORAGE -> DB (${datatype}) `;
     const isNotChanged = await serialized("file-" + fullPath, async () => {
-      if (conflictBaseRev) {
+      if (revisionTarget.mode !== "default") {
         return false;
       }
       if (force) {
@@ -183,7 +193,15 @@ class ServiceDatabaseFileAccessBase extends ServiceModuleBase {
       this._log(msg + " Skip " + fullPath, LOG_LEVEL_VERBOSE);
       return true;
     }
-    const ret = await this.database.localDatabase.putDBEntry(d, onlyChunks, conflictBaseRev);
+    const ret = revisionTarget.mode === "live-base" ? await this.database.localDatabase.putDBEntryWithLiveBaseRevision(
+      d,
+      revisionTarget.baseRevision,
+      onlyChunks
+    ) : await this.database.localDatabase.putDBEntry(
+      d,
+      onlyChunks,
+      revisionTarget.mode === "force-base" ? revisionTarget.baseRevision : void 0
+    );
     if (ret !== false) {
       this._log(msg + fullPath);
       this.events.emitEvent(EVENT_FILE_SAVED);