@miot-rn/common-component 1.0.2 → 1.0.3

package/dist/service/specs/std-spec.js

@@ -6,6 +6,26 @@ import { encodeProp, decodeProp, specsToSubscribeKeys, specAccess } from "../../
 import { OK } from "./error-code";
 const specSubject = new Subject(getEventGenerator('std_spec_subject', encodeProp));
 let receivedMessagesSubscription = null;
+function fillInfo(props) {
+  const propsNew = props.filter(element => {
+    return element !== null;
+  });
+  return propsNew.map(prop => {
+    const {
+      did,
+      miid,
+      ...rest
+    } = prop;
+    const t = {
+      ...rest,
+      did: did || Device.deviceID
+    };
+    if (miid) {
+      t.miid = miid;
+    }
+    return t;
+  });
+}
 export function getProps(props, chunkFn) {
   // console.log('getProps---props', props);
   // 处理固件不上报的情况，此时须将dataSource 设置为2，强行从固件读取
@@ -16,7 +36,7 @@ export function getProps(props, chunkFn) {
         siid,
         piid,
         did = Device.deviceID,
-        dataSource = prop.fromSource ? 1 : 2
+        dataSource = 1
       } = prop;
       const p = {
         siid,
@@ -183,26 +203,6 @@ function subscribeReceivedMessage() {
     });
   });
 }
-function fillInfo(props) {
-  const propsNew = props.filter(element => {
-    return element !== null;
-  });
-  return propsNew.map(prop => {
-    const {
-      did,
-      miid,
-      ...rest
-    } = prop;
-    const t = {
-      ...rest,
-      did: did || Device.deviceID
-    };
-    if (miid) {
-      t.miid = miid;
-    }
-    return t;
-  });
-}
 export function subscribe(props, listener) {
   if (!receivedMessagesSubscription) {
     receivedMessagesSubscription = subscribeReceivedMessage();

package/dist/store/useGlobalSpecManager.d.ts

@@ -8,7 +8,7 @@ declare const useGlobalSpecManager: import("zustand").UseBoundStore<import("zust
     subscribedSpecs: Set<unknown>;
     specUpdateListeners: never[];
     addSpecUpdateListener: (listener: any) => () => void;
-    fetchSpecs: (specs: any, fromSource?: boolean, batchUpdate?: boolean) => Promise<({
+    fetchSpecs: (specs: any, datasource?: number, batchUpdate?: boolean) => Promise<({
         code: number;
         message: string;
         spec: any;
@@ -167,7 +167,7 @@ export declare const useSpecMetaInfo: (spec: any) => any;
 export declare const useSpecUpdateListener: (listener: any) => void;
 export declare const useEventListener: (eventSpec: any, listener: any) => () => void;
 export declare const addSpecUpdateListener: (listener: any) => () => void;
-export declare const fetchSpecs: (specs: any, fromSource?: boolean, batchUpdate?: boolean) => Promise<({
+export declare const fetchSpecs: (specs: any, datasource?: number, batchUpdate?: boolean) => Promise<({
     code: number;
     message: string;
     spec: any;

package/dist/store/useGlobalSpecManager.js

@@ -115,12 +115,12 @@ const useGlobalSpecManager = create((set, get) => ({
    * @function fetchSpecs
    * @memberof useGlobalSpecManager
    * @param {Array<object>} specs - Spec对象数组，每个对象必须包含 siid 属性
-   * @param {boolean} [fromSource=true] - 是否强制从源获取数据
+   * @param {number} [datasource=1] - 数据源：1=优先服务器缓存 2=直接下发rpc(最新值) 3=直接读缓存
    * @param {boolean} [batchUpdate=false] - 是否批量更新状态
    * @returns {Promise<Array<object>>} 返回包含每个Spec读取结果的数组
    * @throws {Error} 当入参无效或读取过程中发生异常时抛出错误
    */
-  fetchSpecs: async (specs, fromSource = true, batchUpdate = false) => {
+  fetchSpecs: async (specs, datasource = 1, batchUpdate = false) => {
     // 边界验证：specs 必须是数组且非空
     if (!Array.isArray(specs) || specs.length === 0) {
       console.log(`[STD-LOCK][${TAG}][fetchSpecs][${new Date().toISOString()}] 入参 specs 必须为非空数组`);
@@ -142,10 +142,8 @@ const useGlobalSpecManager = create((set, get) => ({
         const key = toKey(spec);
         const results = await getProps([{
           ...spec,
-          fromSource
-        }], {
-          fromSourceIfNeed: fromSource
-        });
+          dataSource: datasource
+        }]);
         // data manager返回的结果code是0，但value是null，需要两者都判断
         if (results[0]?.code === 0 && results[0]?.value != null) {
           const updateTime = Math.floor(Date.now() / 1000);
@@ -799,11 +797,11 @@ export const addSpecUpdateListener = listener => {
 /**
  * 读取设备 spec
  * @param specs Spec 对象数组
- * @param fromSource 是否强制从设备/服务端获取
+ * @param datasource 数据源：1=优先服务器缓存 2=直接下发rpc(最新值) 3=直接读缓存
  * @param batchUpdate 是否批量更新状态
  */
-export const fetchSpecs = async (specs, fromSource = true, batchUpdate = false) => {
-  return useGlobalSpecManager.getState().fetchSpecs(specs, fromSource, batchUpdate);
+export const fetchSpecs = async (specs, datasource = 1, batchUpdate = false) => {
+  return useGlobalSpecManager.getState().fetchSpecs(specs, datasource, batchUpdate);
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miot-rn/common-component",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "scripts": {
     "build": "rm -rf dist && rm -f tsconfig.tsbuildinfo && tsc && babel src -d dist --config-file ../../babel.config.js --extensions '.ts,.tsx' --verbose",
     "lint": "eslint src/**/*.ts",
@@ -23,5 +23,5 @@
     "react-native": "0.61.0",
     "zustand": "^4.4.1"
   },
-  "gitHead": "2920def2cc542a8d0efcf100814e477830d94bb3"
+  "gitHead": "fca543751a7f8e62f9b52737ed8c56134b5fc096"
 }