@canton-network/dapp-sdk 0.24.0 → 0.25.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.
package/dist/index.cjs CHANGED
@@ -4,6 +4,7 @@ var coreProviderDapp = require('@canton-network/core-provider-dapp');
4
4
  var coreTypes = require('@canton-network/core-types');
5
5
  var coreWalletUiComponents = require('@canton-network/core-wallet-ui-components');
6
6
  var coreWalletDiscovery = require('@canton-network/core-wallet-discovery');
7
+ var coreRpcTransport = require('@canton-network/core-rpc-transport');
7
8
  var coreWalletDappRpcClient = require('@canton-network/core-wallet-dapp-rpc-client');
8
9
 
9
10
  function _interopNamespace(e) {
@@ -75,7 +76,6 @@ var removeKernelSession = () => {
75
76
  var clearAllLocalState = ({
76
77
  closePopup
77
78
  } = {}) => {
78
- window.canton = void 0;
79
79
  removeKernelSession();
80
80
  removeKernelDiscovery();
81
81
  if (closePopup) {
@@ -151,7 +151,8 @@ var DappClient = class {
151
151
  window.postMessage(
152
152
  {
153
153
  type: coreTypes.WalletEvent.SPLICE_WALLET_EXT_OPEN,
154
- url: userUrl
154
+ url: userUrl,
155
+ target: this.options.target
155
156
  },
156
157
  "*"
157
158
  );
@@ -171,18 +172,26 @@ var DappClient = class {
171
172
  var BROWSER_PROVIDER_ID = "browser";
172
173
  var EXTENSION_DETECT_TIMEOUT_MS = 2e3;
173
174
  var ExtensionAdapter = class {
174
- constructor() {
175
- __publicField(this, "providerId", BROWSER_PROVIDER_ID);
176
- __publicField(this, "name", "Browser Extension");
175
+ constructor(config = {}) {
176
+ __publicField(this, "providerId");
177
+ __publicField(this, "name");
177
178
  __publicField(this, "type", "browser");
178
179
  __publicField(this, "icon");
180
+ __publicField(this, "description");
181
+ __publicField(this, "target");
182
+ this.providerId = config.providerId ?? BROWSER_PROVIDER_ID;
183
+ this.name = config.name ?? "Browser Extension";
184
+ this.icon = config.icon;
185
+ this.description = config.description ?? "Connect via the Splice Wallet browser extension";
186
+ this.target = config.target;
179
187
  }
180
188
  getInfo() {
181
189
  return {
182
190
  providerId: this.providerId,
183
191
  name: this.name,
184
192
  type: this.type,
185
- description: "Connect via the Splice Wallet browser extension"
193
+ description: this.description,
194
+ icon: this.icon
186
195
  };
187
196
  }
188
197
  async detect() {
@@ -193,7 +202,7 @@ var ExtensionAdapter = class {
193
202
  resolve(false);
194
203
  }, EXTENSION_DETECT_TIMEOUT_MS);
195
204
  const handler = (event) => {
196
- if (event.data?.type === coreTypes.WalletEvent.SPLICE_WALLET_EXT_ACK) {
205
+ if (event.data?.type === coreTypes.WalletEvent.SPLICE_WALLET_EXT_ACK && (!this.target || event.data?.target === this.target)) {
197
206
  clearTimeout(timeout);
198
207
  window.removeEventListener("message", handler);
199
208
  resolve(true);
@@ -201,24 +210,88 @@ var ExtensionAdapter = class {
201
210
  };
202
211
  window.addEventListener("message", handler);
203
212
  window.postMessage(
204
- { type: coreTypes.WalletEvent.SPLICE_WALLET_EXT_READY },
213
+ {
214
+ type: coreTypes.WalletEvent.SPLICE_WALLET_EXT_READY,
215
+ target: this.target
216
+ },
205
217
  "*"
206
218
  );
207
219
  });
208
220
  }
209
221
  provider() {
222
+ if (this.target) {
223
+ return new coreProviderDapp.DappSyncProvider(
224
+ new coreRpcTransport.WindowTransport(window, { target: this.target })
225
+ );
226
+ }
210
227
  return new coreProviderDapp.DappSyncProvider();
211
228
  }
212
229
  teardown() {
213
230
  }
214
231
  async restore() {
215
- if (!window.canton) return null;
232
+ const kernel = getKernelDiscovery();
233
+ const kernelMatches = kernel?.walletType === "extension" && (kernel.providerId === void 0 || kernel.providerId === this.providerId);
234
+ const provider = this.provider();
235
+ if (kernelMatches) {
236
+ try {
237
+ await provider.request({ method: "connect" });
238
+ } catch {
239
+ }
240
+ }
216
241
  try {
217
- const provider = new coreProviderDapp.DappSyncProvider();
218
242
  const status2 = await provider.request({ method: "status" });
219
243
  if (status2.connection.isConnected) {
220
244
  return provider;
221
245
  }
246
+ } catch {
247
+ if (kernelMatches) {
248
+ return provider;
249
+ }
250
+ }
251
+ return null;
252
+ }
253
+ };
254
+
255
+ // src/adapter/injected-adapter.ts
256
+ var InjectedAdapter = class {
257
+ constructor(config) {
258
+ __publicField(this, "providerId");
259
+ __publicField(this, "name");
260
+ __publicField(this, "type", "browser");
261
+ __publicField(this, "icon");
262
+ __publicField(this, "providerInstance");
263
+ __publicField(this, "description");
264
+ this.providerId = `browser:${config.id}`;
265
+ this.name = config.name;
266
+ this.icon = config.icon;
267
+ this.providerInstance = config.provider;
268
+ this.description = config.description;
269
+ }
270
+ getInfo() {
271
+ return {
272
+ providerId: this.providerId,
273
+ name: this.name,
274
+ type: this.type,
275
+ description: this.description ?? "Connect via an injected CIP-103 provider (window namespace)",
276
+ icon: this.icon
277
+ };
278
+ }
279
+ async detect() {
280
+ return true;
281
+ }
282
+ provider() {
283
+ return this.providerInstance;
284
+ }
285
+ teardown() {
286
+ }
287
+ async restore() {
288
+ try {
289
+ const status2 = await this.providerInstance.request({
290
+ method: "status"
291
+ });
292
+ if (status2.connection.isConnected) {
293
+ return this.providerInstance;
294
+ }
222
295
  } catch {
223
296
  }
224
297
  return null;
@@ -357,17 +430,16 @@ var dappSDKController = (provider) => rpc_gen_default({
357
430
  txChanged: async () => {
358
431
  throw new Error("Only for events.");
359
432
  },
360
- getActiveNetwork: function() {
361
- throw new Error("Function not implemented.");
362
- },
363
- signMessage: function() {
364
- throw new Error("Function not implemented.");
365
- },
366
- getPrimaryAccount: function() {
367
- return provider.request({
368
- method: "getPrimaryAccount"
369
- });
370
- }
433
+ getActiveNetwork: async () => provider.request({
434
+ method: "getActiveNetwork"
435
+ }),
436
+ signMessage: async (params) => provider.request({
437
+ method: "signMessage",
438
+ params
439
+ }),
440
+ getPrimaryAccount: async () => provider.request({
441
+ method: "getPrimaryAccount"
442
+ })
371
443
  });
372
444
 
373
445
  // src/adapter/remote-adapter.ts
@@ -393,7 +465,8 @@ var RemoteAdapter = class {
393
465
  type: this.type,
394
466
  description: this.description,
395
467
  icon: this.icon,
396
- url: this.rpcUrl
468
+ url: this.rpcUrl,
469
+ reuseGlobalWalletPopup: true
397
470
  };
398
471
  }
399
472
  async detect() {
@@ -482,6 +555,8 @@ var RemoteMappedProvider = class {
482
555
  return controller.prepareExecuteAndWait(args.params);
483
556
  case "getPrimaryAccount":
484
557
  return controller.getPrimaryAccount();
558
+ case "getActiveNetwork":
559
+ return controller.getActiveNetwork();
485
560
  default:
486
561
  throw new Error("Unsupported method");
487
562
  }
@@ -507,6 +582,75 @@ var gateways_default = [
507
582
  }
508
583
  ];
509
584
 
585
+ // src/injected-discovery.ts
586
+ var DEFAULT_ROOTS = ["canton"];
587
+ var isProviderLike = (obj) => {
588
+ if (typeof obj !== "object" || obj === null) return false;
589
+ const p = obj;
590
+ return typeof p.request === "function" && typeof p.on === "function" && typeof p.emit === "function" && typeof p.removeListener === "function";
591
+ };
592
+ function discoverInjectedProviders(roots = DEFAULT_ROOTS) {
593
+ if (typeof window === "undefined") return [];
594
+ const discovered = [];
595
+ const seen = /* @__PURE__ */ new Set();
596
+ const win = window;
597
+ for (const root of roots) {
598
+ const candidate = win[root];
599
+ if (candidate === void 0 || candidate === null) continue;
600
+ if (isProviderLike(candidate) && !seen.has(candidate)) {
601
+ seen.add(candidate);
602
+ discovered.push({
603
+ id: root,
604
+ provider: candidate,
605
+ sourceRoot: root
606
+ });
607
+ continue;
608
+ }
609
+ if (typeof candidate === "object") {
610
+ for (const [key, value] of Object.entries(
611
+ candidate
612
+ )) {
613
+ if (isProviderLike(value) && !seen.has(value)) {
614
+ seen.add(value);
615
+ discovered.push({
616
+ id: `${root}.${key}`,
617
+ provider: value,
618
+ sourceRoot: root
619
+ });
620
+ }
621
+ }
622
+ }
623
+ }
624
+ return discovered;
625
+ }
626
+ async function requestAnnouncedProviders(options) {
627
+ if (typeof window === "undefined") return [];
628
+ const timeoutMs = 300;
629
+ const discovered = /* @__PURE__ */ new Map();
630
+ const handler = (event) => {
631
+ const ce = event;
632
+ const detail = ce.detail;
633
+ if (!detail?.id || !detail.name) return;
634
+ if (discovered.has(detail.id)) return;
635
+ discovered.set(detail.id, {
636
+ id: detail.id,
637
+ name: detail.name,
638
+ icon: detail.icon,
639
+ target: detail.target
640
+ });
641
+ };
642
+ window.addEventListener(coreTypes.CANTON_ANNOUNCE_PROVIDER_EVENT, handler);
643
+ try {
644
+ window.dispatchEvent(
645
+ new CustomEvent(coreTypes.CANTON_REQUEST_PROVIDER_EVENT, { detail: {} })
646
+ );
647
+ await new Promise((resolve) => setTimeout(resolve, timeoutMs));
648
+ } finally {
649
+ window.removeEventListener(coreTypes.CANTON_ANNOUNCE_PROVIDER_EVENT, handler);
650
+ }
651
+ return Array.from(discovered.values());
652
+ }
653
+
510
654
  // src/sdk.ts
511
655
  var DappSDK = class {
512
656
  constructor(options) {
@@ -532,6 +676,46 @@ var DappSDK = class {
532
676
  }
533
677
  }
534
678
  }
679
+ async registerInjectedNamespaceAdapters(discovery) {
680
+ const existingIds = new Set(
681
+ discovery.listAdapters().map((a) => a.providerId)
682
+ );
683
+ const injected = discoverInjectedProviders();
684
+ for (const item of injected) {
685
+ const id = `browser:${item.id}`;
686
+ if (existingIds.has(id)) continue;
687
+ const key = `${item.id} (injected)`;
688
+ const adapter = new InjectedAdapter({
689
+ id: item.id,
690
+ name: key,
691
+ provider: item.provider,
692
+ description: `Injected provider from window.${item.id}`
693
+ });
694
+ discovery.registerAdapter(adapter);
695
+ existingIds.add(id);
696
+ }
697
+ }
698
+ async registerAnnouncedAdapters(discovery) {
699
+ const existingIds = new Set(
700
+ discovery.listAdapters().map((a) => a.providerId)
701
+ );
702
+ const announced = await requestAnnouncedProviders();
703
+ for (const item of announced) {
704
+ const id = `browser:ext:${item.id}`;
705
+ if (existingIds.has(id)) continue;
706
+ const adapter = new ExtensionAdapter({
707
+ providerId: id,
708
+ name: item.name,
709
+ icon: item.icon,
710
+ description: "Connect via a browser extension wallet",
711
+ target: item.target ?? item.id
712
+ });
713
+ if (await adapter.detect()) {
714
+ discovery.registerAdapter(adapter);
715
+ existingIds.add(id);
716
+ }
717
+ }
718
+ }
535
719
  async ensureDiscovery(config) {
536
720
  const defaultAdapters = config?.defaultAdapters ?? createDefaultAdapters(gateways_default);
537
721
  if (this.discovery) {
@@ -540,6 +724,20 @@ var DappSDK = class {
540
724
  this.discovery,
541
725
  config?.additionalAdapters
542
726
  );
727
+ await this.registerInjectedNamespaceAdapters(this.discovery);
728
+ await this.registerAnnouncedAdapters(this.discovery);
729
+ await this.discovery.restorePersistedSessionIfNeeded();
730
+ if (!this.client) {
731
+ const session2 = this.discovery.getActiveSession();
732
+ if (session2) {
733
+ const providerType = session2.adapter.getInfo().type;
734
+ const target = session2.adapter instanceof ExtensionAdapter ? session2.adapter.target : void 0;
735
+ this.client = new DappClient(session2.provider, {
736
+ providerType,
737
+ target
738
+ });
739
+ }
740
+ }
543
741
  return this.discovery;
544
742
  }
545
743
  const initialAdapters = await this.collectDetectedAdapters([
@@ -550,10 +748,17 @@ var DappSDK = class {
550
748
  walletPicker: this.walletPicker,
551
749
  adapters: initialAdapters
552
750
  });
751
+ await this.registerInjectedNamespaceAdapters(this.discovery);
752
+ await this.registerAnnouncedAdapters(this.discovery);
753
+ await this.discovery.restorePersistedSessionIfNeeded();
553
754
  const session = this.discovery.getActiveSession();
554
755
  if (session) {
555
756
  const providerType = session.adapter.getInfo().type;
556
- this.client = new DappClient(session.provider, { providerType });
757
+ const target = session.adapter instanceof ExtensionAdapter ? session.adapter.target : void 0;
758
+ this.client = new DappClient(session.provider, {
759
+ providerType,
760
+ target
761
+ });
557
762
  }
558
763
  return this.discovery;
559
764
  }
@@ -592,9 +797,22 @@ var DappSDK = class {
592
797
  throw new Error("Not connected \u2014 call connect() first");
593
798
  return this.client;
594
799
  }
800
+ /**
801
+ * Returns the raw connected provider instance (if any).
802
+ *
803
+ * This is useful for advanced integrations that need to call methods that
804
+ * are not wrapped by the higher-level SDK helpers.
805
+ */
806
+ getConnectedProvider() {
807
+ const session = this.discovery?.getActiveSession();
808
+ if (!session) return null;
809
+ return session.provider;
810
+ }
595
811
  async connect(options) {
596
812
  await this.ensureInit(options);
597
813
  const discovery = this.discovery;
814
+ await this.registerInjectedNamespaceAdapters(discovery);
815
+ await this.registerAnnouncedAdapters(discovery);
598
816
  await this.registerAdapters(discovery, options?.defaultAdapters);
599
817
  await this.registerAdapters(discovery, options?.additionalAdapters);
600
818
  clearAllLocalState();
@@ -606,7 +824,8 @@ var DappSDK = class {
606
824
  type: info2.type,
607
825
  description: info2.description,
608
826
  icon: info2.icon,
609
- url: info2.url
827
+ url: info2.url,
828
+ reuseGlobalWalletPopup: info2.reuseGlobalWalletPopup
610
829
  };
611
830
  });
612
831
  const picked = await this.walletPicker(entries);
@@ -633,10 +852,14 @@ var DappSDK = class {
633
852
  setKernelDiscovery({ walletType: "remote", url: info.url });
634
853
  this.saveRecentGateway(info.name, info.url);
635
854
  } else if (info.type === "browser") {
636
- setKernelDiscovery({ walletType: "extension" });
855
+ setKernelDiscovery({
856
+ walletType: "extension",
857
+ providerId: info.providerId
858
+ });
637
859
  }
638
860
  this.client = new DappClient(session.provider, {
639
- providerType: info.type
861
+ providerType: info.type,
862
+ target: session.adapter instanceof ExtensionAdapter ? session.adapter.target : void 0
640
863
  });
641
864
  const s = await this.client.status();
642
865
  return s.connection;
@@ -710,6 +933,7 @@ var prepareExecute = (params) => sdk.prepareExecute(params);
710
933
  var prepareExecuteAndWait = (params) => sdk.prepareExecuteAndWait(params);
711
934
  var ledgerApi = (params) => sdk.ledgerApi(params);
712
935
  var open = () => sdk.open();
936
+ var getConnectedProvider = () => sdk.getConnectedProvider();
713
937
  var onStatusChanged = (listener) => sdk.onStatusChanged(listener);
714
938
  var onAccountsChanged = (listener) => sdk.onAccountsChanged(listener);
715
939
  var onTxChanged = (listener) => sdk.onTxChanged(listener);
@@ -717,15 +941,12 @@ var removeOnStatusChanged = (listener) => sdk.removeOnStatusChanged(listener);
717
941
  var removeOnAccountsChanged = (listener) => sdk.removeOnAccountsChanged(listener);
718
942
  var removeOnTxChanged = (listener) => sdk.removeOnTxChanged(listener);
719
943
  function createDefaultAdapters(defaultGatewayConfigs) {
720
- return [
721
- new ExtensionAdapter(),
722
- ...defaultGatewayConfigs.map(
723
- (config) => new RemoteAdapter({
724
- ...config,
725
- icon: config.icon ?? CANTON_LOGO_PNG
726
- })
727
- )
728
- ];
944
+ return defaultGatewayConfigs.map(
945
+ (config) => new RemoteAdapter({
946
+ ...config,
947
+ icon: config.icon ?? CANTON_LOGO_PNG
948
+ })
949
+ );
729
950
  }
730
951
 
731
952
  Object.defineProperty(exports, "DiscoveryClient", {
@@ -770,11 +991,13 @@ exports.DappClient = DappClient;
770
991
  exports.DappSDK = DappSDK;
771
992
  exports.ErrorCode = ErrorCode;
772
993
  exports.ExtensionAdapter = ExtensionAdapter;
994
+ exports.InjectedAdapter = InjectedAdapter;
773
995
  exports.RemoteAdapter = RemoteAdapter;
774
996
  exports.WALLET_GATEWAY_ICON = WALLET_GATEWAY_ICON;
775
997
  exports.connect = connect;
776
998
  exports.dappSDK = sdk;
777
999
  exports.disconnect = disconnect;
1000
+ exports.getConnectedProvider = getConnectedProvider;
778
1001
  exports.ledgerApi = ledgerApi;
779
1002
  exports.listAccounts = listAccounts;
780
1003
  exports.onAccountsChanged = onAccountsChanged;