General Actions to handlers Refacto

GPS/actions/system/dispatch.js

@@ -1,28 +0,0 @@
-
-export function dispatchMessage(redisCnx, msg, chan) {
-    const gps = redisCnx.config.gps
-    if(!gps?.gpsActionsChannel) return
-
-    const actionsChan = redisCnx.fullChan(gps.gpsActionsChannel)
-    if(chan != actionsChan) return
-
-    const action = msg.action
-    if(!action || typeof(action) !== 'string') {
-        console.warn(`[${redisCnx.redisId}] Ignoring message without action on ${chan}`)
-        return
-    }
-
-    const handler = redisCnx['action_'+action]
-    if(typeof(handler) != 'function') {
-        if(redisCnx.debug) console.warn(`[${redisCnx.redisId}] Unknown action ${action} on ${chan}`)
-        return
-    }
-
-    const payload = ('payload' in msg) ? msg.payload : null
-    const reqid = ('reqid' in msg) ? msg.reqid.substr(0, 50) : null
-    const sender = msg.sender || null
-    const roles = Array.isArray(msg.roles) ? msg.roles : ['*']
-
-    if(redisCnx.debug) console.log(`[${redisCnx.redisId}] Dispatching action ${action} from ${sender}`)
-    handler.call(redisCnx, action, payload, reqid, sender, roles)
-}

GPS/actions/system/index.js

@@ -1,10 +1,16 @@
-import { methods as utilities, construct as utilitiesConstruct } from './utilities.js'
-import { dispatchMessage } from './dispatch.js'
+import { assembleHandlers, createDispatchMessage } from '../../../bus/assembleMesh.js'
+import * as utilities from './utilities.js'
 
-export const afterLoginMethods = [
-    utilitiesConstruct,
-]
-export const meshActions = {
-    ...utilities,
-}
-export { dispatchMessage }
+const { actionHandlers, eventHandlers, afterLogin } = assembleHandlers([utilities])
+
+export { actionHandlers, afterLogin }
+
+export const dispatchMessage = createDispatchMessage({
+    eventHandlers,
+    actionRules(redisCnx) {
+        const gps = redisCnx.config.gps ?? {}
+        return({
+            channels: [gps.gpsActionsChannel].filter(Boolean),
+        })
+    },
+})

GPS/actions/system/utilities.js

@@ -1,109 +1,33 @@
-import { publishActionReply } from '../../actionsHelper.js'
+import { replyToAction } from '../../../bus/publishActionReply.js'
 
-export const construct = (redisCnx) => {
-    // console.log('Hello after login from utilities...')
-    // redisCnx.v42=0
-    // setInterval(redisCnx.move4243.bind(redisCnx), 200)
-}
+export const actions = {
 
-export const methods = {
-
-    /*  Event-Rx:
-        {
-            "action": "TIME"
-            "reqid": "6az5e4r6a"
-        }
-        Event-Tx:
-        {
-            "action": "TIME",
-            "success": true,
-            "payload" : {
-                gpsTime: "2022-09-01T14:42:22.603Z",
-                redisTime: "2022-09-01T14:42:22.603Z"
-            },
-            "reqid": "6az5e4r6a"
-        }
-    */
-    async action_TIME(action, payload, reqid, sender, roles){
-        publishActionReply(this, {
+    async action_TIME(action, payload, reqid, sender, roles) {
+        replyToAction(this, {
             action,
             reqid,
             sender,
-            replyChannel: this.config.gps.gpsActionsReply,
-            reply: {
-                success: true,
-                payload: {
-                    gpsTime: new Date().toISOString(),
-                    redisTime: await this.redisClient.time(),
-                },
+            success: true,
+            payload: {
+                gpsTime: new Date().toISOString(),
+                redisTime: await this.redisClient.time(),
             },
         })
     },
 
-
-    /*  Event-Rx:
-        {
-            "action": "RELOADCONFIG"
-            "reqid": "6az5e4r6a"
-        }
-        Event-Tx:
-        {
-            "action": "RELOADCONFIG",
-            "success": true,
-            "reqid": "6az5e4r6a"
-        }
-    */
-    async action_RELOADCONFIG(action, payload, reqid, sender, roles){
-        const replyOpts = {
-            action,
-            reqid,
-            sender,
-            replyChannel: this.config.gps.gpsActionsReply,
-        }
-        if(!this.accessRights.canDo(roles, action)) {
-            publishActionReply(this, { ...replyOpts, reply: {
-                success: false,
-                err: 'Unauthorized action !',
-            } })
-            return
-        }
+    async action_RELOADCONFIG(action, payload, reqid, sender, roles) {
         this.reloadAccessRights()
-        publishActionReply(this, { ...replyOpts, reply: {
-            success: true,
-        } })
+        replyToAction(this, { action, reqid, sender, success: true })
     },
-        
-    /*  Event-Rx:
-        {
-            "action": "GETCONFIG"
-            "reqid": "6az5e4r6a"
-        }
-        Event-Tx:
-        {
-            "action": "GETCONFIG",
-            "success": true,
-            "reqid": "6az5e4r6a",
-            payload: { ...the access rights, and roles... }
-        }
-    */
-    async action_GETCONFIG(action, payload, reqid, sender, roles){
-        const replyOpts = {
+
+    async action_GETCONFIG(action, payload, reqid, sender, roles) {
+        replyToAction(this, {
             action,
             reqid,
             sender,
-            replyChannel: this.config.gps.gpsActionsReply,
-        }
-        if(!this.accessRights.canDo(roles, action)) {
-            publishActionReply(this, { ...replyOpts, reply: {
-                success: false,
-                err: 'Unauthorized action !',
-            } })
-            return
-        }
-        publishActionReply(this, { ...replyOpts, reply: {
             success: true,
             payload: this.getAccessRights(),
-        } })
+        })
     },
 
 }