miniflare 0.0.0-04a8feda8 → 0.0.0-05973bba4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +41 -0
- package/dist/src/index.d.ts +1140 -397
- package/dist/src/index.js +10254 -4990
- package/dist/src/index.js.map +3 -3
- package/dist/src/workers/assets/assets-kv.worker.js +1 -1
- package/dist/src/workers/assets/assets-kv.worker.js.map +1 -1
- package/dist/src/workers/assets/assets.worker.js +4690 -5154
- package/dist/src/workers/assets/assets.worker.js.map +3 -3
- package/dist/src/workers/assets/router.worker.js +5143 -5914
- package/dist/src/workers/assets/router.worker.js.map +3 -3
- package/dist/src/workers/assets/rpc-proxy.worker.js +11 -0
- package/dist/src/workers/assets/rpc-proxy.worker.js.map +6 -0
- package/dist/src/workers/cache/cache-entry.worker.js.map +1 -1
- package/dist/src/workers/cache/cache.worker.js +18 -29
- package/dist/src/workers/cache/cache.worker.js.map +2 -2
- package/dist/src/workers/core/entry.worker.js +41 -70
- package/dist/src/workers/core/entry.worker.js.map +1 -1
- package/dist/src/workers/d1/database.worker.js +9 -7
- package/dist/src/workers/d1/database.worker.js.map +1 -1
- package/dist/src/workers/kv/namespace.worker.js +2 -4
- package/dist/src/workers/kv/namespace.worker.js.map +1 -1
- package/dist/src/workers/kv/sites.worker.js +3 -6
- package/dist/src/workers/kv/sites.worker.js.map +1 -1
- package/dist/src/workers/pipelines/pipeline.worker.js +11 -0
- package/dist/src/workers/pipelines/pipeline.worker.js.map +6 -0
- package/dist/src/workers/queues/broker.worker.js +17 -20
- package/dist/src/workers/queues/broker.worker.js.map +1 -1
- package/dist/src/workers/r2/bucket.worker.js +23 -46
- package/dist/src/workers/r2/bucket.worker.js.map +1 -1
- package/dist/src/workers/ratelimit/ratelimit.worker.js.map +1 -1
- package/dist/src/workers/shared/index.worker.js +28 -51
- package/dist/src/workers/shared/index.worker.js.map +1 -1
- package/dist/src/workers/shared/zod.worker.js +80 -84
- package/dist/src/workers/shared/zod.worker.js.map +1 -1
- package/dist/src/workers/workflows/binding.worker.js +1949 -0
- package/dist/src/workers/workflows/binding.worker.js.map +6 -0
- package/package.json +25 -25
|
@@ -28,8 +28,7 @@ function* dumpSql(db, options) {
|
|
|
28
28
|
ORDER BY tbl_name='sqlite_sequence', rowid;
|
|
29
29
|
`)(), tables = Array.from(tables_cursor);
|
|
30
30
|
for (let { name: table, sql } of tables) {
|
|
31
|
-
if (filterTables.size > 0 && !filterTables.has(table))
|
|
32
|
-
continue;
|
|
31
|
+
if (filterTables.size > 0 && !filterTables.has(table)) continue;
|
|
33
32
|
if (table === "sqlite_sequence")
|
|
34
33
|
noSchema || (yield "DELETE FROM sqlite_sequence;");
|
|
35
34
|
else if (table.match(/^sqlite_stat./))
|
|
@@ -43,14 +42,13 @@ function* dumpSql(db, options) {
|
|
|
43
42
|
continue;
|
|
44
43
|
sql.match(/CREATE TABLE ['"].*/) ? noSchema || (yield `CREATE TABLE IF NOT EXISTS ${sql.substring(13)};`) : noSchema || (yield `${sql};`);
|
|
45
44
|
}
|
|
46
|
-
if (noData)
|
|
47
|
-
continue;
|
|
45
|
+
if (noData) continue;
|
|
48
46
|
let columns_cursor = db.exec(`PRAGMA table_info="${table}"`), columns = Array.from(columns_cursor), select = `SELECT ${columns.map((c) => c.name).join(", ")}
|
|
49
47
|
FROM "${table}";`, rows_cursor = db.exec(select);
|
|
50
48
|
for (let dataRow of rows_cursor.raw()) {
|
|
51
49
|
let formattedCells = dataRow.map((cell, i) => {
|
|
52
50
|
let colType = columns[i].type, cellType = typeof cell;
|
|
53
|
-
return cell === null ? "NULL" : colType === "INTEGER" || cellType === "number" ? cell : colType === "TEXT" || cellType === "string" ? outputQuotedEscapedString(cell) : cell instanceof ArrayBuffer ? `X'${Array.prototype.map.call(new Uint8Array(cell), (b) => b.toString(16)).join("")}'` : (console.log({ colType, cellType, cell, column: columns[i] }), "ERROR");
|
|
51
|
+
return cell === null ? "NULL" : colType === "INTEGER" || cellType === "number" ? cell : colType === "TEXT" || cellType === "string" ? outputQuotedEscapedString(cell) : cell instanceof ArrayBuffer ? `X'${Array.prototype.map.call(new Uint8Array(cell), (b) => b.toString(16).padStart(2, "0")).join("")}'` : (console.log({ colType, cellType, cell, column: columns[i] }), "ERROR");
|
|
54
52
|
});
|
|
55
53
|
yield `INSERT INTO ${sqliteQuote(table)} VALUES(${formattedCells.join(",")});`;
|
|
56
54
|
}
|
|
@@ -233,7 +231,7 @@ var D1ValueSchema = z.union([
|
|
|
233
231
|
]), D1QuerySchema = z.object({
|
|
234
232
|
sql: z.string(),
|
|
235
233
|
params: z.array(D1ValueSchema).nullable().optional()
|
|
236
|
-
}), D1QueriesSchema = z.union([D1QuerySchema, z.array(D1QuerySchema)]), D1_EXPORT_PRAGMA = "PRAGMA miniflare_d1_export(?,?,?);", D1ResultsFormatSchema = z.enum(["ARRAY_OF_OBJECTS", "ROWS_AND_COLUMNS", "NONE"]).catch("ARRAY_OF_OBJECTS"), served_by = "miniflare.db", D1Error = class extends HttpError {
|
|
234
|
+
}), D1QueriesSchema = z.union([D1QuerySchema, z.array(D1QuerySchema)]), D1_EXPORT_PRAGMA = "PRAGMA miniflare_d1_export(?,?,?);", D1ResultsFormatSchema = z.enum(["ARRAY_OF_OBJECTS", "ROWS_AND_COLUMNS", "NONE"]).catch("ARRAY_OF_OBJECTS"), served_by = "miniflare.db", D1_SESSION_COMMIT_TOKEN_HTTP_HEADER = "x-cf-d1-session-commit-token", D1Error = class extends HttpError {
|
|
237
235
|
constructor(cause) {
|
|
238
236
|
super(500);
|
|
239
237
|
this.cause = cause;
|
|
@@ -321,7 +319,11 @@ var D1DatabaseObject = class extends MiniflareDurableObject {
|
|
|
321
319
|
let { searchParams } = new URL(req.url), resultsFormat = D1ResultsFormatSchema.parse(
|
|
322
320
|
searchParams.get("resultsFormat")
|
|
323
321
|
);
|
|
324
|
-
return Response.json(this.#txn(queries, resultsFormat)
|
|
322
|
+
return Response.json(this.#txn(queries, resultsFormat), {
|
|
323
|
+
headers: {
|
|
324
|
+
[D1_SESSION_COMMIT_TOKEN_HTTP_HEADER]: await this.state.storage.getCurrentBookmark()
|
|
325
|
+
}
|
|
326
|
+
});
|
|
325
327
|
};
|
|
326
328
|
#isExportPragma(queries) {
|
|
327
329
|
return queries.length === 1 && queries[0].sql === D1_EXPORT_PRAGMA && (queries[0].params?.length || 0) >= 2;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/workers/d1/database.worker.ts", "../../../../src/workers/d1/dumpSql.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;AAAA,OAAO,YAAY;AACnB;AAAA,EACC;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EAIA;AAAA,OACM;AACP,SAAS,SAAS;;;ACRX,UAAU,QAChB,IACA,SAKC;AACD,QAAM;AAGN,MAAM,eAAe,IAAI,IAAI,SAAS,UAAU,CAAC,CAAC,GAC5C,EAAE,QAAQ,SAAS,IAAI,WAAW,CAAC,GAInC,gBAAgB,GAAG,QAAQ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAM/B,EAAE,GACE,SAAgB,MAAM,KAAK,aAAa;AAE9C,WAAW,EAAE,MAAM,OAAO,IAAI,KAAK,QAAQ;AAC1C,QAAI,aAAa,OAAO,KAAK,CAAC,aAAa,IAAI,KAAK;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -45,8 +45,7 @@ var KVLimits = {
|
|
|
45
45
|
import { Buffer as Buffer2 } from "node:buffer";
|
|
46
46
|
import { HttpError } from "miniflare:shared";
|
|
47
47
|
function decodeKey({ key }, query) {
|
|
48
|
-
if (query.get(KVParams.URL_ENCODED)?.toLowerCase() !== "true")
|
|
49
|
-
return key;
|
|
48
|
+
if (query.get(KVParams.URL_ENCODED)?.toLowerCase() !== "true") return key;
|
|
50
49
|
try {
|
|
51
50
|
return decodeURIComponent(key);
|
|
52
51
|
} catch (e) {
|
|
@@ -180,8 +179,7 @@ var KVNamespaceObject = class extends MiniflareDurableObject {
|
|
|
180
179
|
let key = decodeKey(params, url.searchParams), cacheTtlParam = url.searchParams.get(KVParams.CACHE_TTL), cacheTtl = cacheTtlParam === null ? void 0 : parseInt(cacheTtlParam);
|
|
181
180
|
validateGetOptions(key, { cacheTtl });
|
|
182
181
|
let entry = await this.storage.get(key);
|
|
183
|
-
if (entry === null)
|
|
184
|
-
throw new HttpError2(404, "Not Found");
|
|
182
|
+
if (entry === null) throw new HttpError2(404, "Not Found");
|
|
185
183
|
let headers = new Headers();
|
|
186
184
|
return entry.expiration !== void 0 && headers.set(
|
|
187
185
|
KVHeaders.EXPIRATION,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/workers/kv/namespace.worker.ts", "../../../../src/workers/kv/constants.ts", "../../../../src/workers/kv/validator.worker.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;AAAA,OAAO,YAAY;AACnB;AAAA,EACC;AAAA,EACA;AAAA,EACA;AAAA,EACA,aAAAA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OAEM;;;ACXP,SAAyB,mBAAmB;AAErC,IAAM,WAAW;AAAA,EACvB,eAAe;AAAA,EACf,eAAe;AAAA,EACf,cAAc;AAAA,EACd,gBAAgB,KAAK,OAAO;AAAA,EAC5B,qBAAqB;AAAA,EACrB,mBAAmB;AACpB,GAEa,WAAW;AAAA,EACvB,aAAa;AAAA,EACb,WAAW;AAAA,EACX,YAAY;AAAA,EACZ,gBAAgB;AAAA,EAChB,YAAY;AAAA,EACZ,aAAa;AAAA,EACb,aAAa;AACd,GAEa,YAAY;AAAA,EACxB,YAAY;AAAA,EACZ,UAAU;AACX;;;ACxBA,SAAS,UAAAC,eAAc;AACvB,SAAS,iBAAiB;AAGnB,SAAS,UAAU,EAAE,IAAI,GAAoB,OAAwB;AAC3E,MAAI,MAAM,IAAI,SAAS,WAAW,GAAG,YAAY,MAAM
|
|
4
|
+
"mappings": ";;;;;;;;;AAAA,OAAO,YAAY;AACnB;AAAA,EACC;AAAA,EACA;AAAA,EACA;AAAA,EACA,aAAAA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OAEM;;;ACXP,SAAyB,mBAAmB;AAErC,IAAM,WAAW;AAAA,EACvB,eAAe;AAAA,EACf,eAAe;AAAA,EACf,cAAc;AAAA,EACd,gBAAgB,KAAK,OAAO;AAAA,EAC5B,qBAAqB;AAAA,EACrB,mBAAmB;AACpB,GAEa,WAAW;AAAA,EACvB,aAAa;AAAA,EACb,WAAW;AAAA,EACX,YAAY;AAAA,EACZ,gBAAgB;AAAA,EAChB,YAAY;AAAA,EACZ,aAAa;AAAA,EACb,aAAa;AACd,GAEa,YAAY;AAAA,EACxB,YAAY;AAAA,EACZ,UAAU;AACX;;;ACxBA,SAAS,UAAAC,eAAc;AACvB,SAAS,iBAAiB;AAGnB,SAAS,UAAU,EAAE,IAAI,GAAoB,OAAwB;AAC3E,MAAI,MAAM,IAAI,SAAS,WAAW,GAAG,YAAY,MAAM,OAAQ,QAAO;AACtE,MAAI;AACH,WAAO,mBAAmB,GAAG;AAAA,EAC9B,SAAS,GAAQ;AAChB,UAAI,aAAa,WACV,IAAI,UAAU,KAAK,+BAA+B,IAElD;AAAA,EAER;AACD;AAEO,SAAS,YAAY,KAAmB;AAC9C,MAAI,QAAQ;AACX,UAAM,IAAI,UAAU,KAAK,6BAA6B;AAEvD,MAAI,QAAQ,OAAO,QAAQ;AAC1B,UAAM,IAAI;AAAA,MACT;AAAA,MACA,qBAAqB,GAAG;AAAA,IACzB;AAED,oBAAkB,GAAG;AACtB;AAEO,SAAS,kBAAkB,KAAmB;AACpD,MAAM,YAAYC,QAAO,WAAW,GAAG;AACvC,MAAI,YAAY,SAAS;AACxB,UAAM,IAAI;AAAA,MACT;AAAA,MACA,2BAA2B,SAAS,gCAAgC,SAAS,YAAY;AAAA,IAC1F;AAEF;AAEO,SAAS,mBACf,KACA,SACO;AACP,cAAY,GAAG;AAGf,MAAM,WAAW,SAAS;AAC1B,MACC,aAAa,WACZ,MAAM,QAAQ,KAAK,WAAW,SAAS;AAExC,UAAM,IAAI;AAAA,MACT;AAAA,MACA,WAAW,SAAS,SAAS,OAAO,QAAQ,gCAAgC,SAAS,aAAa;AAAA,IACnG;AAEF;AAEO,SAAS,mBACf,KACA,SAM4D;AAC5D,MAAM,EAAE,KAAK,eAAe,kBAAkB,YAAY,IAAI;AAE9D,cAAY,GAAG;AAGf,MAAI;AACJ,MAAI,qBAAqB,MAAM;AAC9B,QAAM,gBAAgB,SAAS,gBAAgB;AAC/C,QAAI,OAAO,MAAM,aAAa,KAAK,iBAAiB;AACnD,YAAM,IAAI;AAAA,QACT;AAAA,QACA,WAAW,SAAS,cAAc,OAAO,gBAAgB;AAAA,MAC1D;AAED,QAAI,gBAAgB,SAAS;AAC5B,YAAM,IAAI;AAAA,QACT;AAAA,QACA,WAAW,SAAS,cAAc,OAAO,gBAAgB,qCAAqC,SAAS,aAAa;AAAA,MACrH;AAED,iBAAa,MAAM;AAAA,EACpB,WAAW,kBAAkB,MAAM;AAElC,QADA,aAAa,SAAS,aAAa,GAC/B,OAAO,MAAM,UAAU,KAAK,cAAc;AAC7C,YAAM,IAAI;AAAA,QACT;AAAA,QACA,WAAW,SAAS,UAAU,OAAO,aAAa;AAAA,MACnD;AAED,QAAI,aAAa,MAAM,SAAS;AAC/B,YAAM,IAAI;AAAA,QACT;AAAA,QACA,WAAW,SAAS,UAAU,OAAO,aAAa,uCAAuC,SAAS,aAAa;AAAA,MAChH;AAAA,EAEF;AAGA,MAAI;AACJ,MAAI,gBAAgB,MAAM;AACzB,QAAM,iBAAiBA,QAAO,WAAW,WAAW;AACpD,QAAI,iBAAiB,SAAS;AAC7B,YAAM,IAAI;AAAA,QACT;AAAA,QACA,sBAAsB,cAAc,qBAAqB,SAAS,iBAAiB;AAAA,MACpF;AAED,eAAW,KAAK,MAAM,WAAW;AAAA,EAClC;AAEA,SAAO,EAAE,YAAY,SAAS;AAC/B;AAEO,SAAS,kBAAkB,KAAU;AAC3C,MAAM,aAAa,IAAI,aAAa,IAAI,SAAS,UAAU,GACrD,QACL,eAAe,OAAO,SAAS,gBAAgB,SAAS,UAAU,GAC7D,SAAS,IAAI,aAAa,IAAI,SAAS,WAAW,KAAK,QACvD,SAAS,IAAI,aAAa,IAAI,SAAS,WAAW,KAAK;AAC7D,SAAO,EAAE,OAAO,QAAQ,OAAO;AAChC;AAEO,SAAS,oBAAoB,SAAuC;AAE1E,MAAM,QAAQ,QAAQ;AACtB,MAAI,UAAU,QAAW;AACxB,QAAI,MAAM,KAAK,KAAK,QAAQ;AAC3B,YAAM,IAAI;AAAA,QACT;AAAA,QACA,WAAW,SAAS,UAAU,OAAO,KAAK;AAAA,MAC3C;AAED,QAAI,QAAQ,SAAS;AACpB,YAAM,IAAI;AAAA,QACT;AAAA,QACA,WAAW,SAAS,UAAU,OAAO,KAAK,yCAAyC,SAAS,aAAa;AAAA,MAC1G;AAAA,EAEF;AAGA,MAAM,SAAS,QAAQ;AACvB,EAAI,UAAU,QAAM,kBAAkB,MAAM;AAC7C;;;AF7HA,SAAS,wBAAwB,QAAgB,cAAsB;AACtE,SAAO,IAAIC;AAAA,IACV;AAAA,IACA,mBAAmB,MAAM,qBAAqB,YAAY;AAAA,EAC3D;AACD;AACA,IAAM,kBAAN,cAA8B,gBAAwC;AAAA,EAC5D;AAAA,EACA;AAAA,EAET,YAAY,WAAmB;AAC9B,QAAM,kBAAkB,IAAI,gBAAgB,GACtC,gBAAgB,IAAI,gBAAwB,GAE9C,SAAS;AACb,UAAM;AAAA,MACL,UAAU,OAAO,YAAY;AAC5B,kBAAU,MAAM,YAGZ,UAAU,YACb,WAAW,QAAQ,KAAK,IACb,gBAAgB,OAAO,WAClC,gBAAgB,MAAM;AAAA,MAExB;AAAA,MACA,QAAQ;AAMP,sBAAc,QAAQ,MAAM;AAAA,MAC7B;AAAA,IACD,CAAC,GAED,KAAK,SAAS,gBAAgB,QAC9B,KAAK,SAAS;AAAA,EACf;AACD;AAEA,SAAS,gBAAgB,QAAwB;AAChD,SAAO,KAAK,MAAM,SAAS,GAAI;AAChC;AAEA,SAAS,gBAAgB,SAAyB;AACjD,SAAO,UAAU;AAClB;AAEO,IAAM,oBAAN,cAAgC,uBAAuB;AAAA,EAC7D;AAAA,EACA,IAAI,UAAU;AAEb,WAAQ,KAAK,aAAa,IAAI,gBAAgB,IAAI;AAAA,EACnD;AAAA,EAGA,MAA8B,OAAO,KAAK,QAAQ,QAAQ;AAEzD,QAAM,MAAM,UAAU,QAAQ,IAAI,YAAY,GACxC,gBAAgB,IAAI,aAAa,IAAI,SAAS,SAAS,GACvD,WACL,kBAAkB,OAAO,SAAY,SAAS,aAAa;AAG5D,uBAAmB,KAAK,EAAE,SAAS,CAAC;AACpC,QAAM,QAAQ,MAAM,KAAK,QAAQ,IAAI,GAAG;AACxC,QAAI,UAAU,KAAM,OAAM,IAAIA,WAAU,KAAK,WAAW;AAGxD,QAAM,UAAU,IAAI,QAAQ;AAC5B,WAAI,MAAM,eAAe,UACxB,QAAQ;AAAA,MACP,UAAU;AAAA,MACV,gBAAgB,MAAM,UAAU,EAAE,SAAS;AAAA,IAC5C,GAEG,MAAM,aAAa,UACtB,QAAQ,IAAI,UAAU,UAAU,KAAK,UAAU,MAAM,QAAQ,CAAC,GAExD,IAAI,SAAS,MAAM,OAAO,EAAE,QAAQ,CAAC;AAAA,EAC7C;AAAA,EAGA,MAA8B,OAAO,KAAK,QAAQ,QAAQ;AAEzD,QAAM,MAAM,UAAU,QAAQ,IAAI,YAAY,GACxC,gBAAgB,IAAI,aAAa,IAAI,SAAS,UAAU,GACxD,mBAAmB,IAAI,aAAa,IAAI,SAAS,cAAc,GAC/D,cAAc,IAAI,QAAQ,IAAI,UAAU,QAAQ,GAGhD,MAAM,gBAAgB,KAAK,OAAO,IAAI,CAAC,GACvC,EAAE,YAAY,SAAS,IAAI,mBAAmB,KAAK;AAAA,MACxD;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACD,CAAC,GAKG,QAAQ,IAAI,MAGV,gBAAgB,SAAS,IAAI,QAAQ,IAAI,gBAAgB,CAAE,GAC7D;AACJ,IAAK,OAAO,MAAM,aAAa,IACtB,UAAU,SAAM,kBAAkB,KADT,kBAAkB,eAKpD,UAAU,IAAI,eAA2B;AAAA,MACxC,MAAM,YAAY;AACjB,mBAAW,MAAM;AAAA,MAClB;AAAA,IACD,CAAC;AAED,QAAM,eAAe,KAAK,cACvB,SAAS,sBACT,SAAS,gBACR;AACJ,QAAI,oBAAoB,UAAa,kBAAkB;AAEtD,YAAM,wBAAwB,iBAAiB,YAAY;AAK3D,sBAAkB,IAAI,gBAAgB,YAAY,GAClD,QAAQ,MAAM,YAAY,eAAe;AAI1C,QAAI;AACH,YAAM,KAAK,QAAQ,IAAI;AAAA,QACtB;AAAA,QACA;AAAA,QACA,YAAY,WAAW,iBAAiB,UAAU;AAAA,QAClD;AAAA,QACA,QAAQ,iBAAiB;AAAA,MAC1B,CAAC;AAAA,IACF,SAAS,GAAG;AACX,UACC,OAAO,KAAM,YACb,MAAM,QACN,UAAU,KACV,EAAE,SAAS,cACV;AAID,eAAO,oBAAoB,MAAS;AACpC,YAAM,SAAS,MAAM,gBAAgB;AACrC,cAAM,wBAAwB,QAAQ,YAAY;AAAA,MACnD;AACC,cAAM;AAAA,IAER;AAEA,WAAO,IAAI,SAAS;AAAA,EACrB;AAAA,EAGA,SAAiC,OAAO,KAAK,QAAQ,QAAQ;AAE5D,QAAM,MAAM,UAAU,QAAQ,IAAI,YAAY;AAC9C,uBAAY,GAAG,GAGf,MAAM,KAAK,QAAQ,OAAO,GAAG,GACtB,IAAI,SAAS;AAAA,EACrB;AAAA,EAGA,OAAqB,OAAO,KAAK,QAAQ,QAAQ;AAEhD,QAAM,UAAU,kBAAkB,GAAG;AACrC,wBAAoB,OAAO;AAG3B,QAAM,MAAM,MAAM,KAAK,QAAQ,KAAK,OAAO,GACrC,OAAO,IAAI,KAAK,IAAiC,CAAC,SAAS;AAAA,MAChE,MAAM,IAAI;AAAA,MACV,YAAY,WAAW,iBAAiB,IAAI,UAAU;AAAA;AAAA,MAEtD,UAAU,WAAW,KAAK,WAAW,IAAI,QAAQ;AAAA,IAClD,EAAE,GACE;AACJ,WAAI,IAAI,WAAW,SAClB,SAAS,EAAE,MAAM,eAAe,IAAM,aAAa,KAAK,IAExD,SAAS;AAAA,MACR;AAAA,MACA,eAAe;AAAA,MACf,QAAQ,IAAI;AAAA,MACZ,aAAa;AAAA,IACd,GAEM,SAAS,KAAK,MAAM;AAAA,EAC5B;AACD;AAjJC;AAAA,EADC,IAAI,OAAO;AAAA,GAPA,kBAQZ,sBA2BA;AAAA,EADC,IAAI,OAAO;AAAA,GAlCA,kBAmCZ,sBAiFA;AAAA,EADC,OAAO,OAAO;AAAA,GAnHH,kBAoHZ,yBAWA;AAAA,EADC,IAAI,GAAG;AAAA,GA9HI,kBA+HZ;",
|
|
5
5
|
"names": ["HttpError", "Buffer", "Buffer", "HttpError"]
|
|
6
6
|
}
|
|
@@ -102,10 +102,8 @@ function arrayCompare(a, b) {
|
|
|
102
102
|
let minLength = Math.min(a.length, b.length);
|
|
103
103
|
for (let i = 0; i < minLength; i++) {
|
|
104
104
|
let aElement = a[i], bElement = b[i];
|
|
105
|
-
if (aElement < bElement)
|
|
106
|
-
|
|
107
|
-
if (aElement > bElement)
|
|
108
|
-
return 1;
|
|
105
|
+
if (aElement < bElement) return -1;
|
|
106
|
+
if (aElement > bElement) return 1;
|
|
109
107
|
}
|
|
110
108
|
return a.length - b.length;
|
|
111
109
|
}
|
|
@@ -116,8 +114,7 @@ async function handleListRequest(url, blobsService, siteRegExps) {
|
|
|
116
114
|
for await (let name of walkDirectory(blobsService))
|
|
117
115
|
testSiteRegExps(siteRegExps, name) && (name = encodeSitesKey(name), !(prefix !== void 0 && !name.startsWith(prefix)) && keys.push({ name, encodedName: encoder.encode(name) }));
|
|
118
116
|
keys.sort((a, b) => arrayCompare(a.encodedName, b.encodedName));
|
|
119
|
-
for (let key of keys)
|
|
120
|
-
delete key.encodedName;
|
|
117
|
+
for (let key of keys) delete key.encodedName;
|
|
121
118
|
let startAfter = cursor === void 0 ? "" : base64Decode(cursor), startIndex = 0;
|
|
122
119
|
startAfter !== "" && (startIndex = keys.findIndex(({ name }) => name === startAfter), startIndex === -1 && (startIndex = keys.length), startIndex++);
|
|
123
120
|
let endIndex = startIndex + limit, nextCursor = endIndex < keys.length ? base64Encode(keys[endIndex - 1].name) : void 0;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/workers/kv/sites.worker.ts", "../../../../src/workers/kv/constants.ts", "../../../../src/workers/kv/validator.worker.ts"],
|
|
4
|
-
"mappings": ";AAAA,SAAS,cAAc,cAAc,sBAAsB;;;ACA3D,SAAyB,mBAAmB;AAErC,IAAM,WAAW;AAAA,EACvB,eAAe;AAAA,EACf,eAAe;AAAA,EACf,cAAc;AAAA,EACd,gBAAgB,KAAK,OAAO;AAAA,EAC5B,qBAAqB;AAAA,EACrB,mBAAmB;AACpB,GAEa,WAAW;AAAA,EACvB,aAAa;AAAA,EACb,WAAW;AAAA,EACX,YAAY;AAAA,EACZ,gBAAgB;AAAA,EAChB,YAAY;AAAA,EACZ,aAAa;AAAA,EACb,aAAa;AACd;AAOO,IAAM,eAAe;AAAA,EAC3B,mBAAmB;AAAA,EACnB,oBAAoB;AAAA,EACpB,kBAAkB;AACnB,GAKa,wBAAwB;AAE9B,SAAS,eAAe,KAAqB;AAGnD,SAAO,wBAAwB,mBAAmB,GAAG;AACtD;AACO,SAAS,eAAe,KAAqB;AACnD,SAAO,IAAI,WAAW,qBAAqB,IACxC,mBAAmB,IAAI,UAAU,sBAAsB,MAAM,CAAC,IAC9D;AACJ;AAoCO,SAAS,mBACf,SACiB;AACjB,SAAO;AAAA,IACN,SAAS,QAAQ,QAAQ,IAAI,CAAC,WAAW,IAAI,OAAO,MAAM,CAAC;AAAA,IAC3D,SAAS,QAAQ,QAAQ,IAAI,CAAC,WAAW,IAAI,OAAO,MAAM,CAAC;AAAA,EAC5D;AACD;AAWO,SAAS,uBACf,aACqB;AACrB,SAAO;AAAA,IACN,SAAS,YAAY,WAAW,mBAAmB,YAAY,OAAO;AAAA,IACtE,SAAS,YAAY,WAAW,mBAAmB,YAAY,OAAO;AAAA,EACvE;AACD;AAEO,SAAS,gBACf,SACA,KACU;AAEV,SAAI,QAAQ,YAAY,SAAkB,YAAY,QAAQ,SAAS,GAAG,IAEtE,QAAQ,YAAY,SAAkB,CAAC,YAAY,QAAQ,SAAS,GAAG,IACpE;AACR;;;ACtHA,SAAS,cAAc;AACvB,SAAS,iBAAiB;AA6BnB,SAAS,kBAAkB,KAAmB;AACpD,MAAM,YAAY,OAAO,WAAW,GAAG;AACvC,MAAI,YAAY,SAAS;AACxB,UAAM,IAAI;AAAA,MACT;AAAA,MACA,2BAA2B,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
// src/workers/pipelines/pipeline.worker.ts
|
|
2
|
+
import { WorkerEntrypoint } from "cloudflare:workers";
|
|
3
|
+
var Pipeline = class extends WorkerEntrypoint {
|
|
4
|
+
async send(data) {
|
|
5
|
+
console.log("Request received", data);
|
|
6
|
+
}
|
|
7
|
+
};
|
|
8
|
+
export {
|
|
9
|
+
Pipeline as default
|
|
10
|
+
};
|
|
11
|
+
//# sourceMappingURL=pipeline.worker.js.map
|
|
@@ -54,12 +54,14 @@ var QueueMessageDelaySchema = z.number().int().min(0).max(43200).optional(), Que
|
|
|
54
54
|
// https://developers.cloudflare.com/queues/platform/configuration/#consumer
|
|
55
55
|
// https://developers.cloudflare.com/queues/platform/limits/
|
|
56
56
|
maxBatchSize: z.number().min(0).max(100).optional(),
|
|
57
|
-
maxBatchTimeout: z.number().min(0).max(
|
|
57
|
+
maxBatchTimeout: z.number().min(0).max(60).optional(),
|
|
58
58
|
// seconds
|
|
59
59
|
maxRetires: z.number().min(0).max(100).optional(),
|
|
60
|
+
// deprecated
|
|
61
|
+
maxRetries: z.number().min(0).max(100).optional(),
|
|
60
62
|
deadLetterQueue: z.ostring(),
|
|
61
63
|
retryDelay: QueueMessageDelaySchema
|
|
62
|
-
}), QueueConsumerSchema = /* @__PURE__ */ z.intersection(
|
|
64
|
+
}).transform((queue) => (queue.maxRetires !== void 0 && (queue.maxRetries = queue.maxRetires), queue)), QueueConsumerSchema = /* @__PURE__ */ z.intersection(
|
|
63
65
|
QueueConsumerOptionsSchema,
|
|
64
66
|
z.object({ workerName: z.string() })
|
|
65
67
|
), QueueConsumersSchema = /* @__PURE__ */ z.record(QueueConsumerSchema), QueueContentTypeSchema = /* @__PURE__ */ z.enum(["text", "json", "bytes", "v8"]).default("v8"), QueueIncomingMessageSchema = /* @__PURE__ */ z.object({
|
|
@@ -75,7 +77,7 @@ var QueueMessageDelaySchema = z.number().int().min(0).max(43200).optional(), Que
|
|
|
75
77
|
});
|
|
76
78
|
|
|
77
79
|
// src/workers/queues/broker.worker.ts
|
|
78
|
-
var MAX_MESSAGE_SIZE_BYTES = 128 * 1e3, MAX_MESSAGE_BATCH_COUNT = 100, MAX_MESSAGE_BATCH_SIZE =
|
|
80
|
+
var MAX_MESSAGE_SIZE_BYTES = 128 * 1e3, MAX_MESSAGE_BATCH_COUNT = 100, MAX_MESSAGE_BATCH_SIZE = 288 * 1e3, DEFAULT_BATCH_SIZE = 5, DEFAULT_BATCH_TIMEOUT = 1, DEFAULT_RETRIES = 2, exceptionQueueResponse = {
|
|
79
81
|
outcome: "exception",
|
|
80
82
|
retryBatch: { retry: !1 },
|
|
81
83
|
ackAll: !1,
|
|
@@ -104,8 +106,7 @@ function validateContentType(headers) {
|
|
|
104
106
|
}
|
|
105
107
|
function validateMessageDelay(headers) {
|
|
106
108
|
let format = headers.get("X-Msg-Delay-Secs");
|
|
107
|
-
if (!format)
|
|
108
|
-
return;
|
|
109
|
+
if (!format) return;
|
|
109
110
|
let result = QueueMessageDelaySchema.safeParse(Number(format));
|
|
110
111
|
if (!result.success)
|
|
111
112
|
throw new HttpError(
|
|
@@ -198,7 +199,7 @@ var QueueBrokerObject = class extends MiniflareDurableObject {
|
|
|
198
199
|
#flush = async () => {
|
|
199
200
|
let consumer = this.#maybeConsumer;
|
|
200
201
|
assert(consumer !== void 0);
|
|
201
|
-
let batchSize = consumer.maxBatchSize ?? DEFAULT_BATCH_SIZE, maxAttempts = (consumer.
|
|
202
|
+
let batchSize = consumer.maxBatchSize ?? DEFAULT_BATCH_SIZE, maxAttempts = (consumer.maxRetries ?? DEFAULT_RETRIES) + 1, maxAttemptsS = maxAttempts === 1 ? "" : "s", batch = this.#messages.splice(0, batchSize), startTime = Date.now(), endTime, response;
|
|
202
203
|
try {
|
|
203
204
|
response = await this.#dispatchBatch(consumer.workerName, batch), endTime = Date.now();
|
|
204
205
|
} catch (e) {
|
|
@@ -218,14 +219,13 @@ var QueueBrokerObject = class extends MiniflareDurableObject {
|
|
|
218
219
|
this.#messages.push(message), this.#ensurePendingFlush();
|
|
219
220
|
}, delay = retryMessages.get(message.id) ?? globalDelay;
|
|
220
221
|
this.timers.setTimeout(fn, delay * 1e3);
|
|
221
|
-
} else
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
);
|
|
222
|
+
} else consumer.deadLetterQueue !== void 0 ? (await this.logWithLevel(
|
|
223
|
+
LogLevel.WARN,
|
|
224
|
+
`Moving message "${message.id}" on queue "${this.name}" to dead letter queue "${consumer.deadLetterQueue}" after ${maxAttempts} failed attempt${maxAttemptsS}...`
|
|
225
|
+
), toDeadLetterQueue.push(message)) : await this.logWithLevel(
|
|
226
|
+
LogLevel.WARN,
|
|
227
|
+
`Dropped message "${message.id}" on queue "${this.name}" after ${maxAttempts} failed attempt${maxAttemptsS}!`
|
|
228
|
+
);
|
|
229
229
|
let acked = batch.length - failedMessages;
|
|
230
230
|
if (await this.logWithLevel(
|
|
231
231
|
LogLevel.INFO,
|
|
@@ -248,8 +248,7 @@ var QueueBrokerObject = class extends MiniflareDurableObject {
|
|
|
248
248
|
assert(consumer !== void 0);
|
|
249
249
|
let batchSize = consumer.maxBatchSize ?? DEFAULT_BATCH_SIZE, batchTimeout = consumer.maxBatchTimeout ?? DEFAULT_BATCH_TIMEOUT, batchHasSpace = this.#messages.length < batchSize;
|
|
250
250
|
if (this.#pendingFlush !== void 0) {
|
|
251
|
-
if (this.#pendingFlush.immediate || batchHasSpace)
|
|
252
|
-
return;
|
|
251
|
+
if (this.#pendingFlush.immediate || batchHasSpace) return;
|
|
253
252
|
this.timers.clearTimeout(this.#pendingFlush.timeout), this.#pendingFlush = void 0;
|
|
254
253
|
}
|
|
255
254
|
let delay = batchHasSpace ? batchTimeout * 1e3 : 0, timeout = this.timers.setTimeout(this.#flush, delay);
|
|
@@ -264,8 +263,7 @@ var QueueBrokerObject = class extends MiniflareDurableObject {
|
|
|
264
263
|
}
|
|
265
264
|
}
|
|
266
265
|
message = async (req) => {
|
|
267
|
-
if (this.#maybeConsumer === void 0)
|
|
268
|
-
return new Response();
|
|
266
|
+
if (this.#maybeConsumer === void 0) return new Response();
|
|
269
267
|
validateMessageSize(req.headers);
|
|
270
268
|
let contentType = validateContentType(req.headers), delay = validateMessageDelay(req.headers) ?? this.#maybeProducer?.deliveryDelay, body = Buffer2.from(await req.arrayBuffer());
|
|
271
269
|
return this.#enqueue(
|
|
@@ -274,8 +272,7 @@ var QueueBrokerObject = class extends MiniflareDurableObject {
|
|
|
274
272
|
), new Response();
|
|
275
273
|
};
|
|
276
274
|
batch = async (req) => {
|
|
277
|
-
if (this.#maybeConsumer === void 0)
|
|
278
|
-
return new Response();
|
|
275
|
+
if (this.#maybeConsumer === void 0) return new Response();
|
|
279
276
|
validateBatchSize(req.headers);
|
|
280
277
|
let delay = validateMessageDelay(req.headers) ?? this.#maybeProducer?.deliveryDelay, body = QueuesBatchRequestSchema.parse(await req.json());
|
|
281
278
|
return this.#enqueue(body.messages, delay), new Response();
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/workers/queues/broker.worker.ts", "../../../../../../node_modules/.pnpm/kleur@4.1.5/node_modules/kleur/colors.mjs", "../../../../src/workers/queues/constants.ts", "../../../../src/workers/queues/schemas.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;AAAA,OAAO,YAAY;AACnB,SAAS,UAAAA,eAAc;;;ACDvB,IAAI,aAAa,qBAAqB,UAAU,MAAM,QAAM;AACxD,OAAO,UAAY,QACrB,EAAE,aAAa,qBAAqB,UAAU,KAAK,IAAI,QAAQ,OAAO,CAAC,GACxE,QAAQ,QAAQ,UAAU,QAAQ,OAAO;AAGnC,IAAM,IAAI;AAAA,EAChB,SAAS,CAAC,uBAAuB,YAAY,QAAQ,SAAS,WAC7D,eAAe,QAAQ,gBAAgB,OAAO;AAEhD;AAEA,SAAS,KAAK,GAAG,GAAG;AACnB,MAAI,MAAM,IAAI,OAAO,WAAW,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Buffer", "Buffer"]
|
|
6
6
|
}
|
|
@@ -491,8 +491,7 @@ var R2_HASH_ALGORITHMS = [
|
|
|
491
491
|
];
|
|
492
492
|
function serialisedLength(x) {
|
|
493
493
|
for (let i = 0; i < x.length; i++)
|
|
494
|
-
if (x.charCodeAt(i) >= 256)
|
|
495
|
-
return x.length * 2;
|
|
494
|
+
if (x.charCodeAt(i) >= 256) return x.length * 2;
|
|
496
495
|
return x.length;
|
|
497
496
|
}
|
|
498
497
|
var Validator = class {
|
|
@@ -517,17 +516,14 @@ var Validator = class {
|
|
|
517
516
|
range(options, size) {
|
|
518
517
|
if (options.rangeHeader !== void 0) {
|
|
519
518
|
let ranges = parseRanges(options.rangeHeader, size);
|
|
520
|
-
if (ranges?.length === 1)
|
|
521
|
-
return ranges[0];
|
|
519
|
+
if (ranges?.length === 1) return ranges[0];
|
|
522
520
|
} else if (options.range !== void 0) {
|
|
523
521
|
let { offset, length, suffix } = options.range;
|
|
524
522
|
if (suffix !== void 0) {
|
|
525
|
-
if (suffix <= 0)
|
|
526
|
-
throw new InvalidRange();
|
|
523
|
+
if (suffix <= 0) throw new InvalidRange();
|
|
527
524
|
suffix > size && (suffix = size), offset = size - suffix, length = suffix;
|
|
528
525
|
}
|
|
529
|
-
if (offset === void 0 && (offset = 0), length === void 0 && (length = size - offset), offset < 0 || offset > size || length <= 0)
|
|
530
|
-
throw new InvalidRange();
|
|
526
|
+
if (offset === void 0 && (offset = 0), length === void 0 && (length = size - offset), offset < 0 || offset > size || length <= 0) throw new InvalidRange();
|
|
531
527
|
return offset + length > size && (length = size - offset), { start: offset, end: offset + length - 1 };
|
|
532
528
|
}
|
|
533
529
|
}
|
|
@@ -537,8 +533,7 @@ var Validator = class {
|
|
|
537
533
|
return this;
|
|
538
534
|
}
|
|
539
535
|
metadataSize(customMetadata) {
|
|
540
|
-
if (customMetadata === void 0)
|
|
541
|
-
return this;
|
|
536
|
+
if (customMetadata === void 0) return this;
|
|
542
537
|
let metadataLength = 0;
|
|
543
538
|
for (let [key, value] of Object.entries(customMetadata))
|
|
544
539
|
metadataLength += serialisedLength(key) + serialisedLength(value);
|
|
@@ -568,8 +563,7 @@ var DigestingStream = class extends TransformStream {
|
|
|
568
563
|
});
|
|
569
564
|
super({
|
|
570
565
|
async transform(chunk, controller) {
|
|
571
|
-
for (let hash of hashes)
|
|
572
|
-
await hash.writer.write(chunk);
|
|
566
|
+
for (let hash of hashes) await hash.writer.write(chunk);
|
|
573
567
|
controller.enqueue(chunk);
|
|
574
568
|
},
|
|
575
569
|
async flush() {
|
|
@@ -593,8 +587,7 @@ function generateId() {
|
|
|
593
587
|
}
|
|
594
588
|
function generateMultipartEtag(md5Hexes) {
|
|
595
589
|
let hash = createHash("md5");
|
|
596
|
-
for (let md5Hex of md5Hexes)
|
|
597
|
-
hash.update(md5Hex, "hex");
|
|
590
|
+
for (let md5Hex of md5Hexes) hash.update(md5Hex, "hex");
|
|
598
591
|
return `${hash.digest("hex")}-${md5Hexes.length}`;
|
|
599
592
|
}
|
|
600
593
|
function rangeOverlaps(a, b) {
|
|
@@ -602,16 +595,14 @@ function rangeOverlaps(a, b) {
|
|
|
602
595
|
}
|
|
603
596
|
async function decodeMetadata(req) {
|
|
604
597
|
let metadataSize = parseInt(req.headers.get(R2Headers.METADATA_SIZE));
|
|
605
|
-
if (Number.isNaN(metadataSize))
|
|
606
|
-
throw new InvalidMetadata();
|
|
598
|
+
if (Number.isNaN(metadataSize)) throw new InvalidMetadata();
|
|
607
599
|
assert2(req.body !== null);
|
|
608
600
|
let body = req.body, [metadataBuffer, value] = await readPrefix(body, metadataSize), metadataJson = decoder.decode(metadataBuffer);
|
|
609
601
|
return { metadata: R2BindingRequestSchema.parse(JSON.parse(metadataJson)), metadataSize, value };
|
|
610
602
|
}
|
|
611
603
|
function decodeHeaderMetadata(req) {
|
|
612
604
|
let header = req.headers.get(R2Headers.REQUEST);
|
|
613
|
-
if (header === null)
|
|
614
|
-
throw new InvalidMetadata();
|
|
605
|
+
if (header === null) throw new InvalidMetadata();
|
|
615
606
|
return R2BindingRequestSchema.parse(JSON.parse(header));
|
|
616
607
|
}
|
|
617
608
|
function encodeResult(result) {
|
|
@@ -720,10 +711,8 @@ function sqlStmts(db) {
|
|
|
720
711
|
let maybeOldBlobId = get(stmtDelete({ key }))?.blob_id;
|
|
721
712
|
if (maybeOldBlobId === null) {
|
|
722
713
|
let partRows = stmtDeletePartsByKey({ object_key: key });
|
|
723
|
-
for (let partRow of partRows)
|
|
724
|
-
|
|
725
|
-
} else
|
|
726
|
-
maybeOldBlobId !== void 0 && oldBlobIds.push(maybeOldBlobId);
|
|
714
|
+
for (let partRow of partRows) oldBlobIds.push(partRow.blob_id);
|
|
715
|
+
} else maybeOldBlobId !== void 0 && oldBlobIds.push(maybeOldBlobId);
|
|
727
716
|
}
|
|
728
717
|
return oldBlobIds;
|
|
729
718
|
}),
|
|
@@ -788,8 +777,7 @@ function sqlStmts(db) {
|
|
|
788
777
|
throw new NoSuchUpload();
|
|
789
778
|
let partNumberSet = /* @__PURE__ */ new Set();
|
|
790
779
|
for (let { part } of selectedParts) {
|
|
791
|
-
if (partNumberSet.has(part))
|
|
792
|
-
throw new InternalError();
|
|
780
|
+
if (partNumberSet.has(part)) throw new InternalError();
|
|
793
781
|
partNumberSet.add(part);
|
|
794
782
|
}
|
|
795
783
|
let uploadedPartRows = stmtListPartsByUploadId({ upload_id }), uploadedParts = /* @__PURE__ */ new Map();
|
|
@@ -814,10 +802,8 @@ function sqlStmts(db) {
|
|
|
814
802
|
let oldBlobIds = [], maybeOldBlobId = get(stmtGetPreviousByKey({ key }))?.blob_id;
|
|
815
803
|
if (maybeOldBlobId === null) {
|
|
816
804
|
let partRows2 = stmtDeletePartsByKey({ object_key: key });
|
|
817
|
-
for (let partRow of partRows2)
|
|
818
|
-
|
|
819
|
-
} else
|
|
820
|
-
maybeOldBlobId !== void 0 && oldBlobIds.push(maybeOldBlobId);
|
|
805
|
+
for (let partRow of partRows2) oldBlobIds.push(partRow.blob_id);
|
|
806
|
+
} else maybeOldBlobId !== void 0 && oldBlobIds.push(maybeOldBlobId);
|
|
821
807
|
let totalSize = parts.reduce((acc, { size }) => acc + size, 0), etag = generateMultipartEtag(
|
|
822
808
|
parts.map(({ checksum_md5 }) => checksum_md5)
|
|
823
809
|
), newRow = {
|
|
@@ -839,8 +825,7 @@ function sqlStmts(db) {
|
|
|
839
825
|
object_key: key
|
|
840
826
|
});
|
|
841
827
|
let partRows = stmtDeleteUnlinkedPartsByUploadId({ upload_id });
|
|
842
|
-
for (let partRow of partRows)
|
|
843
|
-
oldBlobIds.push(partRow.blob_id);
|
|
828
|
+
for (let partRow of partRows) oldBlobIds.push(partRow.blob_id);
|
|
844
829
|
return stmtUpdateUploadState({
|
|
845
830
|
upload_id,
|
|
846
831
|
state: MultipartUploadState.COMPLETED
|
|
@@ -932,16 +917,14 @@ var R2BucketObject = class extends MiniflareDurableObject {
|
|
|
932
917
|
async #head(key) {
|
|
933
918
|
validate.key(key);
|
|
934
919
|
let row = get(this.#stmts.getByKey({ key }));
|
|
935
|
-
if (row === void 0)
|
|
936
|
-
throw new NoSuchKey();
|
|
920
|
+
if (row === void 0) throw new NoSuchKey();
|
|
937
921
|
let range = { offset: 0, length: row.size };
|
|
938
922
|
return new InternalR2Object(row, range);
|
|
939
923
|
}
|
|
940
924
|
async #get(key, opts) {
|
|
941
925
|
validate.key(key);
|
|
942
926
|
let result = this.#stmts.getPartsByKey(key);
|
|
943
|
-
if (result === void 0)
|
|
944
|
-
throw new NoSuchKey();
|
|
927
|
+
if (result === void 0) throw new NoSuchKey();
|
|
945
928
|
let { row, parts } = result, defaultR2Range = { offset: 0, length: row.size };
|
|
946
929
|
try {
|
|
947
930
|
validate.condition(row, opts.onlyIf);
|
|
@@ -960,8 +943,7 @@ var R2BucketObject = class extends MiniflareDurableObject {
|
|
|
960
943
|
assert2(parts !== void 0);
|
|
961
944
|
let defaultRange = { start: 0, end: row.size - 1 };
|
|
962
945
|
value = this.#assembleMultipartValue(parts, range ?? defaultRange);
|
|
963
|
-
} else if (value = await this.blob.get(row.blob_id, range), value === null)
|
|
964
|
-
throw new NoSuchKey();
|
|
946
|
+
} else if (value = await this.blob.get(row.blob_id, range), value === null) throw new NoSuchKey();
|
|
965
947
|
return new InternalR2ObjectBody(row, value, r2Range);
|
|
966
948
|
}
|
|
967
949
|
async #put(key, value, valueSize, opts) {
|
|
@@ -987,17 +969,14 @@ var R2BucketObject = class extends MiniflareDurableObject {
|
|
|
987
969
|
throw this.#backgroundDelete(blobId), e;
|
|
988
970
|
}
|
|
989
971
|
if (oldBlobIds !== void 0)
|
|
990
|
-
for (let blobId2 of oldBlobIds)
|
|
991
|
-
this.#backgroundDelete(blobId2);
|
|
972
|
+
for (let blobId2 of oldBlobIds) this.#backgroundDelete(blobId2);
|
|
992
973
|
return new InternalR2Object(row);
|
|
993
974
|
}
|
|
994
975
|
#delete(keys) {
|
|
995
976
|
Array.isArray(keys) || (keys = [keys]);
|
|
996
|
-
for (let key of keys)
|
|
997
|
-
validate.key(key);
|
|
977
|
+
for (let key of keys) validate.key(key);
|
|
998
978
|
let oldBlobIds = this.#stmts.deleteByKeys(keys);
|
|
999
|
-
for (let blobId of oldBlobIds)
|
|
1000
|
-
this.#backgroundDelete(blobId);
|
|
979
|
+
for (let blobId of oldBlobIds) this.#backgroundDelete(blobId);
|
|
1001
980
|
}
|
|
1002
981
|
#listWithoutDelimiterQuery(excludeHttp, excludeCustom) {
|
|
1003
982
|
return excludeHttp && excludeCustom ? this.#stmts.listWithoutDelimiter : excludeHttp ? this.#stmts.listCustomMetadataWithoutDelimiter : excludeCustom ? this.#stmts.listHttpMetadataWithoutDelimiter : this.#stmts.listHttpCustomMetadataWithoutDelimiter;
|
|
@@ -1077,15 +1056,13 @@ var R2BucketObject = class extends MiniflareDurableObject {
|
|
|
1077
1056
|
parts,
|
|
1078
1057
|
minPartSize
|
|
1079
1058
|
);
|
|
1080
|
-
for (let blobId of oldBlobIds)
|
|
1081
|
-
this.#backgroundDelete(blobId);
|
|
1059
|
+
for (let blobId of oldBlobIds) this.#backgroundDelete(blobId);
|
|
1082
1060
|
return new InternalR2Object(newRow);
|
|
1083
1061
|
}
|
|
1084
1062
|
async #abortMultipartUpload(key, uploadId) {
|
|
1085
1063
|
validate.key(key);
|
|
1086
1064
|
let oldBlobIds = this.#stmts.abortMultipartUpload(key, uploadId);
|
|
1087
|
-
for (let blobId of oldBlobIds)
|
|
1088
|
-
this.#backgroundDelete(blobId);
|
|
1065
|
+
for (let blobId of oldBlobIds) this.#backgroundDelete(blobId);
|
|
1089
1066
|
}
|
|
1090
1067
|
get = async (req) => {
|
|
1091
1068
|
let metadata = decodeHeaderMetadata(req), result;
|