@ray-js/api 1.4.0-alpha.9 → 1.4.0

package/@types/P2PKit.d.ts

@@ -0,0 +1,402 @@
+/**
+ * P2PKit
+ *
+ * @version 2.0.3
+ */
+declare namespace ty.p2p {
+  /**
+   * P2P SDK 初始化
+   */
+  export function P2PSDKInit(params: {
+    /** 用户id */
+    userId: string
+    complete?: () => void
+    success?: (params: null) => void
+    fail?: (params: {
+      errorMsg: string
+      errorCode: string | number
+      innerError: {
+        errorCode: string | number
+        errorMsg: string
+      }
+    }) => void
+  }): void
+
+  /**
+   * 建立P2P连接
+   */
+  export function connectDevice(params: {
+    /** 设备id */
+    deviceId: string
+    /** 连接模式,0:INTERNET  1:LAN */
+    mode?: number
+    /** 超时时长,单位：ms,设置0会设置成默认值，Internet：15000ms， Lan：3000ms */
+    timeout?: number
+    complete?: () => void
+    success?: (params: null) => void
+    fail?: (params: {
+      errorMsg: string
+      errorCode: string | number
+      innerError: {
+        errorCode: string | number
+        errorMsg: string
+      }
+    }) => void
+  }): void
+
+  /**
+   * 检查P2P连接
+   */
+  export function isP2PActive(params: {
+    /** 设备id */
+    deviceId: string
+    /** 连接模式,0:INTERNET  1:LAN */
+    mode?: number
+    /** 超时时长,单位：ms,设置0会设置成默认值，Internet：15000ms， Lan：3000ms */
+    timeout?: number
+    complete?: () => void
+    success?: (params: null) => void
+    fail?: (params: {
+      errorMsg: string
+      errorCode: string | number
+      innerError: {
+        errorCode: string | number
+        errorMsg: string
+      }
+    }) => void
+  }): void
+
+  /**
+   * 检查P2P连接
+   */
+  export function isP2PActiveSync(params?: ThingP2PConnectionParams): null
+
+  /**
+   * 查询设备相册文件索引列表
+   */
+  export function queryAlbumFileIndexs(params: {
+    /** 设备id */
+    deviceId: string
+    /** albumName 和设备端约定字段 */
+    albumName: string
+    complete?: () => void
+    success?: (params: {
+      /** 文件个数 */
+      count: number
+      /** 文件索引 */
+      items: ThingP2PAlbumFileIndex[]
+    }) => void
+    fail?: (params: {
+      errorMsg: string
+      errorCode: string | number
+      innerError: {
+        errorCode: string | number
+        errorMsg: string
+      }
+    }) => void
+  }): void
+
+  /**
+   * P2P上传文件
+   */
+  export function uploadFile(params: {
+    /** 设备id */
+    deviceId: string
+    /** albumName 和设备端约定字段 */
+    albumName: string
+    /** 文件本地路径 */
+    filePath: string
+    /** 扩展字段 */
+    extData?: string
+    /** 扩展字段长度 */
+    extDataLength?: number
+    complete?: () => void
+    success?: (params: null) => void
+    fail?: (params: {
+      errorMsg: string
+      errorCode: string | number
+      innerError: {
+        errorCode: string | number
+        errorMsg: string
+      }
+    }) => void
+  }): void
+
+  /**
+   * P2P下载文件
+   */
+  export function downloadFile(params: {
+    /** 设备id */
+    deviceId: string
+    /** albumName 和设备端约定字段 */
+    albumName: string
+    /** 下载文件本地存储路径 */
+    filePath: string
+    /** 下载的文件名称，eg: {"files":["filesname1", "filesname2", "filesname3" ]} */
+    jsonfiles: string
+    complete?: () => void
+    success?: (params: null) => void
+    fail?: (params: {
+      errorMsg: string
+      errorCode: string | number
+      innerError: {
+        errorCode: string | number
+        errorMsg: string
+      }
+    }) => void
+  }): void
+
+  /**
+   * P2P下载数据流
+   */
+  export function downloadStream(params: {
+    /** 设备id */
+    deviceId: string
+    /** albumName 和设备端约定字段 */
+    albumName: string
+    /** 下载的文件名称，eg: {"files":["filesname1", "filesname2", "filesname3" ]} */
+    jsonfiles: string
+    complete?: () => void
+    success?: (params: null) => void
+    fail?: (params: {
+      errorMsg: string
+      errorCode: string | number
+      innerError: {
+        errorCode: string | number
+        errorMsg: string
+      }
+    }) => void
+  }): void
+
+  /**
+   * 取消传输任务
+   */
+  export function cancelUploadTask(params: {
+    /** 设备id */
+    deviceId: string
+    complete?: () => void
+    success?: (params: null) => void
+    fail?: (params: {
+      errorMsg: string
+      errorCode: string | number
+      innerError: {
+        errorCode: string | number
+        errorMsg: string
+      }
+    }) => void
+  }): void
+
+  /**
+   * 取消下载任务
+   */
+  export function cancelDownloadTask(params: {
+    /** 设备id */
+    deviceId: string
+    complete?: () => void
+    success?: (params: null) => void
+    fail?: (params: {
+      errorMsg: string
+      errorCode: string | number
+      innerError: {
+        errorCode: string | number
+        errorMsg: string
+      }
+    }) => void
+  }): void
+
+  /**
+   * 和设备断开连接
+   */
+  export function disconnectDevice(params: {
+    /** 设备id */
+    deviceId: string
+    complete?: () => void
+    success?: (params: null) => void
+    fail?: (params: {
+      errorMsg: string
+      errorCode: string | number
+      innerError: {
+        errorCode: string | number
+        errorMsg: string
+      }
+    }) => void
+  }): void
+
+  /**
+   * P2P SDK 反初始化
+   */
+  export function deInitSDK(params?: {
+    complete?: () => void
+    success?: (params: null) => void
+    fail?: (params: {
+      errorMsg: string
+      errorCode: string | number
+      innerError: {
+        errorCode: string | number
+        errorMsg: string
+      }
+    }) => void
+  }): void
+
+  /**
+   * 连接状态改变回调
+   */
+  export function onSessionStatusChange(listener: (params: ThingP2PSessionStatus) => void): void
+
+  /**
+   * 取消监听：连接状态改变回调
+   */
+  export function offSessionStatusChange(listener: (params: ThingP2PSessionStatus) => void): void
+
+  /**
+   * 上传进度回调
+   */
+  export function onUploadProgressUpdate(listener: (params: ProgressEvent) => void): void
+
+  /**
+   * 取消监听：上传进度回调
+   */
+  export function offUploadProgressUpdate(listener: (params: ProgressEvent) => void): void
+
+  /**
+   * 单个文件下载进度回调
+   */
+  export function onDownloadProgressUpdate(listener: (params: DownloadProgressEvent) => void): void
+
+  /**
+   * 取消监听：单个文件下载进度回调
+   */
+  export function offDownloadProgressUpdate(listener: (params: DownloadProgressEvent) => void): void
+
+  /**
+   * 下载总进度回调
+   */
+  export function onDownloadTotalProgressUpdate(
+    listener: (params: DownloadTotalProgressEvent) => void
+  ): void
+
+  /**
+   * 取消监听：下载总进度回调
+   */
+  export function offDownloadTotalProgressUpdate(
+    listener: (params: DownloadTotalProgressEvent) => void
+  ): void
+
+  /**
+   * 单文件下载完成事件
+   */
+  export function onFileDownloadComplete(
+    listener: (params: FileDownloadCompletionEvent) => void
+  ): void
+
+  /**
+   * 取消监听：单文件下载完成事件
+   */
+  export function offFileDownloadComplete(
+    listener: (params: FileDownloadCompletionEvent) => void
+  ): void
+
+  /**
+   * 收到数据包事件
+   */
+  export function onStreamPacketReceive(
+    listener: (params: StreamDownloadPacketReceivedEvent) => void
+  ): void
+
+  /**
+   * 取消监听：收到数据包事件
+   */
+  export function offStreamPacketReceive(
+    listener: (params: StreamDownloadPacketReceivedEvent) => void
+  ): void
+
+  export type ThingP2PConnectionParams = {
+    /** 设备id */
+    deviceId: string
+    /** 连接模式,0:INTERNET  1:LAN */
+    mode?: number
+    /** 超时时长,单位：ms,设置0会设置成默认值，Internet：15000ms， Lan：3000ms */
+    timeout?: number
+  }
+
+  export type ThingP2PAlbumFileIndex = {
+    /** idx 唯一标识，设备提供 */
+    idx: number
+    /** channel 通道号 */
+    channel: number
+    /** type 文件类型，0: 图片，2: mp4, 3: 全景拼接文件 */
+    type: number
+    /** dir 0: 文件，1: 文件夹。保留字段，目前都是 0 */
+    dir: number
+    /** filename 文件名，带有文件后缀 */
+    filename: string
+    /** createTime 文件创建时间 */
+    createTime: number
+    /** duration 视频文件时长 */
+    duration: number
+  }
+
+  export type ThingP2PSessionStatus = {
+    /** 设备id */
+    deviceId: string
+    /** 状态值, 小于0为断开连接 */
+    status: number
+  }
+
+  export type ProgressEvent = {
+    /** 设备id */
+    deviceId: string
+    /** 文件本地路径 */
+    filePath: string
+    /** 上传/下载进度 */
+    progress: number
+  }
+
+  export type DownloadProgressEvent = {
+    /** 设备id */
+    deviceId: string
+    /** 正在下载的文件名称 */
+    fileName: string
+    /** 上传/下载进度 */
+    progress: number
+  }
+
+  export type DownloadTotalProgressEvent = {
+    /** 设备id */
+    deviceId: string
+    /** 上传/下载进度 */
+    progress: number
+  }
+
+  export type FileDownloadCompletionEvent = {
+    /** 设备id */
+    deviceId: string
+    /** 文件名 */
+    fileName: string
+    /** 索引 */
+    index: number
+  }
+
+  export type StreamDownloadPacketReceivedEvent = {
+    /** 设备id */
+    deviceId: string
+    /** 文件个数 */
+    totalFiles: number
+    /** 文件名 */
+    fileName: string
+    /** 索引,目前错误数据 */
+    fileIndex: number
+    /** 文件大小 */
+    fileLength: number
+    /** 数据 */
+    packetData: string
+    /** 包大小 */
+    packetLength: number
+    /** 文件序列号 */
+    fileSerialNumber: number
+    /** 包索引 */
+    packetIndex: number
+    /** 包头/包尾 0b00XY Y:包头  X:包尾 */
+    packetType: number
+  }
+}

package/@types/all-kits.d.ts

@@ -5,3 +5,4 @@
 /// <reference path="./PlayNetKit.d.ts" />
 /// <reference path="./MapKit.d.ts" />
 /// <reference path="./HomeKit.d.ts" />
+/// <reference path="./P2PKit.d.ts" />

package/lib/P2PKit-2.0.3.d.ts

@@ -0,0 +1,27 @@
+/// <reference path="../@types/MapKit.d.ts" />
+export declare const p2p: {
+    P2PSDKInit: typeof ty.p2p.P2PSDKInit;
+    deInitSDK: typeof ty.p2p.deInitSDK;
+    isP2PActive: typeof ty.p2p.isP2PActive;
+    isP2PActiveSync: typeof ty.p2p.isP2PActiveSync;
+    connectDevice: typeof ty.p2p.connectDevice;
+    disconnectDevice: typeof ty.p2p.disconnectDevice;
+    uploadFile: typeof ty.p2p.uploadFile;
+    cancelUploadTask: typeof ty.p2p.cancelUploadTask;
+    downloadFile: typeof ty.p2p.downloadFile;
+    cancelDownloadTask: typeof ty.p2p.cancelDownloadTask;
+    downloadStream: typeof ty.p2p.downloadStream;
+    queryAlbumFileIndexs: typeof ty.p2p.queryAlbumFileIndexs;
+    onSessionStatusChange: typeof ty.p2p.onSessionStatusChange;
+    offSessionStatusChange: typeof ty.p2p.offSessionStatusChange;
+    onUploadProgressUpdate: typeof ty.p2p.onUploadProgressUpdate;
+    offUploadProgressUpdate: typeof ty.p2p.offUploadProgressUpdate;
+    onDownloadProgressUpdate: typeof ty.p2p.onDownloadProgressUpdate;
+    offDownloadProgressUpdate: typeof ty.p2p.offDownloadProgressUpdate;
+    onDownloadTotalProgressUpdate: typeof ty.p2p.onDownloadTotalProgressUpdate;
+    offDownloadTotalProgressUpdate: typeof ty.p2p.offDownloadTotalProgressUpdate;
+    onFileDownloadComplete: typeof ty.p2p.onFileDownloadComplete;
+    offFileDownloadComplete: typeof ty.p2p.offFileDownloadComplete;
+    onStreamPacketReceive: typeof ty.p2p.onStreamPacketReceive;
+    offStreamPacketReceive: typeof ty.p2p.offStreamPacketReceive;
+};

package/lib/P2PKit-2.0.3.js

@@ -0,0 +1,79 @@
+/// <reference path="../@types/MapKit.d.ts" />
+
+import { factory } from './utils';
+
+// ray 1.4.0 集成
+export const p2p = {
+  P2PSDKInit: factory('P2PSDKInit', {
+    "namespace": "p2p"
+  }),
+  deInitSDK: factory('deInitSDK', {
+    "namespace": "p2p"
+  }),
+  isP2PActive: factory('isP2PActive', {
+    "namespace": "p2p"
+  }),
+  isP2PActiveSync: factory('isP2PActiveSync', {
+    "namespace": "p2p"
+  }),
+  connectDevice: factory('connectDevice', {
+    "namespace": "p2p"
+  }),
+  disconnectDevice: factory('disconnectDevice', {
+    "namespace": "p2p"
+  }),
+  uploadFile: factory('uploadFile', {
+    "namespace": "p2p"
+  }),
+  cancelUploadTask: factory('cancelUploadTask', {
+    "namespace": "p2p"
+  }),
+  downloadFile: factory('downloadFile', {
+    "namespace": "p2p"
+  }),
+  cancelDownloadTask: factory('cancelDownloadTask', {
+    "namespace": "p2p"
+  }),
+  downloadStream: factory('downloadStream', {
+    "namespace": "p2p"
+  }),
+  queryAlbumFileIndexs: factory('queryAlbumFileIndexs', {
+    "namespace": "p2p"
+  }),
+  onSessionStatusChange: factory('onSessionStatusChange', {
+    "namespace": "p2p"
+  }),
+  offSessionStatusChange: factory('offSessionStatusChange', {
+    "namespace": "p2p"
+  }),
+  onUploadProgressUpdate: factory('onUploadProgressUpdate', {
+    "namespace": "p2p"
+  }),
+  offUploadProgressUpdate: factory('offUploadProgressUpdate', {
+    "namespace": "p2p"
+  }),
+  onDownloadProgressUpdate: factory('onDownloadProgressUpdate', {
+    "namespace": "p2p"
+  }),
+  offDownloadProgressUpdate: factory('offDownloadProgressUpdate', {
+    "namespace": "p2p"
+  }),
+  onDownloadTotalProgressUpdate: factory('onDownloadTotalProgressUpdate', {
+    "namespace": "p2p"
+  }),
+  offDownloadTotalProgressUpdate: factory('offDownloadTotalProgressUpdate', {
+    "namespace": "p2p"
+  }),
+  onFileDownloadComplete: factory('onFileDownloadComplete', {
+    "namespace": "p2p"
+  }),
+  offFileDownloadComplete: factory('offFileDownloadComplete', {
+    "namespace": "p2p"
+  }),
+  onStreamPacketReceive: factory('onStreamPacketReceive', {
+    "namespace": "p2p"
+  }),
+  offStreamPacketReceive: factory('offStreamPacketReceive', {
+    "namespace": "p2p"
+  })
+};

package/lib/all-kits.d.ts

@@ -5,5 +5,6 @@ export * from './MiniKit-3.1.0';
 export * from './PlayNetKit-1.1.3';
 export * from './MapKit-3.0.7';
 export * from './HomeKit-3.1.4';
+export * from './P2PKit-2.0.3';
 import * as device from './DeviceKit-3.3.1';
 export { device };

package/lib/all-kits.js

@@ -5,5 +5,6 @@ export * from './MiniKit-3.1.0';
 export * from './PlayNetKit-1.1.3';
 export * from './MapKit-3.0.7';
 export * from './HomeKit-3.1.4';
+export * from './P2PKit-2.0.3';
 import * as device from './DeviceKit-3.3.1';
 export { device };

package/lib/getCdnUrl/index.d.ts

@@ -1 +1,2 @@
 export default function getCdnUrl(path: string): string;
+export declare function getCdnUrlAsync(path: string): Promise<string>;

package/lib/getCdnUrl/index.js

@@ -1,4 +1,8 @@
 export default function getCdnUrl(path) {
   // 暂未实现获取cdn方法，将直接返回path
   return path;
+}
+export function getCdnUrlAsync(path) {
+  // 暂未实现获取cdn方法，将直接返回path
+  return Promise.resolve(path);
 }

package/lib/getCdnUrl/index.thing.d.ts

@@ -1 +1,3 @@
-export default function getCdnUrl(path: string, cdnMap?: Record<string, string>): string;
+export declare function getRegionCode(): Promise<string>;
+export default function getCdnUrl(path: string, cdnMap?: Record<string, string>, region?: string): string;
+export declare function getCdnUrlAsync(path: string, cdnMap?: Record<string, string>, region?: string): Promise<string>;

package/lib/getCdnUrl/index.thing.js

@@ -1,25 +1,63 @@
-export default function getCdnUrl(path, cdnMap) {
+const regionMap = {
+  AY: 'images.tuyacn.com',
+  AZ: 'usimagesd1448c85ulz2o4.cdn5th.com',
+  EU: 'euimagesd2h2yqnfpu4gl5.cdn5th.com',
+  IN: 'inimagesd1jqokb9wptk2t.cdn5th.com',
+  RU: 'euimagesd2h2yqnfpu4gl5.cdn5th.com',
+  WE: 'd2h2yqnfpu4gl5.cdn5th.com',
+  UE: 'usimagesd1448c85ulz2o4.cdn5th.com'
+};
+let regionCode = 'EU';
+export function getRegionCode() {
+  return new Promise((resolve, reject) => {
+    ty.getAppInfo({
+      success: function (res) {
+        resolve(res.regionCode);
+      },
+      fail: function (err) {
+        reject(err);
+      }
+    });
+  });
+}
+ty.getAppInfo({
+  success: function (res) {
+    regionCode = res.regionCode;
+  }
+});
+export default function getCdnUrl(path, cdnMap, region) {
   if (!cdnMap) {
     console.warn('请传入cdnMap');
     return path;
   }
-  let regionCode = 'EU';
-  ty.getAppInfo().then(res => {
-    regionCode = res.regionCode;
-  });
-  const region = {
-    AY: 'images.tuyacn.com',
-    AZ: 'usimagesd1448c85ulz2o4.cdn5th.com',
-    EU: 'euimagesd2h2yqnfpu4gl5.cdn5th.com',
-    IN: 'inimagesd1jqokb9wptk2t.cdn5th.com',
-    RU: 'euimagesd2h2yqnfpu4gl5.cdn5th.com',
-    WE: 'd2h2yqnfpu4gl5.cdn5th.com',
-    UE: 'usimagesd1448c85ulz2o4.cdn5th.com'
-  }[regionCode];
   const cdnShortPath = cdnMap[path];
   if (!cdnShortPath) {
     console.warn('[App] cdn "' + path + '" is not exist.');
     return path;
   }
-  return 'https://' + region + '/' + cdnShortPath;
+  const cdnPath = 'https://' + regionMap[region || regionCode] + '/' + cdnShortPath;
+  return cdnPath;
+}
+export async function getCdnUrlAsync(path, cdnMap, region) {
+  if (!cdnMap) {
+    console.warn('请传入cdnMap');
+    return path;
+  }
+  let _regionCode = 'EU';
+  if (region) {
+    _regionCode = region;
+  } else {
+    try {
+      _regionCode = await getRegionCode();
+    } catch (error) {
+      console.warn('[App] getRegionCode error, use default region EU', error);
+    }
+  }
+  const cdnShortPath = cdnMap[path];
+  if (!cdnShortPath) {
+    console.warn('[App] cdn "' + path + '" is not exist.');
+    return path;
+  }
+  const cdnPath = 'https://' + regionMap[_regionCode] + '/' + cdnShortPath;
+  return cdnPath;
 }

package/lib/getCdnUrl/index.wechat.d.ts

@@ -1 +1,2 @@
 export default function getCdnUrl(path: string): string;
+export declare function getCdnUrlAsync(path: string): Promise<string>;

package/lib/getCdnUrl/index.wechat.js

@@ -1,4 +1,8 @@
 export default function getCdnUrl(path) {
   // 暂未实现获取cdn方法，将直接返回path
   return path;
+}
+export function getCdnUrlAsync(path) {
+  // 暂未实现获取cdn方法，将直接返回path
+  return Promise.resolve(path);
 }

package/lib/index.d.ts

@@ -20,7 +20,7 @@ export { default as showTabBar } from './showTabBar';
 export { default as switchTab } from './switchTab';
 export { default as onNavigationBarBack } from './onNavigationBarBack';
 export { default as setNavigationBarBack } from './setNavigationBarBack';
-export { default as getCdnUrl } from './getCdnUrl';
+export { default as getCdnUrl, getCdnUrlAsync } from './getCdnUrl';
 /**
  * 提供 glboal-api 将 wx / ty 对象暴露出去，供给业务在Ray为显示导出api时进行快速响应开发。
  */

package/lib/index.js

@@ -21,7 +21,7 @@ export { default as showTabBar } from './showTabBar';
 export { default as switchTab } from './switchTab';
 export { default as onNavigationBarBack } from './onNavigationBarBack';
 export { default as setNavigationBarBack } from './setNavigationBarBack';
-export { default as getCdnUrl } from './getCdnUrl';
+export { default as getCdnUrl, getCdnUrlAsync } from './getCdnUrl';
 
 /**
  * 提供 glboal-api 将 wx / ty 对象暴露出去，供给业务在Ray为显示导出api时进行快速响应开发。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/api",
-  "version": "1.4.0-alpha.9",
+  "version": "1.4.0",
   "description": "Ray universal api",
   "keywords": [
     "ray"
@@ -29,16 +29,16 @@
     "watch": "ray start --type=component"
   },
   "dependencies": {
-    "@ray-js/framework": "^1.4.0-alpha.9",
-    "@ray-js/router": "^1.4.0-alpha.9",
-    "@ray-js/wechat": "^0.0.32",
+    "@ray-js/framework": "^1.4.0",
+    "@ray-js/router": "^1.4.0",
+    "@ray-js/wechat": "^0.0.33",
     "base64-browser": "^1.0.1"
   },
   "devDependencies": {
-    "@ray-js/cli": "^1.4.0-alpha.9",
+    "@ray-js/cli": "^1.4.0",
     "art-template": "^4.13.2",
     "fs-extra": "^10.1.0",
-    "miniprogram-api-typings": "^3.11.0",
+    "miniprogram-api-typings": "^3.12.0",
     "react": "^17.0.2"
   },
   "publishConfig": {