@eggjs/koa-static-cache 7.0.0-beta.19 → 7.0.0-beta.21
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/index.d.ts +92 -94
- package/dist/index.js +219 -153
- package/package.json +6 -6
package/dist/index.d.ts
CHANGED
|
@@ -1,101 +1,99 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
length?: number;
|
|
1
|
+
export type FileFilter = (path: string) => boolean;
|
|
2
|
+
export interface FileMeta {
|
|
3
|
+
maxAge?: number;
|
|
4
|
+
cacheControl?: string | ((path: string) => string);
|
|
5
|
+
buffer?: Buffer;
|
|
6
|
+
zipBuffer?: Buffer;
|
|
7
|
+
type?: string;
|
|
8
|
+
mime?: string;
|
|
9
|
+
mtime?: Date;
|
|
10
|
+
path?: string;
|
|
11
|
+
md5?: string;
|
|
12
|
+
length?: number;
|
|
14
13
|
}
|
|
15
|
-
interface FileMap {
|
|
16
|
-
|
|
14
|
+
export interface FileMap {
|
|
15
|
+
[path: string]: FileMeta;
|
|
17
16
|
}
|
|
18
|
-
interface FileStore {
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
export interface FileStore {
|
|
18
|
+
get(key: string): unknown;
|
|
19
|
+
set(key: string, value: unknown): void;
|
|
21
20
|
}
|
|
22
|
-
interface Options {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
21
|
+
export interface Options {
|
|
22
|
+
/**
|
|
23
|
+
* The root directory from which to serve static assets
|
|
24
|
+
* Default to `process.cwd`
|
|
25
|
+
*/
|
|
26
|
+
dir?: string;
|
|
27
|
+
/**
|
|
28
|
+
* The max age for cache control
|
|
29
|
+
* Default to `0`
|
|
30
|
+
*/
|
|
31
|
+
maxAge?: number;
|
|
32
|
+
/**
|
|
33
|
+
* The cache control header for static files
|
|
34
|
+
* Default to `undefined`
|
|
35
|
+
* Overrides `options.maxAge`
|
|
36
|
+
*/
|
|
37
|
+
cacheControl?: string | ((path: string) => string);
|
|
38
|
+
/**
|
|
39
|
+
* store the files in memory instead of streaming from the filesystem on each request
|
|
40
|
+
*/
|
|
41
|
+
buffer?: boolean;
|
|
42
|
+
/**
|
|
43
|
+
* when request's accept-encoding include gzip, files will compressed by gzip
|
|
44
|
+
* Default to `false`
|
|
45
|
+
*/
|
|
46
|
+
gzip?: boolean;
|
|
47
|
+
/**
|
|
48
|
+
* try use gzip files, loaded from disk, like nginx gzip_static
|
|
49
|
+
* Default to `false`
|
|
50
|
+
*/
|
|
51
|
+
usePrecompiledGzip?: boolean;
|
|
52
|
+
/**
|
|
53
|
+
* object map of aliases
|
|
54
|
+
* Default to `{}`
|
|
55
|
+
*/
|
|
56
|
+
alias?: Record<string, string>;
|
|
57
|
+
/**
|
|
58
|
+
* the url prefix you wish to add
|
|
59
|
+
* Default to `''`
|
|
60
|
+
*/
|
|
61
|
+
prefix?: string;
|
|
62
|
+
/**
|
|
63
|
+
* filter files at init dir, for example - skip non build (source) files.
|
|
64
|
+
* If array set - allow only listed files
|
|
65
|
+
* Default to `undefined`
|
|
66
|
+
*/
|
|
67
|
+
filter?: FileFilter | string[];
|
|
68
|
+
/**
|
|
69
|
+
* dynamic load file which not cached on initialization
|
|
70
|
+
* Default to `false
|
|
71
|
+
*/
|
|
72
|
+
dynamic?: boolean;
|
|
73
|
+
/**
|
|
74
|
+
* caches the assets on initialization or not,
|
|
75
|
+
* always work together with `options.dynamic`
|
|
76
|
+
* Default to `true`
|
|
77
|
+
*/
|
|
78
|
+
preload?: boolean;
|
|
79
|
+
/**
|
|
80
|
+
* file store for caching
|
|
81
|
+
* Default to `undefined`
|
|
82
|
+
*/
|
|
83
|
+
files?: FileMap | FileStore;
|
|
85
84
|
}
|
|
86
85
|
type Next = () => Promise<void>;
|
|
87
|
-
declare class FileManager {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
86
|
+
export declare class FileManager {
|
|
87
|
+
store?: FileStore;
|
|
88
|
+
map?: FileMap;
|
|
89
|
+
constructor(store?: FileStore | FileMap);
|
|
90
|
+
get(key: string): unknown;
|
|
91
|
+
set(key: string, value: FileMeta): void;
|
|
93
92
|
}
|
|
94
93
|
type MiddlewareFunc = (ctx: any, next: Next) => Promise<void> | void;
|
|
95
|
-
declare function staticCache(): MiddlewareFunc;
|
|
96
|
-
declare function staticCache(dir: string): MiddlewareFunc;
|
|
97
|
-
declare function staticCache(options: Options): MiddlewareFunc;
|
|
98
|
-
declare function staticCache(dir: string, options: Options): MiddlewareFunc;
|
|
99
|
-
declare function staticCache(dir: string, options: Options, files: FileMap | FileStore): MiddlewareFunc;
|
|
100
|
-
|
|
101
|
-
export { FileFilter, FileManager, FileMap, FileMeta, FileStore, Options, staticCache };
|
|
94
|
+
export declare function staticCache(): MiddlewareFunc;
|
|
95
|
+
export declare function staticCache(dir: string): MiddlewareFunc;
|
|
96
|
+
export declare function staticCache(options: Options): MiddlewareFunc;
|
|
97
|
+
export declare function staticCache(dir: string, options: Options): MiddlewareFunc;
|
|
98
|
+
export declare function staticCache(dir: string, options: Options, files: FileMap | FileStore): MiddlewareFunc;
|
|
99
|
+
export {};
|
package/dist/index.js
CHANGED
|
@@ -1,158 +1,224 @@
|
|
|
1
|
-
import crypto from
|
|
2
|
-
import { debuglog, promisify } from
|
|
3
|
-
import fs from
|
|
4
|
-
import { createReadStream,
|
|
5
|
-
import zlib from
|
|
6
|
-
import path from
|
|
7
|
-
import mime from
|
|
8
|
-
import { compressible } from
|
|
9
|
-
import readDir from
|
|
10
|
-
import {
|
|
11
|
-
|
|
12
|
-
//#region src/index.ts
|
|
13
|
-
const debug = debuglog("egg/koa-static-cache");
|
|
1
|
+
import crypto from 'node:crypto';
|
|
2
|
+
import { debuglog, promisify } from 'node:util';
|
|
3
|
+
import fs from 'node:fs/promises';
|
|
4
|
+
import { createReadStream, statSync, readFileSync } from 'node:fs';
|
|
5
|
+
import zlib from 'node:zlib';
|
|
6
|
+
import path from 'node:path';
|
|
7
|
+
import mime from 'mime-types';
|
|
8
|
+
import { compressible } from '@eggjs/compressible';
|
|
9
|
+
import readDir from 'fs-readdir-recursive';
|
|
10
|
+
import { exists, decodeURIComponent as safeDecodeURIComponent } from 'utility';
|
|
11
|
+
const debug = debuglog('egg/koa-static-cache');
|
|
14
12
|
const gzip = promisify(zlib.gzip);
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
13
|
+
export class FileManager {
|
|
14
|
+
store;
|
|
15
|
+
map;
|
|
16
|
+
constructor(store) {
|
|
17
|
+
if (store && typeof store.set === 'function' && typeof store.get === 'function') {
|
|
18
|
+
this.store = store;
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
this.map = store || Object.create(null);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
get(key) {
|
|
25
|
+
return this.store ? this.store.get(key) : this.map[key];
|
|
26
|
+
}
|
|
27
|
+
set(key, value) {
|
|
28
|
+
if (this.store) {
|
|
29
|
+
return this.store.set(key, value);
|
|
30
|
+
}
|
|
31
|
+
this.map[key] = value;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
export function staticCache(dirOrOptions, options = {}, filesStoreOrMap) {
|
|
35
|
+
let dir = '';
|
|
36
|
+
if (typeof dirOrOptions === 'string') {
|
|
37
|
+
// dir priority than options.dir
|
|
38
|
+
dir = dirOrOptions;
|
|
39
|
+
}
|
|
40
|
+
else if (dirOrOptions) {
|
|
41
|
+
options = dirOrOptions;
|
|
42
|
+
}
|
|
43
|
+
if (!dir && options.dir) {
|
|
44
|
+
dir = options.dir;
|
|
45
|
+
}
|
|
46
|
+
if (!dir) {
|
|
47
|
+
// default to process.cwd
|
|
48
|
+
dir = process.cwd();
|
|
49
|
+
}
|
|
50
|
+
dir = path.normalize(dir);
|
|
51
|
+
debug('staticCache dir: %s', dir);
|
|
52
|
+
// prefix must be ASCII code
|
|
53
|
+
options.prefix = (options.prefix ?? '').replace(/\/*$/, '/');
|
|
54
|
+
const files = new FileManager(filesStoreOrMap ?? options.files);
|
|
55
|
+
const enableGzip = !!options.gzip;
|
|
56
|
+
const filePrefix = path.normalize(options.prefix.replace(/^\//, ''));
|
|
57
|
+
// option.filter
|
|
58
|
+
let fileFilter = () => {
|
|
59
|
+
return true;
|
|
60
|
+
};
|
|
61
|
+
if (Array.isArray(options.filter)) {
|
|
62
|
+
fileFilter = (file) => {
|
|
63
|
+
return options.filter.includes(file);
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
if (typeof options.filter === 'function') {
|
|
67
|
+
fileFilter = options.filter;
|
|
68
|
+
}
|
|
69
|
+
if (options.preload !== false) {
|
|
70
|
+
debug('preload: %s', dir);
|
|
71
|
+
readDir(dir, filename => {
|
|
72
|
+
// ignore dot files and node_modules
|
|
73
|
+
return !filename.startsWith('.') && filename !== 'node_modules';
|
|
74
|
+
})
|
|
75
|
+
.filter(fileFilter)
|
|
76
|
+
.forEach(name => {
|
|
77
|
+
loadFile(name, dir, options, files);
|
|
78
|
+
});
|
|
79
|
+
debug('preload end');
|
|
80
|
+
}
|
|
81
|
+
debug('prepare middleware');
|
|
82
|
+
return async (ctx, next) => {
|
|
83
|
+
// only accept HEAD and GET
|
|
84
|
+
if (ctx.method !== 'HEAD' && ctx.method !== 'GET')
|
|
85
|
+
return await next();
|
|
86
|
+
// check prefix first to avoid calculate
|
|
87
|
+
if (!ctx.path.startsWith(options.prefix))
|
|
88
|
+
return await next();
|
|
89
|
+
// decode for `/%E4%B8%AD%E6%96%87`
|
|
90
|
+
// normalize for `//index`
|
|
91
|
+
let filename = path.normalize(safeDecodeURIComponent(ctx.path));
|
|
92
|
+
// check alias
|
|
93
|
+
if (options.alias && options.alias[filename]) {
|
|
94
|
+
filename = options.alias[filename];
|
|
95
|
+
}
|
|
96
|
+
let file = files.get(filename);
|
|
97
|
+
// try to load file
|
|
98
|
+
if (!file) {
|
|
99
|
+
if (!options.dynamic)
|
|
100
|
+
return await next();
|
|
101
|
+
if (path.basename(filename)[0] === '.')
|
|
102
|
+
return await next();
|
|
103
|
+
if (filename.charAt(0) === path.sep) {
|
|
104
|
+
filename = filename.slice(1);
|
|
105
|
+
}
|
|
106
|
+
// trim prefix
|
|
107
|
+
if (options.prefix !== '/') {
|
|
108
|
+
if (filename.indexOf(filePrefix) !== 0) {
|
|
109
|
+
return await next();
|
|
110
|
+
}
|
|
111
|
+
filename = filename.slice(filePrefix.length);
|
|
112
|
+
}
|
|
113
|
+
const fullpath = path.join(dir, filename);
|
|
114
|
+
// files that can be accessed should be under options.dir
|
|
115
|
+
if (!fullpath.startsWith(dir)) {
|
|
116
|
+
return await next();
|
|
117
|
+
}
|
|
118
|
+
const stats = await exists(fullpath);
|
|
119
|
+
if (!stats)
|
|
120
|
+
return await next();
|
|
121
|
+
if (!stats.isFile())
|
|
122
|
+
return await next();
|
|
123
|
+
file = loadFile(filename, dir, options, files);
|
|
124
|
+
}
|
|
125
|
+
ctx.status = 200;
|
|
126
|
+
if (enableGzip)
|
|
127
|
+
ctx.vary('Accept-Encoding');
|
|
128
|
+
if (!file.buffer) {
|
|
129
|
+
const stats = await fs.stat(file.path);
|
|
130
|
+
if (stats.mtime.getTime() !== file.mtime.getTime()) {
|
|
131
|
+
file.mtime = stats.mtime;
|
|
132
|
+
file.md5 = undefined;
|
|
133
|
+
file.length = stats.size;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
ctx.response.lastModified = file.mtime;
|
|
137
|
+
if (file.md5) {
|
|
138
|
+
ctx.response.etag = file.md5;
|
|
139
|
+
}
|
|
140
|
+
if (ctx.fresh) {
|
|
141
|
+
ctx.status = 304;
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
144
|
+
ctx.type = file.type;
|
|
145
|
+
ctx.length = file.zipBuffer ? file.zipBuffer.length : file.length;
|
|
146
|
+
ctx.set('cache-control', file.cacheControl ?? 'public, max-age=' + file.maxAge);
|
|
147
|
+
if (file.md5)
|
|
148
|
+
ctx.set('content-md5', file.md5);
|
|
149
|
+
if (ctx.method === 'HEAD') {
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
const acceptGzip = ctx.acceptsEncodings('gzip') === 'gzip';
|
|
153
|
+
if (file.zipBuffer) {
|
|
154
|
+
if (acceptGzip) {
|
|
155
|
+
ctx.set('content-encoding', 'gzip');
|
|
156
|
+
ctx.body = file.zipBuffer;
|
|
157
|
+
}
|
|
158
|
+
else {
|
|
159
|
+
ctx.body = file.buffer;
|
|
160
|
+
}
|
|
161
|
+
return;
|
|
162
|
+
}
|
|
163
|
+
const shouldGzip = enableGzip && file.length > 1024 && acceptGzip && file.type && compressible(file.type);
|
|
164
|
+
if (file.buffer) {
|
|
165
|
+
if (shouldGzip) {
|
|
166
|
+
const gzFile = files.get(filename + '.gz');
|
|
167
|
+
if (options.usePrecompiledGzip && gzFile && gzFile.buffer) {
|
|
168
|
+
// if .gz file already read from disk
|
|
169
|
+
file.zipBuffer = gzFile.buffer;
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
file.zipBuffer = await gzip(file.buffer);
|
|
173
|
+
}
|
|
174
|
+
ctx.set('content-encoding', 'gzip');
|
|
175
|
+
ctx.body = file.zipBuffer;
|
|
176
|
+
}
|
|
177
|
+
else {
|
|
178
|
+
ctx.body = file.buffer;
|
|
179
|
+
}
|
|
180
|
+
return;
|
|
181
|
+
}
|
|
182
|
+
const stream = createReadStream(file.path);
|
|
183
|
+
// update file hash
|
|
184
|
+
if (!file.md5) {
|
|
185
|
+
const hash = crypto.createHash('md5');
|
|
186
|
+
stream.on('data', hash.update.bind(hash));
|
|
187
|
+
stream.on('end', () => {
|
|
188
|
+
file.md5 = hash.digest('base64');
|
|
189
|
+
});
|
|
190
|
+
}
|
|
191
|
+
ctx.body = stream;
|
|
192
|
+
// enable gzip will remove content length
|
|
193
|
+
if (shouldGzip) {
|
|
194
|
+
ctx.remove('content-length');
|
|
195
|
+
ctx.set('content-encoding', 'gzip');
|
|
196
|
+
ctx.body = stream.pipe(zlib.createGzip());
|
|
197
|
+
}
|
|
198
|
+
};
|
|
135
199
|
}
|
|
136
200
|
/**
|
|
137
|
-
* load file and add file content to cache
|
|
138
|
-
*/
|
|
201
|
+
* load file and add file content to cache
|
|
202
|
+
*/
|
|
139
203
|
function loadFile(name, dir, options, fileManager) {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
204
|
+
const pathname = path.normalize(path.join(options.prefix, name));
|
|
205
|
+
if (!fileManager.get(pathname)) {
|
|
206
|
+
fileManager.set(pathname, {});
|
|
207
|
+
}
|
|
208
|
+
const obj = fileManager.get(pathname);
|
|
209
|
+
const filename = (obj.path = path.join(dir, name));
|
|
210
|
+
const stats = statSync(filename);
|
|
211
|
+
const buffer = readFileSync(filename);
|
|
212
|
+
obj.cacheControl = typeof options.cacheControl === 'function' ? options.cacheControl(filename) : options.cacheControl; // if cacheControl is a function, it will be called with the filename
|
|
213
|
+
obj.maxAge = (typeof obj.maxAge === 'number' ? obj.maxAge : options.maxAge) || 0;
|
|
214
|
+
obj.type = obj.mime = mime.lookup(pathname) || 'application/octet-stream';
|
|
215
|
+
obj.mtime = stats.mtime;
|
|
216
|
+
obj.length = stats.size;
|
|
217
|
+
obj.md5 = crypto.createHash('md5').update(buffer).digest('base64');
|
|
218
|
+
debug('file: %s', JSON.stringify(obj, null, 2));
|
|
219
|
+
if (options.buffer) {
|
|
220
|
+
obj.buffer = buffer;
|
|
221
|
+
}
|
|
222
|
+
return obj;
|
|
155
223
|
}
|
|
156
|
-
|
|
157
|
-
//#endregion
|
|
158
|
-
export { FileManager, staticCache };
|
|
224
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnE,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,IAAI,MAAM,YAAY,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,OAAO,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,kBAAkB,IAAI,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAE/E,MAAM,KAAK,GAAG,QAAQ,CAAC,sBAAsB,CAAC,CAAC;AAE/C,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AA6FlC,MAAM,OAAO,WAAW;IACtB,KAAK,CAAa;IAClB,GAAG,CAAW;IAEd,YAAY,KAA2B;QACrC,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,UAAU,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,UAAU,EAAE,CAAC;YAChF,IAAI,CAAC,KAAK,GAAG,KAAkB,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAI,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,KAAe;QAC9B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,GAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACzB,CAAC;CACF;AASD,MAAM,UAAU,WAAW,CACzB,YAA+B,EAC/B,UAAmB,EAAE,EACrB,eAAqC;IAErC,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;QACrC,gCAAgC;QAChC,GAAG,GAAG,YAAY,CAAC;IACrB,CAAC;SAAM,IAAI,YAAY,EAAE,CAAC;QACxB,OAAO,GAAG,YAAY,CAAC;IACzB,CAAC;IACD,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACxB,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IACpB,CAAC;IACD,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,yBAAyB;QACzB,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACtB,CAAC;IACD,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC1B,KAAK,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;IAElC,4BAA4B;IAC5B,OAAO,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,eAAe,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IAClC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;IAErE,gBAAgB;IAChB,IAAI,UAAU,GAAe,GAAG,EAAE;QAChC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IACF,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClC,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE;YAC5B,OAAQ,OAAO,CAAC,MAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrD,CAAC,CAAC;IACJ,CAAC;IACD,IAAI,OAAO,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;QACzC,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;QAC9B,KAAK,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QAC1B,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE;YACtB,oCAAoC;YACpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,KAAK,cAAc,CAAC;QAClE,CAAC,CAAC;aACC,MAAM,CAAC,UAAU,CAAC;aAClB,OAAO,CAAC,IAAI,CAAC,EAAE;YACd,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QACL,KAAK,CAAC,aAAa,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAC5B,OAAO,KAAK,EAAE,GAAQ,EAAE,IAAU,EAAE,EAAE;QACpC,2BAA2B;QAC3B,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK;YAAE,OAAO,MAAM,IAAI,EAAE,CAAC;QACvE,wCAAwC;QACxC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,OAAO,MAAM,IAAI,EAAE,CAAC;QAE9D,mCAAmC;QACnC,0BAA0B;QAC1B,IAAI,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAEhE,cAAc;QACd,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7C,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC;QAED,IAAI,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAa,CAAC;QAC3C,mBAAmB;QACnB,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,CAAC,OAAO,CAAC,OAAO;gBAAE,OAAO,MAAM,IAAI,EAAE,CAAC;YAC1C,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG;gBAAE,OAAO,MAAM,IAAI,EAAE,CAAC;YAC5D,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC;gBACpC,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC/B,CAAC;YAED,cAAc;YACd,IAAI,OAAO,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAC3B,IAAI,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;oBACvC,OAAO,MAAM,IAAI,EAAE,CAAC;gBACtB,CAAC;gBACD,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAC/C,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC1C,yDAAyD;YACzD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC9B,OAAO,MAAM,IAAI,EAAE,CAAC;YACtB,CAAC;YAED,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;YACrC,IAAI,CAAC,KAAK;gBAAE,OAAO,MAAM,IAAI,EAAE,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;gBAAE,OAAO,MAAM,IAAI,EAAE,CAAC;YAEzC,IAAI,GAAG,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACjD,CAAC;QAED,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;QAEjB,IAAI,UAAU;YAAE,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAE5C,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC,CAAC;YACxC,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,KAAM,CAAC,OAAO,EAAE,EAAE,CAAC;gBACpD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;gBACzB,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC;gBACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC;YAC3B,CAAC;QACH,CAAC;QAED,GAAG,CAAC,QAAQ,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC;QACvC,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC;QAC/B,CAAC;QAED,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;YACd,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,OAAO;QACT,CAAC;QAED,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACrB,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAO,CAAC;QACnE,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,YAAY,IAAI,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;QAChF,IAAI,IAAI,CAAC,GAAG;YAAE,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAE/C,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC;QAE3D,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,UAAU,EAAE,CAAC;gBACf,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;gBACpC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;YACzB,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,UAAU,IAAI,IAAI,CAAC,MAAO,GAAG,IAAI,IAAI,UAAU,IAAI,IAAI,CAAC,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE3G,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAa,CAAC;gBACvD,IAAI,OAAO,CAAC,kBAAkB,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;oBAC1D,qCAAqC;oBACrC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;gBACjC,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC3C,CAAC;gBACD,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;gBACpC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;YACzB,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAK,CAAC,CAAC;QAE5C,mBAAmB;QACnB,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACd,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACtC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACpB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;QACL,CAAC;QAED,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC;QAClB,yCAAyC;QACzC,IAAI,UAAU,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YAC7B,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;YACpC,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,QAAQ,CAAC,IAAY,EAAE,GAAW,EAAE,OAAgB,EAAE,WAAwB;IACrF,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IAClE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/B,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAChC,CAAC;IACD,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAa,CAAC;IAClD,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACjC,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IAEtC,GAAG,CAAC,YAAY,GAAG,OAAO,OAAO,CAAC,YAAY,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,qEAAqE;IAC5L,GAAG,CAAC,MAAM,GAAG,CAAC,OAAO,GAAG,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjF,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,0BAA0B,CAAC;IAC1E,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;IACxB,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC;IACxB,GAAG,CAAC,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEnE,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAChD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eggjs/koa-static-cache",
|
|
3
3
|
"description": "Static cache middleware for koa",
|
|
4
|
-
"version": "7.0.0-beta.
|
|
4
|
+
"version": "7.0.0-beta.21",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"koa",
|
|
7
7
|
"middleware",
|
|
@@ -41,10 +41,10 @@
|
|
|
41
41
|
"typescript": "^5.9.3",
|
|
42
42
|
"vitest": "4.0.0-beta.16",
|
|
43
43
|
"ylru": "^2.0.0",
|
|
44
|
-
"@eggjs/
|
|
45
|
-
"@eggjs/
|
|
46
|
-
"@eggjs/
|
|
47
|
-
"@eggjs/
|
|
44
|
+
"@eggjs/koa": "3.1.0-beta.21",
|
|
45
|
+
"@eggjs/supertest": "9.0.0-beta.21",
|
|
46
|
+
"@eggjs/bin": "8.0.0-beta.21",
|
|
47
|
+
"@eggjs/tsconfig": "3.1.0-beta.21"
|
|
48
48
|
},
|
|
49
49
|
"type": "module",
|
|
50
50
|
"exports": {
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"main": "./dist/index.js",
|
|
62
62
|
"module": "./dist/index.js",
|
|
63
63
|
"scripts": {
|
|
64
|
-
"build": "tsdown",
|
|
64
|
+
"build": "tsdown && rimraf dist && tsc -b --clean && tsc",
|
|
65
65
|
"typecheck": "tsc --noEmit",
|
|
66
66
|
"lint": "oxlint --type-aware",
|
|
67
67
|
"lint:fix": "npm run lint -- --fix",
|