plusui-native 0.2.4 → 0.2.5

package/templates/react/package.json.template

@@ -17,7 +17,8 @@
     "clean": "plusui clean"
   },
   "dependencies": {
-    "plusui-native": "^0.2.0"
+    "plusui-native": "^0.2.0",
+    "plusui-native-core": "^0.1.4"
   }
 }
 

package/templates/solid/CMakeLists.txt.template

@@ -24,7 +24,15 @@ endif()
 # Strategy: Check multiple locations for the Core library
 set(PLUSUI_FOUND FALSE)
 
-# Location 1: Local development (sibling to project inside PlusUI repo)
+# Location 1: Project-local Core directory
+set(PLUSUI_CORE_LOCAL "${CMAKE_SOURCE_DIR}/Core")
+if(EXISTS "${PLUSUI_CORE_LOCAL}/CMakeLists.txt")
+    message(STATUS "Found PlusUI Core at: ${PLUSUI_CORE_LOCAL}")
+    add_subdirectory("${PLUSUI_CORE_LOCAL}" "${CMAKE_BINARY_DIR}/plusui-core")
+    set(PLUSUI_FOUND TRUE)
+endif()
+
+# Location 2: Local development (sibling to project inside PlusUI repo)
 set(PLUSUI_CORE_DEV "${CMAKE_SOURCE_DIR}/../Core")
 if(EXISTS "${PLUSUI_CORE_DEV}/CMakeLists.txt")
     message(STATUS "Found PlusUI Core at: ${PLUSUI_CORE_DEV}")
@@ -32,17 +40,23 @@ if(EXISTS "${PLUSUI_CORE_DEV}/CMakeLists.txt")
     set(PLUSUI_FOUND TRUE)
 endif()
 
-# Location 2: Installed via npm (node_modules)
+# Location 3: Installed via npm (separate core package)
 if(NOT PLUSUI_FOUND)
-    set(PLUSUI_CORE_NPM "${CMAKE_SOURCE_DIR}/node_modules/plusui-native-core/Core")
+    set(PLUSUI_CORE_NPM "${CMAKE_SOURCE_DIR}/node_modules/plusui-native-core")
+    set(PLUSUI_CORE_NPM_LEGACY "${CMAKE_SOURCE_DIR}/node_modules/plusui-native-core/Core")
+
     if(EXISTS "${PLUSUI_CORE_NPM}/CMakeLists.txt")
         message(STATUS "Found PlusUI Core in node_modules: ${PLUSUI_CORE_NPM}")
         add_subdirectory("${PLUSUI_CORE_NPM}" "${CMAKE_BINARY_DIR}/plusui-core")
         set(PLUSUI_FOUND TRUE)
+    elseif(EXISTS "${PLUSUI_CORE_NPM_LEGACY}/CMakeLists.txt")
+        message(STATUS "Found PlusUI Core in node_modules (legacy): ${PLUSUI_CORE_NPM_LEGACY}")
+        add_subdirectory("${PLUSUI_CORE_NPM_LEGACY}" "${CMAKE_BINARY_DIR}/plusui-core")
+        set(PLUSUI_FOUND TRUE)
     endif()
 endif()
 
-# Location 3: Parent directory development structure
+# Location 4: Parent directory development structure
 if(NOT PLUSUI_FOUND)
     set(PLUSUI_CORE_PARENT "${CMAKE_SOURCE_DIR}/../../Core")
     if(EXISTS "${PLUSUI_CORE_PARENT}/CMakeLists.txt")
@@ -56,11 +70,13 @@ if(NOT PLUSUI_FOUND)
     message(FATAL_ERROR "
     PlusUI Core not found!
 
-    Make sure you have run 'npm install' or that this project is inside the PlusUI repository.
+                Install dependencies (npm install) or add a Core folder in this project root.
 
     Searched locations:
+            - ${PLUSUI_CORE_LOCAL}
       - ${PLUSUI_CORE_DEV}
-      - ${PLUSUI_CORE_NPM}
+            - ${PLUSUI_CORE_NPM}
+            - ${PLUSUI_CORE_NPM_LEGACY}
       - ${PLUSUI_CORE_PARENT}
     ")
 endif()
@@ -147,5 +163,5 @@ endif()
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
-
-
+
+

package/templates/solid/frontend/package.json.template

@@ -9,13 +9,12 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "solid-js": "^1.8.0",
-    "plusui-native-core": "{{PLUSUI_CORE_PATH}}"
+    "solid-js": "^1.8.0"
   },
   "devDependencies": {
     "typescript": "^5.3.0",
     "vite": "^5.0.0",
     "vite-plugin-solid": "^2.10.0"
   }
-}
-
+}
+

package/templates/solid/frontend/src/App.tsx

@@ -1,5 +1,5 @@
-import { createSignal, onMount } from 'solid-js';
-import { win, browser, router, app } from 'plusui-native-core';
+import { createSignal, onMount, Show } from 'solid-js';
+import { win, browser, router, app } from './plusui';
 
 // Define routes for your app (optional - for SPA routing)
 const routes = {
@@ -48,7 +48,6 @@ function App() {
   const handleGoBack = async () => await browser.goBack();
   const handleGoForward = async () => await browser.goForward();
   const handleReload = async () => await browser.reload();
-  const handleNavigate = async (url: string) => await browser.navigate(url);
 
   // Router navigation
   const handleGoHome = async () => await router.push('/');
@@ -129,5 +128,5 @@ function App() {
   );
 }
 
-export default App;
-
+export default App;
+

package/templates/solid/frontend/src/plusui.ts

@@ -0,0 +1,117 @@
+type InvokeFn = (method: string, args?: unknown[]) => Promise<unknown>;
+type PendingMap = Record<string, { resolve: (value: unknown) => void; reject: (reason?: unknown) => void }>;
+
+type WindowSize = { width: number; height: number };
+type WindowPosition = { x: number; y: number };
+type RouteMap = Record<string, string>;
+
+let _invoke: InvokeFn | null = null;
+let _pending: PendingMap = {};
+let _routes: RouteMap = {};
+
+function initBridge() {
+  if (typeof window === 'undefined') return;
+
+  const w = window as any;
+  if (typeof w.__invoke__ === 'function') {
+    _invoke = w.__invoke__ as InvokeFn;
+    return;
+  }
+
+  _pending = {};
+  w.__pending__ = _pending;
+
+  w.__invoke__ = (method: string, args?: unknown[]): Promise<unknown> => {
+    return new Promise((resolve, reject) => {
+      const id = Math.random().toString(36).slice(2, 11);
+      const request = JSON.stringify({ id, method, params: args ?? [] });
+
+      _pending[id] = { resolve, reject };
+
+      if (typeof w.__native_invoke__ === 'function') {
+        w.__native_invoke__(request);
+      } else {
+        setTimeout(() => {
+          delete _pending[id];
+          resolve(null);
+        }, 0);
+      }
+
+      setTimeout(() => {
+        if (_pending[id]) {
+          delete _pending[id];
+          reject(new Error(`${method} timed out`));
+        }
+      }, 30000);
+    });
+  };
+
+  w.__response__ = (id: string, result: unknown) => {
+    const pending = _pending[id];
+    if (pending) {
+      pending.resolve(result);
+      delete _pending[id];
+    }
+  };
+
+  _invoke = w.__invoke__ as InvokeFn;
+}
+
+async function invoke(method: string, args?: unknown[]) {
+  if (!_invoke) {
+    initBridge();
+    if (!_invoke) {
+      throw new Error('PlusUI bridge not initialized');
+    }
+  }
+
+  return _invoke(method, args);
+}
+
+initBridge();
+
+export const win = {
+  minimize: async () => invoke('window.minimize', []),
+  maximize: async () => invoke('window.maximize', []),
+  close: async () => invoke('window.close', []),
+  setPosition: async (x: number, y: number) => invoke('window.setPosition', [x, y]),
+  getSize: async (): Promise<WindowSize> => invoke('window.getSize', []) as Promise<WindowSize>,
+  getPosition: async (): Promise<WindowPosition> => invoke('window.getPosition', []) as Promise<WindowPosition>,
+};
+
+export const browser = {
+  getUrl: async (): Promise<string> => invoke('browser.getUrl', []) as Promise<string>,
+  goBack: async () => invoke('browser.goBack', []),
+  goForward: async () => invoke('browser.goForward', []),
+  reload: async () => invoke('browser.reload', []),
+  canGoBack: async (): Promise<boolean> => invoke('browser.canGoBack', []) as Promise<boolean>,
+  canGoForward: async (): Promise<boolean> => invoke('browser.canGoForward', []) as Promise<boolean>,
+  onNavigate: (handler: (url: string) => void) => {
+    if (typeof window === 'undefined') {
+      return () => {};
+    }
+
+    const eventHandler = (event: Event) => {
+      const custom = event as CustomEvent<{ url?: string }>;
+      const nextUrl = custom.detail?.url ?? '';
+      handler(nextUrl);
+    };
+
+    window.addEventListener('plusui:navigate', eventHandler);
+    return () => window.removeEventListener('plusui:navigate', eventHandler);
+  },
+};
+
+export const router = {
+  setRoutes: (routes: RouteMap) => {
+    _routes = routes;
+  },
+  push: async (path: string) => {
+    const target = _routes[path] ?? path;
+    return invoke('browser.navigate', [target]);
+  },
+};
+
+export const app = {
+  quit: async () => invoke('app.quit', []),
+};

package/templates/solid/main.cpp.template

@@ -172,7 +172,7 @@ int main() {
 // ============================================================================
 // FRONTEND API REFERENCE
 // ============================================================================
-// import { win, browser, router, app, display, clipboard } from 'plusui-native-core';
+// import { win, browser, router, app } from './frontend/src/plusui';
 //
 // WINDOW: win.minimize(), win.maximize(), win.close(), win.center(),
 //         win.setSize(w, h), win.setPosition(x, y), win.setTitle(str),
@@ -188,5 +188,5 @@ int main() {
 //
 // DISPLAY: display.getAll(), display.getPrimary(), display.getCurrent()
 //
-// CLIPBOARD: clipboard.writeText(str), clipboard.readText(), clipboard.clear()
-
+// CLIPBOARD: clipboard.writeText(str), clipboard.readText(), clipboard.clear()
+

package/templates/solid/package.json.template

@@ -17,7 +17,8 @@
     "clean": "plusui clean"
   },
   "dependencies": {
-    "plusui-native": "^0.2.0"
+    "plusui-native": "^0.2.0",
+    "plusui-native-core": "^0.1.4"
   }
 }