Move to number subprotocol

Author: ai

README.md

@@ -36,8 +36,8 @@ import { Server } from '@logux/server'
 
 const server = new Server(
   Server.loadOptions(process, {
-    subprotocol: '1.0.0',
-    supports: '1.x',
+    subprotocol: 1,
+    minSubprotocol: 1,
     root: import.meta.dirname
   })
 )

add-http-pages/index.test.ts

@@ -10,8 +10,8 @@ import {
 } from '../index.js'
 
 const DEFAULT_OPTIONS = {
-  subprotocol: '0.0.0',
-  supports: '0.x'
+  minSubprotocol: 0,
+  subprotocol: 0
 }
 
 let lastPort = 9111

base-server/index.d.ts

@@ -45,7 +45,10 @@ interface ChannelOptions {
 }
 
 interface ConnectLoader<Headers extends object = unknown> {
-  (ctx: ConnectContext<Headers>, lastSynced: number):
+  (
+    ctx: ConnectContext<Headers>,
+    lastSynced: number
+  ):
     | [Action, ServerMeta][]
     | Promise<
         [
@@ -146,7 +149,8 @@ export interface BaseServerOptions {
   env?: 'development' | 'production'
 
   /**
-   * URL of main JS file in the root dir.
+   * URL of main JS file in the root dir for the cases where you can’t use
+   * `import.meta.dirname`.
    *
    * ```
    * fileUrl: import.meta.url
@@ -170,6 +174,11 @@ export interface BaseServerOptions {
    */
   key?: { pem: string } | string
 
+  /**
+   * The version requirements for client subprotocol version.
+   */
+  minSubprotocol?: number
+
   /**
    * Replace class for ServerNode.
    */
@@ -221,14 +230,9 @@ export interface BaseServerOptions {
   store?: LogStore
 
   /**
-   * Server current application subprotocol version in SemVer format.
-   */
-  subprotocol?: string
-
-  /**
-   * npm’s version requirements for client subprotocol version.
+   * Server current application subprotocol version.
    */
-  supports?: string
+  subprotocol?: number
 
   /**
    * Test time to test server.
@@ -561,13 +565,13 @@ interface ReportersArguments {
     environment: 'development' | 'production'
     host: string
     loguxServer: string
+    minSubprotocol: number
     nodeId: string
     notes: object
     port: string
     redis: string
     server: boolean
-    subprotocol: string
-    supports: string
+    subprotocol: number
   }
   processed: {
     actionId: ID

base-server/index.js

@@ -94,8 +94,8 @@ export class BaseServer {
     if (typeof this.options.subprotocol === 'undefined') {
       throw optionError('Missed `subprotocol` option in server constructor')
     }
-    if (typeof this.options.supports === 'undefined') {
-      throw optionError('Missed `supports` option in server constructor')
+    if (typeof this.options.minSubprotocol === 'undefined') {
+      throw optionError('Missed `minSubprotocol` option in server constructor')
     }
 
     if (this.options.key && !this.options.cert) {
@@ -621,9 +621,7 @@ export class BaseServer {
     }
 
     let pkg = JSON.parse(
-      await readFile(
-        join(fileURLToPath(import.meta.url), '..', '..', 'package.json')
-      )
+      await readFile(join(import.meta.dirname, '..', 'package.json'))
     )
 
     this.ws.on('connection', (ws, req) => {
@@ -635,13 +633,13 @@ export class BaseServer {
       environment: this.env,
       host: this.options.host,
       loguxServer: pkg.version,
+      minSubprotocol: this.options.minSubprotocol,
       nodeId: this.nodeId,
       notes: this.listenNotes,
       port: this.options.port,
       redis: this.options.redis,
       server: !!this.options.server,
-      subprotocol: this.options.subprotocol,
-      supports: this.options.supports
+      subprotocol: this.options.subprotocol
     })
   }