chore: refactor env usage (#265)

TheSolaAI · Feb 16, 2025 · 290bb1f · 290bb1f
1 parent d8dc927
commit 290bb1f
Show file tree

Hide file tree

Showing 27 changed files with 71 additions and 155 deletions.
diff --git a/src/api/ApiClient.ts b/src/api/ApiClient.ts
@@ -12,9 +12,9 @@ export class ApiClient {
   private walletClient: AxiosInstance;
 
   constructor() {
-    const authServiceUrl = process.env.AUTH_SERVICE_URL;
-    const dataServiceUrl = process.env.DATA_SERVICE_URL;
-    const walletServiceUrl = process.env.WALLET_SERVICE_URL;
+    const authServiceUrl = import.meta.env.VITE_AUTH_SERVICE_URL;
+    const dataServiceUrl = import.meta.env.VITE_DATA_SERVICE_URL;
+    const walletServiceUrl = import.meta.env.VITE_WALLET_SERVICE_URL;
 
     if (!authServiceUrl) {
       throw new Error('AUTH_SERVICE_URL environment variable is not defined');

diff --git a/src/components/ui/RenderBlinks.tsx b/src/components/ui/RenderBlinks.tsx
@@ -17,7 +17,8 @@ function RenderBlinks({ actionName }: RenderBlinksProps) {
     return <div>Invalid action name</div>;
   }
 
-  const rpc = process.env.SOLANA_RPC || 'https://api.mainnet-beta.solana.com';
+  const rpc =
+    import.meta.env.VITE_SOLANA_RPC || 'https://api.mainnet-beta.solana.com';
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const { adapter } = useActionSolanaWalletAdapter(rpc);
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -29,9 +30,7 @@ function RenderBlinks({ actionName }: RenderBlinksProps) {
       {!isLoading && action ? (
         <Blink action={action} adapter={adapter} />
       ) : (
-        <div className="text-primaryDark text-sm">
-          Loading blinks
-        </div>
+        <div className="text-primaryDark text-sm">Loading blinks</div>
       )}
     </>
   );

diff --git a/src/hooks/useLuloActions.ts b/src/hooks/useLuloActions.ts
@@ -13,7 +13,7 @@ import { useWalletHandler } from '../models/WalletHandler.ts';
 
 export const useLuloActions = () => {
   const { currentWallet } = useWalletHandler();
-  const rpc = process.env.SOLANA_RPC;
+  const rpc = import.meta.env.VITE_SOLANA_RPC;
   const { handleAddMessage } = useChatHandler();
   const { setMessageList } = useRoomStore();
 

diff --git a/src/lib/solana/limitOrderTx.ts b/src/lib/solana/limitOrderTx.ts
@@ -6,7 +6,7 @@ import {
 } from '../../types/jupiter';
 import { apiClient, ApiClient } from '../../api/ApiClient';
 
-const wallet_service_url = process.env.WALLET_SERVICE_URL;
+const wallet_service_url = import.meta.env.VITE_WALLET_SERVICE_URL;
 
 export async function limitOrderTx(
   params: LimitOrderParams,

diff --git a/src/lib/solana/lst_data.ts b/src/lib/solana/lst_data.ts
@@ -1,7 +1,7 @@
 import { LSTData } from '../../types/data_types';
 import { apiClient, ApiClient } from '../../api/ApiClient';
 
-const data_service_url = process.env.DATA_SERVICE_URL;
+const data_service_url = import.meta.env.VITE_DATA_SERVICE_URL;
 
 export async function getLstDataHandler(): Promise<LSTData[] | null> {
   let resp = await apiClient.get<LSTData[]>(

diff --git a/src/lib/solana/lulo.ts b/src/lib/solana/lulo.ts
@@ -10,7 +10,7 @@ import {
 } from '../../types/lulo';
 import { VersionedTransaction } from '@solana/web3.js';
 
-const wallet_service_url = process.env.WALLET_SERVICE_URL;
+const wallet_service_url = import.meta.env.VITE_WALLET_SERVICE_URL;
 
 export async function getAssetsLulo(
   params: AssetsParams,
@@ -58,7 +58,7 @@ export async function withdrawLuloTx(
     wallet_service_url + 'api/wallet/lulo/withdraw',
     params,
   );
-  
+
   if (ApiClient.isApiError(response)) {
     console.error('Error during withdraw:', response.errors);
     return null;

diff --git a/src/lib/solana/magiceden.ts b/src/lib/solana/magiceden.ts
diff --git a/src/lib/solana/rugCheck.ts b/src/lib/solana/rugCheck.ts
@@ -1,7 +1,7 @@
-import ApiClient from '../../api/ApiClient';
+import { ApiClient } from '../../api/ApiClient';
 import { RugCheck } from '../../types/data_types';
 
-const data_service_url = process.env.DATA_SERVICE_URL;
+const data_service_url = import.meta.env.VITE_DATA_SERVICE_URL;
 
 export async function getRugCheck(token: string): Promise<RugCheck | null> {
   const resp = await ApiClient.get<RugCheck>(

diff --git a/src/lib/solana/sns.ts b/src/lib/solana/sns.ts
@@ -1,7 +1,7 @@
 import { Connection } from '@solana/web3.js';
 import { getDomainKeySync, NameRegistryState } from '@bonfida/spl-name-service';
 
-const RPC = process.env.SOLANA_RPC;
+const RPC = import.meta.env.VITE_SOLANA_RPC;
 
 function isValidDomainNamee(domainName: string): boolean {
   const regex = /^[a-zA-Z0-9_-]+\.sol$/;

diff --git a/src/lib/solana/swapLst.ts b/src/lib/solana/swapLst.ts
@@ -2,7 +2,7 @@ import { SwapParams, SwapResponse } from '../../types/jupiter';
 import ApiClient from '../../api/ApiClient';
 import { VersionedTransaction } from '@solana/web3.js';
 
-const wallet_service_url = process.env.WALLET_SERVICE_URL;
+const wallet_service_url = import.meta.env.VITE_WALLET_SERVICE_URL;
 
 export async function swapLST(
   params: SwapParams,
@@ -23,4 +23,4 @@ export async function swapLST(
     console.error('Error during swap:', error);
     return null;
   }
-} 
+}
diff --git a/src/lib/solana/swapTx.ts b/src/lib/solana/swapTx.ts
@@ -2,7 +2,7 @@ import { SwapParams, SwapResponse } from '../../types/jupiter';
 import { ApiClient, apiClient } from '../../api/ApiClient';
 import { VersionedTransaction } from '@solana/web3.js';
 
-const wallet_service_url = process.env.WALLET_SERVICE_URL;
+const wallet_service_url = import.meta.env.VITE_WALLET_SERVICE_URL;
 
 export async function swapTx(
   params: SwapParams,

diff --git a/src/lib/solana/tokenGate.ts b/src/lib/solana/tokenGate.ts
@@ -1,7 +1,7 @@
 import axios from 'axios';
 import { TokenGate } from '../../types/token_data';
 
-const url = process.env.WALLET_SERVICE_URL;
+const url = ;
 
 export const tokenGate = async (address: string) => {
   try {

diff --git a/src/lib/solana/transferSpl.ts b/src/lib/solana/transferSpl.ts
@@ -21,10 +21,8 @@ import {
 } from '@solana/web3.js';
 import bs58 from 'bs58';
 
-const rpc = process.env.SOLANA_RPC;
-const sola_ata_keypair = process.env.ATA_PRIV_KEY;
-
-
+const rpc = import.meta.env.VITE_SOLANA_RPC;
+const sola_ata_keypair = import.meta.env.VITE_ATA_PRIV_KEY;
 
 export async function transferSplTx(
   senderAddress: string,

diff --git a/src/lib/solana/wallet.ts b/src/lib/solana/wallet.ts
@@ -1,4 +1,4 @@
-const helius_api_key = process.env.HELIUS_API_KEY;
+const helius_api_key = import.meta.env.VITE_HELIUS_API_KEY;
 const url = `https://mainnet.helius-rpc.com/?api-key=${helius_api_key}`;
 
 export const fetchFilteredAssets = async (
@@ -9,7 +9,7 @@ export const fetchFilteredAssets = async (
     console.log('No address provided');
     return [];
   }
-  if (!process.env.HELIUS_API_KEY) {
+  if (import.meta.env.VITE_HELIUS_API_KEY) {
     console.log('Helius API key not found');
     return [];
   }

diff --git a/src/lib/utils/marketMacro.ts b/src/lib/utils/marketMacro.ts
@@ -1,6 +1,6 @@
 import ApiClient from '../../api/ApiClient';
 
-const url = process.env.DATA_SERVICE_URL;
+const url = import.meta.env.VITE_DATA_SERVICE_URL;
 
 export const getMarketData = async () => {
   if (!url) {

diff --git a/src/main.tsx b/src/main.tsx
@@ -13,7 +13,7 @@ import useIsMobile from './utils/isMobile.tsx';
 
 // Sentry Initialization
 Sentry.init({
-  enabled: process.env.ENVIORNMENT === 'production',
+  enabled: import.meta.env.VITE_ENVIRONMENT === 'production',
   dsn: 'https://9b7886f252a8435b9083cf088a03039d@o4508596709097472.ingest.us.sentry.io/4508601347866624',
   integrations: [
     Sentry.browserTracingIntegration(),
@@ -41,9 +41,9 @@ const RootApp = () => {
 
   return (
     <Router>
-      {process.env.PRVI_APP_ID && (
+      {import.meta.env.VITE_PRIVY_APP_ID && (
         <PrivyProvider
-          appId={process.env.PRVI_APP_ID}
+          appId={import.meta.env.VITE_PRIVY_APP_ID}
           config={{
             loginMethods: ['email', 'wallet'],
             externalWallets: {

diff --git a/src/models/WalletHandler.ts b/src/models/WalletHandler.ts
@@ -4,7 +4,7 @@ import { toast } from 'sonner';
 import { Connection, LAMPORTS_PER_SOL, PublicKey } from '@solana/web3.js';
 import { NFTAsset, TokenAsset, WalletAssets } from '../types/wallet.ts';
 
-let connection = new Connection(process.env.SOLANA_RPC!, 'confirmed');
+let connection = new Connection(import.meta.env.VITE_SOLANA_RPC!, 'confirmed');
 
 interface WalletHandler {
   currentWallet: ConnectedSolanaWallet | null; // The current wallet that the user is using
@@ -33,7 +33,7 @@ export const useWalletHandler = create<WalletHandler>((set, get) => {
     if (get().status === 'paused') return;
 
     try {
-      const response = await fetch(process.env.SOLANA_RPC!, {
+      const response = await fetch(import.meta.env.VITE_SOLANA_RPC!, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',

diff --git a/src/models/provider/SessionProvider.tsx b/src/models/provider/SessionProvider.tsx
@@ -80,10 +80,10 @@ export const SessionProvider: FC<SessionProviderProps> = ({ children }) => {
       const dataChannel = peerConnection.createDataChannel('oai-events');
       const offer = await peerConnection.createOffer();
       await peerConnection.setLocalDescription(offer);
-      if (!process.env.OPENAI_API_URL) {
+      if (!import.meta.env.VITE_OPENAI_API_URL) {
         throw new Error('OPENAI_API_URL is not set');
       }
-      const sdpResponse = await fetch(process.env.OPENAI_API_URL, {
+      const sdpResponse = await fetch(import.meta.env.VITE_OPENAI_API_URL, {
         method: 'POST',
         body: offer.sdp,
         headers: {

diff --git a/src/tools/depositLulo.ts b/src/tools/depositLulo.ts
@@ -61,7 +61,7 @@ export async function handleDepositLulo(args: {
     id: 0,
     createdAt: new Date().toISOString(),
   });
-  const rpc = process.env.SOLANA_RPC;
+  const rpc = import.meta.env.VITE_SOLANA_RPC;
 
   if (!args.currentWallet) {
     return {

diff --git a/src/tools/limitOrder.ts b/src/tools/limitOrder.ts
@@ -9,7 +9,7 @@ import { limitOrderTx } from '../lib/solana/limitOrderTx.ts';
 import { TransactionChatContent } from '../types/chatItem.ts';
 import { TransactionDataMessageItem } from '../components/ui/message_items/TransactionCard.tsx';
 
-const rpc = process.env.SOLANA_RPC;
+const rpc = import.meta.env.VITE_SOLANA_RPC;
 
 const functionDescription =
   'Creates a limit order to buy or sell a token at a specified price.';

diff --git a/src/tools/swapTokens.ts b/src/tools/swapTokens.ts
@@ -61,7 +61,7 @@ export async function swapTokensFunction(args: {
   response: string;
   props?: SwapChatContent;
 }> {
-  let rpc = process.env.SOLANA_RPC;
+  let rpc = import.meta.env.VITE_SOLANA_RPC;
   if (!rpc) {
     return {
       status: 'error',

diff --git a/src/tools/transferSolTx.ts b/src/tools/transferSolTx.ts
@@ -6,7 +6,7 @@ import {
   Transaction,
 } from '@solana/web3.js';
 import { Tool } from '../types/tool';
-import { TransactionChatContent} from '../types/chatItem';
+import { TransactionChatContent } from '../types/chatItem';
 import { TransferChatItem } from '../components/ui/message_items/TransferMessageItem.tsx';
 
 const functionDescription =
@@ -46,15 +46,15 @@ export async function transferSolTxFunction(args: {
 }): Promise<{
   status: 'success' | 'error';
   response: string;
-  props?: TransactionChatContent ;
+  props?: TransactionChatContent;
 }> {
   if (args.currentWallet === null) {
     return {
       status: 'error',
       response: 'No wallet connected',
     };
   }
-  const rpc = process.env.SOLANA_RPC;
+  const rpc = import.meta.env.VITE_SOLANA_RPC;
   if (rpc === undefined) {
     return {
       status: 'error',
@@ -78,18 +78,18 @@ export async function transferSolTxFunction(args: {
   const signature = await connection.sendRawTransaction(
     transaction.serialize(),
   );
-  let title = `Transfer ${amount} SOL to ${recipientAddress}`
-  let link = signature
+  let title = `Transfer ${amount} SOL to ${recipientAddress}`;
+  let link = signature;
 
-  const data: TransactionChatContent  = {
+  const data: TransactionChatContent = {
     response_id: 'temp',
     sender: 'assistant',
     type: 'transfer_sol',
     data: {
       title,
       link,
-      status:"success"
-    }
+      status: 'success',
+    },
   };
 
   return {