ddan-js 2.6.44 → 2.7.0

package/bin/lib/modules/rule/async-validator/rule/url.js

@@ -12,17 +12,17 @@ exports.default = () => {
         : '';
     const v4 = '(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}';
     const v6seg = '[a-fA-F\\d]{1,4}';
-    const v6 = `
-(?:
-(?:${v6seg}:){7}(?:${v6seg}|:)|                                    // 1:2:3:4:5:6:7::  1:2:3:4:5:6:7:8
-(?:${v6seg}:){6}(?:${v4}|:${v6seg}|:)|                             // 1:2:3:4:5:6::    1:2:3:4:5:6::8   1:2:3:4:5:6::8  1:2:3:4:5:6::1.2.3.4
-(?:${v6seg}:){5}(?::${v4}|(?::${v6seg}){1,2}|:)|                   // 1:2:3:4:5::      1:2:3:4:5::7:8   1:2:3:4:5::8    1:2:3:4:5::7:1.2.3.4
-(?:${v6seg}:){4}(?:(?::${v6seg}){0,1}:${v4}|(?::${v6seg}){1,3}|:)| // 1:2:3:4::        1:2:3:4::6:7:8   1:2:3:4::8      1:2:3:4::6:7:1.2.3.4
-(?:${v6seg}:){3}(?:(?::${v6seg}){0,2}:${v4}|(?::${v6seg}){1,4}|:)| // 1:2:3::          1:2:3::5:6:7:8   1:2:3::8        1:2:3::5:6:7:1.2.3.4
-(?:${v6seg}:){2}(?:(?::${v6seg}){0,3}:${v4}|(?::${v6seg}){1,5}|:)| // 1:2::            1:2::4:5:6:7:8   1:2::8          1:2::4:5:6:7:1.2.3.4
-(?:${v6seg}:){1}(?:(?::${v6seg}){0,4}:${v4}|(?::${v6seg}){1,6}|:)| // 1::              1::3:4:5:6:7:8   1::8            1::3:4:5:6:7:1.2.3.4
-(?::(?:(?::${v6seg}){0,5}:${v4}|(?::${v6seg}){1,7}|:))             // ::2:3:4:5:6:7:8  ::2:3:4:5:6:7:8  ::8             ::1.2.3.4
-)(?:%[0-9a-zA-Z]{1,})?                                             // %eth0            %1
+    const v6 = `
+(?:
+(?:${v6seg}:){7}(?:${v6seg}|:)|                                    // 1:2:3:4:5:6:7::  1:2:3:4:5:6:7:8
+(?:${v6seg}:){6}(?:${v4}|:${v6seg}|:)|                             // 1:2:3:4:5:6::    1:2:3:4:5:6::8   1:2:3:4:5:6::8  1:2:3:4:5:6::1.2.3.4
+(?:${v6seg}:){5}(?::${v4}|(?::${v6seg}){1,2}|:)|                   // 1:2:3:4:5::      1:2:3:4:5::7:8   1:2:3:4:5::8    1:2:3:4:5::7:1.2.3.4
+(?:${v6seg}:){4}(?:(?::${v6seg}){0,1}:${v4}|(?::${v6seg}){1,3}|:)| // 1:2:3:4::        1:2:3:4::6:7:8   1:2:3:4::8      1:2:3:4::6:7:1.2.3.4
+(?:${v6seg}:){3}(?:(?::${v6seg}){0,2}:${v4}|(?::${v6seg}){1,4}|:)| // 1:2:3::          1:2:3::5:6:7:8   1:2:3::8        1:2:3::5:6:7:1.2.3.4
+(?:${v6seg}:){2}(?:(?::${v6seg}){0,3}:${v4}|(?::${v6seg}){1,5}|:)| // 1:2::            1:2::4:5:6:7:8   1:2::8          1:2::4:5:6:7:1.2.3.4
+(?:${v6seg}:){1}(?:(?::${v6seg}){0,4}:${v4}|(?::${v6seg}){1,6}|:)| // 1::              1::3:4:5:6:7:8   1::8            1::3:4:5:6:7:1.2.3.4
+(?::(?:(?::${v6seg}){0,5}:${v4}|(?::${v6seg}){1,7}|:))             // ::2:3:4:5:6:7:8  ::2:3:4:5:6:7:8  ::8             ::1.2.3.4
+)(?:%[0-9a-zA-Z]{1,})?                                             // %eth0            %1
 `
         .replace(/\s*\/\/.*$/gm, '')
         .replace(/\n/g, '')

package/bin/types/index.d.ts

@@ -259,7 +259,7 @@ declare const dHook: {
         parseHost: (url: string) => import("./typings").Ddan.IHttpHost;
         join: (...args: string[]) => string;
         shExpMatch: (text: string, pattern: string) => boolean;
-        isLocalhost: (addr: string) => boolean;
+        isLocalIpAddress: (addr: string) => boolean;
     };
     singleton: <T>() => {
         new (): {};
@@ -382,7 +382,7 @@ declare const dMini: {
         parseHost: (url: string) => import("./typings").Ddan.IHttpHost;
         join: (...args: string[]) => string;
         shExpMatch: (text: string, pattern: string) => boolean;
-        isLocalhost: (addr: string) => boolean;
+        isLocalIpAddress: (addr: string) => boolean;
     };
     icon: import("./class/icon").DIcon;
     html: {
@@ -523,7 +523,7 @@ declare const dWeb: {
         parseHost: (url: string) => import("./typings").Ddan.IHttpHost;
         join: (...args: string[]) => string;
         shExpMatch: (text: string, pattern: string) => boolean;
-        isLocalhost: (addr: string) => boolean;
+        isLocalIpAddress: (addr: string) => boolean;
     };
     icon: import("./class/icon").DIcon;
     html: {
@@ -819,7 +819,7 @@ declare const _default: {
         parseHost: (url: string) => import("./typings").Ddan.IHttpHost;
         join: (...args: string[]) => string;
         shExpMatch: (text: string, pattern: string) => boolean;
-        isLocalhost: (addr: string) => boolean;
+        isLocalIpAddress: (addr: string) => boolean;
     };
     css: {
         stringify: (styleObj: Record<string, string | number>) => string;

package/bin/types/modules/node/socks5.d.ts

@@ -39,12 +39,6 @@ export declare class Socks5 {
      */
     private findAvailablePort;
     private handleSocksConnection;
-    /**
-     * 处理连接
-     * @param clientSocket
-     * @returns
-     */
-    private _handleSocksConnection;
     /**
      * 回复客户端请求响应数据
      * VER是SOCKS版本，这里应该是0x05；

package/bin/types/modules/qs/index.d.ts

@@ -45,6 +45,6 @@ declare const _default: {
     parseHost: (url: string) => Ddan.IHttpHost;
     join: (...args: string[]) => string;
     shExpMatch: (text: string, pattern: string) => boolean;
-    isLocalhost: (addr: string) => boolean;
+    isLocalIpAddress: (addr: string) => boolean;
 };
 export default _default;

package/bin/types/modules/rule/async-validator/index.d.ts

@@ -14,6 +14,12 @@ declare class Schema {
         string: import("./interface").ExecuteValidator;
         method: import("./interface").ExecuteValidator;
         number: import("./interface").ExecuteValidator;
+        /**
+         *  Encapsulates a validation schema.
+         *
+         *  @param descriptor An object declaring validation rules
+         *  for this schema.
+         */
         boolean: import("./interface").ExecuteValidator;
         regexp: import("./interface").ExecuteValidator;
         integer: import("./interface").ExecuteValidator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddan-js",
-  "version": "2.6.44",
+  "version": "2.7.0",
   "description": "",
   "keywords": [
     "ddan-js",