@atcute/xrpc-server 0.1.4 → 0.1.5
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.
|
@@ -4,6 +4,8 @@ export interface CORSOptions {
|
|
|
4
4
|
exposedHeaders?: string[];
|
|
5
5
|
/** Additional headers to allow */
|
|
6
6
|
allowedHeaders?: string[];
|
|
7
|
+
/** NSID prefixes to exclude from CORS handling */
|
|
8
|
+
exclude?: string[];
|
|
7
9
|
}
|
|
8
10
|
export declare const cors: (options?: CORSOptions) => FetchMiddleware;
|
|
9
11
|
//# sourceMappingURL=cors.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cors.d.ts","sourceRoot":"","sources":["../../lib/middlewares/cors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,WAAW,WAAW;IAC3B,iDAAiD;IACjD,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,kCAAkC;IAClC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"cors.d.ts","sourceRoot":"","sources":["../../lib/middlewares/cors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,WAAW,WAAW;IAC3B,iDAAiD;IACjD,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,kCAAkC;IAClC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,kDAAkD;IAClD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAwBD,eAAO,MAAM,IAAI,4CA4DhB,CAAC"}
|
package/dist/middlewares/cors.js
CHANGED
|
@@ -13,12 +13,31 @@ const DEFAULT_ALLOWED_HEADERS = [
|
|
|
13
13
|
'atproto-accept-labelers',
|
|
14
14
|
'atproto-proxy',
|
|
15
15
|
];
|
|
16
|
+
const RE_XRPC_NSID = /^\/xrpc\/([^?]*)/;
|
|
16
17
|
export const cors = (options = {}) => {
|
|
17
18
|
const exposedHeaders = Array.from(new Set([...DEFAULT_EXPOSED_HEADERS, ...(options.exposedHeaders?.map((h) => h.toLowerCase()) || [])])).sort();
|
|
18
19
|
const allowedHeaders = Array.from(new Set([...DEFAULT_ALLOWED_HEADERS, ...(options.allowedHeaders?.map((h) => h.toLowerCase()) || [])]))
|
|
19
20
|
.sort()
|
|
20
21
|
.join(',');
|
|
22
|
+
const exclude = options.exclude;
|
|
21
23
|
return async (request, next) => {
|
|
24
|
+
// check if this NSID should be excluded from CORS handling
|
|
25
|
+
if (exclude) {
|
|
26
|
+
const url = new URL(request.url);
|
|
27
|
+
const match = RE_XRPC_NSID.exec(url.pathname);
|
|
28
|
+
if (match) {
|
|
29
|
+
const nsid = match[1];
|
|
30
|
+
const excluded = exclude.some((pattern) => {
|
|
31
|
+
if (pattern.endsWith('.*')) {
|
|
32
|
+
return nsid.startsWith(pattern.slice(0, -1));
|
|
33
|
+
}
|
|
34
|
+
return nsid === pattern;
|
|
35
|
+
});
|
|
36
|
+
if (excluded) {
|
|
37
|
+
return next(request);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
22
41
|
const origin = request.headers.get('origin') || '*';
|
|
23
42
|
// Handle preflight requests
|
|
24
43
|
if (request.method === 'OPTIONS') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cors.js","sourceRoot":"","sources":["../../lib/middlewares/cors.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cors.js","sourceRoot":"","sources":["../../lib/middlewares/cors.ts"],"names":[],"mappings":"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"}
|
package/lib/middlewares/cors.ts
CHANGED
|
@@ -5,6 +5,8 @@ export interface CORSOptions {
|
|
|
5
5
|
exposedHeaders?: string[];
|
|
6
6
|
/** Additional headers to allow */
|
|
7
7
|
allowedHeaders?: string[];
|
|
8
|
+
/** NSID prefixes to exclude from CORS handling */
|
|
9
|
+
exclude?: string[];
|
|
8
10
|
}
|
|
9
11
|
|
|
10
12
|
const DEFAULT_EXPOSED_HEADERS = [
|
|
@@ -27,6 +29,8 @@ const DEFAULT_ALLOWED_HEADERS = [
|
|
|
27
29
|
'atproto-proxy',
|
|
28
30
|
];
|
|
29
31
|
|
|
32
|
+
const RE_XRPC_NSID = /^\/xrpc\/([^?]*)/;
|
|
33
|
+
|
|
30
34
|
export const cors = (options: CORSOptions = {}): FetchMiddleware => {
|
|
31
35
|
const exposedHeaders = Array.from(
|
|
32
36
|
new Set([...DEFAULT_EXPOSED_HEADERS, ...(options.exposedHeaders?.map((h) => h.toLowerCase()) || [])]),
|
|
@@ -38,7 +42,29 @@ export const cors = (options: CORSOptions = {}): FetchMiddleware => {
|
|
|
38
42
|
.sort()
|
|
39
43
|
.join(',');
|
|
40
44
|
|
|
45
|
+
const exclude = options.exclude;
|
|
46
|
+
|
|
41
47
|
return async (request, next) => {
|
|
48
|
+
// check if this NSID should be excluded from CORS handling
|
|
49
|
+
if (exclude) {
|
|
50
|
+
const url = new URL(request.url);
|
|
51
|
+
const match = RE_XRPC_NSID.exec(url.pathname);
|
|
52
|
+
|
|
53
|
+
if (match) {
|
|
54
|
+
const nsid = match[1];
|
|
55
|
+
const excluded = exclude.some((pattern) => {
|
|
56
|
+
if (pattern.endsWith('.*')) {
|
|
57
|
+
return nsid.startsWith(pattern.slice(0, -1));
|
|
58
|
+
}
|
|
59
|
+
return nsid === pattern;
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
if (excluded) {
|
|
63
|
+
return next(request);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
|
|
42
68
|
const origin = request.headers.get('origin') || '*';
|
|
43
69
|
|
|
44
70
|
// Handle preflight requests
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"type": "module",
|
|
3
3
|
"name": "@atcute/xrpc-server",
|
|
4
|
-
"version": "0.1.
|
|
4
|
+
"version": "0.1.5",
|
|
5
5
|
"description": "a small web framework for handling XRPC operations",
|
|
6
6
|
"license": "0BSD",
|
|
7
7
|
"repository": {
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
"@atcute/crypto": "^2.3.0",
|
|
30
30
|
"@atcute/identity": "^1.1.3",
|
|
31
31
|
"@atcute/identity-resolver": "^1.2.1",
|
|
32
|
-
"@atcute/multibase": "^1.1.6",
|
|
33
32
|
"@atcute/lexicons": "^1.2.5",
|
|
34
|
-
"@atcute/uint8array": "^1.0.6"
|
|
33
|
+
"@atcute/uint8array": "^1.0.6",
|
|
34
|
+
"@atcute/multibase": "^1.1.6"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"@atcute/xrpc-server": "file:",
|