@hybrd/xmtp 1.3.2 → 1.4.0

package/package.json

@@ -1,7 +1,14 @@
 {
   "name": "@hybrd/xmtp",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "type": "module",
+  "files": [
+    "dist",
+    "src"
+  ],
+  "types": "dist/index.d.ts",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -10,29 +17,35 @@
     }
   },
   "dependencies": {
+    "@xmtp/agent-sdk": "0.0.14",
     "@xmtp/content-type-group-updated": "2.0.2",
     "@xmtp/content-type-reaction": "2.0.2",
     "@xmtp/content-type-reply": "2.0.2",
     "@xmtp/content-type-text": "2.0.2",
     "@xmtp/content-type-transaction-reference": "2.0.2",
     "@xmtp/content-type-wallet-send-calls": "2.0.0",
-    "@xmtp/node-sdk": "^4.0.1",
+    "@xmtp/node-sdk": "^4.1.0",
     "hono": "^4.7.4",
     "jsonwebtoken": "^9.0.2",
     "uint8arrays": "^5.1.0",
-    "viem": "^2.22.17"
+    "viem": "^2.22.17",
+    "@hybrd/utils": "1.4.0",
+    "@hybrd/types": "1.4.0"
   },
   "devDependencies": {
     "@types/jsonwebtoken": "^9.0.7",
     "@types/node": "22.8.6",
     "tsup": "^8.5.0",
     "vitest": "^3.2.4",
-    "@config/biome": "0.0.0",
-    "@config/tsconfig": "0.0.0"
+    "@config/tsconfig": "0.0.0",
+    "@config/biome": "0.0.0"
   },
   "scripts": {
     "build": "tsup",
+    "build:watch": "tsup --watch",
     "clean": "rm -rf .turbo dist",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "typecheck": "tsc --noEmit",
     "lint": "biome lint --unsafe",
     "lint:fix": "biome lint --write --unsafe",

package/src/client.ts

@@ -1,3 +1,4 @@
+import { logger } from "@hybrd/utils"
 import { ReactionCodec } from "@xmtp/content-type-reaction"
 import { ReplyCodec } from "@xmtp/content-type-reply"
 import { TransactionReferenceCodec } from "@xmtp/content-type-transaction-reference"
@@ -73,7 +74,7 @@ export const createSigner = (key: string): Signer => {
 
 // Function to clear XMTP database when hitting installation limits
 async function clearXMTPDatabase(address: string, env: string) {
-	console.log("🧹 Clearing XMTP database to resolve installation limit...")
+	logger.debug("🧹 Clearing XMTP database to resolve installation limit...")
 
 	// Get the storage directory using the same logic as getDbPath
 	const getStorageDirectory = () => {
@@ -120,9 +121,9 @@ async function clearXMTPDatabase(address: string, env: string) {
 					const fullPath = path.join(dir, file)
 					try {
 						fs.unlinkSync(fullPath)
-						console.log(`✅ Removed: ${fullPath}`)
+						logger.debug(`✅ Removed: ${fullPath}`)
 					} catch (err) {
-						console.log(`⚠️ Could not remove ${fullPath}:`, err)
+						logger.debug(`⚠️ Could not remove ${fullPath}:`, err)
 					}
 				}
 			}
@@ -133,7 +134,6 @@ async function clearXMTPDatabase(address: string, env: string) {
 }
 
 export async function createXMTPClient(
-	// signer: Signer,
 	privateKey: string,
 	opts?: {
 		persist?: boolean
@@ -154,7 +154,7 @@ export async function createXMTPClient(
 		)
 	}
 
-	const { XMTP_ENCRYPTION_KEY, XMTP_ENV } = process.env
+	const { XMTP_DB_ENCRYPTION_KEY, XMTP_ENV } = process.env
 
 	// Get the wallet address to use the correct database
 	const identifier = await signer.getIdentifier()
@@ -162,7 +162,7 @@ export async function createXMTPClient(
 
 	while (attempt < maxRetries) {
 		try {
-			console.log(
+			logger.debug(
 				`🔄 Attempt ${attempt + 1}/${maxRetries} to create XMTP client...`
 			)
 
@@ -175,16 +175,18 @@ export async function createXMTPClient(
 				)
 			}
 
-			if (!XMTP_ENCRYPTION_KEY) {
-				throw new Error("XMTP_ENCRYPTION_KEY must be set for persistent mode")
+			if (!XMTP_DB_ENCRYPTION_KEY) {
+				throw new Error(
+					"XMTP_DB_ENCRYPTION_KEY must be set for persistent mode"
+				)
 			}
 
-			const dbEncryptionKey = getEncryptionKeyFromHex(XMTP_ENCRYPTION_KEY)
+			const dbEncryptionKey = getEncryptionKeyFromHex(XMTP_DB_ENCRYPTION_KEY)
 			const dbPath = await getDbPath(
 				`${XMTP_ENV || "dev"}-${address}`,
 				storagePath
 			)
-			console.log(`📁 Using database path: ${dbPath}`)
+			logger.debug(`📁 Using database path: ${dbPath}`)
 
 			// Always create a fresh client and sync it
 			const client = await Client.create(signer, {
@@ -200,7 +202,7 @@ export async function createXMTPClient(
 			})
 
 			// Force sync conversations to ensure we have the latest data
-			console.log("📡 Syncing conversations to ensure latest state...")
+			logger.debug("📡 Syncing conversations to ensure latest state...")
 			await client.conversations.sync()
 
 			await backupDbToPersistentStorage(
@@ -208,12 +210,11 @@ export async function createXMTPClient(
 				`${XMTP_ENV || "dev"}-${address}`
 			)
 
-			console.log("✅ XMTP XmtpClient created")
-			console.log(`🔑 Wallet address: ${address}`)
-			console.log(`🌐 Environment: ${XMTP_ENV || "dev"}`)
-			console.log(`💾 Storage mode: persistent`)
+			console.log(`Wallet: ${address}`)
+			console.log(`Env: ${XMTP_ENV || "dev"}`)
+			console.log(`Storage: persistent`)
 
-			return client
+			return client as unknown as XmtpClient
 		} catch (error) {
 			attempt++
 
@@ -279,8 +280,8 @@ export async function createXMTPClient(
 					// Try to refresh identity by creating a persistent client first
 					try {
 						console.log("📝 Creating persistent client to refresh identity...")
-						const tempEncryptionKey = XMTP_ENCRYPTION_KEY
-							? getEncryptionKeyFromHex(XMTP_ENCRYPTION_KEY)
+						const tempEncryptionKey = XMTP_DB_ENCRYPTION_KEY
+							? getEncryptionKeyFromHex(XMTP_DB_ENCRYPTION_KEY)
 							: getEncryptionKeyFromHex(generateEncryptionKeyHex())
 						const tempClient = await Client.create(signer, {
 							dbEncryptionKey: tempEncryptionKey,
@@ -348,7 +349,7 @@ export const generateEncryptionKeyHex = () => {
  * @param hex - The hex string
  * @returns The encryption key as Uint8Array
  */
-export const getEncryptionKeyFromHex = (hex: string): Uint8Array => {
+const getEncryptionKeyFromHex = (hex: string): Uint8Array => {
 	return fromString(hex, "hex")
 }
 
@@ -421,7 +422,7 @@ export const getDbPath = async (description = "xmtp", storagePath?: string) => {
 	return dbPath
 }
 
-export const backupDbToPersistentStorage = async (
+const backupDbToPersistentStorage = async (
 	dbPath: string,
 	description: string
 ) => {
@@ -534,9 +535,9 @@ export function validateEnvironment(vars: string[]): Record<string, string> {
 }
 
 /**
- * Diagnose XMTP environment and identity issues
+ * Diagnose XMTP environment and identity issues (internal use only)
  */
-export async function diagnoseXMTPIdentityIssue(
+async function diagnoseXMTPIdentityIssue(
 	client: XmtpClient,
 	inboxId: string,
 	environment: string
@@ -825,116 +826,3 @@ export async function createXMTPConnectionManager(
 // ===================================================================
 // User Address Resolution with Auto-Refresh
 // ===================================================================
-
-/**
- * Resolve user address from inbox ID with automatic identity refresh on association errors
- */
-export async function resolveUserAddress(
-	client: XmtpClient,
-	senderInboxId: string,
-	maxRetries = 2
-): Promise<string> {
-	let attempt = 0
-
-	while (attempt < maxRetries) {
-		try {
-			console.log(
-				`🔍 Resolving user address (attempt ${attempt + 1}/${maxRetries})...`
-			)
-
-			const inboxState = await client.preferences.inboxStateFromInboxIds([
-				senderInboxId
-			])
-
-			const firstInbox = inboxState[0]
-			if (
-				inboxState.length > 0 &&
-				firstInbox?.identifiers &&
-				firstInbox.identifiers.length > 0
-			) {
-				const userAddress = firstInbox.identifiers[0]?.identifier
-				if (userAddress) {
-					console.log("✅ Resolved user address:", userAddress)
-					return userAddress
-				}
-			}
-
-			console.log("⚠️ No identifiers found in inbox state")
-			return "unknown"
-		} catch (error) {
-			attempt++
-
-			if (
-				error instanceof Error &&
-				error.message.includes("Association error: Missing identity update")
-			) {
-				console.log(
-					`🔄 Identity association error during address resolution (attempt ${attempt}/${maxRetries})`
-				)
-
-				if (attempt < maxRetries) {
-					console.log(
-						"🔧 Attempting automatic identity refresh for address resolution..."
-					)
-
-					try {
-						// Force a conversation sync to refresh identity state
-						console.log("📡 Syncing conversations to refresh identity...")
-						await client.conversations.sync()
-
-						// Small delay before retry
-						console.log("⏳ Waiting 2s before retry...")
-						await new Promise((resolve) => setTimeout(resolve, 2000))
-
-						console.log(
-							"✅ Identity sync completed, retrying address resolution..."
-						)
-					} catch (refreshError) {
-						console.log(`❌ Identity refresh failed:`, refreshError)
-					}
-				} else {
-					console.error("❌ Failed to resolve user address after all retries")
-					console.error("💡 Identity association issue persists")
-
-					// Run diagnostic
-					try {
-						const diagnosis = await diagnoseXMTPIdentityIssue(
-							client,
-							senderInboxId,
-							process.env.XMTP_ENV || "dev"
-						)
-
-						console.log("🔍 XMTP Identity Diagnosis:")
-						diagnosis.suggestions.forEach((suggestion) => {
-							console.error(`💡 ${suggestion}`)
-						})
-					} catch (diagError) {
-						console.warn("⚠️ Could not run XMTP identity diagnosis:", diagError)
-					}
-
-					return "unknown"
-				}
-			} else {
-				// For other errors, don't retry
-				console.error("❌ Error resolving user address:", error)
-				return "unknown"
-			}
-		}
-	}
-
-	return "unknown"
-}
-
-export const startPeriodicBackup = (
-	dbPath: string,
-	description: string,
-	intervalMs = 300000
-) => {
-	return setInterval(async () => {
-		try {
-			await backupDbToPersistentStorage(dbPath, description)
-		} catch (error) {
-			console.log(`⚠️ Periodic backup failed:`, error)
-		}
-	}, intervalMs)
-}

package/src/index.ts

@@ -1,25 +1,38 @@
+export {
+	Agent,
+	createSigner,
+	createUser,
+	filter,
+	getTestUrl
+} from "@xmtp/agent-sdk"
+
+export type * from "./types"
+
+export {
+	DEFAULT_AMOUNT,
+	DEFAULT_OPTIONS,
+	MAX_USDC_AMOUNT
+} from "./constants"
+// NodeNext/Node16 requires explicit extensions for relative imports
+// NodeNext/Node16 requires explicit extensions for relative imports
+
 // ===================================================================
-// XMTP Package - Main Entry Point
+// XMTP Client and Connection Management
 // ===================================================================
-// This package provides a clean interface to XMTP functionality
-// Re-exports core XMTP SDK types and utilities
-
-export * from "./client"
-export * from "./constants"
-export * from "./lib/message-listener"
-export * from "./lib/subjects"
-export * from "./resolver"
-export * from "./resolver/basename-resolver"
-export * from "./resolver/ens-resolver"
-export * from "./resolver/xmtp-resolver"
-export * from "./service-client"
-export * from "./types"
+export {
+    createXMTPClient,
+    createSigner as createXMTPSigner,
+    logAgentDetails,
+    validateEnvironment,
+    XMTPConnectionManager
+} from "./client"
+export type { XMTPConnectionConfig } from "./client"
 
 // ===================================================================
 // XMTP Plugin for Agent Integration
 // ===================================================================
 export { XMTPPlugin } from "./plugin"
-export type { Plugin, XMTPPluginContext } from "./plugin"
+export type { Plugin } from "./plugin"
 
 // ===================================================================
 // JWT Utilities for XMTP Tools
@@ -27,47 +40,6 @@ export type { Plugin, XMTPPluginContext } from "./plugin"
 export { generateXMTPToolsToken } from "./lib/jwt"
 export type { XMTPToolsPayload } from "./lib/jwt"
 
-// ===================================================================
-// Enhanced XMTP Client & Connection Management
-// ===================================================================
-export {
-	// Enhanced connection management
-	XMTPConnectionManager,
-	createXMTPConnectionManager,
-	type XMTPConnectionConfig,
-	type XMTPConnectionHealth
-} from "./client"
-
-// ===================================================================
-// XMTP Service Client (for external service communication)
-// ===================================================================
-export {
-	XmtpServiceClient,
-	createXmtpServiceClient
-} from "./service-client"
-
-// Service Client Types
-export type {
-	GetMessageParams,
-	GetRootMessageParams,
-	// Function parameter types
-	SendMessageParams,
-	// Response types
-	SendMessageResponse,
-	SendReactionParams,
-	SendReactionResponse,
-	SendReplyParams,
-	SendReplyResponse,
-	SendTransactionParams,
-	SendTransactionResponse,
-	TransactionCall,
-	TransactionRequest,
-	XmtpRootMessageResponse,
-	XmtpServiceClientConfig,
-	XmtpServiceMessage,
-	XmtpServiceResponse
-} from "./types"
-
 // ===================================================================
 // XMTP Core SDK Exports
 // ===================================================================
@@ -114,28 +86,3 @@ export {
 	ContentTypeWalletSendCalls,
 	type WalletSendCallsParams
 } from "@xmtp/content-type-wallet-send-calls"
-
-// ===================================================================
-// Local Client Utilities
-// ===================================================================
-export {
-	backupDbToPersistentStorage,
-	createSigner,
-	createUser,
-	createXMTPClient,
-	diagnoseXMTPIdentityIssue,
-	generateEncryptionKeyHex,
-	getEncryptionKeyFromHex,
-	logAgentDetails,
-	startPeriodicBackup,
-	validateEnvironment
-} from "./client"
-
-// ===================================================================
-// Application Constants
-// ===================================================================
-export {
-	DEFAULT_AMOUNT,
-	DEFAULT_OPTIONS,
-	MAX_USDC_AMOUNT
-} from "./constants"

package/src/index.ts.old

@@ -0,0 +1,145 @@
+// ===================================================================
+// XMTP Package - Main Entry Point
+// ===================================================================
+// This package provides a clean interface to XMTP functionality
+// Re-exports core XMTP SDK types and utilities
+
+// export * from "./client"
+// export * from "./constants"
+// export * from "./lib/message-listener"
+// export * from "./lib/subjects"
+// export * from "./resolver"
+// export * from "./resolver/basename-resolver"
+// export * from "./resolver/ens-resolver"
+// export * from "./resolver/xmtp-resolver"
+// export * from "./service-client"
+// export * from "./types"
+
+// ===================================================================
+// XMTP Plugin for Agent Integration
+// ===================================================================
+export { XMTPPlugin } from "./plugin"
+export type { Plugin, XMTPPluginContext } from "./plugin"
+
+// ===================================================================
+// JWT Utilities for XMTP Tools
+// ===================================================================
+export { generateXMTPToolsToken } from "./lib/jwt"
+export type { XMTPToolsPayload } from "./lib/jwt"
+export { logger } from "./lib/logger"
+
+// ===================================================================
+// Enhanced XMTP Client & Connection Management
+// ===================================================================
+// export {
+// 	// Enhanced connection management
+// 	XMTPConnectionManager,
+// 	createXMTPConnectionManager,
+// 	type XMTPConnectionConfig,
+// 	type XMTPConnectionHealth
+// } from "./client"
+
+// ===================================================================
+// XMTP Service Client (for external service communication)
+// ===================================================================
+// export {
+// 	XmtpServiceClient,
+// 	createXmtpServiceClient
+// } from "./service-client"
+
+// Service Client Types
+// export type {
+// 	GetMessageParams,
+// 	GetRootMessageParams,
+// 	// Function parameter types
+// 	SendMessageParams,
+// 	// Response types
+// 	SendMessageResponse,
+// 	SendReactionParams,
+// 	SendReactionResponse,
+// 	SendReplyParams,
+// 	SendReplyResponse,
+// 	SendTransactionParams,
+// 	SendTransactionResponse,
+// 	TransactionCall,
+// 	TransactionRequest,
+// 	XmtpRootMessageResponse,
+// 	XmtpServiceClientConfig,
+// 	XmtpServiceMessage,
+// 	XmtpServiceResponse
+// } from "./types"
+
+// ===================================================================
+// XMTP Core SDK Exports
+// ===================================================================
+export {
+	Client,
+	IdentifierKind,
+	// type Conversation,
+	type DecodedMessage,
+	type Dm,
+	// type Group,
+	type LogLevel,
+	type Signer,
+	type XmtpEnv
+} from "@xmtp/node-sdk"
+
+// ===================================================================
+// XMTP Content Types
+// ===================================================================
+export {
+	ContentTypeTransactionReference,
+	type TransactionReference
+} from "@xmtp/content-type-transaction-reference"
+
+export { ContentTypeText, type TextParameters } from "@xmtp/content-type-text"
+
+export {
+	ContentTypeReaction,
+	type Reaction
+} from "@xmtp/content-type-reaction"
+
+export {
+	ContentTypeReply,
+	ReplyCodec,
+	type Reply
+} from "@xmtp/content-type-reply"
+
+export {
+	ContentTypeGroupUpdated,
+	GroupUpdatedCodec,
+	type GroupUpdated
+} from "@xmtp/content-type-group-updated"
+
+export {
+	ContentTypeWalletSendCalls,
+	type WalletSendCallsParams
+} from "@xmtp/content-type-wallet-send-calls"
+
+// ===================================================================
+// Local Client Utilities
+// ===================================================================
+// export {
+// 	backupDbToPersistentStorage,
+// 	createSigner,
+// 	createUser,
+// 	createXMTPClient,
+// 	diagnoseXMTPIdentityIssue,
+// 	generateEncryptionKeyHex,
+// 	getEncryptionKeyFromHex,
+// 	logAgentDetails,
+// 	startPeriodicBackup,
+// 	validateEnvironment
+// } from "./client"
+
+// ===================================================================
+// Application Constants
+// ===================================================================
+export {
+	DEFAULT_AMOUNT,
+	DEFAULT_OPTIONS,
+	MAX_USDC_AMOUNT
+} from "./constants"
+
+export { Agent, createSigner, createUser, getTestUrl } from "@xmtp/agent-sdk"
+