@jcbuisson/express-x 1.8.1 → 1.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcbuisson/express-x",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "",
   "type": "module",
   "main": "src/index.mjs",

package/src/common-hooks.mjs

@@ -32,11 +32,14 @@ export function protect(field) {
 }
 
 /*
+ * Does nothing for calls which are not client-side with websocket transport
  * Check if the 'expireAt' key in connection data is met
  * If it is met, throw an error (which will be sent back to the calling server or client) and reset connection data
  * If not, do nothing. If needed, an application-level hook may automatically extend the expiration data at each service call
 */
 export const isNotExpired = async (context) => {
+   if (context.caller !== 'client' || context.transport !== 'ws') return
+   
    const expireAt = await getConnectionDataItem(context, 'expireAt')
    if (expireAt) {
       const expireAtDate = new Date(expireAt)

package/src/context.mjs

@@ -1,12 +1,12 @@
 
 export async function getContextConnection(context) {
-   const id = context.params.connectionId
+   const id = context.connectionId
    const connection = await context.app.prisma.Connection.findUnique({ where: { id }})
    return connection
 }
 
 export async function resetConnection(context) {
-   const id = context.params.connectionId
+   const id = context.connectionId
    // by using updateMany, we cover the case where the connection `id` no longer exists
    await context.app.prisma.Connection.updateMany({
       where: { id },
@@ -18,14 +18,14 @@ export async function resetConnection(context) {
 }
 
 export async function getConnectionDataItem(context, key) {
-   const id = context.params.connectionId
+   const id = context.connectionId
    const connection = await context.app.prisma.Connection.findUnique({ where: { id }})
    const data = JSON.parse(connection.data)
    return data[key]
 }
 
 export async function setConnectionDataItem(context, key, value) {
-   const id = context.params.connectionId
+   const id = context.connectionId
    const connection = await context.app.prisma.Connection.findUnique({ where: { id }})
    const data = JSON.parse(connection.data)
    data[key] = value
@@ -38,7 +38,7 @@ export async function setConnectionDataItem(context, key, value) {
 }
 
 export async function removeConnectionDataItem(context, key) {
-   const id = context.params.connectionId
+   const id = context.connectionId
    const connection = await context.app.prisma.Connection.findUnique({ where: { id }})
    const data = JSON.parse(connection.data)
    delete data[key]
@@ -51,7 +51,7 @@ export async function removeConnectionDataItem(context, key) {
 }
 
 export async function sendServiceEventToClient(context, name, action, result) {
-   const id = context.params.connectionId
+   const id = context.connectionId
    const socket = context.app.cnx2Socket[id]
    socket.emit('service-event', {
       name,

package/src/server.mjs

@@ -156,7 +156,11 @@ export function expressX(prisma, config) {
          // hooked version of method to be used server-side
          service[methodName] = (...args) => {
             const context = {
-               caller: 'server'
+               app,
+               caller: 'server',
+               serviceName: service._name,
+               methodName,
+               args,
             }
             const hookedMethod = service['__' + methodName]
             return hookedMethod(context, ...args)
@@ -199,16 +203,16 @@ export function expressX(prisma, config) {
     */
    async function addHttpRest(path, service) {
       const context = {
-         caller: 'client',
          app,
+         caller: 'client',
          transport: 'http',
-         params: { name: service._name }
+         serviceName: service._name,
+
+         // params: { name: service._name }
       }
 
       // introspect schema and return a map: field name => prisma type
       function getTypesMap() {
-         // const dmmf = await service.prisma._getDmmf()
-         // const fieldDescriptions = dmmf.modelMap[service._name].fields
          const dmmf = service.prisma._runtimeDataModel
          const fieldDescriptions = dmmf.models[service._name].fields
          return fieldDescriptions.reduce((accu, descr) => {
@@ -220,7 +224,7 @@ export function expressX(prisma, config) {
 
       app.post(path, async (req, res) => {
          app.log('verbose', `http request POST ${req.url}`)
-         context.params.req = req
+         context.req = req
          try {
             const value = await service.__create(context, { data: req.body })
             res.json(value)
@@ -232,7 +236,7 @@ export function expressX(prisma, config) {
 
       app.get(path, async (req, res) => {
          app.log('verbose', `http request GET ${req.url}`)
-         context.params.req = req
+         context.req = req
          const query = { ...req.query }
          try {
             // the values in `req.query` are all strings, but Prisma need proper types
@@ -267,7 +271,7 @@ export function expressX(prisma, config) {
 
       app.get(`${path}/:id`, async (req, res) => {
          app.log('verbose', `http request GET ${req.url}`)
-         context.params.req = req
+         context.req = req
          try {
             const value = await service.__findUnique(context, {
                where: {
@@ -283,7 +287,7 @@ export function expressX(prisma, config) {
 
       app.patch(`${path}/:id`, async (req, res) => {
          app.log('verbose', `http request PATCH ${req.url}`)
-         context.params.req = req
+         context.req = req
          try {
             const value = await service.__update(context, {
                where: {
@@ -300,7 +304,7 @@ export function expressX(prisma, config) {
 
       app.delete(`${path}/:id`, async (req, res) => {
          app.log('verbose', `http request DELETE ${req.url}`)
-         context.params.req = req
+         context.req = req
          try {
             const value = await service.__delete(context, {
                where: {
@@ -387,10 +391,15 @@ export function expressX(prisma, config) {
                   const serviceMethod = service['__' + action]
                   if (serviceMethod) {
                      const context = {
-                        caller: 'client',
                         app,
+                        caller: 'client',
                         transport: 'ws',
-                        params: { connectionId: connection.id, name, action, args },
+                        connectionId: connection.id,
+                        serviceName: name,
+                        methodName: action,
+                        args,
+
+                        // params: { connectionId: connection.id, name, action, args },
                      }
 
                      try {