@trtc/calls-uikit-vue2 4.4.7 → 4.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trtc/calls-uikit-vue2",
-  "version": "4.4.7",
+  "version": "4.4.8",
   "main": "./tuicall-uikit-vue2.umd.js",
   "module": "./tuicall-uikit-vue2.es.js",
   "types": "./types/index.d.ts",
@@ -15,8 +15,7 @@
   "dependencies": {
     "@tencentcloud/tui-core-lite": "1.0.0",
     "@trtc/call-engine-lite-js": "~3.5.8",
-    "@tencentcloud/lite-chat": "^1.6.3",
-    "@trtc/call-engine-lite-wx": "~3.4.8"
+    "@tencentcloud/lite-chat": "^1.6.3"
 },
   "bugs": {
     "url": "https://github.com/tencentyun/TUICallKit/issues"

package/src/TUICallService/CallService/index.ts

@@ -27,7 +27,7 @@ const TUIGlobal: ITUIGlobal = TuiGlobal.getInstance();
 const TUIStore: ITUIStore = TuiStore.getInstance();
 const uiDesign = UIDesign.getInstance();
 uiDesign.setTUIStore(TUIStore);
-const version = '4.4.7';
+const version = '4.4.8';
 import AIAssistant from './AIAssistant'; // 仅 web 支持 AI 实时字幕
 const frameWork = 'vue2.7';
 export { TUIGlobal, TUIStore, uiDesign };
@@ -83,7 +83,7 @@ export default class TUICallService {
     await this._wasmReadyPromise;
     
     if (!this._isInitialized) {
-      this._doInit(params);
+      await this._doInit(params);
       this._isInitialized = true;
     }
   }

package/src/TUICallService/utils/validate/validateConfig.ts

@@ -0,0 +1,203 @@
+import { NAME, MAX_NUMBER_ROOM_ID, VideoResolution, VideoDisplayMode } from "../../const/index";
+
+export const VALIDATE_PARAMS = {
+  init: {
+    SDKAppID: {
+      required: true,
+      rules: [NAME.NUMBER],
+      allowEmpty: false,
+    },
+    userID: {
+      required: true,
+      rules: [NAME.STRING],
+      allowEmpty: false,
+    },
+    userSig: {
+      required: true,
+      rules: [NAME.STRING],
+      allowEmpty: false,
+    },
+    tim: {
+      required: false,
+      rules: [NAME.OBJECT],
+    },
+  },
+  call: {
+    userID: {
+      required: true,
+      rules: [NAME.STRING],
+      allowEmpty: false
+    },
+    type: {
+      required: true,
+      rules: [NAME.NUMBER],
+      range: [1, 2],
+      allowEmpty: false
+    },
+    roomID: {
+      required: false,
+      rules: [NAME.NUMBER], // 仅支持数字房间号, 后续会支持字符串房间号
+      range: `0~${MAX_NUMBER_ROOM_ID}`,
+      allowEmpty: false,
+    },
+    strRoomID: {
+      required: false,
+      rules: [NAME.STRING],
+      allowEmpty: true,
+    },
+    userData: {
+      required: false,
+      rules: [NAME.STRING],
+      allowEmpty: false,
+    },
+    timeout: {
+      required: false,
+      rules: [NAME.NUMBER],
+      allowEmpty: false
+    }
+  },
+  groupCall: {
+    userIDList: {
+      required: true,
+      rules: [NAME.ARRAY],
+      allowEmpty: false
+    },
+    type: {
+      required: true,
+      rules: [NAME.NUMBER],
+      range: [1, 2],
+      allowEmpty: false
+    },
+    groupID: {
+      required: true,
+      rules: [NAME.STRING],
+      allowEmpty: false
+    },
+    roomID: {
+      required: false,
+      rules: [NAME.NUMBER], // 仅支持数字房间号, 后续会支持字符串房间号
+      range: `0~${MAX_NUMBER_ROOM_ID}`,
+      allowEmpty: false
+    },
+    strRoomID: {
+      required: false,
+      rules: [NAME.STRING],
+      allowEmpty: true,
+    },
+    timeout: {
+      required: false,
+      rules: [NAME.NUMBER],
+      allowEmpty: false
+    },
+    userData: {
+      required: false,
+      rules: [NAME.STRING],
+      allowEmpty: false,
+    },
+    offlinePushInfo: {
+      required: false,
+      rules: [NAME.OBJECT],
+      allowEmpty: false,
+    },
+  },
+  joinInGroupCall: {
+    type: {
+      required: true,
+      rules: [NAME.NUMBER],
+      range: [1, 2],
+      allowEmpty: false
+    },
+    groupID: {
+      required: true,
+      rules: [NAME.STRING],
+      allowEmpty: false
+    },
+    roomID: {
+      required: true,
+      rules: [NAME.NUMBER],
+      allowEmpty: false,
+    },
+    strRoomID: {
+      required: false,
+      rules: [NAME.STRING],
+      allowEmpty: true,
+    },
+  },
+  inviteUser: {
+    userIDList: {
+      required: true,
+      rules: [NAME.ARRAY],
+      allowEmpty: false
+    },
+  },
+  setSelfInfo: {
+    nickName: {
+      required: false,
+      rules: [NAME.STRING],
+      allowEmpty: false,
+    },
+    avatar: {
+      required: false,
+      rules: [NAME.STRING],
+      allowEmpty: false,
+    }
+  },
+  enableFloatWindow: [
+    {
+      key: "enable",
+      required: false,
+      rules: [NAME.BOOLEAN],
+      allowEmpty: false,
+    }
+  ],
+  enableAIVoice: [
+    {
+      key: "enable",
+      required: true,
+      rules: [NAME.BOOLEAN],
+      allowEmpty: false,
+    }
+  ],
+  enableMuteMode: [
+    {
+      key: "enable",
+      required: true,
+      rules: [NAME.BOOLEAN],
+      allowEmpty: false,
+    }
+  ],
+  setCallingBell: [
+    {
+      key: "filePath",
+      required: false,
+      rules: [NAME.STRING],
+      allowEmpty: true,
+    }
+  ],
+  setLanguage: [
+    {
+      key: "language",
+      required: true,
+      rules: [NAME.STRING],
+      allowEmpty: false
+    }
+  ],
+  setVideoDisplayMode: [
+    {
+      key: "displayMode",
+      required: true,
+      rules: [NAME.STRING],
+      range: [VideoDisplayMode.CONTAIN, VideoDisplayMode.COVER, VideoDisplayMode.FILL],
+      allowEmpty: false
+    }
+  ],
+  setVideoResolution: [
+    {
+      key: "resolution",
+      required: true,
+      rules: [NAME.STRING],
+      range: [VideoResolution.RESOLUTION_1080P, VideoResolution.RESOLUTION_480P, VideoResolution.RESOLUTION_720P],
+      allowEmpty: false
+    }
+  ]
+};

package/src/TUICallService/utils/validate/validateParams.ts

@@ -0,0 +1,88 @@
+import { getType, isArray, isString, isUndefined, isNumber, modifyObjectKey } from "../common-utils";
+import { NAME } from "../../const/index";
+const PREFIX = NAME.PREFIX + "API";
+
+export function paramValidate (config: any) {
+  return function (target, propertyName: string, descriptor: PropertyDescriptor) {
+    let method = descriptor.value;
+	  descriptor.value = function (...args) {
+      doValidate.call(this, config, args, propertyName);
+      return method.apply(this, args);
+	  };
+    return descriptor;
+  };
+}
+function doValidate(config, args, name) {
+  try {
+    // 兼容 init 方法中： SDKAppID sdkAppID 两种写法的参数校验判断
+    if (!args[0].SDKAppID) {
+      config = modifyObjectKey(config, "SDKAppID", "sdkAppID");
+    }
+    if (isArray(config)) {
+      for (let i = 0; i < config.length; i++) {
+        check.call(this, {
+          ...config[i],
+          value: args[i],
+          name,
+        });
+      }
+    } else {
+      for (const key in config) {
+        if (config.hasOwnProperty(key)) { 
+          check.call(this, {
+            ...config[key],
+            value: args[0][key],
+            name,
+            key,
+          });
+        }
+      }
+    }
+  } catch (error) {
+    console.error(error);
+    throw error;
+  }
+}
+function check({ required, rules, range, value, allowEmpty, name, key }) {
+  // 用户没传指定参数
+  if (isUndefined(value)) {
+    // 检查必填参数, 若配置是必填则报错
+    if (required) {
+      throw new Error(`${PREFIX}<${name}>: ${key} is required.`);
+    } else {
+      return;
+    }
+  }
+  // 判断参数类型是否正确
+  const result = rules.some((item)=>item === getType(value));
+  let type  = '';
+  if (!result) {
+    for (let i = 0; i < rules.length; i++) {
+      let str = rules[i];
+      str = str.replace(str[0], str[0].toUpperCase());
+      type += `${str}/`;
+    }
+    type = type.substring(0, type.length - 1);
+    throw new Error(`${PREFIX}<${name}>: ${key} must be ${type}, current ${key} is ${typeof value}.`);
+  }
+  // 不允许传空值, 例如: '', '  '
+  if (allowEmpty === false) {
+    const isEmptyString = isString(value) && value.trim() === '';
+    if (isEmptyString) {
+      throw new Error(`${PREFIX}<${name}>: ${key} is blank.`);
+    }
+  }
+  // 判断是否符合限制条件
+  if (isArray(range)) {
+    if (range && range.indexOf(value) === -1) {
+      throw new Error(`${PREFIX}<${name}>: ${key} error, only be ${range}, current ${key} is ${value}.`);
+    }
+  }
+  // 取值范围, 前闭后闭
+  if (isString(range) && range.indexOf('~') !== -1) {
+    const valueList = range.split('~');
+    if (value < +valueList[0] || value > +valueList[1] || (isNumber(value) && Number.isNaN(value))) {
+      throw new Error(`${PREFIX}<${name}>: ${key} error, only be ${range}, current ${key} is ${value}.`);
+    }
+  }
+}

package/src/TUICallService/utils/validate/validateStatus.ts

@@ -0,0 +1,26 @@
+import { NAME } from "../../const/index";
+import { t } from '../../locales/index';
+
+interface IStatusValidateParams {
+  engineInstance?: boolean;
+}
+
+export function statusValidate (config: IStatusValidateParams) {
+	return function (target, propertyName: string, descriptor: PropertyDescriptor) {
+    let method = descriptor.value;
+    descriptor.value = function (...args: Array<any>) {
+      doValidate.call(this, config, args, propertyName);
+      return method.apply(this, args);
+		};
+    return descriptor;
+  };
+}
+
+function doValidate(config) {
+  if (config?.engineInstance && !this._tuiCallEngine) {
+    const error = `${NAME.PREFIX} ${t('TUICallKit init is not complete')}`;
+    console.error(error);
+    throw error;
+  }
+}
+

package/src/index.ts

@@ -37,7 +37,7 @@ const TUICallType = {
   AUDIO_CALL: 1,
   VIDEO_CALL: 2,
 };
-const Version = '4.4.7'; // basic-demo 原来上报使用
+const Version = '4.4.8'; // basic-demo 原来上报使用
 
 // 输出产物
 export {