hfs 0.55.1 → 0.55.2

package/frontend/assets/{sha512-legacy-CP10jckG.js → sha512-legacy-HnxdKRIz.js}

@@ -1,4 +1,4 @@
-System.register(["./index-legacy-BoMy1vEB.js"],(function(h,t){"use strict";var i,s;return{setters:[function(h){i=h.g,s=h.c}],execute:function(){function t(h,t){for(var i=function(){var i=t[s];if("string"!=typeof i&&!Array.isArray(i)){var r=function(t){if("default"!==t&&!(t in h)){var s=Object.getOwnPropertyDescriptor(i,t);s&&Object.defineProperty(h,t,s.get?s:{enumerable:!0,get:function(){return i[t]}})}};for(var e in i)r(e)}},s=0;s<t.length;s++)i();return Object.freeze(Object.defineProperty(h,Symbol.toStringTag,{value:"Module"}))}var r={exports:{}};
+System.register(["./index-legacy-BFUS5Ol_.js"],(function(h,t){"use strict";var i,s;return{setters:[function(h){i=h.g,s=h.c}],execute:function(){function t(h,t){for(var i=function(){var i=t[s];if("string"!=typeof i&&!Array.isArray(i)){var r=function(t){if("default"!==t&&!(t in h)){var s=Object.getOwnPropertyDescriptor(i,t);s&&Object.defineProperty(h,t,s.get?s:{enumerable:!0,get:function(){return i[t]}})}};for(var e in i)r(e)}},s=0;s<t.length;s++)i();return Object.freeze(Object.defineProperty(h,Symbol.toStringTag,{value:"Module"}))}var r={exports:{}};
 /*
        * [js-sha512]{@link https://github.com/emn178/js-sha512}
        *

package/frontend/index.html

@@ -22,6 +22,6 @@
         document.getElementById('root').innerHTML = 'Loading...'
     </script>
     <script crossorigin id="vite-legacy-polyfill" src="/assets/polyfills-legacy-DMrMt_pQ.js"></script>
-    <script crossorigin id="vite-legacy-entry" data-src="/assets/index-legacy-BoMy1vEB.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script crossorigin id="vite-legacy-entry" data-src="/assets/index-legacy-BFUS5Ol_.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hfs",
-  "version": "0.55.1",
+  "version": "0.55.2",
   "description": "HTTP File Server",
   "keywords": ["file server", "http server"],
   "homepage": "https://rejetto.com/hfs",

package/src/argv.js

@@ -0,0 +1,8 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.argv = void 0;
+const minimist_1 = __importDefault(require("minimist"));
+exports.argv = (0, minimist_1.default)(process.argv.slice(2));

package/src/commands.js

@@ -17,7 +17,8 @@ const fileAttr_1 = require("./fileAttr");
 const github_1 = require("./github");
 const cross_1 = require("./cross");
 const api_monitor_1 = __importDefault(require("./api.monitor"));
-if (!const_1.argv.updating)
+const argv_1 = require("./argv");
+if (!argv_1.argv.updating)
     try {
         /*
         is this try-block useful in case the stdin is unavailable?

package/src/config.js

@@ -38,12 +38,13 @@ const path_1 = require("path");
 const events_1 = __importDefault(require("./events"));
 const promises_1 = require("fs/promises");
 const immer_1 = __importStar(require("immer"));
+const argv_1 = require("./argv");
 (0, immer_1.setAutoFreeze)(false); // we still want to mess with objects later (eg: account.belongs)
 // keep definition of config properties
 const configProps = {};
 let started = false; // this will tell the difference for subscribeConfig()s that are called before or after config is loaded
 let state = {}; // current state of config properties
-const filePath = (0, misc_1.with_)(const_1.argv.config || process.env.HFS_CONFIG, p => {
+const filePath = (0, misc_1.with_)(argv_1.argv.config || process.env.HFS_CONFIG, p => {
     if (!p)
         return const_1.CONFIG_FILE;
     p = (0, path_1.resolve)(const_1.ORIGINAL_CWD, p);
@@ -139,7 +140,7 @@ function setConfig(newCfg, save) {
     const version = lodash_1.default.isString(newCfg.version) ? new Version(newCfg.version) : undefined;
     const considerEnvs = !process.env['HFS_ENV_BOOTSTRAP'] || !started && lodash_1.default.isEmpty(newCfg);
     // first time we consider also CLI args
-    const argCfg = !started && lodash_1.default.pickBy((0, misc_1.newObj)(configProps, (x, k) => { var _a; return (_a = const_1.argv[k]) !== null && _a !== void 0 ? _a : (0, misc_1.tryJson)(considerEnvs ? process.env['HFS_' + k.toUpperCase().replaceAll('-', '_')] : '', lodash_1.default.identity); }), x => x !== undefined);
+    const argCfg = !started && lodash_1.default.pickBy((0, misc_1.newObj)(configProps, (x, k) => { var _a; return (_a = argv_1.argv[k]) !== null && _a !== void 0 ? _a : (0, misc_1.tryJson)(considerEnvs ? process.env['HFS_' + k.toUpperCase().replaceAll('-', '_')] : '', lodash_1.default.identity); }), x => x !== undefined);
     if (!lodash_1.default.isEmpty(argCfg)) {
         (0, exports.saveConfigAsap)(); // don't set `save` argument, as it would interfere below at check `save===false`
         Object.assign(newCfg, argCfg);
@@ -196,10 +197,6 @@ const saveDebounced = (0, misc_1.debounceAsync)(async () => {
     const aWeekAgo = Date.now() - misc_1.DAY * 7;
     if (await (0, promises_1.stat)(bak).then(x => aWeekAgo > Number(x.mtime || x.ctime), () => true))
         await (0, promises_1.copyFile)(filePath, bak).catch(() => { }); // ignore errors
-    if (lodash_1.default.isEmpty(state)) {
-        console.error('saving empty config');
-        debugger;
-    }
     await exports.configFile.save(stringify({ ...state, version: const_1.VERSION }))
         .catch(err => console.error('Failed at saving config file, please ensure it is writable.', String(err)));
 });

package/src/consoleLog.js

@@ -7,9 +7,9 @@ exports.consoleLog = void 0;
 const events_1 = __importDefault(require("./events"));
 const cross_1 = require("./cross");
 const fs_1 = require("fs");
-const const_1 = require("./const");
+const argv_1 = require("./argv");
 exports.consoleLog = [];
-const f = const_1.argv.consoleFile ? (0, fs_1.createWriteStream)(const_1.argv.consoleFile, 'utf-8') : null;
+const f = argv_1.argv.consoleFile ? (0, fs_1.createWriteStream)(argv_1.argv.consoleFile, 'utf-8') : null;
 for (const k of ['log', 'warn', 'error']) {
     const original = console[k];
     console[k] = (...args) => {

package/src/const.js

@@ -30,31 +30,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CONFIG_FILE = exports.MIME_AUTO = exports.APP_PATH = exports.IS_BINARY = exports.IS_MAC = exports.IS_WINDOWS = exports.HFS_REPO_BRANCH = exports.RUNNING_BETA = exports.VERSION = exports.BUILD_TIMESTAMP = exports.HFS_STARTED = exports.ORIGINAL_CWD = exports.DEV = exports.ARGS_FILE = exports.argv = exports.COMPATIBLE_API_VERSION = exports.API_VERSION = void 0;
+exports.CONFIG_FILE = exports.MIME_AUTO = exports.APP_PATH = exports.IS_BINARY = exports.IS_MAC = exports.IS_WINDOWS = exports.HFS_REPO_BRANCH = exports.RUNNING_BETA = exports.VERSION = exports.BUILD_TIMESTAMP = exports.HFS_STARTED = exports.ORIGINAL_CWD = exports.DEV = exports.ARGS_FILE = exports.COMPATIBLE_API_VERSION = exports.API_VERSION = void 0;
 const minimist_1 = __importDefault(require("minimist"));
 const fs = __importStar(require("fs"));
 const os_1 = require("os");
 const lodash_1 = __importDefault(require("lodash"));
 const path_1 = require("path");
 const cross_1 = require("./cross");
+const argv_1 = require("./argv");
 __exportStar(require("./cross-const"), exports);
 exports.API_VERSION = 10.3;
 exports.COMPATIBLE_API_VERSION = 1; // while changes in the api are not breaking, this number stays the same, otherwise it is made equal to API_VERSION
-exports.argv = (0, minimist_1.default)(process.argv.slice(2));
 // you can add arguments with this file, currently used for the update process on mac/linux
 exports.ARGS_FILE = (0, path_1.join)((0, os_1.homedir)(), 'hfs-args');
 try {
     const s = fs.readFileSync(exports.ARGS_FILE, 'utf-8');
     console.log('additional arguments', s);
-    lodash_1.default.defaults(exports.argv, (0, minimist_1.default)(JSON.parse(s)));
+    lodash_1.default.defaults(argv_1.argv, (0, minimist_1.default)(JSON.parse(s)));
     fs.unlinkSync(exports.ARGS_FILE);
 }
 catch (_a) { }
-exports.DEV = process.env.DEV || exports.argv.dev ? 'DEV' : '';
+exports.DEV = process.env.DEV || argv_1.argv.dev ? 'DEV' : '';
 exports.ORIGINAL_CWD = process.cwd();
 exports.HFS_STARTED = new Date();
 const PKG_PATH = (0, path_1.join)(__dirname, '..', 'package.json');
-exports.BUILD_TIMESTAMP = "2025-01-01T17:07:20.752Z";
+exports.BUILD_TIMESTAMP = "2025-01-05T19:25:48.693Z";
 const pkg = JSON.parse(fs.readFileSync(PKG_PATH, 'utf8'));
 exports.VERSION = pkg.version;
 exports.RUNNING_BETA = exports.VERSION.includes('-');
@@ -75,12 +75,12 @@ console.log(`© Massimo Melina <a@rejetto.com> - License https://www.gnu.org/lic
 console.log('started', (0, cross_1.formatTimestamp)(exports.HFS_STARTED), exports.DEV);
 console.log('version', exports.VERSION || '-');
 console.log('build', exports.BUILD_TIMESTAMP || '-');
-console.debug('arguments', exports.argv);
+console.debug('arguments', argv_1.argv);
 // still considering whether to use ".hfs" with Windows users, who may be less accustomed to it
-const dir = exports.argv.cwd || useHomeDir() && (0, path_1.join)((0, os_1.homedir)(), '.hfs');
+const dir = argv_1.argv.cwd || useHomeDir() && (0, path_1.join)((0, os_1.homedir)(), '.hfs');
 if (dir) {
     try {
-        fs.mkdirSync(dir);
+        fs.mkdirSync(dir, { recursive: true });
     }
     catch (e) {
         if (e.code !== 'EEXIST')
@@ -88,6 +88,8 @@ if (dir) {
     }
     process.chdir(dir);
 }
+else if (process.cwd().startsWith(process.env.windir + '\\')) // this happens if you run hfs from task scheduler
+    process.chdir(exports.APP_PATH);
 console.log('working directory (cwd)', process.cwd());
 if (exports.APP_PATH !== process.cwd())
     console.log('app', exports.APP_PATH);

package/src/cross-const.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HTTP_MESSAGES = exports.HTTP_SERVICE_UNAVAILABLE = exports.HTTP_SERVER_ERROR = exports.HTTP_TOO_MANY_REQUESTS = exports.HTTP_FAILED_DEPENDENCY = exports.HTTP_FOOL = exports.HTTP_RANGE_NOT_SATISFIABLE = exports.HTTP_PAYLOAD_TOO_LARGE = exports.HTTP_PRECONDITION_FAILED = exports.HTTP_CONFLICT = exports.HTTP_NOT_ACCEPTABLE = exports.HTTP_METHOD_NOT_ALLOWED = exports.HTTP_NOT_FOUND = exports.HTTP_FORBIDDEN = exports.HTTP_UNAUTHORIZED = exports.HTTP_BAD_REQUEST = exports.HTTP_NOT_MODIFIED = exports.HTTP_TEMPORARY_REDIRECT = exports.HTTP_MOVED_PERMANENTLY = exports.HTTP_PARTIAL_CONTENT = exports.HTTP_NO_CONTENT = exports.HTTP_OK = exports.HFS_REPO = exports.PLUGIN_CUSTOM_REST_PREFIX = exports.NBSP = exports.PORT_DISABLED = exports.PLUGINS_PUB_URI = exports.API_URI = exports.ADMIN_URI = exports.FRONTEND_URI = exports.SPECIAL_URI = void 0;
+exports.HTTP_MESSAGES = exports.HTTP_SERVICE_UNAVAILABLE = exports.HTTP_SERVER_ERROR = exports.HTTP_TOO_MANY_REQUESTS = exports.HTTP_FAILED_DEPENDENCY = exports.HTTP_FOOL = exports.HTTP_RANGE_NOT_SATISFIABLE = exports.HTTP_PAYLOAD_TOO_LARGE = exports.HTTP_PRECONDITION_FAILED = exports.HTTP_CONFLICT = exports.HTTP_NOT_ACCEPTABLE = exports.HTTP_METHOD_NOT_ALLOWED = exports.HTTP_NOT_FOUND = exports.HTTP_FORBIDDEN = exports.HTTP_UNAUTHORIZED = exports.HTTP_BAD_REQUEST = exports.HTTP_NOT_MODIFIED = exports.HTTP_TEMPORARY_REDIRECT = exports.HTTP_MOVED_PERMANENTLY = exports.HTTP_PARTIAL_CONTENT = exports.HTTP_NO_CONTENT = exports.HTTP_OK = exports.UPLOAD_STATUS = exports.UPLOAD_RESUMABLE = exports.HFS_REPO = exports.PLUGIN_CUSTOM_REST_PREFIX = exports.NBSP = exports.PORT_DISABLED = exports.PLUGINS_PUB_URI = exports.API_URI = exports.ADMIN_URI = exports.FRONTEND_URI = exports.SPECIAL_URI = void 0;
 exports.SPECIAL_URI = '/~/';
 exports.FRONTEND_URI = exports.SPECIAL_URI + 'frontend/';
 exports.ADMIN_URI = exports.SPECIAL_URI + 'admin/';
@@ -10,6 +10,8 @@ exports.PORT_DISABLED = -1;
 exports.NBSP = '\xA0';
 exports.PLUGIN_CUSTOM_REST_PREFIX = '_';
 exports.HFS_REPO = 'rejetto/hfs';
+exports.UPLOAD_RESUMABLE = 'upload.resumable';
+exports.UPLOAD_STATUS = 'upload.status';
 exports.HTTP_OK = 200;
 exports.HTTP_NO_CONTENT = 204;
 exports.HTTP_PARTIAL_CONTENT = 206;

package/src/cross.js

@@ -534,22 +534,3 @@ const BROWSERS = {
     Xbox: /xbox/i,
     UC: /UCBrowser/i,
 };
-Object.defineProperties(Object.prototype, {
-    _L: {
-        enumerable: false,
-        writable: true,
-        value(msg = '') {
-            const val = this instanceof Number || this instanceof String || this instanceof Boolean ? this.valueOf() : this;
-            console.log('**', msg, val);
-            return val;
-        }
-    },
-    _D: {
-        enumerable: false,
-        writable: true,
-        value(msg = '') {
-            debugger;
-            return this._L(msg);
-        }
-    }
-});

package/src/github.js

@@ -15,6 +15,7 @@ const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const fs_1 = require("fs");
 const persistence_1 = require("./persistence");
+const argv_1 = require("./argv");
 const DIST_ROOT = 'dist';
 exports.downloading = {};
 function downloadProgress(repo, status) {
@@ -236,7 +237,7 @@ exports.blacklistedInstalledPlugins = [];
 // centralized hosted information, to be used as little as possible
 const FN = 'central.json';
 let builtIn = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(__dirname, '..', FN), 'utf8'));
-exports.getProjectInfo = (0, misc_1.debounceAsync)(() => const_1.argv.central === false ? Promise.resolve(builtIn) : readGithubFile(`${const_1.HFS_REPO}/${const_1.HFS_REPO_BRANCH}/${FN}`)
+exports.getProjectInfo = (0, misc_1.debounceAsync)(() => argv_1.argv.central === false ? Promise.resolve(builtIn) : readGithubFile(`${const_1.HFS_REPO}/${const_1.HFS_REPO_BRANCH}/${FN}`)
     .then(JSON.parse, () => null)
     .then(o => {
     if (o)

package/src/i18n.js

@@ -40,6 +40,8 @@ function i18nFromTranslations(translations, embedded = 'en') {
                 for (const lang of searchLangs)
                     if (found = (_b = (_a = state.translations[selectedLang = lang]) === null || _a === void 0 ? void 0 : _a.translate) === null || _b === void 0 ? void 0 : _b[key])
                         break;
+                if (found)
+                    break;
                 if (!warns.has(key) && langs.length && langs[0] !== embedded) {
                     warns.add(key);
                     console.debug("miss i18n:", key);

package/src/listen.js

@@ -46,6 +46,7 @@ const events_1 = __importDefault(require("./events"));
 const net_1 = require("net");
 const nat_1 = require("./nat");
 const persistence_1 = require("./persistence");
+const argv_1 = require("./argv");
 let httpSrv;
 let httpsSrv;
 const openBrowserAtStart = (0, config_1.defineConfig)('open_browser_at_start', !const_1.DEV);
@@ -75,7 +76,7 @@ const considerHttp = (0, misc_1.debounceAsync)(async () => {
             return;
     httpSrv.on('connection', connections_1.newConnection);
     printUrls(httpSrv.name);
-    if (openBrowserAtStart.get() && !const_1.argv.updated)
+    if (openBrowserAtStart.get() && !argv_1.argv.updated)
         openAdmin();
 });
 exports.portCfg = (0, config_1.defineConfig)('port', 80);

package/src/serveGuiAndSharedFiles.js

@@ -54,6 +54,7 @@ const serveGuiAndSharedFiles = async (ctx, next) => {
                 ctx.status = cross_const_1.HTTP_SERVER_ERROR;
                 ctx.body = err.message || String(err);
             });
+            ctx.req.on('close', () => dest.end());
             const uri = await dest.lockMiddleware; // we need to wait more than just the stream
             ctx.body = { uri };
         }

package/src/update.js

@@ -19,6 +19,7 @@ const util_os_1 = require("./util-os");
 const first_1 = require("./first");
 const persistence_1 = require("./persistence");
 const lodash_1 = __importDefault(require("lodash"));
+const argv_1 = require("./argv");
 const updateToBeta = (0, config_1.defineConfig)('update_to_beta', false);
 const autoCheckUpdate = (0, config_1.defineConfig)('auto_check_update', true);
 const lastCheckUpdate = persistence_1.storedMap.singleSync('lastCheckUpdate', 0);
@@ -92,7 +93,7 @@ function localUpdateAvailable() {
 }
 exports.localUpdateAvailable = localUpdateAvailable;
 async function updateSupported() {
-    return const_1.argv.forceupdate || const_1.IS_BINARY && !await util_os_1.RUNNING_AS_SERVICE;
+    return argv_1.argv.forceupdate || const_1.IS_BINARY && !await util_os_1.RUNNING_AS_SERVICE;
 }
 exports.updateSupported = updateSupported;
 async function update(tagOrUrl = '') {
@@ -170,12 +171,12 @@ exports.update = update;
 function launch(cmd, pars = [], options) {
     return ((options === null || options === void 0 ? void 0 : options.sync) ? child_process_1.spawnSync : child_process_1.spawn)((0, util_os_1.cmdEscape)(cmd), pars, { detached: true, shell: true, stdio: [0, 1, 2], ...options });
 }
-if (const_1.argv.updating) { // we were launched with a temporary name, restore original name to avoid breaking references
+if (argv_1.argv.updating) { // we were launched with a temporary name, restore original name to avoid breaking references
     const bin = process.execPath;
-    const dest = (0, path_1.join)((0, path_1.dirname)(bin), const_1.argv.updating);
+    const dest = (0, path_1.join)((0, path_1.dirname)(bin), argv_1.argv.updating);
     (0, fs_1.renameSync)(bin, dest);
     // have to relaunch with new name, or otherwise next update will fail with EBUSY on hfs.exe
-    console.log("renamed binary file to", const_1.argv.updating, "and restarting");
+    console.log("renamed binary file to", argv_1.argv.updating, "and restarting");
     // be sure to test launching both double-clicking and in a terminal
     if (const_1.IS_WINDOWS) // this method on Mac works only once, and without console
         (0, first_1.onProcessExit)(() => launch(dest, ['--updated', '--cwd .'])); // launch+sync here would cause old process to stay open, locking ports

package/src/upload.js

@@ -37,7 +37,7 @@ function setUploadMeta(path, ctx) {
 }
 // stay sync because we use this function with formidable()
 const diskSpaceCache = (0, expiringCache_1.expiringCache)(3000); // invalidate shortly
-const openFiles = new Set();
+const uploadingFiles = new Set();
 function uploadWriter(base, baseUri, path, ctx) {
     let fullPath = '';
     if ((0, misc_1.dirTraversal)(path))
@@ -78,12 +78,12 @@ function uploadWriter(base, baseUri, path, ctx) {
         catch (e) { // warn, but let it through
             console.warn("can't check disk size:", e.message || String(e));
         }
-    if (openFiles.has(fullPath))
-        return fail(const_1.HTTP_CONFLICT, 'uploading');
     // optionally 'skip'
     if (ctx.query.existing === 'skip' && fs_1.default.existsSync(fullPath))
         return fail(const_1.HTTP_CONFLICT, 'exists');
-    openFiles.add(fullPath);
+    if (uploadingFiles.has(fullPath))
+        return fail(const_1.HTTP_CONFLICT, 'uploading');
+    uploadingFiles.add(fullPath);
     let overwriteRequestedButForbidden = false;
     try {
         // if upload creates a folder, then add meta to it too
@@ -91,38 +91,42 @@ function uploadWriter(base, baseUri, path, ctx) {
             setUploadMeta(dir, ctx);
         // use temporary name while uploading
         const keepName = (0, path_1.basename)(fullPath).slice(-200);
-        let tempName = (0, path_1.join)(dir, 'hfs$upload-' + keepName);
-        const resumable = fs_1.default.existsSync(tempName) && !openFiles.has(tempName) && tempName; // resumable is temp-file-1
-        if (resumable)
-            tempName = (0, path_1.join)(dir, 'hfs$upload2-' + keepName);
+        const firstTempName = (0, path_1.join)(dir, 'hfs$upload-' + keepName);
+        const altTempName = (0, path_1.join)(dir, 'hfs$upload2-' + keepName);
+        const splitAndPreserving = ctx.query.preserveTempFile; // frontend knows about existing temp that can be resumed, but it is not resuming that, but instead it is continuing split-uploading on alternative temp file
+        let tempName = splitAndPreserving ? altTempName : firstTempName;
+        const stats = (0, misc_1.try_)(() => fs_1.default.statSync(tempName));
+        const resumableSize = (stats === null || stats === void 0 ? void 0 : stats.size) || 0; // we use size to even when user has not required resume, yet, to notify frontend of the possibility
+        const resumableTempName = resumableSize > 0 && tempName;
+        if (resumableTempName)
+            tempName = altTempName;
         // checks for resume feature
         let resume = Number(ctx.query.resume);
-        const size = resumable && (0, misc_1.try_)(() => fs_1.default.statSync(resumable).size);
-        if (size === undefined) // stat failed
-            return fail(const_1.HTTP_SERVER_ERROR);
-        if (lodash_1.default.isNumber(size) && resume > size)
+        if (resume > resumableSize)
             return fail(const_1.HTTP_RANGE_NOT_SATISFIABLE);
         // warn frontend about resume possibility
         let resumableLost = false;
-        if (!resume && resumable) {
+        if (!resume && !resumableTempName)
+            (0, frontEndApis_1.notifyClient)(ctx, const_1.UPLOAD_RESUMABLE, { [path]: 0 });
+        if (!resume && resumableTempName) {
             const timeout = 30;
-            (0, frontEndApis_1.notifyClient)(ctx, 'upload.resumable', { [path]: size, expires: Date.now() + timeout * 1000 });
-            delayedDelete(resumable, timeout, () => // if user resumes, this upload is interrupted, and next upload will cancel this delayedDelete
-             fs_1.default.rename(tempName, resumable, err => {
+            (0, frontEndApis_1.notifyClient)(ctx, const_1.UPLOAD_RESUMABLE, { [path]: resumableSize, expires: Date.now() + timeout * 1000 });
+            delayedDelete(resumableTempName, timeout, () => // if user resumes, this upload is interrupted, and next upload will cancel this delayedDelete
+             fs_1.default.rename(tempName, resumableTempName, err => {
                 if (err)
                     return;
-                tempName = resumable;
+                tempName = resumableTempName;
                 resumableLost = true;
             }));
         }
         // append if resuming
-        const resuming = resume && resumable;
+        const resuming = resume && resumableTempName;
         if (!resuming)
             resume = 0;
         const writeStream = (0, misc_1.createStreamLimiter)(reqSize !== null && reqSize !== void 0 ? reqSize : Infinity);
-        if (resuming) {
+        if (resuming && !splitAndPreserving) {
             fs_1.default.rm(tempName, () => { });
-            tempName = resumable;
+            tempName = resumableTempName;
         }
         cancelDeletion(tempName);
         ctx.state.uploadDestinationPath = tempName;
@@ -131,7 +135,7 @@ function uploadWriter(base, baseUri, path, ctx) {
         const resEvent = events_1.default.emit('uploadStart', obj);
         if (resEvent === null || resEvent === void 0 ? void 0 : resEvent.isDefaultPrevented())
             return;
-        const fileStream = resuming ? fs_1.default.createWriteStream(resumable, { flags: 'r+', start: resume })
+        const fileStream = resuming ? fs_1.default.createWriteStream(resumableTempName, { flags: 'r+', start: resume })
             : fs_1.default.createWriteStream(tempName);
         writeStream.on('error', e => {
             releaseFile();
@@ -145,7 +149,7 @@ function uploadWriter(base, baseUri, path, ctx) {
             try {
                 await new Promise(res => fileStream.close(res)); // this only seem to be necessary on Windows
                 if (ctx.req.aborted) {
-                    if (resumable && !resumableLost && !resuming) // we don't want to be left with 2 temp files
+                    if (resumableTempName && !resumableLost && !resuming) // we don't want to be left with 2 temp files
                         return (0, promises_1.rm)(tempName);
                     const sec = exports.deleteUnfinishedUploadsAfter.get();
                     return lodash_1.default.isNumber(sec) && delayedDelete(tempName, sec);
@@ -168,12 +172,14 @@ function uploadWriter(base, baseUri, path, ctx) {
                 try {
                     await (0, promises_1.rename)(tempName, dest);
                     cancelDeletion(tempName); // not necessary, as deletion's failure is silent, but still
+                    if (splitAndPreserving) // we've been using altTempName, but now we're done, so we can delete firstTempName
+                        delayedDelete(firstTempName, 0);
                     ctx.state.uploadDestinationPath = dest;
                     setUploadMeta(dest, ctx);
                     if (ctx.query.comment)
                         void (0, comments_1.setCommentFor)(dest, String(ctx.query.comment));
-                    if (resumable && !resuming) // this happens if user decided to not resume and the new upload finished before delayedDelete
-                        (0, promises_1.rm)(resumable).catch(console.warn);
+                    if (resumableTempName && !resuming) // this happens if user decided to not resume and the new upload finished before delayedDelete
+                        (0, promises_1.rm)(resumableTempName).catch(console.warn);
                     obj.uri = (0, misc_1.enforceFinal)('/', baseUri) + (0, misc_1.pathEncode)((0, path_1.basename)(dest));
                     events_1.default.emit('uploadFinished', obj);
                     if (resEvent)
@@ -236,7 +242,7 @@ function uploadWriter(base, baseUri, path, ctx) {
         delete waitingToBeDeleted[path];
     }
     function releaseFile() {
-        openFiles.delete(fullPath);
+        uploadingFiles.delete(fullPath);
     }
     function fail(status, msg) {
         console.debug('upload failed', status, msg);
@@ -245,7 +251,7 @@ function uploadWriter(base, baseUri, path, ctx) {
             ctx.status = status;
         if (msg)
             ctx.body = msg;
-        (0, frontEndApis_1.notifyClient)(ctx, 'upload.status', { [path]: ctx.status }); // allow browsers to detect failure while still sending body
+        (0, frontEndApis_1.notifyClient)(ctx, const_1.UPLOAD_STATUS, { [path]: ctx.status }); // allow browsers to detect failure while still sending body
     }
 }
 exports.uploadWriter = uploadWriter;