ruby_everywhere 0.7.0 → 0.9.0

data/support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/WebFragment.kt

@@ -1,5 +1,8 @@
 package com.rubyeverywhere.shell
 
+import android.view.View
+import android.widget.TextView
+import androidx.core.view.isVisible
 import dev.hotwire.core.turbo.errors.VisitError
 import dev.hotwire.navigation.destinations.HotwireDestinationDeepLink
 import dev.hotwire.navigation.fragments.HotwireWebFragment
@@ -8,10 +11,11 @@ import dev.hotwire.navigation.fragments.HotwireWebFragment
  * The default destination for every web visit.
  *
  * Deliberately thin — the framework's own fragment already does the work. Its
- * one job is telling [MainActivity] when there is content on screen, which is
- * how the splash comes down. Android has no `NavigatorDelegate.requestDidFinish`
- * the way iOS does; the visit callbacks on the fragment are where that
- * information surfaces.
+ * jobs are telling [MainActivity] when there is content on screen (how the
+ * splash comes down — Android has no `NavigatorDelegate.requestDidFinish` the
+ * way iOS does; the visit callbacks on the fragment are where that information
+ * surfaces) and swapping the library's button-less error view for one the user
+ * can act on.
  */
 @HotwireDestinationDeepLink(uri = "hotwire://fragment/web")
 open class WebFragment : HotwireWebFragment() {
@@ -30,6 +34,29 @@ open class WebFragment : HotwireWebFragment() {
         settled()
     }
 
+    /**
+     * The library's error view is a message with no controls — its only retry
+     * is pull-to-refresh, invisible exactly when the user is staring at a dead
+     * page. Ours adds an explicit retry, and — inside a picked instance, where
+     * retrying can only knock on the same dead host — the way home: clear the
+     * instance and re-root onto the app's own start page, exactly what the
+     * page's own `Everywhere.instance.clear()` would do if it could load.
+     */
+    override fun createErrorView(error: VisitError): View {
+        val view = layoutInflater.inflate(R.layout.everywhere_error, null)
+        view.findViewById<TextView>(R.id.everywhere_error_description).text = error.description()
+        view.findViewById<View>(R.id.everywhere_error_retry).setOnClickListener {
+            refresh(displayProgress = true)
+        }
+        view.findViewById<View>(R.id.everywhere_error_leave).apply {
+            isVisible = EverywhereConfig.shared.instanceUrl != null
+            setOnClickListener {
+                EverywhereEvents.emit(EverywhereEvents.Event.ClearInstance(null))
+            }
+        }
+        return view
+    }
+
     private fun settled() {
         (activity as? MainActivity)?.onWebContentSettled()
     }

data/support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/bridge/WebControlChannel.kt

@@ -189,16 +189,12 @@ class WebControlChannel : WebViewCompat.WebMessageListener {
         }
 
         /**
-         * The app's own origin, derived from the *effective* root — so a dev
-         * build against 127.0.0.1 and a picked instance both work without a
-         * second list to keep in sync.
+         * Every origin the shell's own pages come from — stamped root, dev
+         * override, picked instance (EverywhereConfig.trustedRootOrigins).
+         * All of them, not just the effective root: while the shell is rooted
+         * on an instance, the picker's own pages are still served from the
+         * stamped origin, and they need the channel to switch or leave.
          */
-        private fun originRules(): Set<String> {
-            val uri = EverywhereConfig.shared.rootUrl.toUri()
-            val scheme = uri.scheme ?: return emptySet()
-            val host = uri.host ?: return emptySet()
-            val port = if (uri.port > 0) ":${uri.port}" else ""
-            return setOf("$scheme://$host$port")
-        }
+        private fun originRules(): Set<String> = EverywhereConfig.shared.trustedRootOrigins
     }
 }

data/support/mobile/android/app/src/main/res/layout/everywhere_error.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  FROZEN. The failed-visit screen WebFragment.createErrorView inflates in
+  place of the library's hotwire_error.xml, which has no controls at all —
+  its only retry is pull-to-refresh, invisible exactly when the user is
+  staring at a dead page. Same typography as the library's version, plus an
+  explicit retry button and an escape hatch for picked instances (shown by
+  WebFragment only when an instance override is active).
+-->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:colorBackground">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:gravity="center_horizontal"
+        android:paddingStart="24dp"
+        android:paddingEnd="24dp">
+
+        <com.google.android.material.textview.MaterialTextView
+            style="@style/TextAppearance.MaterialComponents.Headline6"
+            android:id="@+id/everywhere_error_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/everywhere_error_title" />
+
+        <com.google.android.material.textview.MaterialTextView
+            style="@style/TextAppearance.MaterialComponents.Caption"
+            android:id="@+id/everywhere_error_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:gravity="center_horizontal"
+            android:textSize="14sp" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/everywhere_error_retry"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="@string/everywhere_error_retry" />
+
+        <com.google.android.material.button.MaterialButton
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:id="@+id/everywhere_error_leave"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/everywhere_error_leave"
+            android:visibility="gone" />
+
+    </LinearLayout>
+
+</FrameLayout>

data/support/mobile/android/app/src/main/res/values/strings.xml

@@ -15,4 +15,23 @@
       names its own overflow tab on iOS.
     -->
     <string name="everywhere_more_tab">More</string>
+    <!--
+      The failed-visit screen (WebFragment.createErrorView). "Back to start"
+      shows only inside a picked instance, where retrying the same dead host
+      is the only other move — it clears the instance and re-roots.
+    -->
+    <string name="everywhere_error_title">Error loading page</string>
+    <string name="everywhere_error_retry">Try again</string>
+    <string name="everywhere_error_leave">Back to start</string>
+    <!--
+      MissingExtensionFragment — the fallback destination when a previewed
+      app's rule names a native screen compiled into ITS build, not this
+      shell. Copy mirrors iOS's MissingExtensionScreen.
+    -->
+    <string name="everywhere_missing_screen_nav_title">Preview</string>
+    <string name="everywhere_missing_screen_title">This screen is native</string>
+    <string name="everywhere_missing_screen_body">In the full build, “%1$s” is a native screen compiled into the app. Jump can\'t run another app\'s native code — everything else in this preview works.</string>
+    <!-- Older previewed apps serve no fallback_uri; their native-screen visits
+         are refused with this toast instead of a spinner that never ends. -->
+    <string name="everywhere_missing_screen_toast">“%1$s” is a native screen in the full build — Jump can\'t run another app\'s native code.</string>
 </resources>

data/support/mobile/ios/App/ErrorViewController.swift

@@ -1,14 +1,19 @@
 import UIKit
 
 /// A full-screen error page with a retry button, presented when a visit fails
-/// (e.g. the server is unreachable).
+/// (e.g. the server is unreachable). When the failure happened inside a picked
+/// instance — where retrying can only knock on the same dead host — a second
+/// button offers the way home (SceneDelegate passes `leaveHandler` exactly
+/// then, and it clears the instance and re-roots).
 final class ErrorViewController: UIViewController {
     private let error: Error
     private let retryHandler: (() -> Void)?
+    private let leaveHandler: (() -> Void)?
 
-    init(error: Error, retryHandler: (() -> Void)?) {
+    init(error: Error, retryHandler: (() -> Void)?, leaveHandler: (() -> Void)? = nil) {
         self.error = error
         self.retryHandler = retryHandler
+        self.leaveHandler = leaveHandler
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -41,7 +46,15 @@ final class ErrorViewController: UIViewController {
         })
         retryButton.isHidden = retryHandler == nil
 
-        let stackView = UIStackView(arrangedSubviews: [imageView, messageLabel, retryButton])
+        var leaveConfiguration = UIButton.Configuration.plain()
+        leaveConfiguration.title = "Back to start"
+        leaveConfiguration.buttonSize = .large
+        let leaveButton = UIButton(configuration: leaveConfiguration, primaryAction: UIAction { [weak self] _ in
+            self?.leave()
+        })
+        leaveButton.isHidden = leaveHandler == nil
+
+        let stackView = UIStackView(arrangedSubviews: [imageView, messageLabel, retryButton, leaveButton])
         stackView.axis = .vertical
         stackView.alignment = .center
         stackView.spacing = 16
@@ -61,4 +74,9 @@ final class ErrorViewController: UIViewController {
         retryHandler?()
         dismiss(animated: true)
     }
+
+    private func leave() {
+        dismiss(animated: true)
+        leaveHandler?()
+    }
 }

data/support/mobile/ios/App/SceneDelegate.swift

@@ -599,7 +599,18 @@ extension SceneDelegate: NavigatorDelegate {
     }
 
     private func presentError(_ error: HotwireNativeError, retryHandler: RetryBlock?) {
-        let errorViewController = ErrorViewController(error: error, retryHandler: retryHandler)
+        // Inside a picked instance whose server has gone away, Retry can only
+        // knock on the same dead host — offer the way home too: clear the
+        // instance and re-root, exactly what the leave tab does when it can load.
+        var leaveHandler: (() -> Void)?
+        if config.remoteInstances == true, EverywhereConfig.instanceURL != nil {
+            leaveHandler = { [weak self] in
+                guard let self else { return }
+                EverywhereConfig.setInstanceURL(nil)
+                self.resetApp(to: self.config.startURL)
+            }
+        }
+        let errorViewController = ErrorViewController(error: error, retryHandler: retryHandler, leaveHandler: leaveHandler)
         errorViewController.modalPresentationStyle = .fullScreen
         activeNavigator.activeNavigationController.present(errorViewController, animated: true)
     }

data/support/mobile/ios/App.xcodeproj/project.pbxproj

@@ -361,7 +361,6 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_STYLE = Automatic;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -386,7 +385,6 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_STYLE = Automatic;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;

data/support/release/macos/notarize.sh

@@ -94,6 +94,9 @@ if [ -n "${NOTARY_KEY:-}" ]; then
 elif [ -n "${NOTARY_PROFILE:-}" ]; then
   xcrun notarytool submit "$ZIP" --keychain-profile "$NOTARY_PROFILE" --wait
 else
+  # Last resort. --password puts the app-specific password on the command line,
+  # where any process on the machine can read it out of `ps` — prefer NOTARY_KEY
+  # (API key, above) or NOTARY_PROFILE, neither of which passes a secret in argv.
   # Accept APPLE_APP_SPECIFIC_PASSWORD as an alias for APPLE_PASSWORD.
   APPLE_PASSWORD="${APPLE_PASSWORD:-${APPLE_APP_SPECIFIC_PASSWORD:-}}"
   : "${APPLE_ID:?set APPLE_ID or NOTARY_PROFILE}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_everywhere
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Andrea Fomera
@@ -114,10 +114,14 @@ files:
 - lib/everywhere/blake2b.rb
 - lib/everywhere/boot.rb
 - lib/everywhere/builders/android.rb
+- lib/everywhere/builders/base.rb
 - lib/everywhere/builders/desktop.rb
 - lib/everywhere/builders/ios.rb
+- lib/everywhere/builders/native_sources.rb
 - lib/everywhere/child_processes.rb
+- lib/everywhere/child_supervision.rb
 - lib/everywhere/cli.rb
+- lib/everywhere/clock.rb
 - lib/everywhere/commands/build.rb
 - lib/everywhere/commands/clean.rb
 - lib/everywhere/commands/dev.rb
@@ -136,17 +140,31 @@ files:
 - lib/everywhere/commands/shell_dir.rb
 - lib/everywhere/commands/updates_keygen.rb
 - lib/everywhere/config.rb
+- lib/everywhere/config/app.rb
+- lib/everywhere/config/auth.rb
+- lib/everywhere/config/data.rb
+- lib/everywhere/config/deep_linking.rb
+- lib/everywhere/config/desktop_ui.rb
+- lib/everywhere/config/mobile.rb
+- lib/everywhere/config/native_desktop.rb
+- lib/everywhere/config/native_mobile.rb
+- lib/everywhere/config/shell.rb
+- lib/everywhere/config/updates.rb
 - lib/everywhere/console.rb
 - lib/everywhere/database.rb
 - lib/everywhere/desktop_assets.rb
+- lib/everywhere/desktop_dev_app.rb
 - lib/everywhere/dock.rb
 - lib/everywhere/dock/footer.rb
 - lib/everywhere/dock/screen.rb
 - lib/everywhere/dock/state.rb
 - lib/everywhere/emulator.rb
 - lib/everywhere/engine.rb
+- lib/everywhere/entrypoint.rb
+- lib/everywhere/error.rb
 - lib/everywhere/fatal.rb
 - lib/everywhere/framework.rb
+- lib/everywhere/host.rb
 - lib/everywhere/icon.rb
 - lib/everywhere/ignore.rb
 - lib/everywhere/jump.rb
@@ -156,18 +174,23 @@ files:
 - lib/everywhere/mobile_config_endpoint.rb
 - lib/everywhere/mobile_configs_controller.rb
 - lib/everywhere/native_helper.rb
+- lib/everywhere/native_platform.rb
 - lib/everywhere/omniauth.rb
 - lib/everywhere/paths.rb
 - lib/everywhere/platform/client.rb
 - lib/everywhere/platform/credentials.rb
 - lib/everywhere/platform/snapshot.rb
+- lib/everywhere/plist.rb
 - lib/everywhere/png.rb
 - lib/everywhere/raster.rb
+- lib/everywhere/raw_tty.rb
 - lib/everywhere/receipt.rb
 - lib/everywhere/relay.rb
 - lib/everywhere/s3.rb
+- lib/everywhere/shell_pages.rb
 - lib/everywhere/shellout.rb
 - lib/everywhere/simulator.rb
+- lib/everywhere/tab_filter.rb
 - lib/everywhere/task_pool.rb
 - lib/everywhere/ui.rb
 - lib/everywhere/update_manifest.rb
@@ -217,6 +240,7 @@ files:
 - support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/IconFont.kt
 - support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/MainActivity.kt
 - support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/MainTabs.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/MissingExtensionFragment.kt
 - support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/WebBottomSheetFragment.kt
 - support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/WebFragment.kt
 - support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/bridge/BiometricsComponent.kt
@@ -234,6 +258,7 @@ files:
 - support/mobile/android/app/src/main/res/layout/activity_main.xml
 - support/mobile/android/app/src/main/res/layout/bridge_menu_sheet.xml
 - support/mobile/android/app/src/main/res/layout/bridge_menu_sheet_item.xml
+- support/mobile/android/app/src/main/res/layout/everywhere_error.xml
 - support/mobile/android/app/src/main/res/layout/tab_more_sheet.xml
 - support/mobile/android/app/src/main/res/layout/tab_more_sheet_item.xml
 - support/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml