miaoda-expo-devkit 0.1.1-dev.development-build.4 → 0.1.1-dev.development-build.6

package/README.md

@@ -180,7 +180,9 @@ Web 注入内容包括：
 Bundle，避免使用失效的增量 revision。最终编译失败会返回 `422` 并继续保持暂停。
 
 普通恢复执行 Fast Refresh；`/_hmr/reload` 执行完整 Bundle 重载，若当前暂停则延迟到
-恢复时执行。过渡期内旧路径 `/innerapi/v1/sourcecode/__hmr_*` 作为别名同样可用，
+恢复时执行。暂停期间 iOS/Android 客户端展示全屏「应用正在更新中」遮罩，阻断用户
+对旧界面的交互，恢复后自动消失（Web 端不展示）。过渡期内旧路径
+`/innerapi/v1/sourcecode/__hmr_*` 作为别名同样可用，
 供平台网关 sourcecode 透传通道不改路由接入。协议、返回值、版本要求和加载边界见
 [Metro HMR 批量编辑控制](../../docs/metro-hmr-control.md)。
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miaoda-expo-devkit",
-  "version": "0.1.1-dev.development-build.4",
+  "version": "0.1.1-dev.development-build.6",
   "description": "Expo 应用开发工具集：Sentry DSN 替换 stub、错误/网络捕获、Metro 符号化",
   "license": "MIT",
   "main": "./dist/index.js",

package/pnpm-patches/expo@55.0.6.patch

@@ -21,7 +21,7 @@ index e2b8941..355deae 100644
    "jest-expo": "~55.0.9",
    "lottie-react-native": "~7.3.4",
 diff --git a/src/async-require/hmr.ts b/src/async-require/hmr.ts
-index c0ea71e..be9cb40 100644
+index c0ea71e..9250e76 100644
 --- a/src/async-require/hmr.ts
 +++ b/src/async-require/hmr.ts
 @@ -17,6 +17,7 @@ import {
@@ -32,7 +32,7 @@ index c0ea71e..be9cb40 100644
    showLoading,
  } from './hmrUtils';
  
-@@ -29,6 +30,38 @@ let hmrClient: MetroHMRClient | null = null;
+@@ -29,6 +30,66 @@ let hmrClient: MetroHMRClient | null = null;
  let hmrUnavailableReason: string | null = null;
  const buildErrorQueue = new Set<unknown>();
  let didConnect: boolean = false;
@@ -40,6 +40,34 @@ index c0ea71e..be9cb40 100644
 +// miaodaPaused 是 Agent 的编辑闸门，与用户自己的 Fast Refresh 开关
 +// （fastRefreshRequested）相互独立：放行后只有用户开着 Fast Refresh 才恢复更新。
 +let miaodaPaused = false;
++// 暂停状态订阅者：launch/MiaodaHmrOverlay 的全屏遮罩据此在 Agent 批量编辑
++// 期间盖住应用、阻断交互。遮罩挂在 dev 模式的根组件包装里，纯 JS 实现。
++const miaodaPausedListeners = new Set<(paused: boolean) => void>();
++
++// miaodaPaused 的唯一写入入口：值真正变化时才广播，订阅者异常不能
++// 反过来打断 HMR 控制链路（ack、reload 等时序敏感操作）。
++function setMiaodaPaused(paused: boolean) {
++  if (miaodaPaused === paused) return;
++  miaodaPaused = paused;
++  for (const listener of miaodaPausedListeners) {
++    try {
++      listener(paused);
++    } catch {}
++  }
++}
++
++// 订阅暂停状态变化，返回取消订阅函数（供 React useEffect 使用）。
++export function subscribeMiaodaPaused(listener: (paused: boolean) => void): () => void {
++  miaodaPausedListeners.add(listener);
++  return () => {
++    miaodaPausedListeners.delete(listener);
++  };
++}
++
++// 遮罩挂载时读取当前值，避免错过订阅注册之前发生的迁移。
++export function isMiaodaPaused(): boolean {
++  return miaodaPaused;
++}
 +let fastRefreshRequested = false;
 +// 断线兜底轮询间隔。控制消息走 /hot WebSocket，轮询只用于 socket 断开期间的
 +// 状态同步，不需要很频繁。
@@ -71,7 +99,7 @@ index c0ea71e..be9cb40 100644
  const pendingLogs: [LogLevel, any[]][] = [];
  
  type LogLevel =
-@@ -42,6 +75,102 @@ type LogLevel =
+@@ -42,6 +103,102 @@ type LogLevel =
    | 'groupEnd'
    | 'debug';
  
@@ -140,7 +168,7 @@ index c0ea71e..be9cb40 100644
 +    if (miaodaSessionBaseVersion === null && version !== null) miaodaSessionBaseVersion = version;
 +    if (state.paused) {
 +      miaodaObservedPaused = true;
-+      miaodaPaused = true;
++      setMiaodaPaused(true);
 +      hmrClient?.disable();
 +      // 把观察到的这次暂停作为本地基线版本。之后若出现没有对应 WebSocket
 +      // 控制消息的新版本，说明错过了状态迁移，必须完整 Bundle reload。
@@ -155,7 +183,7 @@ index c0ea71e..be9cb40 100644
 +      const missedReload = version !== null && miaodaSessionBaseVersion !== null && version > miaodaSessionBaseVersion && state.lastMode === 'reload';
 +      const shouldReload = missedReload || (missedControl && (miaodaObservedPaused || miaodaWebSocketDisconnected));
 +      miaodaObservedPaused = false;
-+      miaodaPaused = false;
++      setMiaodaPaused(false);
 +      miaodaLastControlVersion = version;
 +      if (shouldReload) {
 +        reload();
@@ -174,7 +202,7 @@ index c0ea71e..be9cb40 100644
  function assert(foo: any, msg: string): asserts foo {
    if (!foo) throw new Error(msg);
  }
-@@ -52,6 +181,9 @@ function assert(foo: any, msg: string): asserts foo {
+@@ -52,6 +209,9 @@ function assert(foo: any, msg: string): asserts foo {
   */
  const HMRClient = {
    enable() {
@@ -184,7 +212,7 @@ index c0ea71e..be9cb40 100644
      if (hmrUnavailableReason !== null) {
        // If HMR became unavailable while you weren't using it,
        // explain why when you try to turn it on.
-@@ -87,6 +219,7 @@ const HMRClient = {
+@@ -87,6 +247,7 @@ const HMRClient = {
    },
  
    disable() {
@@ -192,7 +220,7 @@ index c0ea71e..be9cb40 100644
      assert(hmrClient, 'Expected HMRClient.setup() call at startup.');
      hmrClient.disable();
    },
-@@ -180,6 +313,13 @@ const HMRClient = {
+@@ -180,6 +341,13 @@ const HMRClient = {
      const origin = `${serverScheme}://${serverHost}`;
      const client = new MetroHMRClient(`${origin}/hot`);
      hmrClient = client;
@@ -206,7 +234,7 @@ index c0ea71e..be9cb40 100644
  
      pendingEntryPoints.push(
        // HMRServer understands regular bundle URLs, so prefer that in case
-@@ -193,6 +333,55 @@ const HMRClient = {
+@@ -193,6 +361,55 @@ const HMRClient = {
        })
      );
  
@@ -233,7 +261,7 @@ index c0ea71e..be9cb40 100644
 +        case 'pause':
 +          // 立即闸住 HMR 并隐藏刷新提示，然后回 ack——服务端要等所有客户端
 +          // ack 后才认为暂停完成，ack 之前 Agent 不会开始写文件。
-+          miaodaPaused = true;
++          setMiaodaPaused(true);
 +          client.disable();
 +          hideLoading();
 +          client.send(JSON.stringify({type: 'miaoda-hmr-ack', version: 1, id: message.id}));
@@ -241,12 +269,12 @@ index c0ea71e..be9cb40 100644
 +        case 'resume':
 +          // 解除 Agent 闸门；用户自己的 Fast Refresh 开关保持独立，
 +          // 只有它开着才真正恢复更新。
-+          miaodaPaused = false;
++          setMiaodaPaused(false);
 +          if (fastRefreshRequested) HMRClient.enable();
 +          break;
 +        case 'reload':
 +          // 完整加载前也保持闸门，避免 reload 完成前又有增量进来。
-+          miaodaPaused = true;
++          setMiaodaPaused(true);
 +          client.disable();
 +          reload();
 +          break;
@@ -262,7 +290,7 @@ index c0ea71e..be9cb40 100644
      client.on('connection-error', (e: Error) => {
        setHMRUnavailableReason(getConnectionError(serverHost, e));
      });
-@@ -234,6 +423,10 @@ const HMRClient = {
+@@ -234,6 +451,10 @@ const HMRClient = {
      client.on('error', (data) => this._onMetroError(data));
  
      client.on('close', (closeEvent?: { code: number; reason: string }) => {
@@ -273,7 +301,7 @@ index c0ea71e..be9cb40 100644
        hideLoading();
        const reason = closeEvent?.reason;
        const code = closeEvent?.code || 1000;
-@@ -326,6 +519,9 @@ function registerBundleEntryPoints(client: MetroHMRClient | null) {
+@@ -326,6 +547,9 @@ function registerBundleEntryPoints(client: MetroHMRClient | null) {
      client?.send(
        JSON.stringify({
          type: 'register-entrypoints',
@@ -283,3 +311,125 @@ index c0ea71e..be9cb40 100644
          entryPoints: pendingEntryPoints,
        })
      );
+diff --git a/src/launch/MiaodaHmrOverlay.tsx b/src/launch/MiaodaHmrOverlay.tsx
+new file mode 100644
+index 0000000..2db61b9
+--- /dev/null
++++ b/src/launch/MiaodaHmrOverlay.tsx
+@@ -0,0 +1,58 @@
++import * as React from 'react';
++import { ActivityIndicator, StyleSheet, Text, View } from 'react-native';
++
++import { isMiaodaPaused, subscribeMiaodaPaused } from '../async-require/hmr';
++
++// Miaoda HMR 批量编辑期间的「更新中」全屏遮罩。
++//
++// Agent 通过 `/_hmr/off` 暂停 HMR 后会连续改写工程文件，这期间设备仍在运行
++// 上一份完好的 JS，但用户看到的是一个随时会被替换掉的界面，继续操作会产生
++// 基于旧代码的困惑交互。遮罩在暂停期间盖住整个应用并吃掉所有触摸，
++// resume（或 reload 导致的整树卸载）后自动消失。
++//
++// 状态源是 async-require/hmr 里的 miaodaPaused 广播：WebSocket 控制帧到达时
++// 同步触发，2 秒轮询兜底路径同样走该广播，因此两种通道下遮罩行为一致。
++// 纯 JS 实现，挂在 withDevTools 里，只在开发模式出现，不需要原生改动。
++export default function MiaodaHmrOverlay(): React.ReactElement | null {
++  // 挂载时用当前值初始化，避免错过订阅注册之前就已经开始的暂停。
++  const [paused, setPaused] = React.useState(isMiaodaPaused);
++
++  React.useEffect(() => subscribeMiaodaPaused(setPaused), []);
++
++  if (!paused) return null;
++
++  // absoluteFill + 默认的 pointerEvents="auto"：作为根组件的最后一个兄弟节点
++  // 渲染在用户界面之上，拦截全部触摸，直到暂停解除。
++  return (
++    <View style={styles.container}>
++      <ActivityIndicator color="#ffffff" size="large" />
++      <Text style={styles.title}>应用正在更新中</Text>
++      <Text style={styles.subtitle}>暂时无法使用，更新完成后将自动恢复</Text>
++    </View>
++  );
++}
++
++const styles = StyleSheet.create({
++  container: {
++    // 不展开 StyleSheet.absoluteFillObject（RN 新版本中已标记废弃），直接写全。
++    position: 'absolute',
++    top: 0,
++    left: 0,
++    right: 0,
++    bottom: 0,
++    backgroundColor: 'rgba(0, 0, 0, 0.65)',
++    alignItems: 'center',
++    justifyContent: 'center',
++  },
++  title: {
++    color: '#ffffff',
++    fontSize: 17,
++    fontWeight: '600',
++    marginTop: 16,
++  },
++  subtitle: {
++    color: 'rgba(255, 255, 255, 0.8)',
++    fontSize: 13,
++    marginTop: 8,
++  },
++});
+diff --git a/src/launch/withDevTools.ios.tsx b/src/launch/withDevTools.ios.tsx
+index f1f686c..0029bfa 100644
+--- a/src/launch/withDevTools.ios.tsx
++++ b/src/launch/withDevTools.ios.tsx
+@@ -3,6 +3,8 @@ import * as React from 'react';
+ import DevLoadingView from '../environment/DevLoadingView';
+ import { isRunningInExpoGo } from '../environment/ExpoGo';
+ 
++import MiaodaHmrOverlay from './MiaodaHmrOverlay';
++
+ /**
+  * Append the Expo Fast Refresh view and optionally
+  * keep the screen awake if `expo-keep-awake` is installed.
+@@ -31,11 +33,17 @@ export function withDevTools<TComponent extends React.ComponentType<any>>(
+         <>
+           <AppRootComponent {...props} />
+           <DevLoadingView />
++          <MiaodaHmrOverlay />
+         </>
+       );
+     }
+ 
+-    return <AppRootComponent {...props} />;
++    return (
++      <>
++        <AppRootComponent {...props} />
++        <MiaodaHmrOverlay />
++      </>
++    );
+   }
+ 
+   if (process.env.NODE_ENV !== 'production') {
+diff --git a/src/launch/withDevTools.tsx b/src/launch/withDevTools.tsx
+index 5a98062..6a6c3b7 100644
+--- a/src/launch/withDevTools.tsx
++++ b/src/launch/withDevTools.tsx
+@@ -1,5 +1,7 @@
+ import * as React from 'react';
+ 
++import MiaodaHmrOverlay from './MiaodaHmrOverlay';
++
+ // Keep the screen awake on Android, we don't use the Fast Refresh overlay here.
+ // The default behavior here is to skip the custom Fast Refresh indicator.
+ export function withDevTools<TComponent extends React.ComponentType<any>>(
+@@ -18,7 +20,12 @@ export function withDevTools<TComponent extends React.ComponentType<any>>(
+ 
+   function WithDevTools(props: React.ComponentProps<TComponent>) {
+     useOptionalKeepAwake();
+-    return <AppRootComponent {...props} />;
++    return (
++      <>
++        <AppRootComponent {...props} />
++        <MiaodaHmrOverlay />
++      </>
++    );
+   }
+ 
+   if (process.env.NODE_ENV !== 'production') {

package/pnpm-patches/react-native@0.83.2.patch

@@ -1,3 +1,30 @@
+diff --git a/Libraries/LogBox/Data/LogBoxData.js b/Libraries/LogBox/Data/LogBoxData.js
+index 2ce92e0..56eb4f8 100644
+--- a/Libraries/LogBox/Data/LogBoxData.js
++++ b/Libraries/LogBox/Data/LogBoxData.js
+@@ -149,9 +149,17 @@ function appendNewLog(newLog: LogBoxLog) {
+-  // If the next log has the same category as the previous one
+-  // then roll it up into the last log in the list by incrementing
+-  // the count (similar to how Chrome does it).
++  // Only merge logs with the same severity. A fatal exception must retain
++  // its own stack and open the inspector even after a matching console error.
+   const lastLog = Array.from(logs).pop();
+-  if (lastLog && lastLog.category === newLog.category) {
++  if (
++    lastLog &&
++    lastLog.category === newLog.category &&
++    lastLog.level === newLog.level
++  ) {
+     lastLog.incrementCount();
+-    handleUpdate();
++    // A repeated uncaught exception must also reopen a hidden inspector.
++    if (newLog.level === 'fatal' && _selectedIndex < 0) {
++      setSelectedLog(logs.size - 1);
++    } else {
++      handleUpdate();
++    }
+     return;
+   }
 diff --git a/Libraries/LogBox/UI/LogBoxInspector.js b/Libraries/LogBox/UI/LogBoxInspector.js
 --- a/Libraries/LogBox/UI/LogBoxInspector.js
 +++ b/Libraries/LogBox/UI/LogBoxInspector.js

package/pnpmfile.cjs

@@ -51,6 +51,7 @@ const managedPatches = {
   'expo@55.0.6': {
     filename: 'expo@55.0.6.patch',
     legacyHashes: new Set([
+      '3eca6fa71eb9640bccf2075dc37c5c8ed2fa060db77b36bb2c67fba902a9a9c5',
       '1df9b522728e93daf64f9e2298ab835ce52d55b4aa2de92a68b947e7ed08f40a',
       '8ac63998a9852ddafda7af96deb4d7ac4c3a5da5e65e865af32be9d4fd966e02',
       '12efbb4c64bc67744a838cc5d9d88604ad2a99cdd578a5cfab31b8d1c2be1144',