@rvoh/psychic-websockets 0.5.0 → 2.0.0-alpha.1

package/dist/cjs/src/cable/index.js

@@ -1,13 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const dream_1 = require("@rvoh/dream");
-const psychic_1 = require("@rvoh/psychic");
-const redis_adapter_1 = require("@socket.io/redis-adapter");
-const socketio = require("socket.io");
-const MissingWsRedisConnection_js_1 = require("../error/ws/MissingWsRedisConnection.js");
-const EnvInternal_js_1 = require("../helpers/EnvInternal.js");
-const index_js_1 = require("../psychic-app-websockets/index.js");
-class Cable {
+import { DreamCLI } from '@rvoh/dream';
+import { PsychicApp, PsychicServer } from '@rvoh/psychic';
+import { PsychicLogos } from '@rvoh/psychic/internal';
+import { colorize } from '@rvoh/psychic/utils';
+import { createAdapter } from '@socket.io/redis-adapter';
+import * as socketio from 'socket.io';
+import MissingWsRedisConnection from '../error/ws/MissingWsRedisConnection.js';
+import EnvInternal from '../helpers/EnvInternal.js';
+import PsychicAppWebsockets from '../psychic-app-websockets/index.js';
+export default class Cable {
     app;
     io;
     httpServer;
@@ -28,7 +28,7 @@ class Cable {
             return;
         // for socket.io, we have to circumvent the normal process for starting a
         // psychic server so that we can bind socket.io to the http instance.
-        this.httpServer = psychic_1.PsychicServer.createPsychicHttpInstance(this.app, this.config.psychicApp.sslCredentials);
+        this.httpServer = PsychicServer.createPsychicHttpInstance(this.app, this.config.psychicApp.sslCredentials);
         this.io = new socketio.Server(this.httpServer, { cors: this.config.psychicApp.corsOptions });
     }
     /**
@@ -47,7 +47,7 @@ class Cable {
                 }
             }
             catch (error) {
-                if (EnvInternal_js_1.default.boolean('PSYCHIC_DANGEROUSLY_PERMIT_WS_EXCEPTIONS'))
+                if (EnvInternal.boolean('PSYCHIC_DANGEROUSLY_PERMIT_WS_EXCEPTIONS'))
                     throw error;
                 else {
                     ;
@@ -67,7 +67,7 @@ class Cable {
             }
         });
         this.bindToRedis();
-        const psychicAppWebsockets = index_js_1.default.getOrFail();
+        const psychicAppWebsockets = PsychicAppWebsockets.getOrFail();
         await this.listen({
             port: parseInt((port || psychicAppWebsockets.psychicApp.port).toString()),
         });
@@ -99,7 +99,7 @@ class Cable {
     async listen({ port }) {
         return new Promise(accept => {
             this.httpServer.listen(port, () => {
-                if (!EnvInternal_js_1.default.isTest) {
+                if (!EnvInternal.isTest) {
                     welcomeMessage({ port });
                 }
                 accept(true);
@@ -115,39 +115,38 @@ class Cable {
         const pubClient = this.config.websocketOptions.connection;
         const subClient = this.config.websocketOptions.subConnection;
         if (!pubClient || !subClient)
-            throw new MissingWsRedisConnection_js_1.default();
+            throw new MissingWsRedisConnection();
         this.redisConnections.push(pubClient);
         this.redisConnections.push(subClient);
         pubClient.on('error', error => {
-            index_js_1.default.log('PUB CLIENT ERROR', error);
+            PsychicAppWebsockets.log('PUB CLIENT ERROR', error);
         });
         subClient.on('error', error => {
-            index_js_1.default.log('sub CLIENT ERROR', error);
+            PsychicAppWebsockets.log('sub CLIENT ERROR', error);
         });
         try {
-            this.io.adapter((0, redis_adapter_1.createAdapter)(pubClient, subClient));
+            this.io.adapter(createAdapter(pubClient, subClient));
         }
         catch (error) {
-            index_js_1.default.log('FAILED TO ADAPT', error);
+            PsychicAppWebsockets.log('FAILED TO ADAPT', error);
         }
     }
 }
-exports.default = Cable;
 function welcomeMessage({ port }) {
-    if (EnvInternal_js_1.default.isDevelopment) {
-        dream_1.DreamCLI.logger.log((0, psychic_1.colorize)(psychic_1.PsychicLogos.asciiLogo(), { color: 'greenBright' }), {
+    if (EnvInternal.isDevelopment) {
+        DreamCLI.logger.log(colorize(PsychicLogos.asciiLogo(), { color: 'greenBright' }), {
             logPrefix: '',
         });
-        dream_1.DreamCLI.logger.log('', { logPrefix: '' });
-        dream_1.DreamCLI.logger.log((0, psychic_1.colorize)('✺ ' + psychic_1.PsychicApp.getOrFail().appName, { color: 'greenBright' }), {
+        DreamCLI.logger.log('', { logPrefix: '' });
+        DreamCLI.logger.log(colorize('✺ ' + PsychicApp.getOrFail().appName, { color: 'greenBright' }), {
             logPrefix: '',
         });
-        dream_1.DreamCLI.logger.log((0, psychic_1.colorize)(`└─ http://localhost:${port.toString()}`, { color: 'greenBright' }), {
+        DreamCLI.logger.log(colorize(`└─ http://localhost:${port.toString()}`, { color: 'greenBright' }), {
             logPrefix: '',
         });
-        dream_1.DreamCLI.logger.log('', { logPrefix: '' });
+        DreamCLI.logger.log('', { logPrefix: '' });
     }
     else {
-        dream_1.DreamCLI.logger.log(`psychic dev server started at port ${port} with websockets`);
+        DreamCLI.logger.log(`psychic dev server started at port ${port} with websockets`);
     }
 }

package/dist/cjs/src/cable/redisWsKey.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = redisWsKey;
-function redisWsKey(websocketId, redisKeyPrefix) {
+export default function redisWsKey(websocketId, redisKeyPrefix) {
     return `${redisKeyPrefix}:${websocketId}:socket_ids`;
 }

package/dist/cjs/src/cable/ws.js

@@ -1,12 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const dream_1 = require("@rvoh/dream");
-const redis_emitter_1 = require("@socket.io/redis-emitter");
-const InvalidWsPathError_js_1 = require("../error/ws/InvalidWsPathError.js");
-const EnvInternal_js_1 = require("../helpers/EnvInternal.js");
-const index_js_1 = require("../psychic-app-websockets/index.js");
-const redisWsKey_js_1 = require("./redisWsKey.js");
-class Ws {
+import { DateTime, Dream } from '@rvoh/dream';
+import { uniq } from '@rvoh/dream/utils';
+import { Emitter } from '@socket.io/redis-emitter';
+import InvalidWsPathError from '../error/ws/InvalidWsPathError.js';
+import EnvInternal from '../helpers/EnvInternal.js';
+import PsychicAppWebsockets from '../psychic-app-websockets/index.js';
+import redisWsKey from './redisWsKey.js';
+export default class Ws {
     allowedPaths;
     /**
      * @internal
@@ -57,10 +56,10 @@ class Ws {
      * @param redisKeyPrefix - (optional) the prefix you wish to use to couple to this id (defaults to 'user')
      */
     static async register(socket, id, redisKeyPrefix = 'user') {
-        const psychicWebsocketsApp = index_js_1.default.getOrFail();
+        const psychicWebsocketsApp = PsychicAppWebsockets.getOrFail();
         const redisClient = psychicWebsocketsApp.websocketOptions.connection;
         const websocketId = idOrDreamToId(id);
-        const redisKey = (0, redisWsKey_js_1.default)(websocketId, redisKeyPrefix);
+        const redisKey = redisWsKey(websocketId, redisKeyPrefix);
         const socketIdsToKeep = await redisClient.lrange(redisKey, -2, -1);
         await redisClient
             .multi()
@@ -68,8 +67,8 @@ class Ws {
             .rpush(redisKey, ...socketIdsToKeep, socket.id)
             .expireat(redisKey, 
         // TODO: make this configurable in non-test environments
-        dream_1.DateTime.now()
-            .plus(EnvInternal_js_1.default.isTest ? { seconds: 15 } : { day: 1 })
+        DateTime.now()
+            .plus(EnvInternal.isTest ? { seconds: 15 } : { day: 1 })
             .toSeconds())
             .exec();
         socket.on('disconnect', async () => {
@@ -111,9 +110,9 @@ class Ws {
     boot() {
         if (this.booted)
             return;
-        const psychicWebsocketsApp = index_js_1.default.getOrFail();
+        const psychicWebsocketsApp = PsychicAppWebsockets.getOrFail();
         this.redisClient = psychicWebsocketsApp.websocketOptions.connection;
-        this.io = new redis_emitter_1.Emitter(this.redisClient).of(this.namespace);
+        this.io = new Emitter(this.redisClient).of(this.namespace);
         this.booted = true;
     }
     /**
@@ -127,7 +126,7 @@ class Ws {
     // eslint-disable-next-line
     data = {}) {
         if (this.allowedPaths.length && !this.allowedPaths.includes(path))
-            throw new InvalidWsPathError_js_1.default(path);
+            throw new InvalidWsPathError(path);
         this.boot();
         const socketIds = await this.findSocketIds(idOrDreamToId(id));
         for (const socketId of socketIds) {
@@ -141,7 +140,7 @@ class Ws {
      */
     async findSocketIds(userId) {
         this.boot();
-        return (0, dream_1.uniq)(await this.redisClient.lrange(this.redisKey(userId), 0, -1));
+        return uniq(await this.redisClient.lrange(this.redisKey(userId), 0, -1));
     }
     /**
      * @internal
@@ -150,10 +149,9 @@ class Ws {
      * when this Ws instance was constructed.
      */
     redisKey(userId) {
-        return (0, redisWsKey_js_1.default)(userId, this.redisKeyPrefix);
+        return redisWsKey(userId, this.redisKeyPrefix);
     }
 }
-exports.default = Ws;
 function idOrDreamToId(id) {
-    return id instanceof dream_1.Dream ? id.primaryKeyValue().toString() : id.toString();
+    return id instanceof Dream ? id.primaryKeyValue().toString() : id.toString();
 }

package/dist/cjs/src/error/ws/InvalidWsPathError.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class InvalidWsPathError extends Error {
+export default class InvalidWsPathError extends Error {
     invalidPath;
     constructor(invalidPath) {
         super();
@@ -12,4 +10,3 @@ class InvalidWsPathError extends Error {
     `;
     }
 }
-exports.default = InvalidWsPathError;

package/dist/cjs/src/error/ws/MissingWsRedisConnection.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class MissingWsRedisConnection extends Error {
+export default class MissingWsRedisConnection extends Error {
     get message() {
         return `
 No websocket redis connection was found, even though
@@ -29,4 +27,3 @@ export default async (psy: PsychicApp) => {
 `;
     }
 }
-exports.default = MissingWsRedisConnection;

package/dist/cjs/src/helpers/EnvInternal.js

@@ -1,5 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const dream_1 = require("@rvoh/dream");
-const EnvInternal = new dream_1.Env();
-exports.default = EnvInternal;
+import { Env } from '@rvoh/dream';
+const EnvInternal = new Env();
+export default EnvInternal;

package/dist/cjs/src/index.js

@@ -1,9 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PsychicAppWebsockets = exports.Ws = exports.Cable = void 0;
-var index_js_1 = require("./cable/index.js");
-Object.defineProperty(exports, "Cable", { enumerable: true, get: function () { return index_js_1.default; } });
-var ws_js_1 = require("./cable/ws.js");
-Object.defineProperty(exports, "Ws", { enumerable: true, get: function () { return ws_js_1.default; } });
-var index_js_2 = require("./psychic-app-websockets/index.js");
-Object.defineProperty(exports, "PsychicAppWebsockets", { enumerable: true, get: function () { return index_js_2.default; } });
+export { default as Cable } from './cable/index.js';
+export { default as Ws } from './cable/ws.js';
+export { default as PsychicAppWebsockets } from './psychic-app-websockets/index.js';

package/dist/cjs/src/psychic-app-websockets/cache.js

@@ -1,16 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cachePsychicAppWebsockets = cachePsychicAppWebsockets;
-exports.getCachedPsychicAppWebsockets = getCachedPsychicAppWebsockets;
-exports.getCachedPsychicAppWebsocketsOrFail = getCachedPsychicAppWebsocketsOrFail;
 let _psychicAppWebsockets = undefined;
-function cachePsychicAppWebsockets(psychicAppWebsockets) {
+export function cachePsychicAppWebsockets(psychicAppWebsockets) {
     _psychicAppWebsockets = psychicAppWebsockets;
 }
-function getCachedPsychicAppWebsockets() {
+export function getCachedPsychicAppWebsockets() {
     return _psychicAppWebsockets;
 }
-function getCachedPsychicAppWebsocketsOrFail() {
+export function getCachedPsychicAppWebsocketsOrFail() {
     if (!_psychicAppWebsockets)
         throw new Error('must call `cachePsychicAppWebsockets` before loading cached psychic application websockets');
     return _psychicAppWebsockets;

package/dist/cjs/src/psychic-app-websockets/index.js

@@ -1,8 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_js_1 = require("../cable/index.js");
-const cache_js_1 = require("./cache.js");
-class PsychicAppWebsockets {
+import Cable from '../cable/index.js';
+import { cachePsychicAppWebsockets, getCachedPsychicAppWebsocketsOrFail } from './cache.js';
+export default class PsychicAppWebsockets {
     static async init(psychicApp, cb) {
         const psychicWsApp = new PsychicAppWebsockets(psychicApp);
         await cb(psychicWsApp);
@@ -15,12 +13,12 @@ class PsychicAppWebsockets {
             }
         });
         psychicApp.override('server:start', async (psychicServer, { port }) => {
-            const cable = new index_js_1.default(psychicServer.expressApp, psychicWsApp);
+            const cable = new Cable(psychicServer.expressApp, psychicWsApp);
             await cable.start(port);
             psychicServer.attach('cable', cable);
             return cable.httpServer;
         });
-        (0, cache_js_1.cachePsychicAppWebsockets)(psychicWsApp);
+        cachePsychicAppWebsockets(psychicWsApp);
         return psychicWsApp;
     }
     /**
@@ -30,7 +28,7 @@ class PsychicAppWebsockets {
      * The psychic application can be set by calling PsychicApp#init
      */
     static getOrFail() {
-        return (0, cache_js_1.getCachedPsychicAppWebsocketsOrFail)();
+        return getCachedPsychicAppWebsocketsOrFail();
     }
     psychicApp;
     static log(...args) {
@@ -83,4 +81,3 @@ class PsychicAppWebsockets {
         }
     }
 }
-exports.default = PsychicAppWebsockets;

package/dist/esm/src/cable/index.js

@@ -1,5 +1,7 @@
 import { DreamCLI } from '@rvoh/dream';
-import { colorize, PsychicApp, PsychicLogos, PsychicServer } from '@rvoh/psychic';
+import { PsychicApp, PsychicServer } from '@rvoh/psychic';
+import { PsychicLogos } from '@rvoh/psychic/internal';
+import { colorize } from '@rvoh/psychic/utils';
 import { createAdapter } from '@socket.io/redis-adapter';
 import * as socketio from 'socket.io';
 import MissingWsRedisConnection from '../error/ws/MissingWsRedisConnection.js';

package/dist/esm/src/cable/ws.js

@@ -1,4 +1,5 @@
-import { DateTime, Dream, uniq } from '@rvoh/dream';
+import { DateTime, Dream } from '@rvoh/dream';
+import { uniq } from '@rvoh/dream/utils';
 import { Emitter } from '@socket.io/redis-emitter';
 import InvalidWsPathError from '../error/ws/InvalidWsPathError.js';
 import EnvInternal from '../helpers/EnvInternal.js';

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic-websockets",
   "description": "Websocket system for Psychic applications",
-  "version": "0.5.0",
+  "version": "2.0.0-alpha.1",
   "author": "RVO Health",
   "repository": {
     "type": "git",
@@ -29,6 +29,7 @@
     "psy:js": "node ./dist/test-app/src/cli/index.js",
     "psy:ts": "tsx ./test-app/src/cli/index.ts",
     "build": "echo \"building cjs...\" && rm -rf dist && npx tsc -p ./tsconfig.cjs.build.json && echo \"building esm...\" && npx tsc -p ./tsconfig.esm.build.json",
+    "build:test-app": "rm -rf dist && echo \"building test app to esm...\" && npx tsc -p ./tsconfig.esm.build.test-app.json && echo \"building test app to cjs...\" && npx tsc -p ./tsconfig.cjs.build.test-app.json",
     "uspec": "vitest --config ./spec/unit/vite.config.ts",
     "fspec": "vitest run --config=./spec/features/vite.config.ts",
     "fspec:hanging": "vitest run --config=./spec/features/vite.config.ts --reporter=hanging-process",
@@ -48,9 +49,9 @@
   },
   "devDependencies": {
     "@eslint/js": "=9.0.0",
-    "@rvoh/dream": "^1.10.1",
+    "@rvoh/dream": "^2.0.0-alpha.1",
     "@rvoh/dream-spec-helpers": "^1.2.1",
-    "@rvoh/psychic": "^1.11.1",
+    "@rvoh/psychic": "^2.0.0-alpha.1",
     "@rvoh/psychic-spec-helpers": "^1.1.3",
     "@socket.io/redis-adapter": "^8.3.0",
     "@socket.io/redis-emitter": "^5.1.0",
@@ -78,7 +79,7 @@
     "typedoc": "^0.26.6",
     "typescript": "^5.8.2",
     "typescript-eslint": "=7.18.0",
-    "vitest": "^3.2.0"
+    "vitest": "^3.2.4"
   },
   "packageManager": "yarn@4.7.0",
   "dependencies": {