xshell 1.0.181 → 1.0.183

package/builder.js

@@ -502,7 +502,7 @@ export class Bundler {
                 "        <meta charset='utf-8' />\n" +
                 (heads ? heads.map(head => `        ${head}`).join_lines() : '') +
                 (device_width ? "        <meta name='viewport' content='width=device-width, initial-scale=1.0' />\n" : '') +
-                (icon ? `        <link rel='icon' href='{root}${icon}' />\n` : '') +
+                (icon ? `        <link rel='icon' href='{root}${get(icon)}' />\n` : '') +
                 (manifest ? `        <link rel='manifest' href='{root}${manifest}' />\n` : '') +
                 this.resolve_dependency_files(_dependencies, false, { production: this.production }).map(fp => `        <script src='{root}vendors/${fp}' defer></script>`).join_lines() +
                 (scripts?.before ? scripts.before.map(asset => `        <script src='{root}${get(asset)}' defer></script>`).join_lines() : '') +

package/package.json

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

package/server.d.ts

@@ -48,6 +48,8 @@ export declare class Server {
     /** 设置后会启用 websocket rpc */
     remote?: Remote;
     colors: boolean;
+    /** 输出日志时包含日期 */
+    log_date: boolean;
     /** 启用后增加 stdio 订阅相关的 remote.funcs */
     stdio_subscribable?: boolean;
     stdio_subscribers: (((chunk: Uint8Array | string) => Promise<void>) & {
@@ -57,7 +59,7 @@ export declare class Server {
     /** 原始 process.stdout.write 函数 bind 后的备份 */
     stdout_write: Function;
     stderr_write: Function;
-    constructor({ name, http, http2, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, }: {
+    constructor({ name, http, http2, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, log_date }: {
         name: string;
         http?: boolean;
         http2?: boolean;
@@ -68,6 +70,7 @@ export declare class Server {
         remote?: Remote;
         funcs?: Remote['funcs'];
         stdio_subscribable?: boolean;
+        log_date?: boolean;
     });
     /** start http server and listen */
     start(): Promise<void>;

package/server.js

@@ -43,13 +43,15 @@ export class Server {
     /** 设置后会启用 websocket rpc */
     remote;
     colors = util.inspect.defaultOptions.colors;
+    /** 输出日志时包含日期 */
+    log_date = false;
     /** 启用后增加 stdio 订阅相关的 remote.funcs */
     stdio_subscribable;
     stdio_subscribers = [];
     /** 原始 process.stdout.write 函数 bind 后的备份 */
     stdout_write;
     stderr_write;
-    constructor({ name, http, http2, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, }) {
+    constructor({ name, http, http2, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, log_date }) {
         this.name = name;
         if (http)
             this.http = http;
@@ -64,6 +66,8 @@ export class Server {
             this.fpd_certs = fpd_certs;
         if (default_hostnames)
             this.default_hostnames = default_hostnames;
+        if (log_date !== undefined)
+            this.log_date = log_date;
         if (remote)
             this.remote = remote;
         else if (funcs)
@@ -257,7 +261,7 @@ export class Server {
         const ip = request.socket.remoteAddress.replace(/^::ffff:/, '');
         console.log(
         // 时间
-        `${new Date().to_time_str()}  ` +
+        `${this.log_date ? new Date().to_str() : new Date().to_time_str()}  ` +
             // ip（位置）
             (ip || '').limit(40) + '  ' +
             // ua
@@ -359,7 +363,7 @@ export class Server {
         let { method } = request;
         let s = '';
         // 时间
-        s += `${new Date().to_time_str()}  `;
+        s += `${this.log_date ? new Date().to_str() : new Date().to_time_str()}  `;
         // ip（位置）
         s += (ip || '').limit(40) + '  ';
         // ua
@@ -626,6 +630,7 @@ export class Server {
             return fp;
         }
         if (assets_root) {
+            assert(fp.endsWith('.html'), '传入 assets_root 参数时 fp 应该为 .html 文件');
             response.body = (await fread(fp, { print: false }))
                 .replaceAll('{root}', assets_root);
             return fp;