@zhin.js/plugin-calendar 0.1.5 → 0.1.7

package/src/token-manager.ts

@@ -1,3 +1,4 @@
+import { CalendarError } from './errors.js';
 /**
  * In-memory OAuth access-token cache with proactive refresh, single-flight,
  * refresh-token rotation handling, and clear invalid_grant errors.
@@ -30,8 +31,8 @@ export type AuthorizationLostListener = (
 ) => void | Promise<void>;
 
 /** Chat command that (re-)authorizes a provider; shown in user-facing errors. */
-export function authCommandFor(provider: OAuthProviderKind): string {
-  return `calendar auth ${provider}`;
+export function authCommandFor(provider: OAuthProviderKind, commandHead?: string): string | undefined {
+  return commandHead ? `${commandHead} ${provider}` : undefined;
 }
 
 export interface TokenManagerOptions {
@@ -60,10 +61,13 @@ export interface TokenManagerOptions {
 
 export class OAuthTokenError extends Error {
   readonly code: string;
-  constructor(code: string, message: string) {
+  readonly presentation?: CalendarError;
+
+  constructor(code: string, message: string, presentation?: CalendarError) {
     super(message);
     this.name = "OAuthTokenError";
     this.code = code;
+    this.presentation = presentation;
   }
 }
 
@@ -97,11 +101,12 @@ export class OAuthTokenManager {
     if (!options.clientId.trim()) {
       throw new OAuthTokenError(
         "config",
-        `${options.provider}: 缺少 client_id`
+        `${options.provider}: 缺少 client_id`,
+        new CalendarError('clientMissing', { provider: options.provider, field: 'client_id' })
       );
     }
     if (options.provider === "google" && !options.clientSecret?.trim()) {
-      throw new OAuthTokenError("config", "google: 缺少 client_secret");
+      throw new OAuthTokenError("config", "google: 缺少 client_secret", new CalendarError('clientMissing', { provider: 'google', field: 'client_secret' }));
     }
     this.#provider = options.provider;
     this.#clientId = options.clientId.trim();
@@ -230,9 +235,7 @@ export class OAuthTokenManager {
         "not_authorized",
         `${
           this.#provider
-        }: 日历尚未授权。请 master 在聊天中发送「${authCommandFor(
-          this.#provider
-        )}」完成授权。`
+        }: 日历尚未授权。请 master 通过日历授权入口完成授权。`
       );
     }
     const body = new URLSearchParams({
@@ -269,9 +272,7 @@ export class OAuthTokenManager {
       if (errCode === "invalid_grant" || /invalid_grant/i.test(errDesc)) {
         const message = `${
           this.#provider
-        }: 日历授权已失效或被撤销（invalid_grant）。请 master 在聊天中发送「${authCommandFor(
-          this.#provider
-        )}」重新授权。详情：${errDesc}`;
+        }: 日历授权已失效或被撤销（invalid_grant）。请 master 通过日历授权入口重新授权。详情：${errDesc}`;
         this.#authorizationLostMessage = message;
         await this.#notifyAuthorizationLost(message);
         throw new OAuthTokenError("invalid_grant", message);
@@ -280,7 +281,8 @@ export class OAuthTokenManager {
         errCode || "http_error",
         `${this.#provider}: token 刷新失败 HTTP ${response.status}：${
           errDesc || response.statusText
-        }`
+        }`,
+        new CalendarError('refreshHttp', { provider: this.#provider, status: response.status, detail: errDesc || response.statusText })
       );
     }
 
@@ -288,7 +290,8 @@ export class OAuthTokenManager {
     if (!accessToken) {
       throw new OAuthTokenError(
         "response",
-        `${this.#provider}: 刷新响应缺少 access_token`
+        `${this.#provider}: 刷新响应缺少 access_token`,
+        new CalendarError('refreshAccessMissing', { provider: this.#provider })
       );
     }
     const expiresIn = Number(data.expires_in ?? 3600);

package/src/tool-errors.ts

@@ -1,3 +1,6 @@
+import { CalendarError } from './errors.js';
+import type { Locale } from 'zhin.js/i18n';
+import { messages as t } from './i18n.js';
 import { OAuthTokenError } from "./token-manager.js";
 
 /**
@@ -5,13 +8,16 @@ import { OAuthTokenError } from "./token-manager.js";
  * readable reply (e.g. "请 master 发送 calendar auth google") instead of a crash.
  */
 export async function runCalendarTool(
-  operation: () => Promise<string>
+  operation: () => Promise<string>,
+  locale?: Locale
 ): Promise<string> {
   try {
     return await operation();
   } catch (error) {
+    if (error instanceof CalendarError) throw new CalendarError(error.code, error.params, locale);
     if (error instanceof OAuthTokenError) {
-      return error.message;
+      if (error.code === 'invalid_grant' || error.code === 'not_authorized') return t(locale, error.code === 'invalid_grant' ? 'lost' : 'notAuthorized', { provider: 'Calendar' });
+      return error.presentation?.format(locale) ?? error.message;
     }
     throw error;
   }