@gravity-ui/gateway 4.1.1-alpha.0 → 4.1.2-alpha.0

package/dist/commonjs/components/grpc.js

@@ -53,17 +53,17 @@ const common_js_1 = require("../models/common.js");
 const common_js_2 = require("../utils/common.js");
 const grpc_reflection_js_1 = require("../utils/grpc-reflection.js");
 const grpc_js_1 = require("../utils/grpc.js");
+const package_root_js_1 = require("../utils/package-root.js");
 const parse_error_js_1 = require("../utils/parse-error.js");
 const proto_path_resolver_js_1 = require("../utils/proto-path-resolver.js");
 const redact_sensitive_headers_js_1 = require("../utils/redact-sensitive-headers.js");
-const source_dir_js_1 = require("../utils/source-dir.js");
 const validate_js_1 = require("../utils/validate.js");
-const grpcLoaderOptions = Object.assign(Object.assign({}, constants_js_1.DEFAULT_PROTO_LOADER_OPTIONS), { includeDirs: [path_1.default.join(source_dir_js_1.sourceDir, '../proto')] });
+const grpcLoaderOptions = Object.assign(Object.assign({}, constants_js_1.DEFAULT_PROTO_LOADER_OPTIONS), { includeDirs: [path_1.default.join(package_root_js_1.packageRoot, 'proto')] });
 function createRoot(includeGrpcPaths) {
     const root = new protobufjs.Root();
-    root.loadSync(path_1.default.resolve(source_dir_js_1.sourceDir, '../proto/google/rpc/code.proto'));
-    root.loadSync(path_1.default.resolve(source_dir_js_1.sourceDir, '../proto/google/rpc/error_details.proto'));
-    root.loadSync(path_1.default.resolve(source_dir_js_1.sourceDir, '../proto/google/rpc/status.proto'));
+    root.loadSync(path_1.default.resolve(package_root_js_1.packageRoot, 'proto/google/rpc/code.proto'));
+    root.loadSync(path_1.default.resolve(package_root_js_1.packageRoot, 'proto/google/rpc/error_details.proto'));
+    root.loadSync(path_1.default.resolve(package_root_js_1.packageRoot, 'proto/google/rpc/status.proto'));
     // Load well-known internal protobufjs types
     root.loadSync('google/protobuf/struct.proto');
     root.loadSync('google/protobuf/wrappers.proto');

package/dist/commonjs/constants.js

@@ -34,10 +34,13 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AXIOS_RETRY_NAMESPACE = exports.DEFAULT_VALIDATION_SCHEMA = exports.RECREATE_SERVICE_CODES = exports.RETRYABLE_STATUS_CODES = exports.ANY_ACTION_SYMBOL = exports.ECMA_STRING_SIZE = exports.DEFAULT_PROTO_LOADER_OPTIONS = exports.DEFAULT_GRPC_OPTIONS = exports.DEFAULT_AXIOS_OPTIONS = exports.DEFAULT_PROXY_HEADERS = exports.DEFAULT_LANG_HEADER = exports.DEFAULT_TIMEOUT = exports.Lang = exports.VERSION = void 0;
+const fs = __importStar(require("fs"));
 const http = __importStar(require("http"));
 const https = __importStar(require("https"));
+const path = __importStar(require("path"));
 const grpc = __importStar(require("@grpc/grpc-js"));
-const packageJson = require('../package.json');
+const package_root_js_1 = require("./utils/package-root.js");
+const packageJson = JSON.parse(fs.readFileSync(path.resolve(package_root_js_1.packageRoot, 'package.json'), 'utf-8'));
 exports.VERSION = packageJson.version;
 var Lang;
 (function (Lang) {

package/dist/commonjs/utils/grpc-reflection.js

@@ -42,14 +42,16 @@ const lodash_1 = __importDefault(require("lodash"));
 const protobufjs = __importStar(require("protobufjs"));
 const proto_path_resolver_js_1 = require("./proto-path-resolver.js");
 const reflectionClientsMap = {};
-function getCachedClient(actionEndpoint, credentials, grpcOptions, descriptorExtensionProto) {
+async function getCachedClient(actionEndpoint, credentials, grpcOptions, descriptorExtensionProto) {
     const cacheKey = [actionEndpoint, JSON.stringify([grpcOptions, descriptorExtensionProto])];
     let clientWithCache = lodash_1.default.get(reflectionClientsMap, cacheKey);
     if (!clientWithCache) {
-        const grpcReflection = require('grpc-reflection-js');
+        const grpcReflection = await import('grpc-reflection-js');
         let descriptorRoot;
         if (descriptorExtensionProto) {
-            descriptorRoot = protobufjs.Root.fromJSON(require('protobufjs/ext/descriptor'));
+            descriptorRoot = protobufjs.Root.fromJSON(
+            // @ts-expect-error no typings for default export
+            (await import('protobufjs/ext/descriptor/index.js')).default);
             if (Array.isArray(descriptorExtensionProto)) {
                 descriptorRoot.loadSync(descriptorExtensionProto);
             }
@@ -58,7 +60,9 @@ function getCachedClient(actionEndpoint, credentials, grpcOptions, descriptorExt
                 descriptorRoot.loadSync(descriptorExtensionProto.filenames);
             }
         }
-        const client = new grpcReflection.Client(actionEndpoint, credentials, grpcOptions, undefined, descriptorRoot);
+        const client = new grpcReflection.Client(actionEndpoint, credentials, grpcOptions, undefined, 
+        // @ts-ignore this parameter is present only in the patched version
+        descriptorRoot);
         clientWithCache = { client, reflectionRootPromiseMap: {} };
         lodash_1.default.set(reflectionClientsMap, cacheKey, clientWithCache);
     }
@@ -75,7 +79,7 @@ function getCachedClient(actionEndpoint, credentials, grpcOptions, descriptorExt
  * use toJSON for get a JSON descriptor.
  */
 async function getCachedReflectionRoot(actionEndpoint, protoKey, credentials, grpcOptions, descriptorExtensionProto) {
-    const { client, reflectionRootPromiseMap } = getCachedClient(actionEndpoint, credentials, grpcOptions, descriptorExtensionProto);
+    const { client, reflectionRootPromiseMap } = await getCachedClient(actionEndpoint, credentials, grpcOptions, descriptorExtensionProto);
     const cacheKey = [actionEndpoint, protoKey];
     let cachedRootPromise = lodash_1.default.get(reflectionRootPromiseMap, cacheKey);
     if (!cachedRootPromise) {
@@ -99,7 +103,7 @@ async function getCachedReflectionRoot(actionEndpoint, protoKey, credentials, gr
  * use toJSON for get a JSON descriptor.
  */
 async function getReflectionRoot(actionEndpoint, protoKey, credentials, grpcOptions, addToCache) {
-    const { client, reflectionRootPromiseMap } = getCachedClient(actionEndpoint, credentials, grpcOptions);
+    const { client, reflectionRootPromiseMap } = await getCachedClient(actionEndpoint, credentials, grpcOptions);
     const loadedRoot = await client.fileContainingSymbol(protoKey);
     if (addToCache) {
         lodash_1.default.set(reflectionRootPromiseMap, [actionEndpoint, protoKey], Promise.resolve(loadedRoot));

package/dist/commonjs/utils/package-root.d.ts

@@ -0,0 +1 @@
+export declare const packageRoot: string;

package/dist/commonjs/utils/package-root.js

@@ -0,0 +1,44 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.packageRoot = void 0;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const source_dir_js_1 = require("./source-dir.js");
+let packageRootTest = path.resolve(source_dir_js_1.sourceDir, '../package.json');
+if (!fs.existsSync(packageRootTest)) {
+    packageRootTest = path.resolve(source_dir_js_1.sourceDir, '../../package.json');
+}
+exports.packageRoot = path.dirname(packageRootTest);

package/dist/esm/components/grpc.js

@@ -12,17 +12,17 @@ import { GrpcReflection, } from '../models/common.js';
 import { getHeadersFromMetadata, handleError, isExtendedActionEndpoint, isExtendedGrpcActionEndpoint, sanitizeDebugHeaders, } from '../utils/common.js';
 import { getCachedReflectionRoot, getReflectionRoot } from '../utils/grpc-reflection.js';
 import { decodeAnyMessageRecursively, isRecreateServiceError, isRetryableError, } from '../utils/grpc.js';
+import { packageRoot } from '../utils/package-root.js';
 import { GrpcError, grpcErrorFactory, isGrpcError, parseGrpcError } from '../utils/parse-error.js';
 import { patchProtoPathResolver } from '../utils/proto-path-resolver.js';
 import { redactSensitiveHeaders } from '../utils/redact-sensitive-headers.js';
-import { sourceDir } from '../utils/source-dir.js';
 import { validateArgs } from '../utils/validate.js';
-const grpcLoaderOptions = Object.assign(Object.assign({}, DEFAULT_PROTO_LOADER_OPTIONS), { includeDirs: [path.join(sourceDir, '../proto')] });
+const grpcLoaderOptions = Object.assign(Object.assign({}, DEFAULT_PROTO_LOADER_OPTIONS), { includeDirs: [path.join(packageRoot, 'proto')] });
 export function createRoot(includeGrpcPaths) {
     const root = new protobufjs.Root();
-    root.loadSync(path.resolve(sourceDir, '../proto/google/rpc/code.proto'));
-    root.loadSync(path.resolve(sourceDir, '../proto/google/rpc/error_details.proto'));
-    root.loadSync(path.resolve(sourceDir, '../proto/google/rpc/status.proto'));
+    root.loadSync(path.resolve(packageRoot, 'proto/google/rpc/code.proto'));
+    root.loadSync(path.resolve(packageRoot, 'proto/google/rpc/error_details.proto'));
+    root.loadSync(path.resolve(packageRoot, 'proto/google/rpc/status.proto'));
     // Load well-known internal protobufjs types
     root.loadSync('google/protobuf/struct.proto');
     root.loadSync('google/protobuf/wrappers.proto');

package/dist/esm/constants.js

@@ -1,7 +1,10 @@
+import * as fs from 'fs';
 import * as http from 'http';
 import * as https from 'https';
+import * as path from 'path';
 import * as grpc from '@grpc/grpc-js';
-const packageJson = require('../package.json');
+import { packageRoot } from './utils/package-root.js';
+const packageJson = JSON.parse(fs.readFileSync(path.resolve(packageRoot, 'package.json'), 'utf-8'));
 export const VERSION = packageJson.version;
 export var Lang;
 (function (Lang) {

package/dist/esm/utils/grpc-reflection.js

@@ -2,14 +2,16 @@ import _ from 'lodash';
 import * as protobufjs from 'protobufjs';
 import { patchProtoPathResolver } from './proto-path-resolver.js';
 const reflectionClientsMap = {};
-function getCachedClient(actionEndpoint, credentials, grpcOptions, descriptorExtensionProto) {
+async function getCachedClient(actionEndpoint, credentials, grpcOptions, descriptorExtensionProto) {
     const cacheKey = [actionEndpoint, JSON.stringify([grpcOptions, descriptorExtensionProto])];
     let clientWithCache = _.get(reflectionClientsMap, cacheKey);
     if (!clientWithCache) {
-        const grpcReflection = require('grpc-reflection-js');
+        const grpcReflection = await import('grpc-reflection-js');
         let descriptorRoot;
         if (descriptorExtensionProto) {
-            descriptorRoot = protobufjs.Root.fromJSON(require('protobufjs/ext/descriptor'));
+            descriptorRoot = protobufjs.Root.fromJSON(
+            // @ts-expect-error no typings for default export
+            (await import('protobufjs/ext/descriptor/index.js')).default);
             if (Array.isArray(descriptorExtensionProto)) {
                 descriptorRoot.loadSync(descriptorExtensionProto);
             }
@@ -18,7 +20,9 @@ function getCachedClient(actionEndpoint, credentials, grpcOptions, descriptorExt
                 descriptorRoot.loadSync(descriptorExtensionProto.filenames);
             }
         }
-        const client = new grpcReflection.Client(actionEndpoint, credentials, grpcOptions, undefined, descriptorRoot);
+        const client = new grpcReflection.Client(actionEndpoint, credentials, grpcOptions, undefined, 
+        // @ts-ignore this parameter is present only in the patched version
+        descriptorRoot);
         clientWithCache = { client, reflectionRootPromiseMap: {} };
         _.set(reflectionClientsMap, cacheKey, clientWithCache);
     }
@@ -35,7 +39,7 @@ function getCachedClient(actionEndpoint, credentials, grpcOptions, descriptorExt
  * use toJSON for get a JSON descriptor.
  */
 export async function getCachedReflectionRoot(actionEndpoint, protoKey, credentials, grpcOptions, descriptorExtensionProto) {
-    const { client, reflectionRootPromiseMap } = getCachedClient(actionEndpoint, credentials, grpcOptions, descriptorExtensionProto);
+    const { client, reflectionRootPromiseMap } = await getCachedClient(actionEndpoint, credentials, grpcOptions, descriptorExtensionProto);
     const cacheKey = [actionEndpoint, protoKey];
     let cachedRootPromise = _.get(reflectionRootPromiseMap, cacheKey);
     if (!cachedRootPromise) {
@@ -59,7 +63,7 @@ export async function getCachedReflectionRoot(actionEndpoint, protoKey, credenti
  * use toJSON for get a JSON descriptor.
  */
 export async function getReflectionRoot(actionEndpoint, protoKey, credentials, grpcOptions, addToCache) {
-    const { client, reflectionRootPromiseMap } = getCachedClient(actionEndpoint, credentials, grpcOptions);
+    const { client, reflectionRootPromiseMap } = await getCachedClient(actionEndpoint, credentials, grpcOptions);
     const loadedRoot = await client.fileContainingSymbol(protoKey);
     if (addToCache) {
         _.set(reflectionRootPromiseMap, [actionEndpoint, protoKey], Promise.resolve(loadedRoot));

package/dist/esm/utils/package-root.d.ts

@@ -0,0 +1 @@
+export declare const packageRoot: string;

package/dist/esm/utils/package-root.js

@@ -0,0 +1,8 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { sourceDir } from './source-dir.js';
+let packageRootTest = path.resolve(sourceDir, '../package.json');
+if (!fs.existsSync(packageRootTest)) {
+    packageRootTest = path.resolve(sourceDir, '../../package.json');
+}
+export const packageRoot = path.dirname(packageRootTest);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/gateway",
-  "version": "4.1.1-alpha.0",
+  "version": "4.1.2-alpha.0",
   "description": "",
   "license": "MIT",
   "type": "module",