@pluv/io 0.7.2 → 0.10.1

package/.turbo/turbo-build.log

@@ -1,18 +1,18 @@
 
-> @pluv/io@0.7.2 build /home/runner/work/pluv/pluv/packages/io
+> @pluv/io@0.10.1 build /home/runner/work/pluv/pluv/packages/io
 > tsup src/index.ts --format esm,cjs --dts
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
-CLI tsup v7.1.0
+CLI tsup v7.2.0
 CLI Target: es6
 ESM Build start
 CJS Build start
-CJS dist/index.js 31.08 KB
-CJS ⚡️ Build success in 100ms
-ESM dist/index.mjs 29.02 KB
-ESM ⚡️ Build success in 102ms
+ESM dist/index.mjs 29.16 KB
+ESM ⚡️ Build success in 94ms
+CJS dist/index.js 31.22 KB
+CJS ⚡️ Build success in 94ms
 DTS Build start
-DTS ⚡️ Build success in 3935ms
-DTS dist/index.d.mts 17.03 KB
-DTS dist/index.d.ts  17.03 KB
+DTS ⚡️ Build success in 4663ms
+DTS dist/index.d.mts 17.05 KB
+DTS dist/index.d.ts  17.05 KB

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @pluv/io
 
+## 0.10.1
+
+### Patch Changes
+
+- 0eeb67c: Passed through sessionId and userId into platform websockets.
+- 885835d: remove unnecessary dependency
+- Updated dependencies [885835d]
+  - @pluv/crdt-yjs@0.10.1
+  - @pluv/types@0.10.1
+
+## 0.10.0
+
+### Minor Changes
+
+- f43f1cc: Change packages to all be versioned together for consistency.
+
+### Patch Changes
+
+- Updated dependencies [f43f1cc]
+  - @pluv/crdt-yjs@0.10.0
+  - @pluv/types@0.10.0
+
 ## 0.7.2
 
 ### Patch Changes

package/dist/index.d.mts

@@ -39,8 +39,9 @@ interface AbstractWebSocketHandleErrorParams {
 }
 type AbstractListener<TType extends keyof AbstractEventMap> = (event: AbstractEventMap[TType]) => MaybePromise<void>;
 interface AbstractWebSocketConfig {
-    pubSub?: AbstractPubSub;
     room: string;
+    sessionId: string;
+    userId: string | null;
 }
 declare abstract class AbstractWebSocket {
     /** The connection is not yet open. */
@@ -51,8 +52,8 @@ declare abstract class AbstractWebSocket {
     readonly CLOSING = 2;
     /** The connection is closed. */
     readonly CLOSED = 3;
-    pubSub?: AbstractPubSub;
     room: string;
+    sessionId: string;
     abstract get readyState(): 0 | 1 | 2 | 3;
     constructor(config: AbstractWebSocketConfig);
     /**
@@ -152,9 +153,7 @@ type AbstractPlatformConfig = {
     persistance: AbstractPersistance;
     pubSub: AbstractPubSub;
 };
-interface ConvertWebSocketConfig {
-    room: string;
-}
+type ConvertWebSocketConfig = AbstractWebSocketConfig;
 declare abstract class AbstractPlatform<TWebSocket = any, TIOContext extends Record<string, any> = {}, TRoomContext extends Record<string, any> = {}> {
     readonly _ioContext: TIOContext | undefined;
     readonly _roomContext: TRoomContext | undefined;

package/dist/index.d.ts

@@ -39,8 +39,9 @@ interface AbstractWebSocketHandleErrorParams {
 }
 type AbstractListener<TType extends keyof AbstractEventMap> = (event: AbstractEventMap[TType]) => MaybePromise<void>;
 interface AbstractWebSocketConfig {
-    pubSub?: AbstractPubSub;
     room: string;
+    sessionId: string;
+    userId: string | null;
 }
 declare abstract class AbstractWebSocket {
     /** The connection is not yet open. */
@@ -51,8 +52,8 @@ declare abstract class AbstractWebSocket {
     readonly CLOSING = 2;
     /** The connection is closed. */
     readonly CLOSED = 3;
-    pubSub?: AbstractPubSub;
     room: string;
+    sessionId: string;
     abstract get readyState(): 0 | 1 | 2 | 3;
     constructor(config: AbstractWebSocketConfig);
     /**
@@ -152,9 +153,7 @@ type AbstractPlatformConfig = {
     persistance: AbstractPersistance;
     pubSub: AbstractPubSub;
 };
-interface ConvertWebSocketConfig {
-    room: string;
-}
+type ConvertWebSocketConfig = AbstractWebSocketConfig;
 declare abstract class AbstractPlatform<TWebSocket = any, TIOContext extends Record<string, any> = {}, TRoomContext extends Record<string, any> = {}> {
     readonly _ioContext: TIOContext | undefined;
     readonly _roomContext: TRoomContext | undefined;

package/dist/index.js

@@ -234,8 +234,9 @@ var AbstractWebSocket = class {
     this.CLOSING = 2;
     /** The connection is closed. */
     this.CLOSED = 3;
-    const { room } = config;
+    const { room, sessionId } = config;
     this.room = room;
+    this.sessionId = sessionId;
   }
   handleError(params) {
     var _a, _b, _c;
@@ -335,14 +336,17 @@ var IORoom = class {
   }
   register(webSocket, options) {
     return __async(this, null, function* () {
-      var _b;
+      var _b, _c;
       const _a = options, { token } = _a, _platformEventContext = __objRest(_a, ["token"]);
       const platformEventContext = _platformEventContext;
       if (!this._uninitialize)
         yield this._initialize();
+      const user = yield this._getAuthorizedUser(token);
       const sessionId = this._platform.randomUUID();
       const pluvWs = this._platform.convertWebSocket(webSocket, {
-        room: this.id
+        room: this.id,
+        sessionId,
+        userId: (_b = user == null ? void 0 : user.id) != null ? _b : null
       });
       this._logDebug(
         `${import_kleur.default.blue(
@@ -350,8 +354,7 @@ var IORoom = class {
         )} ${sessionId}`
       );
       const uninitializeWs = yield pluvWs.initialize();
-      const user = yield this._getAuthorizedUser(token);
-      const isUnauthorized = !!((_b = this._authorize) == null ? void 0 : _b.required) && !user;
+      const isUnauthorized = !!((_c = this._authorize) == null ? void 0 : _c.required) && !user;
       const isTokenInUse = !!user && Array.from(this._sessions.values()).some(
         (session2) => {
           var _a2;

package/dist/index.mjs

@@ -197,8 +197,9 @@ var AbstractWebSocket = class {
     this.CLOSING = 2;
     /** The connection is closed. */
     this.CLOSED = 3;
-    const { room } = config;
+    const { room, sessionId } = config;
     this.room = room;
+    this.sessionId = sessionId;
   }
   handleError(params) {
     var _a, _b, _c;
@@ -298,14 +299,17 @@ var IORoom = class {
   }
   register(webSocket, options) {
     return __async(this, null, function* () {
-      var _b;
+      var _b, _c;
       const _a = options, { token } = _a, _platformEventContext = __objRest(_a, ["token"]);
       const platformEventContext = _platformEventContext;
       if (!this._uninitialize)
         yield this._initialize();
+      const user = yield this._getAuthorizedUser(token);
       const sessionId = this._platform.randomUUID();
       const pluvWs = this._platform.convertWebSocket(webSocket, {
-        room: this.id
+        room: this.id,
+        sessionId,
+        userId: (_b = user == null ? void 0 : user.id) != null ? _b : null
       });
       this._logDebug(
         `${colors.blue(
@@ -313,8 +317,7 @@ var IORoom = class {
         )} ${sessionId}`
       );
       const uninitializeWs = yield pluvWs.initialize();
-      const user = yield this._getAuthorizedUser(token);
-      const isUnauthorized = !!((_b = this._authorize) == null ? void 0 : _b.required) && !user;
+      const isUnauthorized = !!((_c = this._authorize) == null ? void 0 : _c.required) && !user;
       const isTokenInUse = !!user && Array.from(this._sessions.values()).some(
         (session2) => {
           var _a2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/io",
-  "version": "0.7.2",
+  "version": "0.10.1",
   "description": "@pluv/io server-side websocket manager",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,22 +18,22 @@
   },
   "dependencies": {
     "@panva/hkdf": "^1.1.1",
-    "@types/react": "^18.2.15",
     "jose": "^4.14.4",
     "kleur": "^4.1.5",
-    "wonka": "^6.3.3",
-    "@pluv/crdt-yjs": "^0.4.2",
-    "@pluv/types": "^0.2.2"
+    "wonka": "^6.3.4",
+    "@pluv/crdt-yjs": "^0.10.1",
+    "@pluv/types": "^0.10.1"
   },
   "peerDependencies": {
     "yjs": "^13.0.0"
   },
   "devDependencies": {
-    "tsup": "^7.1.0",
+    "eslint": "^8.47.0",
+    "tsup": "^7.2.0",
     "typescript": "^5.1.6",
     "yjs": "^13.6.7",
-    "@pluv/tsconfig": "^0.2.0",
-    "eslint-config-pluv": "^0.1.14"
+    "@pluv/tsconfig": "^0.10.1",
+    "eslint-config-pluv": "^0.8.1"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/AbstractPlatform.ts

@@ -1,6 +1,9 @@
 import { AbstractPersistance } from "./AbstractPersistance";
 import type { AbstractPubSub } from "./AbstractPubSub";
-import type { AbstractWebSocket } from "./AbstractWebSocket";
+import type {
+    AbstractWebSocket,
+    AbstractWebSocketConfig,
+} from "./AbstractWebSocket";
 import { Persistance } from "./Persistance";
 import { PubSub } from "./PubSub";
 
@@ -24,9 +27,7 @@ export type AbstractPlatformConfig =
           pubSub: AbstractPubSub;
       };
 
-export interface ConvertWebSocketConfig {
-    room: string;
-}
+export type ConvertWebSocketConfig = AbstractWebSocketConfig;
 
 export abstract class AbstractPlatform<
     TWebSocket = any,

package/src/AbstractWebSocket.ts

@@ -1,5 +1,4 @@
 import type { IOEventMessage, MaybePromise } from "@pluv/types";
-import type { AbstractPubSub } from "./AbstractPubSub";
 import type { WebSocketSession } from "./types";
 
 export type AbstractEvent = {};
@@ -37,8 +36,9 @@ export type AbstractListener<TType extends keyof AbstractEventMap> = (
 ) => MaybePromise<void>;
 
 export interface AbstractWebSocketConfig {
-    pubSub?: AbstractPubSub;
     room: string;
+    sessionId: string;
+    userId: string | null;
 }
 
 export abstract class AbstractWebSocket {
@@ -51,15 +51,16 @@ export abstract class AbstractWebSocket {
     /** The connection is closed. */
     public readonly CLOSED = 3;
 
-    public pubSub?: AbstractPubSub;
     public room: string;
+    public sessionId: string;
 
     public abstract get readyState(): 0 | 1 | 2 | 3;
 
     constructor(config: AbstractWebSocketConfig) {
-        const { room } = config;
+        const { room, sessionId } = config;
 
         this.room = room;
+        this.sessionId = sessionId;
     }
 
     /**

package/src/IORoom.ts

@@ -186,9 +186,13 @@ export class IORoom<
 
         if (!this._uninitialize) await this._initialize();
 
+        const user = await this._getAuthorizedUser(token);
+
         const sessionId = this._platform.randomUUID();
         const pluvWs = this._platform.convertWebSocket(webSocket, {
             room: this.id,
+            sessionId,
+            userId: user?.id ?? null,
         });
 
         this._logDebug(
@@ -199,8 +203,6 @@ export class IORoom<
 
         const uninitializeWs = await pluvWs.initialize();
 
-        const user = await this._getAuthorizedUser(token);
-
         const isUnauthorized = !!this._authorize?.required && !user;
         // There is an attempt for multiple of the same identities. Probably malicious.
         const isTokenInUse =