add new type in api - settings in order to support different types of…

packages/ui-settings/src/Settings.ts

@@ -1,14 +1,13 @@
 // Copyright 2017-2021 @polkadot/ui-settings authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { Option, SettingsStruct } from './types';
-
 import EventEmitter from 'eventemitter3';
 import store from 'store';
 
 import { isUndefined } from '@polkadot/util';
 
 import { CAMERA, CAMERA_DEFAULT, CRYPTOS, CRYPTOS_ETH, CRYPTOS_LEDGER, ENDPOINT_DEFAULT, ENDPOINTS, ICON_DEFAULT, ICONS, LANGUAGE_DEFAULT, LEDGER_CONN, LEDGER_CONN_DEFAULT, LOCKING, LOCKING_DEFAULT, PREFIX_DEFAULT, PREFIXES, UIMODE_DEFAULT, UIMODES, UITHEME_DEFAULT, UITHEMES } from './defaults';
+import { Endpoint, EndpointType, Option, SettingsStruct } from './types';
 
 type ChangeCallback = (settings: SettingsStruct) => void;
 type OnTypes = 'change';
@@ -24,6 +23,9 @@ function withDefault (options: Option[], option: string | undefined, fallback: s
 export class Settings implements SettingsStruct {
   readonly #emitter: EventEmitter;
 
+  #apiType: Endpoint;
+
+  // will become deprecated for supporting substrate connect light clients. apiType structure should be used instead
   #apiUrl: string;
 
   #camera: string;
@@ -47,7 +49,9 @@ export class Settings implements SettingsStruct {
 
     this.#emitter = new EventEmitter();
 
+    // will become deprecated for supporting substrate connect light clients. apiType structure should be used instead
     this.#apiUrl = (typeof settings.apiUrl === 'string' && settings.apiUrl) || process.env.WS_URL || (ENDPOINT_DEFAULT.value as string);
+    this.#apiType = { type: EndpointType.jrpc, url: this.#apiUrl };
     this.#camera = withDefault(CAMERA, settings.camera, CAMERA_DEFAULT);
     this.#ledgerConn = withDefault(LEDGER_CONN, settings.ledgerConn, LEDGER_CONN_DEFAULT);
     this.#i18nLang = settings.i18nLang || LANGUAGE_DEFAULT;
@@ -62,6 +66,10 @@ export class Settings implements SettingsStruct {
     return this.#camera;
   }
 
+  public get apiType (): Endpoint {
+    return this.#apiType;
+  }
+
   public get apiUrl (): string {
     return this.#apiUrl;
   }
@@ -140,6 +148,7 @@ export class Settings implements SettingsStruct {
 
   public get (): SettingsStruct {
     return {
+      apiType: this.#apiType,
       apiUrl: this.#apiUrl,
       camera: this.#camera,
       i18nLang: this.#i18nLang,
@@ -153,6 +162,7 @@ export class Settings implements SettingsStruct {
   }
 
   public set (settings: Partial<SettingsStruct>): void {
+    this.#apiType = settings.apiType || this.#apiType;
     this.#apiUrl = settings.apiUrl || this.#apiUrl;
     this.#camera = settings.camera || this.#camera;
     this.#ledgerConn = settings.ledgerConn || this.#ledgerConn;

packages/ui-settings/src/index.ts

@@ -2,10 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { Settings, settings } from './Settings';
+import { Endpoint, EndpointType, JsonRpcEndpoint, SubstrateConnectEndpoint } from './types';
 
 export { ENDPOINT_DEFAULT, ICON_DEFAULT, ICON_DEFAULT_HOST, LANGUAGE_DEFAULT, LOCKING_DEFAULT, PREFIX_DEFAULT, UIMODE_DEFAULT, UITHEME_DEFAULT } from './defaults';
 export { packageInfo } from './packageInfo';
 
-export { settings, Settings };
+export { settings, Settings, Endpoint, JsonRpcEndpoint, SubstrateConnectEndpoint, EndpointType };
 
 export default settings;

packages/ui-settings/src/types.ts

@@ -9,6 +9,7 @@ export type Option = {
 }
 
 export interface SettingsStruct {
+  apiType: Endpoint;
   apiUrl: string;
   camera: string;
   i18nLang: string;
@@ -28,3 +29,19 @@ export interface NetworkSpecsStruct {
   title: string;
   unit: string;
 }
+
+export type Endpoint = JsonRpcEndpoint | SubstrateConnectEndpoint;
+export interface JsonRpcEndpoint {
+  type: EndpointType.jrpc;
+  url: string;
+}
+
+export interface SubstrateConnectEndpoint {
+  type: EndpointType.substrateconnect;
+  chain: string;
+}
+
+export enum EndpointType {
+  jrpc = 'json-rpc',
+  substrateconnect = 'substrate-connect'
+}