ddan-js 2.8.2 → 2.8.4

package/bin/lib/modules/node/aliyun.js

@@ -0,0 +1,156 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ali_oss_1 = require("ali-oss");
+const pop_core_1 = require("@alicloud/pop-core");
+class Aliyun {
+    bucket;
+    accessKeyId;
+    accessKeySecret;
+    region;
+    __oss;
+    __cdn;
+    constructor({ bucket, accessKeyId, accessKeySecret, region }) {
+        this.bucket = bucket;
+        this.accessKeyId = accessKeyId;
+        this.accessKeySecret = accessKeySecret;
+        this.region = region;
+        this.__oss = this._getOSS();
+    }
+    get client() {
+        if (!this.__oss) {
+            this.__oss = this._getOSS();
+        }
+        return this.__oss;
+    }
+    _getOSS() {
+        return new ali_oss_1.default({
+            region: this.region,
+            accessKeyId: this.accessKeyId,
+            accessKeySecret: this.accessKeySecret,
+            bucket: this.bucket,
+        });
+    }
+    async read(name) {
+        try {
+            if (!(await this.exist(name)))
+                return '';
+            const result = await this.client.get(name);
+            return result.content?.toString() || '';
+        }
+        catch (err) {
+            console.log(`aliyun read ${name} error`, err);
+            return undefined;
+        }
+    }
+    async delete(name) {
+        try {
+            await this.client.delete(name);
+            return true;
+        }
+        catch (err) {
+            console.log(`aliyun delete ${name} error`, err);
+            return false;
+        }
+    }
+    async exist(name, options = {}) {
+        try {
+            await this.client.head(name, options);
+            return true;
+        }
+        catch (err) {
+            return false;
+        }
+    }
+    async upload(name, localname) {
+        try {
+            if (!name || !localname)
+                return false;
+            await this.client.put(name, localname);
+            return true;
+        }
+        catch (err) {
+            console.log(`aliyun upload ${localname} error`, err);
+            return false;
+        }
+    }
+    async put(name, content) {
+        try {
+            if (!name || !content)
+                return false;
+            await this.client.put(name, Buffer.from(content));
+            return true;
+        }
+        catch (err) {
+            console.log(`aliyun put content ${name} error`, err);
+            return false;
+        }
+    }
+    async putSymlink(symlinkName, sourceName) {
+        try {
+            if (!symlinkName || !sourceName)
+                return false;
+            // @ts-ignore
+            const res = await this.client.putSymlink(symlinkName, sourceName);
+            return res;
+        }
+        catch (error) {
+            return false;
+        }
+    }
+    async browse(name, cb) {
+        let token = undefined;
+        let flag = false;
+        const maxKeys = "50";
+        const prefix = name.endsWith('/') ? name : `${name}/`;
+        try {
+            do {
+                const result = await this.client.listV2({
+                    prefix,
+                    'continuation-token': token,
+                    'max-keys': maxKeys,
+                }, {});
+                for (let item of result.objects || []) {
+                    cb && (await cb(item.name));
+                }
+                // @ts-ignore
+                token = result.nextContinuationToken;
+                flag = result.isTruncated;
+            } while (flag);
+            return true;
+        }
+        catch (err) {
+            console.log(`aliyun browse ${name} error`, err);
+            return false;
+        }
+    }
+    get cdn() {
+        if (this.__cdn)
+            return this.__cdn;
+        this.__cdn = new pop_core_1.default({
+            accessKeyId: this.accessKeyId,
+            accessKeySecret: this.accessKeySecret,
+            endpoint: 'https://cdn.aliyuncs.com',
+            apiVersion: '2018-05-10',
+        });
+        return this.__cdn;
+    }
+    async refreshCDN(url, type = 'File') {
+        try {
+            let params = {
+                ObjectPath: url,
+                ObjectType: type,
+            };
+            const requestOption = {
+                method: 'POST',
+                formatParams: false,
+            };
+            await this.cdn.request('RefreshObjectCaches', params, requestOption);
+            return true;
+        }
+        catch (err) {
+            console.log(`aliyun refreshCDN ${url} err`, err);
+            return false;
+        }
+    }
+}
+exports.default = Aliyun;

package/bin/lib/modules/node/file.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = require("fs");
+const readDirectory = (dir, callback) => {
+    return new Promise((resolve, reject) => {
+        fs_1.default.readdir(dir, async (err, files) => {
+            if (err) {
+                return reject(err);
+            }
+            resolve(readFiles(dir, files, callback));
+        });
+    });
+};
+const readFiles = async (dir, files, callback) => {
+    for (let file of files) {
+        const localname = `${dir}\\${file}`;
+        if (fs_1.default.lstatSync(localname).isDirectory()) {
+            await readDirectory(`${localname}`, callback);
+        }
+        else {
+            callback && (await callback(localname));
+        }
+    }
+};
+exports.default = { readDirectory, readFiles };

package/bin/lib/modules/node/index.js

@@ -7,4 +7,5 @@ const child_1 = require("./child");
 const proxy_1 = require("./proxy");
 const ecdh_web_1 = require("./ecdh-web");
 const rsa_web_1 = require("./rsa-web");
-exports.default = { ...brotli_1.default, ...child_1.default, ...proxy_1.default, Ecdh: ecdh_1.default, EcdhWeb: ecdh_web_1.default, Socks5: socks5_1.Socks5, rsa: rsa_web_1.default };
+const file_1 = require("./file");
+exports.default = { ...file_1.default, ...brotli_1.default, ...child_1.default, ...proxy_1.default, Ecdh: ecdh_1.default, EcdhWeb: ecdh_web_1.default, Socks5: socks5_1.Socks5, rsa: rsa_web_1.default };

package/bin/lib/modules/node/socks5.js

@@ -14,7 +14,6 @@ class Socks5 {
     upstreamProxy;
     server = null;
     clientSockets = new Set();
-    allowedDomains;
     systemProxy = null;
     useSystemProxy = false;
     __debug = false;
@@ -25,10 +24,9 @@ class Socks5 {
     __logger;
     __totalReceived = 0;
     __totalSent = 0;
-    constructor(upstreamProxy, allowedDomains = ['*'], debug = false, logger) {
+    constructor(upstreamProxy, debug = false, logger) {
         this.__event = new event_1.default();
-        this.upstreamProxy = upstreamProxy;
-        this.allowedDomains = new Set(allowedDomains);
+        this.upstreamProxy = this.filterProxyConfigs(upstreamProxy);
         this.__debug = debug;
         this.__uuid = (0, uuid_1.default)();
         this.__pipeline = new pipeline_1.default(1);
@@ -51,7 +49,7 @@ class Socks5 {
     get totalSent() {
         return this.__totalSent;
     }
-    validateProxyConfig(proxyConfig = this.upstreamProxy) {
+    validateProxyConfig(proxyConfig) {
         const { ipaddress, port, userId, password } = proxyConfig || {};
         if (!ipaddress || typeof ipaddress !== 'string') {
             return '无效的上游代理 IP 地址';
@@ -67,8 +65,24 @@ class Socks5 {
         }
         return '';
     }
+    filterProxyConfigs(proxyConfig) {
+        let configs = [];
+        if (proxyConfig && Array.isArray(proxyConfig)) {
+            configs = proxyConfig;
+        }
+        else {
+            configs = [proxyConfig];
+        }
+        const filterCfgs = [];
+        for (const cfg of configs) {
+            if (!this.validateProxyConfig(cfg)) {
+                filterCfgs.push(cfg);
+            }
+        }
+        return filterCfgs;
+    }
     async start(startPort = 8838) {
-        if (this.validateProxyConfig())
+        if (this.upstreamProxy.length <= 0)
             return 0;
         if (this.server) {
             this.__debug && console.info(`[socks5] server is already running`);
@@ -91,9 +105,10 @@ class Socks5 {
     setUpstreamProxy(upstreamProxy) {
         if (!upstreamProxy)
             return false;
-        if (this.validateProxyConfig(upstreamProxy))
+        const configs = this.filterProxyConfigs(upstreamProxy);
+        if (!configs || configs.length <= 0)
             return false;
-        this.upstreamProxy = upstreamProxy;
+        this.upstreamProxy = configs;
         return true;
     }
     setSystemProxy(use, config) {
@@ -102,9 +117,6 @@ class Socks5 {
             this.systemProxy = config;
         }
     }
-    setAllowedDomains(allowedDomains = []) {
-        this.allowedDomains = new Set(allowedDomains);
-    }
     /**
      * 查找可用端口
      * @param startPort
@@ -150,10 +162,11 @@ class Socks5 {
             const addr = destination.addr;
             addrport = `${addr}:${destination.port}`;
             this.__debug && this.__logger?.info(`[socks5] handle connection`, addrport);
-            if (this.isAllowedDomain(addr)) {
+            const proxyConfig = this.getProxyConfig(addr);
+            if (proxyConfig) {
                 // 走上游代理
-                const upstreamSocket = await this.connectToUpstreamProxy(destination);
-                this.__logger?.info(`[socks5] handle connection upstream`, addrport);
+                const upstreamSocket = await this.connectToUpstreamProxy(destination, proxyConfig);
+                this.__logger?.info(`[socks5] handle connection upstream`, addrport, proxyConfig.userId);
                 this.setupDataForwarding(clientSocket, upstreamSocket, 'upstream');
             }
             else if (this.useSystemProxy && this.systemProxy && !index_1.default.isLocalIpAddress(addr)) {
@@ -241,9 +254,15 @@ class Socks5 {
         });
     }
     // 上游代理连接
-    async connectToUpstreamProxy(destination) {
+    async connectToUpstreamProxy(destination, config) {
         const options = {
-            proxy: { ...this.upstreamProxy, type: 5 },
+            proxy: {
+                ipaddress: config.ipaddress,
+                port: config.port,
+                type: 5,
+                userId: config.userId,
+                password: config.password,
+            },
             command: 'connect',
             destination: {
                 host: destination.addr,
@@ -320,10 +339,21 @@ class Socks5 {
             clientSocket.end();
         });
     }
-    isAllowedDomain(addr) {
+    getProxyConfig(addr) {
         if (index_1.default.isLocalIpAddress(addr))
+            return undefined;
+        for (const cfg of this.upstreamProxy) {
+            if (this.isAllowedDomain(addr, cfg.rules || []))
+                return cfg;
+        }
+        return undefined;
+    }
+    isAllowedDomain(addr, rules) {
+        if (index_1.default.isLocalIpAddress(addr))
+            return false;
+        if (!rules || !Array.isArray(rules))
             return false;
-        for (const pattern of this.allowedDomains) {
+        for (const pattern of rules) {
             if (pattern === '*')
                 return true;
             if (index_1.default.shExpMatch(addr, pattern))

package/bin/types/index.d.ts

@@ -109,6 +109,7 @@ declare const dUtil: {
     bytes2hex: (bytes: Uint8Array) => string;
     toUint32: (str: string) => Uint32Array;
     fromUint32: (uint32: Uint32Array) => string;
+    flatten: <T_3>(data: T_3[], recursive?: boolean, list?: T_3[]) => T_3[];
     gbk: {
         gbkLength: (str: string) => number;
         gbkCut: (source: string, len: number) => string;
@@ -135,16 +136,16 @@ declare const dUtil: {
         };
     };
     list: {
-        stepAction: <T_3>(list: T_3[], func: import("./typings").Ddan.Task<T_3, void>, stepCount?: number) => void;
-        skip: <T_4>(list: T_4[], count: number) => T_4[];
-        take: <T_5>(list: T_5[], count: number, skip?: number) => T_5[];
-        distinct: <T_6>(list: T_6[]) => T_6[];
-        randoms: <T_7>(list: T_7[], count?: number, repeat?: boolean) => T_7[];
+        stepAction: <T_4>(list: T_4[], func: import("./typings").Ddan.Task<T_4, void>, stepCount?: number) => void;
+        skip: <T_5>(list: T_5[], count: number) => T_5[];
+        take: <T_6>(list: T_6[], count: number, skip?: number) => T_6[];
+        distinct: <T_7>(list: T_7[]) => T_7[];
+        randoms: <T_8>(list: T_8[], count?: number, repeat?: boolean) => T_8[];
         toKV: (list: import("./typings").Ddan.KV<any>[], key: string, value: string) => import("./typings").Ddan.KV<any>;
-        groupBy: <T_8>(list: T_8[], key: string) => Record<string, T_8[]>;
-        first: <T_9>(list: T_9[]) => T_9 | undefined;
-        last: <T_10>(list: T_10[]) => T_10 | undefined;
-        toList: <T_11>(val: T_11 | T_11[]) => T_11[];
+        groupBy: <T_9>(list: T_9[], key: string) => Record<string, T_9[]>;
+        first: <T_10>(list: T_10[]) => T_10 | undefined;
+        last: <T_11>(list: T_11[]) => T_11 | undefined;
+        toList: <T_12>(val: T_12 | T_12[]) => T_12[];
     };
     string: {
         toString: (value: any) => any;
@@ -394,6 +395,7 @@ declare const dHook: {
     bytes2hex: (bytes: Uint8Array) => string;
     toUint32: (str: string) => Uint32Array;
     fromUint32: (uint32: Uint32Array) => string;
+    flatten: <T_6>(data: T_6[], recursive?: boolean, list?: T_6[]) => T_6[];
 };
 declare const dMini: {
     mini: {
@@ -675,6 +677,8 @@ declare const dNode: {
     child_exec: (cmd: string) => Promise<[any, string]>;
     brotliCompress: typeof import("./modules/node/brotli").brotliCompress;
     brotliDecompress: typeof import("./modules/node/brotli").brotliDecompress;
+    readDirectory: (dir: string, callback?: import("./typings").Ddan.Func1<string, any> | undefined) => Promise<unknown>;
+    readFiles: (dir: string, files: string[], callback?: import("./typings").Ddan.Func1<string, any> | undefined) => Promise<void>;
 };
 export { dUtil, dHook, dWeb, dMini, dCdn, dStore, dJoker, dTracker, dLogger, dNode, Event, KValue, Mapping };
 declare const _default: {
@@ -1038,6 +1042,7 @@ declare const _default: {
         bytes2hex: (bytes: Uint8Array) => string;
         toUint32: (str: string) => Uint32Array;
         fromUint32: (uint32: Uint32Array) => string;
+        flatten: <T_17>(data: T_17[], recursive?: boolean, list?: T_17[]) => T_17[];
     };
     KValue: typeof KValue;
     Mapping: typeof Mapping;

package/bin/types/modules/convert/base.d.ts

@@ -1,3 +1,4 @@
+declare function flatten<T>(data: T[], recursive?: boolean, list?: T[]): T[];
 declare const _default: {
     bytes2str: (bytes: Uint8Array) => string;
     str2bytes: (str?: string) => Uint8Array;
@@ -10,5 +11,6 @@ declare const _default: {
     bytes2hex: (bytes: Uint8Array) => string;
     toUint32: (str: string) => Uint32Array;
     fromUint32: (uint32: Uint32Array) => string;
+    flatten: typeof flatten;
 };
 export default _default;

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

@@ -28,5 +28,6 @@ declare const _default: {
     bytes2hex: (bytes: Uint8Array) => string;
     toUint32: (str: string) => Uint32Array;
     fromUint32: (uint32: Uint32Array) => string;
+    flatten: <T>(data: T[], recursive?: boolean, list?: T[]) => T[];
 };
 export default _default;

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

@@ -0,0 +1,27 @@
+import OSS from 'ali-oss';
+import { Ddan } from '../../typings';
+export default class Aliyun {
+    bucket: string;
+    accessKeyId: string;
+    accessKeySecret: string;
+    region: string;
+    __oss: OSS;
+    __cdn: any;
+    constructor({ bucket, accessKeyId, accessKeySecret, region }: {
+        bucket: any;
+        accessKeyId: any;
+        accessKeySecret: any;
+        region: any;
+    });
+    get client(): OSS;
+    _getOSS(): OSS;
+    read(name: string): Promise<string | undefined>;
+    delete(name: string): Promise<boolean>;
+    exist(name: string, options?: {}): Promise<boolean>;
+    upload(name: string, localname: string): Promise<boolean>;
+    put(name: string, content: string): Promise<boolean>;
+    putSymlink(symlinkName: string, sourceName: string): Promise<any>;
+    browse(name: string, cb?: Ddan.Func1<string>): Promise<boolean>;
+    get cdn(): any;
+    refreshCDN(url: string, type?: 'File' | 'Directory'): Promise<boolean>;
+}

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

@@ -0,0 +1,6 @@
+import { Ddan } from '../../typings';
+declare const _default: {
+    readDirectory: (dir: string, callback?: Ddan.Func1<string, any> | undefined) => Promise<unknown>;
+    readFiles: (dir: string, files: string[], callback?: Ddan.Func1<string, any> | undefined) => Promise<void>;
+};
+export default _default;

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

@@ -34,5 +34,7 @@ declare const _default: {
     child_exec: (cmd: string) => Promise<[any, string]>;
     brotliCompress: typeof import("./brotli").brotliCompress;
     brotliDecompress: typeof import("./brotli").brotliDecompress;
+    readDirectory: (dir: string, callback?: import("../..").Ddan.Func1<string, any> | undefined) => Promise<unknown>;
+    readFiles: (dir: string, files: string[], callback?: import("../..").Ddan.Func1<string, any> | undefined) => Promise<void>;
 };
 export default _default;

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

@@ -1,12 +1,15 @@
 import DEvent from '../../class/event';
 import DPipeline from '../hook/modules/pipeline';
-interface IProxyConfig {
+interface IProxy {
     ipaddress: string;
     port: number;
     type?: 5;
     userId?: string;
     password?: string;
 }
+interface IRuleProxy extends IProxy {
+    rules?: string[];
+}
 declare const Socks5Event: {
     readonly Error: "error";
 };
@@ -21,7 +24,6 @@ export declare class Socks5 {
     private upstreamProxy;
     private server;
     private clientSockets;
-    private allowedDomains;
     private systemProxy;
     private useSystemProxy;
     __debug: boolean;
@@ -32,17 +34,17 @@ export declare class Socks5 {
     __logger: ILogger;
     __totalReceived: number;
     __totalSent: number;
-    constructor(upstreamProxy: IProxyConfig, allowedDomains?: string[] | ['*'], debug?: boolean, logger?: ILogger);
+    constructor(upstreamProxy: IRuleProxy | IRuleProxy[], debug?: boolean, logger?: ILogger);
     get id(): string;
     get port(): number;
     get url(): string;
     get totalReceived(): number;
     get totalSent(): number;
-    validateProxyConfig(proxyConfig?: IProxyConfig): "" | "无效的上游代理 IP 地址" | "无效的上游代理端口" | "无效的上游代理用户名" | "无效的上游代理密码";
+    validateProxyConfig(proxyConfig: IProxy): "" | "无效的上游代理 IP 地址" | "无效的上游代理端口" | "无效的上游代理用户名" | "无效的上游代理密码";
+    private filterProxyConfigs;
     start(startPort?: number): Promise<number>;
-    setUpstreamProxy(upstreamProxy: IProxyConfig): boolean;
-    setSystemProxy(use: boolean, config?: IProxyConfig): void;
-    setAllowedDomains(allowedDomains?: string[]): void;
+    setUpstreamProxy(upstreamProxy: IRuleProxy | IRuleProxy[]): boolean;
+    setSystemProxy(use: boolean, config?: IProxy): void;
     /**
      * 查找可用端口
      * @param startPort
@@ -83,6 +85,7 @@ export declare class Socks5 {
     private connectToProxy;
     private connectToLocal;
     private setupDataForwarding;
+    private getProxyConfig;
     private isAllowedDomain;
     close(): void;
     on(name: Socks5EventType, listener: (...args: any[]) => void): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddan-js",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "description": "",
   "keywords": [
     "ddan-js",
@@ -101,6 +101,9 @@
     ]
   },
   "devDependencies": {
+    "@alicloud/pop-core": "^1.7.12",
+    "ali-oss": "^6.17.1",
+    "@types/ali-oss": "^6.16.7",
     "@commitlint/cli": "^17.6.1",
     "@commitlint/config-conventional": "^17.6.1",
     "@rollup/plugin-node-resolve": "^15.1.0",