@edgestore/server 0.5.2 → 0.5.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/dist/adapters/astro/index.d.ts +3 -0
- package/dist/adapters/astro/index.d.ts.map +1 -1
- package/dist/adapters/astro/index.js +23 -21
- package/dist/adapters/astro/index.mjs +12 -10
- package/dist/adapters/express/index.d.ts +3 -0
- package/dist/adapters/express/index.d.ts.map +1 -1
- package/dist/adapters/express/index.js +23 -21
- package/dist/adapters/express/index.mjs +12 -10
- package/dist/adapters/fastify/index.d.ts +4 -1
- package/dist/adapters/fastify/index.d.ts.map +1 -1
- package/dist/adapters/fastify/index.js +23 -21
- package/dist/adapters/fastify/index.mjs +12 -10
- package/dist/adapters/hono/index.d.ts +3 -0
- package/dist/adapters/hono/index.d.ts.map +1 -1
- package/dist/adapters/hono/index.js +23 -21
- package/dist/adapters/hono/index.mjs +12 -10
- package/dist/adapters/next/app/index.d.ts +3 -0
- package/dist/adapters/next/app/index.d.ts.map +1 -1
- package/dist/adapters/next/app/index.js +24 -22
- package/dist/adapters/next/app/index.mjs +12 -10
- package/dist/adapters/next/pages/index.d.ts +3 -0
- package/dist/adapters/next/pages/index.d.ts.map +1 -1
- package/dist/adapters/next/pages/index.js +24 -22
- package/dist/adapters/next/pages/index.mjs +12 -10
- package/dist/adapters/remix/index.d.ts +3 -0
- package/dist/adapters/remix/index.d.ts.map +1 -1
- package/dist/adapters/remix/index.js +23 -21
- package/dist/adapters/remix/index.mjs +12 -10
- package/dist/adapters/shared.d.ts +74 -0
- package/dist/adapters/shared.d.ts.map +1 -1
- package/dist/adapters/start/index.d.ts +3 -0
- package/dist/adapters/start/index.d.ts.map +1 -1
- package/dist/adapters/start/index.js +26 -22
- package/dist/adapters/start/index.mjs +15 -11
- package/dist/core/client/index.d.ts.map +1 -1
- package/dist/core/index.js +6 -3
- package/dist/core/index.mjs +7 -4
- package/dist/{index-7b259533.js → index-0c5489b9.js} +1 -1
- package/dist/{index-421c502f.js → index-c5c3cdaa.js} +1 -1
- package/dist/{index-2848cb40.mjs → index-e0432eed.mjs} +1 -1
- package/dist/providers/aws/index.js +1 -1
- package/dist/providers/aws/index.mjs +1 -1
- package/dist/providers/azure/index.js +1 -1
- package/dist/providers/azure/index.mjs +1 -1
- package/dist/providers/edgestore/index.js +2 -2
- package/dist/providers/edgestore/index.mjs +2 -2
- package/dist/{shared-25dbfab4.js → shared-8397d4db.js} +37 -10
- package/dist/{shared-685c8a0c.js → shared-8a6bcddb.js} +38 -9
- package/dist/{shared-4b199b96.mjs → shared-d2a0d681.mjs} +38 -10
- package/dist/{utils-7349adab.mjs → utils-2dd5613c.mjs} +1 -1
- package/dist/{utils-0aab6e3b.js → utils-681a13a7.js} +1 -1
- package/dist/{utils-b3d35894.js → utils-b30649cc.js} +1 -1
- package/package.json +7 -7
- package/src/adapters/astro/index.ts +19 -9
- package/src/adapters/express/index.ts +13 -6
- package/src/adapters/fastify/index.ts +33 -22
- package/src/adapters/hono/index.ts +13 -6
- package/src/adapters/next/app/index.ts +13 -6
- package/src/adapters/next/pages/index.ts +13 -6
- package/src/adapters/remix/index.ts +13 -6
- package/src/adapters/shared.ts +125 -9
- package/src/adapters/start/index.ts +16 -7
- package/src/core/client/index.ts +7 -1
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { EdgeStoreError, EDGE_STORE_ERROR_CODES } from '@edgestore/shared';
|
|
2
|
-
import { L as Logger, m as matchPath } from '../../utils-
|
|
2
|
+
import { L as Logger, m as matchPath } from '../../utils-2dd5613c.mjs';
|
|
3
3
|
import { EdgeStoreProvider } from '../../providers/edgestore/index.mjs';
|
|
4
|
-
import { a as init, r as requestUpload,
|
|
5
|
-
import '../../index-
|
|
4
|
+
import { a as getCookieConfig, c as init, r as requestUpload, d as requestUploadParts, e as completeMultipartUpload, f as confirmUpload, h as deleteFile } from '../../shared-d2a0d681.mjs';
|
|
5
|
+
import '../../index-e0432eed.mjs';
|
|
6
6
|
import '@panva/hkdf';
|
|
7
7
|
import 'cookie';
|
|
8
8
|
import 'jose';
|
|
@@ -26,10 +26,11 @@ function getCookie(req, name) {
|
|
|
26
26
|
return cookies[name];
|
|
27
27
|
}
|
|
28
28
|
function createEdgeStoreFastifyHandler(config) {
|
|
29
|
-
const { provider = EdgeStoreProvider() } = config;
|
|
29
|
+
const { provider = EdgeStoreProvider(), cookieConfig } = config;
|
|
30
30
|
const log = new Logger(config.logLevel);
|
|
31
31
|
globalThis._EDGE_STORE_LOGGER = log;
|
|
32
32
|
log.debug('Creating EdgeStore Fastify handler');
|
|
33
|
+
const resolvedCookieConfig = getCookieConfig(cookieConfig);
|
|
33
34
|
return async (req, reply)=>{
|
|
34
35
|
try {
|
|
35
36
|
// Get the URL from the request - simplified approach
|
|
@@ -53,7 +54,8 @@ function createEdgeStoreFastifyHandler(config) {
|
|
|
53
54
|
const { newCookies, token, baseUrl } = await init({
|
|
54
55
|
ctx,
|
|
55
56
|
provider,
|
|
56
|
-
router: config.router
|
|
57
|
+
router: config.router,
|
|
58
|
+
cookieConfig
|
|
57
59
|
});
|
|
58
60
|
// Set cookies more efficiently - handling them using void operator
|
|
59
61
|
// to explicitly mark these synchronous calls as intentionally not awaited
|
|
@@ -75,21 +77,21 @@ function createEdgeStoreFastifyHandler(config) {
|
|
|
75
77
|
provider,
|
|
76
78
|
router: config.router,
|
|
77
79
|
body: req.body,
|
|
78
|
-
ctxToken: getCookie(req,
|
|
80
|
+
ctxToken: getCookie(req, resolvedCookieConfig.ctx.name)
|
|
79
81
|
}));
|
|
80
82
|
} else if (matchPath(pathname, '/request-upload-parts')) {
|
|
81
83
|
return reply.send(await requestUploadParts({
|
|
82
84
|
provider,
|
|
83
85
|
router: config.router,
|
|
84
86
|
body: req.body,
|
|
85
|
-
ctxToken: getCookie(req,
|
|
87
|
+
ctxToken: getCookie(req, resolvedCookieConfig.ctx.name)
|
|
86
88
|
}));
|
|
87
89
|
} else if (matchPath(pathname, '/complete-multipart-upload')) {
|
|
88
90
|
await completeMultipartUpload({
|
|
89
91
|
provider,
|
|
90
92
|
router: config.router,
|
|
91
93
|
body: req.body,
|
|
92
|
-
ctxToken: getCookie(req,
|
|
94
|
+
ctxToken: getCookie(req, resolvedCookieConfig.ctx.name)
|
|
93
95
|
});
|
|
94
96
|
return reply.status(200).send();
|
|
95
97
|
} else if (matchPath(pathname, '/confirm-upload')) {
|
|
@@ -97,14 +99,14 @@ function createEdgeStoreFastifyHandler(config) {
|
|
|
97
99
|
provider,
|
|
98
100
|
router: config.router,
|
|
99
101
|
body: req.body,
|
|
100
|
-
ctxToken: getCookie(req,
|
|
102
|
+
ctxToken: getCookie(req, resolvedCookieConfig.ctx.name)
|
|
101
103
|
}));
|
|
102
104
|
} else if (matchPath(pathname, '/delete-file')) {
|
|
103
105
|
return reply.send(await deleteFile({
|
|
104
106
|
provider,
|
|
105
107
|
router: config.router,
|
|
106
108
|
body: req.body,
|
|
107
|
-
ctxToken: getCookie(req,
|
|
109
|
+
ctxToken: getCookie(req, resolvedCookieConfig.ctx.name)
|
|
108
110
|
}));
|
|
109
111
|
} else if (matchPath(pathname, '/proxy-file')) {
|
|
110
112
|
const url = req.query ? req.query.url : undefined;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type EdgeStoreErrorCodeKey, type EdgeStoreRouter, type MaybePromise, type Provider } from '@edgestore/shared';
|
|
2
2
|
import { type Context } from 'hono';
|
|
3
3
|
import { type LogLevel } from '../../libs/logger';
|
|
4
|
+
import { type CookieConfig } from '../shared';
|
|
4
5
|
export type CreateContextOptions = {
|
|
5
6
|
c: Context;
|
|
6
7
|
};
|
|
@@ -8,10 +9,12 @@ export type Config<TCtx> = {
|
|
|
8
9
|
provider?: Provider;
|
|
9
10
|
router: EdgeStoreRouter<TCtx>;
|
|
10
11
|
logLevel?: LogLevel;
|
|
12
|
+
cookieConfig?: CookieConfig;
|
|
11
13
|
} & (TCtx extends Record<string, never> ? object : {
|
|
12
14
|
provider?: Provider;
|
|
13
15
|
router: EdgeStoreRouter<TCtx>;
|
|
14
16
|
createContext: (opts: CreateContextOptions) => MaybePromise<TCtx>;
|
|
17
|
+
cookieConfig?: CookieConfig;
|
|
15
18
|
});
|
|
16
19
|
export declare function createEdgeStoreHonoHandler<TCtx>(config: Config<TCtx>): (c: Context) => Promise<(Response & import("hono").TypedResponse<"OK", import("hono/utils/http-status").ContentfulStatusCode, "text">) | (Response & import("hono").TypedResponse<{
|
|
17
20
|
token: string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/hono/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,MAAM,CAAC;AACpC,OAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/hono/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,MAAM,CAAC;AACpC,OAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG1D,OAAO,EAUL,KAAK,YAAY,EAIlB,MAAM,WAAW,CAAC;AAEnB,MAAM,MAAM,oBAAoB,GAAG;IACjC,CAAC,EAAE,OAAO,CAAC;CACZ,CAAC;AAEF,MAAM,MAAM,MAAM,CAAC,IAAI,IAAI;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,GAAG,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GACnC,MAAM,GACN;IACE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAClE,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC,CAAC;AAeP,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,OAQlD,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAsIzB"}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var shared = require('@edgestore/shared');
|
|
6
|
-
var utils = require('../../utils-
|
|
5
|
+
var shared$1 = require('@edgestore/shared');
|
|
6
|
+
var utils = require('../../utils-681a13a7.js');
|
|
7
7
|
var providers_edgestore_index = require('../../providers/edgestore/index.js');
|
|
8
|
-
var shared
|
|
9
|
-
require('../../index-
|
|
8
|
+
var shared = require('../../shared-8a6bcddb.js');
|
|
9
|
+
require('../../index-0c5489b9.js');
|
|
10
10
|
require('@panva/hkdf');
|
|
11
11
|
require('cookie');
|
|
12
12
|
require('jose');
|
|
@@ -20,10 +20,11 @@ function getCookie(c, name) {
|
|
|
20
20
|
return match ? match[1] : undefined;
|
|
21
21
|
}
|
|
22
22
|
function createEdgeStoreHonoHandler(config) {
|
|
23
|
-
const { provider = providers_edgestore_index.EdgeStoreProvider() } = config;
|
|
23
|
+
const { provider = providers_edgestore_index.EdgeStoreProvider(), cookieConfig } = config;
|
|
24
24
|
const log = new utils.Logger(config.logLevel);
|
|
25
25
|
globalThis._EDGE_STORE_LOGGER = log;
|
|
26
26
|
log.debug('Creating EdgeStore Hono handler');
|
|
27
|
+
const resolvedCookieConfig = shared.getCookieConfig(cookieConfig);
|
|
27
28
|
return async (c)=>{
|
|
28
29
|
try {
|
|
29
30
|
const pathname = new URL(c.req.url).pathname;
|
|
@@ -36,16 +37,17 @@ function createEdgeStoreHonoHandler(config) {
|
|
|
36
37
|
c
|
|
37
38
|
}) : {};
|
|
38
39
|
} catch (err) {
|
|
39
|
-
throw new shared.EdgeStoreError({
|
|
40
|
+
throw new shared$1.EdgeStoreError({
|
|
40
41
|
message: 'Error creating context',
|
|
41
42
|
code: 'CREATE_CONTEXT_ERROR',
|
|
42
43
|
cause: err instanceof Error ? err : undefined
|
|
43
44
|
});
|
|
44
45
|
}
|
|
45
|
-
const { newCookies, token, baseUrl } = await shared
|
|
46
|
+
const { newCookies, token, baseUrl } = await shared.init({
|
|
46
47
|
ctx,
|
|
47
48
|
provider,
|
|
48
|
-
router: config.router
|
|
49
|
+
router: config.router,
|
|
50
|
+
cookieConfig
|
|
49
51
|
});
|
|
50
52
|
// Set cookies
|
|
51
53
|
if (Array.isArray(newCookies)) {
|
|
@@ -61,44 +63,44 @@ function createEdgeStoreHonoHandler(config) {
|
|
|
61
63
|
});
|
|
62
64
|
} else if (utils.matchPath(pathname, '/request-upload')) {
|
|
63
65
|
const body = await c.req.json();
|
|
64
|
-
return c.json(await shared
|
|
66
|
+
return c.json(await shared.requestUpload({
|
|
65
67
|
provider,
|
|
66
68
|
router: config.router,
|
|
67
69
|
body,
|
|
68
|
-
ctxToken: getCookie(c,
|
|
70
|
+
ctxToken: getCookie(c, resolvedCookieConfig.ctx.name)
|
|
69
71
|
}));
|
|
70
72
|
} else if (utils.matchPath(pathname, '/request-upload-parts')) {
|
|
71
73
|
const body = await c.req.json();
|
|
72
|
-
return c.json(await shared
|
|
74
|
+
return c.json(await shared.requestUploadParts({
|
|
73
75
|
provider,
|
|
74
76
|
router: config.router,
|
|
75
77
|
body,
|
|
76
|
-
ctxToken: getCookie(c,
|
|
78
|
+
ctxToken: getCookie(c, resolvedCookieConfig.ctx.name)
|
|
77
79
|
}));
|
|
78
80
|
} else if (utils.matchPath(pathname, '/complete-multipart-upload')) {
|
|
79
81
|
const body = await c.req.json();
|
|
80
|
-
await shared
|
|
82
|
+
await shared.completeMultipartUpload({
|
|
81
83
|
provider,
|
|
82
84
|
router: config.router,
|
|
83
85
|
body,
|
|
84
|
-
ctxToken: getCookie(c,
|
|
86
|
+
ctxToken: getCookie(c, resolvedCookieConfig.ctx.name)
|
|
85
87
|
});
|
|
86
88
|
return c.body(null, 200);
|
|
87
89
|
} else if (utils.matchPath(pathname, '/confirm-upload')) {
|
|
88
90
|
const body = await c.req.json();
|
|
89
|
-
return c.json(await shared
|
|
91
|
+
return c.json(await shared.confirmUpload({
|
|
90
92
|
provider,
|
|
91
93
|
router: config.router,
|
|
92
94
|
body,
|
|
93
|
-
ctxToken: getCookie(c,
|
|
95
|
+
ctxToken: getCookie(c, resolvedCookieConfig.ctx.name)
|
|
94
96
|
}));
|
|
95
97
|
} else if (utils.matchPath(pathname, '/delete-file')) {
|
|
96
98
|
const body = await c.req.json();
|
|
97
|
-
return c.json(await shared
|
|
99
|
+
return c.json(await shared.deleteFile({
|
|
98
100
|
provider,
|
|
99
101
|
router: config.router,
|
|
100
102
|
body,
|
|
101
|
-
ctxToken: getCookie(c,
|
|
103
|
+
ctxToken: getCookie(c, resolvedCookieConfig.ctx.name)
|
|
102
104
|
}));
|
|
103
105
|
} else if (utils.matchPath(pathname, '/proxy-file')) {
|
|
104
106
|
const url = c.req.query('url');
|
|
@@ -119,13 +121,13 @@ function createEdgeStoreHonoHandler(config) {
|
|
|
119
121
|
return c.body(null, 404);
|
|
120
122
|
}
|
|
121
123
|
} catch (err) {
|
|
122
|
-
if (err instanceof shared.EdgeStoreError) {
|
|
124
|
+
if (err instanceof shared$1.EdgeStoreError) {
|
|
123
125
|
log[err.level](err.formattedMessage());
|
|
124
126
|
if (err.cause) log[err.level](err.cause);
|
|
125
|
-
return c.json(err.formattedJson(), shared.EDGE_STORE_ERROR_CODES[err.code]);
|
|
127
|
+
return c.json(err.formattedJson(), shared$1.EDGE_STORE_ERROR_CODES[err.code]);
|
|
126
128
|
} else {
|
|
127
129
|
log.error(err);
|
|
128
|
-
return c.json(new shared.EdgeStoreError({
|
|
130
|
+
return c.json(new shared$1.EdgeStoreError({
|
|
129
131
|
message: 'Internal Server Error',
|
|
130
132
|
code: 'SERVER_ERROR'
|
|
131
133
|
}).formattedJson(), 500);
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { EdgeStoreError, EDGE_STORE_ERROR_CODES } from '@edgestore/shared';
|
|
2
|
-
import { L as Logger, m as matchPath } from '../../utils-
|
|
2
|
+
import { L as Logger, m as matchPath } from '../../utils-2dd5613c.mjs';
|
|
3
3
|
import { EdgeStoreProvider } from '../../providers/edgestore/index.mjs';
|
|
4
|
-
import { a as init, r as requestUpload,
|
|
5
|
-
import '../../index-
|
|
4
|
+
import { a as getCookieConfig, c as init, r as requestUpload, d as requestUploadParts, e as completeMultipartUpload, f as confirmUpload, h as deleteFile } from '../../shared-d2a0d681.mjs';
|
|
5
|
+
import '../../index-e0432eed.mjs';
|
|
6
6
|
import '@panva/hkdf';
|
|
7
7
|
import 'cookie';
|
|
8
8
|
import 'jose';
|
|
@@ -16,10 +16,11 @@ function getCookie(c, name) {
|
|
|
16
16
|
return match ? match[1] : undefined;
|
|
17
17
|
}
|
|
18
18
|
function createEdgeStoreHonoHandler(config) {
|
|
19
|
-
const { provider = EdgeStoreProvider() } = config;
|
|
19
|
+
const { provider = EdgeStoreProvider(), cookieConfig } = config;
|
|
20
20
|
const log = new Logger(config.logLevel);
|
|
21
21
|
globalThis._EDGE_STORE_LOGGER = log;
|
|
22
22
|
log.debug('Creating EdgeStore Hono handler');
|
|
23
|
+
const resolvedCookieConfig = getCookieConfig(cookieConfig);
|
|
23
24
|
return async (c)=>{
|
|
24
25
|
try {
|
|
25
26
|
const pathname = new URL(c.req.url).pathname;
|
|
@@ -41,7 +42,8 @@ function createEdgeStoreHonoHandler(config) {
|
|
|
41
42
|
const { newCookies, token, baseUrl } = await init({
|
|
42
43
|
ctx,
|
|
43
44
|
provider,
|
|
44
|
-
router: config.router
|
|
45
|
+
router: config.router,
|
|
46
|
+
cookieConfig
|
|
45
47
|
});
|
|
46
48
|
// Set cookies
|
|
47
49
|
if (Array.isArray(newCookies)) {
|
|
@@ -61,7 +63,7 @@ function createEdgeStoreHonoHandler(config) {
|
|
|
61
63
|
provider,
|
|
62
64
|
router: config.router,
|
|
63
65
|
body,
|
|
64
|
-
ctxToken: getCookie(c,
|
|
66
|
+
ctxToken: getCookie(c, resolvedCookieConfig.ctx.name)
|
|
65
67
|
}));
|
|
66
68
|
} else if (matchPath(pathname, '/request-upload-parts')) {
|
|
67
69
|
const body = await c.req.json();
|
|
@@ -69,7 +71,7 @@ function createEdgeStoreHonoHandler(config) {
|
|
|
69
71
|
provider,
|
|
70
72
|
router: config.router,
|
|
71
73
|
body,
|
|
72
|
-
ctxToken: getCookie(c,
|
|
74
|
+
ctxToken: getCookie(c, resolvedCookieConfig.ctx.name)
|
|
73
75
|
}));
|
|
74
76
|
} else if (matchPath(pathname, '/complete-multipart-upload')) {
|
|
75
77
|
const body = await c.req.json();
|
|
@@ -77,7 +79,7 @@ function createEdgeStoreHonoHandler(config) {
|
|
|
77
79
|
provider,
|
|
78
80
|
router: config.router,
|
|
79
81
|
body,
|
|
80
|
-
ctxToken: getCookie(c,
|
|
82
|
+
ctxToken: getCookie(c, resolvedCookieConfig.ctx.name)
|
|
81
83
|
});
|
|
82
84
|
return c.body(null, 200);
|
|
83
85
|
} else if (matchPath(pathname, '/confirm-upload')) {
|
|
@@ -86,7 +88,7 @@ function createEdgeStoreHonoHandler(config) {
|
|
|
86
88
|
provider,
|
|
87
89
|
router: config.router,
|
|
88
90
|
body,
|
|
89
|
-
ctxToken: getCookie(c,
|
|
91
|
+
ctxToken: getCookie(c, resolvedCookieConfig.ctx.name)
|
|
90
92
|
}));
|
|
91
93
|
} else if (matchPath(pathname, '/delete-file')) {
|
|
92
94
|
const body = await c.req.json();
|
|
@@ -94,7 +96,7 @@ function createEdgeStoreHonoHandler(config) {
|
|
|
94
96
|
provider,
|
|
95
97
|
router: config.router,
|
|
96
98
|
body,
|
|
97
|
-
ctxToken: getCookie(c,
|
|
99
|
+
ctxToken: getCookie(c, resolvedCookieConfig.ctx.name)
|
|
98
100
|
}));
|
|
99
101
|
} else if (matchPath(pathname, '/proxy-file')) {
|
|
100
102
|
const url = c.req.query('url');
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type EdgeStoreRouter, type MaybePromise, type Provider } from '@edgestore/shared';
|
|
2
2
|
import { type NextRequest } from 'next/server';
|
|
3
3
|
import { type LogLevel } from '../../../libs/logger';
|
|
4
|
+
import { type CookieConfig } from '../../shared';
|
|
4
5
|
export type CreateContextOptions = {
|
|
5
6
|
req: NextRequest;
|
|
6
7
|
};
|
|
@@ -8,10 +9,12 @@ export type Config<TCtx> = {
|
|
|
8
9
|
provider?: Provider;
|
|
9
10
|
router: EdgeStoreRouter<TCtx>;
|
|
10
11
|
logLevel?: LogLevel;
|
|
12
|
+
cookieConfig?: CookieConfig;
|
|
11
13
|
} & (TCtx extends Record<string, never> ? object : {
|
|
12
14
|
provider?: Provider;
|
|
13
15
|
router: EdgeStoreRouter<TCtx>;
|
|
14
16
|
createContext: (opts: CreateContextOptions) => MaybePromise<TCtx>;
|
|
17
|
+
cookieConfig?: CookieConfig;
|
|
15
18
|
});
|
|
16
19
|
export declare function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>): (req: NextRequest) => Promise<Response>;
|
|
17
20
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/adapters/next/app/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/adapters/next/app/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAG7D,OAAO,EAUL,KAAK,YAAY,EAIlB,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,WAAW,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,MAAM,CAAC,IAAI,IAAI;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,GAAG,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GACnC,MAAM,GACN;IACE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAClE,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC,CAAC;AAMP,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,SAQhD,WAAW,uBAyK/B"}
|
|
@@ -2,24 +2,25 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var shared = require('@edgestore/shared');
|
|
6
|
-
var utils = require('../../../utils-
|
|
5
|
+
var shared$1 = require('@edgestore/shared');
|
|
6
|
+
var utils = require('../../../utils-681a13a7.js');
|
|
7
7
|
var providers_edgestore_index = require('../../../providers/edgestore/index.js');
|
|
8
|
-
var shared
|
|
9
|
-
require('../../../index-
|
|
8
|
+
var shared = require('../../../shared-8a6bcddb.js');
|
|
9
|
+
require('../../../index-0c5489b9.js');
|
|
10
10
|
require('@panva/hkdf');
|
|
11
11
|
require('cookie');
|
|
12
12
|
require('jose');
|
|
13
13
|
require('uuid');
|
|
14
14
|
|
|
15
15
|
function createEdgeStoreNextHandler(config) {
|
|
16
|
-
const { provider = providers_edgestore_index.EdgeStoreProvider() } = config;
|
|
16
|
+
const { provider = providers_edgestore_index.EdgeStoreProvider(), cookieConfig } = config;
|
|
17
17
|
const log = new utils.Logger(config.logLevel);
|
|
18
18
|
globalThis._EDGE_STORE_LOGGER = log;
|
|
19
19
|
log.debug('Creating EdgeStore Next handler (app adapter)');
|
|
20
|
+
const resolvedCookieConfig = shared.getCookieConfig(cookieConfig);
|
|
20
21
|
return async (req)=>{
|
|
21
22
|
try {
|
|
22
|
-
if (!('nextUrl' in req)) throw new shared.EdgeStoreError({
|
|
23
|
+
if (!('nextUrl' in req)) throw new shared$1.EdgeStoreError({
|
|
23
24
|
message: 'Error running the app adapter. Make sure you are importing the correct adapter in your router configuration',
|
|
24
25
|
code: 'SERVER_ERROR'
|
|
25
26
|
});
|
|
@@ -35,16 +36,17 @@ function createEdgeStoreNextHandler(config) {
|
|
|
35
36
|
req
|
|
36
37
|
}) : {};
|
|
37
38
|
} catch (err) {
|
|
38
|
-
throw new shared.EdgeStoreError({
|
|
39
|
+
throw new shared$1.EdgeStoreError({
|
|
39
40
|
message: 'Error creating context',
|
|
40
41
|
code: 'CREATE_CONTEXT_ERROR',
|
|
41
42
|
cause: err instanceof Error ? err : undefined
|
|
42
43
|
});
|
|
43
44
|
}
|
|
44
|
-
const { newCookies, token, baseUrl } = await shared
|
|
45
|
+
const { newCookies, token, baseUrl } = await shared.init({
|
|
45
46
|
ctx,
|
|
46
47
|
provider,
|
|
47
|
-
router: config.router
|
|
48
|
+
router: config.router,
|
|
49
|
+
cookieConfig
|
|
48
50
|
});
|
|
49
51
|
const res = new Response(JSON.stringify({
|
|
50
52
|
token,
|
|
@@ -60,11 +62,11 @@ function createEdgeStoreNextHandler(config) {
|
|
|
60
62
|
}
|
|
61
63
|
return res;
|
|
62
64
|
} else if (utils.matchPath(pathname, '/request-upload')) {
|
|
63
|
-
const res = await shared
|
|
65
|
+
const res = await shared.requestUpload({
|
|
64
66
|
provider,
|
|
65
67
|
router: config.router,
|
|
66
68
|
body: await req.json(),
|
|
67
|
-
ctxToken: req.cookies.get(
|
|
69
|
+
ctxToken: req.cookies.get(resolvedCookieConfig.ctx.name)?.value
|
|
68
70
|
});
|
|
69
71
|
return new Response(JSON.stringify(res), {
|
|
70
72
|
status: 200,
|
|
@@ -73,11 +75,11 @@ function createEdgeStoreNextHandler(config) {
|
|
|
73
75
|
}
|
|
74
76
|
});
|
|
75
77
|
} else if (utils.matchPath(pathname, '/request-upload-parts')) {
|
|
76
|
-
const res = await shared
|
|
78
|
+
const res = await shared.requestUploadParts({
|
|
77
79
|
provider,
|
|
78
80
|
router: config.router,
|
|
79
81
|
body: await req.json(),
|
|
80
|
-
ctxToken: req.cookies.get(
|
|
82
|
+
ctxToken: req.cookies.get(resolvedCookieConfig.ctx.name)?.value
|
|
81
83
|
});
|
|
82
84
|
return new Response(JSON.stringify(res), {
|
|
83
85
|
status: 200,
|
|
@@ -86,21 +88,21 @@ function createEdgeStoreNextHandler(config) {
|
|
|
86
88
|
}
|
|
87
89
|
});
|
|
88
90
|
} else if (utils.matchPath(pathname, '/complete-multipart-upload')) {
|
|
89
|
-
await shared
|
|
91
|
+
await shared.completeMultipartUpload({
|
|
90
92
|
provider,
|
|
91
93
|
router: config.router,
|
|
92
94
|
body: await req.json(),
|
|
93
|
-
ctxToken: req.cookies.get(
|
|
95
|
+
ctxToken: req.cookies.get(resolvedCookieConfig.ctx.name)?.value
|
|
94
96
|
});
|
|
95
97
|
return new Response(null, {
|
|
96
98
|
status: 200
|
|
97
99
|
});
|
|
98
100
|
} else if (utils.matchPath(pathname, '/confirm-upload')) {
|
|
99
|
-
const res = await shared
|
|
101
|
+
const res = await shared.confirmUpload({
|
|
100
102
|
provider,
|
|
101
103
|
router: config.router,
|
|
102
104
|
body: await req.json(),
|
|
103
|
-
ctxToken: req.cookies.get(
|
|
105
|
+
ctxToken: req.cookies.get(resolvedCookieConfig.ctx.name)?.value
|
|
104
106
|
});
|
|
105
107
|
return new Response(JSON.stringify(res), {
|
|
106
108
|
status: 200,
|
|
@@ -109,11 +111,11 @@ function createEdgeStoreNextHandler(config) {
|
|
|
109
111
|
}
|
|
110
112
|
});
|
|
111
113
|
} else if (utils.matchPath(pathname, '/delete-file')) {
|
|
112
|
-
const res = await shared
|
|
114
|
+
const res = await shared.deleteFile({
|
|
113
115
|
provider,
|
|
114
116
|
router: config.router,
|
|
115
117
|
body: await req.json(),
|
|
116
|
-
ctxToken: req.cookies.get(
|
|
118
|
+
ctxToken: req.cookies.get(resolvedCookieConfig.ctx.name)?.value
|
|
117
119
|
});
|
|
118
120
|
return new Response(JSON.stringify(res), {
|
|
119
121
|
status: 200,
|
|
@@ -147,18 +149,18 @@ function createEdgeStoreNextHandler(config) {
|
|
|
147
149
|
});
|
|
148
150
|
}
|
|
149
151
|
} catch (err) {
|
|
150
|
-
if (err instanceof shared.EdgeStoreError) {
|
|
152
|
+
if (err instanceof shared$1.EdgeStoreError) {
|
|
151
153
|
log[err.level](err.formattedMessage());
|
|
152
154
|
if (err.cause) log[err.level](err.cause);
|
|
153
155
|
return new Response(JSON.stringify(err.formattedJson()), {
|
|
154
|
-
status: shared.EDGE_STORE_ERROR_CODES[err.code],
|
|
156
|
+
status: shared$1.EDGE_STORE_ERROR_CODES[err.code],
|
|
155
157
|
headers: {
|
|
156
158
|
'Content-Type': 'application/json'
|
|
157
159
|
}
|
|
158
160
|
});
|
|
159
161
|
}
|
|
160
162
|
log.error(err);
|
|
161
|
-
return new Response(JSON.stringify(new shared.EdgeStoreError({
|
|
163
|
+
return new Response(JSON.stringify(new shared$1.EdgeStoreError({
|
|
162
164
|
message: 'Internal server error',
|
|
163
165
|
code: 'SERVER_ERROR'
|
|
164
166
|
}).formattedJson()), {
|
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
import { EdgeStoreError, EDGE_STORE_ERROR_CODES } from '@edgestore/shared';
|
|
2
|
-
import { L as Logger, m as matchPath } from '../../../utils-
|
|
2
|
+
import { L as Logger, m as matchPath } from '../../../utils-2dd5613c.mjs';
|
|
3
3
|
import { EdgeStoreProvider } from '../../../providers/edgestore/index.mjs';
|
|
4
|
-
import { a as init, r as requestUpload,
|
|
5
|
-
import '../../../index-
|
|
4
|
+
import { a as getCookieConfig, c as init, r as requestUpload, d as requestUploadParts, e as completeMultipartUpload, f as confirmUpload, h as deleteFile } from '../../../shared-d2a0d681.mjs';
|
|
5
|
+
import '../../../index-e0432eed.mjs';
|
|
6
6
|
import '@panva/hkdf';
|
|
7
7
|
import 'cookie';
|
|
8
8
|
import 'jose';
|
|
9
9
|
import 'uuid';
|
|
10
10
|
|
|
11
11
|
function createEdgeStoreNextHandler(config) {
|
|
12
|
-
const { provider = EdgeStoreProvider() } = config;
|
|
12
|
+
const { provider = EdgeStoreProvider(), cookieConfig } = config;
|
|
13
13
|
const log = new Logger(config.logLevel);
|
|
14
14
|
globalThis._EDGE_STORE_LOGGER = log;
|
|
15
15
|
log.debug('Creating EdgeStore Next handler (app adapter)');
|
|
16
|
+
const resolvedCookieConfig = getCookieConfig(cookieConfig);
|
|
16
17
|
return async (req)=>{
|
|
17
18
|
try {
|
|
18
19
|
if (!('nextUrl' in req)) throw new EdgeStoreError({
|
|
@@ -40,7 +41,8 @@ function createEdgeStoreNextHandler(config) {
|
|
|
40
41
|
const { newCookies, token, baseUrl } = await init({
|
|
41
42
|
ctx,
|
|
42
43
|
provider,
|
|
43
|
-
router: config.router
|
|
44
|
+
router: config.router,
|
|
45
|
+
cookieConfig
|
|
44
46
|
});
|
|
45
47
|
const res = new Response(JSON.stringify({
|
|
46
48
|
token,
|
|
@@ -60,7 +62,7 @@ function createEdgeStoreNextHandler(config) {
|
|
|
60
62
|
provider,
|
|
61
63
|
router: config.router,
|
|
62
64
|
body: await req.json(),
|
|
63
|
-
ctxToken: req.cookies.get(
|
|
65
|
+
ctxToken: req.cookies.get(resolvedCookieConfig.ctx.name)?.value
|
|
64
66
|
});
|
|
65
67
|
return new Response(JSON.stringify(res), {
|
|
66
68
|
status: 200,
|
|
@@ -73,7 +75,7 @@ function createEdgeStoreNextHandler(config) {
|
|
|
73
75
|
provider,
|
|
74
76
|
router: config.router,
|
|
75
77
|
body: await req.json(),
|
|
76
|
-
ctxToken: req.cookies.get(
|
|
78
|
+
ctxToken: req.cookies.get(resolvedCookieConfig.ctx.name)?.value
|
|
77
79
|
});
|
|
78
80
|
return new Response(JSON.stringify(res), {
|
|
79
81
|
status: 200,
|
|
@@ -86,7 +88,7 @@ function createEdgeStoreNextHandler(config) {
|
|
|
86
88
|
provider,
|
|
87
89
|
router: config.router,
|
|
88
90
|
body: await req.json(),
|
|
89
|
-
ctxToken: req.cookies.get(
|
|
91
|
+
ctxToken: req.cookies.get(resolvedCookieConfig.ctx.name)?.value
|
|
90
92
|
});
|
|
91
93
|
return new Response(null, {
|
|
92
94
|
status: 200
|
|
@@ -96,7 +98,7 @@ function createEdgeStoreNextHandler(config) {
|
|
|
96
98
|
provider,
|
|
97
99
|
router: config.router,
|
|
98
100
|
body: await req.json(),
|
|
99
|
-
ctxToken: req.cookies.get(
|
|
101
|
+
ctxToken: req.cookies.get(resolvedCookieConfig.ctx.name)?.value
|
|
100
102
|
});
|
|
101
103
|
return new Response(JSON.stringify(res), {
|
|
102
104
|
status: 200,
|
|
@@ -109,7 +111,7 @@ function createEdgeStoreNextHandler(config) {
|
|
|
109
111
|
provider,
|
|
110
112
|
router: config.router,
|
|
111
113
|
body: await req.json(),
|
|
112
|
-
ctxToken: req.cookies.get(
|
|
114
|
+
ctxToken: req.cookies.get(resolvedCookieConfig.ctx.name)?.value
|
|
113
115
|
});
|
|
114
116
|
return new Response(JSON.stringify(res), {
|
|
115
117
|
status: 200,
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type EdgeStoreRouter, type MaybePromise, type Provider } from '@edgestore/shared';
|
|
2
2
|
import { type NextApiRequest, type NextApiResponse } from 'next/types';
|
|
3
3
|
import { type LogLevel } from '../../../libs/logger';
|
|
4
|
+
import { type CookieConfig } from '../../shared';
|
|
4
5
|
export type CreateContextOptions = {
|
|
5
6
|
req: NextApiRequest;
|
|
6
7
|
res: NextApiResponse;
|
|
@@ -9,10 +10,12 @@ export type Config<TCtx> = {
|
|
|
9
10
|
provider?: Provider;
|
|
10
11
|
router: EdgeStoreRouter<TCtx>;
|
|
11
12
|
logLevel?: LogLevel;
|
|
13
|
+
cookieConfig?: CookieConfig;
|
|
12
14
|
} & (TCtx extends Record<string, never> ? object : {
|
|
13
15
|
provider?: Provider;
|
|
14
16
|
router: EdgeStoreRouter<TCtx>;
|
|
15
17
|
createContext: (opts: CreateContextOptions) => MaybePromise<TCtx>;
|
|
18
|
+
cookieConfig?: CookieConfig;
|
|
16
19
|
});
|
|
17
20
|
export declare function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>): (req: NextApiRequest, res: NextApiResponse) => Promise<void>;
|
|
18
21
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/adapters/next/pages/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AACvE,OAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/adapters/next/pages/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AACvE,OAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAG7D,OAAO,EAUL,KAAK,YAAY,EAIlB,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,cAAc,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,MAAM,CAAC,IAAI,IAAI;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,GAAG,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GACnC,MAAM,GACN;IACE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAClE,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC,CAAC;AAMP,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,SAQhD,cAAc,OAAO,eAAe,mBAwHxD"}
|