@pgds/api-interface 1.3.4 → 1.4.1
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/README.md +0 -1
- package/constants/index.d.ts +1 -0
- package/constants/index.js +2 -1
- package/constants/index.js.map +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.js +16 -0
- package/dist/lib/constants/constants.d.ts +2 -0
- package/dist/lib/index.d.ts +188 -0
- package/dist/lib/index.js +331 -0
- package/dist/lib/models/Http.d.ts +61 -0
- package/dist/lib/models/User.d.ts +8 -0
- package/dist/lib/utils/jsonSchemaUtils.d.ts +7 -0
- package/dist/lib/utils/logger.d.ts +4 -0
- package/dist/lib/utils/metadataUtils.d.ts +2 -0
- package/dist/lib/utils/urlUtils.d.ts +1 -0
- package/index.d.ts +2 -2
- package/index.js +1 -2
- package/lib/auth/mustbeConfig.d.ts +1 -1
- package/lib/auth/mustbeConfig.js +5 -9
- package/lib/auth/mustbeConfig.js.map +1 -1
- package/lib/index.d.ts +20 -25
- package/lib/index.js +17 -58
- package/lib/index.js.map +1 -1
- package/lib/server/server.d.ts +1 -2
- package/lib/server/server.js +3 -7
- package/lib/server/server.js.map +1 -1
- package/lib/utils/jsonSchemaUtils.js +2 -2
- package/lib/utils/jsonSchemaUtils.js.map +1 -1
- package/lib/utils/logger.d.ts +3 -5
- package/lib/utils/logger.js +11 -28
- package/lib/utils/logger.js.map +1 -1
- package/package.json +99 -101
- package/types/hiot.d.ts +2 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function route(version: string, path: string, internal?: boolean): string;
|
package/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { setupApiInterface,
|
|
1
|
+
import { setupApiInterface, JsonResponse, del, endpointMetadata, get, patch, post, put, internal, Method } from "./lib";
|
|
2
2
|
import { routeHelpers } from "./lib/auth/mustbeConfig";
|
|
3
3
|
import { Next, Request, Response } from "./lib/models/Http";
|
|
4
4
|
import { ReqUser } from "./lib/models/ReqUser";
|
|
5
5
|
import { closeServer, server } from "./lib/server/server";
|
|
6
6
|
import { useReqStore, runWithRequestContext } from "./lib/utils/asyncHooks";
|
|
7
|
-
export { setupApiInterface,
|
|
7
|
+
export { setupApiInterface, endpointMetadata, del, get, patch, post, put, internal, JsonResponse, Request, Response, Next, Method, ReqUser, closeServer, server, routeHelpers, useReqStore, runWithRequestContext, };
|
package/index.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.runWithRequestContext = exports.useReqStore = exports.routeHelpers = exports.server = exports.closeServer = exports.ReqUser = exports.Method = exports.internal = exports.put = exports.post = exports.patch = exports.get = exports.del = exports.endpointMetadata = exports.
|
|
3
|
+
exports.runWithRequestContext = exports.useReqStore = exports.routeHelpers = exports.server = exports.closeServer = exports.ReqUser = exports.Method = exports.internal = exports.put = exports.post = exports.patch = exports.get = exports.del = exports.endpointMetadata = exports.setupApiInterface = void 0;
|
|
4
4
|
var lib_1 = require("./lib");
|
|
5
5
|
Object.defineProperty(exports, "setupApiInterface", { enumerable: true, get: function () { return lib_1.setupApiInterface; } });
|
|
6
|
-
Object.defineProperty(exports, "setupInterfaceLegacy", { enumerable: true, get: function () { return lib_1.setupInterfaceLegacy; } });
|
|
7
6
|
Object.defineProperty(exports, "del", { enumerable: true, get: function () { return lib_1.del; } });
|
|
8
7
|
Object.defineProperty(exports, "endpointMetadata", { enumerable: true, get: function () { return lib_1.endpointMetadata; } });
|
|
9
8
|
Object.defineProperty(exports, "get", { enumerable: true, get: function () { return lib_1.get; } });
|
|
@@ -4,7 +4,7 @@ type MustbeRouteHelpers = () => {
|
|
|
4
4
|
authenticated: () => void;
|
|
5
5
|
requestSchema: (schema: any) => void;
|
|
6
6
|
};
|
|
7
|
-
/** Only needed if used along side legacy setup */
|
|
7
|
+
/** Only needed if used along side legacy setup of endpoints */
|
|
8
8
|
declare const routeHelpers: MustbeRouteHelpers;
|
|
9
9
|
export { routeHelpers };
|
|
10
10
|
export declare function configureMustBe(): void;
|
package/lib/auth/mustbeConfig.js
CHANGED
|
@@ -32,22 +32,19 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
-
};
|
|
38
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
36
|
exports.routeHelpers = void 0;
|
|
40
37
|
exports.configureMustBe = configureMustBe;
|
|
41
38
|
exports.isUserAuthorized = isUserAuthorized;
|
|
42
|
-
var constants_1 = require("../../constants");
|
|
43
39
|
var restifyErrors = __importStar(require("restify-errors"));
|
|
40
|
+
var constants_1 = require("../../constants");
|
|
44
41
|
// TODO: this import crashes the library when used by a service
|
|
45
42
|
// import Configurator from "../../types/mustbe/config";
|
|
46
43
|
var ReqUser_1 = require("../models/ReqUser");
|
|
47
44
|
var jsonSchemaUtils_1 = require("../utils/jsonSchemaUtils");
|
|
48
|
-
var logger_1 =
|
|
45
|
+
var logger_1 = require("../utils/logger");
|
|
49
46
|
var mustbe = require("mustbe");
|
|
50
|
-
/** Only needed if used along side legacy setup */
|
|
47
|
+
/** Only needed if used along side legacy setup of endpoints */
|
|
51
48
|
var routeHelpers = (function () {
|
|
52
49
|
var routeHelpers = mustbe.routeHelpers.bind(mustbe)();
|
|
53
50
|
return {
|
|
@@ -125,7 +122,7 @@ function parseActivities(header) {
|
|
|
125
122
|
return activities;
|
|
126
123
|
}
|
|
127
124
|
function isUserAuthorized(activities, requiredActivitiesString) {
|
|
128
|
-
var _a;
|
|
125
|
+
var _a, _b;
|
|
129
126
|
if (activities.global) {
|
|
130
127
|
return true;
|
|
131
128
|
}
|
|
@@ -136,8 +133,7 @@ function isUserAuthorized(activities, requiredActivitiesString) {
|
|
|
136
133
|
return isActivityAuthorized(activities, requiredActivity);
|
|
137
134
|
});
|
|
138
135
|
if (!isAuthorized) {
|
|
139
|
-
|
|
140
|
-
(_a = logger_1.default === null || logger_1.default === void 0 ? void 0 : logger_1.default.debug) === null || _a === void 0 ? void 0 : _a.call(logger_1.default, "user is not authorized", { activities: activities, requiredActivities: requiredActivities });
|
|
136
|
+
(_b = (_a = (0, logger_1.getLogger)()) === null || _a === void 0 ? void 0 : _a.debug) === null || _b === void 0 ? void 0 : _b.call(_a, "user is not authorized", { activities: activities, requiredActivities: requiredActivities });
|
|
141
137
|
}
|
|
142
138
|
return isAuthorized;
|
|
143
139
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mustbeConfig.js","sourceRoot":"","sources":["mustbeConfig.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mustbeConfig.js","sourceRoot":"","sources":["mustbeConfig.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
1
|
+
import { logger as pgdsLogger } from "@pgds/utils/logging";
|
|
1
2
|
import type { RouteOptions, Server } from "restify";
|
|
2
3
|
import type { Next, Request, Response } from "./models/Http";
|
|
3
|
-
interface Locator {
|
|
4
|
-
db: any;
|
|
5
|
-
broker: any;
|
|
6
|
-
api: Server;
|
|
7
|
-
}
|
|
8
4
|
export declare enum Method {
|
|
9
5
|
Post = "post",
|
|
10
6
|
Get = "get",
|
|
@@ -16,7 +12,7 @@ export declare enum Method {
|
|
|
16
12
|
}
|
|
17
13
|
type OmittedFields = "internal" | "method";
|
|
18
14
|
export declare function get(options: Omit<EndpointOptions, OmittedFields>): {
|
|
19
|
-
(
|
|
15
|
+
(): void;
|
|
20
16
|
/**
|
|
21
17
|
* Makes it possible to access the requestHandler through the exported function.
|
|
22
18
|
* If you need to test the function separately, without starting the server
|
|
@@ -27,7 +23,7 @@ export declare function get(options: Omit<EndpointOptions, OmittedFields>): {
|
|
|
27
23
|
unregister(): void;
|
|
28
24
|
};
|
|
29
25
|
export declare function post(options: Omit<EndpointOptions, OmittedFields>): {
|
|
30
|
-
(
|
|
26
|
+
(): void;
|
|
31
27
|
/**
|
|
32
28
|
* Makes it possible to access the requestHandler through the exported function.
|
|
33
29
|
* If you need to test the function separately, without starting the server
|
|
@@ -38,7 +34,7 @@ export declare function post(options: Omit<EndpointOptions, OmittedFields>): {
|
|
|
38
34
|
unregister(): void;
|
|
39
35
|
};
|
|
40
36
|
export declare function put(options: Omit<EndpointOptions, OmittedFields>): {
|
|
41
|
-
(
|
|
37
|
+
(): void;
|
|
42
38
|
/**
|
|
43
39
|
* Makes it possible to access the requestHandler through the exported function.
|
|
44
40
|
* If you need to test the function separately, without starting the server
|
|
@@ -49,7 +45,7 @@ export declare function put(options: Omit<EndpointOptions, OmittedFields>): {
|
|
|
49
45
|
unregister(): void;
|
|
50
46
|
};
|
|
51
47
|
export declare function patch(options: Omit<EndpointOptions, OmittedFields>): {
|
|
52
|
-
(
|
|
48
|
+
(): void;
|
|
53
49
|
/**
|
|
54
50
|
* Makes it possible to access the requestHandler through the exported function.
|
|
55
51
|
* If you need to test the function separately, without starting the server
|
|
@@ -60,7 +56,7 @@ export declare function patch(options: Omit<EndpointOptions, OmittedFields>): {
|
|
|
60
56
|
unregister(): void;
|
|
61
57
|
};
|
|
62
58
|
export declare function del(options: Omit<EndpointOptions, OmittedFields>): {
|
|
63
|
-
(
|
|
59
|
+
(): void;
|
|
64
60
|
/**
|
|
65
61
|
* Makes it possible to access the requestHandler through the exported function.
|
|
66
62
|
* If you need to test the function separately, without starting the server
|
|
@@ -74,7 +70,7 @@ export declare function del(options: Omit<EndpointOptions, OmittedFields>): {
|
|
|
74
70
|
* @deprecated Use internal.get, internal.post, internal.put, internal.patch, internal.del instead
|
|
75
71
|
*/
|
|
76
72
|
export declare function internal(options: Omit<EndpointOptions, "internal">): {
|
|
77
|
-
(
|
|
73
|
+
(): void;
|
|
78
74
|
/**
|
|
79
75
|
* Makes it possible to access the requestHandler through the exported function.
|
|
80
76
|
* If you need to test the function separately, without starting the server
|
|
@@ -86,7 +82,7 @@ export declare function internal(options: Omit<EndpointOptions, "internal">): {
|
|
|
86
82
|
};
|
|
87
83
|
export declare namespace internal {
|
|
88
84
|
var get: (options: Omit<EndpointOptions, OmittedFields>) => {
|
|
89
|
-
(
|
|
85
|
+
(): void;
|
|
90
86
|
/**
|
|
91
87
|
* Makes it possible to access the requestHandler through the exported function.
|
|
92
88
|
* If you need to test the function separately, without starting the server
|
|
@@ -97,7 +93,7 @@ export declare namespace internal {
|
|
|
97
93
|
unregister(): void;
|
|
98
94
|
};
|
|
99
95
|
var post: (options: Omit<EndpointOptions, OmittedFields>) => {
|
|
100
|
-
(
|
|
96
|
+
(): void;
|
|
101
97
|
/**
|
|
102
98
|
* Makes it possible to access the requestHandler through the exported function.
|
|
103
99
|
* If you need to test the function separately, without starting the server
|
|
@@ -108,7 +104,7 @@ export declare namespace internal {
|
|
|
108
104
|
unregister(): void;
|
|
109
105
|
};
|
|
110
106
|
var put: (options: Omit<EndpointOptions, OmittedFields>) => {
|
|
111
|
-
(
|
|
107
|
+
(): void;
|
|
112
108
|
/**
|
|
113
109
|
* Makes it possible to access the requestHandler through the exported function.
|
|
114
110
|
* If you need to test the function separately, without starting the server
|
|
@@ -119,7 +115,7 @@ export declare namespace internal {
|
|
|
119
115
|
unregister(): void;
|
|
120
116
|
};
|
|
121
117
|
var patch: (options: Omit<EndpointOptions, OmittedFields>) => {
|
|
122
|
-
(
|
|
118
|
+
(): void;
|
|
123
119
|
/**
|
|
124
120
|
* Makes it possible to access the requestHandler through the exported function.
|
|
125
121
|
* If you need to test the function separately, without starting the server
|
|
@@ -130,7 +126,7 @@ export declare namespace internal {
|
|
|
130
126
|
unregister(): void;
|
|
131
127
|
};
|
|
132
128
|
var del: (options: Omit<EndpointOptions, OmittedFields>) => {
|
|
133
|
-
(
|
|
129
|
+
(): void;
|
|
134
130
|
/**
|
|
135
131
|
* Makes it possible to access the requestHandler through the exported function.
|
|
136
132
|
* If you need to test the function separately, without starting the server
|
|
@@ -227,8 +223,13 @@ export declare const endpointMetadata: {
|
|
|
227
223
|
export interface ApiInterfaceOptions {
|
|
228
224
|
/** Name of the service */
|
|
229
225
|
serviceName: string;
|
|
230
|
-
/**
|
|
231
|
-
|
|
226
|
+
/** Logger instance to log with */
|
|
227
|
+
logger: typeof pgdsLogger;
|
|
228
|
+
/**
|
|
229
|
+
* Default log level for the service
|
|
230
|
+
* @deprecated Use process.env.LOG_LEVEL instead
|
|
231
|
+
*/
|
|
232
|
+
serviceLogLevel?: string;
|
|
232
233
|
/** Whether to use typescript or not */
|
|
233
234
|
typescript: boolean;
|
|
234
235
|
/** Global version of the API @default v1. Can be overridden per endpoint */
|
|
@@ -242,13 +243,7 @@ export interface ApiInterfaceOptions {
|
|
|
242
243
|
onUncaughtException?: (err: Error) => void;
|
|
243
244
|
/** Maximum length of a parameter. @default 2000 after which the default route is used */
|
|
244
245
|
maxParamLength?: number;
|
|
245
|
-
legacyMode?: boolean;
|
|
246
246
|
}
|
|
247
247
|
export declare function getApiOptions(): ApiInterfaceOptions;
|
|
248
|
-
export declare function setupApiInterface(options: Omit<ApiInterfaceOptions, "legacyMode">): Promise<Server>;
|
|
249
|
-
/**
|
|
250
|
-
* Legacy option to enable legacy mode where the server is started with hiot-restify5.
|
|
251
|
-
* Should only be used (as a temporary solution) where the new server setup is not possible without a complete refactor
|
|
252
|
-
*/
|
|
253
|
-
export declare function setupInterfaceLegacy(options: Omit<ApiInterfaceOptions, "legacyMode">): (locator: Locator) => Promise<Locator>;
|
|
254
248
|
export declare function getServiceName(): string;
|
|
249
|
+
export declare function setupApiInterface(options: ApiInterfaceOptions): Promise<Server>;
|
package/lib/index.js
CHANGED
|
@@ -109,9 +109,8 @@ exports.patch = patch;
|
|
|
109
109
|
exports.del = del;
|
|
110
110
|
exports.internal = internal;
|
|
111
111
|
exports.getApiOptions = getApiOptions;
|
|
112
|
-
exports.setupApiInterface = setupApiInterface;
|
|
113
|
-
exports.setupInterfaceLegacy = setupInterfaceLegacy;
|
|
114
112
|
exports.getServiceName = getServiceName;
|
|
113
|
+
exports.setupApiInterface = setupApiInterface;
|
|
115
114
|
var axios_1 = require("axios");
|
|
116
115
|
var fs = __importStar(require("fs/promises"));
|
|
117
116
|
var restifyErrors = __importStar(require("restify-errors"));
|
|
@@ -120,11 +119,9 @@ var constants_1 = require("./constants/constants");
|
|
|
120
119
|
var server_1 = require("./server/server");
|
|
121
120
|
var asyncHooks_1 = require("./utils/asyncHooks");
|
|
122
121
|
var jsonSchemaUtils_1 = require("./utils/jsonSchemaUtils");
|
|
123
|
-
var logger_1 =
|
|
122
|
+
var logger_1 = require("./utils/logger");
|
|
124
123
|
var urlUtils_1 = require("./utils/urlUtils");
|
|
125
|
-
// the above module as ts types
|
|
126
124
|
var mustbe = require("mustbe");
|
|
127
|
-
var serverLogger;
|
|
128
125
|
var Method;
|
|
129
126
|
(function (Method) {
|
|
130
127
|
Method["Post"] = "post";
|
|
@@ -207,19 +204,12 @@ function registerEndpoint(options) {
|
|
|
207
204
|
if (addToMetadata) {
|
|
208
205
|
exports.endpointMetadata[options.method][options.path] = metadata;
|
|
209
206
|
}
|
|
210
|
-
|
|
211
|
-
* @param legacyServer only required for legacy mode
|
|
212
|
-
*/
|
|
213
|
-
var fn = function (legacyServer) {
|
|
207
|
+
var fn = function () {
|
|
214
208
|
var _a;
|
|
215
|
-
|
|
216
|
-
if (apiOptions.legacyMode && !legacyServer) {
|
|
217
|
-
throw new Error("Passing in server to the endpoint is required when running in legacy mode");
|
|
218
|
-
}
|
|
219
|
-
serverLogger.info("Registering endpoint: ".concat(options.method.toUpperCase(), " ").concat(options.path));
|
|
209
|
+
getServerChildLogger().info("Registering endpoint: ".concat(options.method.toUpperCase(), " ").concat(options.path));
|
|
220
210
|
var routeHelpers = mustbe.routeHelpers();
|
|
221
211
|
var routeOptions = {
|
|
222
|
-
path: (0, urlUtils_1.route)((
|
|
212
|
+
path: (0, urlUtils_1.route)((_a = options.version) !== null && _a !== void 0 ? _a : apiVersion, options.path, options.internal),
|
|
223
213
|
};
|
|
224
214
|
if (options.opts) {
|
|
225
215
|
routeOptions = __assign(__assign({}, routeOptions), options.opts);
|
|
@@ -300,7 +290,7 @@ function registerEndpoint(options) {
|
|
|
300
290
|
handlers: requestHandlers,
|
|
301
291
|
};
|
|
302
292
|
// @ts-ignore
|
|
303
|
-
|
|
293
|
+
server_1.server[pendingRoute.method].apply(server_1.server, __spreadArray([pendingRoute.opts], pendingRoute.handlers, false));
|
|
304
294
|
};
|
|
305
295
|
/**
|
|
306
296
|
* Makes it possible to access the requestHandler through the exported function.
|
|
@@ -330,7 +320,7 @@ function handleErrors(err, next) {
|
|
|
330
320
|
console.log(require("util").inspect(err, null, null, true));
|
|
331
321
|
}
|
|
332
322
|
else {
|
|
333
|
-
|
|
323
|
+
getServerChildLogger().error(err);
|
|
334
324
|
}
|
|
335
325
|
if (err instanceof restifyErrors.HttpError) {
|
|
336
326
|
return next(err);
|
|
@@ -377,49 +367,19 @@ var apiOptions = {};
|
|
|
377
367
|
function getApiOptions() {
|
|
378
368
|
return apiOptions;
|
|
379
369
|
}
|
|
380
|
-
function setupApiInterface(options) {
|
|
381
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
382
|
-
var opts;
|
|
383
|
-
return __generator(this, function (_a) {
|
|
384
|
-
switch (_a.label) {
|
|
385
|
-
case 0:
|
|
386
|
-
opts = __assign(__assign({}, options), { legacyMode: false });
|
|
387
|
-
return [4 /*yield*/, setup(opts)];
|
|
388
|
-
case 1: return [2 /*return*/, (_a.sent())];
|
|
389
|
-
}
|
|
390
|
-
});
|
|
391
|
-
});
|
|
392
|
-
}
|
|
393
|
-
/**
|
|
394
|
-
* Legacy option to enable legacy mode where the server is started with hiot-restify5.
|
|
395
|
-
* Should only be used (as a temporary solution) where the new server setup is not possible without a complete refactor
|
|
396
|
-
*/
|
|
397
|
-
function setupInterfaceLegacy(options) {
|
|
398
|
-
var _this = this;
|
|
399
|
-
var opts = __assign(__assign({}, options), { legacyMode: true });
|
|
400
|
-
return function (locator) { return __awaiter(_this, void 0, void 0, function () {
|
|
401
|
-
return __generator(this, function (_a) {
|
|
402
|
-
switch (_a.label) {
|
|
403
|
-
case 0: return [4 /*yield*/, setup(opts)];
|
|
404
|
-
case 1:
|
|
405
|
-
_a.sent();
|
|
406
|
-
return [2 /*return*/, locator];
|
|
407
|
-
}
|
|
408
|
-
});
|
|
409
|
-
}); };
|
|
410
|
-
}
|
|
411
370
|
var serviceName = "";
|
|
412
371
|
function getServiceName() {
|
|
413
372
|
return serviceName;
|
|
414
373
|
}
|
|
415
|
-
function
|
|
374
|
+
function setupApiInterface(options) {
|
|
416
375
|
return __awaiter(this, void 0, void 0, function () {
|
|
417
|
-
var inApiVersion, port,
|
|
376
|
+
var inApiVersion, port, inServiceName, typescript, onUncaughtException, schemaBasePath, _a, shouldRegisterMetadataEndpoint, maxParamLength, logger, files, err_2, server;
|
|
418
377
|
return __generator(this, function (_b) {
|
|
419
378
|
switch (_b.label) {
|
|
420
379
|
case 0:
|
|
421
380
|
apiOptions = options;
|
|
422
|
-
inApiVersion = options.apiVersion, port = options.port,
|
|
381
|
+
inApiVersion = options.apiVersion, port = options.port, inServiceName = options.serviceName, typescript = options.typescript, onUncaughtException = options.onUncaughtException, schemaBasePath = options.schemaBasePath, _a = options.registerMetadataEndpoint, shouldRegisterMetadataEndpoint = _a === void 0 ? true : _a, maxParamLength = options.maxParamLength, logger = options.logger;
|
|
382
|
+
(0, logger_1.setLogger)(logger);
|
|
423
383
|
apiVersion = inApiVersion;
|
|
424
384
|
serviceName = inServiceName;
|
|
425
385
|
if (!(typescript &&
|
|
@@ -443,20 +403,19 @@ function setup(options) {
|
|
|
443
403
|
}
|
|
444
404
|
return [3 /*break*/, 4];
|
|
445
405
|
case 4:
|
|
446
|
-
(0, logger_1.setupLogger)(serviceName, serviceLogLevel);
|
|
447
|
-
serverLogger = (0, logger_1.createLogger)("".concat(serviceName, ":hiot-api-interface:server"));
|
|
448
|
-
if (!!legacyMode) return [3 /*break*/, 6];
|
|
449
406
|
(0, mustbeConfig_1.configureMustBe)();
|
|
450
|
-
return [4 /*yield*/, (0, server_1.startServer)({
|
|
407
|
+
return [4 /*yield*/, (0, server_1.startServer)({ port: port, onUncaughtException: onUncaughtException, maxParamLength: maxParamLength })];
|
|
451
408
|
case 5:
|
|
452
|
-
|
|
409
|
+
server = _b.sent();
|
|
453
410
|
if (shouldRegisterMetadataEndpoint) {
|
|
454
411
|
registerMetadataEndpoint();
|
|
455
412
|
}
|
|
456
|
-
return [2 /*return*/,
|
|
457
|
-
case 6: return [2 /*return*/];
|
|
413
|
+
return [2 /*return*/, server];
|
|
458
414
|
}
|
|
459
415
|
});
|
|
460
416
|
});
|
|
461
417
|
}
|
|
418
|
+
function getServerChildLogger() {
|
|
419
|
+
return (0, logger_1.getLogger)().child({ part: "server" });
|
|
420
|
+
}
|
|
462
421
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
package/lib/server/server.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Server } from "restify";
|
|
2
2
|
interface ServerOptions {
|
|
3
|
-
serviceName: string;
|
|
4
3
|
port: number;
|
|
5
4
|
onUncaughtException?: (err: Error) => void;
|
|
6
5
|
/** Legacy option to register routes the old way */
|
|
@@ -9,5 +8,5 @@ interface ServerOptions {
|
|
|
9
8
|
}
|
|
10
9
|
export declare const server: Server;
|
|
11
10
|
export declare const closeServer: () => any;
|
|
12
|
-
export declare function startServer({
|
|
11
|
+
export declare function startServer({ port, onUncaughtException, maxParamLength }: ServerOptions): Promise<Server>;
|
|
13
12
|
export {};
|
package/lib/server/server.js
CHANGED
|
@@ -74,7 +74,6 @@ exports.startServer = startServer;
|
|
|
74
74
|
var restify_1 = require("restify");
|
|
75
75
|
var restifyErrors = __importStar(require("restify-errors"));
|
|
76
76
|
var logger_1 = require("../utils/logger");
|
|
77
|
-
var __1 = require("..");
|
|
78
77
|
var _server;
|
|
79
78
|
exports.server = new Proxy({}, {
|
|
80
79
|
get: function (_target, prop, _receiver) {
|
|
@@ -82,10 +81,7 @@ exports.server = new Proxy({}, {
|
|
|
82
81
|
return _server[prop];
|
|
83
82
|
}
|
|
84
83
|
else {
|
|
85
|
-
|
|
86
|
-
if (!(0, __1.getApiOptions)().legacyMode) {
|
|
87
|
-
throw new Error("setupApiInterface has to be run before accessing server");
|
|
88
|
-
}
|
|
84
|
+
throw new Error("setupApiInterface has to be run before accessing server");
|
|
89
85
|
}
|
|
90
86
|
},
|
|
91
87
|
});
|
|
@@ -94,11 +90,11 @@ exports.closeServer = closeServer;
|
|
|
94
90
|
function startServer(_a) {
|
|
95
91
|
return __awaiter(this, arguments, void 0, function (_b) {
|
|
96
92
|
var childLogger, audit, client, register, address;
|
|
97
|
-
var
|
|
93
|
+
var port = _b.port, onUncaughtException = _b.onUncaughtException, maxParamLength = _b.maxParamLength;
|
|
98
94
|
return __generator(this, function (_c) {
|
|
99
95
|
switch (_c.label) {
|
|
100
96
|
case 0:
|
|
101
|
-
childLogger = (0, logger_1.
|
|
97
|
+
childLogger = (0, logger_1.getLogger)().child({ part: "server" });
|
|
102
98
|
_server = (0, restify_1.createServer)({
|
|
103
99
|
log: childLogger,
|
|
104
100
|
handleUncaughtExceptions: true,
|
package/lib/server/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,11 +12,11 @@ exports.jsonSchemaValidationMiddleware = jsonSchemaValidationMiddleware;
|
|
|
12
12
|
var __1 = require("..");
|
|
13
13
|
var path_1 = require("path");
|
|
14
14
|
var typescript_json_schema_1 = require("typescript-json-schema");
|
|
15
|
-
var logger_1 = __importDefault(require("./logger"));
|
|
16
15
|
var constants_1 = require("../constants/constants");
|
|
17
16
|
var restify_errors_1 = require("restify-errors");
|
|
18
17
|
var ajv_1 = __importDefault(require("ajv"));
|
|
19
18
|
var ajv_formats_1 = __importDefault(require("ajv-formats"));
|
|
19
|
+
var logger_1 = require("./logger");
|
|
20
20
|
/** Speeds up loading schemas when testing by only loading the schemas once instead of once per test file */
|
|
21
21
|
exports.schemaCache = new Map();
|
|
22
22
|
function getSchemas(schemaNames) {
|
|
@@ -63,7 +63,7 @@ function getSchema(schemaName) {
|
|
|
63
63
|
console.error("error: schema ".concat(schemaName, " not found"));
|
|
64
64
|
}
|
|
65
65
|
else {
|
|
66
|
-
logger_1.
|
|
66
|
+
(0, logger_1.getLogger)().error("error: schema ".concat(schemaName, " not found"));
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonSchemaUtils.js","sourceRoot":"","sources":["jsonSchemaUtils.ts"],"names":[],"mappings":";;;;;;AAaA,gCA0CC;AAED,8BAUC;AAED,wDAqBC;AAgBD,oDA2BC;AA0CD,wEAsBC;AArMD,
|
|
1
|
+
{"version":3,"file":"jsonSchemaUtils.js","sourceRoot":"","sources":["jsonSchemaUtils.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/logger.d.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import
|
|
2
|
-
export declare function
|
|
3
|
-
export declare function
|
|
4
|
-
declare const _default: bunyan;
|
|
5
|
-
export default _default;
|
|
1
|
+
import { logger as pgdsLogger } from "@pgds/utils/logging";
|
|
2
|
+
export declare function setLogger(inLogger: typeof pgdsLogger): void;
|
|
3
|
+
export declare function getLogger(): import("bunyan");
|
package/lib/utils/logger.js
CHANGED
|
@@ -1,33 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.
|
|
5
|
-
var
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
var serviceLogLevel = "";
|
|
9
|
-
var logger = undefined;
|
|
10
|
-
function setupLogger(inServiceName, inServiceLogLevel) {
|
|
11
|
-
serviceName = inServiceName;
|
|
12
|
-
serviceLogLevel = inServiceLogLevel;
|
|
13
|
-
logger = createLogger(serviceName);
|
|
3
|
+
exports.setLogger = setLogger;
|
|
4
|
+
exports.getLogger = getLogger;
|
|
5
|
+
var logger = null;
|
|
6
|
+
function setLogger(inLogger) {
|
|
7
|
+
logger = inLogger;
|
|
14
8
|
}
|
|
15
|
-
function
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
});
|
|
9
|
+
function getLogger() {
|
|
10
|
+
if (!logger) {
|
|
11
|
+
/** Should never happen */
|
|
12
|
+
throw new Error("setupApiInterface has to be run before accessing logger");
|
|
13
|
+
}
|
|
14
|
+
return logger;
|
|
22
15
|
}
|
|
23
|
-
exports.default = new Proxy({}, {
|
|
24
|
-
get: function (_target, prop, _receiver) {
|
|
25
|
-
if (logger && prop in logger) {
|
|
26
|
-
return logger[prop];
|
|
27
|
-
}
|
|
28
|
-
else {
|
|
29
|
-
return function () { };
|
|
30
|
-
}
|
|
31
|
-
},
|
|
32
|
-
});
|
|
33
16
|
//# sourceMappingURL=logger.js.map
|
package/lib/utils/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["logger.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["logger.ts"],"names":[],"mappings":";;AAIA,8BAEC;AAED,8BAOC;AAbD,IAAI,MAAM,GAA6B,IAAI,CAAC;AAE5C,SAAgB,SAAS,CAAC,QAA2B;IACnD,MAAM,GAAG,QAAQ,CAAC;AACpB,CAAC;AAED,SAAgB,SAAS;IACvB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,0BAA0B;QAC1B,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IAED,OAAO,MAAO,CAAC;AACjB,CAAC"}
|