@rapidmx/activesync-plugin 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/lib/EasSyncKeyUtils.js

@@ -1,6 +1,34 @@
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2026 Jean-Philippe Steinmetz. All rights reserved.
+// SPDX-License-Identifier: MPL-2.0
+///////////////////////////////////////////////////////////////////////////////
+import { ApiError } from "@rapidrest/core";
+import { ApiErrors } from "@rapidrest/service-core";
+import { asEntity } from "./RestapiCompat.js";
+/** Whether `uid` can be listed in an `in(...)` query operand as itself: no comma (the operand separator), no parentheses
+ * or other punctuation, and not one of the literals the query parser substitutes (`me`, `null`). */
+export function isListableUid(uid) {
+    return /^[A-Za-z0-9_.:@+-]+$/.test(uid) && uid !== "me" && uid !== "null";
+}
+/** The cursor that precedes every row ever written. */
+export function epochCursor() {
+    return { date: new Date(0), uid: "" };
+}
+/** Orders two `(date, uid)` positions: negative when `a` sorts before `b`, positive when after, `0` when equal. */
+export function compareCursor(a, b) {
+    const byDate = a.date.getTime() - b.date.getTime();
+    if (byDate !== 0) {
+        return byDate;
+    }
+    return a.uid < b.uid ? -1 : a.uid > b.uid ? 1 : 0;
+}
+/** The cursor position of `row`. */
+export function cursorOf(row) {
+    return { date: new Date(row.dateModified), uid: row.uid };
+}
 /** Formats a `SyncKey` back into its wire string form. */
 export function formatSyncKey(key) {
-    return `${key.generation}:${key.watermark.toISOString()}`;
+    return `${key.generation}:${key.watermark.toISOString()}${key.uid ? `#${key.uid}` : ""}`;
 }
 /** Parses a stored/previously-issued `SyncKey` string. Returns `undefined` for a malformed value - callers
  * only ever parse a key this library itself minted and stored (never a raw, unvalidated client value; see
@@ -11,15 +39,17 @@ export function parseSyncKey(value) {
         return undefined;
     }
     const generation = Number(value.slice(0, separator));
-    const watermark = new Date(value.slice(separator + 1));
+    const rest = value.slice(separator + 1);
+    const hash = rest.indexOf("#");
+    const watermark = new Date(hash === -1 ? rest : rest.slice(0, hash));
     if (!Number.isFinite(generation) || Number.isNaN(watermark.getTime())) {
         return undefined;
     }
-    return { generation, watermark };
+    return hash === -1 ? { generation, watermark } : { generation, watermark, uid: rest.slice(hash + 1) };
 }
 /**
  * Resolves an incoming client `SyncKey` string against the value this library itself previously issued and
- * stored (`storedValue`, e.g. `DeviceSyncState.folderSyncKeys[folderUid]`) — deliberately a plain string
+ * stored (`storedValue`, e.g. `DeviceSyncState.folderSyncKeys["$foldersync"]`) — deliberately a plain string
  * equality check, not a re-parse-and-compare of the client's value, so a client that echoes back anything
  * other than the exact opaque string it was handed is treated as `"invalid"` even if it happens to parse.
  *
@@ -40,80 +70,113 @@ export function resolveSyncKey(clientValue, storedValue) {
     const parsed = parseSyncKey(storedValue);
     return parsed ? { kind: "valid", key: parsed } : { kind: "invalid" };
 }
+/** How many times `persistDeviceSyncState` re-reads and re-applies its patch after losing an optimistic-lock race. */
+const PERSIST_MAX_ATTEMPTS = 5;
 /**
  * Applies `patch` to `deviceSyncState` and persists it - the one correct way any EAS command handler (or
- * `BaseEasRoute` itself) should ever write to a `DeviceSyncState`, replacing the inline
- * `deviceSyncStateRepo.update(...)` calls `ProvisionCommand`/`FolderSyncCommand`/`SyncCommand` used to each
- * repeat individually.
+ * `BaseEasRoute` itself) should ever write to a `DeviceSyncState`.
  *
- * This exists because `RepoUtils.update()` does **not** mutate the `existing` object passed to it - confirmed
- * by reading its implementation directly - it only returns a freshly-fetched instance reflecting the write,
- * leaving the caller's in-memory copy (including its optimistic-concurrency `version`) stale. A single write
- * per request is harmless (nothing re-reads the stale copy), but a *second* write to the same `deviceSyncState`
- * later in the same request - e.g. `BaseEasRoute.dispatch()`'s own trailing `lastSyncAt` update, or a second
- * collection's SyncKey in a multi-collection `Sync` - would build its own patch's `version` off that stale
- * value. `RepoUtils.update()` filters its underlying write by exactly that `version`, so the write silently
- * matches zero rows instead of throwing - a silent no-op, not a visible error. Copying `update()`'s own
- * returned result back onto `deviceSyncState` (last line below) keeps every field, including `version`, current
- * for whatever writes this same request still has left to make.
+ * `RepoUtils.update()` does **not** mutate the `existing` object passed to it - it only returns a freshly-fetched
+ * instance reflecting the write - so the returned row (including its bumped `version`) is copied back onto
+ * `deviceSyncState`, keeping a second write later in the same request from being built off a stale version.
+ *
+ * **Concurrent requests**: one device routinely has several requests in flight at once (a long-poll `Ping`
+ * alongside a `Sync`, or two `Sync`s for different folders), and the row's optimistic lock covers the whole row.
+ * Losing that race used to surface as a 409 *after* the command's side effects had already happened. Instead, a
+ * version conflict re-reads the row, re-applies the patch on top of the fresh copy and retries (bounded). Pass
+ * `patch` as a function when it derives from the row's current content (e.g. updating one entry of the
+ * `folderSyncKeys` map) so the retry merges into what the other request wrote rather than overwriting it.
  */
 export async function persistDeviceSyncState(deviceSyncState, deviceSyncStateRepo, patch) {
-    Object.assign(deviceSyncState, patch);
-    const updated = await deviceSyncStateRepo.update({ uid: deviceSyncState.uid, version: deviceSyncState.version, ...patch }, deviceSyncState, { ignoreACL: true, skipPush: true });
-    Object.assign(deviceSyncState, updated);
+    for (let attempt = 1;; attempt++) {
+        const values = typeof patch === "function" ? patch(deviceSyncState) : patch;
+        Object.assign(deviceSyncState, values);
+        try {
+            const updated = await deviceSyncStateRepo.update({ uid: deviceSyncState.uid, version: deviceSyncState.version, ...values }, asEntity(deviceSyncStateRepo, deviceSyncState), { ignoreACL: true, skipPush: true });
+            Object.assign(deviceSyncState, updated);
+            return;
+        }
+        catch (err) {
+            if (!(err instanceof ApiError) || err.code !== ApiErrors.INVALID_OBJECT_VERSION || attempt >= PERSIST_MAX_ATTEMPTS) {
+                throw err;
+            }
+            const fresh = await deviceSyncStateRepo.findOne(deviceSyncState.uid, { ignoreACL: true });
+            if (!fresh) {
+                throw err;
+            }
+            Object.assign(deviceSyncState, fresh);
+        }
+    }
 }
-/** A tolerance window for treating a row's `dateCreated`/`dateModified` as "close enough" to be an `Add`
- * rather than a `Change` - the two are set within the same request handler and so are typically only
- * milliseconds apart, never exactly equal down to the microsecond depending on the datastore's clock
- * resolution. */
-const NEWLY_CREATED_TOLERANCE_MS = 1000;
+/** The JSON sort expression both backends' query builders accept for a `(dateModified, uid)` ordering. */
+const CURSOR_SORT = JSON.stringify({ dateModified: "ASC", uid: "ASC" });
 /**
- * Enumerates `Add`/`Change`/`Delete`s for one scoped collection since `watermark`, for `FolderSyncCommand` and
- * (eventually) `SyncCommand`'s shared cursor mechanism. Requires `T` to be `RecoverableBaseEntity` (soft
- * delete) — see `RecoverableRepoUtils`'s own doc comment for why a plain hard-deleted entity can't support
- * this at all (nothing left to enumerate once a row is actually gone).
+ * Reads up to `limit` rows matching `criteria` that sort strictly after `cursor` in `(dateModified, uid)` order,
+ * live and soft-deleted rows merged into one stream. `more` is `true` when rows beyond the returned page exist.
  *
- * `RepoUtils.find()` does **not** support an `includeDeleted` option - confirmed by reading its source: unlike
- * `count()`/`findOne()`, it never strips `ModelUtils.buildSearchQuery()`'s default `deleted: false` exclusion
- * back out. Rather than the (harmless-looking but silently no-op) `includeDeleted: true` this function used to
- * pass, deleted rows are fetched via a **second** `find()` call with an explicit, literal `deleted: true` in
- * the query object itself - `buildSearchQuery()`'s exclusion only applies when the caller's query has no
- * `"deleted"` key at all, so supplying one directly (rather than relying on an option `find()` doesn't honor)
- * reliably selects exactly the soft-deleted rows instead. The two result sets are then merged and re-windowed
- * together so `windowSize`/`MoreAvailable` still describe the combined stream, not each half independently.
+ * `RepoUtils.find()` excludes soft-deleted rows unless the query names `deleted` explicitly, so the two halves are
+ * separate queries (the second with a literal `deleted: true`), each over-fetched by one and merged. `limit`/`sort`
+ * are baked into the query object as well as the options - the SQL query builder only reads the former.
  */
-export async function computeChanges(repo, scopeField, scopeUid, watermark, windowSize) {
-    // Overfetch by one (per stream) so a full window can be distinguished from an exact-fit window without a
-    // separate count() round trip - the same trick `ExternalShareExpirationJob`/`MailboxQuotaRecalcJob` already
-    // use for their own MoreAvailable-shaped bookkeeping. `limit`/`sort` must be baked into the query object
-    // itself (not just `options`) for the SQL backend - see those same jobs' comments on this exact requirement.
-    const baseCriteria = { [scopeField]: scopeUid, dateModified: `gt(${watermark.toISOString()})` };
-    const findOptions = { ignoreACL: true, limit: windowSize + 1, sort: "dateModified" };
-    const [liveRows, deletedRows] = await Promise.all([
-        repo.find({ ...baseCriteria, sort: "dateModified", limit: windowSize + 1 }, findOptions),
-        repo.find({ ...baseCriteria, deleted: true, sort: "dateModified", limit: windowSize + 1 }, findOptions),
-    ]);
-    const merged = [...liveRows, ...deletedRows].sort((a, b) => new Date(a.dateModified).getTime() - new Date(b.dateModified).getTime());
-    const moreAvailable = merged.length > windowSize;
-    const page = moreAvailable ? merged.slice(0, windowSize) : merged;
+export async function scanAfter(repo, criteria, cursor, limit) {
+    const iso = cursor.date.toISOString();
+    const position = cursor.uid
+        ? { $or: [{ dateModified: `gt(${iso})` }, { dateModified: `range(${iso},${iso})`, uid: `gt(${cursor.uid})` }] }
+        : { dateModified: `gt(${iso})` };
+    const query = { ...criteria, ...position, sort: CURSOR_SORT, limit: limit + 1 };
+    const options = { ignoreACL: true, limit: limit + 1 };
+    const [live, deleted] = await Promise.all([repo.find(query, options), repo.find({ ...query, deleted: true }, options)]);
+    const merged = [...live, ...deleted].sort((a, b) => compareCursor(cursorOf(a), cursorOf(b)));
+    return { rows: merged.slice(0, limit), more: merged.length > limit };
+}
+/** The JSON sort expression for the newest-first `(dateModified, uid)` ordering `scanOverlap` reads with. */
+const CURSOR_SORT_DESC = JSON.stringify({ dateModified: "DESC", uid: "DESC" });
+/**
+ * Reads the rows matching `criteria` at or before `cursor` whose `dateModified` lies within `windowMs` of it - the
+ * part of the stream a cursor has already passed but where a row committed out of order (another replica stamped
+ * `dateModified` before this one read past it, but committed after) can still appear. At most `limit` rows, the
+ * newest ones, returned in ascending `(dateModified, uid)` order; live and soft-deleted rows merged as `scanAfter`
+ * does. Returns nothing for the epoch cursor (nothing has been passed yet).
+ */
+export async function scanOverlap(repo, criteria, cursor, windowMs, limit) {
+    if (cursor.date.getTime() === 0 || windowMs <= 0 || limit <= 0) {
+        return [];
+    }
+    const from = new Date(Math.max(0, cursor.date.getTime() - windowMs)).toISOString();
+    const query = { ...criteria, dateModified: `range(${from},${cursor.date.toISOString()})`, sort: CURSOR_SORT_DESC, limit };
+    const options = { ignoreACL: true, limit };
+    const [live, deleted] = await Promise.all([repo.find(query, options), repo.find({ ...query, deleted: true }, options)]);
+    return [...live, ...deleted]
+        .filter((row) => compareCursor(cursorOf(row), cursor) <= 0)
+        .sort((a, b) => compareCursor(cursorOf(b), cursorOf(a)))
+        .slice(0, limit)
+        .reverse();
+}
+/**
+ * Enumerates `Add`/`Change`/`Delete`s for one scoped collection after `cursor` - used by `FolderSyncCommand`
+ * (scoped by `mailboxUid` over `Folder`). `Sync` item collections use `EasCollectionSync` instead, which tracks the
+ * exact set of items each device holds; the folder hierarchy is small and always fully re-sent on `SyncKey 0`, so
+ * a creation-time rule is enough here: a row created after the cursor can't be on the device yet, so a live one is
+ * an `Add` (never an `Update` for a `ServerId` the device has never seen) and a deleted one is not reported at all.
+ */
+export async function computeChanges(repo, scopeField, scopeUid, cursor, windowSize) {
+    const { rows, more } = await scanAfter(repo, { [scopeField]: scopeUid }, cursor, windowSize);
     const adds = [];
     const changes = [];
     const deletes = [];
-    let newWatermark = watermark;
-    for (const row of page) {
-        const dateModified = new Date(row.dateModified);
-        if (dateModified.getTime() > newWatermark.getTime()) {
-            newWatermark = dateModified;
-        }
+    let next = cursor;
+    for (const row of rows) {
+        next = cursorOf(row);
+        const createdAfterCursor = new Date(row.dateCreated).getTime() > cursor.date.getTime();
         if (row.deleted === true) {
-            deletes.push(row);
+            if (!createdAfterCursor) {
+                deletes.push(row);
+            }
         }
         else {
-            const dateCreated = new Date(row.dateCreated);
-            const isNewlyCreated = Math.abs(dateModified.getTime() - dateCreated.getTime()) < NEWLY_CREATED_TOLERANCE_MS;
-            (isNewlyCreated ? adds : changes).push(row);
+            (createdAfterCursor ? adds : changes).push(row);
         }
     }
-    return { adds, changes, deletes, newWatermark, moreAvailable };
+    return { adds, changes, deletes, cursor: next, moreAvailable: more };
 }
 //# sourceMappingURL=EasSyncKeyUtils.js.map

package/dist/lib/EasSyncKeyUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"EasSyncKeyUtils.js","sourceRoot":"","sources":["../../src/EasSyncKeyUtils.ts"],"names":[],"mappings":"AAkBA,0DAA0D;AAC1D,MAAM,UAAU,aAAa,CAAC,GAAY;IACtC,OAAO,GAAG,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC;AAC9D,CAAC;AAED;;+GAE+G;AAC/G,MAAM,UAAU,YAAY,CAAC,KAAa;IACtC,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;QACnB,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC;IACvD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QACpE,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;AACrC,CAAC;AAOD;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,cAAc,CAAC,WAA+B,EAAE,WAA+B;IAC3F,IAAI,CAAC,WAAW,IAAI,WAAW,KAAK,GAAG,EAAE,CAAC;QACtC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC/B,CAAC;IACD,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,WAAW,EAAE,CAAC;QAC3D,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC/B,CAAC;IACD,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;AACzE,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CACxC,eAAgC,EAChC,mBAAmC,EACnC,KAA8B;IAE9B,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAC5C,EAAE,GAAG,EAAE,eAAe,CAAC,GAAG,EAAE,OAAO,EAAG,eAAuB,CAAC,OAAO,EAAE,GAAG,KAAK,EAAS,EACxF,eAAe,EACf,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CACtC,CAAC;IACF,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AAC5C,CAAC;AAkBD;;;iBAGiB;AACjB,MAAM,0BAA0B,GAAG,IAAI,CAAC;AAExC;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAChC,IAAkB,EAClB,UAAkB,EAClB,QAAgB,EAChB,SAAe,EACf,UAAkB;IAElB,yGAAyG;IACzG,4GAA4G;IAC5G,yGAAyG;IACzG,6GAA6G;IAC7G,MAAM,YAAY,GAAQ,EAAE,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC;IACrG,MAAM,WAAW,GAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,GAAG,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;IAC1F,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,GAAG,CAAC,EAAE,EAAE,WAAW,CAAC;QACxF,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,GAAG,CAAC,EAAE,EAAE,WAAW,CAAC;KAC1G,CAAC,CAAC;IAEH,MAAM,MAAM,GAAQ,CAAC,GAAG,QAAQ,EAAE,GAAG,WAAW,CAAC,CAAC,IAAI,CAClD,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAE,CAAS,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAE,CAAS,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CACtG,CAAC;IAEF,MAAM,aAAa,GAAY,MAAM,CAAC,MAAM,GAAG,UAAU,CAAC;IAC1D,MAAM,IAAI,GAAQ,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAEvE,MAAM,IAAI,GAAQ,EAAE,CAAC;IACrB,MAAM,OAAO,GAAQ,EAAE,CAAC;IACxB,MAAM,OAAO,GAAQ,EAAE,CAAC;IACxB,IAAI,YAAY,GAAS,SAAS,CAAC;IAEnC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACrB,MAAM,YAAY,GAAG,IAAI,IAAI,CAAE,GAAW,CAAC,YAAY,CAAC,CAAC;QACzD,IAAI,YAAY,CAAC,OAAO,EAAE,GAAG,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;YAClD,YAAY,GAAG,YAAY,CAAC;QAChC,CAAC;QAED,IAAK,GAAW,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAChC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACJ,MAAM,WAAW,GAAG,IAAI,IAAI,CAAE,GAAW,CAAC,WAAW,CAAC,CAAC;YACvD,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC,GAAG,0BAA0B,CAAC;YAC7G,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChD,CAAC;IACL,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC;AACnE,CAAC"}
+{"version":3,"file":"EasSyncKeyUtils.js","sourceRoot":"","sources":["../../src/EasSyncKeyUtils.ts"],"names":[],"mappings":"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"}

package/dist/lib/MessageMoveRules.js

@@ -0,0 +1,100 @@
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2026 Jean-Philippe Steinmetz. All rights reserved.
+// SPDX-License-Identifier: MPL-2.0
+///////////////////////////////////////////////////////////////////////////////
+import { FolderType } from "@rapidmx/restapi";
+/** `ScheduledSendJob`'s per-send retry state (restapi source), cleared with `scheduledSendTime` when a queued message
+ * leaves Outbox. Not all of these exist in `@rapidmx/restapi` 0.9.0 - see `planMessageMove()`. */
+const SCHEDULED_SEND_RETRY_FIELDS = ["scheduledSendAttempts", "scheduledSendError", "scheduledSendLeaseExpiresAt"];
+/** Parses a stored date that may come back as a `Date` or (Mongo) an ISO string; `undefined` if it isn't one. Copy of
+ * restapi's `toValidDate()` (`routes/BaseMessageRoute.ts`). */
+function toValidDate(value) {
+    const date = value instanceof Date ? value : typeof value === "string" || typeof value === "number" ? new Date(value) : undefined;
+    return date && !Number.isNaN(date.getTime()) ? date : undefined;
+}
+/** Whether a send of `message` is in flight: its `scheduledSendLeaseExpiresAt` (set when `send()` or `ScheduledSendJob`
+ * claims it for relay) is still in the future. restapi refuses to move or delete such a message (409,
+ * `assertNotInFlight()`): a moved or soft-deleted message could miss its relay marker and be sent a second time. */
+export function hasLiveSendLease(message) {
+    const lease = toValidDate(message.scheduledSendLeaseExpiresAt);
+    return lease !== undefined && lease.getTime() > Date.now();
+}
+/**
+ * Decides whether an ActiveSync client may move `message` from a folder of `sourceType` into one of `destinationType`,
+ * matching restapi's own REST rules for a non-trusted caller (`BaseMessageRoute.prepareScheduledSendUpdate()`), plus
+ * one of this plugin's own:
+ * - **Into Outbox** is always refused (`"destination"`): only a send puts a message there, after checking its sender -
+ * `ScheduledSendJob` relays whatever it finds in Outbox.
+ * - **Into Drafts** is refused unless the message already is in Drafts, or is taken back out of Outbox to cancel its send
+ * (`"destination"`): a draft's body can be rewritten over ActiveSync (`EmailSyncAdapter.fromApplicationData`), so moving a
+ * received, sent or held message into Drafts, editing it and moving it back would forge its content under its original
+ * sender and dates. Out of Outbox only for what a send queued: a delivered message (`scanResultUid`) a mail filter rule
+ * filed into Outbox is refused, as restapi refuses it with 403.
+ * - **A send in flight** (`hasLiveSendLease()` - claimed for relay by `send()` or `ScheduledSendJob`) can't be moved
+ * anywhere (`"inFlight"`), as restapi's `assertNotInFlight()` refuses with 409: moving it back to Drafts would let it be
+ * sent again while the first relay still runs. Once the lease has lapsed, it can move. Deletes check the same.
+ * - **Out of Outbox** cancels the scheduled send: the plan clears `scheduledSendTime`, the job's retry state and its
+ * lease (`scheduledSendAttempts`/`scheduledSendError`/`scheduledSendLeaseExpiresAt`, only where the stored row has them -
+ * the SQL model of restapi 0.9.0 has no such columns). A message the job already relayed (`scheduledSendRelayedAt`, whose
+ * filing is still pending) is refused (`"sent"`).
+ */
+export function planMessageMove(message, sourceType, destinationType) {
+    if (hasLiveSendLease(message)) {
+        return { allowed: false, reason: "inFlight" };
+    }
+    if (destinationType === FolderType.OUTBOX) {
+        return { allowed: false, reason: "destination" };
+    }
+    // A send only queues drafts: moving one back to Drafts cancels the send. A delivered message in Outbox isn't one.
+    const cancellingSend = sourceType === FolderType.OUTBOX && !message.scanResultUid;
+    if (destinationType === FolderType.DRAFTS && sourceType !== FolderType.DRAFTS && !cancellingSend) {
+        return { allowed: false, reason: "destination" };
+    }
+    const patch = {};
+    if (sourceType === FolderType.OUTBOX) {
+        if (message.scheduledSendRelayedAt) {
+            return { allowed: false, reason: "sent" };
+        }
+        patch.scheduledSendTime = null;
+        for (const field of SCHEDULED_SEND_RETRY_FIELDS) {
+            if (field in message) {
+                patch[field] = null;
+            }
+        }
+    }
+    return { allowed: true, patch };
+}
+/**
+ * `Message` fields only a delivery or a send ever sets - server-managed in restapi (a client's create/update can't set
+ * them), and never present on a draft composed over ActiveSync (`EmailSyncAdapter`), REST or webmail compose:
+ * - `scanResultUid`: inbound delivery (and import) scanned the message into the mailbox;
+ * - `scheduledSendRelayedAt`: the transport accepted it (set until it is filed into Sent Items);
+ * - `sanitizedHtmlBlobKey`: a scan produced sanitized HTML - a delivery, or `scanAndRelay()` on a send, which keeps it on
+ * the Sent Items copy (a draft is never scanned);
+ * - `encrypted: true`: computed by the same scan;
+ * - `recallRequestedAt`: `recall()` only works on a sent message;
+ * - a non-empty `receiptStatus`: seeded when a sent message is filed.
+ */
+const SENT_OR_DELIVERED_MARKERS = [
+    (message) => !!message.scanResultUid,
+    (message) => message.scheduledSendRelayedAt != null,
+    (message) => !!message.sanitizedHtmlBlobKey,
+    (message) => message.encrypted === true,
+    (message) => message.recallRequestedAt != null,
+    (message) => Array.isArray(message.receiptStatus) && message.receiptStatus.length > 0,
+];
+/**
+ * Whether `message`, filed in a folder of `folderType`, is a genuine draft whose content an ActiveSync client may
+ * rewrite: it lives in Drafts and carries none of the marks a delivery or a send leaves (`SENT_OR_DELIVERED_MARKERS`).
+ * Moves into Drafts are refused over ActiveSync (`planMessageMove()`), but a message can still reach Drafts other ways
+ * (restapi's REST moves out of Outbox, a mail filter, an import), so a delivered or sent message found there is not
+ * treated as a draft.
+ *
+ * `sentDate` can't be the marker: every message has one, and a draft gets it when it is created. **Residual**: a
+ * plain-text, unencrypted sent copy with no receipt request carries none of these marks; restapi keeps it out of
+ * Drafts (non-trusted moves into Drafts only from Drafts or Outbox, and only a send from Drafts queues into Outbox).
+ */
+export function isGenuineDraft(message, folderType) {
+    return folderType === FolderType.DRAFTS && !SENT_OR_DELIVERED_MARKERS.some((isMarked) => isMarked(message));
+}
+//# sourceMappingURL=MessageMoveRules.js.map

package/dist/lib/MessageMoveRules.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MessageMoveRules.js","sourceRoot":"","sources":["../../src/MessageMoveRules.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,mEAAmE;AACnE,mCAAmC;AACnC,+EAA+E;AAC/E,OAAO,EAAE,UAAU,EAAgB,MAAM,kBAAkB,CAAC;AAE5D;kGACkG;AAClG,MAAM,2BAA2B,GAAG,CAAC,uBAAuB,EAAE,oBAAoB,EAAE,6BAA6B,CAAU,CAAC;AAE5H;+DAC+D;AAC/D,SAAS,WAAW,CAAC,KAAc;IAC/B,MAAM,IAAI,GACN,KAAK,YAAY,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACzH,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AACpE,CAAC;AAED;;oHAEoH;AACpH,MAAM,UAAU,gBAAgB,CAAC,OAAgB;IAC7C,MAAM,KAAK,GAAqB,WAAW,CAAE,OAAe,CAAC,2BAA2B,CAAC,CAAC;IAC1F,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;AAC/D,CAAC;AAKD;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,eAAe,CAAC,OAAgB,EAAE,UAAkC,EAAE,eAAuC;IACzH,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAClD,CAAC;IACD,IAAI,eAAe,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;QACxC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;IACrD,CAAC;IACD,kHAAkH;IAClH,MAAM,cAAc,GAAY,UAAU,KAAK,UAAU,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;IAC3F,IAAI,eAAe,KAAK,UAAU,CAAC,MAAM,IAAI,UAAU,KAAK,UAAU,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC/F,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;IACrD,CAAC;IACD,MAAM,KAAK,GAA4B,EAAE,CAAC;IAC1C,IAAI,UAAU,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;QACnC,IAAK,OAAe,CAAC,sBAAsB,EAAE,CAAC;YAC1C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAC9C,CAAC;QACD,KAAK,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC/B,KAAK,MAAM,KAAK,IAAI,2BAA2B,EAAE,CAAC;YAC9C,IAAI,KAAK,IAAI,OAAO,EAAE,CAAC;gBACnB,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;YACxB,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AACpC,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,yBAAyB,GAAkC;IAC7D,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa;IACpC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,sBAAsB,IAAI,IAAI;IACnD,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB;IAC3C,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,KAAK,IAAI;IACvC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,iBAAiB,IAAI,IAAI;IAC9C,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC;CACxF,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,UAAU,cAAc,CAAC,OAAgB,EAAE,UAAkC;IAC/E,OAAO,UAAU,KAAK,UAAU,CAAC,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;AAChH,CAAC"}