From d64a9578fefbba11f5c79ed9d2ba19aa0a430a7c Mon Sep 17 00:00:00 2001 From: lucas Date: Tue, 5 Jul 2022 16:38:38 -0300 Subject: [PATCH 01/13] feat: github actions package publish workflow --- .../workflows/javascript-package-publish.yaml | 21 +++++++++++++++++++ package.json | 5 ++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/javascript-package-publish.yaml diff --git a/.github/workflows/javascript-package-publish.yaml b/.github/workflows/javascript-package-publish.yaml new file mode 100644 index 000000000..f748eae62 --- /dev/null +++ b/.github/workflows/javascript-package-publish.yaml @@ -0,0 +1,21 @@ +name: Javascript Package Publish +on: + push: + tags: + - "*" +jobs: + publish: + runs-on: ubuntu-latest + permissions: + packages: write + contents: read + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 12 + registry-url: https://npm.pkg.github.com/ + - run: npm ci + - run: npm publish + env: + NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/package.json b/package.json index 437d96c13..f9a10b7d7 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "Jonathan Wiepert", "Mike Williams" ], - "name": "restify", + "name": "@chaordic/restify", "homepage": "http://mcavage.github.com/node-restify", "description": "REST framework", "version": "1.4.4", @@ -31,6 +31,9 @@ "url": "git://github.com/mcavage/node-restify.git" }, "main": "lib/index.js", + "publishConfig": { + "@chaordic:registry": "https://npm.pkg.github.com" + }, "bin": { "report-latency": "./bin/report-latency" }, From abb4740efdaca367d2dff5ba1a0d550659e0db84 Mon Sep 17 00:00:00 2001 From: lucas Date: Tue, 5 Jul 2022 16:42:37 -0300 Subject: [PATCH 02/13] 1.4.5-rc.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f9a10b7d7..191ccac66 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "name": "@chaordic/restify", "homepage": "http://mcavage.github.com/node-restify", "description": "REST framework", - "version": "1.4.4", + "version": "1.4.5-rc.0", "repository": { "type": "git", "url": "git://github.com/mcavage/node-restify.git" From 57f128e1f3f274025cf5691e4b1ff846176f1182 Mon Sep 17 00:00:00 2001 From: lucas Date: Tue, 5 Jul 2022 16:59:14 -0300 Subject: [PATCH 03/13] update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 191ccac66..f3718ddef 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "version": "1.4.5-rc.0", "repository": { "type": "git", - "url": "git://github.com/mcavage/node-restify.git" + "url": "git://github.com/chaordic/node-restify.git" }, "main": "lib/index.js", "publishConfig": { From 4d5e990ec50403b65a49dfa9b842b16080a12750 Mon Sep 17 00:00:00 2001 From: lucas Date: Wed, 13 Jul 2022 13:54:26 -0300 Subject: [PATCH 04/13] change secret token name --- .github/workflows/javascript-package-publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/javascript-package-publish.yaml b/.github/workflows/javascript-package-publish.yaml index f748eae62..bc33090d4 100644 --- a/.github/workflows/javascript-package-publish.yaml +++ b/.github/workflows/javascript-package-publish.yaml @@ -15,7 +15,7 @@ jobs: with: node-version: 12 registry-url: https://npm.pkg.github.com/ - - run: npm ci + - run: npm install - run: npm publish env: - NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} + NODE_AUTH_TOKEN: ${{secrets.ACTIONS_TOKEN}} From a5ce4ba4c862060be77058b41de05c5e208b0618 Mon Sep 17 00:00:00 2001 From: lucas Date: Wed, 13 Jul 2022 13:54:40 -0300 Subject: [PATCH 05/13] 1.4.6-rc.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f3718ddef..f318631e6 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "name": "@chaordic/restify", "homepage": "http://mcavage.github.com/node-restify", "description": "REST framework", - "version": "1.4.5-rc.0", + "version": "1.4.6-rc.0", "repository": { "type": "git", "url": "git://github.com/chaordic/node-restify.git" From 8d0323341e59871db28636b43bc0ab3df1764005 Mon Sep 17 00:00:00 2001 From: Andreis3 Date: Wed, 31 Aug 2022 08:56:53 -0300 Subject: [PATCH 06/13] fix: remove return 200 in requests with method options --- lib/server.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/server.js b/lib/server.js index ac3790f5d..eb6331756 100644 --- a/lib/server.js +++ b/lib/server.js @@ -62,14 +62,8 @@ function default404Handler(req, res, server) { function default405Handler(req, res, methods, server) { res.header('Allow', methods.join(', ')); - if (req.method === 'OPTIONS') { - res.header('Access-Control-Allow-Methods', methods.join(', ')); - res.send(200); - } else { - var msg = req.url + ' does not support ' + req.method; - res.send(new BadMethodError(msg)); - } - + var msg = req.url + ' does not support ' + req.method; + res.send(new BadMethodError(msg)); server.emit('after', req, res, null); } From ea2410863d2f36928943d001d0667d0ab8ae4ff6 Mon Sep 17 00:00:00 2001 From: Jean Ferreira Date: Wed, 31 Aug 2022 10:49:08 -0300 Subject: [PATCH 07/13] feat: adjust metho OPTIONS for request --- lib/server.js | 62 +++++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/lib/server.js b/lib/server.js index eb6331756..3c2686151 100644 --- a/lib/server.js +++ b/lib/server.js @@ -61,13 +61,21 @@ function default404Handler(req, res, server) { function default405Handler(req, res, methods, server) { - res.header('Allow', methods.join(', ')); - var msg = req.url + ' does not support ' + req.method; - res.send(new BadMethodError(msg)); - server.emit('after', req, res, null); + if (req.method === 'OPTIONS') { + res.header('Access-Control-Allow-Methods', ['GET, POST, OPTIONS, PUT']); + res.header('Access-Control-Allow-Headers', 'Authorization,Content-Type,Accept,Origin,User-Agent,DNT,Cache-Control,X-Mx-ReqToken,Keep-Alive,X-Requested-With,If-Modified-Since,x-host'); + res.header('Access-Control-Allow-Origin', req.headers['x-host']); + res.header('Access-Control-Allow-Credentials', true); + res.header('Access-Control-Max-Age', 1728000); + res.header('Content-Length', 0); + res.header('Content-Type', 'text/plain charset=UTF-8', 0); + res.send(204); + } else { + var msg = req.url + ' does not support ' + req.method; + res.send(new BadMethodError(msg)); + } } - function defaultBadVersionHandler(req, res, versions, server) { var msg = req.method + ' ' + req.url + ' supports versions: ' + versions.join(', '); @@ -79,7 +87,7 @@ function defaultBadVersionHandler(req, res, versions, server) { function toPort(x) { x = parseInt(x, 10); - return (x >= 0 ? x : false); + return (x >= 0 ? x : false); } @@ -141,12 +149,12 @@ function Server(options) { } this.server.on('error', function (err) { - self.log.trace({err: err}, 'error'); + self.log.trace({ err: err }, 'error'); self.emit('error', err); }); this.server.on('clientError', function (err) { - self.log.trace({err: err}, 'clentError'); + self.log.trace({ err: err }, 'clentError'); self.emit('clientError', err); }); @@ -265,23 +273,23 @@ Server.prototype.listen = function listen() { arguments[0] = Number(arguments[0]); switch (typeof (arguments[0])) { - case 'function': - return this.server.listen(listenCallback); + case 'function': + return this.server.listen(listenCallback); - case 'string': - if (isPipeName(arguments[0])) - return this.server.listen(arguments[0], listenCallback); + case 'string': + if (isPipeName(arguments[0])) + return this.server.listen(arguments[0], listenCallback); - throw new TypeError(arguments[0] + ' is not a named pipe'); + throw new TypeError(arguments[0] + ' is not a named pipe'); - case 'number': - var host = arguments[1]; - return this.server.listen(arguments[0], - typeof (host) === 'string' ? host : '0.0.0.0', - listenCallback); + case 'number': + var host = arguments[1]; + return this.server.listen(arguments[0], + typeof (host) === 'string' ? host : '0.0.0.0', + listenCallback); - default: - throw new TypeError('port (Number) required'); + default: + throw new TypeError('port (Number) required'); } }; @@ -586,11 +594,11 @@ Server.prototype._findRoute = function _findRoute(req, res) { * @param {Function} The middleware function to execute */ Server.prototype.param = function param(name, fn) { - return this.use(function (req, res, next) { - var value = req.params && req.params[name]; - if (value) - return fn.call(this, req, res, next, value, name); + return this.use(function (req, res, next) { + var value = req.params && req.params[name]; + if (value) + return fn.call(this, req, res, next, value, name); - return next(); - }); + return next(); + }); }; From 034bff4c668b1cfdef22b29afa0c28fb1e26332e Mon Sep 17 00:00:00 2001 From: Jean Ferreira Date: Wed, 31 Aug 2022 10:50:23 -0300 Subject: [PATCH 08/13] 1.4.7-rc.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f318631e6..f88f33e16 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "name": "@chaordic/restify", "homepage": "http://mcavage.github.com/node-restify", "description": "REST framework", - "version": "1.4.6-rc.0", + "version": "1.4.7-rc.0", "repository": { "type": "git", "url": "git://github.com/chaordic/node-restify.git" From bcac39f41824ab5063453521149c46adaf03d2c3 Mon Sep 17 00:00:00 2001 From: Jean Ferreira Date: Wed, 31 Aug 2022 10:51:03 -0300 Subject: [PATCH 09/13] 1.4.8-rc.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f88f33e16..30c6b29aa 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "name": "@chaordic/restify", "homepage": "http://mcavage.github.com/node-restify", "description": "REST framework", - "version": "1.4.7-rc.0", + "version": "1.4.8-rc.0", "repository": { "type": "git", "url": "git://github.com/chaordic/node-restify.git" From b02f62321bb19d2ea95055987dd64b206c1cd461 Mon Sep 17 00:00:00 2001 From: Jean Ferreira Date: Wed, 31 Aug 2022 16:38:56 -0300 Subject: [PATCH 10/13] feat: update header x-host for origin --- lib/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/server.js b/lib/server.js index 3c2686151..6b08f4ea1 100644 --- a/lib/server.js +++ b/lib/server.js @@ -64,7 +64,7 @@ function default405Handler(req, res, methods, server) { if (req.method === 'OPTIONS') { res.header('Access-Control-Allow-Methods', ['GET, POST, OPTIONS, PUT']); res.header('Access-Control-Allow-Headers', 'Authorization,Content-Type,Accept,Origin,User-Agent,DNT,Cache-Control,X-Mx-ReqToken,Keep-Alive,X-Requested-With,If-Modified-Since,x-host'); - res.header('Access-Control-Allow-Origin', req.headers['x-host']); + res.header('Access-Control-Allow-Origin', req.headers['origin']); res.header('Access-Control-Allow-Credentials', true); res.header('Access-Control-Max-Age', 1728000); res.header('Content-Length', 0); From 6708f76d55811268546caeaddf21717a12cef1b1 Mon Sep 17 00:00:00 2001 From: Jean Ferreira Date: Wed, 31 Aug 2022 16:43:15 -0300 Subject: [PATCH 11/13] 1.4.9-rc.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 30c6b29aa..f93f24ad3 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "name": "@chaordic/restify", "homepage": "http://mcavage.github.com/node-restify", "description": "REST framework", - "version": "1.4.8-rc.0", + "version": "1.4.9-rc.0", "repository": { "type": "git", "url": "git://github.com/chaordic/node-restify.git" From 8eaf9888f8e8097cb733525d44590e108ab1eb47 Mon Sep 17 00:00:00 2001 From: Jean Ferreira Date: Wed, 31 Aug 2022 16:43:53 -0300 Subject: [PATCH 12/13] 1.4.10-rc.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f93f24ad3..3e2053d5a 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "name": "@chaordic/restify", "homepage": "http://mcavage.github.com/node-restify", "description": "REST framework", - "version": "1.4.9-rc.0", + "version": "1.4.10-rc.0", "repository": { "type": "git", "url": "git://github.com/chaordic/node-restify.git" From 2d638bda61ed61e64de76898d873fad9e1250a39 Mon Sep 17 00:00:00 2001 From: Jean Ferreira Date: Wed, 31 Aug 2022 16:44:35 -0300 Subject: [PATCH 13/13] 1.5.2-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e2053d5a..e5422b996 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "name": "@chaordic/restify", "homepage": "http://mcavage.github.com/node-restify", "description": "REST framework", - "version": "1.4.10-rc.0", + "version": "1.5.2-rc.1", "repository": { "type": "git", "url": "git://github.com/chaordic/node-restify.git"