@ultrst-armada/kloks 2.2.0 → 2.2.3
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/package.json +7 -2
- package/packages/backend/dist/api/uiSession.d.ts +8 -0
- package/packages/backend/dist/api/uiSession.js +132 -0
- package/packages/backend/dist/chunk-3RTRATDJ.js +105 -0
- package/packages/backend/dist/{chunk-TOLAWKAY.js → chunk-3ZL2DX73.js} +2 -101
- package/packages/backend/dist/{chunk-6I7I4C6H.js → chunk-4X4QGVAO.js} +1 -1
- package/packages/backend/dist/{chunk-23LS4LWC.js → chunk-7XTURV44.js} +5 -3
- package/packages/backend/dist/{chunk-GTKW4IGC.js → chunk-GCVR257U.js} +4 -2
- package/packages/backend/dist/{chunk-DTPCWHQJ.js → chunk-IIOQ7HXV.js} +1 -1
- package/packages/backend/dist/{chunk-DJ457D5D.js → chunk-IRKJ6HKP.js} +1 -1
- package/packages/backend/dist/{chunk-HYSBT3MP.js → chunk-K5LKAEBJ.js} +1 -1
- package/packages/backend/dist/{chunk-ENMIBY2V.js → chunk-NUBA6A5T.js} +2 -2
- package/packages/backend/dist/{chunk-ZSH73LE5.js → chunk-R4B3KPHY.js} +12 -10
- package/packages/backend/dist/index.js +18 -18
- package/packages/backend/dist/krnl-services.js +7 -6
- package/packages/backend/dist/node.js +54 -52
- package/packages/backend/dist/provider-services/google/drive.js +1 -1
- package/packages/backend/dist/provider-services/index.js +10 -10
- package/packages/backend/dist/provider-services/node.js +4 -4
- package/packages/backend/dist/provider-services/storage/dropbox.js +1 -1
- package/packages/backend/dist/provider-services/storage/github.js +1 -1
- package/packages/backend/dist/provider-services/storage/node.js +4 -4
- package/packages/backend/dist/provider-services/storage.js +4 -4
- package/packages/backend/dist/services/node.js +6 -5
- package/packages/backend/dist/srkl/index.js +5 -4
- package/packages/backend/dist/workspace/node.js +6 -5
- package/packages/backend/dist/{workspaceFileCore-RQO7YMRD.js → workspaceFileCore-XPT6WTFY.js} +4 -3
- package/packages/backend/package.json +7 -2
- package/packages/state-graph/dist/browser.js +24 -24
- package/packages/state-graph/dist/index.js +24 -24
- package/packages/backend/dist/{chunk-T7R6Q7TZ.js → chunk-KQ6IWV3F.js} +3 -3
- package/packages/state-graph/dist/{chunk-UKTICGGV.js → chunk-YUJC367F.js} +3 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ultrst-armada/kloks",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.3",
|
|
4
4
|
"private": false,
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public",
|
|
@@ -26,6 +26,11 @@
|
|
|
26
26
|
"scripts/normalize-package-declarations.mjs"
|
|
27
27
|
],
|
|
28
28
|
"exports": {
|
|
29
|
+
"./backend/ui-session": {
|
|
30
|
+
"types": "./packages/backend/dist/api/uiSession.d.ts",
|
|
31
|
+
"import": "./packages/backend/dist/api/uiSession.js",
|
|
32
|
+
"default": "./packages/backend/dist/api/uiSession.js"
|
|
33
|
+
},
|
|
29
34
|
".": {
|
|
30
35
|
"types": "./index.d.ts",
|
|
31
36
|
"import": "./index.js",
|
|
@@ -346,7 +351,7 @@
|
|
|
346
351
|
"verify:package-exports": "node scripts/verify-package-exports.mjs"
|
|
347
352
|
},
|
|
348
353
|
"dependencies": {
|
|
349
|
-
"@dinilmusick/gutts": "2.2.
|
|
354
|
+
"@dinilmusick/gutts": "2.2.2",
|
|
350
355
|
"@webcontainer/api": "^1.6.4",
|
|
351
356
|
"ws": "^8.18.0",
|
|
352
357
|
"zod": "^3.24.1",
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
type UiSessionInput = {
|
|
2
|
+
appId: string;
|
|
3
|
+
principalId: string;
|
|
4
|
+
env?: Record<string, unknown>;
|
|
5
|
+
};
|
|
6
|
+
/** Call after the application's canonical Luth gate, with its verified principal. */
|
|
7
|
+
export declare function handleUiSessionRequest(request: Request, input: UiSessionInput): Promise<Response | undefined>;
|
|
8
|
+
export {};
|
|
@@ -0,0 +1,132 @@
|
|
|
1
|
+
import {
|
|
2
|
+
queryUnifiedDb
|
|
3
|
+
} from "../chunk-3RTRATDJ.js";
|
|
4
|
+
import "../chunk-IP6XWQU2.js";
|
|
5
|
+
|
|
6
|
+
// src/api/uiSession.ts
|
|
7
|
+
var prefix = "/api/ui-session/";
|
|
8
|
+
var idPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
|
|
9
|
+
var snapshotLimit = 256 * 1024;
|
|
10
|
+
var maxActionLength = 128;
|
|
11
|
+
var table = `CREATE TABLE IF NOT EXISTS ultrst_ui_sessions (
|
|
12
|
+
scope text NOT NULL, principal text NOT NULL, tab uuid NOT NULL,
|
|
13
|
+
revision uuid NOT NULL, snapshot jsonb NOT NULL, command jsonb, status text,
|
|
14
|
+
expires_at timestamptz NOT NULL, updated_at timestamptz NOT NULL,
|
|
15
|
+
PRIMARY KEY (scope, principal, tab)
|
|
16
|
+
)`;
|
|
17
|
+
function respond(body, status = 200) {
|
|
18
|
+
return Response.json(body, { status, headers: { "Cache-Control": "no-store" } });
|
|
19
|
+
}
|
|
20
|
+
function record(value) {
|
|
21
|
+
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
22
|
+
}
|
|
23
|
+
function identifier(value) {
|
|
24
|
+
return typeof value === "string" && idPattern.test(value);
|
|
25
|
+
}
|
|
26
|
+
function actionName(value) {
|
|
27
|
+
return typeof value === "string" && value.length > 0 && value.length <= maxActionLength;
|
|
28
|
+
}
|
|
29
|
+
async function readBody(request) {
|
|
30
|
+
if (!request.body || !request.headers.get("Content-Type")?.toLowerCase().startsWith("application/json")) return null;
|
|
31
|
+
const reader = request.body.getReader();
|
|
32
|
+
const decoder = new TextDecoder();
|
|
33
|
+
let body = "";
|
|
34
|
+
let bytes = 0;
|
|
35
|
+
for (; ; ) {
|
|
36
|
+
const { value, done } = await reader.read();
|
|
37
|
+
if (done) break;
|
|
38
|
+
bytes += value.byteLength;
|
|
39
|
+
if (bytes > snapshotLimit) {
|
|
40
|
+
await reader.cancel();
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
body += decoder.decode(value, { stream: true });
|
|
44
|
+
}
|
|
45
|
+
body += decoder.decode();
|
|
46
|
+
try {
|
|
47
|
+
const parsed = JSON.parse(body);
|
|
48
|
+
return record(parsed) ? parsed : null;
|
|
49
|
+
} catch {
|
|
50
|
+
return null;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
function advertised(snapshot, componentId, controlId) {
|
|
54
|
+
return record(snapshot) && Array.isArray(snapshot.components) && snapshot.components.some((component) => record(component) && component.id === componentId && Array.isArray(component.actions) && component.actions.includes(controlId));
|
|
55
|
+
}
|
|
56
|
+
function query(input) {
|
|
57
|
+
return async (sql, params) => {
|
|
58
|
+
try {
|
|
59
|
+
return await queryUnifiedDb(sql, params, input.env);
|
|
60
|
+
} catch (error) {
|
|
61
|
+
if (error.code !== "42P01") throw error;
|
|
62
|
+
await queryUnifiedDb(table, [], input.env);
|
|
63
|
+
return await queryUnifiedDb(sql, params, input.env);
|
|
64
|
+
}
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
async function handleUiSessionRequest(request, input) {
|
|
68
|
+
const url = new URL(request.url);
|
|
69
|
+
if (!url.pathname.startsWith(prefix)) return;
|
|
70
|
+
if (!input.principalId || !input.appId) return respond({ error: "Authentication required" }, 401);
|
|
71
|
+
const path = url.pathname.slice(prefix.length);
|
|
72
|
+
const [tab, operation, extra] = path.split("/");
|
|
73
|
+
if (!identifier(tab) || extra !== void 0 || operation && !["action", "sync"].includes(operation)) {
|
|
74
|
+
return respond({ error: "Unknown UI session route" }, 404);
|
|
75
|
+
}
|
|
76
|
+
const origin = request.headers.get("Origin");
|
|
77
|
+
if (origin && origin !== url.origin) return respond({ error: "Cross-origin session access denied" }, 403);
|
|
78
|
+
const scope = [input.appId + ":" + url.origin, input.principalId, tab];
|
|
79
|
+
const run = query(input);
|
|
80
|
+
const active = "scope=$1 AND principal=$2 AND tab=$3 AND expires_at>now()";
|
|
81
|
+
try {
|
|
82
|
+
if (request.method === "GET" && !operation) {
|
|
83
|
+
const { rows: [row] } = await run(`SELECT revision, snapshot, command->>'id' AS "commandId", status,
|
|
84
|
+
updated_at AS "updatedAt" FROM ultrst_ui_sessions WHERE ${active}`, scope);
|
|
85
|
+
return row ? respond({ session: row }) : respond({ error: "UI session is unavailable or expired" }, 404);
|
|
86
|
+
}
|
|
87
|
+
if (request.method === "DELETE" && !operation) {
|
|
88
|
+
await run("DELETE FROM ultrst_ui_sessions WHERE scope=$1 AND principal=$2 AND tab=$3", scope);
|
|
89
|
+
return new Response(null, { status: 204, headers: { "Cache-Control": "no-store" } });
|
|
90
|
+
}
|
|
91
|
+
if (request.method !== "POST" || !operation) return respond({ error: "Unsupported method" }, 405);
|
|
92
|
+
const body = await readBody(request);
|
|
93
|
+
if (!body || !identifier(body.revision)) return respond({ error: "Invalid UI session payload" }, 400);
|
|
94
|
+
if (operation === "action") {
|
|
95
|
+
const { componentId, controlId, payload } = body;
|
|
96
|
+
if (!actionName(componentId) || !actionName(controlId)) return respond({ error: "Invalid action" }, 400);
|
|
97
|
+
const { rows: [row] } = await run(`SELECT snapshot FROM ultrst_ui_sessions WHERE ${active} AND revision=$4`, [...scope, body.revision]);
|
|
98
|
+
if (!row || !advertised(row.snapshot, componentId, controlId)) {
|
|
99
|
+
return respond({ error: "The action is unavailable for this snapshot" }, 409);
|
|
100
|
+
}
|
|
101
|
+
const id = crypto.randomUUID();
|
|
102
|
+
const command = { id, revision: body.revision, componentId, controlId, payload };
|
|
103
|
+
const result = await run(`UPDATE ultrst_ui_sessions SET command=$5, status='queued'
|
|
104
|
+
WHERE ${active} AND revision=$4 AND (status IS NULL OR status IN ('succeeded','failed'))
|
|
105
|
+
RETURNING revision`, [...scope, body.revision, JSON.stringify(command)]);
|
|
106
|
+
return result.rowCount ? respond({ actionId: id }, 202) : respond({ error: "Stale or busy UI session" }, 409);
|
|
107
|
+
}
|
|
108
|
+
if (!record(body.snapshot) || body.snapshot.version !== 1 || !Array.isArray(body.snapshot.components)) {
|
|
109
|
+
return respond({ error: "Invalid UI snapshot" }, 400);
|
|
110
|
+
}
|
|
111
|
+
const completion = record(body.completion) ? body.completion : void 0;
|
|
112
|
+
if (completion && identifier(completion.id) && (completion.status === "succeeded" || completion.status === "failed")) {
|
|
113
|
+
await run(`UPDATE ultrst_ui_sessions SET status=$5
|
|
114
|
+
WHERE ${active} AND command->>'id'=$4 AND status='running'`, [...scope, completion.id, completion.status]);
|
|
115
|
+
}
|
|
116
|
+
await run(`DELETE FROM ultrst_ui_sessions WHERE scope=$1 AND principal=$2 AND expires_at<=now()`, scope.slice(0, 2));
|
|
117
|
+
await run(
|
|
118
|
+
`INSERT INTO ultrst_ui_sessions (scope,principal,tab,revision,snapshot,expires_at,updated_at)
|
|
119
|
+
VALUES ($1,$2,$3,$4,$5,now()+interval '20 seconds',now()) ON CONFLICT (scope,principal,tab) DO UPDATE SET
|
|
120
|
+
revision=excluded.revision, snapshot=excluded.snapshot, expires_at=excluded.expires_at, updated_at=excluded.updated_at`,
|
|
121
|
+
[...scope, body.revision, JSON.stringify(body.snapshot)]
|
|
122
|
+
);
|
|
123
|
+
const { rows: [delivery] } = await run(`UPDATE ultrst_ui_sessions SET status='running'
|
|
124
|
+
WHERE ${active} AND status='queued' RETURNING command`, scope);
|
|
125
|
+
return respond({ command: delivery?.command ?? null });
|
|
126
|
+
} catch {
|
|
127
|
+
return respond({ error: "UI session storage unavailable" }, 503);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
export {
|
|
131
|
+
handleUiSessionRequest
|
|
132
|
+
};
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
import {
|
|
2
|
+
resolveSystemDatabaseUrlCandidates,
|
|
3
|
+
tryResolveSystemDatabaseUrl
|
|
4
|
+
} from "./chunk-IP6XWQU2.js";
|
|
5
|
+
|
|
6
|
+
// src/core/unifiedDb.ts
|
|
7
|
+
var neon;
|
|
8
|
+
var defaultSystemEnvironmentResolver = null;
|
|
9
|
+
function configureUnifiedDatabaseEnvironmentResolver(resolver) {
|
|
10
|
+
defaultSystemEnvironmentResolver = resolver;
|
|
11
|
+
}
|
|
12
|
+
function defaultSystemEnvironment() {
|
|
13
|
+
return defaultSystemEnvironmentResolver?.() || {};
|
|
14
|
+
}
|
|
15
|
+
function cleanDbUrl(url) {
|
|
16
|
+
if (typeof url !== "string") return "";
|
|
17
|
+
return url.trim().replace(/^["']|["']$/g, "").trim();
|
|
18
|
+
}
|
|
19
|
+
function getUnifiedDbUrl(env) {
|
|
20
|
+
const supplied = env || {};
|
|
21
|
+
const hasCanonicalBindings = [
|
|
22
|
+
"SYSTEM_DATABASE_URL",
|
|
23
|
+
"SYSTEM_DATABASE_URL_2",
|
|
24
|
+
"SYSTEM_DATABASE_URL_3"
|
|
25
|
+
].some((key) => Object.prototype.hasOwnProperty.call(supplied, key));
|
|
26
|
+
const effective = env === void 0 ? defaultSystemEnvironment() : hasCanonicalBindings ? supplied : { ...defaultSystemEnvironment(), ...supplied };
|
|
27
|
+
return tryResolveSystemDatabaseUrl(effective) || "";
|
|
28
|
+
}
|
|
29
|
+
function isConnectionLevelFailure(error) {
|
|
30
|
+
const value = error;
|
|
31
|
+
const code = String(value?.code || value?.cause?.code || "").toUpperCase();
|
|
32
|
+
if ([
|
|
33
|
+
"ECONNRESET",
|
|
34
|
+
"ECONNREFUSED",
|
|
35
|
+
"ENOTFOUND",
|
|
36
|
+
"EAI_AGAIN",
|
|
37
|
+
"ETIMEDOUT",
|
|
38
|
+
"EHOSTUNREACH",
|
|
39
|
+
"ENETUNREACH",
|
|
40
|
+
"UND_ERR_CONNECT_TIMEOUT",
|
|
41
|
+
"08000",
|
|
42
|
+
"08001",
|
|
43
|
+
"08003",
|
|
44
|
+
"08004",
|
|
45
|
+
"08006",
|
|
46
|
+
"08007",
|
|
47
|
+
"57P03"
|
|
48
|
+
].includes(code)) return true;
|
|
49
|
+
const message = String(value?.message || error || "").toLowerCase();
|
|
50
|
+
return message.includes("fetch failed") || message.includes("network error") || message.includes("connection terminated unexpectedly") || message.includes("socket hang up") || message.includes("connect timeout");
|
|
51
|
+
}
|
|
52
|
+
async function queryUnifiedDb(sqlText, params = [], env) {
|
|
53
|
+
const supplied = env || {};
|
|
54
|
+
const hasCanonicalBindings = [
|
|
55
|
+
"SYSTEM_DATABASE_URL",
|
|
56
|
+
"SYSTEM_DATABASE_URL_2",
|
|
57
|
+
"SYSTEM_DATABASE_URL_3"
|
|
58
|
+
].some((key) => Object.prototype.hasOwnProperty.call(supplied, key));
|
|
59
|
+
const effectiveEnv = env === void 0 ? defaultSystemEnvironment() : hasCanonicalBindings ? supplied : { ...defaultSystemEnvironment(), ...supplied };
|
|
60
|
+
const databaseUrls = resolveSystemDatabaseUrlCandidates(effectiveEnv);
|
|
61
|
+
if (databaseUrls.length === 0) {
|
|
62
|
+
throw new Error(
|
|
63
|
+
"[UnifiedDB] Missing system database configuration. Set SYSTEM_DATABASE_URL; SYSTEM_DATABASE_URL_2 and SYSTEM_DATABASE_URL_3 are optional failover URLs."
|
|
64
|
+
);
|
|
65
|
+
}
|
|
66
|
+
if (!neon) {
|
|
67
|
+
const mod = await import("@neondatabase/serverless");
|
|
68
|
+
neon = mod.neon;
|
|
69
|
+
}
|
|
70
|
+
let lastError;
|
|
71
|
+
for (let index = 0; index < databaseUrls.length; index += 1) {
|
|
72
|
+
const databaseUrl = databaseUrls[index];
|
|
73
|
+
try {
|
|
74
|
+
const sql = neon(databaseUrl);
|
|
75
|
+
const rows = await (sql.query ? sql.query(sqlText, params) : sql(sqlText, params));
|
|
76
|
+
return {
|
|
77
|
+
rows: Array.isArray(rows) ? rows : [],
|
|
78
|
+
rowCount: Array.isArray(rows) ? rows.length : 0
|
|
79
|
+
};
|
|
80
|
+
} catch (error) {
|
|
81
|
+
lastError = error;
|
|
82
|
+
const hasNextFallback = index < databaseUrls.length - 1;
|
|
83
|
+
if (!hasNextFallback || !isConnectionLevelFailure(error)) {
|
|
84
|
+
break;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
const rawCode = String(
|
|
89
|
+
lastError?.code || lastError?.cause?.code || ""
|
|
90
|
+
).toUpperCase();
|
|
91
|
+
const safeCode = /^[A-Z0-9]{5}$/.test(rawCode) ? rawCode : "";
|
|
92
|
+
console.error("[UnifiedDB] Query execution failed.", safeCode ? { code: safeCode } : void 0);
|
|
93
|
+
const sanitizedError = new Error(
|
|
94
|
+
safeCode ? `[UnifiedDB] Query execution failed (database code ${safeCode}).` : "[UnifiedDB] Query execution failed."
|
|
95
|
+
);
|
|
96
|
+
if (safeCode) Object.assign(sanitizedError, { code: safeCode });
|
|
97
|
+
throw sanitizedError;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
export {
|
|
101
|
+
configureUnifiedDatabaseEnvironmentResolver,
|
|
102
|
+
cleanDbUrl,
|
|
103
|
+
getUnifiedDbUrl,
|
|
104
|
+
queryUnifiedDb
|
|
105
|
+
};
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
} from "./chunk-IP6XWQU2.js";
|
|
2
|
+
queryUnifiedDb
|
|
3
|
+
} from "./chunk-3RTRATDJ.js";
|
|
5
4
|
import {
|
|
6
5
|
authorizeB2,
|
|
7
6
|
b2ListBuckets
|
|
@@ -10,100 +9,6 @@ import {
|
|
|
10
9
|
GoogleDriveWorkspaceService
|
|
11
10
|
} from "./chunk-EMSSTOOK.js";
|
|
12
11
|
|
|
13
|
-
// src/core/unifiedDb.ts
|
|
14
|
-
var neon;
|
|
15
|
-
var defaultSystemEnvironmentResolver = null;
|
|
16
|
-
function configureUnifiedDatabaseEnvironmentResolver(resolver) {
|
|
17
|
-
defaultSystemEnvironmentResolver = resolver;
|
|
18
|
-
}
|
|
19
|
-
function defaultSystemEnvironment() {
|
|
20
|
-
return defaultSystemEnvironmentResolver?.() || {};
|
|
21
|
-
}
|
|
22
|
-
function cleanDbUrl(url) {
|
|
23
|
-
if (typeof url !== "string") return "";
|
|
24
|
-
return url.trim().replace(/^["']|["']$/g, "").trim();
|
|
25
|
-
}
|
|
26
|
-
function getUnifiedDbUrl(env) {
|
|
27
|
-
const supplied = env || {};
|
|
28
|
-
const hasCanonicalBindings = [
|
|
29
|
-
"SYSTEM_DATABASE_URL",
|
|
30
|
-
"SYSTEM_DATABASE_URL_2",
|
|
31
|
-
"SYSTEM_DATABASE_URL_3"
|
|
32
|
-
].some((key) => Object.prototype.hasOwnProperty.call(supplied, key));
|
|
33
|
-
const effective = env === void 0 ? defaultSystemEnvironment() : hasCanonicalBindings ? supplied : { ...defaultSystemEnvironment(), ...supplied };
|
|
34
|
-
return tryResolveSystemDatabaseUrl(effective) || "";
|
|
35
|
-
}
|
|
36
|
-
function isConnectionLevelFailure(error) {
|
|
37
|
-
const value = error;
|
|
38
|
-
const code = String(value?.code || value?.cause?.code || "").toUpperCase();
|
|
39
|
-
if ([
|
|
40
|
-
"ECONNRESET",
|
|
41
|
-
"ECONNREFUSED",
|
|
42
|
-
"ENOTFOUND",
|
|
43
|
-
"EAI_AGAIN",
|
|
44
|
-
"ETIMEDOUT",
|
|
45
|
-
"EHOSTUNREACH",
|
|
46
|
-
"ENETUNREACH",
|
|
47
|
-
"UND_ERR_CONNECT_TIMEOUT",
|
|
48
|
-
"08000",
|
|
49
|
-
"08001",
|
|
50
|
-
"08003",
|
|
51
|
-
"08004",
|
|
52
|
-
"08006",
|
|
53
|
-
"08007",
|
|
54
|
-
"57P03"
|
|
55
|
-
].includes(code)) return true;
|
|
56
|
-
const message = String(value?.message || error || "").toLowerCase();
|
|
57
|
-
return message.includes("fetch failed") || message.includes("network error") || message.includes("connection terminated unexpectedly") || message.includes("socket hang up") || message.includes("connect timeout");
|
|
58
|
-
}
|
|
59
|
-
async function queryUnifiedDb(sqlText, params = [], env) {
|
|
60
|
-
const supplied = env || {};
|
|
61
|
-
const hasCanonicalBindings = [
|
|
62
|
-
"SYSTEM_DATABASE_URL",
|
|
63
|
-
"SYSTEM_DATABASE_URL_2",
|
|
64
|
-
"SYSTEM_DATABASE_URL_3"
|
|
65
|
-
].some((key) => Object.prototype.hasOwnProperty.call(supplied, key));
|
|
66
|
-
const effectiveEnv = env === void 0 ? defaultSystemEnvironment() : hasCanonicalBindings ? supplied : { ...defaultSystemEnvironment(), ...supplied };
|
|
67
|
-
const databaseUrls = resolveSystemDatabaseUrlCandidates(effectiveEnv);
|
|
68
|
-
if (databaseUrls.length === 0) {
|
|
69
|
-
throw new Error(
|
|
70
|
-
"[UnifiedDB] Missing system database configuration. Set SYSTEM_DATABASE_URL; SYSTEM_DATABASE_URL_2 and SYSTEM_DATABASE_URL_3 are optional failover URLs."
|
|
71
|
-
);
|
|
72
|
-
}
|
|
73
|
-
if (!neon) {
|
|
74
|
-
const mod = await import("@neondatabase/serverless");
|
|
75
|
-
neon = mod.neon;
|
|
76
|
-
}
|
|
77
|
-
let lastError;
|
|
78
|
-
for (let index = 0; index < databaseUrls.length; index += 1) {
|
|
79
|
-
const databaseUrl = databaseUrls[index];
|
|
80
|
-
try {
|
|
81
|
-
const sql = neon(databaseUrl);
|
|
82
|
-
const rows = await (sql.query ? sql.query(sqlText, params) : sql(sqlText, params));
|
|
83
|
-
return {
|
|
84
|
-
rows: Array.isArray(rows) ? rows : [],
|
|
85
|
-
rowCount: Array.isArray(rows) ? rows.length : 0
|
|
86
|
-
};
|
|
87
|
-
} catch (error) {
|
|
88
|
-
lastError = error;
|
|
89
|
-
const hasNextFallback = index < databaseUrls.length - 1;
|
|
90
|
-
if (!hasNextFallback || !isConnectionLevelFailure(error)) {
|
|
91
|
-
break;
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
const rawCode = String(
|
|
96
|
-
lastError?.code || lastError?.cause?.code || ""
|
|
97
|
-
).toUpperCase();
|
|
98
|
-
const safeCode = /^[A-Z0-9]{5}$/.test(rawCode) ? rawCode : "";
|
|
99
|
-
console.error("[UnifiedDB] Query execution failed.", safeCode ? { code: safeCode } : void 0);
|
|
100
|
-
const sanitizedError = new Error(
|
|
101
|
-
safeCode ? `[UnifiedDB] Query execution failed (database code ${safeCode}).` : "[UnifiedDB] Query execution failed."
|
|
102
|
-
);
|
|
103
|
-
if (safeCode) Object.assign(sanitizedError, { code: safeCode });
|
|
104
|
-
throw sanitizedError;
|
|
105
|
-
}
|
|
106
|
-
|
|
107
12
|
// src/core/systemCredentialsCore.ts
|
|
108
13
|
function parseCredentials(value) {
|
|
109
14
|
if (typeof value === "string") {
|
|
@@ -1102,10 +1007,6 @@ async function getGoogleDriveAccountIdentityForUser(userId, connectionId, query
|
|
|
1102
1007
|
}
|
|
1103
1008
|
|
|
1104
1009
|
export {
|
|
1105
|
-
configureUnifiedDatabaseEnvironmentResolver,
|
|
1106
|
-
cleanDbUrl,
|
|
1107
|
-
getUnifiedDbUrl,
|
|
1108
|
-
queryUnifiedDb,
|
|
1109
1010
|
toPublicStorageConnection,
|
|
1110
1011
|
listUserStorageConnectionsWithSecrets,
|
|
1111
1012
|
setPrimaryUserStorageConnection,
|
|
@@ -2,16 +2,18 @@ import {
|
|
|
2
2
|
deleteWorkspaceFolder,
|
|
3
3
|
readWorkspaceFile,
|
|
4
4
|
writeWorkspaceFile
|
|
5
|
-
} from "./chunk-
|
|
5
|
+
} from "./chunk-GCVR257U.js";
|
|
6
6
|
import {
|
|
7
7
|
createGoogleDriveWorkspaceClient,
|
|
8
8
|
listUserStorageConnections,
|
|
9
|
-
queryUnifiedDb,
|
|
10
9
|
resolveUserStorageConnectionSecret,
|
|
11
10
|
resolveUserWorkspaceStorageAssociation,
|
|
12
11
|
testBackblazeCredentials,
|
|
13
12
|
toPublicStorageConnection
|
|
14
|
-
} from "./chunk-
|
|
13
|
+
} from "./chunk-3ZL2DX73.js";
|
|
14
|
+
import {
|
|
15
|
+
queryUnifiedDb
|
|
16
|
+
} from "./chunk-3RTRATDJ.js";
|
|
15
17
|
import {
|
|
16
18
|
b2ListBuckets,
|
|
17
19
|
b2ListFileNames
|
|
@@ -10,10 +10,10 @@ import {
|
|
|
10
10
|
findUserWorkspace,
|
|
11
11
|
getWorkspaces,
|
|
12
12
|
updateWorkspace
|
|
13
|
-
} from "./chunk-
|
|
13
|
+
} from "./chunk-7XTURV44.js";
|
|
14
14
|
import {
|
|
15
15
|
queryUnifiedDb
|
|
16
|
-
} from "./chunk-
|
|
16
|
+
} from "./chunk-3RTRATDJ.js";
|
|
17
17
|
import {
|
|
18
18
|
b2DownloadFile,
|
|
19
19
|
b2ListFileNames,
|
|
@@ -1,8 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
getPrimarySrklDeploymentUrl,
|
|
3
|
-
getSrklAccounts,
|
|
4
|
-
srklListBackblazeBuckets
|
|
5
|
-
} from "./chunk-DJ457D5D.js";
|
|
6
1
|
import {
|
|
7
2
|
formatCanonicalWorkspaceFolderName,
|
|
8
3
|
sanitizeWorkspaceName
|
|
@@ -13,13 +8,18 @@ import {
|
|
|
13
8
|
findUserWorkspace,
|
|
14
9
|
getWorkspaces,
|
|
15
10
|
updateWorkspace
|
|
16
|
-
} from "./chunk-
|
|
11
|
+
} from "./chunk-7XTURV44.js";
|
|
17
12
|
import {
|
|
18
13
|
deleteWorkspaceFile,
|
|
19
14
|
listWorkspaceFiles,
|
|
20
15
|
readWorkspaceFile,
|
|
21
16
|
writeWorkspaceFile
|
|
22
|
-
} from "./chunk-
|
|
17
|
+
} from "./chunk-GCVR257U.js";
|
|
18
|
+
import {
|
|
19
|
+
getPrimarySrklDeploymentUrl,
|
|
20
|
+
getSrklAccounts,
|
|
21
|
+
srklListBackblazeBuckets
|
|
22
|
+
} from "./chunk-IRKJ6HKP.js";
|
|
23
23
|
import {
|
|
24
24
|
completeGoogleDriveAuthorization,
|
|
25
25
|
createBackblazeStorageConnection,
|
|
@@ -34,7 +34,6 @@ import {
|
|
|
34
34
|
listUserStorageConnections,
|
|
35
35
|
listUserStorageConnectionsWithSecrets,
|
|
36
36
|
persistGoogleDriveTokens,
|
|
37
|
-
queryUnifiedDb,
|
|
38
37
|
readGoogleDriveFileForConnection,
|
|
39
38
|
resolveUserStorageConnectionSecret,
|
|
40
39
|
resolveUserWorkspaceStorageAssociation,
|
|
@@ -43,7 +42,10 @@ import {
|
|
|
43
42
|
testBackblazeCredentials,
|
|
44
43
|
testGoogleDriveConnectionForUser,
|
|
45
44
|
writeGoogleDriveFileForConnection
|
|
46
|
-
} from "./chunk-
|
|
45
|
+
} from "./chunk-3ZL2DX73.js";
|
|
46
|
+
import {
|
|
47
|
+
queryUnifiedDb
|
|
48
|
+
} from "./chunk-3RTRATDJ.js";
|
|
47
49
|
import {
|
|
48
50
|
loginSystemUser,
|
|
49
51
|
resolveUserFromToken
|
|
@@ -364,7 +366,7 @@ async function listUserWorkspaceStorageFiles(input) {
|
|
|
364
366
|
}
|
|
365
367
|
async function deleteUserWorkspaceStorageFolder(input) {
|
|
366
368
|
const context = await resolveWorkspaceContext(input, makeQuery(input.env));
|
|
367
|
-
const { deleteWorkspaceFolder } = await import("./workspaceFileCore-
|
|
369
|
+
const { deleteWorkspaceFolder } = await import("./workspaceFileCore-XPT6WTFY.js");
|
|
368
370
|
await deleteWorkspaceFolder(context.workspace, context.connection, input.env);
|
|
369
371
|
}
|
|
370
372
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import "./chunk-GVMVYC6C.js";
|
|
1
2
|
import "./chunk-2Y2EXYDK.js";
|
|
2
3
|
import "./chunk-RABSY2JU.js";
|
|
3
|
-
import "./chunk-GVMVYC6C.js";
|
|
4
4
|
import {
|
|
5
5
|
calculateProviderCapacity
|
|
6
6
|
} from "./chunk-5SXOQAAX.js";
|
|
@@ -36,7 +36,10 @@ import {
|
|
|
36
36
|
createCanonicalStorageService,
|
|
37
37
|
getCanonicalStorageCapabilities,
|
|
38
38
|
listCanonicalStorageProviders
|
|
39
|
-
} from "./chunk-
|
|
39
|
+
} from "./chunk-KQ6IWV3F.js";
|
|
40
|
+
import {
|
|
41
|
+
createBackblazeB2StorageService
|
|
42
|
+
} from "./chunk-O25T5KCE.js";
|
|
40
43
|
import {
|
|
41
44
|
createDropboxStorageService
|
|
42
45
|
} from "./chunk-F6CHRGJ6.js";
|
|
@@ -54,6 +57,12 @@ import {
|
|
|
54
57
|
import {
|
|
55
58
|
createGoogleDriveStorageService
|
|
56
59
|
} from "./chunk-CTBVXX5C.js";
|
|
60
|
+
import {
|
|
61
|
+
UnsupportedStorageOperation,
|
|
62
|
+
assertStorageOperation,
|
|
63
|
+
normalizeStoragePath,
|
|
64
|
+
readOnlyService
|
|
65
|
+
} from "./chunk-HJE4CVKY.js";
|
|
57
66
|
import {
|
|
58
67
|
createProviderClient
|
|
59
68
|
} from "./chunk-X57LLCAQ.js";
|
|
@@ -66,21 +75,13 @@ import {
|
|
|
66
75
|
listRecognizedAccountServices,
|
|
67
76
|
resolveProviderServiceId
|
|
68
77
|
} from "./chunk-FKK23J2A.js";
|
|
69
|
-
import {
|
|
70
|
-
createBackblazeB2StorageService
|
|
71
|
-
} from "./chunk-O25T5KCE.js";
|
|
72
|
-
import {
|
|
73
|
-
UnsupportedStorageOperation,
|
|
74
|
-
assertStorageOperation,
|
|
75
|
-
normalizeStoragePath,
|
|
76
|
-
readOnlyService
|
|
77
|
-
} from "./chunk-HJE4CVKY.js";
|
|
78
78
|
import {
|
|
79
79
|
BaseApiRoute,
|
|
80
80
|
createSSEResponse,
|
|
81
81
|
withAuth,
|
|
82
82
|
withCors
|
|
83
83
|
} from "./chunk-KCPQWJBO.js";
|
|
84
|
+
import "./chunk-LMY6MGFD.js";
|
|
84
85
|
import {
|
|
85
86
|
LuthAuthClient,
|
|
86
87
|
LuthAuthClient2,
|
|
@@ -114,13 +115,6 @@ import {
|
|
|
114
115
|
WebSocketTransport,
|
|
115
116
|
createBackendClient
|
|
116
117
|
} from "./chunk-NIP22V2G.js";
|
|
117
|
-
import "./chunk-LMY6MGFD.js";
|
|
118
|
-
import {
|
|
119
|
-
normalizeSystemEnvironment,
|
|
120
|
-
resolveSystemDatabaseUrl,
|
|
121
|
-
resolveSystemDatabaseUrlCandidates,
|
|
122
|
-
tryResolveSystemDatabaseUrl
|
|
123
|
-
} from "./chunk-IP6XWQU2.js";
|
|
124
118
|
import {
|
|
125
119
|
authorizeB2,
|
|
126
120
|
b2DownloadFile,
|
|
@@ -128,6 +122,12 @@ import {
|
|
|
128
122
|
b2ListFileNames,
|
|
129
123
|
b2UploadFile2 as b2UploadFile
|
|
130
124
|
} from "./chunk-I6T64MLT.js";
|
|
125
|
+
import {
|
|
126
|
+
normalizeSystemEnvironment,
|
|
127
|
+
resolveSystemDatabaseUrl,
|
|
128
|
+
resolveSystemDatabaseUrlCandidates,
|
|
129
|
+
tryResolveSystemDatabaseUrl
|
|
130
|
+
} from "./chunk-IP6XWQU2.js";
|
|
131
131
|
import {
|
|
132
132
|
GOOGLE_DRIVE_WORKSPACE_SCOPE,
|
|
133
133
|
GoogleDriveWorkspaceService
|
|
@@ -27,15 +27,16 @@ import {
|
|
|
27
27
|
krnlStorageServiceFacade,
|
|
28
28
|
krnlWorkspaceServiceDefinition,
|
|
29
29
|
krnlWorkspaceServiceFacade
|
|
30
|
-
} from "./chunk-
|
|
31
|
-
import "./chunk-DJ457D5D.js";
|
|
30
|
+
} from "./chunk-R4B3KPHY.js";
|
|
32
31
|
import "./chunk-FZKBTF34.js";
|
|
33
|
-
import "./chunk-
|
|
34
|
-
import "./chunk-
|
|
35
|
-
import "./chunk-
|
|
32
|
+
import "./chunk-7XTURV44.js";
|
|
33
|
+
import "./chunk-GCVR257U.js";
|
|
34
|
+
import "./chunk-IRKJ6HKP.js";
|
|
35
|
+
import "./chunk-3ZL2DX73.js";
|
|
36
|
+
import "./chunk-3RTRATDJ.js";
|
|
36
37
|
import "./chunk-2COYZMUJ.js";
|
|
37
|
-
import "./chunk-IP6XWQU2.js";
|
|
38
38
|
import "./chunk-I6T64MLT.js";
|
|
39
|
+
import "./chunk-IP6XWQU2.js";
|
|
39
40
|
import "./chunk-EMSSTOOK.js";
|
|
40
41
|
export {
|
|
41
42
|
AuthServiceDefinition,
|