nayota-show-sdk 1.3.61 → 1.3.63

package/http-config-iot.test.js

@@ -0,0 +1,49 @@
+import httpConfigIot from './utils/http-config-iot'
+
+jest.mock('axios', () => {
+  const create = jest.fn(() => {
+    const instance = jest.fn()
+    instance.interceptors = {
+      request: { use: jest.fn() },
+      response: { use: jest.fn() }
+    }
+    return instance
+  })
+
+  return {
+    __esModule: true,
+    default: {
+      create,
+      defaults: {
+        headers: {
+          common: {}
+        }
+      }
+    }
+  }
+})
+
+describe('httpConfigIot', () => {
+  test('normalizes iot success code 200 into legacy success code 0', () => {
+    const http = httpConfigIot()
+    const responseInterceptor = http.interceptors.response.use.mock.calls[0][0]
+
+    expect(
+      responseInterceptor({
+        status: 200,
+        headers: {},
+        data: {
+          code: 200,
+          data: {
+            id: 'space-1'
+          }
+        }
+      })
+    ).toEqual({
+      code: 0,
+      data: {
+        id: 'space-1'
+      }
+    })
+  })
+})

package/index.test.js

@@ -1,38 +1,27 @@
-let modules
-beforeAll(() => {
-  jest.mock('./__mocks__/requireContext')
+import sdk from './index'
 
-  modules = require('./index.js')
-})
+describe('nayota-show-sdk exports', () => {
+  test('exposes config entry and core API modules', () => {
+    expect(sdk).toBeDefined()
+    expect(typeof sdk.config).toBe('function')
+    expect(typeof sdk.on).toBe('function')
+
+    expect(sdk.area).toBeDefined()
+    expect(typeof sdk.area.list).toBe('function')
+
+    expect(sdk.areaClass).toBeDefined()
+    expect(typeof sdk.areaClass.getOne).toBe('function')
+
+    expect(sdk.components).toBeDefined()
+    expect(typeof sdk.components.create).toBe('function')
 
-// Test the modules object
-describe('modules', () => {
-  test('should have the correct structure', () => {
-    expect(modules).toBeDefined()
-    expect(typeof modules).toBe('object')
-    expect(Object.keys(modules)).toHaveLength(17) // Assuming there is only one module in the littleTool directory
+    expect(sdk.departs).toBeDefined()
+    expect(typeof sdk.departs.updateOne).toBe('function')
 
-    // Test the structure of the module
-    // const module = modules['api'] // Assuming the module name is 'api'
-    // expect(module).toBeDefined()
-    // expect(typeof module).toBe('object')
-    // expect(Object.keys(module)).toHaveLength(13) // Assuming there are 13 sub-modules in the api directory
+    expect(sdk.devices).toBeDefined()
+    expect(typeof sdk.devices.easyList).toBe('function')
 
-    // // Test the structure of each sub-module
-    // expect(module['alarms']).toBeDefined()
-    // expect(module['checkReduces']).toBeDefined()
-    // expect(module['user']).toBeDefined()
-    // expect(module['httpDrives']).toBeDefined()
-    // expect(module['hardwares']).toBeDefined()
-    // expect(module['checks']).toBeDefined()
-    // expect(module['cloudHardwares']).toBeDefined()
-    // expect(module['loraSlaves']).toBeDefined()
-    // expect(module['lorawanDevices']).toBeDefined()
-    // expect(module['nbiotDrives']).toBeDefined()
-    // expect(module['nbm2mDevices']).toBeDefined()
-    // expect(module['netDrives']).toBeDefined()
-    // expect(module['netMqttDevices']).toBeDefined()
-    // // 添加alarms list请求的测试
-    // expect(module['alarms']['list']).toBeDefined()
+    expect(sdk.deviceClass).toBeDefined()
+    expect(typeof sdk.deviceClass.deleteOne).toBe('function')
   })
 })

package/iot-adapter-helpers.test.js

@@ -0,0 +1,29 @@
+import { buildLegacyListResponse } from './utils/iot-adapter-helpers'
+
+describe('iot adapter helpers', () => {
+  test('wraps list responses as code + data.total/data.rows', () => {
+    const result = buildLegacyListResponse({
+      total: 1,
+      items: [
+        {
+          id: 'type-1',
+          name: '风速仪'
+        }
+      ]
+    })
+
+    expect(result).toEqual({
+      code: 0,
+      data: {
+        total: 1,
+        rows: [
+          {
+            id: 'type-1',
+            _id: 'type-1',
+            name: '风速仪'
+          }
+        ]
+      }
+    })
+  })
+})

package/package.json

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

package/utils/http-config-iot.js

@@ -1,9 +1,25 @@
 import urlcfg from '../config/urlcfg'
 import createHttpInstance from './http-factory'
 
+function normalizeIotResponseData(data) {
+  if (!data || typeof data !== 'object' || Array.isArray(data)) {
+    return data
+  }
+
+  if (data.code === 200) {
+    return {
+      ...data,
+      code: 0
+    }
+  }
+
+  return data
+}
+
 export default function httpConfigIot() {
   return createHttpInstance({
     getBaseUrl: () => urlcfg.getIotUrl(),
-    contentType: 'application/json;charset=UTF-8'
+    contentType: 'application/json;charset=UTF-8',
+    normalizeResponseData: normalizeIotResponseData
   })
 }

package/utils/http-factory.js

@@ -6,7 +6,8 @@ import emitter from './EventEmitter'
 
 function createHttpInstance({
   getBaseUrl,
-  contentType
+  contentType,
+  normalizeResponseData
 }) {
   const http = axios.create({
     baseURL: getBaseUrl(),
@@ -40,7 +41,14 @@ function createHttpInstance({
         axios.defaults.headers.common.Authorization = `Bearer ${newToken}`
       }
 
-      const data = res.data
+      const data = typeof normalizeResponseData === 'function'
+        ? normalizeResponseData(res.data, res)
+        : res.data
+
+      if (data !== res.data) {
+        res.data = data
+      }
+
       if (data == null || data.code == null) {
         return res
       }

package/utils/iot-adapter-helpers.js

@@ -209,8 +209,10 @@ export function buildLegacyListResponse(response, mapItem) {
 
   return {
     code: 0,
-    total: Number(payload?.total ?? items.length ?? 0),
-    rows: items.map(item => (mapItem ? mapItem(item) : withLegacyId(item)))
+    data: {
+      total: Number(payload?.total ?? items.length ?? 0),
+      rows: items.map(item => (mapItem ? mapItem(item) : withLegacyId(item)))
+    }
   }
 }
 

package/utils/iot-module-specs.js

@@ -505,8 +505,10 @@ export const iotModuleSpecs = {
           const payload = response && response.data && response.status ? response.data : response
           return {
             code: 0,
-            total: Number(payload?.total || 0),
-            rows: Array.isArray(payload?.rows) ? payload.rows.map(item => withLegacyId(item)) : []
+            data: {
+              total: Number(payload?.total || 0),
+              rows: Array.isArray(payload?.rows) ? payload.rows.map(item => withLegacyId(item)) : []
+            }
           }
         }
       }