Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
5 changes: 5 additions & 0 deletions .changeset/twelve-insects-share.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@kitql/handles': patch
---

log if multiple proxy match
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ jobs:

- name: 🧑‍💻 Setup env
uses: jycouet/jycouet/shared-config/setup@main
# with:
# nodeVersion: 18
with:
pnpmVersion: 9
# nodeVersion: 18

# - name: 🛠️ Prepare nx 1/2
# uses: nrwl/nx-set-shas@v4
Expand Down Expand Up @@ -57,8 +58,9 @@ jobs:

- name: 🧑‍💻 Setup env
uses: jycouet/jycouet/shared-config/setup@main
# with:
# nodeVersion: 18
with:
pnpmVersion: 9
# nodeVersion: 18

- name: 🚧 Run nx build
run: pnpm build
Expand Down
2 changes: 1 addition & 1 deletion packages/create-kitql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"format": "kitql-lint --format"
},
"devDependencies": {
"@types/node": "^20.9.2",
"@types/node": "20.12.7",
"@kitql/eslint-config": "workspace:*"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-kitql/templates/kit-routes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@typescript-eslint/parser": "^7.0.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-svelte": "^2.30.0",
"eslint-plugin-svelte": "^2.37.0",
"prettier": "^3.0.0",
"prettier-plugin-svelte": "^3.0.0",
"svelte": "^4.2.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"commander": "^12.0.0",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-svelte": "2.35.0",
"eslint-plugin-svelte": "2.37.0",
"eslint-plugin-unused-imports": "3.1.0",
"prettier": "3.2.4",
"prettier-plugin-sh": "0.14.0",
Expand Down
3 changes: 3 additions & 0 deletions packages/handles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
"vite": "^5.0.0",
"vitest": "^1.0.0"
},
"dependencies": {
"esm-env": "^1.0.0"
},
"sideEffects": false,
"publishConfig": {
"directory": "dist",
Expand Down
25 changes: 11 additions & 14 deletions packages/handles/src/lib/hooks/handleProxies.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { error } from '@sveltejs/kit'
import { DEV } from 'esm-env'

import { Log } from '@kitql/helpers'

const log = new Log('handleProxies')

/**
* usage:
* import { sequence } from '@sveltejs/kit/hooks';
Expand All @@ -20,18 +23,10 @@ export const handleProxies = (options) => {
const proxies_found = options.proxies.filter((c) => event.url.pathname.startsWith(c.from))

// We should not find more than 1
if (proxies_found.length > 1) {
error(
403,
JSON.stringify({
error: 'Multiple proxies found',
proxies_found,
url: event.url.pathname,
}),
)
}
// We find one, perfect, let's use it
else if (proxies_found.length === 1) {
if (proxies_found.length > 0) {
if (proxies_found.length > 1 && DEV) {
log.error('Multiple proxies found', event.url.pathname)
}
const proxy = proxies_found[0]

const origin = event.request.headers.get('Origin')
Expand All @@ -48,16 +43,18 @@ export const handleProxies = (options) => {
const urlPath = `${proxy.to}${strippedPath}${event.url.search}`
const proxiedUrl = new URL(urlPath)

const requestHeaders = new Headers(event.request.headers)
requestHeaders.set('host', event.url.hostname)

return event
.fetch(proxiedUrl.toString(), {
body: event.request.body,
method: event.request.method,
headers: event.request.headers,
headers: requestHeaders,
// @ts-ignore
duplex: 'half',
})
.catch((err) => {
const log = new Log('handleProxies')
console.error(err)
log.error('handleProxies ERROR')
throw err
Expand Down
2 changes: 1 addition & 1 deletion packages/helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@kitql/eslint-config": "workspace:*",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"publint": "0.2.4",
"rollup-plugin-visualizer": "^5.9.2",
"rollup-plugin-visualizer": "5.12.0",
"svelte": "4.2.1",
"svelte-check": "3.6.0",
"tslib": "2.6.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/internals/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
"format": "kitql-lint --format"
},
"devDependencies": {
"@kitql/eslint-config": "workspace:*",
"@sveltejs/adapter-auto": "^3.0.0",
"@sveltejs/kit": "^2.4.0",
"@sveltejs/package": "2.3.0",
"@kitql/eslint-config": "workspace:*",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"publint": "0.2.4",
"rollup-plugin-visualizer": "^5.9.2",
"rollup-plugin-visualizer": "5.12.0",
"svelte-check": "3.6.0",
"tslib": "2.6.2",
"typescript": "5.4.2",
Expand Down
1 change: 1 addition & 0 deletions packages/vite-plugin-stripper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"remult": "^0.26.0",
"svelte": "4.2.1",
"svelte-check": "3.6.0",
"terser": "^5.30.3",
"tslib": "2.6.2",
"typescript": "5.4.2",
"vite": "^5.0.0",
Expand Down
5 changes: 3 additions & 2 deletions packages/vite-plugin-watch-and-run/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@
},
"devDependencies": {
"@kitql/eslint-config": "workspace:*",
"@types/micromatch": "4.0.2",
"@sveltejs/adapter-auto": "^3.0.0",
"@sveltejs/kit": "^2.4.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@sveltejs/package": "2.3.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@types/micromatch": "4.0.2",
"publint": "0.2.4",
"svelte": "4.2.1",
"svelte-check": "3.6.0",
"terser": "^5.30.3",
"tslib": "2.6.2",
"typescript": "5.4.2",
"vite": "^5.0.0",
Expand Down
Loading