hfs 3.1.0-beta4 → 3.1.0-beta5

package/src/langs/hfs-lang-vi.json

@@ -154,7 +154,7 @@
         "Repeat": "Lặp",
         "showHelpListShortcut": "Ở danh sách file, giữ {key} để hiển thị",
         "Invalid value": "🤷 what u think something in ur freakin' brain?",
-        "upload_skipped": "{n} đã bỏ qua",
+        "upload_interrupted": "{n} Đã huỷ bỏi người dùng!",
         "Overwrite policy": "Chính sách ghi đè:",
         "Rename to avoid overwriting": "Đổi tên, tránh ghi đè file có sẳn",
         "Overwrite existing files": "ĐÈ LUÔN file có sẳn",

package/src/langs/hfs-lang-zh-tw.json

@@ -150,7 +150,7 @@
         "Repeat": "重複播放",
         "showHelpListShortcut": "在檔案清單中，按一下 {key} 即可快速顯示",
         "Invalid value": "無效值",
-        "upload_skipped": "{n} 跳過",
+        "upload_interrupted": "{n} 中止",
         "Overwrite policy": "覆蓋規則",
         "Rename to avoid overwriting": "重新命名以避免覆蓋",
         "Overwrite existing files": "覆蓋已存在的檔案",

package/src/langs/hfs-lang-zh.json

@@ -154,7 +154,7 @@
         "Repeat": "重复",
         "showHelpListShortcut": "在文件列表中，按住 {key} 点击可快速显示",
         "Invalid value": "无效值",
-        "upload_skipped": "{n} 个已跳过",
+        "upload_interrupted": "{n} 中断",
         "Overwrite policy": "覆盖策略",
         "Rename to avoid overwriting": "重命名以避免覆盖",
         "Overwrite existing files": "覆盖已存在的文件",

package/src/listen.js

@@ -67,8 +67,11 @@ const nat_1 = require("./nat");
 const persistence_1 = require("./persistence");
 const argv_1 = require("./argv");
 const consoleLog_1 = require("./consoleLog");
+const first_1 = require("./first");
 let httpSrv;
 let httpsSrv;
+// update relaunch can keep a bridge process alive, so we proactively close listeners here to release ports before the next binary binds
+(0, first_1.onProcessExit)(() => Promise.all([stopServer(httpSrv), stopServer(httpsSrv)]));
 const openBrowserAtStart = (0, config_1.defineConfig)('open_browser_at_start', true);
 exports.baseUrl = (0, config_1.defineConfig)(misc_1.CFG.base_url, '', x => /(?<=\/\/)[^\/]+/.exec(x)?.[0]); // compiled is host only
 async function getBaseUrlOrDefault() {

package/src/throttler.js

@@ -57,7 +57,8 @@ const throttler = async (ctx, next) => {
         if (outSpeed || !closed)
             conn[SymTimeout] = setTimeout(update, DELAY);
     }, DELAY, { leading: true, maxWait: DELAY });
-    ts.on('sent', (n) => {
+    ts.on('sent', async (n) => {
+        await exports.totalSent.ready();
         exports.totalSent.set(x => x + n);
         update();
     });

package/src/update.js

@@ -134,13 +134,16 @@ async function update(tagOrUrl = '') {
     }
     if (url) {
         console.log("downloading", url);
+        const temp = LOCAL_UPDATE + '-temp';
+        await (0, promises_1.rm)(temp, { force: true });
         try {
-            await (0, promises_1.writeFile)(LOCAL_UPDATE, await (0, misc_1.httpStream)(url));
+            await (0, promises_1.writeFile)(temp, await (0, misc_1.httpStream)(url));
         }
         catch (e) {
-            await (0, promises_1.rm)(LOCAL_UPDATE).catch(() => { }); // no leftovers
+            await (0, promises_1.rm)(temp).catch(() => { }); // no leftovers
             throw "Download failed for " + url + (0, misc_1.prefix)(' – ', e?.message);
         }
+        await (0, promises_1.rename)(temp, LOCAL_UPDATE);
         console.debug("download finished");
     }
     const bin = process.execPath;

package/src/util-os.js

@@ -84,15 +84,39 @@ async function getWindowsServicePids() {
     const no = parsed?.[1]?.[2];
     return Object.fromEntries(parsed.slice(2).filter(x => x[2] !== no).map(x => [x[1], x[2]]));
 }
-exports.RUNNING_AS_SERVICE = const_1.IS_WINDOWS && getWindowsServicePids().then(x => {
-    const ret = x[node_process_1.pid] || x[node_process_1.ppid];
+exports.RUNNING_AS_SERVICE = detectRunningAsService().then(ret => {
     if (ret)
         console.log("running as service", ret);
     return ret;
 }, e => {
     console.log("couldn't determine if we are running as a service");
     console.debug(e);
+    return false;
 });
+async function detectRunningAsService() {
+    if (const_1.IS_WINDOWS)
+        return getWindowsServicePids().then(x => x[node_process_1.pid] || x[node_process_1.ppid]);
+    if (process.platform === 'linux') {
+        // interactive shells live in session-*.scope; only a leaf *.service means this process is actually inside a service unit
+        const systemdFromCgroup = await (0, promises_1.readFile)('/proc/self/cgroup', 'utf8').then(cgroup => cgroup.split('\n')
+            // cgroup v1 uses single-colon fields while v2 uses double-colon; taking the last colon-separated field covers both
+            .map(line => line.split(':').pop()?.split('/').pop() || '')
+            .find(unit => unit.endsWith('.service')));
+        if (systemdFromCgroup)
+            return systemdFromCgroup;
+        // keep env markers as a last fallback only for non-interactive runs, to avoid false positives in normal terminal sessions
+        if (!process.stdin.isTTY && !process.stdout.isTTY && (process.env.INVOCATION_ID || process.env.JOURNAL_STREAM || process.env.NOTIFY_SOCKET || process.env.SYSTEMD_EXEC_PID))
+            return process.env.INVOCATION_ID || process.env.SYSTEMD_EXEC_PID || 'systemd';
+        return false;
+    }
+    // launchd services expose LAUNCH_JOB_NAME and run detached from interactive ttys
+    if (!const_1.IS_MAC || process.stdin.isTTY || process.stdout.isTTY)
+        return false;
+    const launchdService = process.env.LAUNCH_JOB_NAME || false;
+    if (launchdService)
+        return launchdService;
+    return false;
+}
 function reg(...pars) {
     return (0, util_1.promisify)(child_process_1.execFile)('reg', pars).then(x => x.stdout);
 }

package/src/webdav.js

@@ -213,8 +213,8 @@ async function handledWebdav(ctx) {
             return `<?xml version="1.0" encoding="utf-8"?><prop xmlns="DAV:"><lockdiscovery><activelock>
                 <locktype><write/></locktype>
                 <lockscope><exclusive/></lockscope>
-                <locktoken><href>${token}</href></locktoken>
-                <lockroot><href>${path}</href></lockroot>
+                <locktoken><href>${lodash_1.default.escape(token)}</href></locktoken>
+                <lockroot><href>${lodash_1.default.escape(path)}</href></lockroot>
                 <depth>0</depth>
                 <timeout>Second-${seconds}</timeout>
             </activelock></lockdiscovery></prop>`;
@@ -254,7 +254,7 @@ async function handledWebdav(ctx) {
             const isDir = await (0, vfs_1.nodeIsFolder)(node);
             const st = await (0, vfs_1.nodeStats)(node);
             res.write(`<response>
-              <href>${outPath + (append ? (0, cross_1.pathEncode)(name, true) + (isDir ? '/' : '') : '')}</href>
+              <href>${lodash_1.default.escape(outPath + (append ? (0, cross_1.pathEncode)(name, true) + (isDir ? '/' : '') : ''))}</href>
               <propstat>
                 <status>HTTP/1.1 200 OK</status>
                 <prop>