plusui-native-core 0.1.65 → 0.1.68

package/Core/Features/Display/display.ts

@@ -1,116 +1,142 @@
-import { connect } from '../Connection/connect';
-
-export interface DisplayMode {
-  width: number;
-  height: number;
-  refreshRate: number;
-  bitDepth: number;
-}
-
-export interface DisplayBounds {
-  x: number;
-  y: number;
-  width: number;
-  height: number;
-}
-
-export interface DisplayResolution {
-  width: number;
-  height: number;
-}
-
-export interface Display {
-  id: number;
-  name: string;
-  isPrimary: boolean;
-  bounds: DisplayBounds;
-  workArea: DisplayBounds;
-  resolution: DisplayResolution;
-  currentMode: DisplayMode;
-  scaleFactor: number;
-  rotation: number;
-  isInternal: boolean;
-  isConnected: boolean;
-}
-
-export class DisplayAPI {
-  public readonly connect = connect.feature('display');
-
-  constructor(
-    private invokeFn: (name: string, args?: unknown[]) => Promise<unknown>
-  ) {}
-
-  on<TData = unknown>(name: string, callback: (payload: TData) => void): () => void {
-    return this.connect.on<TData>(name, callback);
-  }
-
-  emit<TIn = Record<string, unknown>>(name: string, payload: TIn): void {
-    this.connect.emit<TIn>(name, payload);
-  }
-
-  async getAllDisplays(): Promise<Display[]> {
-    return await this.invokeFn<Display[]>('display.getAllDisplays', []);
-  }
-
-  async getPrimaryDisplay(): Promise<Display> {
-    return await this.invokeFn<Display>('display.getPrimaryDisplay', []);
-  }
-
-  async getDisplayAt(x: number, y: number): Promise<Display> {
-    return await this.invokeFn<Display>('display.getDisplayAt', [x, y]);
-  }
-
-  async getDisplayAtCursor(): Promise<Display> {
-    return await this.invokeFn<Display>('display.getDisplayAtCursor', []);
-  }
-
-  async getDisplayById(id: number): Promise<Display> {
-    return await this.invokeFn<Display>('display.getDisplayById', [id]);
-  }
-
-  async setDisplayMode(displayId: number, mode: DisplayMode): Promise<boolean> {
-    return await this.invokeFn<boolean>('display.setDisplayMode', [displayId, mode]);
-  }
-
-  async setPosition(displayId: number, x: number, y: number): Promise<boolean> {
-    return await this.invokeFn<boolean>('display.setPosition', [displayId, x, y]);
-  }
-
-  async turnOff(displayId: number): Promise<boolean> {
-    return await this.invokeFn<boolean>('display.turnOff', [displayId]);
-  }
-
-  async getScreenWidth(): Promise<number> {
-    return await this.invokeFn<number>('screen.getWidth', []);
-  }
-
-  async getScreenHeight(): Promise<number> {
-    return await this.invokeFn<number>('screen.getHeight', []);
-  }
-
-  async getScaleFactor(): Promise<number> {
-    return await this.invokeFn<number>('screen.getScaleFactor', []);
-  }
-
-  async getRefreshRate(): Promise<number> {
-    return await this.invokeFn<number>('screen.getRefreshRate', []);
-  }
-
-  onDisplayConnected(callback: (display: Display) => void): () => void {
-    return () => {};
-  }
-
-  onDisplayDisconnected(callback: (displayId: number) => void): () => void {
-    return () => {};
-  }
-
-  onDisplayChanged(callback: (display: Display) => void): () => void {
-    return () => {};
-  }
-}
-
-export function createDisplayAPI(invokeFn: (name: string, args?: unknown[]) => Promise<unknown>): DisplayAPI {
-  return new DisplayAPI(invokeFn);
-}
-
-export default DisplayAPI;
+/**
+ * Display API - Display/screen management
+ * 
+ * Direct method calls - no .on/.emit
+ * 
+ * Usage:
+ *   import { display } from '@plusui/api';
+ *   
+ *   const displays = await display.getAllDisplays();
+ *   const primary = await display.getPrimaryDisplay();
+ *   display.onChanged((d) => { ... });
+ */
+
+export interface DisplayMode {
+  width: number;
+  height: number;
+  refreshRate: number;
+  bitDepth: number;
+}
+
+export interface DisplayBounds {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
+
+export interface DisplayResolution {
+  width: number;
+  height: number;
+}
+
+export interface Display {
+  id: number;
+  name: string;
+  isPrimary: boolean;
+  bounds: DisplayBounds;
+  workArea: DisplayBounds;
+  resolution: DisplayResolution;
+  currentMode: DisplayMode;
+  scaleFactor: number;
+  rotation: number;
+  isInternal: boolean;
+  isConnected: boolean;
+}
+
+let _invoke: ((name: string, args?: unknown[]) => Promise<unknown>) | null = null;
+let _event: ((event: string, callback: (...args: unknown[]) => void) => () => void) | null = null;
+
+export function setInvokeFn(fn: (name: string, args?: unknown[]) => Promise<unknown>) {
+  _invoke = fn;
+}
+
+export function setEventFn(fn: (event: string, callback: (...args: unknown[]) => void) => () => void) {
+  _event = fn;
+}
+
+async function invoke<T = unknown>(name: string, args?: unknown[]): Promise<T> {
+  if (!_invoke) {
+    if (typeof window !== 'undefined' && (window as any).__invoke__) {
+      _invoke = (window as any).__invoke__;
+    } else {
+      throw new Error('Display API not initialized');
+    }
+  }
+  return _invoke!(name, args) as Promise<T>;
+}
+
+function eventHandler(event: string, callback: (...args: unknown[]) => void): () => void {
+  if (!_event) {
+    if (typeof window !== 'undefined' && (window as any).__on__) {
+      _event = (window as any).__on__;
+    } else {
+      return () => {};
+    }
+  }
+  return _event!(event, callback);
+}
+
+export const display = {
+  async getAllDisplays(): Promise<Display[]> {
+    return invoke<Display[]>('display.getAllDisplays');
+  },
+
+  async getPrimaryDisplay(): Promise<Display> {
+    return invoke<Display>('display.getPrimaryDisplay');
+  },
+
+  async getDisplayAt(x: number, y: number): Promise<Display> {
+    return invoke<Display>('display.getDisplayAt', [x, y]);
+  },
+
+  async getDisplayAtCursor(): Promise<Display> {
+    return invoke<Display>('display.getDisplayAtCursor');
+  },
+
+  async getDisplayById(id: number): Promise<Display> {
+    return invoke<Display>('display.getDisplayById', [id]);
+  },
+
+  async setDisplayMode(displayId: number, mode: DisplayMode): Promise<boolean> {
+    return invoke<boolean>('display.setDisplayMode', [displayId, mode]);
+  },
+
+  async setPosition(displayId: number, x: number, y: number): Promise<boolean> {
+    return invoke<boolean>('display.setPosition', [displayId, x, y]);
+  },
+
+  async turnOff(displayId: number): Promise<boolean> {
+    return invoke<boolean>('display.turnOff', [displayId]);
+  },
+
+  async getScreenWidth(): Promise<number> {
+    return invoke<number>('screen.getWidth');
+  },
+
+  async getScreenHeight(): Promise<number> {
+    return invoke<number>('screen.getHeight');
+  },
+
+  async getScaleFactor(): Promise<number> {
+    return invoke<number>('screen.getScaleFactor');
+  },
+
+  async getRefreshRate(): Promise<number> {
+    return invoke<number>('screen.getRefreshRate');
+  },
+
+  onConnected(callback: (display: Display) => void): () => void {
+    return eventHandler('display:connected', callback as (...args: unknown[]) => void);
+  },
+
+  onDisconnected(callback: (displayId: number) => void): () => void {
+    return eventHandler('display:disconnected', callback as (...args: unknown[]) => void);
+  },
+
+  onChanged(callback: (display: Display) => void): () => void {
+    return eventHandler('display:changed', callback as (...args: unknown[]) => void);
+  },
+};
+
+export default display;