@bodhiapp/bodhi-js 0.0.4 → 0.0.6

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.
Files changed (34) hide show
  1. package/dist/bodhi-browser-ext/src/types/bodhiext.d.ts +0 -1
  2. package/dist/bodhi-browser-ext/src/types/common.d.ts +1 -0
  3. package/dist/bodhi-browser-ext/src/types/protocol.d.ts +0 -1
  4. package/dist/bodhi-js-sdk/core/src/direct-client-base.d.ts +5 -5
  5. package/dist/bodhi-js-sdk/core/src/errors.d.ts +0 -1
  6. package/dist/bodhi-js-sdk/core/src/facade-client-base.d.ts +5 -6
  7. package/dist/bodhi-js-sdk/core/src/interface.d.ts +14 -7
  8. package/dist/bodhi-js-sdk/core/src/logger.d.ts +0 -1
  9. package/dist/bodhi-js-sdk/core/src/oauth.d.ts +0 -1
  10. package/dist/bodhi-js-sdk/core/src/onboarding/config.d.ts +0 -1
  11. package/dist/bodhi-js-sdk/core/src/onboarding/modal.d.ts +1 -2
  12. package/dist/bodhi-js-sdk/core/src/onboarding/protocol-utils.d.ts +0 -1
  13. package/dist/bodhi-js-sdk/core/src/platform.d.ts +0 -1
  14. package/dist/bodhi-js-sdk/core/src/types/api.d.ts +0 -1
  15. package/dist/bodhi-js-sdk/core/src/types/auth.d.ts +37 -0
  16. package/dist/bodhi-js-sdk/core/src/types/callback.d.ts +1 -2
  17. package/dist/bodhi-js-sdk/core/src/types/client-state.d.ts +43 -94
  18. package/dist/bodhi-js-sdk/core/src/types/config.d.ts +0 -1
  19. package/dist/bodhi-js-sdk/core/src/types/index.d.ts +4 -3
  20. package/dist/bodhi-js-sdk/core/src/types/platform.d.ts +0 -1
  21. package/dist/bodhi-js-sdk/core/src/types/user-info.d.ts +0 -32
  22. package/dist/bodhi-js-sdk/web/src/constants.d.ts +0 -1
  23. package/dist/bodhi-js-sdk/web/src/direct-client.d.ts +4 -6
  24. package/dist/bodhi-js-sdk/web/src/ext-client.d.ts +7 -8
  25. package/dist/bodhi-js-sdk/web/src/facade-client.d.ts +2 -3
  26. package/dist/bodhi-js-sdk/web/src/index.d.ts +0 -1
  27. package/dist/bodhi-web.cjs.js +1 -1
  28. package/dist/bodhi-web.esm.d.ts +1 -0
  29. package/dist/bodhi-web.esm.js +274 -265
  30. package/dist/setup-modal/src/types/message-types.d.ts +0 -1
  31. package/dist/setup-modal/src/types/protocol.d.ts +0 -1
  32. package/dist/setup-modal/src/types/state.d.ts +0 -1
  33. package/dist/setup-modal/src/types/type-guards.d.ts +0 -1
  34. package/package.json +10 -6
@@ -1,5 +1,4 @@
1
1
  import { OpenAiApiError, PingResponse, CreateChatCompletionRequest, CreateChatCompletionResponse, CreateChatCompletionStreamResponse } from '@bodhiapp/ts-client';
2
-
3
2
  /**
4
3
  * HTTP response wrapper - body can be success type OR error type
5
4
  * Use isApiErrorResponse() to narrow the type based on status
@@ -26,6 +26,7 @@ export declare const ERROR_TYPES: {
26
26
  readonly NETWORK_ERROR: "network_error";
27
27
  readonly EXTENSION_ERROR: "extension_error";
28
28
  readonly TIMEOUT_ERROR: "timeout_error";
29
+ readonly AUTH_ERROR: "auth_error";
29
30
  };
30
31
  export type ConnectionErrorType = (typeof ERROR_TYPES)[keyof typeof ERROR_TYPES];
31
32
  export declare const DOCUMENT_STATE_COMPLETE = "complete";
@@ -1,6 +1,5 @@
1
1
  import { OpenAiApiError, ErrorBody } from '@bodhiapp/ts-client';
2
2
  import { ApiResponse, ServerStateInfo } from './bodhiext';
3
-
4
3
  /**
5
4
  * Validate OpenAI API error body structure
6
5
  * { error: { message: string, type: string } }
@@ -1,9 +1,9 @@
1
- import { CreateChatCompletionStreamResponse } from '@bodhiapp/ts-client';
1
+ import { AppAccessResponse, CreateChatCompletionStreamResponse } from '@bodhiapp/ts-client';
2
2
  import { IDirectClient } from './interface';
3
3
  import { Logger } from './logger';
4
4
  import { OAuthEndpoints, RefreshTokenResponse } from './oauth';
5
5
  import { StorageKeys } from './storage';
6
- import { ApiResponseResult, AuthLoggedIn, AuthLoggedOut, AuthState, BackendServerState, ClientState, DirectState, InitParams, LogLevel, SerializedDirectState, StateChangeCallback } from './types';
6
+ import { ApiResponseResult, AuthState, BackendServerState, ClientState, DirectState, InitParams, LogLevel, SerializedDirectState, StateChangeCallback } from './types';
7
7
  /**
8
8
  * DirectClientBase - Abstract base class for DirectClient implementations
9
9
  *
@@ -101,8 +101,8 @@ export declare abstract class DirectClientBase implements IDirectClient {
101
101
  * Debug dump of DirectClient internal state
102
102
  */
103
103
  debug(): Promise<Record<string, unknown>>;
104
- abstract login(): Promise<AuthLoggedIn>;
105
- abstract logout(): Promise<AuthLoggedOut>;
104
+ abstract login(): Promise<AuthState>;
105
+ abstract logout(): Promise<AuthState>;
106
106
  getAuthState(): Promise<AuthState>;
107
107
  protected _getAccessTokenRaw(): Promise<string | null>;
108
108
  /**
@@ -118,7 +118,7 @@ export declare abstract class DirectClientBase implements IDirectClient {
118
118
  * Store refreshed tokens
119
119
  */
120
120
  protected _storeRefreshedTokens(tokens: RefreshTokenResponse): Promise<void>;
121
- protected requestResourceAccess(): Promise<string>;
121
+ protected requestResourceAccess(): Promise<ApiResponseResult<AppAccessResponse>>;
122
122
  protected exchangeCodeForTokens(code: string): Promise<void>;
123
123
  protected revokeRefreshToken(): Promise<void>;
124
124
  protected clearAuthStorage(): Promise<void>;
@@ -1,6 +1,5 @@
1
1
  import { ApiError, OperationError } from '../../../bodhi-browser-ext/src/types';
2
2
  import { OpenAiApiError } from '@bodhiapp/ts-client';
3
-
4
3
  /**
5
4
  * Create API error (HTTP 4xx/5xx from server)
6
5
  * Thrown for streaming responses when server returns error
@@ -1,9 +1,8 @@
1
1
  import { CreateChatCompletionStreamResponse } from '@bodhiapp/ts-client';
2
- import { IConnectionClient } from './interface';
2
+ import { IConnectionClient, IExtensionClient } from './interface';
3
3
  import { Logger } from './logger';
4
4
  import { BodhiClientUserPrefsManager } from './storage';
5
- import { ApiResponseResult, AuthLoggedIn, AuthLoggedOut, AuthState, BackendServerState, ClientState, ConnectionMode, DirectState, ExtensionState, InitParams, SerializedClientState, SerializedDirectState, SerializedExtensionState, StateChange, StateChangeCallback } from './types';
6
-
5
+ import { ApiResponseResult, AuthState, BackendServerState, ClientState, ConnectionMode, DirectState, ExtensionState, InitParams, SerializedClientState, SerializedDirectState, SerializedExtensionState, StateChange, StateChangeCallback } from './types';
7
6
  /**
8
7
  * Base facade client with common delegation logic
9
8
  *
@@ -11,7 +10,7 @@ import { ApiResponseResult, AuthLoggedIn, AuthLoggedOut, AuthState, BackendServe
11
10
  * @template TExtClient - Extension client type (implements IConnectionClient with SerializedExtensionState)
12
11
  * @template TDirectClient - Direct client type (implements IConnectionClient with SerializedDirectState)
13
12
  */
14
- export declare abstract class BaseFacadeClient<TConfig, TExtClient extends IConnectionClient<unknown, SerializedExtensionState>, TDirectClient extends IConnectionClient<unknown, SerializedDirectState>> {
13
+ export declare abstract class BaseFacadeClient<TConfig, TExtClient extends IExtensionClient<unknown, SerializedExtensionState>, TDirectClient extends IConnectionClient<unknown, SerializedDirectState>> {
15
14
  protected logger: Logger;
16
15
  protected extClient: TExtClient;
17
16
  protected directClient: TDirectClient;
@@ -90,8 +89,8 @@ export declare abstract class BaseFacadeClient<TConfig, TExtClient extends IConn
90
89
  isServerReady(): boolean;
91
90
  sendExtRequest<TParams = void, TRes = unknown>(action: string, params?: TParams): Promise<TRes>;
92
91
  sendApiRequest<TReq = void, TRes = unknown>(method: string, endpoint: string, body?: TReq, headers?: Record<string, string>, authenticated?: boolean): Promise<ApiResponseResult<TRes>>;
93
- login(): Promise<AuthLoggedIn>;
94
- logout(): Promise<AuthLoggedOut>;
92
+ login(): Promise<AuthState>;
93
+ logout(): Promise<AuthState>;
95
94
  getAuthState(): Promise<AuthState>;
96
95
  pingApi(): Promise<ApiResponseResult<{
97
96
  message: string;
@@ -1,6 +1,5 @@
1
1
  import { CreateChatCompletionStreamResponse } from '@bodhiapp/ts-client';
2
- import { ApiResponseResult, AuthLoggedIn, AuthLoggedOut, AuthState, BackendServerState, ClientState, ConnectionMode, DirectState, ExtensionState, InitParams, StateChangeCallback } from './types';
3
-
2
+ import { ApiResponseResult, AuthState, BackendServerState, ClientState, ConnectionMode, DirectState, ExtensionState, InitParams, StateChangeCallback } from './types';
4
3
  /**
5
4
  * ConnectionClient - Base interface for all client implementations
6
5
  *
@@ -86,14 +85,14 @@ export interface IConnectionClient<IParams = unknown, SerialState = unknown> {
86
85
  * Login via OAuth
87
86
  * - IExtensionClient: Delegates to extension (chrome.identity or browser redirect)
88
87
  * - DirectClient: Direct HTTP OAuth flow
89
- * @returns AuthLoggedIn with login state and user info
88
+ * @returns AuthState with login state and user info
90
89
  */
91
- login(): Promise<AuthLoggedIn>;
90
+ login(): Promise<AuthState>;
92
91
  /**
93
92
  * Logout and revoke tokens
94
- * @returns AuthLoggedOut with logged out state
93
+ * @returns AuthState with logged out state
95
94
  */
96
- logout(): Promise<AuthLoggedOut>;
95
+ logout(): Promise<AuthState>;
97
96
  /**
98
97
  * Get current authentication state
99
98
  * @returns AuthState (discriminated union: AuthLoggedIn | AuthLoggedOut)
@@ -206,6 +205,14 @@ export type UIClient = IConnectionClient<InitParams> & {
206
205
  * @returns DirectState
207
206
  */
208
207
  getDirectState(): Promise<DirectState>;
208
+ /**
209
+ * Send extension request (only available in extension mode)
210
+ * @param action - Extension action
211
+ * @param params - Action parameters
212
+ * @returns Response from extension
213
+ * @throws Error if connection mode is not 'extension'
214
+ */
215
+ sendExtRequest<TParams = void, TRes = unknown>(action: string, params?: TParams): Promise<TRes>;
209
216
  };
210
217
  /**
211
218
  * Web-specific UIClient interface with OAuth callback handling
@@ -218,7 +225,7 @@ export interface IWebUIClient extends UIClient {
218
225
  * @param state - State parameter for CSRF protection
219
226
  * @returns AuthLoggedIn with login state and user info
220
227
  */
221
- handleOAuthCallback(code: string, state: string): Promise<AuthLoggedIn>;
228
+ handleOAuthCallback(code: string, state: string): Promise<AuthState>;
222
229
  }
223
230
  /**
224
231
  * Type guard to check if client has OAuth callback handling (web mode)
@@ -1,5 +1,4 @@
1
1
  import { LogLevel } from './types/config';
2
-
3
2
  export declare class Logger {
4
3
  private prefix;
5
4
  private level;
@@ -1,5 +1,4 @@
1
1
  import { UserInfo } from './types';
2
-
3
2
  /**
4
3
  * Base64 URL encode a buffer (for PKCE)
5
4
  */
@@ -1,5 +1,4 @@
1
1
  import { Browser, OS } from '../../../../setup-modal/src/types';
2
-
3
2
  /**
4
3
  * Browser configurations with extension store URLs
5
4
  */
@@ -1,5 +1,4 @@
1
1
  import { MessageType, RequestMessage, ResponsePayload } from '../../../../setup-modal/src/types';
2
-
3
2
  import type * as ModalTypes from '@bodhiapp/setup-modal/types';
4
3
  /**
5
4
  * Async handler for modal requests
@@ -32,7 +31,7 @@ export interface OnboardingModalConfig {
32
31
  /**
33
32
  * Path to modal HTML file relative to extension root
34
33
  * Used with chrome.runtime.getURL() in extension context
35
- * @default 'src/sdk/core/onboarding/modal.html'
34
+ * @default 'src/bodhi-js-core/setup-modal.html'
36
35
  */
37
36
  modalHtmlPath?: string;
38
37
  /**
@@ -1,5 +1,4 @@
1
1
  import { MessageType, RequestPayload, ResponsePayload, RequestMessage, RequestId } from '../../../../setup-modal/src/types';
2
-
3
2
  /** Build fire-and-forget event message */
4
3
  export declare function buildEvent<T extends MessageType>(type: T, payload: RequestPayload<T>): {
5
4
  kind: "event";
@@ -1,5 +1,4 @@
1
1
  import { BrowserInfo, OSInfo } from './types';
2
-
3
2
  /**
4
3
  * Detects the current browser using UAParser.js
5
4
  */
@@ -1,6 +1,5 @@
1
1
  import { ApiResponse, OperationErrorResponse } from '../../../../bodhi-browser-ext/src/types';
2
2
  import { OpenAiApiError } from '@bodhiapp/ts-client';
3
-
4
3
  /**
5
4
  * Public API result type - discriminated union without protocol fields
6
5
  *
@@ -0,0 +1,37 @@
1
+ import { UserInfo } from './user-info';
2
+ /**
3
+ * Authentication status enum
4
+ */
5
+ export type AuthStatus = 'idle' | 'loading' | 'authenticated' | 'unauthenticated' | 'error';
6
+ /**
7
+ * Authentication error
8
+ */
9
+ export interface AuthError {
10
+ code: string;
11
+ message: string;
12
+ }
13
+ /**
14
+ * Authentication state (flat interface)
15
+ */
16
+ export interface AuthState {
17
+ status: AuthStatus;
18
+ user: UserInfo | null;
19
+ accessToken: string | null;
20
+ error: AuthError | null;
21
+ }
22
+ /**
23
+ * Helper to check if authenticated
24
+ */
25
+ export declare function isAuthenticated(state: AuthState): boolean;
26
+ /**
27
+ * Helper to check if loading
28
+ */
29
+ export declare function isAuthLoading(state: AuthState): boolean;
30
+ /**
31
+ * Helper to check if error
32
+ */
33
+ export declare function isAuthError(state: AuthState): boolean;
34
+ /**
35
+ * Initial auth state
36
+ */
37
+ export declare const INITIAL_AUTH_STATE: AuthState;
@@ -1,6 +1,5 @@
1
1
  import { ClientState } from './client-state';
2
- import { AuthState } from './user-info';
3
-
2
+ import { AuthState } from './auth';
4
3
  /**
5
4
  * Discriminated union for state changes.
6
5
  * Allows single callback to handle both client state and auth state changes.
@@ -1,5 +1,4 @@
1
1
  import { OperationErrorResponse } from '../../../../bodhi-browser-ext/src/types';
2
-
3
2
  /**
4
3
  * Serialized direct client state for persistence
5
4
  * Stores minimal state needed to restore direct connection
@@ -28,51 +27,24 @@ export declare const SERVER_ERROR_CODES: {
28
27
  readonly type: "extension_error";
29
28
  };
30
29
  };
31
- export declare const BACKEND_SERVER_NOT_REACHABLE: BackendServerNotReachableState;
32
30
  /**
33
- * Server is ready - no error field
31
+ * All possible server status values
32
+ * Unified across extension and direct modes
34
33
  */
35
- export interface BackendServerReadyState {
36
- status: 'ready';
37
- version: string;
38
- }
39
- /**
40
- * Server is reachable but needs configuration - has error details
41
- * error code: 'server-not-ready'
42
- */
43
- export interface BackendServerNotReadyState {
44
- status: 'setup' | 'resource-admin' | 'error';
45
- version: string;
46
- error: OperationErrorResponse;
47
- }
34
+ export type ServerStatus = 'not-connected' | 'pending-extension-ready' | 'ready' | 'setup' | 'resource-admin' | 'error' | 'not-reachable';
48
35
  /**
49
- * Server is not reachable - network/connection failure
50
- * error code: 'not-reachable'
51
- */
52
- export interface BackendServerNotReachableState {
53
- status: 'not-reachable';
54
- error: OperationErrorResponse;
55
- }
56
- /**
57
- * Backend server state from /bodhi/v1/info endpoint
58
- * Discriminated union with definite fields per state
36
+ * Backend server state - flat interface with nullable fields
37
+ * Replaces discriminated union of 5 separate interfaces
59
38
  * Different from setup-modal's ServerState which includes UI states
60
39
  */
61
- export type BackendServerState = BackendServerReadyState | BackendServerNotReadyState | BackendServerNotReachableState;
62
- /**
63
- * State indicating extension is ready but server state is pending
64
- */
65
- export interface PendingExtensionReadyState {
66
- status: 'pending-extension-ready';
67
- }
68
- export declare const PENDING_EXTENSION_READY: PendingExtensionReadyState;
69
- /**
70
- * State indicating direct connection not yet established
71
- */
72
- export interface BackendServerNotConnectedState {
73
- status: 'not-connected';
40
+ export interface BackendServerState {
41
+ status: ServerStatus;
42
+ version: string | null;
43
+ error: OperationErrorResponse | null;
74
44
  }
75
- export declare const BACKEND_SERVER_NOT_CONNECTED: BackendServerNotConnectedState;
45
+ export declare const BACKEND_SERVER_NOT_REACHABLE: BackendServerState;
46
+ export declare const PENDING_EXTENSION_READY: BackendServerState;
47
+ export declare const BACKEND_SERVER_NOT_CONNECTED: BackendServerState;
76
48
  /**
77
49
  * Raw response from /bodhi/v1/info endpoint
78
50
  */
@@ -81,8 +53,8 @@ export interface ServerInfoResponse {
81
53
  version?: string;
82
54
  error?: OperationErrorResponse;
83
55
  }
84
- export declare function isServerReady(state: BackendServerState): state is BackendServerReadyState;
85
- export declare function backendServerNotReady(status: 'setup' | 'resource-admin' | 'error', version?: string, error?: OperationErrorResponse): BackendServerNotReadyState;
56
+ export declare function isServerReady(state: BackendServerState): boolean;
57
+ export declare function backendServerNotReady(status: 'setup' | 'resource-admin' | 'error', version?: string, error?: OperationErrorResponse): BackendServerState;
86
58
  /**
87
59
  * ClientState - Unified state for extension or direct connectivity
88
60
  * Discriminated union with type field: 'extension' | 'direct'
@@ -116,60 +88,37 @@ export interface InitParams {
116
88
  }
117
89
  export declare function isExtensionState(state: ClientState): state is ExtensionState;
118
90
  export declare function isDirectState(state: ClientState): state is DirectState;
119
- export interface DirectStateNotInitialized {
120
- type: 'direct';
121
- server: BackendServerNotConnectedState;
122
- }
123
- export interface DirectStateInitialized {
124
- type: 'direct';
125
- url: string;
126
- server: BackendServerNotConnectedState | BackendServerState;
127
- }
128
- export interface DirectStateReady {
129
- type: 'direct';
130
- url: string;
131
- server: BackendServerReadyState;
132
- }
133
- export interface DirectStateNotReachable {
91
+ /**
92
+ * DirectState - Flat interface with nullable url
93
+ * url is null when not initialized, string when configured
94
+ */
95
+ export interface DirectState {
134
96
  type: 'direct';
135
- url: string;
136
- server: BackendServerNotReachableState;
97
+ url: string | null;
98
+ server: BackendServerState;
137
99
  }
138
- export interface DirectStateNotReady {
139
- type: 'direct';
140
- url: string;
141
- server: BackendServerNotReadyState;
100
+ export declare function isDirectServerReady(state: DirectState): boolean;
101
+ export declare function isDirectClientReady(state: DirectState): boolean;
102
+ export declare const DIRECT_STATE_NOT_INITIALIZED: DirectState;
103
+ export declare function createDirectStateReady(url: string, version?: string): DirectState;
104
+ export declare function createDirectStateNotReachable(url: string): DirectState;
105
+ export declare function createDirectStateNotReady(url: string, server: BackendServerState): DirectState;
106
+ /**
107
+ * ExtensionState - Flat interface with nullable extensionId
108
+ * extensionId is null when not ready, string when ready
109
+ */
110
+ export interface ExtensionState {
111
+ type: 'extension';
112
+ extension: 'not-initialized' | 'not-found' | 'ready';
113
+ extensionId: string | null;
114
+ server: BackendServerState;
142
115
  }
143
- export type DirectState = DirectStateNotInitialized | DirectStateInitialized | DirectStateReady | DirectStateNotReachable | DirectStateNotReady;
144
- export declare function isDirectServerReady(state: DirectState): state is DirectStateReady;
145
- export declare function isDirectClientReady(state: DirectState): state is DirectStateInitialized | DirectStateReady | DirectStateNotReachable | DirectStateNotReady;
146
- export declare const DIRECT_STATE_NOT_INITIALIZED: DirectStateNotInitialized;
147
- export declare function createDirectStateReady(url: string, version?: string): DirectStateReady;
148
- export declare function createDirectStateNotReachable(url: string): DirectStateNotReachable;
149
- export declare function createDirectStateNotReady(url: string, server: BackendServerNotReadyState): DirectStateNotReady;
150
116
  export declare const EXTENSION_STATE_NOT_INITIALIZED: ExtensionState;
151
117
  export declare const EXTENSION_STATE_NOT_FOUND: ExtensionState;
152
- export interface ExtensionStateNotInitialized {
153
- type: 'extension';
154
- extension: 'not-initialized';
155
- server: PendingExtensionReadyState;
156
- }
157
- export interface ExtensionStateNotFound {
158
- type: 'extension';
159
- extension: 'not-found';
160
- server: PendingExtensionReadyState;
161
- }
162
- export interface ExtensionStateReady {
163
- type: 'extension';
164
- extension: 'ready';
165
- extensionId: string;
166
- server: PendingExtensionReadyState | BackendServerState;
167
- }
168
- export type ExtensionState = ExtensionStateNotInitialized | ExtensionStateNotFound | ExtensionStateReady;
169
- export declare function isExtensionServerReady(state: ExtensionState): state is ExtensionStateReady;
170
- export declare function isExtensionClientReady(state: ExtensionState): state is ExtensionStateReady;
171
- export declare function createExtensionStateNotInitialized(): ExtensionStateNotInitialized;
172
- export declare function createExtensionStateNotFound(): ExtensionStateNotFound;
118
+ export declare function isExtensionServerReady(state: ExtensionState): boolean;
119
+ export declare function isExtensionClientReady(state: ExtensionState): boolean;
120
+ export declare function createExtensionStateNotInitialized(): ExtensionState;
121
+ export declare function createExtensionStateNotFound(): ExtensionState;
173
122
  /**
174
123
  * Check if client is ready (has handle/url) - does NOT require server ready
175
124
  * Use this for auth checks and reload state checks
@@ -178,14 +127,14 @@ export declare function isClientReady(state: ClientState): boolean;
178
127
  /**
179
128
  * Get backend server state from client state
180
129
  */
181
- export declare function getBackendServerState(state: ClientState): BackendServerState | PendingExtensionReadyState | BackendServerNotConnectedState;
130
+ export declare function getBackendServerState(state: ClientState): BackendServerState;
182
131
  /**
183
132
  * Safely get extension ID from client state
184
- * @returns Extension ID if state is ExtensionStateReady, undefined otherwise
133
+ * @returns Extension ID if present, undefined otherwise
185
134
  */
186
135
  export declare function getExtensionId(state: ClientState): string | undefined;
187
136
  /**
188
137
  * Safely get server URL from client state
189
- * @returns Server URL if state is DirectState with URL, undefined otherwise
138
+ * @returns Server URL if present, undefined otherwise
190
139
  */
191
140
  export declare function getServerUrl(state: ClientState): string | undefined;
@@ -1,5 +1,4 @@
1
1
  import { UserScope } from './user-info';
2
-
3
2
  /**
4
3
  * Log levels for client logging
5
4
  */
@@ -5,9 +5,10 @@ export { isApiResultError, isApiResultOperationError, isApiResultSuccess } from
5
5
  export type { ApiResponseResult } from './api';
6
6
  export { createApiError, createOperationError } from '../errors';
7
7
  export { BACKEND_SERVER_NOT_CONNECTED, BACKEND_SERVER_NOT_REACHABLE, backendServerNotReady, createDirectStateNotReachable, createDirectStateNotReady, createDirectStateReady, createExtensionStateNotFound, createExtensionStateNotInitialized, DIRECT_STATE_NOT_INITIALIZED, EXTENSION_STATE_NOT_FOUND, EXTENSION_STATE_NOT_INITIALIZED, getBackendServerState, getExtensionId, getServerUrl, isClientReady, isDirectClientReady, isDirectServerReady, isDirectState, isExtensionClientReady, isExtensionServerReady, isExtensionState, isServerReady, PENDING_EXTENSION_READY, SERVER_ERROR_CODES, } from './client-state';
8
- export type { BackendServerNotConnectedState, BackendServerNotReachableState, BackendServerNotReadyState, BackendServerReadyState, BackendServerState, ClientState, ConnectionMode, DirectState, DirectStateNotInitialized, DirectStateNotReachable, DirectStateNotReady, DirectStateReady, ExtensionState, ExtensionStateNotFound, ExtensionStateNotInitialized, ExtensionStateReady, InitParams, PendingExtensionReadyState, SerializedClientState, SerializedDirectState, SerializedExtensionState, ServerInfoResponse, } from './client-state';
9
- export { AUTH_CLIENT_NOT_INITIALIZED as AUTH_EXT_NOT_INITIALIZED, isAuthError, isAuthLoggedIn, isAuthLoggedOut, } from './user-info';
10
- export type { AuthLoggedIn, AuthLoggedOut, AuthState, Tokens, UserInfo, UserScope, } from './user-info';
8
+ export type { BackendServerState, ClientState, ConnectionMode, DirectState, ExtensionState, InitParams, SerializedClientState, SerializedDirectState, SerializedExtensionState, ServerInfoResponse, ServerStatus, } from './client-state';
9
+ export { INITIAL_AUTH_STATE, isAuthError, isAuthLoading, isAuthenticated } from './auth';
10
+ export type { AuthError, AuthState, AuthStatus } from './auth';
11
+ export type { Tokens, UserInfo, UserScope } from './user-info';
11
12
  export type { ClientConfig, DiscoveryResult, LogLevel } from './config';
12
13
  export type { BrowserInfo, OSInfo } from './platform';
13
14
  export { NOOP_STATE_CALLBACK } from './callback';
@@ -1,5 +1,4 @@
1
1
  import { BrowserType, OSType } from '../../../../setup-modal/src/types';
2
-
3
2
  /**
4
3
  * Browser detection result
5
4
  */
@@ -25,35 +25,3 @@ export interface Tokens {
25
25
  idToken?: string;
26
26
  expiresIn: number;
27
27
  }
28
- /**
29
- * Authentication state when user is logged in
30
- */
31
- export interface AuthLoggedIn {
32
- isLoggedIn: true;
33
- userInfo: UserInfo;
34
- accessToken: string;
35
- }
36
- /**
37
- * Authentication state when user is logged out
38
- */
39
- export interface AuthLoggedOut {
40
- isLoggedIn: false;
41
- }
42
- /**
43
- * Authentication state when there is an error
44
- */
45
- export interface AuthError {
46
- isLoggedIn: false;
47
- error: {
48
- message: string;
49
- code: string;
50
- };
51
- }
52
- export declare const AUTH_CLIENT_NOT_INITIALIZED: AuthError;
53
- export declare function isAuthError(state: unknown): state is AuthError;
54
- export declare function isAuthLoggedOut(state: unknown): state is AuthLoggedOut;
55
- export declare function isAuthLoggedIn(state: unknown): state is AuthLoggedIn;
56
- /**
57
- * Authentication state (discriminated union)
58
- */
59
- export type AuthState = AuthLoggedIn | AuthLoggedOut | AuthError;
@@ -1,5 +1,4 @@
1
1
  import { StorageKeys } from '../../core/src/index.ts';
2
-
3
2
  export declare const POLL_INTERVAL = 500;
4
3
  export declare const POLL_TIMEOUT = 5000;
5
4
  /**
@@ -1,5 +1,4 @@
1
- import { DirectClientBase, AuthLoggedIn, AuthLoggedOut, DirectClientBaseConfig, StateChangeCallback } from '../../core/src/index.ts';
2
-
1
+ import { DirectClientBase, AuthState, DirectClientBaseConfig, StateChangeCallback } from '../../core/src/index.ts';
3
2
  /**
4
3
  * Configuration for DirectWebClient
5
4
  */
@@ -13,10 +12,9 @@ export interface DirectWebClientConfig extends DirectClientBaseConfig {
13
12
  export declare class DirectWebClient extends DirectClientBase {
14
13
  private redirectUri;
15
14
  constructor(config: DirectWebClientConfig, onStateChange?: StateChangeCallback);
16
- login(): Promise<AuthLoggedIn>;
17
- handleOAuthCallback(code: string, state: string): Promise<AuthLoggedIn>;
18
- logout(): Promise<AuthLoggedOut>;
19
- protected requestResourceAccess(): Promise<string>;
15
+ login(): Promise<AuthState>;
16
+ handleOAuthCallback(code: string, state: string): Promise<AuthState>;
17
+ logout(): Promise<AuthState>;
20
18
  protected exchangeCodeForTokens(code: string): Promise<void>;
21
19
  protected _storageGet(key: string): Promise<string | null>;
22
20
  protected _storageSet(items: Record<string, string | number>): Promise<void>;
@@ -1,7 +1,6 @@
1
- import { ApiResponseResult, AuthLoggedIn, AuthLoggedOut, AuthState, BackendServerState, ClientState, ExtensionState, IExtensionClient, InitParams, StateChangeCallback } from '../../core/src/index.ts';
1
+ import { ApiResponseResult, AuthState, BackendServerState, ClientState, ExtensionState, IExtensionClient, InitParams, StateChangeCallback } from '../../core/src/index.ts';
2
2
  import { CreateChatCompletionStreamResponse } from '@bodhiapp/ts-client';
3
3
  import { WebClientConfig } from './facade-client';
4
-
5
4
  export type SerializedWebExtensionState = {
6
5
  extensionId?: string;
7
6
  };
@@ -39,7 +38,7 @@ export declare class WindowBodhiextClient implements IExtensionClient {
39
38
  setStateCallback(callback: StateChangeCallback): void;
40
39
  /**
41
40
  * Ensure bodhiext is available, attempting to acquire it if not already set
42
- * @throws Error if client not initialized
41
+ * @throws OperationError if client not initialized
43
42
  */
44
43
  private ensureBodhiext;
45
44
  /**
@@ -72,15 +71,15 @@ export declare class WindowBodhiextClient implements IExtensionClient {
72
71
  private requestResourceAccess;
73
72
  /**
74
73
  * Login via browser redirect OAuth2 + PKCE flow
75
- * @returns AuthLoggedIn (though in practice, this redirects and never returns)
74
+ * @returns AuthState (though in practice, this redirects and never returns)
76
75
  */
77
- login(): Promise<AuthLoggedIn>;
76
+ login(): Promise<AuthState>;
78
77
  /**
79
78
  * Handle OAuth callback with authorization code
80
79
  * Should be called from callback page with extracted URL params
81
- * @returns AuthLoggedIn with login state and user info
80
+ * @returns AuthState with login state and user info
82
81
  */
83
- handleOAuthCallback(code: string, state: string): Promise<AuthLoggedIn>;
82
+ handleOAuthCallback(code: string, state: string): Promise<AuthState>;
84
83
  /**
85
84
  * Exchange authorization code for tokens
86
85
  */
@@ -89,7 +88,7 @@ export declare class WindowBodhiextClient implements IExtensionClient {
89
88
  * Logout user and revoke tokens
90
89
  * @returns AuthLoggedOut with logged out state
91
90
  */
92
- logout(): Promise<AuthLoggedOut>;
91
+ logout(): Promise<AuthState>;
93
92
  /**
94
93
  * Get current authentication state
95
94
  */
@@ -1,7 +1,6 @@
1
- import { BaseFacadeClient, Logger, AuthLoggedIn, IWebUIClient, LogLevel, StateChange, StateChangeCallback, UserScope } from '../../core/src/index.ts';
1
+ import { BaseFacadeClient, Logger, AuthState, IWebUIClient, LogLevel, StateChange, StateChangeCallback, UserScope } from '../../core/src/index.ts';
2
2
  import { DirectWebClient } from './direct-client';
3
3
  import { WindowBodhiextClient } from './ext-client';
4
-
5
4
  /**
6
5
  * Configuration for WebClient OAuth
7
6
  */
@@ -41,5 +40,5 @@ export declare class WebUIClient extends BaseFacadeClient<WebClientConfig, Windo
41
40
  protected createLogger(config: WebClientConfig): Logger;
42
41
  protected createExtClient(config: WebClientConfig, onStateChange: (change: StateChange) => void): WindowBodhiextClient;
43
42
  protected createDirectClient(authClientId: string, config: WebClientConfig, onStateChange: (change: StateChange) => void): DirectWebClient;
44
- handleOAuthCallback(code: string, state: string): Promise<AuthLoggedIn>;
43
+ handleOAuthCallback(code: string, state: string): Promise<AuthState>;
45
44
  }
@@ -1,6 +1,5 @@
1
1
  import { SerializedWebExtensionState } from './ext-client';
2
2
  import { IWebUIClient } from './interface';
3
-
4
3
  export { WebUIClient } from './facade-client';
5
4
  export type { IWebUIClient, SerializedWebExtensionState };
6
5
  export { BUILD_MODE as WEB_BUILD_MODE } from './build-info';