@pluv/client 2.1.0 → 2.2.0

package/dist/index.mjs

@@ -50,6 +50,7 @@ var AbstractStorageStore = class {
 
 // src/constants.ts
 var MAX_PRESENCE_SIZE_BYTES = 512;
+var PLUV_PRESENCE_META_KEY = "__pluv";
 
 // src/PluvProcedure.ts
 var PluvProcedure = class _PluvProcedure {
@@ -87,7 +88,7 @@ var PluvProcedure = class _PluvProcedure {
 };
 
 // src/PluvRoom.ts
-import { ConnectionState } from "@pluv/types";
+import { ConnectionState, StorageState } from "@pluv/types";
 
 // src/CrdtManager.ts
 import { noop } from "@pluv/crdt";
@@ -96,7 +97,7 @@ var CrdtManager = class {
     this.initialized = false;
     const { initialStorage = noop.doc({}) } = options;
     this._docFactory = initialStorage;
-    this.doc = initialStorage.getEmpty();
+    this.doc = this._docFactory.getEmpty();
   }
   /**
    * !HACK
@@ -136,11 +137,7 @@ var CrdtManager = class {
     if (!updates.length) return this;
     const initialized = this._docFactory.getInitialized();
     const reference = initialized.get();
-    this.doc = this._applyDocUpdates(
-      this._docFactory.getEmpty(),
-      updates,
-      origin
-    ).rebuildStorage(reference);
+    this.doc = this._applyDocUpdates(this.doc, updates, origin).rebuildStorage(reference);
     this.initialized = true;
     initialized.destroy();
     return this;
@@ -200,6 +197,25 @@ var EventNotifier = class {
   }
 };
 
+// src/ListenerManager.ts
+import { makeSubject as makeSubject3, subscribe as subscribe3 } from "wonka";
+var ListenerManager = class {
+  constructor() {
+    this.subjects = {
+      close: makeSubject3(),
+      error: makeSubject3(),
+      message: makeSubject3(),
+      open: makeSubject3()
+    };
+  }
+  subscribe(kind, callback) {
+    var _a;
+    const source = (_a = this.subjects[kind]) == null ? void 0 : _a.source;
+    if (!source) return () => void 0;
+    return subscribe3(callback)(source).unsubscribe;
+  }
+};
+
 // src/PluvRouter.ts
 var PluvRouter = class _PluvRouter {
   constructor(events) {
@@ -228,22 +244,22 @@ var PluvRouter = class _PluvRouter {
 };
 
 // src/StateNotifier.ts
-import { makeSubject as makeSubject3, subscribe as subscribe3 } from "wonka";
+import { makeSubject as makeSubject4, subscribe as subscribe4 } from "wonka";
 var StateNotifier = class {
   constructor() {
     this.subjects = {
-      connection: makeSubject3(),
-      "my-presence": makeSubject3(),
-      myself: makeSubject3(),
-      others: makeSubject3(),
-      "storage-loaded": makeSubject3()
+      connection: makeSubject4(),
+      "my-presence": makeSubject4(),
+      myself: makeSubject4(),
+      others: makeSubject4(),
+      "storage-loaded": makeSubject4()
     };
   }
   subscribe(name, callback) {
     var _a;
     const source = (_a = this.subjects[name]) == null ? void 0 : _a.source;
     if (!source) throw new Error(`Could not subscribe to source: ${name}`);
-    return subscribe3(callback)(source).unsubscribe;
+    return subscribe4(callback)(source).unsubscribe;
   }
 };
 
@@ -416,6 +432,9 @@ var UsersManager = class {
     );
     const presence = __spreadValues(__spreadValues(__spreadValues({}, this.initialPresence), cleanedPresence), cleanedPatch);
     const validated = this._presence ? this._presence.parse(presence) : presence;
+    if (!!presence[PLUV_PRESENCE_META_KEY]) {
+      validated[PLUV_PRESENCE_META_KEY] = presence[PLUV_PRESENCE_META_KEY];
+    }
     this._others.set(clientId, __spreadProps(__spreadValues({}, other), { presence: validated }));
     return validated;
   }
@@ -494,10 +513,10 @@ var UsersManager = class {
 };
 
 // src/UsersNotifier.ts
-import { makeSubject as makeSubject4, subscribe as subscribe4 } from "wonka";
+import { makeSubject as makeSubject5, subscribe as subscribe5 } from "wonka";
 var UsersNotifier = class {
   constructor() {
-    this.others = makeSubject4();
+    this.others = makeSubject5();
     this._otherSubjects = /* @__PURE__ */ new Map();
   }
   clear() {
@@ -513,17 +532,17 @@ var UsersNotifier = class {
   other(clientId) {
     const subject = this._otherSubjects.get(clientId);
     if (subject) return subject;
-    const newSubject = makeSubject4();
+    const newSubject = makeSubject5();
     this._otherSubjects.set(clientId, newSubject);
     return newSubject;
   }
   subscribeOther(clientId, callback) {
     const source = this.other(clientId).source;
-    const subscription = subscribe4(callback)(source);
+    const subscription = subscribe5(callback)(source);
     return subscription.unsubscribe;
   }
   subscribeOthers(callback) {
-    const subscription = subscribe4(
+    const subscription = subscribe5(
       ({ others, event }) => callback(others, event)
     )(this.others.source);
     return subscription.unsubscribe;
@@ -549,6 +568,7 @@ var PluvRoom = class {
     this._intervals = {
       heartbeat: null
     };
+    this._listenerManager = new ListenerManager();
     this._publicKey = null;
     this._stateNotifier = new StateNotifier();
     this._subscriptions = {
@@ -567,10 +587,12 @@ var PluvRoom = class {
       },
       connection: {
         attempts: 0,
-        count: 0,
         id: null,
         state: ConnectionState.Untouched
       },
+      storage: {
+        state: StorageState.Unavailable
+      },
       webSocket: null
     };
     this._windowListeners = null;
@@ -647,6 +669,9 @@ var PluvRoom = class {
       if (typeof sharedType === "undefined") return null;
       return sharedType;
     };
+    this.getStorageLoaded = () => {
+      return this._state.storage.state === StorageState.Offline || this._state.storage.state === StorageState.Synced;
+    };
     /**
      * @deprecated To be removed in v3. Use PluvRoom.subscribe.other instead
      */
@@ -659,7 +684,7 @@ var PluvRoom = class {
       this._crdtManager.doc.redo();
     };
     /**
-     * @deprecated To be removed in v3. To be removed in v3. Use PluvRoom.subscribe.storage instead
+     * @deprecated To be removed in v3. Use PluvRoom.subscribe.storage instead
      */
     this.storage = new Proxy(
       (key, callback) => this._crdtNotifier.subscribe(key, callback),
@@ -797,12 +822,18 @@ var PluvRoom = class {
     });
     this._crdtManager = new CrdtManager({ initialStorage });
   }
+  /**
+   * @deprecated To be removed in v3. Use `getStorageLoaded` instead.
+   */
   get storageLoaded() {
-    return this._crdtManager.initialized;
+    return this.getStorageLoaded();
   }
   get webSocket() {
     return this._state.webSocket;
   }
+  addEventListener(kind, handler) {
+    return this._listenerManager.subscribe(kind, handler);
+  }
   connect(...args) {
     return __async(this, null, function* () {
       var _a;
@@ -844,6 +875,7 @@ var PluvRoom = class {
       this._updateState((oldState) => {
         oldState.connection.attempts = 0;
         oldState.authorization.token = authToken;
+        oldState.storage.state = StorageState.Loading;
         oldState.webSocket = webSocket;
         return oldState;
       });
@@ -864,6 +896,7 @@ var PluvRoom = class {
       this._updateState((oldState) => {
         oldState.authorization.token = null;
         oldState.connection.state = ConnectionState.Closed;
+        oldState.storage.state = oldState.storage.state === StorageState.Synced ? StorageState.Offline : StorageState.Unavailable;
         oldState.webSocket = null;
         return oldState;
       });
@@ -1110,7 +1143,6 @@ var PluvRoom = class {
       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;
@@ -1162,6 +1194,10 @@ var PluvRoom = class {
       const encodedState = this._crdtManager.doc.getEncodedState();
       this._emitSharedTypes();
       this._observeCrdt();
+      this._updateState((oldState) => {
+        oldState.storage.state = StorageState.Synced;
+        return oldState;
+      });
       this._stateNotifier.subjects["storage-loaded"].next(true);
       this._sendMessage({
         type: "$updateStorage",
@@ -1274,11 +1310,13 @@ var PluvRoom = class {
     this._listeners.onAuthorizationFail(authError);
     this._updateState((oldState) => {
       oldState.connection.state = ConnectionState.Unavailable;
+      oldState.storage.state = StorageState.Unavailable;
       return oldState;
     });
   }
   _onClose(event) {
     return __async(this, null, function* () {
+      this._listenerManager.subjects.close.next(event);
       this._logDebug("WebSocket closed");
       if (!!event.reason) this._logDebug(event.reason);
       const shouldRetry = [
@@ -1306,6 +1344,7 @@ var PluvRoom = class {
            */
           ConnectionState.Closed
         );
+        oldState.storage.state = oldState.storage.state === StorageState.Synced ? StorageState.Offline : StorageState.Unavailable;
         oldState.webSocket = null;
         return oldState;
       });
@@ -1322,9 +1361,11 @@ var PluvRoom = class {
    * @description Handle websocket errors in a meaningful way, should they occur
    * @date August 19, 2022
    */
-  _onError() {
+  _onError(event) {
+    this._listenerManager.subjects.error.next(event);
   }
   _onMessage(event) {
+    this._listenerManager.subjects.message.next(event);
     const message = this._parseMessage(event);
     if (!message) return;
     const shouldLog = typeof this._debug === "boolean" ? this._debug : this._debug.output.find((value) => value === message.type);
@@ -1372,7 +1413,8 @@ var PluvRoom = class {
       default:
     }
   }
-  _onOpen() {
+  _onOpen(event) {
+    this._listenerManager.subjects.open.next(event);
     if (this._state.connection.state !== ConnectionState.Connecting) return;
     this._logDebug("WebSocket connected");
     this._updateState((oldState) => {
@@ -1390,6 +1432,7 @@ var PluvRoom = class {
       if (this._state.connection.state === ConnectionState.Closed) return;
       this._updateState((oldState) => {
         oldState.connection.state = ConnectionState.Unavailable;
+        oldState.storage.state = oldState.storage.state === StorageState.Synced ? StorageState.Offline : StorageState.Unavailable;
         return oldState;
       });
     });
@@ -1489,6 +1532,7 @@ var PluvRoom = class {
     const oldState = __spreadProps(__spreadValues({}, this._state), {
       authorization,
       connection: JSON.parse(JSON.stringify(this._state.connection)),
+      storage: JSON.parse(JSON.stringify(this._state.storage)),
       webSocket: this._state.webSocket
     });
     const newState = updater(oldState);
@@ -1602,9 +1646,13 @@ var createClient = (options) => {
 var infer = (callback) => callback;
 
 // src/MockedRoom.ts
-import { ConnectionState as ConnectionState2 } from "@pluv/types";
+import { ConnectionState as ConnectionState2, StorageState as StorageState2 } from "@pluv/types";
 var MockedRoom = class {
   constructor(room, options) {
+    /**
+     * @deprecated To be removed in v3. Use `getStorageLoaded` instead.
+     */
+    this.storageLoaded = true;
     this._crdtNotifier = new CrdtNotifier();
     this._eventNotifier = new EventNotifier();
     this._usersNotifier = new UsersNotifier();
@@ -1615,10 +1663,12 @@ var MockedRoom = class {
       },
       connection: {
         attempts: 0,
-        count: 1,
         id: null,
         state: ConnectionState2.Untouched
       },
+      storage: {
+        state: StorageState2.Unavailable
+      },
       webSocket: null
     };
     this._stateNotifier = new StateNotifier();
@@ -1793,8 +1843,8 @@ var MockedRoom = class {
     });
     this._observeCrdt();
   }
-  get storageLoaded() {
-    return true;
+  addEventListener(kind, handler) {
+    return () => void 0;
   }
   getDoc() {
     return this._crdtManager.doc;
@@ -1804,6 +1854,9 @@ var MockedRoom = class {
     if (typeof type === "undefined") return this._crdtManager.doc.toJson();
     return this._crdtManager.doc.toJson(type);
   }
+  getStorageLoaded() {
+    return true;
+  }
   _observeCrdt() {
     var _a, _b;
     (_b = (_a = this._subscriptions).observeCrdt) == null ? void 0 : _b.call(_a);

package/package.json

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

package/src/CrdtManager.ts

@@ -1,7 +1,7 @@
-import type { AbstractCrdtDocFactory, CrdtDocLike, CrdtType, InferStorage } from "@pluv/crdt";
+import type { AbstractCrdtDocFactory, InferDocLike, InferStorage } from "@pluv/crdt";
 import { noop } from "@pluv/crdt";
 
-export type CrdtManagerOptions<TCrdt extends AbstractCrdtDocFactory<any>> = {
+export type CrdtManagerOptions<TCrdt extends AbstractCrdtDocFactory<any, any>> = {
     initialStorage?: TCrdt;
 };
 
@@ -15,8 +15,8 @@ interface ApplyUpdateParams {
     update: string | readonly string[];
 }
 
-export class CrdtManager<TCrdt extends AbstractCrdtDocFactory<any>> {
-    public doc: CrdtDocLike<InferStorage<TCrdt>>;
+export class CrdtManager<TCrdt extends AbstractCrdtDocFactory<any, any>> {
+    public doc: InferDocLike<TCrdt>;
     public initialized: boolean = false;
 
     private readonly _docFactory: TCrdt;
@@ -25,7 +25,7 @@ export class CrdtManager<TCrdt extends AbstractCrdtDocFactory<any>> {
         const { initialStorage = noop.doc({}) as any } = options;
 
         this._docFactory = initialStorage;
-        this.doc = initialStorage.getEmpty();
+        this.doc = this._docFactory.getEmpty() as InferDocLike<TCrdt>;
     }
 
     /**
@@ -49,7 +49,7 @@ export class CrdtManager<TCrdt extends AbstractCrdtDocFactory<any>> {
     public destroy(): void {
         this.initialized = false;
         this.doc.destroy();
-        this.doc = this._docFactory.getEmpty();
+        this.doc = this._docFactory.getEmpty() as InferDocLike<TCrdt>;
     }
 
     public get<TKey extends keyof InferStorage<TCrdt>>(key: TKey): InferStorage<TCrdt>[TKey] {
@@ -94,11 +94,7 @@ export class CrdtManager<TCrdt extends AbstractCrdtDocFactory<any>> {
         const initialized = this._docFactory.getInitialized();
         const reference = initialized.get();
 
-        this.doc = this._applyDocUpdates(
-            this._docFactory.getEmpty(),
-            updates,
-            origin,
-        ).rebuildStorage(reference);
+        this.doc = this._applyDocUpdates(this.doc, updates, origin).rebuildStorage(reference);
         this.initialized = true;
         initialized.destroy();
 
@@ -110,10 +106,10 @@ export class CrdtManager<TCrdt extends AbstractCrdtDocFactory<any>> {
     }
 
     private _applyDocUpdates(
-        doc: CrdtDocLike<InferStorage<TCrdt>>,
+        doc: InferDocLike<TCrdt>,
         updates: readonly string[],
         origin?: string,
-    ): CrdtDocLike<InferStorage<TCrdt>> {
+    ): InferDocLike<TCrdt> {
         doc.transact(() => {
             doc.batchApplyEncodedState({ origin, updates });
         }, origin);

package/src/ListenerManager.ts

@@ -0,0 +1,21 @@
+import { makeSubject, subscribe, TypeOfSource } from "wonka";
+
+export class ListenerManager {
+    public subjects = {
+        close: makeSubject<CloseEvent>(),
+        error: makeSubject<Event>(),
+        message: makeSubject<MessageEvent<any>>(),
+        open: makeSubject<Event>(),
+    };
+
+    public subscribe<TKind extends keyof typeof this.subjects>(
+        kind: TKind,
+        callback: (event: TypeOfSource<(typeof this.subjects)[TKind]["source"]>) => void,
+    ): () => void {
+        const source = this.subjects[kind]?.source;
+
+        if (!source) return () => undefined;
+
+        return subscribe(callback)(source as any).unsubscribe;
+    }
+}

package/src/MockedRoom.ts

@@ -1,4 +1,10 @@
-import type { AbstractCrdtDocFactory, InferCrdtJson, InferStorage } from "@pluv/crdt";
+import type {
+    AbstractCrdtDocFactory,
+    InferCrdtJson,
+    InferDoc,
+    InferDocLike,
+    InferStorage,
+} from "@pluv/crdt";
 import type {
     BroadcastProxy,
     CrdtDocLike,
@@ -8,10 +14,10 @@ import type {
     Id,
     InferIOInput,
     InferIOOutput,
-    JsonObject,
     MergeEvents,
     OtherSubscriptionCallback,
     OthersSubscriptionCallback,
+    RoomEventListenerMap,
     RoomLike,
     StateNotifierSubjects,
     StorageProxy,
@@ -21,9 +27,10 @@ import type {
     SubscriptionCallback,
     UpdateMyPresenceAction,
     UserInfo,
+    WebSocketConnection,
     WebSocketState,
 } from "@pluv/types";
-import { ConnectionState } from "@pluv/types";
+import { ConnectionState, StorageState } from "@pluv/types";
 import type { CrdtManagerOptions } from "./CrdtManager";
 import { CrdtManager } from "./CrdtManager";
 import { CrdtNotifier } from "./CrdtNotifier";
@@ -41,7 +48,6 @@ import type {
     EventResolverContext,
     InternalSubscriptions,
     PluvClientLimits,
-    WebSocketConnection,
 } from "./types";
 
 export type MockedRoomEvents<TIO extends IOLike> = Partial<{
@@ -50,8 +56,8 @@ export type MockedRoomEvents<TIO extends IOLike> = Partial<{
 
 export type MockedRoomConfig<
     TIO extends IOLike,
-    TPresence extends JsonObject,
-    TCrdt extends AbstractCrdtDocFactory<any>,
+    TPresence extends Record<string, any>,
+    TCrdt extends AbstractCrdtDocFactory<any, any>,
     TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>>,
 > = {
     events?: MockedRoomEvents<MergeEvents<TEvents, TIO>>;
@@ -62,13 +68,18 @@ export type MockedRoomConfig<
 
 export class MockedRoom<
     TIO extends IOLike,
-    TPresence extends JsonObject,
-    TCrdt extends AbstractCrdtDocFactory<any>,
+    TPresence extends Record<string, any>,
+    TCrdt extends AbstractCrdtDocFactory<any, any>,
     TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>>,
-> implements RoomLike<TIO, TPresence, InferStorage<TCrdt>>
+> implements RoomLike<TIO, InferDoc<TCrdt>, TPresence, InferStorage<TCrdt>>
 {
     public readonly id: string;
 
+    /**
+     * @deprecated To be removed in v3. Use `getStorageLoaded` instead.
+     */
+    public readonly storageLoaded: boolean = true;
+
     private readonly _crdtManager: CrdtManager<TCrdt>;
     private readonly _crdtNotifier = new CrdtNotifier<InferStorage<TCrdt>>();
     private readonly _eventNotifier = new EventNotifier<MergeEvents<TEvents, TIO>>();
@@ -83,10 +94,12 @@ export class MockedRoom<
         },
         connection: {
             attempts: 0,
-            count: 1,
             id: null,
             state: ConnectionState.Untouched,
         },
+        storage: {
+            state: StorageState.Unavailable,
+        },
         webSocket: null,
     };
     private readonly _stateNotifier = new StateNotifier<TIO, TPresence>();
@@ -121,8 +134,11 @@ export class MockedRoom<
         this._observeCrdt();
     }
 
-    public get storageLoaded(): boolean {
-        return true;
+    public addEventListener<TKind extends keyof RoomEventListenerMap>(
+        kind: TKind,
+        handler: RoomEventListenerMap[TKind],
+    ): () => void {
+        return () => undefined;
     }
 
     public broadcast = new Proxy(
@@ -140,7 +156,8 @@ export class MockedRoom<
                 any,
                 any,
                 TPresence,
-                InferStorage<TCrdt>
+                TCrdt,
+                ""
             > | null;
 
             if (!procedure?.config.broadcast) {
@@ -154,7 +171,7 @@ export class MockedRoom<
             if (!myself) return;
 
             const parsed = procedure.config.input ? procedure.config.input.parse(data) : data;
-            const context: EventResolverContext<TIO, TPresence, InferStorage<TCrdt>> = {
+            const context: EventResolverContext<TIO, TPresence, InferDocLike<TCrdt>> = {
                 doc: this._crdtManager.doc,
                 others: this._usersManager.getOthers(),
                 room: this.id,
@@ -213,7 +230,7 @@ export class MockedRoom<
         return Object.freeze(JSON.parse(JSON.stringify(this._state.connection)));
     };
 
-    public getDoc(): CrdtDocLike<InferStorage<TCrdt>> {
+    public getDoc(): CrdtDocLike<InferDoc<TCrdt>, InferStorage<TCrdt>> {
         return this._crdtManager.doc;
     }
 
@@ -249,12 +266,15 @@ export class MockedRoom<
     ): InferCrdtJson<InferStorage<TCrdt>[TKey]> | null;
     public getStorageJson<TKey extends keyof InferStorage<TCrdt>>(type?: TKey) {
         if (this._state.connection.id === null) return null;
-
         if (typeof type === "undefined") return this._crdtManager.doc.toJson();
 
         return this._crdtManager.doc.toJson(type);
     }
 
+    public getStorageLoaded(): boolean {
+        return true;
+    }
+
     public other = (
         connectionId: string,
         callback: OtherSubscriptionCallback<TIO, TPresence>,

package/src/PluvClient.ts

@@ -24,8 +24,8 @@ import type { PluvClientLimits, PublicKey, WithMetadata } from "./types";
 
 export type PluvClientOptions<
     TIO extends IOLike<any, any>,
-    TPresence extends JsonObject,
-    TCrdt extends AbstractCrdtDocFactory<any>,
+    TPresence extends Record<string, any>,
+    TCrdt extends AbstractCrdtDocFactory<any, any>,
     TMetadata extends JsonObject,
 > = RoomEndpoints<TIO, TMetadata> & {
     debug?: boolean;
@@ -43,8 +43,8 @@ export type PluvClientOptions<
 
 export type CreateRoomOptions<
     TIO extends IOLike<any, any>,
-    TPresence extends JsonObject,
-    TCrdt extends AbstractCrdtDocFactory<any>,
+    TPresence extends Record<string, any>,
+    TCrdt extends AbstractCrdtDocFactory<any, any>,
     TMetadata extends JsonObject,
     TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>> = {},
 > = {
@@ -63,8 +63,8 @@ export type EnterRoomParams<TMetadata extends JsonObject = {}> = keyof TMetadata
 
 export class PluvClient<
     TIO extends IOLike<any, any>,
-    TPresence extends JsonObject = {},
-    TCrdt extends AbstractCrdtDocFactory<any> = NoopCrdtDocFactory,
+    TPresence extends Record<string, any> = {},
+    TCrdt extends AbstractCrdtDocFactory<any, any> = NoopCrdtDocFactory,
     TMetadata extends JsonObject = {},
 > {
     public readonly metadata?: InputZodLike<TMetadata>;
@@ -84,8 +84,8 @@ export class PluvClient<
         };
     }
 
-    public get procedure(): PluvProcedure<TIO, {}, {}, TPresence, InferStorage<TCrdt>> {
-        return new PluvProcedure<TIO, {}, {}, TPresence, InferStorage<TCrdt>>();
+    public get procedure(): PluvProcedure<TIO, {}, {}, TPresence, TCrdt, ""> {
+        return new PluvProcedure<TIO, {}, {}, TPresence, TCrdt, "">();
     }
 
     constructor(options: PluvClientOptions<TIO, TPresence, TCrdt, TMetadata>) {