Comparing version 0.0.7 to 0.0.8
@@ -18,2 +18,6 @@ /** | ||
} | ||
declare interface Network { | ||
ip?: string; | ||
speed?: number; | ||
} | ||
export declare class BaseInfo extends Info { | ||
@@ -23,4 +27,3 @@ readonly os: string; | ||
readonly ua: string; | ||
ip: string | undefined; | ||
localtime: DateTime | undefined; | ||
localtime?: DateTime; | ||
/** | ||
@@ -41,3 +44,3 @@ * 原始屏幕分辨率信息 | ||
*/ | ||
network: number; | ||
network?: Network; | ||
constructor(os: string, browser: any, ua: string, screen: ScreenInfo, language: string, processor: number); | ||
@@ -65,2 +68,3 @@ } | ||
} | ||
export declare function getNetwork(): Promise<Network>; | ||
/** | ||
@@ -67,0 +71,0 @@ * 基础信息检测 |
@@ -34,6 +34,2 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { | ||
super(); | ||
/** | ||
* 网速 | ||
*/ | ||
this.network = 0; | ||
this.os = os; | ||
@@ -99,14 +95,4 @@ this.browser = browser; | ||
}; | ||
/** | ||
* 基础信息检测 | ||
*/ | ||
export function getBaseInfo() { | ||
export function getNetwork() { | ||
return __awaiter(this, void 0, void 0, function* () { | ||
let ua = UA.parse(navigator.userAgent); | ||
let os = ua.os; | ||
let browser = ua.browser; | ||
let screen = new ScreenInfo(window.screen.width * window.devicePixelRatio, window.screen.height * window.devicePixelRatio); | ||
let language = navigator.language; | ||
let processor = navigator.hardwareConcurrency; | ||
let info = new BaseInfo(ua.os, { name: ua.browser, version: ua.version }, navigator.userAgent, screen, navigator.language, navigator.hardwareConcurrency); | ||
const testNetwork = () => { | ||
@@ -127,2 +113,14 @@ return new Promise(resolve => { | ||
}; | ||
const getIp = () => { | ||
return new Promise(resolve => { | ||
win.ipCallback = function (info) { | ||
resolve(info.ip); | ||
}; | ||
let script = document.createElement('script'); | ||
script.async = true; | ||
script.src = 'https://www.taobao.com/help/getip.php'; | ||
script.onerror = () => resolve(void 0); | ||
document.head.append(script); | ||
}); | ||
}; | ||
// 网速测试10次 取平均数 | ||
@@ -134,3 +132,21 @@ let size = 10; | ||
} | ||
info.network = rs.reduce((total, num) => total + num) / size; | ||
return { | ||
ip: yield getIp(), | ||
speed: rs.reduce((total, num) => total + num) / size | ||
}; | ||
}); | ||
} | ||
/** | ||
* 基础信息检测 | ||
*/ | ||
export function getBaseInfo() { | ||
return __awaiter(this, void 0, void 0, function* () { | ||
let ua = UA.parse(navigator.userAgent); | ||
let os = ua.os; | ||
let browser = ua.browser; | ||
let screen = new ScreenInfo(window.screen.width * window.devicePixelRatio, window.screen.height * window.devicePixelRatio); | ||
let language = navigator.language; | ||
let processor = navigator.hardwareConcurrency; | ||
let info = new BaseInfo(ua.os, { name: ua.browser, version: ua.version }, navigator.userAgent, screen, navigator.language, navigator.hardwareConcurrency); | ||
info.network = yield getNetwork(); | ||
// 获取地区 与 时间 | ||
@@ -143,15 +159,2 @@ let now = new Date(); | ||
}; | ||
const getIp = () => { | ||
return new Promise(resolve => { | ||
win.ipCallback = function (info) { | ||
resolve(info.ip); | ||
}; | ||
let script = document.createElement('script'); | ||
script.async = true; | ||
script.src = 'https://www.taobao.com/help/getip.php'; | ||
script.onerror = () => resolve(void 0); | ||
document.head.append(script); | ||
}); | ||
}; | ||
info.ip = yield getIp(); | ||
return info; | ||
@@ -254,5 +257,3 @@ }); | ||
handle(video); | ||
const stop = () => { | ||
stream.getTracks()[0].stop(); | ||
}; | ||
const stop = () => stream.getTracks()[0].stop(); | ||
return { | ||
@@ -280,3 +281,3 @@ yes: () => { | ||
testSpeaker(handle) { | ||
let src = "https://web.sdk.qcloud.com/trtc/webrtc/assets/testspeak.mp3"; | ||
let src = "https://cdn.zhiper.com/testspeak.mp3"; | ||
let audio = document.createElement('audio'); | ||
@@ -283,0 +284,0 @@ audio.controls = true; |
{ | ||
"name": "detection", | ||
"version": "0.0.7", | ||
"version": "0.0.8", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "main": "./lib/index", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
14201
398