Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 238102c

Browse files
authoredJan 4, 2025··
Merge pull request #303 from clams-tech/release/2.5.3
Release 2.5.3
2 parents bcac5e7 + a1dc17b commit 238102c

File tree

9 files changed

+35
-29
lines changed

9 files changed

+35
-29
lines changed
 

‎.github/workflows/ci.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Build and Deploy
2+
on:
3+
push:
4+
branches:
5+
- main
6+
permissions:
7+
contents: write
8+
jobs:
9+
build-and-deploy:
10+
concurrency: ci-${{ github.ref }}
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout 🛎️
14+
uses: actions/checkout@v3
15+
16+
- name: Install and Build
17+
run: |
18+
yarn
19+
yarn build
20+
21+
- name: Deploy 🚀
22+
uses: JamesIves/github-pages-deploy-action@v4
23+
with:
24+
folder: build # The folder the action should deploy.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "remote",
3-
"version": "2.5.1",
3+
"version": "2.5.3",
44
"scripts": {
55
"dev": "vite dev",
66
"dev-https": "vite dev --mode https",

‎src/lib/constants.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ export const MODE = import.meta.env.MODE
1414

1515
export const API_HOST = 'api.clams.tech'
1616
export const API_URL = `https://${API_HOST}`
17-
export const WS_PROXY = `wss://${API_HOST}/ws-proxy`
1817
export const ALBY_WS_PROXY = 'wss://lnproxy.getalby.com'
1918

2019
export const SEC_IN_MS = 1000

‎src/lib/wallets/configurations/coreln/AdvancedConnection.svelte

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script lang="ts">
22
import { fade } from 'svelte/transition'
3-
import { ALBY_WS_PROXY, WS_PROXY } from '$lib/constants'
3+
import { ALBY_WS_PROXY } from '$lib/constants'
44
import TextInput from '$lib/components/TextInput.svelte'
55
import { translate } from '$lib/i18n/translations'
66
import type { CoreLnConfiguration } from '$lib/@types/wallets.js'
@@ -11,7 +11,7 @@
1111
let advancedConnectOption: 'default' | 'customProxy' | 'directConnection' =
1212
connection.type === 'direct'
1313
? 'directConnection'
14-
: connection.value === WS_PROXY
14+
: connection.value === ALBY_WS_PROXY
1515
? 'default'
1616
: 'customProxy'
1717
@@ -35,7 +35,7 @@
3535
} else if (advancedConnectOption === 'directConnection') {
3636
connection = { type: 'direct', value: connection.value === 'ws:' ? connection.value : 'wss:' }
3737
} else {
38-
connection = { type: 'proxy', value: WS_PROXY }
38+
connection = { type: 'proxy', value: ALBY_WS_PROXY }
3939
}
4040
}
4141
@@ -114,7 +114,7 @@
114114
bind:this={customProxyInput}
115115
bind:value={connection.value}
116116
name={advancedConnectOption}
117-
placeholder={WS_PROXY}
117+
placeholder={ALBY_WS_PROXY}
118118
invalid={customProxyUrlError}
119119
/>
120120
</div>
@@ -139,11 +139,6 @@
139139
<div
140140
class="flex items-center px-3 py-2 ring-2 ring-purple-500 border border-neutral-600 rounded"
141141
>
142-
<label class="flex items-center cursor-pointer">
143-
<input type="radio" bind:group={connection.value} value={WS_PROXY} />
144-
<span class="ml-1">Remote</span>
145-
</label>
146-
147142
<label class="flex items-center ml-4 cursor-pointer">
148143
<input type="radio" bind:group={connection.value} value={ALBY_WS_PROXY} />
149144
<span class="ml-1">Alby ({$translate('app.labels.tor_support')})</span>

‎src/lib/wallets/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import type { Wallet, CoreLnConfiguration } from '$lib/@types/wallets.js'
22
import type { AppError } from '$lib/@types/errors.js'
33
import type { Session } from '$lib/@types/session.js'
4-
import { WS_PROXY } from '$lib/constants.js'
54
import { nowSeconds, truncateValue, wait } from '$lib/utils.js'
65
import { Subject, type Observable, takeUntil, filter, take } from 'rxjs'
76
import CoreLightning from './coreln/index.js'
@@ -23,6 +22,7 @@ import {
2322
updateInvoices,
2423
updateAddresses
2524
} from '$lib/db/helpers.js'
25+
import { ALBY_WS_PROXY } from '$lib/constants.js'
2626

2727
type ConnectionCategory = 'lightning' | 'onchain' | 'exchange' | 'custodial' | 'custom'
2828

@@ -70,7 +70,7 @@ export const walletTypeToInitialConfiguration = (type: Wallet['type']): Wallet['
7070
address: '',
7171
connection: {
7272
type: 'proxy',
73-
value: WS_PROXY
73+
value: ALBY_WS_PROXY
7474
},
7575
token: ''
7676
}

‎src/routes/lnurl/[value]/+page.svelte

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@
6161
if (!tag) {
6262
parsingLnurl = true
6363
64-
const result = await fetch(`${API_URL}/http-proxy`, {
65-
headers: { 'Target-URL': url.toString() }
66-
}).then(res => res.json())
64+
const result = await fetch(url.toString()).then(res => res.json())
6765
6866
if (result.status === 'ERROR') {
6967
throw {

‎src/routes/lnurl/[value]/auth.svelte

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@
5050
loginURL.searchParams.set('key', signer.publicKey)
5151
loginURL.searchParams.set('t', Date.now().toString())
5252
53-
const authResponse = await fetch(`${API_URL}/http-proxy`, {
54-
headers: { 'Target-URL': loginURL.toString() }
55-
}).then((res) => res.json())
53+
const authResponse = await fetch(loginURL.toString()).then(res => res.json())
5654
5755
if (authResponse && authResponse.status === 'OK') {
5856
authenticationSuccess = true

‎src/routes/lnurl/[value]/pay.svelte

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,7 @@
155155
url.searchParams.set('comment', comment)
156156
}
157157
158-
const result = await fetch(`${API_URL}/http-proxy`, {
159-
headers: {
160-
'Target-URL': url.toString()
161-
}
162-
}).then(res => res.json())
158+
const result = await fetch(url.toString()).then(res => res.json())
163159
164160
if (result.status === 'ERROR') {
165161
throw {

‎src/routes/lnurl/[value]/withdraw.svelte

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,7 @@
9292
url.searchParams.set('k1', k1)
9393
url.searchParams.set('pr', invoice.data.request as string)
9494
95-
const result = await fetch(`${API_URL}/http-proxy`, {
96-
headers: {
97-
'Target-URL': url.toString()
98-
}
99-
}).then(res => res.json())
95+
const result = await fetch(url.toString()).then(res => res.json())
10096
10197
if (result.status === 'ERROR') {
10298
throw {

0 commit comments

Comments
 (0)
Please sign in to comment.