@routr/common 2.13.0 → 2.13.2
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/connect/client.js +5 -9
- package/dist/protos/location.proto +2 -2
- package/dist/requester/grpc_client.js +2 -7
- package/dist/response.d.ts +1 -1
- package/dist/response.js +3 -3
- package/dist/service.d.ts +7 -0
- package/dist/service.js +4 -4
- package/dist/types.d.ts +2 -1
- package/dist/types.js +1 -0
- package/dist/verifier/grpc_client.js +2 -7
- package/package.json +2 -2
package/dist/connect/client.js
CHANGED
|
@@ -47,13 +47,7 @@ const grpc = __importStar(require("@grpc/grpc-js"));
|
|
|
47
47
|
const helper_1 = require("../helper");
|
|
48
48
|
const types_1 = require("./types");
|
|
49
49
|
const protoLoader = require("@grpc/proto-loader");
|
|
50
|
-
const
|
|
51
|
-
keepCase: false,
|
|
52
|
-
longs: String,
|
|
53
|
-
enums: String,
|
|
54
|
-
defaults: false,
|
|
55
|
-
oneofs: true
|
|
56
|
-
};
|
|
50
|
+
const service_1 = require("../service");
|
|
57
51
|
function getProtoPath(kind) {
|
|
58
52
|
switch (kind) {
|
|
59
53
|
case types_1.Kind.ACL:
|
|
@@ -65,7 +59,7 @@ function getProtoPath(kind) {
|
|
|
65
59
|
}
|
|
66
60
|
}
|
|
67
61
|
function createConnectClient(options) {
|
|
68
|
-
const def = protoLoader.loadSync(getProtoPath(options.kind),
|
|
62
|
+
const def = protoLoader.loadSync(getProtoPath(options.kind), service_1.protoLoadOptions);
|
|
69
63
|
const descriptor = grpc.loadPackageDefinition(def);
|
|
70
64
|
const base = descriptor.fonoster.routr.connect;
|
|
71
65
|
switch (options.kind) {
|
|
@@ -79,7 +73,9 @@ function createConnectClient(options) {
|
|
|
79
73
|
}
|
|
80
74
|
exports.createConnectClient = createConnectClient;
|
|
81
75
|
function createConnectService(kind) {
|
|
82
|
-
|
|
76
|
+
// Here we set defaults to simplify partial updates
|
|
77
|
+
const actualProtoOptions = Object.assign(Object.assign({}, service_1.protoLoadOptions), { defaults: false });
|
|
78
|
+
const def = protoLoader.loadSync(getProtoPath(kind), actualProtoOptions);
|
|
83
79
|
const descriptor = grpc.loadPackageDefinition(def);
|
|
84
80
|
const base = descriptor.fonoster.routr.connect;
|
|
85
81
|
switch (kind) {
|
|
@@ -65,13 +65,13 @@ message AddRouteRequest {
|
|
|
65
65
|
|
|
66
66
|
message FindRoutesRequest {
|
|
67
67
|
message Backend {
|
|
68
|
-
enum
|
|
68
|
+
enum Algorithm {
|
|
69
69
|
ROUND_ROBIN = 0;
|
|
70
70
|
LEAST_SESSIONS = 1;
|
|
71
71
|
}
|
|
72
72
|
string ref = 1;
|
|
73
73
|
bool with_session_affinity = 2;
|
|
74
|
-
|
|
74
|
+
Algorithm algorithm = 3;
|
|
75
75
|
}
|
|
76
76
|
string call_id = 1;
|
|
77
77
|
string aor = 2;
|
|
@@ -44,13 +44,8 @@ exports.REQUESTER_PROTO = void 0;
|
|
|
44
44
|
*/
|
|
45
45
|
const grpc = __importStar(require("@grpc/grpc-js"));
|
|
46
46
|
const protoLoader = require("@grpc/proto-loader");
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
longs: String,
|
|
50
|
-
enums: String,
|
|
51
|
-
defaults: false,
|
|
52
|
-
oneofs: true
|
|
53
|
-
});
|
|
47
|
+
const service_1 = require("../service");
|
|
48
|
+
const packageDefinition = protoLoader.loadSync(__dirname + "/../protos/requester.proto", service_1.protoLoadOptions);
|
|
54
49
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
55
50
|
const protoDescriptor = grpc.loadPackageDefinition(packageDefinition);
|
|
56
51
|
exports.REQUESTER_PROTO = protoDescriptor.fonoster.routr.requester;
|
package/dist/response.d.ts
CHANGED
|
@@ -31,7 +31,7 @@ export declare const createServerInternalErrorResponse: (metadata?: Record<strin
|
|
|
31
31
|
reasonPhrase: string;
|
|
32
32
|
};
|
|
33
33
|
};
|
|
34
|
-
export declare const
|
|
34
|
+
export declare const createForbiddenResponse: (metadata?: Record<string, string>) => {
|
|
35
35
|
metadata: Record<string, string>;
|
|
36
36
|
message: {
|
|
37
37
|
responseType: ResponseType;
|
package/dist/response.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.createForbiddenResponse = exports.createServerInternalErrorResponse = exports.createUnauthorizedResponseWithoutChallenge = exports.createUnauthorizedResponse = void 0;
|
|
4
4
|
/*
|
|
5
5
|
* Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
|
|
6
6
|
* http://github.com/fonoster/routr
|
|
@@ -59,7 +59,7 @@ const createServerInternalErrorResponse = (metadata) => {
|
|
|
59
59
|
};
|
|
60
60
|
};
|
|
61
61
|
exports.createServerInternalErrorResponse = createServerInternalErrorResponse;
|
|
62
|
-
const
|
|
62
|
+
const createForbiddenResponse = (metadata) => {
|
|
63
63
|
return {
|
|
64
64
|
metadata,
|
|
65
65
|
message: {
|
|
@@ -68,4 +68,4 @@ const createForbideenResponse = (metadata) => {
|
|
|
68
68
|
}
|
|
69
69
|
};
|
|
70
70
|
};
|
|
71
|
-
exports.
|
|
71
|
+
exports.createForbiddenResponse = createForbiddenResponse;
|
package/dist/service.d.ts
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
import { ObjectProto, ServiceInfo } from "./types";
|
|
2
2
|
import { ServiceDefinitionNotFoundError } from "./errors";
|
|
3
|
+
export declare const protoLoadOptions: {
|
|
4
|
+
keepCase: boolean;
|
|
5
|
+
longs: StringConstructor;
|
|
6
|
+
enums: StringConstructor;
|
|
7
|
+
defaults: boolean;
|
|
8
|
+
oneofs: boolean;
|
|
9
|
+
};
|
|
3
10
|
export declare const PROCESSOR_OBJECT_PROTO: unknown;
|
|
4
11
|
export declare const LOCATION_OBJECT_PROTO: unknown;
|
|
5
12
|
/**
|
package/dist/service.js
CHANGED
|
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.getObjectProto = exports.LOCATION_OBJECT_PROTO = exports.PROCESSOR_OBJECT_PROTO = void 0;
|
|
26
|
+
exports.getObjectProto = exports.LOCATION_OBJECT_PROTO = exports.PROCESSOR_OBJECT_PROTO = exports.protoLoadOptions = void 0;
|
|
27
27
|
/*
|
|
28
28
|
* Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
|
|
29
29
|
* http://github.com/fonoster/routr
|
|
@@ -49,11 +49,11 @@ const logger_1 = require("@fonoster/logger");
|
|
|
49
49
|
const grpc_health_check_1 = require("grpc-health-check");
|
|
50
50
|
const common_1 = require("@fonoster/common");
|
|
51
51
|
const logger = (0, logger_1.getLogger)({ service: "common", filePath: __filename });
|
|
52
|
-
|
|
52
|
+
exports.protoLoadOptions = {
|
|
53
53
|
keepCase: false,
|
|
54
54
|
longs: String,
|
|
55
55
|
enums: String,
|
|
56
|
-
defaults:
|
|
56
|
+
defaults: true,
|
|
57
57
|
oneofs: true
|
|
58
58
|
};
|
|
59
59
|
// TODO: Get version from the proto or package
|
|
@@ -77,7 +77,7 @@ exports.LOCATION_OBJECT_PROTO = getObjectProto({
|
|
|
77
77
|
*/
|
|
78
78
|
function getObjectProto(objectProto) {
|
|
79
79
|
var _a, _b;
|
|
80
|
-
const definitions = protoLoader.loadSync(objectProto.path,
|
|
80
|
+
const definitions = protoLoader.loadSync(objectProto.path, exports.protoLoadOptions);
|
|
81
81
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
82
82
|
const objProto = (_b = (_a = grpc.loadPackageDefinition(definitions)) === null || _a === void 0 ? void 0 : _a.fonoster) === null || _b === void 0 ? void 0 : _b.routr[objectProto.name];
|
|
83
83
|
return (objProto === null || objProto === void 0 ? void 0 : objProto[objectProto.version])
|
package/dist/types.d.ts
CHANGED
|
@@ -40,7 +40,8 @@ export declare enum ExtraHeader {
|
|
|
40
40
|
SESSION_COUNT = "X-Session-Count",
|
|
41
41
|
DOD_NUMBER = "X-DOD-Number",
|
|
42
42
|
DOD_PRIVACY = "X-DOD-Privacy",
|
|
43
|
-
CONNECT_TOKEN = "X-Connect-Token"
|
|
43
|
+
CONNECT_TOKEN = "X-Connect-Token",
|
|
44
|
+
CALL_DIRECTION = "X-Call-Direction"
|
|
44
45
|
}
|
|
45
46
|
export declare enum Privacy {
|
|
46
47
|
NONE = "NONE",
|
package/dist/types.js
CHANGED
|
@@ -44,6 +44,7 @@ var ExtraHeader;
|
|
|
44
44
|
ExtraHeader["DOD_NUMBER"] = "X-DOD-Number";
|
|
45
45
|
ExtraHeader["DOD_PRIVACY"] = "X-DOD-Privacy";
|
|
46
46
|
ExtraHeader["CONNECT_TOKEN"] = "X-Connect-Token";
|
|
47
|
+
ExtraHeader["CALL_DIRECTION"] = "X-Call-Direction";
|
|
47
48
|
})(ExtraHeader = exports.ExtraHeader || (exports.ExtraHeader = {}));
|
|
48
49
|
var Privacy;
|
|
49
50
|
(function (Privacy) {
|
|
@@ -44,13 +44,8 @@ exports.VERIFIER_PROTO = void 0;
|
|
|
44
44
|
*/
|
|
45
45
|
const grpc = __importStar(require("@grpc/grpc-js"));
|
|
46
46
|
const protoLoader = require("@grpc/proto-loader");
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
longs: String,
|
|
50
|
-
enums: String,
|
|
51
|
-
defaults: false,
|
|
52
|
-
oneofs: true
|
|
53
|
-
});
|
|
47
|
+
const service_1 = require("../service");
|
|
48
|
+
const packageDefinition = protoLoader.loadSync(__dirname + "/../protos/verifier.proto", service_1.protoLoadOptions);
|
|
54
49
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
55
50
|
const protoDescriptor = grpc.loadPackageDefinition(packageDefinition);
|
|
56
51
|
exports.VERIFIER_PROTO = protoDescriptor.fonoster.verifier;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@routr/common",
|
|
3
|
-
"version": "2.13.
|
|
3
|
+
"version": "2.13.2",
|
|
4
4
|
"description": "Common package",
|
|
5
5
|
"author": "Pedro Sanders <psanders@fonoster.com>",
|
|
6
6
|
"homepage": "https://github.com/fonoster/routr#readme",
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"devDependencies": {
|
|
56
56
|
"@types/js-yaml": "^4.0.5"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "436dcb17642fe836e4cc75dcd2e277e2bc3fc422"
|
|
59
59
|
}
|