@oxyhq/core 1.8.0 → 1.9.0

package/src/OxyServices.ts

@@ -141,6 +141,9 @@ export interface OxyServices extends InstanceType<ReturnType<typeof composeOxySe
   authSocket(options?: {
     debug?: boolean;
   }): (socket: any, next: (err?: Error) => void) => Promise<void>;
+
+  // Asset management
+  assetUpdateVisibility(fileId: string, visibility: 'private' | 'public' | 'unlisted'): Promise<unknown>;
 }
 
 // Re-export error classes for convenience

package/src/crypto/signatureService.ts

@@ -80,8 +80,8 @@ export class SignatureService {
     if (isReactNative()) {
       const Crypto = await initExpoCrypto();
       const randomBytes = await Crypto.getRandomBytesAsync(32);
-      return Array.from(randomBytes)
-        .map((b: number) => b.toString(16).padStart(2, '0'))
+      return Array.from(new Uint8Array(randomBytes))
+        .map((b) => b.toString(16).padStart(2, '0'))
         .join('');
     }
 

package/src/index.ts

@@ -163,6 +163,13 @@ export {
 } from './utils/loggerUtils';
 export type { LogContext } from './utils/loggerUtils';
 
+// --- Avatar Utilities ---
+export { updateAvatarVisibility } from './utils/avatarUtils';
+
+// --- Account Utilities ---
+export { buildAccountsArray, createQuickAccount } from './utils/accountUtils';
+export type { QuickAccount } from './utils/accountUtils';
+
 // Default export
 import { OxyServices } from './OxyServices';
 export default OxyServices;

package/src/mixins/OxyServices.assets.ts

@@ -160,28 +160,27 @@ export function OxyServicesAssetsMixin<T extends typeof OxyServicesBase>(Base: T
     }
 
     /**
-     * Upload file using Central Asset Service
+     * Upload file using Central Asset Service.
+     *
+     * Accepts either a web File/Blob or a React Native file descriptor
+     * ({uri, type, name, size}). RN descriptors are passed directly to
+     * FormData.append, which handles them natively.
      */
-    async assetUpload(file: File, visibility?: 'private' | 'public' | 'unlisted', metadata?: Record<string, any>, onProgress?: (progress: number) => void): Promise<any> {
-      const fileName = file.name || 'unknown';
-      const fileSize = file.size;
-      
+    async assetUpload(file: File | { uri: string; type?: string; name?: string; size?: number }, visibility?: 'private' | 'public' | 'unlisted', metadata?: Record<string, any>, onProgress?: (progress: number) => void): Promise<any> {
+      const fileName = 'name' in file && file.name ? file.name : 'unknown';
+      const fileSize = 'size' in file && file.size ? file.size : 0;
+
       try {
         const formData = new FormData();
-        // Convert File to Blob to avoid read-only 'name' property error in Expo 54
-        // This is a known issue in Expo SDK 52+ where FormData tries to set the read-only 'name' property
-        let fileBlob: Blob;
-        if (file instanceof Blob) {
-          // Already a Blob, use directly
-          fileBlob = file;
-        } else if (typeof (file as any).blob === 'function') {
-          // Use async blob() method if available (Expo 54+ recommended approach)
-          fileBlob = await (file as any).blob();
+
+        if ('uri' in file && typeof file.uri === 'string') {
+          // React Native file descriptor — RN's FormData handles {uri, type, name} natively
+          formData.append('file', file as unknown as Blob, fileName);
+        } else if (file instanceof Blob) {
+          formData.append('file', file, fileName);
         } else {
-          // Fallback: create Blob from File (works in all environments)
-          fileBlob = new Blob([file], { type: (file as any).type || 'application/octet-stream' });
+          formData.append('file', new Blob([file as unknown as BlobPart], { type: 'application/octet-stream' }), fileName);
         }
-        formData.append('file', fileBlob, fileName);
         if (visibility) {
           formData.append('visibility', visibility);
         }

package/src/mixins/OxyServices.user.ts

@@ -93,8 +93,11 @@ export function OxyServicesUserMixin<T extends typeof OxyServicesBase>(Base: T)
       username: string;
       name?: { first?: string; last?: string; full?: string };
       description?: string;
+      isFederated?: boolean;
+      instance?: string;
+      federation?: { actorUri?: string; domain?: string; actorId?: string };
       _count?: { followers: number; following: number };
-      [key: string]: any;
+      [key: string]: unknown;
     }>> {
       return this.withAuthRetry(async () => {
         return await this.makeRequest('GET', '/profiles/recommendations', undefined, { cache: true });

package/src/models/interfaces.ts

@@ -30,6 +30,8 @@ export interface User {
   email?: string;
   // Avatar file id (asset id)
   avatar?: string;
+  // Named color preset (e.g. 'teal', 'blue', 'purple')
+  color?: string;
   // Privacy and security settings
   privacySettings?: {
     [key: string]: unknown;
@@ -58,6 +60,15 @@ export interface User {
     following?: number;
   };
   accountExpiresAfterInactivityDays?: number | null; // Days of inactivity before account expires (null = never expire)
+  // Fediverse / ActivityPub support
+  type?: 'local' | 'federated';
+  isFederated?: boolean;
+  instance?: string;
+  federation?: {
+    actorUri?: string;
+    domain?: string;
+    actorId?: string;
+  };
   [key: string]: unknown;
 }
 

package/src/types/expo-crypto.d.ts

@@ -0,0 +1,16 @@
+declare module 'expo-crypto' {
+  export enum CryptoDigestAlgorithm {
+    SHA256 = 'SHA-256',
+    SHA384 = 'SHA-384',
+    SHA512 = 'SHA-512',
+  }
+
+  export function digestStringAsync(
+    algorithm: CryptoDigestAlgorithm,
+    data: string,
+  ): Promise<string>;
+
+  export function getRandomBytes(byteCount: number): Uint8Array;
+
+  export function getRandomBytesAsync(byteCount: number): Promise<Uint8Array>;
+}

package/src/types/expo-secure-store.d.ts

@@ -0,0 +1,17 @@
+declare module 'expo-secure-store' {
+  export interface SecureStoreOptions {
+    keychainAccessible?: number;
+    keychainAccessGroup?: string;
+    keychainService?: string;
+    requireAuthentication?: boolean;
+  }
+
+  export const WHEN_UNLOCKED: number;
+  export const AFTER_FIRST_UNLOCK: number;
+  export const WHEN_UNLOCKED_THIS_DEVICE_ONLY: number;
+  export const AFTER_FIRST_UNLOCK_THIS_DEVICE_ONLY: number;
+
+  export function getItemAsync(key: string, options?: SecureStoreOptions): Promise<string | null>;
+  export function setItemAsync(key: string, value: string, options?: SecureStoreOptions): Promise<void>;
+  export function deleteItemAsync(key: string, options?: SecureStoreOptions): Promise<void>;
+}

package/src/utils/accountUtils.ts

@@ -0,0 +1,69 @@
+/**
+ * Shared account types and pure helper functions.
+ * Used by both @oxyhq/services (React Native) and @oxyhq/auth (Web) account stores.
+ */
+
+export interface QuickAccount {
+    sessionId: string;
+    userId?: string;
+    username: string;
+    displayName: string;
+    avatar?: string;
+    avatarUrl?: string;
+}
+
+/**
+ * Build an ordered array of QuickAccounts from a map and order list.
+ */
+export const buildAccountsArray = (
+    accounts: Record<string, QuickAccount>,
+    order: string[]
+): QuickAccount[] => {
+    const result: QuickAccount[] = [];
+    for (const id of order) {
+        const account = accounts[id];
+        if (account) result.push(account);
+    }
+    return result;
+};
+
+/**
+ * Create a QuickAccount from user data returned by the API.
+ *
+ * @param sessionId - Session identifier
+ * @param userData - Raw user object from the API
+ * @param existingAccount - Previously cached account (to preserve avatarUrl if unchanged)
+ * @param getFileDownloadUrl - Function to generate avatar download URL from file ID
+ */
+export const createQuickAccount = (
+    sessionId: string,
+    userData: {
+        name?: { full?: string; first?: string };
+        username?: string;
+        id?: string;
+        _id?: { toString(): string } | string;
+        avatar?: string;
+    },
+    existingAccount?: QuickAccount,
+    getFileDownloadUrl?: (fileId: string, variant: string) => string
+): QuickAccount => {
+    const displayName = userData.name?.full || userData.name?.first || userData.username || 'Account';
+    const userId = userData.id || (typeof userData._id === 'string' ? userData._id : userData._id?.toString());
+
+    // Preserve existing avatarUrl if avatar hasn't changed (prevents image reload)
+    let avatarUrl: string | undefined;
+    if (existingAccount && existingAccount.avatar === userData.avatar && existingAccount.avatarUrl) {
+        avatarUrl = existingAccount.avatarUrl;
+    } else if (userData.avatar && getFileDownloadUrl) {
+        avatarUrl = getFileDownloadUrl(userData.avatar, 'thumb');
+    }
+
+    return {
+        sessionId,
+        userId,
+        username: userData.username || '',
+        displayName,
+        avatar: userData.avatar,
+        avatarUrl,
+    };
+};

package/src/utils/avatarUtils.ts

@@ -0,0 +1,37 @@
+/**
+ * Minimal interface for services that can update asset visibility.
+ * Kept loose to avoid mixin type-inference issues with the OxyServices class.
+ */
+export interface AssetVisibilityService {
+  assetUpdateVisibility(fileId: string, visibility: 'private' | 'public' | 'unlisted'): Promise<unknown>;
+}
+
+/**
+ * Updates file visibility to public for avatar use.
+ * Logs non-404 errors to help debug upload issues.
+ *
+ * @param fileId - The file ID to update visibility for
+ * @param oxyServices - OxyServices instance (or any object with assetUpdateVisibility)
+ * @param contextName - Context name for error logging
+ */
+export async function updateAvatarVisibility(
+  fileId: string | undefined,
+  oxyServices: AssetVisibilityService,
+  contextName: string = 'AvatarUtils'
+): Promise<void> {
+  if (!fileId || fileId.startsWith('temp-')) {
+    return;
+  }
+
+  try {
+    await oxyServices.assetUpdateVisibility(fileId, 'public');
+  } catch (visError: unknown) {
+    // 404 is expected when asset doesn't exist yet — skip logging
+    const status = (visError instanceof Error && 'status' in visError)
+      ? (visError as Error & { status: number }).status
+      : undefined;
+    if (status !== 404) {
+      console.error(`[${contextName}] Failed to update avatar visibility for ${fileId}:`, visError);
+    }
+  }
+}