);
- const showDebugInline = (environment = 'production') => {
- if (/production/i.test(environment)) return;
-
- const debugData = (
- <>
-
tabSession {JSON.stringify(tabSession)}
-
prefs: {JSON.stringify(prefs)}
-
appConfigPrefs: {JSON.stringify(appConfigPrefs)}
-
footerMessageIndex: {footerMessageIndex}
-
- );
-
- return (
-
-
- {isDebugDataVisible && debugData}
-
- );
- };
-
const reloadActiveTab = async (_activeTab = activeTab) => {
await chrome.tabs.reload(_activeTab.id);
};
@@ -254,7 +224,7 @@ function IndexPopupOld() {
};
const showFileUrlPermissionRequestMessage = (tabSession: TabSession, prefs, _activeTab = activeTab) => {
- if (!/chrome/i.test(process.env.PLASMO_TARGET) || !/^file:\/\//i.test(tabSession?.origin ?? activeTab?.url) || prefs) {
+ if (!/chrome/i.test(envService.PLASMO_TARGET) || !/^file:\/\//i.test(tabSession?.origin ?? activeTab?.url) || prefs) {
return null;
}
@@ -316,7 +286,8 @@ function IndexPopupOld() {
return (
<>
- {showDebugInline(process.env.NODE_ENV)}
+
+
{errorOccured ? (
showErrorMessage(openSettingsPage)
) : (
diff --git a/src/services/Logger.ts b/src/services/Logger.ts
index 582f4fd..624106c 100644
--- a/src/services/Logger.ts
+++ b/src/services/Logger.ts
@@ -3,6 +3,8 @@
* provide development utility functions for reporting errors, logging data and logging time
*/
+import { envService } from './envService';
+
/**
* @description stateMachine of debug to cantDebug states
*/
@@ -11,15 +13,11 @@ const debugStates = new Map([
['false', true],
]);
-/* eslint-disable no-console */
-const cantDebug = (debugState: string = 'false') => {
- const key = debugState.toLowerCase();
- return debugStates.has(key) && debugStates.get(key);
-};
+const cantDebug = (shouldDebug: boolean = false) => !shouldDebug;
const nullCallback = () => null;
-const maker =
(fn: T): T => (cantDebug(process.env.DEBUG) ? nullCallback : fn) as T;
+const maker = (fn: T): T => (envService.DEBUG ? nullCallback : fn) as T;
/**
*
@@ -27,7 +25,7 @@ const maker = (fn: T): T => (cantDebug(process.env.DEBUG) ? nullCallback : fn
* @returns {Function} end and display time when called in non production environment
*/
const logTime = (label) => {
- if (cantDebug(process.env.DEBUG)) return () => nullCallback;
+ if (cantDebug(envService.DEBUG)) return () => nullCallback;
console.time(label);
return () => console.timeEnd(label);
diff --git a/src/services/TrackEventService.ts b/src/services/TrackEventService.ts
index b035056..8cdb5e7 100644
--- a/src/services/TrackEventService.ts
+++ b/src/services/TrackEventService.ts
@@ -1,3 +1,4 @@
+import { envService } from './envService';
import Logger from './Logger';
export enum EventCategory {
@@ -8,9 +9,9 @@ export enum EventCategory {
function trackEvent(
eventData: { eventCategory: EventCategory; eventName: string; eventType: string; [key: string]: any },
- appData: { browser; version } = { browser: process.env.PLASMO_TARGET, version: process.env.VERSION },
+ appData = { browser: envService.PLASMO_TARGET, version: envService.VERSION },
date = new Date(),
- enableTracking = /true/.test(process.env.ENABLE_TRACKING),
+ enableTracking = envService.ENABLE_TRACKING,
) {
Logger.logInfo({ enableTracking });
if (!enableTracking) {
@@ -19,7 +20,7 @@ function trackEvent(
const params = new URLSearchParams({ ...{ time: date.toString(), time_iso: date.toISOString(), ...eventData }, ...appData });
Logger.logInfo('track-event', params.toString());
- return fetch(process.env.HOME_URL ?? 'https://jiffyreader.com' + `/track-event?${params.toString()}`);
+ return fetch(envService.HOME_URL ?? 'https://jiffyreader.com' + `/track-event?${params.toString()}`);
}
const TrackEventService = {
diff --git a/src/services/config.ts b/src/services/config.ts
index 00cef46..74a893d 100644
--- a/src/services/config.ts
+++ b/src/services/config.ts
@@ -1,6 +1,7 @@
+import { envService } from '~services/envService';
export const USER_PREF_STORE_KEY = 'prefStore';
export const APP_PREFS_STORE_KEY = 'appStore';
-export const STORAGE_AREA = ((process.env.PLASMO_TARGET as string).includes('firefox') && 'local') || 'sync';
+export const STORAGE_AREA = ((envService.PLASMO_TARGET as string).includes('firefox') && 'local') || 'sync';
export const COLOR_MODE_STATE_TRANSITIONS = [
[null, 'light'],
diff --git a/src/services/envService.ts b/src/services/envService.ts
new file mode 100644
index 0000000..f15c46f
--- /dev/null
+++ b/src/services/envService.ts
@@ -0,0 +1,81 @@
+import { z } from 'zod';
+
+const booleanMap = new Map<'true' | 'false' | undefined, boolean>([
+ ['true', true],
+ ['false', false],
+ [undefined, false],
+]);
+
+const env = {
+ PLASMO_VERSION: { value: process.env.PLASMO_VERSION, validator: z.string().optional() },
+ PLASMO_VERSION_NAME: { value: process.env.PLASMO_VERSION_NAME, validator: z.string().optional() },
+ PLASMO_TARGET: {
+ value: process.env.PLASMO_TARGET,
+ validator: z
+ .string()
+ .default('')
+ .transform((x) => x as typeof process.env.PLASMO_TARGET),
+ },
+ NODE_ENV: {
+ value: process.env.NODE_ENV,
+ validator: z
+ .string()
+ .optional()
+ .transform((x) => x as typeof process.env.NODE_ENV),
+ },
+ PLASMO_DEBUG: {
+ value: process.env.PLASMO_DEBUG,
+ validator: z
+ .boolean()
+ .or(
+ z
+ .enum(['true', 'false'])
+ // .optional()
+ // .default('true')
+ .transform((x) => booleanMap.get(x as keyof typeof booleanMap.keys)),
+ )
+ .default(false),
+ },
+ PLASMO_ENABLE_TRACKING: {
+ value: process.env.PLASMO_ENABLE_TRACKING,
+ validator: z
+ .boolean()
+ .or(
+ z
+ .enum(['true', 'false'])
+ .optional()
+ .default('false')
+ .transform((x) => booleanMap.get(x as keyof typeof booleanMap.keys)),
+ )
+ .default(false),
+ },
+ PLASMO_HOME_URL: { value: process.env.PLASMO_HOME_URL, validator: z.string().optional() },
+};
+
+type Env = typeof env;
+
+console.log({ env });
+
+let envSchema = z.object(Object.fromEntries(Object.entries(env).map(([key, { validator }]) => [key, validator])) as { [K in keyof Env]: Env[K]['validator'] });
+let envSelection = Object.fromEntries(Object.entries(env).map(([key, { value }]) => [key, value])) as (typeof process)['env'];
+let sourceEnv: z.infer;
+
+try {
+ sourceEnv = envSchema.parse(envSelection);
+} catch (error) {
+ const zerr = JSON.stringify((error as z.ZodError).flatten(), null, 2);
+ console.error(zerr);
+ throw new Error(zerr);
+}
+
+const envService = {
+ ...sourceEnv,
+ get isProduction(): boolean {
+ return /production/i.test(this.NODE_ENV);
+ },
+ get showDebugInfo(): boolean {
+ return !this.isProduction;
+ },
+};
+
+export { envService };
diff --git a/src/services/siteOverrides.ts b/src/services/siteOverrides.ts
index 20aa612..5e0efd5 100644
--- a/src/services/siteOverrides.ts
+++ b/src/services/siteOverrides.ts
@@ -6,6 +6,7 @@ import Logger from '~services/Logger';
const siteOverrides = {
'play.google.com': `[br-mode=on] reader-rendered-page { overflow: auto !important; }`,
+ 'reddit.com': 'br-span, br-bold, br-fixation, br-edge { visibility : visible !important; }',
};
/**
diff --git a/src/services/usePrefs.tsx b/src/services/usePrefs.tsx
index 676811e..beef80f 100644
--- a/src/services/usePrefs.tsx
+++ b/src/services/usePrefs.tsx
@@ -2,13 +2,15 @@ import { Storage, useStorage } from '@plasmohq/storage';
import type { Prefs, PrefStore, SetPrefsExternal } from 'index';
import { useEffect, useState } from 'react';
+import { APP_PREFS_STORE_KEY, STORAGE_AREA } from './config';
+import { envService } from './envService';
import Logger from './Logger';
import defaultPrefs from './preferences';
const PREF_STORE_SCOPES = ['global', 'local', 'reset'];
const PREF_LOG_STYLE = 'color: green; background: black;';
-const usePrefs = (getOrigin: () => Promise, initialize = false, target = process.env.PLASMO_TARGET ?? 'chrome'): [Prefs, SetPrefsExternal] => {
+const usePrefs = (getOrigin: () => Promise, initialize = false, target = envService.PLASMO_TARGET ?? 'chrome'): [Prefs, SetPrefsExternal] => {
const [privateOrigin, setPrivateOrigin] = useState(null);
const area = ((target as string).includes('firefox') && 'local') || 'sync';
@@ -89,3 +91,9 @@ const usePrefs = (getOrigin: () => Promise, initialize = false, target =
};
export default usePrefs;
+
+export const usePrefStorage = () =>
+ useStorage({
+ key: APP_PREFS_STORE_KEY,
+ area: STORAGE_AREA,
+ });