@verdaccio/hooks 6.0.0-6-next.43 → 6.0.0-6-next.45

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @verdaccio/hooks
 
+## 6.0.0-6-next.45
+
+### Patch Changes
+
+- 0a6412ca9: refactor: got instead undici
+- Updated dependencies [0a6412ca9]
+  - @verdaccio/core@6.0.0-6-next.75
+  - @verdaccio/logger@6.0.0-6-next.43
+
+## 6.0.0-6-next.44
+
+### Patch Changes
+
+- @verdaccio/core@6.0.0-6-next.74
+- @verdaccio/logger@6.0.0-6-next.42
+
 ## 6.0.0-6-next.43
 
 ### Patch Changes

package/build/notify-request.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.notifyRequest = notifyRequest;
 var _debug = _interopRequireDefault(require("debug"));
-var _undici = require("undici");
+var _gotCjs = _interopRequireDefault(require("got-cjs"));
 var _core = require("@verdaccio/core");
 var _logger = require("@verdaccio/logger");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -14,7 +14,7 @@ async function notifyRequest(url, options) {
   let response;
   try {
     debug('uri %o', url);
-    response = await (0, _undici.fetch)(url, {
+    response = _gotCjs.default.post(url, {
       body: JSON.stringify(options.body),
       method: 'POST',
       headers: {

package/build/notify-request.js.map

@@ -1 +1 @@
-{"version":3,"file":"notify-request.js","names":["_debug","_interopRequireDefault","require","_undici","_core","_logger","obj","__esModule","default","debug","buildDebug","notifyRequest","url","options","response","fetch","body","JSON","stringify","method","headers","status","json","HTTP_STATUS","BAD_REQUEST","Error","logger","info","content","err","error","errorMessage","message"],"sources":["../src/notify-request.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { fetch } from 'undici';\n\nimport { HTTP_STATUS } from '@verdaccio/core';\nimport { logger } from '@verdaccio/logger';\n\nconst debug = buildDebug('verdaccio:hooks:request');\n\nexport type FetchOptions = {\n  body: string;\n  headers?: {};\n  method?: string;\n};\n\nexport async function notifyRequest(url: string, options: FetchOptions): Promise<boolean> {\n  let response;\n  try {\n    debug('uri %o', url);\n    response = await fetch(url, {\n      body: JSON.stringify(options.body),\n      method: 'POST',\n      headers: { 'Content-Type': 'application/json' },\n    });\n    debug('response.status  %o', response.status);\n    const body = await response.json();\n    if (response.status >= HTTP_STATUS.BAD_REQUEST) {\n      throw new Error(body);\n    }\n\n    logger.info(\n      { content: options.body },\n      'The notification @{content} has been successfully dispatched'\n    );\n    return true;\n  } catch (err: any) {\n    debug('request error %o', err);\n    logger.error(\n      { errorMessage: err?.message },\n      'notify service has thrown an error: @{errorMessage}'\n    );\n    return false;\n  }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAEA,IAAAE,KAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AAA2C,SAAAD,uBAAAK,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAE3C,MAAMG,KAAK,GAAG,IAAAC,cAAU,EAAC,yBAAyB,CAAC;AAQ5C,eAAeC,aAAaA,CAACC,GAAW,EAAEC,OAAqB,EAAoB;EACxF,IAAIC,QAAQ;EACZ,IAAI;IACFL,KAAK,CAAC,QAAQ,EAAEG,GAAG,CAAC;IACpBE,QAAQ,GAAG,MAAM,IAAAC,aAAK,EAACH,GAAG,EAAE;MAC1BI,IAAI,EAAEC,IAAI,CAACC,SAAS,CAACL,OAAO,CAACG,IAAI,CAAC;MAClCG,MAAM,EAAE,MAAM;MACdC,OAAO,EAAE;QAAE,cAAc,EAAE;MAAmB;IAChD,CAAC,CAAC;IACFX,KAAK,CAAC,qBAAqB,EAAEK,QAAQ,CAACO,MAAM,CAAC;IAC7C,MAAML,IAAI,GAAG,MAAMF,QAAQ,CAACQ,IAAI,CAAC,CAAC;IAClC,IAAIR,QAAQ,CAACO,MAAM,IAAIE,iBAAW,CAACC,WAAW,EAAE;MAC9C,MAAM,IAAIC,KAAK,CAACT,IAAI,CAAC;IACvB;IAEAU,cAAM,CAACC,IAAI,CACT;MAAEC,OAAO,EAAEf,OAAO,CAACG;IAAK,CAAC,EACzB,8DACF,CAAC;IACD,OAAO,IAAI;EACb,CAAC,CAAC,OAAOa,GAAQ,EAAE;IACjBpB,KAAK,CAAC,kBAAkB,EAAEoB,GAAG,CAAC;IAC9BH,cAAM,CAACI,KAAK,CACV;MAAEC,YAAY,EAAEF,GAAG,aAAHA,GAAG,uBAAHA,GAAG,CAAEG;IAAQ,CAAC,EAC9B,qDACF,CAAC;IACD,OAAO,KAAK;EACd;AACF"}
+{"version":3,"file":"notify-request.js","names":["_debug","_interopRequireDefault","require","_gotCjs","_core","_logger","obj","__esModule","default","debug","buildDebug","notifyRequest","url","options","response","got","post","body","JSON","stringify","method","headers","status","json","HTTP_STATUS","BAD_REQUEST","Error","logger","info","content","err","error","errorMessage","message"],"sources":["../src/notify-request.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport got from 'got-cjs';\n\nimport { HTTP_STATUS } from '@verdaccio/core';\nimport { logger } from '@verdaccio/logger';\n\nconst debug = buildDebug('verdaccio:hooks:request');\n\nexport type FetchOptions = {\n  body: string;\n  headers?: {};\n  method?: string;\n};\n\nexport async function notifyRequest(url: string, options: FetchOptions): Promise<boolean> {\n  let response;\n  try {\n    debug('uri %o', url);\n    response = got.post(url, {\n      body: JSON.stringify(options.body),\n      method: 'POST',\n      headers: { 'Content-Type': 'application/json' },\n    });\n    debug('response.status  %o', response.status);\n    const body = await response.json();\n    if (response.status >= HTTP_STATUS.BAD_REQUEST) {\n      throw new Error(body);\n    }\n\n    logger.info(\n      { content: options.body },\n      'The notification @{content} has been successfully dispatched'\n    );\n    return true;\n  } catch (err: any) {\n    debug('request error %o', err);\n    logger.error(\n      { errorMessage: err?.message },\n      'notify service has thrown an error: @{errorMessage}'\n    );\n    return false;\n  }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,OAAA,GAAAF,sBAAA,CAAAC,OAAA;AAEA,IAAAE,KAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AAA2C,SAAAD,uBAAAK,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAE3C,MAAMG,KAAK,GAAG,IAAAC,cAAU,EAAC,yBAAyB,CAAC;AAQ5C,eAAeC,aAAaA,CAACC,GAAW,EAAEC,OAAqB,EAAoB;EACxF,IAAIC,QAAQ;EACZ,IAAI;IACFL,KAAK,CAAC,QAAQ,EAAEG,GAAG,CAAC;IACpBE,QAAQ,GAAGC,eAAG,CAACC,IAAI,CAACJ,GAAG,EAAE;MACvBK,IAAI,EAAEC,IAAI,CAACC,SAAS,CAACN,OAAO,CAACI,IAAI,CAAC;MAClCG,MAAM,EAAE,MAAM;MACdC,OAAO,EAAE;QAAE,cAAc,EAAE;MAAmB;IAChD,CAAC,CAAC;IACFZ,KAAK,CAAC,qBAAqB,EAAEK,QAAQ,CAACQ,MAAM,CAAC;IAC7C,MAAML,IAAI,GAAG,MAAMH,QAAQ,CAACS,IAAI,CAAC,CAAC;IAClC,IAAIT,QAAQ,CAACQ,MAAM,IAAIE,iBAAW,CAACC,WAAW,EAAE;MAC9C,MAAM,IAAIC,KAAK,CAACT,IAAI,CAAC;IACvB;IAEAU,cAAM,CAACC,IAAI,CACT;MAAEC,OAAO,EAAEhB,OAAO,CAACI;IAAK,CAAC,EACzB,8DACF,CAAC;IACD,OAAO,IAAI;EACb,CAAC,CAAC,OAAOa,GAAQ,EAAE;IACjBrB,KAAK,CAAC,kBAAkB,EAAEqB,GAAG,CAAC;IAC9BH,cAAM,CAACI,KAAK,CACV;MAAEC,YAAY,EAAEF,GAAG,aAAHA,GAAG,uBAAHA,GAAG,CAAEG;IAAQ,CAAC,EAC9B,qDACF,CAAC;IACD,OAAO,KAAK;EACd;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdaccio/hooks",
-  "version": "6.0.0-6-next.43",
+  "version": "6.0.0-6-next.45",
   "description": "loaders logic",
   "main": "./build/index.js",
   "types": "build/index.d.ts",
@@ -26,20 +26,21 @@
     "verdaccio"
   ],
   "engines": {
-    "node": ">=16"
+    "node": ">=12"
   },
   "dependencies": {
-    "@verdaccio/core": "6.0.0-6-next.73",
-    "@verdaccio/logger": "6.0.0-6-next.41",
+    "@verdaccio/core": "6.0.0-6-next.75",
+    "@verdaccio/logger": "6.0.0-6-next.43",
     "core-js": "3.30.2",
     "debug": "4.3.4",
     "handlebars": "4.7.7",
-    "undici": "4.16.0"
+    "got-cjs": "12.5.4"
   },
   "devDependencies": {
-    "@verdaccio/auth": "6.0.0-6-next.52",
-    "@verdaccio/config": "6.0.0-6-next.73",
-    "@verdaccio/types": "11.0.0-6-next.25"
+    "@verdaccio/auth": "6.0.0-6-next.54",
+    "@verdaccio/config": "6.0.0-6-next.75",
+    "@verdaccio/types": "11.0.0-6-next.25",
+    "nock": "13.2.9"
   },
   "funding": {
     "type": "opencollective",

package/src/notify-request.ts

@@ -1,5 +1,5 @@
 import buildDebug from 'debug';
-import { fetch } from 'undici';
+import got from 'got-cjs';
 
 import { HTTP_STATUS } from '@verdaccio/core';
 import { logger } from '@verdaccio/logger';
@@ -16,7 +16,7 @@ export async function notifyRequest(url: string, options: FetchOptions): Promise
   let response;
   try {
     debug('uri %o', url);
-    response = await fetch(url, {
+    response = got.post(url, {
       body: JSON.stringify(options.body),
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },

package/test/notify-request.spec.ts

@@ -1,4 +1,4 @@
-import { MockAgent, setGlobalDispatcher } from 'undici';
+import nock from 'nock';
 
 import { createRemoteUser, parseConfigFile } from '@verdaccio/config';
 import { setup } from '@verdaccio/logger';
@@ -21,26 +21,21 @@ const domain = 'http://slack-service';
 
 const options = {
   path: '/foo?auth_token=mySecretToken',
-  method: 'POST',
 };
 
 describe('Notifications:: notifyRequest', () => {
+  beforeEach(() => {
+    nock.cleanAll();
+  });
   test('when sending a empty notification', async () => {
-    const mockAgent = new MockAgent({ connections: 1 });
-    setGlobalDispatcher(mockAgent);
-    const mockClient = mockAgent.get(domain);
-    mockClient.intercept(options).reply(200, { body: 'test' });
+    nock(domain).post(options.path).reply(200, { body: 'test' });
 
     const notificationResponse = await notify({}, {}, createRemoteUser('foo', []), 'bar');
     expect(notificationResponse).toEqual([false]);
   });
 
   test('when sending a single notification', async () => {
-    const mockAgent = new MockAgent({ connections: 1 });
-    setGlobalDispatcher(mockAgent);
-    const mockClient = mockAgent.get(domain);
-    mockClient.intercept(options).reply(200, { body: 'test' });
-
+    nock(domain).post(options.path).reply(200, { body: 'test' });
     const notificationResponse = await notify(
       {},
       singleHeaderNotificationConfig,
@@ -48,14 +43,10 @@ describe('Notifications:: notifyRequest', () => {
       'bar'
     );
     expect(notificationResponse).toEqual([true]);
-    await mockClient.close();
   });
 
   test('when notification endpoint is missing', async () => {
-    const mockAgent = new MockAgent({ connections: 1 });
-    setGlobalDispatcher(mockAgent);
-    const mockClient = mockAgent.get(domain);
-    mockClient.intercept(options).reply(200, { body: 'test' });
+    nock(domain).post(options.path).reply(200, { body: 'test' });
     const name = 'package';
     const config: Partial<Config> = {
       // @ts-ignore
@@ -70,16 +61,22 @@ describe('Notifications:: notifyRequest', () => {
   });
 
   test('when multiple notifications', async () => {
-    const mockAgent = new MockAgent({ connections: 1 });
-    setGlobalDispatcher(mockAgent);
-    const mockClient = mockAgent.get(domain);
-    mockClient.intercept(options).reply(200, { body: 'test' });
-    mockClient.intercept(options).reply(400, {});
-    mockClient.intercept(options).reply(500, { message: 'Something bad happened' });
+    nock(domain)
+      .post(options.path)
+      .once()
+      .reply(200, { body: 'test' })
+      .post(options.path)
+      .once()
+      .reply(400, {})
+      .post(options.path)
+      .once()
+      .reply(500, { message: 'Something bad happened' });
+    // mockClient.intercept(options).reply(200, { body: 'test' });
+    // mockClient.intercept(options).reply(400, {});
+    // mockClient.intercept(options).reply(500, { message: 'Something bad happened' });
 
     const name = 'package';
     const responses = await notify({ name }, multiNotificationConfig, { name: 'foo' }, 'bar');
     expect(responses).toEqual([true, false, false]);
-    await mockClient.close();
   });
 });