@rvoh/psychic-websockets 0.2.2 → 0.2.4

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const psychic_1 = require("@rvoh/psychic");
 const redis_adapter_1 = require("@socket.io/redis-adapter");
-const yoctocolors_1 = require("yoctocolors");
 const socketio = require("socket.io");
+const yoctocolors_1 = require("yoctocolors");
 const MissingWsRedisConnection_js_1 = require("../error/ws/MissingWsRedisConnection.js");
 const EnvInternal_js_1 = require("../helpers/EnvInternal.js");
 const index_js_1 = require("../psychic-application-websockets/index.js");

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

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvalidWsPathError = void 0;
 const dream_1 = require("@rvoh/dream");
 const redis_emitter_1 = require("@socket.io/redis-emitter");
-const luxon_1 = require("luxon");
 const EnvInternal_js_1 = require("../helpers/EnvInternal.js");
-const redisWsKey_js_1 = require("./redisWsKey.js");
 const index_js_1 = require("../psychic-application-websockets/index.js");
+const redisWsKey_js_1 = require("./redisWsKey.js");
 class Ws {
     allowedPaths;
     io;
@@ -26,7 +25,7 @@ class Ws {
             .rpush(key, ...socketIdsToKeep, socket.id)
             .expireat(key, 
         // TODO: make this configurable in non-test environments
-        luxon_1.DateTime.now()
+        dream_1.DateTime.now()
             .plus(EnvInternal_js_1.default.isTest ? { seconds: 15 } : { day: 1 })
             .toSeconds())
             .exec();

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

@@ -8,7 +8,11 @@ class PsychicApplicationWebsockets {
         await cb(psychicWsApp);
         psychicApp.on('server:shutdown', async (psychicServer) => {
             const cable = psychicServer.$attached.cable;
-            await cable?.stop();
+            if (cable) {
+                await cable.stop();
+                await psychicWsApp.websocketOptions.subConnection?.quit();
+                psychicServer.$attached.cable = undefined;
+            }
         });
         psychicApp.override('server:start', async (psychicServer, { port }) => {
             const cable = new index_js_1.default(psychicServer.expressApp, psychicWsApp);
@@ -63,6 +67,12 @@ class PsychicApplicationWebsockets {
     set(option, value) {
         switch (option) {
             case 'websockets':
+                if (this.websocketOptions?.connection) {
+                    this.websocketOptions.connection.disconnect();
+                }
+                if (this.websocketOptions?.subConnection) {
+                    this.websocketOptions.subConnection.disconnect();
+                }
                 this._websocketOptions = {
                     ...value,
                     subConnection: value?.connection?.duplicate(),

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

@@ -1,7 +1,7 @@
 import { PsychicServer } from '@rvoh/psychic';
 import { createAdapter } from '@socket.io/redis-adapter';
-import colors from 'yoctocolors';
 import * as socketio from 'socket.io';
+import colors from 'yoctocolors';
 import MissingWsRedisConnection from '../error/ws/MissingWsRedisConnection.js';
 import EnvInternal from '../helpers/EnvInternal.js';
 import PsychicApplicationWebsockets from '../psychic-application-websockets/index.js';

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

@@ -1,9 +1,8 @@
-import { uniq } from '@rvoh/dream';
+import { DateTime, uniq } from '@rvoh/dream';
 import { Emitter } from '@socket.io/redis-emitter';
-import { DateTime } from 'luxon';
 import EnvInternal from '../helpers/EnvInternal.js';
-import redisWsKey from './redisWsKey.js';
 import PsychicApplicationWebsockets from '../psychic-application-websockets/index.js';
+import redisWsKey from './redisWsKey.js';
 export default class Ws {
     allowedPaths;
     io;

package/dist/esm/src/psychic-application-websockets/index.js

@@ -6,7 +6,11 @@ export default class PsychicApplicationWebsockets {
         await cb(psychicWsApp);
         psychicApp.on('server:shutdown', async (psychicServer) => {
             const cable = psychicServer.$attached.cable;
-            await cable?.stop();
+            if (cable) {
+                await cable.stop();
+                await psychicWsApp.websocketOptions.subConnection?.quit();
+                psychicServer.$attached.cable = undefined;
+            }
         });
         psychicApp.override('server:start', async (psychicServer, { port }) => {
             const cable = new Cable(psychicServer.expressApp, psychicWsApp);
@@ -61,6 +65,12 @@ export default class PsychicApplicationWebsockets {
     set(option, value) {
         switch (option) {
             case 'websockets':
+                if (this.websocketOptions?.connection) {
+                    this.websocketOptions.connection.disconnect();
+                }
+                if (this.websocketOptions?.subConnection) {
+                    this.websocketOptions.subConnection.disconnect();
+                }
                 this._websocketOptions = {
                     ...value,
                     subConnection: value?.connection?.duplicate(),

package/package.json

@@ -2,9 +2,12 @@
   "type": "module",
   "name": "@rvoh/psychic-websockets",
   "description": "Websocket system for Psychic applications",
-  "version": "0.2.2",
-  "author": "RVOHealth",
-  "repository": "https://github.com/rvohealth/psychic-websockets.git",
+  "version": "0.2.4",
+  "author": "RVO Health",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/rvohealth/psychic-websockets.git"
+  },
   "license": "MIT",
   "main": "./dist/cjs/src/index.js",
   "module": "./dist/esm/src/index.js",
@@ -21,12 +24,14 @@
   ],
   "scripts": {
     "client": "yarn --cwd=./client start",
-    "psy": "yarn psyts",
+    "client:fspec": "BROWSER=none VITE_PSYCHIC_ENV=test yarn --cwd=./client start",
+    "psy": "NODE_ENV=${NODE_ENV:-test} yarn psyts",
     "psyjs": "node ./dist/test-app/src/cli/index.js",
     "psyts": "node --experimental-specifier-resolution=node --import ./bin/esm.js ./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",
     "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",
     "format": "yarn run prettier . --write",
     "lint": "yarn run eslint --no-warn-ignored \"src/**/*.ts\" && yarn run prettier . --check",
     "dev": "NODE_ENV=development WORKER_COUNT=0 ts-node --transpile-only ./test-app/main.ts",
@@ -43,14 +48,13 @@
   },
   "devDependencies": {
     "@eslint/js": "=9.0.0",
-    "@rvoh/dream": "^0.31.0",
+    "@rvoh/dream": "^0.35.0",
     "@rvoh/dream-spec-helpers": "^0.2.0",
-    "@rvoh/psychic": "^0.25.0",
+    "@rvoh/psychic": "^0.28.3",
     "@rvoh/psychic-spec-helpers": "^0.2.0",
     "@socket.io/redis-adapter": "^8.3.0",
     "@socket.io/redis-emitter": "^5.1.0",
     "@types/express": "^4",
-    "@types/luxon": "^3.4.2",
     "@types/node": "^22.5.1",
     "@types/pg": "^8",
     "@types/supertest": "^6.0.2",
@@ -60,7 +64,6 @@
     "ioredis": "^5.4.1",
     "kysely": "^0.27.5",
     "kysely-codegen": "^0.17.0",
-    "luxon": "^3.5.0",
     "luxon-jest-matchers": "^0.1.14",
     "pg": "^8.13.1",
     "prettier": "^3.3.3",
@@ -72,11 +75,11 @@
     "ts-node": "^10.9.2",
     "tslib": "^2.7.0",
     "typedoc": "^0.26.6",
-    "typescript": "^5.5.4",
+    "typescript": "^5.8.2",
     "typescript-eslint": "=7.18.0",
-    "vitest": "^3.0.8"
+    "vitest": "^3.1.1"
   },
-  "packageManager": "yarn@4.4.1",
+  "packageManager": "yarn@4.7.0",
   "dependencies": {
     "yoctocolors": "^2.1.1"
   }