@novasamatech/host-api 0.8.2 → 0.8.4

package/dist/protocol/impl.d.ts

@@ -858,10 +858,15 @@ export declare const hostApiProtocol: {
             } | {
                 tag: "PrivateKey";
                 value: Uint8Array<ArrayBufferLike>;
+            } | {
+                tag: "Coins";
+                value: Uint8Array<ArrayBufferLike>[];
             };
         }>, Codec<import("scale-ts").ResultPayload<undefined, import("@novasamatech/scale").CodecError<{
             reason: string;
-        }, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource">>>];
+        }, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource"> | import("@novasamatech/scale").CodecError<{
+            credited: bigint;
+        }, "PaymentTopUpErr::PartialPayment">>>];
     }>;
     readonly host_payment_request: VersionedProtocolRequest<{
         readonly v1: [Codec<{

package/dist/protocol/messageCodec.d.ts

@@ -911,12 +911,17 @@ export declare const MessagePayload: EnumCodec<Record<"host_handshake_request",
         } | {
             tag: "PrivateKey";
             value: Uint8Array<ArrayBufferLike>;
+        } | {
+            tag: "Coins";
+            value: Uint8Array<ArrayBufferLike>[];
         };
     }>;
 }>> & Record<"host_payment_top_up_response", EnumCodec<{
     readonly v1: Codec<import("scale-ts").ResultPayload<undefined, import("@novasamatech/scale").CodecError<{
         reason: string;
-    }, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource">>>;
+    }, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource"> | import("@novasamatech/scale").CodecError<{
+        credited: bigint;
+    }, "PaymentTopUpErr::PartialPayment">>>;
 }>> & Record<"host_payment_request_request", EnumCodec<{
     readonly v1: Codec<{
         from: number | undefined;
@@ -2405,6 +2410,9 @@ export declare const Message: Codec<{
                 } | {
                     tag: "PrivateKey";
                     value: Uint8Array<ArrayBufferLike>;
+                } | {
+                    tag: "Coins";
+                    value: Uint8Array<ArrayBufferLike>[];
                 };
             };
         };
@@ -2414,7 +2422,9 @@ export declare const Message: Codec<{
             tag: "v1";
             value: import("scale-ts").ResultPayload<undefined, import("@novasamatech/scale").CodecError<{
                 reason: string;
-            }, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource">>;
+            }, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource"> | import("@novasamatech/scale").CodecError<{
+                credited: bigint;
+            }, "PaymentTopUpErr::PartialPayment">>;
         };
     } | {
         tag: "host_payment_request_request";

package/dist/protocol/v1/payments.d.ts

@@ -1,4 +1,4 @@
-export declare const Ed25519PrivateKey: import("scale-ts").Codec<Uint8Array<ArrayBufferLike>>;
+export declare const Sr25519SecretKey: import("scale-ts").Codec<Uint8Array<ArrayBufferLike>>;
 export declare const PaymentId: import("scale-ts").Codec<string>;
 export declare const CoinPaymentPurseId: import("scale-ts").Codec<number>;
 export declare const PaymentTopUpSource: import("scale-ts").Codec<{
@@ -7,6 +7,9 @@ export declare const PaymentTopUpSource: import("scale-ts").Codec<{
 } | {
     tag: "PrivateKey";
     value: Uint8Array<ArrayBufferLike>;
+} | {
+    tag: "Coins";
+    value: Uint8Array<ArrayBufferLike>[];
 }>;
 export declare const PaymentBalance: import("scale-ts").Codec<{
     available: bigint;
@@ -45,27 +48,43 @@ export declare const PaymentBalanceErr: [import("scale-ts").Encoder<import("@nov
         reason: string;
     }, "PaymentBalanceErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentBalanceErr::PermissionDenied">;
 };
+export declare const PartialPaymentErr: import("scale-ts").Codec<{
+    credited: bigint;
+}>;
 export declare const PaymentTopUpErr: [import("scale-ts").Encoder<import("@novasamatech/scale").CodecError<{
     reason: string;
-}, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource">>, import("scale-ts").Decoder<import("@novasamatech/scale").CodecError<{
+}, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource"> | import("@novasamatech/scale").CodecError<{
+    credited: bigint;
+}, "PaymentTopUpErr::PartialPayment">>, import("scale-ts").Decoder<import("@novasamatech/scale").CodecError<{
     reason: string;
-}, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource">>] & {
+}, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource"> | import("@novasamatech/scale").CodecError<{
+    credited: bigint;
+}, "PaymentTopUpErr::PartialPayment">>] & {
     enc: import("scale-ts").Encoder<import("@novasamatech/scale").CodecError<{
         reason: string;
-    }, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource">>;
+    }, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource"> | import("@novasamatech/scale").CodecError<{
+        credited: bigint;
+    }, "PaymentTopUpErr::PartialPayment">>;
     dec: import("scale-ts").Decoder<import("@novasamatech/scale").CodecError<{
         reason: string;
-    }, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource">>;
+    }, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource"> | import("@novasamatech/scale").CodecError<{
+        credited: bigint;
+    }, "PaymentTopUpErr::PartialPayment">>;
 } & {
     readonly InsufficientFunds: import("@novasamatech/scale").ErrCodec<undefined, "PaymentTopUpErr::InsufficientFunds">;
     readonly InvalidSource: import("@novasamatech/scale").ErrCodec<undefined, "PaymentTopUpErr::InvalidSource">;
+    readonly PartialPayment: import("@novasamatech/scale").ErrCodec<{
+        credited: bigint;
+    }, "PaymentTopUpErr::PartialPayment">;
     readonly Unknown: import("@novasamatech/scale").ErrCodec<{
         reason: string;
     }, "PaymentTopUpErr::Unknown">;
 } & {
     [Symbol.hasInstance](v: unknown): v is import("@novasamatech/scale").CodecError<{
         reason: string;
-    }, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource">;
+    }, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource"> | import("@novasamatech/scale").CodecError<{
+        credited: bigint;
+    }, "PaymentTopUpErr::PartialPayment">;
 };
 export declare const PaymentRequestErr: [import("scale-ts").Encoder<import("@novasamatech/scale").CodecError<undefined, "PaymentRequestErr::Rejected"> | import("@novasamatech/scale").CodecError<{
     reason: string;
@@ -146,11 +165,16 @@ export declare const PaymentTopUpV1_request: import("scale-ts").Codec<{
     } | {
         tag: "PrivateKey";
         value: Uint8Array<ArrayBufferLike>;
+    } | {
+        tag: "Coins";
+        value: Uint8Array<ArrayBufferLike>[];
     };
 }>;
 export declare const PaymentTopUpV1_response: import("scale-ts").Codec<import("scale-ts").ResultPayload<undefined, import("@novasamatech/scale").CodecError<{
     reason: string;
-}, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource">>>;
+}, "PaymentTopUpErr::Unknown"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InsufficientFunds"> | import("@novasamatech/scale").CodecError<undefined, "PaymentTopUpErr::InvalidSource"> | import("@novasamatech/scale").CodecError<{
+    credited: bigint;
+}, "PaymentTopUpErr::PartialPayment">>>;
 export declare const PaymentRequestV1_request: import("scale-ts").Codec<{
     from: number | undefined;
     amount: bigint;

package/dist/protocol/v1/payments.js

@@ -1,15 +1,16 @@
 import { Enum, ErrEnum } from '@novasamatech/scale';
-import { Bytes, Option, Result, Struct, _void, str, u128, u32 } from 'scale-ts';
+import { Bytes, Option, Result, Struct, Vector, _void, str, u128, u32 } from 'scale-ts';
 import { GenericErr } from '../commonCodecs.js';
 import { DerivationIndex } from './accounts.js';
 // common types
-export const Ed25519PrivateKey = Bytes(32);
+export const Sr25519SecretKey = Bytes(64);
 export const PaymentId = str;
 // Optional purse selector (RFC 0017). `undefined` (None) targets MAIN_PURSE.
 export const CoinPaymentPurseId = u32;
 export const PaymentTopUpSource = Enum({
     ProductAccount: DerivationIndex,
-    PrivateKey: Ed25519PrivateKey,
+    PrivateKey: Sr25519SecretKey,
+    Coins: Vector(Sr25519SecretKey),
 });
 export const PaymentBalance = Struct({
     available: u128,
@@ -27,9 +28,14 @@ export const PaymentBalanceErr = ErrEnum('PaymentBalanceErr', {
     PermissionDenied: [_void, 'permission denied'],
     Unknown: [GenericErr, 'unknown error'],
 });
+// Carries the amount that was credited when only some coins could be claimed.
+export const PartialPaymentErr = Struct({
+    credited: u128,
+});
 export const PaymentTopUpErr = ErrEnum('PaymentTopUpErr', {
     InsufficientFunds: [_void, 'insufficient funds'],
     InvalidSource: [_void, 'invalid source'],
+    PartialPayment: [PartialPaymentErr, ({ credited }) => `partial payment: credited ${credited}`],
     Unknown: [GenericErr, 'unknown error'],
 });
 export const PaymentRequestErr = ErrEnum('PaymentRequestErr', {

package/dist/transport.js

@@ -284,11 +284,17 @@ export function createTransport(provider) {
                     return;
                 let interrupted = false;
                 const unsubscribe = handler(payload.value, value => {
+                    // The transport may be disposed while a producer still has a batched
+                    // emission queued. Drop it instead of throwing 'Transport is disposed'.
+                    if (disposed)
+                        return;
                     const receivePayload = enumValue(receiveAction, value);
                     transport.postMessage(requestId, receivePayload);
                 }, value => {
                     interrupted = true;
                     subscriptions.delete(requestId);
+                    if (disposed)
+                        return;
                     transport.postMessage(requestId, enumValue(interruptAction, value));
                 });
                 if (interrupted) {
@@ -299,13 +305,25 @@ export function createTransport(provider) {
                 }
             });
             const unsubStop = transport.listenMessages(stopAction, requestId => {
-                subscriptions.get(requestId)?.();
+                const unsubscribe = subscriptions.get(requestId);
+                if (unsubscribe) {
+                    subscriptions.delete(requestId);
+                    unsubscribe();
+                }
             });
-            return () => {
+            const teardown = () => {
                 subscriptions.forEach(unsub => unsub());
+                subscriptions.clear();
                 unsubStart();
                 unsubStop();
+                unsubDestroy();
             };
+            // Tear down active producer subscriptions when the transport is destroyed.
+            // Consumers (e.g. host-container's subscription slot) discard the cleanup
+            // returned below, so without this a disposed transport leaves producers
+            // running and emitting into a dead transport.
+            const unsubDestroy = transport.onDestroy(teardown);
+            return teardown;
         },
         postMessage(requestId, payload) {
             checks();

package/dist/transport.spec.js

@@ -58,6 +58,44 @@ describe('transport', () => {
             expect(s2Handler).toHaveBeenCalledTimes(2);
         });
     });
+    describe('disposal', () => {
+        it('tears down active producer subscriptions on destroy()', () => {
+            const providers = createProviders();
+            const events = createNanoEvents();
+            const host = createTransport(providers.host);
+            const sdk = createTransport(providers.sdk);
+            const hostUnsubscribe = vi.fn();
+            host.handleSubscription('host_account_connection_status_subscribe', (_, send) => {
+                const unsub = events.on('push', () => send({ tag: 'v1', value: 'connected' }));
+                return () => {
+                    unsub();
+                    hostUnsubscribe();
+                };
+            });
+            sdk.subscribe('host_account_connection_status_subscribe', { tag: 'v1', value: undefined }, vi.fn());
+            host.destroy();
+            // The producer subscription opened by the handler must be torn down,
+            // otherwise it keeps emitting into a disposed transport.
+            expect(hostUnsubscribe).toHaveBeenCalledTimes(1);
+        });
+        it('does not throw when a producer emits after destroy()', () => {
+            const providers = createProviders();
+            const events = createNanoEvents();
+            const host = createTransport(providers.host);
+            const sdk = createTransport(providers.sdk);
+            host.handleSubscription('host_account_connection_status_subscribe', (_, send) => {
+                const unsub = events.on('push', () => send({ tag: 'v1', value: 'connected' }));
+                return unsub;
+            });
+            const handler = vi.fn();
+            sdk.subscribe('host_account_connection_status_subscribe', { tag: 'v1', value: undefined }, handler);
+            host.destroy();
+            // A batched emission queued before disposal must not throw
+            // 'Transport is disposed'; it is silently dropped.
+            expect(() => events.emit('push')).not.toThrow();
+            expect(handler).not.toHaveBeenCalled();
+        });
+    });
     describe('debug hook', () => {
         it('emits outgoing events when postMessage is called and still delivers the message', () => {
             const providers = createProviders();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@novasamatech/host-api",
   "type": "module",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "description": "Host API: transport implementation for host - product integration.",
   "license": "Apache-2.0",
   "repository": {
@@ -22,7 +22,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@novasamatech/scale": "0.8.2",
+    "@novasamatech/scale": "0.8.4",
     "nanoevents": "9.1.0",
     "nanoid": "5.1.11",
     "neverthrow": "^8.2.0",