@yongdall/configuration 0.1.0 → 0.2.0

package/cli/generate-salt.mjs

@@ -0,0 +1,26 @@
+import * as pathFn from "node:path";
+import * as fsPromises from "node:fs/promises";
+import createSalt from "#createSalt";
+import { configRoot } from "@yongdall/root";
+
+//#region cli/configuration/cli/generate-salt.mjs
+/** @import { Cli } from '@yongdall/cli-parse' */
+/**
+* 
+* @param {Cli.Env} env 
+*/
+async function generate_salt_default({ force }) {
+	const path = pathFn.resolve(configRoot, "salt");
+	if (!force && await fsPromises.stat(path).catch(() => null)) {
+		console.error("salt 已经存在，如果希望重新生成，请添加 --force 参数");
+		console.warn("[WARN] 重新生成将会导致所有用户退出登陆，并导致所有用户密码失效");
+		return;
+	}
+	const key = await createSalt();
+	await fsPromises.writeFile(path, key);
+	console.error("salt 生成完成");
+}
+
+//#endregion
+export { generate_salt_default as default };
+//# sourceMappingURL=generate-salt.mjs.map

package/cli/generate-salt.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-salt.mjs","names":[],"sources":["../../../cli/configuration/cli/generate-salt.mjs"],"sourcesContent":["import * as pathFn from 'node:path';\nimport * as fsPromises from 'node:fs/promises';\nimport createSalt from '#createSalt';\nimport { configRoot } from '@yongdall/root';\n/** @import { Cli } from '@yongdall/cli-parse' */\n\n/**\n * \n * @param {Cli.Env} env \n */\nexport default async function ({ force }) {\n\n\tconst path = pathFn.resolve(configRoot, 'salt');\n\tif (!force && await fsPromises.stat(path).catch(() => null)) {\n\t\tconsole.error('salt 已经存在，如果希望重新生成，请添加 --force 参数');\n\t\tconsole.warn('[WARN] 重新生成将会导致所有用户退出登陆，并导致所有用户密码失效');\n\t\treturn;\n\t}\n\tconst key = await createSalt()\n\tawait fsPromises.writeFile(path, key);\n\tconsole.error('salt 生成完成');\n}\n"],"mappings":";;;;;;;;;;;AAUA,qCAA+B,EAAE,SAAS;CAEzC,MAAM,OAAO,OAAO,QAAQ,YAAY,OAAO;AAC/C,KAAI,CAAC,SAAS,MAAM,WAAW,KAAK,KAAK,CAAC,YAAY,KAAK,EAAE;AAC5D,UAAQ,MAAM,oCAAoC;AAClD,UAAQ,KAAK,sCAAsC;AACnD;;CAED,MAAM,MAAM,MAAM,YAAY;AAC9B,OAAM,WAAW,UAAU,MAAM,IAAI;AACrC,SAAQ,MAAM,YAAY"}

package/cli/yongdall.yml

@@ -0,0 +1,4 @@
+commands:
+  generate-salt: 
+    exec: ./generate-salt.mjs
+    description: 生成系统加密认证的盐值文件

package/createSalt.mjs

@@ -0,0 +1,19 @@
+import { generateKey } from "node:crypto";
+
+//#region cli/configuration/createSalt.mjs
+/**
+* 
+* @returns {Promise<Uint8Array<ArrayBuffer>>}
+*/
+async function createSalt() {
+	return new Promise((resolve, reject) => {
+		generateKey("hmac", { length: 512 }, (err, key) => {
+			if (err) return reject(err);
+			resolve(key.export());
+		});
+	});
+}
+
+//#endregion
+export { createSalt as default };
+//# sourceMappingURL=createSalt.mjs.map

package/createSalt.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"createSalt.mjs","names":[],"sources":["../../cli/configuration/createSalt.mjs"],"sourcesContent":["import { generateKey } from 'node:crypto';\n\n/**\n * \n * @returns {Promise<Uint8Array<ArrayBuffer>>}\n */\nexport default async function createSalt() {\n\treturn new Promise((resolve, reject) => {\n\t\tgenerateKey('hmac', { length: 512 }, (err, key) => {\n\t\t\tif (err) { return reject(err); }\n\t\t\tresolve(key.export());\n\t\t});\n\t});\n}\n"],"mappings":";;;;;;;AAMA,eAA8B,aAAa;AAC1C,QAAO,IAAI,SAAS,SAAS,WAAW;AACvC,cAAY,QAAQ,EAAE,QAAQ,KAAK,GAAG,KAAK,QAAQ;AAClD,OAAI,IAAO,QAAO,OAAO,IAAI;AAC7B,WAAQ,IAAI,QAAQ,CAAC;IACpB;GACD"}

package/generateSalt.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import * as pathFn from "node:path";
 import * as fsPromises from "node:fs/promises";
-import { generateKey } from "node:crypto";
+import createSalt from "#createSalt";
 import { configRoot } from "@yongdall/root";
 
 //#region cli/configuration/generateSalt.mjs
@@ -17,13 +17,7 @@ async function generateSalt(options) {
 		console.warn("[WARN] 重新生成将会导致所有用户退出登陆，并导致所有用户密码失效");
 		return;
 	}
-	/** @type {Uint8Array} */
-	const key = await new Promise((resolve, reject) => {
-		generateKey("hmac", { length: 512 }, (err, key) => {
-			if (err) return reject(err);
-			resolve(key.export());
-		});
-	});
+	const key = await createSalt();
 	await fsPromises.writeFile(path, key);
 	console.error("salt 生成完成");
 }

package/generateSalt.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"generateSalt.mjs","names":[],"sources":["../../cli/configuration/generateSalt.mjs"],"sourcesContent":["#!/usr/bin/env node\nimport * as pathFn from 'node:path';\nimport * as fsPromises from 'node:fs/promises';\nimport { generateKey } from 'node:crypto';\nimport { configRoot } from '@yongdall/root';\n\nconst path = pathFn.resolve(configRoot, 'salt');\n\n/**\n * \n * @param {string[]} options \n * @returns {Promise<void>}\n */\nexport default async function generateSalt(options) {\n\tconst force = options.includes('--force') || options.includes('-f');\n\tif (!force && await fsPromises.stat(path).catch(() => null)) {\n\t\tconsole.error('salt 已经存在，如果希望重新生成，请添加 --force 参数');\n\t\tconsole.warn('[WARN] 重新生成将会导致所有用户退出登陆，并导致所有用户密码失效');\n\t\treturn;\n\t}\n\t/** @type {Uint8Array} */\n\tconst key = await new Promise((resolve, reject) => {\n\t\tgenerateKey('hmac', { length: 512 }, (err, key) => {\n\t\t\tif (err) { return reject(err); }\n\t\t\tresolve(key.export());\n\t\t});\n\t});\n\tawait fsPromises.writeFile(path, key);\n\tconsole.error('salt 生成完成');\n}\ngenerateSalt(process.argv.slice(2));\n"],"mappings":";;;;;;;AAMA,MAAM,OAAO,OAAO,QAAQ,YAAY,OAAO;;;;;;AAO/C,eAA8B,aAAa,SAAS;AAEnD,KAAI,EADU,QAAQ,SAAS,UAAU,IAAI,QAAQ,SAAS,KAAK,KACrD,MAAM,WAAW,KAAK,KAAK,CAAC,YAAY,KAAK,EAAE;AAC5D,UAAQ,MAAM,oCAAoC;AAClD,UAAQ,KAAK,sCAAsC;AACnD;;;CAGD,MAAM,MAAM,MAAM,IAAI,SAAS,SAAS,WAAW;AAClD,cAAY,QAAQ,EAAE,QAAQ,KAAK,GAAG,KAAK,QAAQ;AAClD,OAAI,IAAO,QAAO,OAAO,IAAI;AAC7B,WAAQ,IAAI,QAAQ,CAAC;IACpB;GACD;AACF,OAAM,WAAW,UAAU,MAAM,IAAI;AACrC,SAAQ,MAAM,YAAY;;AAE3B,aAAa,QAAQ,KAAK,MAAM,EAAE,CAAC"}
+{"version":3,"file":"generateSalt.mjs","names":[],"sources":["../../cli/configuration/generateSalt.mjs"],"sourcesContent":["#!/usr/bin/env node\nimport * as pathFn from 'node:path';\nimport * as fsPromises from 'node:fs/promises';\nimport createSalt from '#createSalt';\nimport { configRoot } from '@yongdall/root';\n\nconst path = pathFn.resolve(configRoot, 'salt');\n\n/**\n * \n * @param {string[]} options \n * @returns {Promise<void>}\n */\nexport default async function generateSalt(options) {\n\tconst force = options.includes('--force') || options.includes('-f');\n\tif (!force && await fsPromises.stat(path).catch(() => null)) {\n\t\tconsole.error('salt 已经存在，如果希望重新生成，请添加 --force 参数');\n\t\tconsole.warn('[WARN] 重新生成将会导致所有用户退出登陆，并导致所有用户密码失效');\n\t\treturn;\n\t}\n\tconst key = await createSalt()\n\tawait fsPromises.writeFile(path, key);\n\tconsole.error('salt 生成完成');\n}\ngenerateSalt(process.argv.slice(2));\n"],"mappings":";;;;;;;AAMA,MAAM,OAAO,OAAO,QAAQ,YAAY,OAAO;;;;;;AAO/C,eAA8B,aAAa,SAAS;AAEnD,KAAI,EADU,QAAQ,SAAS,UAAU,IAAI,QAAQ,SAAS,KAAK,KACrD,MAAM,WAAW,KAAK,KAAK,CAAC,YAAY,KAAK,EAAE;AAC5D,UAAQ,MAAM,oCAAoC;AAClD,UAAQ,KAAK,sCAAsC;AACnD;;CAED,MAAM,MAAM,MAAM,YAAY;AAC9B,OAAM,WAAW,UAAU,MAAM,IAAI;AACrC,SAAQ,MAAM,YAAY;;AAE3B,aAAa,QAAQ,KAAK,MAAM,EAAE,CAAC"}

package/index.d.mts

@@ -2,12 +2,19 @@ import { Tenant } from "@yongdall/types";
 import { assetsRoot, configRoot, projectRoot } from "@yongdall/root";
 
 //#region cli/configuration/index.d.mts
+/**
+ * @template {object} T
+ * @param {string} name
+ * @returns {Promise<[string, T | null] | null>}
+ */
+declare function loadCfgWithPath<T extends object>(name: string): Promise<[string, T | null] | null>;
 /**
  * @template {object} T
  * @param {string} name
  * @returns {Promise<T | null>}
  */
 declare function loadCfg<T extends object>(name: string): Promise<T | null>;
+declare const configurationPath: string;
 /** @type {Omit<Tenant, 'id'>} */
 declare const tenant: Omit<Tenant, "id">;
 declare const boot: object;
@@ -41,4 +48,4 @@ declare namespace configuration {
   let plugins: Record<string, string | boolean> | undefined;
 }
 //#endregion
-export { Configuration, assetsRoot, boot, configRoot, configuration as default, loadCfg, projectRoot, tenant };
+export { Configuration, assetsRoot, boot, configRoot, configurationPath, configuration as default, loadCfg, loadCfgWithPath, projectRoot, tenant };

package/index.mjs

@@ -1,7 +1,7 @@
 import * as pathFn from "node:path";
 import * as fsPromises from "node:fs/promises";
-import { assetsRoot, configRoot, configRoot as configRoot$1, configurationPath, projectRoot } from "@yongdall/root";
-import loadConfiguration from "@yongdall/load-configuration";
+import { assetsRoot, configRoot, configRoot as configRoot$1, configurationPath as configurationPath$1, projectRoot } from "@yongdall/root";
+import loadConfiguration, { loadConfigurationWithPath } from "@yongdall/load-configuration";
 
 //#region cli/configuration/index.mjs
 /** @import { Tenant } from '@yongdall/types' */
@@ -13,8 +13,18 @@ import loadConfiguration from "@yongdall/load-configuration";
 * @prop {boolean} [single] 单用户模式
 * @prop {Record<string, string | boolean>} [plugins] 插件
 */
+const r = await loadConfigurationWithPath(configurationPath$1).catch(() => {});
+const configurationPath = r?.[0] || configurationPath$1;
 /** 全局配置 */
-const configuration = await loadConfiguration(configurationPath).catch(() => {}) || {};
+const configuration = r?.[1] || {};
+/**
+* @template {object} T
+* @param {string} name 
+* @returns {Promise<[string, T | null] | null>}
+*/
+async function loadCfgWithPath(name) {
+	return loadConfigurationWithPath(pathFn.resolve(configRoot$1, name));
+}
 /**
 * @template {object} T
 * @param {string} name 
@@ -34,5 +44,5 @@ const boot = await loadCfg("boot") || {};
 var configuration_default = configuration;
 
 //#endregion
-export { assetsRoot, boot, configRoot, configuration_default as default, loadCfg, projectRoot, tenant };
+export { assetsRoot, boot, configRoot, configurationPath, configuration_default as default, loadCfg, loadCfgWithPath, projectRoot, tenant };
 //# sourceMappingURL=index.mjs.map

package/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["configRoot"],"sources":["../../cli/configuration/index.mjs"],"sourcesContent":["import * as pathFn from 'node:path';\nimport * as fsPromises from 'node:fs/promises';\nimport loadConfiguration from '@yongdall/load-configuration';\nexport { projectRoot, configRoot, assetsRoot } from '@yongdall/root';\nimport { configurationPath, configRoot } from '@yongdall/root';\n/** @import { Tenant } from '@yongdall/types' */\n\n/**\n * @typedef {object} Configuration\n * @prop {string} [bootModule] 启动模块\n * @prop {string} [bootName] 启动模块配置名称\n * @prop {string} [title] 网站名称\n * @prop {boolean} [single] 单用户模式\n * @prop {Record<string, string | boolean>} [plugins] 插件\n */\n\n/** 全局配置 */\nconst configuration = /** @type {Configuration} */(\n\tawait loadConfiguration(configurationPath).catch(() => {}) || {}\n);\n\n\n/**\n * @template {object} T\n * @param {string} name \n * @returns {Promise<T | null>}\n */\nexport async function loadCfg(name) {\n\tlet path = pathFn.resolve(configRoot, name);\n\treturn loadConfiguration(path);\n}\n\n/** @type {Omit<Tenant, 'id'>} */\nexport const tenant = {\n\tlabel: configuration.title || '拥道YongDall',\n\tsingle: Boolean(configuration.single),\n\tproviders: await loadCfg('providers').catch(() => {}).then(v => /** @type {Record<string, string>} */(v || {})),\n\tsalt: await fsPromises.readFile(pathFn.resolve(configRoot, 'salt'))\n};\n\nexport const boot = await loadCfg('boot') || {};\n\nexport default configuration;\n"],"mappings":";;;;;;;;;;;;;;;;AAiBA,MAAM,gBACL,MAAM,kBAAkB,kBAAkB,CAAC,YAAY,GAAG,IAAI,EAAE;;;;;;AASjE,eAAsB,QAAQ,MAAM;AAEnC,QAAO,kBADI,OAAO,QAAQA,cAAY,KAAK,CACb;;;AAI/B,MAAa,SAAS;CACrB,OAAO,cAAc,SAAS;CAC9B,QAAQ,QAAQ,cAAc,OAAO;CACrC,WAAW,MAAM,QAAQ,YAAY,CAAC,YAAY,GAAG,CAAC,MAAK,MAA2C,KAAK,EAAE,CAAE;CAC/G,MAAM,MAAM,WAAW,SAAS,OAAO,QAAQA,cAAY,OAAO,CAAC;CACnE;AAED,MAAa,OAAO,MAAM,QAAQ,OAAO,IAAI,EAAE;AAE/C,4BAAe"}
+{"version":3,"file":"index.mjs","names":["linkPath","configRoot"],"sources":["../../cli/configuration/index.mjs"],"sourcesContent":["import * as pathFn from 'node:path';\nimport * as fsPromises from 'node:fs/promises';\nimport loadConfiguration, { loadConfigurationWithPath } from '@yongdall/load-configuration';\nexport { projectRoot, configRoot, assetsRoot } from '@yongdall/root';\nimport { configurationPath as linkPath, configRoot } from '@yongdall/root';\n/** @import { Tenant } from '@yongdall/types' */\n\n/**\n * @typedef {object} Configuration\n * @prop {string} [bootModule] 启动模块\n * @prop {string} [bootName] 启动模块配置名称\n * @prop {string} [title] 网站名称\n * @prop {boolean} [single] 单用户模式\n * @prop {Record<string, string | boolean>} [plugins] 插件\n */\nconst r = await loadConfigurationWithPath(linkPath).catch(() => {})\n\nexport const configurationPath = r?.[0] || linkPath;\n/** 全局配置 */\nconst configuration = /** @type {Configuration} */(r?.[1] || {});\n\n\n\n/**\n * @template {object} T\n * @param {string} name \n * @returns {Promise<[string, T | null] | null>}\n */\nexport async function loadCfgWithPath(name) {\n\tlet path = pathFn.resolve(configRoot, name);\n\treturn loadConfigurationWithPath(path);\n}\n\n\n/**\n * @template {object} T\n * @param {string} name \n * @returns {Promise<T | null>}\n */\nexport async function loadCfg(name) {\n\tlet path = pathFn.resolve(configRoot, name);\n\treturn loadConfiguration(path);\n}\n\n/** @type {Omit<Tenant, 'id'>} */\nexport const tenant = {\n\tlabel: configuration.title || '拥道YongDall',\n\tsingle: Boolean(configuration.single),\n\tproviders: await loadCfg('providers').catch(() => {}).then(v => /** @type {Record<string, string>} */(v || {})),\n\tsalt: await fsPromises.readFile(pathFn.resolve(configRoot, 'salt'))\n};\n\nexport const boot = await loadCfg('boot') || {};\n\nexport default configuration;\n"],"mappings":";;;;;;;;;;;;;;;AAeA,MAAM,IAAI,MAAM,0BAA0BA,oBAAS,CAAC,YAAY,GAAG;AAEnE,MAAa,oBAAoB,IAAI,MAAMA;;AAE3C,MAAM,gBAA6C,IAAI,MAAM,EAAE;;;;;;AAS/D,eAAsB,gBAAgB,MAAM;AAE3C,QAAO,0BADI,OAAO,QAAQC,cAAY,KAAK,CACL;;;;;;;AASvC,eAAsB,QAAQ,MAAM;AAEnC,QAAO,kBADI,OAAO,QAAQA,cAAY,KAAK,CACb;;;AAI/B,MAAa,SAAS;CACrB,OAAO,cAAc,SAAS;CAC9B,QAAQ,QAAQ,cAAc,OAAO;CACrC,WAAW,MAAM,QAAQ,YAAY,CAAC,YAAY,GAAG,CAAC,MAAK,MAA2C,KAAK,EAAE,CAAE;CAC/G,MAAM,MAAM,WAAW,SAAS,OAAO,QAAQA,cAAY,OAAO,CAAC;CACnE;AAED,MAAa,OAAO,MAAM,QAAQ,OAAO,IAAI,EAAE;AAE/C,4BAAe"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yongdall/configuration",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "type": "module",
   "bin": {
     "configuration.yongdall": "./bin.mjs",
@@ -8,14 +8,16 @@
   },
   "main": "./index.mjs",
   "imports": {
+    "#createSalt": "./createSalt.mjs",
     "#index": "./index.mjs"
   },
   "dependencies": {
-    "@yongdall/load-configuration": "^0.1.0",
-    "@yongdall/root": "^0.1.0"
+    "@yongdall/load-configuration": "^0.2.0",
+    "@yongdall/root": "^0.2.0"
   },
   "devDependencies": {
-    "@yongdall/types": "^0.1.0"
+    "@yongdall/cli-parse": "^0.2.0",
+    "@yongdall/types": "^0.2.0"
   },
   "exports": {
     ".": "./index.mjs"