Replace deprecated serialized calls with withLock

src/serviceFeatures/conflictResolution/operations.ts

@@ -27,7 +27,7 @@ import type { LiveSyncEventHub } from "@vrtmrz/livesync-commonlib/context";
 import type { StorageAccess } from "@vrtmrz/livesync-commonlib/compat/interfaces/StorageAccess";
 import { EVENT_CONFLICT_CANCELLED } from "@vrtmrz/livesync-commonlib/compat/events/coreEvents";
 import { NO_INTERACTION } from "@vrtmrz/livesync-commonlib/replication";
-import { isLockAcquired, serialized } from "octagonal-wheels/concurrency/lock";
+import { isLockAcquired, withLock } from "octagonal-wheels/concurrency/lock";
 import diff_match_patch from "diff-match-patch";
 import { stripAllPrefixes, isPlainText } from "@vrtmrz/livesync-commonlib/compat/string_and_binary/path";
 
@@ -192,7 +192,7 @@ export function createConflictResolutionOperations(
             // per-file lock. Dialogues for other paths remain untouched.
             dependencies.events.emitEvent(EVENT_CONFLICT_CANCELLED, filename);
         }
-        return await serialized(serialisationKey, async () => {
+        return await withLock(serialisationKey, async () => {
             if (latestResolveRequestByFilename.get(filename) !== requestId) {
                 return;
             }

src/serviceFeatures/interactiveConflictResolution/operations.ts

@@ -22,7 +22,7 @@ import type {
 import type { LiveSyncLocalDB } from "@vrtmrz/livesync-commonlib/compat/pouchdb/LiveSyncLocalDB";
 import type { LiveSyncEventHub } from "@vrtmrz/livesync-commonlib/context";
 import { fireAndForget } from "octagonal-wheels/promises";
-import { serialized } from "octagonal-wheels/concurrency/lock";
+import { withLock } from "octagonal-wheels/concurrency/lock";
 import { NO_INTERACTION } from "@vrtmrz/livesync-commonlib/replication";
 import { displayRev } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import { EVENT_CONFLICT_CANCELLED, EVENT_ON_UNRESOLVED_ERROR } from "@/common/events.ts";
@@ -160,7 +160,7 @@ export function createInteractiveConflictResolutionOperations(
         // UI for resolving different files should proceed one-by-one. A newer
         // request for the active file replaces its dialogue instead of waiting
         // behind a comparison which is already stale.
-        return await serialized(dialogueSerialisationKey, async () => {
+        return await withLock(dialogueSerialisationKey, async () => {
             if (disposed || latestRequestByFilename.get(filename) !== requestId) {
                 return false;
             }

src/serviceFeatures/replication/ReplicateResultProcessor.ts

@@ -26,7 +26,7 @@ import {
 import { fireAndForget, isAnyNote, throttle } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import { Semaphore } from "octagonal-wheels/concurrency/semaphore_v2";
 import { withCounting } from "octagonal-wheels/concurrency/counting";
-import { serialized } from "octagonal-wheels/concurrency/lock";
+import { withLock } from "octagonal-wheels/concurrency/lock";
 import type { ReactiveSource } from "octagonal-wheels/dataobject/reactive_v2";
 import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 import { isNotFoundError } from "@vrtmrz/livesync-commonlib/compat/common/utils.doc";
@@ -534,7 +534,7 @@ export class ReplicateResultProcessor {
     private _applyToDatabase(doc_: PouchDB.Core.ExistingDocument<AnyEntry>) {
         const dbDoc = doc_ as LoadedEntry; // It has no `data`
         const path = this.getPath(dbDoc);
-        return serialized(`replication-process:${dbDoc._id}`, async () => {
+        return withLock(`replication-process:${dbDoc._id}`, async () => {
             const docNote = `${path} (${shortenId(dbDoc._id)}, ${shortenRev(dbDoc._rev)})`;
             const isRequired = await this.checkIsChangeRequiredForDatabaseProcessing(dbDoc);
             if (!isRequired) {