wherever-dev 0.18.3 → 0.18.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.
- package/dist/cli-bridge-extension.d.ts +51 -0
- package/dist/cli-bridge-extension.d.ts.map +1 -0
- package/dist/cli-bridge-extension.js +100 -0
- package/dist/cli-bridge-extension.js.map +1 -0
- package/dist/index.js +372 -33
- package/dist/index.js.map +1 -1
- package/dist/protocol.d.ts +22 -0
- package/dist/protocol.d.ts.map +1 -1
- package/dist/server-process-marker.d.ts +28 -0
- package/dist/server-process-marker.d.ts.map +1 -0
- package/dist/server-process-marker.js +30 -0
- package/dist/server-process-marker.js.map +1 -0
- package/dist/session-pool.d.ts +25 -0
- package/dist/session-pool.d.ts.map +1 -1
- package/dist/session-pool.js +52 -1
- package/dist/session-pool.js.map +1 -1
- package/dist/upload-gate.d.ts +96 -0
- package/dist/upload-gate.d.ts.map +1 -0
- package/dist/upload-gate.js +109 -0
- package/dist/upload-gate.js.map +1 -0
- package/dist/upload-staging.d.ts +172 -0
- package/dist/upload-staging.d.ts.map +1 -0
- package/dist/upload-staging.js +368 -0
- package/dist/upload-staging.js.map +1 -0
- package/package.json +1 -1
- package/public/_app/immutable/assets/{0.BnOlDJL_.css → 0.Cb5vRzMp.css} +1 -1
- package/public/_app/immutable/chunks/{pzF36qD8.js → BdyEwvKM.js} +2 -2
- package/public/_app/immutable/chunks/{pzF36qD8.js.map → BdyEwvKM.js.map} +1 -1
- package/public/_app/immutable/chunks/{CxeW4bFU.js → BgfVtPUY.js} +2 -2
- package/public/_app/immutable/chunks/{CxeW4bFU.js.map → BgfVtPUY.js.map} +1 -1
- package/public/_app/immutable/chunks/CO_n26iD.js +2 -0
- package/public/_app/immutable/chunks/{BDyT5Iv7.js.map → CO_n26iD.js.map} +1 -1
- package/public/_app/immutable/entry/{app.fmRrIlrx.js → app.Cd34rZl-.js} +3 -3
- package/public/_app/immutable/entry/{app.fmRrIlrx.js.map → app.Cd34rZl-.js.map} +1 -1
- package/public/_app/immutable/entry/start.Cs0K02Bg.js +2 -0
- package/public/_app/immutable/entry/start.Cs0K02Bg.js.map +1 -0
- package/public/_app/immutable/nodes/{0.y9mNw2ua.js → 0.CbsSRnKE.js} +2 -2
- package/public/_app/immutable/nodes/{0.y9mNw2ua.js.map → 0.CbsSRnKE.js.map} +1 -1
- package/public/_app/immutable/nodes/{1.D0t3PhYs.js → 1.FIugR_jQ.js} +2 -2
- package/public/_app/immutable/nodes/{1.D0t3PhYs.js.map → 1.FIugR_jQ.js.map} +1 -1
- package/public/_app/immutable/nodes/2.B8lR6Ytl.js +120 -0
- package/public/_app/immutable/nodes/2.B8lR6Ytl.js.map +1 -0
- package/public/_app/version.json +1 -1
- package/public/index.html +11 -11
- package/public/service-worker.js +1 -1
- package/public/_app/immutable/chunks/BDyT5Iv7.js +0 -2
- package/public/_app/immutable/entry/start.CR5sFyDq.js +0 -2
- package/public/_app/immutable/entry/start.CR5sFyDq.js.map +0 -1
- package/public/_app/immutable/nodes/2.hfqxCQJf.js +0 -120
- package/public/_app/immutable/nodes/2.hfqxCQJf.js.map +0 -1
|
@@ -0,0 +1,368 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Server-side staging for RESUMABLE, CHUNKED uploads (docs/adr/0012).
|
|
3
|
+
*
|
|
4
|
+
* One server-owned directory, `getWhereverStateDir()/upload-staging/`, holds every
|
|
5
|
+
* in-flight upload as two entries keyed by the client-generated `uploadId`:
|
|
6
|
+
*
|
|
7
|
+
* - `<uploadId>` the partial file; its SIZE is the acknowledged offset;
|
|
8
|
+
* - `<uploadId>.json` the sidecar (`UploadSidecar`), the durable record of what
|
|
9
|
+
* the upload is (`sessionId`, `filename`, `size`), where it
|
|
10
|
+
* goes (`targetDir`, resolved ONCE at begin) and, once
|
|
11
|
+
* finished, where it went (`done`, `savedPath`).
|
|
12
|
+
*
|
|
13
|
+
* The sidecar is what makes completion idempotent across a lost reply or a server
|
|
14
|
+
* restart: a repeated begin or finish of a finished id answers with the recorded
|
|
15
|
+
* `savedPath` instead of writing a second copy.
|
|
16
|
+
*
|
|
17
|
+
* Every operation on one `uploadId` runs through a per-id SERIAL QUEUE, and the
|
|
18
|
+
* `offset === currentOffset` check of a chunk runs INSIDE it, so two sockets
|
|
19
|
+
* racing chunks for the same id (a resumed upload whose old socket is still
|
|
20
|
+
* flushing) can never interleave writes or both be accepted for one offset.
|
|
21
|
+
*
|
|
22
|
+
* This module knows nothing about WebSockets, sessions or the write gate: the
|
|
23
|
+
* caller passes an `authorize(sidecar)` callback that runs inside the queue, so a
|
|
24
|
+
* gate verdict is taken against the sidecar the write will actually use.
|
|
25
|
+
*/
|
|
26
|
+
import fs from 'node:fs';
|
|
27
|
+
import fsp from 'node:fs/promises';
|
|
28
|
+
import path from 'node:path';
|
|
29
|
+
/** Wire capability advertised in `connected.capabilities`. */
|
|
30
|
+
export const UPLOAD_CAPABILITY = 'upload.v1';
|
|
31
|
+
/** Hard cap on one chunk's payload. Small enough that heartbeat frames interleave. */
|
|
32
|
+
export const UPLOAD_CHUNK_MAX_BYTES = 1024 * 1024;
|
|
33
|
+
/** Staging entries untouched for this long are garbage-collected. */
|
|
34
|
+
export const UPLOAD_STAGING_MAX_AGE_MS = 24 * 60 * 60 * 1000;
|
|
35
|
+
/** First byte of a binary chunk frame. */
|
|
36
|
+
export const CHUNK_FRAME_KIND = 1;
|
|
37
|
+
/** Second byte of a binary chunk frame. */
|
|
38
|
+
export const CHUNK_FRAME_VERSION = 1;
|
|
39
|
+
const UPLOAD_ID_RE = /^[A-Za-z0-9_-]{22,64}$/;
|
|
40
|
+
/** A client-generated upload id: URL-safe, 22..64 chars (>= 128 random bits base64url). */
|
|
41
|
+
export function isValidUploadId(id) {
|
|
42
|
+
return typeof id === 'string' && UPLOAD_ID_RE.test(id);
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Parse `[u8 kind=1][u8 version=1][u8 idLen][uploadId ascii][u64 offset BE][payload]`.
|
|
46
|
+
* `uploadId` is returned whenever it could be read, so the refusal can be routed.
|
|
47
|
+
*/
|
|
48
|
+
export function parseChunkFrame(buf) {
|
|
49
|
+
if (buf.length < 3)
|
|
50
|
+
return { ok: false, uploadId: '', error: 'Malformed upload chunk (too short).' };
|
|
51
|
+
if (buf[0] !== CHUNK_FRAME_KIND)
|
|
52
|
+
return { ok: false, uploadId: '', error: 'Unknown binary frame kind.' };
|
|
53
|
+
if (buf[1] !== CHUNK_FRAME_VERSION) {
|
|
54
|
+
return { ok: false, uploadId: '', error: `Unsupported upload chunk version ${buf[1]}.` };
|
|
55
|
+
}
|
|
56
|
+
const idLen = buf[2];
|
|
57
|
+
const headerLen = 3 + idLen + 8;
|
|
58
|
+
if (buf.length < headerLen)
|
|
59
|
+
return { ok: false, uploadId: '', error: 'Malformed upload chunk (truncated header).' };
|
|
60
|
+
const uploadId = buf.subarray(3, 3 + idLen).toString('latin1');
|
|
61
|
+
if (!isValidUploadId(uploadId))
|
|
62
|
+
return { ok: false, uploadId: '', error: 'Invalid uploadId.' };
|
|
63
|
+
const big = buf.readBigUInt64BE(3 + idLen);
|
|
64
|
+
if (big > BigInt(Number.MAX_SAFE_INTEGER))
|
|
65
|
+
return { ok: false, uploadId, error: 'Invalid chunk offset.' };
|
|
66
|
+
const payload = buf.subarray(headerLen);
|
|
67
|
+
if (payload.length > UPLOAD_CHUNK_MAX_BYTES) {
|
|
68
|
+
return {
|
|
69
|
+
ok: false,
|
|
70
|
+
uploadId,
|
|
71
|
+
error: `Upload chunk too large (${payload.length} bytes, the limit is ${UPLOAD_CHUNK_MAX_BYTES} bytes).`,
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
return { ok: true, uploadId, offset: Number(big), payload };
|
|
75
|
+
}
|
|
76
|
+
/** Build a chunk frame (used by tests and as the reference encoder). */
|
|
77
|
+
export function encodeChunkFrame(uploadId, offset, payload) {
|
|
78
|
+
const id = Buffer.from(uploadId, 'latin1');
|
|
79
|
+
const head = Buffer.alloc(3 + id.length + 8);
|
|
80
|
+
head[0] = CHUNK_FRAME_KIND;
|
|
81
|
+
head[1] = CHUNK_FRAME_VERSION;
|
|
82
|
+
head[2] = id.length;
|
|
83
|
+
id.copy(head, 3);
|
|
84
|
+
head.writeBigUInt64BE(BigInt(offset), 3 + id.length);
|
|
85
|
+
return Buffer.concat([head, Buffer.from(payload)]);
|
|
86
|
+
}
|
|
87
|
+
export class UploadStaging {
|
|
88
|
+
dir;
|
|
89
|
+
renameFn;
|
|
90
|
+
now;
|
|
91
|
+
maxAgeMs;
|
|
92
|
+
queues = new Map();
|
|
93
|
+
constructor(opts) {
|
|
94
|
+
this.dir = path.resolve(opts.dir);
|
|
95
|
+
this.renameFn = opts.rename ?? ((a, b) => fsp.rename(a, b));
|
|
96
|
+
this.now = opts.now ?? Date.now;
|
|
97
|
+
this.maxAgeMs = opts.maxAgeMs ?? UPLOAD_STAGING_MAX_AGE_MS;
|
|
98
|
+
}
|
|
99
|
+
partialPath(uploadId) {
|
|
100
|
+
return path.join(this.dir, uploadId);
|
|
101
|
+
}
|
|
102
|
+
sidecarPath(uploadId) {
|
|
103
|
+
return path.join(this.dir, `${uploadId}.json`);
|
|
104
|
+
}
|
|
105
|
+
/** Run `fn` after every earlier operation on `uploadId` has settled. */
|
|
106
|
+
enqueue(uploadId, fn) {
|
|
107
|
+
const prev = this.queues.get(uploadId) ?? Promise.resolve();
|
|
108
|
+
const run = prev.then(fn, fn);
|
|
109
|
+
const tail = run.catch(() => { });
|
|
110
|
+
this.queues.set(uploadId, tail);
|
|
111
|
+
tail.then(() => {
|
|
112
|
+
if (this.queues.get(uploadId) === tail)
|
|
113
|
+
this.queues.delete(uploadId);
|
|
114
|
+
});
|
|
115
|
+
return run;
|
|
116
|
+
}
|
|
117
|
+
async readSidecar(uploadId) {
|
|
118
|
+
try {
|
|
119
|
+
const raw = await fsp.readFile(this.sidecarPath(uploadId), 'utf8');
|
|
120
|
+
const s = JSON.parse(raw);
|
|
121
|
+
return s && typeof s === 'object' && s.uploadId === uploadId ? s : null;
|
|
122
|
+
}
|
|
123
|
+
catch {
|
|
124
|
+
return null;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
async writeSidecar(s) {
|
|
128
|
+
await fsp.mkdir(this.dir, { recursive: true });
|
|
129
|
+
const tmp = `${this.sidecarPath(s.uploadId)}.tmp`;
|
|
130
|
+
await fsp.writeFile(tmp, JSON.stringify(s));
|
|
131
|
+
await fsp.rename(tmp, this.sidecarPath(s.uploadId));
|
|
132
|
+
}
|
|
133
|
+
async partialSize(uploadId) {
|
|
134
|
+
try {
|
|
135
|
+
return (await fsp.stat(this.partialPath(uploadId))).size;
|
|
136
|
+
}
|
|
137
|
+
catch {
|
|
138
|
+
return null;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
/**
|
|
142
|
+
* Start or resume an upload. Idempotent: a known id must match the sidecar's
|
|
143
|
+
* `sessionId`, `size` and `filename`, and answers with the bytes already
|
|
144
|
+
* staged; a finished id answers `{ offset: size, done: true, savedPath }`.
|
|
145
|
+
*/
|
|
146
|
+
begin(req, authorize) {
|
|
147
|
+
return this.enqueue(req.uploadId, async () => {
|
|
148
|
+
const existing = await this.readSidecar(req.uploadId);
|
|
149
|
+
if (existing) {
|
|
150
|
+
if (existing.sessionId !== req.sessionId) {
|
|
151
|
+
return { ok: false, sessionId: req.sessionId, error: 'This upload id belongs to a different session.' };
|
|
152
|
+
}
|
|
153
|
+
if (existing.size !== req.size || existing.filename !== req.filename) {
|
|
154
|
+
return {
|
|
155
|
+
ok: false,
|
|
156
|
+
sessionId: req.sessionId,
|
|
157
|
+
error: 'This upload id is already in use for a different file.',
|
|
158
|
+
};
|
|
159
|
+
}
|
|
160
|
+
const refused = authorize?.(existing);
|
|
161
|
+
if (refused)
|
|
162
|
+
return { ok: false, sessionId: existing.sessionId, error: refused };
|
|
163
|
+
if (existing.done && existing.savedPath) {
|
|
164
|
+
return { ok: true, offset: existing.size, size: existing.size, sessionId: existing.sessionId, done: true, savedPath: existing.savedPath };
|
|
165
|
+
}
|
|
166
|
+
let offset = await this.partialSize(req.uploadId);
|
|
167
|
+
if (offset === null) {
|
|
168
|
+
await fsp.writeFile(this.partialPath(req.uploadId), Buffer.alloc(0));
|
|
169
|
+
offset = 0;
|
|
170
|
+
}
|
|
171
|
+
return { ok: true, offset, size: existing.size, sessionId: existing.sessionId };
|
|
172
|
+
}
|
|
173
|
+
const sidecar = {
|
|
174
|
+
uploadId: req.uploadId,
|
|
175
|
+
sessionId: req.sessionId,
|
|
176
|
+
filename: req.filename,
|
|
177
|
+
size: req.size,
|
|
178
|
+
...(req.mime ? { mime: req.mime } : {}),
|
|
179
|
+
targetDir: '',
|
|
180
|
+
createdAt: this.now(),
|
|
181
|
+
};
|
|
182
|
+
const refused = authorize?.(sidecar);
|
|
183
|
+
if (refused)
|
|
184
|
+
return { ok: false, sessionId: req.sessionId, error: refused };
|
|
185
|
+
sidecar.targetDir = path.resolve(req.targetDir());
|
|
186
|
+
await fsp.mkdir(this.dir, { recursive: true });
|
|
187
|
+
await fsp.writeFile(this.partialPath(req.uploadId), Buffer.alloc(0));
|
|
188
|
+
await this.writeSidecar(sidecar);
|
|
189
|
+
return { ok: true, offset: 0, size: req.size, sessionId: req.sessionId };
|
|
190
|
+
});
|
|
191
|
+
}
|
|
192
|
+
/**
|
|
193
|
+
* Write one chunk at `offset`. Accepted only when `offset` equals the bytes
|
|
194
|
+
* already staged (checked inside the serial queue); otherwise answers with the
|
|
195
|
+
* true offset and `accepted: false`, which is how a client realigns.
|
|
196
|
+
*/
|
|
197
|
+
writeChunk(uploadId, offset, payload, authorize) {
|
|
198
|
+
return this.enqueue(uploadId, async () => {
|
|
199
|
+
const s = await this.readSidecar(uploadId);
|
|
200
|
+
if (!s)
|
|
201
|
+
return { ok: false, sessionId: '', error: 'Unknown upload (send upload_begin first).' };
|
|
202
|
+
const refused = authorize?.(s);
|
|
203
|
+
if (refused)
|
|
204
|
+
return { ok: false, sessionId: s.sessionId, error: refused };
|
|
205
|
+
if (s.done) {
|
|
206
|
+
return { ok: true, offset: s.size, size: s.size, sessionId: s.sessionId, done: true, savedPath: s.savedPath, accepted: false };
|
|
207
|
+
}
|
|
208
|
+
const current = await this.partialSize(uploadId);
|
|
209
|
+
if (current === null)
|
|
210
|
+
return { ok: false, sessionId: s.sessionId, error: 'Upload partial is missing (send upload_begin again).' };
|
|
211
|
+
if (offset !== current) {
|
|
212
|
+
return { ok: true, offset: current, size: s.size, sessionId: s.sessionId, accepted: false };
|
|
213
|
+
}
|
|
214
|
+
if (current + payload.length > s.size) {
|
|
215
|
+
return {
|
|
216
|
+
ok: false,
|
|
217
|
+
sessionId: s.sessionId,
|
|
218
|
+
error: `Upload chunk overruns the declared size (${current + payload.length} > ${s.size} bytes).`,
|
|
219
|
+
};
|
|
220
|
+
}
|
|
221
|
+
const fh = await fsp.open(this.partialPath(uploadId), 'r+');
|
|
222
|
+
try {
|
|
223
|
+
if (payload.length > 0)
|
|
224
|
+
await fh.write(payload, 0, payload.length, current);
|
|
225
|
+
}
|
|
226
|
+
finally {
|
|
227
|
+
await fh.close();
|
|
228
|
+
}
|
|
229
|
+
return { ok: true, offset: current + payload.length, size: s.size, sessionId: s.sessionId, accepted: true };
|
|
230
|
+
});
|
|
231
|
+
}
|
|
232
|
+
/**
|
|
233
|
+
* Move a complete upload into its target dir and record it. Repeated finishes
|
|
234
|
+
* (lost reply, restart) return the same `savedPath`.
|
|
235
|
+
*
|
|
236
|
+
* Decision (recorded at the choice site): a finish before every byte is staged
|
|
237
|
+
* is a refusal (`ok: false` with the staged/declared counts), not an
|
|
238
|
+
* `upload_offset` realign. A conforming client only finishes after its last
|
|
239
|
+
* ack reached `size`, so this is a client bug, and answering with an offset
|
|
240
|
+
* would let a buggy client loop silently. The alternative (reply with the true
|
|
241
|
+
* offset so the client resends) was considered and rejected for that reason.
|
|
242
|
+
*/
|
|
243
|
+
finish(uploadId, sessionId, authorize, nameFor) {
|
|
244
|
+
return this.enqueue(uploadId, async () => {
|
|
245
|
+
const s = await this.readSidecar(uploadId);
|
|
246
|
+
if (!s)
|
|
247
|
+
return { ok: false, sessionId, error: 'Unknown upload (send upload_begin first).' };
|
|
248
|
+
if (s.sessionId !== sessionId) {
|
|
249
|
+
return { ok: false, sessionId, error: 'This upload id belongs to a different session.' };
|
|
250
|
+
}
|
|
251
|
+
const refused = authorize?.(s);
|
|
252
|
+
if (refused)
|
|
253
|
+
return { ok: false, sessionId, error: refused };
|
|
254
|
+
if (s.done && s.savedPath)
|
|
255
|
+
return { ok: true, savedPath: s.savedPath, filename: s.filename, sessionId };
|
|
256
|
+
const staged = await this.partialSize(uploadId);
|
|
257
|
+
if (staged === null) {
|
|
258
|
+
// A crash after the move but before `done` was recorded: the file is
|
|
259
|
+
// already at the recorded path.
|
|
260
|
+
if (s.savedPath && fs.existsSync(s.savedPath)) {
|
|
261
|
+
await this.writeSidecar({ ...s, done: true });
|
|
262
|
+
return { ok: true, savedPath: s.savedPath, filename: s.filename, sessionId };
|
|
263
|
+
}
|
|
264
|
+
return { ok: false, sessionId, error: 'Upload partial is missing (send upload_begin again).' };
|
|
265
|
+
}
|
|
266
|
+
if (staged !== s.size) {
|
|
267
|
+
return { ok: false, sessionId, error: `Upload incomplete (${staged} of ${s.size} bytes received).` };
|
|
268
|
+
}
|
|
269
|
+
let savedPath = s.savedPath;
|
|
270
|
+
if (!savedPath) {
|
|
271
|
+
const name = nameFor ? nameFor(s.filename) : `${this.now()}_${path.basename(s.filename)}`;
|
|
272
|
+
savedPath = path.join(s.targetDir, name);
|
|
273
|
+
await this.writeSidecar({ ...s, savedPath });
|
|
274
|
+
}
|
|
275
|
+
await fsp.mkdir(path.dirname(savedPath), { recursive: true });
|
|
276
|
+
await this.move(this.partialPath(uploadId), savedPath);
|
|
277
|
+
await this.writeSidecar({ ...s, savedPath, done: true });
|
|
278
|
+
return { ok: true, savedPath, filename: s.filename, sessionId };
|
|
279
|
+
});
|
|
280
|
+
}
|
|
281
|
+
/** Rename, falling back to copy + unlink across filesystems (`EXDEV`). */
|
|
282
|
+
async move(from, to) {
|
|
283
|
+
try {
|
|
284
|
+
await this.renameFn(from, to);
|
|
285
|
+
}
|
|
286
|
+
catch (err) {
|
|
287
|
+
if (err?.code !== 'EXDEV')
|
|
288
|
+
throw err;
|
|
289
|
+
await fsp.copyFile(from, to);
|
|
290
|
+
await fsp.unlink(from);
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
/**
|
|
294
|
+
* Delete an unfinished upload's partial and sidecar. A finished id is left
|
|
295
|
+
* alone (its sidecar keeps completion idempotent; the saved file is the
|
|
296
|
+
* user's). Returns a refusal reason or null.
|
|
297
|
+
*/
|
|
298
|
+
abort(uploadId, sessionId) {
|
|
299
|
+
return this.enqueue(uploadId, async () => {
|
|
300
|
+
const s = await this.readSidecar(uploadId);
|
|
301
|
+
if (!s) {
|
|
302
|
+
await fsp.rm(this.partialPath(uploadId), { force: true });
|
|
303
|
+
return null;
|
|
304
|
+
}
|
|
305
|
+
if (s.sessionId !== sessionId)
|
|
306
|
+
return 'This upload id belongs to a different session.';
|
|
307
|
+
if (s.done)
|
|
308
|
+
return null;
|
|
309
|
+
await fsp.rm(this.partialPath(uploadId), { force: true });
|
|
310
|
+
await fsp.rm(this.sidecarPath(uploadId), { force: true });
|
|
311
|
+
return null;
|
|
312
|
+
});
|
|
313
|
+
}
|
|
314
|
+
/**
|
|
315
|
+
* Remove every staging entry (partial, sidecar, leftover `.tmp`) whose newest
|
|
316
|
+
* mtime is older than `maxAgeMs`, skipping ids with a queued operation.
|
|
317
|
+
* Returns the number of upload ids removed.
|
|
318
|
+
*/
|
|
319
|
+
async gc() {
|
|
320
|
+
let names;
|
|
321
|
+
try {
|
|
322
|
+
names = await fsp.readdir(this.dir);
|
|
323
|
+
}
|
|
324
|
+
catch {
|
|
325
|
+
return 0;
|
|
326
|
+
}
|
|
327
|
+
const newest = new Map();
|
|
328
|
+
const files = new Map();
|
|
329
|
+
for (const name of names) {
|
|
330
|
+
const id = name.split('.')[0];
|
|
331
|
+
let mtime;
|
|
332
|
+
try {
|
|
333
|
+
mtime = (await fsp.stat(path.join(this.dir, name))).mtimeMs;
|
|
334
|
+
}
|
|
335
|
+
catch {
|
|
336
|
+
continue;
|
|
337
|
+
}
|
|
338
|
+
newest.set(id, Math.max(newest.get(id) ?? 0, mtime));
|
|
339
|
+
files.set(id, [...(files.get(id) ?? []), name]);
|
|
340
|
+
}
|
|
341
|
+
const cutoff = this.now() - this.maxAgeMs;
|
|
342
|
+
let removed = 0;
|
|
343
|
+
for (const [id, mtime] of newest) {
|
|
344
|
+
if (mtime >= cutoff || this.queues.has(id))
|
|
345
|
+
continue;
|
|
346
|
+
for (const name of files.get(id) ?? []) {
|
|
347
|
+
await fsp.rm(path.join(this.dir, name), { force: true });
|
|
348
|
+
}
|
|
349
|
+
removed++;
|
|
350
|
+
}
|
|
351
|
+
return removed;
|
|
352
|
+
}
|
|
353
|
+
/** Is `p` (already resolved) the staging dir or inside it? Lexical and realpath. */
|
|
354
|
+
contains(p) {
|
|
355
|
+
const dirs = new Set([this.dir]);
|
|
356
|
+
try {
|
|
357
|
+
dirs.add(fs.realpathSync(this.dir));
|
|
358
|
+
}
|
|
359
|
+
catch { }
|
|
360
|
+
const target = path.resolve(p);
|
|
361
|
+
for (const d of dirs) {
|
|
362
|
+
if (target === d || target.startsWith(d.endsWith(path.sep) ? d : d + path.sep))
|
|
363
|
+
return true;
|
|
364
|
+
}
|
|
365
|
+
return false;
|
|
366
|
+
}
|
|
367
|
+
}
|
|
368
|
+
//# sourceMappingURL=upload-staging.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upload-staging.js","sourceRoot":"","sources":["../src/upload-staging.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,GAAG,MAAM,kBAAkB,CAAC;AACnC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,8DAA8D;AAC9D,MAAM,CAAC,MAAM,iBAAiB,GAAG,WAAW,CAAC;AAE7C,sFAAsF;AACtF,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,GAAG,IAAI,CAAC;AAElD,qEAAqE;AACrE,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAE7D,0CAA0C;AAC1C,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAClC,2CAA2C;AAC3C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAErC,MAAM,YAAY,GAAG,wBAAwB,CAAC;AAE9C,2FAA2F;AAC3F,MAAM,UAAU,eAAe,CAAC,EAAW;IACzC,OAAO,OAAO,EAAE,KAAK,QAAQ,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACzD,CAAC;AAyBD;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,GAAW;IACzC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,qCAAqC,EAAE,CAAC;IACrG,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,gBAAgB;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,4BAA4B,EAAE,CAAC;IACzG,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,mBAAmB,EAAE,CAAC;QACnC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,oCAAoC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;IAC3F,CAAC;IACD,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,SAAS,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;IAChC,IAAI,GAAG,CAAC,MAAM,GAAG,SAAS;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,4CAA4C,EAAE,CAAC;IACpH,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/D,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC;IAC/F,MAAM,GAAG,GAAG,GAAG,CAAC,eAAe,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;IAC3C,IAAI,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC;IAC1G,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACxC,IAAI,OAAO,CAAC,MAAM,GAAG,sBAAsB,EAAE,CAAC;QAC5C,OAAO;YACL,EAAE,EAAE,KAAK;YACT,QAAQ;YACR,KAAK,EAAE,2BAA2B,OAAO,CAAC,MAAM,wBAAwB,sBAAsB,UAAU;SACzG,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC;AAC9D,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,gBAAgB,CAAC,QAAgB,EAAE,MAAc,EAAE,OAAmB;IACpF,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC7C,IAAI,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC;IAC3B,IAAI,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC;IAC9B,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;IACpB,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACjB,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC;IACrD,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC;AAkCD,MAAM,OAAO,aAAa;IACf,GAAG,CAAS;IACJ,QAAQ,CAA8C;IACtD,GAAG,CAAe;IAClB,QAAQ,CAAS;IACjB,MAAM,GAAG,IAAI,GAAG,EAA4B,CAAC;IAE9D,YAAY,IAA0B;QACpC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,yBAAyB,CAAC;IAC7D,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,wEAAwE;IAChE,OAAO,CAAI,QAAgB,EAAE,EAAoB;QACvD,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAC5D,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC9B,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACb,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,IAAI;gBAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,QAAgB;QAChC,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;YACnE,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAkB,CAAC;YAC3C,OAAO,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC1E,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,CAAgB;QACzC,MAAM,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;QAClD,MAAM,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5C,MAAM,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACtD,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,QAAgB;QACxC,IAAI,CAAC;YACH,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3D,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,GAAiB,EAAE,SAAqB;QAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACtD,IAAI,QAAQ,EAAE,CAAC;gBACb,IAAI,QAAQ,CAAC,SAAS,KAAK,GAAG,CAAC,SAAS,EAAE,CAAC;oBACzC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,gDAAgD,EAAE,CAAC;gBAC1G,CAAC;gBACD,IAAI,QAAQ,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,IAAI,QAAQ,CAAC,QAAQ,KAAK,GAAG,CAAC,QAAQ,EAAE,CAAC;oBACrE,OAAO;wBACL,EAAE,EAAE,KAAK;wBACT,SAAS,EAAE,GAAG,CAAC,SAAS;wBACxB,KAAK,EAAE,wDAAwD;qBAChE,CAAC;gBACJ,CAAC;gBACD,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC;gBACtC,IAAI,OAAO;oBAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;gBACjF,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;oBACxC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC;gBAC5I,CAAC;gBACD,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAClD,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;oBACpB,MAAM,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;oBACrE,MAAM,GAAG,CAAC,CAAC;gBACb,CAAC;gBACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC;YAClF,CAAC;YACD,MAAM,OAAO,GAAkB;gBAC7B,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvC,SAAS,EAAE,EAAE;gBACb,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;YACF,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC,OAAO,CAAC,CAAC;YACrC,IAAI,OAAO;gBAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;YAC5E,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;YAClD,MAAM,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/C,MAAM,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACrE,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACjC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC;QAC3E,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,UAAU,CAAC,QAAgB,EAAE,MAAc,EAAE,OAAe,EAAE,SAAqB;QACjF,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC3C,IAAI,CAAC,CAAC;gBAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,2CAA2C,EAAE,CAAC;YAChG,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/B,IAAI,OAAO;gBAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;YAC1E,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;gBACX,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;YACjI,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACjD,IAAI,OAAO,KAAK,IAAI;gBAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,sDAAsD,EAAE,CAAC;YAClI,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;gBACvB,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;YAC9F,CAAC;YACD,IAAI,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;gBACtC,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,SAAS,EAAE,CAAC,CAAC,SAAS;oBACtB,KAAK,EAAE,4CAA4C,OAAO,GAAG,OAAO,CAAC,MAAM,MAAM,CAAC,CAAC,IAAI,UAAU;iBAClG,CAAC;YACJ,CAAC;YACD,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;YAC5D,IAAI,CAAC;gBACH,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;oBAAE,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC9E,CAAC;oBAAS,CAAC;gBACT,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;YACnB,CAAC;YACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QAC9G,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;;;OAUG;IACH,MAAM,CAAC,QAAgB,EAAE,SAAiB,EAAE,SAAqB,EAAE,OAAsC;QACvG,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC3C,IAAI,CAAC,CAAC;gBAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,2CAA2C,EAAE,CAAC;YAC5F,IAAI,CAAC,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC9B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,gDAAgD,EAAE,CAAC;YAC3F,CAAC;YACD,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/B,IAAI,OAAO;gBAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;YAC7D,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,SAAS;gBAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC;YAExG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAChD,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,qEAAqE;gBACrE,gCAAgC;gBAChC,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC9C,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC9C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC;gBAC/E,CAAC;gBACD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,sDAAsD,EAAE,CAAC;YACjG,CAAC;YACD,IAAI,MAAM,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;gBACtB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,sBAAsB,MAAM,OAAO,CAAC,CAAC,IAAI,mBAAmB,EAAE,CAAC;YACvG,CAAC;YAED,IAAI,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC;YAC5B,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC1F,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBACzC,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;YAC/C,CAAC;YACD,MAAM,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9D,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC;YACvD,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACzD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC;QAClE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,0EAA0E;IAClE,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,EAAU;QACzC,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAK,GAA6B,EAAE,IAAI,KAAK,OAAO;gBAAE,MAAM,GAAG,CAAC;YAChE,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7B,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,QAAgB,EAAE,SAAiB;QACvC,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC3C,IAAI,CAAC,CAAC,EAAE,CAAC;gBACP,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC1D,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IAAI,CAAC,CAAC,SAAS,KAAK,SAAS;gBAAE,OAAO,gDAAgD,CAAC;YACvF,IAAI,CAAC,CAAC,IAAI;gBAAE,OAAO,IAAI,CAAC;YACxB,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1D,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1D,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,EAAE;QACN,IAAI,KAAe,CAAC;QACpB,IAAI,CAAC;YACH,KAAK,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,CAAC;QACX,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;QACzC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAoB,CAAC;QAC1C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,KAAa,CAAC;YAClB,IAAI,CAAC;gBACH,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC9D,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;YACrD,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC1C,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,MAAM,EAAE,CAAC;YACjC,IAAI,KAAK,IAAI,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;gBAAE,SAAS;YACrD,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;gBACvC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,oFAAoF;IACpF,QAAQ,CAAC,CAAS;QAChB,MAAM,IAAI,GAAG,IAAI,GAAG,CAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACtC,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QACV,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC/B,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;gBAAE,OAAO,IAAI,CAAC;QAC9F,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
|
package/package.json
CHANGED