0.0.9 publish

index.d.ts

@@ -22,7 +22,7 @@ interface _ConsoleDetectorSetting extends _DetectorSetting {
 interface _Detector {
   setting: _DetectorSetting;
   readonly isDevtoolOpen: boolean;
-  readonly enable: boolean;
+  enable: boolean;
   setEnable: (enable: boolean) => void;
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "devtool-detector",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Simple browser devtool detector",
   "types": "index.d.ts",
   "main": "index.js",

src/detector.js

@@ -3,24 +3,19 @@ import DateDetector from './detectors/console-date'
 import RegDetector from './detectors/console-reg'
 import DebugDetector from './detectors/debug'
 
-const userAgent = globalThis.navigator.userAgent
+let _detector = null
 
-const isChrome = typeof globalThis.window.chrome !== 'undefined' || /chrome/i.test(userAgent) || /CriOS/i.test(userAgent)
-const isSafari = (typeof globalThis.window.safari !== 'undefined' && (globalThis.window.safari.pushNotification.toString() === '[object SafariRemoteNotification]')) || (/safari/i.test(userAgent) && !isChrome)
-const isFirefox = 'InstallTrigger' in globalThis.window || /firefox/i.test(userAgent)
+const userAgent = (() => {
+  if (globalThis.navigator) return globalThis.navigator.userAgent
+  else return ''
+})()
+
+const isChrome = typeof globalThis.chrome !== 'undefined' || /chrome/i.test(userAgent) || /CriOS/i.test(userAgent)
+const isSafari = (/safari/i.test(userAgent) && !isChrome) || (typeof globalThis.safari !== 'undefined' && (globalThis.safari.pushNotification.toString() === '[object SafariRemoteNotification]'))
+const isFirefox = 'InstallTrigger' in globalThis || /firefox/i.test(userAgent)
 const isIE = /trident/i.test(userAgent) || /msie/i.test(userAgent)
 const isEdgeLegacy = /edge/i.test(userAgent)
-const isWebkit = /webkit/i.test(userAgent) && !isEdge
-
-const getBrouserName = () => {
-  if (isIE) return 'ie'
-  if (isFirefox) return 'firefox'
-  if (isEdgeLegacy) return 'edge'
-  if (isSafari) return 'safari'
-  if (isChrome) return 'chrome'
-  if (isWebkit) return 'webkit'
-  return 'other'
-}
+const isWebkit = /webkit/i.test(userAgent) && !isEdgeLegacy
 
 const BrowserDetectorConfig = {
   chrome: 'debugger',
@@ -32,10 +27,19 @@ const BrowserDetectorConfig = {
   default: 'debugger'
 }
 
-Object.freeze(BrowserDetectorConfig)
+Object.seal(BrowserDetectorConfig)
 
-export { BrowserDetectorConfig }
-export const getDetector = () => {
+const getBrouserName = () => {
+  if (isIE) return 'ie'
+  if (isFirefox) return 'firefox'
+  if (isEdgeLegacy) return 'edgeLegacy'
+  if (isSafari) return 'safari'
+  if (isChrome) return 'chrome'
+  if (isWebkit) return 'webkit'
+  return 'other'
+}
+
+const defineDetector = () => {
   const detector = BrowserDetectorConfig[getBrouserName()]
   switch (detector) {
     case 'console-elem': return ElemDetector
@@ -44,4 +48,13 @@ export const getDetector = () => {
     case 'debugger':
     default: return DebugDetector
   }
+}
+
+export { BrowserDetectorConfig }
+export const getDetector = () => {
+  if (_detector) return _detector
+  else {
+    _detector = defineDetector()
+    return _detector
+  }
 }

src/detectors/console-date.js

@@ -11,8 +11,7 @@ const date = new Date()
 date.toString = () => {
   _isDetectOpen = true
   return ''
-};
-
+}
 
 const setting = {
   waitConsole: 10,
@@ -25,7 +24,8 @@ const detectStart = () => nextScopeTimeout = setTimeout(detectEvent, setting.nex
 
 const detectEvent = () => {
   _isDetectOpen = false
-  console.log(date)
+  if (console.table) console.table({ date: date })
+  else console.log(date)
   console.clear()
   waitConsoleTimeout = setTimeout(() => {
     if (_isDetectOpen !== _isDevtoolOpen) {
@@ -47,6 +47,9 @@ const Detector = {
   get enable() {
     return _isEnable
   },
+  set enable(enable) {
+    _isEnable = enable
+  },
   setEnable(enable) {
     if (enable === _isEnable) return
     if (enable) {

src/detectors/console-elem.js

@@ -12,7 +12,7 @@ Object.defineProperty(elem, 'id', {
   get() {
     _isDetectOpen = true
   },
-});
+})
 
 const setting = {
   waitConsole: 10,
@@ -25,7 +25,8 @@ const detectStart = () => nextScopeTimeout = setTimeout(detectEvent, setting.nex
 
 const detectEvent = () => {
   _isDetectOpen = false
-  console.log(elem)
+  if (console.table) console.table({ elem: elem })
+  else console.log(elem)
   console.clear()
   waitConsoleTimeout = setTimeout(() => {
     if (_isDetectOpen !== _isDevtoolOpen) {
@@ -47,6 +48,9 @@ const Detector = {
   get enable() {
     return _isEnable
   },
+  set enable(enable) {
+    _isEnable = enable
+  },
   setEnable(enable) {
     if (enable === _isEnable) return
     if (enable) {

src/detectors/console-reg.js

@@ -24,7 +24,8 @@ const detectStart = () => nextScopeTimeout = setTimeout(detectEvent, setting.nex
 
 const detectEvent = () => {
   _isDetectOpen = false
-  console.table({ reg: reg })
+  if (console.table) console.table({ reg: reg })
+  else console.log(reg)
   console.clear()
   waitConsoleTimeout = setTimeout(() => {
     if (_isDetectOpen !== _isDevtoolOpen) {
@@ -45,6 +46,9 @@ const Detector = {
   get enable() {
     return _isEnable
   },
+  set enable(enable) {
+    _isEnable = enable
+  },
   setEnable(enable) {
     if (enable === _isEnable) return
     if (enable) {

src/detectors/debug.js

@@ -67,6 +67,9 @@ const Detector = {
   get enable() {
     return _isEnable
   },
+  set enable(enable) {
+    _isEnable = enable
+  },
   setEnable(enable) {
     if (enable === _isEnable) return
     if (enable) {

src/listeners.js

@@ -1,5 +1,8 @@
-let listeners = []
+const listeners = []
 export default listeners
 export const addDetectListener = (listener) => { listeners.push(listener) }
-export const removeDetectListener = (listener) => { listeners = this.listeners.filter(l => l !== listener) }
-export const removeAllDetectListener = () => { listeners = [] }
+export const removeDetectListener = (listener) => {
+  const index = listeners.indexOf(listener)
+  if (index !== -1) listeners.splice(index, 1)
+}
+export const removeAllDetectListener = () => { array.splice(0, listeners.length) }

test/test.js

@@ -1,6 +1,6 @@
-requirejs(['../index.js'], ({ getDetector, addDetectListener }) => {
+requirejs(['../index.js'], ({ getDetector, addDetectListener, BrowserDetectorConfig }) => {
+  // BrowserDetectorConfig.chrome = 'console-date'
   const Detector = getDetector()
-  console.log(Detector)
   Detector.setEnable(true)
 
   addDetectListener((isDevtoolOpen) => {