@logux/server 0.14.0 → 0.16.0

package/test-client/index.js

@@ -1,5 +1,5 @@
 import { ClientNode, TestPair } from '@logux/core'
-import cookie from 'cookie'
+import { stringifyCookie } from 'cookie'
 import { setTimeout } from 'node:timers/promises'
 
 import { filterMeta } from '../filter-meta/index.js'
@@ -34,9 +34,9 @@ export class TestClient {
       this.node.setLocalHeaders(opts.headers)
     }
     if (opts.cookie) {
-      this.pair.right.ws.upgradeReq.headers.cookie = Object.keys(opts.cookie)
-        .map(i => cookie.serialize(i, opts.cookie[i]))
-        .join('; ')
+      this.pair.right.ws.upgradeReq.headers.cookie = stringifyCookie(
+        opts.cookie
+      )
     }
     server.unbind.push(() => {
       this.node.destroy()
@@ -46,7 +46,7 @@ export class TestClient {
   async collect(test) {
     let added = []
     let unbind = this.node.log.on('add', (action, meta) => {
-      if (!meta.id.includes(` ${this.nodeId} `)) {
+      if (meta.id.split(' ')[1] !== this.nodeId) {
         added.push(action)
       }
     })
@@ -67,8 +67,8 @@ export class TestClient {
       })
 
       this.server.addClient(this.pair.right)
-      this.node.connection.connect()
-      this.node.waitFor('synchronized').then(() => {
+      void this.node.connection.connect()
+      void this.node.waitFor('synchronized').then(() => {
         this.node.throwsError = true
         unbind()
         resolve()
@@ -136,7 +136,7 @@ export class TestClient {
   async received(test) {
     let actions = []
     let unbind = this.log.on('add', (action, meta) => {
-      if (!meta.id.includes(` ${this.nodeId} `)) {
+      if (meta.id.split(' ')[1] !== this.nodeId) {
         actions.push(action)
       }
     })

package/test-server/index.d.ts

@@ -1,7 +1,7 @@
-import type { TestLog, TestTime } from '@logux/core'
+import type { Log, TestLog, TestTime } from '@logux/core'
 
-import { BaseServer } from '../base-server/index.js'
 import type {
+  BaseServer,
   BaseServerOptions,
   Logger,
   ServerMeta
@@ -9,8 +9,10 @@ import type {
 import type { LoggerOptions } from '../server/index.js'
 import type { TestClient, TestClientOptions } from '../test-client/index.js'
 
-export interface TestServerOptions
-  extends Omit<BaseServerOptions, 'minSubprotocol' | 'subprotocol'> {
+export interface TestServerOptions extends Omit<
+  BaseServerOptions,
+  'minSubprotocol' | 'subprotocol'
+> {
   /**
    * Disable built-in auth.
    */
@@ -46,8 +48,9 @@ export interface TestServerOptions
  * ```
  */
 export class TestServer<
-  Headers extends object = unknown
-> extends BaseServer<Headers> {
+  Headers extends object = unknown,
+  ClientData extends object = unknown
+> extends BaseServer<Headers, Log<ServerMeta>, ClientData> {
   /**
    * fetch() compatible API to test HTTP endpoints.
    *

package/test-server/index.js

@@ -34,8 +34,8 @@ export class TestServer extends BaseServer {
 
     this.fetch = this.fetch.bind(this)
 
-    this.on('fatal', () => {
-      this.destroy()
+    this.on('fatal', async () => {
+      await this.destroy()
     })
   }
 
@@ -72,7 +72,8 @@ export class TestServer extends BaseServer {
       if (e.message === 'Server undid action') {
         if (e.action.reason !== reason) {
           throw new Error(
-            `Undo was with ${e.action.reason} reason, not ${reason}`
+            `Undo was with ${e.action.reason} reason, not ${reason}`,
+            { cause: e }
           )
         }
       } else {

package/url-pattern/index.js

@@ -0,0 +1,28 @@
+const PARAM = /:(\w+)/g
+const SPECIAL = /[.*+?^${}()|[\]\\]/g
+
+function escape(text) {
+  return text.replace(SPECIAL, '\\$&')
+}
+
+export function createPattern(pattern) {
+  let names = []
+  let source = ''
+  let last = 0
+  for (let param of pattern.matchAll(PARAM)) {
+    source += escape(pattern.slice(last, param.index)) + '([^/]+)'
+    names.push(param[1])
+    last = param.index + param[0].length
+  }
+  let regexp = new RegExp('^' + source + escape(pattern.slice(last)) + '$')
+
+  return url => {
+    let match = regexp.exec(url)
+    if (!match) return null
+    let params = {}
+    for (let i = 0; i < names.length; i++) {
+      if (names[i] !== '__proto__') params[names[i]] = match[i + 1]
+    }
+    return params
+  }
+}