@pluv/client 0.41.2 → 0.41.4

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/client@0.41.2 build /home/runner/work/pluv/pluv/packages/client
+> @pluv/client@0.41.4 build /home/runner/work/pluv/pluv/packages/client
 > tsup src/index.ts --format esm,cjs --dts
 
 CLI Building entry: src/index.ts
@@ -8,11 +8,11 @@
 CLI Target: es6
 ESM Build start
 CJS Build start
-ESM dist/index.mjs 54.44 KB
-ESM ⚡️ Build success in 116ms
-CJS dist/index.js 55.76 KB
-CJS ⚡️ Build success in 116ms
+ESM dist/index.mjs 55.36 KB
+ESM ⚡️ Build success in 130ms
+CJS dist/index.js 56.67 KB
+CJS ⚡️ Build success in 132ms
 DTS Build start
-DTS ⚡️ Build success in 3794ms
+DTS ⚡️ Build success in 3238ms
 DTS dist/index.d.mts 24.58 KB
 DTS dist/index.d.ts  24.58 KB

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @pluv/client
 
+## 0.41.4
+
+### Patch Changes
+
+- @pluv/crdt@0.41.4
+- @pluv/types@0.41.4
+
+## 0.41.3
+
+### Patch Changes
+
+- 49051c0: Fix presence keys becoming lost, causing presence objects to be partial and failing schema validation.
+  - @pluv/crdt@0.41.3
+  - @pluv/types@0.41.3
+
 ## 0.41.2
 
 ### Patch Changes

package/dist/index.js

@@ -320,6 +320,37 @@ var StorageStore = class extends AbstractStorageStore {
 // src/constants.ts
 var MAX_PRESENCE_SIZE_BYTES = 512;
 
+// src/utils/debounce.ts
+var debounce = (fn, options) => {
+  const { wait, immediate = false } = options != null ? options : {};
+  let prevResult;
+  let timeout = null;
+  return (...args) => {
+    if (typeof timeout === "number") clearTimeout(timeout);
+    timeout = setTimeout(() => {
+      timeout = null;
+      if (!immediate) prevResult = fn(args);
+    }, wait);
+    if (immediate && !timeout) {
+      fn(args);
+      return;
+    }
+    return prevResult;
+  };
+};
+
+// src/utils/pickBy.ts
+var pickBy = (obj, by) => {
+  const result = {};
+  const keys = Object.keys(obj);
+  for (let i = 0; i < keys.length; ++i) {
+    const key = keys[i];
+    const value = obj[key];
+    if (by(value)) result[key] = value;
+  }
+  return result;
+};
+
 // src/UsersManager.ts
 var UsersManager = class {
   constructor(config) {
@@ -346,9 +377,9 @@ var UsersManager = class {
   }
   addConnection(userInfo) {
     var _a;
-    const data = __spreadProps(__spreadValues({}, userInfo), {
-      presence: (_a = userInfo.presence) != null ? _a : this.initialPresence
-    });
+    const cleaned = pickBy((_a = userInfo.presence) != null ? _a : {}, (value) => typeof value !== "undefined");
+    const presence = __spreadValues(__spreadValues({}, this.initialPresence), cleaned);
+    const data = __spreadProps(__spreadValues({}, userInfo), { presence });
     const myClientId = !!this._myself ? this.getClientId(this._myself) : null;
     const clientId = this.getClientId(data);
     const remaining = this._setConnectionId(userInfo.connectionId, clientId).size;
@@ -414,13 +445,16 @@ var UsersManager = class {
     return Array.from(this._others.values());
   }
   patchPresence(connectionId, patch) {
+    var _a;
     const clientId = this.getClientId(connectionId);
     const myClientId = !!this._myself ? this.getClientId(this._myself) : null;
     if (!clientId) return null;
     if (myClientId === clientId) return this.updateMyPresence(patch);
     const other = this._others.get(clientId);
     if (!other) return null;
-    const presence = __spreadValues(__spreadValues({}, other.presence), patch);
+    const cleanedPatch = pickBy(patch != null ? patch : {}, (value) => typeof value !== "undefined");
+    const cleanedPresence = pickBy((_a = other.presence) != null ? _a : {}, (value) => typeof value !== "undefined");
+    const presence = __spreadValues(__spreadValues(__spreadValues({}, this.initialPresence), cleanedPresence), cleanedPatch);
     const validated = this._presence ? this._presence.parse(presence) : presence;
     this._others.set(clientId, __spreadProps(__spreadValues({}, other), { presence: validated }));
     return validated;
@@ -455,10 +489,14 @@ var UsersManager = class {
     this._others.set(clientId, __spreadProps(__spreadValues({}, other), { presence }));
   }
   /**
-   * @description This method need not care about being connected.
+   * @description This method need not care about being connected. This is because a user should
+   * be able to view and update their own presence without being online
+   * @date April 20, 2025
    */
   updateMyPresence(patch) {
-    const updated = __spreadValues(__spreadValues({}, this._myPresence), patch);
+    const cleanedPatch = pickBy(patch, (value) => typeof value !== "undefined");
+    const cleanedPresence = pickBy(this._myPresence, (value) => typeof value !== "undefined");
+    const updated = __spreadValues(__spreadValues(__spreadValues({}, this.initialPresence), cleanedPresence), cleanedPatch);
     const bytes = new TextEncoder().encode(JSON.stringify(updated)).length;
     if (bytes > MAX_PRESENCE_SIZE_BYTES) {
       throw new Error(
@@ -505,25 +543,6 @@ var ConnectionState = /* @__PURE__ */ ((ConnectionState2) => {
   return ConnectionState2;
 })(ConnectionState || {});
 
-// src/utils/debounce.ts
-var debounce = (fn, options) => {
-  const { wait, immediate = false } = options != null ? options : {};
-  let prevResult;
-  let timeout = null;
-  return (...args) => {
-    if (typeof timeout === "number") clearTimeout(timeout);
-    timeout = setTimeout(() => {
-      timeout = null;
-      if (!immediate) prevResult = fn(args);
-    }, wait);
-    if (immediate && !timeout) {
-      fn(args);
-      return;
-    }
-    return prevResult;
-  };
-};
-
 // src/PluvRoom.ts
 var ADD_TO_STORAGE_STATE_DEBOUNCE_MS = 1e3;
 var HEARTBEAT_INTERVAL_MS = 1e4;
@@ -989,7 +1008,7 @@ var PluvRoom = class extends AbstractRoom {
     } else {
       const added = this._usersManager.addConnection({
         connectionId,
-        presence: __spreadValues(__spreadValues({}, this._usersManager.initialPresence), data.presence),
+        presence: data.presence,
         user: message.user
       });
       const other = this._usersManager.getOther(connectionId);
@@ -1006,7 +1025,7 @@ var PluvRoom = class extends AbstractRoom {
       const { presence, user } = data.others[connectionId];
       const result = this._usersManager.addConnection({
         connectionId,
-        presence: presence != null ? presence : void 0,
+        presence,
         user
       });
       if (!!presence) this._usersManager.patchPresence(connectionId, presence);
@@ -1269,13 +1288,15 @@ var PluvRoom = class extends AbstractRoom {
       if (typeof document === "undefined") return;
       if (document.visibilityState !== "visible") return;
       switch (this._state.connection.state) {
-        case "Open" /* Open */:
+        case "Open" /* Open */: {
           this._clearInterval(this._intervals.heartbeat);
           setInterval(this._heartbeat.bind(this), HEARTBEAT_INTERVAL_MS);
           return;
-        case "Unavailable" /* Unavailable */:
+        }
+        case "Unavailable" /* Unavailable */: {
           yield this._reconnect();
           return;
+        }
         default:
       }
     });

package/dist/index.mjs

@@ -289,6 +289,37 @@ var StorageStore = class extends AbstractStorageStore {
 // src/constants.ts
 var MAX_PRESENCE_SIZE_BYTES = 512;
 
+// src/utils/debounce.ts
+var debounce = (fn, options) => {
+  const { wait, immediate = false } = options != null ? options : {};
+  let prevResult;
+  let timeout = null;
+  return (...args) => {
+    if (typeof timeout === "number") clearTimeout(timeout);
+    timeout = setTimeout(() => {
+      timeout = null;
+      if (!immediate) prevResult = fn(args);
+    }, wait);
+    if (immediate && !timeout) {
+      fn(args);
+      return;
+    }
+    return prevResult;
+  };
+};
+
+// src/utils/pickBy.ts
+var pickBy = (obj, by) => {
+  const result = {};
+  const keys = Object.keys(obj);
+  for (let i = 0; i < keys.length; ++i) {
+    const key = keys[i];
+    const value = obj[key];
+    if (by(value)) result[key] = value;
+  }
+  return result;
+};
+
 // src/UsersManager.ts
 var UsersManager = class {
   constructor(config) {
@@ -315,9 +346,9 @@ var UsersManager = class {
   }
   addConnection(userInfo) {
     var _a;
-    const data = __spreadProps(__spreadValues({}, userInfo), {
-      presence: (_a = userInfo.presence) != null ? _a : this.initialPresence
-    });
+    const cleaned = pickBy((_a = userInfo.presence) != null ? _a : {}, (value) => typeof value !== "undefined");
+    const presence = __spreadValues(__spreadValues({}, this.initialPresence), cleaned);
+    const data = __spreadProps(__spreadValues({}, userInfo), { presence });
     const myClientId = !!this._myself ? this.getClientId(this._myself) : null;
     const clientId = this.getClientId(data);
     const remaining = this._setConnectionId(userInfo.connectionId, clientId).size;
@@ -383,13 +414,16 @@ var UsersManager = class {
     return Array.from(this._others.values());
   }
   patchPresence(connectionId, patch) {
+    var _a;
     const clientId = this.getClientId(connectionId);
     const myClientId = !!this._myself ? this.getClientId(this._myself) : null;
     if (!clientId) return null;
     if (myClientId === clientId) return this.updateMyPresence(patch);
     const other = this._others.get(clientId);
     if (!other) return null;
-    const presence = __spreadValues(__spreadValues({}, other.presence), patch);
+    const cleanedPatch = pickBy(patch != null ? patch : {}, (value) => typeof value !== "undefined");
+    const cleanedPresence = pickBy((_a = other.presence) != null ? _a : {}, (value) => typeof value !== "undefined");
+    const presence = __spreadValues(__spreadValues(__spreadValues({}, this.initialPresence), cleanedPresence), cleanedPatch);
     const validated = this._presence ? this._presence.parse(presence) : presence;
     this._others.set(clientId, __spreadProps(__spreadValues({}, other), { presence: validated }));
     return validated;
@@ -424,10 +458,14 @@ var UsersManager = class {
     this._others.set(clientId, __spreadProps(__spreadValues({}, other), { presence }));
   }
   /**
-   * @description This method need not care about being connected.
+   * @description This method need not care about being connected. This is because a user should
+   * be able to view and update their own presence without being online
+   * @date April 20, 2025
    */
   updateMyPresence(patch) {
-    const updated = __spreadValues(__spreadValues({}, this._myPresence), patch);
+    const cleanedPatch = pickBy(patch, (value) => typeof value !== "undefined");
+    const cleanedPresence = pickBy(this._myPresence, (value) => typeof value !== "undefined");
+    const updated = __spreadValues(__spreadValues(__spreadValues({}, this.initialPresence), cleanedPresence), cleanedPatch);
     const bytes = new TextEncoder().encode(JSON.stringify(updated)).length;
     if (bytes > MAX_PRESENCE_SIZE_BYTES) {
       throw new Error(
@@ -474,25 +512,6 @@ var ConnectionState = /* @__PURE__ */ ((ConnectionState2) => {
   return ConnectionState2;
 })(ConnectionState || {});
 
-// src/utils/debounce.ts
-var debounce = (fn, options) => {
-  const { wait, immediate = false } = options != null ? options : {};
-  let prevResult;
-  let timeout = null;
-  return (...args) => {
-    if (typeof timeout === "number") clearTimeout(timeout);
-    timeout = setTimeout(() => {
-      timeout = null;
-      if (!immediate) prevResult = fn(args);
-    }, wait);
-    if (immediate && !timeout) {
-      fn(args);
-      return;
-    }
-    return prevResult;
-  };
-};
-
 // src/PluvRoom.ts
 var ADD_TO_STORAGE_STATE_DEBOUNCE_MS = 1e3;
 var HEARTBEAT_INTERVAL_MS = 1e4;
@@ -958,7 +977,7 @@ var PluvRoom = class extends AbstractRoom {
     } else {
       const added = this._usersManager.addConnection({
         connectionId,
-        presence: __spreadValues(__spreadValues({}, this._usersManager.initialPresence), data.presence),
+        presence: data.presence,
         user: message.user
       });
       const other = this._usersManager.getOther(connectionId);
@@ -975,7 +994,7 @@ var PluvRoom = class extends AbstractRoom {
       const { presence, user } = data.others[connectionId];
       const result = this._usersManager.addConnection({
         connectionId,
-        presence: presence != null ? presence : void 0,
+        presence,
         user
       });
       if (!!presence) this._usersManager.patchPresence(connectionId, presence);
@@ -1238,13 +1257,15 @@ var PluvRoom = class extends AbstractRoom {
       if (typeof document === "undefined") return;
       if (document.visibilityState !== "visible") return;
       switch (this._state.connection.state) {
-        case "Open" /* Open */:
+        case "Open" /* Open */: {
           this._clearInterval(this._intervals.heartbeat);
           setInterval(this._heartbeat.bind(this), HEARTBEAT_INTERVAL_MS);
           return;
-        case "Unavailable" /* Unavailable */:
+        }
+        case "Unavailable" /* Unavailable */: {
           yield this._reconnect();
           return;
+        }
         default:
       }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/client",
-  "version": "0.41.2",
+  "version": "0.41.4",
   "description": "@pluv/io frontend client",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,15 +18,15 @@
   },
   "dependencies": {
     "wonka": "^6.3.5",
-    "@pluv/types": "^0.41.2",
-    "@pluv/crdt": "^0.41.2"
+    "@pluv/crdt": "^0.41.4",
+    "@pluv/types": "^0.41.4"
   },
   "devDependencies": {
     "eslint": "^9.25.0",
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
-    "@pluv/tsconfig": "^0.41.2",
-    "eslint-config-pluv": "^0.41.2"
+    "@pluv/tsconfig": "^0.41.4",
+    "eslint-config-pluv": "^0.41.4"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/PluvRoom.ts

@@ -866,7 +866,7 @@ export class PluvRoom<
              */
             const added = this._usersManager.addConnection({
                 connectionId,
-                presence: { ...this._usersManager.initialPresence, ...data.presence } as TPresence,
+                presence: data.presence as TPresence,
                 user: message.user as Id<InferIOAuthorizeUser<InferIOAuthorize<TIO>>>,
             });
             const other = this._usersManager.getOther(connectionId);
@@ -891,7 +891,7 @@ export class PluvRoom<
 
             const result = this._usersManager.addConnection({
                 connectionId,
-                presence: (presence ?? undefined) as TPresence,
+                presence: presence as TPresence,
                 user,
             });
 
@@ -1236,15 +1236,17 @@ export class PluvRoom<
         if (document.visibilityState !== "visible") return;
 
         switch (this._state.connection.state) {
-            case ConnectionState.Open:
+            case ConnectionState.Open: {
                 this._clearInterval(this._intervals.heartbeat);
                 setInterval(this._heartbeat.bind(this), HEARTBEAT_INTERVAL_MS);
 
                 return;
-            case ConnectionState.Unavailable:
+            }
+            case ConnectionState.Unavailable: {
                 await this._reconnect();
 
                 return;
+            }
             default:
         }
     }

package/src/UsersManager.ts

@@ -1,6 +1,7 @@
 import type { InputZodLike, IOLike, JsonObject, OptionalProps } from "@pluv/types";
 import { MAX_PRESENCE_SIZE_BYTES } from "./constants";
 import type { UserInfo } from "./types";
+import { pickBy } from "./utils";
 
 export type Presence = Record<string, unknown>;
 
@@ -61,10 +62,14 @@ export class UsersManager<TIO extends IOLike, TPresence extends JsonObject = {}>
     public addConnection(
         userInfo: OptionalProps<UserInfo<TIO, TPresence>, "presence">,
     ): AddConnectionResult<TIO, TPresence> {
-        const data: UserInfo<TIO, TPresence> = {
-            ...userInfo,
-            presence: userInfo.presence ?? this.initialPresence,
-        };
+        /**
+         * @description Ensure that the presence is complete, so that it does not fail schema
+         * validation
+         * @date April 20, 2025
+         */
+        const cleaned = pickBy(userInfo.presence ?? {}, (value) => typeof value !== "undefined");
+        const presence = { ...this.initialPresence, ...cleaned };
+        const data: UserInfo<TIO, TPresence> = { ...userInfo, presence };
 
         const myClientId = !!this._myself ? this.getClientId(this._myself) : null;
         const clientId = this.getClientId(data);
@@ -187,7 +192,9 @@ export class UsersManager<TIO extends IOLike, TPresence extends JsonObject = {}>
 
         if (!other) return null;
 
-        const presence = { ...other.presence, ...patch } as TPresence;
+        const cleanedPatch = pickBy(patch ?? {}, (value) => typeof value !== "undefined");
+        const cleanedPresence = pickBy(other.presence ?? {}, (value) => typeof value !== "undefined");
+        const presence = { ...this.initialPresence, ...cleanedPresence, ...cleanedPatch } as TPresence;
         const validated = this._presence ? this._presence.parse(presence) : presence;
 
         this._others.set(clientId, { ...other, presence: validated });
@@ -239,10 +246,14 @@ export class UsersManager<TIO extends IOLike, TPresence extends JsonObject = {}>
     }
 
     /**
-     * @description This method need not care about being connected.
+     * @description This method need not care about being connected. This is because a user should
+     * be able to view and update their own presence without being online
+     * @date April 20, 2025
      */
     public updateMyPresence(patch: Partial<TPresence>): TPresence {
-        const updated = { ...this._myPresence, ...patch };
+        const cleanedPatch = pickBy(patch, (value) => typeof value !== "undefined");
+        const cleanedPresence = pickBy(this._myPresence, (value) => typeof value !== "undefined");
+        const updated = { ...this.initialPresence, ...cleanedPresence, ...cleanedPatch } as TPresence;
         const bytes = new TextEncoder().encode(JSON.stringify(updated)).length;
 
         if (bytes > MAX_PRESENCE_SIZE_BYTES) {

package/src/utils/index.ts

@@ -1,2 +1,3 @@
 export { debounce } from "./debounce";
 export { identity } from "./identity";
+export { pickBy } from "./pickBy";

package/src/utils/pickBy.ts

@@ -0,0 +1,13 @@
+export const pickBy = <T extends Record<string, any>>(obj: T, by: (value: T[keyof T]) => boolean): Partial<T> => {
+    const result: Partial<T> = {};
+    const keys: (keyof T)[] = Object.keys(obj);
+
+    for (let i = 0; i < keys.length; ++i) {
+        const key = keys[i];
+        const value = obj[key];
+
+        if (by(value)) result[key] = value;
+    }
+
+    return result;
+};