Skip to content

Commit d660fab

Browse files
committed
Renamed function
1 parent 226be0b commit d660fab

File tree

7 files changed

+19
-20
lines changed

7 files changed

+19
-20
lines changed

common/api-review/util.api.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,9 @@ export function ordinal(i: number): string;
398398
// @public (undocumented)
399399
export type PartialObserver<T> = Partial<Observer<T>>;
400400

401+
// @public
402+
export function pingServer(endpoint: string): Promise<boolean>;
403+
401404
// Warning: (ae-internal-missing-underscore) The name "promiseWithTimeout" should be prefixed with an underscore because the declaration is marked as @internal
402405
//
403406
// @internal
@@ -474,11 +477,6 @@ export interface Subscribe<T> {
474477
(observer: PartialObserver<T>): Unsubscribe;
475478
}
476479

477-
// Warning: (ae-missing-release-tag) "testConnectionAlive" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
478-
//
479-
// @public (undocumented)
480-
export function testConnectionAlive(endpoint: string): Promise<boolean>;
481-
482480
// Warning: (ae-missing-release-tag) "Unsubscribe" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
483481
//
484482
// @public (undocumented)

packages/auth/src/core/auth/emulator.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@ import { Auth } from '../../model/public_types';
1818
import { AuthErrorCode } from '../errors';
1919
import { _assert } from '../util/assert';
2020
import { _castAuth } from './auth_impl';
21-
import {
22-
deepEqual,
23-
isCloudWorkstation,
24-
testConnectionAlive
25-
} from '@firebase/util';
21+
import { deepEqual, isCloudWorkstation, pingServer } from '@firebase/util';
2622

2723
/**
2824
* Changes the {@link Auth} instance to communicate with the Firebase Auth Emulator, instead of production
@@ -107,7 +103,7 @@ export function connectAuthEmulator(
107103

108104
if (isCloudWorkstation(host)) {
109105
// Workaround to get cookies in Firebase Studio
110-
void testConnectionAlive(`${protocol}//${host}:${port}`);
106+
void pingServer(`${protocol}//${host}:${port}`);
111107
}
112108
}
113109

packages/data-connect/src/api/DataConnect.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
import { AppCheckInternalComponentName } from '@firebase/app-check-interop-types';
2525
import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
2626
import { Provider } from '@firebase/component';
27-
import { isCloudWorkstation, testConnectionAlive } from '@firebase/util';
27+
import { isCloudWorkstation, pingServer } from '@firebase/util';
2828

2929
import { AppCheckTokenProvider } from '../core/AppCheckTokenProvider';
3030
import { Code, DataConnectError } from '../core/error';
@@ -239,7 +239,7 @@ export function connectDataConnectEmulator(
239239
sslEnabled = false
240240
): void {
241241
if (isCloudWorkstation(host)) {
242-
void testConnectionAlive(`https://${host}${port ? `:${port}` : ''}`);
242+
void pingServer(`https://${host}${port ? `:${port}` : ''}`);
243243
}
244244
dc.enableEmulator({ host, port, sslEnabled });
245245
}

packages/firestore/src/lite-api/database.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
EmulatorMockTokenOptions,
2929
getDefaultEmulatorHostnameAndPort,
3030
isCloudWorkstation,
31-
testConnectionAlive
31+
pingServer
3232
} from '@firebase/util';
3333

3434
import {
@@ -335,7 +335,7 @@ export function connectFirestoreEmulator(
335335
};
336336
const newHostSetting = `${host}:${port}`;
337337
if (useSsl) {
338-
void testConnectionAlive(`https://${newHostSetting}`);
338+
void pingServer(`https://${newHostSetting}`);
339339
}
340340
if (settings.host !== DEFAULT_HOST && settings.host !== newHostSetting) {
341341
logWarn(

packages/functions/src/service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import { Provider } from '@firebase/component';
3030
import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
3131
import { MessagingInternalComponentName } from '@firebase/messaging-interop-types';
3232
import { AppCheckInternalComponentName } from '@firebase/app-check-interop-types';
33-
import { isCloudWorkstation, testConnectionAlive } from '@firebase/util';
33+
import { isCloudWorkstation, pingServer } from '@firebase/util';
3434

3535
export const DEFAULT_REGION = 'us-central1';
3636

@@ -180,7 +180,7 @@ export function connectFunctionsEmulator(
180180
useSsl ? 's' : ''
181181
}://${host}:${port}`;
182182
if (useSsl) {
183-
void testConnectionAlive(functionsInstance.emulatorOrigin);
183+
void pingServer(functionsInstance.emulatorOrigin);
184184
}
185185
}
186186

packages/storage/src/service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import {
4646
createMockUserToken,
4747
EmulatorMockTokenOptions,
4848
isCloudWorkstation,
49-
testConnectionAlive
49+
pingServer
5050
} from '@firebase/util';
5151
import { Connection, ConnectionType } from './implementation/connection';
5252

@@ -148,7 +148,7 @@ export function connectStorageEmulator(
148148
storage.host = `${host}:${port}`;
149149
const useSsl = isCloudWorkstation(host);
150150
if (useSsl) {
151-
void testConnectionAlive(`https://${storage.host}`);
151+
void pingServer(`https://${storage.host}`);
152152
}
153153
storage._isUsingEmulator = true;
154154
storage._protocol = useSsl ? 'https' : 'http';

packages/util/src/url.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@ export function isCloudWorkstation(host: string): boolean {
2323
return host.endsWith('.cloudworkstations.dev');
2424
}
2525

26-
export async function testConnectionAlive(endpoint: string): Promise<boolean> {
26+
/**
27+
* Makes a fetch request to the given server.
28+
* Mostly used for forwarding cookies in Firebase Studio.
29+
* @public
30+
*/
31+
export async function pingServer(endpoint: string): Promise<boolean> {
2732
const result = await fetch(endpoint, {
2833
credentials: 'include'
2934
});

0 commit comments

Comments
 (0)