@hot-updater/cloudflare 0.18.0 → 0.18.2

package/dist/index.cjs

@@ -282,7 +282,7 @@ var require_lib = __commonJS({ "../../node_modules/.pnpm/pg-minify@1.6.5/node_mo
 
 //#endregion
 //#region src/d1Database.ts
-var import_lib = __toESM(require_lib(), 1);
+var import_lib = __toESM(require_lib());
 async function resolvePage(singlePage) {
 	const results = [];
 	for await (const page of singlePage.iterPages()) {
@@ -291,8 +291,70 @@ async function resolvePage(singlePage) {
 	}
 	return results;
 }
+function buildWhereClause(conditions) {
+	const clauses = [];
+	const params = [];
+	if (conditions.channel) {
+		clauses.push("channel = ?");
+		params.push(conditions.channel);
+	}
+	if (conditions.platform) {
+		clauses.push("platform = ?");
+		params.push(conditions.platform);
+	}
+	const whereClause = clauses.length > 0 ? ` WHERE ${clauses.join(" AND ")}` : "";
+	return {
+		sql: whereClause,
+		params
+	};
+}
+function transformRowToBundle(row) {
+	return {
+		id: row.id,
+		channel: row.channel,
+		enabled: Boolean(row.enabled),
+		shouldForceUpdate: Boolean(row.should_force_update),
+		fileHash: row.file_hash,
+		gitCommitHash: row.git_commit_hash,
+		message: row.message,
+		platform: row.platform,
+		targetAppVersion: row.target_app_version,
+		storageUri: row.storage_uri,
+		fingerprintHash: row.fingerprint_hash,
+		metadata: row?.metadata ? JSON.parse(row?.metadata) : {}
+	};
+}
 const d1Database = (config, hooks) => {
 	let bundles = [];
+	async function getTotalCount(context, conditions) {
+		const { sql: whereClause, params } = buildWhereClause(conditions);
+		const countSql = (0, import_lib.default)(`SELECT COUNT(*) as total FROM bundles${whereClause}`);
+		const countResult = await context.cf.d1.database.query(config.databaseId, {
+			account_id: config.accountId,
+			sql: countSql,
+			params
+		});
+		const rows = await resolvePage(countResult);
+		return rows[0]?.total || 0;
+	}
+	async function getPaginatedBundles(context, conditions, limit, offset) {
+		const { sql: whereClause, params } = buildWhereClause(conditions);
+		const sql = (0, import_lib.default)(`
+      SELECT * FROM bundles
+      ${whereClause}
+      ORDER BY id DESC
+      LIMIT ?
+      OFFSET ?
+    `);
+		params.push(limit, offset);
+		const result = await context.cf.d1.database.query(config.databaseId, {
+			account_id: config.accountId,
+			sql,
+			params
+		});
+		const rows = await resolvePage(result);
+		return rows.map(transformRowToBundle);
+	}
 	return (0, __hot_updater_plugin_core.createDatabasePlugin)("d1Database", {
 		getContext: () => ({ cf: new cloudflare.default({ apiToken: config.cloudflareApiToken }) }),
 		async getBundleById(context, bundleId) {
@@ -307,67 +369,21 @@ const d1Database = (config, hooks) => {
 			});
 			const rows = await resolvePage(singlePage);
 			if (rows.length === 0) return null;
-			const row = rows[0];
-			return {
-				channel: row.channel,
-				enabled: Boolean(row.enabled),
-				shouldForceUpdate: Boolean(row.should_force_update),
-				fileHash: row.file_hash,
-				gitCommitHash: row.git_commit_hash,
-				id: row.id,
-				message: row.message,
-				platform: row.platform,
-				targetAppVersion: row.target_app_version,
-				storageUri: row.storage_uri,
-				fingerprintHash: row.fingerprint_hash,
-				metadata: row?.metadata ? JSON.parse(row?.metadata) : {}
-			};
+			return transformRowToBundle(rows[0]);
 		},
 		async getBundles(context, options) {
-			const { where, limit, offset = 0 } = options ?? {};
-			let sql = "SELECT * FROM bundles";
-			const params = [];
-			const conditions = [];
-			if (where?.channel) {
-				conditions.push("channel = ?");
-				params.push(where.channel);
-			}
-			if (where?.platform) {
-				conditions.push("platform = ?");
-				params.push(where.platform);
-			}
-			if (conditions.length > 0) sql += ` WHERE ${conditions.join(" AND ")}`;
-			sql += " ORDER BY id DESC";
-			if (limit) {
-				sql += " LIMIT ?";
-				params.push(limit);
-			}
-			if (offset) {
-				sql += " OFFSET ?";
-				params.push(offset);
-			}
-			const singlePage = await context.cf.d1.database.query(config.databaseId, {
-				account_id: config.accountId,
-				sql: (0, import_lib.default)(sql),
-				params
-			});
-			const rows = await resolvePage(singlePage);
-			if (rows.length === 0) bundles = [];
-			else bundles = rows.map((row) => ({
-				id: row.id,
-				channel: row.channel,
-				enabled: Boolean(row.enabled),
-				shouldForceUpdate: Boolean(row.should_force_update),
-				fileHash: row.file_hash,
-				gitCommitHash: row.git_commit_hash,
-				message: row.message,
-				platform: row.platform,
-				targetAppVersion: row.target_app_version,
-				storageUri: row.storage_uri,
-				fingerprintHash: row.fingerprint_hash,
-				metadata: row?.metadata ? JSON.parse(row?.metadata) : {}
-			}));
-			return bundles;
+			const { where = {}, limit, offset } = options;
+			const totalCount = await getTotalCount(context, where);
+			bundles = await getPaginatedBundles(context, where, limit, offset);
+			const paginationOptions = {
+				limit,
+				offset
+			};
+			const pagination = (0, __hot_updater_plugin_core.calculatePagination)(totalCount, paginationOptions);
+			return {
+				data: bundles,
+				pagination
+			};
 		},
 		async getChannels(context) {
 			const sql = (0, import_lib.default)(`
@@ -1134,7 +1150,7 @@ const getVerboseObject = ({ type, result, verboseInfo: { escapedCommand, command
 	type,
 	escapedCommand,
 	commandId: `${commandId}`,
-	timestamp: new Date(),
+	timestamp: /* @__PURE__ */ new Date(),
 	piped,
 	result,
 	options
@@ -2255,7 +2271,7 @@ const getFromStream = (source, from = "stdout") => {
 	if (sourceStream === null || sourceStream === void 0) throw new TypeError(getInvalidStdioOptionMessage(fdNumber, from, options, isWritable));
 	return sourceStream;
 };
-const SUBPROCESS_OPTIONS = new WeakMap();
+const SUBPROCESS_OPTIONS = /* @__PURE__ */ new WeakMap();
 const getFdNumber = (fileDescriptors, fdName, isWritable) => {
 	const fdNumber = parseFdNumber(fdName, isWritable);
 	validateFdNumber(fdNumber, fdName, isWritable, fileDescriptors);
@@ -2384,7 +2400,7 @@ const onDisconnect = async ({ anyProcess, channel, isSubprocess, ipcEmitter, bou
 	ipcEmitter.connected = false;
 	ipcEmitter.emit("disconnect");
 };
-const INCOMING_MESSAGES = new WeakMap();
+const INCOMING_MESSAGES = /* @__PURE__ */ new WeakMap();
 
 //#endregion
 //#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/forward.js
@@ -2401,7 +2417,7 @@ const getIpcEmitter = (anyProcess, channel, isSubprocess) => {
 	});
 	return ipcEmitter;
 };
-const IPC_EMITTERS = new WeakMap();
+const IPC_EMITTERS = /* @__PURE__ */ new WeakMap();
 const forwardEvents = ({ ipcEmitter, anyProcess, channel, isSubprocess }) => {
 	const boundOnMessage = onMessage.bind(void 0, {
 		anyProcess,
@@ -2500,7 +2516,7 @@ const RESPONSE_TYPE = "execa:ipc:response";
 //#endregion
 //#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/outgoing.js
 const startSendMessage = (anyProcess, wrappedMessage, strict) => {
-	if (!OUTGOING_MESSAGES.has(anyProcess)) OUTGOING_MESSAGES.set(anyProcess, new Set());
+	if (!OUTGOING_MESSAGES.has(anyProcess)) OUTGOING_MESSAGES.set(anyProcess, /* @__PURE__ */ new Set());
 	const outgoingMessages = OUTGOING_MESSAGES.get(anyProcess);
 	const onMessageSent = createDeferred();
 	const id = strict ? wrappedMessage.id : void 0;
@@ -2525,7 +2541,7 @@ const waitForOutgoingMessages = async (anyProcess, ipcEmitter, wrappedMessage) =
 		await Promise.all(outgoingMessages.map(({ onMessageSent }) => onMessageSent));
 	}
 };
-const OUTGOING_MESSAGES = new WeakMap();
+const OUTGOING_MESSAGES = /* @__PURE__ */ new WeakMap();
 const hasMessageListeners = (anyProcess, ipcEmitter) => ipcEmitter.listenerCount("message") > getMinListenerCount(anyProcess);
 const getMinListenerCount = (anyProcess) => SUBPROCESS_OPTIONS.has(anyProcess) && !getFdSpecificValue(SUBPROCESS_OPTIONS.get(anyProcess).options.buffer, "ipc") ? 1 : 0;
 
@@ -2597,7 +2613,7 @@ const getSendMethod = (anyProcess) => {
 	PROCESS_SEND_METHODS.set(anyProcess, sendMethod);
 	return sendMethod;
 };
-const PROCESS_SEND_METHODS = new WeakMap();
+const PROCESS_SEND_METHODS = /* @__PURE__ */ new WeakMap();
 
 //#endregion
 //#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/graceful.js
@@ -2914,14 +2930,14 @@ const CR_BINARY = CR.codePointAt(0);
 function isStream(stream, { checkOpen = true } = {}) {
 	return stream !== null && typeof stream === "object" && (stream.writable || stream.readable || !checkOpen || stream.writable === void 0 && stream.readable === void 0) && typeof stream.pipe === "function";
 }
-function isWritableStream$1(stream, { checkOpen = true } = {}) {
+function isWritableStream(stream, { checkOpen = true } = {}) {
 	return isStream(stream, { checkOpen }) && (stream.writable || !checkOpen) && typeof stream.write === "function" && typeof stream.end === "function" && typeof stream.writable === "boolean" && typeof stream.writableObjectMode === "boolean" && typeof stream.destroy === "function" && typeof stream.destroyed === "boolean";
 }
-function isReadableStream$1(stream, { checkOpen = true } = {}) {
+function isReadableStream(stream, { checkOpen = true } = {}) {
 	return isStream(stream, { checkOpen }) && (stream.readable || !checkOpen) && typeof stream.read === "function" && typeof stream.readable === "boolean" && typeof stream.readableObjectMode === "boolean" && typeof stream.destroy === "function" && typeof stream.destroyed === "boolean";
 }
 function isDuplexStream(stream, options) {
-	return isWritableStream$1(stream, options) && isReadableStream$1(stream, options);
+	return isWritableStream(stream, options) && isReadableStream(stream, options);
 }
 
 //#endregion
@@ -3008,7 +3024,7 @@ function h({ preventCancel: r = !1 } = {}) {
 //#endregion
 //#region ../../node_modules/.pnpm/get-stream@9.0.1/node_modules/get-stream/source/stream.js
 const getAsyncIterable = (stream) => {
-	if (isReadableStream$1(stream, { checkOpen: false }) && nodeImports.on !== void 0) return getStreamIterable(stream);
+	if (isReadableStream(stream, { checkOpen: false }) && nodeImports.on !== void 0) return getStreamIterable(stream);
 	if (typeof stream?.[Symbol.asyncIterator] === "function") return stream;
 	if (toString.call(stream) === "[object ReadableStream]") return h.call(stream);
 	throw new TypeError("The first argument must be a Readable, a ReadableStream, or an async iterable.");
@@ -3707,10 +3723,10 @@ const KNOWN_STDIO_STRINGS = new Set([
 	"overlapped",
 	"pipe"
 ]);
-const isReadableStream = (value) => Object.prototype.toString.call(value) === "[object ReadableStream]";
-const isWritableStream = (value) => Object.prototype.toString.call(value) === "[object WritableStream]";
-const isWebStream = (value) => isReadableStream(value) || isWritableStream(value);
-const isTransformStream = (value) => isReadableStream(value?.readable) && isWritableStream(value?.writable);
+const isReadableStream$1 = (value) => Object.prototype.toString.call(value) === "[object ReadableStream]";
+const isWritableStream$1 = (value) => Object.prototype.toString.call(value) === "[object WritableStream]";
+const isWebStream = (value) => isReadableStream$1(value) || isWritableStream$1(value);
+const isTransformStream = (value) => isReadableStream$1(value?.readable) && isWritableStream$1(value?.writable);
 const isAsyncIterableObject = (value) => isObject(value) && typeof value[Symbol.asyncIterator] === "function";
 const isIterableObject = (value) => isObject(value) && typeof value[Symbol.iterator] === "function";
 const isObject = (value) => typeof value === "object" && value !== null;
@@ -3874,10 +3890,10 @@ const guessStreamDirection = {
 	iterable: alwaysInput,
 	asyncIterable: alwaysInput,
 	uint8Array: alwaysInput,
-	webStream: (value) => isWritableStream(value) ? "output" : "input",
+	webStream: (value) => isWritableStream$1(value) ? "output" : "input",
 	nodeStream(value) {
-		if (!isReadableStream$1(value, { checkOpen: false })) return "output";
-		return isWritableStream$1(value, { checkOpen: false }) ? void 0 : "input";
+		if (!isReadableStream(value, { checkOpen: false })) return "output";
+		return isWritableStream(value, { checkOpen: false }) ? void 0 : "input";
 	},
 	webTransform: anyDirection,
 	duplex: anyDirection,
@@ -4007,7 +4023,7 @@ const handleInputOption = (input) => input === void 0 ? [] : [{
 	optionName: "input"
 }];
 const getInputType = (input) => {
-	if (isReadableStream$1(input, { checkOpen: false })) return "nodeStream";
+	if (isReadableStream(input, { checkOpen: false })) return "nodeStream";
 	if (typeof input === "string") return "string";
 	if (isUint8Array(input)) return "uint8Array";
 	throw new Error("The `input` option must be a string, a Uint8Array or a Node.js Readable stream.");
@@ -5145,7 +5161,7 @@ var MergedStream = class extends node_stream.PassThrough {
 	#aborted = new Set([]);
 	#onFinished;
 	#unpipeEvent = Symbol("unpipe");
-	#streamPromises = new WeakMap();
+	#streamPromises = /* @__PURE__ */ new WeakMap();
 	add(stream) {
 		validateStream(stream);
 		if (this.#streams.has(stream)) return;
@@ -5325,7 +5341,7 @@ const abortSourceStream = (source) => {
 //#endregion
 //#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/io/output-async.js
 const pipeOutputAsync = (subprocess, fileDescriptors, controller) => {
-	const pipeGroups = new Map();
+	const pipeGroups = /* @__PURE__ */ new Map();
 	for (const [fdNumber, { stdioItems, direction }] of Object.entries(fileDescriptors)) {
 		for (const { stream } of stdioItems.filter(({ type }) => TRANSFORM_TYPES.has(type))) pipeTransform(subprocess, stream, direction, fdNumber);
 		for (const { stream } of stdioItems.filter(({ type }) => !TRANSFORM_TYPES.has(type))) pipeStdioItem({
@@ -5731,7 +5747,7 @@ const cleanupMergedStreamsMap = async (destinationStream) => {
 	} catch {}
 	MERGED_STREAMS.delete(destinationStream);
 };
-const MERGED_STREAMS = new WeakMap();
+const MERGED_STREAMS = /* @__PURE__ */ new WeakMap();
 const SOURCE_LISTENERS_PER_PIPE = 2;
 const DESTINATION_LISTENERS_PER_PIPE = 1;
 
@@ -6217,9 +6233,9 @@ const throwOnSubprocessError = async (subprocess, { signal }) => {
 //#endregion
 //#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/convert/concurrent.js
 const initializeConcurrentStreams = () => ({
-	readableDestroy: new WeakMap(),
-	writableFinal: new WeakMap(),
-	writableDestroy: new WeakMap()
+	readableDestroy: /* @__PURE__ */ new WeakMap(),
+	writableFinal: /* @__PURE__ */ new WeakMap(),
+	writableDestroy: /* @__PURE__ */ new WeakMap()
 });
 const addConcurrentStream = (concurrentStreams, stream, waitName) => {
 	const weakMap = concurrentStreams[waitName];
@@ -8114,16 +8130,16 @@ var __classPrivateFieldGet = void 0 && (void 0).__classPrivateFieldGet || functi
 var _Mime_extensionToType, _Mime_typeToExtension, _Mime_typeToExtensions;
 var Mime = class {
 	constructor(...args) {
-		_Mime_extensionToType.set(this, new Map());
-		_Mime_typeToExtension.set(this, new Map());
-		_Mime_typeToExtensions.set(this, new Map());
+		_Mime_extensionToType.set(this, /* @__PURE__ */ new Map());
+		_Mime_typeToExtension.set(this, /* @__PURE__ */ new Map());
+		_Mime_typeToExtensions.set(this, /* @__PURE__ */ new Map());
 		for (const arg of args) this.define(arg);
 	}
 	define(typeMap, force = false) {
 		for (let [type, extensions] of Object.entries(typeMap)) {
 			type = type.toLowerCase();
 			extensions = extensions.map((ext) => ext.toLowerCase());
-			if (!__classPrivateFieldGet(this, _Mime_typeToExtensions, "f").has(type)) __classPrivateFieldGet(this, _Mime_typeToExtensions, "f").set(type, new Set());
+			if (!__classPrivateFieldGet(this, _Mime_typeToExtensions, "f").has(type)) __classPrivateFieldGet(this, _Mime_typeToExtensions, "f").set(type, /* @__PURE__ */ new Set());
 			const allExtensions = __classPrivateFieldGet(this, _Mime_typeToExtensions, "f").get(type);
 			let first = true;
 			for (let extension of extensions) {
@@ -8173,7 +8189,7 @@ var Mime = class {
 		};
 	}
 };
-_Mime_extensionToType = new WeakMap(), _Mime_typeToExtension = new WeakMap(), _Mime_typeToExtensions = new WeakMap();
+_Mime_extensionToType = /* @__PURE__ */ new WeakMap(), _Mime_typeToExtension = /* @__PURE__ */ new WeakMap(), _Mime_typeToExtensions = /* @__PURE__ */ new WeakMap();
 var Mime_default = Mime;
 
 //#endregion
@@ -8200,8 +8216,8 @@ const r2Storage = (config, hooks) => (_) => {
 			const filename = path.default.basename(bundlePath);
 			const Key = [bundleId, filename].join("/");
 			try {
-				const { stderr } = await wrangler("r2", "object", "put", [bucketName, Key].join("/"), "--file", bundlePath, ...contentType ? ["--content-type", contentType] : [], "--remote");
-				if (stderr) throw new Error(stderr);
+				const { stderr, exitCode } = await wrangler("r2", "object", "put", [bucketName, Key].join("/"), "--file", bundlePath, ...contentType ? ["--content-type", contentType] : [], "--remote");
+				if (exitCode !== 0 && stderr) throw new Error(stderr);
 			} catch (error$1) {
 				if (error$1 instanceof ExecaError) throw new Error(error$1.stderr || error$1.stdout);
 				throw error$1;

package/dist/index.d.cts

@@ -8,7 +8,6 @@ interface D1DatabaseConfig {
   cloudflareApiToken: string;
 }
 declare const d1Database: (config: D1DatabaseConfig, hooks?: DatabasePluginHooks) => (options: _hot_updater_plugin_core0.BasePluginArgs) => _hot_updater_plugin_core0.DatabasePlugin;
-
 //#endregion
 //#region src/r2Storage.d.ts
 interface R2StorageConfig {
@@ -17,6 +16,5 @@ interface R2StorageConfig {
   bucketName: string;
 }
 declare const r2Storage: (config: R2StorageConfig, hooks?: StoragePluginHooks) => (_: BasePluginArgs) => StoragePlugin;
-
 //#endregion
 export { D1DatabaseConfig, R2StorageConfig, d1Database, r2Storage };

package/dist/index.d.ts

@@ -8,7 +8,6 @@ interface D1DatabaseConfig {
   cloudflareApiToken: string;
 }
 declare const d1Database: (config: D1DatabaseConfig, hooks?: DatabasePluginHooks) => (options: _hot_updater_plugin_core0.BasePluginArgs) => _hot_updater_plugin_core0.DatabasePlugin;
-
 //#endregion
 //#region src/r2Storage.d.ts
 interface R2StorageConfig {
@@ -17,6 +16,5 @@ interface R2StorageConfig {
   bucketName: string;
 }
 declare const r2Storage: (config: R2StorageConfig, hooks?: StoragePluginHooks) => (_: BasePluginArgs) => StoragePlugin;
-
 //#endregion
 export { D1DatabaseConfig, R2StorageConfig, d1Database, r2Storage };