fix: make some improvements (#363)

asyncapi · Dec 1, 2022 · b4e3d9e · b4e3d9e
1 parent 5ceaaa0
commit b4e3d9e
Show file tree

Hide file tree

Showing 8 changed files with 194 additions and 110 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -0,0 +1 @@
+export * from './src/lib/index'
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -73,6 +73,7 @@
     "@types/debug": "^4.1.7",
     "@types/socket.io": "^3.0.2",
     "@types/uri-templates": "^0.1.31",
+    "@types/ws": "^8.5.3",
     "@typescript-eslint/eslint-plugin": "^5.9.0",
     "@typescript-eslint/parser": "^5.9.0",
     "all-contributors-cli": "^6.14.2",

diff --git a/src/adapters/ws/index.ts b/src/adapters/ws/index.ts
@@ -94,17 +94,16 @@ class WebSocketsAdapter extends Adapter {
           }
         }
       }
-
       if (servers.has(pathname)) {
         servers.get(pathname).handleUpgrade(request, socket, head, (ws) => {
-          servers.get(pathname).emit('server:connection:open', ws, request)
-
+          servers.get(pathname).emit('connect', ws, request)
+          
           ws.on('message', (payload) => {
             const msg = this._createMessage(pathname, payload)
             this.emit('message', msg, ws)
           })
 
-          this.emit('connect', { name: this.name(), adapter: this, connection: ws, channel: pathname })
+          this.emit('server:connection:open', { name: this.name(), adapter: this, connection: ws, channel: pathname, request })
         })
       } else {
         socket.destroy()

diff --git a/src/index.ts b/src/index.ts
@@ -67,7 +67,7 @@ export default async function GleeAppInitializer () {
     if (channel.hasPublish()) {
       const operationId = channel.publish().json('operationId')
       if (operationId) {
-        const schema = channel.publish().message().payload().json()
+        const schema = {oneOf: channel.publish().messages().map(message => message.payload().json())} as any
         app.use(channelName, validate(schema), (event, next) => {
           triggerFunction({
             app,
@@ -78,7 +78,7 @@ export default async function GleeAppInitializer () {
       }
     }
     if (channel.hasSubscribe()) {
-      const schema = channel.subscribe().message().payload().json()
+      const schema = {oneOf: channel.subscribe().messages().map(message => message.payload().json())} as any
       app.useOutbound(channelName, validate(schema), json2string)
     }
   })

diff --git a/src/lib/configs.ts b/src/lib/configs.ts
@@ -44,9 +44,7 @@ async function loadConfigsFromFile() {
     ASYNCAPI_FILE_PATH = projectConfigs.ASYNCAPI_FILE_PATH ? path.resolve(GLEE_DIR, projectConfigs.ASYNCAPI_FILE_PATH) : ASYNCAPI_FILE_PATH
     return projectConfigs
   } catch (e) {
-    if (e.code !== 'ERR_MODULE_NOT_FOUND') {
-      return console.error(e)
-    }
+    return console.error(e)
   }
 }
 

diff --git a/src/lib/functions.ts b/src/lib/functions.ts
@@ -104,27 +104,23 @@ export async function trigger({
       return
     }
 
-    if (res?.send) {
-      res.send.forEach((msg) => {
-        app.send(new GleeMessage({
-          payload: msg.payload,
-          headers: msg.headers,
-          channel: msg.channel || message.channel,
-          serverName: msg.server,
-          broadcast: true,
-        }))
-      })
-    }
+    res?.send?.forEach((msg) => {
+      app.send(new GleeMessage({
+        payload: msg.payload,
+        headers: msg.headers,
+        channel: msg.channel || message.channel,
+        serverName: msg.server,
+        broadcast: true,
+      }))
+    })
 
-    if (res?.reply) {
-      res.reply.forEach((msg) => {
-        message.reply({
-          payload: msg.payload,
-          headers: msg.headers,
-          channel: msg.channel,
-        })
+    res?.reply?.forEach((msg) => {
+      message.reply({
+        payload: msg.payload,
+        headers: msg.headers,
+        channel: msg.channel,
       })
-    }
+    })
   } catch (err) {
     if (err.code === 'ERR_MODULE_NOT_FOUND') {
       const functionsPath = relative(GLEE_DIR, GLEE_FUNCTIONS_DIR)

diff --git a/src/lib/lifecycleEvents.ts b/src/lib/lifecycleEvents.ts
@@ -79,22 +79,20 @@ export async function run(lifecycleEvent: string, params: GleeFunctionEvent) {
     const responses = await Promise.all(handlers.map(info => info.fn(params)))
 
     responses.forEach(res => {
-      if (res.send) {
-        res.send.forEach((event: GleeFunctionReturnSend) => {
-          try {
-            params.glee.send(new GleeMessage({
-              payload: event.payload,
-              headers: event.headers,
-              channel: event.channel,
-              serverName: event.server,
-              connection: params.connection,
-            }))
-          } catch (e) {
-            console.error(`The ${lifecycleEvent} lifecycle function failed to send an event to channel ${event.channel}.`)
-            console.error(e)
-          }
-        })
-      }
+      res?.send?.forEach((event: GleeFunctionReturnSend) => {
+        try {
+          params.glee.send(new GleeMessage({
+            payload: event.payload,
+            headers: event.headers,
+            channel: event.channel,
+            serverName: event.server,
+            connection: params.connection,
+          }))
+        } catch (e) {
+          console.error(`The ${lifecycleEvent} lifecycle function failed to send an event to channel ${event.channel}.`)
+          console.error(e)
+        }
+      })
     })
   } catch (e) {
     console.error(e)