chore: update https-proxy-agent to 7.0.0

iTowns · Jul 4, 2023 · 8b939f6 · 8b939f6
1 parent ea5283d
commit 8b939f6
Show file tree

Hide file tree

Showing 21 changed files with 89 additions and 31 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -99,7 +99,7 @@
     "github-url-from-git": "^1.5.0",
     "grunt": "^1.6.1",
     "grunt-bump": "^0.8.0",
-    "https-proxy-agent": "^5.0.1",
+    "https-proxy-agent": "^7.0.0",
     "jsdoc": "^4.0.2",
     "marked": "^5.1.0",
     "mocha": "^10.2.0",

diff --git a/test/unit/3dtileslayerprocess.js b/test/unit/3dtileslayerprocess.js
@@ -3,7 +3,7 @@ import C3DTilesLayer from 'Layer/C3DTilesLayer';
 import C3DTilesSource from 'Source/C3DTilesSource';
 import View from 'Core/View';
 import GlobeView from 'Core/Prefab/GlobeView';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import Coordinates from 'Core/Geographic/Coordinates';
 import Renderer from './bootstrap';
 

diff --git a/test/unit/3dtileslayerprocessbatchtable.js b/test/unit/3dtileslayerprocessbatchtable.js
@@ -6,7 +6,7 @@ import C3DTExtensions from 'Core/3DTiles/C3DTExtensions';
 import C3DTilesTypes from 'Core/3DTiles/C3DTilesTypes';
 import View from 'Core/View';
 import GlobeView from 'Core/Prefab/GlobeView';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import Coordinates from 'Core/Geographic/Coordinates';
 import Renderer from './bootstrap';
 

diff --git a/test/unit/3dtileslayerstyle.js b/test/unit/3dtileslayerstyle.js
@@ -1,6 +1,7 @@
 import assert from 'assert';
 import proj4 from 'proj4';
 import * as THREE from 'three';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import Extent from 'Core/Geographic/Extent';
 import PlanarView from 'Core/Prefab/PlanarView';
 import Style from 'Core/Style';
@@ -28,6 +29,7 @@ describe('3DTilesLayer Style', () => {
             source: new C3DTilesSource({
                 url: 'https://raw.githubusercontent.com/iTowns/iTowns2-sample-data/master/' +
                     '3DTiles/lyon1_with_surface_type_2018/tileset.json',
+                networkOptions: process.env.HTTPS_PROXY ? { agent: new HttpsProxyAgent(process.env.HTTPS_PROXY) } : {},
             }),
         },
         view,

diff --git a/test/unit/bootstrap.js b/test/unit/bootstrap.js
@@ -6,8 +6,13 @@ global.window = {
     setTimeout,
 };
 
-global.URL = function URL() {
-    this.ref = undefined;
+global.URL = function URL(url) {
+    return {
+        host: url.split('://')[1]?.split('/')[0],
+        hostname: url.split('://')[1]?.split(':')[0],
+        port: url.split('://')[1]?.split(':')[1],
+        protocol: url.split('://')[0],
+    };
 };
 
 global.Event = () => {};

diff --git a/test/unit/demutils.js b/test/unit/demutils.js
@@ -1,7 +1,7 @@
 import * as THREE from 'three';
 import ElevationLayer from 'Layer/ElevationLayer';
 import WMTSSource from 'Source/WMTSSource';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import assert from 'assert';
 import GlobeView from 'Core/Prefab/GlobeView';
 import Coordinates from 'Core/Geographic/Coordinates';

diff --git a/test/unit/entwine.js b/test/unit/entwine.js
@@ -1,5 +1,5 @@
 import assert from 'assert';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import View from 'Core/View';
 import GlobeView from 'Core/Prefab/GlobeView';
 import Coordinates from 'Core/Geographic/Coordinates';

diff --git a/test/unit/featuregeometrylayer.js b/test/unit/featuregeometrylayer.js
@@ -3,7 +3,7 @@ import assert from 'assert';
 import GlobeView from 'Core/Prefab/GlobeView';
 import FeatureGeometryLayer from 'Layer/FeatureGeometryLayer';
 import FileSource from 'Source/FileSource';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import Extent from 'Core/Geographic/Extent';
 import Coordinates from 'Core/Geographic/Coordinates';
 import OBB from 'Renderer/OBB';

diff --git a/test/unit/featuregeometrylayererror.js b/test/unit/featuregeometrylayererror.js
@@ -3,7 +3,7 @@ import assert from 'assert';
 import GlobeView from 'Core/Prefab/GlobeView';
 import FeatureGeometryLayer from 'Layer/FeatureGeometryLayer';
 import FileSource from 'Source/FileSource';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import Extent from 'Core/Geographic/Extent';
 import Coordinates from 'Core/Geographic/Coordinates';
 import OBB from 'Renderer/OBB';

diff --git a/test/unit/gdf.js b/test/unit/gdf.js
@@ -1,5 +1,5 @@
 import assert from 'assert';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import Fetcher from 'Provider/Fetcher';
 import GDFParser from 'Parser/GDFParser';
 

diff --git a/test/unit/geoidlayer.js b/test/unit/geoidlayer.js
@@ -4,7 +4,7 @@ import GeoidLayer from 'Layer/GeoidLayer';
 import FileSource from 'Source/FileSource';
 import Coordinates from 'Core/Geographic/Coordinates';
 import GlobeView from 'Core/Prefab/GlobeView';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import Extent from 'Core/Geographic/Extent';
 import OBB from 'Renderer/OBB';
 import TileMesh from 'Core/TileMesh';

diff --git a/test/unit/gtx.js b/test/unit/gtx.js
@@ -1,5 +1,5 @@
 import assert from 'assert';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import GTXParser from 'Parser/GTXParser';
 import Fetcher from 'Provider/Fetcher';
 

diff --git a/test/unit/isg.js b/test/unit/isg.js
@@ -1,5 +1,5 @@
 import assert from 'assert';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import Fetcher from 'Provider/Fetcher';
 import ISGParser from 'Parser/ISGParser';
 

diff --git a/test/unit/label.js b/test/unit/label.js
@@ -9,7 +9,7 @@ import LabelLayer from 'Layer/LabelLayer';
 import GlobeView from 'Core/Prefab/GlobeView';
 import ColorLayer from 'Layer/ColorLayer';
 import FileSource from 'Source/FileSource';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import Renderer from './bootstrap';
 
 const geojson = require('../data/geojson/simple.geojson.json');
@@ -187,6 +187,7 @@ describe('Label2DRenderer', function () {
         fetchedData: geojson,
         crs: 'EPSG:4326',
         format: 'application/json',
+        // TODO : is it necessary since we use fetchedData property ?
         networkOptions: process.env.HTTPS_PROXY ? { agent: new HttpsProxyAgent(process.env.HTTPS_PROXY) } : {},
     });
 

diff --git a/test/unit/lasparser.js b/test/unit/lasparser.js
@@ -1,5 +1,5 @@
 import assert from 'assert';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import LASParser from 'Parser/LASParser';
 import Fetcher from 'Provider/Fetcher';
 import { compareWithEpsilon } from './utils';

diff --git a/test/unit/orientedimagelayer.js b/test/unit/orientedimagelayer.js
@@ -2,7 +2,7 @@ import proj4 from 'proj4';
 import assert from 'assert';
 import OrientedImageLayer from 'Layer/OrientedImageLayer';
 import OrientedImageSource from 'Source/OrientedImageSource';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import Coordinates from 'Core/Geographic/Coordinates';
 import GlobeView from 'Core/Prefab/GlobeView';
 import Renderer from './bootstrap';

diff --git a/test/unit/potree.js b/test/unit/potree.js
@@ -3,7 +3,7 @@ import PotreeLayer from 'Layer/PotreeLayer';
 import PotreeSource from 'Source/PotreeSource';
 import View from 'Core/View';
 import GlobeView from 'Core/Prefab/GlobeView';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import Coordinates from 'Core/Geographic/Coordinates';
 import PotreeNode from 'Core/PotreeNode';
 import PointsMaterial from 'Renderer/PointsMaterial';

diff --git a/test/unit/potreelayerparsing.js b/test/unit/potreelayerparsing.js
@@ -4,7 +4,7 @@ import PotreeSource from 'Source/PotreeSource';
 import Coordinates from 'Core/Geographic/Coordinates';
 import GlobeView from 'Core/Prefab/GlobeView';
 import View from 'Core/View';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import Renderer from './bootstrap';
 
 describe('Potree Provider', function () {

diff --git a/test/unit/source.js b/test/unit/source.js
@@ -11,7 +11,7 @@ import OrientedImageSource from 'Source/OrientedImageSource';
 import C3DTilesSource from 'Source/C3DTilesSource';
 import C3DTilesIonSource from 'Source/C3DTilesIonSource';
 import Extent from 'Core/Geographic/Extent';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 
 describe('Sources', function () {
     // geojson url to parse

diff --git a/test/unit/vectortiles.js b/test/unit/vectortiles.js
@@ -1,6 +1,6 @@
 import fs from 'fs';
 import assert from 'assert';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import VectorTileParser from 'Parser/VectorTileParser';
 import VectorTilesSource from 'Source/VectorTilesSource';
 import Extent from 'Core/Geographic/Extent';