@shivaduke28/gmail-mcp 0.1.0 → 0.2.0

package/dist/auth.js

@@ -1,5 +1,6 @@
 import { OAuth2Client } from "google-auth-library";
-import { readFile, writeFile } from "node:fs/promises";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { dirname } from "node:path";
 import { createServer } from "node:http";
 import { exec } from "node:child_process";
 const SCOPES = [
@@ -10,17 +11,34 @@ export async function authorize(credentialsPath, tokensPath) {
     const credentials = JSON.parse(content);
     const { client_id, client_secret } = credentials.installed;
     const oauth2Client = new OAuth2Client(client_id, client_secret, "http://localhost:3000/callback");
-    // 保存済みトークンがあれば読み込む
+    // 保存済みトークンがあれば読み込み、有効性を確認
+    let hasTokens = false;
     try {
         const tokens = JSON.parse(await readFile(tokensPath, "utf-8"));
         oauth2Client.setCredentials(tokens);
-        return oauth2Client;
+        hasTokens = true;
     }
     catch {
-        // トークンがなければブラウザ認証
+        // ファイルなしまたは破損
+    }
+    if (hasTokens) {
+        try {
+            await oauth2Client.getAccessToken();
+            return oauth2Client;
+        }
+        catch (err) {
+            const status = err.status ?? err.code;
+            if (status === 401 || status === 400) {
+                // トークン失効 → ブラウザ認証へ
+            }
+            else {
+                throw err;
+            }
+        }
     }
     const tokens = await authenticateWithBrowser(oauth2Client);
-    await writeFile(tokensPath, JSON.stringify(tokens, null, 2));
+    await mkdir(dirname(tokensPath), { recursive: true });
+    await writeFile(tokensPath, JSON.stringify(tokens, null, 2), { mode: 0o600 });
     oauth2Client.setCredentials(tokens);
     return oauth2Client;
 }

package/dist/index.js

@@ -7,26 +7,31 @@ import { authorize } from "./auth.js";
 import { gmail as googleGmail } from "@googleapis/gmail";
 import { extractHeaders, extractBody, buildRawMessage } from "./gmail.js";
 import { existsSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
 const credentialsPath = process.env.GOOGLE_OAUTH_CREDENTIALS;
-const tokensPath = process.env.GOOGLE_OAUTH_TOKENS;
 if (!credentialsPath) {
     console.error("GOOGLE_OAUTH_CREDENTIALS 環境変数を設定してください");
     process.exit(1);
 }
-if (!tokensPath) {
-    console.error("GOOGLE_OAUTH_TOKENS 環境変数を設定してください");
-    process.exit(1);
-}
 if (!existsSync(credentialsPath)) {
     console.error(`credentials.json が見つかりません: ${credentialsPath}`);
     process.exit(1);
 }
-// OAuth2認証
-const auth = await authorize(credentialsPath, tokensPath);
-const gmail = googleGmail({ version: "v1", auth });
+const resolvedCredentialsPath = credentialsPath;
+const resolvedTokensPath = process.env.GOOGLE_OAUTH_TOKENS ?? join(homedir(), ".config", "gmail-mcp", "tokens.json");
+// lazy auth: ツール呼び出し時に初めて認証する
+let gmailClient = null;
+async function getGmail() {
+    if (!gmailClient) {
+        const auth = await authorize(resolvedCredentialsPath, resolvedTokensPath);
+        gmailClient = googleGmail({ version: "v1", auth });
+    }
+    return gmailClient;
+}
 const server = new McpServer({
     name: "gmail-mcp",
-    version: "0.1.0",
+    version: "0.2.0",
 });
 // 1. search-messages
 server.registerTool("search-messages", {
@@ -36,6 +41,7 @@ server.registerTool("search-messages", {
         maxResults: z.number().optional().default(20).describe("最大取得件数"),
     },
 }, async ({ query, maxResults }) => {
+    const gmail = await getGmail();
     const res = await gmail.users.messages.list({
         userId: "me",
         q: query,
@@ -83,6 +89,7 @@ server.registerTool("get-messages", {
         messageIds: z.array(z.string()).describe("メッセージIDの配列"),
     },
 }, async ({ messageIds }) => {
+    const gmail = await getGmail();
     const details = await Promise.all(messageIds.map((id) => gmail.users.messages.get({
         userId: "me",
         id,
@@ -117,6 +124,7 @@ server.registerTool("get-threads", {
         threadIds: z.array(z.string()).describe("スレッドIDの配列"),
     },
 }, async ({ threadIds }) => {
+    const gmail = await getGmail();
     const threads = await Promise.all(threadIds.map((id) => gmail.users.threads.get({
         userId: "me",
         id,
@@ -161,6 +169,7 @@ server.registerTool("create-draft", {
         inReplyToMessageId: z.string().optional().describe("返信先メッセージID（返信時に指定。Referencesヘッダー構築用）"),
     },
 }, async ({ to, cc, subject, body, threadId, inReplyToMessageId }) => {
+    const gmail = await getGmail();
     // 返信時のヘッダー構築
     let inReplyTo;
     let references;
@@ -210,6 +219,7 @@ server.registerTool("modify-labels", {
         removeLabelIds: z.array(z.string()).optional().default([]).describe("削除するラベルIDの配列"),
     },
 }, async ({ messageIds, addLabelIds, removeLabelIds }) => {
+    const gmail = await getGmail();
     await gmail.users.messages.batchModify({
         userId: "me",
         requestBody: {
@@ -230,6 +240,7 @@ server.registerTool("list-labels", {
     description: "利用可能なラベル一覧を取得する。レスポンスはTOON形式で返す。",
     inputSchema: {},
 }, async () => {
+    const gmail = await getGmail();
     const res = await gmail.users.labels.list({ userId: "me" });
     const labels = (res.data.labels ?? []).map((label) => ({
         id: label.id ?? "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivaduke28/gmail-mcp",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "type": "module",
   "main": "dist/index.js",
   "bin": {