@couch-kit/host 0.6.0 → 1.1.0

package/README.md

@@ -22,7 +22,28 @@ The server-side library for React Native TV applications. This package turns you
 bun add @couch-kit/host
 ```
 
-> **Note:** This library includes native dependencies (`react-native-tcp-socket`, `react-native-fs`, etc.). React Native's autolinking will handle the setup for Android. Ensure your `android/build.gradle` is configured correctly if you encounter build issues.
+Then install the required peer dependencies:
+
+```bash
+npx expo install expo-file-system expo-network
+bun add react-native-tcp-socket
+```
+
+> **Note:** This library requires Expo modules (`expo-file-system`, `expo-network`) and `react-native-tcp-socket` as peer dependencies. These must be installed in your consumer app. React Native's autolinking will handle native setup automatically.
+
+## Compatibility
+
+| Dependency                   | Minimum Version |
+| ---------------------------- | --------------- |
+| `react`                      | `>= 18.2.0`     |
+| `react-native`               | `>= 0.72.0`     |
+| `react-native-nitro-modules` | `>= 0.33.0`     |
+| `expo`                       | `>= 51.0.0`     |
+| `expo-file-system`           | `>= 17.0.0`     |
+| `expo-network`               | `>= 7.0.0`      |
+| `react-native-tcp-socket`    | `>= 6.0.0`      |
+
+> **New Architecture:** This package supports React Native's New Architecture (Fabric/TurboModules) via React Native 0.83+.
 
 ## Usage
 
@@ -36,7 +57,7 @@ Config:
 - `reducer`: `(state, action) => state` (shared reducer)
 - `port?`: HTTP static server port (default `8080`)
 - `wsPort?`: WebSocket game server port (default `8082`)
-- `staticDir?`: absolute path to the directory of static files to serve. On Android, APK assets live inside a zip archive and cannot be served directly — use this to point to a writable filesystem path where you've extracted the `www/` assets at runtime. Defaults to `${RNFS.MainBundlePath}/www`.
+- `staticDir?`: absolute path to the directory of static files to serve. **Required on Android** — APK assets live inside a zip archive and cannot be served directly, so use this to point to a writable filesystem path where you've extracted the `www/` assets at runtime. On iOS, defaults to the bundle directory + `/www`.
 - `devMode?`: if true, do not start the TV static file server; instead point phones at `devServerUrl`
 - `devServerUrl?`: URL of your laptop dev server (e.g. `http://192.168.1.50:5173`)
 - `debug?`: enable verbose logs
@@ -148,6 +169,6 @@ Important: when the controller is served from the laptop, the client-side hook c
 
 ## Bundling / Assets
 
-In production, the host serves static controller assets from `${RNFS.MainBundlePath}/www`.
+In production, the host serves static controller assets from the iOS bundle directory + `/www` by default. On Android, `staticDir` must be provided since bundle assets live inside the APK.
 
 The CLI `couch-kit bundle` copies your web build output into `android/app/src/main/assets/www` (default). Ensure your app packaging makes those assets available under the expected `www` folder.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@couch-kit/host",
-  "version": "0.6.0",
+  "version": "1.1.0",
   "description": "React Native host for local multiplayer party games on Android TV — WebSocket server, state management, and static file serving",
   "license": "MIT",
   "repository": {
@@ -33,13 +33,7 @@
   "files": [
     "src",
     "lib",
-    "android",
-    "ios",
-    "cpp",
-    "*.podspec",
     "!lib/typescript/example",
-    "!android/build",
-    "!ios/build",
     "!**/__tests__",
     "!**/__fixtures__",
     "!**/__mocks__"
@@ -54,22 +48,22 @@
     "@couch-kit/core": "0.3.3",
     "buffer": "^6.0.3",
     "js-sha1": "^0.7.0",
-    "react-native-fs": "^2.20.0",
-    "react-native-network-info": "^5.2.1",
-    "react-native-nitro-http-server": "^1.5.4",
-    "react-native-tcp-socket": "^6.0.6"
+    "react-native-nitro-http-server": "^1.5.4"
   },
   "devDependencies": {
-    "@types/react": "^18.2.0",
-    "@types/react-native": "^0.72.0",
-    "react": "18.2.0",
-    "react-native": "0.72.6",
+    "@types/react": "^19.1.1",
+    "react": "19.0.4",
+    "react-native": "0.83.2",
     "del-cli": "^5.1.0",
     "jest": "^29.7.0"
   },
   "peerDependencies": {
     "react": ">=18.2.0",
     "react-native": ">=0.72.0",
-    "react-native-nitro-modules": ">=0.33.0"
+    "react-native-nitro-modules": ">=0.33.0",
+    "expo": ">=51.0.0",
+    "expo-file-system": ">=17.0.0",
+    "expo-network": ">=7.0.0",
+    "react-native-tcp-socket": ">=6.0.0"
   }
 }

package/src/assets.ts

@@ -0,0 +1,114 @@
+import { useEffect, useState } from "react";
+import {
+  documentDirectory,
+  getInfoAsync,
+  deleteAsync,
+  makeDirectoryAsync,
+  copyAsync,
+} from "expo-file-system/legacy";
+import { Platform } from "react-native";
+import { toErrorMessage } from "@couch-kit/core";
+
+export interface AssetManifest {
+  files: string[];
+}
+
+export interface ExtractAssetsResult {
+  /** The filesystem path to the extracted www directory, or undefined if not ready */
+  staticDir: string | undefined;
+  /** Whether extraction is in progress */
+  loading: boolean;
+  /** Error message if extraction failed */
+  error: string | null;
+}
+
+/**
+ * Extracts bundled web assets from the APK to the filesystem so the native
+ * HTTP server can serve them.
+ *
+ * On Android, assets live inside the APK and cannot be served directly by
+ * a native HTTP server. This hook copies each file listed in the manifest
+ * from `asset:///www/<file>` to `${documentDirectory}www/<file>`.
+ *
+ * On iOS, assets are accessible from the bundle directory, so extraction
+ * is skipped and `staticDir` is returned as `undefined` (the server falls
+ * back to the bundle path).
+ *
+ * @param manifest - The asset manifest generated by `couch-kit bundle`.
+ *                   Contains a `files` array listing all relative paths.
+ */
+export function useExtractAssets(manifest: AssetManifest): ExtractAssetsResult {
+  const [staticDir, setStaticDir] = useState<string | undefined>(undefined);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+
+  useEffect(() => {
+    // iOS: skip extraction, server uses bundle path fallback
+    if (Platform.OS !== "android") {
+      setLoading(false);
+      return;
+    }
+
+    let cancelled = false;
+
+    const extractAssets = async () => {
+      try {
+        if (!documentDirectory) {
+          throw new Error("Document directory is not available");
+        }
+
+        const targetDir = `${documentDirectory}www/`;
+
+        // Clean previous extraction to ensure fresh assets after app updates
+        const dirInfo = await getInfoAsync(targetDir);
+        if (dirInfo.exists) {
+          await deleteAsync(targetDir, { idempotent: true });
+        }
+
+        // Create the root target directory
+        await makeDirectoryAsync(targetDir, { intermediates: true });
+
+        // Copy each file from APK assets to filesystem
+        for (const file of manifest.files) {
+          if (cancelled) return;
+
+          const sourceUri = `asset:///www/${file}`;
+          const destUri = `${targetDir}${file}`;
+
+          // Ensure subdirectory exists (e.g., "assets/" in "assets/index.js")
+          const lastSlash = file.lastIndexOf("/");
+          if (lastSlash > 0) {
+            const subDir = `${targetDir}${file.substring(0, lastSlash)}`;
+            await makeDirectoryAsync(subDir, { intermediates: true });
+          }
+
+          await copyAsync({ from: sourceUri, to: destUri });
+        }
+
+        if (cancelled) return;
+
+        // Strip file:// prefix for the native HTTP server
+        const rawPath = targetDir.replace(/^file:\/\//, "");
+        setStaticDir(rawPath);
+      } catch (e) {
+        if (!cancelled) {
+          const message = toErrorMessage(e);
+          console.warn("[CouchKit] Asset extraction failed:", message);
+          setError(message);
+        }
+      } finally {
+        if (!cancelled) {
+          setLoading(false);
+        }
+      }
+    };
+
+    extractAssets();
+
+    return () => {
+      cancelled = true;
+    };
+  }, [manifest]);
+
+  return { staticDir, loading, error };
+}

package/src/index.tsx

@@ -1,4 +1,5 @@
-export * from './provider';
-export * from './server';
-export * from './websocket';
-export * from './network';
+export * from "./provider";
+export * from "./server";
+export * from "./websocket";
+export * from "./network";
+export * from "./assets";

package/src/network.ts

@@ -1,4 +1,4 @@
-import { NetworkInfo } from "react-native-network-info";
+import * as Network from "expo-network";
 
 /**
  * Smart IP Discovery
@@ -7,16 +7,12 @@ import { NetworkInfo } from "react-native-network-info";
  */
 export async function getBestIpAddress(): Promise<string | null> {
   try {
-    // 1. Try to get the standard IP address (usually WiFi)
-    const ip = await NetworkInfo.getIPV4Address();
+    const ip = await Network.getIpAddressAsync();
 
     if (ip && ip !== "0.0.0.0" && ip !== "127.0.0.1") {
       return ip;
     }
 
-    // Fallback logic could go here (e.g., iterating interfaces if exposed by a native module)
-    // For now, react-native-network-info is the standard abstraction.
-
     return null;
   } catch (error) {
     console.warn("[CouchKit] Failed to get IP address:", error);

package/src/server.ts

@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 import { StaticServer } from "react-native-nitro-http-server";
-import RNFS from "react-native-fs";
+import { Paths } from "expo-file-system";
 import { getBestIpAddress } from "./network";
 import { DEFAULT_HTTP_PORT, toErrorMessage } from "@couch-kit/core";
 
@@ -15,7 +15,8 @@ export interface CouchKitHostConfig {
  * React hook that manages a static HTTP file server for serving the web controller.
  *
  * In production mode, starts a `StaticServer` bound to `0.0.0.0` on the configured port,
- * serving files from `staticDir` (or `${RNFS.MainBundlePath}/www` by default).
+ * serving files from `staticDir` (or the iOS bundle directory + `/www` by default).
+ * On Android, `staticDir` must be provided since bundle assets live inside the APK.
  * In dev mode, skips the server and returns `devServerUrl` directly.
  *
  * @param config - Server configuration including port, dev mode, and static directory.
@@ -48,9 +49,11 @@ export const useStaticServer = (config: CouchKitHostConfig) => {
 
       // Production Mode: Serve assets from bundle
       try {
-        // Use staticDir if provided (required on Android where MainBundlePath is undefined),
-        // otherwise fall back to iOS MainBundlePath
-        const path = config.staticDir || `${RNFS.MainBundlePath}/www`;
+        // Use staticDir if provided (required on Android where bundle path is undefined),
+        // otherwise fall back to the iOS bundle directory via expo-file-system
+        const path =
+          config.staticDir ||
+          `${Paths.bundle.uri.replace(/^file:\/\//, "")}www`;
         const port = config.port || DEFAULT_HTTP_PORT;
 
         server = new StaticServer();