@jcbuisson/express-x 1.6.17 → 1.7.1

package/package.json

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

package/src/common-hooks.mjs

@@ -1,9 +1,6 @@
 
 import bcrypt from 'bcryptjs'
 
-import { getConnectionDataItem } from './context.mjs'
-import { MyCustomError } from './server.mjs'
-
 
 // hash password of user record
 export const hashPassword = (passwordField) => async (context) => {
@@ -25,25 +22,3 @@ export function protect(field) {
       return (context)
    }
 }
-
-
-export async function isAuthenticated(context) {
-   // extract sessionId from connection data
-   const sessionId = await getConnectionDataItem(context, 'sessionId')
-   if (!sessionId) throw new MyCustomError("not authenticated", 'not-authenticated')
-}
-
-export const isNotExpired = async (context) => {
-   const expireAt = await getConnectionDataItem(context, 'expireAt')
-   if (expireAt) {
-      const expireAtDate = new Date(expireAt)
-      const now = new Date()
-      if (now > expireAtDate) {
-         // expiration date is met: clear connection data & throw exception
-         await resetConnection(context)
-         throw new MyCustomError("session expired", 'session-expired')
-      }
-   } else {
-      throw new MyCustomError("session expired", 'session-expired')
-   }
-}

package/src/index.mjs

@@ -1,10 +1,10 @@
 
-import { expressX, MyCustomError } from './server.mjs'
+import { expressX } from './server.mjs'
 import { hashPassword, protect, isAuthenticated, isNotExpired } from './common-hooks.mjs'
 import { getContextConnection, resetConnection, getConnectionDataItem, setConnectionDataItem, removeConnectionDataItem, sendServiceEventToClient } from './context.mjs'
 
 export {
-   expressX, MyCustomError,
+   expressX,
 
    getContextConnection,
    resetConnection,

package/src/server.mjs

@@ -3,14 +3,6 @@ import http from 'http'
 import { Server } from "socket.io"
 import express from 'express'
 
-export class MyCustomError extends Error {
-   constructor(message, code) {
-      super(message);
-      this.name = 'MyCustomError'
-      this.code = code
-   }
-}
-
 /*
  * Enhance `app` express application with services and real-time features
  */
@@ -182,7 +174,7 @@ export function expressX(prisma, options = {}) {
    function service(name) {
       // get service from `services` cache
       if (name in services) return services[name]
-      throw Error(`there is no service named '${name}'`)
+      app.log('error', `there is no service named '${name}'`, 'missing-service')
    }
 
    function configure(callback) {
@@ -389,6 +381,7 @@ export function expressX(prisma, options = {}) {
 
                      try {
                         const result = await serviceMethod(context, ...args)
+
                         const trimmedResult = result ? JSON.stringify(result).slice(0, 300) : ''
                         app.log('verbose', `client-response ${connection.id} ${uid} ${trimmedResult}`)
                         socket.emit('client-response', {
@@ -396,30 +389,43 @@ export function expressX(prisma, options = {}) {
                            result,
                         })
                      } catch(err) {
-                        app.log('error', err.toString())
+                        console.log('!!!!!!error', err.code, err)
                         app.log('verbose', err.stack)
                         socket.emit('client-response', {
                            uid,
-                           error: new MyCustomError(err.message, err.code),
+                           error: {
+                              code: err.code || 'unknown-error',
+                              message: err.stack,
+                           }
                         })
                      }
                   } else {
                      socket.emit('client-response', {
                         uid,
-                        error: new MyCustomError(`there is no method named '${action}' for service '${name}'`, 'missing-method'),
+                        error: {
+                           code: 'missing-method',
+                           message: `there is no method named '${action}' for service '${name}'`,
+                        }
                      })
                   }
                } catch(error) {
+                  console.log('err', err)
                   app.log('verbose', error.stack)
                   socket.emit('client-response', {
                      uid,
-                     error: new MyCustomError("unknown error", 'unknown-error'),
-               })
+                     error: {
+                        code: err.code || 'unknown-error',
+                        message: error.stack,
+                     }
+                  })
                }
             } else {
                socket.emit('client-response', {
                   uid,
-                  error: new MyCustomError(`there is no service named '${name}'`, 'missing-service'),
+                  error: {
+                     code: 'missing-service',
+                     message: `there is no service named '${name}'`,
+                  }
                })
             }
          })

package/test/index.test.js

@@ -137,3 +137,33 @@ describe('HTTP/REST API', () => {
       app.server.close()
    })
 })
+
+
+describe('Error codes', () => {
+
+   before(async () => {
+      app.createDatabaseService('User')
+      app.createDatabaseService('Post')
+
+      await app.service('User').deleteMany()
+      await app.service('Post').deleteMany()
+   })
+
+   it("can detect 'missing-service' error", async () => {
+      try {
+         await app.service('users').findMany({})
+      } catch(err) {
+         assert(err.code === 'missing-service')
+      }
+   })
+
+   // it("can detect 'missing-method' error", async () => {
+   //    try {
+   //       await app.service('User').dummyMethod({})
+   //    } catch(err) {
+   //       console.log('err', err)
+   //       assert(err.code === 'missing-method')
+   //    }
+   // })
+
+})