@ray-js/api 1.4.61 → 1.4.63

package/lib/cloud/remoteGroup.d.ts

@@ -0,0 +1,10 @@
+import { IGetZigbeeLocalGroupDeviceList, IGetZigbeeLocalGroupRelation } from './interface';
+/**
+ * 获取 Zigbee 遥控器群组 localId 列表
+ */
+declare const getZigbeeLocalGroupRelation: (params: IGetZigbeeLocalGroupRelation) => Promise<string>;
+/**
+ * 获取可以加入 Zigbee 遥控器群组的设备列表
+ */
+declare const getZigbeeLocalGroupDeviceList: (params: IGetZigbeeLocalGroupDeviceList) => Promise<string>;
+export { getZigbeeLocalGroupRelation, getZigbeeLocalGroupDeviceList };

package/lib/cloud/remoteGroup.js

@@ -0,0 +1,31 @@
+// 遥控器群组接口
+import { requestCloud } from '../';
+import { THING } from '../constants';
+/**
+ * 获取 Zigbee 遥控器群组 localId 列表
+ */
+const getZigbeeLocalGroupRelation = params => {
+  return requestCloud({
+    api: "".concat(THING, ".p.remote.local.relation.get"),
+    version: '1.0',
+    data: {
+      devId: params.devId,
+      type: 0
+    }
+  });
+};
+
+/**
+ * 获取可以加入 Zigbee 遥控器群组的设备列表
+ */
+const getZigbeeLocalGroupDeviceList = params => {
+  return requestCloud({
+    api: "".concat(THING, ".m.device.group.dev.list"),
+    version: '1.0',
+    data: params,
+    extData: {
+      gid: params.homeId
+    }
+  });
+};
+export { getZigbeeLocalGroupRelation, getZigbeeLocalGroupDeviceList };

package/lib/errorCode.d.ts

@@ -0,0 +1,4 @@
+declare const _default: {
+    NATIVE_ROUTER_ERROR_ENVIRONMENT: number;
+};
+export default _default;

package/lib/errorCode.js

@@ -0,0 +1,3 @@
+export default {
+  NATIVE_ROUTER_ERROR_ENVIRONMENT: 40016
+};

package/lib/nativeRouters/common.js

@@ -1,6 +1,7 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 const _excluded = ["success", "fail", "complete"];
 import { stringifyUrl } from '../utils';
+import ErrorCode from '../errorCode';
 export function nativeRouter(uri, params) {
   const _ref = params || {},
     {
@@ -20,9 +21,11 @@ export function nativeRouter(uri, params) {
         resolve();
       },
       fail(err) {
-        if (+err.errorCode === 40016) {
+        if (+err.errorCode === ErrorCode.NATIVE_ROUTER_ERROR_ENVIRONMENT) {
+          const errMsg = 'Cannot use in this environment. Please use real device preview.';
+          console.warn(errMsg);
           // 该环境不可使用，请使用真机预览和线上包
-          err.errorMsg = 'Cannot use in this environment. Please use real device preview.';
+          err.errorMsg = errMsg;
         }
         fail === null || fail === void 0 || fail(err);
         reject(err);

package/lib/nativeRouters/index.d.ts

@@ -3,3 +3,4 @@ export * from './outdoors';
 export * from './root';
 export * from './ipc';
 export * from './gw';
+export * from './remoteGroup';

package/lib/nativeRouters/index.js

@@ -2,4 +2,5 @@ export * from './device';
 export * from './outdoors';
 export * from './root';
 export * from './ipc';
-export * from './gw';
+export * from './gw';
+export * from './remoteGroup';

package/lib/nativeRouters/remoteGroup.d.ts

@@ -0,0 +1,22 @@
+import { ICommon } from './common';
+type OpenZigbeeLocalGroupParams = {
+    /**
+     * 设备 ID
+     */
+    deviceId: string;
+    /**
+     * localId 群组本地标识
+     */
+    localId: string;
+    /**
+     * categoryCode 并非三级品类，与 localId 匹配范围为 7001-7008；
+     * localId 为云端分配，步长为 8，因此一个遥控器内部最多支持关联 8 个群组，localId 为初始值依次+1，与之匹配的 categoryCode 从 7001 依次 +1.
+     */
+    categoryCode: string;
+    /**
+     * 二级品类 code，用于进行设备列表筛选过滤
+     */
+    codes: string;
+} & ICommon;
+export declare function openZigbeeLocalGroup(params?: OpenZigbeeLocalGroupParams): Promise<void>;
+export {};

package/lib/nativeRouters/remoteGroup.js

@@ -0,0 +1,11 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { nativeRouter } from './common';
+export function openZigbeeLocalGroup(params) {
+  const realParams = _objectSpread({}, params);
+  // 统一成 TTT 的 deviceId 写法，但实际入参为 devId
+  if (params.deviceId) {
+    realParams.devId = params.deviceId;
+    delete realParams.deviceId;
+  }
+  return nativeRouter('zigbee_pair', realParams);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/api",
-  "version": "1.4.61",
+  "version": "1.4.63",
   "description": "Ray universal api",
   "keywords": [
     "ray"
@@ -29,14 +29,14 @@
     "watch": "ray start --type=component"
   },
   "dependencies": {
-    "@ray-js/framework": "1.4.61",
-    "@ray-js/router": "1.4.61",
+    "@ray-js/framework": "1.4.63",
+    "@ray-js/router": "1.4.63",
     "@ray-js/wechat": "^0.2.8",
     "base64-browser": "^1.0.1",
     "query-string": "^7.1.3"
   },
   "devDependencies": {
-    "@ray-js/cli": "1.4.61",
+    "@ray-js/cli": "1.4.63",
     "art-template": "^4.13.2",
     "fs-extra": "^10.1.0",
     "miniprogram-api-typings": "^3.12.2",
@@ -46,5 +46,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "c57d133fbcabd0af8456f62fdb210b79ebc24d94"
+  "gitHead": "4934e503e3fcb057df92eb42c7f7fd84f1d31e60"
 }

package/@types/PlayNetKit.d.ts

@@ -1,444 +0,0 @@
-/**
- * PlayNetKit
- *
- * @version 1.1.3
- */
-declare namespace ty.playnet {
-  /**
-   * 判断是否有这个权限
-   *WIFI or BLE
-   */
-  export function hasPermission(params: {
-    /**
-     * "WIFI" or "BLE"
-     * 权限
-     */
-    permission: string
-    complete?: () => void
-    success?: (params: boolean) => void
-    fail?: (params: {
-      errorMsg: string
-      errorCode: string | number
-      innerError: {
-        errorCode: string | number
-        errorMsg: string
-      }
-    }) => void
-  }): void
-
-  /**
-   * 请求获取这个权限
-   *WIFI or BLE
-   */
-  export function requestPermission(params: {
-    /**
-     * "WIFI" or "BLE"
-     * 权限
-     */
-    permission: string
-    complete?: () => void
-    success?: (params: null) => void
-    fail?: (params: {
-      errorMsg: string
-      errorCode: string | number
-      innerError: {
-        errorCode: string | number
-        errorMsg: string
-      }
-    }) => void
-  }): void
-
-  /**
-   * 指定时间内扫描已配网的设备，扫描结果通过【onBLEScanDevice】事件获取
-   */
-  export function startBLEScanDevice(params: {
-    /** 扫描超时时间 */
-    timeout: number
-    /**
-     * 扫描类型
-     * SINGLE -> "SINGLE"
-     * SINGLE_QR -> "SINGLE_QR"
-     * MESH -> "MESH"
-     * MESH -> "MESH"
-     * SIG_MESH -> "SIG_MESH"
-     * NORMAL -> "NORMAL" 默认
-     * Thing_BEACON -> "Thing_BEACON"
-     * Multi_Mode 双模
-     */
-    scanType: string
-    complete?: () => void
-    success?: (params: null) => void
-    fail?: (params: {
-      errorMsg: string
-      errorCode: string | number
-      innerError: {
-        errorCode: string | number
-        errorMsg: string
-      }
-    }) => void
-  }): void
-
-  /**
-   * 停止蓝牙扫描
-   */
-  export function stopBLEScan(params?: {
-    complete?: () => void
-    success?: (params: null) => void
-    fail?: (params: {
-      errorMsg: string
-      errorCode: string | number
-      innerError: {
-        errorCode: string | number
-        errorMsg: string
-      }
-    }) => void
-  }): void
-
-  /**
-   * 蓝牙连接 / AP监听广播包后 并查询状态 然后再开始查询wifi列表
-   */
-  export function queryDeviceConfigState(params: {
-    /** homeid */
-    homeId: number
-    /** 超时时间 */
-    timeout: number
-    /**
-     * 配网类型，后续新流程添加在这里
-     * AP -> "AP"
-     * WIFI_BLE -> "WIFI_BLE"
-     */
-    pairType: string
-    /** 蓝牙扫描出来的广播包，目前只有wifi双模需要填写 */
-    bleWifiPairParams: ScanDevicePacket
-    complete?: () => void
-    success?: (params: WiFiInfo[]) => void
-    fail?: (params: {
-      errorMsg: string
-      errorCode: string | number
-      innerError: {
-        errorCode: string | number
-        errorMsg: string
-      }
-    }) => void
-  }): void
-
-  /**
-   * 开始配网
-   */
-  export function startActivator(params: {
-    /**
-     * 配网类型，后续新流程添加在这里
-     * AP -> "AP"
-     * WIFI_BLE -> "WIFI_BLE"
-     */
-    pairType: string
-    /** AP 模式下AP配网参数 */
-    apActivatorParams: ApActivatorParam
-    /** WIFI双模 模式下配网参数 */
-    bleWifiActivatorParams: BleWifiActivatorParam
-    complete?: () => void
-    success?: (params: {
-      /** 设备id */
-      devId: string
-      /** 设备名称 */
-      name: string
-      /** 设备房间id */
-      roomId: string
-      /** 设备图标url */
-      iconUrl: string
-    }) => void
-    fail?: (params: {
-      errorMsg: string
-      errorCode: string | number
-      innerError: {
-        errorCode: string | number
-        errorMsg: string
-      }
-    }) => void
-  }): void
-
-  /**
-   * 停止配网
-   */
-  export function stopActivator(params: {
-    /** uuid 根据uuid来匹配找到对应的蓝牙配网设备 */
-    uuid: string
-    /**
-     * 配网类型，后续新流程添加在这里
-     * AP -> "AP"
-     * WIFI_BLE -> "WIFI_BLE", 蓝牙配网需要填uuid
-     */
-    pairType: string
-    complete?: () => void
-    success?: (params: null) => void
-    fail?: (params: {
-      errorMsg: string
-      errorCode: string | number
-      innerError: {
-        errorCode: string | number
-        errorMsg: string
-      }
-    }) => void
-  }): void
-
-  /**
-   * 自动连接wifi
-   */
-  export function autoConnectToAp(params: {
-    /** ssid */
-    ssid: string
-    /** pwd */
-    pwd: string
-    complete?: () => void
-    success?: (params: null) => void
-    fail?: (params: {
-      errorMsg: string
-      errorCode: string | number
-      innerError: {
-        errorCode: string | number
-        errorMsg: string
-      }
-    }) => void
-  }): void
-
-  /**
-   * 获取配网token
-   */
-  export function getPairConfigToken(params: {
-    /** 家庭id */
-    gid: number
-    complete?: () => void
-    success?: (params: string) => void
-    fail?: (params: {
-      errorMsg: string
-      errorCode: string | number
-      innerError: {
-        errorCode: string | number
-        errorMsg: string
-      }
-    }) => void
-  }): void
-
-  /**
-   * 重置设备
-   */
-  export function resetDevice(params: {
-    /** uuid 根据uuid来匹配找到对应的蓝牙配网设备 */
-    uuid: string
-    /**
-     * 配网类型，后续新流程添加在这里
-     * AP -> "AP"
-     * WIFI_BLE -> "WIFI_BLE", 蓝牙配网需要填uuid
-     */
-    pairType: string
-    complete?: () => void
-    success?: (params: boolean) => void
-    fail?: (params: {
-      errorMsg: string
-      errorCode: string | number
-      innerError: {
-        errorCode: string | number
-        errorMsg: string
-      }
-    }) => void
-  }): void
-
-  /**
-   * 获取sl等级配置
-   */
-  export function getDeviceSecurityConfigs(params?: {
-    complete?: () => void
-    success?: (params: string) => void
-    fail?: (params: {
-      errorMsg: string
-      errorCode: string | number
-      innerError: {
-        errorCode: string | number
-        errorMsg: string
-      }
-    }) => void
-  }): void
-
-  /**
-   * 在自动连接热点场景下，是否是系统控制弹窗的
-   */
-  export function isSystemPopupInAutoConnectAp(params?: {
-    complete?: () => void
-    success?: (params: boolean) => void
-    fail?: (params: {
-      errorMsg: string
-      errorCode: string | number
-      innerError: {
-        errorCode: string | number
-        errorMsg: string
-      }
-    }) => void
-  }): void
-
-  /**
-   * 是否仅有蓝牙权限
-   */
-  export function hasBlePermission(params?: {
-    complete?: () => void
-    success?: (params: boolean) => void
-    fail?: (params: {
-      errorMsg: string
-      errorCode: string | number
-      innerError: {
-        errorCode: string | number
-        errorMsg: string
-      }
-    }) => void
-  }): void
-
-  /**
-   * 是否有本地网络权限
-   */
-  export function hasLocalNetworkPermission(params?: {
-    complete?: () => void
-    success?: (params: boolean) => void
-    fail?: (params: {
-      errorMsg: string
-      errorCode: string | number
-      innerError: {
-        errorCode: string | number
-        errorMsg: string
-      }
-    }) => void
-  }): void
-
-  /**
-   * 扫描到设备后进行通知
-   */
-  export function onBLEScanDevice(listener: (params: ScanDevicePacket) => void): void
-
-  /**
-   * 取消监听：扫描到设备后进行通知
-   */
-  export function offBLEScanDevice(listener: (params: ScanDevicePacket) => void): void
-
-  /**
-   * wifi状态发生变化
-   */
-  export function onWifiStateChange(listener: (params: Privacy) => void): void
-
-  /**
-   * 取消监听：wifi状态发生变化
-   */
-  export function offWifiStateChange(listener: (params: Privacy) => void): void
-
-  /**
-   * 蓝牙状态发生变化
-   */
-  export function onBLEStateChange(listener: (params: Privacy) => void): void
-
-  /**
-   * 取消监听：蓝牙状态发生变化
-   */
-  export function offBLEStateChange(listener: (params: Privacy) => void): void
-
-  /**
-   * 蓝牙权限发生变化
-   */
-  export function onBlePermissionChange(listener: (params: Privacy) => void): void
-
-  /**
-   * 取消监听：蓝牙权限发生变化
-   */
-  export function offBlePermissionChange(listener: (params: Privacy) => void): void
-
-  /**
-   * 本地网络权限发生变化
-   */
-  export function onlocalNetWorkPermissionChange(listener: (params: Privacy) => void): void
-
-  /**
-   * 取消监听：本地网络权限发生变化
-   */
-  export function offlocalNetWorkPermissionChange(listener: (params: Privacy) => void): void
-
-  export type ScanDevicePacket = {
-    /** id */
-    id: string
-    /** name */
-    name: string
-    /** providerName */
-    providerName: string
-    /** data */
-    data: string
-    /** configType */
-    configType: string
-    /** productId */
-    productId: string
-    /** uuid */
-    uuid: string
-    /** mac */
-    mac: string
-    /** address */
-    address: string
-    /** deviceType */
-    deviceType: number
-    /** isbind */
-    isbind: boolean
-    /** flag */
-    flag: number
-    /** isShare */
-    isShare: boolean
-    /** rssi */
-    rssi: number
-  }
-
-  export type WiFiInfo = {
-    /** ssid */
-    ssid: string
-    /** 强度 */
-    rssi: number
-    /** sec */
-    sec: number
-  }
-
-  export type ApActivatorParam = {
-    /** ssid */
-    ssid: string
-    /** pwd */
-    pwd: string
-    /** token */
-    token: string
-    /** 配网超时时间 */
-    timeout: number
-    /** 是否为密码错误恢复配网 */
-    isRecovery: boolean
-    /**
-     * securityConfig
-     * use getDeviceSecurityConfigs() method to get
-     */
-    securityConfig: string
-  }
-
-  export type BleWifiActivatorParam = {
-    /** uuid */
-    uuid: string
-    /** ssid */
-    ssid: string
-    /** pwd */
-    pwd: string
-    /** token */
-    token: string
-    /** timeout */
-    timeout: number
-    /** 是否为密码错误恢复配网 */
-    isRecovery: boolean
-    /**
-     * the phase 1 timeout value, in milliseconds. Default 60000
-     * Note
-     * <p>
-     * For devices with WiFi and Bluetooth capabilities, use WiFi to activate in the first stage, if it fails, use Bluetooth to activate.
-     */
-    phase1Timeout: number
-  }
-
-  export type Privacy = {
-    /** enable */
-    enable: boolean
-  }
-}