@jcbuisson/express-x-client 1.6.0 → 1.6.2

package/package.json

@@ -1,25 +1,15 @@
 {
   "name": "@jcbuisson/express-x-client",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "type": "module",
   "description": "Client library for ExpressX framework",
   "main": "src/index.mjs",
   "test": "node --test",
   "scripts": {
-    "test": "node --test",
-    "generate": "npx prisma generate",
-    "migrate": "npx prisma migrate dev --name init"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@jcbuisson/express-x": "^1.4.0",
-    "@prisma/client": "^4.16.1",
-    "axios": "^1.4.0",
-    "body-parser": "^1.20.2",
-    "prisma": "^4.16.1",
-    "socket.io-client": "^4.7.1",
-    "uuid": "^9.0.0"
   }
 }

package/src/index.mjs

@@ -7,6 +7,7 @@ export default function expressXClient(socket, options={}) {
    const action2service2handlers = {}
    const type2appHandlers = {}
    let onConnectionCallback = null
+   let onReconnectionCallback = null
    let onDisconnectionCallback = null
    let nodeCnxId
 
@@ -14,6 +15,10 @@ export default function expressXClient(socket, options={}) {
       onConnectionCallback = callback
    }
 
+   const setReconnectionCallback = (callback) => {
+      onReconnectionCallback = callback
+   }
+
    const setDisconnectionCallback = (callback) => {
       onDisconnectionCallback = callback
    }
@@ -59,9 +64,11 @@ export default function expressXClient(socket, options={}) {
       if (onConnectionCallback) onConnectionCallback(connectionId)
    })
 
-   socket.on("cnx-transfer-ack", async (connectionId) => {
-      if (options.debug) console.log('cnx-transfer-ack', connectionId)
-      _setCnxId(connectionId)
+   socket.on("cnx-transfer-ack", async (connection) => {
+      if (options.debug) console.log('cnx-transfer-ack', connection)
+      _setCnxId(connection.id)
+      // call user-defined reconnection callback
+      if (onReconnectionCallback) onReconnectionCallback(connection)
    })
 
 
@@ -186,6 +193,7 @@ export default function expressXClient(socket, options={}) {
 
    return {
       setConnectionCallback,
+      setReconnectionCallback,
       setDisconnectionCallback,
       service,
       on,

package/test/index.test.js

@@ -1,130 +0,0 @@
-
-import bodyParser from 'body-parser'
-import axios from 'axios'
-import io from 'socket.io-client'
-import { PrismaClient } from '@prisma/client'
-
-
-import { describe, it, before, after } from 'node:test'
-import { strict as assert } from 'node:assert'
-
-import { expressX } from '@jcbuisson/express-x'
-import expressXClient from '../src/index.mjs'
-
-const prisma = new PrismaClient()
-
-// `app` is a regular express application, enhanced with services and real-time features
-const app = expressX(prisma)
-
-
-describe('HTTP/REST API', () => {
-
-   let chris
-
-   before(async () => {
-      console.log("before")
-      // add body parsers for http requests
-      app.use(bodyParser.json())
-      app.use(bodyParser.urlencoded({ extended: false }))
-
-      app.createDatabaseService('User')
-      app.createDatabaseService('Post')
-
-      await app.service('User').deleteMany()
-      await app.service('Post').deleteMany()
-
-      // add http/rest endpoints
-      app.addHttpRest('/api/user', app.service('User'))
-      app.addHttpRest('/api/post', app.service('Post'))
-
-      await new Promise((resolve) => {
-         app.server.listen(8008, () => {
-            console.log(`App listening at http://localhost:8008`)
-            resolve()
-         })
-      })
-   })
-
-   after(() => {
-      console.log("after")
-      app.server.close()
-   })
-
-   it("can create a user", async () => {
-      const res = await axios.post('http://localhost:8008/api/user', {
-         name: "chris",
-         email: 'chris@mail.fr'
-      })
-      assert(res?.data?.name === 'chris')
-   })
-
-   it("can find users", async () => {
-      const res = await axios.get('http://localhost:8008/api/user')
-      assert(res?.data?.length > 0)
-   })
-
-   it("can find a user by name", async () => {
-      const res = await axios.get('http://localhost:8008/api/user?name=chris')
-      assert(res?.data?.length > 0)
-      chris = res.data[0]
-   })
-
-   it("can find a user by id", async () => {
-      const res = await axios.get(`http://localhost:8008/api/user/${chris.id}`)
-      assert(res?.data?.id === chris.id)
-   })
-
-   it("can patch a user", async () => {
-      const res = await axios.patch(`http://localhost:8008/api/user/${chris.id}`, {
-         name: "Christophe",
-      })
-      assert(res?.data?.name === "Christophe")
-   })
-
-   it("can delete a user", async () => {
-      const res = await axios.delete(`http://localhost:8008/api/user/${chris.id}`)
-      assert(res?.data?.name === "Christophe")
-   })
-
-   after(async () => {
-      app.server.close()
-   })
-})
-
-
-// test compatibility with client API
-describe('Client API', () => {
-
-   let clientApp, socket
-
-   before(async () => {
-      await new Promise((resolve) => {
-         app.server.listen(8008, () => {
-            console.log(`App listening at http://localhost:8008`)
-            resolve()
-         })
-      })
-
-      socket = io('http://localhost:8008', { transports: ["websocket"] })
-      clientApp = expressXClient(socket)
-   })
-
-   after(async () => {
-      app.server.close()
-   })
-
-   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()
-   })
-})