namirasoft-log 1.4.23 → 1.4.24
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/NamirasoftLogServer.js +1 -1
- package/dist/NamirasoftLogServerLog.d.ts +2 -2
- package/dist/NamirasoftLogServerLog.js +4 -4
- package/dist/NamirasoftLogServerLog.js.map +1 -1
- package/dist/command/LogGetCommand.js +2 -2
- package/dist/command/LogGetCommand.js.map +1 -1
- package/dist/command/LogListCommand.js +2 -2
- package/dist/command/LogListCommand.js.map +1 -1
- package/dist/meta/LogMetaTable.js +4 -4
- package/dist/meta/LogMetaTable.js.map +1 -1
- package/package.json +1 -1
- package/src/NamirasoftLogServer.ts +1 -1
- package/src/NamirasoftLogServerLog.ts +4 -4
- package/src/command/LogGetCommand.ts +2 -2
- package/src/command/LogListCommand.ts +2 -2
- package/src/meta/LogMetaTable.ts +4 -4
|
@@ -11,7 +11,7 @@ const NamirasoftLogServerLogGroupTag_1 = require("./NamirasoftLogServerLogGroupT
|
|
|
11
11
|
const NamirasoftLogServerValue_1 = require("./NamirasoftLogServerValue");
|
|
12
12
|
class NamirasoftLogServer extends namirasoft_account_1.NSABaseServer {
|
|
13
13
|
constructor(base_url, manager, onError) {
|
|
14
|
-
super(base_url, `1.4.
|
|
14
|
+
super(base_url, `1.4.24`, manager, onError);
|
|
15
15
|
this.healthz = new NamirasoftLogServerHealthz_1.NamirasoftLogServerHealthz(this);
|
|
16
16
|
this.value = new NamirasoftLogServerValue_1.NamirasoftLogServerValue(this);
|
|
17
17
|
this.log_group_category = new NamirasoftLogServerLogGroupCategory_1.NamirasoftLogServerLogGroupCategory(this);
|
|
@@ -6,11 +6,11 @@ import { NamirasoftLogServerBase } from "./NamirasoftLogServerBase";
|
|
|
6
6
|
import { SortItem } from "namirasoft-core";
|
|
7
7
|
export declare class NamirasoftLogServerLog extends NamirasoftLogServerBase {
|
|
8
8
|
constructor(server: NamirasoftLogServer);
|
|
9
|
-
List(filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[]): Promise<{
|
|
9
|
+
List(log_group_id: string, filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[]): Promise<{
|
|
10
10
|
rows: LogRow[];
|
|
11
11
|
count: number;
|
|
12
12
|
}>;
|
|
13
|
-
Get(id: string): Promise<LogRow>;
|
|
13
|
+
Get(log_group_id: string, id: string): Promise<LogRow>;
|
|
14
14
|
Create(body: LogCreateRow): Promise<LogRow>;
|
|
15
15
|
_CreateFor(user_id: string, body: LogCreateRow): Promise<LogRow>;
|
|
16
16
|
}
|
|
@@ -21,18 +21,18 @@ class NamirasoftLogServerLog extends NamirasoftLogServerBase_1.NamirasoftLogServ
|
|
|
21
21
|
this.Create = this.Create.bind(this);
|
|
22
22
|
this._CreateFor = this._CreateFor.bind(this);
|
|
23
23
|
}
|
|
24
|
-
List(filters, page, size, sorts) {
|
|
24
|
+
List(log_group_id, filters, page, size, sorts) {
|
|
25
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
26
26
|
let filters_string_value = namirasoft_core_1.FilterItem.stringify(filters);
|
|
27
27
|
let sorts_string_value = namirasoft_core_2.SortItem.stringify(sorts);
|
|
28
|
-
let path = `/log/list`;
|
|
28
|
+
let path = `/log/group/${log_group_id}/log/list`;
|
|
29
29
|
let { data } = yield this.server._get(path, { filters: filters_string_value, page, size, sorts: sorts_string_value });
|
|
30
30
|
return data;
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
|
-
Get(id) {
|
|
33
|
+
Get(log_group_id, id) {
|
|
34
34
|
return __awaiter(this, void 0, void 0, function* () {
|
|
35
|
-
let path = `/log/${id}`;
|
|
35
|
+
let path = `/log/group/${log_group_id}/log/${id}`;
|
|
36
36
|
let { data } = yield this.server._get(path, {});
|
|
37
37
|
return data;
|
|
38
38
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NamirasoftLogServerLog.js","sourceRoot":"","sources":["../src/NamirasoftLogServerLog.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,qDAA6C;AAI7C,uEAAoE;AACpE,qDAA2C;AAE3C,MAAa,sBAAuB,SAAQ,iDAAuB;IAE/D,YAAY,MAA2B;QAEnC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IACK,IAAI,CAAC,OAA4B,EAAE,IAAqB,EAAE,IAAqB,EAAE,KAAiB;;
|
|
1
|
+
{"version":3,"file":"NamirasoftLogServerLog.js","sourceRoot":"","sources":["../src/NamirasoftLogServerLog.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,qDAA6C;AAI7C,uEAAoE;AACpE,qDAA2C;AAE3C,MAAa,sBAAuB,SAAQ,iDAAuB;IAE/D,YAAY,MAA2B;QAEnC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IACK,IAAI,CAAC,YAAoB,EAAE,OAA4B,EAAE,IAAqB,EAAE,IAAqB,EAAE,KAAiB;;YAE1H,IAAI,oBAAoB,GAAW,4BAAU,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACjE,IAAI,kBAAkB,GAAW,0BAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC3D,IAAI,IAAI,GAAG,cAAc,YAAY,WAAW,CAAC;YACjD,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAoC,IAAI,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC;YACzJ,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,GAAG,CAAC,YAAoB,EAAE,EAAU;;YAEtC,IAAI,IAAI,GAAG,cAAc,YAAY,QAAQ,EAAE,EAAE,CAAC;YAClD,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAS,IAAI,EAAE,EAAE,CAAC,CAAC;YACxD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,MAAM,CAAC,IAAkB;;YAE3B,IAAI,IAAI,GAAG,MAAM,CAAC;YAClB,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAS,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAC/D,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,UAAU,CAAC,OAAe,EAAE,IAAkB;;YAEhD,IAAI,IAAI,GAAG,qBAAqB,OAAO,MAAM,CAAC;YAC9C,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAS,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAC/D,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;CACJ;AApCD,wDAoCC;AAAA,CAAC"}
|
|
@@ -16,7 +16,7 @@ const NamirasoftLogServer_1 = require("../NamirasoftLogServer");
|
|
|
16
16
|
const namirasoft_account_1 = require("namirasoft-account");
|
|
17
17
|
class LogGetCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
18
18
|
constructor(argv) {
|
|
19
|
-
super(argv, ["id"], []);
|
|
19
|
+
super(argv, ["log_group_id", "id"], []);
|
|
20
20
|
}
|
|
21
21
|
exec() {
|
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -28,7 +28,7 @@ class LogGetCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
|
28
28
|
manager.setValue(token, false);
|
|
29
29
|
let url = this.app.storage.getItem("ns-log-server-url");
|
|
30
30
|
let server = new NamirasoftLogServer_1.NamirasoftLogServer(url, manager, e => this.app.logger.error(e.message));
|
|
31
|
-
let ans = yield server.log.Get(this.arg_values[0]);
|
|
31
|
+
let ans = yield server.log.Get(this.arg_values[0], this.arg_values[1]);
|
|
32
32
|
this.app.logger.success(JSON.stringify(ans));
|
|
33
33
|
});
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogGetCommand.js","sourceRoot":"","sources":["../../src/command/LogGetCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,gEAA6D;AAC7D,2DAAkD;AAElD,MAAa,aAAc,SAAQ,sCAAgB;IAE/C,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"LogGetCommand.js","sourceRoot":"","sources":["../../src/command/LogGetCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,gEAA6D;AAC7D,2DAAkD;AAElD,MAAa,aAAc,SAAQ,sCAAgB;IAE/C,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5C,CAAC;IACc,IAAI;;YAEf,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3C,IAAI,KAAK,IAAI,IAAI;gBACb,MAAM,IAAI,KAAK,CAAC,uGAAuG,CAAC,CAAC;YAC7H,IAAI,OAAO,GAAG,IAAI,gCAAc,EAAE,CAAC;YACnC,IAAI,OAAO,GAAG,IAAI,iCAAY,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC/B,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;YACxD,IAAI,MAAM,GAAG,IAAI,yCAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC1F,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YACvE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACjD,CAAC;KAAA;CACJ;AAnBD,sCAmBC;AAAA,CAAC"}
|
|
@@ -16,7 +16,7 @@ const NamirasoftLogServer_1 = require("../NamirasoftLogServer");
|
|
|
16
16
|
const namirasoft_account_1 = require("namirasoft-account");
|
|
17
17
|
class LogListCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
18
18
|
constructor(argv) {
|
|
19
|
-
super(argv, ["filters", "page", "size", "sorts"], []);
|
|
19
|
+
super(argv, ["log_group_id", "filters", "page", "size", "sorts"], []);
|
|
20
20
|
}
|
|
21
21
|
exec() {
|
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -28,7 +28,7 @@ class LogListCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
|
28
28
|
manager.setValue(token, false);
|
|
29
29
|
let url = this.app.storage.getItem("ns-log-server-url");
|
|
30
30
|
let server = new NamirasoftLogServer_1.NamirasoftLogServer(url, manager, e => this.app.logger.error(e.message));
|
|
31
|
-
let ans = yield server.log.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3]);
|
|
31
|
+
let ans = yield server.log.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3], this.arg_values[4]);
|
|
32
32
|
this.app.logger.success(JSON.stringify(ans));
|
|
33
33
|
});
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogListCommand.js","sourceRoot":"","sources":["../../src/command/LogListCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,gEAA6D;AAC7D,2DAAkD;AAElD,MAAa,cAAe,SAAQ,sCAAgB;IAEhD,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"LogListCommand.js","sourceRoot":"","sources":["../../src/command/LogListCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,gEAA6D;AAC7D,2DAAkD;AAElD,MAAa,cAAe,SAAQ,sCAAgB;IAEhD,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAC1E,CAAC;IACc,IAAI;;YAEf,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3C,IAAI,KAAK,IAAI,IAAI;gBACb,MAAM,IAAI,KAAK,CAAC,uGAAuG,CAAC,CAAC;YAC7H,IAAI,OAAO,GAAG,IAAI,gCAAc,EAAE,CAAC;YACnC,IAAI,OAAO,GAAG,IAAI,iCAAY,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC/B,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;YACxD,IAAI,MAAM,GAAG,IAAI,yCAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC1F,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YACpI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACjD,CAAC;KAAA;CACJ;AAnBD,wCAmBC;AAAA,CAAC"}
|
|
@@ -26,12 +26,12 @@ class LogMetaTable extends namirasoft_site_1.NSBaseMetaTable {
|
|
|
26
26
|
created_at: new namirasoft_core_1.BaseMetaColumn(this, "created_at", "Created At", "DateTime", true),
|
|
27
27
|
};
|
|
28
28
|
this.back_end.get = (id) => __awaiter(this, void 0, void 0, function* () {
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
console.log(id);
|
|
30
|
+
throw new Error("Log.Get is not implemented");
|
|
31
31
|
});
|
|
32
32
|
this.back_end.list = (filters, page, size, sorts) => __awaiter(this, void 0, void 0, function* () {
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
console.log(filters, page, size, sorts);
|
|
34
|
+
throw new Error("Log.List is not implemented");
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogMetaTable.js","sourceRoot":"","sources":["../../src/meta/LogMetaTable.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,qDAAiF;AAEjF,qDAAsE;AAGtE,MAAa,YAAa,SAAQ,iCAA4C;IAY1E,YAAY,QAAiD;QAEzD,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,0BAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACnD,IAAI,CAAC,OAAO,GAAG;YACX,EAAE,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC;YACxD,OAAO,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC;YACvE,YAAY,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,CAAC;YACtF,UAAU,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,KAAK,CAAC;YACjF,YAAY,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,KAAK,CAAC;YACvF,KAAK,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC;YACjE,OAAO,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC;YACvE,UAAU,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,CAAC;SACrF,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAO,EAAU,EAAE,EAAE;YAErC,
|
|
1
|
+
{"version":3,"file":"LogMetaTable.js","sourceRoot":"","sources":["../../src/meta/LogMetaTable.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,qDAAiF;AAEjF,qDAAsE;AAGtE,MAAa,YAAa,SAAQ,iCAA4C;IAY1E,YAAY,QAAiD;QAEzD,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,0BAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACnD,IAAI,CAAC,OAAO,GAAG;YACX,EAAE,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC;YACxD,OAAO,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC;YACvE,YAAY,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,CAAC;YACtF,UAAU,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,KAAK,CAAC;YACjF,YAAY,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,KAAK,CAAC;YACvF,KAAK,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC;YACjE,OAAO,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC;YACvE,UAAU,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,CAAC;SACrF,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAO,EAAU,EAAE,EAAE;YAErC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAClD,CAAC,CAAA,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAO,OAA4B,EAAE,IAAqB,EAAE,IAAqB,EAAE,KAAiB,EAAE,EAAE;YAEzH,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACnD,CAAC,CAAA,CAAC;IACN,CAAC;CACJ;AApCD,oCAoCC;AAAA,CAAC"}
|
package/package.json
CHANGED
|
@@ -39,7 +39,7 @@ export class NamirasoftLogServer extends NSABaseServer
|
|
|
39
39
|
log: NamirasoftLogServerLog;
|
|
40
40
|
constructor(base_url: string, manager: TokenManager, onError: (error: Error) => void)
|
|
41
41
|
{
|
|
42
|
-
super(base_url, `1.4.
|
|
42
|
+
super(base_url, `1.4.24`, manager, onError);
|
|
43
43
|
this.healthz = new NamirasoftLogServerHealthz(this);
|
|
44
44
|
this.value = new NamirasoftLogServerValue(this);
|
|
45
45
|
this.log_group_category = new NamirasoftLogServerLogGroupCategory(this);
|
|
@@ -35,17 +35,17 @@ export class NamirasoftLogServerLog extends NamirasoftLogServerBase
|
|
|
35
35
|
this.Create = this.Create.bind(this);
|
|
36
36
|
this._CreateFor = this._CreateFor.bind(this);
|
|
37
37
|
}
|
|
38
|
-
async List(filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[]): Promise<{ rows: LogRow[], count: number }>
|
|
38
|
+
async List(log_group_id: string, filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[]): Promise<{ rows: LogRow[], count: number }>
|
|
39
39
|
{
|
|
40
40
|
let filters_string_value: string = FilterItem.stringify(filters);
|
|
41
41
|
let sorts_string_value: string = SortItem.stringify(sorts);
|
|
42
|
-
let path = `/log/list`;
|
|
42
|
+
let path = `/log/group/${log_group_id}/log/list`;
|
|
43
43
|
let { data } = await this.server._get<{ rows: LogRow[], count: number }>(path, { filters: filters_string_value, page, size, sorts: sorts_string_value });
|
|
44
44
|
return data;
|
|
45
45
|
}
|
|
46
|
-
async Get(id: string): Promise<LogRow>
|
|
46
|
+
async Get(log_group_id: string, id: string): Promise<LogRow>
|
|
47
47
|
{
|
|
48
|
-
let path = `/log/${id}`;
|
|
48
|
+
let path = `/log/group/${log_group_id}/log/${id}`;
|
|
49
49
|
let { data } = await this.server._get<LogRow>(path, {});
|
|
50
50
|
return data;
|
|
51
51
|
}
|
|
@@ -27,7 +27,7 @@ export class LogGetCommand extends BaseFinalCommand
|
|
|
27
27
|
{
|
|
28
28
|
constructor(argv: string[])
|
|
29
29
|
{
|
|
30
|
-
super(argv, ["id"], []);
|
|
30
|
+
super(argv, ["log_group_id", "id"], []);
|
|
31
31
|
}
|
|
32
32
|
override async exec()
|
|
33
33
|
{
|
|
@@ -39,7 +39,7 @@ export class LogGetCommand extends BaseFinalCommand
|
|
|
39
39
|
manager.setValue(token, false);
|
|
40
40
|
let url = this.app.storage.getItem("ns-log-server-url");
|
|
41
41
|
let server = new NamirasoftLogServer(url, manager, e => this.app.logger.error(e.message));
|
|
42
|
-
let ans = await server.log.Get(this.arg_values[0]);
|
|
42
|
+
let ans = await server.log.Get(this.arg_values[0], this.arg_values[1]);
|
|
43
43
|
this.app.logger.success(JSON.stringify(ans));
|
|
44
44
|
}
|
|
45
45
|
};
|
|
@@ -27,7 +27,7 @@ export class LogListCommand extends BaseFinalCommand
|
|
|
27
27
|
{
|
|
28
28
|
constructor(argv: string[])
|
|
29
29
|
{
|
|
30
|
-
super(argv, ["filters", "page", "size", "sorts"], []);
|
|
30
|
+
super(argv, ["log_group_id", "filters", "page", "size", "sorts"], []);
|
|
31
31
|
}
|
|
32
32
|
override async exec()
|
|
33
33
|
{
|
|
@@ -39,7 +39,7 @@ export class LogListCommand extends BaseFinalCommand
|
|
|
39
39
|
manager.setValue(token, false);
|
|
40
40
|
let url = this.app.storage.getItem("ns-log-server-url");
|
|
41
41
|
let server = new NamirasoftLogServer(url, manager, e => this.app.logger.error(e.message));
|
|
42
|
-
let ans = await server.log.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3]);
|
|
42
|
+
let ans = await server.log.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3], this.arg_values[4]);
|
|
43
43
|
this.app.logger.success(JSON.stringify(ans));
|
|
44
44
|
}
|
|
45
45
|
};
|
package/src/meta/LogMetaTable.ts
CHANGED
|
@@ -50,13 +50,13 @@ export class LogMetaTable extends NSBaseMetaTable<NamirasoftLogServer, LogRow>
|
|
|
50
50
|
};
|
|
51
51
|
this.back_end.get = async (id: string) =>
|
|
52
52
|
{
|
|
53
|
-
|
|
54
|
-
|
|
53
|
+
console.log(id);
|
|
54
|
+
throw new Error("Log.Get is not implemented");
|
|
55
55
|
};
|
|
56
56
|
this.back_end.list = async (filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[]) =>
|
|
57
57
|
{
|
|
58
|
-
|
|
59
|
-
|
|
58
|
+
console.log(filters, page, size, sorts);
|
|
59
|
+
throw new Error("Log.List is not implemented");
|
|
60
60
|
};
|
|
61
61
|
}
|
|
62
62
|
};
|