pipenet 1.3.0 → 1.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +76 -4
- package/dist/Tunnel.d.ts.map +1 -1
- package/dist/Tunnel.js +12 -1
- package/dist/Tunnel.js.map +1 -1
- package/dist/TunnelCluster.js +2 -2
- package/dist/TunnelCluster.js.map +1 -1
- package/dist/pipenet.spec.js +17 -0
- package/dist/pipenet.spec.js.map +1 -1
- package/dist/server/ClientManager.d.ts +11 -1
- package/dist/server/ClientManager.d.ts.map +1 -1
- package/dist/server/ClientManager.js +18 -1
- package/dist/server/ClientManager.js.map +1 -1
- package/dist/server/ClientManager.spec.js +8 -8
- package/dist/server/ClientManager.spec.js.map +1 -1
- package/dist/server/index.d.ts +2 -2
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/index.js.map +1 -1
- package/dist/server/server.d.ts +27 -1
- package/dist/server/server.d.ts.map +1 -1
- package/dist/server/server.js +29 -7
- package/dist/server/server.js.map +1 -1
- package/dist/server/server.spec.js +104 -1
- package/dist/server/server.spec.js.map +1 -1
- package/package.json +2 -2
- package/src/Tunnel.ts +16 -2
- package/src/TunnelCluster.ts +2 -2
- package/src/pipenet.spec.ts +21 -0
- package/src/server/ClientManager.spec.ts +8 -8
- package/src/server/ClientManager.ts +33 -1
- package/src/server/index.ts +2 -2
- package/src/server/server.spec.ts +133 -1
- package/src/server/server.ts +64 -8
package/README.md
CHANGED
|
@@ -1,13 +1,22 @@
|
|
|
1
1
|
# pipenet
|
|
2
2
|
|
|
3
|
-
Expose your local server to the public internet instantly
|
|
3
|
+
Expose your local server to the public internet instantly.
|
|
4
|
+
|
|
5
|
+
## Supported Protocols
|
|
6
|
+
|
|
7
|
+
pipenet tunnels any HTTP-based traffic to your local server:
|
|
8
|
+
|
|
9
|
+
| Protocol | Supported | Notes |
|
|
10
|
+
| -------- | --------- | ----- |
|
|
11
|
+
| HTTP/HTTPS | ✅ | Standard request/response |
|
|
12
|
+
| WebSocket | ✅ | Full duplex communication via HTTP upgrade |
|
|
13
|
+
| SSE (Server-Sent Events) | ✅ | Long-lived HTTP connections |
|
|
14
|
+
| HTTP Streaming | ✅ | Chunked transfer encoding |
|
|
4
15
|
|
|
5
16
|
## Installation
|
|
6
17
|
|
|
7
18
|
```bash
|
|
8
19
|
npm install pipenet
|
|
9
|
-
# or
|
|
10
|
-
pnpm add pipenet
|
|
11
20
|
```
|
|
12
21
|
|
|
13
22
|
## CLI Usage
|
|
@@ -104,11 +113,22 @@ npx pipenet server --port 3000 --tunnel-port 3001 --domain tunnel.example.com
|
|
|
104
113
|
import { createServer } from 'pipenet/server';
|
|
105
114
|
|
|
106
115
|
const server = createServer({
|
|
107
|
-
domains: ['tunnel.example.com'],
|
|
116
|
+
domains: ['tunnel.example.com'], // Optional: custom domain(s)
|
|
108
117
|
secure: false, // Optional: require HTTPS
|
|
109
118
|
landing: 'https://pipenet.dev', // Optional: landing page URL
|
|
110
119
|
maxTcpSockets: 10, // Optional: max sockets per client
|
|
111
120
|
tunnelPort: 3001, // Optional: shared tunnel port for cloud deployments
|
|
121
|
+
|
|
122
|
+
// Lifecycle hooks for tracking tunnels and requests
|
|
123
|
+
onTunnelCreated: (tunnel) => {
|
|
124
|
+
console.log(`Tunnel created: ${tunnel.id} at ${tunnel.url}`);
|
|
125
|
+
},
|
|
126
|
+
onTunnelClosed: (tunnel) => {
|
|
127
|
+
console.log(`Tunnel closed: ${tunnel.id}`);
|
|
128
|
+
},
|
|
129
|
+
onRequest: (request) => {
|
|
130
|
+
console.log(`Request: ${request.method} ${request.path} via ${request.tunnelId}`);
|
|
131
|
+
},
|
|
112
132
|
});
|
|
113
133
|
|
|
114
134
|
// Start tunnel server if using shared tunnel port
|
|
@@ -129,6 +149,18 @@ server.listen(3000, () => {
|
|
|
129
149
|
- `maxTcpSockets` (number) Maximum number of TCP sockets per client (default: 10)
|
|
130
150
|
- `tunnelPort` (number) Shared tunnel port for cloud deployments (enables single-port mode)
|
|
131
151
|
|
|
152
|
+
### Server Hooks
|
|
153
|
+
|
|
154
|
+
The server supports lifecycle hooks for tracking tunnels and requests:
|
|
155
|
+
|
|
156
|
+
- `onTunnelCreated(tunnel)` - Called when a new tunnel is created. Receives `{ id, url, domain }`.
|
|
157
|
+
- `onTunnelClosed(tunnel)` - Called when a tunnel is closed. Receives `{ id, url, domain }`.
|
|
158
|
+
- `onRequest(request)` - Called when a request is proxied through a tunnel. Receives `{ method, path, tunnelId, headers, remoteAddress }`.
|
|
159
|
+
|
|
160
|
+
The `domain` field identifies which configured domain was used when the tunnel was created, which is useful when running a server with multiple domains.
|
|
161
|
+
|
|
162
|
+
The `onRequest` hook provides access to request headers and the client's remote IP address, useful for logging, rate limiting, or authentication.
|
|
163
|
+
|
|
132
164
|
### Server API Endpoints
|
|
133
165
|
|
|
134
166
|
- `GET /api/status` - Server status and tunnel count
|
|
@@ -172,6 +204,46 @@ pipenet was developed by [glama.ai](https://glama.ai) to enable local [Model Con
|
|
|
172
204
|
|
|
173
205
|
This capability is now integrated into [mcp-proxy](https://github.com/punkpeye/mcp-proxy).
|
|
174
206
|
|
|
207
|
+
## pipenet vs localtunnel
|
|
208
|
+
|
|
209
|
+
pipenet is a modernized fork of [localtunnel](https://github.com/localtunnel/localtunnel) with several improvements:
|
|
210
|
+
|
|
211
|
+
| Feature | pipenet | localtunnel |
|
|
212
|
+
| ------- | ------- | ----------- |
|
|
213
|
+
| Cloud deployment support | ✅ Single-port mode via `--tunnel-port` | ❌ Requires random ports |
|
|
214
|
+
| Multiple domains | ✅ `--domain` can be specified multiple times | ❌ Single domain only |
|
|
215
|
+
| TypeScript | ✅ Written in TypeScript with full type definitions | ❌ JavaScript only |
|
|
216
|
+
| ESM support | ✅ Native ES modules | ❌ CommonJS only |
|
|
217
|
+
| Active maintenance | ✅ Actively maintained | ⚠️ Limited maintenance |
|
|
218
|
+
| WebSocket support | ✅ Full WebSocket proxying | ✅ Full WebSocket proxying |
|
|
219
|
+
|
|
220
|
+
### Key Differences
|
|
221
|
+
|
|
222
|
+
**Cloud Deployment Support**: localtunnel creates a random TCP port for each tunnel client, which doesn't work in containerized environments like Docker, fly.io, or Kubernetes where only specific ports are exposed. pipenet solves this with the `--tunnel-port` option, enabling all clients to connect through a single shared port.
|
|
223
|
+
|
|
224
|
+
**Modern JavaScript**: pipenet uses ES modules and is written in TypeScript, providing better IDE support, type safety, and compatibility with modern JavaScript tooling.
|
|
225
|
+
|
|
226
|
+
## pipenet vs zrok
|
|
227
|
+
|
|
228
|
+
[zrok](https://zrok.io/) is a powerful tunneling solution with SDK support for Go, Python, and Node.js. However, zrok SDKs require the environment to be initialized via the CLI first - you can't just `npm install` and start tunneling.
|
|
229
|
+
|
|
230
|
+
pipenet is designed for zero-setup embedding:
|
|
231
|
+
|
|
232
|
+
```js
|
|
233
|
+
import { pipenet } from 'pipenet';
|
|
234
|
+
|
|
235
|
+
const tunnel = await pipenet({ port: 3000 });
|
|
236
|
+
console.log(tunnel.url);
|
|
237
|
+
```
|
|
238
|
+
|
|
239
|
+
No CLI initialization, no external processes, no daemon - just a pure JavaScript library that works out of the box. This makes pipenet ideal for:
|
|
240
|
+
|
|
241
|
+
- **CLI tools** that need tunneling as a feature (e.g., `mcp-proxy --tunnel`)
|
|
242
|
+
- **Test suites** that need ephemeral public URLs
|
|
243
|
+
- **Scripts** that should "just work" without setup steps
|
|
244
|
+
|
|
245
|
+
If you need advanced features like TCP/UDP tunneling, identity management, or a managed SaaS, zrok is an excellent choice.
|
|
246
|
+
|
|
175
247
|
## Acknowledgments
|
|
176
248
|
|
|
177
249
|
pipenet is based on [localtunnel](https://github.com/localtunnel/localtunnel).
|
package/dist/Tunnel.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tunnel.d.ts","sourceRoot":"","sources":["../src/Tunnel.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"Tunnel.d.ts","sourceRoot":"","sources":["../src/Tunnel.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAE,aAAa,EAAwB,MAAM,oBAAoB,CAAC;AAIzE,MAAM,WAAW,aAAa;IAC5B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AA+BD,qBAAa,MAAO,SAAQ,YAAY;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,GAAG,CAAC,EAAE,MAAM,CAAC;gBAER,IAAI,GAAE,aAAkB;IASpC,KAAK,IAAI,IAAI;IAKb,IAAI,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAmBrC,OAAO,CAAC,UAAU;IAkElB,OAAO,CAAC,QAAQ;IAwBhB,OAAO,CAAC,KAAK;CAmCd"}
|
package/dist/Tunnel.js
CHANGED
|
@@ -48,6 +48,7 @@ export class Tunnel extends EventEmitter {
|
|
|
48
48
|
this.emit('error', err);
|
|
49
49
|
});
|
|
50
50
|
let tunnelCount = 0;
|
|
51
|
+
const tunnelHandlers = new Map();
|
|
51
52
|
this.tunnelCluster.on('open', (tunnel) => {
|
|
52
53
|
tunnelCount++;
|
|
53
54
|
log('tunnel open [total: %d]', tunnelCount);
|
|
@@ -58,14 +59,24 @@ export class Tunnel extends EventEmitter {
|
|
|
58
59
|
closeHandler();
|
|
59
60
|
return;
|
|
60
61
|
}
|
|
62
|
+
tunnelHandlers.set(tunnel, closeHandler);
|
|
61
63
|
this.once('close', closeHandler);
|
|
62
64
|
tunnel.once('close', () => {
|
|
65
|
+
tunnelHandlers.delete(tunnel);
|
|
63
66
|
this.removeListener('close', closeHandler);
|
|
64
67
|
});
|
|
65
68
|
});
|
|
66
|
-
this.tunnelCluster.on('dead', () => {
|
|
69
|
+
this.tunnelCluster.on('dead', (deadSocket) => {
|
|
67
70
|
tunnelCount--;
|
|
68
71
|
log('tunnel dead [total: %d]', tunnelCount);
|
|
72
|
+
// Eagerly remove the close handler for the dead tunnel.
|
|
73
|
+
// Without this, the handler lingers until the socket's async
|
|
74
|
+
// 'close' event fires, causing listener accumulation.
|
|
75
|
+
if (deadSocket && tunnelHandlers.has(deadSocket)) {
|
|
76
|
+
const handler = tunnelHandlers.get(deadSocket);
|
|
77
|
+
tunnelHandlers.delete(deadSocket);
|
|
78
|
+
this.removeListener('close', handler);
|
|
79
|
+
}
|
|
69
80
|
if (this.closed) {
|
|
70
81
|
return;
|
|
71
82
|
}
|
package/dist/Tunnel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tunnel.js","sourceRoot":"","sources":["../src/Tunnel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"Tunnel.js","sourceRoot":"","sources":["../src/Tunnel.ts"],"names":[],"mappings":"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"}
|
package/dist/TunnelCluster.js
CHANGED
|
@@ -35,7 +35,7 @@ export class TunnelCluster extends EventEmitter {
|
|
|
35
35
|
const connLocal = () => {
|
|
36
36
|
if (remote.destroyed) {
|
|
37
37
|
log('remote destroyed');
|
|
38
|
-
this.emit('dead');
|
|
38
|
+
this.emit('dead', remote);
|
|
39
39
|
return;
|
|
40
40
|
}
|
|
41
41
|
log('connecting locally to %s://%s:%d', localProtocol, localHost, localPort);
|
|
@@ -55,7 +55,7 @@ export class TunnelCluster extends EventEmitter {
|
|
|
55
55
|
: net.connect({ host: localHost, port: localPort });
|
|
56
56
|
const remoteClose = () => {
|
|
57
57
|
log('remote close');
|
|
58
|
-
this.emit('dead');
|
|
58
|
+
this.emit('dead', remote);
|
|
59
59
|
local.end();
|
|
60
60
|
};
|
|
61
61
|
remote.once('close', remoteClose);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TunnelCluster.js","sourceRoot":"","sources":["../src/TunnelCluster.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,MAAM,GAAG,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC;AAyBpC,MAAM,OAAO,aAAc,SAAQ,YAAY;IACrC,IAAI,CAAuB;IAEnC,YAAY,OAA6B,EAAE;QACzC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,IAAI;QACF,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC;QAEtB,MAAM,cAAc,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,UAAU,CAAC;QACtD,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;QAClC,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,WAAW,CAAC;QAC/C,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAChC,MAAM,aAAa,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QACxD,MAAM,gBAAgB,GAAG,GAAG,CAAC,gBAAgB,CAAC;QAE9C,GAAG,CACD,yCAAyC,EACzC,aAAa,EACb,SAAS,EACT,SAAS,EACT,cAAc,EACd,UAAU,CACX,CAAC;QAEF,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC;YACzB,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,UAAW;SAClB,CAAC,CAAC;QAEH,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAE1B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAA0B,EAAE,EAAE;YAChD,GAAG,CAAC,6BAA6B,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YAEhD,IAAI,GAAG,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBAChC,IAAI,CAAC,IAAI,CACP,OAAO,EACP,IAAI,KAAK,CACP,uBAAuB,cAAc,IAAI,UAAU,iCAAiC,CACrF,CACF,CAAC;YACJ,CAAC;YAED,MAAM,CAAC,GAAG,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,GAAS,EAAE;YAC3B,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;gBACrB,GAAG,CAAC,kBAAkB,CAAC,CAAC;gBACxB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"TunnelCluster.js","sourceRoot":"","sources":["../src/TunnelCluster.ts"],"names":[],"mappings":"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"}
|
package/dist/pipenet.spec.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import axios from 'axios';
|
|
2
|
+
import { EventEmitter } from 'events';
|
|
2
3
|
import http from 'http';
|
|
3
4
|
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
|
|
4
5
|
import { pipenet } from './pipenet.js';
|
|
@@ -78,5 +79,21 @@ describe('pipenet', () => {
|
|
|
78
79
|
tunnel.close();
|
|
79
80
|
});
|
|
80
81
|
});
|
|
82
|
+
it('does not leak close listeners across tunnel reconnections', async () => {
|
|
83
|
+
const tunnel = await pipenet(fakePort, { host });
|
|
84
|
+
const cluster = tunnel.tunnelCluster;
|
|
85
|
+
const before = tunnel.listenerCount('close');
|
|
86
|
+
// Force rapid reconnection cycles by emitting open→dead on the cluster.
|
|
87
|
+
for (let i = 0; i < 20; i++) {
|
|
88
|
+
const fakeSocket = new EventEmitter();
|
|
89
|
+
fakeSocket.destroy = () => { };
|
|
90
|
+
cluster.emit('open', fakeSocket);
|
|
91
|
+
cluster.emit('dead', fakeSocket);
|
|
92
|
+
}
|
|
93
|
+
// Without the fix, 20 close handlers would accumulate.
|
|
94
|
+
// With eager cleanup, count should not grow.
|
|
95
|
+
expect(tunnel.listenerCount('close')).toBe(before);
|
|
96
|
+
tunnel.close();
|
|
97
|
+
});
|
|
81
98
|
});
|
|
82
99
|
//# sourceMappingURL=pipenet.spec.js.map
|
package/dist/pipenet.spec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipenet.spec.js","sourceRoot":"","sources":["../src/pipenet.spec.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,IAAI,IAAY,CAAC;IACjB,IAAI,QAAgB,CAAC;IACrB,IAAI,YAAyB,CAAC;IAE9B,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;IAExC,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,oDAAoD;QACpD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBACrC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC5B,GAAG,CAAC,GAAG,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YACH,WAAW,CAAC,MAAM,CAAC,GAAG,EAAE;gBACtB,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,EAAiB,CAAC;gBAClD,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;gBACrB,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,0CAA0C;QAC1C,YAAY,GAAG,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QACxD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE;gBACvB,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,EAAiB,CAAC;gBACnD,IAAI,GAAG,oBAAoB,IAAI,CAAC,IAAI,EAAE,CAAC;gBACvC,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,GAAG,EAAE;QACZ,WAAW,CAAC,KAAK,EAAE,CAAC;QACpB,YAAY,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEL,EAAE,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;QAC7C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAC;QAErE,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAI,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC;QACnD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAExC,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACvC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAC5D,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,aAAa,SAAS,oBAAoB,CAAC,CAAC,CAAC;QACnF,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;YACpD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;YACzE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAC;YAErE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC;YACnD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACxC,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;YACpD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;YACzE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAC;YAErE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC;YACnD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACxC,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACnD,MAAM,aAAa,GAAG;gBACpB,YAAY,EAAE,iBAAiB;gBAC/B,iBAAiB,EAAE,YAAY;aAChC,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YACzE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAC;YACrE,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AAEH,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"pipenet.spec.js","sourceRoot":"","sources":["../src/pipenet.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,24 +2,34 @@ import type { TunnelServer } from './TunnelServer.js';
|
|
|
2
2
|
import { Client } from './Client.js';
|
|
3
3
|
export interface ClientManagerOptions {
|
|
4
4
|
maxTcpSockets?: number;
|
|
5
|
+
onTunnelClosed?: (tunnel: TunnelInfo) => void;
|
|
6
|
+
onTunnelCreated?: (tunnel: TunnelInfo) => void;
|
|
5
7
|
tunnelServer?: TunnelServer;
|
|
6
8
|
}
|
|
7
9
|
export interface NewClientInfo {
|
|
10
|
+
domain: string;
|
|
8
11
|
id: string;
|
|
9
12
|
maxConnCount?: number;
|
|
10
13
|
port: number;
|
|
14
|
+
url: string;
|
|
15
|
+
}
|
|
16
|
+
export interface TunnelInfo {
|
|
17
|
+
domain: string;
|
|
18
|
+
id: string;
|
|
19
|
+
url: string;
|
|
11
20
|
}
|
|
12
21
|
export declare class ClientManager {
|
|
13
22
|
stats: {
|
|
14
23
|
tunnels: number;
|
|
15
24
|
};
|
|
16
25
|
private clients;
|
|
26
|
+
private clientTunnelInfo;
|
|
17
27
|
private log;
|
|
18
28
|
private opt;
|
|
19
29
|
constructor(opt?: ClientManagerOptions);
|
|
20
30
|
getClient(id: string): Client | undefined;
|
|
21
31
|
hasClient(id: string): boolean;
|
|
22
|
-
newClient(requestedId
|
|
32
|
+
newClient(requestedId: string | undefined, url: string, domain: string): Promise<NewClientInfo>;
|
|
23
33
|
removeClient(id: string): void;
|
|
24
34
|
}
|
|
25
35
|
//# sourceMappingURL=ClientManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientManager.d.ts","sourceRoot":"","sources":["../../src/server/ClientManager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"ClientManager.d.ts","sourceRoot":"","sources":["../../src/server/ClientManager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IAC9C,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IAC/C,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACb;AAED,qBAAa,aAAa;IACjB,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAClC,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,gBAAgB,CAA+C;IACvE,OAAO,CAAC,GAAG,CAAiB;IAC5B,OAAO,CAAC,GAAG,CAAuB;gBAEtB,GAAG,GAAE,oBAAyB;IAQ1C,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIzC,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAIxB,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IA8CrG,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;CAmB/B"}
|
|
@@ -5,11 +5,13 @@ import { TunnelAgent } from './TunnelAgent.js';
|
|
|
5
5
|
export class ClientManager {
|
|
6
6
|
stats;
|
|
7
7
|
clients;
|
|
8
|
+
clientTunnelInfo;
|
|
8
9
|
log;
|
|
9
10
|
opt;
|
|
10
11
|
constructor(opt = {}) {
|
|
11
12
|
this.opt = opt;
|
|
12
13
|
this.clients = new Map();
|
|
14
|
+
this.clientTunnelInfo = new Map();
|
|
13
15
|
this.stats = { tunnels: 0 };
|
|
14
16
|
this.log = debug('lt:ClientManager');
|
|
15
17
|
}
|
|
@@ -19,7 +21,7 @@ export class ClientManager {
|
|
|
19
21
|
hasClient(id) {
|
|
20
22
|
return this.clients.has(id);
|
|
21
23
|
}
|
|
22
|
-
async newClient(requestedId) {
|
|
24
|
+
async newClient(requestedId, url, domain) {
|
|
23
25
|
let id;
|
|
24
26
|
if (requestedId && !this.clients.has(requestedId)) {
|
|
25
27
|
id = requestedId;
|
|
@@ -35,16 +37,23 @@ export class ClientManager {
|
|
|
35
37
|
});
|
|
36
38
|
const client = new Client({ agent, id });
|
|
37
39
|
this.clients.set(id, client);
|
|
40
|
+
this.clientTunnelInfo.set(id, { domain, url });
|
|
38
41
|
client.once('close', () => {
|
|
39
42
|
this.removeClient(id);
|
|
40
43
|
});
|
|
41
44
|
try {
|
|
42
45
|
const info = await agent.listen();
|
|
43
46
|
++this.stats.tunnels;
|
|
47
|
+
// Call the onTunnelCreated hook
|
|
48
|
+
if (this.opt.onTunnelCreated) {
|
|
49
|
+
this.opt.onTunnelCreated({ domain, id, url });
|
|
50
|
+
}
|
|
44
51
|
return {
|
|
52
|
+
domain,
|
|
45
53
|
id: id,
|
|
46
54
|
maxConnCount: maxSockets,
|
|
47
55
|
port: info.port,
|
|
56
|
+
url,
|
|
48
57
|
};
|
|
49
58
|
}
|
|
50
59
|
catch (err) {
|
|
@@ -57,9 +66,17 @@ export class ClientManager {
|
|
|
57
66
|
const client = this.clients.get(id);
|
|
58
67
|
if (!client)
|
|
59
68
|
return;
|
|
69
|
+
const tunnelInfo = this.clientTunnelInfo.get(id);
|
|
70
|
+
const domain = tunnelInfo?.domain || '';
|
|
71
|
+
const url = tunnelInfo?.url || '';
|
|
60
72
|
--this.stats.tunnels;
|
|
61
73
|
this.clients.delete(id);
|
|
74
|
+
this.clientTunnelInfo.delete(id);
|
|
62
75
|
client.close();
|
|
76
|
+
// Call the onTunnelClosed hook
|
|
77
|
+
if (this.opt.onTunnelClosed) {
|
|
78
|
+
this.opt.onTunnelClosed({ domain, id, url });
|
|
79
|
+
}
|
|
63
80
|
}
|
|
64
81
|
}
|
|
65
82
|
//# sourceMappingURL=ClientManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientManager.js","sourceRoot":"","sources":["../../src/server/ClientManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAIzC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"ClientManager.js","sourceRoot":"","sources":["../../src/server/ClientManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,20 +8,20 @@ describe('ClientManager', () => {
|
|
|
8
8
|
});
|
|
9
9
|
it('should create a new client with random id', async () => {
|
|
10
10
|
const manager = new ClientManager();
|
|
11
|
-
const client = await manager.newClient();
|
|
11
|
+
const client = await manager.newClient(undefined, 'http://test.example.com', 'example.com');
|
|
12
12
|
expect(manager.hasClient(client.id)).toBe(true);
|
|
13
13
|
manager.removeClient(client.id);
|
|
14
14
|
});
|
|
15
15
|
it('should create a new client with id', async () => {
|
|
16
16
|
const manager = new ClientManager();
|
|
17
|
-
await manager.newClient('foobar');
|
|
17
|
+
await manager.newClient('foobar', 'http://foobar.example.com', 'example.com');
|
|
18
18
|
expect(manager.hasClient('foobar')).toBe(true);
|
|
19
19
|
manager.removeClient('foobar');
|
|
20
20
|
});
|
|
21
21
|
it('should create a new client with random id if previous exists', async () => {
|
|
22
22
|
const manager = new ClientManager();
|
|
23
|
-
const clientA = await manager.newClient('foobar');
|
|
24
|
-
const clientB = await manager.newClient('foobar');
|
|
23
|
+
const clientA = await manager.newClient('foobar', 'http://foobar.example.com', 'example.com');
|
|
24
|
+
const clientB = await manager.newClient('foobar', 'http://foobar.example.com', 'example.com');
|
|
25
25
|
expect(clientA.id).toBe('foobar');
|
|
26
26
|
expect(manager.hasClient(clientB.id)).toBe(true);
|
|
27
27
|
expect(clientB.id).not.toBe(clientA.id);
|
|
@@ -30,7 +30,7 @@ describe('ClientManager', () => {
|
|
|
30
30
|
});
|
|
31
31
|
it('should remove client once it goes offline', async () => {
|
|
32
32
|
const manager = new ClientManager();
|
|
33
|
-
const client = await manager.newClient('foobar');
|
|
33
|
+
const client = await manager.newClient('foobar', 'http://foobar.example.com', 'example.com');
|
|
34
34
|
const socket = await new Promise((resolve) => {
|
|
35
35
|
const netClient = net.createConnection({ port: client.port }, () => {
|
|
36
36
|
resolve(netClient);
|
|
@@ -47,8 +47,8 @@ describe('ClientManager', () => {
|
|
|
47
47
|
}, 5000);
|
|
48
48
|
it('should remove correct client once it goes offline', async () => {
|
|
49
49
|
const manager = new ClientManager();
|
|
50
|
-
const clientFoo = await manager.newClient('foo');
|
|
51
|
-
await manager.newClient('bar');
|
|
50
|
+
const clientFoo = await manager.newClient('foo', 'http://foo.example.com', 'example.com');
|
|
51
|
+
await manager.newClient('bar', 'http://bar.example.com', 'example.com');
|
|
52
52
|
const socket = await new Promise((resolve) => {
|
|
53
53
|
const netClient = net.createConnection({ port: clientFoo.port }, () => {
|
|
54
54
|
resolve(netClient);
|
|
@@ -64,7 +64,7 @@ describe('ClientManager', () => {
|
|
|
64
64
|
}, 5000);
|
|
65
65
|
it('should remove clients if they do not connect within 5 seconds', async () => {
|
|
66
66
|
const manager = new ClientManager();
|
|
67
|
-
await manager.newClient('foo');
|
|
67
|
+
await manager.newClient('foo', 'http://foo.example.com', 'example.com');
|
|
68
68
|
expect(manager.hasClient('foo')).toBe(true);
|
|
69
69
|
// wait past grace period (1s)
|
|
70
70
|
await new Promise(resolve => setTimeout(resolve, 1500));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientManager.spec.js","sourceRoot":"","sources":["../../src/server/ClientManager.spec.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,OAAO,GAAG,IAAI,aAAa,EAAE,CAAC;QACpC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,OAAO,GAAG,IAAI,aAAa,EAAE,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"ClientManager.spec.js","sourceRoot":"","sources":["../../src/server/ClientManager.spec.ts"],"names":[],"mappings":"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"}
|
package/dist/server/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { Client, type ClientOptions } from './Client.js';
|
|
2
|
-
export { ClientManager, type ClientManagerOptions, type NewClientInfo } from './ClientManager.js';
|
|
3
|
-
export { createServer, type PipenetServer, type ServerOptions } from './server.js';
|
|
2
|
+
export { ClientManager, type ClientManagerOptions, type NewClientInfo, type TunnelInfo } from './ClientManager.js';
|
|
3
|
+
export { createServer, type PipenetServer, type RequestInfo, type ServerHooks, type ServerOptions } from './server.js';
|
|
4
4
|
export { TunnelAgent, type TunnelAgentListenInfo, type TunnelAgentOptions, type TunnelAgentStats } from './TunnelAgent.js';
|
|
5
5
|
export { type SocketHandler, TunnelServer } from './TunnelServer.js';
|
|
6
6
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,KAAK,aAAa,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACnH,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AACvH,OAAO,EAAE,WAAW,EAAE,KAAK,qBAAqB,EAAE,KAAK,kBAAkB,EAAE,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAC3H,OAAO,EAAE,KAAK,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC"}
|
package/dist/server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAsB,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAsB,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,aAAa,EAAkE,MAAM,oBAAoB,CAAC;AACnH,OAAO,EAAE,YAAY,EAA8E,MAAM,aAAa,CAAC;AACvH,OAAO,EAAE,WAAW,EAA8E,MAAM,kBAAkB,CAAC;AAC3H,OAAO,EAAsB,YAAY,EAAE,MAAM,mBAAmB,CAAC"}
|
package/dist/server/server.d.ts
CHANGED
|
@@ -3,12 +3,38 @@ import { TunnelServer } from './TunnelServer.js';
|
|
|
3
3
|
export interface PipenetServer extends http.Server {
|
|
4
4
|
tunnelServer?: TunnelServer;
|
|
5
5
|
}
|
|
6
|
-
export interface
|
|
6
|
+
export interface RequestInfo {
|
|
7
|
+
headers: Record<string, string | string[] | undefined>;
|
|
8
|
+
method: string;
|
|
9
|
+
path: string;
|
|
10
|
+
remoteAddress?: string;
|
|
11
|
+
tunnelId: string;
|
|
12
|
+
}
|
|
13
|
+
export interface ServerHooks {
|
|
14
|
+
/**
|
|
15
|
+
* Called when a request is proxied through a tunnel
|
|
16
|
+
*/
|
|
17
|
+
onRequest?: (request: RequestInfo) => void;
|
|
18
|
+
/**
|
|
19
|
+
* Called when a tunnel is closed
|
|
20
|
+
*/
|
|
21
|
+
onTunnelClosed?: (tunnel: TunnelInfo) => void;
|
|
22
|
+
/**
|
|
23
|
+
* Called when a new tunnel is created
|
|
24
|
+
*/
|
|
25
|
+
onTunnelCreated?: (tunnel: TunnelInfo) => void;
|
|
26
|
+
}
|
|
27
|
+
export interface ServerOptions extends ServerHooks {
|
|
7
28
|
domains?: string[];
|
|
8
29
|
landing?: string;
|
|
9
30
|
maxTcpSockets?: number;
|
|
10
31
|
secure?: boolean;
|
|
11
32
|
tunnelPort?: number;
|
|
12
33
|
}
|
|
34
|
+
export interface TunnelInfo {
|
|
35
|
+
domain: string;
|
|
36
|
+
id: string;
|
|
37
|
+
url: string;
|
|
38
|
+
}
|
|
13
39
|
export declare function createServer(opt?: ServerOptions): PipenetServer;
|
|
14
40
|
//# sourceMappingURL=server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAOxB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,MAAM;IAChD,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,WAAW,aAAa;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAOxB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,MAAM;IAChD,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC;IACvD,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;IAE3C;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IAE9C;;OAEG;IACH,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;CAChD;AAED,MAAM,WAAW,aAAc,SAAQ,WAAW;IAChD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACb;AAED,wBAAgB,YAAY,CAAC,GAAG,GAAE,aAAkB,GAAG,aAAa,CAmMnE"}
|
package/dist/server/server.js
CHANGED
|
@@ -56,10 +56,18 @@ export function createServer(opt = {}) {
|
|
|
56
56
|
});
|
|
57
57
|
app.use(router.routes());
|
|
58
58
|
app.use(router.allowedMethods());
|
|
59
|
+
// Helper to extract domain from host (strips port if present)
|
|
60
|
+
const getDomain = (host) => {
|
|
61
|
+
// Remove port if present (e.g., "localhost:3000" -> "localhost")
|
|
62
|
+
return host.split(':')[0];
|
|
63
|
+
};
|
|
64
|
+
// Helper to build the tunnel URL
|
|
65
|
+
const buildUrl = (id, host) => {
|
|
66
|
+
return schema + '://' + id + '.' + host;
|
|
67
|
+
};
|
|
59
68
|
// Helper to build response with tunnel port if configured
|
|
60
|
-
const buildResponse = (info
|
|
61
|
-
const
|
|
62
|
-
const response = { ...info, url };
|
|
69
|
+
const buildResponse = (info) => {
|
|
70
|
+
const response = { ...info };
|
|
63
71
|
// If using shared tunnel server, override port and add sharedTunnel flag
|
|
64
72
|
if (tunnelPort) {
|
|
65
73
|
response.port = tunnelPort;
|
|
@@ -76,9 +84,11 @@ export function createServer(opt = {}) {
|
|
|
76
84
|
const isNewClientRequest = ctx.query['new'] !== undefined;
|
|
77
85
|
if (isNewClientRequest) {
|
|
78
86
|
const reqId = hri.random();
|
|
87
|
+
const domain = getDomain(ctx.request.host);
|
|
88
|
+
const url = buildUrl(reqId, ctx.request.host);
|
|
79
89
|
log('making new client with id %s', reqId);
|
|
80
|
-
const info = await manager.newClient(reqId);
|
|
81
|
-
ctx.body = buildResponse(info
|
|
90
|
+
const info = await manager.newClient(reqId, url, domain);
|
|
91
|
+
ctx.body = buildResponse(info);
|
|
82
92
|
return;
|
|
83
93
|
}
|
|
84
94
|
ctx.redirect(landingPage);
|
|
@@ -96,9 +106,11 @@ export function createServer(opt = {}) {
|
|
|
96
106
|
ctx.body = { message: msg };
|
|
97
107
|
return;
|
|
98
108
|
}
|
|
109
|
+
const domain = getDomain(ctx.request.host);
|
|
110
|
+
const url = buildUrl(reqId, ctx.request.host);
|
|
99
111
|
log('making new client with id %s', reqId);
|
|
100
|
-
const info = await manager.newClient(reqId);
|
|
101
|
-
ctx.body = buildResponse(info
|
|
112
|
+
const info = await manager.newClient(reqId, url, domain);
|
|
113
|
+
ctx.body = buildResponse(info);
|
|
102
114
|
});
|
|
103
115
|
const server = http.createServer();
|
|
104
116
|
server.tunnelServer = tunnelServer;
|
|
@@ -121,6 +133,16 @@ export function createServer(opt = {}) {
|
|
|
121
133
|
res.end('404');
|
|
122
134
|
return;
|
|
123
135
|
}
|
|
136
|
+
// Call the onRequest hook
|
|
137
|
+
if (opt.onRequest) {
|
|
138
|
+
opt.onRequest({
|
|
139
|
+
headers: req.headers,
|
|
140
|
+
method: req.method || 'GET',
|
|
141
|
+
path: req.url || '/',
|
|
142
|
+
remoteAddress: req.socket.remoteAddress,
|
|
143
|
+
tunnelId: clientId,
|
|
144
|
+
});
|
|
145
|
+
}
|
|
124
146
|
client.handleRequest(req, res);
|
|
125
147
|
});
|
|
126
148
|
server.on('upgrade', (req, socket) => {
|