owebjs 1.5.1-dev → 1.5.3-dev

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.
@@ -265,10 +265,10 @@ function inner(oweb, route) {
265
265
  }, "corkedOp");
266
266
  corkedOp(() => {
267
267
  res.raw.writeHead(200, {
268
+ ...res.getHeaders(),
268
269
  "Content-Type": "text/event-stream",
269
270
  "Cache-Control": "no-cache",
270
- Connection: "keep-alive",
271
- "Access-Control-Allow-Origin": "*"
271
+ Connection: "keep-alive"
272
272
  });
273
273
  if (res.raw.flushHeaders) {
274
274
  res.raw.flushHeaders();
@@ -84,51 +84,51 @@ async function server_default({ cert_file_name, key_file_name }) {
84
84
  };
85
85
  }
86
86
  close(cb) {
87
- uWS.us_listen_socket_close(uServer._socket);
88
- if (!cb) return;
89
- return cb();
87
+ if (uServer._socket) {
88
+ uWS.us_listen_socket_close(uServer._socket);
89
+ uServer._socket = null;
90
+ }
91
+ if (cb) cb();
90
92
  }
91
93
  start(host, port, cb) {
92
- let args;
93
- const callbackFunction = /* @__PURE__ */ __name(function(socket) {
94
- uServer._socket = socket;
95
- if (cb) cb(socket);
94
+ const callbackFunction = /* @__PURE__ */ __name(function(token) {
95
+ uServer._socket = token;
96
+ if (cb) cb(token);
96
97
  }, "callbackFunction");
97
- if (host && port && cb) {
98
- args = [
99
- host,
100
- port,
101
- callbackFunction
102
- ];
103
- }
104
- if (!cb && (!port || typeof port === "function")) {
105
- cb = port;
106
- port = host;
107
- args = [
108
- port,
109
- callbackFunction
110
- ];
98
+ if (host && port) {
99
+ return uServer.listen(host, port, callbackFunction);
100
+ } else {
101
+ return uServer.listen(port || host, callbackFunction);
111
102
  }
112
- return uServer.listen(...args);
113
103
  }
114
104
  listen(host, port, cb) {
115
105
  if (typeof host === "object") {
116
106
  const listenOptions = host;
117
107
  port = listenOptions.port;
118
108
  cb = listenOptions.cb;
119
- host = listenOptions.host;
120
- return this.start(host, port, (socket) => {
121
- uServer._socket = socket;
122
- if (cb) cb(socket);
109
+ host = listenOptions.host || "0.0.0.0";
110
+ return this.start(host, port, (token) => {
111
+ if (token) {
112
+ uServer._socket = token;
113
+ if (cb) cb(null, `http://${host}:${port}`);
114
+ } else {
115
+ if (cb) cb(new Error(`Failed to listen on ${host}:${port}`));
116
+ }
123
117
  });
124
118
  } else {
125
119
  if ((!port || typeof port === "function") && !cb) {
126
120
  cb = port;
127
121
  port = host;
128
- return this.start(port, cb);
129
- } else {
130
- return this.start(host, port, cb);
122
+ host = "0.0.0.0";
131
123
  }
124
+ return this.start(host, port, (token) => {
125
+ if (token) {
126
+ uServer._socket = token;
127
+ if (cb) cb(null, `http://${host}:${port}`);
128
+ } else {
129
+ if (cb) cb(new Error(`Failed to listen on ${host}:${port}`));
130
+ }
131
+ });
132
132
  }
133
133
  }
134
134
  ws(pattern, behaviors, hooks = []) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "owebjs",
3
- "version": "1.5.1-dev",
3
+ "version": "1.5.3-dev",
4
4
  "description": "A flexible and modern web framework built on top of Fastify",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",