xshell 1.0.50 → 1.0.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xshell",
-  "version": "1.0.50",
+  "version": "1.0.51",
   "type": "module",
   "main": "./index.js",
   "bin": {

package/server.d.ts

@@ -68,10 +68,7 @@ export declare class Server {
     format_ua(headers: IncomingHttpHeaders | IncomingHttp2Headers): string;
     proxy(ctx: Context, url: string | URL, headers_?: Record<string, string>): Promise<void>;
     static filter_response_headers(headers: Headers): {};
-    try_send(ctx: Context, fp: string, { root, log_404, }: {
-        root: string;
-        log_404?: boolean;
-    }): Promise<boolean>;
+    try_send(ctx: Context, fpd_root: string, fp: string, log_404: boolean): Promise<boolean>;
     /** 将 body 设置为 fp 所指文件的 ReadStream
         检查 fp 是否合法，设置对应的 content-type，支持缓存，支持分块下载
         - ctx: Koa.Context

package/server.js

@@ -308,27 +308,25 @@ export class Server {
                 headers_[key] = value;
         return headers_;
     }
-    async try_send(ctx, fp, { root, log_404, }) {
+    async try_send(ctx, fpd_root, fp, log_404) {
         const { request: { _path, path, method }, response, } = ctx;
-        if (!(typeof response.body === 'undefined') || response.status !== 404)
+        if (response.body !== undefined || response.status !== 404)
             return true;
         if (method !== 'HEAD' && method !== 'GET')
             return false;
-        function _log_404() {
-            let s = `${' '.repeat(11)}    ${method.toLowerCase()} 404: ${path}`;
-            if (_path !== path)
-                s += ` ${_path.bracket()}`;
-            console.log(s.red);
-        }
         try {
-            await this.fsend(ctx, fp, { root });
+            await this.fsend(ctx, fp, { root: fpd_root });
             return true;
         }
         catch (error) {
             if (error.status !== 404)
                 throw error;
-            if (log_404)
-                _log_404();
+            if (log_404) {
+                let s = `${' '.repeat(11)}    ${method.toLowerCase()} 404: ${path}`;
+                if (_path !== path)
+                    s += ` ${_path.bracket()}`;
+                console.log(s.red);
+            }
             return false;
         }
     }

package/utils.browser.d.ts

@@ -51,6 +51,8 @@ export declare class Lock<TResource = void> {
 export declare function pause(milliseconds?: number): Promise<void>;
 /** 字符串字典序比较 */
 export declare function strcmp(l: string, r: string): 0 | 1 | -1;
+export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;
+export declare function invoke<TReturn = any>(obj: any, funcpath: string, args: any[]): TReturn;
 /** 拼接 TypedArrays 生成一个完整的 Uint8Array */
 export declare function concat(arrays: ArrayBufferView[]): Uint8Array;
 /** 时间间隔 (milliseconds) 格式化 */

package/utils.browser.js

@@ -126,6 +126,19 @@ export function strcmp(l, r) {
         return -1;
     return 1;
 }
+export function get(obj, keypath) {
+    let obj_ = obj;
+    for (const key of keypath.split('.'))
+        obj_ = obj_[key];
+    return obj_;
+}
+export function invoke(obj, funcpath, args) {
+    const paths = funcpath.split('.');
+    let obj_ = obj;
+    for (let i = 0; i < paths.length - 1; i++)
+        obj_ = obj_[paths[i]];
+    return obj_[paths.at(-1)].call(obj_, ...args);
+}
 /** 拼接 TypedArrays 生成一个完整的 Uint8Array */
 export function concat(arrays) {
     let length = 0;

package/utils.d.ts

@@ -22,6 +22,8 @@ export declare function unique<T>(iterable: T[] | Iterable<T>, selector?: string
 export declare function sort_keys<T>(obj: T): T;
 /** 字符串字典序比较 */
 export declare function strcmp(l: string, r: string): 0 | 1 | -1;
+export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;
+export declare function invoke<TReturn = any>(obj: any, funcpath: string, args: any[]): TReturn;
 /** 拼接 TypedArrays 生成一个完整的 Uint8Array */
 export declare function concat(arrays: ArrayBufferView[]): Uint8Array;
 export declare function typed_array_to_buffer(view: ArrayBufferView): Buffer;

package/utils.js

@@ -86,6 +86,19 @@ export function strcmp(l, r) {
         return -1;
     return 1;
 }
+export function get(obj, keypath) {
+    let obj_ = obj;
+    for (const key of keypath.split('.'))
+        obj_ = obj_[key];
+    return obj_;
+}
+export function invoke(obj, funcpath, args) {
+    const paths = funcpath.split('.');
+    let obj_ = obj;
+    for (let i = 0; i < paths.length - 1; i++)
+        obj_ = obj_[paths[i]];
+    return obj_[paths.at(-1)].call(obj_, ...args);
+}
 /** 拼接 TypedArrays 生成一个完整的 Uint8Array */
 export function concat(arrays) {
     let length = 0;