Skip to content

Commit

Permalink
npm run format
Browse files Browse the repository at this point in the history
  • Loading branch information
evgeniibreikin committed Jan 30, 2025
1 parent 40dd5a5 commit 62e13e8
Show file tree
Hide file tree
Showing 88 changed files with 517 additions and 514 deletions.
2 changes: 1 addition & 1 deletion src/core/auth/auth_transports.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ interface AuthTransport {
query: string,
authOptions: InternalAuthOptions,
authRequestType: AuthRequestType,
callback: Function
callback: Function,

This comment has been minimized.

Copy link
@marknadig

marknadig Feb 6, 2025

@evgeniibreikin this added a bunch of extraneous commas the the TS and now the generated JS. Unsure if that was intentional or not.

TIL JavaScript ignores trailing commas

This comment has been minimized.

Copy link
@evgeniibreikin

evgeniibreikin Feb 6, 2025

Author Contributor

hi, yes! There is updated version of prettified did that https://prettier.io/docs/options/#trailing-commas

): void;
}

Expand Down
10 changes: 5 additions & 5 deletions src/core/auth/channel_authorizer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import {
InternalAuthOptions,
ChannelAuthorizationHandler,
ChannelAuthorizationRequestParams,
ChannelAuthorizationCallback
ChannelAuthorizationCallback,
} from './options';

import Runtime from 'runtime';

const composeChannelQuery = (
params: ChannelAuthorizationRequestParams,
authOptions: InternalAuthOptions
authOptions: InternalAuthOptions,
) => {
var query = 'socket_id=' + encodeURIComponent(params.socketId);

Expand Down Expand Up @@ -39,15 +39,15 @@ const composeChannelQuery = (
};

const ChannelAuthorizer = (
authOptions: InternalAuthOptions
authOptions: InternalAuthOptions,
): ChannelAuthorizationHandler => {
if (typeof Runtime.getAuthorizers()[authOptions.transport] === 'undefined') {
throw `'${authOptions.transport}' is not a recognized auth transport`;
}

return (
params: ChannelAuthorizationRequestParams,
callback: ChannelAuthorizationCallback
callback: ChannelAuthorizationCallback,
) => {
const query = composeChannelQuery(params, authOptions);

Expand All @@ -56,7 +56,7 @@ const ChannelAuthorizer = (
query,
authOptions,
AuthRequestType.ChannelAuthorization,
callback
callback,
);
};
};
Expand Down
18 changes: 8 additions & 10 deletions src/core/auth/deprecated_channel_authorizer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
ChannelAuthorizationCallback,
ChannelAuthorizationHandler,
ChannelAuthorizationRequestParams,
InternalAuthOptions
InternalAuthOptions,
} from './options';

export interface DeprecatedChannelAuthorizer {
Expand All @@ -13,7 +13,7 @@ export interface DeprecatedChannelAuthorizer {
export interface ChannelAuthorizerGenerator {
(
channel: Channel,
options: DeprecatedAuthorizerOptions
options: DeprecatedAuthorizerOptions,
): DeprecatedChannelAuthorizer;
}

Expand All @@ -31,28 +31,26 @@ export interface DeprecatedAuthorizerOptions {
export const ChannelAuthorizerProxy = (
pusher,
authOptions: InternalAuthOptions,
channelAuthorizerGenerator: ChannelAuthorizerGenerator
channelAuthorizerGenerator: ChannelAuthorizerGenerator,
): ChannelAuthorizationHandler => {
const deprecatedAuthorizerOptions: DeprecatedAuthorizerOptions = {
authTransport: authOptions.transport,
authEndpoint: authOptions.endpoint,
auth: {
params: authOptions.params,
headers: authOptions.headers
}
headers: authOptions.headers,
},
};
return (
params: ChannelAuthorizationRequestParams,
callback: ChannelAuthorizationCallback
callback: ChannelAuthorizationCallback,
) => {
const channel = pusher.channel(params.channelName);
// This line creates a new channel authorizer every time.
// In the past, this was only done once per channel and reused.
// We can do that again if we want to keep this behavior intact.
const channelAuthorizer: DeprecatedChannelAuthorizer = channelAuthorizerGenerator(
channel,
deprecatedAuthorizerOptions
);
const channelAuthorizer: DeprecatedChannelAuthorizer =
channelAuthorizerGenerator(channel, deprecatedAuthorizerOptions);
channelAuthorizer.authorize(params.socketId, callback);
};
};
20 changes: 9 additions & 11 deletions src/core/auth/options.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export enum AuthRequestType {
UserAuthentication = 'user-authentication',
ChannelAuthorization = 'channel-authorization'
ChannelAuthorization = 'channel-authorization',
}

export interface ChannelAuthorizationData {
Expand All @@ -11,7 +11,7 @@ export interface ChannelAuthorizationData {

export type ChannelAuthorizationCallback = (
error: Error | null,
authData: ChannelAuthorizationData | null
authData: ChannelAuthorizationData | null,
) => void;

export interface ChannelAuthorizationRequestParams {
Expand All @@ -22,7 +22,7 @@ export interface ChannelAuthorizationRequestParams {
export interface ChannelAuthorizationHandler {
(
params: ChannelAuthorizationRequestParams,
callback: ChannelAuthorizationCallback
callback: ChannelAuthorizationCallback,
): void;
}

Expand All @@ -33,7 +33,7 @@ export interface UserAuthenticationData {

export type UserAuthenticationCallback = (
error: Error | null,
authData: UserAuthenticationData | null
authData: UserAuthenticationData | null,
) => void;

export interface UserAuthenticationRequestParams {
Expand All @@ -43,7 +43,7 @@ export interface UserAuthenticationRequestParams {
export interface UserAuthenticationHandler {
(
params: UserAuthenticationRequestParams,
callback: UserAuthenticationCallback
callback: UserAuthenticationCallback,
): void;
}

Expand All @@ -61,12 +61,10 @@ export interface AuthOptionsT<AuthHandler> {
customHandler?: AuthHandler;
}

export declare type UserAuthenticationOptions = AuthOptionsT<
UserAuthenticationHandler
>;
export declare type ChannelAuthorizationOptions = AuthOptionsT<
ChannelAuthorizationHandler
>;
export declare type UserAuthenticationOptions =
AuthOptionsT<UserAuthenticationHandler>;
export declare type ChannelAuthorizationOptions =
AuthOptionsT<ChannelAuthorizationHandler>;

export interface InternalAuthOptions {
transport: 'ajax' | 'jsonp';
Expand Down
10 changes: 5 additions & 5 deletions src/core/auth/user_authenticator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import {
InternalAuthOptions,
UserAuthenticationHandler,
UserAuthenticationRequestParams,
AuthRequestType
AuthRequestType,
} from './options';

import Runtime from 'runtime';

const composeChannelQuery = (
params: UserAuthenticationRequestParams,
authOptions: InternalAuthOptions
authOptions: InternalAuthOptions,
) => {
var query = 'socket_id=' + encodeURIComponent(params.socketId);

Expand All @@ -37,15 +37,15 @@ const composeChannelQuery = (
};

const UserAuthenticator = (
authOptions: InternalAuthOptions
authOptions: InternalAuthOptions,
): UserAuthenticationHandler => {
if (typeof Runtime.getAuthorizers()[authOptions.transport] === 'undefined') {
throw `'${authOptions.transport}' is not a recognized auth transport`;
}

return (
params: UserAuthenticationRequestParams,
callback: UserAuthenticationCallback
callback: UserAuthenticationCallback,
) => {
const query = composeChannelQuery(params, authOptions);

Expand All @@ -54,7 +54,7 @@ const UserAuthenticator = (
query,
authOptions,
AuthRequestType.UserAuthentication,
callback
callback,
);
};
};
Expand Down
18 changes: 9 additions & 9 deletions src/core/base64.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ for (var i = 0, l = b64chars.length; i < l; i++) {
b64tab[b64chars.charAt(i)] = i;
}

var cb_utob = function(c) {
var cb_utob = function (c) {
var cc = c.charCodeAt(0);
return cc < 0x80
? c
: cc < 0x800
? fromCharCode(0xc0 | (cc >>> 6)) + fromCharCode(0x80 | (cc & 0x3f))
: fromCharCode(0xe0 | ((cc >>> 12) & 0x0f)) +
fromCharCode(0x80 | ((cc >>> 6) & 0x3f)) +
fromCharCode(0x80 | (cc & 0x3f));
? fromCharCode(0xc0 | (cc >>> 6)) + fromCharCode(0x80 | (cc & 0x3f))
: fromCharCode(0xe0 | ((cc >>> 12) & 0x0f)) +
fromCharCode(0x80 | ((cc >>> 6) & 0x3f)) +
fromCharCode(0x80 | (cc & 0x3f));
};

var utob = function(u) {
var utob = function (u) {
return u.replace(/[^\x00-\x7F]/g, cb_utob);
};

var cb_encode = function(ccc) {
var cb_encode = function (ccc) {
var padlen = [0, 2, 1][ccc.length % 3];
var ord =
(ccc.charCodeAt(0) << 16) |
Expand All @@ -37,13 +37,13 @@ var cb_encode = function(ccc) {
b64chars.charAt(ord >>> 18),
b64chars.charAt((ord >>> 12) & 63),
padlen >= 2 ? '=' : b64chars.charAt((ord >>> 6) & 63),
padlen >= 1 ? '=' : b64chars.charAt(ord & 63)
padlen >= 1 ? '=' : b64chars.charAt(ord & 63),
];
return chars.join('');
};

var btoa =
global.btoa ||
function(b) {
function (b) {
return b.replace(/[\s\S]{1,3}/g, cb_encode);
};
20 changes: 10 additions & 10 deletions src/core/channels/channel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Metadata from './metadata';
import UrlStore from '../utils/url_store';
import {
ChannelAuthorizationData,
ChannelAuthorizationCallback
ChannelAuthorizationCallback,
} from '../auth/options';
import { HTTPAuthError } from '../errors';

Expand All @@ -29,7 +29,7 @@ export default class Channel extends EventsDispatcher {
subscriptionCount: null;

constructor(name: string, pusher: Pusher) {
super(function(event, data) {
super(function (event, data) {
Logger.debug('No callbacks on ' + name + ' for ' + event);
});

Expand All @@ -52,13 +52,13 @@ export default class Channel extends EventsDispatcher {
trigger(event: string, data: any) {
if (event.indexOf('client-') !== 0) {
throw new Errors.BadEventName(
"Event '" + event + "' does not start with 'client-'"
"Event '" + event + "' does not start with 'client-'",
);
}
if (!this.subscribed) {
var suffix = UrlStore.buildLogSuffix('triggeringClientEvents');
Logger.warn(
`Client event triggered before channel 'subscription_succeeded' event . ${suffix}`
`Client event triggered before channel 'subscription_succeeded' event . ${suffix}`,
);
}
return this.pusher.send_event(event, data, this.name);
Expand Down Expand Up @@ -127,27 +127,27 @@ export default class Channel extends EventsDispatcher {
{},
{
type: 'AuthError',
error: error.message
error: error.message,
},
error instanceof HTTPAuthError ? { status: error.status } : {}
)
error instanceof HTTPAuthError ? { status: error.status } : {},
),
);
} else {
this.pusher.send_event('pusher:subscribe', {
auth: data.auth,
channel_data: data.channel_data,
channel: this.name
channel: this.name,
});
}
}
},
);
}

/** Sends an unsubscription request. For internal use only. */
unsubscribe() {
this.subscribed = false;
this.pusher.send_event('pusher:unsubscribe', {
channel: this.name
channel: this.name,
});
}

Expand Down
4 changes: 2 additions & 2 deletions src/core/channels/channels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default class Channels {

/** Proxies disconnection signal to all channels. */
disconnect() {
Collections.objectApply(this.channels, function(channel) {
Collections.objectApply(this.channels, function (channel) {
channel.disconnect();
});
}
Expand All @@ -78,7 +78,7 @@ function createChannel(name: string, pusher: Pusher): Channel {
return Factory.createPresenceChannel(name, pusher);
} else if (name.indexOf('#') === 0) {
throw new Errors.BadChannelName(
'Cannot create a channel with name "' + name + '".'
'Cannot create a channel with name "' + name + '".',
);
} else {
return Factory.createChannel(name, pusher);
Expand Down
Loading

0 comments on commit 62e13e8

Please sign in to comment.