starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-23 00:58:32 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Gregory Schier
2025-05-08 08:02:32 -07:00
parent 8b1ca4cb47 d3b8a42180
commit 77cdea2f9f
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -3,7 +3,7 @@
Yaak is a desktop API client for interacting with REST, GraphQL, Server Sent Events (SSE), WebSocket, and gRPC Yaak is a desktop API client for interacting with REST, GraphQL, Server Sent Events (SSE), WebSocket, and gRPC
APIs. It's built using [Tauri](https://tauri.app), Rust, and ReactJS. APIs. It's built using [Tauri](https://tauri.app), Rust, and ReactJS.
![screenshot](https://github.com/user-attachments/assets/f18e963f-0b68-4ecb-b8b8-cb71aa9aec02) ![366149288-f18e963f-0b68-4ecb-b8b8-cb71aa9aec02](https://github.com/user-attachments/assets/ca83b7ad-5708-411b-8faf-e36b365841a4)
## Feature Overview ## Feature Overview

12
scripts/vendor-node.cjs
View File

@@ -9,12 +9,14 @@ const NODE_VERSION = 'v22.9.0';
// `${process.platform}_${process.arch}` // `${process.platform}_${process.arch}`
const MAC_ARM = 'darwin_arm64'; const MAC_ARM = 'darwin_arm64';
const MAC_X64 = 'darwin_x64'; const MAC_X64 = 'darwin_x64';
const LNX_ARM = 'linux_arm64';
const LNX_X64 = 'linux_x64'; const LNX_X64 = 'linux_x64';
const WIN_X64 = 'win32_x64'; const WIN_X64 = 'win32_x64';
const URL_MAP = { const URL_MAP = {
[MAC_ARM]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-darwin-arm64.tar.gz`, [MAC_ARM]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-darwin-arm64.tar.gz`,
[MAC_X64]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-darwin-x64.tar.gz`, [MAC_X64]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-darwin-x64.tar.gz`,
[LNX_ARM]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-linux-arm64.tar.gz`,
[LNX_X64]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.gz`, [LNX_X64]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.gz`,
[WIN_X64]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-win-x64.zip`, [WIN_X64]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-win-x64.zip`,
}; };
@@ -22,15 +24,17 @@ const URL_MAP = {
const SRC_BIN_MAP = { const SRC_BIN_MAP = {
[MAC_ARM]: `node-${NODE_VERSION}-darwin-arm64/bin/node`, [MAC_ARM]: `node-${NODE_VERSION}-darwin-arm64/bin/node`,
[MAC_X64]: `node-${NODE_VERSION}-darwin-x64/bin/node`, [MAC_X64]: `node-${NODE_VERSION}-darwin-x64/bin/node`,
[LNX_ARM]: `node-${NODE_VERSION}-linux-arm64/bin/node`,
[LNX_X64]: `node-${NODE_VERSION}-linux-x64/bin/node`, [LNX_X64]: `node-${NODE_VERSION}-linux-x64/bin/node`,
[WIN_X64]: `node-${NODE_VERSION}-win-x64/node.exe`, [WIN_X64]: `node-${NODE_VERSION}-win-x64/node.exe`,
}; };
const DST_BIN_MAP = { const DST_BIN_MAP = {
darwin_arm64: 'yaaknode-aarch64-apple-darwin', [MAC_ARM]: 'yaaknode-aarch64-apple-darwin',
darwin_x64: 'yaaknode-x86_64-apple-darwin', [MAC_X64]: 'yaaknode-x86_64-apple-darwin',
linux_x64: 'yaaknode-x86_64-unknown-linux-gnu', [LNX_ARM]: 'yaaknode-aarch64-unknown-linux-gnu',
win32_x64: 'yaaknode-x86_64-pc-windows-msvc.exe', [LNX_X64]: 'yaaknode-x86_64-unknown-linux-gnu',
[WIN_X64]: 'yaaknode-x86_64-pc-windows-msvc.exe',
}; };
const key = `${process.platform}_${process.env.YAAK_TARGET_ARCH ?? process.arch}`; const key = `${process.platform}_${process.env.YAAK_TARGET_ARCH ?? process.arch}`;

4
scripts/vendor-protoc.cjs
View File

@@ -9,12 +9,14 @@ const VERSION = '28.3';
// `${process.platform}_${process.arch}` // `${process.platform}_${process.arch}`
const MAC_ARM = 'darwin_arm64'; const MAC_ARM = 'darwin_arm64';
const MAC_X64 = 'darwin_x64'; const MAC_X64 = 'darwin_x64';
const LNX_ARM = 'linux_arm64';
const LNX_X64 = 'linux_x64'; const LNX_X64 = 'linux_x64';
const WIN_X64 = 'win32_x64'; const WIN_X64 = 'win32_x64';
const URL_MAP = { const URL_MAP = {
[MAC_ARM]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-osx-aarch_64.zip`, [MAC_ARM]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-osx-aarch_64.zip`,
[MAC_X64]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-osx-x86_64.zip`, [MAC_X64]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-osx-x86_64.zip`,
[LNX_ARM]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-linux-aarch_64.zip`,
[LNX_X64]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-linux-x86_64.zip`, [LNX_X64]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-linux-x86_64.zip`,
[WIN_X64]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-win64.zip`, [WIN_X64]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-win64.zip`,
}; };
@@ -22,6 +24,7 @@ const URL_MAP = {
const SRC_BIN_MAP = { const SRC_BIN_MAP = {
[MAC_ARM]: 'bin/protoc', [MAC_ARM]: 'bin/protoc',
[MAC_X64]: 'bin/protoc', [MAC_X64]: 'bin/protoc',
[LNX_ARM]: 'bin/protoc',
[LNX_X64]: 'bin/protoc', [LNX_X64]: 'bin/protoc',
[WIN_X64]: 'bin/protoc.exe', [WIN_X64]: 'bin/protoc.exe',
}; };
@@ -29,6 +32,7 @@ const SRC_BIN_MAP = {
const DST_BIN_MAP = { const DST_BIN_MAP = {
[MAC_ARM]: 'yaakprotoc-aarch64-apple-darwin', [MAC_ARM]: 'yaakprotoc-aarch64-apple-darwin',
[MAC_X64]: 'yaakprotoc-x86_64-apple-darwin', [MAC_X64]: 'yaakprotoc-x86_64-apple-darwin',
[LNX_ARM]: 'yaakprotoc-aarch64-unknown-linux-gnu',
[LNX_X64]: 'yaakprotoc-x86_64-unknown-linux-gnu', [LNX_X64]: 'yaakprotoc-x86_64-unknown-linux-gnu',
[WIN_X64]: 'yaakprotoc-x86_64-pc-windows-msvc.exe', [WIN_X64]: 'yaakprotoc-x86_64-pc-windows-msvc.exe',
}; };

7
src-web/lib/sendEphemeralRequest.ts
View File

@@ -1,4 +1,5 @@
import type { HttpRequest, HttpResponse } from '@yaakapp-internal/models'; import type { HttpRequest, HttpResponse } from '@yaakapp-internal/models';
import { getActiveCookieJar } from '../hooks/useActiveCookieJar';
import { invokeCmd } from './tauri'; import { invokeCmd } from './tauri';
export async function sendEphemeralRequest( export async function sendEphemeralRequest(
@@ -7,5 +8,9 @@ export async function sendEphemeralRequest(
): Promise<HttpResponse> { ): Promise<HttpResponse> {
// Remove some things that we don't want to associate // Remove some things that we don't want to associate
const newRequest = { ...request }; const newRequest = { ...request };
return invokeCmd('cmd_send_ephemeral_request', { request: newRequest, environmentId }); return invokeCmd('cmd_send_ephemeral_request', {
request: newRequest,
environmentId,
cookieJarId: getActiveCookieJar()?.id,
});
} }