Introduce a directory structure for web HTTP stuff

Similar to that used for transports.
ably · Nov 8, 2023 · 2341e26 · 2341e26
1 parent 1b806ee
commit 2341e26
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 9 deletions.
diff --git a/src/platform/nativescript/index.ts b/src/platform/nativescript/index.ts
@@ -8,7 +8,7 @@ import ErrorInfo from '../../common/lib/types/errorinfo';
 import BufferUtils from '../web/lib/util/bufferutils';
 // @ts-ignore
 import { createCryptoClass } from '../web/lib/util/crypto';
-import Http from '../web/lib/util/http';
+import Http from '../web/lib/http/http';
 // @ts-ignore
 import Config from './config';
 // @ts-ignore

diff --git a/src/platform/react-native/index.ts b/src/platform/react-native/index.ts
@@ -8,7 +8,7 @@ import ErrorInfo from '../../common/lib/types/errorinfo';
 import BufferUtils from '../web/lib/util/bufferutils';
 // @ts-ignore
 import { createCryptoClass } from '../web/lib/util/crypto';
-import Http from '../web/lib/util/http';
+import Http from '../web/lib/http/http';
 import configFactory from './config';
 // @ts-ignore
 import Transports from '../web/lib/transport';

diff --git a/src/platform/web-noencryption/index.ts b/src/platform/web-noencryption/index.ts
@@ -7,7 +7,7 @@ import ErrorInfo from '../../common/lib/types/errorinfo';
 // Platform Specific
 import BufferUtils from '../web/lib/util/bufferutils';
 // @ts-ignore
-import Http from '../web/lib/util/http';
+import Http from '../web/lib/http/http';
 import Config from '../web/config';
 // @ts-ignore
 import Transports from '../web/lib/transport';

diff --git a/src/platform/web/index.ts b/src/platform/web/index.ts
@@ -8,7 +8,7 @@ import ErrorInfo from '../../common/lib/types/errorinfo';
 import BufferUtils from './lib/util/bufferutils';
 // @ts-ignore
 import { createCryptoClass } from './lib/util/crypto';
-import Http from './lib/util/http';
+import Http from './lib/http/http';
 import Config from './config';
 // @ts-ignore
 import Transports from './lib/transport';

diff --git a/src/platform/web/lib/util/http.ts → src/platform/web/lib/http/http.ts b/src/platform/web/lib/util/http.ts → src/platform/web/lib/http/http.ts
@@ -6,11 +6,11 @@ import { IHttpStatic, RequestCallback, RequestParams } from 'common/types/http';
 import HttpMethods from 'common/constants/HttpMethods';
 import BaseClient from 'common/lib/client/baseclient';
 import BaseRealtime from 'common/lib/client/baserealtime';
-import XHRRequest from '../transport/xhrrequest';
+import XHRRequest from './request/xhrrequest';
 import XHRStates from 'common/constants/XHRStates';
 import Logger from 'common/lib/util/logger';
 import { StandardCallback } from 'common/types/utils';
-import fetchRequest from '../transport/fetchrequest';
+import fetchRequest from './request/fetchrequest';
 import { NormalisedClientOptions } from 'common/types/ClientOptions';
 import { isSuccessCode } from 'common/constants/HttpStatusCodes';
 

diff --git a/...latform/web/lib/transport/fetchrequest.ts → ...form/web/lib/http/request/fetchrequest.ts b/...latform/web/lib/transport/fetchrequest.ts → ...form/web/lib/http/request/fetchrequest.ts
diff --git a/src/platform/web/lib/transport/xhrrequest.ts → ...atform/web/lib/http/request/xhrrequest.ts b/src/platform/web/lib/transport/xhrrequest.ts → ...atform/web/lib/http/request/xhrrequest.ts
diff --git a/src/platform/web/lib/transport/xhrpollingtransport.ts b/src/platform/web/lib/transport/xhrpollingtransport.ts
@@ -1,6 +1,6 @@
 import Platform from '../../../../common/platform';
 import CometTransport from '../../../../common/lib/transport/comettransport';
-import XHRRequest from './xhrrequest';
+import XHRRequest from '../http/request/xhrrequest';
 import ConnectionManager, { TransportParams, TransportStorage } from 'common/lib/transport/connectionmanager';
 import Auth from 'common/lib/client/auth';
 import { RequestParams } from 'common/types/http';

diff --git a/src/platform/web/lib/transport/xhrstreamingtransport.ts b/src/platform/web/lib/transport/xhrstreamingtransport.ts
@@ -1,6 +1,6 @@
 import CometTransport from '../../../../common/lib/transport/comettransport';
 import Platform from '../../../../common/platform';
-import XHRRequest from './xhrrequest';
+import XHRRequest from '../http/request/xhrrequest';
 import ConnectionManager, { TransportParams, TransportStorage } from 'common/lib/transport/connectionmanager';
 import Auth from 'common/lib/client/auth';
 import { RequestParams } from 'common/types/http';

diff --git a/src/platform/web/modules.ts b/src/platform/web/modules.ts
@@ -7,7 +7,7 @@ import ErrorInfo from '../../common/lib/types/errorinfo';
 // Platform Specific
 import BufferUtils from './lib/util/bufferutils';
 // @ts-ignore
-import Http from './lib/util/http';
+import Http from './lib/http/http';
 import Config from './config';
 // @ts-ignore
 import { ModulesTransports } from './lib/transport';