better-auth-studio 1.1.2-beta.4 → 1.1.2-beta.40
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/README.md +49 -78
- package/data/default-geo.json +12 -1
- package/dist/adapters/astro.d.ts +1 -1
- package/dist/adapters/astro.d.ts.map +1 -1
- package/dist/adapters/astro.js +17 -15
- package/dist/adapters/astro.js.map +1 -1
- package/dist/adapters/elysia.d.ts +2 -2
- package/dist/adapters/elysia.d.ts.map +1 -1
- package/dist/adapters/elysia.js +17 -15
- package/dist/adapters/elysia.js.map +1 -1
- package/dist/adapters/express.d.ts +2 -2
- package/dist/adapters/express.d.ts.map +1 -1
- package/dist/adapters/express.js +8 -6
- package/dist/adapters/express.js.map +1 -1
- package/dist/adapters/hono.d.ts +2 -2
- package/dist/adapters/hono.d.ts.map +1 -1
- package/dist/adapters/hono.js +16 -14
- package/dist/adapters/hono.js.map +1 -1
- package/dist/adapters/nextjs.d.ts +1 -1
- package/dist/adapters/nextjs.d.ts.map +1 -1
- package/dist/adapters/nextjs.js +14 -12
- package/dist/adapters/nextjs.js.map +1 -1
- package/dist/adapters/nuxt.d.ts +1 -1
- package/dist/adapters/nuxt.d.ts.map +1 -1
- package/dist/adapters/nuxt.js +26 -24
- package/dist/adapters/nuxt.js.map +1 -1
- package/dist/adapters/remix.d.ts +1 -1
- package/dist/adapters/remix.d.ts.map +1 -1
- package/dist/adapters/remix.js +17 -15
- package/dist/adapters/remix.js.map +1 -1
- package/dist/adapters/solid-start.d.ts +1 -1
- package/dist/adapters/solid-start.d.ts.map +1 -1
- package/dist/adapters/solid-start.js +17 -15
- package/dist/adapters/solid-start.js.map +1 -1
- package/dist/adapters/svelte-kit.d.ts +2 -2
- package/dist/adapters/svelte-kit.d.ts.map +1 -1
- package/dist/adapters/svelte-kit.js +17 -15
- package/dist/adapters/svelte-kit.js.map +1 -1
- package/dist/adapters/tanstack-start.d.ts +1 -1
- package/dist/adapters/tanstack-start.d.ts.map +1 -1
- package/dist/adapters/tanstack-start.js +17 -15
- package/dist/adapters/tanstack-start.js.map +1 -1
- package/dist/add-svelte-kit-env-modules.js +11 -11
- package/dist/auth-adapter.d.ts +1 -1
- package/dist/auth-adapter.js +96 -96
- package/dist/cli/commands/init.js +57 -57
- package/dist/cli.js +75 -75
- package/dist/config.d.ts +5 -5
- package/dist/config.js +37 -37
- package/dist/core/handler.d.ts +1 -1
- package/dist/core/handler.d.ts.map +1 -1
- package/dist/core/handler.js +130 -115
- package/dist/core/handler.js.map +1 -1
- package/dist/data.d.ts +2 -2
- package/dist/data.js +60 -60
- package/dist/geo-service.d.ts +6 -2
- package/dist/geo-service.d.ts.map +1 -1
- package/dist/geo-service.js +126 -82
- package/dist/geo-service.js.map +1 -1
- package/dist/get-tsconfig-info.js +4 -4
- package/dist/index.d.ts +9 -8
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -6
- package/dist/index.js.map +1 -1
- package/dist/providers/events/helpers.d.ts +11 -2
- package/dist/providers/events/helpers.d.ts.map +1 -1
- package/dist/providers/events/helpers.js +443 -155
- package/dist/providers/events/helpers.js.map +1 -1
- package/dist/public/assets/main-Cx3iOHjX.js +1216 -0
- package/dist/public/assets/main-Djae8maC.css +1 -0
- package/dist/public/index.html +2 -2
- package/dist/routes/api-router.d.ts +3 -1
- package/dist/routes/api-router.d.ts.map +1 -1
- package/dist/routes/api-router.js +3 -3
- package/dist/routes/api-router.js.map +1 -1
- package/dist/routes.d.ts +6 -4
- package/dist/routes.d.ts.map +1 -1
- package/dist/routes.js +1517 -1309
- package/dist/routes.js.map +1 -1
- package/dist/studio.d.ts +3 -3
- package/dist/studio.d.ts.map +1 -1
- package/dist/studio.js +64 -65
- package/dist/studio.js.map +1 -1
- package/dist/types/events.d.ts +18 -7
- package/dist/types/events.d.ts.map +1 -1
- package/dist/types/events.js +185 -165
- package/dist/types/events.js.map +1 -1
- package/dist/types/handler.d.ts +24 -4
- package/dist/types/handler.d.ts.map +1 -1
- package/dist/types/handler.js.map +1 -1
- package/dist/utils/auth-callbacks-injector.d.ts +2 -2
- package/dist/utils/auth-callbacks-injector.js +27 -27
- package/dist/utils/auth-callbacks-wrapper.d.ts +3 -3
- package/dist/utils/auth-callbacks-wrapper.js +117 -107
- package/dist/utils/database-detection.d.ts +1 -1
- package/dist/utils/database-detection.js +44 -44
- package/dist/utils/database-hook-injector.d.ts +3 -3
- package/dist/utils/database-hook-injector.js +135 -131
- package/dist/utils/email-otp-hooks-injector.d.ts +28 -12
- package/dist/utils/email-otp-hooks-injector.js +104 -97
- package/dist/utils/event-ingestion.d.ts +5 -5
- package/dist/utils/event-ingestion.d.ts.map +1 -1
- package/dist/utils/event-ingestion.js +43 -12
- package/dist/utils/event-ingestion.js.map +1 -1
- package/dist/utils/hook-injector.d.ts +8 -2
- package/dist/utils/hook-injector.d.ts.map +1 -1
- package/dist/utils/hook-injector.js +447 -199
- package/dist/utils/hook-injector.js.map +1 -1
- package/dist/utils/html-injector.d.ts +17 -2
- package/dist/utils/html-injector.d.ts.map +1 -1
- package/dist/utils/html-injector.js +44 -39
- package/dist/utils/html-injector.js.map +1 -1
- package/dist/utils/org-hooks-injector.d.ts +3 -3
- package/dist/utils/org-hooks-injector.js +63 -63
- package/dist/utils/org-hooks-wrapper.d.ts +41 -35
- package/dist/utils/org-hooks-wrapper.js +778 -658
- package/dist/utils/organization-hooks-wrapper.d.ts +23 -17
- package/dist/utils/organization-hooks-wrapper.js +325 -277
- package/dist/utils/package-json.js +11 -11
- package/dist/utils/paths.js +1 -1
- package/dist/utils/server-init.d.ts +1 -1
- package/dist/utils/server-init.js +25 -25
- package/dist/utils/session.d.ts +0 -1
- package/dist/utils/session.d.ts.map +1 -1
- package/dist/utils/session.js +19 -12
- package/dist/utils/session.js.map +1 -1
- package/dist/utils.js +24 -24
- package/package.json +26 -24
- package/public/assets/main-Cx3iOHjX.js +1216 -0
- package/public/assets/main-Djae8maC.css +1 -0
- package/public/index.html +2 -2
- package/scripts/download-geolite2.js +22 -15
- package/scripts/generate-default-db.js +324 -324
- package/scripts/postinstall.js +25 -25
- package/dist/public/assets/main-CEuuUcyk.css +0 -1
- package/dist/public/assets/main-vSWh5Mvp.js +0 -1194
- package/public/assets/main-CEuuUcyk.css +0 -1
- package/public/assets/main-vSWh5Mvp.js +0 -1194
package/dist/adapters/hono.js
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
import { handleStudioRequest } from
|
|
2
|
-
import { injectEventHooks } from
|
|
1
|
+
import { handleStudioRequest } from "../core/handler.js";
|
|
2
|
+
import { injectEventHooks, injectLastSeenAtHooks } from "../utils/hook-injector.js";
|
|
3
3
|
/**
|
|
4
4
|
* Hono adapter for Better Auth Studio
|
|
5
5
|
*/
|
|
6
6
|
export function betterAuthStudio(config) {
|
|
7
|
-
if (config.
|
|
8
|
-
|
|
7
|
+
if (config.auth) {
|
|
8
|
+
injectLastSeenAtHooks(config.auth, config);
|
|
9
|
+
if (config.events?.enabled)
|
|
10
|
+
injectEventHooks(config.auth, config.events);
|
|
9
11
|
}
|
|
10
12
|
return async (c) => {
|
|
11
13
|
try {
|
|
@@ -14,23 +16,23 @@ export function betterAuthStudio(config) {
|
|
|
14
16
|
return sendHonoResponse(c, universalRes);
|
|
15
17
|
}
|
|
16
18
|
catch (error) {
|
|
17
|
-
console.error(
|
|
18
|
-
return c.json({ error:
|
|
19
|
+
console.error("Studio handler error:", error);
|
|
20
|
+
return c.json({ error: "Internal server error" }, 500);
|
|
19
21
|
}
|
|
20
22
|
};
|
|
21
23
|
}
|
|
22
24
|
async function convertHonoToUniversal(c) {
|
|
23
25
|
let body;
|
|
24
26
|
const method = c.req.method;
|
|
25
|
-
if (method !==
|
|
26
|
-
const contentType = c.req.header(
|
|
27
|
-
if (contentType.includes(
|
|
27
|
+
if (method !== "GET" && method !== "HEAD") {
|
|
28
|
+
const contentType = c.req.header("content-type") || "";
|
|
29
|
+
if (contentType.includes("application/json")) {
|
|
28
30
|
try {
|
|
29
31
|
body = await c.req.json();
|
|
30
32
|
}
|
|
31
33
|
catch { }
|
|
32
34
|
}
|
|
33
|
-
else if (contentType.includes(
|
|
35
|
+
else if (contentType.includes("application/x-www-form-urlencoded")) {
|
|
34
36
|
try {
|
|
35
37
|
body = await c.req.parseBody();
|
|
36
38
|
}
|
|
@@ -58,9 +60,9 @@ function sendHonoResponse(c, universal) {
|
|
|
58
60
|
if (Buffer.isBuffer(universal.body)) {
|
|
59
61
|
return c.body(universal.body);
|
|
60
62
|
}
|
|
61
|
-
else if (typeof universal.body ===
|
|
62
|
-
const contentType = universal.headers[
|
|
63
|
-
if (contentType.includes(
|
|
63
|
+
else if (typeof universal.body === "string") {
|
|
64
|
+
const contentType = universal.headers["content-type"] || universal.headers["Content-Type"] || "";
|
|
65
|
+
if (contentType.includes("application/json")) {
|
|
64
66
|
try {
|
|
65
67
|
return c.json(JSON.parse(universal.body));
|
|
66
68
|
}
|
|
@@ -68,7 +70,7 @@ function sendHonoResponse(c, universal) {
|
|
|
68
70
|
return c.text(universal.body);
|
|
69
71
|
}
|
|
70
72
|
}
|
|
71
|
-
else if (contentType.includes(
|
|
73
|
+
else if (contentType.includes("text/html")) {
|
|
72
74
|
return c.html(universal.body);
|
|
73
75
|
}
|
|
74
76
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hono.js","sourceRoot":"","sources":["../../src/adapters/hono.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"hono.js","sourceRoot":"","sources":["../../src/adapters/hono.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nextjs.d.ts","sourceRoot":"","sources":["../../src/adapters/nextjs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAuC,MAAM,qBAAqB,CAAC;AAY7F,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"nextjs.d.ts","sourceRoot":"","sources":["../../src/adapters/nextjs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAuC,MAAM,qBAAqB,CAAC;AAY7F,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,IAMrC,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAanD"}
|
package/dist/adapters/nextjs.js
CHANGED
|
@@ -1,16 +1,18 @@
|
|
|
1
|
-
import { handleStudioRequest } from
|
|
2
|
-
import { injectEventHooks } from
|
|
1
|
+
import { handleStudioRequest } from "../core/handler.js";
|
|
2
|
+
import { injectEventHooks, injectLastSeenAtHooks } from "../utils/hook-injector.js";
|
|
3
3
|
function getUrlFromRequest(req) {
|
|
4
4
|
const nextUrl = req.nextUrl;
|
|
5
|
-
if (nextUrl && typeof nextUrl.pathname ===
|
|
6
|
-
return nextUrl.pathname + (nextUrl.search ||
|
|
5
|
+
if (nextUrl && typeof nextUrl.pathname === "string") {
|
|
6
|
+
return nextUrl.pathname + (nextUrl.search || "");
|
|
7
7
|
}
|
|
8
8
|
const url = new URL(req.url);
|
|
9
9
|
return url.pathname + url.search;
|
|
10
10
|
}
|
|
11
11
|
export function betterAuthStudio(config) {
|
|
12
|
-
if (config.
|
|
13
|
-
|
|
12
|
+
if (config.auth) {
|
|
13
|
+
injectLastSeenAtHooks(config.auth, config);
|
|
14
|
+
if (config.events?.enabled)
|
|
15
|
+
injectEventHooks(config.auth, config.events);
|
|
14
16
|
}
|
|
15
17
|
return async (request) => {
|
|
16
18
|
try {
|
|
@@ -19,19 +21,19 @@ export function betterAuthStudio(config) {
|
|
|
19
21
|
return universalToResponse(universalResponse);
|
|
20
22
|
}
|
|
21
23
|
catch (error) {
|
|
22
|
-
console.error(
|
|
23
|
-
return new Response(JSON.stringify({ error:
|
|
24
|
+
console.error("Studio handler error:", error);
|
|
25
|
+
return new Response(JSON.stringify({ error: "Internal server error" }), {
|
|
24
26
|
status: 500,
|
|
25
|
-
headers: {
|
|
27
|
+
headers: { "Content-Type": "application/json" },
|
|
26
28
|
});
|
|
27
29
|
}
|
|
28
30
|
};
|
|
29
31
|
}
|
|
30
32
|
async function requestToUniversal(req) {
|
|
31
33
|
let body;
|
|
32
|
-
if (req.method !==
|
|
33
|
-
const contentType = req.headers.get(
|
|
34
|
-
if (contentType.includes(
|
|
34
|
+
if (req.method !== "GET" && req.method !== "HEAD") {
|
|
35
|
+
const contentType = req.headers.get("content-type") || "";
|
|
36
|
+
if (contentType.includes("application/json")) {
|
|
35
37
|
try {
|
|
36
38
|
body = await req.json();
|
|
37
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nextjs.js","sourceRoot":"","sources":["../../src/adapters/nextjs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"nextjs.js","sourceRoot":"","sources":["../../src/adapters/nextjs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAEpF,SAAS,iBAAiB,CAAC,GAAY;IACrC,MAAM,OAAO,GAAI,GAAW,CAAC,OAAO,CAAC;IACrC,IAAI,OAAO,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACpD,OAAO,OAAO,CAAC,QAAQ,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IACnD,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,OAAO,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAoB;IACnD,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,qBAAqB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3C,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO;YAAE,gBAAgB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO,KAAK,EAAE,OAAgB,EAAqB,EAAE;QACnD,IAAI,CAAC;YACH,MAAM,gBAAgB,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;YAC3D,MAAM,iBAAiB,GAAG,MAAM,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;YAC9E,OAAO,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;YAC9C,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC,EAAE;gBACtE,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;aAChD,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,GAAY;IAC5C,IAAI,IAAS,CAAC;IACd,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;QAClD,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QAC1D,IAAI,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC7C,IAAI,CAAC;gBACH,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YAC1B,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAa,EAAE,GAAW,EAAE,EAAE;QACjD,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC;QAC3B,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,OAAO;QACP,IAAI;KACL,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAsB;IACjD,OAAO,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE;QAC5B,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,OAAO,EAAE,GAAG,CAAC,OAAO;KACrB,CAAC,CAAC;AACL,CAAC"}
|
package/dist/adapters/nuxt.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nuxt.d.ts","sourceRoot":"","sources":["../../src/adapters/nuxt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAuC,MAAM,qBAAqB,CAAC;AAG7F;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"nuxt.d.ts","sourceRoot":"","sources":["../../src/adapters/nuxt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAuC,MAAM,qBAAqB,CAAC;AAG7F;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAC,CA8B9F"}
|
package/dist/adapters/nuxt.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { handleStudioRequest } from
|
|
2
|
-
import { injectEventHooks } from
|
|
1
|
+
import { handleStudioRequest } from "../core/handler.js";
|
|
2
|
+
import { injectEventHooks, injectLastSeenAtHooks } from "../utils/hook-injector.js";
|
|
3
3
|
/**
|
|
4
4
|
* Nuxt adapter for Better Auth Studio
|
|
5
5
|
*
|
|
@@ -17,8 +17,10 @@ import { injectEventHooks } from '../utils/hook-injector.js';
|
|
|
17
17
|
* auto-imports enabled for h3 utilities.
|
|
18
18
|
*/
|
|
19
19
|
export function betterAuthStudio(config) {
|
|
20
|
-
if (config.
|
|
21
|
-
|
|
20
|
+
if (config.auth) {
|
|
21
|
+
injectLastSeenAtHooks(config.auth, config);
|
|
22
|
+
if (config.events?.enabled)
|
|
23
|
+
injectEventHooks(config.auth, config.events);
|
|
22
24
|
}
|
|
23
25
|
return async (event) => {
|
|
24
26
|
try {
|
|
@@ -28,17 +30,17 @@ export function betterAuthStudio(config) {
|
|
|
28
30
|
}
|
|
29
31
|
catch (error) {
|
|
30
32
|
// Handle client disconnection gracefully
|
|
31
|
-
if (error?.code ===
|
|
32
|
-
error?.code ===
|
|
33
|
-
error?.message?.includes(
|
|
34
|
-
error?.message?.includes(
|
|
33
|
+
if (error?.code === "EPIPE" ||
|
|
34
|
+
error?.code === "ECONNRESET" ||
|
|
35
|
+
error?.message?.includes("aborted") ||
|
|
36
|
+
error?.message?.includes("destroyed")) {
|
|
35
37
|
// Client disconnected, return empty response
|
|
36
38
|
return new Response(null, { status: 499 });
|
|
37
39
|
}
|
|
38
|
-
console.error(
|
|
39
|
-
return new Response(JSON.stringify({ error:
|
|
40
|
+
console.error("Studio handler error:", error);
|
|
41
|
+
return new Response(JSON.stringify({ error: "Internal server error" }), {
|
|
40
42
|
status: 500,
|
|
41
|
-
headers: {
|
|
43
|
+
headers: { "Content-Type": "application/json" },
|
|
42
44
|
});
|
|
43
45
|
}
|
|
44
46
|
};
|
|
@@ -46,7 +48,7 @@ export function betterAuthStudio(config) {
|
|
|
46
48
|
async function convertNuxtToUniversal(event, config) {
|
|
47
49
|
let body;
|
|
48
50
|
const method = event.method;
|
|
49
|
-
if (method !==
|
|
51
|
+
if (method !== "GET" && method !== "HEAD") {
|
|
50
52
|
// First check if body was already read by h3/Nuxt and stored on event
|
|
51
53
|
if (event.body !== undefined) {
|
|
52
54
|
body = event.body;
|
|
@@ -57,15 +59,15 @@ async function convertNuxtToUniversal(event, config) {
|
|
|
57
59
|
try {
|
|
58
60
|
// Check if readBody is available globally (Nuxt auto-imports it)
|
|
59
61
|
const readBodyFn = globalThis.readBody;
|
|
60
|
-
if (typeof readBodyFn ===
|
|
62
|
+
if (typeof readBodyFn === "function") {
|
|
61
63
|
body = await readBodyFn(event);
|
|
62
64
|
}
|
|
63
65
|
}
|
|
64
66
|
catch (error) {
|
|
65
67
|
// Only rethrow connection errors
|
|
66
|
-
if (error?.code ===
|
|
67
|
-
error?.code ===
|
|
68
|
-
error?.message?.includes(
|
|
68
|
+
if (error?.code === "EPIPE" ||
|
|
69
|
+
error?.code === "ECONNRESET" ||
|
|
70
|
+
error?.message?.includes("aborted")) {
|
|
69
71
|
throw error;
|
|
70
72
|
}
|
|
71
73
|
// For other errors (like readBody not found), silently continue
|
|
@@ -77,21 +79,21 @@ async function convertNuxtToUniversal(event, config) {
|
|
|
77
79
|
const headers = {};
|
|
78
80
|
if (event.headers) {
|
|
79
81
|
Object.entries(event.headers).forEach(([key, value]) => {
|
|
80
|
-
if (typeof value ===
|
|
82
|
+
if (typeof value === "string") {
|
|
81
83
|
headers[key] = value;
|
|
82
84
|
}
|
|
83
85
|
else if (Array.isArray(value)) {
|
|
84
|
-
headers[key] = value.join(
|
|
86
|
+
headers[key] = value.join(", ");
|
|
85
87
|
}
|
|
86
88
|
});
|
|
87
89
|
}
|
|
88
90
|
// Extract path and query
|
|
89
|
-
const basePath = config.basePath ||
|
|
90
|
-
const normalizedBasePath = basePath.endsWith(
|
|
91
|
+
const basePath = config.basePath || "/api/studio";
|
|
92
|
+
const normalizedBasePath = basePath.endsWith("/") ? basePath.slice(0, -1) : basePath;
|
|
91
93
|
const url = getRequestURL(event);
|
|
92
94
|
let path = url.pathname;
|
|
93
95
|
if (path.startsWith(normalizedBasePath)) {
|
|
94
|
-
path = path.slice(normalizedBasePath.length) ||
|
|
96
|
+
path = path.slice(normalizedBasePath.length) || "/";
|
|
95
97
|
}
|
|
96
98
|
const pathWithQuery = path + url.search;
|
|
97
99
|
return {
|
|
@@ -102,9 +104,9 @@ async function convertNuxtToUniversal(event, config) {
|
|
|
102
104
|
};
|
|
103
105
|
}
|
|
104
106
|
function getRequestURL(event) {
|
|
105
|
-
const protocol = event.node.req.socket?.encrypted ?
|
|
106
|
-
const host = event.headers.host || event.headers[
|
|
107
|
-
const path = (event.node.req.url ||
|
|
107
|
+
const protocol = event.node.req.socket?.encrypted ? "https" : "http";
|
|
108
|
+
const host = event.headers.host || event.headers[":authority"] || "localhost";
|
|
109
|
+
const path = (event.node.req.url || "/").replace(/[/\\]{2,}/g, "/");
|
|
108
110
|
return new URL(path, `${protocol}://${host}`);
|
|
109
111
|
}
|
|
110
112
|
function universalToResponse(res) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nuxt.js","sourceRoot":"","sources":["../../src/adapters/nuxt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"nuxt.js","sourceRoot":"","sources":["../../src/adapters/nuxt.ts"],"names":[],"mappings":"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"}
|
package/dist/adapters/remix.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remix.d.ts","sourceRoot":"","sources":["../../src/adapters/remix.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAuC,MAAM,qBAAqB,CAAC;AAG7F;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"remix.d.ts","sourceRoot":"","sources":["../../src/adapters/remix.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAuC,MAAM,qBAAqB,CAAC;AAG7F;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,IAMrC,aAAa;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,KAAG,OAAO,CAAC,QAAQ,CAAC,CAapE"}
|
package/dist/adapters/remix.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { handleStudioRequest } from
|
|
2
|
-
import { injectEventHooks } from
|
|
1
|
+
import { handleStudioRequest } from "../core/handler.js";
|
|
2
|
+
import { injectEventHooks, injectLastSeenAtHooks } from "../utils/hook-injector.js";
|
|
3
3
|
/**
|
|
4
4
|
* Remix adapter for Better Auth Studio
|
|
5
5
|
*
|
|
@@ -22,8 +22,10 @@ import { injectEventHooks } from '../utils/hook-injector.js';
|
|
|
22
22
|
* ```
|
|
23
23
|
*/
|
|
24
24
|
export function betterAuthStudio(config) {
|
|
25
|
-
if (config.
|
|
26
|
-
|
|
25
|
+
if (config.auth) {
|
|
26
|
+
injectLastSeenAtHooks(config.auth, config);
|
|
27
|
+
if (config.events?.enabled)
|
|
28
|
+
injectEventHooks(config.auth, config.events);
|
|
27
29
|
}
|
|
28
30
|
return async ({ request }) => {
|
|
29
31
|
try {
|
|
@@ -32,10 +34,10 @@ export function betterAuthStudio(config) {
|
|
|
32
34
|
return universalToResponse(universalRes);
|
|
33
35
|
}
|
|
34
36
|
catch (error) {
|
|
35
|
-
console.error(
|
|
36
|
-
return new Response(JSON.stringify({ error:
|
|
37
|
+
console.error("Studio handler error:", error);
|
|
38
|
+
return new Response(JSON.stringify({ error: "Internal server error" }), {
|
|
37
39
|
status: 500,
|
|
38
|
-
headers: {
|
|
40
|
+
headers: { "Content-Type": "application/json" },
|
|
39
41
|
});
|
|
40
42
|
}
|
|
41
43
|
};
|
|
@@ -43,16 +45,16 @@ export function betterAuthStudio(config) {
|
|
|
43
45
|
async function convertRemixToUniversal({ request }, config) {
|
|
44
46
|
let body;
|
|
45
47
|
const method = request.method;
|
|
46
|
-
if (method !==
|
|
47
|
-
const contentType = request.headers.get(
|
|
48
|
-
if (contentType.includes(
|
|
48
|
+
if (method !== "GET" && method !== "HEAD") {
|
|
49
|
+
const contentType = request.headers.get("content-type") || "";
|
|
50
|
+
if (contentType.includes("application/json")) {
|
|
49
51
|
try {
|
|
50
52
|
body = await request.json();
|
|
51
53
|
}
|
|
52
54
|
catch { }
|
|
53
55
|
}
|
|
54
|
-
else if (contentType.includes(
|
|
55
|
-
contentType.includes(
|
|
56
|
+
else if (contentType.includes("application/x-www-form-urlencoded") ||
|
|
57
|
+
contentType.includes("multipart/form-data")) {
|
|
56
58
|
try {
|
|
57
59
|
const formData = await request.formData();
|
|
58
60
|
body = Object.fromEntries(formData.entries());
|
|
@@ -78,12 +80,12 @@ async function convertRemixToUniversal({ request }, config) {
|
|
|
78
80
|
request.headers.forEach((value, key) => {
|
|
79
81
|
headers[key] = value;
|
|
80
82
|
});
|
|
81
|
-
const basePath = config.basePath ||
|
|
82
|
-
const normalizedBasePath = basePath.endsWith(
|
|
83
|
+
const basePath = config.basePath || "/api/studio";
|
|
84
|
+
const normalizedBasePath = basePath.endsWith("/") ? basePath.slice(0, -1) : basePath;
|
|
83
85
|
const url = new URL(request.url);
|
|
84
86
|
let path = url.pathname;
|
|
85
87
|
if (path.startsWith(normalizedBasePath)) {
|
|
86
|
-
path = path.slice(normalizedBasePath.length) ||
|
|
88
|
+
path = path.slice(normalizedBasePath.length) || "/";
|
|
87
89
|
}
|
|
88
90
|
const pathWithQuery = path + url.search;
|
|
89
91
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remix.js","sourceRoot":"","sources":["../../src/adapters/remix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"remix.js","sourceRoot":"","sources":["../../src/adapters/remix.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solid-start.d.ts","sourceRoot":"","sources":["../../src/adapters/solid-start.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAuC,MAAM,qBAAqB,CAAC;AAG7F,KAAK,QAAQ,GAAG;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7B,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,GAAG,EAAE,GAAG,CAAC;CACV,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"solid-start.d.ts","sourceRoot":"","sources":["../../src/adapters/solid-start.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAuC,MAAM,qBAAqB,CAAC;AAG7F,KAAK,QAAQ,GAAG;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7B,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,GAAG,EAAE,GAAG,CAAC;CACV,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,IAMrC,OAAO,QAAQ,KAAG,OAAO,CAAC,QAAQ,CAAC,CAalD"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { handleStudioRequest } from
|
|
2
|
-
import { injectEventHooks } from
|
|
1
|
+
import { handleStudioRequest } from "../core/handler.js";
|
|
2
|
+
import { injectEventHooks, injectLastSeenAtHooks } from "../utils/hook-injector.js";
|
|
3
3
|
/**
|
|
4
4
|
* SolidStart adapter for Better Auth Studio
|
|
5
5
|
*
|
|
@@ -19,8 +19,10 @@ import { injectEventHooks } from '../utils/hook-injector.js';
|
|
|
19
19
|
* ```
|
|
20
20
|
*/
|
|
21
21
|
export function betterAuthStudio(config) {
|
|
22
|
-
if (config.
|
|
23
|
-
|
|
22
|
+
if (config.auth) {
|
|
23
|
+
injectLastSeenAtHooks(config.auth, config);
|
|
24
|
+
if (config.events?.enabled)
|
|
25
|
+
injectEventHooks(config.auth, config.events);
|
|
24
26
|
}
|
|
25
27
|
return async (event) => {
|
|
26
28
|
try {
|
|
@@ -29,10 +31,10 @@ export function betterAuthStudio(config) {
|
|
|
29
31
|
return universalToResponse(universalRes);
|
|
30
32
|
}
|
|
31
33
|
catch (error) {
|
|
32
|
-
console.error(
|
|
33
|
-
return new Response(JSON.stringify({ error:
|
|
34
|
+
console.error("Studio handler error:", error);
|
|
35
|
+
return new Response(JSON.stringify({ error: "Internal server error" }), {
|
|
34
36
|
status: 500,
|
|
35
|
-
headers: {
|
|
37
|
+
headers: { "Content-Type": "application/json" },
|
|
36
38
|
});
|
|
37
39
|
}
|
|
38
40
|
};
|
|
@@ -41,16 +43,16 @@ async function convertSolidStartToUniversal(event, config) {
|
|
|
41
43
|
const request = event.request;
|
|
42
44
|
let body;
|
|
43
45
|
const method = request.method;
|
|
44
|
-
if (method !==
|
|
45
|
-
const contentType = request.headers.get(
|
|
46
|
-
if (contentType.includes(
|
|
46
|
+
if (method !== "GET" && method !== "HEAD") {
|
|
47
|
+
const contentType = request.headers.get("content-type") || "";
|
|
48
|
+
if (contentType.includes("application/json")) {
|
|
47
49
|
try {
|
|
48
50
|
body = await request.json();
|
|
49
51
|
}
|
|
50
52
|
catch { }
|
|
51
53
|
}
|
|
52
|
-
else if (contentType.includes(
|
|
53
|
-
contentType.includes(
|
|
54
|
+
else if (contentType.includes("application/x-www-form-urlencoded") ||
|
|
55
|
+
contentType.includes("multipart/form-data")) {
|
|
54
56
|
try {
|
|
55
57
|
const formData = await request.formData();
|
|
56
58
|
body = Object.fromEntries(formData.entries());
|
|
@@ -76,12 +78,12 @@ async function convertSolidStartToUniversal(event, config) {
|
|
|
76
78
|
request.headers.forEach((value, key) => {
|
|
77
79
|
headers[key] = value;
|
|
78
80
|
});
|
|
79
|
-
const basePath = config.basePath ||
|
|
80
|
-
const normalizedBasePath = basePath.endsWith(
|
|
81
|
+
const basePath = config.basePath || "/api/studio";
|
|
82
|
+
const normalizedBasePath = basePath.endsWith("/") ? basePath.slice(0, -1) : basePath;
|
|
81
83
|
const url = new URL(request.url);
|
|
82
84
|
let path = url.pathname;
|
|
83
85
|
if (path.startsWith(normalizedBasePath)) {
|
|
84
|
-
path = path.slice(normalizedBasePath.length) ||
|
|
86
|
+
path = path.slice(normalizedBasePath.length) || "/";
|
|
85
87
|
}
|
|
86
88
|
const pathWithQuery = path + url.search;
|
|
87
89
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solid-start.js","sourceRoot":"","sources":["../../src/adapters/solid-start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"solid-start.js","sourceRoot":"","sources":["../../src/adapters/solid-start.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { RequestEvent } from
|
|
2
|
-
import type { StudioConfig } from
|
|
1
|
+
import type { RequestEvent } from "@sveltejs/kit";
|
|
2
|
+
import type { StudioConfig } from "../types/handler.js";
|
|
3
3
|
/**
|
|
4
4
|
* SvelteKit adapter for Better Auth Studio
|
|
5
5
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svelte-kit.d.ts","sourceRoot":"","sources":["../../src/adapters/svelte-kit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,KAAK,EAAE,YAAY,EAAuC,MAAM,qBAAqB,CAAC;AAG7F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"svelte-kit.d.ts","sourceRoot":"","sources":["../../src/adapters/svelte-kit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,KAAK,EAAE,YAAY,EAAuC,MAAM,qBAAqB,CAAC;AAG7F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,IAMrC,OAAO,YAAY,KAAG,OAAO,CAAC,QAAQ,CAAC,CAatD"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { handleStudioRequest } from
|
|
2
|
-
import { injectEventHooks } from
|
|
1
|
+
import { handleStudioRequest } from "../core/handler.js";
|
|
2
|
+
import { injectEventHooks, injectLastSeenAtHooks } from "../utils/hook-injector.js";
|
|
3
3
|
/**
|
|
4
4
|
* SvelteKit adapter for Better Auth Studio
|
|
5
5
|
*
|
|
@@ -33,8 +33,10 @@ import { injectEventHooks } from '../utils/hook-injector.js';
|
|
|
33
33
|
* ```
|
|
34
34
|
*/
|
|
35
35
|
export function betterAuthStudio(config) {
|
|
36
|
-
if (config.
|
|
37
|
-
|
|
36
|
+
if (config.auth) {
|
|
37
|
+
injectLastSeenAtHooks(config.auth, config);
|
|
38
|
+
if (config.events?.enabled)
|
|
39
|
+
injectEventHooks(config.auth, config.events);
|
|
38
40
|
}
|
|
39
41
|
return async (event) => {
|
|
40
42
|
try {
|
|
@@ -43,10 +45,10 @@ export function betterAuthStudio(config) {
|
|
|
43
45
|
return universalToResponse(universalRes);
|
|
44
46
|
}
|
|
45
47
|
catch (error) {
|
|
46
|
-
console.error(
|
|
47
|
-
return new Response(JSON.stringify({ error:
|
|
48
|
+
console.error("Studio handler error:", error);
|
|
49
|
+
return new Response(JSON.stringify({ error: "Internal server error" }), {
|
|
48
50
|
status: 500,
|
|
49
|
-
headers: {
|
|
51
|
+
headers: { "Content-Type": "application/json" },
|
|
50
52
|
});
|
|
51
53
|
}
|
|
52
54
|
};
|
|
@@ -54,16 +56,16 @@ export function betterAuthStudio(config) {
|
|
|
54
56
|
async function convertSvelteKitToUniversal(event, config) {
|
|
55
57
|
let body;
|
|
56
58
|
const method = event.request.method;
|
|
57
|
-
if (method !==
|
|
58
|
-
const contentType = event.request.headers.get(
|
|
59
|
-
if (contentType.includes(
|
|
59
|
+
if (method !== "GET" && method !== "HEAD") {
|
|
60
|
+
const contentType = event.request.headers.get("content-type") || "";
|
|
61
|
+
if (contentType.includes("application/json")) {
|
|
60
62
|
try {
|
|
61
63
|
body = await event.request.json();
|
|
62
64
|
}
|
|
63
65
|
catch { }
|
|
64
66
|
}
|
|
65
|
-
else if (contentType.includes(
|
|
66
|
-
contentType.includes(
|
|
67
|
+
else if (contentType.includes("application/x-www-form-urlencoded") ||
|
|
68
|
+
contentType.includes("multipart/form-data")) {
|
|
67
69
|
try {
|
|
68
70
|
const formData = await event.request.formData();
|
|
69
71
|
body = Object.fromEntries(formData.entries());
|
|
@@ -89,11 +91,11 @@ async function convertSvelteKitToUniversal(event, config) {
|
|
|
89
91
|
event.request.headers.forEach((value, key) => {
|
|
90
92
|
headers[key] = value;
|
|
91
93
|
});
|
|
92
|
-
const basePath = config.basePath ||
|
|
93
|
-
const normalizedBasePath = basePath.endsWith(
|
|
94
|
+
const basePath = config.basePath || "/api/studio";
|
|
95
|
+
const normalizedBasePath = basePath.endsWith("/") ? basePath.slice(0, -1) : basePath;
|
|
94
96
|
let path = event.url.pathname;
|
|
95
97
|
if (path.startsWith(normalizedBasePath)) {
|
|
96
|
-
path = path.slice(normalizedBasePath.length) ||
|
|
98
|
+
path = path.slice(normalizedBasePath.length) || "/";
|
|
97
99
|
}
|
|
98
100
|
const pathWithQuery = path + event.url.search;
|
|
99
101
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svelte-kit.js","sourceRoot":"","sources":["../../src/adapters/svelte-kit.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"svelte-kit.js","sourceRoot":"","sources":["../../src/adapters/svelte-kit.ts"],"names":[],"mappings":"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"}
|