@seayoo-web/gamer-api 1.1.5 → 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

@@ -66,8 +66,10 @@ class Yt {
     u(this, "$gamerToken", "");
     u(this, "req");
     u(this, "storage");
-    this.storage = m.wx ? Z : Y, this.req = r({
-      baseURL: O(t) ? t : `https://${j(t)}/v1`,
+    this.storage = m.wx ? Z : Y;
+    const i = O(t) ? t : `https://${j(t)}`;
+    this.req = r({
+      baseURL: `${i}/v1`,
       timeout: 1e4,
       responseRule: {
         ok: { resolve: "body" },
@@ -78,8 +80,8 @@ class Yt {
         }
       },
       // 使用箭头函数绑定执行上下文
-      requestTransformer: (i) => {
-        this.$gamerToken && (i.headers.Authorization = `Bearer ${this.$gamerToken}`);
+      requestTransformer: (c) => {
+        this.$gamerToken && (c.headers.Authorization = `Bearer ${this.$gamerToken}`);
       }
     }), T() ? this.$gamerToken = h("gamer_token") : this.loadGamerTokenCache();
   }
@@ -87,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;
       }
@@ -249,7 +251,7 @@ function re(e) {
 function f(e) {
   return n(e, "role_card") && re(e.role_card);
 }
-function U(e) {
+function $(e) {
   return n(e, "name", "avatar_url", "bio", "gender", "birthday") && n(e.birthday, "year", "month", "day");
 }
 function v(e) {
@@ -483,7 +485,7 @@ class Zt {
    * https://kdocs.cn/l/cgp4gSBMbOf1?linkname=TMWBCFcOr2
    */
   async getUserProfile(t) {
-    const { data: r } = await this.req.get("club/user-profile", U, {
+    const { data: r } = await this.req.get("club/user-profile", $, {
       params: { member_id: t }
     });
     return r;
@@ -495,7 +497,7 @@ class Zt {
    */
   async updateUserProfile(t) {
     await this.token.autoLogin();
-    const { data: r, code: i } = await this.req.post("club/user-profile", t, U);
+    const { data: r, code: i } = await this.req.post("club/user-profile", t, $);
     return r ?? {
       error: i
     };
@@ -618,7 +620,7 @@ class Zt {
     return r || { redemptions: [] };
   }
 }
-var ke = /* @__PURE__ */ ((e) => (e.EventItem = "event_item", e.GameItem = "game_item", e.PhysicalItem = "physical_item", e.WeixinHongbao = "weixin_hongbao", e.GiftCode = "gift_code", e.LotteryTicket = "lottery_ticket", e.VoidItem = "void_item", e))(ke || {}), be = /* @__PURE__ */ ((e) => (e.UserId = "user_id", e.RoleId = "role_id", e))(be || {}), qe = /* @__PURE__ */ ((e) => (e.None = "none", e.Daily = "daily", e.Weekly = "weekly", e.Monthly = "monthly", e))(qe || {}), o = /* @__PURE__ */ ((e) => (e.Preregister = "preregister", e.Lottery = "lottery", e.Survey = "survey", e.Invite = "invite", e.Share = "share", e.Follow = "follow", e.Subscribe = "weixin_subscribe", e.Comment = "comment", e.Vote = "vote", e.GiftCode = "gift_code", e.Register = "register", e.InvitedRegister = "invited_register", e.ClaimRewards = "claim_rewards", e.Cashback = "cashback", e.Quest = "quest", e.Team = "team", e.LotteryDraw = "lottery_draw", e))(o || {}), Re = /* @__PURE__ */ ((e) => (e.Active = "player_active_points", e.Login = "player_login_days", e.OrderAmount = "order_total_amount", e.Posts = "community_posts", e.Comments = "community_comments", e))(Re || {}), xe = /* @__PURE__ */ ((e) => (e.System = "system", e.UserSubmission = "user_submission", e.Shortlisted = "shortlisted", e))(xe || {}), Ae = /* @__PURE__ */ ((e) => (e.Ineligible = "ineligible", e.Unaccalimed = "unaccalimed", e.Received = "received", e))(Ae || {}), Le = /* @__PURE__ */ ((e) => (e.Unaccalimed = "unaccalimed", e.Received = "received", e.Failed = "failed", e.Delivered = "delivered", e))(Le || {}), Ce = /* @__PURE__ */ ((e) => (e.Ineligible = "ineligible", e.Unaccalimed = "unaccalimed", e.Received = "received", e.Failed = "failed", e))(Ce || {}), Ue = /* @__PURE__ */ ((e) => (e.Output = "output", e.Engage = "engage", e))(Ue || {}), $e = /* @__PURE__ */ ((e) => (e.Private = "private", e.Public = "public", e))($e || {}), Pe = /* @__PURE__ */ ((e) => (e.Unknown = "unknown", e.Pending = "pending", e.Drawn = "drawn", e.Claimed = "claimed", e.Fail = "fail", e))(Pe || {}), Se = /* @__PURE__ */ ((e) => (e.Assemble = "assemble", e.Join = "join", e.Disband = "disband", e.ChangeVisibility = "change_visibility", e.Query = "query", e))(Se || {}), De = /* @__PURE__ */ ((e) => (e.Query = "query", e.Draw = "draw", e.Claim = "claim", e))(De || {});
+var ke = /* @__PURE__ */ ((e) => (e.EventItem = "event_item", e.GameItem = "game_item", e.PhysicalItem = "physical_item", e.WeixinHongbao = "weixin_hongbao", e.GiftCode = "gift_code", e.LotteryTicket = "lottery_ticket", e.VoidItem = "void_item", e))(ke || {}), be = /* @__PURE__ */ ((e) => (e.UserId = "user_id", e.RoleId = "role_id", e))(be || {}), qe = /* @__PURE__ */ ((e) => (e.None = "none", e.Daily = "daily", e.Weekly = "weekly", e.Monthly = "monthly", e))(qe || {}), o = /* @__PURE__ */ ((e) => (e.Preregister = "preregister", e.Lottery = "lottery", e.Survey = "survey", e.Invite = "invite", e.Share = "share", e.Follow = "follow", e.Subscribe = "weixin_subscribe", e.Comment = "comment", e.Vote = "vote", e.GiftCode = "gift_code", e.Register = "register", e.InvitedRegister = "invited_register", e.ClaimRewards = "claim_rewards", e.Cashback = "cashback", e.Quest = "quest", e.Team = "team", e.LotteryDraw = "lottery_draw", e))(o || {}), Re = /* @__PURE__ */ ((e) => (e.Active = "player_active_points", e.Login = "player_login_days", e.OrderAmount = "order_total_amount", e.Posts = "community_posts", e.Comments = "community_comments", e))(Re || {}), xe = /* @__PURE__ */ ((e) => (e.System = "system", e.UserSubmission = "user_submission", e.Shortlisted = "shortlisted", e))(xe || {}), Ae = /* @__PURE__ */ ((e) => (e.Ineligible = "ineligible", e.Unaccalimed = "unaccalimed", e.Received = "received", e))(Ae || {}), Le = /* @__PURE__ */ ((e) => (e.Unaccalimed = "unaccalimed", e.Received = "received", e.Failed = "failed", e.Delivered = "delivered", e))(Le || {}), Ce = /* @__PURE__ */ ((e) => (e.Ineligible = "ineligible", e.Unaccalimed = "unaccalimed", e.Received = "received", e.Failed = "failed", e))(Ce || {}), $e = /* @__PURE__ */ ((e) => (e.Output = "output", e.Engage = "engage", e))($e || {}), Ue = /* @__PURE__ */ ((e) => (e.Private = "private", e.Public = "public", e))(Ue || {}), Pe = /* @__PURE__ */ ((e) => (e.Unknown = "unknown", e.Pending = "pending", e.Drawn = "drawn", e.Claimed = "claimed", e.Fail = "fail", e))(Pe || {}), Se = /* @__PURE__ */ ((e) => (e.Assemble = "assemble", e.Join = "join", e.Disband = "disband", e.ChangeVisibility = "change_visibility", e.Query = "query", e))(Se || {}), De = /* @__PURE__ */ ((e) => (e.Query = "query", e.Draw = "draw", e.Claim = "claim", e))(De || {});
 function Ee(e) {
   return n(e, "event_name", "rules", "since", "until", "features") && Array.isArray(e.features) && e.features.every(Ge);
 }
@@ -1167,16 +1169,16 @@ function q(e) {
     "create_time"
   ) && a(e.topics, b) && F(e.forum);
 }
-function $(e) {
+function U(e) {
   return n(e, "next_token", "posts") && a(e.posts, q);
 }
-function Ut(e) {
+function $t(e) {
   return n(e, "post") && q(e.post);
 }
 function R(e) {
   return n(e);
 }
-function $t(e) {
+function Ut(e) {
   return n(e) && ("post" in e ? q(e.post) : !0) && ("antispam" in e ? R(e.antispam) : !0);
 }
 function g(e) {
@@ -1295,7 +1297,7 @@ class er {
    * https://kdocs.cn/l/cbggfJodHLIz?linkname=XKI9lDVrPq
    */
   async getPosts(t) {
-    const { data: r, code: i } = await this.req.get("community/posts", $, {
+    const { data: r, code: i } = await this.req.get("community/posts", U, {
       params: s(t)
     });
     return r ?? { error: i };
@@ -1306,7 +1308,7 @@ class er {
    * https://kdocs.cn/l/cbggfJodHLIz?linkname=yXubbZuDlC
    */
   async getPinnedPosts(t, r, i) {
-    const { data: c, code: d } = await this.req.get("community/pinned-posts", $, {
+    const { data: c, code: d } = await this.req.get("community/pinned-posts", U, {
       params: s({ forum_id: t, max_results: r, next_token: i })
     });
     return c ?? { error: d };
@@ -1317,7 +1319,7 @@ class er {
    * https://kdocs.cn/l/cbggfJodHLIz?linkname=hj1AZy5rcP
    */
   async getPost(t) {
-    const { data: r, code: i } = await this.req.get("community/post", Ut, {
+    const { data: r, code: i } = await this.req.get("community/post", $t, {
       params: { post_id: t }
     });
     return (r == null ? void 0 : r.post) ?? { error: i };
@@ -1328,7 +1330,7 @@ class er {
    * https://kdocs.cn/l/cbggfJodHLIz?linkname=M5okHBuaVk
    */
   async post(t) {
-    const { data: r, code: i } = await this.req.post("community/post", s(t), $t);
+    const { data: r, code: i } = await this.req.post("community/post", s(t), Ut);
     return r ?? {
       error: i
     };
@@ -1625,11 +1627,11 @@ export {
   zt as NotificationType,
   Ht as PostStatus,
   Re as QuestObjective,
-  Ue as RewardSoure,
+  $e as RewardSoure,
   Ae as RewardStatusPrefix,
   Le as RewardStatusSuffix,
   Se as TeamAction,
-  $e as TeamVisibility,
+  Ue as TeamVisibility,
   xe as VoteOptionSource,
   tr as WeixinApi,
   Jt as WeixinWebLoginErrorCode

package/package.json

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