@shaxpir/duiduidui-models 1.6.16 → 1.6.18

package/dist/models/Workspace.d.ts

@@ -16,6 +16,7 @@ export interface WorkspacePayload {
         [key: string]: CompactDateTime;
     };
     global_conditions: ConditionFilters;
+    uploaded_avatars: ContentId[];
 }
 export interface WorkspaceBody extends ContentBody {
     meta: ContentMeta;
@@ -24,6 +25,7 @@ export interface WorkspaceBody extends ContentBody {
 export declare class Workspace extends Content {
     private _devicesView;
     private _sessionsView;
+    private _uploadedAvatarsView;
     constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
     get payload(): WorkspacePayload;
     getGlobalConditions(): ConditionFilters;
@@ -31,6 +33,7 @@ export declare class Workspace extends Content {
     static create(userId: ContentId, payload: WorkspacePayload): Workspace;
     get sessions(): ArrayView<MultiTime>;
     get devices(): ArrayView<ContentId>;
+    get uploadedAvatars(): ArrayView<ContentId>;
     acquireSessionForUtcTime(utcTime: CompactDateTime): Promise<Session | null>;
     acquireSessionsFromDate(localDate: CompactDate): Promise<Session[]>;
     hasJourneyDate(journeyKey: string): boolean;

package/dist/models/Workspace.js

@@ -13,6 +13,7 @@ class Workspace extends Content_1.Content {
         super(doc, shouldAcquire, shareSync);
         this._devicesView = new ArrayView_1.ArrayView(this, ['payload', 'devices']);
         this._sessionsView = new ArrayView_1.ArrayView(this, ['payload', 'sessions']);
+        this._uploadedAvatarsView = new ArrayView_1.ArrayView(this, ['payload', 'uploaded_avatars']);
     }
     get payload() {
         return this.doc.data.payload;
@@ -49,6 +50,10 @@ class Workspace extends Content_1.Content {
         this.checkDisposed("Workspace.devices");
         return this._devicesView;
     }
+    get uploadedAvatars() {
+        this.checkDisposed("Workspace.uploadedAvatars");
+        return this._uploadedAvatarsView;
+    }
     async acquireSessionForUtcTime(utcTime) {
         this.checkDisposed("Workspace.acquireSessionForUtcTime");
         const shareSync = repo_1.ShareSyncFactory.get();

package/dist/repo/ShareSync.d.ts

@@ -44,6 +44,10 @@ export declare class ShareSync {
     private _socket;
     private _connection;
     private _listener;
+    private _onSocketOpen;
+    private _onSocketMessage;
+    private _onSocketClose;
+    private _onSocketError;
     private _storage;
     private _durableStore;
     private _storageFactory?;

package/dist/repo/ShareSync.js

@@ -96,26 +96,31 @@ class ShareSync {
             shareSync._socket = new reconnecting_websocket_1.default(options.urlProvider);
         }
         function updateSocketIsOpen() {
-            shareSync._socketIsOpen = shareSync._socket.readyState === reconnecting_websocket_1.default.OPEN;
+            shareSync._socketIsOpen = shareSync._socket ? shareSync._socket.readyState === reconnecting_websocket_1.default.OPEN : false;
         }
         // The listener should forward all events: open, message, close, error
         shareSync._listener = options.connectionListener;
-        shareSync._socket.addEventListener('open', (event) => {
+        // Store event handlers as instance variables so we can remove them during shutdown
+        shareSync._onSocketOpen = (event) => {
             updateSocketIsOpen();
             shareSync._listener.onSocketEvent('open', event);
-        });
-        shareSync._socket.addEventListener('message', (event) => {
+        };
+        shareSync._onSocketMessage = (event) => {
             updateSocketIsOpen();
             shareSync._listener.onSocketEvent('message', event);
-        });
-        shareSync._socket.addEventListener('close', (event) => {
+        };
+        shareSync._onSocketClose = (event) => {
             updateSocketIsOpen();
             shareSync._listener.onSocketEvent('close', event);
-        });
-        shareSync._socket.addEventListener('error', (event) => {
+        };
+        shareSync._onSocketError = (event) => {
             updateSocketIsOpen();
             shareSync._listener.onSocketEvent('error', event);
-        });
+        };
+        shareSync._socket.addEventListener('open', shareSync._onSocketOpen);
+        shareSync._socket.addEventListener('message', shareSync._onSocketMessage);
+        shareSync._socket.addEventListener('close', shareSync._onSocketClose);
+        shareSync._socket.addEventListener('error', shareSync._onSocketError);
         // Initialize DurableStore first if enabled, then create connection with it
         if (shareSync._hasDurableStore) {
             shareSync.initializeDurableStore(options).then(() => {
@@ -472,8 +477,20 @@ class ShareSync {
     }
     shutdown() {
         console.log('[ShareSync] Shutting down...');
-        // Close the WebSocket connection
+        // Remove event listeners before closing the socket to prevent handlers from firing during shutdown
         if (this._socket) {
+            if (this._onSocketOpen) {
+                this._socket.removeEventListener('open', this._onSocketOpen);
+            }
+            if (this._onSocketMessage) {
+                this._socket.removeEventListener('message', this._onSocketMessage);
+            }
+            if (this._onSocketClose) {
+                this._socket.removeEventListener('close', this._onSocketClose);
+            }
+            if (this._onSocketError) {
+                this._socket.removeEventListener('error', this._onSocketError);
+            }
             this._socket.close();
             this._socket = null;
         }

package/dist/util/AvatarUri.d.ts

@@ -0,0 +1,72 @@
+import { ContentId } from '../models/Content';
+/**
+ * Zodiac animals in the Chinese zodiac cycle
+ */
+export declare enum ZodiacAnimal {
+    RAT = "rat",
+    OX = "ox",
+    TIGER = "tiger",
+    RABBIT = "rabbit",
+    DRAGON = "dragon",
+    SNAKE = "snake",
+    HORSE = "horse",
+    GOAT = "goat",
+    MONKEY = "monkey",
+    ROOSTER = "rooster",
+    DOG = "dog",
+    PIG = "pig"
+}
+/**
+ * Zodiac animal names in English and Chinese
+ */
+export declare const ZODIAC_NAMES: Record<ZodiacAnimal, {
+    english: string;
+    chinese: string;
+}>;
+/**
+ * Get all zodiac animals in order
+ */
+export declare function getAllZodiacAnimals(): ZodiacAnimal[];
+/**
+ * Calculate zodiac animal from birth year
+ */
+export declare function getZodiacAnimalFromYear(year: number): ZodiacAnimal;
+/**
+ * Avatar URI types
+ */
+export declare enum AvatarUriType {
+    ZODIAC = "zodiac",
+    IMAGE = "image"
+}
+/**
+ * Create a zodiac avatar URI
+ */
+export declare function createZodiacAvatarUri(animal: ZodiacAnimal): string;
+/**
+ * Create an image avatar URI from a ContentId
+ */
+export declare function createImageAvatarUri(imageId: ContentId): string;
+/**
+ * Parse an avatar URI
+ */
+export interface ParsedAvatarUri {
+    type: AvatarUriType;
+    value: string;
+}
+export declare function parseAvatarUri(uri: string | ContentId | null): ParsedAvatarUri | null;
+/**
+ * Check if a URI is a zodiac avatar
+ */
+export declare function isZodiacAvatar(uri: string | ContentId | null): boolean;
+/**
+ * Check if a URI is an image avatar
+ */
+export declare function isImageAvatar(uri: string | ContentId | null): boolean;
+/**
+ * Get zodiac animal from avatar URI (returns null if not a zodiac avatar)
+ */
+export declare function getZodiacAnimalFromUri(uri: string | ContentId | null): ZodiacAnimal | null;
+/**
+ * Get image ContentId from avatar URI (returns null if not an image avatar)
+ */
+export declare function getImageIdFromUri(uri: string | ContentId | null): ContentId | null;

package/dist/util/AvatarUri.js

@@ -0,0 +1,149 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AvatarUriType = exports.ZODIAC_NAMES = exports.ZodiacAnimal = void 0;
+exports.getAllZodiacAnimals = getAllZodiacAnimals;
+exports.getZodiacAnimalFromYear = getZodiacAnimalFromYear;
+exports.createZodiacAvatarUri = createZodiacAvatarUri;
+exports.createImageAvatarUri = createImageAvatarUri;
+exports.parseAvatarUri = parseAvatarUri;
+exports.isZodiacAvatar = isZodiacAvatar;
+exports.isImageAvatar = isImageAvatar;
+exports.getZodiacAnimalFromUri = getZodiacAnimalFromUri;
+exports.getImageIdFromUri = getImageIdFromUri;
+/**
+ * Zodiac animals in the Chinese zodiac cycle
+ */
+var ZodiacAnimal;
+(function (ZodiacAnimal) {
+    ZodiacAnimal["RAT"] = "rat";
+    ZodiacAnimal["OX"] = "ox";
+    ZodiacAnimal["TIGER"] = "tiger";
+    ZodiacAnimal["RABBIT"] = "rabbit";
+    ZodiacAnimal["DRAGON"] = "dragon";
+    ZodiacAnimal["SNAKE"] = "snake";
+    ZodiacAnimal["HORSE"] = "horse";
+    ZodiacAnimal["GOAT"] = "goat";
+    ZodiacAnimal["MONKEY"] = "monkey";
+    ZodiacAnimal["ROOSTER"] = "rooster";
+    ZodiacAnimal["DOG"] = "dog";
+    ZodiacAnimal["PIG"] = "pig";
+})(ZodiacAnimal || (exports.ZodiacAnimal = ZodiacAnimal = {}));
+/**
+ * Zodiac animal names in English and Chinese
+ */
+exports.ZODIAC_NAMES = {
+    [ZodiacAnimal.RAT]: { english: 'Rat', chinese: '鼠' },
+    [ZodiacAnimal.OX]: { english: 'Ox', chinese: '牛' },
+    [ZodiacAnimal.TIGER]: { english: 'Tiger', chinese: '虎' },
+    [ZodiacAnimal.RABBIT]: { english: 'Rabbit', chinese: '兔' },
+    [ZodiacAnimal.DRAGON]: { english: 'Dragon', chinese: '龙' },
+    [ZodiacAnimal.SNAKE]: { english: 'Snake', chinese: '蛇' },
+    [ZodiacAnimal.HORSE]: { english: 'Horse', chinese: '马' },
+    [ZodiacAnimal.GOAT]: { english: 'Goat', chinese: '羊' },
+    [ZodiacAnimal.MONKEY]: { english: 'Monkey', chinese: '猴' },
+    [ZodiacAnimal.ROOSTER]: { english: 'Rooster', chinese: '鸡' },
+    [ZodiacAnimal.DOG]: { english: 'Dog', chinese: '狗' },
+    [ZodiacAnimal.PIG]: { english: 'Pig', chinese: '猪' }
+};
+/**
+ * Get all zodiac animals in order
+ */
+function getAllZodiacAnimals() {
+    return [
+        ZodiacAnimal.RAT,
+        ZodiacAnimal.OX,
+        ZodiacAnimal.TIGER,
+        ZodiacAnimal.RABBIT,
+        ZodiacAnimal.DRAGON,
+        ZodiacAnimal.SNAKE,
+        ZodiacAnimal.HORSE,
+        ZodiacAnimal.GOAT,
+        ZodiacAnimal.MONKEY,
+        ZodiacAnimal.ROOSTER,
+        ZodiacAnimal.DOG,
+        ZodiacAnimal.PIG
+    ];
+}
+/**
+ * Calculate zodiac animal from birth year
+ */
+function getZodiacAnimalFromYear(year) {
+    const animals = getAllZodiacAnimals();
+    // The Chinese zodiac follows a 12-year cycle starting from Rat
+    // 1924, 1936, 1948, 1960, 1972, 1984, 1996, 2008, 2020 are Rat years
+    const index = (year - 4) % 12;
+    return animals[index];
+}
+/**
+ * Avatar URI types
+ */
+var AvatarUriType;
+(function (AvatarUriType) {
+    AvatarUriType["ZODIAC"] = "zodiac";
+    AvatarUriType["IMAGE"] = "image";
+})(AvatarUriType || (exports.AvatarUriType = AvatarUriType = {}));
+/**
+ * Create a zodiac avatar URI
+ */
+function createZodiacAvatarUri(animal) {
+    return `duiduidui://${AvatarUriType.ZODIAC}/${animal}`;
+}
+/**
+ * Create an image avatar URI from a ContentId
+ */
+function createImageAvatarUri(imageId) {
+    return `duiduidui://${AvatarUriType.IMAGE}/${imageId}`;
+}
+function parseAvatarUri(uri) {
+    if (!uri) {
+        return null;
+    }
+    // Check if it's a duiduidui:// URI
+    if (uri.startsWith('duiduidui://')) {
+        const parts = uri.substring('duiduidui://'.length).split('/');
+        if (parts.length >= 2) {
+            const type = parts[0];
+            const value = parts.slice(1).join('/');
+            return { type, value };
+        }
+    }
+    // Backward compatibility: if it's not a URI, treat it as a ContentId (image)
+    return {
+        type: AvatarUriType.IMAGE,
+        value: uri
+    };
+}
+/**
+ * Check if a URI is a zodiac avatar
+ */
+function isZodiacAvatar(uri) {
+    const parsed = parseAvatarUri(uri);
+    return parsed?.type === AvatarUriType.ZODIAC;
+}
+/**
+ * Check if a URI is an image avatar
+ */
+function isImageAvatar(uri) {
+    const parsed = parseAvatarUri(uri);
+    return parsed?.type === AvatarUriType.IMAGE;
+}
+/**
+ * Get zodiac animal from avatar URI (returns null if not a zodiac avatar)
+ */
+function getZodiacAnimalFromUri(uri) {
+    const parsed = parseAvatarUri(uri);
+    if (parsed?.type === AvatarUriType.ZODIAC) {
+        return parsed.value;
+    }
+    return null;
+}
+/**
+ * Get image ContentId from avatar URI (returns null if not an image avatar)
+ */
+function getImageIdFromUri(uri) {
+    const parsed = parseAvatarUri(uri);
+    if (parsed?.type === AvatarUriType.IMAGE) {
+        return parsed.value;
+    }
+    return null;
+}

package/dist/util/index.d.ts

@@ -1,2 +1,3 @@
+export * from './AvatarUri';
 export * from './Encryption';
 export * from './Logging';

package/dist/util/index.js

@@ -15,5 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./AvatarUri"), exports);
 __exportStar(require("./Encryption"), exports);
 __exportStar(require("./Logging"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaxpir/duiduidui-models",
-  "version": "1.6.16",
+  "version": "1.6.18",
   "repository": {
     "type": "git",
     "url": "https://github.com/shaxpir/duiduidui-models"
@@ -21,6 +21,7 @@
     "@shaxpir/shaxpir-common": "1.4.0",
     "ot-json1": "1.0.1",
     "ot-text-unicode": "4.0.0",
+    "react-native-popover-view": "^6.1.0",
     "reconnecting-websocket": "4.4.0"
   },
   "devDependencies": {