@oxyhq/core 1.0.2 → 1.1.0

package/src/mixins/OxyServices.privacy.ts

@@ -3,6 +3,7 @@
  */
 import type { BlockedUser, RestrictedUser } from '../models/interfaces';
 import type { OxyServicesBase } from '../OxyServices.base';
+import { isDev } from '../shared/utils/debugUtils';
 
 export function OxyServicesPrivacyMixin<T extends typeof OxyServicesBase>(Base: T) {
   return class extends Base {
@@ -35,7 +36,7 @@ export function OxyServicesPrivacyMixin<T extends typeof OxyServicesBase>(Base:
         });
       } catch (error) {
         // If there's an error, assume not in list to avoid breaking functionality
-        if (__DEV__) {
+        if (isDev()) {
           console.warn('Error checking user list:', error);
         }
         return false;

package/src/mixins/OxyServices.security.ts

@@ -3,6 +3,7 @@
  */
 import type { OxyServicesBase } from '../OxyServices.base';
 import type { SecurityActivity, SecurityActivityResponse, SecurityEventType } from '../models/interfaces';
+import { isDev } from '../shared/utils/debugUtils';
 
 export function OxyServicesSecurityMixin<T extends typeof OxyServicesBase>(Base: T) {
   return class extends Base {
@@ -71,7 +72,7 @@ export function OxyServicesSecurityMixin<T extends typeof OxyServicesBase>(Base:
       } catch (error) {
         // Don't throw - logging failures shouldn't break user flow
         // But log for monitoring
-        if (__DEV__) {
+        if (isDev()) {
           console.warn('[OxyServices] Failed to log private key exported event:', error);
         }
       }
@@ -93,7 +94,7 @@ export function OxyServicesSecurityMixin<T extends typeof OxyServicesBase>(Base:
       } catch (error) {
         // Don't throw - logging failures shouldn't break user flow
         // But log for monitoring
-        if (__DEV__) {
+        if (isDev()) {
           console.warn('[OxyServices] Failed to log backup created event:', error);
         }
       }

package/src/shared/utils/__tests__/debugUtils.test.ts

@@ -0,0 +1,55 @@
+/**
+ * Tests for isDev() utility.
+ *
+ * These tests manipulate the global __DEV__ and process.env.NODE_ENV
+ * to verify isDev() works across RN, Node, and browser-like environments.
+ */
+
+describe('isDev', () => {
+  const originalDev = (globalThis as any).__DEV__;
+  const originalNodeEnv = process.env.NODE_ENV;
+
+  afterEach(() => {
+    // Restore globals
+    if (originalDev === undefined) {
+      delete (globalThis as any).__DEV__;
+    } else {
+      (globalThis as any).__DEV__ = originalDev;
+    }
+    process.env.NODE_ENV = originalNodeEnv;
+
+    // Clear module cache so isDev re-evaluates
+    jest.resetModules();
+  });
+
+  async function loadIsDev() {
+    const mod = await import('../debugUtils');
+    return mod.isDev;
+  }
+
+  it('returns true when __DEV__ is true (React Native)', async () => {
+    (globalThis as any).__DEV__ = true;
+    const isDev = await loadIsDev();
+    expect(isDev()).toBe(true);
+  });
+
+  it('returns false when __DEV__ is false', async () => {
+    (globalThis as any).__DEV__ = false;
+    const isDev = await loadIsDev();
+    expect(isDev()).toBe(false);
+  });
+
+  it('falls back to NODE_ENV when __DEV__ is undefined', async () => {
+    delete (globalThis as any).__DEV__;
+    process.env.NODE_ENV = 'development';
+    const isDev = await loadIsDev();
+    expect(isDev()).toBe(true);
+  });
+
+  it('returns false when NODE_ENV is production and __DEV__ is undefined', async () => {
+    delete (globalThis as any).__DEV__;
+    process.env.NODE_ENV = 'production';
+    const isDev = await loadIsDev();
+    expect(isDev()).toBe(false);
+  });
+});

package/src/shared/utils/debugUtils.ts

@@ -14,7 +14,12 @@ declare const __DEV__: boolean | undefined;
  * Check if running in development mode
  */
 export const isDev = (): boolean => {
-  return typeof __DEV__ !== 'undefined' && __DEV__;
+  if (typeof __DEV__ !== 'undefined') return __DEV__;
+  try {
+    return typeof process !== 'undefined' && process.env?.NODE_ENV === 'development';
+  } catch {
+    return false;
+  }
 };
 
 /**

package/src/utils/deviceManager.ts

@@ -42,8 +42,10 @@ export class DeviceManager {
   }> {
     if (this.isReactNative()) {
       try {
-        const asyncStorageModule = await import('@react-native-async-storage/async-storage');
-        const storage = (asyncStorageModule.default as unknown) as import('@react-native-async-storage/async-storage').AsyncStorageStatic;
+        // Variable indirection prevents bundlers (Vite, webpack) from statically resolving this
+        const moduleName = '@react-native-async-storage/async-storage';
+        const asyncStorageModule = await import(moduleName);
+        const storage = asyncStorageModule.default as unknown as { getItem: (key: string) => Promise<string | null>; setItem: (key: string, value: string) => Promise<void>; removeItem: (key: string) => Promise<void> };
         return {
           getItem: storage.getItem.bind(storage),
           setItem: storage.setItem.bind(storage),

package/src/utils/platform.ts

@@ -108,8 +108,9 @@ export async function initPlatformFromReactNative(): Promise<void> {
   }
 
   try {
-    // Dynamic import to avoid bundler issues
-    const { Platform } = await import('react-native');
+    // Variable indirection prevents bundlers (Vite, webpack) from statically resolving this
+    const moduleName = 'react-native';
+    const { Platform } = await import(moduleName);
     setPlatformOS(Platform.OS as PlatformOS);
   } catch {
     // react-native not available, use detected platform