Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/all-cougars-hide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce debugLogger for internal debugging support
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
"types/state-selectors.mdx",
"types/telemetry-log-entry.mdx",
"types/use-auth-return.mdx",
"types/use-session-list-return.mdx",
"types/use-session-return.mdx",
Expand All@@ -148,6 +149,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"shared/derive-state.mdx",
"shared/extract-dev-browser-jwt-from-url.mdx",
"shared/fast-deep-merge-and-replace.mdx",
"shared/generate-uuid.mdx",
"shared/get-clerk-js-major-version-or-tag.mdx",
"shared/get-cookie-suffix.mdx",
"shared/get-env-variable.mdx",
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "625KB" },
{ "path": "./dist/clerk.js", "maxSize": "626KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
52 changes: 48 additions & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ import type {
Web3Provider,
} from '@clerk/types';

import type { DebugLoggerInterface } from '@/utils/debug';
import { debugLogger, initDebugLogger } from '@/utils/debug';

import type { MountComponentRenderer } from '../ui/Components';
import {
ALLOWED_PROTOCOLS,
Expand DownExpand Up@@ -159,6 +162,11 @@ type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;

export type ClerkCoreBroadcastChannelEvent = { type: 'signout' };

/**
* Interface for the debug logger with all available logging methods
*/
// DebugLoggerInterface imported from '@/utils/debug'

declare global {
interface Window {
Clerk?: Clerk;
Expand DownExpand Up@@ -197,8 +205,8 @@ export class Clerk implements ClerkInterface {
public static sdkMetadata: SDKMetadata = {
name: __PKG_NAME__,
version: __PKG_VERSION__,
environment: process.env.NODE_ENV || 'production',
};

private static _billing: CommerceBillingNamespace;
private static _apiKeys: APIKeysNamespace;
private _checkout: ClerkInterface['__experimental_checkout'] | undefined;
Expand All@@ -210,6 +218,8 @@ export class Clerk implements ClerkInterface {
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();
// Deprecated: use global singleton from `@/utils/debug`
public debugLogger?: DebugLoggerInterface;
Comment thread
jacekradko marked this conversation as resolved.

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand DownExpand Up@@ -404,6 +414,7 @@ export class Clerk implements ClerkInterface {
public getFapiClient = (): FapiClient => this.#fapiClient;

public load = async (options?: ClerkOptions): Promise<void> => {
debugLogger.info('load() start', {}, 'clerk');
if (this.loaded) {
Comment thread
jacekradko marked this conversation as resolved.
return;
}
Expand DownExpand Up@@ -448,10 +459,18 @@ export class Clerk implements ClerkInterface {
} else {
await this.#loadInNonStandardBrowser();
}
} catch (e) {
if (this.environment?.clientDebugMode) {
initDebugLogger({
enabled: true,
telemetryCollector: this.telemetry,
});
}
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
debugLogger.error('load() failed', { error }, 'clerk');
// bubble up the error
throw e;
throw error;
}
};

Expand All@@ -477,6 +496,16 @@ export class Clerk implements ClerkInterface {
const opts = callbackOrOptions && typeof callbackOrOptions === 'object' ? callbackOrOptions : options || {};

const redirectUrl = opts?.redirectUrl || this.buildAfterSignOutUrl();
debugLogger.debug(
'signOut() start',
{
hasClient: Boolean(this.client),
multiSessionCount: this.client?.signedInSessions.length ?? 0,
redirectUrl,
sessionTarget: opts?.sessionId ?? null,
},
'clerk',
);
const signOutCallback = typeof callbackOrOptions === 'function' ? callbackOrOptions : undefined;
Comment thread
coderabbitai[bot] marked this conversation as resolved.

const executeSignOut = async () => {
Expand DownExpand Up@@ -520,6 +549,7 @@ export class Clerk implements ClerkInterface {

await executeSignOut();

debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
return;
}

Expand All@@ -531,6 +561,7 @@ export class Clerk implements ClerkInterface {

if (shouldSignOutCurrent) {
await executeSignOut();
debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
}
};

Expand DownExpand Up@@ -1202,13 +1233,25 @@ export class Clerk implements ClerkInterface {
const { organization, beforeEmit, redirectUrl, navigate: setActiveNavigate } = params;
let { session } = params;
this.__internal_setActiveInProgress = true;

debugLogger.debug(
'setActive() start',
{
hasClient: Boolean(this.client),
sessionTarget: typeof session === 'string' ? session : (session?.id ?? session ?? null),
organizationTarget:
typeof organization === 'string' ? organization : (organization?.id ?? organization ?? null),
redirectUrl: redirectUrl ?? null,
},
'clerk',
);
try {
Comment thread
jacekradko marked this conversation as resolved.
if (!this.client) {
debugLogger.warn('Clerk setActive called before client is loaded', {}, 'clerk');
throw new Error('setActive is being called before the client is loaded. Wait for init.');
}

if (session === undefined && !this.session) {
debugLogger.warn('Clerk setActive precondition not met: no target session and no active session', {}, 'clerk');
throw new Error(
'setActive should either be called with a session param or there should be already an active session.',
);
Expand DownExpand Up@@ -1414,6 +1457,7 @@ export class Clerk implements ClerkInterface {
const customNavigate =
options?.replace && this.#options.routerReplace ? this.#options.routerReplace : this.#options.routerPush;

debugLogger.info(`Clerk is navigating to: ${toURL}`);
if (this.#options.routerDebug) {
console.log(`Clerk is navigating to: ${toURL}`);
}
Expand Down
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/fapiClient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ import { retry } from '@clerk/shared/retry';
import { camelToSnake } from '@clerk/shared/underscore';
import type { ClerkAPIErrorJSON, ClientJSON, InstanceType } from '@clerk/types';

import { debugLogger } from '@/utils/debug';

import { buildEmailAddress as buildEmailAddressUtil, buildURL as buildUrlUtil, stringifyQueryParams } from '../utils';
import { SUPPORTED_FAPI_VERSION } from './constants';
import { clerkNetworkError } from './errors';
Expand DownExpand Up@@ -250,12 +252,16 @@ export function createFapiClient(options: FapiClientOptions): FapiClient {
response = new Response('{}', requestInit); // Mock an empty json response
}
} catch (e) {
debugLogger.error('network error', { error: e, url: urlStr, method }, 'fapiClient');
clerkNetworkError(urlStr, e);
}

// 204 No Content responses do not have a body so we should not try to parse it
const json: FapiResponseJSON<T> | null = response.status !== 204 ? await response.json() : null;
const fapiResponse: FapiResponse<T> = Object.assign(response, { payload: json });
if (!response.ok) {
debugLogger.error('request failed', { method, path: requestInit.path, status: response.status }, 'fapiClient');
}
await runAfterResponseCallbacks(requestInit, fapiResponse);
return fapiResponse;
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/all-cougars-hide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce debugLogger for internal debugging support
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
"types/state-selectors.mdx",
"types/telemetry-log-entry.mdx",
"types/use-auth-return.mdx",
"types/use-session-list-return.mdx",
"types/use-session-return.mdx",
Expand All@@ -148,6 +149,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"shared/derive-state.mdx",
"shared/extract-dev-browser-jwt-from-url.mdx",
"shared/fast-deep-merge-and-replace.mdx",
"shared/generate-uuid.mdx",
"shared/get-clerk-js-major-version-or-tag.mdx",
"shared/get-cookie-suffix.mdx",
"shared/get-env-variable.mdx",
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "625KB" },
{ "path": "./dist/clerk.js", "maxSize": "626KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
52 changes: 48 additions & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ import type {
Web3Provider,
} from '@clerk/types';

import type { DebugLoggerInterface } from '@/utils/debug';
import { debugLogger, initDebugLogger } from '@/utils/debug';

import type { MountComponentRenderer } from '../ui/Components';
import {
ALLOWED_PROTOCOLS,
Expand DownExpand Up@@ -159,6 +162,11 @@ type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;

export type ClerkCoreBroadcastChannelEvent = { type: 'signout' };

/**
* Interface for the debug logger with all available logging methods
*/
// DebugLoggerInterface imported from '@/utils/debug'

declare global {
interface Window {
Clerk?: Clerk;
Expand DownExpand Up@@ -197,8 +205,8 @@ export class Clerk implements ClerkInterface {
public static sdkMetadata: SDKMetadata = {
name: __PKG_NAME__,
version: __PKG_VERSION__,
environment: process.env.NODE_ENV || 'production',
};

private static _billing: CommerceBillingNamespace;
private static _apiKeys: APIKeysNamespace;
private _checkout: ClerkInterface['__experimental_checkout'] | undefined;
Expand All@@ -210,6 +218,8 @@ export class Clerk implements ClerkInterface {
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();
// Deprecated: use global singleton from `@/utils/debug`
public debugLogger?: DebugLoggerInterface;
Comment thread
jacekradko marked this conversation as resolved.

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand DownExpand Up@@ -404,6 +414,7 @@ export class Clerk implements ClerkInterface {
public getFapiClient = (): FapiClient => this.#fapiClient;

public load = async (options?: ClerkOptions): Promise<void> => {
debugLogger.info('load() start', {}, 'clerk');
if (this.loaded) {
Comment thread
jacekradko marked this conversation as resolved.
return;
}
Expand DownExpand Up@@ -448,10 +459,18 @@ export class Clerk implements ClerkInterface {
} else {
await this.#loadInNonStandardBrowser();
}
} catch (e) {
if (this.environment?.clientDebugMode) {
initDebugLogger({
enabled: true,
telemetryCollector: this.telemetry,
});
}
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
debugLogger.error('load() failed', { error }, 'clerk');
// bubble up the error
throw e;
throw error;
}
};

Expand All@@ -477,6 +496,16 @@ export class Clerk implements ClerkInterface {
const opts = callbackOrOptions && typeof callbackOrOptions === 'object' ? callbackOrOptions : options || {};

const redirectUrl = opts?.redirectUrl || this.buildAfterSignOutUrl();
debugLogger.debug(
'signOut() start',
{
hasClient: Boolean(this.client),
multiSessionCount: this.client?.signedInSessions.length ?? 0,
redirectUrl,
sessionTarget: opts?.sessionId ?? null,
},
'clerk',
);
const signOutCallback = typeof callbackOrOptions === 'function' ? callbackOrOptions : undefined;
Comment thread
coderabbitai[bot] marked this conversation as resolved.

const executeSignOut = async () => {
Expand DownExpand Up@@ -520,6 +549,7 @@ export class Clerk implements ClerkInterface {

await executeSignOut();

debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
return;
}

Expand All@@ -531,6 +561,7 @@ export class Clerk implements ClerkInterface {

if (shouldSignOutCurrent) {
await executeSignOut();
debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
}
};

Expand DownExpand Up@@ -1202,13 +1233,25 @@ export class Clerk implements ClerkInterface {
const { organization, beforeEmit, redirectUrl, navigate: setActiveNavigate } = params;
let { session } = params;
this.__internal_setActiveInProgress = true;

debugLogger.debug(
'setActive() start',
{
hasClient: Boolean(this.client),
sessionTarget: typeof session === 'string' ? session : (session?.id ?? session ?? null),
organizationTarget:
typeof organization === 'string' ? organization : (organization?.id ?? organization ?? null),
redirectUrl: redirectUrl ?? null,
},
'clerk',
);
try {
Comment thread
jacekradko marked this conversation as resolved.
if (!this.client) {
debugLogger.warn('Clerk setActive called before client is loaded', {}, 'clerk');
throw new Error('setActive is being called before the client is loaded. Wait for init.');
}

if (session === undefined && !this.session) {
debugLogger.warn('Clerk setActive precondition not met: no target session and no active session', {}, 'clerk');
throw new Error(
'setActive should either be called with a session param or there should be already an active session.',
);
Expand DownExpand Up@@ -1414,6 +1457,7 @@ export class Clerk implements ClerkInterface {
const customNavigate =
options?.replace && this.#options.routerReplace ? this.#options.routerReplace : this.#options.routerPush;

debugLogger.info(`Clerk is navigating to: ${toURL}`);
if (this.#options.routerDebug) {
console.log(`Clerk is navigating to: ${toURL}`);
}
Expand Down
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/fapiClient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ import { retry } from '@clerk/shared/retry';
import { camelToSnake } from '@clerk/shared/underscore';
import type { ClerkAPIErrorJSON, ClientJSON, InstanceType } from '@clerk/types';

import { debugLogger } from '@/utils/debug';

import { buildEmailAddress as buildEmailAddressUtil, buildURL as buildUrlUtil, stringifyQueryParams } from '../utils';
import { SUPPORTED_FAPI_VERSION } from './constants';
import { clerkNetworkError } from './errors';
Expand DownExpand Up@@ -250,12 +252,16 @@ export function createFapiClient(options: FapiClientOptions): FapiClient {
response = new Response('{}', requestInit); // Mock an empty json response
}
} catch (e) {
debugLogger.error('network error', { error: e, url: urlStr, method }, 'fapiClient');
clerkNetworkError(urlStr, e);
}

// 204 No Content responses do not have a body so we should not try to parse it
const json: FapiResponseJSON<T> | null = response.status !== 204 ? await response.json() : null;
const fapiResponse: FapiResponse<T> = Object.assign(response, { payload: json });
if (!response.ok) {
debugLogger.error('request failed', { method, path: requestInit.path, status: response.status }, 'fapiClient');
}
await runAfterResponseCallbacks(requestInit, fapiResponse);
return fapiResponse;
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/all-cougars-hide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce debugLogger for internal debugging support
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
"types/state-selectors.mdx",
"types/telemetry-log-entry.mdx",
"types/use-auth-return.mdx",
"types/use-session-list-return.mdx",
"types/use-session-return.mdx",
Expand All@@ -148,6 +149,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"shared/derive-state.mdx",
"shared/extract-dev-browser-jwt-from-url.mdx",
"shared/fast-deep-merge-and-replace.mdx",
"shared/generate-uuid.mdx",
"shared/get-clerk-js-major-version-or-tag.mdx",
"shared/get-cookie-suffix.mdx",
"shared/get-env-variable.mdx",
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "625KB" },
{ "path": "./dist/clerk.js", "maxSize": "626KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
52 changes: 48 additions & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ import type {
Web3Provider,
} from '@clerk/types';

import type { DebugLoggerInterface } from '@/utils/debug';
import { debugLogger, initDebugLogger } from '@/utils/debug';

import type { MountComponentRenderer } from '../ui/Components';
import {
ALLOWED_PROTOCOLS,
Expand DownExpand Up@@ -159,6 +162,11 @@ type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;

export type ClerkCoreBroadcastChannelEvent = { type: 'signout' };

/**
* Interface for the debug logger with all available logging methods
*/
// DebugLoggerInterface imported from '@/utils/debug'

declare global {
interface Window {
Clerk?: Clerk;
Expand DownExpand Up@@ -197,8 +205,8 @@ export class Clerk implements ClerkInterface {
public static sdkMetadata: SDKMetadata = {
name: __PKG_NAME__,
version: __PKG_VERSION__,
environment: process.env.NODE_ENV || 'production',
};

private static _billing: CommerceBillingNamespace;
private static _apiKeys: APIKeysNamespace;
private _checkout: ClerkInterface['__experimental_checkout'] | undefined;
Expand All@@ -210,6 +218,8 @@ export class Clerk implements ClerkInterface {
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();
// Deprecated: use global singleton from `@/utils/debug`
public debugLogger?: DebugLoggerInterface;
Comment thread
jacekradko marked this conversation as resolved.

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand DownExpand Up@@ -404,6 +414,7 @@ export class Clerk implements ClerkInterface {
public getFapiClient = (): FapiClient => this.#fapiClient;

public load = async (options?: ClerkOptions): Promise<void> => {
debugLogger.info('load() start', {}, 'clerk');
if (this.loaded) {
Comment thread
jacekradko marked this conversation as resolved.
return;
}
Expand DownExpand Up@@ -448,10 +459,18 @@ export class Clerk implements ClerkInterface {
} else {
await this.#loadInNonStandardBrowser();
}
} catch (e) {
if (this.environment?.clientDebugMode) {
initDebugLogger({
enabled: true,
telemetryCollector: this.telemetry,
});
}
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
debugLogger.error('load() failed', { error }, 'clerk');
// bubble up the error
throw e;
throw error;
}
};

Expand All@@ -477,6 +496,16 @@ export class Clerk implements ClerkInterface {
const opts = callbackOrOptions && typeof callbackOrOptions === 'object' ? callbackOrOptions : options || {};

const redirectUrl = opts?.redirectUrl || this.buildAfterSignOutUrl();
debugLogger.debug(
'signOut() start',
{
hasClient: Boolean(this.client),
multiSessionCount: this.client?.signedInSessions.length ?? 0,
redirectUrl,
sessionTarget: opts?.sessionId ?? null,
},
'clerk',
);
const signOutCallback = typeof callbackOrOptions === 'function' ? callbackOrOptions : undefined;
Comment thread
coderabbitai[bot] marked this conversation as resolved.

const executeSignOut = async () => {
Expand DownExpand Up@@ -520,6 +549,7 @@ export class Clerk implements ClerkInterface {

await executeSignOut();

debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
return;
}

Expand All@@ -531,6 +561,7 @@ export class Clerk implements ClerkInterface {

if (shouldSignOutCurrent) {
await executeSignOut();
debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
}
};

Expand DownExpand Up@@ -1202,13 +1233,25 @@ export class Clerk implements ClerkInterface {
const { organization, beforeEmit, redirectUrl, navigate: setActiveNavigate } = params;
let { session } = params;
this.__internal_setActiveInProgress = true;

debugLogger.debug(
'setActive() start',
{
hasClient: Boolean(this.client),
sessionTarget: typeof session === 'string' ? session : (session?.id ?? session ?? null),
organizationTarget:
typeof organization === 'string' ? organization : (organization?.id ?? organization ?? null),
redirectUrl: redirectUrl ?? null,
},
'clerk',
);
try {
Comment thread
jacekradko marked this conversation as resolved.
if (!this.client) {
debugLogger.warn('Clerk setActive called before client is loaded', {}, 'clerk');
throw new Error('setActive is being called before the client is loaded. Wait for init.');
}

if (session === undefined && !this.session) {
debugLogger.warn('Clerk setActive precondition not met: no target session and no active session', {}, 'clerk');
throw new Error(
'setActive should either be called with a session param or there should be already an active session.',
);
Expand DownExpand Up@@ -1414,6 +1457,7 @@ export class Clerk implements ClerkInterface {
const customNavigate =
options?.replace && this.#options.routerReplace ? this.#options.routerReplace : this.#options.routerPush;

debugLogger.info(`Clerk is navigating to: ${toURL}`);
if (this.#options.routerDebug) {
console.log(`Clerk is navigating to: ${toURL}`);
}
Expand Down
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/fapiClient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ import { retry } from '@clerk/shared/retry';
import { camelToSnake } from '@clerk/shared/underscore';
import type { ClerkAPIErrorJSON, ClientJSON, InstanceType } from '@clerk/types';

import { debugLogger } from '@/utils/debug';

import { buildEmailAddress as buildEmailAddressUtil, buildURL as buildUrlUtil, stringifyQueryParams } from '../utils';
import { SUPPORTED_FAPI_VERSION } from './constants';
import { clerkNetworkError } from './errors';
Expand DownExpand Up@@ -250,12 +252,16 @@ export function createFapiClient(options: FapiClientOptions): FapiClient {
response = new Response('{}', requestInit); // Mock an empty json response
}
} catch (e) {
debugLogger.error('network error', { error: e, url: urlStr, method }, 'fapiClient');
clerkNetworkError(urlStr, e);
}

// 204 No Content responses do not have a body so we should not try to parse it
const json: FapiResponseJSON<T> | null = response.status !== 204 ? await response.json() : null;
const fapiResponse: FapiResponse<T> = Object.assign(response, { payload: json });
if (!response.ok) {
debugLogger.error('request failed', { method, path: requestInit.path, status: response.status }, 'fapiClient');
}
await runAfterResponseCallbacks(requestInit, fapiResponse);
return fapiResponse;
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/all-cougars-hide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce debugLogger for internal debugging support
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
"types/state-selectors.mdx",
"types/telemetry-log-entry.mdx",
"types/use-auth-return.mdx",
"types/use-session-list-return.mdx",
"types/use-session-return.mdx",
Expand All@@ -148,6 +149,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"shared/derive-state.mdx",
"shared/extract-dev-browser-jwt-from-url.mdx",
"shared/fast-deep-merge-and-replace.mdx",
"shared/generate-uuid.mdx",
"shared/get-clerk-js-major-version-or-tag.mdx",
"shared/get-cookie-suffix.mdx",
"shared/get-env-variable.mdx",
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "625KB" },
{ "path": "./dist/clerk.js", "maxSize": "626KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
52 changes: 48 additions & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ import type {
Web3Provider,
} from '@clerk/types';

import type { DebugLoggerInterface } from '@/utils/debug';
import { debugLogger, initDebugLogger } from '@/utils/debug';

import type { MountComponentRenderer } from '../ui/Components';
import {
ALLOWED_PROTOCOLS,
Expand DownExpand Up@@ -159,6 +162,11 @@ type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;

export type ClerkCoreBroadcastChannelEvent = { type: 'signout' };

/**
* Interface for the debug logger with all available logging methods
*/
// DebugLoggerInterface imported from '@/utils/debug'

declare global {
interface Window {
Clerk?: Clerk;
Expand DownExpand Up@@ -197,8 +205,8 @@ export class Clerk implements ClerkInterface {
public static sdkMetadata: SDKMetadata = {
name: __PKG_NAME__,
version: __PKG_VERSION__,
environment: process.env.NODE_ENV || 'production',
};

private static _billing: CommerceBillingNamespace;
private static _apiKeys: APIKeysNamespace;
private _checkout: ClerkInterface['__experimental_checkout'] | undefined;
Expand All@@ -210,6 +218,8 @@ export class Clerk implements ClerkInterface {
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();
// Deprecated: use global singleton from `@/utils/debug`
public debugLogger?: DebugLoggerInterface;
Comment thread
jacekradko marked this conversation as resolved.

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand DownExpand Up@@ -404,6 +414,7 @@ export class Clerk implements ClerkInterface {
public getFapiClient = (): FapiClient => this.#fapiClient;

public load = async (options?: ClerkOptions): Promise<void> => {
debugLogger.info('load() start', {}, 'clerk');
if (this.loaded) {
Comment thread
jacekradko marked this conversation as resolved.
return;
}
Expand DownExpand Up@@ -448,10 +459,18 @@ export class Clerk implements ClerkInterface {
} else {
await this.#loadInNonStandardBrowser();
}
} catch (e) {
if (this.environment?.clientDebugMode) {
initDebugLogger({
enabled: true,
telemetryCollector: this.telemetry,
});
}
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
debugLogger.error('load() failed', { error }, 'clerk');
// bubble up the error
throw e;
throw error;
}
};

Expand All@@ -477,6 +496,16 @@ export class Clerk implements ClerkInterface {
const opts = callbackOrOptions && typeof callbackOrOptions === 'object' ? callbackOrOptions : options || {};

const redirectUrl = opts?.redirectUrl || this.buildAfterSignOutUrl();
debugLogger.debug(
'signOut() start',
{
hasClient: Boolean(this.client),
multiSessionCount: this.client?.signedInSessions.length ?? 0,
redirectUrl,
sessionTarget: opts?.sessionId ?? null,
},
'clerk',
);
const signOutCallback = typeof callbackOrOptions === 'function' ? callbackOrOptions : undefined;
Comment thread
coderabbitai[bot] marked this conversation as resolved.

const executeSignOut = async () => {
Expand DownExpand Up@@ -520,6 +549,7 @@ export class Clerk implements ClerkInterface {

await executeSignOut();

debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
return;
}

Expand All@@ -531,6 +561,7 @@ export class Clerk implements ClerkInterface {

if (shouldSignOutCurrent) {
await executeSignOut();
debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
}
};

Expand DownExpand Up@@ -1202,13 +1233,25 @@ export class Clerk implements ClerkInterface {
const { organization, beforeEmit, redirectUrl, navigate: setActiveNavigate } = params;
let { session } = params;
this.__internal_setActiveInProgress = true;

debugLogger.debug(
'setActive() start',
{
hasClient: Boolean(this.client),
sessionTarget: typeof session === 'string' ? session : (session?.id ?? session ?? null),
organizationTarget:
typeof organization === 'string' ? organization : (organization?.id ?? organization ?? null),
redirectUrl: redirectUrl ?? null,
},
'clerk',
);
try {
Comment thread
jacekradko marked this conversation as resolved.
if (!this.client) {
debugLogger.warn('Clerk setActive called before client is loaded', {}, 'clerk');
throw new Error('setActive is being called before the client is loaded. Wait for init.');
}

if (session === undefined && !this.session) {
debugLogger.warn('Clerk setActive precondition not met: no target session and no active session', {}, 'clerk');
throw new Error(
'setActive should either be called with a session param or there should be already an active session.',
);
Expand DownExpand Up@@ -1414,6 +1457,7 @@ export class Clerk implements ClerkInterface {
const customNavigate =
options?.replace && this.#options.routerReplace ? this.#options.routerReplace : this.#options.routerPush;

debugLogger.info(`Clerk is navigating to: ${toURL}`);
if (this.#options.routerDebug) {
console.log(`Clerk is navigating to: ${toURL}`);
}
Expand Down
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/fapiClient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ import { retry } from '@clerk/shared/retry';
import { camelToSnake } from '@clerk/shared/underscore';
import type { ClerkAPIErrorJSON, ClientJSON, InstanceType } from '@clerk/types';

import { debugLogger } from '@/utils/debug';

import { buildEmailAddress as buildEmailAddressUtil, buildURL as buildUrlUtil, stringifyQueryParams } from '../utils';
import { SUPPORTED_FAPI_VERSION } from './constants';
import { clerkNetworkError } from './errors';
Expand DownExpand Up@@ -250,12 +252,16 @@ export function createFapiClient(options: FapiClientOptions): FapiClient {
response = new Response('{}', requestInit); // Mock an empty json response
}
} catch (e) {
debugLogger.error('network error', { error: e, url: urlStr, method }, 'fapiClient');
clerkNetworkError(urlStr, e);
}

// 204 No Content responses do not have a body so we should not try to parse it
const json: FapiResponseJSON<T> | null = response.status !== 204 ? await response.json() : null;
const fapiResponse: FapiResponse<T> = Object.assign(response, { payload: json });
if (!response.ok) {
debugLogger.error('request failed', { method, path: requestInit.path, status: response.status }, 'fapiClient');
}
await runAfterResponseCallbacks(requestInit, fapiResponse);
return fapiResponse;
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/all-cougars-hide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce debugLogger for internal debugging support
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
"types/state-selectors.mdx",
"types/telemetry-log-entry.mdx",
"types/use-auth-return.mdx",
"types/use-session-list-return.mdx",
"types/use-session-return.mdx",
Expand All@@ -148,6 +149,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"shared/derive-state.mdx",
"shared/extract-dev-browser-jwt-from-url.mdx",
"shared/fast-deep-merge-and-replace.mdx",
"shared/generate-uuid.mdx",
"shared/get-clerk-js-major-version-or-tag.mdx",
"shared/get-cookie-suffix.mdx",
"shared/get-env-variable.mdx",
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "625KB" },
{ "path": "./dist/clerk.js", "maxSize": "626KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
52 changes: 48 additions & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ import type {
Web3Provider,
} from '@clerk/types';

import type { DebugLoggerInterface } from '@/utils/debug';
import { debugLogger, initDebugLogger } from '@/utils/debug';

import type { MountComponentRenderer } from '../ui/Components';
import {
ALLOWED_PROTOCOLS,
Expand DownExpand Up@@ -159,6 +162,11 @@ type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;

export type ClerkCoreBroadcastChannelEvent = { type: 'signout' };

/**
* Interface for the debug logger with all available logging methods
*/
// DebugLoggerInterface imported from '@/utils/debug'

declare global {
interface Window {
Clerk?: Clerk;
Expand DownExpand Up@@ -197,8 +205,8 @@ export class Clerk implements ClerkInterface {
public static sdkMetadata: SDKMetadata = {
name: __PKG_NAME__,
version: __PKG_VERSION__,
environment: process.env.NODE_ENV || 'production',
};

private static _billing: CommerceBillingNamespace;
private static _apiKeys: APIKeysNamespace;
private _checkout: ClerkInterface['__experimental_checkout'] | undefined;
Expand All@@ -210,6 +218,8 @@ export class Clerk implements ClerkInterface {
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();
// Deprecated: use global singleton from `@/utils/debug`
public debugLogger?: DebugLoggerInterface;
Comment thread
jacekradko marked this conversation as resolved.

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand DownExpand Up@@ -404,6 +414,7 @@ export class Clerk implements ClerkInterface {
public getFapiClient = (): FapiClient => this.#fapiClient;

public load = async (options?: ClerkOptions): Promise<void> => {
debugLogger.info('load() start', {}, 'clerk');
if (this.loaded) {
Comment thread
jacekradko marked this conversation as resolved.
return;
}
Expand DownExpand Up@@ -448,10 +459,18 @@ export class Clerk implements ClerkInterface {
} else {
await this.#loadInNonStandardBrowser();
}
} catch (e) {
if (this.environment?.clientDebugMode) {
initDebugLogger({
enabled: true,
telemetryCollector: this.telemetry,
});
}
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
debugLogger.error('load() failed', { error }, 'clerk');
// bubble up the error
throw e;
throw error;
}
};

Expand All@@ -477,6 +496,16 @@ export class Clerk implements ClerkInterface {
const opts = callbackOrOptions && typeof callbackOrOptions === 'object' ? callbackOrOptions : options || {};

const redirectUrl = opts?.redirectUrl || this.buildAfterSignOutUrl();
debugLogger.debug(
'signOut() start',
{
hasClient: Boolean(this.client),
multiSessionCount: this.client?.signedInSessions.length ?? 0,
redirectUrl,
sessionTarget: opts?.sessionId ?? null,
},
'clerk',
);
const signOutCallback = typeof callbackOrOptions === 'function' ? callbackOrOptions : undefined;
Comment thread
coderabbitai[bot] marked this conversation as resolved.

const executeSignOut = async () => {
Expand DownExpand Up@@ -520,6 +549,7 @@ export class Clerk implements ClerkInterface {

await executeSignOut();

debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
return;
}

Expand All@@ -531,6 +561,7 @@ export class Clerk implements ClerkInterface {

if (shouldSignOutCurrent) {
await executeSignOut();
debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
}
};

Expand DownExpand Up@@ -1202,13 +1233,25 @@ export class Clerk implements ClerkInterface {
const { organization, beforeEmit, redirectUrl, navigate: setActiveNavigate } = params;
let { session } = params;
this.__internal_setActiveInProgress = true;

debugLogger.debug(
'setActive() start',
{
hasClient: Boolean(this.client),
sessionTarget: typeof session === 'string' ? session : (session?.id ?? session ?? null),
organizationTarget:
typeof organization === 'string' ? organization : (organization?.id ?? organization ?? null),
redirectUrl: redirectUrl ?? null,
},
'clerk',
);
try {
Comment thread
jacekradko marked this conversation as resolved.
if (!this.client) {
debugLogger.warn('Clerk setActive called before client is loaded', {}, 'clerk');
throw new Error('setActive is being called before the client is loaded. Wait for init.');
}

if (session === undefined && !this.session) {
debugLogger.warn('Clerk setActive precondition not met: no target session and no active session', {}, 'clerk');
throw new Error(
'setActive should either be called with a session param or there should be already an active session.',
);
Expand DownExpand Up@@ -1414,6 +1457,7 @@ export class Clerk implements ClerkInterface {
const customNavigate =
options?.replace && this.#options.routerReplace ? this.#options.routerReplace : this.#options.routerPush;

debugLogger.info(`Clerk is navigating to: ${toURL}`);
if (this.#options.routerDebug) {
console.log(`Clerk is navigating to: ${toURL}`);
}
Expand Down
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/fapiClient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ import { retry } from '@clerk/shared/retry';
import { camelToSnake } from '@clerk/shared/underscore';
import type { ClerkAPIErrorJSON, ClientJSON, InstanceType } from '@clerk/types';

import { debugLogger } from '@/utils/debug';

import { buildEmailAddress as buildEmailAddressUtil, buildURL as buildUrlUtil, stringifyQueryParams } from '../utils';
import { SUPPORTED_FAPI_VERSION } from './constants';
import { clerkNetworkError } from './errors';
Expand DownExpand Up@@ -250,12 +252,16 @@ export function createFapiClient(options: FapiClientOptions): FapiClient {
response = new Response('{}', requestInit); // Mock an empty json response
}
} catch (e) {
debugLogger.error('network error', { error: e, url: urlStr, method }, 'fapiClient');
clerkNetworkError(urlStr, e);
}

// 204 No Content responses do not have a body so we should not try to parse it
const json: FapiResponseJSON<T> | null = response.status !== 204 ? await response.json() : null;
const fapiResponse: FapiResponse<T> = Object.assign(response, { payload: json });
if (!response.ok) {
debugLogger.error('request failed', { method, path: requestInit.path, status: response.status }, 'fapiClient');
}
await runAfterResponseCallbacks(requestInit, fapiResponse);
return fapiResponse;
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/all-cougars-hide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce debugLogger for internal debugging support
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
"types/state-selectors.mdx",
"types/telemetry-log-entry.mdx",
"types/use-auth-return.mdx",
"types/use-session-list-return.mdx",
"types/use-session-return.mdx",
Expand All@@ -148,6 +149,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"shared/derive-state.mdx",
"shared/extract-dev-browser-jwt-from-url.mdx",
"shared/fast-deep-merge-and-replace.mdx",
"shared/generate-uuid.mdx",
"shared/get-clerk-js-major-version-or-tag.mdx",
"shared/get-cookie-suffix.mdx",
"shared/get-env-variable.mdx",
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "625KB" },
{ "path": "./dist/clerk.js", "maxSize": "626KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
52 changes: 48 additions & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ import type {
Web3Provider,
} from '@clerk/types';

import type { DebugLoggerInterface } from '@/utils/debug';
import { debugLogger, initDebugLogger } from '@/utils/debug';

import type { MountComponentRenderer } from '../ui/Components';
import {
ALLOWED_PROTOCOLS,
Expand DownExpand Up@@ -159,6 +162,11 @@ type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;

export type ClerkCoreBroadcastChannelEvent = { type: 'signout' };

/**
* Interface for the debug logger with all available logging methods
*/
// DebugLoggerInterface imported from '@/utils/debug'

declare global {
interface Window {
Clerk?: Clerk;
Expand DownExpand Up@@ -197,8 +205,8 @@ export class Clerk implements ClerkInterface {
public static sdkMetadata: SDKMetadata = {
name: __PKG_NAME__,
version: __PKG_VERSION__,
environment: process.env.NODE_ENV || 'production',
};

private static _billing: CommerceBillingNamespace;
private static _apiKeys: APIKeysNamespace;
private _checkout: ClerkInterface['__experimental_checkout'] | undefined;
Expand All@@ -210,6 +218,8 @@ export class Clerk implements ClerkInterface {
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();
// Deprecated: use global singleton from `@/utils/debug`
public debugLogger?: DebugLoggerInterface;
Comment thread
jacekradko marked this conversation as resolved.

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand DownExpand Up@@ -404,6 +414,7 @@ export class Clerk implements ClerkInterface {
public getFapiClient = (): FapiClient => this.#fapiClient;

public load = async (options?: ClerkOptions): Promise<void> => {
debugLogger.info('load() start', {}, 'clerk');
if (this.loaded) {
Comment thread
jacekradko marked this conversation as resolved.
return;
}
Expand DownExpand Up@@ -448,10 +459,18 @@ export class Clerk implements ClerkInterface {
} else {
await this.#loadInNonStandardBrowser();
}
} catch (e) {
if (this.environment?.clientDebugMode) {
initDebugLogger({
enabled: true,
telemetryCollector: this.telemetry,
});
}
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
debugLogger.error('load() failed', { error }, 'clerk');
// bubble up the error
throw e;
throw error;
}
};

Expand All@@ -477,6 +496,16 @@ export class Clerk implements ClerkInterface {
const opts = callbackOrOptions && typeof callbackOrOptions === 'object' ? callbackOrOptions : options || {};

const redirectUrl = opts?.redirectUrl || this.buildAfterSignOutUrl();
debugLogger.debug(
'signOut() start',
{
hasClient: Boolean(this.client),
multiSessionCount: this.client?.signedInSessions.length ?? 0,
redirectUrl,
sessionTarget: opts?.sessionId ?? null,
},
'clerk',
);
const signOutCallback = typeof callbackOrOptions === 'function' ? callbackOrOptions : undefined;
Comment thread
coderabbitai[bot] marked this conversation as resolved.

const executeSignOut = async () => {
Expand DownExpand Up@@ -520,6 +549,7 @@ export class Clerk implements ClerkInterface {

await executeSignOut();

debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
return;
}

Expand All@@ -531,6 +561,7 @@ export class Clerk implements ClerkInterface {

if (shouldSignOutCurrent) {
await executeSignOut();
debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
}
};

Expand DownExpand Up@@ -1202,13 +1233,25 @@ export class Clerk implements ClerkInterface {
const { organization, beforeEmit, redirectUrl, navigate: setActiveNavigate } = params;
let { session } = params;
this.__internal_setActiveInProgress = true;

debugLogger.debug(
'setActive() start',
{
hasClient: Boolean(this.client),
sessionTarget: typeof session === 'string' ? session : (session?.id ?? session ?? null),
organizationTarget:
typeof organization === 'string' ? organization : (organization?.id ?? organization ?? null),
redirectUrl: redirectUrl ?? null,
},
'clerk',
);
try {
Comment thread
jacekradko marked this conversation as resolved.
if (!this.client) {
debugLogger.warn('Clerk setActive called before client is loaded', {}, 'clerk');
throw new Error('setActive is being called before the client is loaded. Wait for init.');
}

if (session === undefined && !this.session) {
debugLogger.warn('Clerk setActive precondition not met: no target session and no active session', {}, 'clerk');
throw new Error(
'setActive should either be called with a session param or there should be already an active session.',
);
Expand DownExpand Up@@ -1414,6 +1457,7 @@ export class Clerk implements ClerkInterface {
const customNavigate =
options?.replace && this.#options.routerReplace ? this.#options.routerReplace : this.#options.routerPush;

debugLogger.info(`Clerk is navigating to: ${toURL}`);
if (this.#options.routerDebug) {
console.log(`Clerk is navigating to: ${toURL}`);
}
Expand Down
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/fapiClient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ import { retry } from '@clerk/shared/retry';
import { camelToSnake } from '@clerk/shared/underscore';
import type { ClerkAPIErrorJSON, ClientJSON, InstanceType } from '@clerk/types';

import { debugLogger } from '@/utils/debug';

import { buildEmailAddress as buildEmailAddressUtil, buildURL as buildUrlUtil, stringifyQueryParams } from '../utils';
import { SUPPORTED_FAPI_VERSION } from './constants';
import { clerkNetworkError } from './errors';
Expand DownExpand Up@@ -250,12 +252,16 @@ export function createFapiClient(options: FapiClientOptions): FapiClient {
response = new Response('{}', requestInit); // Mock an empty json response
}
} catch (e) {
debugLogger.error('network error', { error: e, url: urlStr, method }, 'fapiClient');
clerkNetworkError(urlStr, e);
}

// 204 No Content responses do not have a body so we should not try to parse it
const json: FapiResponseJSON<T> | null = response.status !== 204 ? await response.json() : null;
const fapiResponse: FapiResponse<T> = Object.assign(response, { payload: json });
if (!response.ok) {
debugLogger.error('request failed', { method, path: requestInit.path, status: response.status }, 'fapiClient');
}
await runAfterResponseCallbacks(requestInit, fapiResponse);
return fapiResponse;
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/all-cougars-hide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce debugLogger for internal debugging support
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
"types/state-selectors.mdx",
"types/telemetry-log-entry.mdx",
"types/use-auth-return.mdx",
"types/use-session-list-return.mdx",
"types/use-session-return.mdx",
Expand All@@ -148,6 +149,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"shared/derive-state.mdx",
"shared/extract-dev-browser-jwt-from-url.mdx",
"shared/fast-deep-merge-and-replace.mdx",
"shared/generate-uuid.mdx",
"shared/get-clerk-js-major-version-or-tag.mdx",
"shared/get-cookie-suffix.mdx",
"shared/get-env-variable.mdx",
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "625KB" },
{ "path": "./dist/clerk.js", "maxSize": "626KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
52 changes: 48 additions & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ import type {
Web3Provider,
} from '@clerk/types';

import type { DebugLoggerInterface } from '@/utils/debug';
import { debugLogger, initDebugLogger } from '@/utils/debug';

import type { MountComponentRenderer } from '../ui/Components';
import {
ALLOWED_PROTOCOLS,
Expand DownExpand Up@@ -159,6 +162,11 @@ type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;

export type ClerkCoreBroadcastChannelEvent = { type: 'signout' };

/**
* Interface for the debug logger with all available logging methods
*/
// DebugLoggerInterface imported from '@/utils/debug'

declare global {
interface Window {
Clerk?: Clerk;
Expand DownExpand Up@@ -197,8 +205,8 @@ export class Clerk implements ClerkInterface {
public static sdkMetadata: SDKMetadata = {
name: __PKG_NAME__,
version: __PKG_VERSION__,
environment: process.env.NODE_ENV || 'production',
};

private static _billing: CommerceBillingNamespace;
private static _apiKeys: APIKeysNamespace;
private _checkout: ClerkInterface['__experimental_checkout'] | undefined;
Expand All@@ -210,6 +218,8 @@ export class Clerk implements ClerkInterface {
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();
// Deprecated: use global singleton from `@/utils/debug`
public debugLogger?: DebugLoggerInterface;
Comment thread
jacekradko marked this conversation as resolved.

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand DownExpand Up@@ -404,6 +414,7 @@ export class Clerk implements ClerkInterface {
public getFapiClient = (): FapiClient => this.#fapiClient;

public load = async (options?: ClerkOptions): Promise<void> => {
debugLogger.info('load() start', {}, 'clerk');
if (this.loaded) {
Comment thread
jacekradko marked this conversation as resolved.
return;
}
Expand DownExpand Up@@ -448,10 +459,18 @@ export class Clerk implements ClerkInterface {
} else {
await this.#loadInNonStandardBrowser();
}
} catch (e) {
if (this.environment?.clientDebugMode) {
initDebugLogger({
enabled: true,
telemetryCollector: this.telemetry,
});
}
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
debugLogger.error('load() failed', { error }, 'clerk');
// bubble up the error
throw e;
throw error;
}
};

Expand All@@ -477,6 +496,16 @@ export class Clerk implements ClerkInterface {
const opts = callbackOrOptions && typeof callbackOrOptions === 'object' ? callbackOrOptions : options || {};

const redirectUrl = opts?.redirectUrl || this.buildAfterSignOutUrl();
debugLogger.debug(
'signOut() start',
{
hasClient: Boolean(this.client),
multiSessionCount: this.client?.signedInSessions.length ?? 0,
redirectUrl,
sessionTarget: opts?.sessionId ?? null,
},
'clerk',
);
const signOutCallback = typeof callbackOrOptions === 'function' ? callbackOrOptions : undefined;
Comment thread
coderabbitai[bot] marked this conversation as resolved.

const executeSignOut = async () => {
Expand DownExpand Up@@ -520,6 +549,7 @@ export class Clerk implements ClerkInterface {

await executeSignOut();

debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
return;
}

Expand All@@ -531,6 +561,7 @@ export class Clerk implements ClerkInterface {

if (shouldSignOutCurrent) {
await executeSignOut();
debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
}
};

Expand DownExpand Up@@ -1202,13 +1233,25 @@ export class Clerk implements ClerkInterface {
const { organization, beforeEmit, redirectUrl, navigate: setActiveNavigate } = params;
let { session } = params;
this.__internal_setActiveInProgress = true;

debugLogger.debug(
'setActive() start',
{
hasClient: Boolean(this.client),
sessionTarget: typeof session === 'string' ? session : (session?.id ?? session ?? null),
organizationTarget:
typeof organization === 'string' ? organization : (organization?.id ?? organization ?? null),
redirectUrl: redirectUrl ?? null,
},
'clerk',
);
try {
Comment thread
jacekradko marked this conversation as resolved.
if (!this.client) {
debugLogger.warn('Clerk setActive called before client is loaded', {}, 'clerk');
throw new Error('setActive is being called before the client is loaded. Wait for init.');
}

if (session === undefined && !this.session) {
debugLogger.warn('Clerk setActive precondition not met: no target session and no active session', {}, 'clerk');
throw new Error(
'setActive should either be called with a session param or there should be already an active session.',
);
Expand DownExpand Up@@ -1414,6 +1457,7 @@ export class Clerk implements ClerkInterface {
const customNavigate =
options?.replace && this.#options.routerReplace ? this.#options.routerReplace : this.#options.routerPush;

debugLogger.info(`Clerk is navigating to: ${toURL}`);
if (this.#options.routerDebug) {
console.log(`Clerk is navigating to: ${toURL}`);
}
Expand Down
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/fapiClient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ import { retry } from '@clerk/shared/retry';
import { camelToSnake } from '@clerk/shared/underscore';
import type { ClerkAPIErrorJSON, ClientJSON, InstanceType } from '@clerk/types';

import { debugLogger } from '@/utils/debug';

import { buildEmailAddress as buildEmailAddressUtil, buildURL as buildUrlUtil, stringifyQueryParams } from '../utils';
import { SUPPORTED_FAPI_VERSION } from './constants';
import { clerkNetworkError } from './errors';
Expand DownExpand Up@@ -250,12 +252,16 @@ export function createFapiClient(options: FapiClientOptions): FapiClient {
response = new Response('{}', requestInit); // Mock an empty json response
}
} catch (e) {
debugLogger.error('network error', { error: e, url: urlStr, method }, 'fapiClient');
clerkNetworkError(urlStr, e);
}

// 204 No Content responses do not have a body so we should not try to parse it
const json: FapiResponseJSON<T> | null = response.status !== 204 ? await response.json() : null;
const fapiResponse: FapiResponse<T> = Object.assign(response, { payload: json });
if (!response.ok) {
debugLogger.error('request failed', { method, path: requestInit.path, status: response.status }, 'fapiClient');
}
await runAfterResponseCallbacks(requestInit, fapiResponse);
return fapiResponse;
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/all-cougars-hide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce debugLogger for internal debugging support
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
"types/state-selectors.mdx",
"types/telemetry-log-entry.mdx",
"types/use-auth-return.mdx",
"types/use-session-list-return.mdx",
"types/use-session-return.mdx",
Expand All@@ -148,6 +149,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"shared/derive-state.mdx",
"shared/extract-dev-browser-jwt-from-url.mdx",
"shared/fast-deep-merge-and-replace.mdx",
"shared/generate-uuid.mdx",
"shared/get-clerk-js-major-version-or-tag.mdx",
"shared/get-cookie-suffix.mdx",
"shared/get-env-variable.mdx",
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "625KB" },
{ "path": "./dist/clerk.js", "maxSize": "626KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
52 changes: 48 additions & 4 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ import type {
Web3Provider,
} from '@clerk/types';

import type { DebugLoggerInterface } from '@/utils/debug';
import { debugLogger, initDebugLogger } from '@/utils/debug';

import type { MountComponentRenderer } from '../ui/Components';
import {
ALLOWED_PROTOCOLS,
Expand DownExpand Up@@ -159,6 +162,11 @@ type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;

export type ClerkCoreBroadcastChannelEvent = { type: 'signout' };

/**
* Interface for the debug logger with all available logging methods
*/
// DebugLoggerInterface imported from '@/utils/debug'

declare global {
interface Window {
Clerk?: Clerk;
Expand DownExpand Up@@ -197,8 +205,8 @@ export class Clerk implements ClerkInterface {
public static sdkMetadata: SDKMetadata = {
name: __PKG_NAME__,
version: __PKG_VERSION__,
environment: process.env.NODE_ENV || 'production',
};

private static _billing: CommerceBillingNamespace;
private static _apiKeys: APIKeysNamespace;
private _checkout: ClerkInterface['__experimental_checkout'] | undefined;
Expand All@@ -210,6 +218,8 @@ export class Clerk implements ClerkInterface {
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();
// Deprecated: use global singleton from `@/utils/debug`
public debugLogger?: DebugLoggerInterface;
Comment thread
jacekradko marked this conversation as resolved.

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand DownExpand Up@@ -404,6 +414,7 @@ export class Clerk implements ClerkInterface {
public getFapiClient = (): FapiClient => this.#fapiClient;

public load = async (options?: ClerkOptions): Promise<void> => {
debugLogger.info('load() start', {}, 'clerk');
if (this.loaded) {
Comment thread
jacekradko marked this conversation as resolved.
return;
}
Expand DownExpand Up@@ -448,10 +459,18 @@ export class Clerk implements ClerkInterface {
} else {
await this.#loadInNonStandardBrowser();
}
} catch (e) {
if (this.environment?.clientDebugMode) {
initDebugLogger({
enabled: true,
telemetryCollector: this.telemetry,
});
}
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
debugLogger.error('load() failed', { error }, 'clerk');
// bubble up the error
throw e;
throw error;
}
};

Expand All@@ -477,6 +496,16 @@ export class Clerk implements ClerkInterface {
const opts = callbackOrOptions && typeof callbackOrOptions === 'object' ? callbackOrOptions : options || {};

const redirectUrl = opts?.redirectUrl || this.buildAfterSignOutUrl();
debugLogger.debug(
'signOut() start',
{
hasClient: Boolean(this.client),
multiSessionCount: this.client?.signedInSessions.length ?? 0,
redirectUrl,
sessionTarget: opts?.sessionId ?? null,
},
'clerk',
);
const signOutCallback = typeof callbackOrOptions === 'function' ? callbackOrOptions : undefined;
Comment thread
coderabbitai[bot] marked this conversation as resolved.

const executeSignOut = async () => {
Expand DownExpand Up@@ -520,6 +549,7 @@ export class Clerk implements ClerkInterface {

await executeSignOut();

debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
return;
}

Expand All@@ -531,6 +561,7 @@ export class Clerk implements ClerkInterface {

if (shouldSignOutCurrent) {
await executeSignOut();
debugLogger.info('signOut() complete', { redirectUrl: stripOrigin(redirectUrl) }, 'clerk');
}
};

Expand DownExpand Up@@ -1202,13 +1233,25 @@ export class Clerk implements ClerkInterface {
const { organization, beforeEmit, redirectUrl, navigate: setActiveNavigate } = params;
let { session } = params;
this.__internal_setActiveInProgress = true;

debugLogger.debug(
'setActive() start',
{
hasClient: Boolean(this.client),
sessionTarget: typeof session === 'string' ? session : (session?.id ?? session ?? null),
organizationTarget:
typeof organization === 'string' ? organization : (organization?.id ?? organization ?? null),
redirectUrl: redirectUrl ?? null,
},
'clerk',
);
try {
Comment thread
jacekradko marked this conversation as resolved.
if (!this.client) {
debugLogger.warn('Clerk setActive called before client is loaded', {}, 'clerk');
throw new Error('setActive is being called before the client is loaded. Wait for init.');
}

if (session === undefined && !this.session) {
debugLogger.warn('Clerk setActive precondition not met: no target session and no active session', {}, 'clerk');
throw new Error(
'setActive should either be called with a session param or there should be already an active session.',
);
Expand DownExpand Up@@ -1414,6 +1457,7 @@ export class Clerk implements ClerkInterface {
const customNavigate =
options?.replace && this.#options.routerReplace ? this.#options.routerReplace : this.#options.routerPush;

debugLogger.info(`Clerk is navigating to: ${toURL}`);
if (this.#options.routerDebug) {
console.log(`Clerk is navigating to: ${toURL}`);
}
Expand Down
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/fapiClient.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ import { retry } from '@clerk/shared/retry';
import { camelToSnake } from '@clerk/shared/underscore';
import type { ClerkAPIErrorJSON, ClientJSON, InstanceType } from '@clerk/types';

import { debugLogger } from '@/utils/debug';

import { buildEmailAddress as buildEmailAddressUtil, buildURL as buildUrlUtil, stringifyQueryParams } from '../utils';
import { SUPPORTED_FAPI_VERSION } from './constants';
import { clerkNetworkError } from './errors';
Expand DownExpand Up@@ -250,12 +252,16 @@ export function createFapiClient(options: FapiClientOptions): FapiClient {
response = new Response('{}', requestInit); // Mock an empty json response
}
} catch (e) {
debugLogger.error('network error', { error: e, url: urlStr, method }, 'fapiClient');
clerkNetworkError(urlStr, e);
}

// 204 No Content responses do not have a body so we should not try to parse it
const json: FapiResponseJSON<T> | null = response.status !== 204 ? await response.json() : null;
const fapiResponse: FapiResponse<T> = Object.assign(response, { payload: json });
if (!response.ok) {
debugLogger.error('request failed', { method, path: requestInit.path, status: response.status }, 'fapiClient');
}
await runAfterResponseCallbacks(requestInit, fapiResponse);
return fapiResponse;
}
Expand Down
Loading
Loading