express-file-cluster 0.3.7 → 0.3.9
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/auth/index.d.cts +1 -1
- package/dist/auth/index.d.ts +1 -1
- package/dist/{chunk-MQNVNOH5.cjs → chunk-DGVOJNR6.cjs} +14 -7
- package/dist/chunk-DGVOJNR6.cjs.map +1 -0
- package/dist/{chunk-LPZEKFVN.js → chunk-HBYSKULC.js} +9 -3
- package/dist/chunk-HBYSKULC.js.map +1 -0
- package/dist/{chunk-MZPG5HXL.js → chunk-KOHLLUN7.js} +13 -6
- package/dist/chunk-KOHLLUN7.js.map +1 -0
- package/dist/{chunk-XH7O25BL.cjs → chunk-TI24L4XE.cjs} +9 -3
- package/dist/chunk-TI24L4XE.cjs.map +1 -0
- package/dist/cli/index.cjs +2 -2
- package/dist/cli/index.js +1 -1
- package/dist/index.cjs +20 -12
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +22 -4
- package/dist/index.d.ts +22 -4
- package/dist/index.js +17 -9
- package/dist/index.js.map +1 -1
- package/dist/tasks/index.cjs +4 -2
- package/dist/tasks/index.cjs.map +1 -1
- package/dist/tasks/index.d.cts +14 -2
- package/dist/tasks/index.d.ts +14 -2
- package/dist/tasks/index.js +3 -1
- package/dist/{types-Df0jLGwr.d.cts → types-BEL3naBt.d.cts} +1 -1
- package/dist/{types-Df0jLGwr.d.ts → types-BEL3naBt.d.ts} +1 -1
- package/package.json +1 -1
- package/dist/chunk-LPZEKFVN.js.map +0 -1
- package/dist/chunk-MQNVNOH5.cjs.map +0 -1
- package/dist/chunk-MZPG5HXL.js.map +0 -1
- package/dist/chunk-XH7O25BL.cjs.map +0 -1
package/dist/auth/index.d.cts
CHANGED
package/dist/auth/index.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }// src/router/scan.ts
|
|
1
|
+
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }// src/router/scan.ts
|
|
2
2
|
var _fs = require('fs'); var _fs2 = _interopRequireDefault(_fs);
|
|
3
3
|
var _path = require('path'); var _path2 = _interopRequireDefault(_path);
|
|
4
4
|
var ROUTE_FILE_RE = /\.(ts|js|mts|mjs|cts|cjs)$/;
|
|
5
5
|
var DYNAMIC_SEGMENT_RE = /\[([^\]]+)\]/g;
|
|
6
|
+
var DEFAULT_MAX_DEPTH = 10;
|
|
6
7
|
function filePathToUrlPath(relativePath) {
|
|
7
8
|
let p = relativePath.replace(ROUTE_FILE_RE, "");
|
|
8
9
|
p = p.replace(/\/index$/, "");
|
|
@@ -18,14 +19,21 @@ function extractParams(relativePath) {
|
|
|
18
19
|
}
|
|
19
20
|
return params;
|
|
20
21
|
}
|
|
21
|
-
function
|
|
22
|
+
function dynamicSegmentCount(urlPath) {
|
|
23
|
+
return (_nullishCoalesce(urlPath.match(/:/g), () => ( []))).length;
|
|
24
|
+
}
|
|
25
|
+
function scanDir(dir, base = dir, maxDepth = DEFAULT_MAX_DEPTH, _depth = 0) {
|
|
22
26
|
if (!_fs2.default.existsSync(dir)) return [];
|
|
27
|
+
if (_depth > maxDepth) {
|
|
28
|
+
console.warn(`[EFC] scanDir: max depth (${maxDepth}) reached at ${dir}, skipping subtree`);
|
|
29
|
+
return [];
|
|
30
|
+
}
|
|
23
31
|
const entries = [];
|
|
24
32
|
const items = _fs2.default.readdirSync(dir, { withFileTypes: true });
|
|
25
33
|
for (const item of items) {
|
|
26
34
|
const fullPath = _path2.default.join(dir, item.name);
|
|
27
35
|
if (item.isDirectory()) {
|
|
28
|
-
entries.push(...scanDir(fullPath, base));
|
|
36
|
+
entries.push(...scanDir(fullPath, base, maxDepth, _depth + 1));
|
|
29
37
|
} else if (ROUTE_FILE_RE.test(item.name)) {
|
|
30
38
|
const relative = "/" + _path2.default.relative(base, fullPath).replace(/\\/g, "/");
|
|
31
39
|
entries.push({
|
|
@@ -36,13 +44,12 @@ function scanDir(dir, base = dir) {
|
|
|
36
44
|
}
|
|
37
45
|
}
|
|
38
46
|
return entries.sort((a, b) => {
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
return aDynamic - bDynamic || a.urlPath.localeCompare(b.urlPath);
|
|
47
|
+
const diff = dynamicSegmentCount(a.urlPath) - dynamicSegmentCount(b.urlPath);
|
|
48
|
+
return diff !== 0 ? diff : a.urlPath.localeCompare(b.urlPath);
|
|
42
49
|
});
|
|
43
50
|
}
|
|
44
51
|
|
|
45
52
|
|
|
46
53
|
|
|
47
54
|
exports.scanDir = scanDir;
|
|
48
|
-
//# sourceMappingURL=chunk-
|
|
55
|
+
//# sourceMappingURL=chunk-DGVOJNR6.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["/home/runner/work/efc.js/efc.js/packages/core/dist/chunk-DGVOJNR6.cjs","../src/router/scan.ts"],"names":[],"mappings":"AAAA;ACAA,gEAAe;AACf,wEAAiB;AAGjB,IAAM,cAAA,EAAgB,4BAAA;AACtB,IAAM,mBAAA,EAAqB,eAAA;AAG3B,IAAM,kBAAA,EAAoB,EAAA;AAE1B,SAAS,iBAAA,CAAkB,YAAA,EAA8B;AACvD,EAAA,IAAI,EAAA,EAAI,YAAA,CAAa,OAAA,CAAQ,aAAA,EAAe,EAAE,CAAA;AAE9C,EAAA,EAAA,EAAI,CAAA,CAAE,OAAA,CAAQ,UAAA,EAAY,EAAE,CAAA;AAE5B,EAAA,EAAA,EAAI,CAAA,CAAE,OAAA,CAAQ,kBAAA,EAAoB,KAAK,CAAA;AACvC,EAAA,OAAO,EAAA,IAAM,GAAA,EAAK,IAAA,EAAM,CAAA,CAAE,UAAA,CAAW,GAAG,EAAA,EAAI,EAAA,EAAI,CAAA,CAAA,EAAI,CAAC,CAAA,CAAA;AACvD;AAEuD;AAC3B,EAAA;AACtB,EAAA;AACgD,EAAA;AACH,EAAA;AACb,IAAA;AACpC,EAAA;AACO,EAAA;AACT;AAGsD;AACjB,EAAA;AACrC;AAgBqB;AAGc,EAAA;AACV,EAAA;AAC6B,IAAA;AAC1C,IAAA;AACV,EAAA;AAE+B,EAAA;AACoB,EAAA;AAEzB,EAAA;AACiB,IAAA;AACjB,IAAA;AAC4B,MAAA;AACV,IAAA;AACG,MAAA;AAC9B,MAAA;AACwB,QAAA;AACzB,QAAA;AACoB,QAAA;AAC/B,MAAA;AACH,IAAA;AACF,EAAA;AAG8B,EAAA;AACkB,IAAA;AACK,IAAA;AACpD,EAAA;AACH;AD7BwD;AACA;AACA;AACA","file":"/home/runner/work/efc.js/efc.js/packages/core/dist/chunk-DGVOJNR6.cjs","sourcesContent":[null,"import fs from 'node:fs';\nimport path from 'node:path';\nimport type { RouteEntry } from '../types.js';\n\nconst ROUTE_FILE_RE = /\\.(ts|js|mts|mjs|cts|cjs)$/;\nconst DYNAMIC_SEGMENT_RE = /\\[([^\\]]+)\\]/g;\n\n/** Maximum directory depth scanDir will recurse into by default. */\nconst DEFAULT_MAX_DEPTH = 10;\n\nfunction filePathToUrlPath(relativePath: string): string {\n let p = relativePath.replace(ROUTE_FILE_RE, '');\n // index files map to parent path\n p = p.replace(/\\/index$/, '');\n // [param] → :param\n p = p.replace(DYNAMIC_SEGMENT_RE, ':$1');\n return p === '' ? '/' : p.startsWith('/') ? p : `/${p}`;\n}\n\nfunction extractParams(relativePath: string): string[] {\n const params: string[] = [];\n let match: RegExpExecArray | null;\n const re = new RegExp(DYNAMIC_SEGMENT_RE.source, 'g');\n while ((match = re.exec(relativePath)) !== null) {\n if (match[1]) params.push(match[1]);\n }\n return params;\n}\n\n/** Count how many dynamic (`:param`) segments a URL path has. */\nfunction dynamicSegmentCount(urlPath: string): number {\n return (urlPath.match(/:/g) ?? []).length;\n}\n\n/**\n * Recursively scans `dir` for route files and returns a sorted list of\n * `RouteEntry` objects. Static routes are always placed before dynamic ones;\n * within the same dynamic-segment count routes are sorted alphabetically.\n *\n * @param dir - Root directory to scan (must exist).\n * @param base - Base directory used to derive relative URL paths; defaults to `dir`.\n * @param maxDepth - Maximum recursion depth (default: 10). Guards against\n * circular symlinks or unexpectedly deep directory trees.\n * @param _depth - Internal current depth counter — do not pass externally.\n */\nexport function scanDir(\n dir: string,\n base: string = dir,\n maxDepth: number = DEFAULT_MAX_DEPTH,\n _depth: number = 0,\n): RouteEntry[] {\n if (!fs.existsSync(dir)) return [];\n if (_depth > maxDepth) {\n console.warn(`[EFC] scanDir: max depth (${maxDepth}) reached at ${dir}, skipping subtree`);\n return [];\n }\n\n const entries: RouteEntry[] = [];\n const items = fs.readdirSync(dir, { withFileTypes: true });\n\n for (const item of items) {\n const fullPath = path.join(dir, item.name);\n if (item.isDirectory()) {\n entries.push(...scanDir(fullPath, base, maxDepth, _depth + 1));\n } else if (ROUTE_FILE_RE.test(item.name)) {\n const relative = '/' + path.relative(base, fullPath).replace(/\\\\/g, '/');\n entries.push({\n urlPath: filePathToUrlPath(relative),\n filePath: fullPath,\n params: extractParams(relative),\n });\n }\n }\n\n // Sort: fewer dynamic segments first; ties broken alphabetically.\n return entries.sort((a, b) => {\n const diff = dynamicSegmentCount(a.urlPath) - dynamicSegmentCount(b.urlPath);\n return diff !== 0 ? diff : a.urlPath.localeCompare(b.urlPath);\n });\n}\n\nexport { filePathToUrlPath };\n"]}
|
|
@@ -22,19 +22,25 @@ function setEnqueueImpl(impl) {
|
|
|
22
22
|
}
|
|
23
23
|
async function enqueue(name, payload) {
|
|
24
24
|
if (!_impl) {
|
|
25
|
-
throw new Error(
|
|
25
|
+
throw new Error(
|
|
26
|
+
`[EFC] Cannot enqueue task "${name}": task queue not initialised. Set tasks.backend in ignite() config.`
|
|
27
|
+
);
|
|
26
28
|
}
|
|
27
29
|
return _impl(name, payload);
|
|
28
30
|
}
|
|
29
31
|
function registerTask(name, def) {
|
|
30
32
|
taskRegistry.set(name, { ...def, name });
|
|
31
33
|
}
|
|
34
|
+
function listTasks() {
|
|
35
|
+
return Array.from(taskRegistry.values()).map(({ name, options }) => ({ name, options }));
|
|
36
|
+
}
|
|
32
37
|
|
|
33
38
|
export {
|
|
34
39
|
taskRegistry,
|
|
35
40
|
defineTask,
|
|
36
41
|
setEnqueueImpl,
|
|
37
42
|
enqueue,
|
|
38
|
-
registerTask
|
|
43
|
+
registerTask,
|
|
44
|
+
listTasks
|
|
39
45
|
};
|
|
40
|
-
//# sourceMappingURL=chunk-
|
|
46
|
+
//# sourceMappingURL=chunk-HBYSKULC.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/tasks/index.ts"],"sourcesContent":["import type { TaskDefinition, TaskOptions } from '../types.js';\n\nexport const taskRegistry = new Map<string, TaskDefinition>();\n\ntype HandlerFn<T> = (payload: T) => Promise<void>;\ntype DefineTaskOverload = {\n <T>(handler: HandlerFn<T>): TaskDefinition<T>;\n <T>(options: TaskOptions, handler: HandlerFn<T>): TaskDefinition<T>;\n};\n\nexport const defineTask: DefineTaskOverload = <T>(\n handlerOrOptions: HandlerFn<T> | TaskOptions,\n maybeHandler?: HandlerFn<T>,\n): TaskDefinition<T> => {\n let options: TaskOptions = {};\n let handler: HandlerFn<T>;\n\n if (typeof handlerOrOptions === 'function') {\n handler = handlerOrOptions;\n } else {\n options = handlerOrOptions;\n if (!maybeHandler) throw new Error('[EFC] defineTask: handler function is required');\n handler = maybeHandler;\n }\n\n return {\n handler: handler as (payload: unknown) => Promise<void>,\n options,\n name: '',\n };\n};\n\ntype EnqueueImpl = (name: string, payload: unknown) => Promise<void>;\nlet _impl: EnqueueImpl | null = null;\n\nexport function setEnqueueImpl(impl: EnqueueImpl): void {\n _impl = impl;\n}\n\nexport async function enqueue<T>(name: string, payload: T): Promise<void> {\n if (!_impl) {\n throw new Error(\n `[EFC] Cannot enqueue task \"${name}\": task queue not initialised. Set tasks.backend in ignite() config.`,\n );\n }\n return _impl(name, payload as unknown);\n}\n\nexport function registerTask(name: string, def: TaskDefinition): void {\n taskRegistry.set(name, { ...def, name });\n}\n\n/**\n * Returns a read-only snapshot of all registered tasks.\n * Each entry contains the task name and its configured options.\n *\n * @example\n * const tasks = listTasks();\n * console.log(tasks.map(t => t.name));\n */\nexport function listTasks(): ReadonlyArray<{ name: string; options: TaskOptions }> {\n return Array.from(taskRegistry.values()).map(({ name, options }) => ({ name, options }));\n}\n"],"mappings":";AAEO,IAAM,eAAe,oBAAI,IAA4B;AAQrD,IAAM,aAAiC,CAC5C,kBACA,iBACsB;AACtB,MAAI,UAAuB,CAAC;AAC5B,MAAI;AAEJ,MAAI,OAAO,qBAAqB,YAAY;AAC1C,cAAU;AAAA,EACZ,OAAO;AACL,cAAU;AACV,QAAI,CAAC,aAAc,OAAM,IAAI,MAAM,gDAAgD;AACnF,cAAU;AAAA,EACZ;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA,MAAM;AAAA,EACR;AACF;AAGA,IAAI,QAA4B;AAEzB,SAAS,eAAe,MAAyB;AACtD,UAAQ;AACV;AAEA,eAAsB,QAAW,MAAc,SAA2B;AACxE,MAAI,CAAC,OAAO;AACV,UAAM,IAAI;AAAA,MACR,8BAA8B,IAAI;AAAA,IACpC;AAAA,EACF;AACA,SAAO,MAAM,MAAM,OAAkB;AACvC;AAEO,SAAS,aAAa,MAAc,KAA2B;AACpE,eAAa,IAAI,MAAM,EAAE,GAAG,KAAK,KAAK,CAAC;AACzC;AAUO,SAAS,YAAmE;AACjF,SAAO,MAAM,KAAK,aAAa,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,QAAQ,OAAO,EAAE,MAAM,QAAQ,EAAE;AACzF;","names":[]}
|
|
@@ -3,6 +3,7 @@ import fs from "fs";
|
|
|
3
3
|
import path from "path";
|
|
4
4
|
var ROUTE_FILE_RE = /\.(ts|js|mts|mjs|cts|cjs)$/;
|
|
5
5
|
var DYNAMIC_SEGMENT_RE = /\[([^\]]+)\]/g;
|
|
6
|
+
var DEFAULT_MAX_DEPTH = 10;
|
|
6
7
|
function filePathToUrlPath(relativePath) {
|
|
7
8
|
let p = relativePath.replace(ROUTE_FILE_RE, "");
|
|
8
9
|
p = p.replace(/\/index$/, "");
|
|
@@ -18,14 +19,21 @@ function extractParams(relativePath) {
|
|
|
18
19
|
}
|
|
19
20
|
return params;
|
|
20
21
|
}
|
|
21
|
-
function
|
|
22
|
+
function dynamicSegmentCount(urlPath) {
|
|
23
|
+
return (urlPath.match(/:/g) ?? []).length;
|
|
24
|
+
}
|
|
25
|
+
function scanDir(dir, base = dir, maxDepth = DEFAULT_MAX_DEPTH, _depth = 0) {
|
|
22
26
|
if (!fs.existsSync(dir)) return [];
|
|
27
|
+
if (_depth > maxDepth) {
|
|
28
|
+
console.warn(`[EFC] scanDir: max depth (${maxDepth}) reached at ${dir}, skipping subtree`);
|
|
29
|
+
return [];
|
|
30
|
+
}
|
|
23
31
|
const entries = [];
|
|
24
32
|
const items = fs.readdirSync(dir, { withFileTypes: true });
|
|
25
33
|
for (const item of items) {
|
|
26
34
|
const fullPath = path.join(dir, item.name);
|
|
27
35
|
if (item.isDirectory()) {
|
|
28
|
-
entries.push(...scanDir(fullPath, base));
|
|
36
|
+
entries.push(...scanDir(fullPath, base, maxDepth, _depth + 1));
|
|
29
37
|
} else if (ROUTE_FILE_RE.test(item.name)) {
|
|
30
38
|
const relative = "/" + path.relative(base, fullPath).replace(/\\/g, "/");
|
|
31
39
|
entries.push({
|
|
@@ -36,13 +44,12 @@ function scanDir(dir, base = dir) {
|
|
|
36
44
|
}
|
|
37
45
|
}
|
|
38
46
|
return entries.sort((a, b) => {
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
return aDynamic - bDynamic || a.urlPath.localeCompare(b.urlPath);
|
|
47
|
+
const diff = dynamicSegmentCount(a.urlPath) - dynamicSegmentCount(b.urlPath);
|
|
48
|
+
return diff !== 0 ? diff : a.urlPath.localeCompare(b.urlPath);
|
|
42
49
|
});
|
|
43
50
|
}
|
|
44
51
|
|
|
45
52
|
export {
|
|
46
53
|
scanDir
|
|
47
54
|
};
|
|
48
|
-
//# sourceMappingURL=chunk-
|
|
55
|
+
//# sourceMappingURL=chunk-KOHLLUN7.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/router/scan.ts"],"sourcesContent":["import fs from 'node:fs';\nimport path from 'node:path';\nimport type { RouteEntry } from '../types.js';\n\nconst ROUTE_FILE_RE = /\\.(ts|js|mts|mjs|cts|cjs)$/;\nconst DYNAMIC_SEGMENT_RE = /\\[([^\\]]+)\\]/g;\n\n/** Maximum directory depth scanDir will recurse into by default. */\nconst DEFAULT_MAX_DEPTH = 10;\n\nfunction filePathToUrlPath(relativePath: string): string {\n let p = relativePath.replace(ROUTE_FILE_RE, '');\n // index files map to parent path\n p = p.replace(/\\/index$/, '');\n // [param] → :param\n p = p.replace(DYNAMIC_SEGMENT_RE, ':$1');\n return p === '' ? '/' : p.startsWith('/') ? p : `/${p}`;\n}\n\nfunction extractParams(relativePath: string): string[] {\n const params: string[] = [];\n let match: RegExpExecArray | null;\n const re = new RegExp(DYNAMIC_SEGMENT_RE.source, 'g');\n while ((match = re.exec(relativePath)) !== null) {\n if (match[1]) params.push(match[1]);\n }\n return params;\n}\n\n/** Count how many dynamic (`:param`) segments a URL path has. */\nfunction dynamicSegmentCount(urlPath: string): number {\n return (urlPath.match(/:/g) ?? []).length;\n}\n\n/**\n * Recursively scans `dir` for route files and returns a sorted list of\n * `RouteEntry` objects. Static routes are always placed before dynamic ones;\n * within the same dynamic-segment count routes are sorted alphabetically.\n *\n * @param dir - Root directory to scan (must exist).\n * @param base - Base directory used to derive relative URL paths; defaults to `dir`.\n * @param maxDepth - Maximum recursion depth (default: 10). Guards against\n * circular symlinks or unexpectedly deep directory trees.\n * @param _depth - Internal current depth counter — do not pass externally.\n */\nexport function scanDir(\n dir: string,\n base: string = dir,\n maxDepth: number = DEFAULT_MAX_DEPTH,\n _depth: number = 0,\n): RouteEntry[] {\n if (!fs.existsSync(dir)) return [];\n if (_depth > maxDepth) {\n console.warn(`[EFC] scanDir: max depth (${maxDepth}) reached at ${dir}, skipping subtree`);\n return [];\n }\n\n const entries: RouteEntry[] = [];\n const items = fs.readdirSync(dir, { withFileTypes: true });\n\n for (const item of items) {\n const fullPath = path.join(dir, item.name);\n if (item.isDirectory()) {\n entries.push(...scanDir(fullPath, base, maxDepth, _depth + 1));\n } else if (ROUTE_FILE_RE.test(item.name)) {\n const relative = '/' + path.relative(base, fullPath).replace(/\\\\/g, '/');\n entries.push({\n urlPath: filePathToUrlPath(relative),\n filePath: fullPath,\n params: extractParams(relative),\n });\n }\n }\n\n // Sort: fewer dynamic segments first; ties broken alphabetically.\n return entries.sort((a, b) => {\n const diff = dynamicSegmentCount(a.urlPath) - dynamicSegmentCount(b.urlPath);\n return diff !== 0 ? diff : a.urlPath.localeCompare(b.urlPath);\n });\n}\n\nexport { filePathToUrlPath };\n"],"mappings":";AAAA,OAAO,QAAQ;AACf,OAAO,UAAU;AAGjB,IAAM,gBAAgB;AACtB,IAAM,qBAAqB;AAG3B,IAAM,oBAAoB;AAE1B,SAAS,kBAAkB,cAA8B;AACvD,MAAI,IAAI,aAAa,QAAQ,eAAe,EAAE;AAE9C,MAAI,EAAE,QAAQ,YAAY,EAAE;AAE5B,MAAI,EAAE,QAAQ,oBAAoB,KAAK;AACvC,SAAO,MAAM,KAAK,MAAM,EAAE,WAAW,GAAG,IAAI,IAAI,IAAI,CAAC;AACvD;AAEA,SAAS,cAAc,cAAgC;AACrD,QAAM,SAAmB,CAAC;AAC1B,MAAI;AACJ,QAAM,KAAK,IAAI,OAAO,mBAAmB,QAAQ,GAAG;AACpD,UAAQ,QAAQ,GAAG,KAAK,YAAY,OAAO,MAAM;AAC/C,QAAI,MAAM,CAAC,EAAG,QAAO,KAAK,MAAM,CAAC,CAAC;AAAA,EACpC;AACA,SAAO;AACT;AAGA,SAAS,oBAAoB,SAAyB;AACpD,UAAQ,QAAQ,MAAM,IAAI,KAAK,CAAC,GAAG;AACrC;AAaO,SAAS,QACd,KACA,OAAe,KACf,WAAmB,mBACnB,SAAiB,GACH;AACd,MAAI,CAAC,GAAG,WAAW,GAAG,EAAG,QAAO,CAAC;AACjC,MAAI,SAAS,UAAU;AACrB,YAAQ,KAAK,6BAA6B,QAAQ,gBAAgB,GAAG,oBAAoB;AACzF,WAAO,CAAC;AAAA,EACV;AAEA,QAAM,UAAwB,CAAC;AAC/B,QAAM,QAAQ,GAAG,YAAY,KAAK,EAAE,eAAe,KAAK,CAAC;AAEzD,aAAW,QAAQ,OAAO;AACxB,UAAM,WAAW,KAAK,KAAK,KAAK,KAAK,IAAI;AACzC,QAAI,KAAK,YAAY,GAAG;AACtB,cAAQ,KAAK,GAAG,QAAQ,UAAU,MAAM,UAAU,SAAS,CAAC,CAAC;AAAA,IAC/D,WAAW,cAAc,KAAK,KAAK,IAAI,GAAG;AACxC,YAAM,WAAW,MAAM,KAAK,SAAS,MAAM,QAAQ,EAAE,QAAQ,OAAO,GAAG;AACvE,cAAQ,KAAK;AAAA,QACX,SAAS,kBAAkB,QAAQ;AAAA,QACnC,UAAU;AAAA,QACV,QAAQ,cAAc,QAAQ;AAAA,MAChC,CAAC;AAAA,IACH;AAAA,EACF;AAGA,SAAO,QAAQ,KAAK,CAAC,GAAG,MAAM;AAC5B,UAAM,OAAO,oBAAoB,EAAE,OAAO,IAAI,oBAAoB,EAAE,OAAO;AAC3E,WAAO,SAAS,IAAI,OAAO,EAAE,QAAQ,cAAc,EAAE,OAAO;AAAA,EAC9D,CAAC;AACH;","names":[]}
|
|
@@ -22,13 +22,19 @@ function setEnqueueImpl(impl) {
|
|
|
22
22
|
}
|
|
23
23
|
async function enqueue(name, payload) {
|
|
24
24
|
if (!_impl) {
|
|
25
|
-
throw new Error(
|
|
25
|
+
throw new Error(
|
|
26
|
+
`[EFC] Cannot enqueue task "${name}": task queue not initialised. Set tasks.backend in ignite() config.`
|
|
27
|
+
);
|
|
26
28
|
}
|
|
27
29
|
return _impl(name, payload);
|
|
28
30
|
}
|
|
29
31
|
function registerTask(name, def) {
|
|
30
32
|
taskRegistry.set(name, { ...def, name });
|
|
31
33
|
}
|
|
34
|
+
function listTasks() {
|
|
35
|
+
return Array.from(taskRegistry.values()).map(({ name, options }) => ({ name, options }));
|
|
36
|
+
}
|
|
37
|
+
|
|
32
38
|
|
|
33
39
|
|
|
34
40
|
|
|
@@ -36,5 +42,5 @@ function registerTask(name, def) {
|
|
|
36
42
|
|
|
37
43
|
|
|
38
44
|
|
|
39
|
-
exports.taskRegistry = taskRegistry; exports.defineTask = defineTask; exports.setEnqueueImpl = setEnqueueImpl; exports.enqueue = enqueue; exports.registerTask = registerTask;
|
|
40
|
-
//# sourceMappingURL=chunk-
|
|
45
|
+
exports.taskRegistry = taskRegistry; exports.defineTask = defineTask; exports.setEnqueueImpl = setEnqueueImpl; exports.enqueue = enqueue; exports.registerTask = registerTask; exports.listTasks = listTasks;
|
|
46
|
+
//# sourceMappingURL=chunk-TI24L4XE.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["/home/runner/work/efc.js/efc.js/packages/core/dist/chunk-TI24L4XE.cjs","../src/tasks/index.ts"],"names":[],"mappings":"AAAA;ACEO,IAAM,aAAA,kBAAe,IAAI,GAAA,CAA4B,CAAA;AAQrD,IAAM,WAAA,EAAiC,CAC5C,gBAAA,EACA,YAAA,EAAA,GACsB;AACtB,EAAA,IAAI,QAAA,EAAuB,CAAC,CAAA;AAC5B,EAAA,IAAI,OAAA;AAEJ,EAAA,GAAA,CAAI,OAAO,iBAAA,IAAqB,UAAA,EAAY;AAC1C,IAAA,QAAA,EAAU,gBAAA;AAAA,EACZ,EAAA,KAAO;AACL,IAAA,QAAA,EAAU,gBAAA;AACV,IAAA,GAAA,CAAI,CAAC,YAAA,EAAc,MAAM,IAAI,KAAA,CAAM,gDAAgD,CAAA;AACnF,IAAA,QAAA,EAAU,YAAA;AAAA,EACZ;AAEA,EAAA,OAAO;AAAA,IACL,OAAA;AAAA,IACA,OAAA;AAAA,IACA,IAAA,EAAM;AAAA,EACR,CAAA;AACF,CAAA;AAGA,IAAI,MAAA,EAA4B,IAAA;AAEzB,SAAS,cAAA,CAAe,IAAA,EAAyB;AACtD,EAAA,MAAA,EAAQ,IAAA;AACV;AAEA,MAAA,SAAsB,OAAA,CAAW,IAAA,EAAc,OAAA,EAA2B;AACxE,EAAA,GAAA,CAAI,CAAC,KAAA,EAAO;AACV,IAAA,MAAM,IAAI,KAAA;AAAA,MACR,CAAA,2BAAA,EAA8B,IAAI,CAAA,oEAAA;AAAA,IACpC,CAAA;AAAA,EACF;AACA,EAAA,OAAO,KAAA,CAAM,IAAA,EAAM,OAAkB,CAAA;AACvC;AAEO,SAAS,YAAA,CAAa,IAAA,EAAc,GAAA,EAA2B;AACpE,EAAA,YAAA,CAAa,GAAA,CAAI,IAAA,EAAM,EAAE,GAAG,GAAA,EAAK,KAAK,CAAC,CAAA;AACzC;AAUO,SAAS,SAAA,CAAA,EAAmE;AACjF,EAAA,OAAO,KAAA,CAAM,IAAA,CAAK,YAAA,CAAa,MAAA,CAAO,CAAC,CAAA,CAAE,GAAA,CAAI,CAAC,EAAE,IAAA,EAAM,QAAQ,CAAA,EAAA,GAAA,CAAO,EAAE,IAAA,EAAM,QAAQ,CAAA,CAAE,CAAA;AACzF;AD1BA;AACA;AACE;AACA;AACA;AACA;AACA;AACA;AACF,6MAAC","file":"/home/runner/work/efc.js/efc.js/packages/core/dist/chunk-TI24L4XE.cjs","sourcesContent":[null,"import type { TaskDefinition, TaskOptions } from '../types.js';\n\nexport const taskRegistry = new Map<string, TaskDefinition>();\n\ntype HandlerFn<T> = (payload: T) => Promise<void>;\ntype DefineTaskOverload = {\n <T>(handler: HandlerFn<T>): TaskDefinition<T>;\n <T>(options: TaskOptions, handler: HandlerFn<T>): TaskDefinition<T>;\n};\n\nexport const defineTask: DefineTaskOverload = <T>(\n handlerOrOptions: HandlerFn<T> | TaskOptions,\n maybeHandler?: HandlerFn<T>,\n): TaskDefinition<T> => {\n let options: TaskOptions = {};\n let handler: HandlerFn<T>;\n\n if (typeof handlerOrOptions === 'function') {\n handler = handlerOrOptions;\n } else {\n options = handlerOrOptions;\n if (!maybeHandler) throw new Error('[EFC] defineTask: handler function is required');\n handler = maybeHandler;\n }\n\n return {\n handler: handler as (payload: unknown) => Promise<void>,\n options,\n name: '',\n };\n};\n\ntype EnqueueImpl = (name: string, payload: unknown) => Promise<void>;\nlet _impl: EnqueueImpl | null = null;\n\nexport function setEnqueueImpl(impl: EnqueueImpl): void {\n _impl = impl;\n}\n\nexport async function enqueue<T>(name: string, payload: T): Promise<void> {\n if (!_impl) {\n throw new Error(\n `[EFC] Cannot enqueue task \"${name}\": task queue not initialised. Set tasks.backend in ignite() config.`,\n );\n }\n return _impl(name, payload as unknown);\n}\n\nexport function registerTask(name: string, def: TaskDefinition): void {\n taskRegistry.set(name, { ...def, name });\n}\n\n/**\n * Returns a read-only snapshot of all registered tasks.\n * Each entry contains the task name and its configured options.\n *\n * @example\n * const tasks = listTasks();\n * console.log(tasks.map(t => t.name));\n */\nexport function listTasks(): ReadonlyArray<{ name: string; options: TaskOptions }> {\n return Array.from(taskRegistry.values()).map(({ name, options }) => ({ name, options }));\n}\n"]}
|
package/dist/cli/index.cjs
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
"use strict"; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
|
|
3
3
|
|
|
4
|
-
var
|
|
4
|
+
var _chunkDGVOJNR6cjs = require('../chunk-DGVOJNR6.cjs');
|
|
5
5
|
|
|
6
6
|
// src/cli/index.ts
|
|
7
7
|
var _commander = require('commander');
|
|
@@ -343,7 +343,7 @@ function routesCommand() {
|
|
|
343
343
|
console.error(_picocolors2.default.red("[EFC] Could not find apiDir (expected src/api)"));
|
|
344
344
|
process.exit(1);
|
|
345
345
|
}
|
|
346
|
-
const routes =
|
|
346
|
+
const routes = _chunkDGVOJNR6cjs.scanDir.call(void 0, apiDir);
|
|
347
347
|
if (routes.length === 0) {
|
|
348
348
|
console.log(_picocolors2.default.yellow("No routes found."));
|
|
349
349
|
return;
|
package/dist/cli/index.js
CHANGED
package/dist/index.cjs
CHANGED
|
@@ -5,10 +5,11 @@ var _chunkQOKLEPTXcjs = require('./chunk-QOKLEPTX.cjs');
|
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
|
|
8
|
-
var _chunkXH7O25BLcjs = require('./chunk-XH7O25BL.cjs');
|
|
9
8
|
|
|
9
|
+
var _chunkTI24L4XEcjs = require('./chunk-TI24L4XE.cjs');
|
|
10
10
|
|
|
11
|
-
|
|
11
|
+
|
|
12
|
+
var _chunkDGVOJNR6cjs = require('./chunk-DGVOJNR6.cjs');
|
|
12
13
|
|
|
13
14
|
// src/index.ts
|
|
14
15
|
var _fs = require('fs'); var _fs2 = _interopRequireDefault(_fs);
|
|
@@ -64,14 +65,16 @@ async function mountRoutes(app, routes) {
|
|
|
64
65
|
|
|
65
66
|
// src/cluster/index.ts
|
|
66
67
|
|
|
67
|
-
|
|
68
68
|
var isShuttingDown = false;
|
|
69
|
+
function workerCount() {
|
|
70
|
+
return Object.keys(_nullishCoalesce(_cluster2.default.workers, () => ( {}))).length;
|
|
71
|
+
}
|
|
69
72
|
function shutdownMaster() {
|
|
70
73
|
isShuttingDown = true;
|
|
71
|
-
console.log(
|
|
74
|
+
console.log(`[EFC] Cluster master (pid=${process.pid}) shutting down, waiting for workers\u2026`);
|
|
72
75
|
}
|
|
73
76
|
function runMaster(options = {}) {
|
|
74
|
-
const count = _nullishCoalesce(options.workers, () => (
|
|
77
|
+
const count = _nullishCoalesce(options.workers, () => ( 1));
|
|
75
78
|
console.log(`[EFC] Primary ${process.pid} starting ${count} workers`);
|
|
76
79
|
for (let i = 0; i < count; i++) {
|
|
77
80
|
_cluster2.default.fork();
|
|
@@ -83,7 +86,7 @@ function runMaster(options = {}) {
|
|
|
83
86
|
const exitCode = _nullishCoalesce(code, () => ( (signal ? -1 : 0)));
|
|
84
87
|
if (isShuttingDown) {
|
|
85
88
|
console.log(`[EFC] Worker ${worker.id} gracefully exited`);
|
|
86
|
-
if (
|
|
89
|
+
if (workerCount() === 0) {
|
|
87
90
|
console.log("[EFC] All workers exited. Primary exiting.");
|
|
88
91
|
process.exit(0);
|
|
89
92
|
}
|
|
@@ -306,7 +309,7 @@ async function scanTasks(tasksDir) {
|
|
|
306
309
|
console.warn(`[EFC] Task file ${file} has no valid default export \u2014 skipping`);
|
|
307
310
|
continue;
|
|
308
311
|
}
|
|
309
|
-
|
|
312
|
+
_chunkTI24L4XEcjs.registerTask.call(void 0, taskName, { ...def, filePath });
|
|
310
313
|
console.log(`[EFC] Registered task: ${taskName}`);
|
|
311
314
|
} catch (err) {
|
|
312
315
|
console.warn(`[EFC] Failed to load task ${file}:`, err);
|
|
@@ -361,7 +364,7 @@ async function initBullMQ(opts) {
|
|
|
361
364
|
const worker = new bullmq.Worker(
|
|
362
365
|
"efc",
|
|
363
366
|
async (job) => {
|
|
364
|
-
const def =
|
|
367
|
+
const def = _chunkTI24L4XEcjs.taskRegistry.get(job.name);
|
|
365
368
|
if (!def) {
|
|
366
369
|
throw new Error(`[EFC] No task registered for name: ${job.name}`);
|
|
367
370
|
}
|
|
@@ -379,8 +382,8 @@ async function initBullMQ(opts) {
|
|
|
379
382
|
worker.on("completed", (job) => {
|
|
380
383
|
console.log(`[EFC] Task ${job.name} completed (id=${job.id})`);
|
|
381
384
|
});
|
|
382
|
-
|
|
383
|
-
const def =
|
|
385
|
+
_chunkTI24L4XEcjs.setEnqueueImpl.call(void 0, async (name, payload) => {
|
|
386
|
+
const def = _chunkTI24L4XEcjs.taskRegistry.get(name);
|
|
384
387
|
if (!def) {
|
|
385
388
|
throw new Error(
|
|
386
389
|
`[EFC] Cannot enqueue unknown task: "${name}". Is the task file in tasksDir?`
|
|
@@ -1118,7 +1121,7 @@ async function ignite(config) {
|
|
|
1118
1121
|
});
|
|
1119
1122
|
}
|
|
1120
1123
|
}
|
|
1121
|
-
const routes =
|
|
1124
|
+
const routes = _chunkDGVOJNR6cjs.scanDir.call(void 0, apiDir);
|
|
1122
1125
|
const apiRouter = _express2.default.Router();
|
|
1123
1126
|
const mounted = await mountRoutes(apiRouter, routes);
|
|
1124
1127
|
app.use(basePath, apiRouter);
|
|
@@ -1134,8 +1137,11 @@ async function ignite(config) {
|
|
|
1134
1137
|
} else {
|
|
1135
1138
|
app.use(
|
|
1136
1139
|
(err, _req, res, _next) => {
|
|
1140
|
+
const duckTyped = err instanceof Error && typeof err.statusCode === "number" ? err : null;
|
|
1137
1141
|
if (isHttpError(err)) {
|
|
1138
1142
|
res.status(err.statusCode).json({ error: err.message, statusCode: err.statusCode });
|
|
1143
|
+
} else if (duckTyped) {
|
|
1144
|
+
res.status(duckTyped.statusCode).json({ error: duckTyped.message, statusCode: duckTyped.statusCode });
|
|
1139
1145
|
} else {
|
|
1140
1146
|
console.error("[EFC] Unhandled error:", err);
|
|
1141
1147
|
res.status(500).json({ error: "Internal Server Error", statusCode: 500 });
|
|
@@ -1185,5 +1191,7 @@ function gracefulShutdown(server, timeoutMs = 1e4) {
|
|
|
1185
1191
|
|
|
1186
1192
|
|
|
1187
1193
|
|
|
1188
|
-
|
|
1194
|
+
|
|
1195
|
+
|
|
1196
|
+
exports.HttpError = HttpError; exports.compose = compose; exports.db = db; exports.defineModel = defineModel; exports.getDbClient = getDbClient; exports.gracefulShutdown = gracefulShutdown; exports.ignite = ignite; exports.isHttpError = isHttpError; exports.listTasks = _chunkTI24L4XEcjs.listTasks; exports.scanDir = _chunkDGVOJNR6cjs.scanDir; exports.setDbClient = setDbClient; exports.workerCount = workerCount;
|
|
1189
1197
|
//# sourceMappingURL=index.cjs.map
|