@jcbuisson/express-x 1.1.3 → 1.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcbuisson/express-x",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "",
   "type": "module",
   "main": "src/index.mjs",
@@ -15,9 +15,10 @@
     "test": "mocha --require esm 'test/**/*.test.js'",
     "generate": "npx prisma generate",
     "migrate": "npx prisma migrate dev --name init"
-},
+  },
   "keywords": [],
   "dependencies": {
+    "@jcbuisson/express-x-client": "^1.0.10",
     "@prisma/client": "^4.10.1",
     "axios": "^1.4.0",
     "config": "^3.3.9",

package/src/index.mjs

@@ -144,6 +144,7 @@ function expressX(app, options={}) {
 
 
       app.post(path, async (req, res) => {
+         if (options.debug) console.log("http request POST", req)
          context.http.req = req
          try {
             const value = await service.__create(context, { data: req.body })
@@ -156,6 +157,7 @@ function expressX(app, options={}) {
       })
 
       app.get(path, async (req, res) => {
+         if (options.debug) console.log("http request GET", req)
          context.http.req = req
          const query = { ...req.query }
          try {
@@ -191,6 +193,7 @@ function expressX(app, options={}) {
       })
 
       app.get(`${path}/:id`, async (req, res) => {
+         if (options.debug) console.log("http request GET", req)
          context.http.req = req
          try {
             const value = await service.__findUnique(context, {
@@ -207,6 +210,7 @@ function expressX(app, options={}) {
       })
 
       app.patch(`${path}/:id`, async (req, res) => {
+         if (options.debug) console.log("http request PATCH", req)
          context.http.req = req
          try {
             const value = await service.__update(context, {
@@ -224,6 +228,7 @@ function expressX(app, options={}) {
       })
 
       app.delete(`${path}/:id`, async (req, res) => {
+         if (options.debug) console.log("http request DELETE", req)
          context.http.req = req
          try {
             const value = await service.__delete(context, {
@@ -331,7 +336,6 @@ function expressX(app, options={}) {
 
    // publish event on associated channels
    async function publish(service, action, result) {
-      console.log('PUB!')
       const publishFunc = service.publishCallback
       if (publishFunc) {
          const channelNames = await publishFunc(result, app)

package/test/index.test.js

@@ -1,11 +1,15 @@
 
-import expressX from '../src/index.mjs'
 import express from 'express'
 import bodyParser from 'body-parser'
 import axios from 'axios'
+import io from 'socket.io-client'
+import expressxClient from '@jcbuisson/express-x-client'
+
 
 import { expect, assert } from 'chai'
 
+import expressX from '../src/index.mjs'
+
 
 // `app` is a regular express application, enhanced with express-x features
 const app = expressX(express(), { debug: false })
@@ -15,7 +19,7 @@ app.createDatabaseService('Post')
 
 
 
-describe('ExpressX API', () => {
+describe('ExpressX API (no running server)', () => {
 
    it("can delete all users", async () => {
       const res = await app.service('User').deleteMany()
@@ -56,17 +60,19 @@ describe('ExpressX API', () => {
 
 describe('HTTP/REST API', () => {
 
-   // add body parsers for http requests
-   app.use(bodyParser.json())
-   app.use(bodyParser.urlencoded({ extended: false }))
+   let chris
 
-   // add http/rest endpoints
-   app.addHttpRest('/api/user', app.service('User'))
-   app.addHttpRest('/api/post', app.service('Post'))
+   before(() => {
+      // add body parsers for http requests
+      app.use(bodyParser.json())
+      app.use(bodyParser.urlencoded({ extended: false }))
 
-   app.server.listen(8008, () => console.log(`App listening at http://localhost:8008`))
+      // add http/rest endpoints
+      app.addHttpRest('/api/user', app.service('User'))
+      app.addHttpRest('/api/post', app.service('Post'))
 
-   let chris
+      app.server.listen(8008, () => console.log(`App listening at http://localhost:8008`))
+   })
 
    it("can create a user", async () => {
       const res = await axios.post('http://localhost:8008/api/user', {
@@ -104,7 +110,36 @@ describe('HTTP/REST API', () => {
       assert(res?.data?.name === "Christophe")
    })
 
-   it("can stop server", () => {
-      app.server.close()
+   after(async () => {
+      await app.server.close()
+   })
+})
+
+
+// test compatibility with `express-x-client`
+describe('Client API', () => {
+
+   let clientApp, socket
+
+   before(() => {
+      app.server.listen(8008, () => console.log(`App listening at http://localhost:8008`))
+
+      socket = io('http://localhost:8008', { transports: ["websocket"] })
+      clientApp = expressxClient(socket)
+   })
+
+   it("can create a user", async () => {
+      const user = await clientApp.service('User').create({
+         data: {
+            name: "chris",
+            email: 'chris@mail.fr'
+         },
+      })
+      assert(user.name === 'chris')
+   })
+
+   after(async () => {
+      await socket.close()
+      await app.server.close()
    })
 })