ddan-js 2.7.3 → 2.7.5

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

@@ -571,11 +571,7 @@ declare const dNode: {
         ipaddress: string;
         port: number;
     } | undefined> | undefined;
-    toPacScript: ({ proxy, system, rules }: {
-        proxy?: string | undefined;
-        system?: string | undefined;
-        rules?: string[] | undefined;
-    }) => string;
+    toPacScript: (proxy: string, rules?: string[], defaultProxy?: string) => string;
     toPacProxy: (ipaddress: string, port: number, options?: {
         type?: "PROXY" | "SOCKS5" | "ALL" | undefined;
         direct?: boolean | undefined;

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

@@ -9,11 +9,7 @@ declare const _default: {
         ipaddress: string;
         port: number;
     } | undefined> | undefined;
-    toPacScript: ({ proxy, system, rules }: {
-        proxy?: string | undefined;
-        system?: string | undefined;
-        rules?: string[] | undefined;
-    }) => string;
+    toPacScript: (proxy: string, rules?: string[], defaultProxy?: string) => string;
     toPacProxy: (ipaddress: string, port: number, options?: {
         type?: "PROXY" | "SOCKS5" | "ALL" | undefined;
         direct?: boolean | undefined;

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

@@ -1,16 +1,12 @@
-declare const _default: {
+declare const _default_1: {
     getSystemProxy: () => Promise<{
         ipaddress: string;
         port: number;
     } | undefined> | undefined;
-    toPacScript: ({ proxy, system, rules }: {
-        proxy?: string | undefined;
-        system?: string | undefined;
-        rules?: string[] | undefined;
-    }) => string;
+    toPacScript: (proxy: string, rules?: string[], defaultProxy?: string) => string;
     toPacProxy: (ipaddress: string, port: number, options?: {
         type?: "PROXY" | "SOCKS5" | "ALL" | undefined;
         direct?: boolean | undefined;
     } | undefined) => string;
 };
-export default _default;
+export default _default_1;

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

@@ -33,6 +33,7 @@ export declare class Socks5 {
     constructor(upstreamProxy: IProxyConfig, allowedDomains?: string[] | ['*'], debug?: boolean, logger?: ILogger);
     get id(): string;
     get port(): number;
+    get url(): string;
     validateProxyConfig(proxyConfig?: IProxyConfig): "" | "无效的上游代理 IP 地址" | "无效的上游代理端口" | "无效的上游代理用户名" | "无效的上游代理密码";
     start(startPort?: number): Promise<number>;
     setUpstreamProxy(upstreamProxy: IProxyConfig): boolean;

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

@@ -14,12 +14,6 @@ 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.7.3",
+  "version": "2.7.5",
   "description": "",
   "keywords": [
     "ddan-js",