nayota-show-sdk 1.3.63 → 1.3.65

package/http-config-iot.test.js

@@ -46,4 +46,50 @@ describe('httpConfigIot', () => {
       }
     })
   })
+
+  test('normalizes any 2xx iot code into legacy success code 0', () => {
+    const http = httpConfigIot()
+    const responseInterceptor = http.interceptors.response.use.mock.calls[0][0]
+
+    expect(
+      responseInterceptor({
+        status: 201,
+        headers: {},
+        data: {
+          code: 201,
+          data: {
+            id: 'space-2'
+          }
+        }
+      })
+    ).toEqual({
+      code: 0,
+      data: {
+        id: 'space-2'
+      }
+    })
+  })
+
+  test('accepts string based 2xx iot codes as legacy success too', () => {
+    const http = httpConfigIot()
+    const responseInterceptor = http.interceptors.response.use.mock.calls[0][0]
+
+    expect(
+      responseInterceptor({
+        status: 204,
+        headers: {},
+        data: {
+          code: '204',
+          data: {
+            id: 'space-3'
+          }
+        }
+      })
+    ).toEqual({
+      code: 0,
+      data: {
+        id: 'space-3'
+      }
+    })
+  })
 })

package/iot-adapter-helpers.test.js

@@ -26,4 +26,34 @@ describe('iot adapter helpers', () => {
       }
     })
   })
+
+  test('unwraps nested iot data.items responses before mapping to legacy rows', () => {
+    const result = buildLegacyListResponse({
+      code: 0,
+      success: true,
+      data: {
+        total: 1,
+        items: [
+          {
+            id: 'depart-1',
+            name: '研发园B区'
+          }
+        ]
+      }
+    })
+
+    expect(result).toEqual({
+      code: 0,
+      data: {
+        total: 1,
+        rows: [
+          {
+            id: 'depart-1',
+            _id: 'depart-1',
+            name: '研发园B区'
+          }
+        ]
+      }
+    })
+  })
 })

package/iot-module-specs.test.js

@@ -0,0 +1,72 @@
+import { iotModuleSpecs } from './utils/iot-module-specs'
+
+describe('iot module specs', () => {
+  test('devices.easyList unwraps nested data.rows payloads', () => {
+    const response = iotModuleSpecs.devices.operations.easyList.fromResponse({
+      code: 0,
+      success: true,
+      data: {
+        total: 2,
+        rows: [
+          {
+            id: 'device-1',
+            name: '风速仪'
+          },
+          {
+            id: 'device-2',
+            name: '温湿度传感器'
+          }
+        ]
+      }
+    })
+
+    expect(response).toEqual({
+      code: 0,
+      data: {
+        total: 2,
+        rows: [
+          {
+            id: 'device-1',
+            _id: 'device-1',
+            name: '风速仪'
+          },
+          {
+            id: 'device-2',
+            _id: 'device-2',
+            name: '温湿度传感器'
+          }
+        ]
+      }
+    })
+  })
+
+  test('devices.easyList also supports nested data.items payloads', () => {
+    const response = iotModuleSpecs.devices.operations.easyList.fromResponse({
+      code: 0,
+      success: true,
+      data: {
+        total: 1,
+        items: [
+          {
+            id: 'device-3',
+            name: '层级设备'
+          }
+        ]
+      }
+    })
+
+    expect(response).toEqual({
+      code: 0,
+      data: {
+        total: 1,
+        rows: [
+          {
+            id: 'device-3',
+            _id: 'device-3',
+            name: '层级设备'
+          }
+        ]
+      }
+    })
+  })
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nayota-show-sdk",
-  "version": "1.3.63",
+  "version": "1.3.65",
   "description": "nayota-show-server rest-api",
   "type": "module",
   "main": "index.js",

package/utils/http-config-iot.js

@@ -1,12 +1,24 @@
 import urlcfg from '../config/urlcfg'
 import createHttpInstance from './http-factory'
 
+function isLegacySuccessCode(code) {
+  if (typeof code === 'number') {
+    return code >= 200 && code < 300
+  }
+
+  if (typeof code === 'string' && /^2\d{2}$/.test(code)) {
+    return true
+  }
+
+  return false
+}
+
 function normalizeIotResponseData(data) {
   if (!data || typeof data !== 'object' || Array.isArray(data)) {
     return data
   }
 
-  if (data.code === 200) {
+  if (isLegacySuccessCode(data.code)) {
     return {
       ...data,
       code: 0
@@ -16,10 +28,15 @@ function normalizeIotResponseData(data) {
   return data
 }
 
+function isIotSuccessResponseData(data) {
+  return data && typeof data === 'object' && data.code === 0
+}
+
 export default function httpConfigIot() {
   return createHttpInstance({
     getBaseUrl: () => urlcfg.getIotUrl(),
     contentType: 'application/json;charset=UTF-8',
-    normalizeResponseData: normalizeIotResponseData
+    normalizeResponseData: normalizeIotResponseData,
+    isSuccessResponseData: isIotSuccessResponseData
   })
 }

package/utils/http-factory.js

@@ -4,10 +4,15 @@ import axios from 'axios'
 import urlcfg from '../config/urlcfg'
 import emitter from './EventEmitter'
 
+function isSuccessStatus(status) {
+  return typeof status === 'number' && status >= 200 && status < 300
+}
+
 function createHttpInstance({
   getBaseUrl,
   contentType,
-  normalizeResponseData
+  normalizeResponseData,
+  isSuccessResponseData
 }) {
   const http = axios.create({
     baseURL: getBaseUrl(),
@@ -53,8 +58,12 @@ function createHttpInstance({
         return res
       }
 
-      if (res.status === 200) {
-        if (data.code !== 0) {
+      if (isSuccessStatus(res.status)) {
+        const success = typeof isSuccessResponseData === 'function'
+          ? isSuccessResponseData(data, res)
+          : data.code === 0
+
+        if (!success) {
           return Promise.reject(data)
         }
         return data

package/utils/iot-adapter-helpers.js

@@ -199,18 +199,19 @@ export function parseLegacySort(sortValue, sortFieldMap = {}) {
 
 export function buildLegacyListResponse(response, mapItem) {
   const payload = extractResponsePayload(response)
-  const items = Array.isArray(payload?.items)
-    ? payload.items
-    : Array.isArray(payload?.rows)
-      ? payload.rows
-      : Array.isArray(payload)
-        ? payload
+  const data = payload?.data !== undefined ? payload.data : payload
+  const items = Array.isArray(data?.items)
+    ? data.items
+    : Array.isArray(data?.rows)
+      ? data.rows
+      : Array.isArray(data)
+        ? data
         : []
 
   return {
     code: 0,
     data: {
-      total: Number(payload?.total ?? items.length ?? 0),
+      total: Number(data?.total ?? items.length ?? 0),
       rows: items.map(item => (mapItem ? mapItem(item) : withLegacyId(item)))
     }
   }

package/utils/iot-module-specs.js

@@ -503,11 +503,17 @@ export const iotModuleSpecs = {
         },
         fromResponse(response) {
           const payload = response && response.data && response.status ? response.data : response
+          const data = payload?.data !== undefined ? payload.data : payload
+          const rows = Array.isArray(data?.rows)
+            ? data.rows
+            : Array.isArray(data?.items)
+              ? data.items
+              : []
           return {
             code: 0,
             data: {
-              total: Number(payload?.total || 0),
-              rows: Array.isArray(payload?.rows) ? payload.rows.map(item => withLegacyId(item)) : []
+              total: Number(data?.total ?? rows.length ?? 0),
+              rows: rows.map(item => withLegacyId(item))
             }
           }
         }