From ca2d46d209a0f5797beaf726dc1115d03f44cec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E8=89=AF=E4=BB=94?=
 <32487868+cijiugechu@users.noreply.github.com>
Date: Wed, 18 Jan 2023 20:30:02 +0800
Subject: [PATCH] refactor: use a standalone logger module instead of attaching
 it to `global`  (#40)

---
 src/api/idle.js         | 1 +
 src/index.js            | 4 +---
 src/launcher/inject.js  | 2 ++
 src/launcher/start.js   | 1 +
 src/lib/cdp.js          | 1 +
 src/lib/local/cdp.js    | 1 +
 src/lib/local/server.js | 1 +
 src/lib/logger.js       | 3 +++
 8 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 src/lib/logger.js

diff --git a/src/api/idle.js b/src/api/idle.js
index 9c972e1..8aaa830 100644
--- a/src/api/idle.js
+++ b/src/api/idle.js
@@ -1,4 +1,5 @@
 import { exec } from 'child_process';
+import { log } from '../lib/logger';
 
 const killProcesses = async pids => new Promise(resolve => exec(process.platform !== 'win32' ? `kill -9 ${pids.join(' ')}` : `taskkill /F ${pids.map(x => `/PID ${x}`).join(' ')}`, (e, out) => resolve(out)));
 
diff --git a/src/index.js b/src/index.js
index b47be43..bac024a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,3 @@
-const rgb = (r, g, b, msg) => `\x1b[38;2;${r};${g};${b}m${msg}\x1b[0m`;
-global.log = (...args) => console.log(`[${rgb(88, 101, 242, 'Gluon')}]`, ...args);
-
 import pkgJSON from '../package.json'
 
 process.versions.gluon = pkgJSON.version;
@@ -8,6 +5,7 @@ process.versions.gluon = pkgJSON.version;
 import { join, dirname, delimiter, sep, resolve, isAbsolute } from 'path';
 import { access, readdir } from 'fs/promises';
 import { fileURLToPath } from 'url';
+import { log } from './lib/logger.js';
 
 import Chromium from './browser/chromium.js';
 import Firefox from './browser/firefox.js';
diff --git a/src/launcher/inject.js b/src/launcher/inject.js
index 13b1edc..cb30922 100644
--- a/src/launcher/inject.js
+++ b/src/launcher/inject.js
@@ -1,3 +1,5 @@
+import { log } from '../lib/logger.js';
+
 import IPCApi from '../lib/ipc.js';
 import LocalCDP from '../lib/local/cdp.js';
 
diff --git a/src/launcher/start.js b/src/launcher/start.js
index 30ba94a..aa26276 100644
--- a/src/launcher/start.js
+++ b/src/launcher/start.js
@@ -1,4 +1,5 @@
 import { spawn } from 'child_process';
+import { log } from '../lib/logger.js';
 
 import ConnectCDP from '../lib/cdp.js';
 import InjectInto from './inject.js';
diff --git a/src/lib/cdp.js b/src/lib/cdp.js
index df79824..dda2306 100644
--- a/src/lib/cdp.js
+++ b/src/lib/cdp.js
@@ -1,5 +1,6 @@
 import WebSocket from 'ws';
 import { get } from 'http';
+import { log } from './logger';
 
 const logCDP = process.argv.includes('--cdp-logging');
 
diff --git a/src/lib/local/cdp.js b/src/lib/local/cdp.js
index d424fa6..5ff3544 100644
--- a/src/lib/local/cdp.js
+++ b/src/lib/local/cdp.js
@@ -1,5 +1,6 @@
 import { basename, dirname, extname, join } from 'path';
 import { readFile } from 'fs/promises';
+import { log } from '../logger';
 
 const generatePath = (pathname, indexFile) => {
   if (pathname === '/') return indexFile;
diff --git a/src/lib/local/server.js b/src/lib/local/server.js
index 6d6d6f8..1cc7e88 100644
--- a/src/lib/local/server.js
+++ b/src/lib/local/server.js
@@ -1,6 +1,7 @@
 import { basename, dirname, extname, join } from 'path';
 import { readFile } from 'fs/promises';
 import { createServer } from 'http';
+import { log } from '../logger';
 
 const generatePath = (pathname, indexFile) => {
   if (pathname === '/') return indexFile;
diff --git a/src/lib/logger.js b/src/lib/logger.js
new file mode 100644
index 0000000..ccc56ad
--- /dev/null
+++ b/src/lib/logger.js
@@ -0,0 +1,3 @@
+const rgb = (r, g, b, msg) => `\x1b[38;2;${r};${g};${b}m${msg}\x1b[0m`;
+
+export const log = (...args) => console.log(`[${rgb(88, 101, 242, 'Gluon')}]`, ...args);
\ No newline at end of file