Skip to content

Commit

Permalink
Project update. [p][robotic]
Browse files Browse the repository at this point in the history
  • Loading branch information
jaswrks committed Feb 17, 2024
1 parent 130c508 commit 45b49b7
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .env.vault
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ DOTENV_VAULT_MAIN="3rfi+ClkONvfHPiU9FTBcC1+Um/L8QeM9dRw1jFzEqzZXw=="
DOTENV_VAULT_MAIN_VERSION=1

# dev
DOTENV_VAULT_DEV="AH3nYu+BcvndByTWLaNET0EfxdqcjS2T2hyIR3B2FxmWmC5zbk2fyYK1Ag2PcZunmDS2eRlHrWDsWQEiD8Rc8LQor5r9kA4wVLW1V8NWKdZ+8CX3gd2lAqPNeCo8tpun0ayCl2VKTZ0eUJBGTroSSAAJglE/Ashvc6DwK1J8zkW1InvCccVgi5QWqGdd9ZyGHoMz2nGlhANElip2TqWmJgvdF69r3XCESFqlsL/kuuFYMFxWtnCNtojcpSjrrKF6gTUrTNf4x3pQ4J9cSCc4NF0dIrVpPLBj/MFjMy1etHjimGLnRqLiwJ1jwKCT44oGP7JzwNisYj+skqPT4z6qhEegPBIPYL9NEpcG5Lcul4fUUEVXYge9qjTYRCjTrIry1zjLRV8qbe0GRTWai8aNmSMftO8VY+NZuv0JESOy6YmBlZlsDtMIGBHcKb+8YKhr7czk6BbIAoMsne1M93jNUR4bcZJhiJwhFrOtPKYlNzDb+xd3aCQMkkDtLklo5ym45NTE4w1ATQ8eZcisLjDUaK1+7yWt9xWLi5Dd24LOTM83iqmnEb143f0xKuHBPKdwfQg3Db7vQ3Fe9QGi5YEDCJLF3rwjvW7o/Zmu1h5jzqSKiFPAlZj0GkGO/+qI5wX6kUwrsSiLW9yw0xPRBmbJ1i9U5wmPuQ6isUqzN+xhsQkimH3RhNs6cwPSe0/3RTLCg/Qs59rE9cEcVlXkUkfWcZXRNrrO6DT1FdsSHyd7Dte36sX51wCG8tw1VibEEREnXKoMS2vK1N/vWvmqRjhnprSh1XAHCfj7CNfh9UjhbwushuXlR5lfOJldodPKy6LrfkL1yq19vpxuZ6eb8qKCySnaPf6PU3VNxxu9pE+7eRW+q/XV/pVyAh7JiGwS"
DOTENV_VAULT_DEV_VERSION=161
DOTENV_VAULT_DEV="3LxOFEcotf08vVOmFQz6ni6yHmYGkjXKDltLIfo4wEmPlGFjgiRUPvS3OR6wuJA/xETkTLu70pUuLxqspg+Ez62BvJLWMwDbMBwvy5aX1YK3G0Li9f2TohyiFw6qctg278ChPz/cztOP6DnZpp+JLk/tMTm0Pq0t80XadRSzLKC+VNMdQHYuyBhJG7yiWgJ9Qb02eKu66giRYTb3WaAh3Bv3mkVpmRXp+t/5I/5Tq0dZvhtTxjzHlKRPH3PZmqO+rUqIJhajksR9PBYN9itQnJUKbMo64FP3h/1a+ekuFgqDHz4vzmyMdfMuv+yzlrL4VopML2baOBSAgN0ADLwMMFzV+hwUgHR1PbpnO+cNYueXPXe7npvUo6YpSbWRbNaIrGafdFM2QBWGj+1si+XSNWCfFoMd6YaPfXayobGHnyFs5GFZcujWrreYCc3QdaAAQYV8GpSKQAbeR8HDn3xZm2/fwF9BHoedCR/UuheeDqcb5RuLnGZm53WC5i+Kq7fNAYEfDorgwq/AlKahmKRuf0J78gg9p5VKhTtjtfmA1Hfmnln5ClkUVeSnOEEptRkGyXVQgk+swXHMZm7I58iIM7KvJ80ZYgzG5GYpUewXCDAF5P9uZ3xYpn1FgNX0SmXIMGPGTHEI/uhNm1g4Dis0mH77wk/GiIO7zJGpL+7w0ywpcIT0izEfHiuNRUnFJRV66Gtnli1fuKFwuq2C97ejnuEXuswP4MqJJNRCQzit58y+PojF7pBmvpflO8SHgk89SUmliv6UzQLXijwkdGybn2830uJQU5xJ2cvYrqpde4jslCxr58lIRPqsU/Wg70vAiX/aC6RQEliTBk4TvIt7RDgw9mmFMSaWVd/yIsJ4G5lwMDQrqdLEnwucbJLm"
DOTENV_VAULT_DEV_VERSION=163

# ci
DOTENV_VAULT_CI="byw0vCDryY618nU7cUlOfeoFoB85I+lmXmFv+FvN8Pt++k2iNIhPequ3OO5rKb6Tdyhxeh0HpJAeE3lGl44Zy6ligd/rO87FROk+HA2ZuZLKGo4WuBV/PGGe3o9V6HSRxsdVN6Vrrk/88Zbd/9PP+cNLCOfMqvIRczW0kdRCb2sfc2sprzdJa74BvvQXMVbTtSxHXa6a0rnHKHD/4ZwWAfbIs14ptOPv9Sc2hT/i5VfnXgQA1nLvUGIG2NyYJNhfYAHmzrrxvbbm87/J739v4pr5NElWaZbSXLdOmbqj8nUr1NaG9Lp06dU6ssqiMNpN8QIsRDagFj7NPjMGH1i7KwydTNEjolGjEQWCoEfKgFHZUuT8Y0uxQVyE0mKw8ZYsGXl9sO2nEYjru9a/XAhoU0haMQ/stvZQhA6oUN8/ilE+d09ZC/83dZYNo/8nSrGekWHwH0j2I2iYr8TeoEbVc+X3UbJilJ+CkjYHnruzLxtyDDZRYl4iK6uwSNDhZ3VD5zutxs0f/lQ5pE7tK1IK/7ZhjybdPa2y8Ml1FOYd09t6W8uWTa1sHuYVKtZkwu+VvfC7ic2wnMIhqcUx05i8qzoRg8M0FgAxz+ycBG3w1wdksjMBGm9qUU54Xnw0Vjz5GMfdjS9x4xIrzJZ+VGFzV6P1QuZjeu+++7iQn6I6pmI+wYNh/lenl75Vgk2PJeUSUIIUgoO12WJ216T5u80jwZO3lVro87uwzqkYcZ3afuJ6mQZiwF2iDlg30MGXGLwkCsuwG558vQNct7DJq3fiZs+IqacWnrNqBNWjCS2/9EBXZ9E5D+6lx33R9qAblV0D0DJYYv9oEXskqieC7rOscdoXuV7s0Lu91w/B4Lt35Sx6Yd838/sGNgXVxrSn"
DOTENV_VAULT_CI_VERSION=161
DOTENV_VAULT_CI="tgl4+DG61nYS2SQKqReS/Z39MjmerpNsU2oItwJgWfs5A1tvPg4roV2ArG4B56Ay0NvscrRu+zKuafQaiUXDtsGVQKLGqsSUM8AL7aRfrW6T7fg/crKYzyMXDwnq7rJWPFFcIIB0dgOO0ikw50GKe5yfmi2H78wS1nh9iYeQWsWOFSe6KeVoGw0qOSndnr3i1bH13UOZb7PVVfvCYF3bOVELSoqgfOGLTUJvoC/7WQQ7CBzeW8C5zxLDoj9Tw084OyQa4r4psBUs70v7N7oo5AS8UBx9dH0at57P0a6u5iCOXlW0QAtzjO7m+VgfEmwsTKy3+QuZy585eI30wBp+3/X/zEJBzKOmmQI6vxSW5uK9EnMlY/jQIXk0MaOuKBBnwofuTOuigmR5vxdXgc5oqhUlRX0dMRWhcQKQ5mrrxOpT01gJuEkmB779MWlmOIcKUHdeAreQguEhjVtTyJwuhEeietJ+THv3uJjLewvcFrvaV3FiWQ7pWE9siNwHyzrTFAC3SxVBpXLcduj68gVwW95oA52WIwO00XmCLq9xZ5xwN5vxZM+1GZdg2KPsqIfLoMaXkxbKCTotZdhLV3R5BDaNB7Hmsg7g2vLFQ5g5nzc+rkTHkz6jbO26EkTPaLKDLCl62SwKTLvWJSQmJ2h2/H1d6a5Hydn1ewJIQH9VTHKb5vAmyHP0P0cRCSjHEdAAIAvJtv9HyyuUwzshdJRlmPKqsaDRiUw9Xb8idayvUuwIzfoHHB+dMWgAC0iyIP3SPZ9IDuvz88RXIgzi+em9J7+jgQeuu3XqzCB7F0Xa+cscQvWZuHeTcKC7sRntUsxSwERPp8NpG9kLIl6aPH16wMQULi/A9AaqQGGY/633ftBEq5ypIiijQp8OkLm6"
DOTENV_VAULT_CI_VERSION=163

# stage
DOTENV_VAULT_STAGE="bfqZYD8oVLWMZ0JR5LICV+sB/btaXavszxZLxTfwSH8U5fg="
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"publishConfig": {
"access": "public"
},
"version": "1.0.234",
"version": "1.0.235",
"license": "GPL-3.0-or-later",
"name": "@clevercanyon/utilities.cfw",
"description": "Utilities for JavaScript apps running in a Cloudflare Worker environment.",
Expand Down
12 changes: 7 additions & 5 deletions src/proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ export const fetch = async (rcData: $cfw.StdRequestContextData, parseable: $type
}) as RequiredFetchOptions;

opts.headers = $http.parseHeaders(opts.headers) as $type.cfw.Headers;

if (!opts.headers.has('user-agent'))
for (const [name, value] of Object.entries(await fetchꓺfakeUAHeaders(rcData))) {
opts.headers.set(name, value);
Expand Down Expand Up @@ -132,6 +133,9 @@ const fetchꓺviaSocket = async (rcData: $cfw.StdRequestContextData, url: $type.
sockets = await import('cloudflare:sockets');

try {
// ---
// Socket setup.

const socket = sockets.connect({
hostname: opts.proxy.host,
port: opts.proxy.port,
Expand Down Expand Up @@ -160,7 +164,7 @@ const fetchꓺviaSocket = async (rcData: $cfw.StdRequestContextData, url: $type.

let rawHTTPResponse = ''; // Initialize.

const textDecoder = new TextDecoder(),
const textDecoder = new TextDecoder(), // Initialize.
reader = socket.readable.getReader() as $type.cfw.ReadableStreamDefaultReader<Uint8Array>;

while (reader) {
Expand All @@ -183,9 +187,7 @@ const fetchꓺviaSocket = async (rcData: $cfw.StdRequestContextData, url: $type.
rawHTTPResponseHeaders = rawHTTPResponseCRLFIndex === -1 ? rawHTTPResponse : rawHTTPResponse.slice(0, rawHTTPResponseCRLFIndex).trim(),
rawHTTPResponseBody = rawHTTPResponseCRLFIndex === -1 ? '' : rawHTTPResponse.slice(rawHTTPResponseCRLFIndex + 4).trim();

void auditLogger.debug('fetchꓺviaSocket:', { rawHTTPResponseHeaders, rawHTTPResponseBody });

const responseStatus = Number(rawHTTPResponseHeaders.match(/^HTTP\/1\.0\s+([0-9]+)/iu)?.[1] || 0),
const responseStatus = Number(rawHTTPResponseHeaders.match(/^HTTP\/[0-9.]+\s+([0-9]+)/iu)?.[1] || 0),
responseHeaders = $http.parseHeaders(rawHTTPResponseHeaders) as $type.cfw.Headers,
responseBody = rawHTTPResponseBody;

Expand All @@ -199,7 +201,7 @@ const fetchꓺviaSocket = async (rcData: $cfw.StdRequestContextData, url: $type.
headers: responseHeaders,
});
} catch (thrown) {
void auditLogger.warn('500: Fetch failure.', { thrown });
void auditLogger.warn('Proxied fetch failure.', { thrown });
return new Response(null, {
status: 500,
statusText: $http.responseStatusText(500),
Expand Down

0 comments on commit 45b49b7

Please sign in to comment.