@lark-apaas/miaoda-core 0.1.0-alpha.21 → 0.1.0-alpha.23

package/lib/components/AppContainer/IframeBridge.d.ts

@@ -1,3 +1,4 @@
 import React from 'react';
+import './utils/listenHot';
 import './LogInterceptor';
 export default function IframeBridge(): React.JSX.Element;

package/lib/components/AppContainer/IframeBridge.js

@@ -5,7 +5,8 @@ import { connectToParent } from "penpal";
 import { useUpdatingRef } from "../../hooks/useUpdatingRef.js";
 import { postMessage } from "../../utils/postMessage.js";
 import { getPreviewParentOrigin } from "../../utils/getParentOrigin.js";
-import { childApi } from "./childApi.js";
+import { childApi } from "./utils/childApi.js";
+import "./utils/listenHot.js";
 import "./LogInterceptor.js";
 var IframeBridge_RouteMessageType = /*#__PURE__*/ function(RouteMessageType) {
     RouteMessageType["RouteChange"] = "RouteChange";
@@ -17,6 +18,10 @@ function isRouteMessageType(type) {
     return Object.values(IframeBridge_RouteMessageType).includes(type);
 }
 async function connectParent() {
+    postMessage({
+        type: 'PreviewReady',
+        data: {}
+    });
     const connection = connectToParent({
         parentOrigin: getPreviewParentOrigin(),
         methods: {
@@ -25,6 +30,7 @@ async function connectParent() {
     });
     await connection.promise;
 }
+'production' !== process.env.NODE_ENV && connectParent();
 function IframeBridge() {
     const location = useLocation();
     const navigate = useNavigate();
@@ -51,13 +57,6 @@ function IframeBridge() {
         historyForward,
         navigateRef
     ]);
-    useEffect(()=>{
-        postMessage({
-            type: 'PreviewReady',
-            data: {}
-        });
-        connectParent();
-    }, []);
     useEffect(()=>{
         if (isActive.current) {
             isActive.current = false;

package/lib/components/AppContainer/{childApi.d.ts → utils/childApi.d.ts}

@@ -1,4 +1,4 @@
-import { ChildApi } from '../../types/iframe-events';
+import { ChildApi } from '../../../types/iframe-events';
 /**
  * 子级方法，提供给父级调用
  */

package/lib/components/AppContainer/{childApi.js → utils/childApi.js}

@@ -1,4 +1,4 @@
-import { normalizeBasePath } from "../../utils/utils.js";
+import { normalizeBasePath } from "../../../utils/utils.js";
 async function getRoutes() {
     let routes = [
         {

package/lib/components/AppContainer/utils/listenHot.d.ts

@@ -0,0 +1 @@
+export declare function connectDevServer(): WebSocket;

package/lib/components/AppContainer/utils/listenHot.js

@@ -0,0 +1,43 @@
+import sockjs_client from "sockjs-client";
+import { postMessage } from "../../../utils/postMessage.js";
+import { getWsPath } from "../../../utils/utils.js";
+let hotInited = false;
+function handleDevServerMessage(msg) {
+    if ('hash' === msg.type) {
+        if (!hotInited) {
+            hotInited = true;
+            return;
+        }
+        postMessage({
+            type: 'HmrMessage',
+            msg: {
+                type: 'hot'
+            },
+            data: null
+        });
+    } else if ('errors' === msg.type) postMessage({
+        type: 'HmrMessage',
+        msg: {
+            type: 'errors',
+            data: JSON.stringify(msg.data)
+        },
+        data: null
+    });
+}
+function connectDevServer() {
+    const sockUrl = getWsPath();
+    const sock = new sockjs_client(sockUrl);
+    sock.onopen = ()=>console.log("✅ connect DevServer SockJS");
+    sock.onmessage = (event)=>{
+        try {
+            const msg = JSON.parse(event.data);
+            console.log("hmr 消息:", msg);
+            handleDevServerMessage(msg);
+        } catch (err) {
+            console.error("解析 hmr 消息失败:", event.data);
+        }
+    };
+    return sock;
+}
+'production' !== process.env.NODE_ENV && connectDevServer();
+export { connectDevServer };

package/lib/types/iframe-events.d.ts

@@ -30,8 +30,13 @@ export interface UpdateRoutesMessage extends IframeMessage<{
 }> {
     type: 'UpdateRoutes';
 }
+/** 热更新消息 */
 export interface HmrMessage extends IframeMessage<Record<string, never>> {
-    type: 'Hmr';
+    type: 'HmrMessage';
+    msg: {
+        type: 'hot' | 'errors';
+        data?: any;
+    };
 }
 export type OutgoingMessage = PreviewReadyMessage | HmrMessage | ConsoleMessage | ChildLocationChangeMessage | CreatePageMessage | RenderErrorMessage | RenderErrorRepairMessage | PageScreenshotMessage | UpdateRoutesMessage;
 export interface GetRoutesMessage extends IframeMessage<Record<string, never>> {

package/lib/utils/utils.d.ts

@@ -15,5 +15,6 @@ export declare function isPreview(): boolean;
  * 移除末尾的斜杠，确保路径不以斜杠结尾
  */
 export declare function normalizeBasePath(basePath?: string): string;
+export declare function getWsPath(): string;
 /** 判断是否是沙箱模式 */
 export declare function isSparkRuntime(): boolean;

package/lib/utils/utils.js

@@ -10,7 +10,13 @@ function normalizeBasePath(basePath) {
     if (!basePath || '/' === basePath) return '';
     return basePath.replace(/\/+$/, '');
 }
+function getWsPath() {
+    const rawBasePath = process.env.CLIENT_BASE_PATH || '/';
+    const normalizedBasePath = rawBasePath.startsWith('/') ? rawBasePath : `/${rawBasePath}`;
+    const basePathWithoutTrailingSlash = normalizedBasePath.endsWith('/') ? normalizedBasePath.slice(0, -1) : normalizedBasePath;
+    return `${basePathWithoutTrailingSlash}/ws`;
+}
 function isSparkRuntime() {
-    return window._IS_Spark_RUNTIME ?? 'true' === process.env.fullstack;
+    return window._IS_Spark_RUNTIME ?? 'fullstack' === process.env.runtimeMode;
 }
-export { clsxWithTw, isPreview, isSparkRuntime, normalizeBasePath };
+export { clsxWithTw, getWsPath, isPreview, isSparkRuntime, normalizeBasePath };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/miaoda-core",
-  "version": "0.1.0-alpha.21",
+  "version": "0.1.0-alpha.23",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -83,6 +83,7 @@
     "html2canvas-pro": "^1.5.11",
     "lodash": "^4.17.21",
     "penpal": "^6.2.2",
+    "sockjs-client": "^1.6.1",
     "sonner": "~2.0.0",
     "tailwind-merge": "~2.0.0",
     "tailwind-variants": "0.3.1",
@@ -107,6 +108,7 @@
     "@types/node": "^22.10.2",
     "@types/react": "^18.3.23",
     "@types/react-dom": "^18.3.7",
+    "@types/sockjs-client": "^1",
     "antd": "^5.26.6",
     "eslint": "^8.57.0",
     "jsdom": "^26.1.0",