@subwallet/extension-base 1.1.25-1 → 1.1.27-0

package/services/wallet-connect-service/index.js

@@ -5,6 +5,7 @@ import _classPrivateFieldLooseKey from "@babel/runtime/helpers/esm/classPrivateF
 
 import { formatJsonRpcError } from '@json-rpc-tools/utils';
 import Eip155RequestHandler from '@subwallet/extension-base/services/wallet-connect-service/handler/Eip155RequestHandler';
+import { SWStorage } from '@subwallet/extension-base/storage';
 import SignClient from '@walletconnect/sign-client';
 import { getInternalError, getSdkError } from '@walletconnect/utils';
 import { BehaviorSubject } from 'rxjs';
@@ -12,6 +13,7 @@ import PolkadotRequestHandler from "./handler/PolkadotRequestHandler.js";
 import { ALL_WALLET_CONNECT_EVENT, DEFAULT_WALLET_CONNECT_OPTIONS, WALLET_CONNECT_SUPPORTED_METHODS } from "./constants.js";
 import { convertConnectRequest, convertNotSupportRequest, isSupportWalletConnectChain } from "./helpers.js";
 import { EIP155_SIGNING_METHODS, POLKADOT_SIGNING_METHODS } from "./types.js";
+const storage = SWStorage.instance;
 var _requestService = /*#__PURE__*/_classPrivateFieldLooseKey("requestService");
 var _polkadotRequestHandler = /*#__PURE__*/_classPrivateFieldLooseKey("polkadotRequestHandler");
 var _eip155RequestHandler = /*#__PURE__*/_classPrivateFieldLooseKey("eip155RequestHandler");
@@ -185,9 +187,9 @@ export default class WalletConnectService {
   }
 }
 function _get_haveData() {
-  const sessionStorage = localStorage.getItem('wc@2:client:0.3//session');
-  const pairingStorage = localStorage.getItem('wc@2:core:0.3//pairing');
-  const subscriptionStorage = localStorage.getItem('wc@2:core:0.3//subscription');
+  const sessionStorage = storage.getItem('wc@2:client:0.3//session');
+  const pairingStorage = storage.getItem('wc@2:core:0.3//pairing');
+  const subscriptionStorage = storage.getItem('wc@2:core:0.3//subscription');
   const sessions = sessionStorage ? JSON.parse(sessionStorage) : [];
   const pairings = pairingStorage ? JSON.parse(pairingStorage) : [];
   const subscriptions = subscriptionStorage ? JSON.parse(subscriptionStorage) : [];

package/storage/index.d.ts

@@ -0,0 +1,14 @@
+export declare class SWStorage {
+    private _storage;
+    constructor();
+    setItem(key: string, value: string): void;
+    getItem(key: string): string | null;
+    removeItem(key: string): void;
+    clear(): void;
+    key(index: number): string | null;
+    length(index: number): string | null;
+    keys(): string[];
+    copy(): Record<string, string>;
+    sync(): void;
+    static get instance(): SWStorage;
+}

package/storage/index.js

@@ -0,0 +1,52 @@
+// Copyright 2019-2022 @polkadot/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export class SWStorage {
+  _storage = {};
+  constructor() {
+    this.sync();
+  }
+  setItem(key, value) {
+    this._storage[key] = value;
+    localStorage.setItem(key, value);
+  }
+  getItem(key) {
+    return this._storage[key] || localStorage.getItem(key) || null;
+  }
+  removeItem(key) {
+    this._storage[key] && delete this._storage[key];
+    localStorage.removeItem(key);
+  }
+  clear() {
+    this._storage = {};
+    localStorage.clear();
+  }
+  key(index) {
+    return Object.keys(this._storage)[index] || null;
+  }
+  length(index) {
+    return Object.keys(this._storage)[index] || null;
+  }
+
+  // Additional methods
+  keys() {
+    return Object.keys(this._storage) || [];
+  }
+  copy() {
+    return JSON.parse(JSON.stringify(this._storage));
+  }
+  sync() {
+    this._storage = JSON.parse(JSON.stringify(localStorage));
+  }
+  static get instance() {
+    // @ts-ignore
+    if (!window.SWStorage) {
+      console.log('SWStorage init');
+      // @ts-ignore
+      window.SWStorage = new SWStorage();
+    }
+
+    // @ts-ignore
+    return window.SWStorage;
+  }
+}

package/utils/array.d.ts

@@ -1 +1,2 @@
 export declare const uniqueStringArray: (array: string[]) => string[];
+export declare function listMerge<T extends Record<string, any>>(keys: string[] | string, existed: T[], newItems: T[]): T[];

package/utils/array.js

@@ -7,4 +7,29 @@ export const uniqueStringArray = array => {
     map[v] = v;
   });
   return Object.keys(map);
-};
+};
+export function listMerge(keys, existed, newItems) {
+  const getKey = (ks, item) => {
+    if (typeof ks === 'string') {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-return
+      return item[ks].toString();
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-return
+    return ks.map(k => item[k].toString()).join('_');
+  };
+
+  // Build existed map with keys
+  const existedMap = Object.fromEntries(existed.map(v => {
+    return [getKey(keys, v), v];
+  }));
+  newItems.forEach(item => {
+    const key = getKey(keys, item);
+    if (existedMap[key]) {
+      Object.assign(existedMap[key], item);
+    } else {
+      existed.push(item);
+    }
+  });
+  return existed;
+}