@oxyhq/core 9.2.4 → 10.0.0

package/dist/esm/i18n/index.js

@@ -9,6 +9,7 @@ import jaJP from './locales/ja-JP.json' with { type: "json" };
 import koKR from './locales/ko-KR.json' with { type: "json" };
 import zhCN from './locales/zh-CN.json' with { type: "json" };
 import arSA from './locales/ar-SA.json' with { type: "json" };
+import { getBaseLanguage } from '../utils/languageUtils.js';
 const DICTS = {
     'en': enUS,
     'en-US': enUS,
@@ -34,11 +35,30 @@ const DICTS = {
     'ar-SA': arSA,
 };
 const FALLBACK = 'en-US';
+/**
+ * Resolve a locale tag to the key of the dictionary that should serve it.
+ *
+ * Account locales are full BCP-47 tags (e.g. `es-MX`, `pt-BR`, `fr-CA`), but a
+ * translation dictionary is shipped per base language. Resolution order:
+ *   1. Exact dictionary for the tag (e.g. `es-ES`).
+ *   2. Dictionary for the base subtag (e.g. `es-MX` → `es`).
+ *   3. The English fallback.
+ */
+function resolveLang(locale) {
+    if (locale) {
+        if (DICTS[locale])
+            return locale;
+        const base = getBaseLanguage(locale);
+        if (DICTS[base])
+            return base;
+    }
+    return FALLBACK;
+}
 function getNested(obj, path) {
     return path.split('.').reduce((acc, key) => (acc && acc[key] != null ? acc[key] : undefined), obj);
 }
 export function translate(locale, key, vars) {
-    const lang = locale && DICTS[locale] ? locale : FALLBACK;
+    const lang = resolveLang(locale);
     const dict = DICTS[lang] || DICTS[FALLBACK];
     let val = getNested(dict, key);
     // Per-key fallback to the English dictionary when a key is missing from the
@@ -58,6 +78,6 @@ export function translate(locale, key, vars) {
     return val;
 }
 export function hasKey(locale, key) {
-    const lang = locale && DICTS[locale] ? locale : FALLBACK;
+    const lang = resolveLang(locale);
     return getNested(DICTS[lang], key) != null || getNested(DICTS[FALLBACK], key) != null;
 }

package/dist/esm/i18n/locales/en-US.json

@@ -169,9 +169,12 @@
     },
     "language": {
         "title": "Language",
-        "subtitle": "Choose your preferred language",
+        "subtitle": "Choose the languages you use. The first is your primary interface language.",
         "current": "Current Language",
+        "selected": "Your languages",
         "available": "Available Languages",
+        "primary": "Primary",
+        "remove": "Remove",
         "changed": "Language changed to {{lang}}",
         "saveFailed": "Failed to save language preference",
         "search": "Search languages"

package/dist/esm/i18n/locales/es-ES.json

@@ -123,9 +123,12 @@
     },
     "language": {
         "title": "Idioma",
-        "subtitle": "Elige tu idioma preferido",
+        "subtitle": "Elige los idiomas que usas. El primero es tu idioma de interfaz principal.",
         "current": "Idioma actual",
+        "selected": "Tus idiomas",
         "available": "Idiomas disponibles",
+        "primary": "Principal",
+        "remove": "Quitar",
         "changed": "Idioma cambiado a {{lang}}",
         "saveFailed": "Error al guardar la preferencia de idioma",
         "search": "Buscar idiomas"

package/dist/esm/i18n/locales/locales/en-US.json

@@ -169,9 +169,12 @@
   },
   "language": {
     "title": "Language",
-    "subtitle": "Choose your preferred language",
+    "subtitle": "Choose the languages you use. The first is your primary interface language.",
     "current": "Current Language",
+    "selected": "Your languages",
     "available": "Available Languages",
+    "primary": "Primary",
+    "remove": "Remove",
     "changed": "Language changed to {{lang}}",
     "saveFailed": "Failed to save language preference",
     "search": "Search languages"

package/dist/esm/i18n/locales/locales/es-ES.json

@@ -123,9 +123,12 @@
   },
   "language": {
     "title": "Idioma",
-    "subtitle": "Elige tu idioma preferido",
+    "subtitle": "Elige los idiomas que usas. El primero es tu idioma de interfaz principal.",
     "current": "Idioma actual",
+    "selected": "Tus idiomas",
     "available": "Idiomas disponibles",
+    "primary": "Principal",
+    "remove": "Quitar",
     "changed": "Idioma cambiado a {{lang}}",
     "saveFailed": "Error al guardar la preferencia de idioma",
     "search": "Buscar idiomas"

package/dist/esm/index.js

@@ -75,7 +75,7 @@ export { TopicType, TopicSource } from './models/Topic.js';
 // ---------------------------------------------------------------------------
 // Languages
 // ---------------------------------------------------------------------------
-export { SUPPORTED_LANGUAGES, getLanguageMetadata, getLanguageName, getNativeLanguageName, normalizeLanguageCode, isRTLLocale, } from './utils/languageUtils.js';
+export { SUPPORTED_LANGUAGES, FALLBACK_LOCALE, getBaseLanguage, normalizeLocale, isSupportedLocale, getLanguageMetadata, getLanguageName, getNativeLanguageName, isRTLLocale, getUserLanguages, getPrimaryLanguage, } from './utils/languageUtils.js';
 // ---------------------------------------------------------------------------
 // Platform detection
 // ---------------------------------------------------------------------------

package/dist/esm/mixins/OxyServices.assets.js

@@ -365,14 +365,18 @@ export function OxyServicesAssetsMixin(Base) {
                     errorMessage = error.message || errorMessage;
                 }
                 else if (error && typeof error === 'object') {
-                    if ('message' in error) {
-                        errorMessage = String(error.message) || errorMessage;
+                    const errObj = error;
+                    if ('message' in errObj) {
+                        errorMessage = String(errObj.message) || errorMessage;
                     }
-                    else if ('error' in error && typeof error.error === 'string') {
-                        errorMessage = error.error;
+                    else if (typeof errObj.error === 'string') {
+                        errorMessage = errObj.error;
                     }
-                    else if ('data' in error && error.data?.message) {
-                        errorMessage = String(error.data.message);
+                    else if (errObj.data && typeof errObj.data === 'object') {
+                        const dataObj = errObj.data;
+                        if (dataObj.message) {
+                            errorMessage = String(dataObj.message);
+                        }
                     }
                 }
                 else if (error) {

package/dist/esm/mixins/OxyServices.language.js

@@ -1,7 +1,7 @@
 /**
  * Language Methods Mixin
  */
-import { normalizeLanguageCode, getLanguageMetadata, getLanguageName, getNativeLanguageName } from '../utils/languageUtils.js';
+import { normalizeLocale, getPrimaryLanguage, getLanguageMetadata, getLanguageName, getNativeLanguageName } from '../utils/languageUtils.js';
 import { loadAsyncStorage } from '@oxyhq/protocol';
 import { isDev } from '../shared/utils/debugUtils.js';
 export function OxyServicesLanguageMixin(Base) {
@@ -55,29 +55,30 @@ export function OxyServicesLanguageMixin(Base) {
             }
         }
         /**
-         * Get the current language from storage or user profile
+         * Get the current locale from the user profile or local storage.
          * @param storageKeyPrefix - Optional prefix for storage key (default: 'oxy_session')
-         * @returns The current language code (e.g., 'en-US') or null if not set
+         * @returns The current BCP-47 locale (e.g., 'en-US') or null if not set
          */
         async getCurrentLanguage(storageKeyPrefix = 'oxy_session') {
             try {
-                // First try to get from user profile if authenticated
+                // First try the authenticated user's primary account locale.
                 try {
                     const user = await this.getCurrentUser();
-                    const userLanguage = user?.language;
-                    if (userLanguage) {
-                        return normalizeLanguageCode(userLanguage) || userLanguage;
+                    const primary = getPrimaryLanguage(user);
+                    if (primary) {
+                        return primary;
                     }
                 }
-                catch (e) {
-                    // User not authenticated or error, continue to storage
+                catch {
+                    // Not authenticated or the profile fetch failed — fall through to the
+                    // locally stored preference below.
                 }
-                // Fall back to storage
+                // Fall back to the locally stored locale preference.
                 const storage = await this.getStorage();
                 const storageKey = `${storageKeyPrefix}_language`;
                 const storedLanguage = await storage.getItem(storageKey);
                 if (storedLanguage) {
-                    return normalizeLanguageCode(storedLanguage) || storedLanguage;
+                    return normalizeLocale(storedLanguage) ?? storedLanguage;
                 }
                 return null;
             }

package/dist/esm/mixins/OxyServices.privacy.js

@@ -70,6 +70,9 @@ export function OxyServicesPrivacyMixin(Base) {
                     cache: false,
                 });
                 this.clearCacheEntry('GET:/privacy/blocked');
+                // The block changed the viewer's graph (`blockedIds`) — bust the cached
+                // consolidated `GET /users/me/graph` so the next read reflects it.
+                this.clearCacheEntry('GET:/users/me/graph');
                 return result;
             }
             catch (error) {
@@ -93,6 +96,9 @@ export function OxyServicesPrivacyMixin(Base) {
                     cache: false,
                 });
                 this.clearCacheEntry('GET:/privacy/blocked');
+                // Symmetric to blockUser: the unblock changed the viewer's `blockedIds`,
+                // so bust the consolidated `GET /users/me/graph` cache.
+                this.clearCacheEntry('GET:/users/me/graph');
                 return result;
             }
             catch (error) {

package/dist/esm/mixins/OxyServices.user.js

@@ -509,6 +509,10 @@ export function OxyServicesUserMixin(Base) {
             try {
                 const result = await this.makeRequest('POST', `/users/${userId}/follow`, undefined, { cache: false });
                 this.clearCacheEntry(`GET:/users/${userId}/follow-status`);
+                // The follow changed the viewer's graph — bust the cached consolidated
+                // `GET /users/me/graph` so the next read reflects the new following/
+                // mutual set instead of the stale pre-write snapshot.
+                this.clearCacheEntry('GET:/users/me/graph');
                 return result;
             }
             catch (error) {
@@ -533,6 +537,8 @@ export function OxyServicesUserMixin(Base) {
                 for (const id of userIds) {
                     this.clearCacheEntry(`GET:/users/${id}/follow-status`);
                 }
+                // The batch changed the viewer's graph — bust the consolidated cache.
+                this.clearCacheEntry('GET:/users/me/graph');
                 return result;
             }
             catch (error) {
@@ -557,6 +563,8 @@ export function OxyServicesUserMixin(Base) {
                 for (const id of userIds) {
                     this.clearCacheEntry(`GET:/users/${id}/follow-status`);
                 }
+                // The batch changed the viewer's graph — bust the consolidated cache.
+                this.clearCacheEntry('GET:/users/me/graph');
                 return result;
             }
             catch (error) {
@@ -571,6 +579,8 @@ export function OxyServicesUserMixin(Base) {
                 const result = await this.makeRequest('DELETE', `/users/${userId}/follow`, undefined, { cache: false });
                 // Bust the cached follow-status so a remount reads fresh truth (see `followUser`).
                 this.clearCacheEntry(`GET:/users/${userId}/follow-status`);
+                // The unfollow changed the viewer's graph — bust the consolidated cache.
+                this.clearCacheEntry('GET:/users/me/graph');
                 return result;
             }
             catch (error) {
@@ -702,6 +712,36 @@ export function OxyServicesUserMixin(Base) {
                 throw this.handleError(error);
             }
         }
+        /**
+         * Get the authenticated VIEWER's OWN social graph — the accounts they follow,
+         * the subset who follow back (mutuals), and the accounts they have blocked —
+         * as ONE ids-only payload. The viewer is derived server-side from the SDK's
+         * auth token (never a param).
+         *
+         * Consolidates what were three separate round trips (`getUserFollowing` /
+         * `getMutualUserIds` / `getBlockedUsers`) into a single request so a consumer
+         * can prime its whole viewer graph at once. Mirrors {@link getMutualUserIds}'s
+         * caching posture (2-minute identity-scoped cache); the follow/unfollow/block/
+         * unblock write methods bust this entry so a local mutation is reflected
+         * immediately. An anonymous caller resolves to empty lists.
+         */
+        async getViewerGraph() {
+            try {
+                const response = await this.makeRequest('GET', '/users/me/graph', undefined, {
+                    cache: true,
+                    cacheTTL: 2 * 60 * 1000, // 2 minutes cache
+                });
+                const graph = response.data;
+                return {
+                    followingIds: graph?.followingIds || [],
+                    mutualIds: graph?.mutualIds || [],
+                    blockedIds: graph?.blockedIds || [],
+                };
+            }
+            catch (error) {
+                throw this.handleError(error);
+            }
+        }
         /**
          * Get notifications
          */

package/dist/esm/server/safeFetch.js

@@ -155,7 +155,7 @@ function ipv6ToGroups(ip) {
         for (const part of segment.split(':')) {
             if (!/^[0-9a-fA-F]{1,4}$/.test(part))
                 return null;
-            groups.push(parseInt(part, 16));
+            groups.push(Number.parseInt(part, 16));
         }
         return groups;
     };
@@ -205,8 +205,8 @@ function extractEmbeddedIpv4(ip) {
     // Hex form "::ffff:0102:0304" → 1.2.3.4
     const hexMapped = lower.match(/^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/);
     if (hexMapped) {
-        const hi = parseInt(hexMapped[1], 16);
-        const lo = parseInt(hexMapped[2], 16);
+        const hi = Number.parseInt(hexMapped[1], 16);
+        const lo = Number.parseInt(hexMapped[2], 16);
         return `${(hi >> 8) & 0xff}.${hi & 0xff}.${(lo >> 8) & 0xff}.${lo & 0xff}`;
     }
     return null;

package/dist/esm/session/SessionClient.js

@@ -274,7 +274,7 @@ export class SessionClient {
             transports: ['websocket'],
             autoConnect: true,
             reconnection: true,
-            reconnectionAttempts: Infinity,
+            reconnectionAttempts: Number.POSITIVE_INFINITY,
             reconnectionDelay: 1000,
             reconnectionDelayMax: 10000,
             auth: (cb) => {

package/dist/esm/shared/utils/colorUtils.js

@@ -21,9 +21,9 @@
  */
 export const darkenColor = (color, factor = 0.6) => {
     const hex = color.replace('#', '');
-    const r = parseInt(hex.substring(0, 2), 16);
-    const g = parseInt(hex.substring(2, 4), 16);
-    const b = parseInt(hex.substring(4, 6), 16);
+    const r = Number.parseInt(hex.substring(0, 2), 16);
+    const g = Number.parseInt(hex.substring(2, 4), 16);
+    const b = Number.parseInt(hex.substring(4, 6), 16);
     const newR = Math.max(0, Math.round(r * (1 - factor)));
     const newG = Math.max(0, Math.round(g * (1 - factor)));
     const newB = Math.max(0, Math.round(b * (1 - factor)));
@@ -43,9 +43,9 @@ export const darkenColor = (color, factor = 0.6) => {
  */
 export const lightenColor = (color, factor = 0.3) => {
     const hex = color.replace('#', '');
-    const r = parseInt(hex.substring(0, 2), 16);
-    const g = parseInt(hex.substring(2, 4), 16);
-    const b = parseInt(hex.substring(4, 6), 16);
+    const r = Number.parseInt(hex.substring(0, 2), 16);
+    const g = Number.parseInt(hex.substring(2, 4), 16);
+    const b = Number.parseInt(hex.substring(4, 6), 16);
     const newR = Math.min(255, Math.round(r + (255 - r) * factor));
     const newG = Math.min(255, Math.round(g + (255 - g) * factor));
     const newB = Math.min(255, Math.round(b + (255 - b) * factor));
@@ -66,9 +66,9 @@ export const hexToRgb = (hex) => {
     const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
     return result
         ? {
-            r: parseInt(result[1], 16),
-            g: parseInt(result[2], 16),
-            b: parseInt(result[3], 16),
+            r: Number.parseInt(result[1], 16),
+            g: Number.parseInt(result[2], 16),
+            b: Number.parseInt(result[3], 16),
         }
         : null;
 };