Skip to content

Commit

Permalink
chore: use derivws WS connection endpoint (binary-com#10835)
Browse files Browse the repository at this point in the history
  • Loading branch information
ali-hosseini-deriv committed Oct 25, 2023
1 parent cc626b5 commit f326438
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/generate_app_id.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- **PR**: [${{ steps.generate_app_id.outputs.pr_url }}](${{ steps.generate_app_id.outputs.pr_url }})
- **URLs**:
- **w/ App ID + Server**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=red.binaryws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}
- **w/ App ID + Server**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=red.derivws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}
- **Original**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}
- **App ID**: `${{ steps.generate_app_id.outputs.app_id }}`
Expand All @@ -55,14 +55,14 @@ jobs:
```
- **PR**: [${{ steps.generate_app_id.outputs.pr_url }}](${{ steps.generate_app_id.outputs.pr_url }})
- **URLs**:
- **w/ App ID + Server**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=red.binaryws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}
- **w/ App ID + Server**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=red.derivws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}
- **Original**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}
- **App ID**: `${{ steps.generate_app_id.outputs.app_id }}`
```
</details>
- name: Store generated URL in artifact
run: echo "HOME_URL=${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=red.binaryws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}" >> ${{ github.workspace }}/url.txt
run: echo "HOME_URL=${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=red.derivws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}" >> ${{ github.workspace }}/url.txt
- name: Upload artifact
uses: actions/upload-artifact@master
with:
Expand Down
2 changes: 1 addition & 1 deletion packages/bot-skeleton/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ bot bot-example.js
**Use only if you know what you're doing**

```
ENDPOINT='wss://ws.binaryws.com/websockets/v3?l=en&app_id=1169' bot bot-example.js
ENDPOINT='wss://ws.derivws.com/websockets/v3?l=en&app_id=1169' bot bot-example.js
```

### CLI examples
Expand Down
2 changes: 1 addition & 1 deletion packages/bot-web-ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ bot bot-example.js
**Use only if you know what you're doing**

```
ENDPOINT='wss://ws.binaryws.com/websockets/v3?l=en&app_id=1169' bot bot-example.js
ENDPOINT='wss://ws.derivws.com/websockets/v3?l=en&app_id=1169' bot bot-example.js
```

### CLI examples:
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/App/Devtools.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const EndpointSection = observer(() => {
maxLength={30}
error={formik.touched.server ? formik.errors.server : undefined}
label='Server'
hint='e.g. frontend.binaryws.com'
hint='e.g. frontend.derivws.com'
{...formik.getFieldProps('server')}
/>
<Input
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Modules/Endpoint/Endpoint.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const Endpoint = () => {
</Text>
</div>

<InputField name='server' label='Server' hint='e.g. frontend.binaryws.com' />
<InputField name='server' label='Server' hint='e.g. frontend.derivws.com' />
<InputField
name='app_id'
label='OAuth App ID'
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/utils/config/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export const getSocketURL = () => {
const is_real = loginid && !/^(VRT|VRW)/.test(loginid);

const server = is_real ? 'green' : 'blue';
const server_url = `${server}.binaryws.com`;
const server_url = `${server}.derivws.com`;

return server_url;
};
Expand All @@ -110,7 +110,7 @@ export const checkAndSetEndpointFromUrl = () => {
url_params.delete('qa_server');
url_params.delete('app_id');

if (/^(^(www\.)?qa[0-9]{1,4}\.deriv.dev|(.*)\.binaryws\.com)$/.test(qa_server) && /^[0-9]+$/.test(app_id)) {
if (/^(^(www\.)?qa[0-9]{1,4}\.deriv.dev|(.*)\.derivws\.com)$/.test(qa_server) && /^[0-9]+$/.test(app_id)) {
localStorage.setItem('config.app_id', app_id);
localStorage.setItem('config.server_url', qa_server);
}
Expand Down

0 comments on commit f326438

Please sign in to comment.