@jmealo/fastify-uws 1.0.4 → 1.0.5

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./server.cjs"),o=require("./request.cjs"),c=require("./response.cjs"),e=require("./websocket-server.cjs"),u=require("./plugin-sse.cjs"),S=require("./plugin-websocket.cjs"),n=(t,s)=>new r.Server(t,s);exports.Server=r.Server;exports.Request=o.Request;exports.Response=c.Response;exports.WebSocket=e.WebSocket;exports.WebSocketServer=e.WebSocketServer;exports.WebSocketStream=e.WebSocketStream;exports.sse=u.default;exports.websocket=S.default;exports.serverFactory=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("./request.cjs"),c=require("./response.cjs"),r=require("./server.cjs"),e=require("./websocket-server.cjs"),u=require("./plugin-sse.cjs"),S=require("./plugin-websocket.cjs"),n=(t,s)=>new r.Server(t,s);exports.Request=o.Request;exports.Response=c.Response;exports.Server=r.Server;exports.WebSocket=e.WebSocket;exports.WebSocketServer=e.WebSocketServer;exports.WebSocketStream=e.WebSocketStream;exports.sse=u.default;exports.websocket=S.default;exports.serverFactory=n;

package/dist/index.d.ts

@@ -1,8 +1,8 @@
-import { ContextConfigDefault, FastifyBaseLogger, FastifyInstance, FastifyRequest, FastifyReply, FastifySchema, FastifyServerFactory, FastifyTypeProvider, FastifyTypeProviderDefault, RawReplyDefaultExpression, RawRequestDefaultExpression, RawServerBase, RawServerDefault, RequestGenericInterface } from 'fastify';
+import { ContextConfigDefault, FastifyBaseLogger, FastifyInstance, FastifyReply, FastifyRequest, FastifySchema, FastifyServerFactory, FastifyTypeProvider, FastifyTypeProviderDefault, RawReplyDefaultExpression, RawRequestDefaultExpression, RawServerBase, RawServerDefault, RequestGenericInterface } from 'fastify';
 import { SSEContext } from './plugin-sse';
-import { Server } from './server';
 import { Request } from './request';
 import { Response } from './response';
+import { Server } from './server';
 import { WebSocket as UwsWebSocket, WebSocketServer, WebSocketStream } from './websocket-server';
 export type UwsServer = RawServerDefault & Server;
 export type UwsRequest = Request;

package/dist/index.js

@@ -1,6 +1,6 @@
-import { Server as o } from "./server.js";
 import { Request as p } from "./request.js";
 import { Response as c } from "./response.js";
+import { Server as o } from "./server.js";
 import { WebSocket as S, WebSocketServer as b, WebSocketStream as k } from "./websocket-server.js";
 import { default as u } from "./plugin-sse.js";
 import { default as W } from "./plugin-websocket.js";

package/dist/server.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const k=require("uWebSockets.js"),E=require("node:dns/promises"),S=require("node:fs"),g=require("node:http"),y=require("node:os"),L=require("node:path"),R=require("node:events"),q=require("ipaddr.js"),u=require("./errors.cjs"),w=require("./http-socket.cjs"),D=require("./request.cjs"),H=require("./response.cjs"),e=require("./symbols.cjs");function T(t,s,r){if(t!=null){if(Array.isArray(t)){if(t.length===0)return;if(t.length>1)throw new Error(`fastify-uws: multiple ${s} values are not supported by uWebSockets.js`);t=t[0]}if(typeof t=="string")return t;if(Buffer.isBuffer(t)){const i=L.join(y.tmpdir(),`fastify-uws-${s}-${process.pid}-${Date.now()}.pem`);return S.writeFileSync(i,t,{mode:384}),r.push(i),i}}}function C(t){if(t.https){const s=[],r=T(t.https.key,"key",s),i=T(t.https.cert,"cert",s),o=T(t.https.ca,"ca",s),c={};return r&&(c.key_file_name=r),i&&(c.cert_file_name=i),o&&(c.ca_file_name=o),t.https.passphrase&&(c.passphrase=t.https.passphrase),{app:k.SSLApp(c),tempFiles:s}}return{app:k.App(),tempFiles:[]}}const v=new Map(g.METHODS.map(t=>[t.toLowerCase(),t])),h={};class F extends R.EventEmitter{[e.kHandler];timeout=0;drainTimeout;maxHeadersCount=0;maxRequestsPerSocket=0;headersTimeout=0;keepAliveTimeout=0;requestTimeout=0;[e.kHttps];[e.kWs];[e.kAddress]=null;[e.kListenSocket]=null;[e.kApp];[e.kClosed]=!1;[e.kListenAll]=!1;[e.kListening]=!1;[e.kTempFiles];constructor(s,r={}){super();const{http2:i=!1,https:o=null,connectionTimeout:c=0,drainTimeout:a}=r;this[e.kHandler]=s,this.timeout=c,this.drainTimeout=a,this[e.kHttps]=o,this[e.kWs]=null;const{app:l,tempFiles:f}=C({https:o});this[e.kApp]=l,this[e.kTempFiles]=f}get encrypted(){return!!this[e.kHttps]}get listening(){return!!this[e.kListening]}setTimeout(s,r){return this.timeout=s,r&&this.once("timeout",r),this}address(){return this[e.kAddress]}listen(s,r){s?.signal&&s.signal.addEventListener("abort",()=>{this.close()},{once:!0}),this[e.kListen](s).then(()=>{this[e.kListening]=!0,r?.(),this.emit("listening")}).catch(i=>{this[e.kAddress]=null,process.nextTick(()=>this.emit("error",i))})}closeIdleConnections(){}closeAllConnections(){if(this[e.kWs])for(const s of this[e.kWs].connections)s.close()}close(s=()=>{}){if(this[e.kClosed])return s();const r=this[e.kAddress]?.port;r!==void 0&&h[r]===this&&delete h[r],this[e.kAddress]=null,this[e.kListening]=!1,this[e.kClosed]=!0,this[e.kListenSocket]&&(k.us_listen_socket_close(this[e.kListenSocket]),this[e.kListenSocket]=null),this.closeAllConnections();for(const i of this[e.kTempFiles])try{S.unlinkSync(i)}catch{}this[e.kTempFiles]=[],process.nextTick(()=>{this.emit("close"),s()})}ref(){}unref(){}async[e.kListen]({port:s,host:r}){if(this[e.kClosed])throw new u.ERR_SERVER_DESTROYED;if(s!=null&&Number.isNaN(Number(s)))throw new u.ERR_SOCKET_BAD_PORT(s);let i=s==null?0:Number(s);const o=await E.lookup(r);if(this[e.kAddress]={address:o.address,family:o.family===6?"IPv6":"IPv4",port:i},this[e.kAddress].address.startsWith("["))throw new u.ERR_ENOTFOUND(this[e.kAddress].address);const a=q.parse(this[e.kAddress].address).toNormalizedString(),l=this[e.kApp],f=(m,p)=>{const d=v.get(p.getMethod()),n=new w.HTTPSocket(this,m,d==="GET"||d==="HEAD");if(!d){n[e.kClientError]=!0,this.emit("clientError",new u.ERR_INVALID_METHOD,n);return}const A=new D.Request(p,n,d),_=new H.Response(n);A.headers.upgrade&&this.emit("upgrade",A,n),this[e.kHandler](A,_)};return l.any("/*",f),i!==0&&h[i]&&(this[e.kWs]=h[i][e.kWs]),this[e.kWs]&&this[e.kWs].addServer(this),new Promise((m,p)=>{const d=n=>{if(!n)return p(new u.ERR_ADDRINUSE(this[e.kAddress].address,i));this[e.kListenSocket]=n,i=this[e.kAddress].port=k.us_socket_local_port(n),h[i]||(h[i]=this),m()};this[e.kListenAll]=r==="localhost",this[e.kListenAll]?l.listen(i,d):l.listen(a,i,d)})}}exports.Server=F;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const k=require("uWebSockets.js"),E=require("node:dns/promises"),g=require("node:events"),S=require("node:fs"),y=require("node:http"),L=require("node:os"),R=require("node:path"),q=require("ipaddr.js"),u=require("./errors.cjs"),w=require("./http-socket.cjs"),D=require("./request.cjs"),H=require("./response.cjs"),e=require("./symbols.cjs");function T(t,s,r){if(t!=null){if(Array.isArray(t)){if(t.length===0)return;if(t.length>1)throw new Error(`fastify-uws: multiple ${s} values are not supported by uWebSockets.js`);t=t[0]}if(typeof t=="string")return t;if(Buffer.isBuffer(t)){const i=R.join(L.tmpdir(),`fastify-uws-${s}-${process.pid}-${Date.now()}.pem`);return S.writeFileSync(i,t,{mode:384}),r.push(i),i}}}function C(t){if(t.https){const s=[],r=T(t.https.key,"key",s),i=T(t.https.cert,"cert",s),o=T(t.https.ca,"ca",s),c={};return r&&(c.key_file_name=r),i&&(c.cert_file_name=i),o&&(c.ca_file_name=o),t.https.passphrase&&(c.passphrase=t.https.passphrase),{app:k.SSLApp(c),tempFiles:s}}return{app:k.App(),tempFiles:[]}}const v=new Map(y.METHODS.map(t=>[t.toLowerCase(),t])),h={};class F extends g.EventEmitter{[e.kHandler];timeout=0;drainTimeout;maxHeadersCount=0;maxRequestsPerSocket=0;headersTimeout=0;keepAliveTimeout=0;requestTimeout=0;[e.kHttps];[e.kWs];[e.kAddress]=null;[e.kListenSocket]=null;[e.kApp];[e.kClosed]=!1;[e.kListenAll]=!1;[e.kListening]=!1;[e.kTempFiles];constructor(s,r={}){super();const{http2:i=!1,https:o=null,connectionTimeout:c=0,drainTimeout:a}=r;this[e.kHandler]=s,this.timeout=c,this.drainTimeout=a,this[e.kHttps]=o,this[e.kWs]=null;const{app:l,tempFiles:f}=C({https:o});this[e.kApp]=l,this[e.kTempFiles]=f}get encrypted(){return!!this[e.kHttps]}get listening(){return!!this[e.kListening]}setTimeout(s,r){return this.timeout=s,r&&this.once("timeout",r),this}address(){return this[e.kAddress]}listen(s,r){s?.signal&&s.signal.addEventListener("abort",()=>{this.close()},{once:!0}),this[e.kListen](s).then(()=>{this[e.kListening]=!0,r?.(),this.emit("listening")}).catch(i=>{this[e.kAddress]=null,process.nextTick(()=>this.emit("error",i))})}closeIdleConnections(){}closeAllConnections(){if(this[e.kWs])for(const s of this[e.kWs].connections)s.close()}close(s=()=>{}){if(this[e.kClosed])return s();const r=this[e.kAddress]?.port;r!==void 0&&h[r]===this&&delete h[r],this[e.kAddress]=null,this[e.kListening]=!1,this[e.kClosed]=!0,this[e.kListenSocket]&&(k.us_listen_socket_close(this[e.kListenSocket]),this[e.kListenSocket]=null),this.closeAllConnections();for(const i of this[e.kTempFiles])try{S.unlinkSync(i)}catch{}this[e.kTempFiles]=[],process.nextTick(()=>{this.emit("close"),s()})}ref(){}unref(){}async[e.kListen]({port:s,host:r}){if(this[e.kClosed])throw new u.ERR_SERVER_DESTROYED;if(s!=null&&Number.isNaN(Number(s)))throw new u.ERR_SOCKET_BAD_PORT(s);let i=s==null?0:Number(s);const o=await E.lookup(r);if(this[e.kAddress]={address:o.address,family:o.family===6?"IPv6":"IPv4",port:i},this[e.kAddress].address.startsWith("["))throw new u.ERR_ENOTFOUND(this[e.kAddress].address);const a=q.parse(this[e.kAddress].address).toNormalizedString(),l=this[e.kApp],f=(m,p)=>{const d=v.get(p.getMethod()),n=new w.HTTPSocket(this,m,d==="GET"||d==="HEAD");if(!d){n[e.kClientError]=!0,this.emit("clientError",new u.ERR_INVALID_METHOD,n);return}const A=new D.Request(p,n,d),_=new H.Response(n);A.headers.upgrade&&this.emit("upgrade",A,n),this[e.kHandler](A,_)};return l.any("/*",f),i!==0&&h[i]&&(this[e.kWs]=h[i][e.kWs]),this[e.kWs]&&this[e.kWs].addServer(this),new Promise((m,p)=>{const d=n=>{if(!n)return p(new u.ERR_ADDRINUSE(this[e.kAddress].address,i));this[e.kListenSocket]=n,i=this[e.kAddress].port=k.us_socket_local_port(n),h[i]||(h[i]=this),m()};this[e.kListenAll]=r==="localhost",this[e.kListenAll]?l.listen(i,d):l.listen(a,i,d)})}}exports.Server=F;

package/dist/server.d.ts

@@ -1,7 +1,7 @@
 import { default as uws } from 'uWebSockets.js';
+import { EventEmitter } from 'node:events';
 import { ServerOptions } from 'node:https';
 import { AddressInfo } from 'node:net';
-import { EventEmitter } from 'node:events';
 import { FastifyServerFactoryHandler, FastifyServerOptions } from 'fastify';
 import { kAddress, kApp, kClosed, kHandler, kHttps, kListen, kListenAll, kListening, kListenSocket, kTempFiles, kWs } from './symbols';
 import { WebSocketServer } from './websocket-server';

package/dist/server.js

@@ -1,10 +1,10 @@
 import E from "uWebSockets.js";
 import H from "node:dns/promises";
+import { EventEmitter as O } from "node:events";
 import N from "node:fs";
-import { METHODS as O } from "node:http";
-import v from "node:os";
-import F from "node:path";
-import { EventEmitter as I } from "node:events";
+import { METHODS as v } from "node:http";
+import F from "node:os";
+import I from "node:path";
 import x from "ipaddr.js";
 import { ERR_SERVER_DESTROYED as M, ERR_SOCKET_BAD_PORT as q, ERR_ENOTFOUND as B, ERR_INVALID_METHOD as $, ERR_ADDRINUSE as b } from "./errors.js";
 import { HTTPSocket as P } from "./http-socket.js";
@@ -21,7 +21,7 @@ function D(e, t, i) {
     }
     if (typeof e == "string") return e;
     if (Buffer.isBuffer(e)) {
-      const s = F.join(v.tmpdir(), `fastify-uws-${t}-${process.pid}-${Date.now()}.pem`);
+      const s = I.join(F.tmpdir(), `fastify-uws-${t}-${process.pid}-${Date.now()}.pem`);
       return N.writeFileSync(s, e, { mode: 384 }), i.push(s), s;
     }
   }
@@ -45,8 +45,8 @@ function U(e) {
   }
   return { app: E.App(), tempFiles: [] };
 }
-const z = new Map(O.map((e) => [e.toLowerCase(), e])), f = {};
-class nt extends I {
+const z = new Map(v.map((e) => [e.toLowerCase(), e])), f = {};
+class nt extends O {
   [y];
   timeout = 0;
   drainTimeout;

package/dist/websocket-server.js

@@ -124,7 +124,10 @@ class H extends l {
     i.ws("/*", {
       upgrade: (n, s, c) => {
         const a = s.getMethod().toUpperCase(), u = new y(e, n, a === "GET" || a === "HEAD"), f = new B(s, u, a), b = new S(u);
-        f[w] = c, e.emit("upgrade", f, u), r(f, b);
+        f[w] = c, e.emit("upgrade", f, u), r(
+          f,
+          b
+        );
       },
       open: (n) => {
         this.connections.add(n), n.handler(n), this.emit("open", n);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jmealo/fastify-uws",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "A performant HTTP and WebSocket server for Fastify with uWebSockets.",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",