@keplr-wallet/stores-core 0.12.118 → 0.12.120-rc.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -23,6 +23,10 @@ export declare class ChainSuggestStore {
23
23
  chainInfo: ChainInfo;
24
24
  origin: string;
25
25
  }> | undefined;
26
+ get waitingSuggestedChainInfos(): import("@keplr-wallet/background").InteractionWaitingData<{
27
+ chainInfo: ChainInfo;
28
+ origin: string;
29
+ }>[];
26
30
  get communityChainInfoRepoUrl(): string;
27
31
  getCommunityChainInfoUrl(chainId: string): string;
28
32
  getCommunityChainInfo(chainId: string): {
@@ -34,7 +38,7 @@ export declare class ChainSuggestStore {
34
38
  })>>, void, import("@keplr-wallet/simple-fetch").SimpleFetchResponse<ChainInfo | (Omit<ChainInfo, "rest"> & {
35
39
  websocket: string;
36
40
  })>>;
37
- approveWithProceedNext(id: string, chainInfo: ChainInfoWithSuggestedOptions, afterFn: (proceedNext: boolean) => void | Promise<void>): Promise<void>;
41
+ approveWithProceedNext(ids: string | string[], chainInfo: ChainInfoWithSuggestedOptions, afterFn: (proceedNext: boolean) => void | Promise<void>): Promise<void>;
38
42
  rejectWithProceedNext(id: string, afterFn: (proceedNext: boolean) => void | Promise<void>): Promise<void>;
39
43
  rejectAll(): Promise<void>;
40
44
  isObsoleteInteraction(id: string | undefined): boolean;
@@ -34,6 +34,9 @@ class ChainSuggestStore {
34
34
  return data[0];
35
35
  }
36
36
  }
37
+ get waitingSuggestedChainInfos() {
38
+ return this.interactionStore.getAllData(background_1.SuggestChainInfoMsg.type());
39
+ }
37
40
  get communityChainInfoRepoUrl() {
38
41
  return `https://github.com/${this.communityChainInfoRepo.organizationName}/${this.communityChainInfoRepo.repoName}`;
39
42
  }
@@ -89,9 +92,9 @@ class ChainSuggestStore {
89
92
  });
90
93
  }
91
94
  }
92
- approveWithProceedNext(id, chainInfo, afterFn) {
95
+ approveWithProceedNext(ids, chainInfo, afterFn) {
93
96
  return __awaiter(this, void 0, void 0, function* () {
94
- yield this.interactionStore.approveWithProceedNextV2(id, chainInfo, afterFn);
97
+ yield this.interactionStore.approveWithProceedNextV2(ids, chainInfo, afterFn);
95
98
  });
96
99
  }
97
100
  rejectWithProceedNext(id, afterFn) {
@@ -1 +1 @@
1
- {"version":3,"file":"chain-suggest.js","sourceRoot":"","sources":["../../../src/core/interaction/chain-suggest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAEA,yDAGkC;AAClC,+BAAwD;AACxD,iDAAqD;AACrD,iDAAmD;AACnD,6DAAyD;AAEzD,MAAa,iBAAiB;IAU5B,YACqB,gBAAkC,EAClC,sBAKlB;QANkB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,2BAAsB,GAAtB,sBAAsB,CAKxC;QAfO,uBAAkB,GAMxB,IAAI,GAAG,EAAE,CAAC;QAWZ,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,yBAAyB;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAG1C,gCAAmB,CAAC,IAAI,EAAE,CAAC,CAAC;QAE/B,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;SAChB;IACH,CAAC;IAED,IAAI,yBAAyB;QAC3B,OAAO,sBAAsB,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,IAAI,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,CAAC;IACtH,CAAC;IAED,wBAAwB,CAAC,OAAe;QACtC,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,aAAa,GAAG,sBAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACnD,OAAO,GAAG,IAAI,CAAC,yBAAyB,SACtC,IAAI,CAAC,sBAAsB,CAAC,UAC9B,IAAI,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,IAAI,aAAa,CAAC,UAAU,OAAO,CAAC;IAC3E,CAAC;IAED,qBAAqB,CAAC,OAAe;QAInC,MAAM,eAAe,GAAG,sBAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;QAChE,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE;YACjD,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;SACvC;QAED,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAE,CAAC;IACvD,CAAC;IAGU,AAAD,CAAC,uBAAuB,CAAC,OAAe;;QAChD,MAAM,eAAe,GAAG,sBAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;QAChE,MAAM,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QACxE,IAAI,kBAAkB,EAAE;YACtB,OAAO;SACR;QAED,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,EAAE;YAC3C,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QAEH,IAAI;YACF,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YACrD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,IAAA,oBAAW,EACjC,IAAA,0BAAW,EAGT,IAAI,CAAC,sBAAsB,CAAC,cAAc;gBACxC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,cAAc;qBACvC,OAAO,CAAC,oBAAoB,EAAE,eAAe,CAAC;qBAC9C,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;gBAC/D,CAAC,CAAC,qCACE,IAAI,CAAC,sBAAsB,CAAC,gBAC9B,IAAI,IAAI,CAAC,sBAAsB,CAAC,QAAQ,IACtC,IAAI,CAAC,sBAAsB,CAAC,UAC9B,IAAI,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,IAAI,eAAe,OAAO,CACpE,CACF,CAAC;YACF,MAAM,SAAS,GACb,MAAM,IAAI,QAAQ,CAAC,IAAI,IAAI,CAAC,cAAc;gBACxC,CAAC,CAAC,QAAQ,CAAC,IAAI;gBACf,CAAC,iCACM,QAAQ,CAAC,IAAI,KAChB,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,EACvB,GAAG,kBACD,OAAO,EAAE,QAAQ,CACf,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,EAC5C,EAAE,CACH,EACD,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,IACnB,CAAC,WAAW,IAAI,QAAQ,CAAC,IAAI,IAAI;wBAClC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,SAAS;qBACnC,CAAC,GAEJ,QAAQ,EAAE,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC,MAAM,CAClD,MAAA,QAAQ,CAAC,IAAI,CAAC,QAAQ,mCAAI,EAAE,CAC7B,GACF,CAAC;YAER,IACE,sBAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,UAAU;gBACrD,eAAe,EACf;gBACA,MAAM,IAAI,KAAK,CACb,wCAAwC,eAAe,aACrD,sBAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,UAC7C,GAAG,CACJ,CAAC;aACH;YAED,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,EAAE;gBAC3C,SAAS,EAAE,KAAK;gBAChB,SAAS;aACV,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACf,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,EAAE;gBAC3C,SAAS,EAAE,KAAK;gBAChB,SAAS,EAAE,SAAS;aACrB,CAAC,CAAC;SACJ;IACH,CAAC;IAEK,sBAAsB,CAC1B,EAAU,EACV,SAAwC,EACxC,OAAuD;;YAEvD,MAAM,IAAI,CAAC,gBAAgB,CAAC,wBAAwB,CAClD,EAAE,EACF,SAAS,EACT,OAAO,CACR,CAAC;QACJ,CAAC;KAAA;IAEK,qBAAqB,CACzB,EAAU,EACV,OAAuD;;YAEvD,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACjE,CAAC;KAAA;IAEK,SAAS;;YACb,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,gCAAmB,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,CAAC;KAAA;IAED,qBAAqB,CAAC,EAAsB;QAC1C,OAAO,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;IACzD,CAAC;CACF;AA5JW;IADT,iBAAU,CAAC,OAAO;6DAOL;AAkDH;IADV,WAAI;gEAyEJ;AAlIH,8CA8JC"}
1
+ {"version":3,"file":"chain-suggest.js","sourceRoot":"","sources":["../../../src/core/interaction/chain-suggest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAEA,yDAGkC;AAClC,+BAAwD;AACxD,iDAAqD;AACrD,iDAAmD;AACnD,6DAAyD;AAEzD,MAAa,iBAAiB;IAU5B,YACqB,gBAAkC,EAClC,sBAKlB;QANkB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,2BAAsB,GAAtB,sBAAsB,CAKxC;QAfO,uBAAkB,GAMxB,IAAI,GAAG,EAAE,CAAC;QAWZ,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,yBAAyB;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAG1C,gCAAmB,CAAC,IAAI,EAAE,CAAC,CAAC;QAE/B,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;SAChB;IACH,CAAC;IAED,IAAI,0BAA0B;QAC5B,OAAO,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAGpC,gCAAmB,CAAC,IAAI,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,yBAAyB;QAC3B,OAAO,sBAAsB,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,IAAI,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,CAAC;IACtH,CAAC;IAED,wBAAwB,CAAC,OAAe;QACtC,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,aAAa,GAAG,sBAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACnD,OAAO,GAAG,IAAI,CAAC,yBAAyB,SACtC,IAAI,CAAC,sBAAsB,CAAC,UAC9B,IAAI,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,IAAI,aAAa,CAAC,UAAU,OAAO,CAAC;IAC3E,CAAC;IAED,qBAAqB,CAAC,OAAe;QAInC,MAAM,eAAe,GAAG,sBAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;QAChE,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE;YACjD,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;SACvC;QAED,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAE,CAAC;IACvD,CAAC;IAGU,AAAD,CAAC,uBAAuB,CAAC,OAAe;;QAChD,MAAM,eAAe,GAAG,sBAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;QAChE,MAAM,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QACxE,IAAI,kBAAkB,EAAE;YACtB,OAAO;SACR;QAED,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,EAAE;YAC3C,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QAEH,IAAI;YACF,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YACrD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,IAAA,oBAAW,EACjC,IAAA,0BAAW,EAGT,IAAI,CAAC,sBAAsB,CAAC,cAAc;gBACxC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,cAAc;qBACvC,OAAO,CAAC,oBAAoB,EAAE,eAAe,CAAC;qBAC9C,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;gBAC/D,CAAC,CAAC,qCACE,IAAI,CAAC,sBAAsB,CAAC,gBAC9B,IAAI,IAAI,CAAC,sBAAsB,CAAC,QAAQ,IACtC,IAAI,CAAC,sBAAsB,CAAC,UAC9B,IAAI,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,IAAI,eAAe,OAAO,CACpE,CACF,CAAC;YACF,MAAM,SAAS,GACb,MAAM,IAAI,QAAQ,CAAC,IAAI,IAAI,CAAC,cAAc;gBACxC,CAAC,CAAC,QAAQ,CAAC,IAAI;gBACf,CAAC,iCACM,QAAQ,CAAC,IAAI,KAChB,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,EACvB,GAAG,kBACD,OAAO,EAAE,QAAQ,CACf,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,EAC5C,EAAE,CACH,EACD,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,IACnB,CAAC,WAAW,IAAI,QAAQ,CAAC,IAAI,IAAI;wBAClC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,SAAS;qBACnC,CAAC,GAEJ,QAAQ,EAAE,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC,MAAM,CAClD,MAAA,QAAQ,CAAC,IAAI,CAAC,QAAQ,mCAAI,EAAE,CAC7B,GACF,CAAC;YAER,IACE,sBAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,UAAU;gBACrD,eAAe,EACf;gBACA,MAAM,IAAI,KAAK,CACb,wCAAwC,eAAe,aACrD,sBAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,UAC7C,GAAG,CACJ,CAAC;aACH;YAED,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,EAAE;gBAC3C,SAAS,EAAE,KAAK;gBAChB,SAAS;aACV,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACf,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,EAAE;gBAC3C,SAAS,EAAE,KAAK;gBAChB,SAAS,EAAE,SAAS;aACrB,CAAC,CAAC;SACJ;IACH,CAAC;IAEK,sBAAsB,CAC1B,GAAsB,EACtB,SAAwC,EACxC,OAAuD;;YAEvD,MAAM,IAAI,CAAC,gBAAgB,CAAC,wBAAwB,CAClD,GAAG,EACH,SAAS,EACT,OAAO,CACR,CAAC;QACJ,CAAC;KAAA;IAEK,qBAAqB,CACzB,EAAU,EACV,OAAuD;;YAEvD,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACjE,CAAC;KAAA;IAEK,SAAS;;YACb,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,gCAAmB,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,CAAC;KAAA;IAED,qBAAqB,CAAC,EAAsB;QAC1C,OAAO,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;IACzD,CAAC;CACF;AAnKW;IADT,iBAAU,CAAC,OAAO;6DAOL;AAyDH;IADV,WAAI;gEAyEJ;AAzIH,8CAqKC"}
@@ -3,12 +3,24 @@ import { InteractionForegroundHandler, InteractionWaitingData } from "@keplr-wal
3
3
  export declare class InteractionStore implements InteractionForegroundHandler {
4
4
  protected readonly router: Router;
5
5
  protected readonly msgRequester: MessageRequester;
6
- protected data: InteractionWaitingData[];
6
+ protected readonly afterInteraction?: ((next: (InteractionWaitingData & {
7
+ uri: string;
8
+ }) | undefined) => void) | undefined;
9
+ protected readonly onDataReceived?: ((data: InteractionWaitingData[]) => Promise<InteractionWaitingData[]>) | undefined;
10
+ protected readonly onDataChanged?: ((old: InteractionWaitingData[], fresh: InteractionWaitingData[]) => void) | undefined;
11
+ protected readonly pingHandler?: ((windowId: number | undefined, ignoreWindowIdAndForcePing: boolean) => Promise<boolean>) | undefined;
12
+ protected _isInitialized: boolean;
13
+ data: InteractionWaitingData[];
7
14
  protected obsoleteData: Map<string, boolean>;
8
- constructor(router: Router, msgRequester: MessageRequester);
15
+ constructor(router: Router, msgRequester: MessageRequester, afterInteraction?: ((next: (InteractionWaitingData & {
16
+ uri: string;
17
+ }) | undefined) => void) | undefined, onDataReceived?: ((data: InteractionWaitingData[]) => Promise<InteractionWaitingData[]>) | undefined, onDataChanged?: ((old: InteractionWaitingData[], fresh: InteractionWaitingData[]) => void) | undefined, pingHandler?: ((windowId: number | undefined, ignoreWindowIdAndForcePing: boolean) => Promise<boolean>) | undefined);
18
+ init(): Promise<void>;
19
+ get isInitialized(): boolean;
20
+ protected refreshData(): Promise<void>;
9
21
  getAllData: <T = unknown>(type: string) => InteractionWaitingData<T>[];
10
22
  getData: <T = unknown>(id: string) => InteractionWaitingData<T> | undefined;
11
- onInteractionDataReceived(data: InteractionWaitingData): void;
23
+ onInteractionDataReceived(): void;
12
24
  onEventDataReceived(): void;
13
25
  /**
14
26
  * 웹페이지에서 어떤 API를 요청해서 extension이 켜졌을때
@@ -5,6 +5,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
5
5
  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
6
  return c > 3 && r && Object.defineProperty(target, key, r), r;
7
7
  };
8
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
9
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
10
+ return new (P || (P = Promise))(function (resolve, reject) {
11
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
12
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
13
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
14
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
15
+ });
16
+ };
8
17
  Object.defineProperty(exports, "__esModule", { value: true });
9
18
  exports.InteractionStore = void 0;
10
19
  const router_1 = require("@keplr-wallet/router");
@@ -12,9 +21,15 @@ const background_1 = require("@keplr-wallet/background");
12
21
  const mobx_1 = require("mobx");
13
22
  const mobx_utils_1 = require("mobx-utils");
14
23
  class InteractionStore {
15
- constructor(router, msgRequester) {
24
+ constructor(router, msgRequester, afterInteraction, onDataReceived, onDataChanged, pingHandler) {
16
25
  this.router = router;
17
26
  this.msgRequester = msgRequester;
27
+ this.afterInteraction = afterInteraction;
28
+ this.onDataReceived = onDataReceived;
29
+ this.onDataChanged = onDataChanged;
30
+ this.pingHandler = pingHandler;
31
+ this._isInitialized = false;
32
+ // TODO: 일단 빠르게 개발해보려고 얘를 public으로 바꿨지만 적절한 방식이 아니다. 좀 더 고민해본다...
18
33
  this.data = [];
19
34
  // 원래 obsolete에 대한 정보를 data 밑의 field에 포함시켰는데
20
35
  // obsolete 처리가 추가되기 전에는 data는 한번 받으면 그 이후에 변화되지 않는다는 가정으로 다른 로직이 짜여졌었다.
@@ -29,11 +44,48 @@ class InteractionStore {
29
44
  return this.data.find((d) => d.id === id);
30
45
  });
31
46
  (0, mobx_1.makeObservable)(this);
32
- const service = new background_1.InteractionForegroundService(this);
47
+ const service = new background_1.InteractionForegroundService(this, pingHandler);
33
48
  (0, background_1.interactionForegroundInit)(router, service);
49
+ this.init();
50
+ }
51
+ init() {
52
+ return __awaiter(this, void 0, void 0, function* () {
53
+ yield this.refreshData();
54
+ (0, mobx_1.runInAction)(() => {
55
+ this._isInitialized = true;
56
+ });
57
+ });
58
+ }
59
+ get isInitialized() {
60
+ return this._isInitialized;
34
61
  }
35
- onInteractionDataReceived(data) {
36
- this.data.push(data);
62
+ refreshData() {
63
+ return __awaiter(this, void 0, void 0, function* () {
64
+ // 어차피 interaction data는 한번 생성되면 값이 바뀌지 않도록 만들어져있고
65
+ // id는 겹칠 수 없기 때문에 이걸 key로 사용한다.
66
+ // refresh한 이후에 값이 바뀐게 아니라면 ref도 바꾸지 않기 위해서 값 자체를 바꾸지 않는다.
67
+ const prevKey = this.data.map((d) => d.id).join("/");
68
+ let data = yield this.msgRequester.sendMessage(router_1.BACKGROUND_PORT, new background_1.GetInteractionWaitingDataArrayMsg());
69
+ if (this.onDataReceived) {
70
+ data = yield this.onDataReceived(data);
71
+ }
72
+ const newKey = data.map((d) => d.id).join("/");
73
+ if (prevKey !== newKey) {
74
+ const prev = this.data.slice();
75
+ (0, mobx_1.runInAction)(() => {
76
+ this.data = data;
77
+ });
78
+ if (this.onDataChanged) {
79
+ this.onDataChanged(prev, data.slice());
80
+ }
81
+ }
82
+ });
83
+ }
84
+ onInteractionDataReceived() {
85
+ // this.data.push(data);
86
+ // XXX: 로직의 간편화를 위해서 여기서 data를 직접 this.data에 넣기보다 그냥 백그라운드로부터 refesh를 선택한다.
87
+ // no need to await.
88
+ this.refreshData();
37
89
  }
38
90
  onEventDataReceived() {
39
91
  // noop
@@ -58,6 +110,10 @@ class InteractionStore {
58
110
  yield this.delay(100);
59
111
  yield afterFn(this.hasOtherData(id));
60
112
  this.removeData(id);
113
+ if (this.afterInteraction) {
114
+ const next = this.data[0];
115
+ this.afterInteraction(next);
116
+ }
61
117
  }
62
118
  /**
63
119
  * 웹페이지에서 어떤 API를 요청해서 extension이 켜졌을때
@@ -96,6 +152,10 @@ class InteractionStore {
96
152
  }
97
153
  yield afterFn(this.hasOtherData(ids));
98
154
  this.removeData(ids);
155
+ if (this.afterInteraction) {
156
+ const next = this.data[0];
157
+ this.afterInteraction(next);
158
+ }
99
159
  }
100
160
  /**
101
161
  * 웹페이지에서 어떤 API를 요청해서 extension이 켜졌을때
@@ -116,6 +176,10 @@ class InteractionStore {
116
176
  yield this.delay(100);
117
177
  yield afterFn(this.hasOtherData(id));
118
178
  this.removeData(id);
179
+ if (this.afterInteraction) {
180
+ const next = this.data[0];
181
+ this.afterInteraction(next);
182
+ }
119
183
  }
120
184
  /**
121
185
  * 웹페이지에서 어떤 API를 요청해서 extension이 켜졌을때
@@ -147,6 +211,10 @@ class InteractionStore {
147
211
  yield this.delay(50);
148
212
  yield afterFn(this.hasOtherData(ids));
149
213
  this.removeData(ids);
214
+ if (this.afterInteraction) {
215
+ const next = this.data[0];
216
+ this.afterInteraction(next);
217
+ }
150
218
  }
151
219
  delay(ms) {
152
220
  return new Promise((resolve) => {
@@ -195,6 +263,9 @@ class InteractionStore {
195
263
  return !!find;
196
264
  }
197
265
  }
266
+ __decorate([
267
+ mobx_1.observable
268
+ ], InteractionStore.prototype, "_isInitialized", void 0);
198
269
  __decorate([
199
270
  mobx_1.observable.shallow
200
271
  ], InteractionStore.prototype, "data", void 0);
@@ -1 +1 @@
1
- {"version":3,"file":"interaction.js","sourceRoot":"","sources":["../../../src/core/interaction/interaction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"interaction.js","sourceRoot":"","sources":["../../../src/core/interaction/interaction.ts"],"names":[],"mappings":"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"}
@@ -37,12 +37,12 @@ export type SignInteractionData = {
37
37
  export declare class SignInteractionStore {
38
38
  protected readonly interactionStore: InteractionStore;
39
39
  constructor(interactionStore: InteractionStore);
40
- get waitingDatas(): InteractionWaitingData<SignInteractionData & {
40
+ get waitingDatas(): Omit<InteractionWaitingData<SignInteractionData & {
41
41
  signDocWrapper: SignDocWrapper;
42
- }>[];
43
- get waitingData(): InteractionWaitingData<SignInteractionData & {
42
+ }>, "uri" | "windowId">[];
43
+ get waitingData(): Omit<InteractionWaitingData<SignInteractionData & {
44
44
  signDocWrapper: SignDocWrapper;
45
- }> | undefined;
45
+ }>, "uri" | "windowId"> | undefined;
46
46
  approveWithProceedNext(id: string, newSignDocWrapper: SignDocWrapper, signature: Uint8Array | undefined, afterFn: (proceedNext: boolean) => void | Promise<void>, options?: {
47
47
  preDelay?: number;
48
48
  }): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"sign.js","sourceRoot":"","sources":["../../../src/core/interaction/sign.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sign.js","sourceRoot":"","sources":["../../../src/core/interaction/sign.ts"],"names":[],"mappings":"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"}
@@ -111,6 +111,13 @@ export declare class KeyRingStore {
111
111
  status: KeyRingStatus;
112
112
  keyInfos: KeyInfo[];
113
113
  }>;
114
+ unlockWithoutSyncStatus(password: string): Generator<Promise<{
115
+ status: KeyRingStatus;
116
+ keyInfos: KeyInfo[];
117
+ }>, void, {
118
+ status: KeyRingStatus;
119
+ keyInfos: KeyInfo[];
120
+ }>;
114
121
  changeKeyRingName(vaultId: string, name: string): Generator<Promise<{
115
122
  status: KeyRingStatus;
116
123
  keyInfos: KeyInfo[];
@@ -191,6 +191,21 @@ class KeyRingStore {
191
191
  this._isMigrating = false;
192
192
  }
193
193
  }
194
+ *unlockWithoutSyncStatus(password) {
195
+ if (this._needMigration) {
196
+ this._isMigrating = true;
197
+ }
198
+ try {
199
+ const msg = new background_1.UnlockKeyRingMsg(password);
200
+ const result = yield* (0, common_1.toGenerator)(this.requester.sendMessage(router_1.BACKGROUND_PORT, msg));
201
+ this._keyInfos = result.keyInfos;
202
+ this._needMigration = false;
203
+ }
204
+ finally {
205
+ // Set the flag to false even if the migration is failed.
206
+ this._isMigrating = false;
207
+ }
208
+ }
194
209
  *changeKeyRingName(vaultId, name) {
195
210
  const msg = new background_1.ChangeKeyRingNameMsg(vaultId, name);
196
211
  const result = yield* (0, common_1.toGenerator)(this.requester.sendMessage(router_1.BACKGROUND_PORT, msg));
@@ -280,6 +295,9 @@ __decorate([
280
295
  __decorate([
281
296
  mobx_1.flow
282
297
  ], KeyRingStore.prototype, "unlock", null);
298
+ __decorate([
299
+ mobx_1.flow
300
+ ], KeyRingStore.prototype, "unlockWithoutSyncStatus", null);
283
301
  __decorate([
284
302
  mobx_1.flow
285
303
  ], KeyRingStore.prototype, "changeKeyRingName", null);
@@ -1 +1 @@
1
- {"version":3,"file":"keyring.js","sourceRoot":"","sources":["../../src/core/keyring.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"keyring.js","sourceRoot":"","sources":["../../src/core/keyring.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,iDAAyE;AACzE,+BAOc;AACd,iDAAmD;AACnD,yDAwBkC;AAGlC,iDAAqD;AAErD,MAAa,YAAY;IAgBvB,YACqB,eAElB,EACkB,SAA2B;QAH3B,oBAAe,GAAf,eAAe,CAEjC;QACkB,cAAS,GAAT,SAAS,CAAkB;QAlBtC,mBAAc,GAAY,KAAK,CAAC;QAGhC,YAAO,GAAiC,YAAY,CAAC;QAGrD,mBAAc,GAAY,KAAK,CAAC;QAGhC,iBAAY,GAAY,KAAK,CAAC;QAG9B,cAAS,GAAc,EAAE,CAAC;QAQlC,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC;QAErB,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAEK,IAAI;;YACR,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAElC,IAAA,kBAAW,EAAC,GAAG,EAAE;gBACf,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;YAC7B,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAEK,oBAAoB;;YACxB,IAAI,IAAI,CAAC,aAAa,EAAE;gBACtB,OAAO;aACR;YAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC7B,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,GAAG,EAAE;oBAC5B,IAAI,IAAI,CAAC,aAAa,EAAE;wBACtB,OAAO,EAAE,CAAC;wBAEV,IAAI,QAAQ,EAAE;4BACZ,QAAQ,EAAE,CAAC;yBACZ;qBACF;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEK,kBAAkB;;YACtB,MAAM,GAAG,GAAG,IAAI,oCAAuB,EAAE,CAAC;YAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CAAC;YACtE,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC;KAAA;IAGD,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,OAAO,KAAK,OAAO,CAAC;IAClC,CAAC;IAGA,AAAD,CAAC,oBAAoB;QACnB,MAAM,GAAG,GAAG,IAAI,gCAAmB,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAA,oBAAW,EAC/B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CACjD,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,aAAa,CAAC;QAC3C,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC;IACzC,CAAC;IAGA,AAAD,CAAC,aAAa,CAAC,OAAe;QAC5B,MAAM,GAAG,GAAG,IAAI,6BAAgB,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAA,oBAAW,EAC/B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CACjD,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;QAEjC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;IAC7D,CAAC;IAED,uBAAuB,CAAC,OAAe,EAAE,SAAoB;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC;QACxE,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,KAAK,CAAC;SACd;QAED,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE;YAC9D,OAAO,KAAK,CAAC;SACd;QAED,MAAM,WAAW,GAAG,WAClB,sBAAa,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,UACzC,WAAW,CAAC;QAEZ,OAAO,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC;IAClD,CAAC;IAEK,+BAA+B,CACnC,OAAe,EACf,OAAe;;YAOf,MAAM,GAAG,GAAG,IAAI,+CAAkC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAErE,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CAAC;QAChE,CAAC;KAAA;IAEK,WAAW,CAAC,OAAe,EAAE,QAAgB;;YACjD,MAAM,GAAG,GAAG,IAAI,wCAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/D,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CAAC;QAChE,CAAC;KAAA;IAGA,AAAD,CAAC,mBAAmB,CAAC,OAAe,EAAE,OAAe,EAAE,QAAgB;QACrE,MAAM,GAAG,GAAG,IAAI,mCAAsB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAA,oBAAW,EAC/B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CACjD,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;QAEjC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;IAC7D,CAAC;IAGA,AAAD,CAAC,cAAc,CACb,QAAgB,EAChB,WAAwB,EACxB,IAAY,EACZ,QAA4B,EAC5B,IAAkB;QAElB,MAAM,GAAG,GAAG,IAAI,8BAAiB,CAC/B,QAAQ,EACR,WAAW,EACX,IAAI,EACJ,QAAQ,EACR,IAAI,CACL,CAAC;QACF,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAA,oBAAW,EAC/B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CACjD,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;QAEjC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;QAE3D,OAAO,MAAM,CAAC,OAAO,CAAC;IACxB,CAAC;IAGA,AAAD,CAAC,YAAY,CACX,MAAkB,EAClB,GAAW,EACX,WAAwB,EACxB,IAAY,EACZ,QAA4B;QAE5B,MAAM,GAAG,GAAG,IAAI,4BAAe,CAAC,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC1E,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAA,oBAAW,EAC/B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CACjD,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;QAEjC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;QAE3D,OAAO,MAAM,CAAC,OAAO,CAAC;IACxB,CAAC;IAGA,AAAD,CAAC,kBAAkB,CAAC,OAAe,EAAE,MAAkB,EAAE,GAAW;QAClE,MAAM,GAAG,GAAG,IAAI,kCAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAA,oBAAW,EAC/B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CACjD,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;QAEjC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;IAC7D,CAAC;IAGA,AAAD,CAAC,cAAc,CACb,aAA4B,EAC5B,IAAY,EACZ,QAA4B;QAE5B,MAAM,GAAG,GAAG,IAAI,8BAAiB,CAAC,aAAa,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAA,oBAAW,EAC/B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CACjD,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;QAEjC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;QAE3D,OAAO,MAAM,CAAC,OAAO,CAAC;IACxB,CAAC;IAGA,AAAD,CAAC,gBAAgB,CACf,UAAsB,EACtB,IAAiB,EACjB,IAAY,EACZ,QAA4B;QAE5B,MAAM,GAAG,GAAG,IAAI,gCAAmB,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAA,oBAAW,EAC/B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CACjD,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;QAEjC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;QAE3D,OAAO,MAAM,CAAC,OAAO,CAAC;IACxB,CAAC;IAGA,AAAD,CAAC,IAAI;QACH,MAAM,GAAG,GAAG,IAAI,2BAAc,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAA,oBAAW,EAC/B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CACjD,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/B,CAAC;IAGA,AAAD,CAAC,MAAM,CAAC,QAAgB;QACtB,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;SAC1B;QAED,IAAI;YACF,MAAM,GAAG,GAAG,IAAI,6BAAgB,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAA,oBAAW,EAC/B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CACjD,CAAC;YACF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;YAC7B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;YAEjC,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;SAC7B;gBAAS;YACR,yDAAyD;YACzD,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;SAC3B;IACH,CAAC;IAGA,AAAD,CAAC,uBAAuB,CAAC,QAAgB;QACvC,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;SAC1B;QAED,IAAI;YACF,MAAM,GAAG,GAAG,IAAI,6BAAgB,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAA,oBAAW,EAC/B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CACjD,CAAC;YACF,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;YAEjC,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;SAC7B;gBAAS;YACR,yDAAyD;YACzD,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;SAC3B;IACH,CAAC;IAGA,AAAD,CAAC,iBAAiB,CAAC,OAAe,EAAE,IAAY;QAC9C,MAAM,GAAG,GAAG,IAAI,iCAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAA,oBAAW,EAC/B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CACjD,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;QAEjC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;IAC7D,CAAC;IAGA,AAAD,CAAC,aAAa,CAAC,OAAe,EAAE,QAAgB;QAC9C,MAAM,GAAG,GAAG,IAAI,6BAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAA,oBAAW,EAC/B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CACjD,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;QAEjC,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,EAAE;YACtD,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;SAC5D;IACH,CAAC;IAEK,kBAAkB,CACtB,gBAAwB,EACxB,eAAuB;;YAEvB,MAAM,GAAG,GAAG,IAAI,kCAAqB,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;YACzE,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CAAC;QAChE,CAAC;KAAA;IAEK,0BAA0B,CAAC,QAAgB;;YAC/C,MAAM,GAAG,GAAG,IAAI,0CAA6B,CAAC,QAAQ,CAAC,CAAC;YACxD,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CAAC;QAChE,CAAC;KAAA;IAEK,aAAa,CAAC,QAAgB;;YAClC,MAAM,GAAG,GAAG,IAAI,6BAAgB,CAAC,QAAQ,CAAC,CAAC;YAC3C,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CAAC;QAChE,CAAC;KAAA;IAEK,cAAc,CAAC,UAAkB;;YACrC,MAAM,GAAG,GAAG,IAAI,8BAAiB,CAAC,UAAU,CAAC,CAAC;YAC9C,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAe,EAAE,GAAG,CAAC,CAAC;QAChE,CAAC;KAAA;CACF;AA/VW;IADT,iBAAU;oDAC+B;AAGhC;IADT,iBAAU;6CACoD;AAGrD;IADT,iBAAU;oDAC+B;AAGhC;IADT,iBAAU;kDAC6B;AAG9B;IADT,iBAAU,CAAC,GAAG;+CACqB;AAkEpC;IADC,eAAQ;mDAGR;AAOA;IADA,WAAI;wDAUJ;AAGA;IADA,WAAI;iDAUJ;AAuCA;IADA,WAAI;uDAUJ;AAGA;IADA,WAAI;kDAwBJ;AAGA;IADA,WAAI;gDAkBJ;AAGA;IADA,WAAI;sDAUJ;AAGA;IADA,WAAI;kDAgBJ;AAGA;IADA,WAAI;oDAiBJ;AAGA;IADA,WAAI;wCAOJ;AAGA;IADA,WAAI;0CAmBJ;AAGA;IADA,WAAI;2DAkBJ;AAGA;IADA,WAAI;qDAUJ;AAGA;IADA,WAAI;iDAYJ;AAzUH,oCAiWC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@keplr-wallet/stores-core",
3
- "version": "0.12.118",
3
+ "version": "0.12.120-rc.0",
4
4
  "main": "build/index.js",
5
5
  "author": "chainapsis",
6
6
  "license": "Apache-2.0",
@@ -16,18 +16,18 @@
16
16
  "lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
17
17
  },
18
18
  "dependencies": {
19
- "@keplr-wallet/background": "0.12.118",
20
- "@keplr-wallet/common": "0.12.118",
21
- "@keplr-wallet/cosmos": "0.12.118",
22
- "@keplr-wallet/router": "0.12.118",
23
- "@keplr-wallet/simple-fetch": "0.12.118",
24
- "@keplr-wallet/stores": "0.12.118",
25
- "@keplr-wallet/types": "0.12.118",
19
+ "@keplr-wallet/background": "0.12.120-rc.0",
20
+ "@keplr-wallet/common": "0.12.120-rc.0",
21
+ "@keplr-wallet/cosmos": "0.12.120-rc.0",
22
+ "@keplr-wallet/router": "0.12.120-rc.0",
23
+ "@keplr-wallet/simple-fetch": "0.12.120-rc.0",
24
+ "@keplr-wallet/stores": "0.12.120-rc.0",
25
+ "@keplr-wallet/types": "0.12.120-rc.0",
26
26
  "buffer": "^6.0.3"
27
27
  },
28
28
  "peerDependencies": {
29
29
  "mobx": "^6",
30
30
  "mobx-utils": "^6"
31
31
  },
32
- "gitHead": "f9cec64d613cf117c84fcfc38554affd4daaf906"
32
+ "gitHead": "1ce64ffb879d3d6040a14c6e1341ff8e4a45c0be"
33
33
  }
@@ -42,6 +42,13 @@ export class ChainSuggestStore {
42
42
  }
43
43
  }
44
44
 
45
+ get waitingSuggestedChainInfos() {
46
+ return this.interactionStore.getAllData<{
47
+ chainInfo: ChainInfo;
48
+ origin: string;
49
+ }>(SuggestChainInfoMsg.type());
50
+ }
51
+
45
52
  get communityChainInfoRepoUrl(): string {
46
53
  return `https://github.com/${this.communityChainInfoRepo.organizationName}/${this.communityChainInfoRepo.repoName}`;
47
54
  }
@@ -142,12 +149,12 @@ export class ChainSuggestStore {
142
149
  }
143
150
 
144
151
  async approveWithProceedNext(
145
- id: string,
152
+ ids: string | string[],
146
153
  chainInfo: ChainInfoWithSuggestedOptions,
147
154
  afterFn: (proceedNext: boolean) => void | Promise<void>
148
155
  ) {
149
156
  await this.interactionStore.approveWithProceedNextV2(
150
- id,
157
+ ids,
151
158
  chainInfo,
152
159
  afterFn
153
160
  );
@@ -12,13 +12,25 @@ import {
12
12
  ApproveInteractionV2Msg,
13
13
  RejectInteractionMsg,
14
14
  RejectInteractionV2Msg,
15
+ GetInteractionWaitingDataArrayMsg,
15
16
  } from "@keplr-wallet/background";
16
- import { action, observable, makeObservable, flow, toJS } from "mobx";
17
+ import {
18
+ action,
19
+ observable,
20
+ makeObservable,
21
+ flow,
22
+ toJS,
23
+ runInAction,
24
+ } from "mobx";
17
25
  import { computedFn } from "mobx-utils";
18
26
 
19
27
  export class InteractionStore implements InteractionForegroundHandler {
28
+ @observable
29
+ protected _isInitialized: boolean = false;
30
+
31
+ // TODO: 일단 빠르게 개발해보려고 얘를 public으로 바꿨지만 적절한 방식이 아니다. 좀 더 고민해본다...
20
32
  @observable.shallow
21
- protected data: InteractionWaitingData[] = [];
33
+ public data: InteractionWaitingData[] = [];
22
34
  // 원래 obsolete에 대한 정보를 data 밑의 field에 포함시켰는데
23
35
  // obsolete 처리가 추가되기 전에는 data는 한번 받으면 그 이후에 변화되지 않는다는 가정으로 다른 로직이 짜여졌었다.
24
36
  // ref도 변하면 안됐기 때문에 obsolete가 data 밑에 있으면 이러한 요구사항을 이루면서 처리할 수가 없다.
@@ -29,12 +41,65 @@ export class InteractionStore implements InteractionForegroundHandler {
29
41
 
30
42
  constructor(
31
43
  protected readonly router: Router,
32
- protected readonly msgRequester: MessageRequester
44
+ protected readonly msgRequester: MessageRequester,
45
+ protected readonly afterInteraction?: (
46
+ next: (InteractionWaitingData & { uri: string }) | undefined
47
+ ) => void,
48
+ protected readonly onDataReceived?: (
49
+ data: InteractionWaitingData[]
50
+ ) => Promise<InteractionWaitingData[]>,
51
+ protected readonly onDataChanged?: (
52
+ old: InteractionWaitingData[],
53
+ fresh: InteractionWaitingData[]
54
+ ) => void,
55
+ protected readonly pingHandler?: (
56
+ windowId: number | undefined,
57
+ ignoreWindowIdAndForcePing: boolean
58
+ ) => Promise<boolean>
33
59
  ) {
34
60
  makeObservable(this);
35
61
 
36
- const service = new InteractionForegroundService(this);
62
+ const service = new InteractionForegroundService(this, pingHandler);
37
63
  interactionForegroundInit(router, service);
64
+
65
+ this.init();
66
+ }
67
+
68
+ async init(): Promise<void> {
69
+ await this.refreshData();
70
+
71
+ runInAction(() => {
72
+ this._isInitialized = true;
73
+ });
74
+ }
75
+
76
+ get isInitialized(): boolean {
77
+ return this._isInitialized;
78
+ }
79
+
80
+ protected async refreshData(): Promise<void> {
81
+ // 어차피 interaction data는 한번 생성되면 값이 바뀌지 않도록 만들어져있고
82
+ // id는 겹칠 수 없기 때문에 이걸 key로 사용한다.
83
+ // refresh한 이후에 값이 바뀐게 아니라면 ref도 바꾸지 않기 위해서 값 자체를 바꾸지 않는다.
84
+ const prevKey = this.data.map((d) => d.id).join("/");
85
+ let data = await this.msgRequester.sendMessage(
86
+ BACKGROUND_PORT,
87
+ new GetInteractionWaitingDataArrayMsg()
88
+ );
89
+ if (this.onDataReceived) {
90
+ data = await this.onDataReceived(data);
91
+ }
92
+ const newKey = data.map((d) => d.id).join("/");
93
+ if (prevKey !== newKey) {
94
+ const prev = this.data.slice();
95
+ runInAction(() => {
96
+ this.data = data;
97
+ });
98
+
99
+ if (this.onDataChanged) {
100
+ this.onDataChanged(prev, data.slice());
101
+ }
102
+ }
38
103
  }
39
104
 
40
105
  getAllData = computedFn(
@@ -52,8 +117,11 @@ export class InteractionStore implements InteractionForegroundHandler {
52
117
  );
53
118
 
54
119
  @action
55
- onInteractionDataReceived(data: InteractionWaitingData) {
56
- this.data.push(data);
120
+ onInteractionDataReceived() {
121
+ // this.data.push(data);
122
+ // XXX: 로직의 간편화를 위해서 여기서 data를 직접 this.data에 넣기보다 그냥 백그라운드로부터 refesh를 선택한다.
123
+ // no need to await.
124
+ this.refreshData();
57
125
  }
58
126
 
59
127
  @action
@@ -90,6 +158,11 @@ export class InteractionStore implements InteractionForegroundHandler {
90
158
  yield this.delay(100);
91
159
  yield afterFn(this.hasOtherData(id));
92
160
  this.removeData(id);
161
+
162
+ if (this.afterInteraction) {
163
+ const next = this.data[0];
164
+ this.afterInteraction(next);
165
+ }
93
166
  }
94
167
 
95
168
  /**
@@ -150,6 +223,11 @@ export class InteractionStore implements InteractionForegroundHandler {
150
223
  }
151
224
  yield afterFn(this.hasOtherData(ids));
152
225
  this.removeData(ids);
226
+
227
+ if (this.afterInteraction) {
228
+ const next = this.data[0];
229
+ this.afterInteraction(next);
230
+ }
153
231
  }
154
232
 
155
233
  /**
@@ -179,6 +257,11 @@ export class InteractionStore implements InteractionForegroundHandler {
179
257
  yield this.delay(100);
180
258
  yield afterFn(this.hasOtherData(id));
181
259
  this.removeData(id);
260
+
261
+ if (this.afterInteraction) {
262
+ const next = this.data[0];
263
+ this.afterInteraction(next);
264
+ }
182
265
  }
183
266
 
184
267
  /**
@@ -227,6 +310,11 @@ export class InteractionStore implements InteractionForegroundHandler {
227
310
  yield this.delay(50);
228
311
  yield afterFn(this.hasOtherData(ids));
229
312
  this.removeData(ids);
313
+
314
+ if (this.afterInteraction) {
315
+ const next = this.data[0];
316
+ this.afterInteraction(next);
317
+ }
230
318
  }
231
319
 
232
320
  protected delay(ms: number): Promise<void> {
@@ -43,8 +43,11 @@ export class SignInteractionStore {
43
43
  }
44
44
 
45
45
  @computed
46
- get waitingDatas(): InteractionWaitingData<
47
- SignInteractionData & { signDocWrapper: SignDocWrapper }
46
+ get waitingDatas(): Omit<
47
+ InteractionWaitingData<
48
+ SignInteractionData & { signDocWrapper: SignDocWrapper }
49
+ >,
50
+ "uri" | "windowId"
48
51
  >[] {
49
52
  return this.interactionStore
50
53
  .getAllData<SignInteractionData>("request-sign-cosmos")
@@ -70,8 +73,11 @@ export class SignInteractionStore {
70
73
 
71
74
  @computed
72
75
  get waitingData():
73
- | InteractionWaitingData<
74
- SignInteractionData & { signDocWrapper: SignDocWrapper }
76
+ | Omit<
77
+ InteractionWaitingData<
78
+ SignInteractionData & { signDocWrapper: SignDocWrapper }
79
+ >,
80
+ "uri" | "windowId"
75
81
  >
76
82
  | undefined {
77
83
  const datas = this.waitingDatas;
@@ -322,6 +322,26 @@ export class KeyRingStore {
322
322
  }
323
323
  }
324
324
 
325
+ @flow
326
+ *unlockWithoutSyncStatus(password: string) {
327
+ if (this._needMigration) {
328
+ this._isMigrating = true;
329
+ }
330
+
331
+ try {
332
+ const msg = new UnlockKeyRingMsg(password);
333
+ const result = yield* toGenerator(
334
+ this.requester.sendMessage(BACKGROUND_PORT, msg)
335
+ );
336
+ this._keyInfos = result.keyInfos;
337
+
338
+ this._needMigration = false;
339
+ } finally {
340
+ // Set the flag to false even if the migration is failed.
341
+ this._isMigrating = false;
342
+ }
343
+ }
344
+
325
345
  @flow
326
346
  *changeKeyRingName(vaultId: string, name: string) {
327
347
  const msg = new ChangeKeyRingNameMsg(vaultId, name);