@proofkit/better-auth 0.3.1-beta.1 → 0.4.0-beta.11
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/bin/intent.js +20 -0
- package/dist/esm/adapter.d.ts +3 -6
- package/dist/esm/adapter.js +58 -95
- package/dist/esm/adapter.js.map +1 -1
- package/dist/esm/cli/index.js +65 -22
- package/dist/esm/cli/index.js.map +1 -1
- package/dist/esm/migrate.d.ts +21 -83
- package/dist/esm/migrate.js +81 -100
- package/dist/esm/migrate.js.map +1 -1
- package/package.json +12 -9
- package/skills/better-auth-setup/SKILL.md +233 -0
- package/src/adapter.ts +80 -107
- package/src/cli/index.ts +86 -26
- package/src/migrate.ts +129 -160
- package/dist/esm/odata/index.d.ts +0 -29
- package/dist/esm/odata/index.js +0 -157
- package/dist/esm/odata/index.js.map +0 -1
- package/src/odata/index.ts +0 -219
package/dist/esm/odata/index.js
DELETED
|
@@ -1,157 +0,0 @@
|
|
|
1
|
-
import { logger } from "better-auth";
|
|
2
|
-
import { ok, err } from "neverthrow";
|
|
3
|
-
function validateUrl(input) {
|
|
4
|
-
try {
|
|
5
|
-
const url = new URL(input);
|
|
6
|
-
return ok(url);
|
|
7
|
-
} catch (error) {
|
|
8
|
-
return err(error);
|
|
9
|
-
}
|
|
10
|
-
}
|
|
11
|
-
function createRawFetch(args) {
|
|
12
|
-
const result = validateUrl(args.serverUrl);
|
|
13
|
-
if (result.isErr()) {
|
|
14
|
-
throw new Error("Invalid server URL");
|
|
15
|
-
}
|
|
16
|
-
let baseURL = result.value.origin;
|
|
17
|
-
if ("apiKey" in args.auth) {
|
|
18
|
-
baseURL += "/otto";
|
|
19
|
-
}
|
|
20
|
-
baseURL += `/fmi/odata/v4/${args.database}`;
|
|
21
|
-
const authHeaders = {};
|
|
22
|
-
if ("apiKey" in args.auth) {
|
|
23
|
-
authHeaders.Authorization = `Bearer ${args.auth.apiKey}`;
|
|
24
|
-
} else {
|
|
25
|
-
const credentials = btoa(`${args.auth.username}:${args.auth.password}`);
|
|
26
|
-
authHeaders.Authorization = `Basic ${credentials}`;
|
|
27
|
-
}
|
|
28
|
-
const wrappedFetch = async (input, options) => {
|
|
29
|
-
try {
|
|
30
|
-
let url;
|
|
31
|
-
if (typeof input === "string") {
|
|
32
|
-
url = input.startsWith("http") ? input : `${baseURL}${input.startsWith("/") ? input : `/${input}`}`;
|
|
33
|
-
} else if (input instanceof URL) {
|
|
34
|
-
url = input.toString();
|
|
35
|
-
} else if (input instanceof Request) {
|
|
36
|
-
url = input.url;
|
|
37
|
-
} else {
|
|
38
|
-
url = String(input);
|
|
39
|
-
}
|
|
40
|
-
let processedBody = options == null ? void 0 : options.body;
|
|
41
|
-
if (processedBody && typeof processedBody === "object" && !(processedBody instanceof FormData) && !(processedBody instanceof URLSearchParams) && !(processedBody instanceof ReadableStream)) {
|
|
42
|
-
processedBody = JSON.stringify(processedBody);
|
|
43
|
-
}
|
|
44
|
-
const headers = {
|
|
45
|
-
"Content-Type": "application/json",
|
|
46
|
-
...authHeaders,
|
|
47
|
-
...(options == null ? void 0 : options.headers) || {}
|
|
48
|
-
};
|
|
49
|
-
const requestInit = {
|
|
50
|
-
...options,
|
|
51
|
-
headers,
|
|
52
|
-
body: processedBody
|
|
53
|
-
};
|
|
54
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
55
|
-
logger.info("raw-fetch", `${requestInit.method || "GET"} ${url}`);
|
|
56
|
-
if (requestInit.body) {
|
|
57
|
-
logger.info("raw-fetch", "Request body:", requestInit.body);
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
const response = await fetch(url, requestInit);
|
|
61
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
62
|
-
logger.info("raw-fetch", `Response status: ${response.status} ${response.statusText}`);
|
|
63
|
-
logger.info("raw-fetch", "Response headers:", Object.fromEntries(response.headers.entries()));
|
|
64
|
-
}
|
|
65
|
-
if (!response.ok) {
|
|
66
|
-
const errorText = await response.text().catch(() => "Unknown error");
|
|
67
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
68
|
-
logger.error("raw-fetch", `HTTP Error ${response.status}: ${errorText}`);
|
|
69
|
-
}
|
|
70
|
-
return {
|
|
71
|
-
error: `HTTP ${response.status}: ${errorText}`,
|
|
72
|
-
response
|
|
73
|
-
};
|
|
74
|
-
}
|
|
75
|
-
let responseData;
|
|
76
|
-
const contentType = response.headers.get("content-type");
|
|
77
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
78
|
-
logger.info("raw-fetch", `Response content-type: ${contentType || "none"}`);
|
|
79
|
-
}
|
|
80
|
-
if (contentType == null ? void 0 : contentType.includes("application/json")) {
|
|
81
|
-
try {
|
|
82
|
-
const responseText = await response.text();
|
|
83
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
84
|
-
logger.info("raw-fetch", `Raw response text: "${responseText}"`);
|
|
85
|
-
logger.info("raw-fetch", `Response text length: ${responseText.length}`);
|
|
86
|
-
}
|
|
87
|
-
if (responseText.trim() === "") {
|
|
88
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
89
|
-
logger.info("raw-fetch", "Empty JSON response, returning null");
|
|
90
|
-
}
|
|
91
|
-
responseData = null;
|
|
92
|
-
} else {
|
|
93
|
-
responseData = JSON.parse(responseText);
|
|
94
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
95
|
-
logger.info("raw-fetch", "Successfully parsed JSON response");
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
} catch (parseError) {
|
|
99
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
100
|
-
logger.error("raw-fetch", "JSON parse error:", parseError);
|
|
101
|
-
}
|
|
102
|
-
return {
|
|
103
|
-
error: `Failed to parse JSON response: ${parseError instanceof Error ? parseError.message : "Unknown parse error"}`,
|
|
104
|
-
response
|
|
105
|
-
};
|
|
106
|
-
}
|
|
107
|
-
} else if (contentType == null ? void 0 : contentType.includes("text/")) {
|
|
108
|
-
responseData = await response.text();
|
|
109
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
110
|
-
logger.info("raw-fetch", `Text response: "${responseData}"`);
|
|
111
|
-
}
|
|
112
|
-
} else {
|
|
113
|
-
try {
|
|
114
|
-
responseData = await response.text();
|
|
115
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
116
|
-
logger.info("raw-fetch", `Unknown content-type response as text: "${responseData}"`);
|
|
117
|
-
}
|
|
118
|
-
} catch {
|
|
119
|
-
responseData = null;
|
|
120
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
121
|
-
logger.info("raw-fetch", "Could not parse response as text, returning null");
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
if (options == null ? void 0 : options.output) {
|
|
126
|
-
const validation = options.output.safeParse(responseData);
|
|
127
|
-
if (validation.success) {
|
|
128
|
-
return {
|
|
129
|
-
data: validation.data,
|
|
130
|
-
response
|
|
131
|
-
};
|
|
132
|
-
}
|
|
133
|
-
return {
|
|
134
|
-
error: `Validation failed: ${validation.error.message}`,
|
|
135
|
-
response
|
|
136
|
-
};
|
|
137
|
-
}
|
|
138
|
-
return {
|
|
139
|
-
data: responseData,
|
|
140
|
-
response
|
|
141
|
-
};
|
|
142
|
-
} catch (error) {
|
|
143
|
-
return {
|
|
144
|
-
error: error instanceof Error ? error.message : "Unknown error occurred"
|
|
145
|
-
};
|
|
146
|
-
}
|
|
147
|
-
};
|
|
148
|
-
return {
|
|
149
|
-
baseURL,
|
|
150
|
-
fetch: wrappedFetch
|
|
151
|
-
};
|
|
152
|
-
}
|
|
153
|
-
export {
|
|
154
|
-
createRawFetch,
|
|
155
|
-
validateUrl
|
|
156
|
-
};
|
|
157
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../src/odata/index.ts"],"sourcesContent":["/** biome-ignore-all lint/suspicious/noExplicitAny: library code */\nimport { logger as betterAuthLogger } from \"better-auth\";\nimport { err, ok, type Result } from \"neverthrow\";\nimport type { z } from \"zod/v4\";\n\ninterface BasicAuthCredentials {\n username: string;\n password: string;\n}\ninterface OttoAPIKeyAuth {\n apiKey: string;\n}\ntype ODataAuth = BasicAuthCredentials | OttoAPIKeyAuth;\n\nexport interface FmOdataConfig {\n serverUrl: string;\n auth: ODataAuth;\n database: string;\n logging?: true | \"verbose\" | \"none\";\n}\n\nexport function validateUrl(input: string): Result<URL, unknown> {\n try {\n const url = new URL(input);\n return ok(url);\n } catch (error) {\n return err(error);\n }\n}\n\nexport function createRawFetch(args: FmOdataConfig) {\n const result = validateUrl(args.serverUrl);\n\n if (result.isErr()) {\n throw new Error(\"Invalid server URL\");\n }\n\n let baseURL = result.value.origin;\n if (\"apiKey\" in args.auth) {\n baseURL += \"/otto\";\n }\n baseURL += `/fmi/odata/v4/${args.database}`;\n\n // Create authentication headers\n const authHeaders: Record<string, string> = {};\n if (\"apiKey\" in args.auth) {\n authHeaders.Authorization = `Bearer ${args.auth.apiKey}`;\n } else {\n const credentials = btoa(`${args.auth.username}:${args.auth.password}`);\n authHeaders.Authorization = `Basic ${credentials}`;\n }\n\n // Enhanced fetch function with body handling, validation, and structured responses\n const wrappedFetch = async <TOutput = any>(\n input: string | URL | Request,\n options?: Omit<RequestInit, \"body\"> & {\n body?: any; // Allow any type for body\n output?: z.ZodSchema<TOutput>; // Optional schema for validation\n },\n ): Promise<{ data?: TOutput; error?: string; response?: Response }> => {\n try {\n let url: string;\n\n // Handle different input types\n if (typeof input === \"string\") {\n // If it's already a full URL, use as-is, otherwise prepend baseURL\n url = input.startsWith(\"http\") ? input : `${baseURL}${input.startsWith(\"/\") ? input : `/${input}`}`;\n } else if (input instanceof URL) {\n url = input.toString();\n } else if (input instanceof Request) {\n url = input.url;\n } else {\n url = String(input);\n }\n\n // Handle body serialization\n let processedBody = options?.body;\n if (\n processedBody &&\n typeof processedBody === \"object\" &&\n !(processedBody instanceof FormData) &&\n !(processedBody instanceof URLSearchParams) &&\n !(processedBody instanceof ReadableStream)\n ) {\n processedBody = JSON.stringify(processedBody);\n }\n\n // Merge headers\n const headers = {\n \"Content-Type\": \"application/json\",\n ...authHeaders,\n ...(options?.headers || {}),\n };\n\n const requestInit: RequestInit = {\n ...options,\n headers,\n body: processedBody,\n };\n\n // Optional logging\n if (args.logging === \"verbose\" || args.logging === true) {\n betterAuthLogger.info(\"raw-fetch\", `${requestInit.method || \"GET\"} ${url}`);\n if (requestInit.body) {\n betterAuthLogger.info(\"raw-fetch\", \"Request body:\", requestInit.body);\n }\n }\n\n const response = await fetch(url, requestInit);\n\n // Optional logging for response details\n if (args.logging === \"verbose\" || args.logging === true) {\n betterAuthLogger.info(\"raw-fetch\", `Response status: ${response.status} ${response.statusText}`);\n betterAuthLogger.info(\"raw-fetch\", \"Response headers:\", Object.fromEntries(response.headers.entries()));\n }\n\n // Check if response is ok\n if (!response.ok) {\n const errorText = await response.text().catch(() => \"Unknown error\");\n if (args.logging === \"verbose\" || args.logging === true) {\n betterAuthLogger.error(\"raw-fetch\", `HTTP Error ${response.status}: ${errorText}`);\n }\n return {\n error: `HTTP ${response.status}: ${errorText}`,\n response,\n };\n }\n\n // Parse response based on content type\n let responseData: any;\n const contentType = response.headers.get(\"content-type\");\n\n if (args.logging === \"verbose\" || args.logging === true) {\n betterAuthLogger.info(\"raw-fetch\", `Response content-type: ${contentType || \"none\"}`);\n }\n\n if (contentType?.includes(\"application/json\")) {\n try {\n const responseText = await response.text();\n if (args.logging === \"verbose\" || args.logging === true) {\n betterAuthLogger.info(\"raw-fetch\", `Raw response text: \"${responseText}\"`);\n betterAuthLogger.info(\"raw-fetch\", `Response text length: ${responseText.length}`);\n }\n\n // Handle empty responses\n if (responseText.trim() === \"\") {\n if (args.logging === \"verbose\" || args.logging === true) {\n betterAuthLogger.info(\"raw-fetch\", \"Empty JSON response, returning null\");\n }\n responseData = null;\n } else {\n responseData = JSON.parse(responseText);\n if (args.logging === \"verbose\" || args.logging === true) {\n betterAuthLogger.info(\"raw-fetch\", \"Successfully parsed JSON response\");\n }\n }\n } catch (parseError) {\n if (args.logging === \"verbose\" || args.logging === true) {\n betterAuthLogger.error(\"raw-fetch\", \"JSON parse error:\", parseError);\n }\n return {\n error: `Failed to parse JSON response: ${parseError instanceof Error ? parseError.message : \"Unknown parse error\"}`,\n response,\n };\n }\n } else if (contentType?.includes(\"text/\")) {\n // Handle text responses (text/plain, text/html, etc.)\n responseData = await response.text();\n if (args.logging === \"verbose\" || args.logging === true) {\n betterAuthLogger.info(\"raw-fetch\", `Text response: \"${responseData}\"`);\n }\n } else {\n // For other content types, try to get text but don't fail if it's binary\n try {\n responseData = await response.text();\n if (args.logging === \"verbose\" || args.logging === true) {\n betterAuthLogger.info(\"raw-fetch\", `Unknown content-type response as text: \"${responseData}\"`);\n }\n } catch {\n // If text parsing fails (e.g., binary data), return null\n responseData = null;\n if (args.logging === \"verbose\" || args.logging === true) {\n betterAuthLogger.info(\"raw-fetch\", \"Could not parse response as text, returning null\");\n }\n }\n }\n\n // Validate output if schema provided\n if (options?.output) {\n const validation = options.output.safeParse(responseData);\n if (validation.success) {\n return {\n data: validation.data,\n response,\n };\n }\n return {\n error: `Validation failed: ${validation.error.message}`,\n response,\n };\n }\n\n // Return unvalidated data\n return {\n data: responseData as TOutput,\n response,\n };\n } catch (error) {\n return {\n error: error instanceof Error ? error.message : \"Unknown error occurred\",\n };\n }\n };\n\n return {\n baseURL,\n fetch: wrappedFetch,\n };\n}\n"],"names":["betterAuthLogger"],"mappings":"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"}
|
package/src/odata/index.ts
DELETED
|
@@ -1,219 +0,0 @@
|
|
|
1
|
-
/** biome-ignore-all lint/suspicious/noExplicitAny: library code */
|
|
2
|
-
import { logger as betterAuthLogger } from "better-auth";
|
|
3
|
-
import { err, ok, type Result } from "neverthrow";
|
|
4
|
-
import type { z } from "zod/v4";
|
|
5
|
-
|
|
6
|
-
interface BasicAuthCredentials {
|
|
7
|
-
username: string;
|
|
8
|
-
password: string;
|
|
9
|
-
}
|
|
10
|
-
interface OttoAPIKeyAuth {
|
|
11
|
-
apiKey: string;
|
|
12
|
-
}
|
|
13
|
-
type ODataAuth = BasicAuthCredentials | OttoAPIKeyAuth;
|
|
14
|
-
|
|
15
|
-
export interface FmOdataConfig {
|
|
16
|
-
serverUrl: string;
|
|
17
|
-
auth: ODataAuth;
|
|
18
|
-
database: string;
|
|
19
|
-
logging?: true | "verbose" | "none";
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
export function validateUrl(input: string): Result<URL, unknown> {
|
|
23
|
-
try {
|
|
24
|
-
const url = new URL(input);
|
|
25
|
-
return ok(url);
|
|
26
|
-
} catch (error) {
|
|
27
|
-
return err(error);
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
export function createRawFetch(args: FmOdataConfig) {
|
|
32
|
-
const result = validateUrl(args.serverUrl);
|
|
33
|
-
|
|
34
|
-
if (result.isErr()) {
|
|
35
|
-
throw new Error("Invalid server URL");
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
let baseURL = result.value.origin;
|
|
39
|
-
if ("apiKey" in args.auth) {
|
|
40
|
-
baseURL += "/otto";
|
|
41
|
-
}
|
|
42
|
-
baseURL += `/fmi/odata/v4/${args.database}`;
|
|
43
|
-
|
|
44
|
-
// Create authentication headers
|
|
45
|
-
const authHeaders: Record<string, string> = {};
|
|
46
|
-
if ("apiKey" in args.auth) {
|
|
47
|
-
authHeaders.Authorization = `Bearer ${args.auth.apiKey}`;
|
|
48
|
-
} else {
|
|
49
|
-
const credentials = btoa(`${args.auth.username}:${args.auth.password}`);
|
|
50
|
-
authHeaders.Authorization = `Basic ${credentials}`;
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
// Enhanced fetch function with body handling, validation, and structured responses
|
|
54
|
-
const wrappedFetch = async <TOutput = any>(
|
|
55
|
-
input: string | URL | Request,
|
|
56
|
-
options?: Omit<RequestInit, "body"> & {
|
|
57
|
-
body?: any; // Allow any type for body
|
|
58
|
-
output?: z.ZodSchema<TOutput>; // Optional schema for validation
|
|
59
|
-
},
|
|
60
|
-
): Promise<{ data?: TOutput; error?: string; response?: Response }> => {
|
|
61
|
-
try {
|
|
62
|
-
let url: string;
|
|
63
|
-
|
|
64
|
-
// Handle different input types
|
|
65
|
-
if (typeof input === "string") {
|
|
66
|
-
// If it's already a full URL, use as-is, otherwise prepend baseURL
|
|
67
|
-
url = input.startsWith("http") ? input : `${baseURL}${input.startsWith("/") ? input : `/${input}`}`;
|
|
68
|
-
} else if (input instanceof URL) {
|
|
69
|
-
url = input.toString();
|
|
70
|
-
} else if (input instanceof Request) {
|
|
71
|
-
url = input.url;
|
|
72
|
-
} else {
|
|
73
|
-
url = String(input);
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
// Handle body serialization
|
|
77
|
-
let processedBody = options?.body;
|
|
78
|
-
if (
|
|
79
|
-
processedBody &&
|
|
80
|
-
typeof processedBody === "object" &&
|
|
81
|
-
!(processedBody instanceof FormData) &&
|
|
82
|
-
!(processedBody instanceof URLSearchParams) &&
|
|
83
|
-
!(processedBody instanceof ReadableStream)
|
|
84
|
-
) {
|
|
85
|
-
processedBody = JSON.stringify(processedBody);
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
// Merge headers
|
|
89
|
-
const headers = {
|
|
90
|
-
"Content-Type": "application/json",
|
|
91
|
-
...authHeaders,
|
|
92
|
-
...(options?.headers || {}),
|
|
93
|
-
};
|
|
94
|
-
|
|
95
|
-
const requestInit: RequestInit = {
|
|
96
|
-
...options,
|
|
97
|
-
headers,
|
|
98
|
-
body: processedBody,
|
|
99
|
-
};
|
|
100
|
-
|
|
101
|
-
// Optional logging
|
|
102
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
103
|
-
betterAuthLogger.info("raw-fetch", `${requestInit.method || "GET"} ${url}`);
|
|
104
|
-
if (requestInit.body) {
|
|
105
|
-
betterAuthLogger.info("raw-fetch", "Request body:", requestInit.body);
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
const response = await fetch(url, requestInit);
|
|
110
|
-
|
|
111
|
-
// Optional logging for response details
|
|
112
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
113
|
-
betterAuthLogger.info("raw-fetch", `Response status: ${response.status} ${response.statusText}`);
|
|
114
|
-
betterAuthLogger.info("raw-fetch", "Response headers:", Object.fromEntries(response.headers.entries()));
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
// Check if response is ok
|
|
118
|
-
if (!response.ok) {
|
|
119
|
-
const errorText = await response.text().catch(() => "Unknown error");
|
|
120
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
121
|
-
betterAuthLogger.error("raw-fetch", `HTTP Error ${response.status}: ${errorText}`);
|
|
122
|
-
}
|
|
123
|
-
return {
|
|
124
|
-
error: `HTTP ${response.status}: ${errorText}`,
|
|
125
|
-
response,
|
|
126
|
-
};
|
|
127
|
-
}
|
|
128
|
-
|
|
129
|
-
// Parse response based on content type
|
|
130
|
-
let responseData: any;
|
|
131
|
-
const contentType = response.headers.get("content-type");
|
|
132
|
-
|
|
133
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
134
|
-
betterAuthLogger.info("raw-fetch", `Response content-type: ${contentType || "none"}`);
|
|
135
|
-
}
|
|
136
|
-
|
|
137
|
-
if (contentType?.includes("application/json")) {
|
|
138
|
-
try {
|
|
139
|
-
const responseText = await response.text();
|
|
140
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
141
|
-
betterAuthLogger.info("raw-fetch", `Raw response text: "${responseText}"`);
|
|
142
|
-
betterAuthLogger.info("raw-fetch", `Response text length: ${responseText.length}`);
|
|
143
|
-
}
|
|
144
|
-
|
|
145
|
-
// Handle empty responses
|
|
146
|
-
if (responseText.trim() === "") {
|
|
147
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
148
|
-
betterAuthLogger.info("raw-fetch", "Empty JSON response, returning null");
|
|
149
|
-
}
|
|
150
|
-
responseData = null;
|
|
151
|
-
} else {
|
|
152
|
-
responseData = JSON.parse(responseText);
|
|
153
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
154
|
-
betterAuthLogger.info("raw-fetch", "Successfully parsed JSON response");
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
} catch (parseError) {
|
|
158
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
159
|
-
betterAuthLogger.error("raw-fetch", "JSON parse error:", parseError);
|
|
160
|
-
}
|
|
161
|
-
return {
|
|
162
|
-
error: `Failed to parse JSON response: ${parseError instanceof Error ? parseError.message : "Unknown parse error"}`,
|
|
163
|
-
response,
|
|
164
|
-
};
|
|
165
|
-
}
|
|
166
|
-
} else if (contentType?.includes("text/")) {
|
|
167
|
-
// Handle text responses (text/plain, text/html, etc.)
|
|
168
|
-
responseData = await response.text();
|
|
169
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
170
|
-
betterAuthLogger.info("raw-fetch", `Text response: "${responseData}"`);
|
|
171
|
-
}
|
|
172
|
-
} else {
|
|
173
|
-
// For other content types, try to get text but don't fail if it's binary
|
|
174
|
-
try {
|
|
175
|
-
responseData = await response.text();
|
|
176
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
177
|
-
betterAuthLogger.info("raw-fetch", `Unknown content-type response as text: "${responseData}"`);
|
|
178
|
-
}
|
|
179
|
-
} catch {
|
|
180
|
-
// If text parsing fails (e.g., binary data), return null
|
|
181
|
-
responseData = null;
|
|
182
|
-
if (args.logging === "verbose" || args.logging === true) {
|
|
183
|
-
betterAuthLogger.info("raw-fetch", "Could not parse response as text, returning null");
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
// Validate output if schema provided
|
|
189
|
-
if (options?.output) {
|
|
190
|
-
const validation = options.output.safeParse(responseData);
|
|
191
|
-
if (validation.success) {
|
|
192
|
-
return {
|
|
193
|
-
data: validation.data,
|
|
194
|
-
response,
|
|
195
|
-
};
|
|
196
|
-
}
|
|
197
|
-
return {
|
|
198
|
-
error: `Validation failed: ${validation.error.message}`,
|
|
199
|
-
response,
|
|
200
|
-
};
|
|
201
|
-
}
|
|
202
|
-
|
|
203
|
-
// Return unvalidated data
|
|
204
|
-
return {
|
|
205
|
-
data: responseData as TOutput,
|
|
206
|
-
response,
|
|
207
|
-
};
|
|
208
|
-
} catch (error) {
|
|
209
|
-
return {
|
|
210
|
-
error: error instanceof Error ? error.message : "Unknown error occurred",
|
|
211
|
-
};
|
|
212
|
-
}
|
|
213
|
-
};
|
|
214
|
-
|
|
215
|
-
return {
|
|
216
|
-
baseURL,
|
|
217
|
-
fetch: wrappedFetch,
|
|
218
|
-
};
|
|
219
|
-
}
|