xshell 1.3.64 → 1.3.65

package/server.d.ts

@@ -145,7 +145,7 @@ export declare class Server {
             )
             return
         } */
-    try_send(ctx: Context, fp: string, { fpd_root, assets_root, sea: _sea, log_404 }?: {
+    try_send(ctx: Context, fp: string, { fpd_root, assets_root, sea: _sea, log_404, }?: {
         fpd_root?: string;
         assets_root?: string;
         sea?: boolean;
@@ -171,6 +171,7 @@ export declare class Server {
         sea?: boolean;
     }): Promise<string>;
     set_content_type(response: Koa.Response, fext: string): void;
+    set_text(response: Koa.Response, body: string, status?: number): void;
     /** - range: 取值为逗号分割的多个可用端口或端口区间 (不能含有空格，包含区间右值)，比如：`8321,8322,8300-8310,11000-11999
         - reverse?: `false` 在 range 内从后往前尝试 */
     static get_available_port(range: string, reverse?: boolean): Promise<number>;

package/server.js

@@ -13,7 +13,7 @@ import { contentType as get_content_type } from 'mime-types';
 // --- my libs
 import { t } from './i18n/instance.js';
 import { request as _request, Remote, get_socket_ip } from './net.js';
-import { inspect, check, range_to_numbers, encode, filter_keys, filter_values, consume_stream, colored, url_width, defer2 } from './utils.js';
+import { inspect, check, range_to_numbers, encode, filter_keys, filter_values, consume_stream, colored, url_width, defer2, nowstr } from './utils.js';
 import { flist, fread, fstat } from './file.js';
 import { exe_nodejs, sea } from './process.js';
 // ------------ my server
@@ -320,9 +320,7 @@ export class Server {
         catch (error) {
             if (error.status !== 404)
                 console.error(error);
-            response.status = error.status || 500;
-            response.set('content-type', text_plain);
-            response.body = inspect_error(error);
+            this.set_text(response, inspect_error(error), error.status || 500);
         }
     }
     /** 解析 req.body to request.body
@@ -343,8 +341,20 @@ export class Server {
                 req.body;
     }
     async _router(ctx, next) {
-        let { request } = ctx;
-        const _path = request._path = decodeURIComponent(request.path);
+        let { request, response } = ctx;
+        let _path;
+        try {
+            _path = request._path = decodeURIComponent(request.path);
+        }
+        catch (error) {
+            if (error instanceof URIError) {
+                const message = 'url 格式不对';
+                this.set_text(response, message, 400);
+                console.log(`${nowstr()}  ${message}: ${request.path} ${request.ip}／${this.get_client_info(request.headers)}`);
+                return;
+            }
+            throw error;
+        }
         Object.defineProperty(request, 'path', {
             value: _path,
             configurable: true,
@@ -631,9 +641,7 @@ export class Server {
             else {
                 if (this.print.errors)
                     console.log(error);
-                response.status = 500;
-                response.set('content-type', text_plain);
-                response.body = inspect_error(error);
+                this.set_text(response, inspect_error(error), 500);
             }
         }
         return true;
@@ -798,6 +806,12 @@ export class Server {
                     :
                         get_content_type(`file.${fext}`) || 'application/octet-stream'));
     }
+    set_text(response, body, status) {
+        if (status)
+            response.status = status;
+        response.set('content-type', text_plain);
+        response.body = body;
+    }
     /** - range: 取值为逗号分割的多个可用端口或端口区间 (不能含有空格，包含区间右值)，比如：`8321,8322,8300-8310,11000-11999
         - reverse?: `false` 在 range 内从后往前尝试 */
     static async get_available_port(range, reverse = false) {