@ton/appkit 1.0.0-alpha.0 → 1.0.0-alpha.2

package/src/connectors/tonconnect/connectors/ton-connect-connector.ts

@@ -11,14 +11,13 @@ import type { TonConnectUiCreateOptions } from '@tonconnect/ui';
 
 import { TonConnectWalletAdapter } from '../adapters/ton-connect-wallet-adapter';
 import { CONNECTOR_EVENTS, NETWORKS_EVENTS } from '../../../core/app-kit';
-import type { Connector, ConnectorMetadata } from '../../../types/connector';
+import type { Connector } from '../../../types/connector';
 import type { WalletInterface } from '../../../types/wallet';
 import { TONCONNECT_DEFAULT_CONNECTOR_ID } from '../constants/id';
 import { createConnector } from '../../../types/connector';
 
 export interface TonConnectConnectorConfig {
     id?: string;
-    metadata?: ConnectorMetadata;
     tonConnectOptions?: TonConnectUiCreateOptions;
     tonConnectUI?: TonConnectUI;
 }
@@ -32,10 +31,16 @@ export const createTonConnectConnector = (config: TonConnectConnectorConfig) =>
     return createConnector(({ eventEmitter, networkManager }): TonConnectConnector => {
         let originalTonConnectUI: TonConnectUI | null = null;
         let unsubscribeTonConnect: (() => void) | null = null;
+        let unsubscribeDefaultNetwork: (() => void) | null = null;
+        let destroyed = false;
 
         const id = config.id ?? TONCONNECT_DEFAULT_CONNECTOR_ID;
 
-        function getTonConnectUI() {
+        const getTonConnectUI = (): TonConnectUI | null => {
+            if (destroyed) {
+                return null;
+            }
+
             if (originalTonConnectUI) {
                 return originalTonConnectUI;
             }
@@ -59,7 +64,7 @@ export const createTonConnectConnector = (config: TonConnectConnectorConfig) =>
             }
 
             return originalTonConnectUI;
-        }
+        };
 
         function getConnectedWallets(): WalletInterface[] {
             const ui = getTonConnectUI();
@@ -84,19 +89,17 @@ export const createTonConnectConnector = (config: TonConnectConnectorConfig) =>
                 return;
             }
 
-            unsubscribeTonConnect = originalTonConnectUI.onStatusChange((wallet) => {
-                const wallets = getConnectedWallets();
-
-                if (wallet) {
-                    eventEmitter.emit(CONNECTOR_EVENTS.CONNECTED, { wallets, connectorId: id }, id);
-                } else {
-                    eventEmitter.emit(CONNECTOR_EVENTS.DISCONNECTED, { connectorId: id }, id);
-                }
+            unsubscribeTonConnect = originalTonConnectUI.onStatusChange(() => {
+                eventEmitter.emit(
+                    CONNECTOR_EVENTS.WALLETS_UPDATED,
+                    { connectorId: id, wallets: getConnectedWallets() },
+                    id,
+                );
             });
 
             // Set default network and subscribe to changes
             originalTonConnectUI.setConnectionNetwork(networkManager.getDefaultNetwork()?.chainId);
-            eventEmitter.on(NETWORKS_EVENTS.DEFAULT_CHANGED, ({ payload }) => {
+            unsubscribeDefaultNetwork = eventEmitter.on(NETWORKS_EVENTS.DEFAULT_CHANGED, ({ payload }) => {
                 if (originalTonConnectUI) {
                     originalTonConnectUI.setConnectionNetwork(payload.network?.chainId);
                 }
@@ -106,11 +109,6 @@ export const createTonConnectConnector = (config: TonConnectConnectorConfig) =>
         return {
             id,
             type: 'tonconnect',
-            metadata: {
-                name: 'TonConnect',
-                iconUrl: 'https://avatars.githubusercontent.com/u/113980577',
-                ...config.metadata,
-            },
 
             get tonConnectUI() {
                 return getTonConnectUI();
@@ -135,7 +133,11 @@ export const createTonConnectConnector = (config: TonConnectConnectorConfig) =>
             },
 
             destroy() {
+                destroyed = true;
                 unsubscribeTonConnect?.();
+                unsubscribeDefaultNetwork?.();
+                unsubscribeTonConnect = null;
+                unsubscribeDefaultNetwork = null;
                 originalTonConnectUI = null;
             },
         };

package/src/core/app-kit/constants/events.ts

@@ -10,8 +10,9 @@
  * Connector events
  */
 export const CONNECTOR_EVENTS = {
-    CONNECTED: 'connector:connected',
-    DISCONNECTED: 'connector:disconnected',
+    ADDED: 'connector:added',
+    REMOVED: 'connector:removed',
+    WALLETS_UPDATED: 'connector:wallets-updated',
 } as const;
 
 /**

package/src/core/app-kit/index.ts

@@ -13,7 +13,8 @@ export type { AppKitConfig } from './types/config';
 export type {
     AppKitEmitter,
     AppKitEvents,
-    WalletConnectedPayload,
-    WalletDisconnectedPayload,
+    ConnectorAddedPayload,
+    ConnectorRemovedPayload,
+    ConnectorWalletsUpdatedPayload,
     DefaultNetworkChangedPayload,
 } from './types/events';

package/src/core/app-kit/services/app-kit.ts

@@ -7,7 +7,7 @@
  */
 
 import { SwapManager, StreamingManager } from '@ton/walletkit';
-import type { ProviderInput, SwapProviderInterface, StakingProviderInterface } from '@ton/walletkit';
+import type { ProviderInput, SwapProviderInterface, StakingProviderInterface, StreamingProvider } from '@ton/walletkit';
 
 import type { AppKitConfig } from '../types/config';
 import { CONNECTOR_EVENTS, WALLETS_EVENTS } from '../constants/events';
@@ -21,6 +21,7 @@ import { AppKitNetworkManager } from '../../network';
 import { Network } from '../../../types/network';
 import type { AppKitCache } from '../../cache';
 import { LruAppKitCache } from '../../cache';
+import type { AppKitProvider } from '../../../types/provider';
 
 /**
  * Central hub for wallet management.
@@ -43,8 +44,7 @@ export class AppKit {
         this.cache = config.cache ?? new LruAppKitCache();
 
         this.emitter = new EventEmitter<AppKitEvents>();
-        this.emitter.on(CONNECTOR_EVENTS.CONNECTED, this.updateWalletsFromConnectors.bind(this));
-        this.emitter.on(CONNECTOR_EVENTS.DISCONNECTED, this.updateWalletsFromConnectors.bind(this));
+        this.emitter.on(CONNECTOR_EVENTS.WALLETS_UPDATED, this.updateWalletsFromConnectors.bind(this));
 
         // Use provided networks config or default to mainnet
         const networks = config.networks ?? {
@@ -88,6 +88,8 @@ export class AppKit {
         }
 
         this.connectors.push(connector);
+        this.updateWalletsFromConnectors();
+        this.emitter.emit(CONNECTOR_EVENTS.ADDED, { connector }, 'appkit');
 
         return () => {
             this.removeConnector(connector);
@@ -104,13 +106,15 @@ export class AppKit {
         if (oldConnector) {
             oldConnector.destroy();
             this.connectors.splice(this.connectors.indexOf(oldConnector), 1);
+            this.updateWalletsFromConnectors();
+            this.emitter.emit(CONNECTOR_EVENTS.REMOVED, { connector: oldConnector }, 'appkit');
         }
     }
 
     /**
      * Add a provider
      */
-    registerProvider(input: ProviderInput): void {
+    registerProvider(input: ProviderInput<AppKitProvider>): void {
         const provider = typeof input === 'function' ? input(this.createFactoryContext()) : input;
         switch (provider.type) {
             case 'swap':
@@ -119,6 +123,9 @@ export class AppKit {
             case 'staking':
                 this.stakingManager.registerProvider(provider as StakingProviderInterface);
                 break;
+            case 'streaming':
+                this.streamingManager.registerProvider(provider as StreamingProvider);
+                break;
             default:
                 throw new Error('Unknown provider type');
         }

package/src/core/app-kit/types/config.ts

@@ -11,6 +11,7 @@ import type { NetworkAdapters, ProviderInput } from '@ton/walletkit';
 import type { AppKitCache } from '../../cache';
 import type { ConnectorInput } from '../../../types/connector';
 import type { Network } from '../../../types/network';
+import type { AppKitProvider } from '../../../types/provider';
 
 /**
  * Configuration for AppKit
@@ -37,7 +38,7 @@ export interface AppKitConfig {
      */
     defaultNetwork?: Network;
 
-    providers?: ProviderInput[];
+    providers?: ProviderInput<AppKitProvider>[];
 
     /**
      * Custom cache implementation.

package/src/core/app-kit/types/events.ts

@@ -6,19 +6,24 @@
  *
  */
 
+import type { Connector } from '../../../types/connector';
 import type { Network } from '../../../types/network';
 import type { CONNECTOR_EVENTS, WALLETS_EVENTS, NETWORKS_EVENTS } from '../constants/events';
 import type { SharedKitEvents } from '../../emitter';
 import type { EventEmitter } from '../../emitter';
 import type { WalletInterface } from '../../../types/wallet';
 
-export interface WalletConnectedPayload {
-    wallets: WalletInterface[];
-    connectorId: string;
+export interface ConnectorAddedPayload {
+    connector: Connector;
 }
 
-export interface WalletDisconnectedPayload {
+export interface ConnectorRemovedPayload {
+    connector: Connector;
+}
+
+export interface ConnectorWalletsUpdatedPayload {
     connectorId: string;
+    wallets: WalletInterface[];
 }
 
 export interface DefaultNetworkChangedPayload {
@@ -27,8 +32,9 @@ export interface DefaultNetworkChangedPayload {
 
 export type AppKitEvents = {
     // Connector events
-    [CONNECTOR_EVENTS.CONNECTED]: WalletConnectedPayload;
-    [CONNECTOR_EVENTS.DISCONNECTED]: WalletDisconnectedPayload;
+    [CONNECTOR_EVENTS.ADDED]: ConnectorAddedPayload;
+    [CONNECTOR_EVENTS.REMOVED]: ConnectorRemovedPayload;
+    [CONNECTOR_EVENTS.WALLETS_UPDATED]: ConnectorWalletsUpdatedPayload;
 
     // Wallets events
     [WALLETS_EVENTS.UPDATED]: { wallets: WalletInterface[] };

package/src/swap/index.ts

@@ -6,7 +6,7 @@
  *
  */
 
-export { DefiError, SwapError, SwapProvider, SwapManager } from '@ton/walletkit';
+export { DefiError, DefiErrorCode, SwapError, SwapErrorCode, SwapProvider, SwapManager } from '@ton/walletkit';
 
 export type {
     SwapToken,

package/src/types/connector.ts

@@ -21,8 +21,6 @@ export interface Connector {
     /** Protocol type (e.g. 'tonconnect') */
     readonly type: string;
 
-    readonly metadata: ConnectorMetadata;
-
     /** Cleanup connector resources */
     destroy(): void;
 
@@ -36,11 +34,6 @@ export interface Connector {
     getConnectedWallets(): WalletInterface[];
 }
 
-export interface ConnectorMetadata {
-    name: string;
-    iconUrl?: string;
-}
-
 /**
  * Context passed to connector factory functions.
  */

package/src/types/provider.ts

@@ -6,9 +6,9 @@
  *
  */
 
-import type { SwapProviderInterface, StakingProviderInterface } from '@ton/walletkit';
+import type { SwapProviderInterface, StakingProviderInterface, StreamingProvider } from '@ton/walletkit';
 
 /**
- * Provider configuration
+ * Available provider types in AppKit.
  */
-export type Provider = SwapProviderInterface | StakingProviderInterface;
+export type AppKitProvider = SwapProviderInterface | StakingProviderInterface | StreamingProvider;

package/src/utils/index.ts

@@ -27,7 +27,7 @@ export * from './nft/nft-info';
 export * from './object/map-values';
 export * from './predicate/is-number';
 export * from './predicate/is-string';
-export * from './promise/cancel-promise';
+export * from './promise/with-timeout';
 export * from './promise/sleep';
 export * from './query/filter-query-options';
 export * from './network/resolve-network';

package/{dist/esm/utils/promise/cancel-promise.d.ts → src/utils/promise/with-timeout.ts}

@@ -5,5 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
-export declare const cancelPromise: <T>(promise: T, timeoutMs: number) => Promise<T>;
-//# sourceMappingURL=cancel-promise.d.ts.map
+
+// Re-exported from walletkit so the kit packages share a single source of truth.
+export { withTimeout } from '@ton/walletkit';

package/dist/cjs/utils/promise/cancel-promise.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cancel-promise.d.ts","sourceRoot":"","sources":["../../../../src/utils/promise/cancel-promise.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,eAAO,MAAM,aAAa,GAAI,CAAC,EAAE,SAAS,CAAC,EAAE,WAAW,MAAM,KAAG,OAAO,CAAC,CAAC,CAOzE,CAAC"}

package/dist/cjs/utils/promise/cancel-promise.js

@@ -1,19 +0,0 @@
-"use strict";
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cancelPromise = void 0;
-const cancelPromise = (promise, timeoutMs) => {
-    return Promise.race([
-        promise,
-        new Promise((_, reject) => {
-            setTimeout(() => reject(new Error(`Execution timed out - ${timeoutMs}ms`)), timeoutMs);
-        }),
-    ]);
-};
-exports.cancelPromise = cancelPromise;

package/dist/cjs/utils/promise/cancel-promise.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cancel-promise.test.d.ts","sourceRoot":"","sources":["../../../../src/utils/promise/cancel-promise.test.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG"}

package/dist/cjs/utils/promise/cancel-promise.test.js

@@ -1,25 +0,0 @@
-"use strict";
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-const vitest_1 = require("vitest");
-const cancel_promise_1 = require("./cancel-promise");
-(0, vitest_1.describe)('cancelPromise', () => {
-    (0, vitest_1.it)('should resolve if promise resolves before timeout', async () => {
-        const promise = new Promise((resolve) => setTimeout(() => resolve('success'), 10));
-        await (0, vitest_1.expect)((0, cancel_promise_1.cancelPromise)(promise, 50)).resolves.toBe('success');
-    });
-    (0, vitest_1.it)('should reject if promise times out', async () => {
-        const promise = new Promise((resolve) => setTimeout(() => resolve('success'), 50));
-        await (0, vitest_1.expect)((0, cancel_promise_1.cancelPromise)(promise, 10)).rejects.toThrow('Execution timed out - 10ms');
-    });
-    (0, vitest_1.it)('should propagate rejection from original promise', async () => {
-        const promise = new Promise((_, reject) => setTimeout(() => reject(new Error('failure')), 10));
-        await (0, vitest_1.expect)((0, cancel_promise_1.cancelPromise)(promise, 50)).rejects.toThrow('failure');
-    });
-});

package/dist/esm/utils/promise/cancel-promise.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cancel-promise.d.ts","sourceRoot":"","sources":["../../../../src/utils/promise/cancel-promise.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,eAAO,MAAM,aAAa,GAAI,CAAC,EAAE,SAAS,CAAC,EAAE,WAAW,MAAM,KAAG,OAAO,CAAC,CAAC,CAOzE,CAAC"}

package/dist/esm/utils/promise/cancel-promise.js

@@ -1,15 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-export const cancelPromise = (promise, timeoutMs) => {
-    return Promise.race([
-        promise,
-        new Promise((_, reject) => {
-            setTimeout(() => reject(new Error(`Execution timed out - ${timeoutMs}ms`)), timeoutMs);
-        }),
-    ]);
-};

package/dist/esm/utils/promise/cancel-promise.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cancel-promise.test.d.ts","sourceRoot":"","sources":["../../../../src/utils/promise/cancel-promise.test.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG"}

package/dist/esm/utils/promise/cancel-promise.test.js

@@ -1,23 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-import { describe, expect, it } from 'vitest';
-import { cancelPromise } from './cancel-promise';
-describe('cancelPromise', () => {
-    it('should resolve if promise resolves before timeout', async () => {
-        const promise = new Promise((resolve) => setTimeout(() => resolve('success'), 10));
-        await expect(cancelPromise(promise, 50)).resolves.toBe('success');
-    });
-    it('should reject if promise times out', async () => {
-        const promise = new Promise((resolve) => setTimeout(() => resolve('success'), 50));
-        await expect(cancelPromise(promise, 10)).rejects.toThrow('Execution timed out - 10ms');
-    });
-    it('should propagate rejection from original promise', async () => {
-        const promise = new Promise((_, reject) => setTimeout(() => reject(new Error('failure')), 10));
-        await expect(cancelPromise(promise, 50)).rejects.toThrow('failure');
-    });
-});

package/src/utils/promise/cancel-promise.test.ts

@@ -1,28 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import { describe, expect, it } from 'vitest';
-
-import { cancelPromise } from './cancel-promise';
-
-describe('cancelPromise', () => {
-    it('should resolve if promise resolves before timeout', async () => {
-        const promise = new Promise((resolve) => setTimeout(() => resolve('success'), 10));
-        await expect(cancelPromise(promise, 50)).resolves.toBe('success');
-    });
-
-    it('should reject if promise times out', async () => {
-        const promise = new Promise((resolve) => setTimeout(() => resolve('success'), 50));
-        await expect(cancelPromise(promise, 10)).rejects.toThrow('Execution timed out - 10ms');
-    });
-
-    it('should propagate rejection from original promise', async () => {
-        const promise = new Promise((_, reject) => setTimeout(() => reject(new Error('failure')), 10));
-        await expect(cancelPromise(promise, 50)).rejects.toThrow('failure');
-    });
-});

package/src/utils/promise/cancel-promise.ts

@@ -1,16 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-export const cancelPromise = <T>(promise: T, timeoutMs: number): Promise<T> => {
-    return Promise.race([
-        promise,
-        new Promise((_, reject) => {
-            setTimeout(() => reject(new Error(`Execution timed out - ${timeoutMs}ms`)), timeoutMs);
-        }) as T,
-    ]);
-};