@pluv/io 0.17.3 → 0.19.0

package/dist/index.js

@@ -84,6 +84,9 @@ __export(src_exports, {
   AbstractPubSub: () => AbstractPubSub,
   AbstractWebSocket: () => AbstractWebSocket,
   PluvIO: () => PluvIO,
+  PluvProcedure: () => PluvProcedure,
+  PluvRouter: () => PluvRouter,
+  PluvServer: () => PluvServer,
   createIO: () => createIO
 });
 module.exports = __toCommonJS(src_exports);
@@ -113,8 +116,7 @@ var Persistance = class extends AbstractPersistance {
   deleteUser(room, connectionId) {
     return __async(this, null, function* () {
       const users = this._users.get(room);
-      if (!users)
-        return;
+      if (!users) return;
       users.delete(connectionId);
       if (!users.size) {
         yield this.deleteUsers(room);
@@ -143,8 +145,7 @@ var Persistance = class extends AbstractPersistance {
   }
   getUsers(room) {
     const users = this._users.get(room);
-    if (!users)
-      return Promise.resolve([]);
+    if (!users) return Promise.resolve([]);
     return Promise.resolve(Array.from(users.values()));
   }
   setStorageState(room, state) {
@@ -175,8 +176,7 @@ var PubSub = class extends AbstractPubSub {
   publish(roomName, payload) {
     return __async(this, null, function* () {
       const subject = this._subjects.get(roomName);
-      if (!subject)
-        return;
+      if (!subject) return;
       Promise.resolve(subject.next(payload));
     });
   }
@@ -194,11 +194,9 @@ var PubSub = class extends AbstractPubSub {
   unsubscribe(subscriptionId) {
     var _a;
     const [roomName, unsubscribe] = (_a = this._unsubscriptions.get(subscriptionId)) != null ? _a : [];
-    if (!roomName || !unsubscribe)
-      return;
+    if (!roomName || !unsubscribe) return;
     const refs = this._subscriptionsRefs.get(roomName);
-    if (!refs)
-      return;
+    if (!refs) return;
     if (refs.length === 1) {
       this._subjects.delete(roomName);
       this._subscriptionsRefs.delete(roomName);
@@ -241,11 +239,7 @@ var AbstractWebSocket = class {
   }
   handleError(params) {
     var _a, _b, _c;
-    const {
-      error,
-      message = error instanceof Error ? error.message : "Unexpected error",
-      session
-    } = params;
+    const { error, message = error instanceof Error ? error.message : "Unexpected error", session } = params;
     const stack = error instanceof Error ? (_a = error.stack) != null ? _a : null : null;
     return this.sendMessage({
       connectionId: (_b = session == null ? void 0 : session.id) != null ? _b : null,
@@ -261,6 +255,76 @@ var AbstractWebSocket = class {
 };
 
 // src/PluvIO.ts
+var import_crdt3 = require("@pluv/crdt");
+
+// src/PluvProcedure.ts
+var PluvProcedure = class _PluvProcedure {
+  constructor(config = {}) {
+    this._broadcast = null;
+    this._input = null;
+    this._self = null;
+    this._sync = null;
+    const { broadcast, input, self, sync } = config;
+    this._broadcast = broadcast != null ? broadcast : null;
+    this._input = input != null ? input : null;
+    this._self = self != null ? self : null;
+    this._sync = sync != null ? sync : null;
+  }
+  get config() {
+    var _a, _b, _c, _d, _e, _f, _g;
+    return {
+      broadcast: (_b = (_a = this._broadcast) == null ? void 0 : _a.bind(this)) != null ? _b : null,
+      input: (_c = this._input) != null ? _c : null,
+      resolver: this._resolver,
+      self: (_e = (_d = this._self) == null ? void 0 : _d.bind(this)) != null ? _e : null,
+      sync: (_g = (_f = this._sync) == null ? void 0 : _f.bind(this)) != null ? _g : null
+    };
+  }
+  broadcast(resolver) {
+    const { broadcast } = this.config;
+    if (!!broadcast) throw new Error("Broadcast was already defined for this procedure");
+    return new _PluvProcedure(__spreadProps(__spreadValues({}, this.config), {
+      broadcast: resolver
+    }));
+  }
+  input(input) {
+    return new _PluvProcedure({ input });
+  }
+  self(resolver) {
+    const { self } = this.config;
+    if (!!self) throw new Error("Self was already defined for this procedure");
+    return new _PluvProcedure(__spreadProps(__spreadValues({}, this.config), {
+      self: resolver
+    }));
+  }
+  sync(resolver) {
+    const { sync } = this.config;
+    if (!!sync) throw new Error("Sync was already defined for this procedure");
+    return new _PluvProcedure(__spreadProps(__spreadValues({}, this.config), {
+      sync: resolver
+    }));
+  }
+  _resolver() {
+    return (data, context) => {
+      var _a, _b, _c;
+      return __spreadValues(__spreadValues(__spreadValues({}, (_a = this._broadcast) == null ? void 0 : _a.call(this, data, context)), (_b = this._self) == null ? void 0 : _b.call(this, data, context)), (_c = this._sync) == null ? void 0 : _c.call(this, data, context));
+    };
+  }
+};
+
+// src/PluvRouter.ts
+var PluvRouter = class _PluvRouter {
+  constructor(events) {
+    this._events = {};
+    this._events = events;
+  }
+  static merge(...routers) {
+    const events = Object.assign(/* @__PURE__ */ Object.create(null), ...routers.map((router) => router._events));
+    return new _PluvRouter(events);
+  }
+};
+
+// src/PluvServer.ts
 var import_crdt2 = require("@pluv/crdt");
 var import_kleur2 = __toESM(require("kleur"));
 
@@ -273,13 +337,7 @@ var import_hkdf = __toESM(require("@panva/hkdf"));
 var import_jose = require("jose");
 var DEFAULT_MAX_AGE_MS = 6e4;
 var getEncryptionKey = (secret) => __async(void 0, null, function* () {
-  return yield (0, import_hkdf.default)(
-    "sha256",
-    secret,
-    "",
-    "Pluv.io Generated Encryption Key",
-    32
-  );
+  return yield (0, import_hkdf.default)("sha256", secret, "", "Pluv.io Generated Encryption Key", 32);
 });
 var now = () => Date.now() / 1e3 | 0;
 var authorize = (params) => {
@@ -311,37 +369,37 @@ var IORoom = class {
     this._sessions = /* @__PURE__ */ new Map();
     this._uninitialize = null;
     this._authorize = null;
-    const {
-      authorize: authorize2,
-      context,
-      crdt = import_crdt.noop,
-      debug,
-      events,
-      onDestroy,
-      platform
-    } = config;
+    const { authorize: authorize2, context, crdt = import_crdt.noop, debug, onDestroy, platform, router } = config;
     this._context = context;
     this._debug = debug;
     this._docFactory = crdt.doc(() => ({}));
     this._doc = this._docFactory.getEmpty();
-    this._events = events;
+    this._router = router;
     this._platform = platform;
     this.id = id;
     this._listeners = {
       onDestroy: (event) => onDestroy == null ? void 0 : onDestroy(event)
     };
-    if (authorize2)
-      this._authorize = authorize2;
+    if (authorize2) this._authorize = authorize2;
   }
-  broadcast(event, data) {
-    const message = { type: event, data };
-    return Promise.resolve(this._broadcast({ message }));
+  get _events() {
+    return this._router._events;
+  }
+  get broadcast() {
+    const _broadcast = (event, data) => {
+      const message = { type: event, data };
+      return Promise.resolve(this._broadcast({ message }));
+    };
+    return new Proxy(_broadcast, {
+      get(fn, prop) {
+        return (data) => fn(prop, data);
+      }
+    });
   }
   getSize() {
     const currentTime = (/* @__PURE__ */ new Date()).getTime();
     return Array.from(this._sessions.values()).reduce((count, session) => {
-      if (session.quit)
-        return count;
+      if (session.quit) return count;
       return currentTime - session.timers.ping > PING_TIMEOUT_MS ? count : count + 1;
     }, 0);
   }
@@ -350,8 +408,7 @@ var IORoom = class {
       var _b;
       const _a = options, { token } = _a, _platformEventContext = __objRest(_a, ["token"]);
       const platformEventContext = _platformEventContext;
-      if (!this._uninitialize)
-        yield this._initialize();
+      if (!this._uninitialize) yield this._initialize();
       const user = yield this._getAuthorizedUser(token, options);
       const sessionId = this._platform.randomUUID();
       const pluvWs = this._platform.convertWebSocket(webSocket, {
@@ -359,26 +416,16 @@ var IORoom = class {
         sessionId,
         userId: (_b = user == null ? void 0 : user.id) != null ? _b : null
       });
-      this._logDebug(
-        `${import_kleur.default.blue(
-          `Registering connection for room ${this.id}:`
-        )} ${sessionId}`
-      );
+      this._logDebug(`${import_kleur.default.blue(`Registering connection for room ${this.id}:`)} ${sessionId}`);
       const uninitializeWs = yield pluvWs.initialize();
       const ioAuthorize = this._getIOAuthorize(options);
       const isUnauthorized = !!(ioAuthorize == null ? void 0 : ioAuthorize.required) && !user;
-      const isTokenInUse = !!user && Array.from(this._sessions.values()).some(
-        (session2) => {
-          var _a2;
-          return ((_a2 = session2.user) == null ? void 0 : _a2.id) === user.id;
-        }
-      );
+      const isTokenInUse = !!user && Array.from(this._sessions.values()).some((session2) => {
+        var _a2;
+        return ((_a2 = session2.user) == null ? void 0 : _a2.id) === user.id;
+      });
       if (isUnauthorized || isTokenInUse) {
-        this._logDebug(
-          `${import_kleur.default.blue(
-            "Authorization failed for connection:"
-          )} ${sessionId}`
-        );
+        this._logDebug(`${import_kleur.default.blue("Authorization failed for connection:")} ${sessionId}`);
         pluvWs.handleError({ error: new Error("Not authorized") });
         pluvWs.close(3e3, "WebSocket unauthorized.");
         return;
@@ -396,24 +443,14 @@ var IORoom = class {
         user
       };
       this._sessions.set(session.id, session);
-      yield this._platform.persistance.addUser(
-        this.id,
-        sessionId,
-        user != null ? user : {}
-      );
+      yield this._platform.persistance.addUser(this.id, sessionId, user != null ? user : {});
       const onClose = this._onClose(session, uninitializeWs).bind(this);
-      const onMessage = this._onMessage(session, platformEventContext).bind(
-        this
-      );
+      const onMessage = this._onMessage(session, platformEventContext).bind(this);
       pluvWs.addEventListener("close", onClose);
       pluvWs.addEventListener("error", onClose);
       pluvWs.addEventListener("message", onMessage);
       this._emitRegistered(session);
-      this._logDebug(
-        `${import_kleur.default.blue(
-          `Registered connection for room ${this.id}:`
-        )} ${sessionId}`
-      );
+      this._logDebug(`${import_kleur.default.blue(`Registered connection for room ${this.id}:`)} ${sessionId}`);
       const size = this.getSize();
       this._logDebug(`${import_kleur.default.blue(`Room ${this.id} size:`)} ${size}`);
     });
@@ -466,10 +503,8 @@ var IORoom = class {
     return __async(this, null, function* () {
       var _a;
       const ioAuthorize = this._getIOAuthorize(context);
-      if (!ioAuthorize)
-        return null;
-      if (!token)
-        return null;
+      if (!ioAuthorize) return null;
+      if (!token) return null;
       const payload = yield authorize({
         platform: this._platform,
         secret: ioAuthorize.secret
@@ -480,9 +515,7 @@ var IORoom = class {
         return null;
       }
       if (payload.room !== this.id) {
-        this._logDebug(
-          import_kleur.default.blue(`Token is not authorized for room ${this.id}:`)
-        );
+        this._logDebug(import_kleur.default.blue(`Token is not authorized for room ${this.id}:`));
         this._logDebug(import_kleur.default.blue("Received:"), payload.room);
         this._logDebug(token);
         return null;
@@ -490,29 +523,19 @@ var IORoom = class {
       try {
         return (_a = ioAuthorize.user.parse(payload.user)) != null ? _a : null;
       } catch (e) {
-        this._logDebug(
-          `${import_kleur.default.blue("Token fails validation:")} ${token}`
-        );
+        this._logDebug(`${import_kleur.default.blue("Token fails validation:")} ${token}`);
         return null;
       }
     });
   }
-  _getEventConfig(message) {
+  _getProcedure(message) {
     var _a;
-    return (_a = this._events[message.type]) != null ? _a : null;
-  }
-  _getEventInputs(message) {
-    const eventConfig = this._getEventConfig(message);
-    if (!eventConfig)
-      return message.data;
-    return eventConfig.input ? eventConfig.input.parse(message.data) : message.data;
+    return (_a = this._router._events[message.type]) != null ? _a : null;
   }
-  _getEventResolverObject(message) {
-    const eventConfig = this._getEventConfig(message);
-    if (!eventConfig)
-      return {};
-    const resolver = eventConfig.resolver;
-    return typeof resolver === "function" ? { broadcast: resolver } : __spreadValues({}, resolver);
+  _getProcedureInputs(message) {
+    const procedure = this._getProcedure(message);
+    if (!procedure) return message.data;
+    return procedure.config.input ? procedure.config.input.parse(message.data) : message.data;
   }
   _initialize() {
     return __async(this, null, function* () {
@@ -521,17 +544,14 @@ var IORoom = class {
         yield this._uninitialize();
         this._uninitialize = null;
       }
-      const pubSubId = yield this._platform.pubSub.subscribe(
-        this.id,
-        (_a) => {
-          var _b = _a, { options = {} } = _b, message = __objRest(_b, ["options"]);
-          const session = {
-            id: message.connectionId,
-            user: message.user
-          };
-          this._sendMessage(message, session, options);
-        }
-      );
+      const pubSubId = yield this._platform.pubSub.subscribe(this.id, (_a) => {
+        var _b = _a, { options = {} } = _b, message = __objRest(_b, ["options"]);
+        const session = {
+          id: message.connectionId,
+          user: message.user
+        };
+        this._sendMessage(message, session, options);
+      });
       this._uninitialize = () => __async(this, null, function* () {
         this._platform.pubSub.unsubscribe(pubSubId);
         const encodedState = this._doc.getEncodedState();
@@ -550,14 +570,9 @@ var IORoom = class {
   }
   _onClose(session, callback) {
     return () => {
-      if (!this._uninitialize)
-        return;
+      if (!this._uninitialize) return;
       session.quit = true;
-      this._logDebug(
-        `${import_kleur.default.blue(
-          `(Unregistering connection for room ${this.id}:`
-        )} ${session.id}`
-      );
+      this._logDebug(`${import_kleur.default.blue(`(Unregistering connection for room ${this.id}:`)} ${session.id}`);
       this._sessions.delete(session.id);
       this._platform.persistance.deleteUser(this.id, session.id).finally(() => {
         var _a;
@@ -570,23 +585,16 @@ var IORoom = class {
         });
         callback == null ? void 0 : callback();
         const size = this.getSize();
-        this._logDebug(
-          `${import_kleur.default.blue(
-            `Unregistered connection for room ${this.id}:`
-          )} ${session.id}`
-        );
-        this._logDebug(
-          `${import_kleur.default.blue(`Room ${this.id} size:`)} ${size}`
-        );
-        if (size)
-          return;
+        this._logDebug(`${import_kleur.default.blue(`Unregistered connection for room ${this.id}:`)} ${session.id}`);
+        this._logDebug(`${import_kleur.default.blue(`Room ${this.id} size:`)} ${size}`);
+        if (size) return;
         (_a = this._uninitialize) == null ? void 0 : _a.call(this);
       });
     };
   }
   _onMessage(session, platformEventContext) {
     return (event) => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d, _e, _f;
       const baseContext = {
         context: this._context,
         doc: this._doc,
@@ -594,19 +602,18 @@ var IORoom = class {
         session,
         sessions: this._sessions
       };
-      if (!this._uninitialize)
-        return;
+      if (!this._uninitialize) return;
       if (session.quit) {
         session.webSocket.close(1011, "WebSocket broken.");
         return;
       }
       const message = this._parseMessage(event);
-      if (!message)
-        return;
-      const resolver = this._getEventResolverObject(message);
+      if (!message) return;
+      const procedure = this._getProcedure(message);
+      if (!procedure) return;
       let inputs;
       try {
-        inputs = this._getEventInputs(message);
+        inputs = this._getProcedureInputs(message);
       } catch (error) {
         session == null ? void 0 : session.webSocket.handleError({
           error,
@@ -619,9 +626,9 @@ var IORoom = class {
         context: __spreadValues(__spreadValues({}, this._context), platformEventContext)
       });
       Promise.all([
-        (_a = resolver.broadcast) == null ? void 0 : _a.call(resolver, inputs, extendedContext),
-        (_b = resolver.self) == null ? void 0 : _b.call(resolver, inputs, extendedContext),
-        (_c = resolver.sync) == null ? void 0 : _c.call(resolver, inputs, baseContext)
+        (_b = (_a = procedure.config).broadcast) == null ? void 0 : _b.call(_a, inputs, extendedContext),
+        (_d = (_c = procedure.config).self) == null ? void 0 : _d.call(_c, inputs, extendedContext),
+        (_f = (_e = procedure.config).sync) == null ? void 0 : _f.call(_e, inputs, baseContext)
       ]).then(([broadcast, self, sync]) => {
         if (broadcast) {
           Object.entries(broadcast).forEach(([type, data]) => {
@@ -653,12 +660,9 @@ var IORoom = class {
   _parseMessage(message) {
     try {
       const parsed = this._platform.parseData(message.data);
-      if (typeof parsed !== "object")
-        return null;
-      if (typeof parsed.type !== "string")
-        return null;
-      if (typeof parsed.data !== "object")
-        return null;
+      if (typeof parsed !== "object") return null;
+      if (typeof parsed.type !== "string") return null;
+      if (typeof parsed.data !== "object") return null;
       return parsed;
     } catch (e) {
       return null;
@@ -698,11 +702,9 @@ var IORoom = class {
   }
   _sendSelfMessage(message, sender) {
     const senderId = sender == null ? void 0 : sender.id;
-    if (!senderId)
-      return;
+    if (!senderId) return;
     const session = this._sessions.get(senderId);
-    if (!session)
-      return;
+    if (!session) return;
     session.webSocket.sendMessage(__spreadValues({
       connectionId: sender.id,
       room: this.id,
@@ -710,9 +712,9 @@ var IORoom = class {
     }, message));
   }
   _sendSyncMessage(message, sender) {
+    var _a;
     const senderId = sender == null ? void 0 : sender.id;
-    if (!senderId)
-      return;
+    if (!senderId) return;
     const context = {
       context: this._context,
       doc: this._doc,
@@ -720,21 +722,19 @@ var IORoom = class {
       session: null,
       sessions: this._sessions
     };
-    const resolver = this._getEventResolverObject(message).sync;
-    if (!resolver)
-      return;
+    const resolver = (_a = this._getProcedure(message)) == null ? void 0 : _a.config.sync;
+    if (!resolver) return;
     let inputs;
     try {
-      inputs = this._getEventInputs(message);
+      inputs = this._getProcedureInputs(message);
     } catch (e) {
       return;
     }
     Promise.resolve(resolver(inputs, context)).then((output) => {
-      if (!output)
-        return;
+      if (!output) return;
       Object.keys(output).forEach((type) => {
-        var _a, _b;
-        const data = (_a = output[type]) != null ? _a : {};
+        var _a2, _b;
+        const data = (_a2 = output[type]) != null ? _a2 : {};
         this._platform.pubSub.publish(this.id, {
           connectionId: senderId,
           data,
@@ -749,149 +749,43 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "0.17.3";
+var version = "0.19.0";
 
-// src/PluvIO.ts
-var PluvIO = class _PluvIO {
+// src/PluvServer.ts
+var PluvServer = class {
   constructor(options) {
     this._rooms = /* @__PURE__ */ new Map();
     this._authorize = null;
     this._context = {};
-    this._events = {
-      $GET_OTHERS: {
-        resolver: {
-          sync: (data, { room, session, sessions }) => {
-            const others = Array.from(sessions.entries()).filter(([, wsSession]) => wsSession.id !== (session == null ? void 0 : session.id)).reduce(
-              (acc, [connectionId, { presence, user }]) => __spreadProps(__spreadValues({}, acc), {
-                [connectionId]: {
-                  connectionId,
-                  presence,
-                  room,
-                  user
-                }
-              }),
-              {}
-            );
-            return { $OTHERS_RECEIVED: { others } };
-          }
-        }
-      },
-      $INITIALIZE_SESSION: {
-        resolver: {
-          broadcast: ({ presence }, { session }) => {
-            if (!session)
-              return {};
-            session.presence = presence;
-            return {
-              $USER_JOINED: {
-                connectionId: session.id,
-                user: session.user,
-                presence
-              }
-            };
-          },
-          self: (_0, _1) => __async(this, [_0, _1], function* ({ update }, { context, doc, room }) {
-            var _a, _b;
-            const oldState = yield this._platform.persistance.getStorageState(room);
-            const updates = [
-              oldState ? null : yield (_a = this._getInitialStorage) == null ? void 0 : _a.call(this, __spreadProps(__spreadValues({}, context), {
-                room
-              })),
-              update
-            ];
-            if (updates.some((_update) => !!_update)) {
-              const encodedState = doc.batchApplyEncodedState(updates).getEncodedState();
-              yield this._platform.persistance.setStorageState(
-                room,
-                encodedState
-              );
-              this._listeners.onStorageUpdated(__spreadProps(__spreadValues({}, context), {
-                encodedState,
-                room
-              }));
-            }
-            const state = (_b = yield this._platform.persistance.getStorageState(
-              room
-            )) != null ? _b : doc.getEncodedState();
-            return { $STORAGE_RECEIVED: { state } };
-          })
-        }
-      },
-      $PING: {
-        resolver: {
-          self: (data, { session }) => {
-            if (!session)
-              return {};
-            const currentTime = (/* @__PURE__ */ new Date()).getTime();
-            session.timers.ping = currentTime;
-            return { $PONG: {} };
-          }
-        }
-      },
-      $UPDATE_PRESENCE: {
-        resolver: ({ presence }, { session }) => {
-          if (!session)
-            return {};
-          session.presence = Object.assign(
-            /* @__PURE__ */ Object.create(null),
-            session.presence,
-            presence
-          );
-          return { $PRESENCE_UPDATED: { presence } };
-        }
-      },
-      $UPDATE_STORAGE: {
-        resolver: ({ origin, update }, { context, doc, room }) => {
-          if (origin === "$INITIALIZED" && Object.keys(doc.toJson()).length) {
-            return;
-          }
-          const updated = doc.applyEncodedState({ update });
-          const encodedState = updated.getEncodedState();
-          this._platform.persistance.setStorageState(room, encodedState).then(() => {
-            this._listeners.onStorageUpdated(__spreadProps(__spreadValues({}, context), {
-              encodedState,
-              room
-            }));
-          });
-          return { $STORAGE_UPDATED: { state: encodedState } };
-        }
-      }
-    };
-    this._getInitialStorage = null;
     this._version = version;
     const {
       authorize: authorize2,
       context,
       crdt = import_crdt2.noop,
       debug = false,
-      events,
-      getInitialStorage,
       onRoomDeleted,
       onStorageUpdated,
-      platform
+      platform,
+      router = new PluvRouter({})
     } = options;
     this._crdt = crdt;
     this._debug = debug;
     this._platform = platform;
-    if (authorize2)
-      this._authorize = authorize2;
-    if (context)
-      this._context = context;
-    if (events)
-      this._events = events;
-    if (getInitialStorage)
-      this._getInitialStorage = getInitialStorage;
+    this._router = router != null ? router : null;
+    if (authorize2) this._authorize = authorize2;
+    if (context) this._context = context;
     this._listeners = {
       onRoomDeleted: (event) => onRoomDeleted == null ? void 0 : onRoomDeleted(event),
       onStorageUpdated: (event) => onStorageUpdated == null ? void 0 : onStorageUpdated(event)
     };
   }
+  get _events() {
+    return this._router._events;
+  }
   createToken(params) {
     return __async(this, null, function* () {
       if (!this._authorize) {
-        throw new Error(
-          "IO does not specify authorize during initialization."
-        );
+        throw new Error("IO does not specify authorize during initialization.");
       }
       const ioAuthorize = typeof this._authorize === "function" ? this._authorize(params) : this._authorize;
       const secret = ioAuthorize.secret;
@@ -901,22 +795,6 @@ var PluvIO = class _PluvIO {
       }).encode(params);
     });
   }
-  event(event, config) {
-    if (event.startsWith("$")) {
-      throw new Error('Event name must not start with "$".');
-    }
-    const newEvent = {
-      [event]: config
-    };
-    return _PluvIO.merge(
-      this,
-      new _PluvIO({
-        crdt: this._crdt,
-        events: newEvent,
-        platform: this._platform
-      })
-    );
-  }
   getRoom(room, options) {
     var _b;
     const _a = options, { debug } = _a, platformRoomContext = __objRest(_a, ["debug"]);
@@ -926,19 +804,15 @@ var PluvIO = class _PluvIO {
     }
     const platform = this._platform;
     const oldRoom = this._rooms.get(room);
-    if (oldRoom)
-      return oldRoom;
+    if (oldRoom) return oldRoom;
     const roomContext = __spreadValues(__spreadValues({}, this._context), platformRoomContext);
     const newRoom = new IORoom(room, {
       authorize: (_b = this._authorize) != null ? _b : void 0,
       context: roomContext,
       crdt: this._crdt,
       debug: debug != null ? debug : this._debug,
-      events: this._events,
       onDestroy: ({ encodedState, room: room2 }) => {
-        this._logDebug(
-          `${import_kleur2.default.blue("Deleting empty room:")} ${room2}`
-        );
+        this._logDebug(`${import_kleur2.default.blue("Deleting empty room:")} ${room2}`);
         const roomContext2 = __spreadValues({
           room: room2,
           encodedState
@@ -948,74 +822,176 @@ var PluvIO = class _PluvIO {
         if (this._debug) {
           const rooms = Array.from(this._rooms.keys());
           this._logDebug(`${import_kleur2.default.blue("Deleted room:")} ${room2}`);
-          this._logDebug(
-            `${import_kleur2.default.blue("Rooms available:")} ${rooms.join(
-              ", "
-            )}`
-          );
+          this._logDebug(`${import_kleur2.default.blue("Rooms available:")} ${rooms.join(", ")}`);
         }
       },
-      platform
+      platform,
+      router: this._router
     });
     this._rooms.set(room, newRoom);
     if (this._debug) {
       const rooms = Array.from(this._rooms.keys());
       this._logDebug(`${import_kleur2.default.blue("Created room:")} ${room}`);
-      this._logDebug(
-        `${import_kleur2.default.blue("Rooms available:")} ${rooms.join(", ")}`
-      );
+      this._logDebug(`${import_kleur2.default.blue("Rooms available:")} ${rooms.join(", ")}`);
     }
     return newRoom;
   }
-  static merge(first, second) {
-    var _a;
-    const authorize2 = (_a = first._authorize) != null ? _a : void 0;
-    const context = first._context;
-    const crdt = first._crdt;
-    const debug = first._debug;
-    const platform = first._platform;
-    const getInitialStorage = first._getInitialStorage;
-    const events1 = first._events;
-    const events2 = second._events;
-    const { onRoomDeleted, onStorageUpdated } = first._listeners;
-    const events = Object.assign(/* @__PURE__ */ Object.create(null), events1, events2);
-    return new _PluvIO({
+  _logDebug(...data) {
+    this._debug && console.log(...data);
+  }
+  _purgeEmptyRooms() {
+    const rooms = Array.from(this._rooms.entries());
+    rooms.forEach(([id, room]) => {
+      if (room.getSize()) return;
+      this._rooms.delete(id);
+    });
+  }
+};
+
+// src/PluvIO.ts
+var PluvIO = class {
+  constructor(options) {
+    this._router = new PluvRouter({
+      $GET_OTHERS: this.procedure.sync((data, { room, session, sessions }) => {
+        const others = Array.from(sessions.entries()).filter(([, wsSession]) => wsSession.id !== (session == null ? void 0 : session.id)).reduce(
+          (acc, [connectionId, { presence, user }]) => __spreadProps(__spreadValues({}, acc), {
+            [connectionId]: {
+              connectionId,
+              presence,
+              room,
+              user
+            }
+          }),
+          {}
+        );
+        return { $OTHERS_RECEIVED: { others } };
+      }),
+      $INITIALIZE_SESSION: this.procedure.broadcast((data, { session }) => {
+        const presence = data == null ? void 0 : data.presence;
+        if (!session) return {};
+        session.presence = presence;
+        return {
+          $USER_JOINED: {
+            connectionId: session.id,
+            user: session.user,
+            presence
+          }
+        };
+      }).self((_0, _1) => __async(this, [_0, _1], function* (data, { context, doc, room }) {
+        var _a, _b;
+        const oldState = yield this._platform.persistance.getStorageState(room);
+        const update = data == null ? void 0 : data.update;
+        const updates = [
+          oldState ? null : yield (_a = this._getInitialStorage) == null ? void 0 : _a.call(this, __spreadProps(__spreadValues({}, context), {
+            room
+          })),
+          update
+        ];
+        if (updates.some((_update) => !!_update)) {
+          const encodedState = doc.batchApplyEncodedState(updates).getEncodedState();
+          yield this._platform.persistance.setStorageState(room, encodedState);
+          this._listeners.onStorageUpdated(__spreadProps(__spreadValues({}, context), { encodedState, room }));
+        }
+        const state = (_b = yield this._platform.persistance.getStorageState(room)) != null ? _b : doc.getEncodedState();
+        return { $STORAGE_RECEIVED: { state } };
+      })),
+      $PING: this.procedure.self((data, { session }) => {
+        if (!session) return {};
+        const currentTime = (/* @__PURE__ */ new Date()).getTime();
+        session.timers.ping = currentTime;
+        return { $PONG: {} };
+      }),
+      $UPDATE_PRESENCE: this.procedure.broadcast((data, { session }) => {
+        const presence = data == null ? void 0 : data.presence;
+        if (!session) return {};
+        session.presence = Object.assign(/* @__PURE__ */ Object.create(null), session.presence, presence);
+        return { $PRESENCE_UPDATED: { presence } };
+      }),
+      $UPDATE_STORAGE: this.procedure.broadcast((data, { context, doc, room }) => {
+        var _a;
+        const origin = data == null ? void 0 : data.origin;
+        const update = (_a = data == null ? void 0 : data.update) != null ? _a : null;
+        if (origin === "$INITIALIZED" && Object.keys(doc.toJson()).length) {
+          return {};
+        }
+        const updated = update === null ? doc : doc.applyEncodedState({ update });
+        const encodedState = updated.getEncodedState();
+        this._platform.persistance.setStorageState(room, encodedState).then(() => {
+          this._listeners.onStorageUpdated(__spreadProps(__spreadValues({}, context), {
+            encodedState,
+            room
+          }));
+        });
+        return { $STORAGE_UPDATED: { state: encodedState } };
+      })
+    });
+    this._authorize = null;
+    this._context = {};
+    this._getInitialStorage = null;
+    this._version = version;
+    const {
       authorize: authorize2,
       context,
-      crdt,
-      debug,
-      events,
+      crdt = import_crdt3.noop,
+      debug = false,
       getInitialStorage,
       onRoomDeleted,
       onStorageUpdated,
       platform
-    });
+    } = options;
+    this._crdt = crdt;
+    this._debug = debug;
+    this._platform = platform;
+    if (authorize2) this._authorize = authorize2;
+    if (context) this._context = context;
+    if (getInitialStorage) this._getInitialStorage = getInitialStorage;
+    this._listeners = {
+      onRoomDeleted: (event) => onRoomDeleted == null ? void 0 : onRoomDeleted(event),
+      onStorageUpdated: (event) => onStorageUpdated == null ? void 0 : onStorageUpdated(event)
+    };
   }
-  _logDebug(...data) {
-    this._debug && console.log(...data);
+  get _events() {
+    return this._router._events;
   }
-  _purgeEmptyRooms() {
-    const rooms = Array.from(this._rooms.entries());
-    rooms.forEach(([id, room]) => {
-      if (room.getSize())
-        return;
-      this._rooms.delete(id);
+  get procedure() {
+    return new PluvProcedure();
+  }
+  createToken(params) {
+    return __async(this, null, function* () {
+      if (!this._authorize) {
+        throw new Error("IO does not specify authorize during initialization.");
+      }
+      const ioAuthorize = typeof this._authorize === "function" ? this._authorize(params) : this._authorize;
+      const secret = ioAuthorize.secret;
+      return yield authorize({
+        platform: this._platform,
+        secret
+      }).encode(params);
     });
   }
+  mergeRouters(...routers) {
+    return PluvRouter.merge(...routers);
+  }
+  router(events) {
+    return new PluvRouter(events);
+  }
+  server(config = {}) {
+    var _a;
+    const router = config.router ? this.mergeRouters(this._router, config.router) : this._router;
+    return new PluvServer(__spreadProps(__spreadValues({}, this._listeners), {
+      authorize: (_a = this._authorize) != null ? _a : void 0,
+      context: this._context,
+      crdt: this._crdt,
+      debug: this._debug,
+      platform: this._platform,
+      router
+    }));
+  }
 };
 
 // src/createIO.ts
 var createIO = (params) => {
-  const {
-    authorize: authorize2,
-    context,
-    crdt,
-    debug,
-    getInitialStorage,
-    onRoomDeleted,
-    onStorageUpdated,
-    platform
-  } = params;
+  const { authorize: authorize2, context, crdt, debug, getInitialStorage, onRoomDeleted, onStorageUpdated, platform } = params;
   return new PluvIO({
     authorize: authorize2,
     context,
@@ -1034,5 +1010,8 @@ var createIO = (params) => {
   AbstractPubSub,
   AbstractWebSocket,
   PluvIO,
+  PluvProcedure,
+  PluvRouter,
+  PluvServer,
   createIO
 });