Merge pull request #148 from CleverCloud/update-dependencies

Author: hsablonniere

.github/workflows/publish.yml

@@ -38,4 +38,4 @@ jobs:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}
-          npm publish --access public --tag ${{ steps.npm_tag.outputs.tag }}      
+          npm publish --access public --tag ${{ steps.npm_tag.outputs.tag }}

README.md

@@ -166,9 +166,8 @@ This stream is exposed the inner WebSocket source with [`component-emitter`](htt
 Here's an example of how to use `EventsStream` to retrieve events from the Clever Cloud platform:
 
 ```js
-// Browser implementation or Node.js implementation
-import { EventsStream } from '@clevercloud/client/esm/streams/events.browser.js';
-// import { EventsStream } from '@clevercloud/client/esm/streams/events.node.js';
+// Browser and Node.js 21+ implementation
+import { EventsStream } from '@clevercloud/client/esm/streams/events.js';
 
 // Load and cache config and tokens
 const API_HOST = 'https://api.clever-cloud.com';

esm/api/v2/unknown.js

@@ -76,59 +76,6 @@ export function todo_postAuthorize(params, body) {
   });
 }
 
-/**
- * DELETE /invoice/external/paypal/{bid}
- * @param {Object} params
- * @param {String} params.bid
- * @returns {Promise<RequestParams>}
- */
-export function todo_cancelPaypalTransaction(params) {
-  // no multipath for /self or /organisations/{id}
-  return Promise.resolve({
-    method: 'delete',
-    url: `/v2/invoice/external/paypal/${params.bid}`,
-    headers: { Accept: 'application/json' },
-    // no query params
-    // no body
-  });
-}
-
-/**
- * PUT /invoice/external/paypal/{bid}
- * @param {Object} params
- * @param {String} params.bid
- * @param {Object} body
- * @returns {Promise<RequestParams>}
- */
-export function todo_authorizePaypalTransaction(params, body) {
-  // no multipath for /self or /organisations/{id}
-  return Promise.resolve({
-    method: 'put',
-    url: `/v2/invoice/external/paypal/${params.bid}`,
-    headers: { Accept: 'application/json', 'Content-Type': '*/*' },
-    // no query params
-    body,
-  });
-}
-
-/**
- * POST /invoice/external/{bid}
- * @param {Object} params
- * @param {String} params.bid
- * @param {Object} body
- * @returns {Promise<RequestParams>}
- */
-export function todo_updateInvoice(params, body) {
-  // no multipath for /self or /organisations/{id}
-  return Promise.resolve({
-    method: 'post',
-    url: `/v2/invoice/external/${params.bid}`,
-    headers: { Accept: 'application/json', 'Content-Type': '*/*' },
-    // no query params
-    body,
-  });
-}
-
 /**
  * GET /newsfeeds/blog
  * @returns {Promise<RequestParams>}
@@ -933,24 +880,6 @@ export function todo_getUserGitInformations(params) {
   });
 }
 
-/**
- * GET /validation/vat/{key}
- * @param {Object} params
- * @param {String} params.key
- * @param {String} params.action
- * @returns {Promise<RequestParams>}
- */
-export function todo_validate(params) {
-  // no multipath for /self or /organisations/{id}
-  return Promise.resolve({
-    method: 'get',
-    url: `/v2/validation/vat/${params.key}`,
-    headers: { Accept: 'application/json' },
-    queryParams: pickNonNull(params, ['action']),
-    // no body
-  });
-}
-
 /**
  * GET /vat_check
  * @param {Object} params

esm/streams/events.browser.js

@@ -20,7 +20,7 @@ const PONG_MESSAGE = JSON.stringify({
  * @extends {AbstractStream}
  * @template {WebSocketLike} T
  */
-export class AbstractEventsStream extends AbstractStream {
+export class EventsStream extends AbstractStream {
   /**
    * @param {Object} options
    * @param {String} options.apiHost
@@ -51,7 +51,7 @@ export class AbstractEventsStream extends AbstractStream {
     // * user events wired to event emitter: "message(event)" => "event"
 
     const { url, authMessage } = await this._prepareEventsWs();
-    this._ws = this._createWebSocket(url);
+    this._ws = new globalThis.WebSocket(url);
 
     this._ws.addEventListener('open', () => this._ws.send(authMessage));
 
@@ -95,32 +95,10 @@ export class AbstractEventsStream extends AbstractStream {
       // When _closeSource() is called, we already know this._ws is about to be forced closed
       // so we need to remove the listener before calling closeWebSocket()
       this._ws.removeEventListener('close', this._wsCloseListener);
-      this._closeWebSocket(this._ws);
+      this._ws.close();
     }
   }
 
-  // -- abstract methods ------
-
-  /**
-   * @param {string} _url
-   * @returns {T}
-   * @abstract
-   * @protected
-   */
-  _createWebSocket(_url) {
-    // It's up to the class extending AbstractEventsStream to implement how to create a WS connection
-    throw new Error('Not implemented');
-  }
-
-  /**
-   * @param {T} _webSocket
-   * @protected
-   */
-  _closeWebSocket(_webSocket) {
-    // It's up to the class extending AbstractEventsStream to implement how to close a WS connection
-    throw new Error('Not implemented');
-  }
-
   // -- private methods ------
 
   /**

esm/streams/events.abstract.js esm/streams/events.jsesm/streams/events.abstract.js renamed to esm/streams/events.js

@@ -1,4 +1,4 @@
-import EventSource from 'eventsource';
+import { EventSource } from 'eventsource';
 import { AbstractLogsStream } from './logs.abstract.js';
 
 /**

esm/streams/events.node.js

@@ -43,16 +43,15 @@
     "oauth-1.0a": "^2.2.6"
   },
   "peerDependencies": {
-    "eventsource": "^1.0.7",
-    "ws": "^7.4.3"
+    "eventsource": "^4.0.0"
   },
   "devDependencies": {
     "@babel/parser": "^7.27.0",
     "@babel/traverse": "^7.27.0",
     "@babel/types": "^7.27.0",
-    "@eslint/compat": "^1.2.7",
     "@commitlint/cli": "^19.8.0",
     "@commitlint/config-conventional": "^19.8.0",
+    "@eslint/compat": "^1.2.7",
     "@esm-bundle/chai": "^4.3.3",
     "@types/babel__traverse": "^7.20.7",
     "@types/component-emitter": "^1.2.14",