@ms-cloudpack/api-server 0.6.18 → 0.6.20
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/lib/createCloudpackServer.d.ts +4 -4
- package/lib/task-scheduler/TaskScheduler.d.ts +1 -1
- package/lib/task-scheduler/createSimpleScheduler.js +2 -2
- package/lib/task-scheduler/createSimpleScheduler.js.map +1 -1
- package/lib/task-scheduler/createTaskSchedulerReporter.d.ts +2 -2
- package/lib/task-scheduler/createTaskSchedulerReporter.d.ts.map +1 -1
- package/lib/task-scheduler/createTaskSchedulerReporter.js +7 -7
- package/lib/task-scheduler/createTaskSchedulerReporter.js.map +1 -1
- package/lib/trpc-adapters/httpAdapter.d.ts +1 -1
- package/lib/trpc-adapters/httpsAdapter.d.ts +0 -1
- package/lib/trpc-adapters/httpsAdapter.js +1 -1
- package/package.json +3 -3
|
@@ -6,10 +6,6 @@ export declare function createCloudpackServer(options: {
|
|
|
6
6
|
rootSpan: Span | undefined;
|
|
7
7
|
reporter: TaskReporter;
|
|
8
8
|
}): Promise<Omit<{
|
|
9
|
-
query: <TProcedure extends {}[TPath], TPath extends never>(path: TPath, ...args: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<TProcedure>>) => Promise<import("@trpc/server").inferProcedureOutput<TProcedure>>;
|
|
10
|
-
mutation: <TProcedure extends {}[TPath], TPath extends never>(path: TPath, ...args: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<TProcedure>>) => Promise<import("@trpc/server").inferProcedureOutput<TProcedure>>;
|
|
11
|
-
subscription: <TProcedure extends {}[TPath], TPath extends never>(path: TPath, ...args: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<TProcedure>>) => Promise<import("@trpc/server").inferProcedureOutput<TProcedure>>;
|
|
12
|
-
} & {
|
|
13
9
|
addPackageOverride: (input: {
|
|
14
10
|
packageName: string;
|
|
15
11
|
importPath: string;
|
|
@@ -43,5 +39,9 @@ export declare function createCloudpackServer(options: {
|
|
|
43
39
|
}) => Promise<{
|
|
44
40
|
fixable: boolean;
|
|
45
41
|
}>;
|
|
42
|
+
} & {
|
|
43
|
+
query: <TProcedure extends {}[TPath], TPath extends never>(path: TPath, ...args: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<TProcedure>>) => Promise<import("@trpc/server").inferProcedureOutput<TProcedure>>;
|
|
44
|
+
mutation: <TProcedure extends {}[TPath], TPath extends never>(path: TPath, ...args: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<TProcedure>>) => Promise<import("@trpc/server").inferProcedureOutput<TProcedure>>;
|
|
45
|
+
subscription: <TProcedure extends {}[TPath], TPath extends never>(path: TPath, ...args: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<TProcedure>>) => Promise<import("@trpc/server").inferProcedureOutput<TProcedure>>;
|
|
46
46
|
}, "query" | "mutation" | "subscription">>;
|
|
47
47
|
//# sourceMappingURL=createCloudpackServer.d.ts.map
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { Logger } from '@lage-run/logger';
|
|
2
2
|
import scheduler from '@lage-run/scheduler';
|
|
3
3
|
import { TargetHasher } from '@lage-run/hasher';
|
|
4
4
|
import os from 'os';
|
|
5
5
|
import { createTaskSchedulerReporter } from './createTaskSchedulerReporter.js';
|
|
6
6
|
import { require } from './TaskScheduler.js';
|
|
7
7
|
export function createSimpleScheduler({ reporter, root }) {
|
|
8
|
-
const logger = new
|
|
8
|
+
const logger = new Logger();
|
|
9
9
|
logger.addReporter(createTaskSchedulerReporter(reporter));
|
|
10
10
|
const runners = {
|
|
11
11
|
worker: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSimpleScheduler.js","sourceRoot":"","sources":["../../src/task-scheduler/createSimpleScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"createSimpleScheduler.js","sourceRoot":"","sources":["../../src/task-scheduler/createSimpleScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,UAAU,qBAAqB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAA4C;IAChG,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;IAC5B,MAAM,CAAC,WAAW,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE1D,MAAM,OAAO,GAAG;QACd,MAAM,EAAE;YACN,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,iDAAiD,CAAC;YAC1E,OAAO,EAAE,EAAE;SACZ;QACD,IAAI,EAAE;YACJ,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,+CAA+C,CAAC;YACxE,OAAO,EAAE,EAAE;SACZ;KACF,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;IAE/D,OAAO,IAAI,SAAS,CAAC,eAAe,CAAC;QACnC,WAAW,EAAE,EAAE;QACf,eAAe,EAAE,IAAI;QACrB,MAAM;QACN,iBAAiB,EAAE,IAAI,GAAG,EAAE;QAC5B,UAAU,EAAE;YACV,OAAO;YACP,IAAI;YACJ,QAAQ,EAAE,EAAE;SACb;QACD,WAAW,EAAE,IAAI;QACjB,gBAAgB,EAAE,KAAK;QACvB,qBAAqB,EAAE,EAAE,CAAC,QAAQ,EAAE;QACpC,MAAM;KACP,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { Logger } from '@lage-run/logger';\nimport scheduler from '@lage-run/scheduler';\nimport { TargetHasher } from '@lage-run/hasher';\nimport os from 'os';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport { createTaskSchedulerReporter } from './createTaskSchedulerReporter.js';\nimport { require } from './TaskScheduler.js';\n\nexport function createSimpleScheduler({ reporter, root }: { reporter: TaskReporter; root: string }) {\n const logger = new Logger();\n logger.addReporter(createTaskSchedulerReporter(reporter));\n\n const runners = {\n worker: {\n script: require.resolve('@lage-run/scheduler/lib/runners/WorkerRunner.js'),\n options: {},\n },\n noop: {\n script: require.resolve('@lage-run/scheduler/lib/runners/NoOpRunner.js'),\n options: {},\n },\n };\n\n const hasher = new TargetHasher({ root, environmentGlob: [] });\n\n return new scheduler.SimpleScheduler({\n concurrency: 10,\n continueOnError: true,\n logger,\n maxWorkersPerTask: new Map(),\n workerData: {\n runners,\n root,\n taskArgs: [],\n },\n shouldCache: true,\n shouldResetCache: false,\n workerIdleMemoryLimit: os.totalmem(),\n hasher,\n });\n}\n"]}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { type Reporter } from '@lage-run/logger';
|
|
2
2
|
import type { TaskReporter } from '@ms-cloudpack/task-reporter';
|
|
3
|
-
export declare function createTaskSchedulerReporter(reporter: TaskReporter):
|
|
3
|
+
export declare function createTaskSchedulerReporter(reporter: TaskReporter): Reporter;
|
|
4
4
|
//# sourceMappingURL=createTaskSchedulerReporter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTaskSchedulerReporter.d.ts","sourceRoot":"","sources":["../../src/task-scheduler/createTaskSchedulerReporter.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"createTaskSchedulerReporter.d.ts","sourceRoot":"","sources":["../../src/task-scheduler/createTaskSchedulerReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,KAAK,EAAE,YAAY,EAAoB,MAAM,6BAA6B,CAAC;AAElF,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,YAAY,GAAG,QAAQ,CAmE5E"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { LogLevel } from '@lage-run/logger';
|
|
2
2
|
export function createTaskSchedulerReporter(reporter) {
|
|
3
3
|
const reporterTasks = new Map();
|
|
4
4
|
return {
|
|
5
5
|
log(entry) {
|
|
6
|
-
if (entry.msg && entry.level <=
|
|
6
|
+
if (entry.msg && entry.level <= LogLevel.warn && entry.data?.target) {
|
|
7
7
|
const target = entry.data?.target;
|
|
8
8
|
if (reporterTasks.has(target.id)) {
|
|
9
9
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
@@ -41,11 +41,11 @@ export function createTaskSchedulerReporter(reporter) {
|
|
|
41
41
|
}
|
|
42
42
|
if (entry.msg) {
|
|
43
43
|
const logLevelToConsoleFnMap = {
|
|
44
|
-
[
|
|
45
|
-
[
|
|
46
|
-
[
|
|
47
|
-
[
|
|
48
|
-
[
|
|
44
|
+
[LogLevel.error]: console.error,
|
|
45
|
+
[LogLevel.warn]: console.warn,
|
|
46
|
+
[LogLevel.info]: console.info,
|
|
47
|
+
[LogLevel.verbose]: console.debug,
|
|
48
|
+
[LogLevel.silly]: console.debug,
|
|
49
49
|
};
|
|
50
50
|
logLevelToConsoleFnMap[entry.level](entry.msg);
|
|
51
51
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTaskSchedulerReporter.js","sourceRoot":"","sources":["../../src/task-scheduler/createTaskSchedulerReporter.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"createTaskSchedulerReporter.js","sourceRoot":"","sources":["../../src/task-scheduler/createTaskSchedulerReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAiB,MAAM,kBAAkB,CAAC;AAI3D,MAAM,UAAU,2BAA2B,CAAC,QAAsB;IAChE,MAAM,aAAa,GAAG,IAAI,GAAG,EAA4B,CAAC;IAE1D,OAAO;QACL,GAAG,CAAC,KAAK;YACP,IAAI,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE;gBACnE,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,MAAgB,CAAC;gBAC5C,IAAI,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;oBAChC,oEAAoE;oBACpE,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAE,CAAC,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC;iBACpD;gBACD,OAAO;aACR;YAED,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE;gBACnC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;gBAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAgB,CAAC;gBAE3C,0CAA0C;gBAC1C,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;oBACvC,CAAC,CAAC,oEAAoE;wBACpE,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAE;oBAC/B,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gBAEzC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBAEnC,QAAQ,MAAM,EAAE;oBACd,KAAK,SAAS;wBACZ,IAAI,CAAC,KAAK,EAAE,CAAC;wBACb,MAAM;oBAER,KAAK,SAAS;wBACZ,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;wBACtC,MAAM;oBAER,KAAK,SAAS;wBACZ,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;wBAClC,MAAM;oBAER,KAAK,QAAQ;wBACX,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;wBAClC,MAAM;oBAER,KAAK,SAAS;wBACZ,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;wBACnC,MAAM;iBACT;gBACD,OAAO;aACR;YAED,IAAI,KAAK,CAAC,GAAG,EAAE;gBACb,MAAM,sBAAsB,GAAG;oBAC7B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;oBAC/B,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI;oBAC7B,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI;oBAC7B,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,KAAK;oBACjC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;iBAChC,CAAC;gBAEF,sBAAsB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC/C,OAAO;aACR;QACH,CAAC;QACD,SAAS;YACP,OAAO;QACT,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["import { LogLevel, type Reporter } from '@lage-run/logger';\nimport type { Target } from '@lage-run/target-graph';\nimport type { TaskReporter, TaskReporterTask } from '@ms-cloudpack/task-reporter';\n\nexport function createTaskSchedulerReporter(reporter: TaskReporter): Reporter {\n const reporterTasks = new Map<string, TaskReporterTask>();\n\n return {\n log(entry) {\n if (entry.msg && entry.level <= LogLevel.warn && entry.data?.target) {\n const target = entry.data?.target as Target;\n if (reporterTasks.has(target.id)) {\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n reporterTasks.get(target.id)!.message += entry.msg;\n }\n return;\n }\n\n if (entry.data && entry.data.status) {\n const { status } = entry.data;\n const target = entry.data.target as Target;\n\n // Ensure task is in the reporterTasks map\n const task = reporterTasks.has(target.id)\n ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n reporterTasks.get(target.id)!\n : reporter.addTask(target.label, true);\n\n reporterTasks.set(target.id, task);\n\n switch (status) {\n case 'running':\n task.start();\n break;\n\n case 'success':\n task.complete({ status: 'complete' });\n break;\n\n case 'skipped':\n task.complete({ status: 'skip' });\n break;\n\n case 'failed':\n task.complete({ status: 'fail' });\n break;\n\n case 'aborted':\n task.complete({ status: 'abort' });\n break;\n }\n return;\n }\n\n if (entry.msg) {\n const logLevelToConsoleFnMap = {\n [LogLevel.error]: console.error,\n [LogLevel.warn]: console.warn,\n [LogLevel.info]: console.info,\n [LogLevel.verbose]: console.debug,\n [LogLevel.silly]: console.debug,\n };\n\n logLevelToConsoleFnMap[entry.level](entry.msg);\n return;\n }\n },\n summarize() {\n // noop\n },\n };\n}\n"]}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/// <reference types="node"
|
|
1
|
+
/// <reference types="node" />
|
|
2
2
|
import type { AnyRouter } from '@trpc/server';
|
|
3
3
|
import { type NodeHTTPCreateContextFnOptions, type NodeHTTPHandlerOptions } from '@trpc/server/adapters/node-http';
|
|
4
4
|
import http from 'http';
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
2
|
//# sourceMappingURL=httpsAdapter.js.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ms-cloudpack/api-server",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.20",
|
|
4
4
|
"description": "An implementation of the API server that does interacts with a task scheduler.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"@ms-cloudpack/data-bus": "^0.3.0",
|
|
24
24
|
"@ms-cloudpack/package-utilities": "^3.1.5",
|
|
25
25
|
"@ms-cloudpack/path-string-parsing": "^1.0.2",
|
|
26
|
-
"@ms-cloudpack/task-reporter": "^0.5.
|
|
27
|
-
"@ms-cloudpack/telemetry": "^0.3.
|
|
26
|
+
"@ms-cloudpack/task-reporter": "^0.5.2",
|
|
27
|
+
"@ms-cloudpack/telemetry": "^0.3.4",
|
|
28
28
|
"@trpc/client": "^10.21.1",
|
|
29
29
|
"@trpc/server": "^10.21.1",
|
|
30
30
|
"chokidar": "^3.5.3",
|