ee-core 4.1.3 → 4.1.4

package/utils/ip.js

@@ -1,221 +1,221 @@
-const { promisify } = require('util');
-const dgram = require('dgram');
-const { isIPv6, isIPv4 } = require('net');
-const dns = require('dns-socket');
-const HttpClient = require('../httpclient');
-
-const emptyIP = '';
-const defaults = {
-	timeout: 3000,
-	type: 'http', // 'http' | 'dns' | 'all'
-};
-
-const dnsServers = [
-	{
-		v4: {
-			servers: [
-				'208.67.222.222',
-				'208.67.220.220',
-				'208.67.222.220',
-				'208.67.220.222',
-			],
-			name: 'myip.opendns.com',
-			type: 'A',
-		},
-		v6: {
-			servers: [
-				'2620:0:ccc::2',
-				'2620:0:ccd::2',
-			],
-			name: 'myip.opendns.com',
-			type: 'AAAA',
-		},
-	},
-];
-
-const type = {
-	v4: {
-		dnsServers: dnsServers.map(({v4: {servers, ...question}}) => ({
-			servers, question,
-		})),
-		httpsUrls: [
-			'https://icanhazip.com/',
-			'https://api.ipify.org/',
-		],
-	},
-	v6: {
-		dnsServers: dnsServers.map(({v6: {servers, ...question}}) => ({
-			servers, question,
-		})),
-		httpsUrls: [
-			'https://icanhazip.com/',
-			'https://api6.ipify.org/',
-		],
-	},
-};
-
-const queryDns = (version, options) => {
-	const data = type[version];
-	const socket = dns({
-		retries: 0,
-		maxQueries: 1,
-		socket: dgram.createSocket(version === 'v6' ? 'udp6' : 'udp4'),
-		timeout: options.timeout,
-	});
-
-	const socketQuery = promisify(socket.query.bind(socket));
-	const promise = (async () => {
-		for (const dnsServerInfo of data.dnsServers) {
-			const {servers, question} = dnsServerInfo;
-			for (const server of servers) {
-				if (socket.destroyed) {
-					return emptyIP;
-				}
-
-				try {
-					const {name, type, transform} = question;
-					const dnsResponse = await socketQuery({questions: [{name, type}]}, 53, server);
-
-					const {
-						answers: {
-							0: {
-								data,
-							},
-						},
-					} = dnsResponse;
-					const response = (typeof data === 'string' ? data : data.toString()).trim();
-          const ip = (transform && version === 'v6') ? transform(response) : response;
-					const method = version === 'v6' ? isIPv6 : isIPv4;
-
-					if (ip && method(ip)) {
-						socket.destroy();
-						return ip;
-					}
-				} catch (error) {
-					// Log.coreLogger.error('[ee-core] [utils/ip] queryDns error:', error);
-				}
-			}
-		}
-
-		socket.destroy();
-		return emptyIP;
-	})();
-
-	promise.cancel = () => {
-		socket.destroy();
-	};
-
-	return promise;
-};
-
-const queryHttps = (version, options) => {
-	let cancel;
-  const hc = new HttpClient();
-
-	const promise = (async () => {
-		const requestOptions = {
-			method: 'GET',
-			timeout: options.timeout,
-			dataType: 'text',
-		};
-
-		const urls = [
-			...type[version].httpsUrls,
-			...(options.fallbackUrls ?? []),
-		];
-
-		for (const url of urls) {
-			try {
-				const gotPromise = hc.request(url, requestOptions);
-				gotPromise.cancel = () => {
-					// ..
-				}
-				cancel = gotPromise.cancel;
-
-				const response = await gotPromise;
-				let result = response.status == 200 ? response.data : '';
-				const ip = result.trim();
-
-				const method = version === 'v6' ? isIPv6 : isIPv4;
-
-				if (ip && method(ip)) {
-					return ip;
-				}
-			} catch (error) {
-				//Log.coreLogger.error('[ee-core] [utils/ip] queryHttps error:', error);
-			}
-		}
-
-		return emptyIP;
-	})();
-
-	promise.cancel = function () {
-		return cancel.apply(this);
-	};
-
-	return promise;
-};
-
-const queryAll = (version, options) => {
-	let cancel;
-	const promise = (async () => {
-		let response;
-		const dnsPromise = queryDns(version, options);
-		cancel = dnsPromise.cancel;
-		try {
-			response = await dnsPromise;
-		} catch {
-			const httpsPromise = queryHttps(version, options);
-			cancel = httpsPromise.cancel;
-			response = await httpsPromise;
-		}
-
-		return response;
-	})();
-
-	promise.cancel = cancel;
-
-	return promise;
-};
-
-// 查询 public ipv4  
-function publicIpv4(options) {
-  options = {
-    ...defaults,
-    ...options,
-  };
-
-  if (options.type == 'http') {
-    return queryHttps('v4', options);
-  }	
-	
-  if (options.type == 'dns') {
-    return queryDns('v4', options);
-  }
-
-  return queryAll('v4', options);
-}
-
-// 查询public ipv6 
-function publicIpv6(options) {
-  options = {
-    ...defaults,
-    ...options,
-  };
-
-  if (options.type == 'http') {
-    return queryHttps('v6', options);
-  }	
-	
-  if (options.type == 'dns') {
-    return queryDns('v6', options);
-  }
-
-  return queryAll('v6', options);
-}
-
-module.exports = {
-  publicIpv4,
-  publicIpv6
-};
-
+const { promisify } = require('util');
+const dgram = require('dgram');
+const { isIPv6, isIPv4 } = require('net');
+const dns = require('dns-socket');
+const HttpClient = require('../httpclient');
+
+const emptyIP = '';
+const defaults = {
+	timeout: 3000,
+	type: 'http', // 'http' | 'dns' | 'all'
+};
+
+const dnsServers = [
+	{
+		v4: {
+			servers: [
+				'208.67.222.222',
+				'208.67.220.220',
+				'208.67.222.220',
+				'208.67.220.222',
+			],
+			name: 'myip.opendns.com',
+			type: 'A',
+		},
+		v6: {
+			servers: [
+				'2620:0:ccc::2',
+				'2620:0:ccd::2',
+			],
+			name: 'myip.opendns.com',
+			type: 'AAAA',
+		},
+	},
+];
+
+const type = {
+	v4: {
+		dnsServers: dnsServers.map(({v4: {servers, ...question}}) => ({
+			servers, question,
+		})),
+		httpsUrls: [
+			'https://icanhazip.com/',
+			'https://api.ipify.org/',
+		],
+	},
+	v6: {
+		dnsServers: dnsServers.map(({v6: {servers, ...question}}) => ({
+			servers, question,
+		})),
+		httpsUrls: [
+			'https://icanhazip.com/',
+			'https://api6.ipify.org/',
+		],
+	},
+};
+
+const queryDns = (version, options) => {
+	const data = type[version];
+	const socket = dns({
+		retries: 0,
+		maxQueries: 1,
+		socket: dgram.createSocket(version === 'v6' ? 'udp6' : 'udp4'),
+		timeout: options.timeout,
+	});
+
+	const socketQuery = promisify(socket.query.bind(socket));
+	const promise = (async () => {
+		for (const dnsServerInfo of data.dnsServers) {
+			const {servers, question} = dnsServerInfo;
+			for (const server of servers) {
+				if (socket.destroyed) {
+					return emptyIP;
+				}
+
+				try {
+					const {name, type, transform} = question;
+					const dnsResponse = await socketQuery({questions: [{name, type}]}, 53, server);
+
+					const {
+						answers: {
+							0: {
+								data,
+							},
+						},
+					} = dnsResponse;
+					const response = (typeof data === 'string' ? data : data.toString()).trim();
+          const ip = (transform && version === 'v6') ? transform(response) : response;
+					const method = version === 'v6' ? isIPv6 : isIPv4;
+
+					if (ip && method(ip)) {
+						socket.destroy();
+						return ip;
+					}
+				} catch (error) {
+					// Log.coreLogger.error('[ee-core] [utils/ip] queryDns error:', error);
+				}
+			}
+		}
+
+		socket.destroy();
+		return emptyIP;
+	})();
+
+	promise.cancel = () => {
+		socket.destroy();
+	};
+
+	return promise;
+};
+
+const queryHttps = (version, options) => {
+	let cancel;
+  const hc = new HttpClient();
+
+	const promise = (async () => {
+		const requestOptions = {
+			method: 'GET',
+			timeout: options.timeout,
+			dataType: 'text',
+		};
+
+		const urls = [
+			...type[version].httpsUrls,
+			...(options.fallbackUrls ?? []),
+		];
+
+		for (const url of urls) {
+			try {
+				const gotPromise = hc.request(url, requestOptions);
+				gotPromise.cancel = () => {
+					// ..
+				}
+				cancel = gotPromise.cancel;
+
+				const response = await gotPromise;
+				let result = response.status == 200 ? response.data : '';
+				const ip = result.trim();
+
+				const method = version === 'v6' ? isIPv6 : isIPv4;
+
+				if (ip && method(ip)) {
+					return ip;
+				}
+			} catch (error) {
+				//Log.coreLogger.error('[ee-core] [utils/ip] queryHttps error:', error);
+			}
+		}
+
+		return emptyIP;
+	})();
+
+	promise.cancel = function () {
+		return cancel.apply(this);
+	};
+
+	return promise;
+};
+
+const queryAll = (version, options) => {
+	let cancel;
+	const promise = (async () => {
+		let response;
+		const dnsPromise = queryDns(version, options);
+		cancel = dnsPromise.cancel;
+		try {
+			response = await dnsPromise;
+		} catch {
+			const httpsPromise = queryHttps(version, options);
+			cancel = httpsPromise.cancel;
+			response = await httpsPromise;
+		}
+
+		return response;
+	})();
+
+	promise.cancel = cancel;
+
+	return promise;
+};
+
+// 查询 public ipv4  
+function publicIpv4(options) {
+  options = {
+    ...defaults,
+    ...options,
+  };
+
+  if (options.type == 'http') {
+    return queryHttps('v4', options);
+  }	
+	
+  if (options.type == 'dns') {
+    return queryDns('v4', options);
+  }
+
+  return queryAll('v4', options);
+}
+
+// 查询public ipv6 
+function publicIpv6(options) {
+  options = {
+    ...defaults,
+    ...options,
+  };
+
+  if (options.type == 'http') {
+    return queryHttps('v6', options);
+  }	
+	
+  if (options.type == 'dns') {
+    return queryDns('v6', options);
+  }
+
+  return queryAll('v6', options);
+}
+
+module.exports = {
+  publicIpv4,
+  publicIpv6
+};
+

package/utils/is.d.ts

@@ -1,14 +1,14 @@
-export declare function renderer(): boolean;
-export declare function main(): boolean;
-export declare function osx(): boolean;
-export declare function macOS(): boolean;
-export declare function windows(): boolean;
-export declare function linux(): boolean;
-export declare function x86(): boolean;
-export declare function x64(): boolean;
-export declare function sandbox(): boolean;
-export declare function mas(): boolean;
-export declare function windowsStore(): boolean;
-export declare function all(...args: any[]): boolean;
-export declare function none(...args: any[]): boolean;
-export declare function one(...args: any[]): boolean;
+export declare function renderer(): boolean;
+export declare function main(): boolean;
+export declare function osx(): boolean;
+export declare function macOS(): boolean;
+export declare function windows(): boolean;
+export declare function linux(): boolean;
+export declare function x86(): boolean;
+export declare function x64(): boolean;
+export declare function sandbox(): boolean;
+export declare function mas(): boolean;
+export declare function windowsStore(): boolean;
+export declare function all(...args: any[]): boolean;
+export declare function none(...args: any[]): boolean;
+export declare function one(...args: any[]): boolean;

package/utils/is.js

@@ -1,112 +1,112 @@
-'use strict';
-
-// Checks if we are in renderer process
-function renderer () {
-  return process.type === 'renderer'
-}
-
-// Checks if we are in main process
-function main() {
-  return process.type === 'browser'
-}
-
-// Checks if we are under Mac OS
-function osx() {
-  return process.platform === 'darwin'
-}
-
-// Checks if we are under Mac OS
-function macOS() {
-  return osx()
-}
-
-// Checks if we are under Windows OS
-function windows() {
-  return process.platform === 'win32'
-}
-
-// Checks if we are under Linux OS
-function linux() {
-  return process.platform === 'linux'
-}
-
-// Checks if we are the processor's arch is x86
-function x86() {
-  return process.arch === 'ia32'
-}
-
-// Checks if we are the processor's arch is x64
-function x64() {
-  return process.arch === 'x64'
-}
-
-// Checks if the app is running in a sandbox on macOS
-function sandbox() {
-  return 'APP_SANDBOX_CONTAINER_ID' in process.env
-}
-
-// Checks if the app is running as a Mac App Store build
-function mas() {
-  return process.mas === true
-}
-
-// Checks if the app is running as a Windows Store (appx) build
-function windowsStore() {
-  return process.windowsStore === true
-}
-
-// checks if all the 'is functions' passed as arguments are true
-function all() {
-  const isFunctions = new Array(arguments.length)
-  for (var i = 0; i < isFunctions.length; i++) {
-    isFunctions[i] = arguments[i]
-  }
-  if (!isFunctions.length) return
-  for (i = 0; i < isFunctions.length; i++) {
-    if (!isFunctions[i]()) return false
-  }
-  return true
-}
-
-// checks if all the 'is functions' passed as arguments are false
-function none() {
-  const isFunctions = new Array(arguments.length)
-  for (var i = 0; i < isFunctions.length; i++) {
-    isFunctions[i] = arguments[i]
-  }
-  if (!isFunctions.length) return
-  for (i = 0; i < isFunctions.length; i++) {
-    if (isFunctions[i]()) return false
-  }
-  return true
-}
-
-// returns true if one of the 'is functions' passed as argument is true
-function one() {
-  const isFunctions = new Array(arguments.length)
-  for (var i = 0; i < isFunctions.length; i++) {
-    isFunctions[i] = arguments[i]
-  }
-  if (!isFunctions.length) return
-  for (i = 0; i < isFunctions.length; i++) {
-    if (isFunctions[i]()) return true
-  }
-  return false
-}
-
-module.exports = {
-  renderer,
-  main,
-  osx,
-  macOS,
-  windows,
-  linux,
-  x86,
-  x64,
-  sandbox,
-  mas,
-  windowsStore,
-  all,
-  none,
-  one,
+'use strict';
+
+// Checks if we are in renderer process
+function renderer () {
+  return process.type === 'renderer'
+}
+
+// Checks if we are in main process
+function main() {
+  return process.type === 'browser'
+}
+
+// Checks if we are under Mac OS
+function osx() {
+  return process.platform === 'darwin'
+}
+
+// Checks if we are under Mac OS
+function macOS() {
+  return osx()
+}
+
+// Checks if we are under Windows OS
+function windows() {
+  return process.platform === 'win32'
+}
+
+// Checks if we are under Linux OS
+function linux() {
+  return process.platform === 'linux'
+}
+
+// Checks if we are the processor's arch is x86
+function x86() {
+  return process.arch === 'ia32'
+}
+
+// Checks if we are the processor's arch is x64
+function x64() {
+  return process.arch === 'x64'
+}
+
+// Checks if the app is running in a sandbox on macOS
+function sandbox() {
+  return 'APP_SANDBOX_CONTAINER_ID' in process.env
+}
+
+// Checks if the app is running as a Mac App Store build
+function mas() {
+  return process.mas === true
+}
+
+// Checks if the app is running as a Windows Store (appx) build
+function windowsStore() {
+  return process.windowsStore === true
+}
+
+// checks if all the 'is functions' passed as arguments are true
+function all() {
+  const isFunctions = new Array(arguments.length)
+  for (var i = 0; i < isFunctions.length; i++) {
+    isFunctions[i] = arguments[i]
+  }
+  if (!isFunctions.length) return
+  for (i = 0; i < isFunctions.length; i++) {
+    if (!isFunctions[i]()) return false
+  }
+  return true
+}
+
+// checks if all the 'is functions' passed as arguments are false
+function none() {
+  const isFunctions = new Array(arguments.length)
+  for (var i = 0; i < isFunctions.length; i++) {
+    isFunctions[i] = arguments[i]
+  }
+  if (!isFunctions.length) return
+  for (i = 0; i < isFunctions.length; i++) {
+    if (isFunctions[i]()) return false
+  }
+  return true
+}
+
+// returns true if one of the 'is functions' passed as argument is true
+function one() {
+  const isFunctions = new Array(arguments.length)
+  for (var i = 0; i < isFunctions.length; i++) {
+    isFunctions[i] = arguments[i]
+  }
+  if (!isFunctions.length) return
+  for (i = 0; i < isFunctions.length; i++) {
+    if (isFunctions[i]()) return true
+  }
+  return false
+}
+
+module.exports = {
+  renderer,
+  main,
+  osx,
+  macOS,
+  windows,
+  linux,
+  x86,
+  x64,
+  sandbox,
+  mas,
+  windowsStore,
+  all,
+  none,
+  one,
 };