xshell 1.0.40 → 1.0.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xshell",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "type": "module",
   "main": "./index.js",
   "bin": {
@@ -79,7 +79,7 @@
     "strip-ansi": "^7.1.0",
     "through2": "^4.0.2",
     "tough-cookie": "^4.1.3",
-    "tslib": "^2.6.0",
+    "tslib": "^2.6.1",
     "typescript": "^5.1.6",
     "undici": "^5.22.1",
     "vinyl": "^3.0.0",
@@ -100,13 +100,13 @@
     "@types/mime-types": "^2.1.1",
     "@types/node": "^20.4.4",
     "@types/qs": "^6.9.7",
-    "@types/react": "^18.2.15",
+    "@types/react": "^18.2.16",
     "@types/through2": "^2.0.38",
     "@types/tough-cookie": "^4.0.2",
     "@types/vinyl-fs": "^3.0.2",
     "@types/vscode": "^1.80.0",
-    "@typescript-eslint/eslint-plugin": "^6.1.0",
-    "@typescript-eslint/parser": "^6.1.0",
+    "@typescript-eslint/eslint-plugin": "^6.2.0",
+    "@typescript-eslint/parser": "^6.2.0",
     "eslint": "^8.45.0",
     "eslint-plugin-react": "^7.33.0",
     "eslint-plugin-xlint": "^1.0.6"

package/path.js

@@ -4,10 +4,10 @@ export function to_fp(str) {
         return str;
     const fp = str.replaceAll('\\', '/');
     // 转换小写盘符开头的路径
-    if (fp[1] === ':' && 'a' <= fp[0] && fp[0] <= 'z')
-        return fp[0].toUpperCase() + fp.slice(1);
-    else
-        return fp;
+    return fp[1] === ':' && 'a' <= fp[0] && fp[0] <= 'z' ?
+        fp[0].toUpperCase() + fp.slice(1)
+        :
+            fp;
 }
 /** Normalize a string path, reducing '..' and '.' parts.
     When multiple slashes are found, they're replaced by a single one; when the path contains a trailing slash, it is preserved.

package/prototype.browser.d.ts

@@ -78,8 +78,12 @@ declare global {
         space(this: string): string;
         /** 等价于 .endsWith('/') */
         isdir: boolean;
-        /** 以 `/` 分割的路径 */
+        /** 以 `/` 分割的路径，可能以 / 结尾 */
         fp: string;
+        /** 以 `/` 分割的文件夹路径，一定以 / 结尾 */
+        fpd: string;
+        /** 父文件夹路径 (path.dirname)，一定以 `/` 结尾 */
+        fdir: string;
         /** 文件名 (path.basename 的结果), 保留结尾的 /，如:
             - D:/0/aaa.txt -> aaa.txt
             - D:/aaa/ -> aaa/ */

package/prototype.browser.js

@@ -35,6 +35,16 @@ export const brackets = {
     fat: ['【', '】'],
     tortoise_shell: ['〔', '〕'],
 };
+function to_fp(str) {
+    if (!str)
+        return str;
+    const fp = str.replaceAll('\\', '/');
+    // 转换小写盘符开头的路径
+    return fp[1] === ':' && 'a' <= fp[0] && fp[0] <= 'z' ?
+        fp[0].toUpperCase() + fp.slice(1)
+        :
+            fp;
+}
 // ------------------------------------ String.prototype
 Object.defineProperties(String.prototype, {
     ...to_getter_property_descriptors({
@@ -278,14 +288,13 @@ Object.defineProperties(String.prototype, {
             return this.endsWith('/');
         },
         fp() {
+            return to_fp(this);
+        },
+        fpd() {
             if (!this)
                 return this;
-            const fp = this.replaceAll('\\', '/');
-            // 转换小写盘符开头的路径
-            if (fp[1] === ':' && 'a' <= fp[0] && fp[0] <= 'z')
-                return fp[0].toUpperCase() + fp.slice(1);
-            else
-                return fp;
+            const fp = to_fp(this);
+            return fp.endsWith('/') ? fp : `${fp}/`;
         },
         fdir() {
             const fname = (this.endsWith('/') ? this.slice(0, -1) : this).split('/').at(-1);

package/prototype.d.ts

@@ -99,9 +99,11 @@ declare global {
         space(this: string): string;
         /** 等价于 .endsWith('/') */
         isdir: boolean;
-        /** 以 `/` 分割的路径 */
+        /** 以 `/` 分割的路径，可能以 / 结尾 */
         fp: string;
-        /** 父文件夹路径 (path.dirname)，并保证以 `/` 结尾 */
+        /** 以 `/` 分割的文件夹路径，一定以 / 结尾 */
+        fpd: string;
+        /** 父文件夹路径 (path.dirname)，一定以 `/` 结尾 */
         fdir: string;
         /** 文件名 (path.basename 的结果), 保留结尾的 /，如:
             - D:/0/aaa.txt -> aaa.txt

package/prototype.js

@@ -316,6 +316,10 @@ if (!globalThis.my_prototype_defined) {
             fp() {
                 return to_fp(this);
             },
+            fpd() {
+                const fp = to_fp(this);
+                fp.endsWith('/') ? fp : `${fp}/`;
+            },
             fdir() {
                 const fpd = dirname(this);
                 // 有可能 fpd 是 '/'

package/server.js

@@ -14,6 +14,7 @@ import KoaCors from '@koa/cors';
 import KoaCompress from 'koa-compress';
 import { userAgent as KoaUserAgent } from 'koa-useragent';
 // --- my libs
+import { t } from './i18n/instance.js';
 import { request as _request } from './net.js';
 import { stream_to_buffer, inspect, output_width, assert } from './utils.js';
 import { fstat } from './file.js';
@@ -306,11 +307,9 @@ export class Server {
             - absolute?: `false` 使用绝对路径指定发送的文件
             - download?: `undefined` 在 response.headers 中加上 content-disposition: attachment 指示浏览器下载文件 */
     async fsend(ctx, fp, { root, absolute, download, } = {}) {
-        assert(root.isdir);
+        assert(absolute || root?.isdir, t('fsend 必须传 absolute 选项或 root 文件夹'));
         const { request } = ctx;
         let { response } = ctx;
-        if (!absolute && !root)
-            throw new Error('fsend with `!absolute && !root`');
         if (!absolute) {
             if (fp.startsWith(root))
                 fp = fp.slice(root.length);