@aigne/example-mcp-blocklet 1.7.3 → 1.8.0

package/README.md

@@ -49,6 +49,12 @@ BLOCKLET_APP_URL="" # Set your Blocklet app URL here
 pnpm start
 ```
 
+or
+
+```bash
+pnpm start https://your-blocklet-app-url
+```
+
 ## License
 
 This project is licensed under the MIT License.

package/index.ts

@@ -2,11 +2,11 @@
 
 import assert from "node:assert";
 import { runChatLoopInTerminal } from "@aigne/cli/utils/run-chat-loop.js";
-import { AIAgent, ExecutionEngine, MCPAgent, PromptBuilder } from "@aigne/core";
+import { AIAgent, AIGNE, MCPAgent, PromptBuilder } from "@aigne/core";
 import { loadModel } from "@aigne/core/loader/index.js";
 import { logger } from "@aigne/core/utils/logger.js";
 import { UnauthorizedError, refreshAuthorization } from "@modelcontextprotocol/sdk/client/auth.js";
-import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 // @ts-ignore
 import JWT from "jsonwebtoken";
 
@@ -14,20 +14,28 @@ import { TerminalOAuthProvider } from "./oauth.js";
 
 logger.enable(`aigne:mcp,${process.env.DEBUG}`);
 
-const { BLOCKLET_APP_URL } = process.env;
-assert(BLOCKLET_APP_URL, "Please set the BLOCKLET_APP_URL environment variable");
-console.info("Connecting to blocklet app", BLOCKLET_APP_URL);
+const rawUrl = process.argv[2] || process.env.BLOCKLET_APP_URL;
+assert(
+  rawUrl,
+  "Please provide a blocklet url as an argument or set the BLOCKLET_APP_URL environment variable",
+);
 
-const appUrl = new URL(BLOCKLET_APP_URL);
-appUrl.pathname = "/.well-known/service/mcp/sse";
+const appUrl = new URL(rawUrl);
+appUrl.pathname = "/.well-known/service/mcp";
+console.info("Connecting to blocklet", appUrl.href);
+
+let transport: StreamableHTTPClientTransport;
 
 const provider = new TerminalOAuthProvider(appUrl.host);
 const authCodePromise = new Promise((resolve, reject) => {
-  provider.once("authorized", resolve);
+  provider.once("authorized", async (code) => {
+    await transport.finishAuth(code);
+    resolve(code);
+  });
   provider.once("error", reject);
 });
 
-const transport = new SSEClientTransport(appUrl, {
+transport = new StreamableHTTPClientTransport(appUrl, {
   authProvider: provider,
 });
 
@@ -35,22 +43,25 @@ try {
   let tokens = await provider.tokens();
   if (tokens) {
     let decoded = JWT.decode(tokens.access_token);
-    console.info("Decoded access token:", decoded);
     if (decoded) {
       const now = Date.now();
       const expiresAt = decoded.exp * 1000;
       if (now < expiresAt) {
         console.info("Tokens already exist and not expired, skipping authorization");
       } else if (tokens.refresh_token) {
+        console.info("Access token expired:", { now, expiresAt, decoded });
         decoded = JWT.decode(tokens.refresh_token);
-        console.info("Decoded refresh token:", decoded);
         if (decoded) {
           const now = Date.now();
           const expiresAt = decoded.exp * 1000;
           if (now < expiresAt) {
             console.info("Refresh token already exists and not expired, refreshing authorization");
             try {
+              const oauthUrl = new URL(appUrl.href);
+              oauthUrl.pathname = "/.well-known/oauth-authorization-server";
+              const metadata = await fetch(oauthUrl.href).then((res) => res.json());
               tokens = await refreshAuthorization(appUrl.href, {
+                metadata,
                 // biome-ignore lint/style/noNonNullAssertion: <explanation>
                 clientInformation: (await provider.clientInformation())!,
                 refreshToken: tokens.refresh_token,
@@ -72,7 +83,7 @@ try {
       }
     }
   } else {
-    console.info("No tokens found, starting authorization");
+    console.info("No tokens found, starting authorization...");
     await transport.start();
   }
 } catch (error) {
@@ -87,21 +98,20 @@ try {
   }
 }
 
-console.info("Starting connecting to blocklet mcp...");
-
 const model = await loadModel();
 
 const blocklet = await MCPAgent.from({
   url: appUrl.href,
   timeout: 8000,
+  transport: "streamableHttp",
   opts: {
     authProvider: provider,
   },
 });
 
-const engine = new ExecutionEngine({
+const aigne = new AIGNE({
   model,
-  tools: [blocklet],
+  skills: [blocklet],
 });
 
 const agent = AIAgent.from({
@@ -111,7 +121,7 @@ const agent = AIAgent.from({
   memory: true,
 });
 
-const userAgent = engine.call(agent);
+const userAgent = aigne.invoke(agent);
 
 await runChatLoopInTerminal(userAgent, {
   welcome:

package/oauth.ts

@@ -147,8 +147,10 @@ export class TerminalOAuthProvider extends EventEmitter implements OAuthClientPr
 
           if (code) {
             this.emit("authorized", code);
-            console.info("Authorization successful!", Date.now());
-            resolve();
+            console.info("Authorization code received, exchanging for tokens...");
+            setTimeout(() => {
+              resolve();
+            }, 3000);
           } else {
             this.emit("error", new Error("No authorization code received"));
             reject(new Error("No authorization code received"));
@@ -158,7 +160,7 @@ export class TerminalOAuthProvider extends EventEmitter implements OAuthClientPr
 
       // Start the local server
       server.listen(this.localServerPort, async () => {
-        console.log("Please authorize the application in your browser...");
+        console.log("Please complete the authorization in your browser...");
         // Open the authorization URL in the default browser
         await open(authorizationUrl.toString());
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigne/example-mcp-blocklet",
-  "version": "1.7.3",
+  "version": "1.8.0",
   "description": "A demonstration of using AIGNE Framework and MCP Server hosted by the Blocklet platform",
   "author": "Arcblock <blocklet@arcblock.io> https://github.com/blocklet",
   "homepage": "https://github.com/AIGNE-io/aigne-framework/tree/main/examples/mcp-blocklet",
@@ -20,8 +20,11 @@
     "jsonwebtoken": "^9.0.2",
     "open": "^10.1.0",
     "zod": "^3.24.2",
-    "@aigne/cli": "^1.7.0",
-    "@aigne/core": "^1.11.0"
+    "@aigne/core": "^1.12.0",
+    "@aigne/cli": "^1.8.0"
+  },
+  "devDependencies": {
+    "@aigne/test-utils": "^0.1.0"
   },
   "scripts": {
     "start": "bun run index.ts",