Encodes/decodes bootstrap state to base64

 - Avoids JSON encoding issue in an HTML attribute
Improves base64 decode performance

Author: eamodio

src/avatars.ts

@@ -1,4 +1,5 @@
 import { EventEmitter, Uri } from 'vscode';
+import { base64 } from '@env/base64';
 import { md5 } from '@env/crypto';
 import type { GravatarDefaultStyle } from './config';
 import type { StoredAvatar } from './constants.storage';
@@ -9,7 +10,7 @@ import { configuration } from './system/-webview/configuration';
 import { getContext } from './system/-webview/context';
 import { debounce } from './system/function/debounce';
 import { filterMap } from './system/iterable';
-import { base64, equalsIgnoreCase } from './system/string';
+import { equalsIgnoreCase } from './system/string';
 import type { ContactPresenceStatus } from './vsls/vsls';
 
 const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's smis (small integers)

src/env/browser/base64.ts

@@ -1,5 +1,6 @@
 const { fromCharCode } = String;
 const textEncoder = new TextEncoder();
+const textDecoder = new TextDecoder();
 
 export function base64(s: string): string;
 export function base64(bytes: Uint8Array): string;
@@ -18,8 +19,32 @@ export function fromBase64(s: string): Uint8Array {
 
 	const len = decoded.length;
 	const bytes = new Uint8Array(len);
-	for (let i = 0; i < len; i++) {
+
+	// Unrolled loop for better performance on larger strings
+	let i = 0;
+	const end = len - (len % 8);
+	for (; i < end; i += 8) {
+		bytes[i] = decoded.charCodeAt(i);
+		bytes[i + 1] = decoded.charCodeAt(i + 1);
+		bytes[i + 2] = decoded.charCodeAt(i + 2);
+		bytes[i + 3] = decoded.charCodeAt(i + 3);
+		bytes[i + 4] = decoded.charCodeAt(i + 4);
+		bytes[i + 5] = decoded.charCodeAt(i + 5);
+		bytes[i + 6] = decoded.charCodeAt(i + 6);
+		bytes[i + 7] = decoded.charCodeAt(i + 7);
+	}
+	// Handle remaining bytes
+	for (; i < len; i++) {
 		bytes[i] = decoded.charCodeAt(i);
 	}
+
 	return bytes;
 }
+
+/**
+ * Decodes a base64-encoded string directly to a UTF-8 string.
+ * More efficient than fromBase64().toString() for string conversion.
+ */
+export function fromBase64ToString(s: string): string {
+	return textDecoder.decode(fromBase64(s));
+}

src/env/node/base64.ts

@@ -7,3 +7,11 @@ export function base64(data: string | Uint8Array): string {
 export function fromBase64(s: string): Uint8Array {
 	return Buffer.from(s, 'base64') as unknown as Uint8Array;
 }
+
+/**
+ * Decodes a base64-encoded string directly to a UTF-8 string.
+ * More efficient than fromBase64().toString() for string conversion.
+ */
+export function fromBase64ToString(s: string): string {
+	return Buffer.from(s, 'base64').toString('utf8');
+}

src/plus/integrations/providers/azure/azure.ts

@@ -1,6 +1,7 @@
 import type { HttpsProxyAgent } from 'https-proxy-agent';
 import type { CancellationToken, Disposable } from 'vscode';
 import { window } from 'vscode';
+import { base64 } from '@env/base64';
 import type { RequestInit, Response } from '@env/fetch';
 import { fetch, getProxyAgent, wrapForForcedInsecureSSL } from '@env/fetch';
 import { isWeb } from '@env/platform';
@@ -25,7 +26,6 @@ import { Logger } from '../../../../system/logger';
 import type { LogScope } from '../../../../system/logger.scope';
 import { getLogScope } from '../../../../system/logger.scope';
 import { maybeStopWatch } from '../../../../system/stopwatch';
-import { base64 } from '../../../../system/string';
 import type {
 	AzureGitCommit,
 	AzureProjectDescriptor,

src/plus/integrations/providers/azureDevOps.ts

@@ -1,5 +1,6 @@
 import type { AuthenticationSession, CancellationToken, EventEmitter } from 'vscode';
 import { window } from 'vscode';
+import { base64 } from '@env/base64';
 import { GitCloudHostIntegrationId, GitSelfManagedHostIntegrationId } from '../../../constants.integrations';
 import type { Container } from '../../../container';
 import type { Account, UnidentifiedAuthor } from '../../../git/models/author';
@@ -9,7 +10,6 @@ import type { IssueOrPullRequest, IssueOrPullRequestType } from '../../../git/mo
 import type { PullRequest, PullRequestMergeMethod, PullRequestState } from '../../../git/models/pullRequest';
 import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata';
 import { flatSettled } from '../../../system/promise';
-import { base64 } from '../../../system/string';
 import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthenticationProvider';
 import type { IntegrationAuthenticationService } from '../authentication/integrationAuthenticationService';
 import type { IntegrationConnectionChangeEvent } from '../integrationService';

src/plus/integrations/providers/github/github.ts

@@ -5,6 +5,7 @@ import type { Endpoints, OctokitResponse, RequestParameters } from '@octokit/typ
 import type { HttpsProxyAgent } from 'https-proxy-agent';
 import type { CancellationToken, Event } from 'vscode';
 import { Disposable, EventEmitter, Uri, window } from 'vscode';
+import { base64 } from '@env/base64';
 import { fetch, getProxyAgent, wrapForForcedInsecureSSL } from '@env/fetch';
 import { isWeb } from '@env/platform';
 import type { Container } from '../../../../container';
@@ -45,7 +46,6 @@ import { Logger } from '../../../../system/logger';
 import type { LogScope } from '../../../../system/logger.scope';
 import { getLogScope } from '../../../../system/logger.scope';
 import { maybeStopWatch } from '../../../../system/stopwatch';
-import { base64 } from '../../../../system/string';
 import type { Version } from '../../../../system/version';
 import { fromString, satisfies } from '../../../../system/version';
 import type {

src/plus/integrations/providers/providersApi.ts

@@ -1,5 +1,6 @@
 import ProviderApis from '@gitkraken/provider-apis';
 import { version as codeVersion, env } from 'vscode';
+import { base64 } from '@env/base64';
 import type { Response as FetchResponse } from '@env/fetch';
 import { fetch as _fetch, getProxyAgent } from '@env/fetch';
 import { getPlatform } from '@env/platform';
@@ -19,7 +20,6 @@ import {
 } from '../../../errors';
 import type { PagedResult } from '../../../git/gitProvider';
 import type { PullRequest, PullRequestMergeMethod } from '../../../git/models/pullRequest';
-import { base64 } from '../../../system/string';
 import type { IntegrationAuthenticationService } from '../authentication/integrationAuthenticationService';
 import type {
 	GetAzureProjectsForResourceFn,

src/system/string.ts

@@ -8,8 +8,6 @@ import { hrtime } from '@env/hrtime';
 import { CharCode } from '../constants';
 import { getNumericFormat } from './date';
 
-export { fromBase64, base64 } from '@env/base64';
-
 export function capitalize(s: string): string {
 	return `${s[0].toLocaleUpperCase()}${s.slice(1)}`;
 }

src/uris/deepLinks/deepLinkService.ts

@@ -1,5 +1,6 @@
 import type { QuickPickItem, SecretStorageChangeEvent } from 'vscode';
 import { Disposable, env, EventEmitter, ProgressLocation, Range, Uri, window, workspace } from 'vscode';
+import { fromBase64ToString } from '@env/base64';
 import type { OpenCloudPatchCommandArgs } from '../../commands/patches';
 import type { StoredDeepLinkContext, StoredNamedRef } from '../../constants.storage';
 import type { Container } from '../../container';
@@ -29,7 +30,6 @@ import { debug } from '../../system/decorators/log';
 import { once } from '../../system/event';
 import { Logger } from '../../system/logger';
 import { maybeUri, normalizePath } from '../../system/path';
-import { fromBase64 } from '../../system/string';
 import { isWalkthroughSupported } from '../../telemetry/walkthroughStateProvider';
 import { showInspectView } from '../../webviews/commitDetails/actions';
 import type { ShowWipArgs } from '../../webviews/commitDetails/protocol';
@@ -1236,7 +1236,7 @@ export class DeepLinkService implements Disposable {
 					const type = this._context.params?.get('type');
 					let prEntityId = this._context.params?.get('prEntityId') ?? undefined;
 					if (prEntityId != null) {
-						prEntityId = fromBase64(prEntityId).toString();
+						prEntityId = fromBase64ToString(prEntityId);
 					}
 
 					void (await executeCommand<OpenCloudPatchCommandArgs>('gitlens.openCloudPatch', {

src/webviews/apps/shared/appHost.ts

@@ -2,6 +2,7 @@ import { provide } from '@lit/context';
 import type { ReactiveControllerHost } from 'lit';
 import { html, LitElement } from 'lit';
 import { property } from 'lit/decorators.js';
+import { fromBase64ToString } from '@env/base64';
 import type { CustomEditorIds, WebviewIds, WebviewViewIds } from '../../../constants.views';
 import type { Deferrable } from '../../../system/function/debounce';
 import { debounce } from '../../../system/function/debounce';
@@ -55,8 +56,8 @@ export abstract class GlAppHost<
 	@provide({ context: telemetryContext })
 	protected _telemetry!: TelemetryContext;
 
-	@property({ type: Object, noAccessor: true })
-	private bootstrap!: State;
+	@property({ type: String, noAccessor: true })
+	private bootstrap!: string;
 	protected onThemeUpdated?(e: ThemeChangeEvent): void;
 
 	get state(): State {
@@ -83,7 +84,7 @@ export abstract class GlAppHost<
 		this._ipc = new HostIpc(this.name);
 		this._ipc.sendCommand(WebviewReadyCommand, undefined);
 
-		const state = this.bootstrap;
+		const state: State = JSON.parse(fromBase64ToString(this.bootstrap));
 		this.bootstrap = undefined!;
 		this._ipc.replaceIpcPromisesWithPromises(state);
 		this.onPersistState?.(state);