@seayoo-web/gamer-api 1.1.6 → 1.1.7

package/README.md

@@ -5,30 +5,58 @@
 ```js
 import { NetRequest } from "@seayoo-web/request";
 import { AuthToken, EventApi, ClubApi, CommunityApi } from "@seayoo-web/gamer-api";
+import { captureException } from "@sentry/vue";
 
-const authToken = new AuthToken("https://gamer-api.seayoo.com", NetRequest);
+const authToken = new AuthToken(SY_GAMER_API, NetRequest);
 const eventApi = new EventApi(authToken, eventId);
 const clubApi = new ClubApi(authToken);
 const communityApi = new CommunityApi(authToken);
 
-// 设置 idToken 后即可认为登录（会在内部自动进行 gamerToken 的置换操作）
-// idToken 通过通行证登录组件获取
-export function login(idToken: string) {
-	authToken.idToken = idToken;
+// 调整请求配置
+authToken.req.setConfig({
+  messageHandler(_, message) {
+    toast(message);
+  },
+  errorHandler({ status, rawError, sentryError, sentryTags, sentryExtra }) {
+    if (status === 401) {
+      logout();
+      // 继续其他处理:提示或直接登录
+      //
+      return;
+    }
+    // 意外错误进行上报
+    if (rawError) {
+      captureException(sentryError, {
+        extra: sentryExtra,
+        tags: sentryTags,
+      });
+    }
+  },
+});
+
+// 触发登录
+export async function login() {
+  // idToken 通过通行证登录组件获取
+  const idToken = await accountLogin();
+  if (idToken) {
+    authToken.idToken = idToken;
     // 可选自动登录调用，后续每个 api 都会自动检查并 autoLogin
-	authToken.autoLogin();
+    authToken.autoLogin();
+  }
 }
 
-// 检测是否登录，登录后获取用户数据
+// 获取用户数据
 export async function getUserInfo() {
-    return authToken.isLogined ? await authToken.getSession() : null
+  return authToken.isLogined ? await authToken.getSession() : null;
 }
 
-// 如果在 ComboWebView 中，url query 会直接提供 gamer_token
-// authToken 会自动从 url query 中读取并更新 gamer_token
+// 退出登录(同步操作)
+export function logout() {
+  authToken.logout();
+}
 
 // 导出供其他功能使用
-export { eventApi, clubApi, communityApi, weixinApi };
+export { eventApi, clubApi, communityApi };
 ```
 
 ## 小程序初始化
@@ -37,30 +65,41 @@ export { eventApi, clubApi, communityApi, weixinApi };
 import { NetRequest } from "@seayoo-web/request/wx";
 import { AuthToken, EventApi, ClubApi, WeixinApi } from "@seayoo-web/gamer-api";
 
-const authToken = new AuthToken("https://gamer-api.seayoo.com", NetRequest);
+const authToken = new AuthToken(SY_GAMER_API, NetRequest);
 const eventApi = new EventApi(authToken, eventId);
 const clubApi = new ClubApi(authToken);
 const communityApi = new CommunityApi(authToken);
 const weixinApi = new WeixinApi(authToken, appId);
 
-// 获取 weixinToken / unionid / openid
-export async function weixinLogin() {
-    const result = await weixinApi.login()
-    if("error" in result) {
-       /* handle error */
-       return null
+// 登录
+export function login() {
+    // idToken 通过通行证登录组件获取
+    const idToken = await accountLogin();
+    if(!idToken) {
+        return
     }
-    return result; // { weixin_token, openid, unionid }
-}
-
-// idToken 通过通行证登录组件获取，weixinToken 通过上述方法获取
-export function login(idToken: string, weixinToken: string) {
+    // 获取 weixinToken，成功时返回 { weixin_token, openid, unionid }
+    const result = await weixinApi.login();
+    if(!("weixin_token" in result)) {
+        return
+    }
+    // 设置
 	authToken.idToken = idToken
-    authToken.weixinToken = weixinToken;
+    authToken.weixinToken = result.weixin_token;
     // 可选自动登录调用，后续每个 api 都会自动检查并 autoLogin
     authToken.autoLogin();
 }
 
+// 获取用户数据
+export async function getUserInfo() {
+  return authToken.isLogined ? await authToken.getSession() : null;
+}
+
+// 退出登录(同步操作)
+export function logout() {
+  authToken.logout();
+}
+
 // 导出供其他功能使用
 export { eventApi, clubApi, communityApi, weixinApi };
 ```

package/dist/index.js

@@ -89,7 +89,7 @@ class Yt {
     const r = this.storage.get(_).match(/^(\d{12,})#(.{8,})$/);
     if (r) {
       const i = parseInt(r[1]), c = r[2];
-      if (i > Date.now() - 2 * 24 * 3600 * 1e3) {
+      if (i > Date.now() - (24 * 3600 - 10) * 1e3) {
         this.$gamerToken = c;
         return;
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@seayoo-web/gamer-api",
   "description": "agent for gamer api",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "type": "module",
   "source": "index.ts",
   "main": "./dist/index.js",
@@ -24,9 +24,9 @@
     "@types/node": "^22.13.1",
     "@seayoo-web/combo-webview": "^2.5.0",
     "@seayoo-web/tsconfig": "^1.0.3",
+    "@seayoo-web/request": "^2.1.2",
     "@seayoo-web/scripts": "^1.3.9",
-    "@seayoo-web/utils": "^3.0.10",
-    "@seayoo-web/request": "^2.1.2"
+    "@seayoo-web/utils": "^3.0.10"
   },
   "peerDependencies": {
     "@seayoo-web/combo-webview": "^2.5.0",