@pluv/client 1.0.1 → 2.0.0

package/src/types.ts

@@ -1,5 +1,7 @@
-import type { AbstractCrdtDoc, CrdtType } from "@pluv/crdt";
+import type { CrdtType } from "@pluv/crdt";
 import type {
+    ConnectionState,
+    CrdtDocLike,
     EventRecord,
     Id,
     InferIOAuthorize,
@@ -7,8 +9,8 @@ import type {
     IOLike,
     JsonObject,
     MaybePromise,
+    UserInfo,
 } from "@pluv/types";
-import type { ConnectionState } from "./enums";
 import type { PluvClient } from "./PluvClient";
 
 export interface AuthorizationState<TIO extends IOLike> {
@@ -32,7 +34,7 @@ export interface EventResolverContext<
     TPresence extends JsonObject = {},
     TStorage extends Record<string, CrdtType<any, any>> = {},
 > {
-    doc: AbstractCrdtDoc<TStorage>;
+    doc: CrdtDocLike<TStorage>;
     others: readonly UserInfo<TIO, TPresence>[];
     room: string;
     user: UserInfo<TIO, TPresence>;
@@ -74,16 +76,6 @@ export type PublicKey<TMetadata extends JsonObject> =
     | string
     | ((params: PublicKeyParams<TMetadata>) => string);
 
-export type UpdateMyPresenceAction<TPresence extends JsonObject> =
-    | Partial<TPresence>
-    | ((oldPresence: TPresence | null) => Partial<TPresence>);
-
-export interface UserInfo<TIO extends IOLike, TPresence extends JsonObject = {}> {
-    connectionId: string;
-    presence: TPresence;
-    user: Id<InferIOAuthorizeUser<InferIOAuthorize<TIO>>>;
-}
-
 export interface WebSocketConnection {
     /**
      * @description How many times a connection attempt was made. This will increment upon each
@@ -103,12 +95,6 @@ export interface WebSocketConnection {
     state: ConnectionState;
 }
 
-export interface WebSocketState<TIO extends IOLike> {
-    authorization: AuthorizationState<TIO>;
-    connection: WebSocketConnection;
-    webSocket: WebSocket | null;
-}
-
 export type WithMetadata<TMetadata extends JsonObject = {}> = keyof TMetadata extends never
     ? { metadata?: undefined }
     : { metadata: TMetadata };

package/src/AbstractRoom.ts

@@ -1,84 +0,0 @@
-import type { AbstractCrdtDoc, CrdtType, InferCrdtJson } 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 { MergeEvents, PluvRouterEventConfig } from "./PluvRouter";
-import type { StateNotifierSubjects, SubscriptionCallback } from "./StateNotifier";
-import type { UpdateMyPresenceAction, UserInfo, WebSocketConnection } from "./types";
-
-export abstract class AbstractRoom<
-    TIO extends IOLike,
-    TPresence extends JsonObject = {},
-    TStorage extends Record<string, CrdtType<any, any>> = {},
-    TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {},
-> {
-    public readonly id: string;
-
-    constructor(room: string) {
-        this.id = room;
-    }
-
-    public abstract storageLoaded: boolean;
-
-    public abstract broadcast<TEvent extends keyof InferIOInput<MergeEvents<TEvents, TIO>>>(
-        event: TEvent,
-        data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[TEvent]>,
-    ): void;
-
-    public abstract canRedo(): boolean;
-
-    public abstract canUndo(): boolean;
-
-    public abstract getDoc(): AbstractCrdtDoc<TStorage>;
-
-    public abstract event<TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(
-        event: TEvent,
-        callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>,
-    ): () => void;
-
-    public abstract getConnection(): WebSocketConnection;
-
-    public abstract getMyPresence(): TPresence;
-
-    public abstract getMyself(): 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>(type: TKey): TStorage[TKey] | null;
-
-    public abstract getStorageJson(): InferCrdtJson<TStorage> | null;
-    public abstract getStorageJson<TKey extends keyof TStorage>(
-        type: TKey,
-    ): InferCrdtJson<TStorage[TKey]> | null;
-
-    public abstract other(
-        connectionId: string,
-        callback: OtherNotifierSubscriptionCallback<TIO, TPresence>,
-    ): () => void;
-
-    public abstract redo(): void;
-
-    public abstract storage<TKey extends keyof TStorage>(
-        key: TKey,
-        fn: (value: InferCrdtJson<TStorage[TKey]>) => void,
-    ): () => void;
-
-    public abstract storageRoot(
-        fn: (value: {
-            [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
-        }) => void,
-    ): () => void;
-
-    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 undo(): void;
-
-    public abstract updateMyPresence(presence: UpdateMyPresenceAction<TPresence>): void;
-}

package/src/enums.ts

@@ -1,9 +0,0 @@
-export const ConnectionState = {
-    Closed: "Closed",
-    Connecting: "Connecting",
-    Open: "Open",
-    Unavailable: "Unavailable",
-    Untouched: "Untouched",
-} as const;
-
-export type ConnectionState = (typeof ConnectionState)[keyof typeof ConnectionState];