@hitchy/plugin-odem-socket.io 0.2.1 → 0.2.3

package/api/services/odem/websocket-provider.js

@@ -18,30 +18,47 @@ module.exports = function() {
 		 */
 		static start() {
 			api.once( "websocket", io => {
+				const { crud, notifications } = api.config.socket.odem;
+
 				const namespace = io.of( "/hitchy/odem" );
 
-				for ( const modelName of Object.keys( api.models ) ) {
-					const model = api.models[modelName];
+				const txPerModel = {};
 
-					this.manageModel( namespace, modelName, model );
+				for ( const [ modelName, model ] of Object.entries( api.models ) ) {
+					txPerModel[modelName] = this.broadcastModelNotifications( notifications, namespace, modelName, model );
 				}
-			} );
-		}
 
-		/**
-		 * Initializes manager for controlling and monitoring named model via
-		 * provided server-side websocket.
-		 *
-		 * @param {Server} io server-side websocket
-		 * @param {string} modelName name of model to manage
-		 * @param {class<Hitchy.Plugin.Odem.Model>} model ODM-based model instance to manage
-		 * @returns {void}
-		 */
-		static manageModel( io, modelName, model ) {
-			const { crud, notifications } = api.config.socket.odem;
+				namespace.on( "connection", socket => {
+					const rxPerModel = {};
+
+					for ( const [ modelName, model ] of Object.entries( api.models ) ) {
+						rxPerModel[modelName] = this.handleModelRequests( crud, socket, modelName, model );
+					}
+
+					socket.once( "disconnect", () => {
+						for ( const [ modelName, handlers ] of Object.entries( rxPerModel ) ) {
+							for ( const [ eventName, handler ] of Object.entries( handlers ) ) {
+								const prefix = api.utility.case.pascalToKebab( modelName );
+
+								socket.off( `${prefix}:${eventName}`, handler );
+							}
+						}
+					} );
+				} );
+
+				api.once( "close", () => {
+					namespace.disconnectSockets( true );
 
-			this.handleModelRequests( crud, io, modelName, model );
-			this.forwardModelNotifications( notifications, io, modelName, model );
+					for ( const [ modelName, model ] of Object.entries( api.models ) ) {
+						const handlers = txPerModel[modelName];
+
+						model.notifications
+							.off( "created", handlers.created )
+							.off( "changed", handlers.changed )
+							.off( "removed", handlers.removed );
+					}
+				} );
+			} );
 		}
 
 		/**
@@ -49,168 +66,57 @@ module.exports = function() {
 		 * model-related actions.
 		 *
 		 * @param {boolean} enabled true if command handling is enabled in configuration
-		 * @param {Server} io server-side websocket
+		 * @param {WebSocket} socket socket representing established incoming connection
 		 * @param {string} modelName name of model to manage
 		 * @param {class<Hitchy.Plugin.Odem.Model>} model ODM-based model instance to manage
-		 * @returns {void}
+		 * @returns {Object<string,function>} map of registered handler functions
 		 */
-		static handleModelRequests( enabled, io, modelName, model ) {
+		static handleModelRequests( enabled, socket, modelName, model ) {
 			const prefix = api.utility.case.pascalToKebab( modelName );
 
 			if ( !enabled ) {
 				logDebug( "disabling socket-based action requests for model %s (%s)", modelName, prefix );
 
-				io.on( "connection", socket => {
-					socket
-						.on( `${prefix}:list`, ( _, __, ___, response ) => reject( response ) )
-						.on( `${prefix}:find`, ( _, __, ___, ____, response ) => reject( response ) )
-						.on( `${prefix}:create`, ( _, __, response ) => reject( response ) )
-						.on( `${prefix}:read`, ( _, __, response ) => reject( response ) )
-						.on( `${prefix}:update`, ( _, __, ___, response ) => reject( response ) )
-						.on( `${prefix}:delete`, ( _, __, response ) => reject( response ) );
-				} );
+				const handlers = {
+					list: ( _, __, ___, response ) => reject( response ),
+					find: ( _, __, ___, ____, response ) => reject( response ),
+					create: ( _, __, response ) => reject( response ),
+					read: ( _, __, response ) => reject( response ),
+					update: ( _, __, ___, response ) => reject( response ),
+					delete: ( _, __, response ) => reject( response ),
+				};
 
-				return;
+				socket
+					.on( `${prefix}:list`, handlers.list )
+					.on( `${prefix}:find`, handlers.find )
+					.on( `${prefix}:create`, handlers.create )
+					.on( `${prefix}:read`, handlers.read )
+					.on( `${prefix}:update`, handlers.update )
+					.on( `${prefix}:delete`, handlers.delete );
+
+				return handlers;
 			}
 
 			logDebug( "enabling socket-based action requests for model %s (%s)", modelName, prefix );
 
-			io.on( "connection", socket => {
-				socket
-					.on( `${prefix}:list`, async( sessionId, queryOptions, loadRecords, response ) => {
-						logDebug( "request for listing %s instances w/ queryOptions %j and loadRecords %j", modelName, queryOptions, Boolean( loadRecords ) );
-
-						try {
-							const meta = {};
-							const items = await model.list( queryOptions, { loadRecords: Boolean( loadRecords ), metaCollector: meta } );
-
-							response( {
-								success: true,
-								count: meta.count,
-								items: items.map( item => ( loadRecords ? item.toObject( { serialized: true } ) : { uuid: item.uuid } ) ),
-							} );
-						} catch ( error ) {
-							logError( "listing %s instances failed: %s", modelName, error.stack );
-
-							response( {
-								error: error.message,
-							} );
-						}
-					} )
-					.on( `${prefix}:find`, async( sessionId, query, queryOptions, loadRecords, response ) => {
-						logDebug( "request for finding %s instances matching %j w/ queryOptions %j and uuidsOnly %j", modelName, query, queryOptions, Boolean( loadRecords ) );
-
-						try {
-							const meta = {};
-							const items = await model.find( query, queryOptions, { loadRecords: Boolean( loadRecords ), metaCollector: meta } );
-
-							response( {
-								success: true,
-								count: meta.count,
-								items: items.map( item => ( loadRecords ? item.toObject( { serialized: true } ) : { uuid: item.uuid } ) ),
-							} );
-						} catch ( error ) {
-							logError( "finding %s instances matching %j failed: %s", modelName, error.stack );
-
-							response( {
-								error: error.message,
-							} );
-						}
-					} )
-					.on( `${prefix}:create`, async( sessionId, properties, response ) => {
-						logDebug( "request for creating %s instance with %j", modelName, properties );
-
-						try {
-							const schema = model.schema;
-							const instance = new model; // eslint-disable-line new-cap
-
-							for ( const propName of Object.keys( properties ) ) {
-								if ( schema.props.hasOwnProperty( propName ) ||
-								     schema.computed.hasOwnProperty( propName ) ) {
-									instance[propName] = properties[propName];
-								}
-							}
-
-							await instance.save();
-
-							response( {
-								success: true,
-								properties: instance.toObject( { serialized: true } ),
-							} );
-						} catch ( error ) {
-							logError( "creating %s instance failed: %s", modelName, error.stack );
-
-							response( {
-								error: error.message,
-							} );
-						}
-					} )
-					.on( `${prefix}:read`, async( sessionId, uuid, response ) => {
-						logDebug( "request for reading %s instance %s", modelName, uuid );
-
-						try {
-							const instance = new model( uuid ); // eslint-disable-line new-cap
-							await instance.load();
-
-							response( {
-								success: true,
-								properties: instance.toObject( { serialized: true } ),
-							} );
-						} catch ( error ) {
-							logError( "reading %s instance failed: %s", modelName, error.stack );
-
-							response( {
-								error: error.message,
-							} );
-						}
-					} )
-					.on( `${prefix}:update`, async( sessionId, uuid, properties, response ) => {
-						logDebug( "request for updating %s instance %s with %j", modelName, uuid, properties );
-
-						try {
-							const instance = new model( uuid ); // eslint-disable-line new-cap
-							await instance.load();
-
-							for ( const propName of Object.keys( properties ) ) {
-								if ( model.schema.props.hasOwnProperty( propName ) || model.schema.computed.hasOwnProperty( propName ) ) {
-									instance[propName] = properties[propName];
-								}
-							}
-
-							await instance.save();
-
-							response( {
-								success: true,
-								properties: instance.toObject( { serialized: true } ),
-							} );
-						} catch ( error ) {
-							logError( "updating %s instance failed: %s", modelName, error.stack );
-
-							response( {
-								error: error.message,
-							} );
-						}
-					} )
-					.on( `${prefix}:delete`, async( sessionId, uuid, response ) => {
-						logDebug( "request for deleting %s instance %s", modelName, uuid );
-
-						try {
-							const instance = new model( uuid ); // eslint-disable-line new-cap
-							await instance.remove();
-
-							response( {
-								success: true,
-								properties: { uuid },
-							} );
-						} catch ( error ) {
-							logError( "deleting %s instance %s failed: %s", modelName, uuid, error.stack );
-
-							response( {
-								error: error.message,
-							} );
-						}
-					} );
-			} );
+			const handlers = {
+				list: ( ...args ) => this.handleListRequest( modelName, model, ...args ),
+				find: ( ...args ) => this.handleFindRequest( modelName, model, ...args ),
+				create: ( ...args ) => this.handleCreateRequest( modelName, model, ...args ),
+				read: ( ...args ) => this.handleReadRequest( modelName, model, ...args ),
+				update: ( ...args ) => this.handleUpdateRequest( modelName, model, ...args ),
+				delete: ( ...args ) => this.handleDeleteRequest( modelName, model, ...args ),
+			};
+
+			socket
+				.on( `${prefix}:list`, handlers.list )
+				.on( `${prefix}:find`, handlers.find )
+				.on( `${prefix}:create`, handlers.create )
+				.on( `${prefix}:read`, handlers.read )
+				.on( `${prefix}:update`, handlers.update )
+				.on( `${prefix}:delete`, handlers.delete );
+
+			return handlers;
 		}
 
 		/**
@@ -218,40 +124,254 @@ module.exports = function() {
 		 * them as broadcast events to connected clients.
 		 *
 		 * @param {boolean} enabled true if command handling is enabled in configuration
-		 * @param {Server} io server-side websocket
+		 * @param {Server} namespace namespace managing a list of server-side sockets with common prefix
 		 * @param {string} modelName name of model to manage
 		 * @param {class<Hitchy.Plugin.Odem.Model>} model ODM-based model instance to manage
-		 * @returns {void}
+		 * @returns {Object<string,function>} map of registered handler functions
 		 */
-		static forwardModelNotifications( enabled, io, modelName, model ) {
+		static broadcastModelNotifications( enabled, namespace, modelName, model ) {
 			if ( enabled ) {
 				const prefix = api.utility.case.pascalToKebab( modelName );
 
-				model.notifications
-					.on( "created", async( uuid, newRecord, asyncGeneratorFn ) => {
+				const handlers = {
+					created: async( uuid, newRecord, asyncGeneratorFn ) => {
 						const event = {
 							change: "created",
 							properties: ( await asyncGeneratorFn() ).toObject( { serialized: true } ),
 						};
 
-						io.emit( `${prefix}:changed`, event );
-					} )
-					.on( "changed", async( uuid, newRecord, oldRecord, asyncGeneratorFn ) => {
+						namespace.emit( `${prefix}:changed`, event );
+					},
+					changed: async( uuid, newRecord, oldRecord, asyncGeneratorFn ) => {
 						const event = {
 							change: "updated",
 							properties: ( await asyncGeneratorFn() ).toObject( { serialized: true } ),
 						};
 
-						io.emit( `${prefix}:changed`, event );
-					} )
-					.on( "removed", uuid => {
+						namespace.emit( `${prefix}:changed`, event );
+					},
+					removed: uuid => {
 						const event = {
 							change: "deleted",
 							properties: { uuid: model.formatUUID( uuid ) },
 						};
 
-						io.emit( `${prefix}:changed`, event );
-					} );
+						namespace.emit( `${prefix}:changed`, event );
+					},
+				};
+
+				model.notifications
+					.on( "created", handlers.created )
+					.on( "changed", handlers.changed )
+					.on( "removed", handlers.removed );
+
+				return handlers;
+			}
+
+			return {};
+		}
+
+		/**
+		 * Handles incoming request for listing items of a model.
+		 *
+		 * @param {string} modelName name of model
+		 * @param {string} model named server-side model
+		 * @param {string} sessionId client-provided session ID
+		 * @param {Hitchy.Odem.ListOptions} queryOptions client-provided options for listing items
+		 * @param {boolean} loadRecords if true, whole records shall be fetched per item
+		 * @param {function} response callback to invoke with response
+		 * @returns {Promise<void>} promise settled on request handled
+		 */
+		static async handleListRequest( modelName, model, sessionId, queryOptions, loadRecords, response ) {
+			logDebug( "request for listing %s instances w/ queryOptions %j and loadRecords %j", modelName, queryOptions, Boolean( loadRecords ) );
+
+			try {
+				const meta = {};
+				const items = await model.list( queryOptions, { loadRecords: Boolean( loadRecords ), metaCollector: meta } );
+
+				response( {
+					success: true,
+					count: meta.count,
+					items: items.map( item => ( loadRecords ? item.toObject( { serialized: true } ) : { uuid: item.uuid } ) ),
+				} );
+			} catch ( error ) {
+				logError( "listing %s instances failed: %s", modelName, error.stack );
+
+				response( {
+					error: error.message,
+				} );
+			}
+		}
+
+		/**
+		 * Handles incoming request for finding items of a model matching some
+		 * provided query.
+		 *
+		 * @param {string} modelName name of model
+		 * @param {string} model named server-side model
+		 * @param {string} sessionId client-provided session ID
+		 * @param {Hitchy.Odem.Query} query client-provided constraints to be met by returned items
+		 * @param {Hitchy.Odem.ListOptions} queryOptions client-provided options for listing items
+		 * @param {boolean} loadRecords if true, whole records shall be fetched per item
+		 * @param {function} response callback to invoke with response
+		 * @returns {Promise<void>} promise settled on request handled
+		 */
+		static async handleFindRequest( modelName, model, sessionId, query, queryOptions, loadRecords, response ) {
+			logDebug( "request for finding %s instances matching %j w/ queryOptions %j and uuidsOnly %j", modelName, query, queryOptions, Boolean( loadRecords ) );
+
+			try {
+				const meta = {};
+				const items = await model.find( query, queryOptions, { loadRecords: Boolean( loadRecords ), metaCollector: meta } );
+
+				response( {
+					success: true,
+					count: meta.count,
+					items: items.map( item => ( loadRecords ? item.toObject( { serialized: true } ) : { uuid: item.uuid } ) ),
+				} );
+			} catch ( error ) {
+				logError( "finding %s instances matching %j failed: %s", modelName, error.stack );
+
+				response( {
+					error: error.message,
+				} );
+			}
+		}
+
+		/**
+		 * Handles incoming request for creating item of a model.
+		 *
+		 * @param {string} modelName name of model
+		 * @param {string} model named server-side model
+		 * @param {string} sessionId client-provided session ID
+		 * @param {Hitchy.Odem.ListOptions} properties properties of item to create
+		 * @param {function} response callback to invoke with response
+		 * @returns {Promise<void>} promise settled on request handled
+		 */
+		static async handleCreateRequest( modelName, model, sessionId, properties, response ) {
+			logDebug( "request for creating %s instance with %j", modelName, properties );
+
+			try {
+				const schema = model.schema;
+				const instance = new model; // eslint-disable-line new-cap
+
+				for ( const propName of Object.keys( properties ) ) {
+					if ( schema.props.hasOwnProperty( propName ) ||
+					     schema.computed.hasOwnProperty( propName ) ) {
+						instance[propName] = properties[propName];
+					}
+				}
+
+				await instance.save();
+
+				response( {
+					success: true,
+					properties: instance.toObject( { serialized: true } ),
+				} );
+			} catch ( error ) {
+				logError( "creating %s instance failed: %s", modelName, error.stack );
+
+				response( {
+					error: error.message,
+				} );
+			}
+		}
+
+		/**
+		 * Handles incoming request for reading properties of a single item.
+		 *
+		 * @param {string} modelName name of item's model
+		 * @param {string} model named server-side model
+		 * @param {string} sessionId client-provided session ID
+		 * @param {string} uuid client-provided UUID of item to read
+		 * @param {function} response callback to invoke with response
+		 * @returns {Promise<void>} promise settled on request handled
+		 */
+		static async handleReadRequest( modelName, model, sessionId, uuid, response ) {
+			logDebug( "request for reading %s instance %s", modelName, uuid );
+
+			try {
+				const instance = new model( uuid ); // eslint-disable-line new-cap
+				await instance.load();
+
+				response( {
+					success: true,
+					properties: instance.toObject( { serialized: true } ),
+				} );
+			} catch ( error ) {
+				logError( "reading %s instance failed: %s", modelName, error.stack );
+
+				response( {
+					error: error.message,
+				} );
+			}
+		}
+
+		/**
+		 * Handles incoming request for adjusting properties of a single item.
+		 *
+		 * @param {string} modelName name of item's model
+		 * @param {string} model named server-side model
+		 * @param {string} sessionId client-provided session ID
+		 * @param {string} uuid client-provided UUID of item to modify
+		 * @param {Object} properties client-provided properties of item replacing its existing ones
+		 * @param {function} response callback to invoke with response
+		 * @returns {Promise<void>} promise settled on request handled
+		 */
+		static async handleUpdateRequest( modelName, model, sessionId, uuid, properties, response ) {
+			logDebug( "request for updating %s instance %s with %j", modelName, uuid, properties );
+
+			try {
+				const instance = new model( uuid ); // eslint-disable-line new-cap
+				await instance.load();
+
+				for ( const propName of Object.keys( properties ) ) {
+					if ( model.schema.props.hasOwnProperty( propName ) || model.schema.computed.hasOwnProperty( propName ) ) {
+						instance[propName] = properties[propName];
+					}
+				}
+
+				await instance.save();
+
+				response( {
+					success: true,
+					properties: instance.toObject( { serialized: true } ),
+				} );
+			} catch ( error ) {
+				logError( "updating %s instance failed: %s", modelName, error.stack );
+
+				response( {
+					error: error.message,
+				} );
+			}
+		}
+
+		/**
+		 * Handles incoming request for removing a model's item.
+		 *
+		 * @param {string} modelName name of item's model
+		 * @param {string} model named server-side model
+		 * @param {string} sessionId client-provided session ID
+		 * @param {string} uuid client-provided UUID of item to remove
+		 * @param {function} response callback to invoke with response
+		 * @returns {Promise<void>} promise settled on request handled
+		 */
+		static async handleDeleteRequest( modelName, model, sessionId, uuid, response ) {
+			logDebug( "request for deleting %s instance %s", modelName, uuid );
+
+			try {
+				const instance = new model( uuid ); // eslint-disable-line new-cap
+				await instance.remove();
+
+				response( {
+					success: true,
+					properties: { uuid },
+				} );
+			} catch ( error ) {
+				logError( "deleting %s instance %s failed: %s", modelName, uuid, error.stack );
+
+				response( {
+					error: error.message,
+				} );
 			}
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hitchy/plugin-odem-socket.io",
-	"version": "0.2.1",
+	"version": "0.2.3",
 	"description": "exposing Hitchy's ODM via websocket",
 	"main": "index.js",
 	"scripts": {
@@ -30,18 +30,18 @@
 		"index.js"
 	],
 	"peerDependencies": {
-		"@hitchy/core": ">=0.7.2",
-		"@hitchy/plugin-odem": ">=0.7.1",
-		"@hitchy/plugin-socket.io": ">=0.1.0"
+		"@hitchy/core": ">=0.8.1",
+		"@hitchy/plugin-odem": ">=0.7.8",
+		"@hitchy/plugin-socket.io": ">=0.1.1"
 	},
 	"devDependencies": {
-		"@hitchy/server-dev-tools": "^0.4.3",
-		"c8": "^7.11.2",
-		"eslint": "^8.14.0",
-		"eslint-config-cepharum": "^1.0.12",
-		"eslint-plugin-promise": "^6.0.0",
-		"mocha": "^9.2.2",
+		"@hitchy/server-dev-tools": "^0.4.6",
+		"c8": "^8.0.1",
+		"eslint": "^8.47.0",
+		"eslint-config-cepharum": "^1.0.13",
+		"eslint-plugin-promise": "^6.1.1",
+		"mocha": "^10.2.0",
 		"should": "^13.2.3",
-		"socket.io-client": "^4.5.0"
+		"socket.io-client": "^4.7.2"
 	}
 }