@intentic/providers 1.125.0 → 1.126.0
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/authentik-api.d.ts.map +1 -1
- package/dist/auth/authentik-api.js +1 -0
- package/dist/auth/authentik-api.js.map +1 -1
- package/dist/auth/authentik.d.ts.map +1 -1
- package/dist/auth/authentik.js +22 -11
- package/dist/auth/authentik.js.map +1 -1
- package/dist/backings/garage-bucket.d.ts.map +1 -0
- package/dist/backings/garage-bucket.js.map +1 -0
- package/dist/backings/garage.d.ts.map +1 -0
- package/dist/{data → backings}/garage.js +21 -10
- package/dist/backings/garage.js.map +1 -0
- package/dist/backings/postgres-database.d.ts.map +1 -0
- package/dist/{data → backings}/postgres-database.js +4 -1
- package/dist/backings/postgres-database.js.map +1 -0
- package/dist/backings/postgres.d.ts.map +1 -0
- package/dist/{data → backings}/postgres.js +21 -10
- package/dist/backings/postgres.js.map +1 -0
- package/dist/backings/valkey-namespace.d.ts.map +1 -0
- package/dist/{data → backings}/valkey-namespace.js +4 -1
- package/dist/backings/valkey-namespace.js.map +1 -0
- package/dist/backings/valkey.d.ts.map +1 -0
- package/dist/{data → backings}/valkey.js +21 -10
- package/dist/backings/valkey.js.map +1 -0
- package/dist/backup/backup.d.ts.map +1 -1
- package/dist/backup/backup.js +6 -5
- package/dist/backup/backup.js.map +1 -1
- package/dist/core/backing-ssh.d.ts +1 -0
- package/dist/core/backing-ssh.d.ts.map +1 -1
- package/dist/core/backing-ssh.js +10 -1
- package/dist/core/backing-ssh.js.map +1 -1
- package/dist/core/inputs.d.ts +1 -0
- package/dist/core/inputs.d.ts.map +1 -1
- package/dist/core/inputs.js +1 -0
- package/dist/core/inputs.js.map +1 -1
- package/dist/core/list-stamped.d.ts +4 -0
- package/dist/core/list-stamped.d.ts.map +1 -0
- package/dist/core/list-stamped.js +54 -0
- package/dist/core/list-stamped.js.map +1 -0
- package/dist/core/over-ssh.d.ts +5 -0
- package/dist/core/over-ssh.d.ts.map +1 -0
- package/dist/core/over-ssh.js +20 -0
- package/dist/core/over-ssh.js.map +1 -0
- package/dist/core/response-detail.d.ts +2 -0
- package/dist/core/response-detail.d.ts.map +1 -0
- package/dist/core/response-detail.js +20 -0
- package/dist/core/response-detail.js.map +1 -0
- package/dist/core/ssh-diagnostics.d.ts +6 -0
- package/dist/core/ssh-diagnostics.d.ts.map +1 -0
- package/dist/core/ssh-diagnostics.js +46 -0
- package/dist/core/ssh-diagnostics.js.map +1 -0
- package/dist/core/ssh.d.ts +9 -0
- package/dist/core/ssh.d.ts.map +1 -1
- package/dist/core/ssh.js +102 -8
- package/dist/core/ssh.js.map +1 -1
- package/dist/forgejo/ci.d.ts +2 -1
- package/dist/forgejo/ci.d.ts.map +1 -1
- package/dist/forgejo/ci.js +57 -52
- package/dist/forgejo/ci.js.map +1 -1
- package/dist/forgejo/forgejo-api.d.ts.map +1 -1
- package/dist/forgejo/forgejo-api.js +3 -1
- package/dist/forgejo/forgejo-api.js.map +1 -1
- package/dist/forgejo/forgejo-notify.d.ts +2 -1
- package/dist/forgejo/forgejo-notify.d.ts.map +1 -1
- package/dist/forgejo/forgejo-notify.js +64 -59
- package/dist/forgejo/forgejo-notify.js.map +1 -1
- package/dist/forgejo/forgejo-org.d.ts +2 -1
- package/dist/forgejo/forgejo-org.d.ts.map +1 -1
- package/dist/forgejo/forgejo-org.js +18 -18
- package/dist/forgejo/forgejo-org.js.map +1 -1
- package/dist/forgejo/forgejo-runner.d.ts.map +1 -1
- package/dist/forgejo/forgejo-runner.js +15 -5
- package/dist/forgejo/forgejo-runner.js.map +1 -1
- package/dist/forgejo/forgejo-team.d.ts +2 -1
- package/dist/forgejo/forgejo-team.d.ts.map +1 -1
- package/dist/forgejo/forgejo-team.js +35 -33
- package/dist/forgejo/forgejo-team.js.map +1 -1
- package/dist/forgejo/forgejo-user.d.ts +2 -1
- package/dist/forgejo/forgejo-user.d.ts.map +1 -1
- package/dist/forgejo/forgejo-user.js +22 -22
- package/dist/forgejo/forgejo-user.js.map +1 -1
- package/dist/forgejo/forgejo.d.ts +1 -0
- package/dist/forgejo/forgejo.d.ts.map +1 -1
- package/dist/forgejo/forgejo.js +20 -9
- package/dist/forgejo/forgejo.js.map +1 -1
- package/dist/forgejo/repo.d.ts +2 -1
- package/dist/forgejo/repo.d.ts.map +1 -1
- package/dist/forgejo/repo.js +38 -38
- package/dist/forgejo/repo.js.map +1 -1
- package/dist/github/gh-ci.d.ts.map +1 -1
- package/dist/github/gh-ci.js +19 -35
- package/dist/github/gh-ci.js.map +1 -1
- package/dist/github/github-api.d.ts.map +1 -1
- package/dist/github/github-api.js +12 -4
- package/dist/github/github-api.js.map +1 -1
- package/dist/gitlab/gitlab-api.d.ts.map +1 -1
- package/dist/gitlab/gitlab-api.js +14 -5
- package/dist/gitlab/gitlab-api.js.map +1 -1
- package/dist/gitlab/gl-ci.d.ts.map +1 -1
- package/dist/gitlab/gl-ci.js +22 -34
- package/dist/gitlab/gl-ci.js.map +1 -1
- package/dist/host/host.d.ts.map +1 -1
- package/dist/host/host.js +4 -2
- package/dist/host/host.js.map +1 -1
- package/dist/host/workspace.d.ts.map +1 -1
- package/dist/host/workspace.js +15 -9
- package/dist/host/workspace.js.map +1 -1
- package/dist/index.d.ts +6 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -6
- package/dist/index.js.map +1 -1
- package/dist/integrations/discord-api.d.ts.map +1 -1
- package/dist/integrations/discord-api.js +4 -3
- package/dist/integrations/discord-api.js.map +1 -1
- package/dist/integrations/stripe-api.d.ts.map +1 -1
- package/dist/integrations/stripe-api.js +1 -1
- package/dist/integrations/stripe-api.js.map +1 -1
- package/dist/komodo/deployment.d.ts +2 -1
- package/dist/komodo/deployment.d.ts.map +1 -1
- package/dist/komodo/deployment.js +36 -30
- package/dist/komodo/deployment.js.map +1 -1
- package/dist/komodo/komodo-api.d.ts.map +1 -1
- package/dist/komodo/komodo-api.js +5 -2
- package/dist/komodo/komodo-api.js.map +1 -1
- package/dist/komodo/komodo-notify.d.ts +2 -1
- package/dist/komodo/komodo-notify.d.ts.map +1 -1
- package/dist/komodo/komodo-notify.js +35 -30
- package/dist/komodo/komodo-notify.js.map +1 -1
- package/dist/komodo/komodo-periphery.d.ts.map +1 -1
- package/dist/komodo/komodo-periphery.js +5 -1
- package/dist/komodo/komodo-periphery.js.map +1 -1
- package/dist/komodo/komodo-server.d.ts +2 -1
- package/dist/komodo/komodo-server.d.ts.map +1 -1
- package/dist/komodo/komodo-server.js +30 -26
- package/dist/komodo/komodo-server.js.map +1 -1
- package/dist/komodo/komodo-user.d.ts +2 -1
- package/dist/komodo/komodo-user.d.ts.map +1 -1
- package/dist/komodo/komodo-user.js +36 -34
- package/dist/komodo/komodo-user.js.map +1 -1
- package/dist/komodo/komodo.d.ts +1 -0
- package/dist/komodo/komodo.d.ts.map +1 -1
- package/dist/komodo/komodo.js +38 -34
- package/dist/komodo/komodo.js.map +1 -1
- package/dist/network/cf-route.d.ts.map +1 -1
- package/dist/network/cf-route.js +30 -4
- package/dist/network/cf-route.js.map +1 -1
- package/dist/network/cloudflare-api.d.ts +13 -0
- package/dist/network/cloudflare-api.d.ts.map +1 -1
- package/dist/network/cloudflare-api.js +25 -7
- package/dist/network/cloudflare-api.js.map +1 -1
- package/dist/network/tunnel.d.ts.map +1 -1
- package/dist/network/tunnel.js +34 -9
- package/dist/network/tunnel.js.map +1 -1
- package/dist/observability/signoz.d.ts.map +1 -1
- package/dist/observability/signoz.js +22 -15
- package/dist/observability/signoz.js.map +1 -1
- package/dist/providers.d.ts.map +1 -1
- package/dist/providers.js +16 -20
- package/dist/providers.js.map +1 -1
- package/dist/services/compose-service.d.ts +1 -1
- package/dist/services/compose-service.d.ts.map +1 -1
- package/dist/services/compose-service.js +22 -15
- package/dist/services/compose-service.js.map +1 -1
- package/dist/services/infisical.js +3 -3
- package/dist/services/infisical.js.map +1 -1
- package/dist/services/invoiceninja.js +3 -3
- package/dist/services/invoiceninja.js.map +1 -1
- package/dist/services/openproject.d.ts.map +1 -1
- package/dist/services/openproject.js +4 -7
- package/dist/services/openproject.js.map +1 -1
- package/dist/services/outline.d.ts.map +1 -1
- package/dist/services/outline.js +13 -13
- package/dist/services/outline.js.map +1 -1
- package/dist/services/paperless.js +3 -3
- package/dist/services/paperless.js.map +1 -1
- package/package.json +7 -7
- package/dist/data/garage-bucket.d.ts.map +0 -1
- package/dist/data/garage-bucket.js.map +0 -1
- package/dist/data/garage.d.ts.map +0 -1
- package/dist/data/garage.js.map +0 -1
- package/dist/data/postgres-database.d.ts.map +0 -1
- package/dist/data/postgres-database.js.map +0 -1
- package/dist/data/postgres.d.ts.map +0 -1
- package/dist/data/postgres.js.map +0 -1
- package/dist/data/valkey-namespace.d.ts.map +0 -1
- package/dist/data/valkey-namespace.js.map +0 -1
- package/dist/data/valkey.d.ts.map +0 -1
- package/dist/data/valkey.js.map +0 -1
- package/dist/github/gh-deployment.d.ts +0 -4
- package/dist/github/gh-deployment.d.ts.map +0 -1
- package/dist/github/gh-deployment.js +0 -92
- package/dist/github/gh-deployment.js.map +0 -1
- package/dist/gitlab/gl-deployment.d.ts +0 -4
- package/dist/gitlab/gl-deployment.d.ts.map +0 -1
- package/dist/gitlab/gl-deployment.js +0 -93
- package/dist/gitlab/gl-deployment.js.map +0 -1
- /package/dist/{data → backings}/garage-bucket.d.ts +0 -0
- /package/dist/{data → backings}/garage-bucket.js +0 -0
- /package/dist/{data → backings}/garage.d.ts +0 -0
- /package/dist/{data → backings}/postgres-database.d.ts +0 -0
- /package/dist/{data → backings}/postgres.d.ts +0 -0
- /package/dist/{data → backings}/valkey-namespace.d.ts +0 -0
- /package/dist/{data → backings}/valkey.d.ts +0 -0
package/dist/komodo/komodo.js
CHANGED
|
@@ -1,18 +1,22 @@
|
|
|
1
|
+
import { setTimeout as sleep } from "node:timers/promises";
|
|
2
|
+
import { HASH_KEY } from "@intentic/graph";
|
|
1
3
|
import { z } from "zod";
|
|
2
4
|
import { guardedUpdate } from "../core/guarded-update.js";
|
|
3
|
-
import { gitProvider, parseInputs, sshSchema, sshTarget } from "../core/inputs.js";
|
|
5
|
+
import { gitProvider, hasPendingRef, parseInputs, sshSchema, sshTarget } from "../core/inputs.js";
|
|
6
|
+
import { containerLabel } from "../core/backing-ssh.js";
|
|
7
|
+
import { listStampedContainers } from "../core/list-stamped.js";
|
|
4
8
|
import { sshExecutor } from "../core/ssh.js";
|
|
5
9
|
const komodoSchema = sshSchema.extend({
|
|
6
10
|
internalIp: z.string(),
|
|
7
11
|
domain: z.string(),
|
|
8
|
-
forgejoUrl: z.string(),
|
|
9
|
-
runnerToken: z.string(),
|
|
10
12
|
adminUser: z.string(),
|
|
11
13
|
adminPassword: z.string(),
|
|
12
|
-
|
|
13
|
-
|
|
14
|
+
gitUrl: z.string().optional(),
|
|
15
|
+
gitAccount: z.string().optional(),
|
|
16
|
+
gitToken: z.string().optional(),
|
|
14
17
|
registry: z.string(),
|
|
15
|
-
|
|
18
|
+
registryUser: z.string(),
|
|
19
|
+
registryToken: z.string(),
|
|
16
20
|
coreImage: z.string(),
|
|
17
21
|
peripheryImage: z.string(),
|
|
18
22
|
ferretdbImage: z.string(),
|
|
@@ -22,14 +26,14 @@ const komodoSchema = sshSchema.extend({
|
|
|
22
26
|
});
|
|
23
27
|
const parse = (inputs) => parseInputs(komodoSchema, inputs, "komodo");
|
|
24
28
|
const CORE = "intentic-komodo-core";
|
|
25
|
-
const
|
|
29
|
+
export const KOMODO_CORE_PORT = 9120;
|
|
26
30
|
const STATE_DIR = "/opt/intentic/komodo";
|
|
27
31
|
const READY_TIMEOUT_MS = 90_000;
|
|
28
32
|
const READY_INTERVAL_MS = 3_000;
|
|
29
|
-
const internalUrl = (parsed) => `http://${parsed.internalIp}:${
|
|
33
|
+
const internalUrl = (parsed) => `http://${parsed.internalIp}:${KOMODO_CORE_PORT}`;
|
|
30
34
|
const outputsFor = (parsed) => ({ url: `https://${parsed.domain}`, internalUrl: internalUrl(parsed) });
|
|
31
|
-
const running = async (session) => {
|
|
32
|
-
const result = await session.exec(`docker ps --filter "label=intentic.id=${
|
|
35
|
+
const running = async (session, id) => {
|
|
36
|
+
const result = await session.exec(`docker ps --filter "label=intentic.id=${id}" --format '{{.Names}}'`);
|
|
33
37
|
return result.stdout.trim() !== "";
|
|
34
38
|
};
|
|
35
39
|
const PROJECT = "komodo";
|
|
@@ -51,7 +55,7 @@ const desiredImages = (parsed) => ({
|
|
|
51
55
|
core: parsed.coreImage,
|
|
52
56
|
periphery: parsed.peripheryImage,
|
|
53
57
|
});
|
|
54
|
-
const composeYaml = (images) => [
|
|
58
|
+
const composeYaml = (images, id, hash) => [
|
|
55
59
|
"services:",
|
|
56
60
|
" postgres:",
|
|
57
61
|
` image: ${images["postgres"]}`,
|
|
@@ -68,34 +72,30 @@ const composeYaml = (images) => [
|
|
|
68
72
|
` image: ${images["core"]}`,
|
|
69
73
|
" restart: unless-stopped",
|
|
70
74
|
" depends_on: [ ferretdb ]",
|
|
71
|
-
` ports: [ "${
|
|
75
|
+
` ports: [ "${KOMODO_CORE_PORT}:9120" ]`,
|
|
72
76
|
" env_file: ./.env",
|
|
73
77
|
" volumes: [ keys:/config/keys, ./config.toml:/config/config.toml:ro ]",
|
|
74
|
-
` labels: [ "intentic.id=${
|
|
78
|
+
` labels: [ "intentic.id=${id}", "intentic.type=komodo", "intentic.hash=${hash}" ]`,
|
|
75
79
|
" periphery:",
|
|
76
80
|
` image: ${images["periphery"]}`,
|
|
77
81
|
" restart: unless-stopped",
|
|
82
|
+
" security_opt: [ systempaths=unconfined ]",
|
|
78
83
|
" volumes: [ /var/run/docker.sock:/var/run/docker.sock, /proc:/proc, keys:/config/keys ]",
|
|
79
84
|
"volumes: { postgres-data: {}, ferretdb-state: {}, keys: {} }",
|
|
80
85
|
"",
|
|
81
86
|
].join("\n");
|
|
82
87
|
const configToml = (parsed) => {
|
|
83
|
-
const
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
`domain = "${git.domain}"`,
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
"[[docker_registry]]",
|
|
91
|
-
`domain = "${parsed.registry}"`,
|
|
92
|
-
`accounts = [{ username = "${parsed.adminUser}", token = "${parsed.packagesToken}" }]`,
|
|
93
|
-
"",
|
|
94
|
-
].join("\n");
|
|
88
|
+
const lines = [];
|
|
89
|
+
if (parsed.gitUrl !== undefined && parsed.gitAccount !== undefined && parsed.gitToken !== undefined) {
|
|
90
|
+
const git = gitProvider(parsed.gitUrl);
|
|
91
|
+
lines.push("[[git_provider]]", `domain = "${git.domain}"`, `https = ${git.https}`, `accounts = [{ username = "${parsed.gitAccount}", token = "${parsed.gitToken}" }]`, "");
|
|
92
|
+
}
|
|
93
|
+
lines.push("[[docker_registry]]", `domain = "${parsed.registry}"`, `accounts = [{ username = "${parsed.registryUser}", token = "${parsed.registryToken}" }]`, "");
|
|
94
|
+
return lines.join("\n");
|
|
95
95
|
};
|
|
96
|
-
const ensureFiles = async (session, parsed, images) => {
|
|
96
|
+
const ensureFiles = async (session, parsed, images, id, hash) => {
|
|
97
97
|
await session.exec(`mkdir -p ${STATE_DIR}`);
|
|
98
|
-
await session.exec(`cat > ${STATE_DIR}/compose.yaml <<'COMPOSE_EOF'\n${composeYaml(images)}COMPOSE_EOF`);
|
|
98
|
+
await session.exec(`cat > ${STATE_DIR}/compose.yaml <<'COMPOSE_EOF'\n${composeYaml(images, id, hash)}COMPOSE_EOF`);
|
|
99
99
|
await session.exec(`cat > ${STATE_DIR}/config.toml <<'CONFIG_EOF'\n${configToml(parsed)}CONFIG_EOF`);
|
|
100
100
|
const staticEnv = [
|
|
101
101
|
"TZ=Etc/UTC",
|
|
@@ -120,7 +120,7 @@ const ensureFiles = async (session, parsed, images) => {
|
|
|
120
120
|
await session.exec(`test -f ${STATE_DIR}/.env || { printf '%s\\n' ${staticEnv} > ${STATE_DIR}/.env; { ${generated}; } >> ${STATE_DIR}/.env; }`);
|
|
121
121
|
};
|
|
122
122
|
const healthy = async (session, parsed) => {
|
|
123
|
-
const result = await session.exec(`wget -q -O /dev/null ${internalUrl(parsed)}`);
|
|
123
|
+
const result = await session.exec(`wget -q -T 10 -O /dev/null ${internalUrl(parsed)}`);
|
|
124
124
|
return result.code === 0;
|
|
125
125
|
};
|
|
126
126
|
const waitHealthy = async (session, parsed) => {
|
|
@@ -132,11 +132,14 @@ const waitHealthy = async (session, parsed) => {
|
|
|
132
132
|
if (Date.now() >= deadline) {
|
|
133
133
|
throw new Error(`komodo did not become healthy within ${READY_TIMEOUT_MS}ms`);
|
|
134
134
|
}
|
|
135
|
-
await
|
|
135
|
+
await sleep(READY_INTERVAL_MS);
|
|
136
136
|
}
|
|
137
137
|
};
|
|
138
138
|
export const createKomodoProvider = (executor = sshExecutor) => ({
|
|
139
139
|
read: async (inputs, ctx) => {
|
|
140
|
+
if (hasPendingRef(inputs, "internalIp", "gitUrl", "gitAccount", "gitToken", "registry", "registryUser", "registryToken")) {
|
|
141
|
+
return undefined;
|
|
142
|
+
}
|
|
140
143
|
const parsed = parse(inputs);
|
|
141
144
|
let session;
|
|
142
145
|
try {
|
|
@@ -147,10 +150,11 @@ export const createKomodoProvider = (executor = sshExecutor) => ({
|
|
|
147
150
|
return undefined;
|
|
148
151
|
}
|
|
149
152
|
try {
|
|
150
|
-
if (!(await running(session)) || !(await healthy(session, parsed))) {
|
|
153
|
+
if (!(await running(session, ctx.id)) || !(await healthy(session, parsed))) {
|
|
151
154
|
return undefined;
|
|
152
155
|
}
|
|
153
|
-
|
|
156
|
+
const stampHash = await containerLabel(session, ctx.id, HASH_KEY);
|
|
157
|
+
return { outputs: outputsFor(parsed), detail: { images: await runningImages(session) }, ...(stampHash === "" ? {} : { stampHash }) };
|
|
154
158
|
}
|
|
155
159
|
finally {
|
|
156
160
|
await session.dispose();
|
|
@@ -171,7 +175,7 @@ export const createKomodoProvider = (executor = sshExecutor) => ({
|
|
|
171
175
|
const session = await executor.connect(sshTarget(parsed));
|
|
172
176
|
try {
|
|
173
177
|
const bringUp = async (images) => {
|
|
174
|
-
await ensureFiles(session, parsed, images);
|
|
178
|
+
await ensureFiles(session, parsed, images, ctx.id, ctx.inputsHash ?? "");
|
|
175
179
|
const up = await session.exec(`docker compose -p komodo --project-directory ${STATE_DIR} --env-file ${STATE_DIR}/.env -f ${STATE_DIR}/compose.yaml up -d`);
|
|
176
180
|
if (up.code !== 0) {
|
|
177
181
|
throw new Error(`failed to bring up komodo stack: exited ${up.code}: ${up.stderr.trim()}`);
|
|
@@ -208,8 +212,7 @@ export const createKomodoProvider = (executor = sshExecutor) => ({
|
|
|
208
212
|
}
|
|
209
213
|
},
|
|
210
214
|
delete: async (inputs) => {
|
|
211
|
-
const
|
|
212
|
-
const session = await executor.connect(sshTarget(parsed));
|
|
215
|
+
const session = await executor.connect(sshTarget(parseInputs(sshSchema, inputs, "komodo")));
|
|
213
216
|
try {
|
|
214
217
|
await session.exec(`docker compose -p komodo --project-directory ${STATE_DIR} --env-file ${STATE_DIR}/.env -f ${STATE_DIR}/compose.yaml down -v 2>/dev/null || true`);
|
|
215
218
|
await session.exec(`rm -rf ${STATE_DIR}`);
|
|
@@ -218,5 +221,6 @@ export const createKomodoProvider = (executor = sshExecutor) => ({
|
|
|
218
221
|
await session.dispose();
|
|
219
222
|
}
|
|
220
223
|
},
|
|
224
|
+
list: (sources, ctx) => listStampedContainers(executor, "komodo", sources, ctx.log),
|
|
221
225
|
});
|
|
222
226
|
//# sourceMappingURL=komodo.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"komodo.js","sourceRoot":"","sources":["../../src/komodo/komodo.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"komodo.js","sourceRoot":"","sources":["../../src/komodo/komodo.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cf-route.d.ts","sourceRoot":"","sources":["../../src/network/cf-route.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cf-route.d.ts","sourceRoot":"","sources":["../../src/network/cf-route.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAgBzD,MAAM,MAAM,kBAAkB,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAsCrG,eAAO,MAAM,qBAAqB,GAC9B,MAAK,aAA6B,EAClC,mBAAkB,kBAA0C,KAC7D,QAoED,CAAC"}
|
package/dist/network/cf-route.js
CHANGED
|
@@ -1,13 +1,16 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { setTimeout as sleep } from "node:timers/promises";
|
|
2
|
+
import { formatStamp, parseStamp, STAMP_KEY } from "@intentic/graph";
|
|
2
3
|
import { z } from "zod";
|
|
3
4
|
import { parseInputs } from "../core/inputs.js";
|
|
4
5
|
import { cloudflareApi } from "./cloudflare-api.js";
|
|
5
6
|
const cfRouteSchema = z.object({ hostname: z.string(), zoneId: z.string(), apiToken: z.string(), cname: z.string() });
|
|
6
7
|
const parse = (inputs) => parseInputs(cfRouteSchema, inputs, "cf-route");
|
|
8
|
+
const deleteSchema = cfRouteSchema.omit({ cname: true });
|
|
7
9
|
const dohResolves = async (hostname) => {
|
|
8
10
|
try {
|
|
9
11
|
const response = await fetch(`https://cloudflare-dns.com/dns-query?name=${encodeURIComponent(hostname)}&type=A`, {
|
|
10
12
|
headers: { accept: "application/dns-json" },
|
|
13
|
+
signal: AbortSignal.timeout(10_000),
|
|
11
14
|
});
|
|
12
15
|
if (!response.ok) {
|
|
13
16
|
return false;
|
|
@@ -29,12 +32,15 @@ const waitForDnsPropagation = async (hostname, log) => {
|
|
|
29
32
|
log(`cf-route: ${hostname} not yet observable via DoH after 90s; proceeding (downstream calls may need a retry)`);
|
|
30
33
|
return;
|
|
31
34
|
}
|
|
32
|
-
await
|
|
35
|
+
await sleep(2000);
|
|
33
36
|
}
|
|
34
37
|
};
|
|
35
38
|
export const createCfRouteProvider = (api = cloudflareApi, awaitPropagation = waitForDnsPropagation) => ({
|
|
36
39
|
read: async (inputs) => {
|
|
37
|
-
|
|
40
|
+
if (typeof inputs["zoneId"] !== "string") {
|
|
41
|
+
return undefined;
|
|
42
|
+
}
|
|
43
|
+
const { hostname, zoneId, apiToken } = parseInputs(deleteSchema, inputs, "cf-route");
|
|
38
44
|
const record = await api.findDnsRecord({ apiToken, zoneId, name: hostname });
|
|
39
45
|
if (record === undefined) {
|
|
40
46
|
return undefined;
|
|
@@ -42,6 +48,9 @@ export const createCfRouteProvider = (api = cloudflareApi, awaitPropagation = wa
|
|
|
42
48
|
return { outputs: { url: `https://${hostname}` }, detail: { content: record.content } };
|
|
43
49
|
},
|
|
44
50
|
diff: (inputs, observed) => {
|
|
51
|
+
if (typeof inputs["cname"] !== "string") {
|
|
52
|
+
return { action: "update", reason: "tunnel not created yet — its cname is not derivable" };
|
|
53
|
+
}
|
|
45
54
|
const { cname } = parse(inputs);
|
|
46
55
|
const content = observed.detail?.["content"];
|
|
47
56
|
if (content === cname) {
|
|
@@ -63,12 +72,29 @@ export const createCfRouteProvider = (api = cloudflareApi, awaitPropagation = wa
|
|
|
63
72
|
return { url: `https://${hostname}` };
|
|
64
73
|
},
|
|
65
74
|
delete: async (inputs) => {
|
|
66
|
-
const { hostname, zoneId, apiToken } =
|
|
75
|
+
const { hostname, zoneId, apiToken } = parseInputs(deleteSchema, inputs, "cf-route");
|
|
67
76
|
const record = await api.findDnsRecord({ apiToken, zoneId, name: hostname });
|
|
68
77
|
if (record === undefined) {
|
|
69
78
|
return;
|
|
70
79
|
}
|
|
71
80
|
await api.deleteDnsRecord({ apiToken, zoneId, recordId: record.id });
|
|
72
81
|
},
|
|
82
|
+
list: async (sources, ctx) => {
|
|
83
|
+
const account = sources.find((source) => source.type === "cloudflare");
|
|
84
|
+
if (account === undefined) {
|
|
85
|
+
return [];
|
|
86
|
+
}
|
|
87
|
+
const { apiToken, zone } = parseInputs(z.object({ apiToken: z.string(), zone: z.string() }), account.inputs, "cloudflare");
|
|
88
|
+
const found = await api.getZone({ apiToken, zone });
|
|
89
|
+
if (found === undefined) {
|
|
90
|
+
ctx.log(`cf-route list: zone "${zone}" not found, skipping scan`);
|
|
91
|
+
return [];
|
|
92
|
+
}
|
|
93
|
+
const records = await api.listStampedDnsRecords({ apiToken, zoneId: found.id, commentPrefix: `${STAMP_KEY}=` });
|
|
94
|
+
return records.flatMap((record) => {
|
|
95
|
+
const id = parseStamp(record.comment);
|
|
96
|
+
return id === undefined ? [] : [{ id, inputs: { hostname: record.name, zoneId: found.id, apiToken } }];
|
|
97
|
+
});
|
|
98
|
+
},
|
|
73
99
|
});
|
|
74
100
|
//# sourceMappingURL=cf-route.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cf-route.js","sourceRoot":"","sources":["../../src/network/cf-route.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cf-route.js","sourceRoot":"","sources":["../../src/network/cf-route.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,11 @@ export interface CloudflareApi {
|
|
|
36
36
|
readonly apiToken: string;
|
|
37
37
|
readonly tunnelId: string;
|
|
38
38
|
}) => Promise<string>;
|
|
39
|
+
readonly getTunnelStatus: (args: {
|
|
40
|
+
readonly accountId: string;
|
|
41
|
+
readonly apiToken: string;
|
|
42
|
+
readonly tunnelId: string;
|
|
43
|
+
}) => Promise<string>;
|
|
39
44
|
readonly getTunnelIngress: (args: {
|
|
40
45
|
readonly accountId: string;
|
|
41
46
|
readonly apiToken: string;
|
|
@@ -55,6 +60,14 @@ export interface CloudflareApi {
|
|
|
55
60
|
readonly id: string;
|
|
56
61
|
readonly content: string;
|
|
57
62
|
} | undefined>;
|
|
63
|
+
readonly listStampedDnsRecords: (args: {
|
|
64
|
+
readonly apiToken: string;
|
|
65
|
+
readonly zoneId: string;
|
|
66
|
+
readonly commentPrefix: string;
|
|
67
|
+
}) => Promise<{
|
|
68
|
+
readonly name: string;
|
|
69
|
+
readonly comment: string;
|
|
70
|
+
}[]>;
|
|
58
71
|
readonly createDnsRecord: (args: {
|
|
59
72
|
readonly apiToken: string;
|
|
60
73
|
readonly zoneId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudflare-api.d.ts","sourceRoot":"","sources":["../../src/network/cloudflare-api.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,WAAW;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC5B;AAOD,MAAM,WAAW,aAAa;IAG1B,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE;QACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;KACzB,KAAK,OAAO,CAAC;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC,CAAC;IAG/E,QAAQ,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE;QACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;KAC7B,KAAK,OAAO,CAAC;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC,CAAC;IAE5F,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE;QACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;KACzB,KAAK,OAAO,CAAC;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC,CAAC;IAEnD,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE;QAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;KACzB,KAAK,OAAO,CAAC;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAEvC,QAAQ,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cloudflare-api.d.ts","sourceRoot":"","sources":["../../src/network/cloudflare-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,13 +10,23 @@ const envelopeSchema = z.object({
|
|
|
10
10
|
});
|
|
11
11
|
const request = async (apiToken, path, init) => {
|
|
12
12
|
const label = `Cloudflare API ${init?.method ?? "GET"} ${path}`;
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
...
|
|
18
|
-
|
|
19
|
-
|
|
13
|
+
const started = Date.now();
|
|
14
|
+
let response;
|
|
15
|
+
try {
|
|
16
|
+
response = await fetch(`${BASE}${path}`, {
|
|
17
|
+
...init,
|
|
18
|
+
headers: {
|
|
19
|
+
Authorization: `Bearer ${apiToken}`,
|
|
20
|
+
...(init?.body !== undefined ? { "Content-Type": "application/json" } : {}),
|
|
21
|
+
},
|
|
22
|
+
signal: AbortSignal.timeout(30_000),
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
throw new Error(`${label} transport failed after ${Date.now() - started}ms: ${error instanceof Error ? error.message : String(error)}`, {
|
|
27
|
+
cause: error,
|
|
28
|
+
});
|
|
29
|
+
}
|
|
20
30
|
const envelope = parseResponse(envelopeSchema, await response.json(), label);
|
|
21
31
|
if (!response.ok || !envelope.success) {
|
|
22
32
|
const detail = envelope.errors.map((error) => `${error.code} ${error.message}`).join("; ");
|
|
@@ -65,6 +75,10 @@ export const cloudflareApi = {
|
|
|
65
75
|
body: JSON.stringify({ name, config_src: "cloudflare" }),
|
|
66
76
|
}),
|
|
67
77
|
getTunnelToken: ({ accountId, apiToken, tunnelId }) => call(apiToken, `/accounts/${encodeURIComponent(accountId)}/cfd_tunnel/${encodeURIComponent(tunnelId)}/token`, z.string()),
|
|
78
|
+
getTunnelStatus: async ({ accountId, apiToken, tunnelId }) => {
|
|
79
|
+
const tunnel = await call(apiToken, `/accounts/${encodeURIComponent(accountId)}/cfd_tunnel/${encodeURIComponent(tunnelId)}`, z.object({ status: z.string() }));
|
|
80
|
+
return tunnel.status;
|
|
81
|
+
},
|
|
68
82
|
getTunnelIngress: async ({ accountId, apiToken, tunnelId }) => {
|
|
69
83
|
const config = await call(apiToken, `/accounts/${encodeURIComponent(accountId)}/cfd_tunnel/${encodeURIComponent(tunnelId)}/configurations`, z.object({ config: z.object({ ingress: z.array(ingressRuleSchema).optional() }).optional() }).nullable());
|
|
70
84
|
const ingress = config?.config?.ingress;
|
|
@@ -84,6 +98,10 @@ export const cloudflareApi = {
|
|
|
84
98
|
}
|
|
85
99
|
return { id: found.id, content: found.content };
|
|
86
100
|
},
|
|
101
|
+
listStampedDnsRecords: async ({ apiToken, zoneId, commentPrefix }) => {
|
|
102
|
+
const records = await call(apiToken, `/zones/${encodeURIComponent(zoneId)}/dns_records?comment.startswith=${encodeURIComponent(commentPrefix)}&per_page=1000`, z.array(z.object({ name: z.string(), comment: z.string() })));
|
|
103
|
+
return records;
|
|
104
|
+
},
|
|
87
105
|
createDnsRecord: async ({ apiToken, zoneId, name, content, comment }) => {
|
|
88
106
|
await call(apiToken, `/zones/${encodeURIComponent(zoneId)}/dns_records`, z.unknown(), {
|
|
89
107
|
method: "POST",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudflare-api.js","sourceRoot":"","sources":["../../src/network/cloudflare-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AASlD,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cloudflare-api.js","sourceRoot":"","sources":["../../src/network/cloudflare-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel.d.ts","sourceRoot":"","sources":["../../src/network/tunnel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tunnel.d.ts","sourceRoot":"","sources":["../../src/network/tunnel.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAmC,MAAM,kBAAkB,CAAC;AAGlF,OAAO,KAAK,EAAE,WAAW,EAAc,MAAM,gBAAgB,CAAC;AAE9D,OAAO,KAAK,EAAE,aAAa,EAAe,MAAM,qBAAqB,CAAC;AA4HtE,eAAO,MAAM,oBAAoB,GAAI,MAAK,aAA6B,EAAE,WAAU,WAAyB,KAAG,QA4E7G,CAAC"}
|
package/dist/network/tunnel.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { setTimeout as sleep } from "node:timers/promises";
|
|
1
2
|
import { z } from "zod";
|
|
2
|
-
import { parseInputs, sshSchema, sshTarget } from "../core/inputs.js";
|
|
3
|
-
import { sshExecutor } from "../core/ssh.js";
|
|
3
|
+
import { hasPendingRef, parseInputs, sshSchema, sshTarget } from "../core/inputs.js";
|
|
4
|
+
import { connectWithRetry, sshExecutor } from "../core/ssh.js";
|
|
4
5
|
import { cloudflareApi } from "./cloudflare-api.js";
|
|
5
6
|
const tunnelSchema = sshSchema.extend({
|
|
6
7
|
name: z.string(),
|
|
@@ -12,8 +13,8 @@ const tunnelSchema = sshSchema.extend({
|
|
|
12
13
|
const parse = (inputs) => parseInputs(tunnelSchema, inputs, "tunnel");
|
|
13
14
|
const CATCH_ALL = { service: "http_status:404" };
|
|
14
15
|
const desiredRules = (parsed) => [
|
|
15
|
-
...
|
|
16
|
-
.
|
|
16
|
+
...parsed.ingress
|
|
17
|
+
.toSorted((a, b) => Number(a.hostname.startsWith("*")) - Number(b.hostname.startsWith("*")))
|
|
17
18
|
.map((rule) => ({ hostname: rule.hostname, service: `http://127.0.0.1:${rule.port}` })),
|
|
18
19
|
CATCH_ALL,
|
|
19
20
|
];
|
|
@@ -50,8 +51,24 @@ const checkConnector = async (executor, parsed, tunnelId, ctx) => {
|
|
|
50
51
|
await session.dispose();
|
|
51
52
|
}
|
|
52
53
|
};
|
|
53
|
-
const
|
|
54
|
-
|
|
54
|
+
const CONNECT_TIMEOUT_MS = 120_000;
|
|
55
|
+
const CONNECT_INTERVAL_MS = 3_000;
|
|
56
|
+
const waitConnected = async (api, parsed, tunnelId, log) => {
|
|
57
|
+
const deadline = Date.now() + CONNECT_TIMEOUT_MS;
|
|
58
|
+
for (;;) {
|
|
59
|
+
const status = await api.getTunnelStatus({ accountId: parsed.accountId, apiToken: parsed.apiToken, tunnelId });
|
|
60
|
+
if (status === "healthy" || status === "degraded") {
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
if (Date.now() >= deadline) {
|
|
64
|
+
throw new Error(`cloudflared connector did not register with Cloudflare within ${CONNECT_TIMEOUT_MS}ms (tunnel status "${status}")`);
|
|
65
|
+
}
|
|
66
|
+
log(`tunnel "${parsed.name}": waiting for the connector to register with Cloudflare (status "${status}")…`);
|
|
67
|
+
await sleep(CONNECT_INTERVAL_MS);
|
|
68
|
+
}
|
|
69
|
+
};
|
|
70
|
+
const runConnector = async (executor, parsed, tunnelId, token, log) => {
|
|
71
|
+
const session = await connectWithRetry(executor, sshTarget(parsed), { log });
|
|
55
72
|
try {
|
|
56
73
|
const name = containerName(tunnelId);
|
|
57
74
|
await session.exec(`docker rm -f ${name} 2>/dev/null || true`);
|
|
@@ -66,6 +83,9 @@ const runConnector = async (executor, parsed, tunnelId, token) => {
|
|
|
66
83
|
};
|
|
67
84
|
export const createTunnelProvider = (api = cloudflareApi, executor = sshExecutor) => ({
|
|
68
85
|
read: async (inputs, ctx) => {
|
|
86
|
+
if (hasPendingRef(inputs, "accountId")) {
|
|
87
|
+
return undefined;
|
|
88
|
+
}
|
|
69
89
|
const parsed = parse(inputs);
|
|
70
90
|
const tunnel = await api.findTunnel({ accountId: parsed.accountId, apiToken: parsed.apiToken, name: parsed.name });
|
|
71
91
|
if (tunnel === undefined) {
|
|
@@ -94,18 +114,23 @@ export const createTunnelProvider = (api = cloudflareApi, executor = sshExecutor
|
|
|
94
114
|
}
|
|
95
115
|
return { action: "noop" };
|
|
96
116
|
},
|
|
97
|
-
apply: async (inputs) => {
|
|
117
|
+
apply: async (inputs, observed, ctx) => {
|
|
98
118
|
const parsed = parse(inputs);
|
|
99
119
|
const existing = await api.findTunnel({ accountId: parsed.accountId, apiToken: parsed.apiToken, name: parsed.name });
|
|
100
120
|
const tunnel = existing ?? (await api.createTunnel({ accountId: parsed.accountId, apiToken: parsed.apiToken, name: parsed.name }));
|
|
101
|
-
const token = await api.getTunnelToken({ accountId: parsed.accountId, apiToken: parsed.apiToken, tunnelId: tunnel.id });
|
|
102
121
|
await api.putTunnelIngress({
|
|
103
122
|
accountId: parsed.accountId,
|
|
104
123
|
apiToken: parsed.apiToken,
|
|
105
124
|
tunnelId: tunnel.id,
|
|
106
125
|
ingress: desiredRules(parsed),
|
|
107
126
|
});
|
|
108
|
-
|
|
127
|
+
const detail = observed?.detail;
|
|
128
|
+
const connectorCurrent = detail?.["connectorRunning"] === true && detail["image"] === parsed.image;
|
|
129
|
+
if (!connectorCurrent) {
|
|
130
|
+
const token = await api.getTunnelToken({ accountId: parsed.accountId, apiToken: parsed.apiToken, tunnelId: tunnel.id });
|
|
131
|
+
await runConnector(executor, parsed, tunnel.id, token, ctx.log);
|
|
132
|
+
await waitConnected(api, parsed, tunnel.id, ctx.log);
|
|
133
|
+
}
|
|
109
134
|
return { tunnelId: tunnel.id, cname: cname(tunnel.id) };
|
|
110
135
|
},
|
|
111
136
|
delete: async (inputs) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../src/network/tunnel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../src/network/tunnel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signoz.d.ts","sourceRoot":"","sources":["../../src/observability/signoz.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"signoz.d.ts","sourceRoot":"","sources":["../../src/observability/signoz.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAOjE,OAAO,EAAE,KAAK,WAAW,EAAe,MAAM,gBAAgB,CAAC;AA6Y/D,eAAO,MAAM,oBAAoB,GAAI,WAAU,WAAyB,KAAG,QAgEzE,CAAC"}
|