7 files changed, 82 insertions, 16 deletions

diff --git a/packages/service-preload/.eslintrc.cjs b/packages/service-preload/.eslintrc.cjs
new file mode 100644
index 0000000..02fab21
--- /dev/null
+++ b/packages/service-preload/.eslintrc.cjs
@@ -0,0 +1,6 @@
+module.exports = {
+  env: {
+    node: true,
+    browser: true,
+  },
+};
diff --git a/packages/service-preload/esbuild.config.js b/packages/service-preload/esbuild.config.js
index b73a071..66f5e84 100644
--- a/packages/service-preload/esbuild.config.js
+++ b/packages/service-preload/esbuild.config.js
@@ -1,8 +1,8 @@
 import { chrome } from '../../config/buildConstants.js';
-import { getConfig } from '../../config/esbuildConfig.js';
-import { fileURLToDirname } from '../../config/utils.js';
+import fileURLToDirname from '../../config/fileURLToDirname.js';
+import getEsbuildConfig from '../../config/getEsbuildConfig.js';
 
-export default getConfig({
+export default getEsbuildConfig({
   absWorkingDir: fileURLToDirname(import.meta.url),
   entryPoints: [
     'src/index.ts',
diff --git a/packages/service-preload/package.json b/packages/service-preload/package.json
index 26215a3..14717f8 100644
--- a/packages/service-preload/package.json
+++ b/packages/service-preload/package.json
@@ -5,14 +5,12 @@
   "type": "module",
   "types": "dist-types/index.d.ts",
   "scripts": {
-    "typecheck": "tsc"
+    "typecheck:workspace": "yarn g:typecheck"
   },
   "dependencies": {
     "@sophie/service-shared": "workspace:*",
-    "electron": "16.0.6"
-  },
-  "devDependencies": {
-    "rimraf": "^3.0.2",
-    "typescript": "^4.5.4"
+    "electron": "16.0.6",
+    "loglevel": "^1.8.0",
+    "loglevel-plugin-prefix": "^0.8.4"
   }
 }
diff --git a/packages/service-preload/src/index.ts b/packages/service-preload/src/index.ts
index d1ea13c..2bbfefd 100644
--- a/packages/service-preload/src/index.ts
+++ b/packages/service-preload/src/index.ts
@@ -18,8 +18,12 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { ipcRenderer, webFrame } from 'electron';
 import { ServiceToMainIpcMessage, webSource } from '@sophie/service-shared';
+import { ipcRenderer, webFrame } from 'electron';
+
+import { getLogger } from './utils/log';
+
+const log = getLogger('index');
 
 if (webFrame.parent === null) {
   // Inject CSS to simulate `browserView.setBackgroundColor`.
@@ -49,14 +53,14 @@ if (webFrame.parent === null) {
  * @see https://www.electronjs.org/docs/latest/api/web-contents#contentsexecutejavascriptinisolatedworldworldid-scripts-usergesture
  */
 async function fetchAndExecuteInjectScript(): Promise<void> {
-  const apiExposedResponse = await ipcRenderer.invoke(
+  const apiExposedResponse: unknown = await ipcRenderer.invoke(
     ServiceToMainIpcMessage.ApiExposedInMainWorld,
   );
   const injectSource = webSource.parse(apiExposedResponse);
   // Isolated world 0 is the main world.
-  return webFrame.executeJavaScriptInIsolatedWorld(0, [injectSource]);
+  await webFrame.executeJavaScriptInIsolatedWorld(0, [injectSource]);
 }
 
 fetchAndExecuteInjectScript().catch((err) => {
-  console.log('Failed to fetch inject source:', err);
+  log.error('Failed to fetch inject source:', err);
 });
diff --git a/packages/service-preload/src/utils/log.ts b/packages/service-preload/src/utils/log.ts
new file mode 100644
index 0000000..0c35319
--- /dev/null
+++ b/packages/service-preload/src/utils/log.ts
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C)  2022 Kristóf Marussy <kristof@marussy.com>
+ *
+ * This file is part of Sophie.
+ *
+ * Sophie is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import loglevel, { Logger } from 'loglevel';
+import prefix from 'loglevel-plugin-prefix';
+
+if (import.meta.env?.DEV) {
+  loglevel.setLevel('debug');
+} else {
+  loglevel.setLevel('info');
+}
+
+prefix.reg(loglevel);
+prefix.apply(loglevel, {
+  format(level, name, timestamp) {
+    const timeStr = timestamp.toString();
+    const nameStr = typeof name === 'undefined' ? '' : ` ${name}`;
+    return `[${timeStr}] ${level}${nameStr}:`;
+  },
+});
+
+export function getLogger(loggerName: string): Logger {
+  return loglevel.getLogger(loggerName);
+}
+
+export function silenceLogger(): void {
+  loglevel.disableAll();
+  const loggers = loglevel.getLoggers();
+  Object.keys(loggers).forEach((loggerName) => {
+    loggers[loggerName].disableAll();
+  });
+}
diff --git a/packages/service-preload/tsconfig.json b/packages/service-preload/tsconfig.json
index 638690b..0372dde 100644
--- a/packages/service-preload/tsconfig.json
+++ b/packages/service-preload/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../config/tsconfig.base.json",
   "compilerOptions": {
     "noEmit": true,
     "lib": [
@@ -10,10 +10,12 @@
   },
   "references": [
     {
-      "path": "../service-shared"
+      "path": "../service-shared/tsconfig.build.json"
     }
   ],
   "include": [
-    "src/**/*.ts"
+    "src/**/*.ts",
+    "types/**/*.ts",
+    "esbuild.config.js"
   ]
 }
diff --git a/packages/service-preload/types/importMeta.d.ts b/packages/service-preload/types/importMeta.d.ts
new file mode 100644
index 0000000..9b73170
--- /dev/null
+++ b/packages/service-preload/types/importMeta.d.ts
@@ -0,0 +1,7 @@
+interface ImportMeta {
+  env: {
+    DEV: boolean;
+    MODE: string;
+    PROD: boolean;
+  }
+}