xshell 1.1.11 → 1.1.13

package/package.json

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

package/path.d.ts

@@ -54,7 +54,7 @@ export declare function extname(path: string): string;
 /** `/` */
 export declare const sep = "/";
 /** The platform-specific file delimiter. ';' or ':'. */
-export declare const delimiter: ";" | ":";
+export declare const delimiter: ":" | ";";
 /** Returns an object from a path string - the opposite of format().
     @param path path to evaluate.
     @throws {TypeError} if `path` is not a string. */
@@ -81,7 +81,7 @@ export declare let path: {
     basename: typeof basename;
     extname: typeof extname;
     sep: string;
-    delimiter: ";" | ":";
+    delimiter: ":" | ";";
     parse: typeof parse;
     format: typeof format;
     toNamespacedPath: typeof toNamespacedPath;

package/prototype.browser.js

@@ -343,21 +343,22 @@ Object.defineProperties(String.prototype, {
             return fp.endsWith('/') ? fp : `${fp}/`;
         },
         fdir() {
-            return this.strip_end(this.fname);
+            return this.fp.strip_end(this.fname);
         },
         fname() {
-            const ilast = this.lastIndexOf('/');
+            const { fp } = this;
+            const ilast = fp.lastIndexOf('/');
             if (ilast === -1)
-                return this; // 没有斜杠时返回整个字符串
+                return fp; // 没有斜杠时返回整个字符串
             // 以斜杠结尾的情况
-            if (ilast === this.length - 1) {
-                const iprev = this.lastIndexOf('/', ilast - 1);
+            if (ilast === fp.length - 1) {
+                const iprev = fp.lastIndexOf('/', ilast - 1);
                 return iprev === -1
-                    ? this // 只有一个斜杠且在末尾
-                    : this.slice(iprev + 1);
+                    ? fp // 只有一个斜杠且在末尾
+                    : fp.slice(iprev + 1);
             }
             // 返回最后一个斜杠后的内容
-            return this.slice(ilast + 1);
+            return fp.slice(ilast + 1);
         },
         fext() {
             const { fname } = this;

package/prototype.js

@@ -380,21 +380,22 @@ if (!globalThis.my_prototype_defined) {
                 return fp.endsWith('/') ? fp : `${fp}/`;
             },
             fdir() {
-                return this.strip_end(this.fname);
+                return this.fp.strip_end(this.fname);
             },
             fname() {
-                const ilast = this.lastIndexOf('/');
+                const { fp } = this;
+                const ilast = fp.lastIndexOf('/');
                 if (ilast === -1)
-                    return this; // 没有斜杠时返回整个字符串
+                    return fp; // 没有斜杠时返回整个字符串
                 // 以斜杠结尾的情况
-                if (ilast === this.length - 1) {
-                    const iprev = this.lastIndexOf('/', ilast - 1);
+                if (ilast === fp.length - 1) {
+                    const iprev = fp.lastIndexOf('/', ilast - 1);
                     return iprev === -1
-                        ? this // 只有一个斜杠且在末尾
-                        : this.slice(iprev + 1);
+                        ? fp // 只有一个斜杠且在末尾
+                        : fp.slice(iprev + 1);
                 }
                 // 返回最后一个斜杠后的内容
-                return this.slice(ilast + 1);
+                return fp.slice(ilast + 1);
             },
             fext() {
                 const { fname } = this;

package/server.d.ts

@@ -118,7 +118,7 @@ export declare class Server {
             - redirect?: `manual` 重定向处理策略，默认按原样返回给客户端
             - timeout?: `1000 * 5` 请求超时时间，可以传入 0 禁用超时
             - throw_error?: `false` 在遇到 request 请求错误时直接 throw 出来，而不是自动设置到 response */
-    request(ctx: Context, path_url: string | URL, { headers: headers_, redirect, queries, timeout, throw_error }?: ServerRequestOptions): Promise<true>;
+    request(ctx: Context, path_url: string | URL, { headers: headers_, redirect, queries, timeout, throw_error, proxy }?: ServerRequestOptions): Promise<true>;
     static filter_response_headers(headers: RawResponse['headers']): Record<string, string>;
     /** 提供静态文件
         @example
@@ -163,5 +163,6 @@ export interface ServerRequestOptions {
     redirect?: RequestOptions['redirect'];
     timeout?: RequestOptions['timeout'];
     throw_error?: boolean;
+    proxy?: RequestOptions['proxy'];
 }
 export declare const text_plain: "text/plain; charset=utf-8";

package/server.js

@@ -493,7 +493,7 @@ export class Server {
             - redirect?: `manual` 重定向处理策略，默认按原样返回给客户端
             - timeout?: `1000 * 5` 请求超时时间，可以传入 0 禁用超时
             - throw_error?: `false` 在遇到 request 请求错误时直接 throw 出来，而不是自动设置到 response */
-    async request(ctx, path_url, { headers: headers_, redirect = 'manual', queries, timeout, throw_error } = {}) {
+    async request(ctx, path_url, { headers: headers_, redirect = 'manual', queries, timeout, throw_error, proxy } = {}) {
         const { request: { method, headers, query: _queries, body, ip } } = ctx;
         let { response } = ctx;
         const x_forwarded_for = headers['x-forwarded-for'] ? `${headers['x-forwarded-for']}, ${ip}` : ip;
@@ -513,7 +513,8 @@ export class Server {
                     : { ...headers, 'x-forwarded-for': x_forwarded_for }),
                 raw: true,
                 redirect,
-                timeout
+                timeout,
+                proxy
             });
             response.status = response_.status;
             response.set(Server.filter_response_headers(response_.headers));

package/utils.browser.d.ts

@@ -79,7 +79,7 @@ export declare function encode(str: string): Uint8Array<ArrayBufferLike>;
     在流式处理 (buffer 可能不完整) 时，应使用独立的 TextDecoder 实例调用 decode(buffer, { stream: true }) */
 export declare function decode(buffer: Uint8Array): string;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 1 | 0 | -1;
+export declare function strcmp(l: string, r: string): 0 | 1 | -1;
 /** 比较 1.10.02 这种版本号
     - l, r: 两个版本号字符串
     - loose?: 宽松模式，允许两个版本号格式（位数）不一致 */

package/utils.d.ts

@@ -40,7 +40,7 @@ export declare function filter_values<TObj extends Record<string, any>>(obj: TOb
 /** 忽略对象中的 keys, 返回新对象 */
 export declare function omit<TObj>(obj: TObj, omit_keys: string[]): TObj;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 1 | 0 | -1;
+export declare function strcmp(l: string, r: string): 0 | 1 | -1;
 /** 比较 1.10.02 这种版本号
     - l, r: 两个版本号字符串
     - loose?: 宽松模式，允许两个版本号格式（位数）不一致 */