@logux/server 0.10.4 → 0.10.8

package/base-server/index.d.ts

@@ -327,7 +327,7 @@ interface ChannelFilter<Headers extends object> {
     ctx: Context<{}, Headers>,
     action: Readonly<Action>,
     meta: Readonly<ServerMeta>
-  ): boolean
+  ): boolean | Promise<boolean>
 }
 
 /**
@@ -597,7 +597,7 @@ interface GetProcessor {
 }
 
 interface PostProcessor {
-  isValid(command: object): false
+  isValid(command: object): boolean
   command(command: object, request: object): Promise<void>
 }
 
@@ -1140,7 +1140,7 @@ export class BaseServer<
    * @param action New action.
    * @param meta Action’s metadata.
    */
-  sendAction(action: Action, meta: ServerMeta): void
+  sendAction(action: Action, meta: ServerMeta): void | Promise<void>
 
   /**
    * Send `logux/subscribed` if client was not already subscribed.

package/base-server/index.js

@@ -1,12 +1,12 @@
 import { ServerConnection, MemoryStore, Log, parseId } from '@logux/core'
 import { LoguxNotFoundError } from '@logux/actions'
 import { createNanoEvents } from 'nanoevents'
+import { WebSocketServer } from 'ws'
 import { promises as fs } from 'fs'
 import { fileURLToPath } from 'url'
 import { join, dirname } from 'path'
 import UrlPattern from 'url-pattern'
 import { nanoid } from 'nanoid'
-import WebSocket from 'ws'
 
 import { bindControlServer } from '../bind-control-server/index.js'
 import { bindBackendProxy } from '../bind-backend-proxy/index.js'
@@ -378,12 +378,12 @@ export class BaseServer {
     if (!this.authenticator) {
       throw new Error('You must set authentication callback by server.auth()')
     }
-    this.http = await createHttpServer(this.options)
-    this.ws = new WebSocket.Server({ server: this.http })
+    this.httpServer = await createHttpServer(this.options)
+    this.ws = new WebSocketServer({ server: this.httpServer })
     if (!this.options.server) {
       await new Promise((resolve, reject) => {
         this.ws.on('error', reject)
-        this.http.listen(this.options.port, this.options.host, resolve)
+        this.httpServer.listen(this.options.port, this.options.host, resolve)
       })
     }
     bindControlServer(this, this.httpListener)
@@ -395,12 +395,12 @@ export class BaseServer {
           this.ws.close()
         })
     )
-    if (this.http) {
+    if (this.httpServer) {
       this.unbind.push(
         () =>
           new Promise(resolve => {
-            this.http.on('close', resolve)
-            this.http.close()
+            this.httpServer.on('close', resolve)
+            this.httpServer.close()
           })
       )
     }
@@ -543,7 +543,7 @@ export class BaseServer {
     }
   }
 
-  sendAction(action, meta) {
+  async sendAction(action, meta) {
     let from = parseId(meta.id).clientId
     let ignoreClients = new Set(meta.excludeClients || [])
     ignoreClients.add(from)
@@ -594,7 +594,7 @@ export class BaseServer {
                 let filter = subscriber.filter
                 if (typeof filter === 'function') {
                   if (!ctx) ctx = this.createContext(action, meta)
-                  filter = filter(ctx, action, meta)
+                  filter = await filter(ctx, action, meta)
                 }
                 let client = this.clientIds.get(clientId)
                 if (filter && client) {

package/bind-control-server/index.js

@@ -18,7 +18,7 @@ function isValidBody(body) {
 
 export function bindControlServer(app, custom) {
   let masks = app.options.controlMask.split(/,\s*/).map(i => ip.cidrSubnet(i))
-  app.http.on('request', async (req, res) => {
+  app.httpServer.on('request', async (req, res) => {
     let urlString = req.url
     if (/^\/\w+%3F/.test(urlString)) urlString = decodeURIComponent(urlString)
     let reqUrl = new URL(urlString, 'http://localhost')

package/human-formatter/index.js

@@ -1,6 +1,6 @@
-import { createColors } from 'nanocolors'
 import stripAnsi from 'strip-ansi'
 import yyyymmdd from 'yyyy-mm-dd'
+import pico from 'picocolors'
 import path from 'path'
 import os from 'os'
 
@@ -170,7 +170,7 @@ function prettyStackTrace(c, stack, basepath) {
 }
 
 export function humanFormatter(options) {
-  let c = createColors(options.color)
+  let c = pico.createColors(options.color)
   this.color = c.isColorSupported
   let basepath = options.basepath || process.cwd()
   if (basepath.slice(-1) !== path.sep) basepath += path.sep

package/options-loader/index.js

@@ -1,5 +1,5 @@
-import { bold, cyan, yellow, green, red } from 'nanocolors'
 import dotenv from 'dotenv'
+import pico from 'picocolors'
 
 export function loadOptions(spec, process, env) {
   let rawCliArgs = gatherCliArgs(process.argv)
@@ -72,7 +72,9 @@ function parseValues(spec, args) {
       parsed[key] = parsingResult[1]
     } else {
       throw Error(
-        `Failed to parse ${bold(key)} argument value. \n${parsingResult[0]}`
+        `Failed to parse ${pico.bold(key)} argument value. \n${
+          parsingResult[0]
+        }`
       )
     }
   }
@@ -104,8 +106,8 @@ function composeHelp(spec, argv) {
   let nameColumnLength = Math.max(...options.map(it => it.full.length))
   let envColumnLength = Math.max(...options.map(it => it.env.length))
 
-  let composeName = name => yellow(name.padEnd(nameColumnLength + 2))
-  let composeEnv = env => cyan(env.padEnd(envColumnLength + 2))
+  let composeName = name => pico.yellow(name.padEnd(nameColumnLength + 2))
+  let composeEnv = env => pico.cyan(env.padEnd(envColumnLength + 2))
   let composeOptionHelp = option => {
     return (
       composeName(option.full) + composeEnv(option.env) + option.description
@@ -118,7 +120,7 @@ function composeHelp(spec, argv) {
     let lastPart = pathParts[pathParts.length - 1]
     examples = [
       '',
-      bold('Examples:'),
+      pico.bold('Examples:'),
       ...spec.examples.map(i => i.replace('$0', lastPart))
     ]
   }
@@ -126,7 +128,7 @@ function composeHelp(spec, argv) {
   return [
     'Start Logux Server',
     '',
-    bold('Options:'),
+    pico.bold('Options:'),
     ...options.map(option => composeOptionHelp(option)),
     ...examples
   ].join('\n')
@@ -153,10 +155,9 @@ function toKebabCase(word) {
 
 export function oneOf(options, rawValue) {
   if (!options.includes(rawValue)) {
+    let opt = JSON.stringify(options)
     return [
-      `Expected ${green('one of ' + JSON.stringify(options))}, got ${red(
-        rawValue
-      )}`,
+      `Expected ${pico.green('one of ' + opt)}, got ${pico.red(rawValue)}`,
       null
     ]
   } else {
@@ -167,7 +168,7 @@ export function oneOf(options, rawValue) {
 export function number(rawValue) {
   let parsed = Number.parseInt(rawValue, 10)
   if (Number.isNaN(parsed)) {
-    return [`Expected ${green('number')}, got ${red(rawValue)}`, null]
+    return [`Expected ${pico.green('number')}, got ${pico.red(rawValue)}`, null]
   } else {
     return [null, parsed]
   }
@@ -175,7 +176,7 @@ export function number(rawValue) {
 
 export function string(rawValue) {
   if (typeof rawValue !== 'string') {
-    return [`Expected ${green('string')}, got ${red(rawValue)}`, null]
+    return [`Expected ${pico.green('string')}, got ${pico.red(rawValue)}`, null]
   } else {
     return [null, rawValue]
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logux/server",
-  "version": "0.10.4",
+  "version": "0.10.8",
   "description": "Build own Logux server or make proxy between WebSocket and HTTP backend on any language",
   "keywords": [
     "logux",
@@ -29,22 +29,21 @@
   "dependencies": {
     "@logux/actions": "^0.2.1",
     "@logux/core": "^0.7.2",
-    "@types/node-fetch": "^2.5.10",
     "JSONStream": "^1.3.5",
     "cookie": "^0.4.1",
     "dotenv": "^10.0.0",
-    "globby": "^11.0.4",
+    "fast-glob": "^3.2.7",
     "ip": "^1.1.5",
-    "nanocolors": "^0.2.10",
-    "nanodelay": "^2.0.1",
-    "nanoevents": "^6.0.1",
-    "nanoid": "^3.1.28",
+    "nanodelay": "^2.0.2",
+    "nanoevents": "^6.0.2",
+    "nanoid": "^3.1.30",
     "node-fetch": "^2.6.1",
+    "picocolors": "^1.0.0",
     "pino": "^6.13.3",
     "semver": "^7.3.5",
     "strip-ansi": "^7.0.1",
     "url-pattern": "^1.0.3",
-    "ws": "^7.5.0",
+    "ws": "^8.3.0",
     "yyyy-mm-dd": "^1.0.2"
   }
 }

package/server/index.js

@@ -1,6 +1,6 @@
 import { join, relative } from 'path'
-import globby from 'globby'
-import { bgRed, black } from 'nanocolors'
+import pico from 'picocolors'
+import glob from 'fast-glob'
 
 import { createReporter } from '../create-reporter/index.js'
 import { BaseServer } from '../base-server/index.js'
@@ -63,14 +63,15 @@ export class Server extends BaseServer {
     )
     if (help) {
       process.stdout.write(help + '\n')
-      process.exit(0)
-    } else {
-      try {
-        return Object.assign(defaults, options)
-      } catch (e) {
-        process.stderr.write(`${bgRed(black(' FATAL '))} ${e.message}\n`)
-        process.exit(1)
-      }
+      return process.exit(0)
+    }
+    try {
+      return Object.assign(defaults, options)
+    } catch (e) {
+      process.stderr.write(
+        `${pico.bgRed(pico.black(' FATAL '))} ${e.message}\n`
+      )
+      return process.exit(1)
     }
   }
 
@@ -133,7 +134,7 @@ export class Server extends BaseServer {
   async autoloadModules(
     files = ['modules/*/index.js', 'modules/*.js', '!**/*.{test,spec}.js']
   ) {
-    let matches = await globby(files, {
+    let matches = await glob(files, {
       cwd: this.options.root,
       absolute: true,
       onlyFiles: true

package/test-server/index.js

@@ -30,6 +30,10 @@ export class TestServer extends BaseServer {
     }
     if (opts.auth !== false) this.auth(() => true)
     this.testUsers = {}
+
+    this.on('fatal', () => {
+      this.destroy()
+    })
   }
 
   async connect(userId, opts = {}) {