@hot-updater/cloudflare 0.20.0-rc.0 → 0.20.0

package/dist/index.cjs

@@ -44,7 +44,7 @@ const node_stream = __toESM(require("node:stream"));
 const node_buffer = __toESM(require("node:buffer"));
 
 //#region ../../node_modules/.pnpm/pg-minify@1.6.5/node_modules/pg-minify/lib/utils.js
-var require_utils = __commonJS({ "../../node_modules/.pnpm/pg-minify@1.6.5/node_modules/pg-minify/lib/utils.js"(exports, module) {
+var require_utils = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/pg-minify@1.6.5/node_modules/pg-minify/lib/utils.js": ((exports, module) => {
 	const { inspect: inspect$2 } = require("util");
 	function getIndexPos$1(text, index) {
 		let lineIdx = 0, colIdx = index, pos = 0;
@@ -71,11 +71,11 @@ var require_utils = __commonJS({ "../../node_modules/.pnpm/pg-minify@1.6.5/node_
 		messageGap: messageGap$1,
 		addInspection: addInspection$1
 	};
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/pg-minify@1.6.5/node_modules/pg-minify/lib/error.js
-var require_error = __commonJS({ "../../node_modules/.pnpm/pg-minify@1.6.5/node_modules/pg-minify/lib/error.js"(exports, module) {
+var require_error = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/pg-minify@1.6.5/node_modules/pg-minify/lib/error.js": ((exports, module) => {
 	const { EOL } = require("os");
 	const { addInspection, messageGap } = require_utils();
 	const parsingErrorCode$1 = {
@@ -134,11 +134,11 @@ var require_error = __commonJS({ "../../node_modules/.pnpm/pg-minify@1.6.5/node_
 		SQLParsingError: SQLParsingError$1,
 		parsingErrorCode: parsingErrorCode$1
 	};
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/pg-minify@1.6.5/node_modules/pg-minify/lib/parser.js
-var require_parser = __commonJS({ "../../node_modules/.pnpm/pg-minify@1.6.5/node_modules/pg-minify/lib/parser.js"(exports, module) {
+var require_parser = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/pg-minify@1.6.5/node_modules/pg-minify/lib/parser.js": ((exports, module) => {
 	const { parsingErrorCode, SQLParsingError } = require_error();
 	const { getIndexPos } = require_utils();
 	const compressors = ".,;:()[]=<>+-*/|!?@#";
@@ -268,21 +268,21 @@ var require_parser = __commonJS({ "../../node_modules/.pnpm/pg-minify@1.6.5/node
 		return s === " " || s === "	" || s === "\r" || s === "\n";
 	}
 	module.exports = minify$1;
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/pg-minify@1.6.5/node_modules/pg-minify/lib/index.js
-var require_lib = __commonJS({ "../../node_modules/.pnpm/pg-minify@1.6.5/node_modules/pg-minify/lib/index.js"(exports, module) {
+var require_lib = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/pg-minify@1.6.5/node_modules/pg-minify/lib/index.js": ((exports, module) => {
 	const parser = require_parser();
 	const error = require_error();
 	parser.SQLParsingError = error.SQLParsingError;
 	parser.parsingErrorCode = error.parsingErrorCode;
 	module.exports = parser;
-} });
+}) });
 
 //#endregion
 //#region src/d1Database.ts
-var import_lib = __toESM(require_lib());
+var import_lib = /* @__PURE__ */ __toESM(require_lib(), 1);
 async function resolvePage(singlePage) {
 	const results = [];
 	for await (const page of singlePage.iterPages()) {
@@ -1254,10 +1254,10 @@ const handleCommand = (filePath, rawArguments, rawOptions) => {
 
 //#endregion
 //#region ../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/windows.js
-var require_windows = __commonJS({ "../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/windows.js"(exports, module) {
+var require_windows = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/windows.js": ((exports, module) => {
 	module.exports = isexe$3;
 	isexe$3.sync = sync$2;
-	var fs$3 = require("fs");
+	var fs$2 = require("fs");
 	function checkPathExt(path$10, options) {
 		var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
 		if (!pathext) return true;
@@ -1274,28 +1274,28 @@ var require_windows = __commonJS({ "../../node_modules/.pnpm/isexe@2.0.0/node_mo
 		return checkPathExt(path$10, options);
 	}
 	function isexe$3(path$10, options, cb) {
-		fs$3.stat(path$10, function(er, stat) {
+		fs$2.stat(path$10, function(er, stat) {
 			cb(er, er ? false : checkStat$1(stat, path$10, options));
 		});
 	}
 	function sync$2(path$10, options) {
-		return checkStat$1(fs$3.statSync(path$10), path$10, options);
+		return checkStat$1(fs$2.statSync(path$10), path$10, options);
 	}
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/mode.js
-var require_mode = __commonJS({ "../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/mode.js"(exports, module) {
+var require_mode = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/mode.js": ((exports, module) => {
 	module.exports = isexe$2;
 	isexe$2.sync = sync$1;
-	var fs$2 = require("fs");
+	var fs$1 = require("fs");
 	function isexe$2(path$10, options, cb) {
-		fs$2.stat(path$10, function(er, stat) {
+		fs$1.stat(path$10, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, options));
 		});
 	}
 	function sync$1(path$10, options) {
-		return checkStat(fs$2.statSync(path$10), options);
+		return checkStat(fs$1.statSync(path$10), options);
 	}
 	function checkStat(stat, options) {
 		return stat.isFile() && checkMode(stat, options);
@@ -1313,12 +1313,12 @@ var require_mode = __commonJS({ "../../node_modules/.pnpm/isexe@2.0.0/node_modul
 		var ret = mod & o$1 || mod & g && gid === myGid || mod & u$1 && uid === myUid || mod & ug && myUid === 0;
 		return ret;
 	}
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/index.js
-var require_isexe = __commonJS({ "../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/index.js"(exports, module) {
-	var fs$1 = require("fs");
+var require_isexe = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/index.js": ((exports, module) => {
+	require("fs");
 	var core;
 	if (process.platform === "win32" || global.TESTING_WINDOWS) core = require_windows();
 	else core = require_mode();
@@ -1356,16 +1356,16 @@ var require_isexe = __commonJS({ "../../node_modules/.pnpm/isexe@2.0.0/node_modu
 			else throw er;
 		}
 	}
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/which@2.0.2/node_modules/which/which.js
-var require_which = __commonJS({ "../../node_modules/.pnpm/which@2.0.2/node_modules/which/which.js"(exports, module) {
+var require_which = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/which@2.0.2/node_modules/which/which.js": ((exports, module) => {
 	const isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
 	const path$9 = require("path");
 	const COLON = isWindows ? ";" : ":";
 	const isexe = require_isexe();
-	const getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
+	const getNotFoundError = (cmd) => Object.assign(/* @__PURE__ */ new Error(`not found: ${cmd}`), { code: "ENOENT" });
 	const getPathInfo = (cmd, opt) => {
 		const colon = opt.colon || COLON;
 		const pathEnv = cmd.match(/\//) || isWindows && cmd.match(/\\/) ? [""] : [...isWindows ? [process.cwd()] : [], ...(opt.path || process.env.PATH || "").split(colon)];
@@ -1431,11 +1431,11 @@ var require_which = __commonJS({ "../../node_modules/.pnpm/which@2.0.2/node_modu
 	};
 	module.exports = which$1;
 	which$1.sync = whichSync;
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/path-key@3.1.1/node_modules/path-key/index.js
-var require_path_key = __commonJS({ "../../node_modules/.pnpm/path-key@3.1.1/node_modules/path-key/index.js"(exports, module) {
+var require_path_key = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/path-key@3.1.1/node_modules/path-key/index.js": ((exports, module) => {
 	const pathKey$1 = (options = {}) => {
 		const environment = options.env || process.env;
 		const platform$1 = options.platform || process.platform;
@@ -1444,11 +1444,11 @@ var require_path_key = __commonJS({ "../../node_modules/.pnpm/path-key@3.1.1/nod
 	};
 	module.exports = pathKey$1;
 	module.exports.default = pathKey$1;
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/resolveCommand.js
-var require_resolveCommand = __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/resolveCommand.js"(exports, module) {
+var require_resolveCommand = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/resolveCommand.js": ((exports, module) => {
 	const path$8 = require("path");
 	const which = require_which();
 	const getPathKey = require_path_key();
@@ -1476,11 +1476,11 @@ var require_resolveCommand = __commonJS({ "../../node_modules/.pnpm/cross-spawn@
 		return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true);
 	}
 	module.exports = resolveCommand$1;
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/escape.js
-var require_escape = __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/escape.js"(exports, module) {
+var require_escape = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/escape.js": ((exports, module) => {
 	const metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g;
 	function escapeCommand(arg) {
 		arg = arg.replace(metaCharsRegExp, "^$1");
@@ -1497,17 +1497,17 @@ var require_escape = __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0.6/no
 	}
 	module.exports.command = escapeCommand;
 	module.exports.argument = escapeArgument;
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/shebang-regex@3.0.0/node_modules/shebang-regex/index.js
-var require_shebang_regex = __commonJS({ "../../node_modules/.pnpm/shebang-regex@3.0.0/node_modules/shebang-regex/index.js"(exports, module) {
+var require_shebang_regex = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/shebang-regex@3.0.0/node_modules/shebang-regex/index.js": ((exports, module) => {
 	module.exports = /^#!(.*)/;
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/shebang-command@2.0.0/node_modules/shebang-command/index.js
-var require_shebang_command = __commonJS({ "../../node_modules/.pnpm/shebang-command@2.0.0/node_modules/shebang-command/index.js"(exports, module) {
+var require_shebang_command = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/shebang-command@2.0.0/node_modules/shebang-command/index.js": ((exports, module) => {
 	const shebangRegex = require_shebang_regex();
 	module.exports = (string = "") => {
 		const match = string.match(shebangRegex);
@@ -1517,11 +1517,11 @@ var require_shebang_command = __commonJS({ "../../node_modules/.pnpm/shebang-com
 		if (binary === "env") return argument;
 		return argument ? `${binary} ${argument}` : binary;
 	};
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/readShebang.js
-var require_readShebang = __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/readShebang.js"(exports, module) {
+var require_readShebang = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/readShebang.js": ((exports, module) => {
 	const fs = require("fs");
 	const shebangCommand = require_shebang_command();
 	function readShebang$1(command) {
@@ -1536,11 +1536,11 @@ var require_readShebang = __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0
 		return shebangCommand(buffer.toString());
 	}
 	module.exports = readShebang$1;
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/parse.js
-var require_parse = __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/parse.js"(exports, module) {
+var require_parse = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/parse.js": ((exports, module) => {
 	const path$7 = require("path");
 	const resolveCommand = require_resolveCommand();
 	const escape = require_escape();
@@ -1599,14 +1599,14 @@ var require_parse = __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0.6/nod
 		return options.shell ? parsed : parseNonShell(parsed);
 	}
 	module.exports = parse$1;
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/enoent.js
-var require_enoent = __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/enoent.js"(exports, module) {
+var require_enoent = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/enoent.js": ((exports, module) => {
 	const isWin = process.platform === "win32";
 	function notFoundError(original, syscall) {
-		return Object.assign(new Error(`${syscall} ${original.command} ENOENT`), {
+		return Object.assign(/* @__PURE__ */ new Error(`${syscall} ${original.command} ENOENT`), {
 			code: "ENOENT",
 			errno: "ENOENT",
 			syscall: `${syscall} ${original.command}`,
@@ -1639,11 +1639,11 @@ var require_enoent = __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0.6/no
 		verifyENOENTSync,
 		notFoundError
 	};
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/index.js
-var require_cross_spawn = __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/index.js"(exports, module) {
+var require_cross_spawn = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/index.js": ((exports, module) => {
 	const cp = require("child_process");
 	const parse = require_parse();
 	const enoent = require_enoent();
@@ -1664,10 +1664,11 @@ var require_cross_spawn = __commonJS({ "../../node_modules/.pnpm/cross-spawn@7.0
 	module.exports.sync = spawnSync$1;
 	module.exports._parse = parse;
 	module.exports._enoent = enoent;
-} });
+}) });
 
 //#endregion
 //#region ../../node_modules/.pnpm/path-key@4.0.0/node_modules/path-key/index.js
+var import_cross_spawn = /* @__PURE__ */ __toESM(require_cross_spawn(), 1);
 function pathKey(options = {}) {
 	const { env = process.env, platform: platform$1 = process.platform } = options;
 	if (platform$1 !== "win32") return "PATH";
@@ -2238,7 +2239,7 @@ const throwOnMissingStrict = (isSubprocess) => {
 const throwOnStrictDisconnect = (isSubprocess) => {
 	throw new Error(`${getMethodName("sendMessage", isSubprocess)} failed: the ${getOtherProcessName(isSubprocess)} exited without listening to incoming messages.`);
 };
-const getAbortDisconnectError = () => new Error(`\`cancelSignal\` aborted: the ${getOtherProcessName(true)} disconnected.`);
+const getAbortDisconnectError = () => /* @__PURE__ */ new Error(`\`cancelSignal\` aborted: the ${getOtherProcessName(true)} disconnected.`);
 const throwOnMissingParent = () => {
 	throw new Error("`getCancelSignal()` cannot be used without setting the `cancelSignal` subprocess option.");
 };
@@ -2876,7 +2877,6 @@ const fixCwdError = (originalMessage, cwd) => {
 
 //#endregion
 //#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/arguments/options.js
-var import_cross_spawn = __toESM(require_cross_spawn(), 1);
 const normalizeOptions = (filePath, rawArguments, rawOptions) => {
 	rawOptions.cwd = normalizeCwd(rawOptions.cwd);
 	const [processedFile, processedArguments, processedOptions] = handleNodeOption(filePath, rawArguments, rawOptions);
@@ -3204,7 +3204,7 @@ const arrayMethods = {
 async function getStreamAsArrayBuffer(stream, options) {
 	return getStreamContents$1(stream, arrayBufferMethods, options);
 }
-const initArrayBuffer = () => ({ contents: new ArrayBuffer(0) });
+const initArrayBuffer = () => ({ contents: /* @__PURE__ */ new ArrayBuffer(0) });
 const useTextEncoder = (chunk) => textEncoder.encode(chunk);
 const textEncoder = new TextEncoder();
 const useUint8Array = (chunk) => new Uint8Array(chunk);
@@ -3553,10 +3553,9 @@ function parseBigint(milliseconds) {
 }
 function parseMilliseconds(milliseconds) {
 	switch (typeof milliseconds) {
-		case "number": {
+		case "number":
 			if (Number.isFinite(milliseconds)) return parseNumber(milliseconds);
 			break;
-		}
 		case "bigint": return parseBigint(milliseconds);
 	}
 	throw new TypeError("Expected a finite number or bigint");
@@ -4096,10 +4095,10 @@ const getDuplicateStream = ({ stdioItem: { type, value, optionName }, direction,
 		optionName
 	});
 };
-const getOtherStdioItems = (fileDescriptors, type) => fileDescriptors.flatMap(({ direction, stdioItems }) => stdioItems.filter((stdioItem) => stdioItem.type === type).map((stdioItem) => ({
+const getOtherStdioItems = (fileDescriptors, type) => fileDescriptors.flatMap(({ direction, stdioItems }) => stdioItems.filter((stdioItem) => stdioItem.type === type).map(((stdioItem) => ({
 	...stdioItem,
 	direction
-})));
+}))));
 const validateDuplicateStreamSync = ({ otherStdioItems, type, value, optionName, direction }) => {
 	if (SPECIAL_DUPLICATE_TYPES_SYNC.has(type)) getDuplicateStreamInstance({
 		otherStdioItems,
@@ -4616,7 +4615,7 @@ const logLine = (line, fdNumber, verboseInfo) => {
 const transformOutputSync = ({ fileDescriptors, syncResult: { output }, options, isMaxBuffer, verboseInfo }) => {
 	if (output === null) return { output: Array.from({ length: 3 }) };
 	const state = {};
-	const outputFiles = new Set([]);
+	const outputFiles = /* @__PURE__ */ new Set([]);
 	const transformedOutput = output.map((result, fdNumber) => transformOutputResultSync({
 		result,
 		fileDescriptors,
@@ -5178,9 +5177,9 @@ const getHighWaterMark = (streams, objectMode) => {
 	return Math.max(...highWaterMarks);
 };
 var MergedStream = class extends node_stream.PassThrough {
-	#streams = new Set([]);
-	#ended = new Set([]);
-	#aborted = new Set([]);
+	#streams = /* @__PURE__ */ new Set([]);
+	#ended = /* @__PURE__ */ new Set([]);
+	#aborted = /* @__PURE__ */ new Set([]);
 	#onFinished;
 	#unpipeEvent = Symbol("unpipe");
 	#streamPromises = /* @__PURE__ */ new WeakMap();
@@ -5779,7 +5778,7 @@ const unpipeOnAbort = (unpipeSignal, unpipeContext) => unpipeSignal === void 0 ?
 const unpipeOnSignalAbort = async (unpipeSignal, { sourceStream, mergedStream, fileDescriptors, sourceOptions, startTime }) => {
 	await (0, node_util.aborted)(unpipeSignal, sourceStream);
 	await mergedStream.remove(sourceStream);
-	const error$1 = new Error("Pipe canceled by `unpipeSignal` option.");
+	const error$1 = /* @__PURE__ */ new Error("Pipe canceled by `unpipeSignal` option.");
 	throw createNonCommandError({
 		error: error$1,
 		fileDescriptors,
@@ -8227,10 +8226,11 @@ const r2Storage = (config, hooks) => (_) => {
 		cloudflareApiToken,
 		cwd: process.cwd()
 	});
+	const getStorageKey = (0, __hot_updater_plugin_core.createStorageKeyBuilder)(config.basePath);
 	return {
 		name: "r2Storage",
 		async deleteBundle(bundleId) {
-			const Key = `${bundleId}/bundle.zip `;
+			const Key = getStorageKey(bundleId, "bundle.zip");
 			try {
 				await wrangler("r2", "object", "delete", [bucketName, Key].join("/"), "--remote");
 				return { storageUri: `r2://${bucketName}/${Key}` };
@@ -8241,7 +8241,7 @@ const r2Storage = (config, hooks) => (_) => {
 		async uploadBundle(bundleId, bundlePath) {
 			const contentType = src_default.getType(bundlePath) ?? void 0;
 			const filename = path.default.basename(bundlePath);
-			const Key = [bundleId, filename].join("/");
+			const Key = getStorageKey(bundleId, filename);
 			try {
 				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);

package/dist/index.d.cts

@@ -14,6 +14,10 @@ interface R2StorageConfig {
   cloudflareApiToken: string;
   accountId: string;
   bucketName: string;
+  /**
+   * Base path where bundles will be stored in the bucket
+   */
+  basePath?: string;
 }
 declare const r2Storage: (config: R2StorageConfig, hooks?: StoragePluginHooks) => (_: BasePluginArgs) => StoragePlugin;
 //#endregion

package/dist/index.d.ts

@@ -14,6 +14,10 @@ interface R2StorageConfig {
   cloudflareApiToken: string;
   accountId: string;
   bucketName: string;
+  /**
+   * Base path where bundles will be stored in the bucket
+   */
+  basePath?: string;
 }
 declare const r2Storage: (config: R2StorageConfig, hooks?: StoragePluginHooks) => (_: BasePluginArgs) => StoragePlugin;
 //#endregion