insite-ws 1.0.352 → 1.0.354

package/.conveyer.js

@@ -0,0 +1,43 @@
+import path from "node:path";
+import { Conveyer, ESBuild } from "@nesvet/conveyer/stages";
+import { Packages } from "@nesvet/conveyer/Packages";
+
+
+const { NODE_ENV } = process.env;
+
+const distDir = "dist";
+
+const common = {
+	external: new Packages().external().asNames(),
+	format: "esm",
+	sourcemap: true,
+	define: {
+		"process.env.NODE_ENV": JSON.stringify(NODE_ENV)
+	}
+};
+
+
+new Conveyer([
+	
+	new ESBuild({
+		title: "Server",
+		entryPoints: [ "src/server/index.js" ],
+		outfile: path.resolve(distDir, "server.js"),
+		platform: "node",
+		target: "node20",
+		...common
+	}),
+	
+	new ESBuild({
+		title: "Client",
+		entryPoints: [ "src/client/index.js" ],
+		outfile: path.resolve(distDir, "client.js"),
+		platform: "neutral",
+		target: "es2020",
+		...common
+	})
+	
+], {
+	initialCleanup: distDir,
+	bumpVersions: { ignored: [ path.resolve(distDir, "**") ] }
+});

package/dist/client.js

@@ -0,0 +1,2 @@
+var W=Object.defineProperty;var H=(e,s,t)=>s in e?W(e,s,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[s]=t;var u=(e,s,t)=>(H(e,typeof s!="symbol"?s+"":s,t),t),g=(e,s,t)=>{if(!s.has(e))throw TypeError("Cannot "+t)};var i=(e,s,t)=>(g(e,s,"read from private field"),t?t.call(e):s.get(e)),o=(e,s,t)=>{if(s.has(e))throw TypeError("Cannot add the same private member more than once");s instanceof WeakSet?s.add(e):s.set(e,t)},h=(e,s,t,n)=>(g(e,s,"write to private field"),n?n.call(e,t):s.set(e,t),t);import{debounce as D,noop as E}from"@nesvet/n";import G from"eventemitter3";function L(...e){for(let s of this.listenerHandlers)if(s.call(this,!0,...e)!==void 0)return;this.directOn(...e)}function _(...e){for(let s of this.listenerHandlers)if(s.call(this,!0,...e)!==void 0)return;this.directOnce(...e)}function T(...e){for(let s of this.listenerHandlers)if(s.call(this,!1,...e)!==void 0)return;this.directOff(...e)}function N(e){e.directOn=e.on,e.directOnce=e.once,e.directOff=e.off,e.listenerHandlers=new Set,e.on=L,e.once=_,e.off=T}var I=2e3,P=0,a,l,r,p,k,b,f,w,d,m,C=class extends G{constructor(t,n={}){super();u(this,"webSocket",null);o(this,a,D(function(){this.isOpen&&this.webSocket.close()},65e3));o(this,l,void 0);o(this,r,void 0);u(this,"isChanged",!1);o(this,p,()=>{i(this,l).call(this),h(this,l,void 0),h(this,r,void 0),this.emit("open"),i(this,a).call(this)});o(this,k,({data:t})=>{if(i(this,a).call(this),t)try{let[n,...c]=JSON.parse(t);this.emit("message",n,...c),this.emit(`message:${n}`,...c)}catch(n){i(this,b).call(this,n)}else this.webSocket.send("")});o(this,b,t=>{t instanceof Event&&(t=void 0),i(this,r)&&(i(this,r).call(this,t),h(this,l,void 0),h(this,r,void 0)),this.emit("error",t)});o(this,f,void 0);o(this,w,t=>{i(this,a).clear(),this.emit("close",t),this.autoReconnect&&![1002,3500,4e3].includes(t.code)&&h(this,f,setTimeout(()=>this.open().catch(E),I))});u(this,"connect",this.open);u(this,"disconnect",this.close);o(this,d,[]);o(this,m,()=>{for(let t of i(this,d))this.webSocket.send(t);i(this,d).length=0});N(this),this.url=t;let{name:c=P++,protocols:v,immediately:x=!0,autoReconnect:y=!0,on:S}=n;if(this.name=c,this.protocols=v,this.autoReconnect=y,S)for(let O in S)S[O]&&this.on(O,S[O]);this.url&&x&&this.open().catch(E)}get isConnecting(){return this.webSocket?this.webSocket.readyState===this.webSocket.CONNECTING:null}get isOpen(){return this.webSocket?this.webSocket.readyState===this.webSocket.OPEN:null}get isClosing(){return this.webSocket?this.webSocket.readyState===this.webSocket.CLOSING:null}get isClosed(){return this.webSocket?this.webSocket.readyState===this.webSocket.CLOSED:null}open(t={}){return clearTimeout(i(this,f)),this.close(4e3,"reopen").then(()=>(t.url&&(this.url=t.url),t.protocols&&(this.protocols=t.protocols),new Promise((n,c)=>{h(this,l,n),h(this,r,c),this.webSocket&&(this.isChanged=this.webSocket._url!==this.url,this.isChanged&&this.emit("server-change")),this.webSocket=new WebSocket(this.url,this.protocols),this.webSocket._url=this.url,this.emit("connecting"),this.send=this.webSocket.send.bind(this.webSocket),this.webSocket.addEventListener("open",i(this,p)),this.webSocket.addEventListener("message",i(this,k)),this.webSocket.addEventListener("error",i(this,b)),this.webSocket.addEventListener("close",i(this,w))})))}close(t=3500,n="manual"){return clearTimeout(i(this,f)),new Promise(c=>{this.isConnecting||this.isOpen?(this.webSocket.addEventListener("close",c),this.webSocket.close(t,n)):c()})}sendMessage(...t){let n=JSON.stringify(t);this.isOpen?this.webSocket.send(n):(i(this,d).length||this.once("open",i(this,m)),i(this,d).push(n))}};a=new WeakMap,l=new WeakMap,r=new WeakMap,p=new WeakMap,k=new WeakMap,b=new WeakMap,f=new WeakMap,w=new WeakMap,d=new WeakMap,m=new WeakMap;export{C as WebSocket};
+//# sourceMappingURL=client.js.map

package/dist/client.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/client/WebSocket.js", "../src/extendEventEmitter.js"],
+  "sourcesContent": ["import { debounce, noop } from \"@nesvet/n\";\nimport EventEmitter from \"eventemitter3\";\nimport { heartbeatGap, heartbeatInterval } from \"../common\";\nimport { extendEventEmitter } from \"../extendEventEmitter\";\n\n\nconst reconnectTimeout = 2000;\n\nlet i = 0;\n\n\nclass InSiteWebSocket extends EventEmitter {\n\tconstructor(url, options = {}) {\n\t\tsuper();\n\t\t\n\t\textendEventEmitter(this);\n\t\t\n\t\tthis.url = url;\n\t\t\n\t\tconst {\n\t\t\tname = i++,\n\t\t\tprotocols,\n\t\t\timmediately = true,\n\t\t\tautoReconnect = true,\n\t\t\ton\n\t\t} = options;\n\t\t\n\t\tthis.name = name;\n\t\t\n\t\tthis.protocols = protocols;\n\t\t\n\t\tthis.autoReconnect = autoReconnect;\n\t\t\n\t\tif (on)\n\t\t\tfor (const eventName in on)\n\t\t\t\tif (on[eventName])\n\t\t\t\t\tthis.on(eventName, on[eventName]);\n\t\t\n\t\tif (this.url && immediately)\n\t\t\tthis.open().catch(noop);\n\t\t\n\t}\n\t\n\twebSocket = null;\n\t\n\t#defib = debounce(function () {\n\t\t\n\t\tif (this.isOpen) {\n\t\t\tif (process.env.NODE_ENV === \"development\")\n\t\t\t\tconsole.info(`WebSocket ${this.name} has no heartbeat - going offline`);\n\t\t\t\n\t\t\tthis.webSocket.close();\n\t\t}\n\t\t\n\t}, heartbeatInterval + heartbeatGap);\n\t\n\t#openResolve;\n\t#openReject;\n\t\n\tget isConnecting() {\n\t\treturn this.webSocket ? this.webSocket.readyState === this.webSocket.CONNECTING : null;\n\t}\n\t\n\tget isOpen() {\n\t\treturn this.webSocket ? this.webSocket.readyState === this.webSocket.OPEN : null;\n\t}\n\t\n\tget isClosing() {\n\t\treturn this.webSocket ? this.webSocket.readyState === this.webSocket.CLOSING : null;\n\t}\n\t\n\tget isClosed() {\n\t\treturn this.webSocket ? this.webSocket.readyState === this.webSocket.CLOSED : null;\n\t}\n\t\n\tisChanged = false;\n\t\n\t#handleWebSocketOpen = () => {\n\t\t\n\t\tthis.#openResolve();\n\t\tthis.#openResolve = undefined;\n\t\tthis.#openReject = undefined;\n\t\t\n\t\tthis.emit(\"open\");\n\t\t\n\t\tthis.#defib();\n\t\t\n\t};\n\t\n\t#handleWebSocketMessage = ({ data: message }) => {\n\t\t\n\t\tthis.#defib();\n\t\t\n\t\tif (message)\n\t\t\ttry {\n\t\t\t\tconst [ kind, ...rest ] = JSON.parse(message);\n\t\t\t\t\n\t\t\t\tthis.emit(\"message\", kind, ...rest);\n\t\t\t\tthis.emit(`message:${kind}`, ...rest);\n\t\t\t} catch (error) {\n\t\t\t\tthis.#handleWebSocketError(error);\n\t\t\t}\n\t\t else\n\t\t\tthis.webSocket.send(\"\");\n\t\t\n\t};\n\t\n\t#handleWebSocketError = error => {\n\t\tif (error instanceof Event)\n\t\t\terror = undefined;\n\t\t\n\t\tif (this.#openReject) {\n\t\t\tthis.#openReject(error);\n\t\t\tthis.#openResolve = undefined;\n\t\t\tthis.#openReject = undefined;\n\t\t}\n\t\t\n\t\tthis.emit(\"error\", error);\n\t\t\n\t};\n\t\n\t#reconnectTimeout;\n\t\n\t#handleWebSocketClose = event => {\n\t\t\n\t\tif (process.env.NODE_ENV === \"development\")\n\t\t\tconsole.info(`WebSocket ${this.name} is closed with code ${event.code} and reason \"${event.reason}\"`);\n\t\t\n\t\tthis.#defib.clear();\n\t\t\n\t\tthis.emit(\"close\", event);\n\t\t\n\t\tif (this.autoReconnect && ![ 1002, 3500, 4000 ].includes(event.code)) {\n\t\t\tif (process.env.NODE_ENV === \"development\")\n\t\t\t\tconsole.info(`WebSocket ${this.name} will try to reconnect in 2 sec\u2026`);\n\t\t\t\n\t\t\tthis.#reconnectTimeout = setTimeout(() => this.open().catch(noop), reconnectTimeout);\n\t\t}\n\t\t\n\t};\n\t\n\topen(options = {}) {\n\t\t\n\t\tclearTimeout(this.#reconnectTimeout);\n\t\t\n\t\treturn this.close(4000, \"reopen\").then(() => {\n\t\t\t\n\t\t\tif (options.url)\n\t\t\t\tthis.url = options.url;\n\t\t\t\n\t\t\tif (options.protocols)\n\t\t\t\tthis.protocols = options.protocols;\n\t\t\t\n\t\t\treturn new Promise((resolve, reject) => {\n\t\t\t\tthis.#openResolve = resolve;\n\t\t\t\tthis.#openReject = reject;\n\t\t\t\t\n\t\t\t\tif (this.webSocket) {\n\t\t\t\t\tthis.isChanged = this.webSocket._url !== this.url;\n\t\t\t\t\tif (this.isChanged)\n\t\t\t\t\t\tthis.emit(\"server-change\");\n\t\t\t\t}\n\t\t\t\t\n\t\t\t\tthis.webSocket = new WebSocket(this.url, this.protocols);\n\t\t\t\tthis.webSocket._url = this.url;\n\t\t\t\t\n\t\t\t\tthis.emit(\"connecting\");\n\t\t\t\t\n\t\t\t\tthis.send = this.webSocket.send.bind(this.webSocket);\n\t\t\t\t\n\t\t\t\tthis.webSocket.addEventListener(\"open\", this.#handleWebSocketOpen);\n\t\t\t\tthis.webSocket.addEventListener(\"message\", this.#handleWebSocketMessage);\n\t\t\t\tthis.webSocket.addEventListener(\"error\", this.#handleWebSocketError);\n\t\t\t\tthis.webSocket.addEventListener(\"close\", this.#handleWebSocketClose);\n\t\t\t\t\n\t\t\t});\n\t\t});\n\t}\n\t\n\tconnect = this.open;\n\t\n\tclose(code = 3500, reason = \"manual\") {\n\t\t\n\t\tclearTimeout(this.#reconnectTimeout);\n\t\t\n\t\treturn new Promise(resolve => {\n\t\t\tif (this.isConnecting || this.isOpen) {\n\t\t\t\tthis.webSocket.addEventListener(\"close\", resolve);\n\t\t\t\tthis.webSocket.close(code, reason);\n\t\t\t} else\n\t\t\t\tresolve();\n\t\t\t\n\t\t});\n\t}\n\t\n\tdisconnect = this.close;\n\t\n\t#queue = [];\n\t\n\t#releaseQueue = () => {\n\t\t\n\t\tfor (const message of this.#queue)\n\t\t\tthis.webSocket.send(message);\n\t\t\n\t\tthis.#queue.length = 0;\n\t\t\n\t};\n\t\n\tsendMessage(...args) {\n\t\tconst message = JSON.stringify(args);\n\t\t\n\t\tif (this.isOpen)\n\t\t\tthis.webSocket.send(message);\n\t\telse {\n\t\t\tif (!this.#queue.length)\n\t\t\t\tthis.once(\"open\", this.#releaseQueue);\n\t\t\t\n\t\t\tthis.#queue.push(message);\n\t\t}\n\t\t\n\t}\n\t\n}\n\nexport { InSiteWebSocket as WebSocket };\n", "/** @this EventEmitter */\nfunction extendedOn(...args) {\n\t\n\tfor (const listenerHandler of this.listenerHandlers)\n\t\tif (listenerHandler.call(this, true, ...args) !== undefined)\n\t\t\treturn;\n\t\n\tthis.directOn(...args);\n\t\n}\n\n/** @this EventEmitter */\nfunction extendedOnce(...args) {\n\t\n\tfor (const listenerHandler of this.listenerHandlers)\n\t\tif (listenerHandler.call(this, true, ...args) !== undefined)\n\t\t\treturn;\n\t\n\tthis.directOnce(...args);\n\t\n}\n\n/** @this EventEmitter */\nfunction extendedOff(...args) {\n\t\n\tfor (const listenerHandler of this.listenerHandlers)\n\t\tif (listenerHandler.call(this, false, ...args) !== undefined)\n\t\t\treturn;\n\t\n\tthis.directOff(...args);\n\t\n}\n\nexport function extendEventEmitter(eventEmitter) {\n\t\n\teventEmitter.directOn = eventEmitter.on;\n\teventEmitter.directOnce = eventEmitter.once;\n\teventEmitter.directOff = eventEmitter.off;\n\t\n\teventEmitter.listenerHandlers = new Set();\n\t\n\teventEmitter.on = extendedOn;\n\teventEmitter.once = extendedOnce;\n\teventEmitter.off = extendedOff;\n\t\n}\n"],
+  "mappings": "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",
+  "names": ["debounce", "noop", "EventEmitter", "extendedOn", "args", "listenerHandler", "extendedOnce", "extendedOff", "extendEventEmitter", "eventEmitter", "reconnectTimeout", "i", "_defib", "_openResolve", "_openReject", "_handleWebSocketOpen", "_handleWebSocketMessage", "_handleWebSocketError", "_reconnectTimeout", "_handleWebSocketClose", "_queue", "_releaseQueue", "InSiteWebSocket", "EventEmitter", "url", "options", "__publicField", "__privateAdd", "debounce", "__privateGet", "__privateSet", "message", "kind", "rest", "error", "event", "noop", "extendEventEmitter", "name", "protocols", "immediately", "autoReconnect", "on", "eventName", "resolve", "reject", "code", "reason", "args"]
+}

package/dist/server.js

@@ -0,0 +1,2 @@
+import y from"node:http";import x from"node:https";import{debounce as v}from"@nesvet/n";import{WebSocketServer as N}from"ws";function b(...t){for(let e of this.listenerHandlers)if(e.call(this,!0,...t)!==void 0)return;this.directOn(...t)}function u(...t){for(let e of this.listenerHandlers)if(e.call(this,!0,...t)!==void 0)return;this.directOnce(...t)}function g(...t){for(let e of this.listenerHandlers)if(e.call(this,!1,...t)!==void 0)return;this.directOff(...t)}function h(t){t.directOn=t.on,t.directOnce=t.once,t.directOff=t.off,t.listenerHandlers=new Set,t.on=b,t.once=u,t.off=g}var l=Symbol("heartbeatInterval"),i=Symbol("defib"),o=Symbol("pingTs");import C from"ws";var a=class extends C{isWebSocketServerClient=!0;get isConnecting(){return this.readyState===this.CONNECTING}get isOpen(){return this.readyState===this.OPEN}get isClosing(){return this.readyState===this.CLOSING}get isClosed(){return this.readyState===this.CLOSED}sendMessage(...e){this.send(JSON.stringify(e))}};var m=class t extends N{constructor(e={},r,n){let{upgrade:s,ssl:c,port:S,server:d=c?x.createServer({...c}):y.createServer(),...p}=e;if(super({...p,WebSocket:a,server:d}),h(this),"upgrade"in this)throw new Error('WebSocketServer now contains an "upgrade" property');r&&(typeof r=="function"?(n=r,r=void 0):Object.assign(this,r)),this.upgrade=s,this.on("connection",this.#e),d.listen(S,n)}isWebSocketServer=!0;#e(e,r){e.wss=this,e.userAgent=r.headers["user-agent"],e.remoteAddress=r.headers["x-real-ip"]??r.headers["x-forwarded-for"]??"127.0.0.1",e.on("message",t.handleClientMessage),e.on("error",t.handleClientError),e.on("close",t.handleClientClose),e[i]=v(()=>e.terminate(),65e3),e[i](),e.latency=0,e[l]=setInterval(()=>{e[o]=Date.now(),e.send("")},5e3),this.emit("client-connect",e,r)}static handleClientMessage(e){let r=e.toString();if(this[i](),r)try{let[n,...s]=JSON.parse(r);this.emit(`message:${n}`,...s),this.wss.emit("client-message",this,n,...s),this.wss.emit(`client-message:${n}`,this,...s)}catch(n){t.handleClientError.call(this,n)}else this[o]&&(this.latency=Date.now()-this[o],delete this[o])}static handleClientError(e){e instanceof Event&&(e=void 0),this.wss.emit("client-error",this,e)}static handleClientClose(...e){this[i].clear(),clearInterval(this[l]),this.wss.emit("client-close",this),this.wss.emit("client-closed",this)}};export{m as WebSocketServer};
+//# sourceMappingURL=server.js.map

package/dist/server.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/server/WebSocketServer.js", "../src/extendEventEmitter.js", "../src/server/symbols.js", "../src/server/WebSocketServerClient.js"],
+  "sourcesContent": ["import http from \"node:http\";\nimport https from \"node:https\";\nimport { debounce } from \"@nesvet/n\";\nimport { WebSocketServer } from \"ws\";\nimport { heartbeatGap, heartbeatInterval } from \"../common\";\nimport { extendEventEmitter } from \"../extendEventEmitter\";\nimport { defibSymbol, heartbeatIntervalSymbol, pingTsSymbol } from \"./symbols\";\nimport { WebSocketServerClient } from \"./WebSocketServerClient\";\n\n\nclass InSiteWebSocketServer extends WebSocketServer {\n\tconstructor(options = {}, props, handleListen) {\n\t\tconst {\n\t\t\tupgrade,\n\t\t\tssl,\n\t\t\tport,\n\t\t\tserver = ssl ? https.createServer({ ...ssl }) : http.createServer(),\n\t\t\t...wssOptions\n\t\t} = options;\n\t\t\n\t\tsuper({\n\t\t\t...wssOptions,\n\t\t\tWebSocket: WebSocketServerClient,\n\t\t\tserver\n\t\t});\n\t\t\n\t\textendEventEmitter(this);\n\t\t\n\t\tif (\"upgrade\" in this)\n\t\t\tthrow new Error(\"WebSocketServer now contains an \\\"upgrade\\\" property\");\n\t\t\n\t\tif (props)\n\t\t\tif (typeof props == \"function\") {\n\t\t\t\thandleListen = props;\n\t\t\t\tprops = undefined;\n\t\t\t} else\n\t\t\t\tObject.assign(this, props);\n\t\t\n\t\tthis.upgrade = upgrade;\n\t\t\n\t\tthis.on(\"connection\", this.#handleConnection);\n\t\t\n\t\tserver.listen(port, handleListen);\n\t\t\n\t}\n\t\n\tisWebSocketServer = true;\n\t\n\t#handleConnection(ws, request) {\n\t\tws.wss = this;\n\t\t\n\t\tws.userAgent = request.headers[\"user-agent\"];\n\t\tws.remoteAddress = request.headers[\"x-real-ip\"] ?? request.headers[\"x-forwarded-for\"] ?? \"127.0.0.1\";\n\t\t\n\t\tws.on(\"message\", InSiteWebSocketServer.handleClientMessage);\n\t\tws.on(\"error\", InSiteWebSocketServer.handleClientError);\n\t\tws.on(\"close\", InSiteWebSocketServer.handleClientClose);\n\t\t\n\t\tws[defibSymbol] = debounce(() => ws.terminate(), heartbeatInterval + heartbeatGap);\n\t\tws[defibSymbol]();\n\t\t\n\t\tws.latency = 0;\n\t\t\n\t\tws[heartbeatIntervalSymbol] = setInterval(() => {\n\t\t\t\n\t\t\tws[pingTsSymbol] = Date.now();\n\t\t\tws.send(\"\");\n\t\t\t\n\t\t}, heartbeatInterval);\n\t\t\n\t\tthis.emit(\"client-connect\", ws, request);\n\t\t\n\t}\n\t\n\tstatic handleClientMessage(data) {\n\t\tconst message = data.toString();\n\t\t\n\t\tthis[defibSymbol]();\n\t\t\n\t\tif (message)\n\t\t\ttry {\n\t\t\t\tconst [ kind, ...rest ] = JSON.parse(message);\n\t\t\t\t\n\t\t\t\tthis.emit(`message:${kind}`, ...rest);\n\t\t\t\tthis.wss.emit(\"client-message\", this, kind, ...rest);\n\t\t\t\tthis.wss.emit(`client-message:${kind}`, this, ...rest);\n\t\t\t} catch (error) {\n\t\t\t\tInSiteWebSocketServer.handleClientError.call(this, error);\n\t\t\t}\n\t\t else if (this[pingTsSymbol]) {\n\t\t\tthis.latency = Date.now() - this[pingTsSymbol];\n\t\t\tdelete this[pingTsSymbol];\n\t\t}\n\t\t\n\t}\n\t\n\tstatic handleClientError(error) {\n\t\tif (error instanceof Event)\n\t\t\terror = undefined;\n\t\t\n\t\tif (process.env.NODE_ENV === \"development\")\n\t\t\tconsole.error(\"WebSocketServer Client error\", error);\n\t\t\n\t\tthis.wss.emit(\"client-error\", this, error);\n\t\t\n\t}\n\t\n\tstatic handleClientClose(...args) {\n\t\t\n\t\tif (process.env.NODE_ENV === \"development\")\n\t\t\tconsole.info(\"WebSocketServer Client closed\", ...args);\n\t\t\n\t\tthis[defibSymbol].clear();\n\t\tclearInterval(this[heartbeatIntervalSymbol]);\n\t\t\n\t\tthis.wss.emit(\"client-close\", this);\n\t\tthis.wss.emit(\"client-closed\", this);\n\t\t\n\t}\n\t\n}\n\nexport { InSiteWebSocketServer as WebSocketServer };\n", "/** @this EventEmitter */\nfunction extendedOn(...args) {\n\t\n\tfor (const listenerHandler of this.listenerHandlers)\n\t\tif (listenerHandler.call(this, true, ...args) !== undefined)\n\t\t\treturn;\n\t\n\tthis.directOn(...args);\n\t\n}\n\n/** @this EventEmitter */\nfunction extendedOnce(...args) {\n\t\n\tfor (const listenerHandler of this.listenerHandlers)\n\t\tif (listenerHandler.call(this, true, ...args) !== undefined)\n\t\t\treturn;\n\t\n\tthis.directOnce(...args);\n\t\n}\n\n/** @this EventEmitter */\nfunction extendedOff(...args) {\n\t\n\tfor (const listenerHandler of this.listenerHandlers)\n\t\tif (listenerHandler.call(this, false, ...args) !== undefined)\n\t\t\treturn;\n\t\n\tthis.directOff(...args);\n\t\n}\n\nexport function extendEventEmitter(eventEmitter) {\n\t\n\teventEmitter.directOn = eventEmitter.on;\n\teventEmitter.directOnce = eventEmitter.once;\n\teventEmitter.directOff = eventEmitter.off;\n\t\n\teventEmitter.listenerHandlers = new Set();\n\t\n\teventEmitter.on = extendedOn;\n\teventEmitter.once = extendedOnce;\n\teventEmitter.off = extendedOff;\n\t\n}\n", "export const heartbeatIntervalSymbol = Symbol(\"heartbeatInterval\");\nexport const defibSymbol = Symbol(\"defib\");\nexport const pingTsSymbol = Symbol(\"pingTs\");\n", "import WebSocket from \"ws\";\n\n\nclass InSiteWebSocketServerClient extends WebSocket {\n\t\n\tisWebSocketServerClient = true;\n\t\n\tget isConnecting() {\n\t\treturn this.readyState === this.CONNECTING;\n\t}\n\t\n\tget isOpen() {\n\t\treturn this.readyState === this.OPEN;\n\t}\n\t\n\tget isClosing() {\n\t\treturn this.readyState === this.CLOSING;\n\t}\n\t\n\tget isClosed() {\n\t\treturn this.readyState === this.CLOSED;\n\t}\n\t\n\tsendMessage(...args) {\n\t\tthis.send(JSON.stringify(args));\n\t\t\n\t}\n\t\n}\n\nexport { InSiteWebSocketServerClient as WebSocketServerClient };\n"],
+  "mappings": "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",
+  "names": ["http", "https", "debounce", "WebSocketServer", "extendedOn", "args", "listenerHandler", "extendedOnce", "extendedOff", "extendEventEmitter", "eventEmitter", "heartbeatIntervalSymbol", "defibSymbol", "pingTsSymbol", "WebSocket", "InSiteWebSocketServerClient", "args", "InSiteWebSocketServer", "_InSiteWebSocketServer", "WebSocketServer", "options", "props", "handleListen", "upgrade", "ssl", "port", "server", "https", "http", "wssOptions", "InSiteWebSocketServerClient", "extendEventEmitter", "#handleConnection", "ws", "request", "defibSymbol", "debounce", "heartbeatIntervalSymbol", "pingTsSymbol", "data", "message", "kind", "rest", "error", "args"]
+}

package/package.json

@@ -1,15 +1,16 @@
 {
 	"name": "insite-ws",
-	"version": "1.0.352",
+	"version": "1.0.354",
 	"description": "inSite WebSockets",
 	"type": "module",
 	"exports": {
-		"./server": "./lib/server/index.js",
-		"./client": "./lib/client/index.js"
+		"./server": "./dist/server.js",
+		"./client": "./dist/client.js"
 	},
 	"packageManager": "yarn@1.22.22",
 	"scripts": {
-		"test": "echo \"Error: no test specified\" && exit 1"
+		"test": "echo \"Error: no test specified\" && exit 1",
+		"build": "node .conveyer"
 	},
 	"repository": {
 		"type": "git",
@@ -28,6 +29,7 @@
 		"ws": "^8"
 	},
 	"devDependencies": {
+		"@nesvet/conveyer": "^1",
 		"@nesvet/eslint-config": "^1"
 	}
 }

package/{lib → src}/client/WebSocket.js

@@ -9,7 +9,7 @@ const reconnectTimeout = 2000;
 let i = 0;
 
 
-export class InSiteWebSocket extends EventEmitter {
+class InSiteWebSocket extends EventEmitter {
 	constructor(url, options = {}) {
 		super();
 		
@@ -221,3 +221,5 @@ export class InSiteWebSocket extends EventEmitter {
 	}
 	
 }
+
+export { InSiteWebSocket as WebSocket };

package/{lib → src}/server/WebSocketServer.js

@@ -5,10 +5,10 @@ import { WebSocketServer } from "ws";
 import { heartbeatGap, heartbeatInterval } from "../common";
 import { extendEventEmitter } from "../extendEventEmitter";
 import { defibSymbol, heartbeatIntervalSymbol, pingTsSymbol } from "./symbols";
-import { InSiteWebSocketServerClient } from "./WebSocketServerClient";
+import { WebSocketServerClient } from "./WebSocketServerClient";
 
 
-export class InSiteWebSocketServer extends WebSocketServer {
+class InSiteWebSocketServer extends WebSocketServer {
 	constructor(options = {}, props, handleListen) {
 		const {
 			upgrade,
@@ -20,7 +20,7 @@ export class InSiteWebSocketServer extends WebSocketServer {
 		
 		super({
 			...wssOptions,
-			WebSocket: InSiteWebSocketServerClient,
+			WebSocket: WebSocketServerClient,
 			server
 		});
 		
@@ -50,7 +50,7 @@ export class InSiteWebSocketServer extends WebSocketServer {
 		ws.wss = this;
 		
 		ws.userAgent = request.headers["user-agent"];
-		ws.remoteAddress = request.headers["x-real-ip"] ?? request.headers["x-forwarded-for"];
+		ws.remoteAddress = request.headers["x-real-ip"] ?? request.headers["x-forwarded-for"] ?? "127.0.0.1";
 		
 		ws.on("message", InSiteWebSocketServer.handleClientMessage);
 		ws.on("error", InSiteWebSocketServer.handleClientError);
@@ -119,3 +119,5 @@ export class InSiteWebSocketServer extends WebSocketServer {
 	}
 	
 }
+
+export { InSiteWebSocketServer as WebSocketServer };

package/{lib → src}/server/WebSocketServerClient.js

@@ -1,7 +1,7 @@
 import WebSocket from "ws";
 
 
-export class InSiteWebSocketServerClient extends WebSocket {
+class InSiteWebSocketServerClient extends WebSocket {
 	
 	isWebSocketServerClient = true;
 	
@@ -27,3 +27,5 @@ export class InSiteWebSocketServerClient extends WebSocket {
 	}
 	
 }
+
+export { InSiteWebSocketServerClient as WebSocketServerClient };