@signalapp/libsignal-client 0.46.2 → 0.48.0

package/Native.d.ts

@@ -407,6 +407,7 @@ export function ServerCertificate_GetKeyId(obj: Wrapper<ServerCertificate>): num
 export function ServerCertificate_GetSerialized(obj: Wrapper<ServerCertificate>): Buffer;
 export function ServerCertificate_GetSignature(obj: Wrapper<ServerCertificate>): Buffer;
 export function ServerCertificate_New(keyId: number, serverKey: Wrapper<PublicKey>, trustRoot: Wrapper<PrivateKey>): ServerCertificate;
+export function ServerMessageAck_Send(asyncRuntime: Wrapper<TokioAsyncContext>, ack: Wrapper<ServerMessageAck>): Promise<void>;
 export function ServerPublicParams_CreateAuthCredentialWithPniPresentationDeterministic(serverPublicParams: Wrapper<ServerPublicParams>, randomness: Buffer, groupSecretParams: Serialized<GroupSecretParams>, authCredentialWithPniBytes: Buffer): Buffer;
 export function ServerPublicParams_CreateExpiringProfileKeyCredentialPresentationDeterministic(serverPublicParams: Wrapper<ServerPublicParams>, randomness: Buffer, groupSecretParams: Serialized<GroupSecretParams>, profileKeyCredential: Serialized<ExpiringProfileKeyCredential>): Buffer;
 export function ServerPublicParams_CreateProfileKeyCredentialRequestContextDeterministic(serverPublicParams: Wrapper<ServerPublicParams>, randomness: Buffer, userId: Buffer, profileKey: Serialized<ProfileKey>): Serialized<ProfileKeyCredentialRequestContext>;
@@ -467,6 +468,7 @@ export function SignedPreKeyRecord_GetTimestamp(obj: Wrapper<SignedPreKeyRecord>
 export function SignedPreKeyRecord_New(id: number, timestamp: Timestamp, pubKey: Wrapper<PublicKey>, privKey: Wrapper<PrivateKey>, signature: Buffer): SignedPreKeyRecord;
 export function SignedPreKeyRecord_Serialize(obj: Wrapper<SignedPreKeyRecord>): Buffer;
 export function Svr3Backup(asyncRuntime: Wrapper<TokioAsyncContext>, connectionManager: Wrapper<ConnectionManager>, secret: Buffer, password: string, maxTries: number, username: string, enclavePassword: string): Promise<Buffer>;
+export function Svr3Remove(asyncRuntime: Wrapper<TokioAsyncContext>, connectionManager: Wrapper<ConnectionManager>, username: string, enclavePassword: string): Promise<void>;
 export function Svr3Restore(asyncRuntime: Wrapper<TokioAsyncContext>, connectionManager: Wrapper<ConnectionManager>, password: string, shareSet: Buffer, username: string, enclavePassword: string): Promise<Buffer>;
 export function TESTING_CdsiLookupErrorConvert(errorDescription: string): void;
 export function TESTING_CdsiLookupResponseConvert(asyncRuntime: Wrapper<TokioAsyncContext>): Promise<LookupResponse>;
@@ -475,10 +477,10 @@ export function TESTING_ChatRequestGetHeaderValue(request: Wrapper<HttpRequest>,
 export function TESTING_ChatRequestGetMethod(request: Wrapper<HttpRequest>): string;
 export function TESTING_ChatRequestGetPath(request: Wrapper<HttpRequest>): string;
 export function TESTING_ChatServiceDebugInfoConvert(): ChatServiceDebugInfo;
-export function TESTING_ChatServiceErrorConvert(): void;
-export function TESTING_ChatServiceInactiveErrorConvert(): void;
+export function TESTING_ChatServiceErrorConvert(errorDescription: string): void;
 export function TESTING_ChatServiceResponseAndDebugInfoConvert(): ResponseAndDebugInfo;
 export function TESTING_ChatServiceResponseConvert(bodyPresent: boolean): ChatResponse;
+export function TESTING_ChatService_InjectRawServerRequest(chat: Wrapper<Chat>, bytes: Buffer): void;
 export function TESTING_ErrorOnBorrowAsync(_input: null): Promise<void>;
 export function TESTING_ErrorOnBorrowIo(asyncRuntime: Wrapper<NonSuspendingBackgroundThreadRuntime>, _input: null): Promise<void>;
 export function TESTING_ErrorOnBorrowSync(_input: null): void;
@@ -490,6 +492,7 @@ export function TESTING_FutureProducesOtherPointerType(asyncRuntime: Wrapper<Non
 export function TESTING_FutureProducesPointerType(asyncRuntime: Wrapper<NonSuspendingBackgroundThreadRuntime>, input: number): Promise<TestingHandleType>;
 export function TESTING_FutureSuccess(asyncRuntime: Wrapper<NonSuspendingBackgroundThreadRuntime>, input: number): Promise<number>;
 export function TESTING_NonSuspendingBackgroundThreadRuntime_New(): NonSuspendingBackgroundThreadRuntime;
+export function TESTING_OnlyCompletesByCancellation(asyncRuntime: Wrapper<TokioAsyncContext>): Promise<void>;
 export function TESTING_OtherTestingHandleType_getValue(handle: Wrapper<OtherTestingHandleType>): string;
 export function TESTING_PanicInBodyAsync(_input: null): Promise<void>;
 export function TESTING_PanicInBodyIo(asyncRuntime: Wrapper<NonSuspendingBackgroundThreadRuntime>, _input: null): Promise<void>;
@@ -506,6 +509,7 @@ export function TESTING_PanicOnReturnSync(_needsCleanup: null): null;
 export function TESTING_ProcessBytestringArray(input: Buffer[]): Buffer[];
 export function TESTING_ReturnStringArray(): string[];
 export function TESTING_TestingHandleType_getValue(handle: Wrapper<TestingHandleType>): number;
+export function TokioAsyncContext_cancel(context: Wrapper<TokioAsyncContext>, rawCancellationId: bigint): void;
 export function TokioAsyncContext_new(): TokioAsyncContext;
 export function UnidentifiedSenderMessageContent_Deserialize(data: Buffer): UnidentifiedSenderMessageContent;
 export function UnidentifiedSenderMessageContent_GetContentHint(m: Wrapper<UnidentifiedSenderMessageContent>): number;
@@ -575,6 +579,7 @@ interface SenderKeyDistributionMessage { readonly __type: unique symbol; }
 interface SenderKeyMessage { readonly __type: unique symbol; }
 interface SenderKeyRecord { readonly __type: unique symbol; }
 interface ServerCertificate { readonly __type: unique symbol; }
+interface ServerMessageAck { readonly __type: unique symbol; }
 interface ServerPublicParams { readonly __type: unique symbol; }
 interface ServerSecretParams { readonly __type: unique symbol; }
 interface SessionRecord { readonly __type: unique symbol; }

package/dist/Errors.d.ts

@@ -33,7 +33,10 @@ export declare enum ErrorCode {
     SvrDataMissing = 29,
     SvrRequestFailed = 30,
     SvrRestoreFailed = 31,
-    ChatServiceInactive = 32
+    ChatServiceInactive = 32,
+    AppExpired = 33,
+    DeviceDelinked = 34,
+    Cancelled = 35
 }
 export declare class LibSignalErrorBase extends Error {
     readonly code: ErrorCode;
@@ -137,6 +140,12 @@ export type RateLimitedError = LibSignalErrorBase & {
 export type ChatServiceInactive = LibSignalErrorBase & {
     code: ErrorCode.ChatServiceInactive;
 };
+export type AppExpiredError = LibSignalErrorBase & {
+    code: ErrorCode.AppExpired;
+};
+export type DeviceDelinkedError = LibSignalErrorBase & {
+    code: ErrorCode.DeviceDelinked;
+};
 export type SvrDataMissingError = LibSignalErrorBase & {
     code: ErrorCode.SvrDataMissing;
 };
@@ -145,5 +154,9 @@ export type SvrRequestFailedError = LibSignalErrorCommon & {
 };
 export type SvrRestoreFailedError = LibSignalErrorCommon & {
     code: ErrorCode.SvrRestoreFailed;
+    readonly triesRemaining: number;
+};
+export type CancellationError = LibSignalErrorCommon & {
+    code: ErrorCode.Cancelled;
 };
-export type LibSignalError = GenericError | DuplicatedMessageError | SealedSenderSelfSendError | UntrustedIdentityError | InvalidRegistrationIdError | VerificationFailedError | InvalidSessionError | InvalidSenderKeySessionError | NicknameCannotBeEmptyError | CannotStartWithDigitError | MissingSeparatorError | BadNicknameCharacterError | NicknameTooShortError | NicknameTooLongError | DiscriminatorCannotBeEmptyError | DiscriminatorCannotBeZeroError | DiscriminatorCannotBeSingleDigitError | DiscriminatorCannotHaveLeadingZerosError | BadDiscriminatorCharacterError | DiscriminatorTooLargeError | InputDataTooLong | InvalidEntropyDataLength | InvalidUsernameLinkEncryptedData | IoError | CdsiInvalidTokenError | InvalidUriError | InvalidMediaInputError | SvrDataMissingError | SvrRestoreFailedError | SvrRequestFailedError | UnsupportedMediaInputError | ChatServiceInactive;
+export type LibSignalError = GenericError | DuplicatedMessageError | SealedSenderSelfSendError | UntrustedIdentityError | InvalidRegistrationIdError | VerificationFailedError | InvalidSessionError | InvalidSenderKeySessionError | NicknameCannotBeEmptyError | CannotStartWithDigitError | MissingSeparatorError | BadNicknameCharacterError | NicknameTooShortError | NicknameTooLongError | DiscriminatorCannotBeEmptyError | DiscriminatorCannotBeZeroError | DiscriminatorCannotBeSingleDigitError | DiscriminatorCannotHaveLeadingZerosError | BadDiscriminatorCharacterError | DiscriminatorTooLargeError | InputDataTooLong | InvalidEntropyDataLength | InvalidUsernameLinkEncryptedData | IoError | CdsiInvalidTokenError | InvalidUriError | InvalidMediaInputError | SvrDataMissingError | SvrRestoreFailedError | SvrRequestFailedError | UnsupportedMediaInputError | ChatServiceInactive | AppExpiredError | DeviceDelinkedError | CancellationError;

package/dist/Errors.js

@@ -41,6 +41,9 @@ var ErrorCode;
     ErrorCode[ErrorCode["SvrRequestFailed"] = 30] = "SvrRequestFailed";
     ErrorCode[ErrorCode["SvrRestoreFailed"] = 31] = "SvrRestoreFailed";
     ErrorCode[ErrorCode["ChatServiceInactive"] = 32] = "ChatServiceInactive";
+    ErrorCode[ErrorCode["AppExpired"] = 33] = "AppExpired";
+    ErrorCode[ErrorCode["DeviceDelinked"] = 34] = "DeviceDelinked";
+    ErrorCode[ErrorCode["Cancelled"] = 35] = "Cancelled";
 })(ErrorCode = exports.ErrorCode || (exports.ErrorCode = {}));
 class LibSignalErrorBase extends Error {
     constructor(message, name, operation, extraProps) {

package/dist/acknowledgments.md

@@ -669,7 +669,7 @@ For more information on this, and how to apply and follow the GNU AGPL, see
 
 ```
 
-## attest 0.1.0, device-transfer 0.1.0, libsignal-bridge 0.1.0, libsignal-bridge-macros 0.1.0, libsignal-core 0.1.0, libsignal-ffi 0.46.2, libsignal-jni 0.46.2, libsignal-message-backup 0.1.0, libsignal-message-backup-io 0.1.0, libsignal-message-backup-macros 0.1.0, libsignal-net 0.1.0, libsignal-node 0.46.2, libsignal-protocol 0.1.0, libsignal-svr3 0.1.0, poksho 0.7.0, signal-crypto 0.1.0, signal-media 0.1.0, signal-neon-futures 0.1.0, signal-neon-futures-tests 0.1.0, signal-pin 0.1.0, usernames 0.1.0, zkcredential 0.1.0, zkgroup 0.9.0
+## attest 0.1.0, device-transfer 0.1.0, libsignal-bridge 0.1.0, libsignal-bridge-macros 0.1.0, libsignal-core 0.1.0, libsignal-ffi 0.48.0, libsignal-jni 0.48.0, libsignal-message-backup 0.1.0, libsignal-message-backup-macros 0.1.0, libsignal-net 0.1.0, libsignal-node 0.48.0, libsignal-protocol 0.1.0, libsignal-svr3 0.1.0, poksho 0.7.0, signal-crypto 0.1.0, signal-media 0.1.0, signal-neon-futures 0.1.0, signal-neon-futures-tests 0.1.0, signal-pin 0.1.0, usernames 0.1.0, zkcredential 0.1.0, zkgroup 0.9.0
 
 ```
 GNU AFFERO GENERAL PUBLIC LICENSE
@@ -4454,7 +4454,7 @@ DEALINGS IN THE SOFTWARE.
 
 ```
 
-## smallvec 1.13.1
+## smallvec 1.13.2
 
 ```
 Copyright (c) 2018 The Servo Project Developers
@@ -6830,6 +6830,39 @@ SOFTWARE.
 
 ```
 
+## atomic-take 1.1.0
+
+```
+The MIT License (MIT)
+
+Copyright (c) 2019 Alice Ryhl
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+```
+
 ## crossbeam-deque 0.8.5, crossbeam-epoch 0.9.18, crossbeam-utils 0.8.19
 
 ```

package/dist/net.d.ts

@@ -17,6 +17,7 @@ export type CDSRequestOptionsType = {
         accessKey: string;
     }>;
     returnAcisWithoutUaks: boolean;
+    abortSignal?: AbortSignal;
 };
 export type CDSResponseEntryType<Aci, Pni> = {
     aci: Aci | undefined;
@@ -34,8 +35,13 @@ export type ChatRequest = Readonly<{
     body?: Uint8Array;
     timeoutMillis?: number;
 }>;
-type TokioAsyncContext = Wrapper<Native.TokioAsyncContext>;
 type ConnectionManager = Wrapper<Native.ConnectionManager>;
+/** Low-level async runtime control, mostly just exported for testing. */
+export declare class TokioAsyncContext {
+    readonly _nativeHandle: Native.TokioAsyncContext;
+    constructor(handle: Native.TokioAsyncContext);
+    makeCancellable<T>(abortSignal: AbortSignal | undefined, promise: Promise<T>): Promise<T>;
+}
 /**
  * Provides API methods to connect and communicate with the Chat Service.
  * Before using either authenticated or unauthenticated channels,
@@ -60,8 +66,13 @@ export declare class ChatService {
      * the service is connected, all the requests will be using the established connection. Also, if
      * the connection is lost for any reason other than the call to {@link #disconnect()}, an
      * automatic reconnect attempt will be made.
+     *
+     * @throws {AppExpiredError} if the current app version is too old (as judged by the server).
+     * @throws {LibSignalError} with other codes for other failures.
      */
-    connectUnauthenticated(): Promise<Native.ChatServiceDebugInfo>;
+    connectUnauthenticated(options?: {
+        abortSignal?: AbortSignal;
+    }): Promise<Native.ChatServiceDebugInfo>;
     /**
      * Initiates establishing of the underlying authenticated connection to the Chat Service. Once the
      * service is connected, all the requests will be using the established connection. Also, if the
@@ -69,8 +80,14 @@ export declare class ChatService {
      * reconnect attempt will be made.
      *
      * Calling this method will result in starting to accept incoming requests from the Chat Service.
+     *
+     * @throws {AppExpiredError} if the current app version is too old (as judged by the server).
+     * @throws {DeviceDelinkedError} if the current device has been delinked.
+     * @throws {LibSignalError} with other codes for other failures.
      */
-    connectAuthenticated(): Promise<Native.ChatServiceDebugInfo>;
+    connectAuthenticated(options?: {
+        abortSignal?: AbortSignal;
+    }): Promise<Native.ChatServiceDebugInfo>;
     /**
      * Sends request to the Chat Service over an unauthenticated channel.
      *
@@ -80,14 +97,18 @@ export declare class ChatService {
      * @throws {ChatServiceInactive} if you haven't called {@link #connectUnauthenticated()} (as a
      * rejection of the promise).
      */
-    unauthenticatedFetchAndDebug(chatRequest: ChatRequest): Promise<Native.ResponseAndDebugInfo>;
+    unauthenticatedFetchAndDebug(chatRequest: ChatRequest, options?: {
+        abortSignal?: AbortSignal;
+    }): Promise<Native.ResponseAndDebugInfo>;
     /**
      * Sends request to the Chat Service over an unauthenticated channel.
      *
      * @throws {ChatServiceInactive} if you haven't called {@link #connectUnauthenticated()} (as a
      * rejection of the promise).
      */
-    unauthenticatedFetch(chatRequest: ChatRequest): Promise<Native.ChatResponse>;
+    unauthenticatedFetch(chatRequest: ChatRequest, options?: {
+        abortSignal?: AbortSignal;
+    }): Promise<Native.ChatResponse>;
     /**
      * Sends request to the Chat Service over an authenticated channel.
      *
@@ -97,14 +118,18 @@ export declare class ChatService {
      * @throws {ChatServiceInactive} if you haven't called {@link #connectAuthenticated()} (as a
      * rejection of the promise).
      */
-    authenticatedFetchAndDebug(chatRequest: ChatRequest): Promise<Native.ResponseAndDebugInfo>;
+    authenticatedFetchAndDebug(chatRequest: ChatRequest, options?: {
+        abortSignal?: AbortSignal;
+    }): Promise<Native.ResponseAndDebugInfo>;
     /**
      * Sends request to the Chat Service over an authenticated channel.
      *
      * @throws {ChatServiceInactive} if you haven't called {@link #connectAuthenticated()} (as a
      * rejection of the promise).
      */
-    authenticatedFetch(chatRequest: ChatRequest): Promise<Native.ChatResponse>;
+    authenticatedFetch(chatRequest: ChatRequest, options?: {
+        abortSignal?: AbortSignal;
+    }): Promise<Native.ChatResponse>;
     static buildHttpRequest(chatRequest: ChatRequest): {
         _nativeHandle: Native.HttpRequest;
     };
@@ -144,7 +169,7 @@ export declare class Net {
      * method is a no-op.
      */
     clearProxy(): void;
-    cdsiLookup({ username, password }: Readonly<ServiceAuth>, { e164s, acisAndAccessKeys, returnAcisWithoutUaks, }: ReadonlyDeep<CDSRequestOptionsType>): Promise<CDSResponseType<string, string>>;
+    cdsiLookup({ username, password }: Readonly<ServiceAuth>, { e164s, acisAndAccessKeys, returnAcisWithoutUaks, abortSignal, }: ReadonlyDeep<CDSRequestOptionsType>): Promise<CDSResponseType<string, string>>;
 }
 /**
  * This interface provides functionality for communicating with SVR3
@@ -170,8 +195,7 @@ export interface Svr3Client {
     /**
      * Backup a secret to SVR3.
      *
-     * Error messages are expected to be log-safe and not contain any sensitive
-     *   data.
+     * Error messages are log-safe and do not contain any sensitive data.
      *
      * @param what - The secret to be stored. Must be 32 bytes long.
      * @param password - User-provided password that will be used to derive the
@@ -200,12 +224,13 @@ export interface Svr3Client {
      * are therefore non-actionable and are guaranteed to be thrown again when
      * retried.
      */
-    backup(what: Buffer, password: string, maxTries: number, auth: Readonly<ServiceAuth>): Promise<Buffer>;
+    backup(what: Buffer, password: string, maxTries: number, auth: Readonly<ServiceAuth>, options?: {
+        abortSignal?: AbortSignal;
+    }): Promise<Buffer>;
     /**
      * Restore a secret from SVR3.
      *
-     * Error messages are expected to be log-safe and not contain any sensitive
-     * data.
+     * Error messages are log-safe and do not contain any sensitive data.
      *
      * @param password - User-provided password that will be used to derive the
      * decryption key for the secret.
@@ -216,8 +241,8 @@ export interface Svr3Client {
      * generally good for about 15 minutes, therefore it can be reused for the
      * subsequent calls to either backup or restore that are not too far apart in
      * time.
-     * @returns A `Promise` which--when awaited--will return a byte array with the
-     * restored secret.
+     * @returns A `Promise` which--when awaited--will return a
+     * {@link RestoredSecret} object, containing the restored secret.
      *
      * The returned `Promise` can also fail due to the network issues (including
      * the connection timeout), problems establishing the Noise connection to the
@@ -237,6 +262,45 @@ export interface Svr3Client {
      * masked share set fails, or when the server requests fail for reasons
      * other than "maximum attempts exceeded".
      */
-    restore(password: string, shareSet: Buffer, auth: Readonly<ServiceAuth>): Promise<Buffer>;
+    restore(password: string, shareSet: Buffer, auth: Readonly<ServiceAuth>, options?: {
+        abortSignal?: AbortSignal;
+    }): Promise<RestoredSecret>;
+    /**
+     * Remove a value stored in SVR3.
+     *
+     * This method will succeed even if the data has never been backed up in the
+     * first place.
+     *
+     * Error messages are log-safe and do not contain any sensitive data.
+     *
+     * @param auth - An instance of {@link ServiceAuth} containing the username
+     * and password obtained from the Chat Server. The password is an OTP which is
+     * generally good for about 15 minutes, therefore it can be reused for the
+     * subsequent calls to either backup or restore that are not too far apart in
+     * time.
+     * @returns A `Promise` successful completion of which will mean the data has
+     * been removed.
+     *
+     * The returned `Promise` can also fail due to the network issues (including
+     * the connection timeout), problems establishing the Noise connection to the
+     * enclaves, or invalid arguments' values. {@link IoError} errors can, in
+     * general, be retried, although there is already a retry-with-backoff
+     * mechanism inside libsignal used to connect to the SVR3 servers. Other
+     * exceptions are caused by the bad input or data missing on the server. They
+     * are therefore non-actionable and are guaranteed to be thrown again when
+     * retried.
+     */
+    remove(auth: Readonly<ServiceAuth>, options?: {
+        abortSignal?: AbortSignal;
+    }): Promise<void>;
+}
+/**
+ * A simple data class containing the secret restored from SVR3 as well as the
+ * number of restore attempts remaining.
+ */
+export declare class RestoredSecret {
+    readonly triesRemaining: number;
+    readonly value: Buffer;
+    constructor(serialized: Buffer);
 }
 export {};

package/dist/net.js

@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Net = exports.ChatService = exports.Environment = void 0;
+exports.RestoredSecret = exports.Net = exports.ChatService = exports.TokioAsyncContext = exports.Environment = void 0;
 const Native = require("../Native");
 const Address_1 = require("./Address");
 const DEFAULT_CHAT_REQUEST_TIMEOUT_MILLIS = 5000;
@@ -19,6 +19,30 @@ function newNativeHandle(handle) {
         _nativeHandle: handle,
     };
 }
+/** Low-level async runtime control, mostly just exported for testing. */
+class TokioAsyncContext {
+    constructor(handle) {
+        this._nativeHandle = handle;
+    }
+    makeCancellable(abortSignal, promise) {
+        if (abortSignal !== undefined &&
+            '_cancellationToken' in promise &&
+            typeof promise._cancellationToken === 'bigint') {
+            const cancellationToken = promise._cancellationToken;
+            const cancel = () => {
+                Native.TokioAsyncContext_cancel(this, cancellationToken);
+            };
+            if (abortSignal.aborted) {
+                cancel();
+            }
+            else {
+                abortSignal.addEventListener('abort', cancel);
+            }
+        }
+        return promise;
+    }
+}
+exports.TokioAsyncContext = TokioAsyncContext;
 /**
  * Provides API methods to connect and communicate with the Chat Service.
  * Before using either authenticated or unauthenticated channels,
@@ -38,17 +62,20 @@ class ChatService {
      * Note: the same instance of `ChatService` can be reused after `disconnect()` was
      * called.
      */
-    async disconnect() {
-        await Native.ChatService_disconnect(this.asyncContext, this.chatService);
+    disconnect() {
+        return Native.ChatService_disconnect(this.asyncContext, this.chatService);
     }
     /**
      * Initiates establishing of the underlying unauthenticated connection to the Chat Service. Once
      * the service is connected, all the requests will be using the established connection. Also, if
      * the connection is lost for any reason other than the call to {@link #disconnect()}, an
      * automatic reconnect attempt will be made.
+     *
+     * @throws {AppExpiredError} if the current app version is too old (as judged by the server).
+     * @throws {LibSignalError} with other codes for other failures.
      */
-    async connectUnauthenticated() {
-        return await Native.ChatService_connect_unauth(this.asyncContext, this.chatService);
+    connectUnauthenticated(options) {
+        return this.asyncContext.makeCancellable(options?.abortSignal, Native.ChatService_connect_unauth(this.asyncContext, this.chatService));
     }
     /**
      * Initiates establishing of the underlying authenticated connection to the Chat Service. Once the
@@ -57,9 +84,13 @@ class ChatService {
      * reconnect attempt will be made.
      *
      * Calling this method will result in starting to accept incoming requests from the Chat Service.
+     *
+     * @throws {AppExpiredError} if the current app version is too old (as judged by the server).
+     * @throws {DeviceDelinkedError} if the current device has been delinked.
+     * @throws {LibSignalError} with other codes for other failures.
      */
-    async connectAuthenticated() {
-        return await Native.ChatService_connect_auth(this.asyncContext, this.chatService);
+    connectAuthenticated(options) {
+        return this.asyncContext.makeCancellable(options?.abortSignal, Native.ChatService_connect_auth(this.asyncContext, this.chatService));
     }
     /**
      * Sends request to the Chat Service over an unauthenticated channel.
@@ -70,8 +101,8 @@ class ChatService {
      * @throws {ChatServiceInactive} if you haven't called {@link #connectUnauthenticated()} (as a
      * rejection of the promise).
      */
-    async unauthenticatedFetchAndDebug(chatRequest) {
-        return await Native.ChatService_unauth_send_and_debug(this.asyncContext, this.chatService, ChatService.buildHttpRequest(chatRequest), chatRequest.timeoutMillis ?? DEFAULT_CHAT_REQUEST_TIMEOUT_MILLIS);
+    unauthenticatedFetchAndDebug(chatRequest, options) {
+        return this.asyncContext.makeCancellable(options?.abortSignal, Native.ChatService_unauth_send_and_debug(this.asyncContext, this.chatService, ChatService.buildHttpRequest(chatRequest), chatRequest.timeoutMillis ?? DEFAULT_CHAT_REQUEST_TIMEOUT_MILLIS));
     }
     /**
      * Sends request to the Chat Service over an unauthenticated channel.
@@ -79,8 +110,8 @@ class ChatService {
      * @throws {ChatServiceInactive} if you haven't called {@link #connectUnauthenticated()} (as a
      * rejection of the promise).
      */
-    async unauthenticatedFetch(chatRequest) {
-        return await Native.ChatService_unauth_send(this.asyncContext, this.chatService, ChatService.buildHttpRequest(chatRequest), chatRequest.timeoutMillis ?? DEFAULT_CHAT_REQUEST_TIMEOUT_MILLIS);
+    unauthenticatedFetch(chatRequest, options) {
+        return this.asyncContext.makeCancellable(options?.abortSignal, Native.ChatService_unauth_send(this.asyncContext, this.chatService, ChatService.buildHttpRequest(chatRequest), chatRequest.timeoutMillis ?? DEFAULT_CHAT_REQUEST_TIMEOUT_MILLIS));
     }
     /**
      * Sends request to the Chat Service over an authenticated channel.
@@ -91,8 +122,8 @@ class ChatService {
      * @throws {ChatServiceInactive} if you haven't called {@link #connectAuthenticated()} (as a
      * rejection of the promise).
      */
-    async authenticatedFetchAndDebug(chatRequest) {
-        return await Native.ChatService_auth_send_and_debug(this.asyncContext, this.chatService, ChatService.buildHttpRequest(chatRequest), chatRequest.timeoutMillis ?? DEFAULT_CHAT_REQUEST_TIMEOUT_MILLIS);
+    authenticatedFetchAndDebug(chatRequest, options) {
+        return this.asyncContext.makeCancellable(options?.abortSignal, Native.ChatService_auth_send_and_debug(this.asyncContext, this.chatService, ChatService.buildHttpRequest(chatRequest), chatRequest.timeoutMillis ?? DEFAULT_CHAT_REQUEST_TIMEOUT_MILLIS));
     }
     /**
      * Sends request to the Chat Service over an authenticated channel.
@@ -100,8 +131,8 @@ class ChatService {
      * @throws {ChatServiceInactive} if you haven't called {@link #connectAuthenticated()} (as a
      * rejection of the promise).
      */
-    async authenticatedFetch(chatRequest) {
-        return await Native.ChatService_auth_send(this.asyncContext, this.chatService, ChatService.buildHttpRequest(chatRequest), chatRequest.timeoutMillis ?? DEFAULT_CHAT_REQUEST_TIMEOUT_MILLIS);
+    authenticatedFetch(chatRequest, options) {
+        return this.asyncContext.makeCancellable(options?.abortSignal, Native.ChatService_auth_send(this.asyncContext, this.chatService, ChatService.buildHttpRequest(chatRequest), chatRequest.timeoutMillis ?? DEFAULT_CHAT_REQUEST_TIMEOUT_MILLIS));
     }
     static buildHttpRequest(chatRequest) {
         const { verb, path, body, headers } = chatRequest;
@@ -119,7 +150,7 @@ class ChatService {
 exports.ChatService = ChatService;
 class Net {
     constructor(env, userAgent) {
-        this.asyncContext = newNativeHandle(Native.TokioAsyncContext_new());
+        this.asyncContext = new TokioAsyncContext(Native.TokioAsyncContext_new());
         this.connectionManager = newNativeHandle(Native.ConnectionManager_new(env, userAgent));
         this.svr3 = new Svr3ClientImpl(this.asyncContext, this.connectionManager);
     }
@@ -158,7 +189,7 @@ class Net {
     clearProxy() {
         Native.ConnectionManager_clear_proxy(this.connectionManager);
     }
-    async cdsiLookup({ username, password }, { e164s, acisAndAccessKeys, returnAcisWithoutUaks, }) {
+    async cdsiLookup({ username, password }, { e164s, acisAndAccessKeys, returnAcisWithoutUaks, abortSignal, }) {
         const request = newNativeHandle(Native.LookupRequest_new());
         e164s.forEach((e164) => {
             Native.LookupRequest_addE164(request, e164);
@@ -167,21 +198,36 @@ class Net {
             Native.LookupRequest_addAciAndAccessKey(request, Address_1.Aci.parseFromServiceIdString(aciStr).getServiceIdFixedWidthBinary(), Buffer.from(accessKeyStr, 'base64'));
         });
         Native.LookupRequest_setReturnAcisWithoutUaks(request, returnAcisWithoutUaks);
-        const lookup = await Native.CdsiLookup_new(this.asyncContext, this.connectionManager, username, password, request);
-        return await Native.CdsiLookup_complete(this.asyncContext, newNativeHandle(lookup));
+        const lookup = await this.asyncContext.makeCancellable(abortSignal, Native.CdsiLookup_new(this.asyncContext, this.connectionManager, username, password, request));
+        return await this.asyncContext.makeCancellable(abortSignal, Native.CdsiLookup_complete(this.asyncContext, newNativeHandle(lookup)));
     }
 }
 exports.Net = Net;
+/**
+ * A simple data class containing the secret restored from SVR3 as well as the
+ * number of restore attempts remaining.
+ */
+class RestoredSecret {
+    constructor(serialized) {
+        this.triesRemaining = serialized.readInt32BE();
+        this.value = serialized.subarray(4);
+    }
+}
+exports.RestoredSecret = RestoredSecret;
 class Svr3ClientImpl {
     constructor(asyncContext, connectionManager) {
         this.asyncContext = asyncContext;
         this.connectionManager = connectionManager;
     }
-    async backup(what, password, maxTries, auth) {
-        return Native.Svr3Backup(this.asyncContext, this.connectionManager, what, password, maxTries, auth.username, auth.password);
+    async backup(what, password, maxTries, auth, options) {
+        return this.asyncContext.makeCancellable(options?.abortSignal, Native.Svr3Backup(this.asyncContext, this.connectionManager, what, password, maxTries, auth.username, auth.password));
+    }
+    async restore(password, shareSet, auth, options) {
+        const serialized = await this.asyncContext.makeCancellable(options?.abortSignal, Native.Svr3Restore(this.asyncContext, this.connectionManager, password, shareSet, auth.username, auth.password));
+        return new RestoredSecret(serialized);
     }
-    async restore(password, shareSet, auth) {
-        return Native.Svr3Restore(this.asyncContext, this.connectionManager, password, shareSet, auth.username, auth.password);
+    async remove(auth, options) {
+        return this.asyncContext.makeCancellable(options?.abortSignal, Native.Svr3Remove(this.asyncContext, this.connectionManager, auth.username, auth.password));
     }
 }
 //# sourceMappingURL=net.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalapp/libsignal-client",
-  "version": "0.46.2",
+  "version": "0.48.0",
   "license": "AGPL-3.0-only",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",