@ray-js/robot-map 0.0.9-beta.1 → 0.0.9-beta.11

package/lib/RjsComponent/index.js

@@ -115,6 +115,14 @@ const componentOptions = {
         }
       }
     },
+    customCarpets: {
+      type: Array,
+      observer: function (newValue, oldValue) {
+        if (!isEqual(newValue, oldValue) && this.data.initialized && this.render) {
+          this.render.onReceiveCustomCarpets(newValue);
+        }
+      }
+    },
     furnitures: {
       type: Array,
       observer: function (newValue, oldValue) {
@@ -193,6 +201,9 @@ const componentOptions = {
       if (this.data.customElements) {
         this.render.onReceiveCustomElements(this.data.customElements);
       }
+      if (this.data.customCarpets) {
+        this.render.onReceiveCustomCarpets(this.data.customCarpets);
+      }
       if (this.data.furnitures) {
         this.render.onReceiveFurnitures(this.data.furnitures);
       }

package/lib/RjsComponent/index.rjs

@@ -137,6 +137,12 @@ export default Render({
     this.mapInstance.drawCustomElements(elements)
   },
 
+  // 接收自定义地毯
+  onReceiveCustomCarpets(carpets) {
+    if (!this.mapInstance || !carpets) return
+    this.mapInstance.drawCustomCarpets(carpets)
+  },
+
   // 接收家具
   onReceiveFurnitures(furnitures) {
     if (!this.mapInstance || !furnitures) return

package/lib/RjsRobotMap.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-const _excluded = ["map", "path", "roomProperties", "forbiddenSweepZones", "forbiddenMopZones", "cleanZones", "customZones", "virtualWalls", "spots", "wayPoints", "detectedObjects", "customElements", "furnitures", "config", "runtime", "onMapReady"];
+const _excluded = ["map", "path", "roomProperties", "forbiddenSweepZones", "forbiddenMopZones", "cleanZones", "customZones", "virtualWalls", "spots", "wayPoints", "detectedObjects", "customElements", "customCarpets", "furnitures", "config", "runtime", "onMapReady"];
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
@@ -29,6 +29,7 @@ const RjsRobotMap = _ref => {
       wayPoints = [],
       detectedObjects = [],
       customElements = [],
+      customCarpets = [],
       furnitures = [],
       config,
       runtime,
@@ -156,6 +157,7 @@ const RjsRobotMap = _ref => {
     wayPoints: wayPoints,
     detectedObjects: detectedObjects,
     customElements: customElements,
+    customCarpets: customCarpets,
     furnitures: furnitures,
     config: config,
     runtime: runtime,

package/lib/RobotMap.js

@@ -9,17 +9,17 @@ import "core-js/modules/web.dom-collections.iterator.js";
 /* eslint-disable @typescript-eslint/no-empty-function */
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import createInvoke from '@ray-js/webview-invoke/native';
-import { createWebviewContext, WebView } from '@ray-js/ray';
+import { createWebviewContext, usePageEvent, WebView } from '@ray-js/ray';
 import { isEqual } from 'lodash-es';
 import { MAP_API_METHODS, MAP_CALLBACK_METHODS } from '@ray-js/robot-map-sdk';
 import { nanoid } from 'nanoid/non-secure';
 import { robotMapDefaultProps } from './props';
 import { EXCLUDED_API_METHODS } from './types';
+import { createAppLoggerBridge } from './appLoggerBridge';
 
 // 回调名到事件名的映射
 const CALLBACK_TO_EVENT_MAP = _objectSpread({
-  onInitialized: 'onInitialized',
-  onLogger: 'onLogger'
+  onInitialized: 'onInitialized'
 }, MAP_CALLBACK_METHODS.reduce((acc, methodName) => {
   acc[methodName] = methodName;
   return acc;
@@ -50,6 +50,7 @@ const RobotMap = _ref => {
   const prevConfigRef = useRef(null);
   const prevRuntimeRef = useRef(null);
   const hasSkippedInitialConfigUpdateRef = useRef(false);
+  const appLoggerBridgeRef = useRef(createAppLoggerBridge());
   const webviewId = useRef(nanoid()).current;
   const webviewContext = useRef(null);
   const invoke = useRef(null);
@@ -78,6 +79,14 @@ const RobotMap = _ref => {
       invoke.current.listener(event);
     }
   }, []);
+  const destroyApp = useCallback(trigger => {
+    try {
+      var _invoke$current;
+      (_invoke$current = invoke.current) === null || _invoke$current === void 0 || _invoke$current.bind('destroyApp')(trigger);
+    } catch (error) {
+      // Ignore teardown bridge failures during page exit.
+    }
+  }, []);
 
   // 事件分发函数 - 这个函数是稳定的，不会随渲染变化
   const eventDispatcher = useCallback(function (eventName) {
@@ -94,6 +103,9 @@ const RobotMap = _ref => {
     // 更新回调引用
     callbacksRef.current = callbacks;
   });
+  usePageEvent('onUnload', () => {
+    destroyApp('page.onUnload');
+  });
   useEffect(() => {
     webviewContext.current = createWebviewContext(webviewId);
     Object.defineProperty(webviewContext.current, 'platform', {
@@ -145,7 +157,17 @@ const RobotMap = _ref => {
         eventDispatcher(eventName, ...args);
       });
     });
+    invoke.current.define('onAppLogger', payload => {
+      appLoggerBridgeRef.current(payload);
+    });
   }, []);
+  useEffect(() => {
+    return () => {
+      destroyApp('component.unmount');
+      invoke.current = null;
+      webviewContext.current = null;
+    };
+  }, [destroyApp]);
   useEffect(() => {
     if (mapApi && map) {
       triggersRef.current.onReceiveMap(map);

package/lib/appLoggerBridge.d.ts

@@ -0,0 +1,2 @@
+import type { LoggerPayload } from './props';
+export declare function createAppLoggerBridge(): (payload: LoggerPayload) => void;

package/lib/appLoggerBridge.js

@@ -0,0 +1,86 @@
+import "core-js/modules/es.json.stringify.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.filter.js";
+import "core-js/modules/esnext.iterator.map.js";
+import "core-js/modules/web.dom-collections.iterator.js";
+const APP_LOG_TAG = 'ray-robot-map';
+const MAX_MESSAGE_LENGTH = 10 * 1024;
+function stringifyDatum(value) {
+  if (typeof value === 'string') {
+    return value;
+  }
+  try {
+    var _JSON$stringify;
+    return (_JSON$stringify = JSON.stringify(value)) !== null && _JSON$stringify !== void 0 ? _JSON$stringify : String(value);
+  } catch (_unused) {
+    return String(value);
+  }
+}
+function buildMessage(payload) {
+  const detail = payload.data.map(stringifyDatum).filter(part => part.length > 0).join(', ');
+  const text = "\u3010".concat(APP_LOG_TAG, "\u3011: [MapSDK][").concat(payload.tag, "] ").concat(payload.message).concat(detail ? ", ".concat(detail) : '');
+  return text.length > MAX_MESSAGE_LENGTH ? text.slice(0, MAX_MESSAGE_LENGTH) : text;
+}
+export function createAppLoggerBridge() {
+  const managerCache = new Map();
+  let warned = false;
+  let isDevtools;
+  const warnOnce = error => {
+    if (warned) {
+      return;
+    }
+    warned = true;
+    console.warn('[ray-robot-map] app logger bridge failed', error);
+  };
+  const resolveDevtools = () => {
+    if (isDevtools !== undefined) {
+      return isDevtools;
+    }
+    try {
+      var _ty, _ty$getSystemInfoSync;
+      isDevtools = ((_ty = globalThis.ty) === null || _ty === void 0 || (_ty$getSystemInfoSync = _ty.getSystemInfoSync) === null || _ty$getSystemInfoSync === void 0 ? void 0 : _ty$getSystemInfoSync.call(_ty).brand) === 'devtools';
+    } catch (_unused2) {
+      isDevtools = false;
+    }
+    return isDevtools;
+  };
+  const resolveManager = tag => {
+    if (managerCache.has(tag)) {
+      var _managerCache$get;
+      return (_managerCache$get = managerCache.get(tag)) !== null && _managerCache$get !== void 0 ? _managerCache$get : null;
+    }
+    try {
+      var _ty$getLogManager, _ty2, _ty2$getLogManager;
+      if (resolveDevtools()) {
+        managerCache.set(tag, null);
+        return null;
+      }
+      const manager = (_ty$getLogManager = (_ty2 = globalThis.ty) === null || _ty2 === void 0 || (_ty2$getLogManager = _ty2.getLogManager) === null || _ty2$getLogManager === void 0 ? void 0 : _ty2$getLogManager.call(_ty2, {
+        tag
+      })) !== null && _ty$getLogManager !== void 0 ? _ty$getLogManager : null;
+      managerCache.set(tag, manager);
+      return manager;
+    } catch (error) {
+      warnOnce(error);
+      managerCache.set(tag, null);
+      return null;
+    }
+  };
+  return payload => {
+    const manager = resolveManager(APP_LOG_TAG);
+    if (!manager) {
+      return;
+    }
+    const method = manager.log;
+    if (typeof method !== 'function') {
+      return;
+    }
+    try {
+      method.call(manager, {
+        message: buildMessage(payload)
+      });
+    } catch (error) {
+      warnOnce(error);
+    }
+  };
+}

package/lib/props.d.ts

@@ -142,12 +142,5 @@ export interface RobotMapProps extends MapCallbacks {
      * @param mapApi - 可供使用的地图 API 函数对象，所有方法返回 Promise / Available map API functions object, all methods return Promise
      */
     onMapReady?: (mapApi: MapApi) => void;
-    /**
-     * @description.zh SDK 日志回调
-     * @description.en Callback for SDK log payloads
-     * @description.zh 当 webview 内部 SDK 转发结构化日志时触发。默认仅转发 warn 和 error，可通过 `config.logger.hostLevels` 扩展到 info 和 debug。
-     * @description.en Triggered when the webview SDK forwards structured logs. By default only warn and error are forwarded, and you can extend this to info and debug through `config.logger.hostLevels`.
-     */
-    onLogger?: (payload: LoggerPayload) => void;
 }
 export declare const robotMapDefaultProps: RobotMapProps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/robot-map",
-  "version": "0.0.9-beta.1",
+  "version": "0.0.9-beta.11",
   "description": "机器人地图组件",
   "main": "lib/index",
   "files": [
@@ -33,7 +33,7 @@
     "@ray-js/ray": "^1.7.39"
   },
   "dependencies": {
-    "@ray-js/robot-map-sdk": "0.0.15-beta.3",
+    "@ray-js/robot-map-sdk": "0.0.15-beta.11",
     "clsx": "^1.2.1",
     "nanoid": "^5.1.6"
   },