@logux/server 0.12.2 → 0.12.4

package/test-client/index.js

@@ -1,6 +1,6 @@
 import { ClientNode, TestPair } from '@logux/core'
-import { delay } from 'nanodelay'
 import cookie from 'cookie'
+import { delay } from 'nanodelay'
 
 import { filterMeta } from '../filter-meta/index.js'
 
@@ -43,6 +43,18 @@ export class TestClient {
     })
   }
 
+  async collect(test) {
+    let added = []
+    let unbind = this.node.log.on('add', (action, meta) => {
+      if (!meta.id.includes(` ${this.nodeId} `)) {
+        added.push(action)
+      }
+    })
+    await test()
+    unbind()
+    return added
+  }
+
   connect() {
     return new Promise((resolve, reject) => {
       this.node.throwsError = false
@@ -69,18 +81,6 @@ export class TestClient {
     return this.pair.wait('right')
   }
 
-  async collect(test) {
-    let added = []
-    let unbind = this.node.log.on('add', (action, meta) => {
-      if (!meta.id.includes(` ${this.nodeId} `)) {
-        added.push(action)
-      }
-    })
-    await test()
-    unbind()
-    return added
-  }
-
   process(action, meta) {
     return this.collect(async () => {
       return new Promise((resolve, reject) => {
@@ -133,10 +133,23 @@ export class TestClient {
     })
   }
 
+  async received(test) {
+    let actions = []
+    let unbind = this.log.on('add', (action, meta) => {
+      if (!meta.id.includes(` ${this.nodeId} `)) {
+        actions.push(action)
+      }
+    })
+    await test()
+    await delay(1)
+    unbind()
+    return actions
+  }
+
   async subscribe(channel, filter, since) {
     let action = channel
     if (typeof channel === 'string') {
-      action = { type: 'logux/subscribe', channel }
+      action = { channel, type: 'logux/subscribe' }
     }
     if (filter) {
       action.filter = filter
@@ -151,24 +164,11 @@ export class TestClient {
   unsubscribe(channel, filter) {
     let action = channel
     if (typeof channel === 'string') {
-      action = { type: 'logux/unsubscribe', channel }
+      action = { channel, type: 'logux/unsubscribe' }
     }
     if (filter) {
       action.filter = filter
     }
     return this.process(action)
   }
-
-  async received(test) {
-    let actions = []
-    let unbind = this.log.on('add', (action, meta) => {
-      if (!meta.id.includes(` ${this.nodeId} `)) {
-        actions.push(action)
-      }
-    })
-    await test()
-    await delay(1)
-    unbind()
-    return actions
-  }
 }

package/test-server/index.d.ts

@@ -1,19 +1,16 @@
-import { TestTime, TestLog } from '@logux/core'
+import type { TestLog, TestTime } from '@logux/core'
 
-import { TestClient, TestClientOptions } from '../test-client/index.js'
-import {
+import { BaseServer } from '../base-server/index.js'
+import type {
   BaseServerOptions,
-  BaseServer,
-  ServerMeta,
-  Logger
+  Logger,
+  ServerMeta
 } from '../base-server/index.js'
-import { LoggerOptions } from '../server/index.js'
+import type { LoggerOptions } from '../server/index.js'
+import type { TestClient, TestClientOptions } from '../test-client/index.js'
 
 export interface TestServerOptions
   extends Omit<BaseServerOptions, 'subprotocol' | 'supports'> {
-  subprotocol?: string
-  supports?: string
-
   /**
    * Disable built-in auth.
    */
@@ -23,6 +20,10 @@ export interface TestServerOptions
    * Logger with custom settings.
    */
   logger?: Logger | LoggerOptions
+
+  subprotocol?: string
+
+  supports?: string
 }
 
 /**
@@ -48,9 +49,13 @@ export class TestServer<
   Headers extends object = {}
 > extends BaseServer<Headers> {
   /**
-   * @param opts The limit subset of server options.
+   * Server actions log, with methods to check actions inside.
+   *
+   * ```js
+   * server.log.actions() //=> […]
+   * ```
    */
-  constructor(opts?: TestServerOptions)
+  log: TestLog<ServerMeta>
 
   /**
    * Time replacement without variable parts like current timestamp.
@@ -58,13 +63,9 @@ export class TestServer<
   time: TestTime
 
   /**
-   * Server actions log, with methods to check actions inside.
-   *
-   * ```js
-   * server.log.actions() //=> […]
-   * ```
+   * @param opts The limit subset of server options.
    */
-  log: TestLog<ServerMeta>
+  constructor(opts?: TestServerOptions)
 
   /**
    * Create and connect client.
@@ -80,24 +81,6 @@ export class TestServer<
    */
   connect(userId: string, opts?: TestClientOptions): Promise<TestClient>
 
-  /**
-   * Try to connect client and throw an error is client didn’t received
-   * `Wrong Cregentials` message from the server.
-   *
-   * ```js
-   * server = new TestServer()
-   * await server.expectWrongCredentials('10')
-   * ```
-   *
-   * @param userId User ID.
-   * @param opts Other options.
-   * @returns Promise until check.
-   */
-  expectWrongCredentials(
-    userId: string,
-    opts?: TestClientOptions
-  ): Promise<void>
-
   /**
    * Call callback and throw an error if there was no `Action was denied`
    * during callback.
@@ -112,6 +95,18 @@ export class TestServer<
    */
   expectDenied(test: () => any | Promise<any>): Promise<void>
 
+  /**
+   * Call callback and throw an error if there was no error during
+   * server processing.
+   *
+   * @param text RegExp or string of error message.
+   * @param test Callback with subscripting or action sending.
+   */
+  expectError(
+    text: RegExp | string,
+    test: () => any | Promise<any>
+  ): Promise<void>
+
   /**
    * Call callback and throw an error if there was no `logux/undo` in return
    * with specific reason.
@@ -128,14 +123,20 @@ export class TestServer<
   expectUndo(reason: string, test: () => any | Promise<any>): Promise<void>
 
   /**
-   * Call callback and throw an error if there was no error during
-   * server processing.
+   * Try to connect client and throw an error is client didn’t received
+   * `Wrong Cregentials` message from the server.
    *
-   * @param text RegExp or string of error message.
-   * @param test Callback with subscripting or action sending.
+   * ```js
+   * server = new TestServer()
+   * await server.expectWrongCredentials('10')
+   * ```
+   *
+   * @param userId User ID.
+   * @param opts Other options.
+   * @returns Promise until check.
    */
-  expectError(
-    text: string | RegExp,
-    test: () => any | Promise<any>
+  expectWrongCredentials(
+    userId: string,
+    opts?: TestClientOptions
   ): Promise<void>
 }

package/test-server/index.js

@@ -1,7 +1,7 @@
 import { TestTime } from '@logux/core'
 
-import { createReporter } from '../create-reporter/index.js'
 import { BaseServer } from '../base-server/index.js'
+import { createReporter } from '../create-reporter/index.js'
 import { TestClient } from '../test-client/index.js'
 
 export class TestServer extends BaseServer {
@@ -12,20 +12,20 @@ export class TestServer extends BaseServer {
 
     opts.time.lastId += 1
     super({
+      id: `${opts.time.lastId}`,
       subprotocol: '0.0.0',
       supports: '0.0.0',
-      id: `${opts.time.lastId}`,
       ...opts
     })
     if (opts.logger) {
       this.on('report', createReporter(opts))
     } else {
       this.logger = {
-        fatal: () => {},
+        debug: () => {},
         error: () => {},
-        warn: () => {},
+        fatal: () => {},
         info: () => {},
-        debug: () => {}
+        warn: () => {}
       }
     }
     if (opts.auth !== false) this.auth(() => true)
@@ -42,21 +42,24 @@ export class TestServer extends BaseServer {
     return client
   }
 
-  async expectWrongCredentials(userId, opts = {}) {
+  async expectDenied(test) {
+    await this.expectUndo('denied', test)
+  }
+
+  async expectError(text, test) {
     try {
-      await this.connect(userId, opts)
-      throw new Error('Credentials passed')
+      await test()
+      throw new Error('Actions passed without error')
     } catch (e) {
-      if (e.message !== 'Wrong credentials') {
+      if (
+        (typeof text === 'string' && e.message !== text) ||
+        (text instanceof RegExp && !text.test(e.message))
+      ) {
         throw e
       }
     }
   }
 
-  async expectDenied(test) {
-    await this.expectUndo('denied', test)
-  }
-
   async expectUndo(reason, test) {
     try {
       await test()
@@ -75,15 +78,12 @@ export class TestServer extends BaseServer {
     }
   }
 
-  async expectError(text, test) {
+  async expectWrongCredentials(userId, opts = {}) {
     try {
-      await test()
-      throw new Error('Actions passed without error')
+      await this.connect(userId, opts)
+      throw new Error('Credentials passed')
     } catch (e) {
-      if (
-        (typeof text === 'string' && e.message !== text) ||
-        (text instanceof RegExp && !text.test(e.message))
-      ) {
+      if (e.message !== 'Wrong credentials') {
         throw e
       }
     }

package/vite.config.ts

@@ -0,0 +1,13 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    coverage: {
+      exclude: ['node_modules', 'server/index.js', '*/*.test.*'],
+      lines: 100,
+      provider: 'v8'
+    },
+    environment: 'node',
+    exclude: ['node_modules', 'test/servers']
+  }
+})