jishushell 0.4.24 → 0.5.15

package/dist/services/suggestions.js

@@ -0,0 +1,133 @@
+/**
+ * Suggestions engine — scans every app instance for unbound `requires`
+ * slots that *could* be filled from the current capability registry, and
+ * emits one suggestion per (consumer, slot, candidate). The Dashboard
+ * polls this so the user gets a low-friction "you can connect X to Y"
+ * prompt without having to dig into each instance.
+ *
+ * Dismissals are stored on the consumer's `instance.json.dismissedSuggestions`
+ * (per-slot, 30-day TTL).
+ */
+import * as capabilityRegistry from "./capability-registry.js";
+import * as instanceManager from "./instance-manager.js";
+import { getApp } from "./app/app-manager.js";
+import { resolveConnections } from "./connection-resolver.js";
+import { loadCapabilitySpecForLegacyInstance } from "./runtime/migrations.js";
+import { safeReadJson, safeWriteJson } from "../utils/safe-json.js";
+const DISMISS_TTL_MS = 30 * 24 * 60 * 60 * 1000;
+export function computeSuggestions() {
+    const out = [];
+    const allInstances = instanceManager.listInstances();
+    for (const inst of allInstances) {
+        // App-installed instances (yaml apps from the Apps page) carry an
+        // `app_id` and resolve their spec via the registry. Legacy instances
+        // (hermes / openclaw created via the classic NewInstance flow) have
+        // no `app_id`; their `requires` come from the matching yaml template
+        // synthesized in-memory by `loadCapabilitySpecForLegacyInstance`.
+        // Without this branch, brand-new hermes / openclaw instances never
+        // surface suggestions even when running candidates exist.
+        const appId = inst.app_id;
+        let spec = null;
+        if (appId) {
+            const appData = getApp(appId);
+            if (!appData)
+                continue;
+            spec = appData.spec;
+        }
+        else {
+            spec = loadCapabilitySpecForLegacyInstance(inst);
+            if (!spec)
+                continue;
+        }
+        const persisted = (inst.connections ?? {});
+        const dismissed = (inst.dismissedSuggestions ?? []);
+        const dismissedSlots = new Set(dismissed
+            .filter((d) => new Date(d.until).getTime() > Date.now())
+            .map((d) => d.slot));
+        let pending = [];
+        try {
+            const r = resolveConnections(spec, { connections: persisted }, "preCreate");
+            pending = r.pending;
+        }
+        catch {
+            continue;
+        }
+        for (const p of pending) {
+            if (dismissedSlots.has(p.slot))
+                continue;
+            const candidates = enumerateCandidates(p.capability);
+            // Same agent-on-agent guard as the Connections-tab dropdown: hermes
+            // and openclaw consuming `llm` should never be offered another
+            // agent's `llm-agent` (would chain agent → agent → real model).
+            const consumerAgentType = String(inst?.agentType ?? "");
+            const consumerIsAgent = consumerAgentType === "hermes" || consumerAgentType === "openclaw";
+            const running = candidates.filter((e) => {
+                if (e.status !== "running")
+                    return false;
+                if (e.instanceId === inst.id)
+                    return false;
+                if (consumerIsAgent && p.capability === "llm" && e.capability === "llm-agent")
+                    return false;
+                return true;
+            });
+            if (running.length === 0)
+                continue;
+            // Single candidate → suggest it; multiple → suggest the running ones.
+            const top = running[0];
+            out.push({
+                id: `${inst.id}::${p.slot}::${top.instanceId}::${top.capability}`,
+                consumerInstanceId: inst.id,
+                consumerName: inst.name ?? inst.id,
+                appId: appId ?? "",
+                slot: p.slot,
+                capability: p.capability,
+                candidate: {
+                    providerId: top.instanceId,
+                    capability: top.capability,
+                    name: top.name,
+                    protocol: top.protocol,
+                    status: top.status,
+                    hostPort: top.hostPort,
+                    path: top.path,
+                },
+                reason: p.reason,
+            });
+        }
+    }
+    return out;
+}
+function enumerateCandidates(capability) {
+    const isCategoryToken = ["llm", "search", "browser", "mcp"].includes(capability);
+    if (!isCategoryToken) {
+        return capabilityRegistry.listProviders(capability);
+    }
+    const file = capabilityRegistry.snapshot();
+    const out = [];
+    for (const [cap, list] of Object.entries(file.providersByCapability ?? {})) {
+        if (cap.startsWith(capability + "-") || cap === capability) {
+            out.push(...list);
+        }
+    }
+    return out;
+}
+/**
+ * Mark a suggestion as dismissed. Persisted on the consumer instance so
+ * subsequent computeSuggestions() invocations skip it for the TTL window.
+ *
+ * `id` follows the format `${consumerInstanceId}::${slot}::...` — the
+ * leading two segments are enough to identify the slot to dismiss.
+ */
+export async function dismissSuggestion(id) {
+    const parts = id.split("::");
+    if (parts.length < 2)
+        throw new Error(`Invalid suggestion id: ${id}`);
+    const [consumerInstanceId, slot] = parts;
+    const path = instanceManager.instanceMetaPath(consumerInstanceId);
+    const cur = (safeReadJson(path, `instance:${consumerInstanceId}`) ?? {});
+    const list = Array.isArray(cur.dismissedSuggestions) ? cur.dismissedSuggestions : [];
+    const filtered = list.filter((d) => d.slot !== slot);
+    filtered.push({ slot, until: new Date(Date.now() + DISMISS_TTL_MS).toISOString() });
+    cur.dismissedSuggestions = filtered;
+    safeWriteJson(path, cur);
+}
+//# sourceMappingURL=suggestions.js.map

package/dist/services/suggestions.js.map

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

package/dist/services/task-registry.js

@@ -15,13 +15,15 @@ const MAX_TASK_EVENTS = 500;
 setInterval(() => {
     const now = Date.now();
     for (const [id, task] of tasks) {
-        if (task.status !== "running" && now - parseInt(id.split("-").pop() || "0") > TASK_MAX_AGE) {
+        const parts = id.split("-");
+        const createdAt = Number(parts[parts.length - 2] || 0);
+        if (task.status !== "running" && Number.isFinite(createdAt) && now - createdAt > TASK_MAX_AGE) {
             tasks.delete(id);
         }
     }
 }, 60_000).unref();
 export function createTask(name) {
-    const id = `${name}-${Date.now()}`;
+    const id = `${name}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
     const task = { id, name, status: "running", events: [], listeners: new Set() };
     tasks.set(id, task);
     return task;

package/dist/services/task-registry.js.map

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

package/dist/services/telemetry/device-fingerprint.d.ts

@@ -2,7 +2,7 @@
  * Cross-platform device fingerprint generation.
  *
  * Supported platforms:
- *   - Linux: Jetson Orin/Thor, RK3588, CIX P1, 辉羲 R1, Raspberry Pi
+ *   - Linux: Jetson Orin/Thor, RK3588, CIX P1, Huixi R1, Raspberry Pi
  *   - macOS: Mac Mini, Mac Studio
  *
  * Fingerprint = SHA-256(machine_id_or_uuid + mac)

package/dist/services/telemetry/device-fingerprint.js

@@ -2,7 +2,7 @@
  * Cross-platform device fingerprint generation.
  *
  * Supported platforms:
- *   - Linux: Jetson Orin/Thor, RK3588, CIX P1, 辉羲 R1, Raspberry Pi
+ *   - Linux: Jetson Orin/Thor, RK3588, CIX P1, Huixi R1, Raspberry Pi
  *   - macOS: Mac Mini, Mac Studio
  *
  * Fingerprint = SHA-256(machine_id_or_uuid + mac)

package/dist/services/types-shim.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Lightweight `AppInstance` shim exported from a stable module path so PR 4
+ * apply hooks don't need to import from app-manager.ts (which would create
+ * a circular dependency: app-manager → connection-apply → app-manager).
+ */
+import type { InstanceConnections } from "../types.js";
+export interface AppInstance {
+    id: string;
+    name?: string;
+    description?: string;
+    app_id?: string;
+    connections?: InstanceConnections;
+    "connections-env"?: Record<string, string>;
+    schemaVersion?: number;
+    [key: string]: unknown;
+}

package/dist/services/types-shim.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types-shim.js.map

package/dist/services/types-shim.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types-shim.js","sourceRoot":"","sources":["../../src/services/types-shim.ts"],"names":[],"mappings":""}

package/dist/services/webdav/server.d.ts

@@ -0,0 +1,24 @@
+import type { FastifyRequest, FastifyReply } from "fastify";
+import { FilesManager } from "../files-manager.js";
+import { type AppPassword } from "../app-passwords.js";
+export interface WebdavContext {
+    filesManager: FilesManager;
+    /** WebDAV root URL prefix, e.g. "/webdav" — no trailing slash. */
+    mountPrefix: string;
+    /** Authenticated app password (already verified by auth middleware). */
+    authedAs: AppPassword;
+}
+/**
+ * Strip the mount prefix from req.url and decode each segment, then
+ * normalize: leading / trailing slash removed, "." collapsed. Returns
+ * the files/-relative path the rest of the WebDAV server uses.
+ */
+export declare function extractRel(reqUrl: string, mountPrefix: string): string;
+export declare function handleOptions(_ctx: WebdavContext, _req: FastifyRequest, reply: FastifyReply): Promise<void>;
+export declare function handlePropfind(ctx: WebdavContext, req: FastifyRequest, reply: FastifyReply): Promise<void>;
+export declare function handleGet(ctx: WebdavContext, req: FastifyRequest, reply: FastifyReply, bodyless: boolean): Promise<void>;
+export declare function handlePut(ctx: WebdavContext, req: FastifyRequest, reply: FastifyReply): Promise<void>;
+export declare function handleDelete(ctx: WebdavContext, req: FastifyRequest, reply: FastifyReply): Promise<void>;
+export declare function handleMkcol(ctx: WebdavContext, req: FastifyRequest, reply: FastifyReply): Promise<void>;
+export declare function handleMove(ctx: WebdavContext, req: FastifyRequest, reply: FastifyReply): Promise<void>;
+export declare function handleCopy(ctx: WebdavContext, req: FastifyRequest, reply: FastifyReply): Promise<void>;

package/dist/services/webdav/server.js

@@ -0,0 +1,420 @@
+/**
+ * WebDAV server logic for the AI NAS (M3 W4 PR-3).
+ *
+ * Implements a focused subset of RFC 4918 — the methods iOS Files,
+ * macOS Finder, Windows Explorer, and FX (Android) actually issue:
+ *
+ *   OPTIONS   capability advertisement
+ *   PROPFIND  list (Depth: 0 / 1)
+ *   GET       stream a file
+ *   HEAD      same headers as GET, no body
+ *   PUT       upload (octet-stream pass-through; overwrites are normal)
+ *   DELETE    soft-delete to .trash via FilesManager
+ *   MKCOL     create directory
+ *   MOVE      rename / move within the WebDAV root
+ *   COPY      shallow file copy (no recursive copy in this PR)
+ *
+ * Locking (LOCK / UNLOCK / PROPPATCH) is intentionally NOT implemented;
+ * we return 501 — clients fall back to optimistic concurrency.
+ *
+ * All request paths are validated through the FilesManager surface so
+ * we share path-safety, symlink defense, and the audit log with the
+ * /api/files routes. Authentication runs upstream (see routes/webdav.ts).
+ */
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { FilesError, } from "../files-manager.js";
+import { buildMultistatus, parseDepth, } from "./xml-builder.js";
+import { isAllowed } from "../app-passwords.js";
+import { resolveSafe } from "../../utils/path-safety.js";
+import { atomicWriteStream } from "../../utils/safe-write.js";
+import { withPathLock } from "../../utils/path-locks.js";
+import { FILES_ROOT } from "../../config.js";
+// ── Path extraction ────────────────────────────────
+/**
+ * Strip the mount prefix from req.url and decode each segment, then
+ * normalize: leading / trailing slash removed, "." collapsed. Returns
+ * the files/-relative path the rest of the WebDAV server uses.
+ */
+export function extractRel(reqUrl, mountPrefix) {
+    const cleanPrefix = mountPrefix.replace(/\/+$/, "");
+    let urlPath = reqUrl;
+    // Strip query string — WebDAV doesn't use it
+    const q = urlPath.indexOf("?");
+    if (q >= 0)
+        urlPath = urlPath.slice(0, q);
+    if (urlPath.startsWith(cleanPrefix))
+        urlPath = urlPath.slice(cleanPrefix.length);
+    if (urlPath.startsWith("/"))
+        urlPath = urlPath.slice(1);
+    if (urlPath.endsWith("/"))
+        urlPath = urlPath.slice(0, -1);
+    // Decode each segment so `%E7%AC%94%E8%AE%B0` becomes `笔记`
+    return urlPath
+        .split("/")
+        .map((s) => {
+        try {
+            return decodeURIComponent(s);
+        }
+        catch {
+            return s;
+        }
+    })
+        .filter((s) => s !== "")
+        .join("/");
+}
+// ── Auth scope check ───────────────────────────────
+function checkScope(ctx, rel, needsWrite) {
+    return isAllowed(ctx.authedAs, rel, needsWrite);
+}
+function send403(reply, reason) {
+    reply
+        .code(403)
+        .header("Content-Type", "text/plain; charset=utf-8")
+        .send(`forbidden: ${reason ?? "scope mismatch"}`);
+}
+// ── OPTIONS ────────────────────────────────────────
+export async function handleOptions(_ctx, _req, reply) {
+    reply
+        .code(200)
+        .header("Allow", "OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MOVE, COPY")
+        .header("DAV", "1")
+        .header("MS-Author-Via", "DAV") // Windows Explorer compatibility
+        .send();
+}
+// ── PROPFIND ───────────────────────────────────────
+export async function handlePropfind(ctx, req, reply) {
+    const rel = extractRel(req.url, ctx.mountPrefix);
+    const scope = checkScope(ctx, rel, false);
+    if (!scope.allowed)
+        return send403(reply, scope.reason);
+    const depth = parseDepth(req.headers.depth);
+    const targetAbs = resolveSafe(FILES_ROOT, rel);
+    let stat;
+    try {
+        const ls = fs.lstatSync(targetAbs);
+        if (ls.isSymbolicLink()) {
+            reply.code(403).send("symlinks not exposed via WebDAV");
+            return;
+        }
+        stat = fs.statSync(targetAbs);
+    }
+    catch (e) {
+        if (e?.code === "ENOENT") {
+            reply.code(404).send();
+            return;
+        }
+        throw e;
+    }
+    const resources = [
+        statToResource(rel, stat, basename(rel) || "files"),
+    ];
+    if (depth >= 1 && stat.isDirectory()) {
+        let entries;
+        try {
+            entries = fs.readdirSync(targetAbs);
+        }
+        catch {
+            entries = [];
+        }
+        for (const name of entries) {
+            if (name.startsWith("."))
+                continue; // hidden / .trash never exposed
+            const childAbs = path.join(targetAbs, name);
+            let childStat;
+            try {
+                const ls = fs.lstatSync(childAbs);
+                if (ls.isSymbolicLink())
+                    continue;
+                childStat = fs.statSync(childAbs);
+            }
+            catch {
+                continue;
+            }
+            const childRel = rel ? `${rel}/${name}` : name;
+            const childScope = checkScope(ctx, childRel, false);
+            if (!childScope.allowed)
+                continue; // hide outside-scope children
+            resources.push(statToResource(childRel, childStat, name));
+        }
+    }
+    const xml = buildMultistatus(ctx.mountPrefix, resources);
+    reply
+        .code(207)
+        .header("Content-Type", 'application/xml; charset="utf-8"')
+        .header("DAV", "1")
+        .send(xml);
+}
+function statToResource(rel, stat, displayName) {
+    const isDir = stat.isDirectory();
+    return {
+        pathRel: rel,
+        displayName,
+        isDir,
+        size: isDir ? 0 : stat.size,
+        mtime: Math.floor(stat.mtimeMs / 1000),
+        etag: `W/"${stat.size}-${Math.floor(stat.mtimeMs)}"`,
+        mime: isDir ? undefined : guessMime(displayName),
+    };
+}
+function basename(rel) {
+    if (!rel)
+        return "";
+    const idx = rel.lastIndexOf("/");
+    return idx === -1 ? rel : rel.slice(idx + 1);
+}
+const MIME_BY_EXT = {
+    ".txt": "text/plain; charset=utf-8",
+    ".md": "text/markdown; charset=utf-8",
+    ".json": "application/json",
+    ".pdf": "application/pdf",
+    ".jpg": "image/jpeg",
+    ".jpeg": "image/jpeg",
+    ".png": "image/png",
+    ".webp": "image/webp",
+    ".gif": "image/gif",
+    ".mp4": "video/mp4",
+    ".mov": "video/quicktime",
+    ".mp3": "audio/mpeg",
+    ".zip": "application/zip",
+};
+function guessMime(name) {
+    const ext = path.extname(name).toLowerCase();
+    return MIME_BY_EXT[ext] ?? "application/octet-stream";
+}
+// ── GET / HEAD ─────────────────────────────────────
+export async function handleGet(ctx, req, reply, bodyless) {
+    const rel = extractRel(req.url, ctx.mountPrefix);
+    const scope = checkScope(ctx, rel, false);
+    if (!scope.allowed)
+        return send403(reply, scope.reason);
+    if (rel === "") {
+        reply.code(403).send("cannot GET the WebDAV root");
+        return;
+    }
+    try {
+        const r = await ctx.filesManager.readStream(rel);
+        reply
+            .header("Content-Type", r.mime)
+            .header("Content-Length", String(r.size))
+            .header("ETag", r.etag)
+            .header("Last-Modified", new Date(r.mtime * 1000).toUTCString())
+            .header("Accept-Ranges", "bytes");
+        if (bodyless) {
+            reply.code(200).send();
+        }
+        else {
+            reply.code(200).send(r.openStream());
+        }
+    }
+    catch (e) {
+        sendFilesError(reply, e);
+    }
+}
+// ── PUT ────────────────────────────────────────────
+export async function handlePut(ctx, req, reply) {
+    const rel = extractRel(req.url, ctx.mountPrefix);
+    const scope = checkScope(ctx, rel, true);
+    if (!scope.allowed)
+        return send403(reply, scope.reason);
+    if (rel === "") {
+        reply.code(405).send("cannot PUT the WebDAV root");
+        return;
+    }
+    // Content-Length is mandatory for the same reason as /api/files.
+    const cl = req.headers["content-length"];
+    const clNum = typeof cl === "string" ? Number.parseInt(cl, 10) : Number.NaN;
+    if (!Number.isFinite(clNum) || clNum < 0) {
+        reply.code(411).send("Content-Length required");
+        return;
+    }
+    const body = req.raw;
+    if (!body) {
+        reply.code(400).send("missing body");
+        return;
+    }
+    try {
+        // WebDAV PUT default-overwrites; matches RFC 4918 §9.7.
+        const result = await ctx.filesManager.writeStream(rel, body, {
+            overwrite: true,
+            expectedSize: clNum,
+        });
+        // 201 if newly created, 204 if overwritten — FilesManager doesn't
+        // currently distinguish; default to 201 (Finder accepts both).
+        reply
+            .code(201)
+            .header("ETag", result.etag)
+            .header("Content-Length", "0")
+            .send();
+    }
+    catch (e) {
+        sendFilesError(reply, e);
+    }
+}
+// ── DELETE ─────────────────────────────────────────
+export async function handleDelete(ctx, req, reply) {
+    const rel = extractRel(req.url, ctx.mountPrefix);
+    const scope = checkScope(ctx, rel, true);
+    if (!scope.allowed)
+        return send403(reply, scope.reason);
+    if (rel === "") {
+        reply.code(405).send("cannot DELETE the WebDAV root");
+        return;
+    }
+    try {
+        await ctx.filesManager.remove(rel);
+        reply.code(204).send();
+    }
+    catch (e) {
+        sendFilesError(reply, e);
+    }
+}
+// ── MKCOL ──────────────────────────────────────────
+export async function handleMkcol(ctx, req, reply) {
+    const rel = extractRel(req.url, ctx.mountPrefix);
+    const scope = checkScope(ctx, rel, true);
+    if (!scope.allowed)
+        return send403(reply, scope.reason);
+    if (rel === "") {
+        reply.code(405).send("cannot MKCOL the WebDAV root");
+        return;
+    }
+    // RFC 4918 §9.3: MKCOL must reject a request with a body.
+    const cl = Number.parseInt(req.headers["content-length"], 10);
+    if (Number.isFinite(cl) && cl > 0) {
+        reply.code(415).send("MKCOL must not include a body");
+        return;
+    }
+    try {
+        await ctx.filesManager.mkdir(rel);
+        reply.code(201).send();
+    }
+    catch (e) {
+        sendFilesError(reply, e);
+    }
+}
+// ── MOVE ───────────────────────────────────────────
+export async function handleMove(ctx, req, reply) {
+    const fromRel = extractRel(req.url, ctx.mountPrefix);
+    const toRel = parseDestinationHeader(req, ctx.mountPrefix);
+    if (toRel === null) {
+        reply.code(400).send("invalid Destination header");
+        return;
+    }
+    const fromScope = checkScope(ctx, fromRel, true);
+    if (!fromScope.allowed)
+        return send403(reply, fromScope.reason);
+    const toScope = checkScope(ctx, toRel, true);
+    if (!toScope.allowed)
+        return send403(reply, toScope.reason);
+    const overwrite = String(req.headers.overwrite ?? "T")
+        .trim()
+        .toUpperCase() !== "F";
+    try {
+        await ctx.filesManager.move(fromRel, toRel, overwrite);
+        // 201 if the destination was newly created, 204 if overwritten.
+        // Without knowing pre-state we default to 201 (clients accept it).
+        reply.code(201).header("Content-Length", "0").send();
+    }
+    catch (e) {
+        sendFilesError(reply, e);
+    }
+}
+// ── COPY ───────────────────────────────────────────
+export async function handleCopy(ctx, req, reply) {
+    const fromRel = extractRel(req.url, ctx.mountPrefix);
+    const toRel = parseDestinationHeader(req, ctx.mountPrefix);
+    if (toRel === null) {
+        reply.code(400).send("invalid Destination header");
+        return;
+    }
+    const fromScope = checkScope(ctx, fromRel, false);
+    if (!fromScope.allowed)
+        return send403(reply, fromScope.reason);
+    const toScope = checkScope(ctx, toRel, true);
+    if (!toScope.allowed)
+        return send403(reply, toScope.reason);
+    const overwrite = String(req.headers.overwrite ?? "T")
+        .trim()
+        .toUpperCase() !== "F";
+    // For W4 we only support file copy (not recursive directory copy).
+    // Finder relies primarily on MOVE; recursive COPY is rare. Returning
+    // 502 Bad Gateway with a clear body lets clients fall back.
+    const fromAbs = resolveSafe(FILES_ROOT, fromRel);
+    let stat;
+    try {
+        stat = fs.statSync(fromAbs);
+    }
+    catch {
+        reply.code(404).send();
+        return;
+    }
+    if (stat.isDirectory()) {
+        reply
+            .code(502)
+            .send("recursive directory COPY is not supported in this build");
+        return;
+    }
+    const toAbs = resolveSafe(FILES_ROOT, toRel);
+    try {
+        if (!overwrite && fs.existsSync(toAbs)) {
+            reply.code(412).send();
+            return;
+        }
+        fs.mkdirSync(path.dirname(toAbs), { recursive: true });
+        // Stream copy via atomicWriteStream so we get tmp+rename atomicity
+        await withPathLock(toAbs, async () => {
+            await atomicWriteStream(toAbs, fs.createReadStream(fromAbs));
+        });
+        reply.code(201).header("Content-Length", "0").send();
+    }
+    catch (e) {
+        sendFilesError(reply, e);
+    }
+}
+function parseDestinationHeader(req, mountPrefix) {
+    const raw = req.headers.destination;
+    if (typeof raw !== "string" || !raw)
+        return null;
+    // Destination may be a full URL (https://host/webdav/x) or a path-only
+    // value. We strip everything up to and including the mount prefix.
+    let dest = raw;
+    try {
+        const u = new URL(raw);
+        dest = u.pathname;
+    }
+    catch {
+        // Not a full URL — assume path-only
+    }
+    const cleanPrefix = mountPrefix.replace(/\/+$/, "");
+    if (!dest.startsWith(cleanPrefix))
+        return null;
+    let rest = dest.slice(cleanPrefix.length);
+    if (rest.startsWith("/"))
+        rest = rest.slice(1);
+    if (rest.endsWith("/"))
+        rest = rest.slice(0, -1);
+    return rest
+        .split("/")
+        .map((s) => {
+        try {
+            return decodeURIComponent(s);
+        }
+        catch {
+            return s;
+        }
+    })
+        .filter((s) => s !== "")
+        .join("/");
+}
+// ── Error mapping ──────────────────────────────────
+function sendFilesError(reply, e) {
+    if (e instanceof FilesError) {
+        reply.code(e.httpStatus).send(e.message);
+        return;
+    }
+    const err = e;
+    console.error("[webdav] unexpected:", err.message);
+    reply.code(500).send(err.message ?? "internal error");
+}
+//# sourceMappingURL=server.js.map