@crowi/api 2.0.0-alpha.0

package/dist/util/dedup-users.js

@@ -0,0 +1,149 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ARRAY_USER_REFS = exports.SCALAR_USER_REFS = void 0;
+exports.reassignUserReferences = reassignUserReferences;
+exports.mergeUserGroups = mergeUserGroups;
+exports.chooseSurvivor = chooseSurvivor;
+/**
+ * The full scalar reference set (uniqueness spec §c). `from` is matched by
+ * exact equality; reassigned to `to` via `$set`.
+ */
+exports.SCALAR_USER_REFS = [
+    { collection: 'pages', field: 'creator' },
+    { collection: 'pages', field: 'lastUpdateUser' },
+    { collection: 'revisions', field: 'author' },
+    { collection: 'revisions', field: 'savedBy' },
+    { collection: 'comments', field: 'creator' },
+    // `bookmarks.user`: the compound-unique conflict (a page both users
+    // bookmarked) is resolved first by UNIQUE_PER_USER_REFS below; the remaining
+    // non-conflicting rows reassign here like any other scalar.
+    { collection: 'bookmarks', field: 'user' },
+    { collection: 'attachments', field: 'creator' },
+    { collection: 'shares', field: 'creator' },
+    { collection: 'watchers', field: 'user' },
+    { collection: 'activities', field: 'user' },
+    { collection: 'notifications', field: 'user' },
+    { collection: 'updateposts', field: 'creator' },
+];
+/** The full array reference set (uniqueness spec §c). */
+exports.ARRAY_USER_REFS = [
+    { collection: 'pages', field: 'grantedUsers' },
+    { collection: 'pages', field: 'liker' },
+    { collection: 'pages', field: 'seenUsers' },
+    { collection: 'revisions', field: 'contributors' },
+];
+/**
+ * Collections with a unique `{ <pageField>, user }` index where reassigning a
+ * losing user's row onto the survivor could collide with an existing survivor
+ * row. Those losing rows are deleted before the generic scalar reassign so the
+ * `$set` never trips the compound unique index. `bookmarks` is the only such
+ * collection in the §c set.
+ */
+const UNIQUE_PER_USER_REFS = [{ collection: 'bookmarks', userField: 'user' }];
+/**
+ * Reassign every ownership reference from `from` to `to`. Does not touch the
+ * `users` collection itself (the caller deletes/keeps the user docs). Pure data
+ * movement — safe to call repeatedly (idempotent: a second run finds no `from`
+ * references left).
+ */
+async function reassignUserReferences(db, from, to, logger) {
+    const reassigned = {};
+    let deletedConflicting = 0;
+    // 1. Resolve compound-unique collisions first (delete losing rows that would
+    //    collide with an existing survivor row on reassign). For bookmarks the
+    //    unique key is { page, user }: delete a `from` bookmark whose page the
+    //    `to` user already bookmarks.
+    for (const { collection, userField } of UNIQUE_PER_USER_REFS) {
+        const col = db.collection(collection);
+        const fromRows = await col.find({ [userField]: from }).toArray();
+        for (const row of fromRows) {
+            const page = row.page;
+            const survivorHas = await col.findOne({ page, [userField]: to });
+            if (survivorHas) {
+                await col.deleteOne({ _id: row._id });
+                deletedConflicting += 1;
+            }
+        }
+    }
+    // 2. Scalar references: `$set` field = to where field = from.
+    for (const { collection, field } of exports.SCALAR_USER_REFS) {
+        const res = await db.collection(collection).updateMany({ [field]: from }, { $set: { [field]: to } });
+        const n = res.modifiedCount ?? 0;
+        if (n > 0)
+            reassigned[`${collection}.${field}`] = n;
+    }
+    // 3. Array references: add the survivor, then remove the loser. `$addToSet`
+    //    keeps the survivor unique; doing it before `$pull` means a doc that had
+    //    only `from` still ends up with `to`.
+    for (const { collection, field } of exports.ARRAY_USER_REFS) {
+        const col = db.collection(collection);
+        const added = await col.updateMany({ [field]: from }, { $addToSet: { [field]: to } });
+        const pulled = await col.updateMany({ [field]: from }, { $pull: { [field]: from } });
+        const n = Math.max(added.modifiedCount ?? 0, pulled.modifiedCount ?? 0);
+        if (n > 0)
+            reassigned[`${collection}.${field}`] = n;
+    }
+    logger?.debug(`reassignUserReferences: ${from} -> ${to}`, reassigned, { deletedConflicting });
+    return { reassigned, deletedConflicting };
+}
+/**
+ * Merge each group: reassign every removed user's references onto `keep`, then
+ * delete the removed user docs. `dryRun` reports the would-be effect without
+ * writing.
+ */
+async function mergeUserGroups(db, groups, opts) {
+    const reassigned = {};
+    let usersRemoved = 0;
+    let deletedConflicting = 0;
+    let groupsMerged = 0;
+    for (const group of groups) {
+        if (group.remove.length === 0)
+            continue;
+        groupsMerged += 1;
+        if (opts.dryRun) {
+            usersRemoved += group.remove.length;
+            continue;
+        }
+        for (const from of group.remove) {
+            const result = await reassignUserReferences(db, from, group.keep, opts.logger);
+            for (const [key, n] of Object.entries(result.reassigned)) {
+                reassigned[key] = (reassigned[key] ?? 0) + n;
+            }
+            deletedConflicting += result.deletedConflicting;
+            await db.collection('users').deleteOne({ _id: from });
+            usersRemoved += 1;
+        }
+    }
+    return { groupsMerged, usersRemoved, reassigned, deletedConflicting };
+}
+/**
+ * The policy for choosing which user in a duplicate group survives
+ * (uniqueness spec §c): keep the one with the most content, breaking ties by
+ * oldest `createdAt`. "Content" is approximated by the number of pages the user
+ * created — the dominant signal in the incident and cheap to count.
+ *
+ * Returns the group with `keep` set to the winner and `remove` to the rest.
+ */
+async function chooseSurvivor(db, candidateIds) {
+    if (candidateIds.length === 0)
+        throw new Error('chooseSurvivor: empty candidate set');
+    const users = await db
+        .collection('users')
+        .find({ _id: { $in: candidateIds } })
+        .toArray();
+    const pages = db.collection('pages');
+    const scored = await Promise.all(users.map(async (u) => {
+        const id = u._id;
+        const createdAt = u.createdAt ?? new Date(0);
+        const pageCount = await pages.countDocuments({ creator: id });
+        return { id, createdAt, pageCount };
+    }));
+    scored.sort((a, b) => {
+        if (b.pageCount !== a.pageCount)
+            return b.pageCount - a.pageCount; // most content first
+        return a.createdAt.getTime() - b.createdAt.getTime(); // then oldest first
+    });
+    const [winner, ...losers] = scored;
+    return { keep: winner.id, remove: losers.map((l) => l.id) };
+}
+//# sourceMappingURL=dedup-users.js.map

package/dist/util/dedup-users.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dedup-users.js","sourceRoot":"","sources":["../../src/util/dedup-users.ts"],"names":[],"mappings":"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"}

package/dist/util/editor-cap-counter.d.ts

@@ -0,0 +1,90 @@
+/** Default editor cap when `COLLAB_MAX_EDITORS_PER_PAGE` is unset / invalid. */
+export declare const DEFAULT_MAX_EDITORS = 20;
+/**
+ * Parse `COLLAB_MAX_EDITORS_PER_PAGE` (or any equivalent env string)
+ * defensively. Empty / non-numeric / non-positive values fall back to
+ * `DEFAULT_MAX_EDITORS` so callers never have to remember the
+ * "isFinite && > 0" dance.
+ */
+export declare function parseCapEnv(value: string | undefined): number;
+export interface TryAcquireResult {
+    acquired: boolean;
+    /** Post-acquire SCARD (or the SCARD observed when rejection happens). */
+    count: number;
+    cap: number;
+}
+export interface EditorCapCounter {
+    /** Soft maximum editors per page (`COLLAB_MAX_EDITORS_PER_PAGE`, default 20). */
+    readonly maxEditorsPerPage: number;
+    /**
+     * Read-only count check. Used by the wsToken endpoint so a 21st
+     * client gets a `readonly: true` token *before* the WebSocket
+     * connects, avoiding the "editable for a millisecond then forced
+     * readonly" UX bug.
+     */
+    peek(pageId: string): Promise<{
+        count: number;
+        cap: number;
+    }>;
+    /**
+     * SADD the `<userId>:<socketId>` entry **after** verifying the
+     * pre-acquire count is under the cap. Returns `acquired: false`
+     * when the entry is rejected so the caller can flip the readonly
+     * bit on the connection.
+     */
+    tryAcquire(pageId: string, userId: string, socketId: string): Promise<TryAcquireResult>;
+    /**
+     * SREM the entry. Best-effort: failures are warn-only (the entry
+     * eventually expires via the per-key TTL). No-op for entries that
+     * were never acquired (Redis SREM returns 0).
+     */
+    release(pageId: string, userId: string, socketId: string): Promise<void>;
+    /**
+     * Disconnect handler. Embedded collab shares `crowi.redis` so the
+     * disconnect call is a no-op (api owns the client lifecycle). The
+     * method stays on the interface so a future Phase 9 multi-instance
+     * extension that owns its own client can implement teardown
+     * symmetrically.
+     */
+    disconnect(): Promise<void>;
+}
+export interface CreateEditorCapCounterOptions {
+    /**
+     * Pre-built node-redis v4 client (typed structurally as
+     * `MinimalRedisClient`). Pass `crowi.redis` from the api boot.
+     * `null` / `undefined` → return a no-op counter (Redis not
+     * configured; cap disabled).
+     */
+    redisClient?: MinimalRedisClient | null;
+    /** Override the default 20-editor cap. */
+    maxEditorsPerPage?: number;
+    /**
+     * Test seam — inject a pre-built `RedisClientType`-shaped object.
+     * Kept distinct from `redisClient` so unit tests can drive a fake
+     * without the api passing a real client (the production wiring
+     * always uses `redisClient`; tests that mock the fake go through
+     * this seam).
+     */
+    __clientForTest?: MinimalRedisClient;
+}
+/**
+ * Minimum surface of node-redis v4 we lean on. Keeps the test mock
+ * surface narrow and gives us a single place to extend if Phase 9's
+ * multi-server work needs more commands.
+ */
+export interface MinimalRedisClient {
+    isOpen: boolean;
+    connect(): Promise<unknown>;
+    disconnect(): Promise<unknown>;
+    sCard(key: string): Promise<number>;
+    sAdd(key: string, member: string): Promise<number>;
+    sRem(key: string, member: string): Promise<number>;
+    expire(key: string, seconds: number): Promise<unknown>;
+}
+/**
+ * Build an editor-cap counter against a shared Redis client.
+ *
+ * Returns a no-op counter when `redisClient` is null/undefined — the
+ * API surface is identical so callers don't have to branch.
+ */
+export declare function createEditorCapCounter(opts?: CreateEditorCapCounterOptions): Promise<EditorCapCounter>;

package/dist/util/editor-cap-counter.js

@@ -0,0 +1,175 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_MAX_EDITORS = void 0;
+exports.parseCapEnv = parseCapEnv;
+exports.createEditorCapCounter = createEditorCapCounter;
+const debug_1 = __importDefault(require("debug"));
+const debug = (0, debug_1.default)('crowi:util:editor-cap-counter');
+/**
+ * RFC-0003 Phase 6 — Redis-backed editor cap counter.
+ *
+ * Tracks the set of currently-connected editors per page so the
+ * wsToken issuance path (api HTTP handler) and the WebSocket
+ * `onAuthenticate` hook (in-process Hocuspocus engine; see
+ * `src/collab/attach.ts`) agree on a single cluster-wide count.
+ *
+ * Wire-level design:
+ *
+ *   - Key:   `crowi:collab:editors:<pageId>`
+ *   - Value: a **Set** of `<userId>:<socketId>` entries (one entry
+ *            per active WebSocket connection).
+ *   - TTL:   `EXPIRE 86400` (24 h) is re-applied on every successful
+ *            `SADD` so an idle key naturally evaporates after a day
+ *            of stillness. Stale entries left behind by abnormal
+ *            disconnects are bounded by the same TTL — the spec
+ *            (`defence in depth`) explicitly allows up to 24 h of
+ *            overcount before Redis garbage-collects.
+ *
+ * Why a Set, not INCR/DECR?
+ *
+ *   - INCR / DECR is asymmetric on abnormal close: a +1 that never
+ *     gets the matching -1 climbs the counter until an operator
+ *     manually resets it. SADD-with-EXPIRE self-heals.
+ *   - SCARD is O(1) so the read cost matches GET-against-INCR.
+ *   - The same `<userId>:<socketId>` can be SADD'd twice (handler
+ *     retry, etc.) without inflating the count (Set idempotency).
+ *
+ * Race window:
+ *
+ *   - SCARD + SADD is *not* atomic; a 21st client racing 20 acquirers
+ *     can briefly observe `count = 20`, write its entry, then settle
+ *     at 21. The spec accepts this — Phase 6 is "defence in depth",
+ *     not "hard cap with Redis Lua". A `simplify` pass may add a Lua
+ *     script if operations need stricter semantics.
+ *
+ * Fail-open posture:
+ *
+ *   - `redisClient` null/undefined (= REDIS_URL unset) → return a
+ *     no-op counter: `peek` is always 0, `tryAcquire` is always
+ *     `{acquired: true}`, `release` is a no-op. The cap is a soft
+ *     limit by design.
+ *
+ * Phase 9 (same-process attach) signature change: the previous
+ * `redisOpts` argument is replaced with a pre-built `redisClient`
+ * (typed structurally as `MinimalRedisClient`). The api boot opens
+ * exactly one Redis client per process (`crowi.redis`); embedded
+ * collab now shares it instead of opening a second connection — see
+ * `.feature-state/specs/feature-collab-embed-into-api.md` §"Redis
+ * client 共有".
+ */
+const KEY_PREFIX = 'crowi:collab:editors:';
+/** Default editor cap when `COLLAB_MAX_EDITORS_PER_PAGE` is unset / invalid. */
+exports.DEFAULT_MAX_EDITORS = 20;
+const TTL_SECONDS = 86400; // 24h sliding window via re-EXPIRE on SADD
+const keyFor = (pageId) => `${KEY_PREFIX}${pageId}`;
+const entryFor = (userId, socketId) => `${userId}:${socketId}`;
+/**
+ * Parse `COLLAB_MAX_EDITORS_PER_PAGE` (or any equivalent env string)
+ * defensively. Empty / non-numeric / non-positive values fall back to
+ * `DEFAULT_MAX_EDITORS` so callers never have to remember the
+ * "isFinite && > 0" dance.
+ */
+function parseCapEnv(value) {
+    const n = parseInt(value ?? '', 10);
+    return Number.isFinite(n) && n > 0 ? n : exports.DEFAULT_MAX_EDITORS;
+}
+const makeNoopCounter = (maxEditorsPerPage) => ({
+    maxEditorsPerPage,
+    async peek() {
+        return { count: 0, cap: maxEditorsPerPage };
+    },
+    async tryAcquire() {
+        return { acquired: true, count: 0, cap: maxEditorsPerPage };
+    },
+    async release() {
+        /* nothing */
+    },
+    async disconnect() {
+        /* nothing */
+    },
+});
+/**
+ * Build an editor-cap counter against a shared Redis client.
+ *
+ * Returns a no-op counter when `redisClient` is null/undefined — the
+ * API surface is identical so callers don't have to branch.
+ */
+async function createEditorCapCounter(opts = {}) {
+    const maxEditorsPerPage = opts.maxEditorsPerPage ?? exports.DEFAULT_MAX_EDITORS;
+    if (opts.__clientForTest) {
+        return wrapClient(opts.__clientForTest, maxEditorsPerPage);
+    }
+    if (!opts.redisClient) {
+        debug('redis client not provided — editor cap counter disabled (fail-open)');
+        return makeNoopCounter(maxEditorsPerPage);
+    }
+    debug('editor cap counter ready (max=%d, key prefix=%s)', maxEditorsPerPage, KEY_PREFIX);
+    return wrapClient(opts.redisClient, maxEditorsPerPage);
+}
+function wrapClient(client, maxEditorsPerPage) {
+    return {
+        maxEditorsPerPage,
+        async peek(pageId) {
+            try {
+                const count = await client.sCard(keyFor(pageId));
+                return { count, cap: maxEditorsPerPage };
+            }
+            catch (err) {
+                console.warn(`[crowi:editor-cap-counter] peek failed for ${pageId} — treating as 0:`, err.message);
+                return { count: 0, cap: maxEditorsPerPage };
+            }
+        },
+        async tryAcquire(pageId, userId, socketId) {
+            const key = keyFor(pageId);
+            const entry = entryFor(userId, socketId);
+            let preCount;
+            try {
+                preCount = await client.sCard(key);
+            }
+            catch (err) {
+                console.warn(`[crowi:editor-cap-counter] tryAcquire SCARD failed for ${pageId} — fail-open:`, err.message);
+                return { acquired: true, count: 0, cap: maxEditorsPerPage };
+            }
+            if (preCount >= maxEditorsPerPage) {
+                debug('cap exceeded for page %s (count=%d max=%d)', pageId, preCount, maxEditorsPerPage);
+                return { acquired: false, count: preCount, cap: maxEditorsPerPage };
+            }
+            try {
+                const added = await client.sAdd(key, entry);
+                await client.expire(key, TTL_SECONDS);
+                // `added === 0` means the entry already existed in the set;
+                // treat it as a successful acquire so a handler retry is
+                // idempotent. The count reported is `preCount` (unchanged)
+                // when the entry was already present.
+                const count = preCount + (added > 0 ? 1 : 0);
+                debug('acquired page=%s entry=%s count=%d', pageId, entry, count);
+                return { acquired: true, count, cap: maxEditorsPerPage };
+            }
+            catch (err) {
+                console.warn(`[crowi:editor-cap-counter] tryAcquire SADD failed for ${pageId} — fail-open:`, err.message);
+                return { acquired: true, count: preCount, cap: maxEditorsPerPage };
+            }
+        },
+        async release(pageId, userId, socketId) {
+            try {
+                await client.sRem(keyFor(pageId), entryFor(userId, socketId));
+                debug('released page=%s user=%s socket=%s', pageId, userId, socketId);
+            }
+            catch (err) {
+                console.warn(`[crowi:editor-cap-counter] release failed for ${pageId}:`, err.message);
+            }
+        },
+        async disconnect() {
+            // Shared client lifecycle is owned by Crowi (api boot). The
+            // counter doesn't `disconnect()` the underlying client here —
+            // doing so would tear down session storage / config pub-sub /
+            // page-event pubsub too. Phase 9 multi-instance extensions
+            // that *do* own a private client can override this.
+            debug('disconnect() noop — shared client lifetime owned by Crowi');
+        },
+    };
+}
+//# sourceMappingURL=editor-cap-counter.js.map

package/dist/util/editor-cap-counter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"editor-cap-counter.js","sourceRoot":"","sources":["../../src/util/editor-cap-counter.ts"],"names":[],"mappings":"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"}

package/dist/util/fileUploader.d.ts

@@ -0,0 +1,55 @@
+import { Readable } from 'node:stream';
+import type Crowi from '../crowi';
+import type { StorageDriver } from '@crowi/plugin-api';
+/**
+ * Look up a storage driver by its registered name. Throws with the list
+ * of available drivers when no match — used by the `crowi-admin storage
+ * copy` CLI which addresses non-active drivers by name.
+ */
+export declare function getStorageDriverByName(crowi: Crowi, name: string): StorageDriver;
+export interface FileUploader {
+    /**
+     * Upload a file from a local path or a Readable stream. Used by the
+     * attachment / profile-picture controllers.
+     *
+     * `filePath` is the storage key (forwarded verbatim to the driver).
+     * `type` is the MIME content type. `fileStream` may be a Readable or
+     * the path of a temp file on disk (legacy callers pass either).
+     */
+    uploadFile(filePath: string, type: string, fileStream: Readable | string, options?: Record<string, unknown>): Promise<{
+        key: string;
+    }>;
+    /** Stream a stored file back to the caller. */
+    findDeliveryFile(attachmentId: unknown, filePath: string): Promise<Readable>;
+    /** Delete a stored file. Idempotent. */
+    deleteFile(attachmentId: unknown, filePath: string): Promise<void>;
+    /**
+     * Build a URL the browser can fetch. Drivers that support
+     * `signedUrl` (e.g. S3) return a time-limited URL; drivers that
+     * don't fall back to the API streaming endpoint.
+     *
+     * NOTE: For values that get *persisted* (e.g. `user.image`) use
+     * {@link persistentUrl} instead — a signed URL expires and would
+     * 403 once stored.
+     */
+    generateUrl(filePath: string, expiresInSec?: number): Promise<string>;
+    /**
+     * Stable, non-expiring URL for a `user/`-prefixed key, suitable for
+     * storing in the DB (`user.image`). Always the `by-key` streaming
+     * proxy (`/api/v2/attachments/by-key/:key`), never a time-limited
+     * signed URL — regardless of the active driver. The proxy streams
+     * from whichever driver is active (local or S3) and is reachable from
+     * an `<img src>` via the access-token cookie, so avatars survive past
+     * any signed-URL TTL.
+     */
+    persistentUrl(filePath: string): string;
+}
+declare const _default: (crowi: Crowi) => FileUploader;
+export default _default;
+/**
+ * Path prefix used by `generateUrl()` when a driver has no `signedUrl`.
+ * Hoisted so the storage-copy migration can recognise the same shape
+ * when extracting keys from `User.image` URLs without re-encoding the
+ * route knowledge in two places.
+ */
+export declare const BY_KEY_URL_PREFIX = "/api/v2/attachments/by-key/";

package/dist/util/fileUploader.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BY_KEY_URL_PREFIX = void 0;
+exports.getStorageDriverByName = getStorageDriverByName;
+const node_fs_1 = require("node:fs");
+// Resolved per call (not cached at module init) because the
+// PluginManager bootstraps after this module is required.
+function activeDriver(crowi) {
+    const driver = crowi.getPlugins().active.storage;
+    if (!driver) {
+        throw new Error('Storage driver not registered. Install @crowi/plugin-storage-local (default) or @crowi/plugin-storage-aws-s3.');
+    }
+    return driver;
+}
+/**
+ * Look up a storage driver by its registered name. Throws with the list
+ * of available drivers when no match — used by the `crowi-admin storage
+ * copy` CLI which addresses non-active drivers by name.
+ */
+function getStorageDriverByName(crowi, name) {
+    const driver = crowi.getPlugins().storage.get(name);
+    if (driver)
+        return driver;
+    const available = crowi
+        .getPlugins()
+        .storage.list()
+        .map((d) => d.driverName)
+        .join(', ');
+    throw new Error(`Storage driver '${name}' is not registered. Available drivers: ${available || '(none)'}.`);
+}
+exports.default = (crowi) => ({
+    async uploadFile(filePath, type, fileStream, _options) {
+        const driver = activeDriver(crowi);
+        const stream = typeof fileStream === 'string' ? (0, node_fs_1.createReadStream)(fileStream) : fileStream;
+        return driver.put(filePath, stream, { contentType: type });
+    },
+    async findDeliveryFile(_attachmentId, filePath) {
+        const driver = activeDriver(crowi);
+        return driver.get(filePath);
+    },
+    async deleteFile(_attachmentId, filePath) {
+        const driver = activeDriver(crowi);
+        await driver.delete(filePath);
+    },
+    async generateUrl(filePath, expiresInSec = 60 * 5) {
+        const driver = activeDriver(crowi);
+        if (driver.signedUrl) {
+            return driver.signedUrl(filePath, expiresInSec);
+        }
+        // Drivers without signedUrl (e.g. local) fall back to the ts-rest
+        // streaming endpoint mounted at `/api/v2/attachments/by-key/:key`.
+        // The `by-key` route only accepts keys under the `user/` prefix
+        // (profile pictures); attachment-row-backed files use the
+        // `/api/v2/attachments/:id` route via `Attachment.fileUrl`.
+        return `${exports.BY_KEY_URL_PREFIX}${encodeURIComponent(filePath)}`;
+    },
+    persistentUrl(filePath) {
+        // Always the stable proxy — never a signed URL — because the value
+        // is persisted (e.g. user.image). See the interface doc.
+        return `${exports.BY_KEY_URL_PREFIX}${encodeURIComponent(filePath)}`;
+    },
+});
+/**
+ * Path prefix used by `generateUrl()` when a driver has no `signedUrl`.
+ * Hoisted so the storage-copy migration can recognise the same shape
+ * when extracting keys from `User.image` URLs without re-encoding the
+ * route knowledge in two places.
+ */
+exports.BY_KEY_URL_PREFIX = '/api/v2/attachments/by-key/';
+//# sourceMappingURL=fileUploader.js.map

package/dist/util/fileUploader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fileUploader.js","sourceRoot":"","sources":["../../src/util/fileUploader.ts"],"names":[],"mappings":";;;AAoBA,wDASC;AA7BD,qCAA2C;AAK3C,4DAA4D;AAC5D,0DAA0D;AAC1D,SAAS,YAAY,CAAC,KAAY;IAChC,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC;IACjD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,+GAA+G,CAAC,CAAC;IACnI,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,KAAY,EAAE,IAAY;IAC/D,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACpD,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAC1B,MAAM,SAAS,GAAG,KAAK;SACpB,UAAU,EAAE;SACZ,OAAO,CAAC,IAAI,EAAE;SACd,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;SACxB,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,2CAA2C,SAAS,IAAI,QAAQ,GAAG,CAAC,CAAC;AAC9G,CAAC;AA0CD,kBAAe,CAAC,KAAY,EAAgB,EAAE,CAAC,CAAC;IAC9C,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ;QACnD,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QACnC,MAAM,MAAM,GAAa,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,0BAAgB,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;QACpG,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,aAAa,EAAE,QAAQ;QAC5C,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QACnC,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,aAAa,EAAE,QAAQ;QACtC,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QACnC,MAAM,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,EAAE,GAAG,CAAC;QAC/C,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAClD,CAAC;QACD,kEAAkE;QAClE,mEAAmE;QACnE,gEAAgE;QAChE,0DAA0D;QAC1D,4DAA4D;QAC5D,OAAO,GAAG,yBAAiB,GAAG,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC/D,CAAC;IAED,aAAa,CAAC,QAAQ;QACpB,mEAAmE;QACnE,yDAAyD;QACzD,OAAO,GAAG,yBAAiB,GAAG,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC/D,CAAC;CACF,CAAC,CAAC;AAEH;;;;;GAKG;AACU,QAAA,iBAAiB,GAAG,6BAA6B,CAAC"}

package/dist/util/formUtil.d.ts

@@ -0,0 +1,2 @@
+export declare const normalizeCRLFFilter: (value: any) => any;
+export declare const stringToArrayFilter: (value: any) => any;

package/dist/util/formUtil.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stringToArrayFilter = exports.normalizeCRLFFilter = void 0;
+const normalizeCRLFFilter = (value) => {
+    return value.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
+};
+exports.normalizeCRLFFilter = normalizeCRLFFilter;
+const stringToArrayFilter = (value) => {
+    if (!value || value === '') {
+        return [];
+    }
+    return value.split('\n');
+};
+exports.stringToArrayFilter = stringToArrayFilter;
+//# sourceMappingURL=formUtil.js.map

package/dist/util/formUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"formUtil.js","sourceRoot":"","sources":["../../src/util/formUtil.ts"],"names":[],"mappings":";;;AAAO,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,EAAE;IAC3C,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAC3D,CAAC,CAAC;AAFW,QAAA,mBAAmB,uBAE9B;AAEK,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,EAAE;IAC3C,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B"}

package/dist/util/githubAuth.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (config: any) => any;
+export default _default;