@pluv/client 0.17.3 → 0.18.0

package/dist/index.mjs

@@ -57,10 +57,7 @@ import { noop } from "@pluv/crdt";
 var CrdtManager = class {
   constructor(options) {
     this.initialized = false;
-    const {
-      encodedState,
-      initialStorage = noop.doc({})
-    } = options;
+    const { encodedState, initialStorage = noop.doc({}) } = options;
     this._docFactory = initialStorage;
     this.doc = encodedState ? initialStorage.getFresh().applyEncodedState({ update: encodedState }) : initialStorage.getFresh();
   }
@@ -92,18 +89,10 @@ var CrdtManager = class {
       this.doc = this._applyDocUpdates(this.doc, updates, origin).track();
       return this;
     }
-    const onEmpty = this._applyDocUpdates(
-      this._docFactory.getEmpty(),
-      updates,
-      origin
-    );
+    const onEmpty = this._applyDocUpdates(this._docFactory.getEmpty(), updates, origin);
     if (!onEmpty.isEmpty()) {
       onEmpty.destroy();
-      this.doc = this._applyDocUpdates(
-        this._docFactory.getFresh(),
-        updates,
-        origin
-      ).track();
+      this.doc = this._applyDocUpdates(this._docFactory.getFresh(), updates, origin).track();
       this.initialized = true;
       onInitialized == null ? void 0 : onInitialized(this.doc.getEncodedState());
       return this;
@@ -116,9 +105,7 @@ var CrdtManager = class {
   }
   _applyDocUpdates(doc, updates, origin) {
     doc.transact(() => {
-      doc.batchApplyEncodedState(
-        updates.map((update) => ({ origin, update }))
-      );
+      doc.batchApplyEncodedState(updates.map((update) => ({ origin, update })));
     }, origin);
     return doc;
   }
@@ -433,9 +420,7 @@ var MockedRoom = class extends AbstractRoom {
     });
   }
   getConnection() {
-    return Object.freeze(
-      JSON.parse(JSON.stringify(this._state.connection))
-    );
+    return Object.freeze(JSON.parse(JSON.stringify(this._state.connection)));
   }
   getDoc() {
     return this._crdtManager.doc;
@@ -566,15 +551,37 @@ var PluvRoom = class extends AbstractRoom {
     };
     this._windowListeners = null;
     this._wsListeners = null;
+    this.broadcast = new Proxy(
+      (event, data) => {
+        if (!this._state.webSocket)
+          return;
+        if (this._state.connection.state !== "Open" /* Open */)
+          return;
+        const type = event.toString();
+        this._sendMessage({ data, type });
+      },
+      {
+        get(fn, prop) {
+          return (data) => {
+            return fn(prop, data);
+          };
+        }
+      }
+    );
     this.canRedo = () => {
       return !!this._crdtManager.doc.canRedo();
     };
     this.canUndo = () => {
       return !!this._crdtManager.doc.canUndo();
     };
-    this.event = (event, callback) => {
-      return this._eventNotifier.subscribe(event, callback);
-    };
+    this.event = new Proxy(
+      (event, callback) => this._eventNotifier.subscribe(event, callback),
+      {
+        get(fn, prop) {
+          return (callback) => fn(prop, callback);
+        }
+      }
+    );
     this.getMyPresence = () => {
       return this._usersManager.myPresence;
     };
@@ -627,10 +634,7 @@ var PluvRoom = class extends AbstractRoom {
       const myself = (_a = this._usersManager.myself) != null ? _a : null;
       this._stateNotifier.subjects["my-presence"].next(myPresence);
       !!myself && this._stateNotifier.subjects["myself"].next(myself);
-      this.broadcast(
-        "$UPDATE_PRESENCE",
-        { presence }
-      );
+      this.broadcast("$UPDATE_PRESENCE", { presence });
     };
     this._flattenStorageStore = debounce(
       () => __async(this, null, function* () {
@@ -658,10 +662,7 @@ var PluvRoom = class extends AbstractRoom {
     this._listeners = {
       onAuthorizationFail: (error) => {
         this._clearTimeout(this._timeouts.reconnect);
-        this._timeouts.reconnect = setTimeout(
-          this._reconnect.bind(this),
-          RECONNECT_TIMEOUT_MS
-        );
+        this._timeouts.reconnect = setTimeout(this._reconnect.bind(this), RECONNECT_TIMEOUT_MS);
         onAuthorizationFail == null ? void 0 : onAuthorizationFail(error);
       }
     };
@@ -679,23 +680,14 @@ var PluvRoom = class extends AbstractRoom {
   get webSocket() {
     return this._state.webSocket;
   }
-  broadcast(event, data) {
-    if (!this._state.webSocket)
-      return;
-    if (this._state.connection.state !== "Open" /* Open */)
-      return;
-    const type = event.toString();
-    this._sendMessage({ data, type });
-  }
   connect() {
     return __async(this, null, function* () {
       if (!this._endpoints.wsEndpoint) {
         throw new Error("Must provide an wsEndpoint.");
       }
-      const canConnect = [
-        "Closed" /* Closed */,
-        "Untouched" /* Untouched */
-      ].some((state) => this._state.connection.state === state);
+      const canConnect = ["Closed" /* Closed */, "Untouched" /* Untouched */].some(
+        (state) => this._state.connection.state === state
+      );
       if (!canConnect)
         return;
       this._clearTimeout(this._timeouts.reconnect);
@@ -733,10 +725,9 @@ var PluvRoom = class extends AbstractRoom {
       }
       if (!this._state.webSocket)
         return;
-      const canDisconnect = [
-        "Connecting" /* Connecting */,
-        "Open" /* Open */
-      ].some((state) => this._state.connection.state === state);
+      const canDisconnect = ["Connecting" /* Connecting */, "Open" /* Open */].some(
+        (state) => this._state.connection.state === state
+      );
       if (!canDisconnect)
         return;
       this._clearInterval(this._intervals.heartbeat);
@@ -747,9 +738,7 @@ var PluvRoom = class extends AbstractRoom {
     });
   }
   getConnection() {
-    return Object.freeze(
-      JSON.parse(JSON.stringify(this._state.connection))
-    );
+    return Object.freeze(JSON.parse(JSON.stringify(this._state.connection)));
   }
   getDoc() {
     return this._crdtManager.doc;
@@ -783,14 +772,8 @@ var PluvRoom = class extends AbstractRoom {
       onNavigatorOnline: this._onNavigatorOnline.bind(this),
       onVisibilityChange: this._onVisibilityChange.bind(this)
     };
-    window.addEventListener(
-      "online",
-      this._windowListeners.onNavigatorOnline
-    );
-    document.addEventListener(
-      "visibilitychange",
-      this._windowListeners.onVisibilityChange
-    );
+    window.addEventListener("online", this._windowListeners.onNavigatorOnline);
+    document.addEventListener("visibilitychange", this._windowListeners.onVisibilityChange);
   }
   _attachWsListeners() {
     if (!this._state.webSocket)
@@ -801,22 +784,10 @@ var PluvRoom = class extends AbstractRoom {
       onMessage: this._onMessage.bind(this),
       onOpen: this._onOpen.bind(this)
     };
-    this._state.webSocket.addEventListener(
-      "close",
-      this._wsListeners.onClose
-    );
-    this._state.webSocket.addEventListener(
-      "error",
-      this._wsListeners.onError
-    );
-    this._state.webSocket.addEventListener(
-      "message",
-      this._wsListeners.onMessage
-    );
-    this._state.webSocket.addEventListener(
-      "open",
-      this._wsListeners.onOpen
-    );
+    this._state.webSocket.addEventListener("close", this._wsListeners.onClose);
+    this._state.webSocket.addEventListener("error", this._wsListeners.onError);
+    this._state.webSocket.addEventListener("message", this._wsListeners.onMessage);
+    this._state.webSocket.addEventListener("open", this._wsListeners.onOpen);
   }
   _clearInterval(interval) {
     if (Number.isNaN(interval))
@@ -854,35 +825,17 @@ var PluvRoom = class extends AbstractRoom {
       return;
     if (typeof document === "undefined")
       return;
-    window.removeEventListener(
-      "online",
-      this._windowListeners.onNavigatorOnline
-    );
-    document.removeEventListener(
-      "visibilitychange",
-      this._windowListeners.onVisibilityChange
-    );
+    window.removeEventListener("online", this._windowListeners.onNavigatorOnline);
+    document.removeEventListener("visibilitychange", this._windowListeners.onVisibilityChange);
     this._windowListeners = null;
   }
   _detachWsListeners() {
     if (!this._state.webSocket || !this._wsListeners)
       return;
-    this._state.webSocket.removeEventListener(
-      "close",
-      this._wsListeners.onClose
-    );
-    this._state.webSocket.removeEventListener(
-      "error",
-      this._wsListeners.onError
-    );
-    this._state.webSocket.removeEventListener(
-      "message",
-      this._wsListeners.onMessage
-    );
-    this._state.webSocket.removeEventListener(
-      "open",
-      this._wsListeners.onOpen
-    );
+    this._state.webSocket.removeEventListener("close", this._wsListeners.onClose);
+    this._state.webSocket.removeEventListener("error", this._wsListeners.onError);
+    this._state.webSocket.removeEventListener("message", this._wsListeners.onMessage);
+    this._state.webSocket.removeEventListener("open", this._wsListeners.onOpen);
     this._wsListeners = null;
   }
   _emitSharedTypes() {
@@ -928,9 +881,7 @@ var PluvRoom = class extends AbstractRoom {
       try {
         return yield res.text().then((text) => text.trim());
       } catch (err) {
-        throw new Error(
-          err instanceof Error ? err.message : "Room is unauthorized"
-        );
+        throw new Error(err instanceof Error ? err.message : "Room is unauthorized");
       }
     });
   }
@@ -964,10 +915,7 @@ var PluvRoom = class extends AbstractRoom {
     if (!this._state.webSocket)
       throw new Error("Could not find WebSocket");
     const data = message.data;
-    this._usersManager.patchPresence(
-      connectionId,
-      data.presence
-    );
+    this._usersManager.patchPresence(connectionId, data.presence);
     const myPresence = this._usersManager.myPresence;
     const myself = (_a = this._usersManager.myself) != null ? _a : null;
     if ((myself == null ? void 0 : myself.connectionId) === connectionId) {
@@ -992,10 +940,7 @@ var PluvRoom = class extends AbstractRoom {
         return;
       this._usersManager.setUser(connectionId, user);
       const other = this._usersManager.getOther(connectionId);
-      !!presence && this._usersManager.patchPresence(
-        connectionId,
-        presence
-      );
+      !!presence && this._usersManager.patchPresence(connectionId, presence);
       this._otherNotifier.subject(connectionId).next(other);
     });
     const others = this._usersManager.getOthers();
@@ -1014,10 +959,7 @@ var PluvRoom = class extends AbstractRoom {
       oldState.authorization.user = user;
       return oldState;
     });
-    this._usersManager.setMyself(
-      connectionId,
-      user
-    );
+    this._usersManager.setMyself(connectionId, user);
     const presence = this._usersManager.myPresence;
     const myself = (_a = this._usersManager.myself) != null ? _a : null;
     this._stateNotifier.subjects["my-presence"].next(presence);
@@ -1095,11 +1037,7 @@ var PluvRoom = class extends AbstractRoom {
     if (myself.connectionId === connectionId) {
       this._sendMessage({ type: "$GET_OTHERS", data: {} });
     }
-    this._usersManager.setUser(
-      connectionId,
-      data.user,
-      data.presence
-    );
+    this._usersManager.setUser(connectionId, data.user, data.presence);
     const other = this._usersManager.getOther(connectionId);
     const others = this._usersManager.getOthers();
     this._otherNotifier.subject(connectionId).next(other);
@@ -1107,10 +1045,7 @@ var PluvRoom = class extends AbstractRoom {
   }
   _heartbeat() {
     this._clearTimeout(this._timeouts.pong);
-    this._timeouts.pong = setTimeout(
-      this._reconnect.bind(this),
-      PONG_TIMEOUT_MS
-    );
+    this._timeouts.pong = setTimeout(this._reconnect.bind(this), PONG_TIMEOUT_MS);
     this._sendMessage({ type: "$PING", data: {} });
   }
   _logDebug(...data) {
@@ -1240,10 +1175,7 @@ var PluvRoom = class extends AbstractRoom {
       return oldState;
     });
     this._clearInterval(this._intervals.heartbeat);
-    this._intervals.heartbeat = setInterval(
-      this._heartbeat.bind(this),
-      HEARTBEAT_INTERVAL_MS
-    );
+    this._intervals.heartbeat = setInterval(this._heartbeat.bind(this), HEARTBEAT_INTERVAL_MS);
   }
   _onNavigatorOnline() {
     return __async(this, null, function* () {
@@ -1317,9 +1249,7 @@ var PluvRoom = class extends AbstractRoom {
   _updateState(updater) {
     let authorization;
     try {
-      authorization = JSON.parse(
-        JSON.stringify(this._state.authorization)
-      );
+      authorization = JSON.parse(JSON.stringify(this._state.authorization));
     } catch (e) {
       throw new Error("User is not JSON serializable");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/client",
-  "version": "0.17.3",
+  "version": "0.18.0",
   "description": "@pluv/io frontend client",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,15 +18,15 @@
   },
   "dependencies": {
     "wonka": "^6.3.4",
-    "@pluv/crdt": "^0.17.3",
-    "@pluv/types": "^0.17.3"
+    "@pluv/crdt": "^0.18.0",
+    "@pluv/types": "^0.18.0"
   },
   "devDependencies": {
     "eslint": "^8.57.0",
     "tsup": "^8.0.2",
     "typescript": "^5.4.5",
-    "@pluv/tsconfig": "^0.17.3",
-    "eslint-config-pluv": "^0.17.3"
+    "@pluv/tsconfig": "^0.18.0",
+    "eslint-config-pluv": "^0.18.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/AbstractRoom.ts

@@ -1,21 +1,8 @@
-import type {
-    AbstractCrdtDoc,
-    AbstractCrdtType,
-    InferCrdtStorageJson,
-} from "@pluv/crdt";
-import type {
-    IOLike,
-    Id,
-    InferIOInput,
-    InferIOOutput,
-    JsonObject,
-} from "@pluv/types";
+import type { AbstractCrdtDoc, AbstractCrdtType, InferCrdtStorageJson } from "@pluv/crdt";
+import type { IOLike, Id, InferIOInput, InferIOOutput, JsonObject } from "@pluv/types";
 import type { EventNotifierSubscriptionCallback } from "./EventNotifier";
 import type { OtherNotifierSubscriptionCallback } from "./OtherNotifier";
-import type {
-    StateNotifierSubjects,
-    SubscriptionCallback,
-} from "./StateNotifier";
+import type { StateNotifierSubjects, SubscriptionCallback } from "./StateNotifier";
 import type { UserInfo, WebSocketConnection } from "./types";
 
 export abstract class AbstractRoom<
@@ -53,20 +40,13 @@ export abstract class AbstractRoom<
 
     public abstract getMyself(): Id<UserInfo<TIO, TPresence>> | null;
 
-    public abstract getOther(
-        connectionId: string,
-    ): Id<UserInfo<TIO, TPresence>> | null;
+    public abstract getOther(connectionId: string): Id<UserInfo<TIO, TPresence>> | null;
 
     public abstract getOthers(): readonly Id<UserInfo<TIO, TPresence>>[];
 
-    public abstract getStorage<TKey extends keyof TStorage>(
-        key: TKey,
-    ): TStorage[TKey] | null;
+    public abstract getStorage<TKey extends keyof TStorage>(key: TKey): TStorage[TKey] | null;
 
-    public abstract other(
-        connectionId: string,
-        callback: OtherNotifierSubscriptionCallback<TIO>,
-    ): () => void;
+    public abstract other(connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>): () => void;
 
     public abstract redo(): void;
 
@@ -81,17 +61,12 @@ export abstract class AbstractRoom<
         }) => void,
     ): () => void;
 
-    public abstract subscribe<
-        TSubject extends keyof StateNotifierSubjects<TIO, TPresence>,
-    >(
+    public abstract subscribe<TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(
         name: TSubject,
         callback: SubscriptionCallback<TIO, TPresence, TSubject>,
     ): () => void;
 
-    public abstract transact(
-        fn: (storage: TStorage) => void,
-        origin?: string,
-    ): void;
+    public abstract transact(fn: (storage: TStorage) => void, origin?: string): void;
 
     public abstract undo(): void;
 

package/src/CrdtManager.ts

@@ -1,13 +1,7 @@
-import type {
-    AbstractCrdtDoc,
-    AbstractCrdtDocFactory,
-    AbstractCrdtType,
-} from "@pluv/crdt";
+import type { AbstractCrdtDoc, AbstractCrdtDocFactory, AbstractCrdtType } from "@pluv/crdt";
 import { noop } from "@pluv/crdt";
 
-export type CrdtManagerOptions<
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
-> = {
+export type CrdtManagerOptions<TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> = {
     encodedState?: string | Uint8Array | null;
     initialStorage?: AbstractCrdtDocFactory<TStorage>;
 };
@@ -18,26 +12,19 @@ type CrdtManagerInitializeParams = {
     update: string | readonly string[];
 };
 
-export class CrdtManager<
-    TStorage extends Record<string, AbstractCrdtType<any, any>>,
-> {
+export class CrdtManager<TStorage extends Record<string, AbstractCrdtType<any, any>>> {
     public doc: AbstractCrdtDoc<TStorage>;
     public initialized: boolean = false;
 
     private readonly _docFactory: AbstractCrdtDocFactory<TStorage>;
 
     constructor(options: CrdtManagerOptions<TStorage>) {
-        const {
-            encodedState,
-            initialStorage = noop.doc({}) as AbstractCrdtDocFactory<TStorage>,
-        } = options;
+        const { encodedState, initialStorage = noop.doc({}) as AbstractCrdtDocFactory<TStorage> } = options;
 
         this._docFactory = initialStorage;
 
         this.doc = encodedState
-            ? initialStorage
-                  .getFresh()
-                  .applyEncodedState({ update: encodedState })
+            ? initialStorage.getFresh().applyEncodedState({ update: encodedState })
             : initialStorage.getFresh();
     }
 
@@ -50,8 +37,7 @@ export class CrdtManager<
     public applyUpdate(update: string | readonly string[], origin?: any): this {
         if (!this.initialized) return this;
 
-        const updates: readonly string[] =
-            typeof update === "string" ? [update] : update;
+        const updates: readonly string[] = typeof update === "string" ? [update] : update;
 
         this._applyDocUpdates(this.doc, updates, origin);
 
@@ -79,20 +65,12 @@ export class CrdtManager<
             return this;
         }
 
-        const onEmpty = this._applyDocUpdates(
-            this._docFactory.getEmpty(),
-            updates,
-            origin,
-        );
+        const onEmpty = this._applyDocUpdates(this._docFactory.getEmpty(), updates, origin);
 
         if (!onEmpty.isEmpty()) {
             onEmpty.destroy();
 
-            this.doc = this._applyDocUpdates(
-                this._docFactory.getFresh(),
-                updates,
-                origin,
-            ).track();
+            this.doc = this._applyDocUpdates(this._docFactory.getFresh(), updates, origin).track();
             this.initialized = true;
 
             onInitialized?.(this.doc.getEncodedState());
@@ -115,9 +93,7 @@ export class CrdtManager<
         origin?: string,
     ): AbstractCrdtDoc<TStorage> {
         doc.transact(() => {
-            doc.batchApplyEncodedState(
-                updates.map((update) => ({ origin, update })),
-            );
+            doc.batchApplyEncodedState(updates.map((update) => ({ origin, update })));
         }, origin);
 
         return doc;

package/src/CrdtNotifier.ts

@@ -1,21 +1,15 @@
 import type { AbstractCrdtType, InferCrdtStorageJson } from "@pluv/crdt";
-import { makeSubject, Subject, subscribe } from "wonka";
+import type { Subject } from "wonka";
+import { makeSubject, subscribe } from "wonka";
 
-export class CrdtNotifier<
-    TStorage extends Record<string, AbstractCrdtType<any, any>>,
-> {
+export class CrdtNotifier<TStorage extends Record<string, AbstractCrdtType<any, any>>> {
     public rootSubject = makeSubject<{
         [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
     }>();
 
-    public subjects = new Map<
-        keyof TStorage,
-        Subject<InferCrdtStorageJson<TStorage[keyof TStorage]>> | null
-    >();
+    public subjects = new Map<keyof TStorage, Subject<InferCrdtStorageJson<TStorage[keyof TStorage]>> | null>();
 
-    public subject<TKey extends keyof TStorage>(
-        key: TKey,
-    ): Subject<InferCrdtStorageJson<TStorage[TKey]>> {
+    public subject<TKey extends keyof TStorage>(key: TKey): Subject<InferCrdtStorageJson<TStorage[TKey]>> {
         const subject = this.subjects.get(key);
 
         if (subject) {

package/src/EventNotifier.ts

@@ -2,20 +2,14 @@ import type { Id, InferIOOutput, IOEventMessage, IOLike } from "@pluv/types";
 import type { Subject } from "wonka";
 import { makeSubject, subscribe } from "wonka";
 
-export type EventNotifierSubscriptionCallback<
-    TIO extends IOLike,
-    TEvent extends keyof InferIOOutput<TIO>,
-> = (value: Id<IOEventMessage<TIO, TEvent>>) => void;
+export type EventNotifierSubscriptionCallback<TIO extends IOLike, TEvent extends keyof InferIOOutput<TIO>> = (
+    value: Id<IOEventMessage<TIO, TEvent>>,
+) => void;
 
 export class EventNotifier<TIO extends IOLike> {
-    public subjects = new Map<
-        keyof InferIOOutput<TIO>,
-        Subject<Id<IOEventMessage<TIO, keyof InferIOOutput<TIO>>>>
-    >();
+    public subjects = new Map<keyof InferIOOutput<TIO>, Subject<Id<IOEventMessage<TIO, keyof InferIOOutput<TIO>>>>>();
 
-    public subject<TEvent extends keyof InferIOOutput<TIO>>(
-        name: TEvent,
-    ): Subject<Id<IOEventMessage<TIO, TEvent>>> {
+    public subject<TEvent extends keyof InferIOOutput<TIO>>(name: TEvent): Subject<Id<IOEventMessage<TIO, TEvent>>> {
         const subject = this.subjects.get(name);
 
         if (subject) return subject;