@oxyhq/services 5.10.4 → 5.10.5

package/src/core/index.ts

@@ -1,28 +1,13 @@
 /**
- * OxyServices Core Module - Modular Architecture
+ * OxyServices Core Module - Unified Architecture
  * 
- * This module exports the main OxyServices class and all individual service modules
- * for a clean, maintainable, and focused architecture.
+ * This module exports the unified OxyServices class that provides all API functionality
+ * in one simple, easy-to-use interface.
  */
 
-// Main OxyServices class (backward compatible)
-export { OxyServicesMain as OxyServices } from './OxyServicesMain';
-
-// Individual service classes for focused usage
-export { AuthService } from './auth/AuthService';
-export { UserService } from './users/UserService';
-export { PaymentService } from './payments/PaymentService';
-export { KarmaService } from './karma/KarmaService';
-export { FileService } from './files/FileService';
-export { LocationService } from './locations/LocationService';
-export { AnalyticsService } from './analytics/AnalyticsService';
-export { DeviceService } from './devices/DeviceService';
-
-// Base class for custom service extensions
-export { OxyServices as BaseOxyServices } from './OxyServices';
-
-// Constants
-export { OXY_CLOUD_URL } from './files/FileService';
+// Main OxyServices class (unified)
+export { OxyServices } from './OxyServices';
+export { OXY_CLOUD_URL } from './OxyServices';
 
 // Re-export all models and types for convenience
 export * from '../models/interfaces';
@@ -32,8 +17,8 @@ export * from '../models/session';
 export { DeviceManager } from '../utils/deviceManager';
 export type { DeviceFingerprint, StoredDeviceInfo } from '../utils/deviceManager';
 
-// Import the main class for default export
-import { OxyServicesMain } from './OxyServicesMain';
+// Import for default export
+import { OxyServices } from './OxyServices';
 
 // Default export for backward compatibility
-export default OxyServicesMain;
+export default OxyServices;

package/src/ui/screens/FileManagementScreen.tsx

@@ -118,7 +118,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                 setLoading(true);
             }
 
-            const response = await oxyServices.files.listUserFiles(targetUserId);
+            const response = await oxyServices.listUserFiles(targetUserId);
             setFiles(response.files || []);
         } catch (error: any) {
             console.error('Failed to load files:', error);
@@ -172,7 +172,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
             await Promise.all(
                 photosToLoad.map(async (photo) => {
                     try {
-                        const downloadUrl = oxyServices.files.getFileDownloadUrl(photo.id);
+                        const downloadUrl = oxyServices.getFileDownloadUrl(photo.id);
 
                         if (Platform.OS === 'web') {
                             const img = new (window as any).Image();
@@ -340,7 +340,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
             console.log('Current user ID:', user?.id);
             setDeleting(fileId);
 
-            const result = await oxyServices.files.deleteFile(fileId);
+            const result = await oxyServices.deleteFile(fileId);
             console.log('Delete result:', result);
 
             toast.success('File deleted successfully');
@@ -408,7 +408,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                 console.log('Downloading file:', { fileId, filename });
 
                 // Use the public download URL method
-                const downloadUrl = oxyServices.files.getFileDownloadUrl(fileId);
+                const downloadUrl = oxyServices.getFileDownloadUrl(fileId);
                 console.log('Download URL:', downloadUrl);
 
                 try {
@@ -426,7 +426,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                     console.warn('Link download failed, trying fetch method:', linkError);
 
                     // Method 2: Fallback to authenticated download
-                    const blob = await oxyServices.files.getFileContentAsBlob(fileId);
+                    const blob = await oxyServices.getFileContentAsBlob(fileId);
                     const url = window.URL.createObjectURL(blob);
 
                     const link = document.createElement('a');
@@ -491,11 +491,11 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                         file.contentType.startsWith('video/') ||
                         file.contentType.startsWith('audio/')) {
                         // For images, PDFs, videos, and audio, we'll use the URL directly
-                        const downloadUrl = oxyServices.files.getFileDownloadUrl(file.id);
+                        const downloadUrl = oxyServices.getFileDownloadUrl(file.id);
                         setFileContent(downloadUrl);
                     } else {
                         // For text files, get the content using authenticated request
-                        const content = await oxyServices.files.getFileContentAsText(file.id);
+                        const content = await oxyServices.getFileContentAsText(file.id);
                         setFileContent(content);
                     }
                 } catch (error: any) {
@@ -532,7 +532,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
     };
 
     const renderSimplePhotoItem = useCallback((photo: FileMetadata, index: number) => {
-        const downloadUrl = oxyServices.files.getFileDownloadUrl(photo.id);
+        const downloadUrl = oxyServices.getFileDownloadUrl(photo.id);
 
         // Calculate photo item width based on actual container size from bottom sheet
         let itemsPerRow = 3; // Default for mobile
@@ -598,7 +598,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
     }, [oxyServices, containerWidth]);
 
     const renderJustifiedPhotoItem = useCallback((photo: FileMetadata, width: number, height: number, isLast: boolean) => {
-        const downloadUrl = oxyServices.files.getFileDownloadUrl(photo.id);
+        const downloadUrl = oxyServices.getFileDownloadUrl(photo.id);
 
         return (
             <TouchableOpacity
@@ -689,7 +689,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                                 {isImage && (
                                     Platform.OS === 'web' ? (
                                         <img
-                                            src={oxyServices.files.getFileDownloadUrl(file.id)}
+                                            src={oxyServices.getFileDownloadUrl(file.id)}
                                             style={{
                                                 width: '100%',
                                                 height: '100%',
@@ -709,7 +709,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                                         />
                                     ) : (
                                         <Image
-                                            source={{ uri: oxyServices.files.getFileDownloadUrl(file.id) }}
+                                            source={{ uri: oxyServices.getFileDownloadUrl(file.id) }}
                                             style={styles.previewImage}
                                             resizeMode="cover"
                                             onError={() => {
@@ -817,7 +817,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
     };
 
     const renderPhotoItem = (photo: FileMetadata, index: number) => {
-        const downloadUrl = oxyServices.files.getFileDownloadUrl(photo.id);
+        const downloadUrl = oxyServices.getFileDownloadUrl(photo.id);
 
         // Calculate photo item width based on actual container size from bottom sheet
         let itemsPerRow = 3; // Default for mobile

package/src/ui/screens/ProfileScreen.tsx

@@ -61,7 +61,7 @@ const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme,
 
         // Load user profile and karma total
         Promise.all([
-            oxyServices.users.getUserById(userId).catch((err: any) => {
+            oxyServices.getUserById(userId).catch((err: any) => {
                 console.error('getUserById error:', err);
                 // If this is the current user and the API call fails, use current user data as fallback
                 if (currentUser && currentUser.id === userId) {
@@ -70,8 +70,8 @@ const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme,
                 }
                 throw err;
             }),
-            oxyServices.karma.getUserKarmaTotal ?
-                oxyServices.karma.getUserKarmaTotal(userId).catch((err: any) => {
+            oxyServices.getUserKarmaTotal ?
+                oxyServices.getUserKarmaTotal(userId).catch((err: any) => {
                     console.warn('getUserKarmaTotal error:', err);
                     return { total: undefined };
                 }) :

package/src/ui/screens/SignInScreen.tsx

@@ -136,7 +136,7 @@ const SignInScreen: React.FC<BaseScreenProps> = ({
 
         try {
             // First check if username exists by trying to get profile
-            const profile = await oxyServices.users.getProfileByUsername(usernameToValidate);
+            const profile = await oxyServices.getProfileByUsername(usernameToValidate);
 
             if (profile) {
                 const profileData = {

package/src/ui/screens/karma/KarmaCenterScreen.tsx

@@ -38,8 +38,8 @@ const KarmaCenterScreen: React.FC<BaseScreenProps> = ({
         setIsLoading(true);
         setError(null);
         Promise.all([
-            oxyServices.karma.getUserKarmaTotal(user.id),
-            oxyServices.karma.getUserKarmaHistory(user.id, 20, 0),
+            oxyServices.getUserKarmaTotal(user.id),
+            oxyServices.getUserKarmaHistory(user.id, 20, 0),
         ])
             .then(([totalRes, historyRes]) => {
                 setKarmaTotal(totalRes.total);

package/src/ui/screens/karma/KarmaLeaderboardScreen.tsx

@@ -19,7 +19,7 @@ const KarmaLeaderboardScreen: React.FC<BaseScreenProps> = ({ goBack, theme, navi
     useEffect(() => {
         setIsLoading(true);
         setError(null);
-        oxyServices.karma.getKarmaLeaderboard()
+        oxyServices.getKarmaLeaderboard()
             .then((data: any) => setLeaderboard(Array.isArray(data) ? data : []))
             .catch((err: any) => setError(err.message || 'Failed to load leaderboard'))
             .finally(() => setIsLoading(false));

package/src/ui/screens/karma/KarmaRulesScreen.tsx

@@ -18,7 +18,7 @@ const KarmaRulesScreen: React.FC<BaseScreenProps> = ({ goBack, theme }) => {
     useEffect(() => {
         setIsLoading(true);
         setError(null);
-        oxyServices.karma.getKarmaRules()
+        oxyServices.getKarmaRules()
             .then((data: any) => setRules(Array.isArray(data) ? data : []))
             .catch((err: any) => setError(err.message || 'Failed to load rules'))
             .finally(() => setIsLoading(false));

package/src/ui/stores/followStore.ts

@@ -53,7 +53,7 @@ export const useFollowStore = create<FollowState>((set: any, get: any) => ({
       errors: { ...state.errors, [userId]: null },
     }));
     try {
-      const response = await oxyServices.users.getFollowStatus(userId);
+      const response = await oxyServices.getFollowStatus(userId);
       set((state: FollowState) => ({
         followingUsers: { ...state.followingUsers, [userId]: response.isFollowing },
         fetchingUsers: { ...state.fetchingUsers, [userId]: false },
@@ -75,10 +75,10 @@ export const useFollowStore = create<FollowState>((set: any, get: any) => ({
       let response: any;
       let newFollowState;
       if (isCurrentlyFollowing) {
-        response = await oxyServices.users.unfollowUser(userId);
+        response = await oxyServices.unfollowUser(userId);
         newFollowState = false;
       } else {
-        response = await oxyServices.users.followUser(userId);
+        response = await oxyServices.followUser(userId);
         newFollowState = true;
       }
       
@@ -158,7 +158,7 @@ export const useFollowStore = create<FollowState>((set: any, get: any) => ({
       loadingCounts: { ...state.loadingCounts, [userId]: true },
     }));
     try {
-      const user = await oxyServices.users.getUserById(userId);
+      const user = await oxyServices.getUserById(userId);
       if (user && user._count) {
         set((state: FollowState) => ({
           followerCounts: { 

package/lib/commonjs/core/OxyServicesMain.js

@@ -1,51 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.OxyServicesMain = void 0;
-var _AuthService = require("./auth/AuthService");
-var _UserService = require("./users/UserService");
-var _PaymentService = require("./payments/PaymentService");
-var _KarmaService = require("./karma/KarmaService");
-var _FileService = require("./files/FileService");
-var _LocationService = require("./locations/LocationService");
-var _AnalyticsService = require("./analytics/AnalyticsService");
-var _DeviceService = require("./devices/DeviceService");
-/**
- * Main OxyServices class that combines all individual services
- * 
- * This class provides a unified interface to all Oxy API services while maintaining
- * backward compatibility with the original monolithic structure.
- */
-class OxyServicesMain extends _AuthService.AuthService {
-  // Service instances
-
-  constructor(config) {
-    super(config);
-
-    // Initialize all service instances
-    this.users = new _UserService.UserService(config);
-    this.payments = new _PaymentService.PaymentService(config);
-    this.karma = new _KarmaService.KarmaService(config);
-    this.files = new _FileService.FileService(config);
-    this.locations = new _LocationService.LocationService(config);
-    this.analytics = new _AnalyticsService.AnalyticsService(config);
-    this.devices = new _DeviceService.DeviceService(config);
-  }
-
-  // Re-export OXY_CLOUD_URL for convenience
-  static OXY_CLOUD_URL = _FileService.OXY_CLOUD_URL;
-
-  // Additional utility methods that span multiple services
-  async fetchLinkMetadata(url) {
-    try {
-      const res = await this.getClient().get(`/api/link-metadata?url=${encodeURIComponent(url)}`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-}
-exports.OxyServicesMain = OxyServicesMain;
-//# sourceMappingURL=OxyServicesMain.js.map

package/lib/commonjs/core/OxyServicesMain.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_AuthService","require","_UserService","_PaymentService","_KarmaService","_FileService","_LocationService","_AnalyticsService","_DeviceService","OxyServicesMain","AuthService","constructor","config","users","UserService","payments","PaymentService","karma","KarmaService","files","FileService","locations","LocationService","analytics","AnalyticsService","devices","DeviceService","OXY_CLOUD_URL","fetchLinkMetadata","url","res","getClient","get","encodeURIComponent","data","error","handleError","exports"],"sourceRoot":"../../../src","sources":["core/OxyServicesMain.ts"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,eAAA,GAAAF,OAAA;AACA,IAAAG,aAAA,GAAAH,OAAA;AACA,IAAAI,YAAA,GAAAJ,OAAA;AACA,IAAAK,gBAAA,GAAAL,OAAA;AACA,IAAAM,iBAAA,GAAAN,OAAA;AACA,IAAAO,cAAA,GAAAP,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMQ,eAAe,SAASC,wBAAW,CAAC;EAC/C;;EASAC,WAAWA,CAACC,MAAiB,EAAE;IAC7B,KAAK,CAACA,MAAM,CAAC;;IAEb;IACA,IAAI,CAACC,KAAK,GAAG,IAAIC,wBAAW,CAACF,MAAM,CAAC;IACpC,IAAI,CAACG,QAAQ,GAAG,IAAIC,8BAAc,CAACJ,MAAM,CAAC;IAC1C,IAAI,CAACK,KAAK,GAAG,IAAIC,0BAAY,CAACN,MAAM,CAAC;IACrC,IAAI,CAACO,KAAK,GAAG,IAAIC,wBAAW,CAACR,MAAM,CAAC;IACpC,IAAI,CAACS,SAAS,GAAG,IAAIC,gCAAe,CAACV,MAAM,CAAC;IAC5C,IAAI,CAACW,SAAS,GAAG,IAAIC,kCAAgB,CAACZ,MAAM,CAAC;IAC7C,IAAI,CAACa,OAAO,GAAG,IAAIC,4BAAa,CAACd,MAAM,CAAC;EAC1C;;EAEA;EACA,OAAgBe,aAAa,GAAGA,0BAAa;;EAE7C;EACA,MAAMC,iBAAiBA,CAACC,GAAW,EAKhC;IACD,IAAI;MACF,MAAMC,GAAG,GAAG,MAAM,IAAI,CAACC,SAAS,CAAC,CAAC,CAACC,GAAG,CAAC,0BAA0BC,kBAAkB,CAACJ,GAAG,CAAC,EAAE,CAAC;MAC3F,OAAOC,GAAG,CAACI,IAAI;IACjB,CAAC,CAAC,OAAOC,KAAK,EAAE;MACd,MAAM,IAAI,CAACC,WAAW,CAACD,KAAK,CAAC;IAC/B;EACF;AACF;AAACE,OAAA,CAAA5B,eAAA,GAAAA,eAAA","ignoreList":[]}

package/lib/commonjs/core/analytics/AnalyticsService.js

@@ -1,67 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.AnalyticsService = void 0;
-var _OxyServices = require("../OxyServices");
-/**
- * Analytics service for handling analytics and content viewer operations
- */
-class AnalyticsService extends _OxyServices.OxyServices {
-  /**
-   * Get analytics data for user
-   */
-  async getAnalytics(userId, period) {
-    try {
-      const params = new URLSearchParams();
-      if (period) params.append('period', period);
-      const res = await this.getClient().get(`/api/analytics/users/${userId}?${params.toString()}`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Update analytics data
-   */
-  async updateAnalytics(userId, type, data) {
-    try {
-      const res = await this.getClient().put(`/api/analytics/users/${userId}/${type}`, data);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get content viewers for user
-   */
-  async getContentViewers(userId, period) {
-    try {
-      const params = new URLSearchParams();
-      if (period) params.append('period', period);
-      const res = await this.getClient().get(`/api/analytics/users/${userId}/viewers?${params.toString()}`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-
-  /**
-   * Get follower details for user
-   */
-  async getFollowerDetails(userId, period) {
-    try {
-      const params = new URLSearchParams();
-      if (period) params.append('period', period);
-      const res = await this.getClient().get(`/api/analytics/users/${userId}/followers?${params.toString()}`);
-      return res.data;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
-}
-exports.AnalyticsService = AnalyticsService;
-//# sourceMappingURL=AnalyticsService.js.map

package/lib/commonjs/core/analytics/AnalyticsService.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_OxyServices","require","AnalyticsService","OxyServices","getAnalytics","userId","period","params","URLSearchParams","append","res","getClient","get","toString","data","error","handleError","updateAnalytics","type","put","getContentViewers","getFollowerDetails","exports"],"sourceRoot":"../../../../src","sources":["core/analytics/AnalyticsService.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAGA;AACA;AACA;AACO,MAAMC,gBAAgB,SAASC,wBAAW,CAAC;EAChD;AACF;AACA;EACE,MAAMC,YAAYA,CAACC,MAAc,EAAEC,MAAe,EAA0B;IAC1E,IAAI;MACF,MAAMC,MAAM,GAAG,IAAIC,eAAe,CAAC,CAAC;MACpC,IAAIF,MAAM,EAAEC,MAAM,CAACE,MAAM,CAAC,QAAQ,EAAEH,MAAM,CAAC;MAE3C,MAAMI,GAAG,GAAG,MAAM,IAAI,CAACC,SAAS,CAAC,CAAC,CAACC,GAAG,CAAC,wBAAwBP,MAAM,IAAIE,MAAM,CAACM,QAAQ,CAAC,CAAC,EAAE,CAAC;MAC7F,OAAOH,GAAG,CAACI,IAAI;IACjB,CAAC,CAAC,OAAOC,KAAK,EAAE;MACd,MAAM,IAAI,CAACC,WAAW,CAACD,KAAK,CAAC;IAC/B;EACF;;EAEA;AACF;AACA;EACE,MAAME,eAAeA,CAACZ,MAAc,EAAEa,IAAY,EAAEJ,IAAyB,EAAgC;IAC3G,IAAI;MACF,MAAMJ,GAAG,GAAG,MAAM,IAAI,CAACC,SAAS,CAAC,CAAC,CAACQ,GAAG,CAAC,wBAAwBd,MAAM,IAAIa,IAAI,EAAE,EAAEJ,IAAI,CAAC;MACtF,OAAOJ,GAAG,CAACI,IAAI;IACjB,CAAC,CAAC,OAAOC,KAAK,EAAE;MACd,MAAM,IAAI,CAACC,WAAW,CAACD,KAAK,CAAC;IAC/B;EACF;;EAEA;AACF;AACA;EACE,MAAMK,iBAAiBA,CAACf,MAAc,EAAEC,MAAe,EAA4B;IACjF,IAAI;MACF,MAAMC,MAAM,GAAG,IAAIC,eAAe,CAAC,CAAC;MACpC,IAAIF,MAAM,EAAEC,MAAM,CAACE,MAAM,CAAC,QAAQ,EAAEH,MAAM,CAAC;MAE3C,MAAMI,GAAG,GAAG,MAAM,IAAI,CAACC,SAAS,CAAC,CAAC,CAACC,GAAG,CAAC,wBAAwBP,MAAM,YAAYE,MAAM,CAACM,QAAQ,CAAC,CAAC,EAAE,CAAC;MACrG,OAAOH,GAAG,CAACI,IAAI;IACjB,CAAC,CAAC,OAAOC,KAAK,EAAE;MACd,MAAM,IAAI,CAACC,WAAW,CAACD,KAAK,CAAC;IAC/B;EACF;;EAEA;AACF;AACA;EACE,MAAMM,kBAAkBA,CAAChB,MAAc,EAAEC,MAAe,EAA4B;IAClF,IAAI;MACF,MAAMC,MAAM,GAAG,IAAIC,eAAe,CAAC,CAAC;MACpC,IAAIF,MAAM,EAAEC,MAAM,CAACE,MAAM,CAAC,QAAQ,EAAEH,MAAM,CAAC;MAE3C,MAAMI,GAAG,GAAG,MAAM,IAAI,CAACC,SAAS,CAAC,CAAC,CAACC,GAAG,CAAC,wBAAwBP,MAAM,cAAcE,MAAM,CAACM,QAAQ,CAAC,CAAC,EAAE,CAAC;MACvG,OAAOH,GAAG,CAACI,IAAI;IACjB,CAAC,CAAC,OAAOC,KAAK,EAAE;MACd,MAAM,IAAI,CAACC,WAAW,CAACD,KAAK,CAAC;IAC/B;EACF;AACF;AAACO,OAAA,CAAApB,gBAAA,GAAAA,gBAAA","ignoreList":[]}