@pluv/client 1.0.1 → 2.0.0

package/dist/index.mjs

@@ -38,13 +38,6 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 
-// src/AbstractRoom.ts
-var AbstractRoom = class {
-  constructor(room) {
-    this.id = room;
-  }
-};
-
 // src/AbstractStorageStore.ts
 var AbstractStorageStore = class {
   constructor(room) {
@@ -90,6 +83,9 @@ var PluvProcedure = class _PluvProcedure {
   }
 };
 
+// src/PluvRoom.ts
+import { ConnectionState } from "@pluv/types";
+
 // src/CrdtManager.ts
 import { noop } from "@pluv/crdt";
 var CrdtManager = class {
@@ -105,14 +101,17 @@ var CrdtManager = class {
    * update. This unfortunately means updates can be dropped entirely
    * @date June 13, 2023
    */
-  applyUpdate(update, origin) {
+  applyUpdate(params) {
+    const { origin, update } = params;
     if (!this.initialized) return this;
     const updates = typeof update === "string" ? [update] : update;
     this._applyDocUpdates(this.doc, updates, origin);
     return this;
   }
   destroy() {
+    this.initialized = false;
     this.doc.destroy();
+    this.doc = this._docFactory.getEmpty();
   }
   get(key) {
     return this.doc.get(key);
@@ -121,7 +120,7 @@ var CrdtManager = class {
     return this._docFactory.getInitialized().getEncodedState();
   }
   initialize(params) {
-    const { onInitialized, origin, update } = params;
+    const { origin, update } = params;
     if (this.initialized) {
       console.warn("Attempted to initialize storage multiple times");
       return this;
@@ -141,9 +140,11 @@ var CrdtManager = class {
     ).rebuildStorage(reference);
     this.initialized = true;
     initialized.destroy();
-    onInitialized == null ? void 0 : onInitialized(this.doc.getEncodedState());
     return this;
   }
+  resolveEncodedState(updates) {
+    return this._docFactory.resolveEncodedState(updates);
+  }
   _applyDocUpdates(doc, updates, origin) {
     doc.transact(() => {
       doc.batchApplyEncodedState({ origin, updates });
@@ -518,15 +519,6 @@ var UsersManager = class {
   }
 };
 
-// src/enums.ts
-var ConnectionState = {
-  Closed: "Closed",
-  Connecting: "Connecting",
-  Open: "Open",
-  Unavailable: "Unavailable",
-  Untouched: "Untouched"
-};
-
 // src/PluvRoom.ts
 var ADD_TO_STORAGE_STATE_DEBOUNCE_MS = 1e3;
 var HEARTBEAT_INTERVAL_MS = 1e4;
@@ -539,24 +531,8 @@ var ORIGIN_STORAGE_UPDATED = "$storageUpdated";
 var DEFAULT_PLUV_CLIENT_ADDON = (input) => ({
   storage: new StorageStore(input.room.id)
 });
-var PluvRoom = class extends AbstractRoom {
+var PluvRoom = class {
   constructor(room, options) {
-    const {
-      addons = [],
-      authEndpoint,
-      debug = false,
-      initialPresence,
-      initialStorage,
-      limits,
-      metadata,
-      onAuthorizationFail,
-      presence,
-      publicKey,
-      reconnectTimeoutMs = RECONNECT_TIMEOUT_MS,
-      router,
-      wsEndpoint
-    } = options;
-    super(room);
     this._crdtNotifier = new CrdtNotifier();
     this._eventNotifier = new EventNotifier();
     this._intervals = {
@@ -703,7 +679,7 @@ var PluvRoom = class extends AbstractRoom {
         const shouldFlatten = yield this._storageStore.getShouldFlatten();
         if (!shouldFlatten) return;
         const updates = yield this._storageStore.getUpdates();
-        this._crdtManager.applyUpdate(updates, this);
+        this._crdtManager.applyUpdate({ update: updates, origin: this });
         const encodedState = this._crdtManager.doc.getEncodedState();
         yield this._storageStore.flatten(encodedState);
       }),
@@ -715,14 +691,30 @@ var PluvRoom = class extends AbstractRoom {
         DEFAULT_PLUV_CLIENT_ADDON
       );
     };
+    const {
+      addons = [],
+      authEndpoint,
+      debug = false,
+      initialPresence,
+      initialStorage,
+      limits,
+      metadata,
+      onAuthorizationFail,
+      presence,
+      publicKey,
+      reconnectTimeoutMs = RECONNECT_TIMEOUT_MS,
+      router,
+      wsEndpoint
+    } = options;
+    this.id = room;
+    this.metadata = metadata;
     const addon = this._getAddon(addons);
     const { storage } = __spreadValues(__spreadValues({}, DEFAULT_PLUV_CLIENT_ADDON({ room: this })), addon({ room: this }));
-    this.metadata = metadata;
+    this._storageStore = storage;
     this._debug = debug;
     this._endpoints = { authEndpoint, wsEndpoint };
     this._limits = limits;
     this._reconnectTimeoutMs = reconnectTimeoutMs;
-    this._storageStore = storage;
     if (!!publicKey) this._publicKey = publicKey;
     this._listeners = {
       onAuthorizationFail: (error) => {
@@ -760,6 +752,7 @@ var PluvRoom = class extends AbstractRoom {
         oldState.connection.state = ConnectionState.Connecting;
         return oldState;
       });
+      yield this._storageStore.initialize();
       const wsEndpoint = this._getWsEndpoint(this.id, params);
       const url = new URL(wsEndpoint);
       let authToken = null;
@@ -824,20 +817,6 @@ var PluvRoom = class extends AbstractRoom {
       this._flattenStorageStore();
     });
   }
-  _applyStorageStore() {
-    return __async(this, null, function* () {
-      const updates = yield this._storageStore.getUpdates();
-      this._crdtManager.initialize({
-        onInitialized: () => {
-          this._stateNotifier.subjects["storage-loaded"].next(true);
-          this._observeCrdt();
-        },
-        origin: ORIGIN_INITIALIZED,
-        update: updates
-      });
-      this._emitSharedTypes();
-    });
-  }
   _attachWindowListeners() {
     if (typeof window === "undefined") return;
     if (typeof document === "undefined") return;
@@ -1028,33 +1007,35 @@ var PluvRoom = class extends AbstractRoom {
     this._stateNotifier.subjects.others.next(others);
   }
   _handleRegisteredMessage(message) {
-    var _a, _b;
-    const { connectionId } = message;
-    const user = message.user;
-    if (!connectionId) return;
-    if (!this._state.webSocket) throw new Error("Could not find WebSocket");
-    const data = message.data;
-    const state = data.state;
-    this._updateState((oldState) => {
-      oldState.connection.count += 1;
-      oldState.connection.id = connectionId;
-      oldState.authorization.user = user != null ? user : null;
-      return oldState;
-    });
-    const userInfo = {
-      connectionId,
-      presence: (_a = data.presence) != null ? _a : void 0,
-      user
-    };
-    this._usersManager.setMyself(userInfo);
-    const presence = this._usersManager.myPresence;
-    const myself = (_b = this._usersManager.myself) != null ? _b : null;
-    this._stateNotifier.subjects["my-presence"].next(presence);
-    this._stateNotifier.subjects.myself.next(myself);
-    const update = this._crdtManager.getInitialState();
-    this._sendMessage({
-      type: "$initializeSession",
-      data: { presence, update }
+    return __async(this, null, function* () {
+      var _a, _b, _c;
+      const { connectionId } = message;
+      const user = message.user;
+      if (!connectionId) return;
+      if (!this._state.webSocket) throw new Error("Could not find WebSocket");
+      const data = message.data;
+      const state = data.state;
+      this._updateState((oldState) => {
+        oldState.connection.count += 1;
+        oldState.connection.id = connectionId;
+        oldState.authorization.user = user != null ? user : null;
+        return oldState;
+      });
+      const userInfo = {
+        connectionId,
+        presence: (_a = data.presence) != null ? _a : void 0,
+        user
+      };
+      this._usersManager.setMyself(userInfo);
+      const presence = this._usersManager.myPresence;
+      const myself = (_b = this._usersManager.myself) != null ? _b : null;
+      this._stateNotifier.subjects["my-presence"].next(presence);
+      this._stateNotifier.subjects.myself.next(myself);
+      const update = !state ? (_c = this._crdtManager.resolveEncodedState(yield this._storageStore.getUpdates())) != null ? _c : this._crdtManager.getInitialState() : this._crdtManager.getInitialState();
+      this._sendMessage({
+        type: "$initializeSession",
+        data: { presence, update }
+      });
     });
   }
   _handleStorageReceivedMessage(message) {
@@ -1063,24 +1044,34 @@ var PluvRoom = class extends AbstractRoom {
       if (!connectionId) return;
       if (!this._state.webSocket) throw new Error("Could not find WebSocket");
       const data = message.data;
+      const changeKind = data.changeKind;
       const state = data.state;
-      this._crdtManager.initialize({
-        onInitialized: (update2) => __async(this, null, function* () {
-          yield this._addToStorageStore(update2);
-          this._emitSharedTypes();
-          this._observeCrdt();
-          this._stateNotifier.subjects["storage-loaded"].next(true);
-        }),
-        origin: ORIGIN_INITIALIZED,
-        update: state
-      });
+      const updates = yield this._storageStore.getUpdates();
+      const origin = ORIGIN_INITIALIZED;
+      const updateStorage = (update) => {
+        return this._crdtManager.initialized ? this._crdtManager.applyUpdate({ update, origin }) : this._crdtManager.initialize({ update, origin });
+      };
+      if (changeKind === "empty") {
+        this._crdtManager.destroy();
+        this._crdtManager.initialize({ origin, update: updates });
+      } else if (changeKind === "initialized") {
+        if (!!updates.length) updateStorage(updates);
+        else {
+          const encodedState2 = updateStorage(state).doc.getEncodedState();
+          this._addToStorageStore(encodedState2);
+        }
+      } else {
+        const encodedState2 = updateStorage(state).doc.getEncodedState();
+        if (!!updates.length) this._crdtManager.applyUpdate({ update: updates, origin });
+        yield this._addToStorageStore(encodedState2);
+      }
       const encodedState = this._crdtManager.doc.getEncodedState();
-      yield this._storageStore.addUpdate(encodedState);
       this._emitSharedTypes();
-      const update = this._crdtManager.doc.getEncodedState();
+      this._observeCrdt();
+      this._stateNotifier.subjects["storage-loaded"].next(true);
       this._sendMessage({
         type: "$updateStorage",
-        data: { origin: ORIGIN_INITIALIZED, update }
+        data: { origin, update: encodedState }
       });
     });
   }
@@ -1150,7 +1141,8 @@ var PluvRoom = class extends AbstractRoom {
   }
   _logDebug(...data) {
     var _a;
-    if (((_a = process == null ? void 0 : process.env) == null ? void 0 : _a.NODE_ENV) === "production") return;
+    if (typeof process === "undefined") return;
+    if (((_a = process.env) == null ? void 0 : _a.NODE_ENV) === "production") return;
     if (this._debug) console.log(...data);
   }
   _observeCrdt() {
@@ -1159,11 +1151,11 @@ var PluvRoom = class extends AbstractRoom {
     const unsubscribe = this._crdtManager.doc.subscribe((event) => {
       var _a2;
       const origin = (_a2 = event.origin) != null ? _a2 : null;
-      this._addToStorageStore(event.update);
       this._emitSharedTypes();
       if (origin === ORIGIN_INITIALIZED || origin === ORIGIN_STORAGE_UPDATED) {
         return;
       }
+      this._addToStorageStore(event.update);
       if (!this._state.webSocket) return;
       if (!this._state.connection.id) return;
       if (this._state.webSocket.readyState !== WebSocket.OPEN) return;
@@ -1410,7 +1402,7 @@ var PluvClient = class {
     this._publicKey = null;
     this._rooms = /* @__PURE__ */ new Map();
     this.createRoom = (room, options = {}) => {
-      var _a;
+      var _a, _b;
       const oldRoom = this.getRoom(room);
       if (oldRoom) return oldRoom;
       const newRoom = new PluvRoom(room, {
@@ -1418,12 +1410,12 @@ var PluvClient = class {
         authEndpoint: this._authEndpoint,
         debug: options.debug,
         initialPresence: options.initialPresence,
-        initialStorage: this._initialStorage,
+        initialStorage: (_a = options.initialStorage) != null ? _a : this._initialStorage,
         limits: this._limits,
         metadata: this.metadata,
         onAuthorizationFail: options.onAuthorizationFail,
         presence: this._presence,
-        publicKey: (_a = this._publicKey) != null ? _a : void 0,
+        publicKey: (_b = this._publicKey) != null ? _b : void 0,
         reconnectTimeoutMs: options.reconnectTimeoutMs,
         router: options.router,
         wsEndpoint: this._wsEndpoint
@@ -1492,7 +1484,8 @@ var PluvClient = class {
   }
   _logDebug(...data) {
     var _a;
-    if (((_a = process == null ? void 0 : process.env) == null ? void 0 : _a.NODE_ENV) === "production") return;
+    if (typeof process === "undefined") return;
+    if (((_a = process.env) == null ? void 0 : _a.NODE_ENV) === "production") return;
     if (this._debug) console.log(...data);
   }
 };
@@ -1506,10 +1499,9 @@ var createClient = (options) => {
 var infer = (callback) => callback;
 
 // src/MockedRoom.ts
-var MockedRoom = class extends AbstractRoom {
+import { ConnectionState as ConnectionState2 } from "@pluv/types";
+var MockedRoom = class {
   constructor(room, options) {
-    const { events, initialPresence, initialStorage, limits, presence, router } = options;
-    super(room);
     this._crdtNotifier = new CrdtNotifier();
     this._eventNotifier = new EventNotifier();
     this._otherNotifier = new OtherNotifier();
@@ -1522,7 +1514,7 @@ var MockedRoom = class extends AbstractRoom {
         attempts: 0,
         count: 1,
         id: null,
-        state: ConnectionState.Untouched
+        state: ConnectionState2.Untouched
       },
       webSocket: null
     };
@@ -1533,7 +1525,7 @@ var MockedRoom = class extends AbstractRoom {
     this.broadcast = new Proxy(
       (event, data) => __async(this, null, function* () {
         if (!this._state.webSocket) return;
-        if (this._state.connection.state !== ConnectionState.Open) return;
+        if (this._state.connection.state !== ConnectionState2.Open) return;
         const type = event.toString();
         const procedure = this._router._defs.events[type];
         if (!(procedure == null ? void 0 : procedure.config.broadcast)) {
@@ -1635,6 +1627,8 @@ var MockedRoom = class extends AbstractRoom {
       this._stateNotifier.subjects["my-presence"].next(myPresence);
       if (!!myself) this._stateNotifier.subjects["myself"].next(myself);
     };
+    const { events, initialPresence, initialStorage, limits, presence, router } = options;
+    this.id = room;
     this._events = events;
     this._limits = __spreadValues({
       presenceMaxSize: MAX_PRESENCE_SIZE_BYTES
@@ -1710,9 +1704,7 @@ var register = (params) => {
   };
 };
 export {
-  AbstractRoom,
   AbstractStorageStore,
-  ConnectionState,
   MockedRoom,
   PluvClient,
   PluvRoom,

package/package.json

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

package/src/CrdtManager.ts

@@ -1,24 +1,28 @@
-import type { AbstractCrdtDoc, AbstractCrdtDocFactory, CrdtType } from "@pluv/crdt";
+import type { AbstractCrdtDocFactory, CrdtDocLike, CrdtType, InferStorage } from "@pluv/crdt";
 import { noop } from "@pluv/crdt";
 
-export type CrdtManagerOptions<TStorage extends Record<string, CrdtType<any, any>> = {}> = {
-    initialStorage?: AbstractCrdtDocFactory<TStorage>;
+export type CrdtManagerOptions<TCrdt extends AbstractCrdtDocFactory<any>> = {
+    initialStorage?: TCrdt;
 };
 
-type CrdtManagerInitializeParams = {
-    onInitialized?: (state: string) => void;
+interface CrdtManagerInitializeParams {
     origin?: any;
     update: string | readonly string[];
-};
+}
+
+interface ApplyUpdateParams {
+    origin?: any;
+    update: string | readonly string[];
+}
 
-export class CrdtManager<TStorage extends Record<string, CrdtType<any, any>>> {
-    public doc: AbstractCrdtDoc<TStorage>;
+export class CrdtManager<TCrdt extends AbstractCrdtDocFactory<any>> {
+    public doc: CrdtDocLike<InferStorage<TCrdt>>;
     public initialized: boolean = false;
 
-    private readonly _docFactory: AbstractCrdtDocFactory<TStorage>;
+    private readonly _docFactory: TCrdt;
 
-    constructor(options: CrdtManagerOptions<TStorage>) {
-        const { initialStorage = noop.doc({}) as AbstractCrdtDocFactory<TStorage> } = options;
+    constructor(options: CrdtManagerOptions<TCrdt>) {
+        const { initialStorage = noop.doc({}) as any } = options;
 
         this._docFactory = initialStorage;
         this.doc = initialStorage.getEmpty();
@@ -30,7 +34,9 @@ export class CrdtManager<TStorage extends Record<string, CrdtType<any, any>>> {
      * update. This unfortunately means updates can be dropped entirely
      * @date June 13, 2023
      */
-    public applyUpdate(update: string | readonly string[], origin?: any): this {
+    public applyUpdate(params: ApplyUpdateParams): this {
+        const { origin, update } = params;
+
         if (!this.initialized) return this;
 
         const updates: readonly string[] = typeof update === "string" ? [update] : update;
@@ -41,10 +47,12 @@ export class CrdtManager<TStorage extends Record<string, CrdtType<any, any>>> {
     }
 
     public destroy(): void {
+        this.initialized = false;
         this.doc.destroy();
+        this.doc = this._docFactory.getEmpty();
     }
 
-    public get<TKey extends keyof TStorage>(key: TKey): TStorage[TKey] {
+    public get<TKey extends keyof InferStorage<TCrdt>>(key: TKey): InferStorage<TCrdt>[TKey] {
         return this.doc.get(key);
     }
 
@@ -53,7 +61,7 @@ export class CrdtManager<TStorage extends Record<string, CrdtType<any, any>>> {
     }
 
     public initialize(params: CrdtManagerInitializeParams): this {
-        const { onInitialized, origin, update } = params;
+        const { origin, update } = params;
 
         /**
          * !HACK
@@ -94,16 +102,18 @@ export class CrdtManager<TStorage extends Record<string, CrdtType<any, any>>> {
         this.initialized = true;
         initialized.destroy();
 
-        onInitialized?.(this.doc.getEncodedState());
-
         return this;
     }
 
+    public resolveEncodedState(updates: string | string[] | readonly string[]): string | null {
+        return this._docFactory.resolveEncodedState(updates);
+    }
+
     private _applyDocUpdates(
-        doc: AbstractCrdtDoc<TStorage>,
+        doc: CrdtDocLike<InferStorage<TCrdt>>,
         updates: readonly string[],
         origin?: string,
-    ): AbstractCrdtDoc<TStorage> {
+    ): CrdtDocLike<InferStorage<TCrdt>> {
         doc.transact(() => {
             doc.batchApplyEncodedState({ origin, updates });
         }, origin);

package/src/EventNotifier.ts

@@ -1,12 +1,13 @@
-import type { Id, InferIOOutput, IOEventMessage, IOLike } from "@pluv/types";
+import type {
+    EventNotifierSubscriptionCallback,
+    Id,
+    InferIOOutput,
+    IOEventMessage,
+    IOLike,
+} from "@pluv/types";
 import type { Subject } from "wonka";
 import { makeSubject, subscribe } from "wonka";
 
-export type EventNotifierSubscriptionCallback<
-    TIO extends IOLike<any, any>,
-    TEvent extends keyof InferIOOutput<TIO>,
-> = (value: Id<IOEventMessage<TIO, TEvent>>) => void;
-
 export class EventNotifier<TIO extends IOLike> {
     public subjects = new Map<
         keyof InferIOOutput<TIO>,