ysk-server-core 1.1.23 → 1.1.25
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/hosting/backup-cron.d.ts +31 -0
- package/dist/hosting/backup-cron.d.ts.map +1 -1
- package/dist/hosting/backup-cron.js +111 -24
- package/dist/hosting/backup-cron.js.map +1 -1
- package/dist/hosting/cloudflare-dns.d.ts +20 -0
- package/dist/hosting/cloudflare-dns.d.ts.map +1 -1
- package/dist/hosting/cloudflare-dns.js +54 -0
- package/dist/hosting/cloudflare-dns.js.map +1 -1
- package/dist/hosting/cron-host-rewrite.d.ts +69 -0
- package/dist/hosting/cron-host-rewrite.d.ts.map +1 -0
- package/dist/hosting/cron-host-rewrite.js +255 -0
- package/dist/hosting/cron-host-rewrite.js.map +1 -0
- package/dist/hosting/ddns/detect-public-ip.d.ts +13 -0
- package/dist/hosting/ddns/detect-public-ip.d.ts.map +1 -0
- package/dist/hosting/ddns/detect-public-ip.js +95 -0
- package/dist/hosting/ddns/detect-public-ip.js.map +1 -0
- package/dist/hosting/ddns/index.d.ts +5 -0
- package/dist/hosting/ddns/index.d.ts.map +1 -0
- package/dist/hosting/ddns/index.js +5 -0
- package/dist/hosting/ddns/index.js.map +1 -0
- package/dist/hosting/ddns/providers.d.ts +41 -0
- package/dist/hosting/ddns/providers.d.ts.map +1 -0
- package/dist/hosting/ddns/providers.js +200 -0
- package/dist/hosting/ddns/providers.js.map +1 -0
- package/dist/hosting/ddns/service.d.ts +56 -0
- package/dist/hosting/ddns/service.d.ts.map +1 -0
- package/dist/hosting/ddns/service.js +319 -0
- package/dist/hosting/ddns/service.js.map +1 -0
- package/dist/hosting/ddns/store.d.ts +36 -0
- package/dist/hosting/ddns/store.d.ts.map +1 -0
- package/dist/hosting/ddns/store.js +149 -0
- package/dist/hosting/ddns/store.js.map +1 -0
- package/dist/hosting/extras.js +1 -1
- package/dist/hosting/extras.js.map +1 -1
- package/dist/hosting/index.d.ts +2 -0
- package/dist/hosting/index.d.ts.map +1 -1
- package/dist/hosting/index.js +2 -0
- package/dist/hosting/index.js.map +1 -1
- package/dist/hosting/validators/adapters/cosmos-identity.d.ts +3 -0
- package/dist/hosting/validators/adapters/cosmos-identity.d.ts.map +1 -0
- package/dist/hosting/validators/adapters/cosmos-identity.js +68 -0
- package/dist/hosting/validators/adapters/cosmos-identity.js.map +1 -0
- package/dist/hosting/validators/adapters/near.d.ts +6 -5
- package/dist/hosting/validators/adapters/near.d.ts.map +1 -1
- package/dist/hosting/validators/adapters/near.js +80 -2
- package/dist/hosting/validators/adapters/near.js.map +1 -1
- package/dist/hosting/validators/adapters/phase2.d.ts +4 -1
- package/dist/hosting/validators/adapters/phase2.d.ts.map +1 -1
- package/dist/hosting/validators/adapters/phase2.js +17 -3
- package/dist/hosting/validators/adapters/phase2.js.map +1 -1
- package/dist/hosting/validators/extras.d.ts +4 -1
- package/dist/hosting/validators/extras.d.ts.map +1 -1
- package/dist/hosting/validators/extras.js +9 -0
- package/dist/hosting/validators/extras.js.map +1 -1
- package/dist/hosting/validators/index.d.ts +1 -0
- package/dist/hosting/validators/index.d.ts.map +1 -1
- package/dist/hosting/validators/index.js +1 -0
- package/dist/hosting/validators/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudflare-dns.js","sourceRoot":"","sources":["../../src/hosting/cloudflare-dns.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cloudflare-dns.js","sourceRoot":"","sources":["../../src/hosting/cloudflare-dns.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import type { HostExecutor } from '../host/executor.js';
|
|
2
|
+
export type HostCronRewriteKind = 'replace' | 'comment' | 'uncomment' | 'delete' | 'adopt';
|
|
3
|
+
export type HostCronRewriteNext = {
|
|
4
|
+
type: 'replace';
|
|
5
|
+
schedule: string;
|
|
6
|
+
command: string;
|
|
7
|
+
} | {
|
|
8
|
+
type: 'comment';
|
|
9
|
+
} | {
|
|
10
|
+
type: 'uncomment';
|
|
11
|
+
} | {
|
|
12
|
+
type: 'delete';
|
|
13
|
+
} | {
|
|
14
|
+
type: 'adopt';
|
|
15
|
+
managedId: string;
|
|
16
|
+
};
|
|
17
|
+
export declare function splitCrontabBody(text: string): string[];
|
|
18
|
+
export declare function findRawLineIndexes(lines: string[], oldRaw: string): number[];
|
|
19
|
+
export declare function assertHostCronUser(user: string): string;
|
|
20
|
+
export declare function assertHostCronSchedule(schedule: string): string;
|
|
21
|
+
export declare function buildHostCronJobLine(schedule: string, command: string, managedId?: string): string;
|
|
22
|
+
export declare function applyHostCronLineEdit(lines: string[], index: number, next: HostCronRewriteNext): {
|
|
23
|
+
lines: string[];
|
|
24
|
+
preview: string;
|
|
25
|
+
};
|
|
26
|
+
export declare function joinCrontabBody(lines: string[]): string;
|
|
27
|
+
export declare function parseJobFields(text: string): {
|
|
28
|
+
schedule: string;
|
|
29
|
+
command: string;
|
|
30
|
+
} | null;
|
|
31
|
+
/** Crontabs `installCrontab` actually writes (process user, usually root). */
|
|
32
|
+
export declare function isInstallOwnedCronUser(user: string, processUser?: string): boolean;
|
|
33
|
+
export declare function crontabReadArgv(user: string, isRoot: boolean): string[];
|
|
34
|
+
export declare function crontabWriteArgv(user: string, isRoot: boolean, file: string): string[];
|
|
35
|
+
export type HostCronRewriteResult = {
|
|
36
|
+
ok: boolean;
|
|
37
|
+
blocked?: boolean;
|
|
38
|
+
requiresExecute?: boolean;
|
|
39
|
+
requiresRoot?: boolean;
|
|
40
|
+
notes: string[];
|
|
41
|
+
preview?: string;
|
|
42
|
+
user: string;
|
|
43
|
+
written?: boolean;
|
|
44
|
+
};
|
|
45
|
+
export declare function rewriteHostCronLine(input: {
|
|
46
|
+
host: HostExecutor;
|
|
47
|
+
dataDir: string;
|
|
48
|
+
user: string;
|
|
49
|
+
oldRaw: string;
|
|
50
|
+
next: HostCronRewriteNext;
|
|
51
|
+
}): Promise<HostCronRewriteResult>;
|
|
52
|
+
export declare function runHostCronCommand(input: {
|
|
53
|
+
host: HostExecutor;
|
|
54
|
+
user: string;
|
|
55
|
+
command: string;
|
|
56
|
+
}): Promise<HostCronRewriteResult & {
|
|
57
|
+
exitCode?: number;
|
|
58
|
+
stdout?: string;
|
|
59
|
+
stderr?: string;
|
|
60
|
+
}>;
|
|
61
|
+
export declare function findHostJobRaw(text: string, schedule: string, command: string): {
|
|
62
|
+
ok: true;
|
|
63
|
+
raw: string;
|
|
64
|
+
} | {
|
|
65
|
+
ok: false;
|
|
66
|
+
reason: 'missing' | 'duplicate';
|
|
67
|
+
count: number;
|
|
68
|
+
};
|
|
69
|
+
//# sourceMappingURL=cron-host-rewrite.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cron-host-rewrite.d.ts","sourceRoot":"","sources":["../../src/hosting/cron-host-rewrite.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAMxD,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE3F,MAAM,MAAM,mBAAmB,GAC3B;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACtD;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GACrB;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzC,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAEvD;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAO5E;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAOvD;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAO/D;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAKlG;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EAAE,EACf,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,mBAAmB,GACxB;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAyBtC;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAGvD;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAkBzF;AAED,8EAA8E;AAC9E,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAKlF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,MAAM,EAAE,CAGvE;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAGtF;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,EAAE,EAAE,OAAO,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,wBAAsB,mBAAmB,CAAC,KAAK,EAAE;IAC/C,IAAI,EAAE,YAAY,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,mBAAmB,CAAC;CAC3B,GAAG,OAAO,CAAC,qBAAqB,CAAC,CA6EjC;AAED,wBAAsB,kBAAkB,CAAC,KAAK,EAAE;IAC9C,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,qBAAqB,GAAG;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAuC3F;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,SAAS,GAAG,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAa3F"}
|
|
@@ -0,0 +1,255 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* In-place host crontab line edit. Does not go through installCrontab (no -u).
|
|
3
|
+
*/
|
|
4
|
+
import { mkdirSync, writeFileSync } from 'node:fs';
|
|
5
|
+
import { join } from 'node:path';
|
|
6
|
+
import { ErrorCodes, YskError, tl } from 'ysk-server-shared';
|
|
7
|
+
import { assertSafeCronCommand, assertSafeCronSchedule } from './extras.js';
|
|
8
|
+
const AT_SCHEDULE = /^@(reboot|hourly|daily|weekly|monthly|yearly|annually)$/i;
|
|
9
|
+
export function splitCrontabBody(text) {
|
|
10
|
+
return String(text ?? '').replace(/\r\n/g, '\n').replace(/\r/g, '\n').split('\n');
|
|
11
|
+
}
|
|
12
|
+
export function findRawLineIndexes(lines, oldRaw) {
|
|
13
|
+
const want = String(oldRaw ?? '').replace(/\r$/, '');
|
|
14
|
+
const hits = [];
|
|
15
|
+
for (let i = 0; i < lines.length; i += 1) {
|
|
16
|
+
if (lines[i] === want)
|
|
17
|
+
hits.push(i);
|
|
18
|
+
}
|
|
19
|
+
return hits;
|
|
20
|
+
}
|
|
21
|
+
export function assertHostCronUser(user) {
|
|
22
|
+
const u = String(user ?? '').trim();
|
|
23
|
+
if (u === 'current')
|
|
24
|
+
return u;
|
|
25
|
+
if (!u || !/^[a-zA-Z0-9_.-]+$/.test(u)) {
|
|
26
|
+
throw new YskError(ErrorCodes.VALIDATION, tl('notes.cron.hostUserInvalid'), { httpStatus: 400 });
|
|
27
|
+
}
|
|
28
|
+
return u;
|
|
29
|
+
}
|
|
30
|
+
export function assertHostCronSchedule(schedule) {
|
|
31
|
+
const s = String(schedule ?? '').trim();
|
|
32
|
+
if (!s || /[\r\n]/.test(s)) {
|
|
33
|
+
throw new YskError(ErrorCodes.VALIDATION, tl('notes.cron.hostScheduleInvalid'), { httpStatus: 400 });
|
|
34
|
+
}
|
|
35
|
+
if (AT_SCHEDULE.test(s))
|
|
36
|
+
return s.toLowerCase();
|
|
37
|
+
return assertSafeCronSchedule(s);
|
|
38
|
+
}
|
|
39
|
+
export function buildHostCronJobLine(schedule, command, managedId) {
|
|
40
|
+
const sched = assertHostCronSchedule(schedule);
|
|
41
|
+
const cmd = assertSafeCronCommand(command);
|
|
42
|
+
const tag = managedId?.trim() ? ` # ysk:${managedId.trim()}` : '';
|
|
43
|
+
return `${sched} ${cmd}${tag}`;
|
|
44
|
+
}
|
|
45
|
+
export function applyHostCronLineEdit(lines, index, next) {
|
|
46
|
+
const current = lines[index] ?? '';
|
|
47
|
+
let replacement;
|
|
48
|
+
if (next.type === 'delete') {
|
|
49
|
+
replacement = null;
|
|
50
|
+
}
|
|
51
|
+
else if (next.type === 'comment') {
|
|
52
|
+
replacement = current.trimStart().startsWith('#') ? current : `# ${current}`;
|
|
53
|
+
}
|
|
54
|
+
else if (next.type === 'uncomment') {
|
|
55
|
+
replacement = current.replace(/^#\s?/, '');
|
|
56
|
+
}
|
|
57
|
+
else if (next.type === 'replace') {
|
|
58
|
+
const live = buildHostCronJobLine(next.schedule, next.command);
|
|
59
|
+
replacement = current.trimStart().startsWith('#') ? `# ${live}` : live;
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
const stripped = current.replace(/^#\s?/, '');
|
|
63
|
+
const parsed = parseJobFields(stripped);
|
|
64
|
+
if (!parsed) {
|
|
65
|
+
throw new YskError(ErrorCodes.VALIDATION, tl('notes.cron.hostLineNotJob'), { httpStatus: 400 });
|
|
66
|
+
}
|
|
67
|
+
replacement = buildHostCronJobLine(parsed.schedule, parsed.command, next.managedId);
|
|
68
|
+
}
|
|
69
|
+
const out = [...lines];
|
|
70
|
+
if (replacement == null)
|
|
71
|
+
out.splice(index, 1);
|
|
72
|
+
else
|
|
73
|
+
out[index] = replacement;
|
|
74
|
+
const preview = replacement == null ? '' : replacement;
|
|
75
|
+
return { lines: out, preview };
|
|
76
|
+
}
|
|
77
|
+
export function joinCrontabBody(lines) {
|
|
78
|
+
const body = lines.join('\n');
|
|
79
|
+
return body.endsWith('\n') ? body : `${body}\n`;
|
|
80
|
+
}
|
|
81
|
+
export function parseJobFields(text) {
|
|
82
|
+
const t = String(text ?? '').trim();
|
|
83
|
+
if (!t || t.startsWith('#'))
|
|
84
|
+
return null;
|
|
85
|
+
if (/^[A-Za-z_][A-Za-z0-9_]*=/.test(t))
|
|
86
|
+
return null;
|
|
87
|
+
if (t.startsWith('@')) {
|
|
88
|
+
const sp = t.search(/\s+/);
|
|
89
|
+
if (sp < 0)
|
|
90
|
+
return null;
|
|
91
|
+
const schedule = t.slice(0, sp);
|
|
92
|
+
let command = t.slice(sp).trim();
|
|
93
|
+
command = command.replace(/\s+#\s*ysk:[^\s#]+/i, '').trim();
|
|
94
|
+
if (!command)
|
|
95
|
+
return null;
|
|
96
|
+
return { schedule, command };
|
|
97
|
+
}
|
|
98
|
+
const m = t.match(/^(\S+\s+\S+\s+\S+\s+\S+\s+\S+)\s+(.+)$/);
|
|
99
|
+
if (!m)
|
|
100
|
+
return null;
|
|
101
|
+
const command = (m[2] ?? '').replace(/\s+#\s*ysk:[^\s#]+/i, '').trim();
|
|
102
|
+
if (!command)
|
|
103
|
+
return null;
|
|
104
|
+
return { schedule: m[1] ?? '', command };
|
|
105
|
+
}
|
|
106
|
+
/** Crontabs `installCrontab` actually writes (process user, usually root). */
|
|
107
|
+
export function isInstallOwnedCronUser(user, processUser) {
|
|
108
|
+
const u = String(user ?? '').trim();
|
|
109
|
+
if (u === 'current' || u === 'root')
|
|
110
|
+
return true;
|
|
111
|
+
const self = (processUser ?? '').trim();
|
|
112
|
+
return Boolean(self) && u === self;
|
|
113
|
+
}
|
|
114
|
+
export function crontabReadArgv(user, isRoot) {
|
|
115
|
+
if (isRoot && user && user !== 'current')
|
|
116
|
+
return ['crontab', '-u', user, '-l'];
|
|
117
|
+
return ['crontab', '-l'];
|
|
118
|
+
}
|
|
119
|
+
export function crontabWriteArgv(user, isRoot, file) {
|
|
120
|
+
if (isRoot && user && user !== 'current')
|
|
121
|
+
return ['crontab', '-u', user, file];
|
|
122
|
+
return ['crontab', file];
|
|
123
|
+
}
|
|
124
|
+
export async function rewriteHostCronLine(input) {
|
|
125
|
+
const user = assertHostCronUser(input.user);
|
|
126
|
+
const isRoot = input.host.isRoot();
|
|
127
|
+
if (!isRoot && user !== 'current') {
|
|
128
|
+
return {
|
|
129
|
+
ok: false,
|
|
130
|
+
blocked: true,
|
|
131
|
+
requiresRoot: true,
|
|
132
|
+
user,
|
|
133
|
+
notes: [tl('notes.cron.hostRewriteNeedRoot')],
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
const oldRaw = String(input.oldRaw ?? '').replace(/\r$/, '');
|
|
137
|
+
if (!oldRaw.trim()) {
|
|
138
|
+
return { ok: false, user, notes: [tl('notes.cron.hostLineMissing')] };
|
|
139
|
+
}
|
|
140
|
+
const read = await input.host.runCommand(crontabReadArgv(user, isRoot), { timeoutMs: 8_000 });
|
|
141
|
+
const text = read.exitCode === 0
|
|
142
|
+
? String(read.stdout || '')
|
|
143
|
+
: /no crontab/i.test(String(read.stderr || '')) || /no crontab/i.test(String(read.stdout || ''))
|
|
144
|
+
? ''
|
|
145
|
+
: null;
|
|
146
|
+
if (text == null) {
|
|
147
|
+
return {
|
|
148
|
+
ok: false,
|
|
149
|
+
user,
|
|
150
|
+
notes: [tl('notes.cron.hostReadFailed', { detail: (read.stderr || read.stdout || `exit=${read.exitCode}`).slice(0, 200) })],
|
|
151
|
+
};
|
|
152
|
+
}
|
|
153
|
+
const lines = splitCrontabBody(text);
|
|
154
|
+
const hits = findRawLineIndexes(lines, oldRaw);
|
|
155
|
+
if (hits.length === 0) {
|
|
156
|
+
return { ok: false, user, notes: [tl('notes.cron.hostLineMissing')] };
|
|
157
|
+
}
|
|
158
|
+
if (hits.length > 1) {
|
|
159
|
+
return { ok: false, user, notes: [tl('notes.cron.hostLineDuplicate', { count: hits.length })] };
|
|
160
|
+
}
|
|
161
|
+
const index = hits[0];
|
|
162
|
+
let edited;
|
|
163
|
+
try {
|
|
164
|
+
edited = applyHostCronLineEdit(lines, index, input.next);
|
|
165
|
+
}
|
|
166
|
+
catch (e) {
|
|
167
|
+
const msg = e instanceof YskError ? e.message : e instanceof Error ? e.message : String(e);
|
|
168
|
+
return { ok: false, user, notes: [msg] };
|
|
169
|
+
}
|
|
170
|
+
const body = joinCrontabBody(edited.lines);
|
|
171
|
+
if (!input.host.executeEnabled()) {
|
|
172
|
+
return {
|
|
173
|
+
ok: false,
|
|
174
|
+
blocked: true,
|
|
175
|
+
requiresExecute: true,
|
|
176
|
+
user,
|
|
177
|
+
preview: edited.preview,
|
|
178
|
+
notes: [tl('notes.cron.hostRewriteNeedExecute'), edited.preview ? tl('notes.cron.hostPreview', { line: edited.preview }) : tl('notes.cron.hostPreviewDelete')],
|
|
179
|
+
};
|
|
180
|
+
}
|
|
181
|
+
const dir = join(input.dataDir.replace(/\/+$/, ''), 'cron');
|
|
182
|
+
mkdirSync(dir, { recursive: true });
|
|
183
|
+
const safeUser = user.replace(/[^a-zA-Z0-9_.-]/g, '_') || 'user';
|
|
184
|
+
const file = join(dir, `host-${safeUser}.crontab`);
|
|
185
|
+
writeFileSync(file, body, 'utf8');
|
|
186
|
+
const run = await input.host.runCommand(crontabWriteArgv(user, isRoot, file), { timeoutMs: 12_000 });
|
|
187
|
+
const ok = run.exitCode === 0;
|
|
188
|
+
return {
|
|
189
|
+
ok,
|
|
190
|
+
user,
|
|
191
|
+
written: ok,
|
|
192
|
+
preview: edited.preview,
|
|
193
|
+
notes: ok
|
|
194
|
+
? [tl('notes.cron.hostRewritten', { user }), edited.preview ? tl('notes.cron.hostPreview', { line: edited.preview }) : tl('notes.cron.hostPreviewDelete')]
|
|
195
|
+
: [tl('notes.cron.hostWriteFailed', { detail: (run.stderr || `exit=${run.exitCode}`).slice(0, 240) })],
|
|
196
|
+
};
|
|
197
|
+
}
|
|
198
|
+
export async function runHostCronCommand(input) {
|
|
199
|
+
const user = assertHostCronUser(input.user);
|
|
200
|
+
const cmd = assertSafeCronCommand(input.command);
|
|
201
|
+
if (!input.host.executeEnabled()) {
|
|
202
|
+
return {
|
|
203
|
+
ok: false,
|
|
204
|
+
blocked: true,
|
|
205
|
+
requiresExecute: true,
|
|
206
|
+
user,
|
|
207
|
+
notes: [tl('notes.cron.hostRunNeedExecute')],
|
|
208
|
+
};
|
|
209
|
+
}
|
|
210
|
+
const isRoot = input.host.isRoot();
|
|
211
|
+
if (!isRoot && user !== 'current') {
|
|
212
|
+
return {
|
|
213
|
+
ok: false,
|
|
214
|
+
blocked: true,
|
|
215
|
+
requiresRoot: true,
|
|
216
|
+
user,
|
|
217
|
+
notes: [tl('notes.cron.hostRewriteNeedRoot')],
|
|
218
|
+
};
|
|
219
|
+
}
|
|
220
|
+
const argv = isRoot && user && user !== 'current' && user !== 'root'
|
|
221
|
+
? ['runuser', '-u', user, '--', 'bash', '-lc', cmd]
|
|
222
|
+
: ['bash', '-lc', cmd];
|
|
223
|
+
const r = await input.host.runCommand(argv, { timeoutMs: 120_000 });
|
|
224
|
+
return {
|
|
225
|
+
ok: r.exitCode === 0,
|
|
226
|
+
user,
|
|
227
|
+
exitCode: r.exitCode,
|
|
228
|
+
stdout: (r.stdout || '').slice(0, 4000),
|
|
229
|
+
stderr: (r.stderr || '').slice(0, 4000),
|
|
230
|
+
notes: [
|
|
231
|
+
tl('notes.cron.hostRan', { user }),
|
|
232
|
+
`exit=${r.exitCode}`,
|
|
233
|
+
r.exitCode === 0 ? tl('notes.tpl.success') : tl('notes.failed'),
|
|
234
|
+
],
|
|
235
|
+
};
|
|
236
|
+
}
|
|
237
|
+
export function findHostJobRaw(text, schedule, command) {
|
|
238
|
+
const sched = String(schedule ?? '').trim();
|
|
239
|
+
const cmd = String(command ?? '').trim();
|
|
240
|
+
const lines = splitCrontabBody(text);
|
|
241
|
+
const hits = [];
|
|
242
|
+
for (const raw of lines) {
|
|
243
|
+
const parsed = parseJobFields(raw.replace(/^#\s?/, ''));
|
|
244
|
+
if (!parsed)
|
|
245
|
+
continue;
|
|
246
|
+
if (parsed.schedule === sched && parsed.command === cmd)
|
|
247
|
+
hits.push(raw);
|
|
248
|
+
}
|
|
249
|
+
if (hits.length === 1)
|
|
250
|
+
return { ok: true, raw: hits[0] };
|
|
251
|
+
if (hits.length === 0)
|
|
252
|
+
return { ok: false, reason: 'missing', count: 0 };
|
|
253
|
+
return { ok: false, reason: 'duplicate', count: hits.length };
|
|
254
|
+
}
|
|
255
|
+
//# sourceMappingURL=cron-host-rewrite.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cron-host-rewrite.js","sourceRoot":"","sources":["../../src/hosting/cron-host-rewrite.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAE7D,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAE5E,MAAM,WAAW,GACf,0DAA0D,CAAC;AAW7D,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,OAAO,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AACpF,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAe,EAAE,MAAc;IAChE,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACrD,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI;YAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,CAAC,CAAC;IAC9B,IAAI,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC,4BAA4B,CAAC,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;IACnG,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,QAAgB;IACrD,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,IAAI,CAAC,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC,gCAAgC,CAAC,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;IACvG,CAAC;IACD,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;IAChD,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAgB,EAAE,OAAe,EAAE,SAAkB;IACxF,MAAM,KAAK,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC;IAC/C,MAAM,GAAG,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,GAAG,GAAG,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,UAAU,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAClE,OAAO,GAAG,KAAK,IAAI,GAAG,GAAG,GAAG,EAAE,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,KAAe,EACf,KAAa,EACb,IAAyB;IAEzB,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IACnC,IAAI,WAA0B,CAAC;IAC/B,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC3B,WAAW,GAAG,IAAI,CAAC;IACrB,CAAC;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACnC,WAAW,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,CAAC;IAC/E,CAAC;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACrC,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,oBAAoB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/D,WAAW,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACzE,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC,2BAA2B,CAAC,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;QAClG,CAAC;QACD,WAAW,GAAG,oBAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACtF,CAAC;IACD,MAAM,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IACvB,IAAI,WAAW,IAAI,IAAI;QAAE,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;;QACzC,GAAG,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC;IAC9B,MAAM,OAAO,GAAG,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IACvD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAe;IAC7C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IACzC,IAAI,0BAA0B,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACpD,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3B,IAAI,EAAE,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;QACxB,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAChC,IAAI,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACjC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC5D,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC1B,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IAC/B,CAAC;IACD,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,IAAI,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACpB,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACvE,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1B,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC;AAC3C,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,sBAAsB,CAAC,IAAY,EAAE,WAAoB;IACvE,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACjD,MAAM,IAAI,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,MAAe;IAC3D,IAAI,MAAM,IAAI,IAAI,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/E,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,MAAe,EAAE,IAAY;IAC1E,IAAI,MAAM,IAAI,IAAI,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/E,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AAC3B,CAAC;AAaD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,KAMzC;IACC,MAAM,IAAI,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IACnC,IAAI,CAAC,MAAM,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EAAE,IAAI;YACb,YAAY,EAAE,IAAI;YAClB,IAAI;YACJ,KAAK,EAAE,CAAC,EAAE,CAAC,gCAAgC,CAAC,CAAC;SAC9C,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;QACnB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,4BAA4B,CAAC,CAAC,EAAE,CAAC;IACxE,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9F,MAAM,IAAI,GACR,IAAI,CAAC,QAAQ,KAAK,CAAC;QACjB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC;QAC3B,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;YAC9F,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,IAAI,CAAC;IACb,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACjB,OAAO;YACL,EAAE,EAAE,KAAK;YACT,IAAI;YACJ,KAAK,EAAE,CAAC,EAAE,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,IAAI,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;SAC5H,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,IAAI,GAAG,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC/C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,4BAA4B,CAAC,CAAC,EAAE,CAAC;IACxE,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,8BAA8B,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;IAClG,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAE,CAAC;IACvB,IAAI,MAA4C,CAAC;IACjD,IAAI,CAAC;QACH,MAAM,GAAG,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3D,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,GAAG,GAAG,CAAC,YAAY,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3F,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;IAC3C,CAAC;IACD,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAE3C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;QACjC,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EAAE,IAAI;YACb,eAAe,EAAE,IAAI;YACrB,IAAI;YACJ,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,KAAK,EAAE,CAAC,EAAE,CAAC,mCAAmC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,wBAAwB,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,8BAA8B,CAAC,CAAC;SAC/J,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC5D,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC;IACjE,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,QAAQ,UAAU,CAAC,CAAC;IACnD,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;IACrG,MAAM,EAAE,GAAG,GAAG,CAAC,QAAQ,KAAK,CAAC,CAAC;IAC9B,OAAO;QACL,EAAE;QACF,IAAI;QACJ,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,KAAK,EAAE,EAAE;YACP,CAAC,CAAC,CAAC,EAAE,CAAC,0BAA0B,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,wBAAwB,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,8BAA8B,CAAC,CAAC;YAC1J,CAAC,CAAC,CAAC,EAAE,CAAC,4BAA4B,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,QAAQ,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;KACzG,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,KAIxC;IACC,MAAM,IAAI,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,GAAG,GAAG,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;QACjC,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EAAE,IAAI;YACb,eAAe,EAAE,IAAI;YACrB,IAAI;YACJ,KAAK,EAAE,CAAC,EAAE,CAAC,+BAA+B,CAAC,CAAC;SAC7C,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IACnC,IAAI,CAAC,MAAM,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EAAE,IAAI;YACb,YAAY,EAAE,IAAI;YAClB,IAAI;YACJ,KAAK,EAAE,CAAC,EAAE,CAAC,gCAAgC,CAAC,CAAC;SAC9C,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GACR,MAAM,IAAI,IAAI,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,MAAM;QACrD,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC;QACnD,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;IAC3B,MAAM,CAAC,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;IACpE,OAAO;QACL,EAAE,EAAE,CAAC,CAAC,QAAQ,KAAK,CAAC;QACpB,IAAI;QACJ,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC;QACvC,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC;QACvC,KAAK,EAAE;YACL,EAAE,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,CAAC;YAClC,QAAQ,CAAC,CAAC,QAAQ,EAAE;YACpB,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC;SAChE;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,IAAY,EACZ,QAAgB,EAChB,OAAe;IAEf,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5C,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM;YAAE,SAAS;QACtB,IAAI,MAAM,CAAC,QAAQ,KAAK,KAAK,IAAI,MAAM,CAAC,OAAO,KAAK,GAAG;YAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1E,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAE,EAAE,CAAC;IAC1D,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IACzE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;AAChE,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export type PublicIpFetch = (url: string, timeoutMs: number) => Promise<string>;
|
|
2
|
+
export declare function isCgnatIpv4(ip: string): boolean;
|
|
3
|
+
export declare function isPublicIpv4(ip: string): boolean;
|
|
4
|
+
export declare function isPublicIpv6(ip: string): boolean;
|
|
5
|
+
export declare function detectPublicIpv4(fetchImpl?: PublicIpFetch, timeoutMs?: number): Promise<{
|
|
6
|
+
ip: string | null;
|
|
7
|
+
error: string | null;
|
|
8
|
+
}>;
|
|
9
|
+
export declare function detectPublicIpv6(fetchImpl?: PublicIpFetch, timeoutMs?: number): Promise<{
|
|
10
|
+
ip: string | null;
|
|
11
|
+
error: string | null;
|
|
12
|
+
}>;
|
|
13
|
+
//# sourceMappingURL=detect-public-ip.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"detect-public-ip.d.ts","sourceRoot":"","sources":["../../../src/hosting/ddns/detect-public-ip.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAUhF,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAI/C;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAYhD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAWhD;AAcD,wBAAsB,gBAAgB,CACpC,SAAS,GAAE,aAA4B,EACvC,SAAS,SAAQ,GAChB,OAAO,CAAC;IAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAWtD;AAED,wBAAsB,gBAAgB,CACpC,SAAS,GAAE,aAA4B,EACvC,SAAS,SAAQ,GAChB,OAAO,CAAC;IAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAWtD"}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Detect host WAN IPv4/IPv6. Fail-closed: never return RFC1918 / CGNAT / empty.
|
|
3
|
+
* Probe hosts match VPN + validators (ifconfig.me, ident.me, ipify).
|
|
4
|
+
*/
|
|
5
|
+
import { isIpv4, isIpv6 } from 'ysk-server-shared';
|
|
6
|
+
const V4_URLS = [
|
|
7
|
+
'https://ifconfig.me/ip',
|
|
8
|
+
'https://ident.me',
|
|
9
|
+
'https://api.ipify.org',
|
|
10
|
+
];
|
|
11
|
+
const V6_URLS = ['https://api6.ipify.org', 'https://v6.ident.me'];
|
|
12
|
+
export function isCgnatIpv4(ip) {
|
|
13
|
+
const p = ip.split('.').map((x) => Number(x));
|
|
14
|
+
if (p.length !== 4 || p.some((n) => !Number.isInteger(n)))
|
|
15
|
+
return false;
|
|
16
|
+
return p[0] === 100 && p[1] >= 64 && p[1] <= 127;
|
|
17
|
+
}
|
|
18
|
+
export function isPublicIpv4(ip) {
|
|
19
|
+
if (!isIpv4(ip))
|
|
20
|
+
return false;
|
|
21
|
+
const p = ip.split('.').map((x) => Number(x));
|
|
22
|
+
const a = p[0];
|
|
23
|
+
const b = p[1];
|
|
24
|
+
if (a === 0 || a === 10 || a === 127)
|
|
25
|
+
return false;
|
|
26
|
+
if (a === 169 && b === 254)
|
|
27
|
+
return false;
|
|
28
|
+
if (a === 172 && b >= 16 && b <= 31)
|
|
29
|
+
return false;
|
|
30
|
+
if (a === 192 && b === 168)
|
|
31
|
+
return false;
|
|
32
|
+
if (isCgnatIpv4(ip))
|
|
33
|
+
return false;
|
|
34
|
+
if (a >= 224)
|
|
35
|
+
return false;
|
|
36
|
+
return true;
|
|
37
|
+
}
|
|
38
|
+
export function isPublicIpv6(ip) {
|
|
39
|
+
const s = ip.trim().toLowerCase();
|
|
40
|
+
if (!isIpv6(s))
|
|
41
|
+
return false;
|
|
42
|
+
if (s === '::' || s === '::1')
|
|
43
|
+
return false;
|
|
44
|
+
if (s.startsWith('fe80:'))
|
|
45
|
+
return false;
|
|
46
|
+
if (s.startsWith('fc') || s.startsWith('fd'))
|
|
47
|
+
return false;
|
|
48
|
+
if (s.startsWith('::ffff:')) {
|
|
49
|
+
const mapped = s.slice('::ffff:'.length);
|
|
50
|
+
if (isIpv4(mapped))
|
|
51
|
+
return isPublicIpv4(mapped);
|
|
52
|
+
}
|
|
53
|
+
return true;
|
|
54
|
+
}
|
|
55
|
+
function defaultFetch(url, timeoutMs) {
|
|
56
|
+
const ac = new AbortController();
|
|
57
|
+
const t = setTimeout(() => ac.abort(), timeoutMs);
|
|
58
|
+
return fetch(url, { signal: ac.signal, headers: { accept: 'text/plain' } })
|
|
59
|
+
.then(async (res) => {
|
|
60
|
+
if (!res.ok)
|
|
61
|
+
return '';
|
|
62
|
+
return (await res.text()).trim().split(/\s+/)[0] ?? '';
|
|
63
|
+
})
|
|
64
|
+
.catch(() => '')
|
|
65
|
+
.finally(() => clearTimeout(t));
|
|
66
|
+
}
|
|
67
|
+
export async function detectPublicIpv4(fetchImpl = defaultFetch, timeoutMs = 5_000) {
|
|
68
|
+
let sawPrivate = null;
|
|
69
|
+
for (const url of V4_URLS) {
|
|
70
|
+
const raw = (await fetchImpl(url, timeoutMs)).trim();
|
|
71
|
+
if (isPublicIpv4(raw))
|
|
72
|
+
return { ip: raw, error: null };
|
|
73
|
+
if (raw && isIpv4(raw))
|
|
74
|
+
sawPrivate = raw;
|
|
75
|
+
}
|
|
76
|
+
return {
|
|
77
|
+
ip: null,
|
|
78
|
+
error: sawPrivate ? 'notPublicIpv4' : 'probeFailed',
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
export async function detectPublicIpv6(fetchImpl = defaultFetch, timeoutMs = 5_000) {
|
|
82
|
+
let sawPrivate = null;
|
|
83
|
+
for (const url of V6_URLS) {
|
|
84
|
+
const raw = (await fetchImpl(url, timeoutMs)).trim();
|
|
85
|
+
if (isPublicIpv6(raw))
|
|
86
|
+
return { ip: raw, error: null };
|
|
87
|
+
if (raw && isIpv6(raw))
|
|
88
|
+
sawPrivate = raw;
|
|
89
|
+
}
|
|
90
|
+
return {
|
|
91
|
+
ip: null,
|
|
92
|
+
error: sawPrivate ? 'notPublicIpv6' : 'probeFailed',
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
//# sourceMappingURL=detect-public-ip.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"detect-public-ip.js","sourceRoot":"","sources":["../../../src/hosting/ddns/detect-public-ip.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hosting/ddns/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hosting/ddns/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import type { DdnsRecordDto } from 'ysk-server-shared';
|
|
2
|
+
import type { HostExecutor } from '../../host/executor.js';
|
|
3
|
+
import type { JsonStore } from '../../db/store.js';
|
|
4
|
+
import { type CfFetch } from '../cloudflare-dns.js';
|
|
5
|
+
import type { DdnsSecrets } from './store.js';
|
|
6
|
+
export type DdnsProviderResult = {
|
|
7
|
+
ok: boolean;
|
|
8
|
+
skipped?: boolean;
|
|
9
|
+
code?: string | null;
|
|
10
|
+
error?: string | null;
|
|
11
|
+
notes: string[];
|
|
12
|
+
zoneId?: string;
|
|
13
|
+
};
|
|
14
|
+
export declare function zoneFromFqdn(fqdn: string, explicit?: string): string;
|
|
15
|
+
export declare function ddnsRelativeName(fqdn: string, zone: string): string;
|
|
16
|
+
export declare function findLocalDnsConflict(input: {
|
|
17
|
+
db: JsonStore;
|
|
18
|
+
zoneId: string;
|
|
19
|
+
relName: string;
|
|
20
|
+
type: string;
|
|
21
|
+
}): {
|
|
22
|
+
managedBy: string;
|
|
23
|
+
id: string;
|
|
24
|
+
} | null;
|
|
25
|
+
export declare function resolveCfToken(secrets: DdnsSecrets): string;
|
|
26
|
+
export declare function isRfc2136Loopback(server: string): boolean;
|
|
27
|
+
/** Key file must exist and stay under dataDir (relative names resolve in ddns/). */
|
|
28
|
+
export declare function resolveRfc2136KeyFile(dataDir: string, keyFile?: string): string | null;
|
|
29
|
+
export declare function applyDdnsProvider(input: {
|
|
30
|
+
record: DdnsRecordDto;
|
|
31
|
+
content: string;
|
|
32
|
+
secrets: DdnsSecrets;
|
|
33
|
+
dataDir: string;
|
|
34
|
+
host: HostExecutor;
|
|
35
|
+
db?: JsonStore;
|
|
36
|
+
execute: boolean;
|
|
37
|
+
fetchImpl?: CfFetch;
|
|
38
|
+
/** Stage local rows only; caller applies each zone once. */
|
|
39
|
+
deferLocalApply?: boolean;
|
|
40
|
+
}): Promise<DdnsProviderResult>;
|
|
41
|
+
//# sourceMappingURL=providers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../../src/hosting/ddns/providers.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAOnD,OAAO,EAAiC,KAAK,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAG9C,MAAM,MAAM,kBAAkB,GAAG;IAC/B,EAAE,EAAE,OAAO,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAKpE;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAMnE;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE;IAC1C,EAAE,EAAE,SAAS,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAY3C;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAO3D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAGzD;AAED,oFAAoF;AACpF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAStF;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE;IAC7C,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,WAAW,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,YAAY,CAAC;IACnB,EAAE,CAAC,EAAE,SAAS,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,4DAA4D;IAC5D,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsI9B"}
|