diff --git a/README.md b/README.md index 3d4ce0a..5ba8b26 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ 1. **Go** (版本 >= 1.25) 2. **Node.js** 3. **Wails CLI** +4. **UPX** ### 安装依赖 diff --git a/Taskfile.yml b/Taskfile.yml index 76efbe2..4df283f 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -1,17 +1,15 @@ -version: '3' +version: "3" includes: common: ./build/Taskfile.yml windows: ./build/windows/Taskfile.yml darwin: ./build/darwin/Taskfile.yml linux: ./build/linux/Taskfile.yml - ios: ./build/ios/Taskfile.yml - android: ./build/android/Taskfile.yml vars: APP_NAME: "mesh-drop" BIN_DIR: "bin" - VITE_PORT: '{{.WAILS_VITE_PORT | default 9245}}' + VITE_PORT: "{{.WAILS_VITE_PORT | default 9245}}" tasks: build: diff --git a/build/Taskfile.yml b/build/Taskfile.yml index 60f77d8..d2d3204 100644 --- a/build/Taskfile.yml +++ b/build/Taskfile.yml @@ -1,4 +1,4 @@ -version: '3' +version: "3" tasks: go:mod:tidy: @@ -42,7 +42,6 @@ tasks: vars: BUILD_COMMAND: '{{if eq .DEV "true"}}build:dev{{else}}build{{end}}' - frontend:vendor:puppertino: summary: Fetches Puppertino CSS into frontend/public for consistent mobile styling sources: @@ -78,7 +77,6 @@ tasks: sed -E -i'' 's/class=\"btn\"/class=\"p-btn p-prim-col\"/g' "$INDEX_HTML" || true fi - generate:bindings: label: generate:bindings (BUILD_FLAGS={{.BUILD_FLAGS}}) summary: Generates bindings for the frontend @@ -87,7 +85,7 @@ tasks: sources: - "**/*.[jt]s" - exclude: frontend/**/* - - frontend/bindings/**/* # Rerun when switching between dev/production mode causes changes in output + - frontend/bindings/**/* # Rerun when switching between dev/production mode causes changes in output - "**/*.go" - go.mod - go.sum @@ -190,63 +188,3 @@ tasks: preconditions: - sh: docker info > /dev/null 2>&1 msg: "Docker is required. Please install Docker first." - - ios:device:list: - summary: Lists connected iOS devices (UDIDs) - cmds: - - xcrun xcdevice list - - ios:run:device: - summary: Build, install, and launch on a physical iPhone using Apple tools (xcodebuild/devicectl) - vars: - PROJECT: '{{.PROJECT}}' # e.g., build/ios/xcode/.xcodeproj - SCHEME: '{{.SCHEME}}' # e.g., ios.dev - CONFIG: '{{.CONFIG | default "Debug"}}' - DERIVED: '{{.DERIVED | default "build/ios/DerivedData"}}' - UDID: '{{.UDID}}' # from `task ios:device:list` - BUNDLE_ID: '{{.BUNDLE_ID}}' # e.g., com.yourco.wails.ios.dev - TEAM_ID: '{{.TEAM_ID}}' # optional, if your project is not already set up for signing - preconditions: - - sh: xcrun -f xcodebuild - msg: "xcodebuild not found. Please install Xcode." - - sh: xcrun -f devicectl - msg: "devicectl not found. Please update to Xcode 15+ (which includes devicectl)." - - sh: test -n '{{.PROJECT}}' - msg: "Set PROJECT to your .xcodeproj path (e.g., PROJECT=build/ios/xcode/App.xcodeproj)." - - sh: test -n '{{.SCHEME}}' - msg: "Set SCHEME to your app scheme (e.g., SCHEME=ios.dev)." - - sh: test -n '{{.UDID}}' - msg: "Set UDID to your device UDID (see: task ios:device:list)." - - sh: test -n '{{.BUNDLE_ID}}' - msg: "Set BUNDLE_ID to your app's bundle identifier (e.g., com.yourco.wails.ios.dev)." - cmds: - - | - set -euo pipefail - echo "Building for device: UDID={{.UDID}} SCHEME={{.SCHEME}} PROJECT={{.PROJECT}}" - XCB_ARGS=( - -project "{{.PROJECT}}" - -scheme "{{.SCHEME}}" - -configuration "{{.CONFIG}}" - -destination "id={{.UDID}}" - -derivedDataPath "{{.DERIVED}}" - -allowProvisioningUpdates - -allowProvisioningDeviceRegistration - ) - # Optionally inject signing identifiers if provided - if [ -n '{{.TEAM_ID}}' ]; then XCB_ARGS+=(DEVELOPMENT_TEAM={{.TEAM_ID}}); fi - if [ -n '{{.BUNDLE_ID}}' ]; then XCB_ARGS+=(PRODUCT_BUNDLE_IDENTIFIER={{.BUNDLE_ID}}); fi - xcodebuild "${XCB_ARGS[@]}" build | xcpretty || true - # If xcpretty isn't installed, run without it - if [ "${PIPESTATUS[0]}" -ne 0 ]; then - xcodebuild "${XCB_ARGS[@]}" build - fi - # Find built .app - APP_PATH=$(find "{{.DERIVED}}/Build/Products" -type d -name "*.app" -maxdepth 3 | head -n 1) - if [ -z "$APP_PATH" ]; then - echo "Could not locate built .app under {{.DERIVED}}/Build/Products" >&2 - exit 1 - fi - echo "Installing: $APP_PATH" - xcrun devicectl device install app --device "{{.UDID}}" "$APP_PATH" - echo "Launching: {{.BUNDLE_ID}}" - xcrun devicectl device process launch --device "{{.UDID}}" --stderr console --stdout console "{{.BUNDLE_ID}}" diff --git a/build/android/Taskfile.yml b/build/android/Taskfile.yml deleted file mode 100644 index aca62e4..0000000 --- a/build/android/Taskfile.yml +++ /dev/null @@ -1,237 +0,0 @@ -version: '3' - -includes: - common: ../Taskfile.yml - -vars: - APP_ID: '{{.APP_ID | default "com.wails.app"}}' - MIN_SDK: '21' - TARGET_SDK: '34' - NDK_VERSION: 'r26d' - -tasks: - install:deps: - summary: Check and install Android development dependencies - cmds: - - go run build/android/scripts/deps/install_deps.go - env: - TASK_FORCE_YES: '{{if .YES}}true{{else}}false{{end}}' - prompt: This will check and install Android development dependencies. Continue? - - build: - summary: Creates a build of the application for Android - deps: - - task: common:go:mod:tidy - - task: generate:android:bindings - vars: - BUILD_FLAGS: - ref: .BUILD_FLAGS - - task: common:build:frontend - vars: - BUILD_FLAGS: - ref: .BUILD_FLAGS - PRODUCTION: - ref: .PRODUCTION - - task: common:generate:icons - cmds: - - echo "Building Android app {{.APP_NAME}}..." - - task: compile:go:shared - vars: - ARCH: '{{.ARCH | default "arm64"}}' - vars: - BUILD_FLAGS: '{{if eq .PRODUCTION "true"}}-tags production,android -trimpath -buildvcs=false -ldflags="-w -s"{{else}}-tags android,debug -buildvcs=false -gcflags=all="-l"{{end}}' - env: - PRODUCTION: '{{.PRODUCTION | default "false"}}' - - compile:go:shared: - summary: Compile Go code to shared library (.so) - cmds: - - | - NDK_ROOT="${ANDROID_NDK_HOME:-$ANDROID_HOME/ndk/{{.NDK_VERSION}}}" - if [ ! -d "$NDK_ROOT" ]; then - echo "Error: Android NDK not found at $NDK_ROOT" - echo "Please set ANDROID_NDK_HOME or install NDK {{.NDK_VERSION}} via Android Studio" - exit 1 - fi - - # Determine toolchain based on host OS - case "$(uname -s)" in - Darwin) HOST_TAG="darwin-x86_64" ;; - Linux) HOST_TAG="linux-x86_64" ;; - *) echo "Unsupported host OS"; exit 1 ;; - esac - - TOOLCHAIN="$NDK_ROOT/toolchains/llvm/prebuilt/$HOST_TAG" - - # Set compiler based on architecture - case "{{.ARCH}}" in - arm64) - export CC="$TOOLCHAIN/bin/aarch64-linux-android{{.MIN_SDK}}-clang" - export CXX="$TOOLCHAIN/bin/aarch64-linux-android{{.MIN_SDK}}-clang++" - export GOARCH=arm64 - JNI_DIR="arm64-v8a" - ;; - amd64|x86_64) - export CC="$TOOLCHAIN/bin/x86_64-linux-android{{.MIN_SDK}}-clang" - export CXX="$TOOLCHAIN/bin/x86_64-linux-android{{.MIN_SDK}}-clang++" - export GOARCH=amd64 - JNI_DIR="x86_64" - ;; - *) - echo "Unsupported architecture: {{.ARCH}}" - exit 1 - ;; - esac - - export CGO_ENABLED=1 - export GOOS=android - - mkdir -p {{.BIN_DIR}} - mkdir -p build/android/app/src/main/jniLibs/$JNI_DIR - - go build -buildmode=c-shared {{.BUILD_FLAGS}} \ - -o build/android/app/src/main/jniLibs/$JNI_DIR/libwails.so - vars: - BUILD_FLAGS: '{{if eq .PRODUCTION "true"}}-tags production,android -trimpath -buildvcs=false -ldflags="-w -s"{{else}}-tags android,debug -buildvcs=false -gcflags=all="-l"{{end}}' - - compile:go:all-archs: - summary: Compile Go code for all Android architectures (fat APK) - cmds: - - task: compile:go:shared - vars: - ARCH: arm64 - - task: compile:go:shared - vars: - ARCH: amd64 - - package: - summary: Packages a production build of the application into an APK - deps: - - task: build - vars: - PRODUCTION: "true" - cmds: - - task: assemble:apk - - package:fat: - summary: Packages a production build for all architectures (fat APK) - cmds: - - task: compile:go:all-archs - - task: assemble:apk - - assemble:apk: - summary: Assembles the APK using Gradle - cmds: - - | - cd build/android - ./gradlew assembleDebug - cp app/build/outputs/apk/debug/app-debug.apk "../../{{.BIN_DIR}}/{{.APP_NAME}}.apk" - echo "APK created: {{.BIN_DIR}}/{{.APP_NAME}}.apk" - - assemble:apk:release: - summary: Assembles a release APK using Gradle - cmds: - - | - cd build/android - ./gradlew assembleRelease - cp app/build/outputs/apk/release/app-release-unsigned.apk "../../{{.BIN_DIR}}/{{.APP_NAME}}-release.apk" - echo "Release APK created: {{.BIN_DIR}}/{{.APP_NAME}}-release.apk" - - generate:android:bindings: - internal: true - summary: Generates bindings for Android - sources: - - "**/*.go" - - go.mod - - go.sum - generates: - - frontend/bindings/**/* - cmds: - - wails3 generate bindings -f '{{.BUILD_FLAGS}}' -clean=true - env: - GOOS: android - CGO_ENABLED: 1 - GOARCH: '{{.ARCH | default "arm64"}}' - - ensure-emulator: - internal: true - summary: Ensure Android Emulator is running - silent: true - cmds: - - | - # Check if an emulator is already running - if adb devices | grep -q "emulator"; then - echo "Emulator already running" - exit 0 - fi - - # Get first available AVD - AVD_NAME=$(emulator -list-avds | head -1) - if [ -z "$AVD_NAME" ]; then - echo "No Android Virtual Devices found." - echo "Create one using: Android Studio > Tools > Device Manager" - exit 1 - fi - - echo "Starting emulator: $AVD_NAME" - emulator -avd "$AVD_NAME" -no-snapshot-load & - - # Wait for emulator to boot (max 60 seconds) - echo "Waiting for emulator to boot..." - adb wait-for-device - - for i in {1..60}; do - BOOT_COMPLETED=$(adb shell getprop sys.boot_completed 2>/dev/null | tr -d '\r') - if [ "$BOOT_COMPLETED" = "1" ]; then - echo "Emulator booted successfully" - exit 0 - fi - sleep 1 - done - - echo "Emulator boot timeout" - exit 1 - preconditions: - - sh: command -v adb - msg: "adb not found. Please install Android SDK and add platform-tools to PATH" - - sh: command -v emulator - msg: "emulator not found. Please install Android SDK and add emulator to PATH" - - deploy-emulator: - summary: Deploy to Android Emulator - deps: [package] - cmds: - - adb uninstall {{.APP_ID}} 2>/dev/null || true - - adb install "{{.BIN_DIR}}/{{.APP_NAME}}.apk" - - adb shell am start -n {{.APP_ID}}/.MainActivity - - run: - summary: Run the application in Android Emulator - deps: - - task: ensure-emulator - - task: build - vars: - ARCH: x86_64 - cmds: - - task: assemble:apk - - adb uninstall {{.APP_ID}} 2>/dev/null || true - - adb install "{{.BIN_DIR}}/{{.APP_NAME}}.apk" - - adb shell am start -n {{.APP_ID}}/.MainActivity - - logs: - summary: Stream Android logcat filtered to this app - cmds: - - adb logcat -v time | grep -E "(Wails|{{.APP_NAME}})" - - logs:all: - summary: Stream all Android logcat (verbose) - cmds: - - adb logcat -v time - - clean: - summary: Clean build artifacts - cmds: - - rm -rf {{.BIN_DIR}} - - rm -rf build/android/app/build - - rm -rf build/android/app/src/main/jniLibs/*/libwails.so - - rm -rf build/android/.gradle diff --git a/build/android/app/build.gradle b/build/android/app/build.gradle deleted file mode 100644 index 78fdbf7..0000000 --- a/build/android/app/build.gradle +++ /dev/null @@ -1,63 +0,0 @@ -plugins { - id 'com.android.application' -} - -android { - namespace 'com.wails.app' - compileSdk 34 - - buildFeatures { - buildConfig = true - } - - defaultConfig { - applicationId "com.wails.app" - minSdk 21 - targetSdk 34 - versionCode 1 - versionName "1.0" - - // Configure supported ABIs - ndk { - abiFilters 'arm64-v8a', 'x86_64' - } - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - debug { - debuggable true - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - - // Source sets configuration - sourceSets { - main { - // JNI libraries are in jniLibs folder - jniLibs.srcDirs = ['src/main/jniLibs'] - // Assets for the WebView - assets.srcDirs = ['src/main/assets'] - } - } - - // Packaging options - packagingOptions { - // Don't strip Go symbols in debug builds - doNotStrip '*/arm64-v8a/libwails.so' - doNotStrip '*/x86_64/libwails.so' - } -} - -dependencies { - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.webkit:webkit:1.9.0' - implementation 'com.google.android.material:material:1.11.0' -} diff --git a/build/android/app/proguard-rules.pro b/build/android/app/proguard-rules.pro deleted file mode 100644 index 8b88c3d..0000000 --- a/build/android/app/proguard-rules.pro +++ /dev/null @@ -1,12 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. - -# Keep native methods --keepclasseswithmembernames class * { - native ; -} - -# Keep Wails bridge classes --keep class com.wails.app.WailsBridge { *; } --keep class com.wails.app.WailsJSBridge { *; } diff --git a/build/android/app/src/main/AndroidManifest.xml b/build/android/app/src/main/AndroidManifest.xml deleted file mode 100644 index 6c7982a..0000000 --- a/build/android/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/build/android/app/src/main/java/com/wails/app/MainActivity.java b/build/android/app/src/main/java/com/wails/app/MainActivity.java deleted file mode 100644 index 3067fee..0000000 --- a/build/android/app/src/main/java/com/wails/app/MainActivity.java +++ /dev/null @@ -1,198 +0,0 @@ -package com.wails.app; - -import android.annotation.SuppressLint; -import android.os.Bundle; -import android.util.Log; -import android.webkit.WebResourceRequest; -import android.webkit.WebResourceResponse; -import android.webkit.WebSettings; -import android.webkit.WebView; -import android.webkit.WebViewClient; - -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; -import androidx.webkit.WebViewAssetLoader; -import com.wails.app.BuildConfig; - -/** - * MainActivity hosts the WebView and manages the Wails application lifecycle. - * It uses WebViewAssetLoader to serve assets from the Go library without - * requiring a network server. - */ -public class MainActivity extends AppCompatActivity { - private static final String TAG = "WailsActivity"; - private static final String WAILS_SCHEME = "https"; - private static final String WAILS_HOST = "wails.localhost"; - - private WebView webView; - private WailsBridge bridge; - private WebViewAssetLoader assetLoader; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - // Initialize the native Go library - bridge = new WailsBridge(this); - bridge.initialize(); - - // Set up WebView - setupWebView(); - - // Load the application - loadApplication(); - } - - @SuppressLint("SetJavaScriptEnabled") - private void setupWebView() { - webView = findViewById(R.id.webview); - - // Configure WebView settings - WebSettings settings = webView.getSettings(); - settings.setJavaScriptEnabled(true); - settings.setDomStorageEnabled(true); - settings.setDatabaseEnabled(true); - settings.setAllowFileAccess(false); - settings.setAllowContentAccess(false); - settings.setMediaPlaybackRequiresUserGesture(false); - settings.setMixedContentMode(WebSettings.MIXED_CONTENT_NEVER_ALLOW); - - // Enable debugging in debug builds - if (BuildConfig.DEBUG) { - WebView.setWebContentsDebuggingEnabled(true); - } - - // Set up asset loader for serving local assets - assetLoader = new WebViewAssetLoader.Builder() - .setDomain(WAILS_HOST) - .addPathHandler("/", new WailsPathHandler(bridge)) - .build(); - - // Set up WebView client to intercept requests - webView.setWebViewClient(new WebViewClient() { - @Nullable - @Override - public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) { - String url = request.getUrl().toString(); - Log.d(TAG, "Intercepting request: " + url); - - // Handle wails.localhost requests - if (request.getUrl().getHost() != null && - request.getUrl().getHost().equals(WAILS_HOST)) { - - // For wails API calls (runtime, capabilities, etc.), we need to pass the full URL - // including query string because WebViewAssetLoader.PathHandler strips query params - String path = request.getUrl().getPath(); - if (path != null && path.startsWith("/wails/")) { - // Get full path with query string for runtime calls - String fullPath = path; - String query = request.getUrl().getQuery(); - if (query != null && !query.isEmpty()) { - fullPath = path + "?" + query; - } - Log.d(TAG, "Wails API call detected, full path: " + fullPath); - - // Call bridge directly with full path - byte[] data = bridge.serveAsset(fullPath, request.getMethod(), "{}"); - if (data != null && data.length > 0) { - java.io.InputStream inputStream = new java.io.ByteArrayInputStream(data); - java.util.Map headers = new java.util.HashMap<>(); - headers.put("Access-Control-Allow-Origin", "*"); - headers.put("Cache-Control", "no-cache"); - headers.put("Content-Type", "application/json"); - - return new WebResourceResponse( - "application/json", - "UTF-8", - 200, - "OK", - headers, - inputStream - ); - } - // Return error response if data is null - return new WebResourceResponse( - "application/json", - "UTF-8", - 500, - "Internal Error", - new java.util.HashMap<>(), - new java.io.ByteArrayInputStream("{}".getBytes()) - ); - } - - // For regular assets, use the asset loader - return assetLoader.shouldInterceptRequest(request.getUrl()); - } - - return super.shouldInterceptRequest(view, request); - } - - @Override - public void onPageFinished(WebView view, String url) { - super.onPageFinished(view, url); - Log.d(TAG, "Page loaded: " + url); - // Inject Wails runtime - bridge.injectRuntime(webView, url); - } - }); - - // Add JavaScript interface for Go communication - webView.addJavascriptInterface(new WailsJSBridge(bridge, webView), "wails"); - } - - private void loadApplication() { - // Load the main page from the asset server - String url = WAILS_SCHEME + "://" + WAILS_HOST + "/"; - Log.d(TAG, "Loading URL: " + url); - webView.loadUrl(url); - } - - /** - * Execute JavaScript in the WebView from the Go side - */ - public void executeJavaScript(final String js) { - runOnUiThread(() -> { - if (webView != null) { - webView.evaluateJavascript(js, null); - } - }); - } - - @Override - protected void onResume() { - super.onResume(); - if (bridge != null) { - bridge.onResume(); - } - } - - @Override - protected void onPause() { - super.onPause(); - if (bridge != null) { - bridge.onPause(); - } - } - - @Override - protected void onDestroy() { - super.onDestroy(); - if (bridge != null) { - bridge.shutdown(); - } - if (webView != null) { - webView.destroy(); - } - } - - @Override - public void onBackPressed() { - if (webView != null && webView.canGoBack()) { - webView.goBack(); - } else { - super.onBackPressed(); - } - } -} diff --git a/build/android/app/src/main/java/com/wails/app/WailsBridge.java b/build/android/app/src/main/java/com/wails/app/WailsBridge.java deleted file mode 100644 index 3dab652..0000000 --- a/build/android/app/src/main/java/com/wails/app/WailsBridge.java +++ /dev/null @@ -1,214 +0,0 @@ -package com.wails.app; - -import android.content.Context; -import android.util.Log; -import android.webkit.WebView; - -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicInteger; - -/** - * WailsBridge manages the connection between the Java/Android side and the Go native library. - * It handles: - * - Loading and initializing the native Go library - * - Serving asset requests from Go - * - Passing messages between JavaScript and Go - * - Managing callbacks for async operations - */ -public class WailsBridge { - private static final String TAG = "WailsBridge"; - - static { - // Load the native Go library - System.loadLibrary("wails"); - } - - private final Context context; - private final AtomicInteger callbackIdGenerator = new AtomicInteger(0); - private final ConcurrentHashMap pendingAssetCallbacks = new ConcurrentHashMap<>(); - private final ConcurrentHashMap pendingMessageCallbacks = new ConcurrentHashMap<>(); - private WebView webView; - private volatile boolean initialized = false; - - // Native methods - implemented in Go - private static native void nativeInit(WailsBridge bridge); - private static native void nativeShutdown(); - private static native void nativeOnResume(); - private static native void nativeOnPause(); - private static native void nativeOnPageFinished(String url); - private static native byte[] nativeServeAsset(String path, String method, String headers); - private static native String nativeHandleMessage(String message); - private static native String nativeGetAssetMimeType(String path); - - public WailsBridge(Context context) { - this.context = context; - } - - /** - * Initialize the native Go library - */ - public void initialize() { - if (initialized) { - return; - } - - Log.i(TAG, "Initializing Wails bridge..."); - try { - nativeInit(this); - initialized = true; - Log.i(TAG, "Wails bridge initialized successfully"); - } catch (Exception e) { - Log.e(TAG, "Failed to initialize Wails bridge", e); - } - } - - /** - * Shutdown the native Go library - */ - public void shutdown() { - if (!initialized) { - return; - } - - Log.i(TAG, "Shutting down Wails bridge..."); - try { - nativeShutdown(); - initialized = false; - } catch (Exception e) { - Log.e(TAG, "Error during shutdown", e); - } - } - - /** - * Called when the activity resumes - */ - public void onResume() { - if (initialized) { - nativeOnResume(); - } - } - - /** - * Called when the activity pauses - */ - public void onPause() { - if (initialized) { - nativeOnPause(); - } - } - - /** - * Serve an asset from the Go asset server - * @param path The URL path requested - * @param method The HTTP method - * @param headers The request headers as JSON - * @return The asset data, or null if not found - */ - public byte[] serveAsset(String path, String method, String headers) { - if (!initialized) { - Log.w(TAG, "Bridge not initialized, cannot serve asset: " + path); - return null; - } - - Log.d(TAG, "Serving asset: " + path); - try { - return nativeServeAsset(path, method, headers); - } catch (Exception e) { - Log.e(TAG, "Error serving asset: " + path, e); - return null; - } - } - - /** - * Get the MIME type for an asset - * @param path The asset path - * @return The MIME type string - */ - public String getAssetMimeType(String path) { - if (!initialized) { - return "application/octet-stream"; - } - - try { - String mimeType = nativeGetAssetMimeType(path); - return mimeType != null ? mimeType : "application/octet-stream"; - } catch (Exception e) { - Log.e(TAG, "Error getting MIME type for: " + path, e); - return "application/octet-stream"; - } - } - - /** - * Handle a message from JavaScript - * @param message The message from JavaScript (JSON) - * @return The response to send back to JavaScript (JSON) - */ - public String handleMessage(String message) { - if (!initialized) { - Log.w(TAG, "Bridge not initialized, cannot handle message"); - return "{\"error\":\"Bridge not initialized\"}"; - } - - Log.d(TAG, "Handling message from JS: " + message); - try { - return nativeHandleMessage(message); - } catch (Exception e) { - Log.e(TAG, "Error handling message", e); - return "{\"error\":\"" + e.getMessage() + "\"}"; - } - } - - /** - * Inject the Wails runtime JavaScript into the WebView. - * Called when the page finishes loading. - * @param webView The WebView to inject into - * @param url The URL that finished loading - */ - public void injectRuntime(WebView webView, String url) { - this.webView = webView; - // Notify Go side that page has finished loading so it can inject the runtime - Log.d(TAG, "Page finished loading: " + url + ", notifying Go side"); - if (initialized) { - nativeOnPageFinished(url); - } - } - - /** - * Execute JavaScript in the WebView (called from Go side) - * @param js The JavaScript code to execute - */ - public void executeJavaScript(String js) { - if (webView != null) { - webView.post(() -> webView.evaluateJavascript(js, null)); - } - } - - /** - * Called from Go when an event needs to be emitted to JavaScript - * @param eventName The event name - * @param eventData The event data (JSON) - */ - public void emitEvent(String eventName, String eventData) { - String js = String.format("window.wails && window.wails._emit('%s', %s);", - escapeJsString(eventName), eventData); - executeJavaScript(js); - } - - private String escapeJsString(String str) { - return str.replace("\\", "\\\\") - .replace("'", "\\'") - .replace("\n", "\\n") - .replace("\r", "\\r"); - } - - // Callback interfaces - public interface AssetCallback { - void onAssetReady(byte[] data, String mimeType); - void onAssetError(String error); - } - - public interface MessageCallback { - void onResponse(String response); - void onError(String error); - } -} diff --git a/build/android/app/src/main/java/com/wails/app/WailsJSBridge.java b/build/android/app/src/main/java/com/wails/app/WailsJSBridge.java deleted file mode 100644 index 98ae5b2..0000000 --- a/build/android/app/src/main/java/com/wails/app/WailsJSBridge.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.wails.app; - -import android.util.Log; -import android.webkit.JavascriptInterface; -import android.webkit.WebView; -import com.wails.app.BuildConfig; - -/** - * WailsJSBridge provides the JavaScript interface that allows the web frontend - * to communicate with the Go backend. This is exposed to JavaScript as the - * `window.wails` object. - * - * Similar to iOS's WKScriptMessageHandler but using Android's addJavascriptInterface. - */ -public class WailsJSBridge { - private static final String TAG = "WailsJSBridge"; - - private final WailsBridge bridge; - private final WebView webView; - - public WailsJSBridge(WailsBridge bridge, WebView webView) { - this.bridge = bridge; - this.webView = webView; - } - - /** - * Send a message to Go and return the response synchronously. - * Called from JavaScript: wails.invoke(message) - * - * @param message The message to send (JSON string) - * @return The response from Go (JSON string) - */ - @JavascriptInterface - public String invoke(String message) { - Log.d(TAG, "Invoke called: " + message); - return bridge.handleMessage(message); - } - - /** - * Send a message to Go asynchronously. - * The response will be sent back via a callback. - * Called from JavaScript: wails.invokeAsync(callbackId, message) - * - * @param callbackId The callback ID to use for the response - * @param message The message to send (JSON string) - */ - @JavascriptInterface - public void invokeAsync(final String callbackId, final String message) { - Log.d(TAG, "InvokeAsync called: " + message); - - // Handle in background thread to not block JavaScript - new Thread(() -> { - try { - String response = bridge.handleMessage(message); - sendCallback(callbackId, response, null); - } catch (Exception e) { - Log.e(TAG, "Error in async invoke", e); - sendCallback(callbackId, null, e.getMessage()); - } - }).start(); - } - - /** - * Log a message from JavaScript to Android's logcat - * Called from JavaScript: wails.log(level, message) - * - * @param level The log level (debug, info, warn, error) - * @param message The message to log - */ - @JavascriptInterface - public void log(String level, String message) { - switch (level.toLowerCase()) { - case "debug": - Log.d(TAG + "/JS", message); - break; - case "info": - Log.i(TAG + "/JS", message); - break; - case "warn": - Log.w(TAG + "/JS", message); - break; - case "error": - Log.e(TAG + "/JS", message); - break; - default: - Log.v(TAG + "/JS", message); - break; - } - } - - /** - * Get the platform name - * Called from JavaScript: wails.platform() - * - * @return "android" - */ - @JavascriptInterface - public String platform() { - return "android"; - } - - /** - * Check if we're running in debug mode - * Called from JavaScript: wails.isDebug() - * - * @return true if debug build, false otherwise - */ - @JavascriptInterface - public boolean isDebug() { - return BuildConfig.DEBUG; - } - - /** - * Send a callback response to JavaScript - */ - private void sendCallback(String callbackId, String result, String error) { - final String js; - if (error != null) { - js = String.format( - "window.wails && window.wails._callback('%s', null, '%s');", - escapeJsString(callbackId), - escapeJsString(error) - ); - } else { - js = String.format( - "window.wails && window.wails._callback('%s', %s, null);", - escapeJsString(callbackId), - result != null ? result : "null" - ); - } - - webView.post(() -> webView.evaluateJavascript(js, null)); - } - - private String escapeJsString(String str) { - if (str == null) return ""; - return str.replace("\\", "\\\\") - .replace("'", "\\'") - .replace("\n", "\\n") - .replace("\r", "\\r"); - } -} diff --git a/build/android/app/src/main/java/com/wails/app/WailsPathHandler.java b/build/android/app/src/main/java/com/wails/app/WailsPathHandler.java deleted file mode 100644 index 326fa9b..0000000 --- a/build/android/app/src/main/java/com/wails/app/WailsPathHandler.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.wails.app; - -import android.net.Uri; -import android.util.Log; -import android.webkit.WebResourceResponse; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.webkit.WebViewAssetLoader; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.util.HashMap; -import java.util.Map; - -/** - * WailsPathHandler implements WebViewAssetLoader.PathHandler to serve assets - * from the Go asset server. This allows the WebView to load assets without - * using a network server, similar to iOS's WKURLSchemeHandler. - */ -public class WailsPathHandler implements WebViewAssetLoader.PathHandler { - private static final String TAG = "WailsPathHandler"; - - private final WailsBridge bridge; - - public WailsPathHandler(WailsBridge bridge) { - this.bridge = bridge; - } - - @Nullable - @Override - public WebResourceResponse handle(@NonNull String path) { - Log.d(TAG, "Handling path: " + path); - - // Normalize path - if (path.isEmpty() || path.equals("/")) { - path = "/index.html"; - } - - // Get asset from Go - byte[] data = bridge.serveAsset(path, "GET", "{}"); - - if (data == null || data.length == 0) { - Log.w(TAG, "Asset not found: " + path); - return null; // Return null to let WebView handle 404 - } - - // Determine MIME type - String mimeType = bridge.getAssetMimeType(path); - Log.d(TAG, "Serving " + path + " with type " + mimeType + " (" + data.length + " bytes)"); - - // Create response - InputStream inputStream = new ByteArrayInputStream(data); - Map headers = new HashMap<>(); - headers.put("Access-Control-Allow-Origin", "*"); - headers.put("Cache-Control", "no-cache"); - - return new WebResourceResponse( - mimeType, - "UTF-8", - 200, - "OK", - headers, - inputStream - ); - } - - /** - * Determine MIME type from file extension - */ - private String getMimeType(String path) { - String lowerPath = path.toLowerCase(); - - if (lowerPath.endsWith(".html") || lowerPath.endsWith(".htm")) { - return "text/html"; - } else if (lowerPath.endsWith(".js") || lowerPath.endsWith(".mjs")) { - return "application/javascript"; - } else if (lowerPath.endsWith(".css")) { - return "text/css"; - } else if (lowerPath.endsWith(".json")) { - return "application/json"; - } else if (lowerPath.endsWith(".png")) { - return "image/png"; - } else if (lowerPath.endsWith(".jpg") || lowerPath.endsWith(".jpeg")) { - return "image/jpeg"; - } else if (lowerPath.endsWith(".gif")) { - return "image/gif"; - } else if (lowerPath.endsWith(".svg")) { - return "image/svg+xml"; - } else if (lowerPath.endsWith(".ico")) { - return "image/x-icon"; - } else if (lowerPath.endsWith(".woff")) { - return "font/woff"; - } else if (lowerPath.endsWith(".woff2")) { - return "font/woff2"; - } else if (lowerPath.endsWith(".ttf")) { - return "font/ttf"; - } else if (lowerPath.endsWith(".eot")) { - return "application/vnd.ms-fontobject"; - } else if (lowerPath.endsWith(".xml")) { - return "application/xml"; - } else if (lowerPath.endsWith(".txt")) { - return "text/plain"; - } else if (lowerPath.endsWith(".wasm")) { - return "application/wasm"; - } else if (lowerPath.endsWith(".mp3")) { - return "audio/mpeg"; - } else if (lowerPath.endsWith(".mp4")) { - return "video/mp4"; - } else if (lowerPath.endsWith(".webm")) { - return "video/webm"; - } else if (lowerPath.endsWith(".webp")) { - return "image/webp"; - } - - return "application/octet-stream"; - } -} diff --git a/build/android/app/src/main/res/layout/activity_main.xml b/build/android/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index f278384..0000000 --- a/build/android/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/build/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/build/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 9409abe..0000000 Binary files a/build/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/build/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/build/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 9409abe..0000000 Binary files a/build/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/build/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/build/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 5b6acc0..0000000 Binary files a/build/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/build/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/build/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 5b6acc0..0000000 Binary files a/build/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/build/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/build/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 1c2c664..0000000 Binary files a/build/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/build/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/build/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 1c2c664..0000000 Binary files a/build/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/build/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/build/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index be557d8..0000000 Binary files a/build/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/build/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/build/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index be557d8..0000000 Binary files a/build/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/build/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/build/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 4507f32..0000000 Binary files a/build/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/build/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/build/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 4507f32..0000000 Binary files a/build/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/build/android/app/src/main/res/values/colors.xml b/build/android/app/src/main/res/values/colors.xml deleted file mode 100644 index dd33f3b..0000000 --- a/build/android/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - #3574D4 - #2C5FB8 - #1B2636 - #FFFFFFFF - #FF000000 - diff --git a/build/android/app/src/main/res/values/strings.xml b/build/android/app/src/main/res/values/strings.xml deleted file mode 100644 index 3ed9e47..0000000 --- a/build/android/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - Wails App - diff --git a/build/android/app/src/main/res/values/themes.xml b/build/android/app/src/main/res/values/themes.xml deleted file mode 100644 index be8a282..0000000 --- a/build/android/app/src/main/res/values/themes.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/build/android/build.gradle b/build/android/build.gradle deleted file mode 100644 index d7fbab3..0000000 --- a/build/android/build.gradle +++ /dev/null @@ -1,4 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -plugins { - id 'com.android.application' version '8.7.3' apply false -} diff --git a/build/android/gradle.properties b/build/android/gradle.properties deleted file mode 100644 index b9d4426..0000000 --- a/build/android/gradle.properties +++ /dev/null @@ -1,26 +0,0 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 - -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. For more details, visit -# https://developer.android.com/build/optimize-your-build#parallel -# org.gradle.parallel=true - -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true - -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/build/android/gradle/wrapper/gradle-wrapper.jar b/build/android/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index f8e1ee3..0000000 Binary files a/build/android/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/build/android/gradle/wrapper/gradle-wrapper.properties b/build/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 23449a2..0000000 --- a/build/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/build/android/gradlew b/build/android/gradlew deleted file mode 100644 index adff685..0000000 --- a/build/android/gradlew +++ /dev/null @@ -1,248 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/build/android/gradlew.bat b/build/android/gradlew.bat deleted file mode 100644 index c4bdd3a..0000000 --- a/build/android/gradlew.bat +++ /dev/null @@ -1,93 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/build/android/main_android.go b/build/android/main_android.go deleted file mode 100644 index 70a7164..0000000 --- a/build/android/main_android.go +++ /dev/null @@ -1,11 +0,0 @@ -//go:build android - -package main - -import "github.com/wailsapp/wails/v3/pkg/application" - -func init() { - // Register main function to be called when the Android app initializes - // This is necessary because in c-shared build mode, main() is not automatically called - application.RegisterAndroidMain(main) -} diff --git a/build/android/scripts/deps/install_deps.go b/build/android/scripts/deps/install_deps.go deleted file mode 100644 index d9dfedf..0000000 --- a/build/android/scripts/deps/install_deps.go +++ /dev/null @@ -1,151 +0,0 @@ -package main - -import ( - "fmt" - "os" - "os/exec" - "path/filepath" - "runtime" - "strings" -) - -func main() { - fmt.Println("Checking Android development dependencies...") - fmt.Println() - - errors := []string{} - - // Check Go - if !checkCommand("go", "version") { - errors = append(errors, "Go is not installed. Install from https://go.dev/dl/") - } else { - fmt.Println("✓ Go is installed") - } - - // Check ANDROID_HOME - androidHome := os.Getenv("ANDROID_HOME") - if androidHome == "" { - androidHome = os.Getenv("ANDROID_SDK_ROOT") - } - if androidHome == "" { - // Try common default locations - home, _ := os.UserHomeDir() - possiblePaths := []string{ - filepath.Join(home, "Android", "Sdk"), - filepath.Join(home, "Library", "Android", "sdk"), - "/usr/local/share/android-sdk", - } - for _, p := range possiblePaths { - if _, err := os.Stat(p); err == nil { - androidHome = p - break - } - } - } - - if androidHome == "" { - errors = append(errors, "ANDROID_HOME not set. Install Android Studio and set ANDROID_HOME environment variable") - } else { - fmt.Printf("✓ ANDROID_HOME: %s\n", androidHome) - } - - // Check adb - if !checkCommand("adb", "version") { - if androidHome != "" { - platformTools := filepath.Join(androidHome, "platform-tools") - errors = append(errors, fmt.Sprintf("adb not found. Add %s to PATH", platformTools)) - } else { - errors = append(errors, "adb not found. Install Android SDK Platform-Tools") - } - } else { - fmt.Println("✓ adb is installed") - } - - // Check emulator - if !checkCommand("emulator", "-list-avds") { - if androidHome != "" { - emulatorPath := filepath.Join(androidHome, "emulator") - errors = append(errors, fmt.Sprintf("emulator not found. Add %s to PATH", emulatorPath)) - } else { - errors = append(errors, "emulator not found. Install Android Emulator via SDK Manager") - } - } else { - fmt.Println("✓ Android Emulator is installed") - } - - // Check NDK - ndkHome := os.Getenv("ANDROID_NDK_HOME") - if ndkHome == "" && androidHome != "" { - // Look for NDK in default location - ndkDir := filepath.Join(androidHome, "ndk") - if entries, err := os.ReadDir(ndkDir); err == nil { - for _, entry := range entries { - if entry.IsDir() { - ndkHome = filepath.Join(ndkDir, entry.Name()) - break - } - } - } - } - - if ndkHome == "" { - errors = append(errors, "Android NDK not found. Install NDK via Android Studio > SDK Manager > SDK Tools > NDK (Side by side)") - } else { - fmt.Printf("✓ Android NDK: %s\n", ndkHome) - } - - // Check Java - if !checkCommand("java", "-version") { - errors = append(errors, "Java not found. Install JDK 11+ (OpenJDK recommended)") - } else { - fmt.Println("✓ Java is installed") - } - - // Check for AVD (Android Virtual Device) - if checkCommand("emulator", "-list-avds") { - cmd := exec.Command("emulator", "-list-avds") - output, err := cmd.Output() - if err == nil && len(strings.TrimSpace(string(output))) > 0 { - avds := strings.Split(strings.TrimSpace(string(output)), "\n") - fmt.Printf("✓ Found %d Android Virtual Device(s)\n", len(avds)) - } else { - fmt.Println("⚠ No Android Virtual Devices found. Create one via Android Studio > Tools > Device Manager") - } - } - - fmt.Println() - - if len(errors) > 0 { - fmt.Println("❌ Missing dependencies:") - for _, err := range errors { - fmt.Printf(" - %s\n", err) - } - fmt.Println() - fmt.Println("Setup instructions:") - fmt.Println("1. Install Android Studio: https://developer.android.com/studio") - fmt.Println("2. Open SDK Manager and install:") - fmt.Println(" - Android SDK Platform (API 34)") - fmt.Println(" - Android SDK Build-Tools") - fmt.Println(" - Android SDK Platform-Tools") - fmt.Println(" - Android Emulator") - fmt.Println(" - NDK (Side by side)") - fmt.Println("3. Set environment variables:") - if runtime.GOOS == "darwin" { - fmt.Println(" export ANDROID_HOME=$HOME/Library/Android/sdk") - } else { - fmt.Println(" export ANDROID_HOME=$HOME/Android/Sdk") - } - fmt.Println(" export PATH=$PATH:$ANDROID_HOME/platform-tools:$ANDROID_HOME/emulator") - fmt.Println("4. Create an AVD via Android Studio > Tools > Device Manager") - os.Exit(1) - } - - fmt.Println("✓ All Android development dependencies are installed!") -} - -func checkCommand(name string, args ...string) bool { - cmd := exec.Command(name, args...) - cmd.Stdout = nil - cmd.Stderr = nil - return cmd.Run() == nil -} diff --git a/build/android/settings.gradle b/build/android/settings.gradle deleted file mode 100644 index a3f3ec3..0000000 --- a/build/android/settings.gradle +++ /dev/null @@ -1,18 +0,0 @@ -pluginManagement { - repositories { - google() - mavenCentral() - gradlePluginPortal() - } -} - -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - google() - mavenCentral() - } -} - -rootProject.name = "WailsApp" -include ':app' diff --git a/build/config.yml b/build/config.yml index 03cbfa9..9c6459e 100644 --- a/build/config.yml +++ b/build/config.yml @@ -1,7 +1,7 @@ # This file contains the configuration for this project. # When you update `info` or `fileAssociations`, run `wails3 task common:update:build-assets` to update the assets. # Note that this will overwrite any changes you have made to the assets. -version: '3' +version: "3" # This information is used to generate the build assets. info: @@ -12,23 +12,6 @@ info: copyright: "(c) 2025, My Company" # Copyright text comments: "Some Product Comments" # Comments version: "0.0.1" # The application version - # cfBundleIconName: "appicon" # The macOS icon name in Assets.car icon bundles (optional) - # # Should match the name of your .icon file without the extension - # # If not set and Assets.car exists, defaults to "appicon" - -# iOS build configuration (uncomment to customise iOS project generation) -# Note: Keys under `ios` OVERRIDE values under `info` when set. -# ios: -# # The iOS bundle identifier used in the generated Xcode project (CFBundleIdentifier) -# bundleID: "com.mycompany.myproduct" -# # The display name shown under the app icon (CFBundleDisplayName/CFBundleName) -# displayName: "My Product" -# # The app version to embed in Info.plist (CFBundleShortVersionString/CFBundleVersion) -# version: "0.0.1" -# # The company/organisation name for templates and project settings -# company: "My Company" -# # Additional comments to embed in Info.plist metadata -# comments: "Some Product Comments" # Dev mode configuration dev_mode: @@ -75,4 +58,4 @@ fileAssociations: # Other data other: - - name: My Other Data \ No newline at end of file + - name: My Other Data diff --git a/build/ios/Assets.xcassets b/build/ios/Assets.xcassets deleted file mode 100644 index 46fbb87..0000000 --- a/build/ios/Assets.xcassets +++ /dev/null @@ -1,116 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - }, - "images" : [ - { - "filename" : "icon-20@2x.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" - }, - { - "filename" : "icon-20@3x.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" - }, - { - "filename" : "icon-29@2x.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" - }, - { - "filename" : "icon-29@3x.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" - }, - { - "filename" : "icon-40@2x.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" - }, - { - "filename" : "icon-40@3x.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" - }, - { - "filename" : "icon-60@2x.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" - }, - { - "filename" : "icon-60@3x.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" - }, - { - "filename" : "icon-20.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "filename" : "icon-20@2x.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "filename" : "icon-29.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "filename" : "icon-29@2x.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "filename" : "icon-40.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "filename" : "icon-40@2x.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "filename" : "icon-76.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "filename" : "icon-76@2x.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "filename" : "icon-83.5@2x.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { - "filename" : "icon-1024.png", - "idiom" : "ios-marketing", - "scale" : "1x", - "size" : "1024x1024" - } - ] -} \ No newline at end of file diff --git a/build/ios/Info.dev.plist b/build/ios/Info.dev.plist deleted file mode 100644 index 71789cb..0000000 --- a/build/ios/Info.dev.plist +++ /dev/null @@ -1,62 +0,0 @@ - - - - - CFBundleExecutable - mesh-drop - CFBundleIdentifier - com.example.meshdrop.dev - CFBundleName - My Product (Dev) - CFBundleDisplayName - My Product (Dev) - CFBundlePackageType - APPL - CFBundleShortVersionString - 0.1.0-dev - CFBundleVersion - 0.1.0 - LSRequiresIPhoneOS - - MinimumOSVersion - 15.0 - UILaunchStoryboardName - LaunchScreen - UIRequiredDeviceCapabilities - - armv7 - arm64 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - NSAllowsLocalNetworking - - - - WailsDevelopmentMode - - - NSHumanReadableCopyright - © 2026, My Company - - - CFBundleGetInfoString - This is a comment - - - \ No newline at end of file diff --git a/build/ios/Info.plist b/build/ios/Info.plist deleted file mode 100644 index 89fd385..0000000 --- a/build/ios/Info.plist +++ /dev/null @@ -1,59 +0,0 @@ - - - - - CFBundleExecutable - mesh-drop - CFBundleIdentifier - com.example.meshdrop - CFBundleName - My Product - CFBundleDisplayName - My Product - CFBundlePackageType - APPL - CFBundleShortVersionString - 0.1.0 - CFBundleVersion - 0.1.0 - LSRequiresIPhoneOS - - MinimumOSVersion - 15.0 - UILaunchStoryboardName - LaunchScreen - UIRequiredDeviceCapabilities - - armv7 - arm64 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - NSAllowsLocalNetworking - - - - NSHumanReadableCopyright - © 2026, My Company - - - CFBundleGetInfoString - This is a comment - - - \ No newline at end of file diff --git a/build/ios/LaunchScreen.storyboard b/build/ios/LaunchScreen.storyboard deleted file mode 100644 index 176e2e4..0000000 --- a/build/ios/LaunchScreen.storyboard +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/ios/Taskfile.yml b/build/ios/Taskfile.yml deleted file mode 100644 index 8c27f08..0000000 --- a/build/ios/Taskfile.yml +++ /dev/null @@ -1,293 +0,0 @@ -version: '3' - -includes: - common: ../Taskfile.yml - -vars: - BUNDLE_ID: '{{.BUNDLE_ID | default "com.wails.app"}}' - # SDK_PATH is computed lazily at task-level to avoid errors on non-macOS systems - # Each task that needs it defines SDK_PATH in its own vars section - -tasks: - install:deps: - summary: Check and install iOS development dependencies - cmds: - - go run build/ios/scripts/deps/install_deps.go - env: - TASK_FORCE_YES: '{{if .YES}}true{{else}}false{{end}}' - prompt: This will check and install iOS development dependencies. Continue? - - # Note: Bindings generation may show CGO warnings for iOS C imports. - # These warnings are harmless and don't affect the generated bindings, - # as the generator only needs to parse Go types, not C implementations. - build: - summary: Creates a build of the application for iOS - deps: - - task: generate:ios:overlay - - task: generate:ios:xcode - - task: common:go:mod:tidy - - task: generate:ios:bindings - vars: - BUILD_FLAGS: - ref: .BUILD_FLAGS - - task: common:build:frontend - vars: - BUILD_FLAGS: - ref: .BUILD_FLAGS - PRODUCTION: - ref: .PRODUCTION - - task: common:generate:icons - cmds: - - echo "Building iOS app {{.APP_NAME}}..." - - go build -buildmode=c-archive -overlay build/ios/xcode/overlay.json {{.BUILD_FLAGS}} -o {{.OUTPUT}}.a - vars: - BUILD_FLAGS: '{{if eq .PRODUCTION "true"}}-tags production,ios -trimpath -buildvcs=false -ldflags="-w -s"{{else}}-tags ios,debug -buildvcs=false -gcflags=all="-l"{{end}}' - DEFAULT_OUTPUT: '{{.BIN_DIR}}/{{.APP_NAME}}' - OUTPUT: '{{ .OUTPUT | default .DEFAULT_OUTPUT }}' - SDK_PATH: - sh: xcrun --sdk iphonesimulator --show-sdk-path - env: - GOOS: ios - CGO_ENABLED: 1 - GOARCH: '{{.ARCH | default "arm64"}}' - PRODUCTION: '{{.PRODUCTION | default "false"}}' - CGO_CFLAGS: '-isysroot {{.SDK_PATH}} -target arm64-apple-ios15.0-simulator -mios-simulator-version-min=15.0' - CGO_LDFLAGS: '-isysroot {{.SDK_PATH}} -target arm64-apple-ios15.0-simulator' - - compile:objc: - summary: Compile Objective-C iOS wrapper - vars: - SDK_PATH: - sh: xcrun --sdk iphonesimulator --show-sdk-path - cmds: - - xcrun -sdk iphonesimulator clang -target arm64-apple-ios15.0-simulator -isysroot {{.SDK_PATH}} -framework Foundation -framework UIKit -framework WebKit -o {{.BIN_DIR}}/{{.APP_NAME}} build/ios/main.m - - codesign --force --sign - "{{.BIN_DIR}}/{{.APP_NAME}}" - - package: - summary: Packages a production build of the application into a `.app` bundle - deps: - - task: build - vars: - PRODUCTION: "true" - cmds: - - task: create:app:bundle - - create:app:bundle: - summary: Creates an iOS `.app` bundle - cmds: - - rm -rf "{{.BIN_DIR}}/{{.APP_NAME}}.app" - - mkdir -p "{{.BIN_DIR}}/{{.APP_NAME}}.app" - - cp "{{.BIN_DIR}}/{{.APP_NAME}}" "{{.BIN_DIR}}/{{.APP_NAME}}.app/" - - cp build/ios/Info.plist "{{.BIN_DIR}}/{{.APP_NAME}}.app/" - - | - # Compile asset catalog and embed icons in the app bundle - APP_BUNDLE="{{.BIN_DIR}}/{{.APP_NAME}}.app" - AC_IN="build/ios/xcode/main/Assets.xcassets" - if [ -d "$AC_IN" ]; then - TMP_AC=$(mktemp -d) - xcrun actool \ - --compile "$TMP_AC" \ - --app-icon AppIcon \ - --platform iphonesimulator \ - --minimum-deployment-target 15.0 \ - --product-type com.apple.product-type.application \ - --target-device iphone \ - --target-device ipad \ - --output-partial-info-plist "$APP_BUNDLE/assetcatalog_generated_info.plist" \ - "$AC_IN" - if [ -f "$TMP_AC/Assets.car" ]; then - cp -f "$TMP_AC/Assets.car" "$APP_BUNDLE/Assets.car" - fi - rm -rf "$TMP_AC" - if [ -f "$APP_BUNDLE/assetcatalog_generated_info.plist" ]; then - /usr/libexec/PlistBuddy -c "Merge $APP_BUNDLE/assetcatalog_generated_info.plist" "$APP_BUNDLE/Info.plist" || true - fi - fi - - codesign --force --sign - "{{.BIN_DIR}}/{{.APP_NAME}}.app" - - deploy-simulator: - summary: Deploy to iOS Simulator - deps: [package] - cmds: - - xcrun simctl terminate booted {{.BUNDLE_ID}} 2>/dev/null || true - - xcrun simctl uninstall booted {{.BUNDLE_ID}} 2>/dev/null || true - - xcrun simctl install booted "{{.BIN_DIR}}/{{.APP_NAME}}.app" - - xcrun simctl launch booted {{.BUNDLE_ID}} - - compile:ios: - summary: Compile the iOS executable from Go archive and main.m - deps: - - task: build - vars: - SDK_PATH: - sh: xcrun --sdk iphonesimulator --show-sdk-path - cmds: - - | - MAIN_M=build/ios/xcode/main/main.m - if [ ! -f "$MAIN_M" ]; then - MAIN_M=build/ios/main.m - fi - xcrun -sdk iphonesimulator clang \ - -target arm64-apple-ios15.0-simulator \ - -isysroot {{.SDK_PATH}} \ - -framework Foundation -framework UIKit -framework WebKit \ - -framework Security -framework CoreFoundation \ - -lresolv \ - -o "{{.BIN_DIR}}/{{.APP_NAME | lower}}" \ - "$MAIN_M" "{{.BIN_DIR}}/{{.APP_NAME}}.a" - - generate:ios:bindings: - internal: true - summary: Generates bindings for iOS with proper CGO flags - sources: - - "**/*.go" - - go.mod - - go.sum - generates: - - frontend/bindings/**/* - vars: - SDK_PATH: - sh: xcrun --sdk iphonesimulator --show-sdk-path - cmds: - - wails3 generate bindings -f '{{.BUILD_FLAGS}}' -clean=true - env: - GOOS: ios - CGO_ENABLED: 1 - GOARCH: '{{.ARCH | default "arm64"}}' - CGO_CFLAGS: '-isysroot {{.SDK_PATH}} -target arm64-apple-ios15.0-simulator -mios-simulator-version-min=15.0' - CGO_LDFLAGS: '-isysroot {{.SDK_PATH}} -target arm64-apple-ios15.0-simulator' - - ensure-simulator: - internal: true - summary: Ensure iOS Simulator is running and booted - silent: true - cmds: - - | - if ! xcrun simctl list devices booted | grep -q "Booted"; then - echo "Starting iOS Simulator..." - # Get first available iPhone device - DEVICE_ID=$(xcrun simctl list devices available | grep "iPhone" | head -1 | grep -o "[A-F0-9-]\{36\}" || true) - if [ -z "$DEVICE_ID" ]; then - echo "No iPhone simulator found. Creating one..." - RUNTIME=$(xcrun simctl list runtimes | grep iOS | tail -1 | awk '{print $NF}') - DEVICE_ID=$(xcrun simctl create "iPhone 15 Pro" "iPhone 15 Pro" "$RUNTIME") - fi - # Boot the device - echo "Booting device $DEVICE_ID..." - xcrun simctl boot "$DEVICE_ID" 2>/dev/null || true - # Open Simulator app - open -a Simulator - # Wait for boot (max 30 seconds) - for i in {1..30}; do - if xcrun simctl list devices booted | grep -q "Booted"; then - echo "Simulator booted successfully" - break - fi - sleep 1 - done - # Final check - if ! xcrun simctl list devices booted | grep -q "Booted"; then - echo "Failed to boot simulator after 30 seconds" - exit 1 - fi - fi - preconditions: - - sh: command -v xcrun - msg: "xcrun not found. Please run 'wails3 task ios:install:deps' to install iOS development dependencies" - - generate:ios:overlay: - internal: true - summary: Generate Go build overlay and iOS shim - sources: - - build/config.yml - generates: - - build/ios/xcode/overlay.json - - build/ios/xcode/gen/main_ios.gen.go - cmds: - - wails3 ios overlay:gen -out build/ios/xcode/overlay.json -config build/config.yml - - generate:ios:xcode: - internal: true - summary: Generate iOS Xcode project structure and assets - sources: - - build/config.yml - - build/appicon.png - generates: - - build/ios/xcode/main/main.m - - build/ios/xcode/main/Assets.xcassets/**/* - - build/ios/xcode/project.pbxproj - cmds: - - wails3 ios xcode:gen -outdir build/ios/xcode -config build/config.yml - - run: - summary: Run the application in iOS Simulator - deps: - - task: ensure-simulator - - task: compile:ios - cmds: - - rm -rf "{{.BIN_DIR}}/{{.APP_NAME}}.dev.app" - - mkdir -p "{{.BIN_DIR}}/{{.APP_NAME}}.dev.app" - - cp "{{.BIN_DIR}}/{{.APP_NAME | lower}}" "{{.BIN_DIR}}/{{.APP_NAME}}.dev.app/{{.APP_NAME | lower}}" - - cp build/ios/Info.dev.plist "{{.BIN_DIR}}/{{.APP_NAME}}.dev.app/Info.plist" - - | - # Compile asset catalog and embed icons for dev bundle - APP_BUNDLE="{{.BIN_DIR}}/{{.APP_NAME}}.dev.app" - AC_IN="build/ios/xcode/main/Assets.xcassets" - if [ -d "$AC_IN" ]; then - TMP_AC=$(mktemp -d) - xcrun actool \ - --compile "$TMP_AC" \ - --app-icon AppIcon \ - --platform iphonesimulator \ - --minimum-deployment-target 15.0 \ - --product-type com.apple.product-type.application \ - --target-device iphone \ - --target-device ipad \ - --output-partial-info-plist "$APP_BUNDLE/assetcatalog_generated_info.plist" \ - "$AC_IN" - if [ -f "$TMP_AC/Assets.car" ]; then - cp -f "$TMP_AC/Assets.car" "$APP_BUNDLE/Assets.car" - fi - rm -rf "$TMP_AC" - if [ -f "$APP_BUNDLE/assetcatalog_generated_info.plist" ]; then - /usr/libexec/PlistBuddy -c "Merge $APP_BUNDLE/assetcatalog_generated_info.plist" "$APP_BUNDLE/Info.plist" || true - fi - fi - - codesign --force --sign - "{{.BIN_DIR}}/{{.APP_NAME}}.dev.app" - - xcrun simctl terminate booted "com.wails.{{.APP_NAME | lower}}.dev" 2>/dev/null || true - - xcrun simctl uninstall booted "com.wails.{{.APP_NAME | lower}}.dev" 2>/dev/null || true - - xcrun simctl install booted "{{.BIN_DIR}}/{{.APP_NAME}}.dev.app" - - xcrun simctl launch booted "com.wails.{{.APP_NAME | lower}}.dev" - - xcode: - summary: Open the generated Xcode project for this app - cmds: - - task: generate:ios:xcode - - open build/ios/xcode/main.xcodeproj - - logs: - summary: Stream iOS Simulator logs filtered to this app - cmds: - - | - xcrun simctl spawn booted log stream \ - --level debug \ - --style compact \ - --predicate 'senderImagePath CONTAINS[c] "{{.APP_NAME | lower}}.app/" OR composedMessage CONTAINS[c] "{{.APP_NAME | lower}}" OR eventMessage CONTAINS[c] "{{.APP_NAME | lower}}" OR process == "{{.APP_NAME | lower}}" OR category CONTAINS[c] "{{.APP_NAME | lower}}"' - - logs:dev: - summary: Stream logs for the dev bundle (used by `task ios:run`) - cmds: - - | - xcrun simctl spawn booted log stream \ - --level debug \ - --style compact \ - --predicate 'senderImagePath CONTAINS[c] ".dev.app/" OR subsystem == "com.wails.{{.APP_NAME | lower}}.dev" OR process == "{{.APP_NAME | lower}}"' - - logs:wide: - summary: Wide log stream to help discover the exact process/bundle identifiers - cmds: - - | - xcrun simctl spawn booted log stream \ - --level debug \ - --style compact \ - --predicate 'senderImagePath CONTAINS[c] ".app/"' \ No newline at end of file diff --git a/build/ios/app_options_default.go b/build/ios/app_options_default.go deleted file mode 100644 index 04e4f1b..0000000 --- a/build/ios/app_options_default.go +++ /dev/null @@ -1,10 +0,0 @@ -//go:build !ios - -package main - -import "github.com/wailsapp/wails/v3/pkg/application" - -// modifyOptionsForIOS is a no-op on non-iOS platforms -func modifyOptionsForIOS(opts *application.Options) { - // No modifications needed for non-iOS platforms -} \ No newline at end of file diff --git a/build/ios/app_options_ios.go b/build/ios/app_options_ios.go deleted file mode 100644 index 8f6ac31..0000000 --- a/build/ios/app_options_ios.go +++ /dev/null @@ -1,11 +0,0 @@ -//go:build ios - -package main - -import "github.com/wailsapp/wails/v3/pkg/application" - -// modifyOptionsForIOS adjusts the application options for iOS -func modifyOptionsForIOS(opts *application.Options) { - // Disable signal handlers on iOS to prevent crashes - opts.DisableDefaultSignalHandler = true -} \ No newline at end of file diff --git a/build/ios/build.sh b/build/ios/build.sh deleted file mode 100644 index 522a7bd..0000000 --- a/build/ios/build.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash -set -e - -# Build configuration -APP_NAME="mesh-drop" -BUNDLE_ID="com.example.meshdrop" -VERSION="0.1.0" -BUILD_NUMBER="0.1.0" -BUILD_DIR="build/ios" -TARGET="simulator" - -echo "Building iOS app: $APP_NAME" -echo "Bundle ID: $BUNDLE_ID" -echo "Version: $VERSION ($BUILD_NUMBER)" -echo "Target: $TARGET" - -# Ensure build directory exists -mkdir -p "$BUILD_DIR" - -# Determine SDK and target architecture -if [ "$TARGET" = "simulator" ]; then - SDK="iphonesimulator" - ARCH="arm64-apple-ios15.0-simulator" -elif [ "$TARGET" = "device" ]; then - SDK="iphoneos" - ARCH="arm64-apple-ios15.0" -else - echo "Unknown target: $TARGET" - exit 1 -fi - -# Get SDK path -SDK_PATH=$(xcrun --sdk $SDK --show-sdk-path) - -# Compile the application -echo "Compiling with SDK: $SDK" -xcrun -sdk $SDK clang \ - -target $ARCH \ - -isysroot "$SDK_PATH" \ - -framework Foundation \ - -framework UIKit \ - -framework WebKit \ - -framework CoreGraphics \ - -o "$BUILD_DIR/$APP_NAME" \ - "$BUILD_DIR/main.m" - -# Create app bundle -echo "Creating app bundle..." -APP_BUNDLE="$BUILD_DIR/$APP_NAME.app" -rm -rf "$APP_BUNDLE" -mkdir -p "$APP_BUNDLE" - -# Move executable -mv "$BUILD_DIR/$APP_NAME" "$APP_BUNDLE/" - -# Copy Info.plist -cp "$BUILD_DIR/Info.plist" "$APP_BUNDLE/" - -# Sign the app -echo "Signing app..." -codesign --force --sign - "$APP_BUNDLE" - -echo "Build complete: $APP_BUNDLE" - -# Deploy to simulator if requested -if [ "$TARGET" = "simulator" ]; then - echo "Deploying to simulator..." - xcrun simctl terminate booted "$BUNDLE_ID" 2>/dev/null || true - xcrun simctl install booted "$APP_BUNDLE" - xcrun simctl launch booted "$BUNDLE_ID" - echo "App launched on simulator" -fi \ No newline at end of file diff --git a/build/ios/entitlements.plist b/build/ios/entitlements.plist deleted file mode 100644 index cc5d958..0000000 --- a/build/ios/entitlements.plist +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - get-task-allow - - - - com.apple.security.app-sandbox - - - - com.apple.security.network.client - - - - com.apple.security.files.user-selected.read-only - - - \ No newline at end of file diff --git a/build/ios/icon.png b/build/ios/icon.png deleted file mode 100644 index be7d591..0000000 --- a/build/ios/icon.png +++ /dev/null @@ -1,3 +0,0 @@ -# iOS Icon Placeholder -# This file should be replaced with the actual app icon (1024x1024 PNG) -# The build process will generate all required icon sizes from this base icon \ No newline at end of file diff --git a/build/ios/main.m b/build/ios/main.m deleted file mode 100644 index 366767a..0000000 --- a/build/ios/main.m +++ /dev/null @@ -1,23 +0,0 @@ -//go:build ios -// Minimal bootstrap: delegate comes from Go archive (WailsAppDelegate) -#import -#include - -// External Go initialization function from the c-archive (declare before use) -extern void WailsIOSMain(); - -int main(int argc, char * argv[]) { - @autoreleasepool { - // Disable buffering so stdout/stderr from Go log.Printf flush immediately - setvbuf(stdout, NULL, _IONBF, 0); - setvbuf(stderr, NULL, _IONBF, 0); - - // Start Go runtime on a background queue to avoid blocking main thread/UI - dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0), ^{ - WailsIOSMain(); - }); - - // Run UIApplicationMain using WailsAppDelegate provided by the Go archive - return UIApplicationMain(argc, argv, nil, @"WailsAppDelegate"); - } -} \ No newline at end of file diff --git a/build/ios/main_ios.go b/build/ios/main_ios.go deleted file mode 100644 index b75a403..0000000 --- a/build/ios/main_ios.go +++ /dev/null @@ -1,24 +0,0 @@ -//go:build ios - -package main - -import ( - "C" -) - -// For iOS builds, we need to export a function that can be called from Objective-C -// This wrapper allows us to keep the original main.go unmodified - -//export WailsIOSMain -func WailsIOSMain() { - // DO NOT lock the goroutine to the current OS thread on iOS! - // This causes signal handling issues: - // "signal 16 received on thread with no signal stack" - // "fatal error: non-Go code disabled sigaltstack" - // iOS apps run in a sandboxed environment where the Go runtime's - // signal handling doesn't work the same way as desktop platforms. - - // Call the actual main function from main.go - // This ensures all the user's code is executed - main() -} \ No newline at end of file diff --git a/build/ios/project.pbxproj b/build/ios/project.pbxproj deleted file mode 100644 index d2bf1c2..0000000 --- a/build/ios/project.pbxproj +++ /dev/null @@ -1,222 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = {}; - objectVersion = 56; - objects = { - -/* Begin PBXBuildFile section */ - C0DEBEEF0000000000000001 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C0DEBEEF0000000000000002 /* main.m */; }; - C0DEBEEF00000000000000F1 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0DEBEEF0000000000000101 /* UIKit.framework */; }; - C0DEBEEF00000000000000F2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0DEBEEF0000000000000102 /* Foundation.framework */; }; - C0DEBEEF00000000000000F3 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0DEBEEF0000000000000103 /* WebKit.framework */; }; - C0DEBEEF00000000000000F4 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0DEBEEF0000000000000104 /* Security.framework */; }; - C0DEBEEF00000000000000F5 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0DEBEEF0000000000000105 /* CoreFoundation.framework */; }; - C0DEBEEF00000000000000F6 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = C0DEBEEF0000000000000106 /* libresolv.tbd */; }; - C0DEBEEF00000000000000F7 /* My Product.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C0DEBEEF0000000000000107 /* My Product.a */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - C0DEBEEF0000000000000002 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - C0DEBEEF0000000000000003 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C0DEBEEF0000000000000004 /* My Product.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "My Product.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - C0DEBEEF0000000000000101 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - C0DEBEEF0000000000000102 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - C0DEBEEF0000000000000103 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; - C0DEBEEF0000000000000104 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; - C0DEBEEF0000000000000105 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; - C0DEBEEF0000000000000106 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.text-based-dylib-definition; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; - C0DEBEEF0000000000000107 /* My Product.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "My Product.a"; path = ../../../bin/My Product.a; sourceTree = SOURCE_ROOT; }; -/* End PBXFileReference section */ - -/* Begin PBXGroup section */ - C0DEBEEF0000000000000010 = { - isa = PBXGroup; - children = ( - C0DEBEEF0000000000000020 /* Products */, - C0DEBEEF0000000000000045 /* Frameworks */, - C0DEBEEF0000000000000030 /* main */, - ); - sourceTree = ""; - }; - C0DEBEEF0000000000000020 /* Products */ = { - isa = PBXGroup; - children = ( - C0DEBEEF0000000000000004 /* My Product.app */, - ); - name = Products; - sourceTree = ""; - }; - C0DEBEEF0000000000000030 /* main */ = { - isa = PBXGroup; - children = ( - C0DEBEEF0000000000000002 /* main.m */, - C0DEBEEF0000000000000003 /* Info.plist */, - ); - path = main; - sourceTree = SOURCE_ROOT; - }; - C0DEBEEF0000000000000045 /* Frameworks */ = { - isa = PBXGroup; - children = ( - C0DEBEEF0000000000000101 /* UIKit.framework */, - C0DEBEEF0000000000000102 /* Foundation.framework */, - C0DEBEEF0000000000000103 /* WebKit.framework */, - C0DEBEEF0000000000000104 /* Security.framework */, - C0DEBEEF0000000000000105 /* CoreFoundation.framework */, - C0DEBEEF0000000000000106 /* libresolv.tbd */, - C0DEBEEF0000000000000107 /* My Product.a */, - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - C0DEBEEF0000000000000040 /* My Product */ = { - isa = PBXNativeTarget; - buildConfigurationList = C0DEBEEF0000000000000070 /* Build configuration list for PBXNativeTarget "My Product" */; - buildPhases = ( - C0DEBEEF0000000000000055 /* Prebuild: Wails Go Archive */, - C0DEBEEF0000000000000050 /* Sources */, - C0DEBEEF0000000000000056 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "My Product"; - productName = "My Product"; - productReference = C0DEBEEF0000000000000004 /* My Product.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - C0DEBEEF0000000000000060 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1500; - ORGANIZATIONNAME = "My Company"; - TargetAttributes = { - C0DEBEEF0000000000000040 = { - CreatedOnToolsVersion = 15.0; - }; - }; - }; - buildConfigurationList = C0DEBEEF0000000000000080 /* Build configuration list for PBXProject "main" */; - compatibilityVersion = "Xcode 15.0"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = C0DEBEEF0000000000000010; - productRefGroup = C0DEBEEF0000000000000020 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - C0DEBEEF0000000000000040 /* My Product */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXFrameworksBuildPhase section */ - C0DEBEEF0000000000000056 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - C0DEBEEF00000000000000F7 /* My Product.a in Frameworks */, - C0DEBEEF00000000000000F1 /* UIKit.framework in Frameworks */, - C0DEBEEF00000000000000F2 /* Foundation.framework in Frameworks */, - C0DEBEEF00000000000000F3 /* WebKit.framework in Frameworks */, - C0DEBEEF00000000000000F4 /* Security.framework in Frameworks */, - C0DEBEEF00000000000000F5 /* CoreFoundation.framework in Frameworks */, - C0DEBEEF00000000000000F6 /* libresolv.tbd in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - C0DEBEEF0000000000000055 /* Prebuild: Wails Go Archive */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Prebuild: Wails Go Archive"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "set -e\nAPP_ROOT=\"${PROJECT_DIR}/../../..\"\nSDK_PATH=$(xcrun --sdk iphonesimulator --show-sdk-path)\nexport GOOS=ios\nexport GOARCH=arm64\nexport CGO_ENABLED=1\nexport CGO_CFLAGS=\"-isysroot ${SDK_PATH} -target arm64-apple-ios15.0-simulator -mios-simulator-version-min=15.0\"\nexport CGO_LDFLAGS=\"-isysroot ${SDK_PATH} -target arm64-apple-ios15.0-simulator\"\ncd \"${APP_ROOT}\"\n# Ensure overlay exists\nif [ ! -f build/ios/xcode/overlay.json ]; then\n wails3 ios overlay:gen -out build/ios/xcode/overlay.json -config build/config.yml || true\nfi\n# Build Go c-archive if missing or older than sources\nif [ ! -f bin/My Product.a ]; then\n echo \"Building Go c-archive...\"\n go build -buildmode=c-archive -overlay build/ios/xcode/overlay.json -o bin/My Product.a\nfi\n"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - C0DEBEEF0000000000000050 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C0DEBEEF0000000000000001 /* main.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - C0DEBEEF0000000000000090 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - INFOPLIST_FILE = main/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.example.meshdrop"; - PRODUCT_NAME = "My Product"; - CODE_SIGNING_ALLOWED = NO; - SDKROOT = iphonesimulator; - }; - name = Debug; - }; - C0DEBEEF00000000000000A0 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - INFOPLIST_FILE = main/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.example.meshdrop"; - PRODUCT_NAME = "My Product"; - CODE_SIGNING_ALLOWED = NO; - SDKROOT = iphonesimulator; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - C0DEBEEF0000000000000070 /* Build configuration list for PBXNativeTarget "My Product" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C0DEBEEF0000000000000090 /* Debug */, - C0DEBEEF00000000000000A0 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; - C0DEBEEF0000000000000080 /* Build configuration list for PBXProject "main" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C0DEBEEF0000000000000090 /* Debug */, - C0DEBEEF00000000000000A0 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; -/* End XCConfigurationList section */ - }; - rootObject = C0DEBEEF0000000000000060 /* Project object */; -} diff --git a/build/ios/scripts/deps/install_deps.go b/build/ios/scripts/deps/install_deps.go deleted file mode 100644 index 88ed47a..0000000 --- a/build/ios/scripts/deps/install_deps.go +++ /dev/null @@ -1,319 +0,0 @@ -// install_deps.go - iOS development dependency checker -// This script checks for required iOS development tools. -// It's designed to be portable across different shells by using Go instead of shell scripts. -// -// Usage: -// go run install_deps.go # Interactive mode -// TASK_FORCE_YES=true go run install_deps.go # Auto-accept prompts -// CI=true go run install_deps.go # CI mode (auto-accept) - -package main - -import ( - "bufio" - "fmt" - "os" - "os/exec" - "strings" -) - -type Dependency struct { - Name string - CheckFunc func() (bool, string) // Returns (success, details) - Required bool - InstallCmd []string - InstallMsg string - SuccessMsg string - FailureMsg string -} - -func main() { - fmt.Println("Checking iOS development dependencies...") - fmt.Println("=" + strings.Repeat("=", 50)) - fmt.Println() - - hasErrors := false - dependencies := []Dependency{ - { - Name: "Xcode", - CheckFunc: func() (bool, string) { - // Check if xcodebuild exists - if !checkCommand([]string{"xcodebuild", "-version"}) { - return false, "" - } - // Get version info - out, err := exec.Command("xcodebuild", "-version").Output() - if err != nil { - return false, "" - } - lines := strings.Split(string(out), "\n") - if len(lines) > 0 { - return true, strings.TrimSpace(lines[0]) - } - return true, "" - }, - Required: true, - InstallMsg: "Please install Xcode from the Mac App Store:\n https://apps.apple.com/app/xcode/id497799835\n Xcode is REQUIRED for iOS development (includes iOS SDKs, simulators, and frameworks)", - SuccessMsg: "✅ Xcode found", - FailureMsg: "❌ Xcode not found (REQUIRED)", - }, - { - Name: "Xcode Developer Path", - CheckFunc: func() (bool, string) { - // Check if xcode-select points to a valid Xcode path - out, err := exec.Command("xcode-select", "-p").Output() - if err != nil { - return false, "xcode-select not configured" - } - path := strings.TrimSpace(string(out)) - - // Check if path exists and is in Xcode.app - if _, err := os.Stat(path); err != nil { - return false, "Invalid Xcode path" - } - - // Verify it's pointing to Xcode.app (not just Command Line Tools) - if !strings.Contains(path, "Xcode.app") { - return false, fmt.Sprintf("Points to %s (should be Xcode.app)", path) - } - - return true, path - }, - Required: true, - InstallCmd: []string{"sudo", "xcode-select", "-s", "/Applications/Xcode.app/Contents/Developer"}, - InstallMsg: "Xcode developer path needs to be configured", - SuccessMsg: "✅ Xcode developer path configured", - FailureMsg: "❌ Xcode developer path not configured correctly", - }, - { - Name: "iOS SDK", - CheckFunc: func() (bool, string) { - // Get the iOS Simulator SDK path - cmd := exec.Command("xcrun", "--sdk", "iphonesimulator", "--show-sdk-path") - output, err := cmd.Output() - if err != nil { - return false, "Cannot find iOS SDK" - } - sdkPath := strings.TrimSpace(string(output)) - - // Check if the SDK path exists - if _, err := os.Stat(sdkPath); err != nil { - return false, "iOS SDK path not found" - } - - // Check for UIKit framework (essential for iOS development) - uikitPath := fmt.Sprintf("%s/System/Library/Frameworks/UIKit.framework", sdkPath) - if _, err := os.Stat(uikitPath); err != nil { - return false, "UIKit.framework not found" - } - - // Get SDK version - versionCmd := exec.Command("xcrun", "--sdk", "iphonesimulator", "--show-sdk-version") - versionOut, _ := versionCmd.Output() - version := strings.TrimSpace(string(versionOut)) - - return true, fmt.Sprintf("iOS %s SDK", version) - }, - Required: true, - InstallMsg: "iOS SDK comes with Xcode. Please ensure Xcode is properly installed.", - SuccessMsg: "✅ iOS SDK found with UIKit framework", - FailureMsg: "❌ iOS SDK not found or incomplete", - }, - { - Name: "iOS Simulator Runtime", - CheckFunc: func() (bool, string) { - if !checkCommand([]string{"xcrun", "simctl", "help"}) { - return false, "" - } - // Check if we can list runtimes - out, err := exec.Command("xcrun", "simctl", "list", "runtimes").Output() - if err != nil { - return false, "Cannot access simulator" - } - // Count iOS runtimes - lines := strings.Split(string(out), "\n") - count := 0 - var versions []string - for _, line := range lines { - if strings.Contains(line, "iOS") && !strings.Contains(line, "unavailable") { - count++ - // Extract version number - if parts := strings.Fields(line); len(parts) > 2 { - for _, part := range parts { - if strings.HasPrefix(part, "(") && strings.HasSuffix(part, ")") { - versions = append(versions, strings.Trim(part, "()")) - break - } - } - } - } - } - if count > 0 { - return true, fmt.Sprintf("%d runtime(s): %s", count, strings.Join(versions, ", ")) - } - return false, "No iOS runtimes installed" - }, - Required: true, - InstallMsg: "iOS Simulator runtimes come with Xcode. You may need to download them:\n Xcode → Settings → Platforms → iOS", - SuccessMsg: "✅ iOS Simulator runtime available", - FailureMsg: "❌ iOS Simulator runtime not available", - }, - } - - // Check each dependency - for _, dep := range dependencies { - success, details := dep.CheckFunc() - if success { - msg := dep.SuccessMsg - if details != "" { - msg = fmt.Sprintf("%s (%s)", dep.SuccessMsg, details) - } - fmt.Println(msg) - } else { - fmt.Println(dep.FailureMsg) - if details != "" { - fmt.Printf(" Details: %s\n", details) - } - if dep.Required { - hasErrors = true - if len(dep.InstallCmd) > 0 { - fmt.Println() - fmt.Println(" " + dep.InstallMsg) - fmt.Printf(" Fix command: %s\n", strings.Join(dep.InstallCmd, " ")) - if promptUser("Do you want to run this command?") { - fmt.Println("Running command...") - cmd := exec.Command(dep.InstallCmd[0], dep.InstallCmd[1:]...) - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - cmd.Stdin = os.Stdin - if err := cmd.Run(); err != nil { - fmt.Printf("Command failed: %v\n", err) - os.Exit(1) - } - fmt.Println("✅ Command completed. Please run this check again.") - } else { - fmt.Printf(" Please run manually: %s\n", strings.Join(dep.InstallCmd, " ")) - } - } else { - fmt.Println(" " + dep.InstallMsg) - } - } - } - } - - // Check for iPhone simulators - fmt.Println() - fmt.Println("Checking for iPhone simulator devices...") - if !checkCommand([]string{"xcrun", "simctl", "list", "devices"}) { - fmt.Println("❌ Cannot check for iPhone simulators") - hasErrors = true - } else { - out, err := exec.Command("xcrun", "simctl", "list", "devices").Output() - if err != nil { - fmt.Println("❌ Failed to list simulator devices") - hasErrors = true - } else if !strings.Contains(string(out), "iPhone") { - fmt.Println("⚠️ No iPhone simulator devices found") - fmt.Println() - - // Get the latest iOS runtime - runtimeOut, err := exec.Command("xcrun", "simctl", "list", "runtimes").Output() - if err != nil { - fmt.Println(" Failed to get iOS runtimes:", err) - } else { - lines := strings.Split(string(runtimeOut), "\n") - var latestRuntime string - for _, line := range lines { - if strings.Contains(line, "iOS") && !strings.Contains(line, "unavailable") { - // Extract runtime identifier - parts := strings.Fields(line) - if len(parts) > 0 { - latestRuntime = parts[len(parts)-1] - } - } - } - - if latestRuntime == "" { - fmt.Println(" No iOS runtime found. Please install iOS simulators in Xcode:") - fmt.Println(" Xcode → Settings → Platforms → iOS") - } else { - fmt.Println(" Would you like to create an iPhone 15 Pro simulator?") - createCmd := []string{"xcrun", "simctl", "create", "iPhone 15 Pro", "iPhone 15 Pro", latestRuntime} - fmt.Printf(" Command: %s\n", strings.Join(createCmd, " ")) - if promptUser("Create simulator?") { - cmd := exec.Command(createCmd[0], createCmd[1:]...) - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - if err := cmd.Run(); err != nil { - fmt.Printf(" Failed to create simulator: %v\n", err) - } else { - fmt.Println(" ✅ iPhone 15 Pro simulator created") - } - } else { - fmt.Println(" Skipping simulator creation") - fmt.Printf(" Create manually: %s\n", strings.Join(createCmd, " ")) - } - } - } - } else { - // Count iPhone devices - count := 0 - lines := strings.Split(string(out), "\n") - for _, line := range lines { - if strings.Contains(line, "iPhone") && !strings.Contains(line, "unavailable") { - count++ - } - } - fmt.Printf("✅ %d iPhone simulator device(s) available\n", count) - } - } - - // Final summary - fmt.Println() - fmt.Println("=" + strings.Repeat("=", 50)) - if hasErrors { - fmt.Println("❌ Some required dependencies are missing or misconfigured.") - fmt.Println() - fmt.Println("Quick setup guide:") - fmt.Println("1. Install Xcode from Mac App Store (if not installed)") - fmt.Println("2. Open Xcode once and agree to the license") - fmt.Println("3. Install additional components when prompted") - fmt.Println("4. Run: sudo xcode-select -s /Applications/Xcode.app/Contents/Developer") - fmt.Println("5. Download iOS simulators: Xcode → Settings → Platforms → iOS") - fmt.Println("6. Run this check again") - os.Exit(1) - } else { - fmt.Println("✅ All required dependencies are installed!") - fmt.Println(" You're ready for iOS development with Wails!") - } -} - -func checkCommand(args []string) bool { - if len(args) == 0 { - return false - } - cmd := exec.Command(args[0], args[1:]...) - cmd.Stdout = nil - cmd.Stderr = nil - err := cmd.Run() - return err == nil -} - -func promptUser(question string) bool { - // Check if we're in a non-interactive environment - if os.Getenv("CI") != "" || os.Getenv("TASK_FORCE_YES") == "true" { - fmt.Printf("%s [y/N]: y (auto-accepted)\n", question) - return true - } - - reader := bufio.NewReader(os.Stdin) - fmt.Printf("%s [y/N]: ", question) - - response, err := reader.ReadString('\n') - if err != nil { - return false - } - - response = strings.ToLower(strings.TrimSpace(response)) - return response == "y" || response == "yes" -} \ No newline at end of file diff --git a/build/windows/Taskfile.yml b/build/windows/Taskfile.yml index a973981..53dd37b 100644 --- a/build/windows/Taskfile.yml +++ b/build/windows/Taskfile.yml @@ -25,7 +25,7 @@ tasks: DEV: "{{.DEV}}" vars: # Default to CGO_ENABLED=0 if not explicitly set - CGO_ENABLED: '{{.CGO_ENABLED | default "0"}}'--lzma + CGO_ENABLED: '{{.CGO_ENABLED | default "0"}}' build:native: summary: Builds the application using native Go cross-compilation diff --git a/frontend/bindings/mesh-drop/internal/discovery/service.ts b/frontend/bindings/mesh-drop/internal/discovery/service.ts index 7df7db1..0854693 100644 --- a/frontend/bindings/mesh-drop/internal/discovery/service.ts +++ b/frontend/bindings/mesh-drop/internal/discovery/service.ts @@ -13,15 +13,26 @@ export function GetID(): $CancellablePromise { return $Call.ByID(1539451205); } +export function GetLocalIPInSameSubnet(receiverIP: string): $CancellablePromise<[string, boolean]> { + return $Call.ByID(3089425954, receiverIP); +} + +export function GetLocalIPs(): $CancellablePromise<[string[], boolean]> { + return $Call.ByID(2403939179).then(($result: any) => { + $result[0] = $$createType0($result[0]); + return $result; + }); +} + export function GetPeerByIP(ip: string): $CancellablePromise<$models.Peer | null> { return $Call.ByID(1626825408, ip).then(($result: any) => { - return $$createType1($result); + return $$createType2($result); }); } export function GetPeers(): $CancellablePromise<$models.Peer[]> { return $Call.ByID(3041084029).then(($result: any) => { - return $$createType2($result); + return $$createType3($result); }); } @@ -30,6 +41,7 @@ export function Start(): $CancellablePromise { } // Private type creation functions -const $$createType0 = $models.Peer.createFrom; -const $$createType1 = $Create.Nullable($$createType0); -const $$createType2 = $Create.Array($$createType0); +const $$createType0 = $Create.Array($Create.Any); +const $$createType1 = $models.Peer.createFrom; +const $$createType2 = $Create.Nullable($$createType1); +const $$createType3 = $Create.Array($$createType1); diff --git a/frontend/bindings/mesh-drop/internal/transfer/models.ts b/frontend/bindings/mesh-drop/internal/transfer/models.ts index be4c325..856fb6c 100644 --- a/frontend/bindings/mesh-drop/internal/transfer/models.ts +++ b/frontend/bindings/mesh-drop/internal/transfer/models.ts @@ -70,6 +70,11 @@ export class Sender { */ "name": string; + /** + * 发送者 IP + */ + "ip": string; + /** Creates a new Sender instance. */ constructor($$source: Partial = {}) { if (!("id" in $$source)) { @@ -78,6 +83,9 @@ export class Sender { if (!("name" in $$source)) { this["name"] = ""; } + if (!("ip" in $$source)) { + this["ip"] = ""; + } Object.assign(this, $$source); }