hfs 3.3.3 → 3.4.0-alpha1

package/src/update.js

@@ -10,7 +10,7 @@ exports.getVersions = getVersions;
 exports.getUpdates = getUpdates;
 exports.localUpdateAvailable = localUpdateAvailable;
 exports.previousAvailable = previousAvailable;
-exports.updateSupported = updateSupported;
+exports.updateNotSupported = updateNotSupported;
 exports.update = update;
 const github_1 = require("./github");
 const const_1 = require("./const");
@@ -29,6 +29,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const argv_1 = require("./argv");
 const promises_2 = require("stream/promises");
 const updateChangelog_1 = require("./updateChangelog");
+const fast_xml_parser_1 = require("fast-xml-parser");
 const updateToBeta = (0, config_1.defineConfig)(misc_1.CFG.update_to_beta, false);
 const autoCheckUpdate = (0, config_1.defineConfig)(misc_1.CFG.auto_check_update, true);
 const lastCheckUpdate = persistence_1.storedMap.singleSync('lastCheckUpdate', 0);
@@ -59,15 +60,16 @@ exports.checkForUpdates = (0, misc_1.debounceAsync)(async () => {
 async function getBestUpdate() {
     return (await getUpdates(true))[0];
 }
-const ReleaseKeys = ['prerelease', 'tag_name', 'name', 'body', 'assets', 'isNewer', 'versionScalar'];
-const ReleaseAssetKeys = ['name', 'browser_download_url'];
+const releaseKeys = ['prerelease', 'tag_name', 'name', 'body', 'assets', 'isNewer', 'versionScalar'];
+const releaseAssetKeys = ['name', 'browser_download_url'];
+const assetPrefix = `hfs-${(0, misc_1.xlate)(process.platform, { win32: 'windows', darwin: 'mac' })}-${process.arch}`;
 const curV = config_1.currentVersion.scalar;
 function prepareRelease(r) {
     const v = (0, config_1.versionToScalar)(r.name);
-    return Object.assign(lodash_1.default.pick(r, ReleaseKeys), {
+    return Object.assign(lodash_1.default.pick(r, releaseKeys), {
         versionScalar: v,
         isNewer: v > curV, // make easy to know what's newer
-        assets: r.assets.map((a) => lodash_1.default.pick(a, ReleaseAssetKeys))
+        assets: r.assets.map((a) => lodash_1.default.pick(a, releaseAssetKeys))
     });
 }
 async function getVersions(filter, max = 30, stopAtCurrent = false) {
@@ -91,10 +93,19 @@ async function getVersions(filter, max = 30, stopAtCurrent = false) {
 async function getUpdates(strict = false) {
     console.log("Checking for updates");
     void (0, github_1.getProjectInfo)(); // also check for alerts and print them asap in the console
-    const stable = prepareRelease(await (0, github_1.getRepoInfo)(const_1.HFS_REPO + '/releases/latest'));
     const includeBetas = updateToBeta.get() || const_1.RUNNING_BETA;
-    // we don't consider betas before stable
-    const betas = !includeBetas ? [] : await getVersions(x => x.prerelease && x.versionScalar > stable.versionScalar && (!strict || x.isNewer));
+    const latest = await (0, misc_1.httpStream)(`https://github.com/${const_1.HFS_REPO}/releases/latest`, { method: 'HEAD', noRedirect: true });
+    const stableTag = latest.headers.location?.split('/').at(-1);
+    if (!stableTag)
+        throw Error('Cannot determine latest stable version');
+    if ((0, config_1.versionToScalar)(stableTag) === curV && !includeBetas)
+        return [];
+    let stable = prepareRelease({ prerelease: false, tag_name: stableTag, name: stableTag, body: '', assets: [probableAsset(stableTag)], isNewer: false, versionScalar: 0 });
+    if (stable.isNewer || const_1.RUNNING_BETA && !strict)
+        stable = await (0, github_1.getRepoInfo)(const_1.HFS_REPO + '/releases/tags/' + stableTag).then(prepareRelease).catch(() => stable);
+    const betas = !includeBetas ? [] : await getVersions(x => x.prerelease && x.versionScalar > stable.versionScalar && (!strict || x.isNewer))
+        // preserve update detection when GitHub's REST quota is exhausted
+        .catch(() => getVersionsFromAtom(x => x.prerelease && x.versionScalar > stable.versionScalar && (!strict || x.isNewer)));
     if (stable.isNewer || const_1.RUNNING_BETA && !strict)
         betas.push(stable);
     if (stable.isNewer && stable.body) {
@@ -102,7 +113,28 @@ async function getUpdates(strict = false) {
             .catch(() => []); // missing history must not prevent installing an available update
         stable.body = (0, updateChangelog_1.updateChangelog)(stable, history, curV);
     }
-    return betas;
+    return lodash_1.default.sortBy(betas, x => -x.versionScalar);
+    async function getVersionsFromAtom(filter) {
+        const feed = new fast_xml_parser_1.XMLParser({ ignoreAttributes: false })
+            .parse(await (0, misc_1.httpString)(`https://github.com/${const_1.HFS_REPO}/releases.atom`))?.feed;
+        return lodash_1.default.sortBy(lodash_1.default.castArray(feed?.entry)
+            .map((x) => prepareRelease({
+            prerelease: /^v?\d+\.\d+\.\d+-/.test(x.title),
+            tag_name: x.id.split('/').at(-1),
+            name: x.title,
+            body: x.content?.['#text'] || '',
+            assets: [probableAsset(x.id.split('/').at(-1))],
+            isNewer: false,
+            versionScalar: 0,
+        }))
+            .filter(x => Number.isFinite(x.versionScalar) && !x.name.endsWith('-ignore')
+            && x.versionScalar !== curV && filter(x)), x => -x.versionScalar);
+    }
+    function probableAsset(tag) {
+        const name = `${assetPrefix}-${tag.replace(/^v/, '')}.zip`;
+        // release-assets.yml uses this predictable name, keeping degraded checks installable
+        return { name, browser_download_url: `https://github.com/${const_1.HFS_REPO}/releases/download/${tag}/${name}` };
+    }
 }
 const LOCAL_UPDATE = 'hfs-update.zip'; // update from file takes precedence over net
 const INSTALLED_FN = 'hfs-installed.zip';
@@ -113,13 +145,16 @@ function localUpdateAvailable() {
 function previousAvailable() {
     return (0, misc_1.exists)(PREVIOUS_FN);
 }
-function updateSupported() {
-    return !process.env.DISABLE_UPDATE && (argv_1.argv.forceupdate || const_1.IS_BINARY);
+function updateNotSupported() {
+    return process.env.DISABLE_UPDATE ? "Automatic updates are disabled"
+        : !(argv_1.argv.forceupdate || const_1.IS_BINARY) ? "Only binary versions support automatic updates"
+            : (0, promises_1.access)((0, path_1.dirname)(process.execPath), fs_1.constants.W_OK | fs_1.constants.X_OK)
+                .then(() => '', () => `Executable directory is not writable: ${(0, path_1.dirname)(process.execPath)}`);
 }
 async function update(tagOrUrl = '') {
-    if (!updateSupported())
-        throw process.env.DISABLE_UPDATE ? "Automatic updates are disabled"
-            : "Only binary versions support automatic updates";
+    const error = await updateNotSupported();
+    if (error)
+        throw error;
     let url = tagOrUrl.includes('://') && tagOrUrl;
     if (tagOrUrl === const_1.PREVIOUS_TAG)
         await (0, promises_1.rename)(PREVIOUS_FN, LOCAL_UPDATE);
@@ -135,11 +170,9 @@ async function update(tagOrUrl = '') {
             });
         if (!update)
             throw "No update has been found";
-        const plat = '-' + (0, misc_1.xlate)(process.platform, { win32: 'windows', darwin: 'mac' });
-        const assetSearch = `${plat}-${process.arch}`;
-        const asset = update.assets.find((x) => x.name.includes(assetSearch) && x.name.endsWith('.zip'));
+        const asset = update.assets.find((x) => x.name.includes(assetPrefix) && x.name.endsWith('.zip'));
         if (!asset)
-            throw `Asset not found: ${assetSearch}`;
+            throw `Asset not found: ${assetPrefix}`;
         url = asset.browser_download_url;
     }
     if (url) {

package/src/upload.js

@@ -5,7 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dontOverwriteUploading = exports.minAvailableMb = exports.deleteUnfinishedUploadsAfter = void 0;
 exports.getUploadMeta = getUploadMeta;
+exports.saveUploadMeta = saveUploadMeta;
+exports.setUploadApproved = setUploadApproved;
 exports.getUploadTempFor = getUploadTempFor;
+exports.isUploading = isUploading;
+exports.whileUploadMetaPending = whileUploadMetaPending;
 exports.uploadWriter = uploadWriter;
 const vfs_1 = require("./vfs");
 const const_1 = require("./const");
@@ -25,6 +29,7 @@ const expiringCache_1 = require("./expiringCache");
 const first_1 = require("./first");
 const uploadOwners_1 = require("./uploadOwners");
 const webdav_1 = require("./webdav");
+const adminApis_1 = require("./adminApis");
 exports.deleteUnfinishedUploadsAfter = (0, config_1.defineConfig)(misc_1.CFG.delete_unfinished_uploads_after, 86_400);
 exports.minAvailableMb = (0, config_1.defineConfig)(misc_1.CFG.min_available_mb, 100);
 exports.dontOverwriteUploading = (0, config_1.defineConfig)(misc_1.CFG.dont_overwrite_uploading, true);
@@ -56,10 +61,18 @@ const ATTR_UPLOADER = 'uploader';
 function getUploadMeta(path) {
     return (0, misc_1.loadFileAttr)(path, ATTR_UPLOADER);
 }
-function setUploadMeta(path, ctx) {
-    return (0, misc_1.storeFileAttr)(path, ATTR_UPLOADER, {
+function saveUploadMeta(path, meta) {
+    return (0, misc_1.storeFileAttr)(path, ATTR_UPLOADER, meta);
+}
+async function setUploadApproved(path, approved) {
+    const meta = await getUploadMeta(path);
+    return Boolean(meta && await saveUploadMeta(path, { ...meta, approved }));
+}
+function fillUploadMeta(path, ctx) {
+    return saveUploadMeta(path, {
         username: (0, auth_1.getCurrentUsername)(ctx) || undefined,
         ip: ctx.ip,
+        approved: (0, adminApis_1.ctxAdminAccess)(ctx) || undefined,
     });
 }
 function getUploadTempFor(fullPath) {
@@ -67,6 +80,24 @@ function getUploadTempFor(fullPath) {
 }
 const diskSpaceCache = (0, expiringCache_1.expiringCache)(3_000); // invalidate shortly
 const uploadingFiles = new Map();
+const uploadMetaPending = new Set();
+function isUploading(path) {
+    const key = (0, vfs_1.normalizeFilename)(path);
+    return (0, path_1.basename)(path).startsWith(const_1.UPLOAD_TEMP_PREFIX)
+        || uploadingFiles.has(key)
+        || uploadingFiles.has((0, vfs_1.normalizeFilename)(getUploadTempFor(path))) // active uploads are keyed by their temporary file
+        || uploadMetaPending.has(key);
+}
+async function whileUploadMetaPending(path, cb) {
+    const key = (0, vfs_1.normalizeFilename)(path);
+    uploadMetaPending.add(key);
+    try {
+        return await cb();
+    }
+    finally {
+        uploadMetaPending.delete(key);
+    }
+}
 // initially sync for formidable; still sync to avoid async races and PUT piping gaps
 function uploadWriter(base, baseUri, filename, ctx) {
     if (!filename || !(0, misc_1.isValidFileName)(filename) || !filename)
@@ -123,7 +154,7 @@ function uploadWriter(base, baseUri, filename, ctx) {
         const createdFolders = [];
         const firstCreated = !dir.endsWith(':\\') && fs_1.default.mkdirSync(dir, { recursive: true });
         if (firstCreated) {
-            setUploadMeta(dir, ctx);
+            fillUploadMeta(dir, ctx);
             // recursive mkdir returns the first created directory; existing ancestors must not receive ownership
             const firstCreatedPath = (0, path_1.toNamespacedPath)((0, path_1.resolve)(firstCreated)); // Node 24 mkdir can return a namespace-prefixed Windows path
             let source = (0, path_1.resolve)(dir);
@@ -219,12 +250,16 @@ function uploadWriter(base, baseUri, filename, ctx) {
                 await new Promise(res => fileStream.close(res)); // this only seems necessary on Windows
                 for (const { uri, source } of createdFolders)
                     await (0, uploadOwners_1.setUploadOwner)(uri, ctx, source);
-                if (errored)
-                    return;
                 if (simulate)
                     return (0, promises_1.rm)(tempName).catch(() => { });
+                if (!await fillUploadMeta(tempName, ctx)) {
+                    await (0, promises_1.rm)(tempName).catch(() => { });
+                    return fail(const_1.HTTP_SERVER_ERROR);
+                }
+                if (errored)
+                    return;
                 if (ctx.isAborted()) { // in the very unlikely case the connection is interrupted between last-byte and here, we still consider it unfinished, as the client had no way to know, and will resume, but it would get an error if we finish the process
-                    const sec = exports.deleteUnfinishedUploadsAfter.get();
+                    const sec = first_1.quitting ? undefined : exports.deleteUnfinishedUploadsAfter.get(); // preserve uploads interrupted by shutdown for resuming
                     await (0, uploadOwners_1.setUploadOwner)(tempOwnerUri, ctx, tempName, lodash_1.default.isNumber(sec) ? Date.now() + sec * 1000 : null);
                     return lodash_1.default.isNumber(sec) && delayedDelete(tempName, sec, tempOwnerUri);
                 }
@@ -254,11 +289,16 @@ function uploadWriter(base, baseUri, filename, ctx) {
                     () => (0, promises_1.rename)(tempName, dest).then(() => true, e => e?.code !== 'EBUSY' && Promise.reject(e)), { timeout: 10_000 });
                     if (!done)
                         throw 'EBUSY';
+                    await (0, misc_1.moveStoredFileAttrs)(tempName, dest);
                     (0, uploadOwners_1.deleteUploadOwner)(tempOwnerUri); // the temp URI no longer exists after rename; final ownership is recorded below
                     if (mtime) // so we use it to touch the file
                         await (0, promises_1.utimes)(dest, Date.now() / 1000, mtime / 1000);
                     obj.fullPath = ctx.state.uploadDestinationPath = dest;
-                    void setUploadMeta(dest, ctx);
+                    if (!await fillUploadMeta(dest, ctx)) {
+                        await (0, promises_1.rename)(dest, tempName);
+                        await (0, misc_1.moveStoredFileAttrs)(dest, tempName);
+                        throw Error("couldn't store upload metadata");
+                    }
                     if (ctx.query.comment)
                         void (0, comments_1.setCommentFor)(dest, String(ctx.query.comment));
                     obj.uri = (0, misc_1.enforceFinal)('/', baseUri) + (0, misc_1.pathEncode)((0, path_1.basename)(dest));
@@ -272,8 +312,9 @@ function uploadWriter(base, baseUri, filename, ctx) {
                                 cb(obj);
                 }
                 catch (err) {
-                    void setUploadMeta(tempName, ctx);
+                    void fillUploadMeta(tempName, ctx);
                     console.error("Couldn't rename temp to", dest, String(err));
+                    fail(const_1.HTTP_SERVER_ERROR);
                 }
             }
             finally {

package/src/util-http.js

@@ -38,6 +38,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stream2string = void 0;
+exports.readTextLimited = readTextLimited;
+exports.readRequestBodyLimited = readRequestBodyLimited;
 exports.httpString = httpString;
 exports.httpWithBody = httpWithBody;
 exports.httpStream = httpStream;
@@ -51,6 +53,29 @@ const consumers_1 = require("node:stream/consumers");
 Object.defineProperty(exports, "stream2string", { enumerable: true, get: function () { return consumers_1.text; } });
 const tls = __importStar(require("node:tls"));
 const cross_1 = require("./cross");
+const cross_const_1 = require("./cross-const");
+async function readTextLimited(stream, maxBytes) {
+    if (Number(stream.headers['content-length']) > maxBytes)
+        return { error: 'too_large' };
+    const chunks = [];
+    let size = 0;
+    // keep the socket alive so callers can send the rejection before closing an undrained request
+    for await (const chunk of stream.iterator({ destroyOnReturn: false })) {
+        const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+        size += buffer.length;
+        if (size > maxBytes)
+            return { error: 'too_large' };
+        chunks.push(buffer);
+    }
+    return { text: new TextDecoder().decode(Buffer.concat(chunks, size)) };
+}
+async function readRequestBodyLimited(ctx, maxBytes) {
+    const body = await readTextLimited(ctx.req, maxBytes);
+    if (!('error' in body))
+        return body;
+    ctx.set('Connection', 'close'); // an unread rejected body makes this connection unsafe to reuse
+    ctx.status = cross_const_1.HTTP_PAYLOAD_TOO_LARGE;
+}
 async function httpString(url, { maxBytes = 10 * cross_1.MB, ...options } = {}) {
     const stream = await httpStream(url, options);
     if (maxBytes === Infinity)
@@ -85,12 +110,13 @@ function httpStream(url, { body, proxy, jar, noRedirect, httpThrow = true, ...op
             options.headers['user-agent'] = httpStream.defaultUA;
         if (body) {
             options.method ||= 'POST';
-            if (lodash_1.default.isPlainObject(body)) {
-                options.headers['content-type'] ??= 'application/json';
-                body = JSON.stringify(body);
-            }
-            if (!(body instanceof node_stream_1.Readable))
+            if (!(body instanceof node_stream_1.Readable)) {
+                if (typeof body === 'object' && !(body instanceof Buffer)) {
+                    options.headers['content-type'] ??= 'application/json';
+                    body = JSON.stringify(body);
+                }
                 options.headers['content-length'] ??= Buffer.byteLength(body);
+            }
         }
         const { auth, ...parsed } = parseHttpUrl(url);
         const hostJar = jar && (jar[parsed.hostname || ''] ||= {});

package/src/vfs.js

@@ -42,6 +42,7 @@ const walkDir_1 = require("./walkDir");
 const node_stream_1 = require("node:stream");
 const adminApis_1 = require("./adminApis");
 const showHiddenFiles = (0, config_1.defineConfig)(misc_1.CFG.show_hidden_files, false);
+const sourceNames = new Map();
 function setVfsPath(node, vfsPath, parent) {
     return (0, misc_1.setHidden)(node, {
         vfsPath: (0, misc_1.enforceFinal)('/', parent?.vfsPath) + (0, misc_1.pathEncode)(vfsPath)
@@ -189,6 +190,27 @@ async function getNodeByName(name, parent, assumeMissingToBeFolder = false) {
     // does the tree node have a child that goes by this name, otherwise attempt disk
     let virtualName = name;
     let child = parent.children?.find(isSameFilenameAs(name));
+    const sameName = isSameFilenameAs(name);
+    const sourceName = Object.entries(parent.rename || {}).find(([, to]) => sameName(to))?.[0] || name;
+    if (!child) {
+        child = findSourceChild();
+        if (!child && const_1.IS_WINDOWS && parent.source) {
+            const aliases = await windowsPathNames((0, path_1.join)(parent.source, sourceName), parent.source);
+            if (!aliases)
+                return;
+            child = findSourceChild(aliases);
+            if (!child) {
+                const normalized = new Set(aliases.map(normalizeFilename));
+                const candidates = parent.children?.filter(candidate => candidate.source
+                    && normalized.has(normalizeFilename((0, path_1.basename)(candidate.source)))) || [];
+                if (candidates.length > 1)
+                    return; // an unverified physical alias must identify one VFS child
+                const [candidate] = candidates;
+                if (candidate?.source && await isSameFilePath((0, path_1.dirname)(candidate.source), parent.source))
+                    child = candidate;
+            }
+        }
+    }
     if (child) { // found as vfs node
         virtualName = getNodeName(child);
         await setIsFolder(child); // in case it's pointing to a folder that didn't exist at loading time
@@ -202,7 +224,6 @@ async function getNodeByName(name, parent, assumeMissingToBeFolder = false) {
         const ret = {};
         let onDisk = name;
         if (parent.rename) { // reverse the mapping
-            const sameName = isSameFilenameAs(name);
             const entries = Object.entries(parent.rename);
             // search display names first: with { A: B, C: A }, A must resolve to C rather than be hidden
             const asDisplayName = entries.find(([, to]) => sameName(to));
@@ -211,12 +232,17 @@ async function getNodeByName(name, parent, assumeMissingToBeFolder = false) {
                 virtualName = asDisplayName[1];
             }
             else {
-                const asPhysicalName = entries.find(([from]) => sameName(from));
+                if (!await canonicalizeWindowsAlias())
+                    return;
+                const sameSourceName = isSameFilenameAs(onDisk);
+                const asPhysicalName = entries.find(([from]) => sameSourceName(from));
                 if (asPhysicalName)
                     return; // a VFS rename replaces the original public name
             }
             ret.rename = renameUnderPath(parent.rename, onDisk);
         }
+        else if (!await canonicalizeWindowsAlias())
+            return;
         if (!(0, misc_1.isValidFileName)(onDisk))
             return;
         ret.source = (0, path_1.join)(parent.source, onDisk);
@@ -225,6 +251,22 @@ async function getNodeByName(name, parent, assumeMissingToBeFolder = false) {
         if (assumeMissingToBeFolder)
             ret.isFolder ??= true;
         return ret;
+        async function canonicalizeWindowsAlias() {
+            if (!const_1.IS_WINDOWS || !name.includes('~'))
+                return true;
+            // Windows exposes 8.3 aliases that must keep the long name's VFS identity
+            const longPath = await convertWindowsPath((0, path_1.join)(parent.source, name), true);
+            if (!longPath)
+                return true; // new names containing '~' are still valid
+            if (!await isSameFilePath((0, path_1.dirname)(longPath), parent.source))
+                return false;
+            onDisk = virtualName = (0, path_1.basename)(longPath);
+            return true;
+        }
+    }
+    function findSourceChild(names = [sourceName]) {
+        const normalized = new Set(names.map(normalizeFilename));
+        return parent.children?.find(x => getSourceNames(x, parent).some(source => normalized.has(normalizeFilename(source))));
     }
 }
 const smartUncFolderDetection = (0, config_1.defineConfig)(misc_1.CFG.smart_unc_folder_detection, false);
@@ -261,8 +303,42 @@ async function reviewVfs() {
             usedNames.add(normalizeFilename(getNodeName(child)));
         }
         await Promise.allSettled(node.children.map(recur));
+        await Promise.allSettled(node.children.map(child => setSourceNames(child, node)));
     })(exports.vfs.compiled());
 }
+async function setSourceNames(node, parent) {
+    if (!node.source || !parent.source)
+        return;
+    const sameParent = normalizeFilename((0, path_1.dirname)((0, path_1.resolve)(node.source))) === normalizeFilename((0, path_1.resolve)(parent.source));
+    if (!sameParent && (!const_1.IS_WINDOWS || !await isSameFilePath((0, path_1.dirname)(node.source), parent.source)))
+        return;
+    const names = [(0, path_1.basename)(node.source)];
+    const key = sourceNamesKey(node, parent);
+    if (const_1.IS_WINDOWS) {
+        const converted = await Promise.all([convertWindowsPath(node.source), convertWindowsPath(node.source, true)]);
+        names.push(...converted.map(x => x && (0, path_1.basename)(x)).filter(Boolean));
+    }
+    sourceNames.set(key, lodash_1.default.uniq(names));
+}
+function convertWindowsPath(path, isLong = false) {
+    return new Promise(resolvePromise => {
+        if (!fswin_1.default.convertPath(path, resolvePromise, isLong))
+            resolvePromise(undefined);
+    });
+}
+async function windowsPathNames(path, parent) {
+    const converted = await Promise.all([convertWindowsPath(path), convertWindowsPath(path, true)]);
+    const existing = converted.find(Boolean);
+    if (existing && !await isSameFilePath((0, path_1.dirname)(existing), parent))
+        return;
+    return lodash_1.default.uniq([(0, path_1.basename)(path), ...converted.map(x => x && (0, path_1.basename)(x)).filter(Boolean)]);
+}
+function getSourceNames(node, parent) {
+    return node.source && parent.source ? sourceNames.get(sourceNamesKey(node, parent)) || [] : [];
+}
+function sourceNamesKey(node, parent) {
+    return normalizeFilename((0, path_1.resolve)(parent.source)) + '\0' + normalizeFilename((0, path_1.resolve)(node.source));
+}
 exports.saveVfs = (0, misc_1.debounceAsync)(async () => {
     await reviewVfs(); // refresh runtime-derived folder flags before saving mutated VFS state
     exports.vfs.set(exports.vfs.compiled()); // sync the mutable runtime tree back to config state before persisting it
@@ -385,6 +461,7 @@ async function* walkNode(parent, { ctx, depth = Infinity, prefixPath = '', requi
             started = true;
             const { source } = parent;
             const taken = new Set();
+            const takenSources = new Set();
             const maskApplier = parentMaskApplier(parent);
             const visitLater = [];
             const childrenWorking = parent.children?.length && Promise.all(parent.children.map(async (child) => {
@@ -392,7 +469,9 @@ async function* walkNode(parent, { ctx, depth = Infinity, prefixPath = '', requi
                     return;
                 const nodeName = getNodeName(child);
                 const name = prefixPath + nodeName;
-                taken?.add(normalizeFilename(name));
+                taken.add(normalizeFilename(name));
+                for (const sourceName of getSourceNames(child, parent))
+                    takenSources.add(normalizeFilename(prefixPath + sourceName));
                 const item = setVfsPath({ ...child, original: child, name, parent }, name, parent);
                 if (await cantSee(item))
                     return;
@@ -434,7 +513,8 @@ async function* walkNode(parent, { ctx, depth = Infinity, prefixPath = '', requi
                                 renamed = dir + '/' + renamed;
                         }
                         const name = prefixPath + (renamed || path);
-                        if (taken?.has(normalizeFilename(name))) // taken by vfs node above
+                        if (taken.has(normalizeFilename(name))
+                            || takenSources.has(normalizeFilename(prefixPath + path))) // taken by vfs node above
                             return false; // false just in case it's a folder
                         const item = setVfsPath({ name, isFolder, source: (0, path_1.join)(source, path), parent, stats: entry.stats }, name, parent);
                         // masks containing '/' must be matched against the relative path while keeping walkDir recursion enabled

package/src/webdav.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.webdav = void 0;
 exports.releaseWebdavLock = releaseWebdavLock;
 exports.isWebdavLocked = isWebdavLocked;
-const consumers_1 = require("node:stream/consumers");
+const util_http_1 = require("./util-http");
 const vfs_1 = require("./vfs");
 const cross_1 = require("./cross");
 const stream_1 = require("stream");
@@ -315,11 +315,14 @@ const webdav = async (ctx, next) => {
                 setWebdavHeaders(true);
             return;
         }
-        const body = ctx.length || ctx.get('content-length') || ctx.get('transfer-encoding') ? await (0, consumers_1.text)(ctx.req) : '';
+        const body = await (0, util_http_1.readRequestBodyLimited)(ctx, 1024 * 1024);
+        if (!body)
+            return;
+        const bodyText = body.text;
         const token = getProvidedLockToken();
         let seconds = Number(ctx.get('timeout').split(',').find(x => /^Second-\d+$/i.test(x.trim()))?.trim().split('-', 2)[1]);
         seconds = lodash_1.default.clamp(seconds || LOCK_DEFAULT_SECONDS, 1, LOCK_MAX_SECONDS);
-        if (!body) {
+        if (!bodyText) {
             // Finder and similar clients refresh an existing lock by sending LOCK without a body
             if (!token)
                 return ctx.status = cross_1.HTTP_BAD_REQUEST;
@@ -338,7 +341,7 @@ const webdav = async (ctx, next) => {
             ctx.body = renderLockResponse(lock.token, lock.seconds);
             return;
         }
-        const lockinfo = (0, cross_1.try_)(() => xmlParser.parse(body).lockinfo);
+        const lockinfo = (0, cross_1.try_)(() => xmlParser.parse(bodyText).lockinfo);
         const scope = lodash_1.default.keys(lockinfo?.lockscope)[0];
         const type = lodash_1.default.keys(lockinfo?.locktype)[0];
         if (!scope || !type)
@@ -416,8 +419,11 @@ const webdav = async (ctx, next) => {
                 setWebdavHeaders(true);
             return;
         }
-        const body = ctx.length || ctx.get('content-length') || ctx.get('transfer-encoding') ? await (0, consumers_1.text)(ctx.req) : '';
-        const props = (0, cross_1.try_)(() => parseProppatchProps(body)) || [];
+        const body = await (0, util_http_1.readRequestBodyLimited)(ctx, 1024 * 1024);
+        if (!body)
+            return;
+        const bodyText = body.text;
+        const props = (0, cross_1.try_)(() => parseProppatchProps(bodyText)) || [];
         if (!props.length)
             return ctx.status = cross_1.HTTP_BAD_REQUEST;
         const statuses = [];

package/admin/assets/AccountsPage-C_ayTmn7.js

@@ -1,3 +0,0 @@
-import{i as e}from"./rolldown-runtime-CacB07dV.js";import{t}from"./DateTimeField-ZUy9IBhM.js";import{n,r,t as i}from"./MenuButton-BTRAUH7H.js";import{n as a,t as o}from"./VfsPathField-DHifSPJi.js";import{Bn as s,C as c,Ct as l,Da as u,E as d,Ea as f,Et as p,F as m,Ft as h,H as g,Ir as _,Lt as v,M as y,Ma as b,N as x,O as S,Oa as C,Pa as w,R as T,S as E,St as D,Ta as O,U as k,Ut as A,W as j,Wr as M,Yt as N,_ as ee,_i as P,_r as te,ai as F,en as I,fr as L,ft as R,gt as ne,ht as re,it as ie,j as ae,jr as oe,ka as se,lr as z,lt as ce,mt as B,ni as le,nr as ue,q as de,ri as fe,st as pe,tr as me,tt as V,vi as H,w as he,y as U,zt as ge}from"./index-B3difDBD.js";import{$ as _e,J as ve,Q as ye,X as be,Y as xe,Z as Se,et as W,it as Ce,nt as we,rt as G,tt as Te}from"./icons-DR_Rvxtn.js";var K=e(w());u();var Ee=[`password`,`password2`,`adminActualAccess`,`hasPassword`,`invalidated`,`canLogin`,`members`];function De({account:e,done:n,groups:r,addToBar:i,reload:a}){var u,m;let{username:h}=ie(),[_,v]=(0,K.useState)(e),[x,S]=(0,K.useState)([]),C=I();(0,K.useEffect)(()=>{var t;v(e),S(r.filter(t=>t!==e.username)),C||(t=k.current)==null||(t=t.querySelector(`input`))==null||t.focus()},[JSON.stringify(e)]);let w=!e.username,{isGroup:T}=_,k=(0,K.useRef)(),{members:A}=e,j=(u=e.plugin)==null?void 0:u.auth;return(0,K.createElement)(ce,{key:e.username,formRef:k,values:_,set(e,t){v(n=>f(f({},n),{},{[t]:e}))},barSx:f({gap:2,width:`100%`},de()),stickyBar:!0,addToBar:[!w&&(0,K.createElement)(c,f(f({icon:G,title:`Delete`,confirm:`Delete ${e.username}?`},h===e.username&&{disabled:!0,title:`Cannot delete current account`}),{},{onClick:()=>z(`del_account`,{username:e.username}).then(a)})),(0,K.createElement)(c,{icon:xe,title:`Invalidate past sessions${s(`
-(already invalidated sessions before `,D(e.invalidated||0),`)`)}`,confirm:`Invalidate all sessions up to now for "${e.username}"?`,doneMessage:!0,onClick:()=>z(`invalidate_sessions`,{username:e.username}).then(a)}),...me(i)],fields:[{k:`username`,label:T?`Group name`:void 0,autoComplete:`off`,required:!0,md:T&&!j?12:4,getError:t=>t!==e.username&&z(`get_account`,{username:t}).then(t=>(t==null?void 0:t.username)===e.username?`usernames are case-insensitive`:`already used`,()=>!1)},j&&{k:``,md:8,comp:(0,K.createElement)(H,{severity:`info`},` Authentication handled by a plugin`)},!T&&!j&&{k:`password`,xs:6,md:4,type:`password`,autoComplete:`new-password`,required:w,label:w?`Password`:`Change password`},!T&&!j&&{k:`password2`,xs:6,md:4,type:`password`,autoComplete:`new-password`,label:`Repeat password`,getError:(e,{values:t})=>(e||``)!==(t.password||``)&&`Enter same password`},{k:`disabled`,comp:R,fromField:e=>!e,toField:e=>!e,label:`Enabled`,xs:12,sm:6,lg:4,helperText:_.disabled||_.canLogin!==!1?`Login is prevented if account is disabled, or all its groups are disabled`:(0,K.createElement)(F,{sx:{color:`warning.main`},component:`span`},new Date(e.expire)<new Date?`Login is prevented because account is expired`:`Login is prevented because all of its groups are disabled`)},{k:`ignore_limits`,comp:R,xs:12,sm:6,lg:4,helperText:_.ignore_limits?`Speed limits don't apply to this account`:`Speed limits apply to this account`},f({k:`admin`,comp:R,fromField:e=>e||null,label:`Admin-panel access`,xs:12,sm:6,lg:4,helperText:`To access THIS interface you are using right now`},!e.admin&&e.adminActualAccess&&{value:!0,disabled:!0,helperText:`This permission is inherited. To disable it, act on the groups.`}),!T&&{k:`require_password_change`,comp:R,xs:12,sm:6,lg:4,helperText:`At next login, but can be dismissed`},{k:`disable_password_change`,label:`Password change`,comp:ne,xs:12,sm:6,lg:4,defaultValue:null,options:{[`Default (${_.canChangePassword?`Allowed`:`Disabled`})`]:null,Allowed:!1,Disabled:!0}},A?T&&!A.length?(0,K.createElement)(F,{},`No members`):A.length>0&&(0,K.createElement)(E,{gap:0,flexWrap:`wrap`},`${A.length} members: `,N(`,\xA0`,(m=e.members)==null?void 0:m.map(e=>(0,K.createElement)(r.includes(e)?`i`:`span`,{},e))),(0,K.createElement)(U,{icon:G,confirm:`Delete ${e.members.length} accounts?`,onClick:()=>z(`del_account`,{username:e.members}).then(a),sx:{verticalAlign:`text-top`}})):null,T&&(0,K.createElement)(H,{severity:`info`},`To add users to this group, select the user and then click "Inherit"`),{k:`belongs`,comp:re,label:`Inherit from groups`,options:x,sm:6,lg:4,helperText:`Specify groups to inherit permissions from`+(T?`. A group can inherit from another group`:``)+(x.length?``:`. Now disabled because there are no groups to select, create one first.`)},{k:`allow_net`,comp:d,label:`Allowed network address`,sm:6,lg:4,placeholder:`any address`},!T&&{k:`auto_login_net`,comp:d,label:`Auto-login by IP address`,sm:6,lg:4,placeholder:`none`},{k:`redirect`,comp:o,placeholder:`no`,sm:6,lg:4,helperText:`If you want this account to be redirected to a specific folder/address (or even file) at login time`},{k:`expire`,label:`Expiration`,sm:6,lg:4,comp:t,toField:e=>e&&new Date(e),helperText:`When expired, login won't be allowed`},f(f({k:`days_to_live`,sm:6,lg:4,comp:B,step:`any`,min:1/1e3},_.expire&&{xs:12,disabled:!0,sx:{opacity:.2}}),{},{helperText:`Used to set expiration on first login`}),{k:`notes`,multiline:!0,sm:6,lg:4}],onError:g,save:f(f({},y(l(_,e))),{},{onClick(){return b(function*(){var t;let{password:r=``,password2:i,adminActualAccess:a,hasPassword:o,invalidated:s,canLogin:c,members:l}=_,u=O(_,Ee),d=((t=k.current)==null?void 0:t.querySelector(`button.saveBtn`))||void 0;if(w){let e=yield z(`add_account`,u);if(r)try{yield p(_.username,r)}catch(e){throw z(`del_account`,{username:_.username}),e}n(e==null?void 0:e.username,d);return}let m=yield z(`set_account`,{username:e.username,changes:u});r&&(yield p(_.username,r),v(e=>f(f({},e),{},{password:``,password2:``}))),e.username===h&&(V.username=m.username),n(m==null?void 0:m.username,d)})()}})})}var q=e(L());se(),u();var J={fieldSeparator:`,`,lineSeparator:`
-`,quote:`"`},Y={field:0,fieldOffset:0,line:0,lineOffset:0,quoted:!1,appendCell:!1,appendField:!1,appendRow:!1},X=class extends Error{constructor(e,t){super(`Invalid CSV at ${e}:${t}`)}},Oe=class{constructor(e=J){C(this,`_rows`,[]),C(this,`_row`,[]),C(this,`_cell`,``),C(this,`_options`,J),C(this,`_state`,f({},Y)),C(this,`_index`,0),C(this,`_current`,``),C(this,`_previous`,``),C(this,`_quoteState`,f({},Y)),this._options=Object.assign({},J,e)}parse(e){for(this.reset(),this._index=0;this._index<e.length;this._index++)this._state.appendCell=!0,this._previous=this._current,this._current=e[this._index],this.handleNext();if(this._row.length>0&&(this.addField(this.fieldValue(this._cell),this._row,this._state),this.addRow(this._row,this._rows,this._state)),this._state.quoted)throw new X(this._quoteState.line,this._quoteState.lineOffset);return this.makeImmutable(),this._rows}get rows(){return this._rows}get json(){if(this.rows.length>0){let e=this.rows[0].filter(e=>typeof e==`string`);return Object.freeze(this.rows.filter((e,t)=>e&&t>0).map(t=>{let n={};return e.forEach((e,r)=>{n[e]=t[r]}),Object.freeze(n)}))}return Object.freeze([])}handleNext(){this.handleQuote()||this.handleFieldSeparator()||this.handleLineSeparator(),this.processState()}handleQuote(){return this._current===this._options.quote?(this._quoteState=f({},this._state),this._previous===`\\`?this.handleQuoteEscaped():this.handleQuoteNotEscaped(),!0):!1}handleQuoteEscaped(){this._cell=this._cell.slice(0,Math.max(0,this._cell.length-1))}handleQuoteNotEscaped(){if(this._cell.length===0||this._state.quoted)this._state.quoted=!this._state.quoted;else throw new X(this._state.line,this._state.lineOffset);this._state.appendCell=!1}handleFieldSeparator(){return this._current===this._options.fieldSeparator?(this._state.quoted||(this._state.appendCell=!1,this._state.appendField=!0),!0):!1}handleLineSeparator(){return this._current===this._options.lineSeparator?(this._state.quoted||(this._state.appendCell=!1,this._state.appendField=!0,this._state.appendRow=!0),!0):!1}processState(){this._state.appendCell&&(this._cell+=this._current),this._state.appendField&&(this.addField(this.fieldValue(this._cell),this._row,this._state),this._cell=``),this._state.appendRow&&(this.addRow(this._row,this._rows,this._state),this._row=[]),this._state.lineOffset++,this._state.fieldOffset++}fieldValue(e){return e}addField(e,t,n){t.push(e),n.field++,n.fieldOffset=-1,n.appendField=!1}addRow(e,t,n){t.push(e),n.field=0,n.line++,n.lineOffset=-1,n.appendRow=!1}makeImmutable(){this.rows.forEach(e=>{e.forEach(e=>Object.freeze(e)),Object.freeze(e)}),Object.freeze(this._rows)}reset(){this._rows=[],this._row=[],this._cell=``,this._state=f({},Y),this._index=0,this._current=``,this._previous=``,this._quoteState=f({},Y)}};u();function ke(e){return Z.apply(this,arguments)}function Z(){return Z=b(function*(e){v(function(){var t=b(function*(t){let n=t==null?void 0:t[0];if(!n)return;let r=yield h(n);if(!r)return;let i=new Oe().parse(r.trim()),a={comp:B,min:1,max:9,xs:6,typing:!0},o={skipFirstLines:0,usernameColumn:1,passwordColumn:2,groupColumn:3,redirectColumn:4,overwriteExistingAccounts:!1},c=yield j({title:`Import accounts from CSV`,dialogProps:{maxWidth:`sm`},values:o,form:e=>{let t=i[e.skipFirstLines||0]||[],n=u(t,f(f({},o),e));return{save:{startIcon:(0,K.createElement)(ve),children:`Go`},fields:[(0,K.createElement)(F,{sx:{p:1}},`Total lines:`,i.length),{k:`skipFirstLines`,comp:B,max:i.length-1,typing:!0,md:6,getError:e=>e!=null&&!Number.isInteger(e)&&`Enter an integer`,helperText:(0,K.createElement)(K.Fragment,{},`First line: `,(0,K.createElement)(`code`,{},t.join(`, `)))},{k:`overwriteExistingAccounts`,comp:R,md:6},f(f({k:`usernameColumn`},a),{},{helperText:(0,K.createElement)(K.Fragment,{},`First username: `,n.u)}),f(f({k:`passwordColumn`},a),{},{helperText:(0,K.createElement)(K.Fragment,{},`First password: `,n.p)}),f(f({k:`groupColumn`},a),{},{helperText:(0,K.createElement)(K.Fragment,{},`First group: `,n.g)}),f(f({k:`redirectColumn`},a),{},{helperText:(0,K.createElement)(K.Fragment,{},`First redirect: `,n.r)})]}}});if(!c)return;let{close:l}=A({title:`Importing...`,Content(){let[t,n]=(0,K.useState)(0),[r,a]=(0,K.useState)();return(0,K.useEffect)(()=>{let t=!1;return setTimeout(b(function*(){if(t)return;let r=0,o=0,d=c.skipFirstLines,f=i.length-d,m=0;try{for(let e of i){var h;if(t)return;if(d){d--;continue}let i=u(e,c);a(i),n(m++/f),yield z(`add_account`,{username:i.u,belongs:(h=i.g)==null?void 0:h.split(`,`),redirect:i.r,overwrite:c.overwriteExistingAccounts}).then(()=>{if(i.p)return p(i.u,i.p)}).catch(e=>{if(e.code===409)return o++;r++})}}finally{l();let t=m-r-o;g(`Results: `+[s(``,r,` failed`),s(``,t,` succeeded`),s(``,o,` skipped because already present`)].filter(Boolean).join(`, `),!t&&r?`error`:r||o?`warning`:`success`),e==null||e()}})),()=>{t=!0}},[]),(0,K.createElement)(F,{sx:{display:`flex`,gap:2,alignItems:`center`}},(0,K.createElement)(he,{icon:W,progress:t}),r==null?void 0:r.u)}});function u(e,t){return{u:e[t.usernameColumn-1],p:e[t.passwordColumn-1],g:e[t.groupColumn-1],r:e[t.redirectColumn-1]}}});return function(e){return t.apply(this,arguments)}}(),{multiple:!1,accept:`.csv`})}),Z.apply(this,arguments)}u();var Ae=`	`,Q=e=>e==null?void 0:e.split(Ae).at(-1);function je(){let{username:e,accountsAsTree:t}=ie(),{data:o,reload:s,element:l}=ee(`get_accounts`),[u,d]=(0,K.useState)([]),p=Array.isArray(u);(0,K.useEffect)(()=>{Array.isArray(o==null?void 0:o.list)&&p&&d(u.filter(e=>o.list.find(t=>(t==null?void 0:t.username)===Q(e))))},[o]);let h=(0,K.useMemo)(()=>o&&q.default.sortBy(o.list,[e=>!e.isGroup,e=>!e.adminActualAccess,`username`]),[o]),v=p&&q.default.find(h,{username:Q(u[0])}),y=m(`md`),C=!(u.length>0)||!h?null:p&&u.length>1?(0,K.createElement)(K.Fragment,{},(0,K.createElement)(E,{},(0,K.createElement)(P,{variant:`h6`},u.length+` selected`),(0,K.createElement)(U,{onClick:I,icon:G},`Remove`)),(0,K.createElement)(_,{},q.default.uniq(u.map(Q)).map(e=>(0,K.createElement)(a,{key:e},(0,K.createElement)(oe,{},e))))):ue(v||j(),e=>(0,K.createElement)(De,{account:e,groups:h.filter(e=>e.isGroup).map(e=>e.username),addToBar:y&&[(0,K.createElement)(F,{sx:{flex:1}}),$(e,{fontSize:`large`,sx:{p:1}}),(0,K.createElement)(c,{icon:pe,title:`Close`,onClick:N})],reload:s,done(e,t){d(y?[e]:[]),s(),S(``,t)}}));(0,K.useEffect)(()=>{if(y||!C||!u.length)return;let{close:e}=A({title:q.default.isString(u)?q.default.startCase(u):u.length>1?`Multiple selection`:v?(v.isGroup?`Group: `:`User: `)+v.username:`?`,Content:()=>C,onClose(e){e||N()}});return()=>void e(!0)},[y,u,v]);let w={height:`100%`,display:`flex`,flexDirection:`column`,overflow:`auto`},[D,O]=T(`Show tree`,`Show list`,()=>({icon:te}),t);return V.accountsAsTree=D,l||(0,K.createElement)(M,{container:!0,sx:{rowSpacing:1,columnSpacing:2,top:0,flex:`1 1 auto`,height:0}},(0,K.createElement)(M,{size:{xs:12,md:5,lg:4,xl:5},sx:w},(0,K.createElement)(F,{sx:{display:`flex`,flexWrap:`wrap`,gap:2,mb:2,boxShadow:e=>`0px -8px 4px 10px ${e.palette.background.paper}`,position:`sticky`,top:0,zIndex:2,backgroundColor:`background.paper`,width:`fit-content`}},(0,K.createElement)(i,{variant:`contained`,startIcon:(0,K.createElement)(Se),items:[{children:`user`,onClick:()=>d(`new-user`)},{children:`group`,onClick:()=>d(`new-group`)},{children:`from CSV`,onClick:()=>ke(s)}]},`Add`),x(s),O,(h==null?void 0:h.length)>0&&(0,K.createElement)(P,{sx:{p:1}},`${h.length} account(s)`)),!(h!=null&&h.length)&&(0,K.createElement)(H,{severity:`info`},ge`To access administration <u>remotely</u> you will need to create a user account with admin permission`),(0,K.createElement)(r,{multiSelect:!0,sx:{pr:4,pb:2,minWidth:`15em`},selectedItems:p?u:[],slots:{collapseIcon:Te,expandIcon:Ce},onSelectedItemsChange(e,t){var n,r;!(e==null||(n=e.target)==null||(r=n.closest)==null)&&r.call(n,`.MuiTreeItem-iconContainer`)||d(t)}},h&&(function e(t,r=``){return t.map(t=>{var i,a;return(0,K.createElement)(n,{key:t.username,itemId:r+t.username,label:(0,K.createElement)(F,{sx:{display:`flex`,flexWrap:`wrap`,padding:`.2em 0`,columnGap:`.5em`,alignItems:`center`}},$(t),(t.disabled||t.canLogin===!1)&&ae(we,t.disabled?`Disabled`:`Disabled by its groups`,t.disabled?void 0:{color:`text.secondary`}),(t.expire||t.days_to_live)&&(0,K.createElement)(be),t.adminActualAccess&&ae(_e,`Can login into Admin`),t.username,!!((i=t.belongs)!=null&&i.length)&&(0,K.createElement)(F,{sx:{color:`text.secondary`,fontSize:`small`}},`(`,(a=t.belongs)==null?void 0:a.join(`, `),`)`))},D&&e(h.filter(e=>{var n;return(n=t.directMembers)==null?void 0:n.includes(e.username)}),r+t.username+Ae))})})(D?h.filter(e=>!h.some(t=>{var n;return(n=t.members)==null?void 0:n.includes(e.username)})):h))),y&&C&&(0,K.createElement)(M,{size:`grow`,sx:f(f({},w),{},{maxWidth:`100%`})},(0,K.createElement)(fe,{sx:{overflow:`initial`}},(0,K.createElement)(le,{},C))));function j(){return{username:``,hasPassword:u===`new-user`,adminActualAccess:!1,invalidated:void 0,canLogin:!0,canChangePassword:!0,isGroup:u===`new-group`,members:[],directMembers:[]}}function N(){d([])}function I(){return L.apply(this,arguments)}function L(){return L=b(function*(){if(typeof u==`string`||u.some(t=>Q(t)===e)&&!(yield k(`You cannot ask to delete the account you are using. Continue with the rest?`)))return;let t=q.default.without(q.default.uniq(u.map(Q)),e);if(!t.length)return g(`Nothing to delete`,`info`);if(!(yield k(`Delete ${t.length} item(s)?`)))return;let n=[];for(let e of t)(yield z(`del_account`,{username:e}).then(()=>1,()=>0))||n.push(e);if(s(),n.length)return g(`The following items couldn't be deleted: `+n.join(`, `),`error`)}),L.apply(this,arguments)}}function $(e,t={}){return(0,K.createElement)(e.isGroup?W:ye,t)}export{je as default};

package/admin/assets/ArrayField-B20NUH0C.js

@@ -1,2 +0,0 @@
-import{i as e}from"./rolldown-runtime-CacB07dV.js";import{n as t,t as n}from"./DataTable-BwyFEGxv.js";import{t as r}from"./DateTimeField-ZUy9IBhM.js";import{Aa as i,C as a,Da as o,Ea as s,F as c,Gr as l,I as u,Kr as d,Ma as f,Pa as p,S as m,St as h,Ta as g,W as _,Wn as v,Yn as y,ai as b,b as ee,ct as x,dt as S,fr as C,ft as w,ii as T,ja as E,un as D,ut as O,wn as te}from"./index-B3difDBD.js";import{F as ne,I as re,L as ie,P as ae,q as oe,rt as se}from"./icons-DR_Rvxtn.js";var k=e(p()),A=e(C());o(),i();var j=[`label`,`helperText`,`fields`,`value`,`onChange`,`onError`,`setApi`,`reorder`,`prepend`,`noRows`,`valuesForAdd`,`autoRowHeight`,`dialog`,`form`,`details`,`objectK`,`saveOn`,`applyButton`,`height`,`error`,`sx`],M=[`$width`,`$column`,`$type`,`$hideUnder`,`showIf`,`$render`,`$mergeRender`];function N(e){let{label:r,helperText:i,fields:o,value:u,onChange:p,onError:h,setApi:x,reorder:C,prepend:w,noRows:T,valuesForAdd:N,autoRowHeight:I,dialog:L,form:R,details:z,objectK:B,saveOn:V,applyButton:H,height:U,error:W,sx:G}=e,ce=g(e,j),K=Array.isArray(u)?u:!B||!u?[]:Object.entries(u).map(([e,t])=>s({[B]:e},t)),q=(0,k.useMemo)(()=>K.map((e,t)=>v(s({},e),e.hasOwnProperty(`id`)?{$idx:t}:{id:t})),[JSON.stringify(K)]),J=!!W||void 0,Y=e=>t=>s(s({fields:D(o,t).map(e=>{var n;let{$width:r,$column:i,$type:a,$hideUnder:o,showIf:s,$render:c,$mergeRender:l}=e,u=g(e,M);return(!s||s(t))&&A.default.defaults(u,(n=F[a])==null?void 0:n.field)})},R),e);x==null||x({isEqual:te});let[X,le]=(0,k.useState)();return(0,k.createElement)(k.Fragment,{},(0,k.createElement)(m,{rowGap:0,flexWrap:`wrap`,ml:`2px`},r&&(0,k.createElement)(l,{error:J,sx:{color:J?void 0:`text.primary`}},r),i&&(0,k.createElement)(d,{error:J},i)),(0,k.createElement)(b,s(s({},ce),{},{sx:S({height:U},G)}),(0,k.createElement)(n,s(s(s({rows:q,details:z},I&&{getRowHeight:()=>`auto`}),!c(`sm`)&&{compact:!0}),{},{sx:s({".MuiDataGrid-virtualScroller":{minHeight:`3em`}},I&&{".MuiDataGrid-cell":{minHeight:`52px !important`}}),hideFooterSelectedRowCount:!0,hideFooter:!0,slots:{noRowsOverlay:()=>(0,k.createElement)(ee,{},T||`No entries`)},slotProps:{pagination:{showFirstButton:!0,showLastButton:!0}},onCellDoubleClick({field:e,row:t},n){var r;let i=D(o,!1).find(t=>!(0,k.isValidElement)(t)&&t.k===e&&t.$type===`boolean`);if(!i)return;let a=(r=t.$idx)==null?t.id:r,c=t[e],l=!(i.toField||A.default.identity)(c);Z(a,s(s({},K[a]),{},{[e]:(i.fromField||A.default.identity)(l,{originalValue:c})}),n)},columns:[...D(o,!1).map(e=>{var t,n;if((0,k.isValidElement)(e))return;let r=(t=F[e.$type])==null?void 0:t.column;return A.default.defaults(s(s({field:e.k,headerName:(n=e.headerName)==null?typeof e.label==`string`?e.label:O(e.k):n,disableColumnMenu:!0,valueGetter:t=>(e.toField||A.default.identity)(t)},e.$width?{[e.$width>=8?`width`:`flex`]:e.$width}:!(r!=null&&r.width)&&!(r!=null&&r.flex)&&{flex:1}),{},{renderCell:e.$render,mergeRender:e.$mergeRender,hideUnder:e.$hideUnder},e.$column),r)}).filter(Boolean),{field:``,type:`actions`,width:90,headerAlign:`center`,renderHeader(){return(0,k.createElement)(k.Fragment,{},(0,k.createElement)(a,{icon:ie,title:`Add`,size:`small`,onClick(e){return f(function*(){let t=yield _({form:Y({}),title:`Add`,values:N,dialogProps:L});if(!t)return;let n=K.slice()||[];w?n.unshift(t):n.push(t),Q(n,e)})()}}),X!==void 0&&(0,k.createElement)(a,{icon:ae,title:`Undo`,size:`small`,onClick:e=>Q(X,e)}))},getActions({row:e}){let{$idx:n=e.id}=e,i=`Modify`;return[(0,k.createElement)(t,{key:`edit`,icon:(0,k.createElement)(oe),label:i,title:i,onClick(t){return f(function*(){t.stopPropagation();let a=yield _({values:e,form:(e,{submit:t})=>Y(V===`change`&&{save:!1,onChange(e){Z(n,e,`change`)}}||H&&{addToBar:(0,k.createElement)(P,s(s({children:`Apply`,sx:s({ml:2},H.sx)},H),{},{onClick(){t(function(){var e=f(function*(e){let t=Z(n,s(s({},K[n]),e),`save`);yield H.onClick(t)});return function(t){return e.apply(this,arguments)}}())}}))}||V&&{save:!1})(e),title:(0,k.createElement)(k.Fragment,{},i,r&&` - `,r),dialogProps:L});a&&Z(n,a,t)})()}}),(0,k.createElement)(t,{key:`delete`,icon:(0,k.createElement)(se),label:`Delete`,showInMenu:C,onClick(e){e.stopPropagation(),Q(K.filter((e,t)=>t!==n),e)}}),C&&n&&(0,k.createElement)(t,{key:`up`,icon:(0,k.createElement)(re),label:`Move up`,showInMenu:!0,onClick(e){e.stopPropagation(),Q(y(K.slice(),n,n-1),e)}}),C&&n<q.length-1&&(0,k.createElement)(t,{key:`down`,icon:(0,k.createElement)(ne),label:`Move down`,showInMenu:!0,onClick(e){e.stopPropagation(),Q(y(K.slice(),n,n+1),e)}})].filter(Boolean)}}]}))));function Z(e,t,n){return Q(K.map((n,r)=>r===e?t:n),n)}function Q(e,t){let n=$(e);return p(n,{was:u,event:t}),V!==`change`&&le(K),n}function $(e){return B?Object.fromEntries(e.map(e=>{let{[B]:t}=e;return[t,g(e,[B].map(E))]})):e}}function P(e){return(0,k.createElement)(T,s({ref:u([`s`]).ref,title:`Apply
-(ctrl+s)`},e))}var F={boolean:{field:{comp:w},column:{renderCell:({value:e})=>e&&(0,k.createElement)(x)}},dateTime:{field:{comp:r},column:{minWidth:96,flex:.5,renderCell:({value:e})=>h(e)}}};export{N as t};

package/admin/assets/ConfigFilePage-Dw0-gus3.js

@@ -1,4 +0,0 @@
-import{i as e}from"./rolldown-runtime-CacB07dV.js";import{Bn as t,C as n,Jt as r,N as i,Nt as a,Pa as o,S as s,_ as c,ai as l,jt as u,lr as d,pt as f,qt as p,tt as m,vi as h,vt as g,y as _}from"./index-B3difDBD.js";import{K as v,q as y}from"./icons-DR_Rvxtn.js";import{t as b}from"./TextEditor-CDOjRy40.js";var x=e(o());function S(){m.title=`Config file`;let{data:e,reload:o,element:S}=c(`get_config_text`,{}),[C,w]=(0,x.useState)(),[T,E]=(0,x.useState)(),[D,O]=(0,x.useState)(!1);return(0,x.useEffect)(()=>{E(e==null?void 0:e.text),w(e==null?void 0:e.text)},[e]),S||(0,x.createElement)(x.Fragment,{},(0,x.createElement)(s,{flexWrap:`wrap`,justifyContent:`space-between`},(0,x.createElement)(_,{icon:v,onClick:A,disabled:!e},`Export without passwords`),D?(0,x.createElement)(x.Fragment,{},i(o),(0,x.createElement)(n,{icon:g,title:`Save
-(ctrl+enter)`,modified:C!==T,onClick:k}),(0,x.createElement)(h,{severity:`warning`,sx:{minWidth:`10em`}},`Be careful, you can easily break things here`)):(0,x.createElement)(_,{icon:y,variant:`outlined`,onClick(){O(!0),setTimeout(()=>a(`main textarea`),500)}},`Edit`),(0,x.createElement)(l,{sx:{flex:1,minWidth:`fit-content`}},(0,x.createElement)(f,{label:`File path`,value:e==null?void 0:e.fullPath,size:`small`}))),S||C!==void 0&&(0,x.createElement)(l,{sx:{"& pre,& textarea":{wordBreak:`break-all !important`}}},(0,x.createElement)(p,{margin:10},(0,x.createElement)(b,{value:C,disabled:!D,style:{background:`#8881`},onValueChange:w,onKeyDown(e){[`s`,`Enter`].includes(r(e))&&(k(),e.preventDefault())}}))));function k(){return d(`set_config_text`,{text:C}).then(()=>E(C))}function A(){var n;let r=(C||``).replace(/^(\s*(\w*password|_\w*|token|srp|dynamic_dns_url):\s*).+(?:\r?\n|$)/gm,`$1removed
-`).replace(/(:\/\/)[^/@\s]+@/g,`$1removed@`)+t(`custom_html: | # this is currently ignored by hfs, just here for reference
-`,(n=e.customHtml)==null?void 0:n.replace(/^/gm,`  `));r&&u(`config_no_passwords.yaml`,r)}}export{S as default};

package/admin/assets/CustomHtmlPage-CLGyZfZ8.js

@@ -1,2 +0,0 @@
-import{i as e}from"./rolldown-runtime-CacB07dV.js";import{A as t,Bn as n,C as r,Cn as i,Da as a,Ea as o,H as s,I as c,Ma as l,N as u,Pa as d,_ as f,ai as p,fr as m,gt as h,ir as g,it as _,lr as v,na as y,or as b,tt as x,vi as S,vt as C,xr as w,z as T,zt as E}from"./index-B3difDBD.js";import{t as D}from"./TextEditor-CDOjRy40.js";var O=e(m()),k=e(d());a();function A(e,t,n){return(0,k.createElement)(j,o({checked:e||!1,onChange(e,n){t(n)},disabled:e===void 0},n))}var j=y(w)(({theme:e,size:t})=>{let n=t&&t===`small`;return{height:n?36:48,width:n?18:26,padding:5,"& .MuiSwitch-switchBase":{margin:1,padding:0,transform:`translateY(${n?16:22}px)`,"&.Mui-checked":{color:e.palette.primary.contrastText,transform:`translateY(2px)`,"& .MuiSwitch-thumb:before":{backgroundImage:`url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="${n?14:20}" width="20" viewBox="0 0 20 20"><path fill="${encodeURIComponent(e.palette.primary.contrastText)}" d="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z"/></svg>')`},"& + .MuiSwitch-track":{backgroundColor:e.palette.grey[500]}}},"& .Mui-checked .MuiSwitch-thumb":{backgroundColor:e.palette.primary.main,boxShadow:`0px 2px 1px 1px rgba(0, 0, 0, 0.2), 0px 1px 1px 0px rgba(0, 0, 0, 0.14), 0px 1px 3px 0px rgba(0, 0, 0, 0.12)`},"& .MuiSwitch-thumb":{width:n?16:24,height:n?16:24,backgroundColor:e.palette.grey[700],"&::before":{content:`''`,position:`absolute`,width:`85%`,height:`85%`,left:0,top:0,backgroundRepeat:`no-repeat`,backgroundPosition:`center`,backgroundImage:`url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="${n?14:20}" width="20" viewBox="0 0 20 20"><path fill="${encodeURIComponent(e.palette.primary.contrastText)}" d="M19,13H5V11H19V13Z"/></svg>')`}},"& .MuiSwitch-track":{backgroundColor:e.palette.grey[500],borderRadius:20/2}}});a();var M={top:`Top of HTML Body`,bottom:`Bottom of HTML Body`};function N({setTitleSide:e}){let{data:a,reload:d,element:m}=f(`get_custom_html`),{customHtmlSection:y}=_(),[w,j]=(0,k.useState)({}),[N,P]=(0,k.useState)({});(0,k.useEffect)(()=>{a&&(P(a.sections),j(a.sections),R(a.enabled))},[a]);let F=(0,k.useMemo)(()=>{let e=O.default.sortBy(Object.keys(w),i);return e.length&&!e.includes(y)&&(x.customHtmlSection=O.default.findKey(w,Boolean)||(e==null?void 0:e[0])||``),e.map(e=>{var t;return{value:e,label:(M[e]||n(`HTTP `,b[e])||O.default.startCase(e))+((t=w[e])!=null&&t.trim()?` *`:``)}})},[w]),I=(0,k.useMemo)(()=>!O.default.isEqualWith(N,w,(e,t)=>!e&&!t||void 0),[N,w]),[L,R]=(0,k.useState)();e((0,k.useMemo)(()=>(0,k.createElement)(p,{sx:{display:{xs:`none`,md:`block`}}},(0,k.createElement)(S,{severity:`info`},E("Add HTML code to some parts of the Front-end. It's saved to file `custom.html`, that you can edit directly with your editor of choice. "),T(`customization`,`More help`)),(0,k.createElement)(S,{severity:`info`},`To customize icons `,T(`customization#icons`,`read documentation`))),[]));let z=c([`s`,`Enter`]);return m||(0,k.createElement)(k.Fragment,{},(0,k.createElement)(p,{sx:{display:`flex`,alignItems:`center`,gap:1,mb:1}},(0,k.createElement)(h,{label:`Section`,value:y,options:F,onChange:e=>x.customHtmlSection=e}),u(d),(0,k.createElement)(r,{ref:z.ref,icon:C,title:`Save
-(ctrl+s)`,modified:I,doneAnimation:!0,onClick:B}),t(`Enable all sections`,void 0,A(L,function(){var e=l(function*(e){try{yield v(`set_config`,{values:{[g.disable_custom_html]:!e}}),R(e)}catch(e){s(e)}});return function(t){return e.apply(this,arguments)}}()))),(0,k.createElement)(D,{lang:y===`style`?`css`:y===`script`?`js`:`html`,value:(w==null?void 0:w[y])||``,style:{background:`#8881`},onValueChange(e){j(t=>o(o({},t),{},{[y]:e}))}}));function B(){return v(`set_custom_html`,{sections:w}).then(()=>P(w))}}export{N as default};