@tencentcloud/trtc-cloud-wx 0.0.20-beta.5 → 0.0.21

package/package.json

@@ -1,56 +1,15 @@
 {
   "name": "@tencentcloud/trtc-cloud-wx",
-  "version": "0.0.20-beta.5",
+  "version": "0.0.21",
   "description": "",
-  "main": "dist/trtc-cloud-wx.js",
-  "module": "dist/trtc-cloud-wx.js",
+  "main": "./trtc-cloud-wx.js",
   "type": "module",
-  "scripts": {
-    "build": "npm run clear && rollup -c && node ./build/copy_to_roomkit.js",
-    "dev": "node ./build/chokidar.js",
-    "clear": "node ./build/clear.js",
-    "copy": "node ./build/copy.js",
-    "doc": "npx typedoc --tsconfig typedoc.json",
-    "doc:watch": "typedoc --watch",
-    "doc:build": "jsdoc -c jsdoc.json",
-    "publish": "bash ./sdk_publish.bash"
-  },
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "devDependencies": {
-    "@babel/core": "^7.21.4",
-    "@babel/preset-env": "^7.21.4",
-    "@babel/preset-typescript": "^7.21.4",
-    "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-terser": "^0.4.3",
-    "@rollup/plugin-typescript": "^11.0.0",
-    "@types/node": "^18.15.11",
-    "@typescript-eslint/eslint-plugin": "^2.28.0",
-    "@typescript-eslint/parser": "^2.28.0",
-    "babel-loader": "^9.1.2",
-    "better-docs": "^2.7.2",
-    "chokidar": "^3.5.3",
-    "docdash-blue": "^1.1.9",
-    "eslint": "^5.14.1",
-    "eslint-config-airbnb-base": "13.1.0",
-    "eslint-loader": "^2.1.2",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-node": "^7.0.1",
-    "eslint-plugin-promise": "^3.8.0",
-    "jsdoc": "^4.0.2",
-    "rollup": "^3.27.1",
-    "rollup-plugin-uglify": "^6.0.4",
-    "taffydb": "^2.7.3",
-    "tslib": "^2.5.0",
-    "typedoc": "^0.24.4",
-    "typedoc-theme-hierarchy": "^3.1.0",
-    "typescript": "^5.0.2"
-  },
   "dependencies": {
     "aegis-mp-sdk": "^1.37.7",
     "eventemitter3": "^5.0.0",
-    "trtc-wx-sdk": "^1.1.5-beta.1"
+    "trtc-wx-sdk": "1.1.6-beta.2"
   }
 }

package/{dist/trtc-cloud-wx.js → trtc-cloud-wx.js}

@@ -1393,7 +1393,7 @@ var Logger = /*#__PURE__*/function () {
 var logger = new Logger();
 
 var name = "@tencentcloud/trtc-cloud-wx";
-var version = "0.0.20-beta.5";
+var version = "0.0.22";
 var description = "";
 var main = "dist/trtc-cloud-wx.js";
 var module$1 = "dist/trtc-cloud-wx.js";
@@ -2811,17 +2811,10 @@ var TRTCCloud = /*#__PURE__*/function () {
       return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee28() {
         var _this15 = this,
           _handleMap;
-        var timeoutDuration, timeoutPromise, params, streamId, handleMap, originalPromise;
+        var params, streamId, handleMap, timeoutDuration, retriesNumber;
         return _regeneratorRuntime().wrap(function _callee28$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              // 定义一个超时时间（以毫秒为单位）
-              timeoutDuration = 2000;
-              timeoutPromise = new Promise(function (resolve, reject) {
-                setTimeout(function () {
-                  reject(new Error('setAttributes timed out'));
-                }, timeoutDuration);
-              });
               params = options.params, streamId = options.streamId;
               handleMap = (_handleMap = {}, _defineProperty(_handleMap, Handletype.setPlayer, function () {
                 return __awaiter(_this15, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
@@ -2870,14 +2863,68 @@ var TRTCCloud = /*#__PURE__*/function () {
                     }
                   }, _callee27, this);
                 }));
-              }), _handleMap);
-              originalPromise = handleMap[handleType] ? handleMap[handleType]() : Promise.reject(new Error('setAttributes fail'));
-              return _context28.abrupt("return", Promise.race([originalPromise, timeoutPromise]));
-            case 6:
+              }), _handleMap); // 定义一个超时时间（以毫秒为单位）
+              timeoutDuration = 2000; // 定义超时重试次数
+              retriesNumber = 3;
+              return _context28.abrupt("return", this.retryWithTimeout(function () {
+                return handleMap[handleType] ? handleMap[handleType]() : Promise.reject(Object.assign(new Error('setAttributes fail'), {
+                  errorCode: -1
+                }));
+              }, timeoutDuration, retriesNumber));
+            case 5:
             case "end":
               return _context28.stop();
           }
-        }, _callee28);
+        }, _callee28, this);
+      }));
+    }
+  }, {
+    key: "retryWithTimeout",
+    value: function retryWithTimeout(fn, timeout, retries) {
+      return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
+        var lastError, i, result;
+        return _regeneratorRuntime().wrap(function _callee29$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
+            case 0:
+              lastError = null;
+              i = 0;
+            case 2:
+              if (!(i < retries)) {
+                _context29.next = 19;
+                break;
+              }
+              _context29.prev = 3;
+              logger.info("setAttributes ".concat(i + 1, "st retry"));
+              _context29.next = 7;
+              return Promise.race([fn(), new Promise(function (resolve, reject) {
+                return setTimeout(function () {
+                  return reject(new Error('setAttributes timed out'));
+                }, timeout);
+              })]);
+            case 7:
+              result = _context29.sent;
+              return _context29.abrupt("return", result);
+            case 11:
+              _context29.prev = 11;
+              _context29.t0 = _context29["catch"](3);
+              if (!((_context29.t0 === null || _context29.t0 === void 0 ? void 0 : _context29.t0.errorCode) === -1)) {
+                _context29.next = 15;
+                break;
+              }
+              return _context29.abrupt("return", _context29.t0);
+            case 15:
+              lastError = _context29.t0;
+            case 16:
+              i++;
+              _context29.next = 2;
+              break;
+            case 19:
+              throw lastError;
+            case 20:
+            case "end":
+              return _context29.stop();
+          }
+        }, _callee29, null, [[3, 11]]);
       }));
     }
   }], [{

package/.babelrc

@@ -1,6 +0,0 @@
-{
-  "presets": [
-    "@babel/preset-env",
-    "@babel/preset-typescript"
-  ]
-}

package/.eslintrc.json

@@ -1,129 +0,0 @@
-{
-  "extends": [
-    "airbnb-base",
-    "plugin:promise/recommended",
-    "plugin:import/typescript",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "plugins": [
-    "@typescript-eslint",
-    "import",
-    "node",
-    "promise"
-  ],
-  "parserOptions": {
-    "ecmaVersion": 9,
-    "ecmaFeatures": {
-      "jsx": false
-    },
-    "sourceType": "module"
-  },
-  "env": {
-    "es6": true,
-    "node": true,
-    "jest": true
-  },
-  "settings": {
-    "import/resolver": {
-      "node": {
-        "extensions": [
-          ".js",
-          ".jsx",
-          ".ts",
-          ".tsx"
-        ]
-      }
-    }
-  },
-  "rules": {
-    // "@typescript-eslint/explicit-function-return-type": "off",
-    "explicit-module-boundary-types": "off",
-    "max-len": ["error", {"code": 120}],
-    "import/extensions": 0,
-    "no-unused-expressions": [
-      "error",
-      {
-        "allowTernary": true
-      }
-    ],
-    "no-empty-function": "off",
-    "@typescript-eslint/no-empty-function": "off",
-    "class-methods-use-this": "off",
-    "arrow-parens": "off",
-    "comma-dangle": [
-      "error",
-      "only-multiline"
-    ],
-    "complexity": [
-      "error",
-      20
-    ],
-    "func-names": "off",
-    "global-require": "off",
-    "handle-callback-err": [
-      "error",
-      "^(err|error)$"
-    ],
-    "import/no-unresolved": [
-      "error",
-      {
-        "caseSensitive": true,
-        "commonjs": true,
-        "ignore": [
-          "^[^.]"
-        ]
-      }
-    ],
-    "import/prefer-default-export": "off",
-    "linebreak-style": "off",
-    "no-catch-shadow": "error",
-    "no-continue": "off",
-    "no-div-regex": "warn",
-    "no-else-return": "off",
-    "no-param-reassign": "off",
-    "no-plusplus": "off",
-    "no-shadow": "off",
-    "no-multi-assign": "off",
-    "no-underscore-dangle": "off",
-    "node/no-deprecated-api": "error",
-    "node/process-exit-as-throw": "error",
-    "object-curly-spacing": [
-      "error",
-      "never"
-    ],
-    "operator-linebreak": [
-      "error",
-      "after",
-      {
-        "overrides": {
-          ":": "before",
-          "?": "before"
-        }
-      }
-    ],
-    "prefer-arrow-callback": "off",
-    "prefer-destructuring": "off",
-    "prefer-template": "off",
-    "quote-props": [
-      1,
-      "as-needed",
-      {
-        "unnecessary": true
-      }
-    ],
-    "semi": [
-      "error",
-      "never"
-    ],
-    "no-await-in-loop": "off",
-    "no-restricted-syntax": "off",
-    "promise/always-return": "off"
-  },
-  "globals": {
-    "window": true,
-    "document": true,
-    "App": true,
-    "wx": true
-  }
-}

package/build/chokidar.js

@@ -1,19 +0,0 @@
-import path from 'path'
-import chokidar from 'chokidar'
-import {exec} from 'child_process'
-
-const __dirname = new URL('.', import.meta.url).pathname
-
-
-const srcDir = path.resolve(__dirname, '../src')
-
-chokidar.watch(srcDir).on('all', async (event, filePath) => {
-  console.log(`${event}: ${filePath}`)
-  if (event === 'change' || event === 'add') {
-    exec('npm run build', (err, stdout, stderr) => {
-      if (err) console.error(err)
-      console.log(stdout)
-      console.error(stderr)
-    })
-  }
-})

package/build/clear.js

@@ -1,24 +0,0 @@
-import fs from 'fs'
-import path from 'path'
-
-// 获取 dist 目录的绝对路径
-const distPath = path.resolve(new URL('.', import.meta.url).pathname, '../dist')
-// 定义一个函数，用于删除指定目录下的所有文件和文件夹
-function deleteFolderRecursive(folderPath) {
-  if (fs.existsSync(folderPath)) {
-    fs.readdirSync(folderPath).forEach(file => {
-      const curPath = path.join(folderPath, file)
-      if (fs.lstatSync(curPath).isDirectory()) {
-        deleteFolderRecursive(curPath)
-      } else if (!curPath.includes('package.json')) {
-        fs.unlinkSync(curPath)
-      }
-    })
-    // fs.rmdirSync(folderPath);
-  }
-}
-
-// 调用函数，删除 dist 目录下的所有文件和文件夹
-deleteFolderRecursive(distPath)
-
-console.log('清理完成！')

package/build/copy.js

@@ -1,24 +0,0 @@
-import fs from 'fs'
-import path from 'path'
-
-const __dirname = new URL('.', import.meta.url).pathname
-
-const distPath = path.resolve(__dirname, '../dist')
-const targetPathList = [
-  // path.resolve(__dirname, "../trtc-custom-component/src"),
-  path.resolve(__dirname, '../../trtc-component-wx/miniprogram_dev/node_modules/@tencentcloud/trtc-cloud-wx'),
-]
-
-fs.readdir(distPath, (err, files) => {
-  if (err) throw err
-  files.forEach((file) => {
-    targetPathList.forEach((targetPath) => {
-      const srcPath = path.join(distPath, file)
-      const destPath = path.join(targetPath, file)
-      fs.copyFile(srcPath, destPath, (err) => {
-        if (err) throw err
-        console.log(`${file} has been copied to ${targetPath}`)
-      })
-    })
-  })
-})

package/build/copy_to_roomkit.js

@@ -1,19 +0,0 @@
-import fs from 'fs'
-import path from 'path'
-
-const sourceDir = '/Users/connor/Desktop/work/TRTCCloud-wx/trtc-cloud-wx/dist'
-const targetDir = '/Users/connor/Desktop/TUIRoomEngine/samples/tui-room-uniapp/dist/build/mp-weixin/node_modules/@tencentcloud/trtc-cloud-wx'
-
-fs.readdir(sourceDir, (err, files) => {
-  if (err) throw err
-
-  files.forEach((file) => {
-    const sourceFile = path.join(sourceDir, file)
-    const targetFile = path.join(targetDir, file)
-
-    fs.copyFile(sourceFile, targetFile, (err) => {
-      if (err) throw err
-      console.log(`${sourceFile} was copied to ${targetFile}`)
-    })
-  })
-})

package/dist/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "@tencentcloud/trtc-cloud-wx",
-  "version": "0.0.20-beta.5",
-  "description": "",
-  "main": "./trtc-cloud-wx.js",
-  "type": "module",
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "aegis-mp-sdk": "^1.37.7",
-    "eventemitter3": "^5.0.0",
-    "trtc-wx-sdk": "1.1.6-beta.2"
-  }
-}