Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SDK-3870] refactor: send react-hooks agent as channel param #1459

Merged
merged 5 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from 2 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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
2. Create a new branch for the release, for example `release/1.2.3`
3. Update the CHANGELOG.md with any customer-affecting changes since the last release and add this to the git index
4. Run `npm version <VERSION_NUMBER> --no-git-tag-version` with the new version and add the changes to the git index
5. Update the version number to the new version in `src/platform/react-hooks/src/AblyProvider.tsx`
5. Update the version number to the new version in `src/platform/react-hooks/src/AblyReactHooks.ts`
6. Create a PR for the release branch
7. Once the release PR is landed to the `main` branch, checkout the `main` branch locally (remember to pull the remote changes) and run `npm run build`
8. Run `git tag <VERSION_NUMBER>` with the new version and push the tag to git
Expand Down
13 changes: 0 additions & 13 deletions src/platform/react-hooks/src/AblyProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import * as Ably from 'ably';
import { Types } from '../../../../ably.js';
import React, { useMemo } from 'react';

const version = '1.2.45';

const canUseSymbol = typeof Symbol === 'function' && typeof Symbol.for === 'function';

interface AblyProviderProps {
Expand All @@ -28,8 +26,6 @@ export function getContext(ctxId = 'default'): AblyContextType {
return ctxMap[ctxId];
}

let hasSentAgent = false;

export const AblyProvider = ({ client, children, id = 'default' }: AblyProviderProps) => {
if (!client) {
throw new Error('AblyProvider: the `client` prop is required');
Expand All @@ -46,14 +42,5 @@ export const AblyProvider = ({ client, children, id = 'default' }: AblyProviderP
context = ctxMap[id] = React.createContext(realtime ?? 1);
}

React.useEffect(() => {
if (!hasSentAgent) {
hasSentAgent = true;
realtime.request('GET', '/time', null, null, {
'Ably-Agent': `react-hooks-time-ping/${version}`,
});
}
});

return <context.Provider value={realtime}>{children}</context.Provider>;
};
12 changes: 12 additions & 0 deletions src/platform/react-hooks/src/AblyReactHooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,15 @@ export type ChannelNameAndId = {
id?: string;
};
export type ChannelParameters = string | ChannelNameAndOptions;

export const version = '1.2.45';

export function channelOptionsWithAgent(options?: Types.ChannelOptions) {
return {
...options,
params: {
ttypic marked this conversation as resolved.
Show resolved Hide resolved
...options?.params,
agent: `react-hooks/${version}`,
},
};
}
9 changes: 6 additions & 3 deletions src/platform/react-hooks/src/hooks/useChannel.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Types } from '../../../../../ably.js';
import { useEffect, useMemo, useRef } from 'react';
import { ChannelParameters } from '../AblyReactHooks.js';
import { channelOptionsWithAgent, ChannelParameters } from '../AblyReactHooks.js';
import { useAbly } from './useAbly.js';
import { useStateErrors } from './useStateErrors.js';

Expand Down Expand Up @@ -45,13 +45,16 @@ export function useChannel(
const channelOptionsRef = useRef(channelOptions);
const ablyMessageCallbackRef = useRef(ablyMessageCallback);

const channel = useMemo(() => ably.channels.get(channelName, channelOptionsRef.current), [ably, channelName]);
const channel = useMemo(
() => ably.channels.get(channelName, channelOptionsWithAgent(channelOptionsRef.current)),
ttypic marked this conversation as resolved.
Show resolved Hide resolved
[ably, channelName]
);

const { connectionError, channelError } = useStateErrors(channelHookOptions);

useEffect(() => {
if (channelOptionsRef.current !== channelOptions && channelOptions) {
channel.setOptions(channelOptions);
channel.setOptions(channelOptionsWithAgent(channelOptions));
}
channelOptionsRef.current = channelOptions;
}, [channel, channelOptions]);
Expand Down
19 changes: 16 additions & 3 deletions src/platform/react-hooks/src/hooks/usePresence.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Types } from '../../../../../ably.js';
import { useCallback, useEffect, useState } from 'react';
import { ChannelParameters } from '../AblyReactHooks.js';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { channelOptionsWithAgent, ChannelParameters } from '../AblyReactHooks.js';
import { useAbly } from './useAbly.js';
import { useStateErrors } from './useStateErrors.js';

Expand Down Expand Up @@ -28,11 +28,24 @@ export function usePresence<T = any>(

const subscribeOnly = typeof channelNameOrNameAndOptions === 'string' ? false : params.subscribeOnly;

const channel = ably.channels.get(params.channelName, params.options);
const channelOptions = params.options;
const channelOptionsRef = useRef(channelOptions);

const channel = useMemo(
() => ably.channels.get(params.channelName, channelOptionsWithAgent(channelOptionsRef.current)),
[ably, params.channelName]
);
const skip = params.skip;

const { connectionError, channelError } = useStateErrors(params);

useEffect(() => {
if (channelOptionsRef.current !== channelOptions && channelOptions) {
channel.setOptions(channelOptionsWithAgent(channelOptions));
}
channelOptionsRef.current = channelOptions;
}, [channel, channelOptions]);

const [presenceData, updatePresenceData] = useState<Array<PresenceMessage<T>>>([]);

const updatePresence = async (message?: Types.PresenceMessage) => {
Expand Down
Loading