@sitepong/cli 0.1.11 → 0.1.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/auth/token.js +90 -24
- package/dist/auth/token.js.map +1 -1
- package/dist/auth/token.test.js +19 -1
- package/dist/auth/token.test.js.map +1 -1
- package/dist/commands/hosting/index.js +2 -0
- package/dist/commands/hosting/index.js.map +1 -1
- package/dist/commands/hosting/migrate.js +120 -0
- package/dist/commands/hosting/migrate.js.map +1 -0
- package/package.json +1 -1
package/dist/auth/token.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { readAuth, writeAuth, clearAuth, getSitePongHome } from '../config/paths.js';
|
|
2
4
|
const SUPABASE_URL = process.env.SITEPONG_SUPABASE_URL || 'https://paddle.sitepong.com';
|
|
3
5
|
const SUPABASE_ANON_KEY = process.env.SITEPONG_SUPABASE_KEY || 'sb_publishable_TKXjSteHPj87BxEpowx07w_SXajAbki';
|
|
4
6
|
export function getSupabaseUrl() {
|
|
@@ -31,32 +33,96 @@ export async function loginWithEmail(email, password) {
|
|
|
31
33
|
writeAuth(auth);
|
|
32
34
|
return auth;
|
|
33
35
|
}
|
|
36
|
+
// Supabase rotates refresh tokens on every use and revokes the whole session
|
|
37
|
+
// family when a token is reused. Concurrent CLI processes (e.g. the parallel
|
|
38
|
+
// pool in functions-deploy scripts) all racing to refresh with the same token
|
|
39
|
+
// therefore logged the user out constantly: the first refresh wins, every
|
|
40
|
+
// loser trips reuse-detection, and the old code responded with clearAuth().
|
|
41
|
+
// Fix: serialize refresh across processes with a lock directory, re-read
|
|
42
|
+
// auth.json inside the lock (a sibling may have already refreshed), and never
|
|
43
|
+
// clear a session that another process has since rotated.
|
|
44
|
+
const LOCK_STALE_MS = 30_000;
|
|
45
|
+
const LOCK_WAIT_MS = 15_000;
|
|
46
|
+
function lockPath() {
|
|
47
|
+
return path.join(getSitePongHome(), 'auth.refresh.lock');
|
|
48
|
+
}
|
|
49
|
+
async function withRefreshLock(fn) {
|
|
50
|
+
const lock = lockPath();
|
|
51
|
+
const deadline = Date.now() + LOCK_WAIT_MS;
|
|
52
|
+
for (;;) {
|
|
53
|
+
try {
|
|
54
|
+
fs.mkdirSync(lock, { recursive: false });
|
|
55
|
+
break;
|
|
56
|
+
}
|
|
57
|
+
catch {
|
|
58
|
+
try {
|
|
59
|
+
const age = Date.now() - fs.statSync(lock).mtimeMs;
|
|
60
|
+
if (age > LOCK_STALE_MS) {
|
|
61
|
+
fs.rmdirSync(lock);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
catch { /* lock vanished — loop and retry mkdir */ }
|
|
65
|
+
if (Date.now() > deadline)
|
|
66
|
+
break; // don't deadlock — proceed unlocked
|
|
67
|
+
await new Promise((r) => setTimeout(r, 150));
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
try {
|
|
71
|
+
return await fn();
|
|
72
|
+
}
|
|
73
|
+
finally {
|
|
74
|
+
try {
|
|
75
|
+
fs.rmdirSync(lockPath());
|
|
76
|
+
}
|
|
77
|
+
catch { /* already released */ }
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
function isFresh(auth) {
|
|
81
|
+
return !!auth && auth.expires_at - Math.floor(Date.now() / 1000) >= 300;
|
|
82
|
+
}
|
|
34
83
|
export async function refreshToken() {
|
|
35
|
-
const
|
|
36
|
-
if (!
|
|
84
|
+
const before = readAuth();
|
|
85
|
+
if (!before?.refresh_token)
|
|
37
86
|
throw new Error('Not logged in. Run `sitepong login` first.');
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
87
|
+
return withRefreshLock(async () => {
|
|
88
|
+
// A sibling process may have refreshed while we waited on the lock.
|
|
89
|
+
const current = readAuth();
|
|
90
|
+
if (isFresh(current))
|
|
91
|
+
return current;
|
|
92
|
+
const auth = current ?? before;
|
|
93
|
+
const res = await fetch(`${SUPABASE_URL}/auth/v1/token?grant_type=refresh_token`, {
|
|
94
|
+
method: 'POST',
|
|
95
|
+
headers: {
|
|
96
|
+
'Content-Type': 'application/json',
|
|
97
|
+
'apikey': SUPABASE_ANON_KEY,
|
|
98
|
+
},
|
|
99
|
+
body: JSON.stringify({ refresh_token: auth.refresh_token }),
|
|
100
|
+
});
|
|
101
|
+
if (!res.ok) {
|
|
102
|
+
// Before declaring the session dead, check whether another process
|
|
103
|
+
// rotated the token underneath us — if so, use its result.
|
|
104
|
+
const latest = readAuth();
|
|
105
|
+
if (latest && latest.refresh_token !== auth.refresh_token)
|
|
106
|
+
return latest;
|
|
107
|
+
// Only a definitive auth rejection kills the session. Transient
|
|
108
|
+
// network/5xx failures must not log the user out.
|
|
109
|
+
if (res.status === 400 || res.status === 401 || res.status === 403) {
|
|
110
|
+
clearAuth();
|
|
111
|
+
throw new Error('Session expired. Run `sitepong login` to re-authenticate.');
|
|
112
|
+
}
|
|
113
|
+
throw new Error(`Token refresh failed (${res.status}) — session kept; retry the command.`);
|
|
114
|
+
}
|
|
115
|
+
const data = await res.json();
|
|
116
|
+
const newAuth = {
|
|
117
|
+
access_token: data.access_token,
|
|
118
|
+
refresh_token: data.refresh_token,
|
|
119
|
+
expires_at: Math.floor(Date.now() / 1000) + data.expires_in,
|
|
120
|
+
user_id: data.user.id,
|
|
121
|
+
email: data.user.email,
|
|
122
|
+
};
|
|
123
|
+
writeAuth(newAuth);
|
|
124
|
+
return newAuth;
|
|
45
125
|
});
|
|
46
|
-
if (!res.ok) {
|
|
47
|
-
clearAuth();
|
|
48
|
-
throw new Error('Session expired. Run `sitepong login` to re-authenticate.');
|
|
49
|
-
}
|
|
50
|
-
const data = await res.json();
|
|
51
|
-
const newAuth = {
|
|
52
|
-
access_token: data.access_token,
|
|
53
|
-
refresh_token: data.refresh_token,
|
|
54
|
-
expires_at: Math.floor(Date.now() / 1000) + data.expires_in,
|
|
55
|
-
user_id: data.user.id,
|
|
56
|
-
email: data.user.email,
|
|
57
|
-
};
|
|
58
|
-
writeAuth(newAuth);
|
|
59
|
-
return newAuth;
|
|
60
126
|
}
|
|
61
127
|
export async function getAccessToken() {
|
|
62
128
|
const auth = readAuth();
|
package/dist/auth/token.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/auth/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/auth/token.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/token.test.js
CHANGED
|
@@ -65,13 +65,31 @@ describe('token', () => {
|
|
|
65
65
|
const { refreshToken } = await import('./token.js');
|
|
66
66
|
await expect(refreshToken()).rejects.toThrow('Not logged in');
|
|
67
67
|
});
|
|
68
|
-
it('refreshToken
|
|
68
|
+
it('refreshToken short-circuits when stored auth is still fresh', async () => {
|
|
69
|
+
// MOCK_AUTH expires in 1h — no refresh needed, no fetch should fire.
|
|
70
|
+
const fetchMock = mockFetch({}, false, 500);
|
|
71
|
+
const { refreshToken } = await import('./token.js');
|
|
72
|
+
const auth = await refreshToken();
|
|
73
|
+
expect(auth.access_token).toBe(MOCK_AUTH.access_token);
|
|
74
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
75
|
+
});
|
|
76
|
+
it('refreshToken clears auth on definitive auth rejection', async () => {
|
|
77
|
+
const { writeAuth } = await import('../config/paths.js');
|
|
78
|
+
writeAuth({ ...MOCK_AUTH, expires_at: Math.floor(Date.now() / 1000) + 60 });
|
|
69
79
|
mockFetch({}, false, 401);
|
|
70
80
|
const { refreshToken } = await import('./token.js');
|
|
71
81
|
await expect(refreshToken()).rejects.toThrow('Session expired');
|
|
72
82
|
const { readAuth } = await import('../config/paths.js');
|
|
73
83
|
expect(readAuth()).toBeNull();
|
|
74
84
|
});
|
|
85
|
+
it('refreshToken keeps the session on transient server errors', async () => {
|
|
86
|
+
const { writeAuth, readAuth } = await import('../config/paths.js');
|
|
87
|
+
writeAuth({ ...MOCK_AUTH, expires_at: Math.floor(Date.now() / 1000) + 60 });
|
|
88
|
+
mockFetch({}, false, 503);
|
|
89
|
+
const { refreshToken } = await import('./token.js');
|
|
90
|
+
await expect(refreshToken()).rejects.toThrow('session kept');
|
|
91
|
+
expect(readAuth()).not.toBeNull();
|
|
92
|
+
});
|
|
75
93
|
it('getSupabaseUrl returns default URL', async () => {
|
|
76
94
|
const { getSupabaseUrl } = await import('./token.js');
|
|
77
95
|
expect(getSupabaseUrl()).toContain('paddle.sitepong.com');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.test.js","sourceRoot":"","sources":["../../src/auth/token.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"token.test.js","sourceRoot":"","sources":["../../src/auth/token.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,9 +9,11 @@ import { registerBackups } from './backups.js';
|
|
|
9
9
|
import { registerLogs } from './logs.js';
|
|
10
10
|
import { registerKeys } from './keys.js';
|
|
11
11
|
import { registerLink } from './link.js';
|
|
12
|
+
import { registerMigrate } from './migrate.js';
|
|
12
13
|
export function registerHosting(parent) {
|
|
13
14
|
const hosting = parent.command('hosting').description('Manage Supabase hosting instances');
|
|
14
15
|
registerInstances(hosting);
|
|
16
|
+
registerMigrate(hosting);
|
|
15
17
|
registerLink(hosting);
|
|
16
18
|
registerDb(hosting);
|
|
17
19
|
registerFunctions(hosting);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/hosting/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/hosting/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,UAAU,eAAe,CAAC,MAAe;IAC7C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,mCAAmC,CAAC,CAAC;IAC3F,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC3B,eAAe,CAAC,OAAO,CAAC,CAAC;IACzB,YAAY,CAAC,OAAO,CAAC,CAAC;IACtB,UAAU,CAAC,OAAO,CAAC,CAAC;IACpB,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC3B,eAAe,CAAC,OAAO,CAAC,CAAC;IACzB,eAAe,CAAC,OAAO,CAAC,CAAC;IACzB,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC3B,cAAc,CAAC,OAAO,CAAC,CAAC;IACxB,eAAe,CAAC,OAAO,CAAC,CAAC;IACzB,YAAY,CAAC,OAAO,CAAC,CAAC;IACtB,YAAY,CAAC,OAAO,CAAC,CAAC;AACxB,CAAC"}
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
function fmtBytes(b) {
|
|
2
|
+
if (!b)
|
|
3
|
+
return 'unknown';
|
|
4
|
+
const u = ['B', 'KB', 'MB', 'GB', 'TB'];
|
|
5
|
+
let v = b, i = 0;
|
|
6
|
+
while (v >= 1024 && i < u.length - 1) {
|
|
7
|
+
v /= 1024;
|
|
8
|
+
i++;
|
|
9
|
+
}
|
|
10
|
+
return `${v.toFixed(1)} ${u[i]}`;
|
|
11
|
+
}
|
|
12
|
+
function printPlan(plan, info) {
|
|
13
|
+
info('');
|
|
14
|
+
info(` Fidelity: ${plan.fidelity.toUpperCase()}`);
|
|
15
|
+
info(` Reachable: db ${plan.db.reachable ? '✓' : '✗'} rest ${plan.api.restReachable ? '✓' : '✗'} auth ${plan.api.authAdminReachable ? '✓' : '✗'} storage ${plan.api.storageReachable ? '✓' : '✗'}`);
|
|
16
|
+
if (plan.db.reachable)
|
|
17
|
+
info(` Source: ${fmtBytes(plan.db.databaseBytes)}, ${plan.db.tableCount} tables`);
|
|
18
|
+
if (plan.blockers.length) {
|
|
19
|
+
info('\n 🚫 Blockers:');
|
|
20
|
+
plan.blockers.forEach((b) => info(` • ${b}`));
|
|
21
|
+
}
|
|
22
|
+
info('\n ✅ Migrates automatically:');
|
|
23
|
+
(plan.autoMigrated.length ? plan.autoMigrated : ['(nothing detected)']).forEach((a) => info(` • ${a}`));
|
|
24
|
+
info('\n 📋 Finish before go-live:');
|
|
25
|
+
if (!plan.checklist.length)
|
|
26
|
+
info(' 🎉 nothing outstanding');
|
|
27
|
+
plan.checklist.forEach((c) => info(` [${c.required ? 'REQUIRED' : 'optional'}] ${c.title}`));
|
|
28
|
+
info('');
|
|
29
|
+
}
|
|
30
|
+
export function registerMigrate(parent) {
|
|
31
|
+
parent
|
|
32
|
+
.command('migrate')
|
|
33
|
+
.description('Migrate an existing (cloud) Supabase into a self-hosted instance')
|
|
34
|
+
.requiredOption('--from-url <url>', 'Source Supabase project URL')
|
|
35
|
+
.requiredOption('--service-key <key>', 'Source service_role key')
|
|
36
|
+
.option('--db-url <url>', 'Source DB connection string (required for full fidelity)')
|
|
37
|
+
.option('--pat <token>', 'Source personal access token (sharpens detection)')
|
|
38
|
+
.option('--name <name>', 'Target instance name (provisions a new instance)')
|
|
39
|
+
.option('--instance <id>', 'Migrate into an existing instance instead of provisioning')
|
|
40
|
+
.option('--plan <plan>', 'Plan preset (nano, starter, pro, business, scale)', 'starter')
|
|
41
|
+
.option('--cpu-class <class>', 'CPU class (general, compute, performance)', 'performance')
|
|
42
|
+
.option('--test', 'Only test the source connection and print the plan (no migration)')
|
|
43
|
+
.option('--watch', 'Poll the migration until it completes')
|
|
44
|
+
.action(async (opts) => {
|
|
45
|
+
const { hostingClient } = await import('../../client/hosting.js');
|
|
46
|
+
const { info, success, error } = await import('../../output/log.js');
|
|
47
|
+
const body = {
|
|
48
|
+
sourceUrl: opts.fromUrl,
|
|
49
|
+
sourceServiceKey: opts.serviceKey,
|
|
50
|
+
sourceDbUrl: opts.dbUrl || undefined,
|
|
51
|
+
sourcePat: opts.pat || undefined,
|
|
52
|
+
};
|
|
53
|
+
// --test: detection only
|
|
54
|
+
if (opts.test) {
|
|
55
|
+
info('Testing source connection…');
|
|
56
|
+
try {
|
|
57
|
+
const plan = await hostingClient().post('/api/hosting/migrations/test', { body });
|
|
58
|
+
printPlan(plan, info);
|
|
59
|
+
}
|
|
60
|
+
catch (e) {
|
|
61
|
+
error(e instanceof Error ? e.message : 'Connection test failed');
|
|
62
|
+
process.exit(1);
|
|
63
|
+
}
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
if (!opts.instance && !opts.name) {
|
|
67
|
+
error('Provide --name to provision a new instance, or --instance <id> to target an existing one.');
|
|
68
|
+
process.exit(1);
|
|
69
|
+
}
|
|
70
|
+
if (!opts.dbUrl) {
|
|
71
|
+
error('--db-url is required for a full-fidelity migration.');
|
|
72
|
+
process.exit(1);
|
|
73
|
+
}
|
|
74
|
+
let job;
|
|
75
|
+
try {
|
|
76
|
+
const created = await hostingClient().post('/api/hosting/migrations', {
|
|
77
|
+
body: {
|
|
78
|
+
...body,
|
|
79
|
+
instanceName: opts.name || undefined,
|
|
80
|
+
instanceId: opts.instance || undefined,
|
|
81
|
+
plan: opts.plan,
|
|
82
|
+
cpuClass: opts.cpuClass,
|
|
83
|
+
},
|
|
84
|
+
});
|
|
85
|
+
success(`Migration queued: ${created.id}`);
|
|
86
|
+
job = { id: created.id, status: created.status, phase: null, instance_id: null, error: null, progress: null };
|
|
87
|
+
}
|
|
88
|
+
catch (e) {
|
|
89
|
+
error(e instanceof Error ? e.message : 'Failed to queue migration');
|
|
90
|
+
process.exit(1);
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
if (!opts.watch) {
|
|
94
|
+
info(`Track it with: sitepong hosting migrate --watch (or GET /api/hosting/migrations/${job.id})`);
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
// --watch: poll to terminal
|
|
98
|
+
let lastLog = 0;
|
|
99
|
+
const poll = async () => {
|
|
100
|
+
const j = await hostingClient().get(`/api/hosting/migrations/${job.id}`);
|
|
101
|
+
const log = j.progress?.log ?? [];
|
|
102
|
+
for (; lastLog < log.length; lastLog++)
|
|
103
|
+
info(` · ${log[lastLog]}`);
|
|
104
|
+
if (j.status === 'completed') {
|
|
105
|
+
success(`Migration complete → instance ${j.instance_id}`);
|
|
106
|
+
return true;
|
|
107
|
+
}
|
|
108
|
+
if (j.status === 'failed') {
|
|
109
|
+
error(`Migration failed: ${j.error ?? 'unknown'}`);
|
|
110
|
+
process.exit(1);
|
|
111
|
+
}
|
|
112
|
+
return false;
|
|
113
|
+
};
|
|
114
|
+
info('Watching migration (Ctrl-C to stop; it keeps running server-side)…');
|
|
115
|
+
while (!(await poll())) {
|
|
116
|
+
await new Promise((r) => setTimeout(r, 3000));
|
|
117
|
+
}
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
//# sourceMappingURL=migrate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/commands/hosting/migrate.ts"],"names":[],"mappings":"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"}
|