@logux/server 0.12.2 → 0.12.3

package/add-sync-map/index.d.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   LoguxSubscribeAction,
   SyncMapChangeAction,
   SyncMapCreateAction,
@@ -6,9 +6,8 @@ import {
   SyncMapValues,
   SyncMapTypes
 } from '@logux/actions'
-
-import { BaseServer, ServerMeta } from '../base-server/index.js'
-import { Context } from '../context/index.js'
+import type { BaseServer, ServerMeta } from '../base-server/index.js'
+import type { Context } from '../context/index.js'
 
 declare const WITH_TIME: unique symbol
 
@@ -81,7 +80,7 @@ interface SyncMapOperations<Value extends SyncMapValues> {
     since: number | undefined,
     action: LoguxSubscribeAction,
     meta: ServerMeta
-  ): Promise<SyncMapData<Value>> | SyncMapData<Value> | false | Promise<false>
+  ): Promise<SyncMapData<Value> | false> | SyncMapData<Value> | false 
 
   create?(
     ctx: Context,

package/base-server/index.d.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   Action,
   AnyAction,
   ID,
@@ -8,17 +8,16 @@ import {
   LogStore,
   TestTime
 } from '@logux/core'
-import { Server as HTTPServer, ServerResponse, IncomingMessage } from 'http'
-import {
+import type { Server as HTTPServer, ServerResponse, IncomingMessage } from 'http'
+import type {
   LoguxUnsubscribeAction,
   AbstractActionCreator,
   LoguxSubscribeAction
 } from '@logux/actions'
-import { Unsubscribe } from 'nanoevents'
-import { LogFn } from 'pino'
-
-import { Context, ChannelContext } from '../context/index.js'
-import { ServerClient } from '../server-client/index.js'
+import type { Unsubscribe } from 'nanoevents'
+import type { LogFn } from 'pino'
+import type { Context, ChannelContext } from '../context/index.js'
+import type { ServerClient } from '../server-client/index.js'
 
 export interface ServerMeta extends Meta {
   /**
@@ -110,13 +109,13 @@ export interface BaseServerOptions {
 
   /**
    * Timeout in milliseconds to disconnect connection.
-   * Default is `20000`.
+   * Default is `70000`.
    */
   timeout?: number
 
   /**
    * Milliseconds since last message to test connection by sending ping.
-   * Default is `10000`.
+   * Default is `20000`.
    */
   ping?: number
 
@@ -720,7 +719,7 @@ export class BaseServer<
   subscribers: {
     [channel: string]: {
       [nodeId: string]: {
-        filter: ChannelFilter<{}> | true
+        filters: Record<string, ChannelFilter<{}> | true>
         unsubscribe?: (action: LoguxUnsubscribeAction, meta: ServerMeta) => void
       }
     }

package/base-server/index.js

@@ -94,6 +94,10 @@ function normalizeChannelCallbacks(pattern, callbacks) {
   }
 }
 
+function subscriberFilterId(action) {
+  return JSON.stringify(action.filter || {})
+}
+
 export class BaseServer {
   constructor(opts = {}) {
     this.options = opts
@@ -140,12 +144,6 @@ export class BaseServer {
       log = this.options.time.nextLog({ store, nodeId: this.nodeId })
     } else {
       log = new Log({ store, nodeId: this.nodeId })
-      if (typeof this.options.timeout === 'undefined') {
-        this.options.timeout = 20000
-      }
-      if (typeof this.options.ping === 'undefined') {
-        this.options.ping = 10000
-      }
     }
 
     this.logger = console
@@ -554,7 +552,7 @@ export class BaseServer {
       if (!this.subscribers[channel]) {
         this.subscribers[channel] = {}
       }
-      this.subscribers[channel][nodeId] = { filter: true }
+      this.subscribers[channel][nodeId] = { filters: { '{}': true } }
       this.log.add({ type: 'logux/subscribed', channel }, { nodes: [nodeId] })
     }
   }
@@ -599,7 +597,6 @@ export class BaseServer {
     }
 
     if (meta.channels) {
-      let ctx
       for (let channel of meta.channels) {
         if (this.subscribers[channel]) {
           for (let nodeId in this.subscribers[channel]) {
@@ -607,15 +604,16 @@ export class BaseServer {
             if (!ignoreClients.has(clientId)) {
               let subscriber = this.subscribers[channel][nodeId]
               if (subscriber) {
-                let filter = subscriber.filter
-                if (typeof filter === 'function') {
-                  if (!ctx) ctx = this.createContext(action, meta)
-                  filter = await filter(ctx, action, meta)
-                }
+                let ctx = this.createContext(action, meta)
                 let client = this.clientIds.get(clientId)
-                if (filter && client) {
-                  ignoreClients.add(clientId)
-                  client.node.onAdd(action, meta)
+                for (let filter of Object.values(subscriber.filters)) {
+                  filter = typeof filter === 'function'
+                    ? await filter(ctx, action, meta)
+                    : filter
+                  if (filter && client) {
+                    ignoreClients.add(clientId)
+                    client.node.onAdd(action, meta)
+                  }
                 }
               }
             }
@@ -747,8 +745,13 @@ export class BaseServer {
             return
           }
 
-          let filter = true
-          if (channel.filter) filter = await channel.filter(ctx, action, meta)
+          let filterId = subscriberFilterId(action)
+          let filters = { [filterId]: true }
+
+          if (channel.filter) {
+            let filter = await channel.filter(ctx, action, meta)
+            filters = { [filterId]: filter }
+          }
 
           this.emitter.emit('report', 'subscribed', {
             actionId: meta.id,
@@ -759,8 +762,12 @@ export class BaseServer {
             this.subscribers[action.channel] = {}
             this.emitter.emit('subscribing', action, meta)
           }
+          let subscriber = this.subscribers[action.channel][ctx.nodeId]
+          if (subscriber) {
+            filters = { ...subscriber.filters, ...filters }
+          }
           this.subscribers[action.channel][ctx.nodeId] = {
-            filter,
+            filters,
             unsubscribe: channel.unsubscribe
               ? (unsubscribeAction, unsubscribeMeta) =>
                   channel.unsubscribe(ctx, unsubscribeAction, unsubscribeMeta)
@@ -810,7 +817,11 @@ export class BaseServer {
           subscriber.unsubscribe(action, meta)
           this.contexts.delete(action)
         }
-        delete this.subscribers[action.channel][clientNodeId]
+        let filterId = subscriberFilterId(action)
+        delete subscriber.filters[filterId]
+        if (Object.keys(subscriber.filters).length === 0) {
+          delete this.subscribers[action.channel][clientNodeId]
+        }
         if (Object.keys(this.subscribers[action.channel]).length === 0) {
           delete this.subscribers[action.channel]
         }

package/context/index.d.ts

@@ -1,7 +1,6 @@
-import { AnyAction } from '@logux/core'
-
-import { ServerMeta } from '../base-server/index.js'
-import { Server } from '../server/index.js'
+import type { AnyAction } from '@logux/core'
+import type { ServerMeta } from '../base-server/index.js'
+import type { Server } from '../server/index.js'
 
 /**
  * Action context.

package/filter-meta/index.d.ts

@@ -1,4 +1,4 @@
-import { ServerMeta } from '../base-server/index.js'
+import type { ServerMeta } from '../base-server/index.js'
 
 /**
  * Remove all non-allowed keys from meta.

package/options-loader/index.test.js

@@ -1,3 +1,4 @@
+import { it, expect, describe } from 'vitest'
 import { resolve } from 'path'
 
 import { loadOptions, oneOf, number } from './index.js'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logux/server",
-  "version": "0.12.2",
+  "version": "0.12.3",
   "description": "Build own Logux server or make proxy between WebSocket and HTTP backend on any language",
   "keywords": [
     "logux",
@@ -28,23 +28,23 @@
   },
   "dependencies": {
     "@logux/actions": "^0.3.0",
-    "@logux/core": "^0.8.0",
+    "@logux/core": "^0.8.1",
     "JSONStream": "^1.3.5",
     "cookie": "^0.5.0",
-    "dotenv": "^16.0.2",
-    "fast-glob": "^3.2.11",
+    "dotenv": "^16.0.3",
+    "fast-glob": "^3.2.12",
     "ip": "^1.1.8",
     "nanodelay": "^2.0.2",
     "nanoevents": "^7.0.1",
-    "nanoid": "^4.0.0",
-    "node-fetch": "^2.6.7",
+    "nanoid": "^4.0.2",
+    "node-fetch": "^3.3.1",
     "picocolors": "^1.0.0",
-    "pino": "8.5.0",
+    "pino": "8.14.1",
     "pino-abstract-transport": "^1.0.0",
-    "semver": "^7.3.7",
+    "semver": "^7.5.1",
     "strip-ansi": "^7.0.1",
     "url-pattern": "^1.0.3",
-    "ws": "^8.8.1",
+    "ws": "^8.13.0",
     "yyyy-mm-dd": "^1.0.2"
   }
 }

package/request/index.d.ts

@@ -1,4 +1,5 @@
-import fetch, { RequestInit } from 'node-fetch'
+import type { RequestInit } from 'node-fetch'
+import type fetch from 'node-fetch'
 
 /**
  * Throwing this error in `accessAndProcess` or `accessAndLoad`

package/request/test.test.js

@@ -1,4 +1,5 @@
-import { jest } from '@jest/globals'
+import { it, expect } from 'vitest'
+import { spy } from 'nanospy'
 
 import { ResponseError, request, patch, post, get, put, del } from '../index.js'
 
@@ -43,7 +44,7 @@ it('parses JSON body', async () => {
 })
 
 it('has shortcut for GET', async () => {
-  let fetch = jest.fn(async () => ({
+  let fetch = spy(async () => ({
     status: 200,
     async json() {
       return { answer: '1' }
@@ -51,46 +52,71 @@ it('has shortcut for GET', async () => {
   }))
 
   expect(await get('/a', { headers: { a: 1 } }, fetch)).toEqual({ answer: '1' })
-  expect(fetch).toHaveBeenCalledWith('/a', {
-    method: 'GET',
-    headers: { a: 1 }
-  })
+  expect(fetch.calls).toEqual([
+    [
+      '/a',
+      {
+        method: 'GET',
+        headers: { a: 1 }
+      }
+    ]
+  ])
 })
 
 it('has shortcut for POST', async () => {
-  let fetch = jest.fn(async () => ({ status: 204 }))
+  let fetch = spy(async () => ({ status: 204 }))
   await post('/a', { headers: { a: 1 } }, fetch)
-  expect(fetch).toHaveBeenCalledWith('/a', {
-    method: 'POST',
-    headers: { a: 1 }
-  })
+  expect(fetch.calls).toEqual([
+    [
+      '/a',
+      {
+        method: 'POST',
+        headers: { a: 1 }
+      }
+    ]
+  ])
 })
 
 it('has shortcut for PUT', async () => {
-  let fetch = jest.fn(async () => ({ status: 204 }))
+  let fetch = spy(async () => ({ status: 204 }))
   await put('/a', { headers: { a: 1 } }, fetch)
-  expect(fetch).toHaveBeenCalledWith('/a', {
-    method: 'PUT',
-    headers: { a: 1 }
-  })
+  expect(fetch.calls).toEqual([
+    [
+      '/a',
+      {
+        method: 'PUT',
+        headers: { a: 1 }
+      }
+    ]
+  ])
 })
 
 it('has shortcut for PATCH', async () => {
-  let fetch = jest.fn(async () => ({ status: 204 }))
+  let fetch = spy(async () => ({ status: 204 }))
   await patch('/a', { headers: { a: 1 } }, fetch)
-  expect(fetch).toHaveBeenCalledWith('/a', {
-    method: 'PATCH',
-    headers: { a: 1 }
-  })
+  expect(fetch.calls).toEqual([
+    [
+      '/a',
+      {
+        method: 'PATCH',
+        headers: { a: 1 }
+      }
+    ]
+  ])
 })
 
 it('has shortcut for DELETE', async () => {
-  let fetch = jest.fn(async () => ({ status: 204 }))
+  let fetch = spy(async () => ({ status: 204 }))
   await del('/a', { headers: { a: 1 } }, fetch)
-  expect(fetch).toHaveBeenCalledWith('/a', {
-    method: 'DELETE',
-    headers: { a: 1 }
-  })
+  expect(fetch.calls).toEqual([
+    [
+      '/a',
+      {
+        method: 'DELETE',
+        headers: { a: 1 }
+      }
+    ]
+  ])
 })
 
 it('works without option object', async () => {

package/server/index.d.ts

@@ -1,4 +1,6 @@
-import { BaseServer, Logger, BaseServerOptions } from '../base-server/index.js'
+import type { Logger, BaseServerOptions } from '../base-server/index.js'
+
+import { BaseServer } from '../base-server/index.js'
 
 export interface LoggerOptions {
   /**

package/server-client/index.d.ts

@@ -1,6 +1,5 @@
-import { ServerConnection, ServerNode } from '@logux/core'
-
-import { BaseServer } from '../base-server/index.js'
+import type { ServerConnection, ServerNode } from '@logux/core'
+import type { BaseServer } from '../base-server/index.js'
 
 /**
  * Logux client connected to server.

package/test-client/index.d.ts

@@ -1,8 +1,7 @@
-import { LoguxSubscribeAction, LoguxUnsubscribeAction } from '@logux/actions'
-import { Action, AnyAction, TestLog, TestPair } from '@logux/core'
-
-import { ServerMeta } from '../base-server/index.js'
-import { TestServer } from '../test-server/index.js'
+import type { LoguxSubscribeAction, LoguxUnsubscribeAction } from '@logux/actions'
+import type { Action, AnyAction, TestLog, TestPair } from '@logux/core'
+import type { ServerMeta } from '../base-server/index.js'
+import type { TestServer } from '../test-server/index.js'
 
 export class LoguxActionError extends Error {
   action: Action

package/test-server/index.d.ts

@@ -1,13 +1,13 @@
-import { TestTime, TestLog } from '@logux/core'
-
-import { TestClient, TestClientOptions } from '../test-client/index.js'
-import {
+import type { TestTime, TestLog } from '@logux/core'
+import type { TestClient, TestClientOptions } from '../test-client/index.js'
+import type {
   BaseServerOptions,
-  BaseServer,
   ServerMeta,
   Logger
 } from '../base-server/index.js'
-import { LoggerOptions } from '../server/index.js'
+import type { LoggerOptions } from '../server/index.js'
+
+import { BaseServer } from '../base-server/index.js'
 
 export interface TestServerOptions
   extends Omit<BaseServerOptions, 'subprotocol' | 'supports'> {

package/vite.config.ts

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