@kapeta/local-cluster-service 0.34.1 → 0.34.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.34.2](https://github.com/kapetacom/local-cluster-service/compare/v0.34.1...v0.34.2) (2024-01-22)
+
+
+### Bug Fixes
+
+* Forward query params correctly ([#121](https://github.com/kapetacom/local-cluster-service/issues/121)) ([1bbf6f0](https://github.com/kapetacom/local-cluster-service/commit/1bbf6f0cf0fee218c441f3b556683873e208c951))
+
 ## [0.34.1](https://github.com/kapetacom/local-cluster-service/compare/v0.34.0...v0.34.1) (2024-01-22)
 
 

package/dist/cjs/src/proxy/types/rest.js

@@ -14,6 +14,7 @@ const path_1 = __importDefault(require("path"));
 const pathTemplateParser_1 = require("../../utils/pathTemplateParser");
 const networkManager_1 = require("../../networkManager");
 const socketManager_1 = require("../../socketManager");
+const qs_1 = require("qs");
 function getRestMethodId(restResource, httpMethod, httpPath) {
     return lodash_1.default.findKey(restResource.spec.methods, (method) => {
         let methodType = method.method ? method.method.toUpperCase() : 'GET';
@@ -77,7 +78,7 @@ function proxyRestRequest(req, res, opts) {
         providerPath = '/' + providerPath;
     }
     if (!lodash_1.default.isEmpty(req.query)) {
-        providerPath += '?' + new URLSearchParams(req.query).toString();
+        providerPath += '?' + (0, qs_1.stringify)(req.query, { arrayFormat: 'repeat' });
     }
     const requestHeaders = lodash_1.default.clone(req.headers);
     delete requestHeaders['content-length'];

package/dist/cjs/src/proxy/types/web.js

@@ -12,6 +12,7 @@ const request_1 = __importDefault(require("request"));
 const lodash_1 = __importDefault(require("lodash"));
 const networkManager_1 = require("../../networkManager");
 const socketManager_1 = require("../../socketManager");
+const qs_1 = require("qs");
 function proxyHttpRequest(req, res, opts) {
     const requestHeaders = lodash_1.default.clone(req.headers);
     delete requestHeaders['content-length'];
@@ -26,7 +27,7 @@ function proxyHttpRequest(req, res, opts) {
         path = path.replace(sourceBasePath, targetBasePath);
     }
     if (!lodash_1.default.isEmpty(req.query)) {
-        path += '?' + new URLSearchParams(req.query).toString();
+        path += '?' + (0, qs_1.stringify)(req.query, { arrayFormat: 'repeat' });
     }
     console.log('Proxy request to provider: %s => %s%s [http]', opts.consumerPath, opts.address, path);
     const reqOpts = {

package/dist/esm/src/proxy/types/rest.js

@@ -14,6 +14,7 @@ const path_1 = __importDefault(require("path"));
 const pathTemplateParser_1 = require("../../utils/pathTemplateParser");
 const networkManager_1 = require("../../networkManager");
 const socketManager_1 = require("../../socketManager");
+const qs_1 = require("qs");
 function getRestMethodId(restResource, httpMethod, httpPath) {
     return lodash_1.default.findKey(restResource.spec.methods, (method) => {
         let methodType = method.method ? method.method.toUpperCase() : 'GET';
@@ -77,7 +78,7 @@ function proxyRestRequest(req, res, opts) {
         providerPath = '/' + providerPath;
     }
     if (!lodash_1.default.isEmpty(req.query)) {
-        providerPath += '?' + new URLSearchParams(req.query).toString();
+        providerPath += '?' + (0, qs_1.stringify)(req.query, { arrayFormat: 'repeat' });
     }
     const requestHeaders = lodash_1.default.clone(req.headers);
     delete requestHeaders['content-length'];

package/dist/esm/src/proxy/types/web.js

@@ -12,6 +12,7 @@ const request_1 = __importDefault(require("request"));
 const lodash_1 = __importDefault(require("lodash"));
 const networkManager_1 = require("../../networkManager");
 const socketManager_1 = require("../../socketManager");
+const qs_1 = require("qs");
 function proxyHttpRequest(req, res, opts) {
     const requestHeaders = lodash_1.default.clone(req.headers);
     delete requestHeaders['content-length'];
@@ -26,7 +27,7 @@ function proxyHttpRequest(req, res, opts) {
         path = path.replace(sourceBasePath, targetBasePath);
     }
     if (!lodash_1.default.isEmpty(req.query)) {
-        path += '?' + new URLSearchParams(req.query).toString();
+        path += '?' + (0, qs_1.stringify)(req.query, { arrayFormat: 'repeat' });
     }
     console.log('Proxy request to provider: %s => %s%s [http]', opts.consumerPath, opts.address, path);
     const reqOpts = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.34.1",
+    "version": "0.34.2",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {
@@ -48,18 +48,18 @@
     "homepage": "https://github.com/kapetacom/local-cluster-service#readme",
     "dependencies": {
         "@kapeta/codegen": "^1.2.1",
-        "@kapeta/local-cluster-config": ">= 0.3.0 <2",
+        "@kapeta/kaplang-core": "^1.9.3",
+        "@kapeta/local-cluster-config": ">= 0.3.2 <2",
         "@kapeta/nodejs-api-client": ">=0.1.3 <2",
         "@kapeta/nodejs-process": "<2",
         "@kapeta/nodejs-registry-utils": ">=0.9.4 <2",
         "@kapeta/nodejs-utils": "<2",
-        "@kapeta/sdk-config": "^2.0.0",
-        "@kapeta/web-microfrontend": "^1",
-        "@kapeta/kaplang-core": "^1.9",
         "@kapeta/schemas": "^2.0.0",
+        "@kapeta/sdk-config": "^2.0.0",
         "@kapeta/ui-web-components": "^3.0.1",
         "@kapeta/ui-web-plan-editor": "^2.0.0",
         "@kapeta/ui-web-types": "^1.2.0",
+        "@kapeta/web-microfrontend": "^1",
         "@sentry/node": "^7.94.1",
         "@types/dockerode": "^3.3.19",
         "@types/stream-json": "^1.7.3",
@@ -75,6 +75,7 @@
         "md5": "2.2.1",
         "node-cache": "^5.1.2",
         "node-uuid": "^1.4.8",
+        "qs": "^6.11.2",
         "request": "2.88.2",
         "request-promise": "4.2.6",
         "socket.io": "^4.5.2",

package/src/proxy/types/rest.ts

@@ -14,6 +14,7 @@ import { Request, Response } from 'express';
 import { ProxyRequestInfo, SimpleRequest, StringMap } from '../../types';
 import { StringBodyRequest } from '../../middleware/stringBody';
 import { Resource } from '@kapeta/schemas';
+import { stringify } from 'qs';
 
 export function getRestMethodId(restResource: Resource, httpMethod: string, httpPath: string) {
     return _.findKey(restResource.spec.methods, (method) => {
@@ -105,7 +106,7 @@ export function proxyRestRequest(req: StringBodyRequest, res: Response, opts: Pr
     }
 
     if (!_.isEmpty(req.query)) {
-        providerPath += '?' + new URLSearchParams(req.query as any).toString();
+        providerPath += '?' + stringify(req.query, { arrayFormat: 'repeat' });
     }
 
     const requestHeaders = _.clone(req.headers);

package/src/proxy/types/web.ts

@@ -7,9 +7,10 @@ import request from 'request';
 import _ from 'lodash';
 import { networkManager } from '../../networkManager';
 import { socketManager } from '../../socketManager';
-import { Request, Response } from 'express';
+import { Response } from 'express';
 import { ProxyRequestInfo, SimpleRequest, StringMap } from '../../types';
 import { StringBodyRequest } from '../../middleware/stringBody';
+import { stringify } from 'qs';
 
 export function proxyHttpRequest(req: StringBodyRequest, res: Response, opts: ProxyRequestInfo) {
     const requestHeaders = _.clone(req.headers);
@@ -28,7 +29,7 @@ export function proxyHttpRequest(req: StringBodyRequest, res: Response, opts: Pr
     }
 
     if (!_.isEmpty(req.query)) {
-        path += '?' + new URLSearchParams(req.query as any).toString();
+        path += '?' + stringify(req.query, { arrayFormat: 'repeat' });
     }
 
     console.log('Proxy request to provider: %s => %s%s [http]', opts.consumerPath, opts.address, path);