fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler#3356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
la14-1 wants to merge 2 commits into
base:main
Choose a base branch
from
Open

fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler #3356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0035a34
fix(list): use actionStr.slice instead of action.slice to avoid TypeE…
louisgv Apr 24, 2026
ac3976a
fix(tests): resolve mock test failures in PR #3356
louisgv May 14, 2026
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
32 changes: 16 additions & 16 deletions packages/cli/src/__tests__/digitalocean-token.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,34 +88,34 @@ describe("doApi 401 OAuth recovery", () => {

it("attempts OAuth recovery on 401 before throwing", async () => {
state.token = "expired-token";
let callCount = 0;
let apiCalls = 0;
let oauthChecks = 0;
globalThis.fetch = mock((url: string | URL | Request) => {
callCount++;
const urlStr = String(url);
// First call: the actual API call returning 401
if (callCount === 1) {
// OAuth connectivity check — fail it so tryDoOAuth returns null quickly
// (avoids starting a real Bun.serve OAuth server)
if (urlStr.includes("cloud.digitalocean.com")) {
oauthChecks++;
return Promise.reject(new Error("network unavailable"));
}
// DigitalOcean API calls — return 401
if (urlStr.includes("api.digitalocean.com")) {
apiCalls++;
return Promise.resolve(
new Response("Unauthorized", {
status: 401,
}),
);
}
// Second call: OAuth connectivity check — fail it so tryDoOAuth returns null quickly
// (avoids starting a real Bun.serve OAuth server)
if (urlStr.includes("cloud.digitalocean.com")) {
return Promise.reject(new Error("network unavailable"));
}
return Promise.resolve(
new Response("Unauthorized", {
status: 401,
}),
);
// Ignore unrelated calls (e.g. telemetry flush)
return Promise.resolve(new Response("ok"));
});

// OAuth recovery fails (connectivity check fails), so doApi throws the 401
await expect(doApi("GET", "/account", undefined, 1)).rejects.toThrow("DigitalOcean API error 401");
// Verify recovery was attempted (API call + OAuth connectivity check + retries)
expect(callCount).toBeGreaterThanOrEqual(2);
// Verify recovery was attempted: 1 API call + 1 connectivity check
expect(apiCalls).toBe(1);
expect(oauthChecks).toBe(1);
});

it("succeeds after OAuth recovery provides a new token", async () => {
Expand Down
169 changes: 95 additions & 74 deletions packages/cli/src/__tests__/hetzner-cov.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -585,47 +585,46 @@ describe("hetzner/createServer", () => {
},
},
};
let callCount = 0;
global.fetch = mock(() => {
callCount++;
if (callCount <= 1) {
// Token validation
return Promise.resolve(
new Response(
JSON.stringify({
servers: [],
}),
),
);
let hetznerCalls = 0;
let postServerAttempts = 0;
global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
const urlStr = String(url);
// Ignore non-Hetzner calls (e.g. telemetry flush)
if (!urlStr.includes("api.hetzner.cloud")) {
return Promise.resolve(new Response("ok"));
}
if (callCount <= 2) {
// SSH keys
return Promise.resolve(
new Response(
JSON.stringify({
ssh_keys: [],
}),
),
);
hetznerCalls++;
const method = opts?.method ?? "GET";
// POST /servers — first attempt fails, retry succeeds
if (method === "POST" && urlStr.includes("/servers")) {
postServerAttempts++;
if (postServerAttempts === 1) {
return Promise.resolve(
new Response(
JSON.stringify({
error: {
code: "resource_limit_exceeded",
message: "primary_ip_limit",
},
}),
{
status: 403,
},
),
);
}
return Promise.resolve(new Response(JSON.stringify(serverResp)));
}
if (callCount <= 3) {
// First create attempt — resource_limit_exceeded (HTTP 403)
// DELETE /primary_ips — cleanup orphaned IP
if (method === "DELETE" && urlStr.includes("/primary_ips/")) {
return Promise.resolve(
new Response(
JSON.stringify({
error: {
code: "resource_limit_exceeded",
message: "primary_ip_limit",
},
}),
{
status: 403,
},
),
new Response("", {
status: 204,
}),
);
}
if (callCount <= 4) {
// List primary IPs for cleanup
// GET /primary_ips — list IPs for cleanup
if (urlStr.includes("/primary_ips")) {
return Promise.resolve(
new Response(
JSON.stringify({
Expand All@@ -645,40 +644,81 @@ describe("hetzner/createServer", () => {
),
);
}
if (callCount <= 5) {
// Delete orphaned IP 100
// GET /ssh_keys
if (urlStr.includes("/ssh_keys")) {
return Promise.resolve(
new Response("", {
status: 204,
}),
new Response(
JSON.stringify({
ssh_keys: [],
}),
),
);
}
// Retry create — success
return Promise.resolve(new Response(JSON.stringify(serverResp)));
// GET /servers (token validation)
if (urlStr.includes("/servers")) {
return Promise.resolve(
new Response(
JSON.stringify({
servers: [],
}),
),
);
}
return Promise.resolve(new Response(JSON.stringify({})));
});
const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
await ensureHcloudToken();
const conn = await createServer("test-retry", "cx23", "fsn1");
expect(conn.ip).toBe("10.0.0.5");
// Should have called: token(1), ssh_keys(2), create-fail(3), list-ips(4), delete-ip(5), create-ok(6)
expect(callCount).toBeGreaterThanOrEqual(6);
// Should have called: token, ssh_keys, create-fail, list-ips, delete-ip, create-ok
expect(hetznerCalls).toBeGreaterThanOrEqual(6);
});

it("throws with guidance when resource limit hit and no orphaned IPs to clean", async () => {
process.env.HCLOUD_TOKEN = "test-token";
let callCount = 0;
global.fetch = mock(() => {
callCount++;
if (callCount <= 1) {
let postServerAttempts = 0;
global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
const urlStr = String(url);
// Ignore non-Hetzner calls (e.g. telemetry flush)
if (!urlStr.includes("api.hetzner.cloud")) {
return Promise.resolve(new Response("ok"));
}
const method = opts?.method ?? "GET";
// POST /servers — always fail with resource_limit_exceeded
if (method === "POST" && urlStr.includes("/servers")) {
postServerAttempts++;
return Promise.resolve(
new Response(
JSON.stringify({
servers: [],
error: {
code: "resource_limit_exceeded",
message: "primary_ip_limit",
},
}),
{
status: 403,
},
),
);
}
if (callCount <= 2) {
// GET /primary_ips — all attached (none orphaned)
if (urlStr.includes("/primary_ips")) {
return Promise.resolve(
new Response(
JSON.stringify({
primary_ips: [
{
id: 100,
ip: "1.2.3.4",
assignee_id: 42,
},
],
}),
),
);
}
// GET /ssh_keys
if (urlStr.includes("/ssh_keys")) {
return Promise.resolve(
new Response(
JSON.stringify({
Expand All@@ -687,36 +727,17 @@ describe("hetzner/createServer", () => {
),
);
}
if (callCount <= 3) {
// Create fails with resource_limit_exceeded
// GET /servers (token validation)
if (urlStr.includes("/servers")) {
return Promise.resolve(
new Response(
JSON.stringify({
error: {
code: "resource_limit_exceeded",
message: "primary_ip_limit",
},
servers: [],
}),
{
status: 403,
},
),
);
}
// List primary IPs — all attached (none orphaned)
return Promise.resolve(
new Response(
JSON.stringify({
primary_ips: [
{
id: 100,
ip: "1.2.3.4",
assignee_id: 42,
},
],
}),
),
);
return Promise.resolve(new Response(JSON.stringify({})));
});
const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
await ensureHcloudToken();
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/list.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -448,7 +448,7 @@ async function handleGoneServer(record: SpawnRecord, cloud: string): Promise<"de
// Remap to selected instance
const actionStr = String(action);
if (actionStr.startsWith("remap-")) {
const idx = Number.parseInt(action.slice(6), 10);
const idx = Number.parseInt(actionStr.slice(6), 10);
const inst = instances[idx];
if (inst) {
updateRecordConnection(record, {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler#3356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

la14-1
wants to merge
2
commits into

base:main
Choose a base branch

from

 Open


fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler
#3356
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0035a34

fix(list): use actionStr.slice instead of action.slice to avoid TypeE…


louisgv Apr 24, 2026
ac3976a

fix(tests): resolve mock test failures in PR #3356


louisgv May 14, 2026

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


32 changes: 16 additions & 16 deletions
packages/cli/src/__tests__/digitalocean-token.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,34 +88,34 @@ describe("doApi 401 OAuth recovery", () => {

 it("attempts OAuth recovery on 401 before throwing", async () => {
 state.token = "expired-token";
 let callCount = 0;
 let apiCalls = 0;
 let oauthChecks = 0;
 globalThis.fetch = mock((url: string | URL | Request) => {
 callCount++;
 const urlStr = String(url);
 // First call: the actual API call returning 401
 if (callCount === 1) {
 // OAuth connectivity check — fail it so tryDoOAuth returns null quickly
 // (avoids starting a real Bun.serve OAuth server)
 if (urlStr.includes("cloud.digitalocean.com")) {
 oauthChecks++;
 return Promise.reject(new Error("network unavailable"));
 }
 // DigitalOcean API calls — return 401
 if (urlStr.includes("api.digitalocean.com")) {
 apiCalls++;
 return Promise.resolve(
 new Response("Unauthorized", {
 status: 401,
 }),
 );
 }
 // Second call: OAuth connectivity check — fail it so tryDoOAuth returns null quickly
 // (avoids starting a real Bun.serve OAuth server)
 if (urlStr.includes("cloud.digitalocean.com")) {
 return Promise.reject(new Error("network unavailable"));
 }
 return Promise.resolve(
 new Response("Unauthorized", {
 status: 401,
 }),
 );
 // Ignore unrelated calls (e.g. telemetry flush)
 return Promise.resolve(new Response("ok"));
 });

 // OAuth recovery fails (connectivity check fails), so doApi throws the 401
 await expect(doApi("GET", "/account", undefined, 1)).rejects.toThrow("DigitalOcean API error 401");
 // Verify recovery was attempted (API call + OAuth connectivity check + retries)
 expect(callCount).toBeGreaterThanOrEqual(2);
 // Verify recovery was attempted: 1 API call + 1 connectivity check
 expect(apiCalls).toBe(1);
 expect(oauthChecks).toBe(1);
 });

 it("succeeds after OAuth recovery provides a new token", async () => {
Expand Down

169 changes: 95 additions & 74 deletions
packages/cli/src/__tests__/hetzner-cov.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,47 +585,46 @@ describe("hetzner/createServer", () => {
 },
 },
 };
 let callCount = 0;
 global.fetch = mock(() => {
 callCount++;
 if (callCount <= 1) {
 // Token validation
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 }),
 ),
 );
 let hetznerCalls = 0;
 let postServerAttempts = 0;
 global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
 const urlStr = String(url);
 // Ignore non-Hetzner calls (e.g. telemetry flush)
 if (!urlStr.includes("api.hetzner.cloud")) {
 return Promise.resolve(new Response("ok"));
 }
 if (callCount <= 2) {
 // SSH keys
 return Promise.resolve(
 new Response(
 JSON.stringify({
 ssh_keys: [],
 }),
 ),
 );
 hetznerCalls++;
 const method = opts?.method ?? "GET";
 // POST /servers — first attempt fails, retry succeeds
 if (method === "POST" && urlStr.includes("/servers")) {
 postServerAttempts++;
 if (postServerAttempts === 1) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 );
 }
 return Promise.resolve(new Response(JSON.stringify(serverResp)));
 }
if (callCount <= 3) {
 // First create attempt — resource_limit_exceeded (HTTP 403)
// DELETE /primary_ips — cleanup orphaned IP
if (method === "DELETE" && urlStr.includes("/primary_ips/")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 new Response("", {
 status: 204,
 }),
 );
 }
if (callCount <= 4) {
 // List primary IPs for cleanup
// GET /primary_ips — list IPs for cleanup
if (urlStr.includes("/primary_ips")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
Expand All@@ -645,40 +644,81 @@ describe("hetzner/createServer", () => {
 ),
 );
 }
if (callCount <= 5) {
 // Delete orphaned IP 100
// GET /ssh_keys
if (urlStr.includes("/ssh_keys")) {
 return Promise.resolve(
 new Response("", {
 status: 204,
 }),
 new Response(
 JSON.stringify({
 ssh_keys: [],
 }),
 ),
 );
 }
 // Retry create — success
 return Promise.resolve(new Response(JSON.stringify(serverResp)));
 // GET /servers (token validation)
 if (urlStr.includes("/servers")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 }),
 ),
 );
 }
 return Promise.resolve(new Response(JSON.stringify({})));
 });
 const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
 await ensureHcloudToken();
 const conn = await createServer("test-retry", "cx23", "fsn1");
 expect(conn.ip).toBe("10.0.0.5");
 // Should have called: token(1), ssh_keys(2), create-fail(3), list-ips(4), delete-ip(5), create-ok(6)
 expect(callCount).toBeGreaterThanOrEqual(6);
 // Should have called: token, ssh_keys, create-fail, list-ips, delete-ip, create-ok
 expect(hetznerCalls).toBeGreaterThanOrEqual(6);
 });

 it("throws with guidance when resource limit hit and no orphaned IPs to clean", async () => {
 process.env.HCLOUD_TOKEN = "test-token";
 let callCount = 0;
 global.fetch = mock(() => {
 callCount++;
 if (callCount <= 1) {
 let postServerAttempts = 0;
 global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
 const urlStr = String(url);
 // Ignore non-Hetzner calls (e.g. telemetry flush)
 if (!urlStr.includes("api.hetzner.cloud")) {
 return Promise.resolve(new Response("ok"));
 }
 const method = opts?.method ?? "GET";
 // POST /servers — always fail with resource_limit_exceeded
 if (method === "POST" && urlStr.includes("/servers")) {
 postServerAttempts++;
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 );
 }
 if (callCount <= 2) {
 // GET /primary_ips — all attached (none orphaned)
 if (urlStr.includes("/primary_ips")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 primary_ips: [
 {
 id: 100,
 ip: "1.2.3.4",
 assignee_id: 42,
 },
 ],
 }),
 ),
 );
 }
 // GET /ssh_keys
 if (urlStr.includes("/ssh_keys")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
Expand All@@ -687,36 +727,17 @@ describe("hetzner/createServer", () => {
 ),
 );
 }
if (callCount <= 3) {
 // Create fails with resource_limit_exceeded
// GET /servers (token validation)
if (urlStr.includes("/servers")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 servers: [],
 }),
 {
 status: 403,
 },
 ),
 );
 }
 // List primary IPs — all attached (none orphaned)
 return Promise.resolve(
 new Response(
 JSON.stringify({
 primary_ips: [
 {
 id: 100,
 ip: "1.2.3.4",
 assignee_id: 42,
 },
 ],
 }),
 ),
 );
 return Promise.resolve(new Response(JSON.stringify({})));
 });
 const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
 await ensureHcloudToken();
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli/src/commands/list.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -448,7 +448,7 @@ async function handleGoneServer(record: SpawnRecord, cloud: string): Promise<"de
 // Remap to selected instance
 const actionStr = String(action);
 if (actionStr.startsWith("remap-")) {
 const idx = Number.parseInt(action.slice(6), 10);
 const idx = Number.parseInt(actionStr.slice(6), 10);
 const inst = instances[idx];
 if (inst) {
 updateRecordConnection(record, {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler#3356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

la14-1
wants to merge
2
commits into

base:main
Choose a base branch

from

 Open


fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler
#3356
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0035a34

fix(list): use actionStr.slice instead of action.slice to avoid TypeE…


louisgv Apr 24, 2026
ac3976a

fix(tests): resolve mock test failures in PR #3356


louisgv May 14, 2026

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


32 changes: 16 additions & 16 deletions
packages/cli/src/__tests__/digitalocean-token.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,34 +88,34 @@ describe("doApi 401 OAuth recovery", () => {

 it("attempts OAuth recovery on 401 before throwing", async () => {
 state.token = "expired-token";
 let callCount = 0;
 let apiCalls = 0;
 let oauthChecks = 0;
 globalThis.fetch = mock((url: string | URL | Request) => {
 callCount++;
 const urlStr = String(url);
 // First call: the actual API call returning 401
 if (callCount === 1) {
 // OAuth connectivity check — fail it so tryDoOAuth returns null quickly
 // (avoids starting a real Bun.serve OAuth server)
 if (urlStr.includes("cloud.digitalocean.com")) {
 oauthChecks++;
 return Promise.reject(new Error("network unavailable"));
 }
 // DigitalOcean API calls — return 401
 if (urlStr.includes("api.digitalocean.com")) {
 apiCalls++;
 return Promise.resolve(
 new Response("Unauthorized", {
 status: 401,
 }),
 );
 }
 // Second call: OAuth connectivity check — fail it so tryDoOAuth returns null quickly
 // (avoids starting a real Bun.serve OAuth server)
 if (urlStr.includes("cloud.digitalocean.com")) {
 return Promise.reject(new Error("network unavailable"));
 }
 return Promise.resolve(
 new Response("Unauthorized", {
 status: 401,
 }),
 );
 // Ignore unrelated calls (e.g. telemetry flush)
 return Promise.resolve(new Response("ok"));
 });

 // OAuth recovery fails (connectivity check fails), so doApi throws the 401
 await expect(doApi("GET", "/account", undefined, 1)).rejects.toThrow("DigitalOcean API error 401");
 // Verify recovery was attempted (API call + OAuth connectivity check + retries)
 expect(callCount).toBeGreaterThanOrEqual(2);
 // Verify recovery was attempted: 1 API call + 1 connectivity check
 expect(apiCalls).toBe(1);
 expect(oauthChecks).toBe(1);
 });

 it("succeeds after OAuth recovery provides a new token", async () => {
Expand Down

169 changes: 95 additions & 74 deletions
packages/cli/src/__tests__/hetzner-cov.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,47 +585,46 @@ describe("hetzner/createServer", () => {
 },
 },
 };
 let callCount = 0;
 global.fetch = mock(() => {
 callCount++;
 if (callCount <= 1) {
 // Token validation
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 }),
 ),
 );
 let hetznerCalls = 0;
 let postServerAttempts = 0;
 global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
 const urlStr = String(url);
 // Ignore non-Hetzner calls (e.g. telemetry flush)
 if (!urlStr.includes("api.hetzner.cloud")) {
 return Promise.resolve(new Response("ok"));
 }
 if (callCount <= 2) {
 // SSH keys
 return Promise.resolve(
 new Response(
 JSON.stringify({
 ssh_keys: [],
 }),
 ),
 );
 hetznerCalls++;
 const method = opts?.method ?? "GET";
 // POST /servers — first attempt fails, retry succeeds
 if (method === "POST" && urlStr.includes("/servers")) {
 postServerAttempts++;
 if (postServerAttempts === 1) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 );
 }
 return Promise.resolve(new Response(JSON.stringify(serverResp)));
 }
if (callCount <= 3) {
 // First create attempt — resource_limit_exceeded (HTTP 403)
// DELETE /primary_ips — cleanup orphaned IP
if (method === "DELETE" && urlStr.includes("/primary_ips/")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 new Response("", {
 status: 204,
 }),
 );
 }
if (callCount <= 4) {
 // List primary IPs for cleanup
// GET /primary_ips — list IPs for cleanup
if (urlStr.includes("/primary_ips")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
Expand All@@ -645,40 +644,81 @@ describe("hetzner/createServer", () => {
 ),
 );
 }
if (callCount <= 5) {
 // Delete orphaned IP 100
// GET /ssh_keys
if (urlStr.includes("/ssh_keys")) {
 return Promise.resolve(
 new Response("", {
 status: 204,
 }),
 new Response(
 JSON.stringify({
 ssh_keys: [],
 }),
 ),
 );
 }
 // Retry create — success
 return Promise.resolve(new Response(JSON.stringify(serverResp)));
 // GET /servers (token validation)
 if (urlStr.includes("/servers")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 }),
 ),
 );
 }
 return Promise.resolve(new Response(JSON.stringify({})));
 });
 const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
 await ensureHcloudToken();
 const conn = await createServer("test-retry", "cx23", "fsn1");
 expect(conn.ip).toBe("10.0.0.5");
 // Should have called: token(1), ssh_keys(2), create-fail(3), list-ips(4), delete-ip(5), create-ok(6)
 expect(callCount).toBeGreaterThanOrEqual(6);
 // Should have called: token, ssh_keys, create-fail, list-ips, delete-ip, create-ok
 expect(hetznerCalls).toBeGreaterThanOrEqual(6);
 });

 it("throws with guidance when resource limit hit and no orphaned IPs to clean", async () => {
 process.env.HCLOUD_TOKEN = "test-token";
 let callCount = 0;
 global.fetch = mock(() => {
 callCount++;
 if (callCount <= 1) {
 let postServerAttempts = 0;
 global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
 const urlStr = String(url);
 // Ignore non-Hetzner calls (e.g. telemetry flush)
 if (!urlStr.includes("api.hetzner.cloud")) {
 return Promise.resolve(new Response("ok"));
 }
 const method = opts?.method ?? "GET";
 // POST /servers — always fail with resource_limit_exceeded
 if (method === "POST" && urlStr.includes("/servers")) {
 postServerAttempts++;
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 );
 }
 if (callCount <= 2) {
 // GET /primary_ips — all attached (none orphaned)
 if (urlStr.includes("/primary_ips")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 primary_ips: [
 {
 id: 100,
 ip: "1.2.3.4",
 assignee_id: 42,
 },
 ],
 }),
 ),
 );
 }
 // GET /ssh_keys
 if (urlStr.includes("/ssh_keys")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
Expand All@@ -687,36 +727,17 @@ describe("hetzner/createServer", () => {
 ),
 );
 }
if (callCount <= 3) {
 // Create fails with resource_limit_exceeded
// GET /servers (token validation)
if (urlStr.includes("/servers")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 servers: [],
 }),
 {
 status: 403,
 },
 ),
 );
 }
 // List primary IPs — all attached (none orphaned)
 return Promise.resolve(
 new Response(
 JSON.stringify({
 primary_ips: [
 {
 id: 100,
 ip: "1.2.3.4",
 assignee_id: 42,
 },
 ],
 }),
 ),
 );
 return Promise.resolve(new Response(JSON.stringify({})));
 });
 const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
 await ensureHcloudToken();
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli/src/commands/list.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -448,7 +448,7 @@ async function handleGoneServer(record: SpawnRecord, cloud: string): Promise<"de
 // Remap to selected instance
 const actionStr = String(action);
 if (actionStr.startsWith("remap-")) {
 const idx = Number.parseInt(action.slice(6), 10);
 const idx = Number.parseInt(actionStr.slice(6), 10);
 const inst = instances[idx];
 if (inst) {
 updateRecordConnection(record, {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler#3356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

la14-1
wants to merge
2
commits into

base:main
Choose a base branch

from

 Open


fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler
#3356
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0035a34

fix(list): use actionStr.slice instead of action.slice to avoid TypeE…


louisgv Apr 24, 2026
ac3976a

fix(tests): resolve mock test failures in PR #3356


louisgv May 14, 2026

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


32 changes: 16 additions & 16 deletions
packages/cli/src/__tests__/digitalocean-token.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,34 +88,34 @@ describe("doApi 401 OAuth recovery", () => {

 it("attempts OAuth recovery on 401 before throwing", async () => {
 state.token = "expired-token";
 let callCount = 0;
 let apiCalls = 0;
 let oauthChecks = 0;
 globalThis.fetch = mock((url: string | URL | Request) => {
 callCount++;
 const urlStr = String(url);
 // First call: the actual API call returning 401
 if (callCount === 1) {
 // OAuth connectivity check — fail it so tryDoOAuth returns null quickly
 // (avoids starting a real Bun.serve OAuth server)
 if (urlStr.includes("cloud.digitalocean.com")) {
 oauthChecks++;
 return Promise.reject(new Error("network unavailable"));
 }
 // DigitalOcean API calls — return 401
 if (urlStr.includes("api.digitalocean.com")) {
 apiCalls++;
 return Promise.resolve(
 new Response("Unauthorized", {
 status: 401,
 }),
 );
 }
 // Second call: OAuth connectivity check — fail it so tryDoOAuth returns null quickly
 // (avoids starting a real Bun.serve OAuth server)
 if (urlStr.includes("cloud.digitalocean.com")) {
 return Promise.reject(new Error("network unavailable"));
 }
 return Promise.resolve(
 new Response("Unauthorized", {
 status: 401,
 }),
 );
 // Ignore unrelated calls (e.g. telemetry flush)
 return Promise.resolve(new Response("ok"));
 });

 // OAuth recovery fails (connectivity check fails), so doApi throws the 401
 await expect(doApi("GET", "/account", undefined, 1)).rejects.toThrow("DigitalOcean API error 401");
 // Verify recovery was attempted (API call + OAuth connectivity check + retries)
 expect(callCount).toBeGreaterThanOrEqual(2);
 // Verify recovery was attempted: 1 API call + 1 connectivity check
 expect(apiCalls).toBe(1);
 expect(oauthChecks).toBe(1);
 });

 it("succeeds after OAuth recovery provides a new token", async () => {
Expand Down

169 changes: 95 additions & 74 deletions
packages/cli/src/__tests__/hetzner-cov.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,47 +585,46 @@ describe("hetzner/createServer", () => {
 },
 },
 };
 let callCount = 0;
 global.fetch = mock(() => {
 callCount++;
 if (callCount <= 1) {
 // Token validation
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 }),
 ),
 );
 let hetznerCalls = 0;
 let postServerAttempts = 0;
 global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
 const urlStr = String(url);
 // Ignore non-Hetzner calls (e.g. telemetry flush)
 if (!urlStr.includes("api.hetzner.cloud")) {
 return Promise.resolve(new Response("ok"));
 }
 if (callCount <= 2) {
 // SSH keys
 return Promise.resolve(
 new Response(
 JSON.stringify({
 ssh_keys: [],
 }),
 ),
 );
 hetznerCalls++;
 const method = opts?.method ?? "GET";
 // POST /servers — first attempt fails, retry succeeds
 if (method === "POST" && urlStr.includes("/servers")) {
 postServerAttempts++;
 if (postServerAttempts === 1) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 );
 }
 return Promise.resolve(new Response(JSON.stringify(serverResp)));
 }
if (callCount <= 3) {
 // First create attempt — resource_limit_exceeded (HTTP 403)
// DELETE /primary_ips — cleanup orphaned IP
if (method === "DELETE" && urlStr.includes("/primary_ips/")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 new Response("", {
 status: 204,
 }),
 );
 }
if (callCount <= 4) {
 // List primary IPs for cleanup
// GET /primary_ips — list IPs for cleanup
if (urlStr.includes("/primary_ips")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
Expand All@@ -645,40 +644,81 @@ describe("hetzner/createServer", () => {
 ),
 );
 }
if (callCount <= 5) {
 // Delete orphaned IP 100
// GET /ssh_keys
if (urlStr.includes("/ssh_keys")) {
 return Promise.resolve(
 new Response("", {
 status: 204,
 }),
 new Response(
 JSON.stringify({
 ssh_keys: [],
 }),
 ),
 );
 }
 // Retry create — success
 return Promise.resolve(new Response(JSON.stringify(serverResp)));
 // GET /servers (token validation)
 if (urlStr.includes("/servers")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 }),
 ),
 );
 }
 return Promise.resolve(new Response(JSON.stringify({})));
 });
 const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
 await ensureHcloudToken();
 const conn = await createServer("test-retry", "cx23", "fsn1");
 expect(conn.ip).toBe("10.0.0.5");
 // Should have called: token(1), ssh_keys(2), create-fail(3), list-ips(4), delete-ip(5), create-ok(6)
 expect(callCount).toBeGreaterThanOrEqual(6);
 // Should have called: token, ssh_keys, create-fail, list-ips, delete-ip, create-ok
 expect(hetznerCalls).toBeGreaterThanOrEqual(6);
 });

 it("throws with guidance when resource limit hit and no orphaned IPs to clean", async () => {
 process.env.HCLOUD_TOKEN = "test-token";
 let callCount = 0;
 global.fetch = mock(() => {
 callCount++;
 if (callCount <= 1) {
 let postServerAttempts = 0;
 global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
 const urlStr = String(url);
 // Ignore non-Hetzner calls (e.g. telemetry flush)
 if (!urlStr.includes("api.hetzner.cloud")) {
 return Promise.resolve(new Response("ok"));
 }
 const method = opts?.method ?? "GET";
 // POST /servers — always fail with resource_limit_exceeded
 if (method === "POST" && urlStr.includes("/servers")) {
 postServerAttempts++;
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 );
 }
 if (callCount <= 2) {
 // GET /primary_ips — all attached (none orphaned)
 if (urlStr.includes("/primary_ips")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 primary_ips: [
 {
 id: 100,
 ip: "1.2.3.4",
 assignee_id: 42,
 },
 ],
 }),
 ),
 );
 }
 // GET /ssh_keys
 if (urlStr.includes("/ssh_keys")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
Expand All@@ -687,36 +727,17 @@ describe("hetzner/createServer", () => {
 ),
 );
 }
if (callCount <= 3) {
 // Create fails with resource_limit_exceeded
// GET /servers (token validation)
if (urlStr.includes("/servers")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 servers: [],
 }),
 {
 status: 403,
 },
 ),
 );
 }
 // List primary IPs — all attached (none orphaned)
 return Promise.resolve(
 new Response(
 JSON.stringify({
 primary_ips: [
 {
 id: 100,
 ip: "1.2.3.4",
 assignee_id: 42,
 },
 ],
 }),
 ),
 );
 return Promise.resolve(new Response(JSON.stringify({})));
 });
 const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
 await ensureHcloudToken();
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli/src/commands/list.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -448,7 +448,7 @@ async function handleGoneServer(record: SpawnRecord, cloud: string): Promise<"de
 // Remap to selected instance
 const actionStr = String(action);
 if (actionStr.startsWith("remap-")) {
 const idx = Number.parseInt(action.slice(6), 10);
 const idx = Number.parseInt(actionStr.slice(6), 10);
 const inst = instances[idx];
 if (inst) {
 updateRecordConnection(record, {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler#3356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

la14-1
wants to merge
2
commits into

base:main
Choose a base branch

from

 Open


fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler
#3356
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0035a34

fix(list): use actionStr.slice instead of action.slice to avoid TypeE…


louisgv Apr 24, 2026
ac3976a

fix(tests): resolve mock test failures in PR #3356


louisgv May 14, 2026

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


32 changes: 16 additions & 16 deletions
packages/cli/src/__tests__/digitalocean-token.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,34 +88,34 @@ describe("doApi 401 OAuth recovery", () => {

 it("attempts OAuth recovery on 401 before throwing", async () => {
 state.token = "expired-token";
 let callCount = 0;
 let apiCalls = 0;
 let oauthChecks = 0;
 globalThis.fetch = mock((url: string | URL | Request) => {
 callCount++;
 const urlStr = String(url);
 // First call: the actual API call returning 401
 if (callCount === 1) {
 // OAuth connectivity check — fail it so tryDoOAuth returns null quickly
 // (avoids starting a real Bun.serve OAuth server)
 if (urlStr.includes("cloud.digitalocean.com")) {
 oauthChecks++;
 return Promise.reject(new Error("network unavailable"));
 }
 // DigitalOcean API calls — return 401
 if (urlStr.includes("api.digitalocean.com")) {
 apiCalls++;
 return Promise.resolve(
 new Response("Unauthorized", {
 status: 401,
 }),
 );
 }
 // Second call: OAuth connectivity check — fail it so tryDoOAuth returns null quickly
 // (avoids starting a real Bun.serve OAuth server)
 if (urlStr.includes("cloud.digitalocean.com")) {
 return Promise.reject(new Error("network unavailable"));
 }
 return Promise.resolve(
 new Response("Unauthorized", {
 status: 401,
 }),
 );
 // Ignore unrelated calls (e.g. telemetry flush)
 return Promise.resolve(new Response("ok"));
 });

 // OAuth recovery fails (connectivity check fails), so doApi throws the 401
 await expect(doApi("GET", "/account", undefined, 1)).rejects.toThrow("DigitalOcean API error 401");
 // Verify recovery was attempted (API call + OAuth connectivity check + retries)
 expect(callCount).toBeGreaterThanOrEqual(2);
 // Verify recovery was attempted: 1 API call + 1 connectivity check
 expect(apiCalls).toBe(1);
 expect(oauthChecks).toBe(1);
 });

 it("succeeds after OAuth recovery provides a new token", async () => {
Expand Down

169 changes: 95 additions & 74 deletions
packages/cli/src/__tests__/hetzner-cov.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,47 +585,46 @@ describe("hetzner/createServer", () => {
 },
 },
 };
 let callCount = 0;
 global.fetch = mock(() => {
 callCount++;
 if (callCount <= 1) {
 // Token validation
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 }),
 ),
 );
 let hetznerCalls = 0;
 let postServerAttempts = 0;
 global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
 const urlStr = String(url);
 // Ignore non-Hetzner calls (e.g. telemetry flush)
 if (!urlStr.includes("api.hetzner.cloud")) {
 return Promise.resolve(new Response("ok"));
 }
 if (callCount <= 2) {
 // SSH keys
 return Promise.resolve(
 new Response(
 JSON.stringify({
 ssh_keys: [],
 }),
 ),
 );
 hetznerCalls++;
 const method = opts?.method ?? "GET";
 // POST /servers — first attempt fails, retry succeeds
 if (method === "POST" && urlStr.includes("/servers")) {
 postServerAttempts++;
 if (postServerAttempts === 1) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 );
 }
 return Promise.resolve(new Response(JSON.stringify(serverResp)));
 }
if (callCount <= 3) {
 // First create attempt — resource_limit_exceeded (HTTP 403)
// DELETE /primary_ips — cleanup orphaned IP
if (method === "DELETE" && urlStr.includes("/primary_ips/")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 new Response("", {
 status: 204,
 }),
 );
 }
if (callCount <= 4) {
 // List primary IPs for cleanup
// GET /primary_ips — list IPs for cleanup
if (urlStr.includes("/primary_ips")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
Expand All@@ -645,40 +644,81 @@ describe("hetzner/createServer", () => {
 ),
 );
 }
if (callCount <= 5) {
 // Delete orphaned IP 100
// GET /ssh_keys
if (urlStr.includes("/ssh_keys")) {
 return Promise.resolve(
 new Response("", {
 status: 204,
 }),
 new Response(
 JSON.stringify({
 ssh_keys: [],
 }),
 ),
 );
 }
 // Retry create — success
 return Promise.resolve(new Response(JSON.stringify(serverResp)));
 // GET /servers (token validation)
 if (urlStr.includes("/servers")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 }),
 ),
 );
 }
 return Promise.resolve(new Response(JSON.stringify({})));
 });
 const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
 await ensureHcloudToken();
 const conn = await createServer("test-retry", "cx23", "fsn1");
 expect(conn.ip).toBe("10.0.0.5");
 // Should have called: token(1), ssh_keys(2), create-fail(3), list-ips(4), delete-ip(5), create-ok(6)
 expect(callCount).toBeGreaterThanOrEqual(6);
 // Should have called: token, ssh_keys, create-fail, list-ips, delete-ip, create-ok
 expect(hetznerCalls).toBeGreaterThanOrEqual(6);
 });

 it("throws with guidance when resource limit hit and no orphaned IPs to clean", async () => {
 process.env.HCLOUD_TOKEN = "test-token";
 let callCount = 0;
 global.fetch = mock(() => {
 callCount++;
 if (callCount <= 1) {
 let postServerAttempts = 0;
 global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
 const urlStr = String(url);
 // Ignore non-Hetzner calls (e.g. telemetry flush)
 if (!urlStr.includes("api.hetzner.cloud")) {
 return Promise.resolve(new Response("ok"));
 }
 const method = opts?.method ?? "GET";
 // POST /servers — always fail with resource_limit_exceeded
 if (method === "POST" && urlStr.includes("/servers")) {
 postServerAttempts++;
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 );
 }
 if (callCount <= 2) {
 // GET /primary_ips — all attached (none orphaned)
 if (urlStr.includes("/primary_ips")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 primary_ips: [
 {
 id: 100,
 ip: "1.2.3.4",
 assignee_id: 42,
 },
 ],
 }),
 ),
 );
 }
 // GET /ssh_keys
 if (urlStr.includes("/ssh_keys")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
Expand All@@ -687,36 +727,17 @@ describe("hetzner/createServer", () => {
 ),
 );
 }
if (callCount <= 3) {
 // Create fails with resource_limit_exceeded
// GET /servers (token validation)
if (urlStr.includes("/servers")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 servers: [],
 }),
 {
 status: 403,
 },
 ),
 );
 }
 // List primary IPs — all attached (none orphaned)
 return Promise.resolve(
 new Response(
 JSON.stringify({
 primary_ips: [
 {
 id: 100,
 ip: "1.2.3.4",
 assignee_id: 42,
 },
 ],
 }),
 ),
 );
 return Promise.resolve(new Response(JSON.stringify({})));
 });
 const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
 await ensureHcloudToken();
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli/src/commands/list.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -448,7 +448,7 @@ async function handleGoneServer(record: SpawnRecord, cloud: string): Promise<"de
 // Remap to selected instance
 const actionStr = String(action);
 if (actionStr.startsWith("remap-")) {
 const idx = Number.parseInt(action.slice(6), 10);
 const idx = Number.parseInt(actionStr.slice(6), 10);
 const inst = instances[idx];
 if (inst) {
 updateRecordConnection(record, {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler#3356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

la14-1
wants to merge
2
commits into

base:main
Choose a base branch

from

 Open


fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler
#3356
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0035a34

fix(list): use actionStr.slice instead of action.slice to avoid TypeE…


louisgv Apr 24, 2026
ac3976a

fix(tests): resolve mock test failures in PR #3356


louisgv May 14, 2026

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


32 changes: 16 additions & 16 deletions
packages/cli/src/__tests__/digitalocean-token.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,34 +88,34 @@ describe("doApi 401 OAuth recovery", () => {

 it("attempts OAuth recovery on 401 before throwing", async () => {
 state.token = "expired-token";
 let callCount = 0;
 let apiCalls = 0;
 let oauthChecks = 0;
 globalThis.fetch = mock((url: string | URL | Request) => {
 callCount++;
 const urlStr = String(url);
 // First call: the actual API call returning 401
 if (callCount === 1) {
 // OAuth connectivity check — fail it so tryDoOAuth returns null quickly
 // (avoids starting a real Bun.serve OAuth server)
 if (urlStr.includes("cloud.digitalocean.com")) {
 oauthChecks++;
 return Promise.reject(new Error("network unavailable"));
 }
 // DigitalOcean API calls — return 401
 if (urlStr.includes("api.digitalocean.com")) {
 apiCalls++;
 return Promise.resolve(
 new Response("Unauthorized", {
 status: 401,
 }),
 );
 }
 // Second call: OAuth connectivity check — fail it so tryDoOAuth returns null quickly
 // (avoids starting a real Bun.serve OAuth server)
 if (urlStr.includes("cloud.digitalocean.com")) {
 return Promise.reject(new Error("network unavailable"));
 }
 return Promise.resolve(
 new Response("Unauthorized", {
 status: 401,
 }),
 );
 // Ignore unrelated calls (e.g. telemetry flush)
 return Promise.resolve(new Response("ok"));
 });

 // OAuth recovery fails (connectivity check fails), so doApi throws the 401
 await expect(doApi("GET", "/account", undefined, 1)).rejects.toThrow("DigitalOcean API error 401");
 // Verify recovery was attempted (API call + OAuth connectivity check + retries)
 expect(callCount).toBeGreaterThanOrEqual(2);
 // Verify recovery was attempted: 1 API call + 1 connectivity check
 expect(apiCalls).toBe(1);
 expect(oauthChecks).toBe(1);
 });

 it("succeeds after OAuth recovery provides a new token", async () => {
Expand Down

169 changes: 95 additions & 74 deletions
packages/cli/src/__tests__/hetzner-cov.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,47 +585,46 @@ describe("hetzner/createServer", () => {
 },
 },
 };
 let callCount = 0;
 global.fetch = mock(() => {
 callCount++;
 if (callCount <= 1) {
 // Token validation
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 }),
 ),
 );
 let hetznerCalls = 0;
 let postServerAttempts = 0;
 global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
 const urlStr = String(url);
 // Ignore non-Hetzner calls (e.g. telemetry flush)
 if (!urlStr.includes("api.hetzner.cloud")) {
 return Promise.resolve(new Response("ok"));
 }
 if (callCount <= 2) {
 // SSH keys
 return Promise.resolve(
 new Response(
 JSON.stringify({
 ssh_keys: [],
 }),
 ),
 );
 hetznerCalls++;
 const method = opts?.method ?? "GET";
 // POST /servers — first attempt fails, retry succeeds
 if (method === "POST" && urlStr.includes("/servers")) {
 postServerAttempts++;
 if (postServerAttempts === 1) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 );
 }
 return Promise.resolve(new Response(JSON.stringify(serverResp)));
 }
if (callCount <= 3) {
 // First create attempt — resource_limit_exceeded (HTTP 403)
// DELETE /primary_ips — cleanup orphaned IP
if (method === "DELETE" && urlStr.includes("/primary_ips/")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 new Response("", {
 status: 204,
 }),
 );
 }
if (callCount <= 4) {
 // List primary IPs for cleanup
// GET /primary_ips — list IPs for cleanup
if (urlStr.includes("/primary_ips")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
Expand All@@ -645,40 +644,81 @@ describe("hetzner/createServer", () => {
 ),
 );
 }
if (callCount <= 5) {
 // Delete orphaned IP 100
// GET /ssh_keys
if (urlStr.includes("/ssh_keys")) {
 return Promise.resolve(
 new Response("", {
 status: 204,
 }),
 new Response(
 JSON.stringify({
 ssh_keys: [],
 }),
 ),
 );
 }
 // Retry create — success
 return Promise.resolve(new Response(JSON.stringify(serverResp)));
 // GET /servers (token validation)
 if (urlStr.includes("/servers")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 }),
 ),
 );
 }
 return Promise.resolve(new Response(JSON.stringify({})));
 });
 const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
 await ensureHcloudToken();
 const conn = await createServer("test-retry", "cx23", "fsn1");
 expect(conn.ip).toBe("10.0.0.5");
 // Should have called: token(1), ssh_keys(2), create-fail(3), list-ips(4), delete-ip(5), create-ok(6)
 expect(callCount).toBeGreaterThanOrEqual(6);
 // Should have called: token, ssh_keys, create-fail, list-ips, delete-ip, create-ok
 expect(hetznerCalls).toBeGreaterThanOrEqual(6);
 });

 it("throws with guidance when resource limit hit and no orphaned IPs to clean", async () => {
 process.env.HCLOUD_TOKEN = "test-token";
 let callCount = 0;
 global.fetch = mock(() => {
 callCount++;
 if (callCount <= 1) {
 let postServerAttempts = 0;
 global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
 const urlStr = String(url);
 // Ignore non-Hetzner calls (e.g. telemetry flush)
 if (!urlStr.includes("api.hetzner.cloud")) {
 return Promise.resolve(new Response("ok"));
 }
 const method = opts?.method ?? "GET";
 // POST /servers — always fail with resource_limit_exceeded
 if (method === "POST" && urlStr.includes("/servers")) {
 postServerAttempts++;
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 );
 }
 if (callCount <= 2) {
 // GET /primary_ips — all attached (none orphaned)
 if (urlStr.includes("/primary_ips")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 primary_ips: [
 {
 id: 100,
 ip: "1.2.3.4",
 assignee_id: 42,
 },
 ],
 }),
 ),
 );
 }
 // GET /ssh_keys
 if (urlStr.includes("/ssh_keys")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
Expand All@@ -687,36 +727,17 @@ describe("hetzner/createServer", () => {
 ),
 );
 }
if (callCount <= 3) {
 // Create fails with resource_limit_exceeded
// GET /servers (token validation)
if (urlStr.includes("/servers")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 servers: [],
 }),
 {
 status: 403,
 },
 ),
 );
 }
 // List primary IPs — all attached (none orphaned)
 return Promise.resolve(
 new Response(
 JSON.stringify({
 primary_ips: [
 {
 id: 100,
 ip: "1.2.3.4",
 assignee_id: 42,
 },
 ],
 }),
 ),
 );
 return Promise.resolve(new Response(JSON.stringify({})));
 });
 const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
 await ensureHcloudToken();
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli/src/commands/list.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -448,7 +448,7 @@ async function handleGoneServer(record: SpawnRecord, cloud: string): Promise<"de
 // Remap to selected instance
 const actionStr = String(action);
 if (actionStr.startsWith("remap-")) {
 const idx = Number.parseInt(action.slice(6), 10);
 const idx = Number.parseInt(actionStr.slice(6), 10);
 const inst = instances[idx];
 if (inst) {
 updateRecordConnection(record, {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler#3356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

la14-1
wants to merge
2
commits into

base:main
Choose a base branch

from

 Open


fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler
#3356
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0035a34

fix(list): use actionStr.slice instead of action.slice to avoid TypeE…


louisgv Apr 24, 2026
ac3976a

fix(tests): resolve mock test failures in PR #3356


louisgv May 14, 2026

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


32 changes: 16 additions & 16 deletions
packages/cli/src/__tests__/digitalocean-token.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,34 +88,34 @@ describe("doApi 401 OAuth recovery", () => {

 it("attempts OAuth recovery on 401 before throwing", async () => {
 state.token = "expired-token";
 let callCount = 0;
 let apiCalls = 0;
 let oauthChecks = 0;
 globalThis.fetch = mock((url: string | URL | Request) => {
 callCount++;
 const urlStr = String(url);
 // First call: the actual API call returning 401
 if (callCount === 1) {
 // OAuth connectivity check — fail it so tryDoOAuth returns null quickly
 // (avoids starting a real Bun.serve OAuth server)
 if (urlStr.includes("cloud.digitalocean.com")) {
 oauthChecks++;
 return Promise.reject(new Error("network unavailable"));
 }
 // DigitalOcean API calls — return 401
 if (urlStr.includes("api.digitalocean.com")) {
 apiCalls++;
 return Promise.resolve(
 new Response("Unauthorized", {
 status: 401,
 }),
 );
 }
 // Second call: OAuth connectivity check — fail it so tryDoOAuth returns null quickly
 // (avoids starting a real Bun.serve OAuth server)
 if (urlStr.includes("cloud.digitalocean.com")) {
 return Promise.reject(new Error("network unavailable"));
 }
 return Promise.resolve(
 new Response("Unauthorized", {
 status: 401,
 }),
 );
 // Ignore unrelated calls (e.g. telemetry flush)
 return Promise.resolve(new Response("ok"));
 });

 // OAuth recovery fails (connectivity check fails), so doApi throws the 401
 await expect(doApi("GET", "/account", undefined, 1)).rejects.toThrow("DigitalOcean API error 401");
 // Verify recovery was attempted (API call + OAuth connectivity check + retries)
 expect(callCount).toBeGreaterThanOrEqual(2);
 // Verify recovery was attempted: 1 API call + 1 connectivity check
 expect(apiCalls).toBe(1);
 expect(oauthChecks).toBe(1);
 });

 it("succeeds after OAuth recovery provides a new token", async () => {
Expand Down

169 changes: 95 additions & 74 deletions
packages/cli/src/__tests__/hetzner-cov.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,47 +585,46 @@ describe("hetzner/createServer", () => {
 },
 },
 };
 let callCount = 0;
 global.fetch = mock(() => {
 callCount++;
 if (callCount <= 1) {
 // Token validation
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 }),
 ),
 );
 let hetznerCalls = 0;
 let postServerAttempts = 0;
 global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
 const urlStr = String(url);
 // Ignore non-Hetzner calls (e.g. telemetry flush)
 if (!urlStr.includes("api.hetzner.cloud")) {
 return Promise.resolve(new Response("ok"));
 }
 if (callCount <= 2) {
 // SSH keys
 return Promise.resolve(
 new Response(
 JSON.stringify({
 ssh_keys: [],
 }),
 ),
 );
 hetznerCalls++;
 const method = opts?.method ?? "GET";
 // POST /servers — first attempt fails, retry succeeds
 if (method === "POST" && urlStr.includes("/servers")) {
 postServerAttempts++;
 if (postServerAttempts === 1) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 );
 }
 return Promise.resolve(new Response(JSON.stringify(serverResp)));
 }
if (callCount <= 3) {
 // First create attempt — resource_limit_exceeded (HTTP 403)
// DELETE /primary_ips — cleanup orphaned IP
if (method === "DELETE" && urlStr.includes("/primary_ips/")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 new Response("", {
 status: 204,
 }),
 );
 }
if (callCount <= 4) {
 // List primary IPs for cleanup
// GET /primary_ips — list IPs for cleanup
if (urlStr.includes("/primary_ips")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
Expand All@@ -645,40 +644,81 @@ describe("hetzner/createServer", () => {
 ),
 );
 }
if (callCount <= 5) {
 // Delete orphaned IP 100
// GET /ssh_keys
if (urlStr.includes("/ssh_keys")) {
 return Promise.resolve(
 new Response("", {
 status: 204,
 }),
 new Response(
 JSON.stringify({
 ssh_keys: [],
 }),
 ),
 );
 }
 // Retry create — success
 return Promise.resolve(new Response(JSON.stringify(serverResp)));
 // GET /servers (token validation)
 if (urlStr.includes("/servers")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 }),
 ),
 );
 }
 return Promise.resolve(new Response(JSON.stringify({})));
 });
 const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
 await ensureHcloudToken();
 const conn = await createServer("test-retry", "cx23", "fsn1");
 expect(conn.ip).toBe("10.0.0.5");
 // Should have called: token(1), ssh_keys(2), create-fail(3), list-ips(4), delete-ip(5), create-ok(6)
 expect(callCount).toBeGreaterThanOrEqual(6);
 // Should have called: token, ssh_keys, create-fail, list-ips, delete-ip, create-ok
 expect(hetznerCalls).toBeGreaterThanOrEqual(6);
 });

 it("throws with guidance when resource limit hit and no orphaned IPs to clean", async () => {
 process.env.HCLOUD_TOKEN = "test-token";
 let callCount = 0;
 global.fetch = mock(() => {
 callCount++;
 if (callCount <= 1) {
 let postServerAttempts = 0;
 global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
 const urlStr = String(url);
 // Ignore non-Hetzner calls (e.g. telemetry flush)
 if (!urlStr.includes("api.hetzner.cloud")) {
 return Promise.resolve(new Response("ok"));
 }
 const method = opts?.method ?? "GET";
 // POST /servers — always fail with resource_limit_exceeded
 if (method === "POST" && urlStr.includes("/servers")) {
 postServerAttempts++;
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 );
 }
 if (callCount <= 2) {
 // GET /primary_ips — all attached (none orphaned)
 if (urlStr.includes("/primary_ips")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 primary_ips: [
 {
 id: 100,
 ip: "1.2.3.4",
 assignee_id: 42,
 },
 ],
 }),
 ),
 );
 }
 // GET /ssh_keys
 if (urlStr.includes("/ssh_keys")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
Expand All@@ -687,36 +727,17 @@ describe("hetzner/createServer", () => {
 ),
 );
 }
if (callCount <= 3) {
 // Create fails with resource_limit_exceeded
// GET /servers (token validation)
if (urlStr.includes("/servers")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 servers: [],
 }),
 {
 status: 403,
 },
 ),
 );
 }
 // List primary IPs — all attached (none orphaned)
 return Promise.resolve(
 new Response(
 JSON.stringify({
 primary_ips: [
 {
 id: 100,
 ip: "1.2.3.4",
 assignee_id: 42,
 },
 ],
 }),
 ),
 );
 return Promise.resolve(new Response(JSON.stringify({})));
 });
 const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
 await ensureHcloudToken();
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli/src/commands/list.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -448,7 +448,7 @@ async function handleGoneServer(record: SpawnRecord, cloud: string): Promise<"de
 // Remap to selected instance
 const actionStr = String(action);
 if (actionStr.startsWith("remap-")) {
 const idx = Number.parseInt(action.slice(6), 10);
 const idx = Number.parseInt(actionStr.slice(6), 10);
 const inst = instances[idx];
 if (inst) {
 updateRecordConnection(record, {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler#3356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

la14-1
wants to merge
2
commits into

base:main
Choose a base branch

from

 Open


fix(list): use actionStr.slice to avoid TypeError on symbol in remap handler
#3356
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0035a34

fix(list): use actionStr.slice instead of action.slice to avoid TypeE…


louisgv Apr 24, 2026
ac3976a

fix(tests): resolve mock test failures in PR #3356


louisgv May 14, 2026

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


32 changes: 16 additions & 16 deletions
packages/cli/src/__tests__/digitalocean-token.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,34 +88,34 @@ describe("doApi 401 OAuth recovery", () => {

 it("attempts OAuth recovery on 401 before throwing", async () => {
 state.token = "expired-token";
 let callCount = 0;
 let apiCalls = 0;
 let oauthChecks = 0;
 globalThis.fetch = mock((url: string | URL | Request) => {
 callCount++;
 const urlStr = String(url);
 // First call: the actual API call returning 401
 if (callCount === 1) {
 // OAuth connectivity check — fail it so tryDoOAuth returns null quickly
 // (avoids starting a real Bun.serve OAuth server)
 if (urlStr.includes("cloud.digitalocean.com")) {
 oauthChecks++;
 return Promise.reject(new Error("network unavailable"));
 }
 // DigitalOcean API calls — return 401
 if (urlStr.includes("api.digitalocean.com")) {
 apiCalls++;
 return Promise.resolve(
 new Response("Unauthorized", {
 status: 401,
 }),
 );
 }
 // Second call: OAuth connectivity check — fail it so tryDoOAuth returns null quickly
 // (avoids starting a real Bun.serve OAuth server)
 if (urlStr.includes("cloud.digitalocean.com")) {
 return Promise.reject(new Error("network unavailable"));
 }
 return Promise.resolve(
 new Response("Unauthorized", {
 status: 401,
 }),
 );
 // Ignore unrelated calls (e.g. telemetry flush)
 return Promise.resolve(new Response("ok"));
 });

 // OAuth recovery fails (connectivity check fails), so doApi throws the 401
 await expect(doApi("GET", "/account", undefined, 1)).rejects.toThrow("DigitalOcean API error 401");
 // Verify recovery was attempted (API call + OAuth connectivity check + retries)
 expect(callCount).toBeGreaterThanOrEqual(2);
 // Verify recovery was attempted: 1 API call + 1 connectivity check
 expect(apiCalls).toBe(1);
 expect(oauthChecks).toBe(1);
 });

 it("succeeds after OAuth recovery provides a new token", async () => {
Expand Down

169 changes: 95 additions & 74 deletions
packages/cli/src/__tests__/hetzner-cov.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,47 +585,46 @@ describe("hetzner/createServer", () => {
 },
 },
 };
 let callCount = 0;
 global.fetch = mock(() => {
 callCount++;
 if (callCount <= 1) {
 // Token validation
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 }),
 ),
 );
 let hetznerCalls = 0;
 let postServerAttempts = 0;
 global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
 const urlStr = String(url);
 // Ignore non-Hetzner calls (e.g. telemetry flush)
 if (!urlStr.includes("api.hetzner.cloud")) {
 return Promise.resolve(new Response("ok"));
 }
 if (callCount <= 2) {
 // SSH keys
 return Promise.resolve(
 new Response(
 JSON.stringify({
 ssh_keys: [],
 }),
 ),
 );
 hetznerCalls++;
 const method = opts?.method ?? "GET";
 // POST /servers — first attempt fails, retry succeeds
 if (method === "POST" && urlStr.includes("/servers")) {
 postServerAttempts++;
 if (postServerAttempts === 1) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 );
 }
 return Promise.resolve(new Response(JSON.stringify(serverResp)));
 }
if (callCount <= 3) {
 // First create attempt — resource_limit_exceeded (HTTP 403)
// DELETE /primary_ips — cleanup orphaned IP
if (method === "DELETE" && urlStr.includes("/primary_ips/")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 new Response("", {
 status: 204,
 }),
 );
 }
if (callCount <= 4) {
 // List primary IPs for cleanup
// GET /primary_ips — list IPs for cleanup
if (urlStr.includes("/primary_ips")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
Expand All@@ -645,40 +644,81 @@ describe("hetzner/createServer", () => {
 ),
 );
 }
if (callCount <= 5) {
 // Delete orphaned IP 100
// GET /ssh_keys
if (urlStr.includes("/ssh_keys")) {
 return Promise.resolve(
 new Response("", {
 status: 204,
 }),
 new Response(
 JSON.stringify({
 ssh_keys: [],
 }),
 ),
 );
 }
 // Retry create — success
 return Promise.resolve(new Response(JSON.stringify(serverResp)));
 // GET /servers (token validation)
 if (urlStr.includes("/servers")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 }),
 ),
 );
 }
 return Promise.resolve(new Response(JSON.stringify({})));
 });
 const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
 await ensureHcloudToken();
 const conn = await createServer("test-retry", "cx23", "fsn1");
 expect(conn.ip).toBe("10.0.0.5");
 // Should have called: token(1), ssh_keys(2), create-fail(3), list-ips(4), delete-ip(5), create-ok(6)
 expect(callCount).toBeGreaterThanOrEqual(6);
 // Should have called: token, ssh_keys, create-fail, list-ips, delete-ip, create-ok
 expect(hetznerCalls).toBeGreaterThanOrEqual(6);
 });

 it("throws with guidance when resource limit hit and no orphaned IPs to clean", async () => {
 process.env.HCLOUD_TOKEN = "test-token";
 let callCount = 0;
 global.fetch = mock(() => {
 callCount++;
 if (callCount <= 1) {
 let postServerAttempts = 0;
 global.fetch = mock((url: string | URL | Request, opts?: RequestInit) => {
 const urlStr = String(url);
 // Ignore non-Hetzner calls (e.g. telemetry flush)
 if (!urlStr.includes("api.hetzner.cloud")) {
 return Promise.resolve(new Response("ok"));
 }
 const method = opts?.method ?? "GET";
 // POST /servers — always fail with resource_limit_exceeded
 if (method === "POST" && urlStr.includes("/servers")) {
 postServerAttempts++;
 return Promise.resolve(
 new Response(
 JSON.stringify({
 servers: [],
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 }),
 {
 status: 403,
 },
 ),
 );
 }
 if (callCount <= 2) {
 // GET /primary_ips — all attached (none orphaned)
 if (urlStr.includes("/primary_ips")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 primary_ips: [
 {
 id: 100,
 ip: "1.2.3.4",
 assignee_id: 42,
 },
 ],
 }),
 ),
 );
 }
 // GET /ssh_keys
 if (urlStr.includes("/ssh_keys")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
Expand All@@ -687,36 +727,17 @@ describe("hetzner/createServer", () => {
 ),
 );
 }
if (callCount <= 3) {
 // Create fails with resource_limit_exceeded
// GET /servers (token validation)
if (urlStr.includes("/servers")) {
 return Promise.resolve(
 new Response(
 JSON.stringify({
 error: {
 code: "resource_limit_exceeded",
 message: "primary_ip_limit",
 },
 servers: [],
 }),
 {
 status: 403,
 },
 ),
 );
 }
 // List primary IPs — all attached (none orphaned)
 return Promise.resolve(
 new Response(
 JSON.stringify({
 primary_ips: [
 {
 id: 100,
 ip: "1.2.3.4",
 assignee_id: 42,
 },
 ],
 }),
 ),
 );
 return Promise.resolve(new Response(JSON.stringify({})));
 });
 const { ensureHcloudToken, createServer } = await import("../hetzner/hetzner");
 await ensureHcloudToken();
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli/src/commands/list.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -448,7 +448,7 @@ async function handleGoneServer(record: SpawnRecord, cloud: string): Promise<"de
 // Remap to selected instance
 const actionStr = String(action);
 if (actionStr.startsWith("remap-")) {
 const idx = Number.parseInt(action.slice(6), 10);
 const idx = Number.parseInt(actionStr.slice(6), 10);
 const inst = instances[idx];
 if (inst) {
 updateRecordConnection(record, {
Expand Down
Loading