@kapeta/local-cluster-service 0.19.3 → 0.19.5

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.19.5](https://github.com/kapetacom/local-cluster-service/compare/v0.19.4...v0.19.5) (2023-09-07)
+
+
+### Bug Fixes
+
+* Handle query and hash in path matching ([#70](https://github.com/kapetacom/local-cluster-service/issues/70)) ([e743cf8](https://github.com/kapetacom/local-cluster-service/commit/e743cf80c6754f43c948fd25967f04808429a784))
+
+## [0.19.4](https://github.com/kapetacom/local-cluster-service/compare/v0.19.3...v0.19.4) (2023-09-05)
+
+
+### Bug Fixes
+
+* Do not rename local sample if we already have ([095737e](https://github.com/kapetacom/local-cluster-service/commit/095737e7cfd94ec1e5dc8efcb178fbf88f67d783))
+
 ## [0.19.3](https://github.com/kapetacom/local-cluster-service/compare/v0.19.2...v0.19.3) (2023-09-05)
 
 

package/dist/cjs/src/definitionsManager.js

@@ -15,9 +15,12 @@ const nodejs_registry_utils_1 = require("@kapeta/nodejs-registry-utils");
 const progressListener_1 = require("./progressListener");
 const path_1 = __importDefault(require("path"));
 exports.SAMPLE_PLAN_NAME = 'kapeta/sample-nodejs-plan';
-function applyHandleChange(definition, targetHandle) {
+function getRenamed(definition, targetHandle) {
     const originalUri = (0, nodejs_utils_1.parseKapetaUri)(definition.definition.metadata.name);
-    definition.definition.metadata.name = `${targetHandle}/${originalUri.name}`;
+    return `${targetHandle}/${originalUri.name}`;
+}
+function applyHandleChange(definition, targetHandle) {
+    definition.definition.metadata.name = getRenamed(definition, targetHandle);
     return definition;
 }
 function normalizeFilters(kindFilter) {
@@ -50,6 +53,11 @@ class DefinitionsManager {
             // Not logged in yet, so we can't rewrite the sample plan
             return definitions;
         }
+        const newName = getRenamed(samplePlan, profile.handle);
+        if (definitions.some((d) => d.definition.metadata.name === newName && d.version === 'local')) {
+            // We already have a local version of the sample plan
+            return definitions;
+        }
         console.log('Rewriting sample plan to use handle %s', profile.handle);
         applyHandleChange(samplePlan, profile.handle);
         const planDef = samplePlan.definition;

package/dist/cjs/src/proxy/types/rest.d.ts

@@ -1,4 +1,6 @@
 import { Response } from 'express';
 import { ProxyRequestInfo } from '../../types';
 import { StringBodyRequest } from '../../middleware/stringBody';
+import { Resource } from '@kapeta/schemas';
+export declare function getRestMethodId(restResource: Resource, httpMethod: string, httpPath: string): string | undefined;
 export declare function proxyRestRequest(req: StringBodyRequest, res: Response, opts: ProxyRequestInfo): void;

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.proxyRestRequest = void 0;
+exports.proxyRestRequest = exports.getRestMethodId = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const request_1 = __importDefault(require("request"));
 const path_1 = __importDefault(require("path"));
@@ -24,6 +24,7 @@ function getRestMethodId(restResource, httpMethod, httpPath) {
         return pathTemplate.matches(httpPath);
     });
 }
+exports.getRestMethodId = getRestMethodId;
 /**
  *
  * @param req {Request}

package/dist/cjs/src/repositoryManager.js

@@ -26,9 +26,9 @@ const DEFAULT_PROVIDERS = [
     'kapeta/resource-type-web-fragment',
     'kapeta/resource-type-mongodb',
     'kapeta/resource-type-postgresql',
+    'kapeta/resource-type-smtp-client',
     'kapeta/language-target-react-ts',
     'kapeta/language-target-nodejs',
-    'kapeta/language-target-java-spring-boot',
 ];
 class RepositoryManager extends node_events_1.EventEmitter {
     _registryService;
@@ -84,7 +84,10 @@ class RepositoryManager extends node_events_1.EventEmitter {
                     throw e;
                 }
                 cacheManager_1.cacheManager.flush();
-                //console.log(`Asset installed: ${ref}`);
+                if (await definitionsManager_1.definitionsManager.exists(ref)) {
+                    return;
+                }
+                throw new Error(`Failed to install asset: ${ref}`);
             };
         };
         const tasks = [];

package/dist/cjs/src/utils/pathTemplateParser.js

@@ -3,6 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pathTemplateParser = exports.PathTemplate = void 0;
 const TYPE_VARIABLE = 'variable';
 const TYPE_PATH = 'path';
+function normalizePath(path) {
+    if (!path.startsWith('/')) {
+        path = '/' + path;
+    }
+    if (path.includes('#')) {
+        path = path.split('#')[0];
+    }
+    if (path.includes('?')) {
+        path = path.split('?')[0];
+    }
+    return path;
+}
 /**
  * A path template is a string that can be used to match a path and extract variables from it.
  *
@@ -62,9 +74,7 @@ class PathTemplate {
         return this.parse(path) !== null;
     }
     parse(path) {
-        if (!path.startsWith('/')) {
-            path = '/' + path;
-        }
+        path = normalizePath(path);
         const values = {};
         for (let i = 0; i < this._parts.length; i++) {
             const part = this._parts[i];

package/dist/cjs/test/proxy/types/rest.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const rest_1 = require("../../../src/proxy/types/rest");
+describe('getRestMethodId', () => {
+    it('should match @Query in url', () => {
+        const restResource = new TestResource();
+        const restMethodId = (0, rest_1.getRestMethodId)(restResource, "POST", "/names?name=Ib");
+        expect(restMethodId).toBeDefined();
+    });
+});
+class TestResource {
+    kind = "";
+    metadata = new TestResourceMetaData();
+    get spec() {
+        return {
+            methods: [
+                {
+                    responseType: {
+                        ref: "Name[]"
+                    },
+                    method: "GET",
+                    path: "/names",
+                    arguments: {}
+                },
+                {
+                    responseType: {
+                        ref: "Name"
+                    },
+                    method: "POST",
+                    path: "/names",
+                    arguments: {
+                        name: {
+                            type: "string",
+                            transport: "QUERY"
+                        }
+                    }
+                }
+            ]
+        };
+    }
+    ;
+}
+class TestResourceMetaData {
+    name = "";
+}

package/dist/cjs/test/utils/pathTemplateParser.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/cjs/test/utils/pathTemplateParser.test.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const pathTemplateParser_1 = require("../../src/utils/pathTemplateParser");
+describe('pathTemplateParser', () => {
+    it('must return parameters for query parameters from parse', () => {
+        const template = new pathTemplateParser_1.PathTemplate('/names');
+        const parse = template.parse('/names?name=Ib#test');
+        console.log(parse);
+        expect(parse).toBeTruthy();
+    });
+    it('must return parameters defined in url', () => {
+        const template = new pathTemplateParser_1.PathTemplate('/names/{identityId}');
+        const parse = template.parse('/names/idn_xxyyzz');
+        expect(parse).toBeTruthy();
+        expect(parse).toMatchObject({ identityId: 'idn_xxyyzz' });
+    });
+    it('must return parameters defined in url regardless of query parameters', () => {
+        const template = new pathTemplateParser_1.PathTemplate('/names/{identityId}');
+        const parse = template.parse('/names/idn_xxyyzz?name=Ib#test');
+        expect(parse).toBeTruthy();
+        expect(parse).toMatchObject({ identityId: 'idn_xxyyzz' });
+    });
+});

package/dist/esm/src/definitionsManager.js

@@ -15,9 +15,12 @@ const nodejs_registry_utils_1 = require("@kapeta/nodejs-registry-utils");
 const progressListener_1 = require("./progressListener");
 const path_1 = __importDefault(require("path"));
 exports.SAMPLE_PLAN_NAME = 'kapeta/sample-nodejs-plan';
-function applyHandleChange(definition, targetHandle) {
+function getRenamed(definition, targetHandle) {
     const originalUri = (0, nodejs_utils_1.parseKapetaUri)(definition.definition.metadata.name);
-    definition.definition.metadata.name = `${targetHandle}/${originalUri.name}`;
+    return `${targetHandle}/${originalUri.name}`;
+}
+function applyHandleChange(definition, targetHandle) {
+    definition.definition.metadata.name = getRenamed(definition, targetHandle);
     return definition;
 }
 function normalizeFilters(kindFilter) {
@@ -50,6 +53,11 @@ class DefinitionsManager {
             // Not logged in yet, so we can't rewrite the sample plan
             return definitions;
         }
+        const newName = getRenamed(samplePlan, profile.handle);
+        if (definitions.some((d) => d.definition.metadata.name === newName && d.version === 'local')) {
+            // We already have a local version of the sample plan
+            return definitions;
+        }
         console.log('Rewriting sample plan to use handle %s', profile.handle);
         applyHandleChange(samplePlan, profile.handle);
         const planDef = samplePlan.definition;

package/dist/esm/src/proxy/types/rest.d.ts

@@ -1,4 +1,6 @@
 import { Response } from 'express';
 import { ProxyRequestInfo } from '../../types';
 import { StringBodyRequest } from '../../middleware/stringBody';
+import { Resource } from '@kapeta/schemas';
+export declare function getRestMethodId(restResource: Resource, httpMethod: string, httpPath: string): string | undefined;
 export declare function proxyRestRequest(req: StringBodyRequest, res: Response, opts: ProxyRequestInfo): void;

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.proxyRestRequest = void 0;
+exports.proxyRestRequest = exports.getRestMethodId = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const request_1 = __importDefault(require("request"));
 const path_1 = __importDefault(require("path"));
@@ -24,6 +24,7 @@ function getRestMethodId(restResource, httpMethod, httpPath) {
         return pathTemplate.matches(httpPath);
     });
 }
+exports.getRestMethodId = getRestMethodId;
 /**
  *
  * @param req {Request}

package/dist/esm/src/repositoryManager.js

@@ -26,9 +26,9 @@ const DEFAULT_PROVIDERS = [
     'kapeta/resource-type-web-fragment',
     'kapeta/resource-type-mongodb',
     'kapeta/resource-type-postgresql',
+    'kapeta/resource-type-smtp-client',
     'kapeta/language-target-react-ts',
     'kapeta/language-target-nodejs',
-    'kapeta/language-target-java-spring-boot',
 ];
 class RepositoryManager extends node_events_1.EventEmitter {
     _registryService;
@@ -84,7 +84,10 @@ class RepositoryManager extends node_events_1.EventEmitter {
                     throw e;
                 }
                 cacheManager_1.cacheManager.flush();
-                //console.log(`Asset installed: ${ref}`);
+                if (await definitionsManager_1.definitionsManager.exists(ref)) {
+                    return;
+                }
+                throw new Error(`Failed to install asset: ${ref}`);
             };
         };
         const tasks = [];

package/dist/esm/src/utils/pathTemplateParser.js

@@ -3,6 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pathTemplateParser = exports.PathTemplate = void 0;
 const TYPE_VARIABLE = 'variable';
 const TYPE_PATH = 'path';
+function normalizePath(path) {
+    if (!path.startsWith('/')) {
+        path = '/' + path;
+    }
+    if (path.includes('#')) {
+        path = path.split('#')[0];
+    }
+    if (path.includes('?')) {
+        path = path.split('?')[0];
+    }
+    return path;
+}
 /**
  * A path template is a string that can be used to match a path and extract variables from it.
  *
@@ -62,9 +74,7 @@ class PathTemplate {
         return this.parse(path) !== null;
     }
     parse(path) {
-        if (!path.startsWith('/')) {
-            path = '/' + path;
-        }
+        path = normalizePath(path);
         const values = {};
         for (let i = 0; i < this._parts.length; i++) {
             const part = this._parts[i];

package/dist/esm/test/proxy/types/rest.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const rest_1 = require("../../../src/proxy/types/rest");
+describe('getRestMethodId', () => {
+    it('should match @Query in url', () => {
+        const restResource = new TestResource();
+        const restMethodId = (0, rest_1.getRestMethodId)(restResource, "POST", "/names?name=Ib");
+        expect(restMethodId).toBeDefined();
+    });
+});
+class TestResource {
+    kind = "";
+    metadata = new TestResourceMetaData();
+    get spec() {
+        return {
+            methods: [
+                {
+                    responseType: {
+                        ref: "Name[]"
+                    },
+                    method: "GET",
+                    path: "/names",
+                    arguments: {}
+                },
+                {
+                    responseType: {
+                        ref: "Name"
+                    },
+                    method: "POST",
+                    path: "/names",
+                    arguments: {
+                        name: {
+                            type: "string",
+                            transport: "QUERY"
+                        }
+                    }
+                }
+            ]
+        };
+    }
+    ;
+}
+class TestResourceMetaData {
+    name = "";
+}

package/dist/esm/test/utils/pathTemplateParser.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/esm/test/utils/pathTemplateParser.test.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const pathTemplateParser_1 = require("../../src/utils/pathTemplateParser");
+describe('pathTemplateParser', () => {
+    it('must return parameters for query parameters from parse', () => {
+        const template = new pathTemplateParser_1.PathTemplate('/names');
+        const parse = template.parse('/names?name=Ib#test');
+        console.log(parse);
+        expect(parse).toBeTruthy();
+    });
+    it('must return parameters defined in url', () => {
+        const template = new pathTemplateParser_1.PathTemplate('/names/{identityId}');
+        const parse = template.parse('/names/idn_xxyyzz');
+        expect(parse).toBeTruthy();
+        expect(parse).toMatchObject({ identityId: 'idn_xxyyzz' });
+    });
+    it('must return parameters defined in url regardless of query parameters', () => {
+        const template = new pathTemplateParser_1.PathTemplate('/names/{identityId}');
+        const parse = template.parse('/names/idn_xxyyzz?name=Ib#test');
+        expect(parse).toBeTruthy();
+        expect(parse).toMatchObject({ identityId: 'idn_xxyyzz' });
+    });
+});

package/jest.config.js

@@ -0,0 +1,8 @@
+module.exports = {
+    preset: 'ts-jest',
+    testEnvironment: 'node',
+    transform: {
+        '^.+\\.ts?$': 'ts-jest',
+    },
+    transformIgnorePatterns: ['<rootDir>/node_modules/'],
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.19.3",
+    "version": "0.19.5",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {
@@ -32,7 +32,7 @@
     "scripts": {
         "start": "node ./dist/cjs/start.js",
         "dev": "nodemon -e js,ts,json ./start.ts",
-        "test": "echo its fine",
+        "test": "jest",
         "clean": "rm -rf ./dist",
         "build:esm": "tsc --module nodenext --moduleResolution nodenext --outDir ./dist/esm && echo '{\"type\":\"module\"}' > ./dist/esm/package.json",
         "build:cjs": "tsc  --outDir ./dist/cjs && echo '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json",
@@ -80,6 +80,7 @@
         "@types/fs-extra": "^11.0.1",
         "@types/glob": "^8.1.0",
         "@types/gunzip-maybe": "^1.4.0",
+        "@types/jest": "^29.5.4",
         "@types/lodash": "^4.14.195",
         "@types/md5": "^2.3.2",
         "@types/node": "^20.5.8",
@@ -88,8 +89,10 @@
         "@types/tar-stream": "^2.2.2",
         "eslint": "^8.42.0",
         "eslint-config-prettier": "^8.8.0",
+        "jest": "^29.6.4",
         "nodemon": "^2.0.2",
         "prettier": "^2.8.8",
+        "ts-jest": "^29.1.1",
         "ts-node": "^10.9.1"
     },
     "prettier": "@kapeta/prettier-config",

package/src/definitionsManager.ts

@@ -12,9 +12,12 @@ import Path from 'path';
 
 export const SAMPLE_PLAN_NAME = 'kapeta/sample-nodejs-plan';
 
-function applyHandleChange(definition: DefinitionInfo, targetHandle: string) {
+function getRenamed(definition: DefinitionInfo, targetHandle: string) {
     const originalUri = parseKapetaUri(definition.definition.metadata.name);
-    definition.definition.metadata.name = `${targetHandle}/${originalUri.name}`;
+    return `${targetHandle}/${originalUri.name}`;
+}
+function applyHandleChange(definition: DefinitionInfo, targetHandle: string) {
+    definition.definition.metadata.name = getRenamed(definition, targetHandle);
     return definition;
 }
 
@@ -55,10 +58,15 @@ class DefinitionsManager {
             return definitions;
         }
 
-        console.log('Rewriting sample plan to use handle %s', profile.handle);
+        const newName = getRenamed(samplePlan, profile.handle);
 
-        applyHandleChange(samplePlan, profile.handle);
+        if (definitions.some((d) => d.definition.metadata.name === newName && d.version === 'local')) {
+            // We already have a local version of the sample plan
+            return definitions;
+        }
 
+        console.log('Rewriting sample plan to use handle %s', profile.handle);
+        applyHandleChange(samplePlan, profile.handle);
         const planDef = samplePlan.definition as Plan;
 
         const blockRefs = new Set<string>();

package/src/proxy/types/rest.ts

@@ -10,7 +10,7 @@ import { ProxyRequestInfo, SimpleRequest, StringMap } from '../../types';
 import { StringBodyRequest } from '../../middleware/stringBody';
 import { Resource } from '@kapeta/schemas';
 
-function getRestMethodId(restResource: Resource, httpMethod: string, httpPath: string) {
+export function getRestMethodId(restResource: Resource, httpMethod: string, httpPath: string) {
     return _.findKey(restResource.spec.methods, (method) => {
         let methodType = method.method ? method.method.toUpperCase() : 'GET';
 

package/src/repositoryManager.ts

@@ -24,9 +24,9 @@ const DEFAULT_PROVIDERS = [
     'kapeta/resource-type-web-fragment',
     'kapeta/resource-type-mongodb',
     'kapeta/resource-type-postgresql',
+    'kapeta/resource-type-smtp-client',
     'kapeta/language-target-react-ts',
     'kapeta/language-target-nodejs',
-    'kapeta/language-target-java-spring-boot',
 ];
 
 class RepositoryManager extends EventEmitter {
@@ -90,7 +90,10 @@ class RepositoryManager extends EventEmitter {
                     throw e;
                 }
                 cacheManager.flush();
-                //console.log(`Asset installed: ${ref}`);
+                if (await definitionsManager.exists(ref)) {
+                    return;
+                }
+                throw new Error(`Failed to install asset: ${ref}`);
             };
         };
 

package/src/utils/pathTemplateParser.ts

@@ -3,6 +3,22 @@ import { StringMap } from '../types';
 const TYPE_VARIABLE = 'variable';
 const TYPE_PATH = 'path';
 
+function normalizePath(path: string) {
+    if (!path.startsWith('/')) {
+        path = '/' + path;
+    }
+
+    if (path.includes('#')) {
+        path = path.split('#')[0];
+    }
+
+    if (path.includes('?')) {
+        path = path.split('?')[0];
+    }
+
+    return path;
+}
+
 /**
  * A path template is a string that can be used to match a path and extract variables from it.
  *
@@ -71,9 +87,7 @@ export class PathTemplate {
     }
 
     parse(path: string) {
-        if (!path.startsWith('/')) {
-            path = '/' + path;
-        }
+        path = normalizePath(path);
 
         const values: StringMap = {};
 

package/test/proxy/types/rest.test.ts

@@ -0,0 +1,49 @@
+import {getRestMethodId} from "../../../src/proxy/types/rest";
+import {Resource, ResourceMetadata} from '@kapeta/schemas';
+
+describe('getRestMethodId', () => {
+    it('should match @Query in url', () => {
+        const restResource = new TestResource();
+
+        const restMethodId = getRestMethodId(restResource, "POST", "/names?name=Ib");
+        expect(restMethodId).toBeDefined();
+    })
+});
+
+class TestResource implements Resource {
+    kind = "";
+    metadata = new TestResourceMetaData();
+
+    get spec(): { [p: string]: any } {
+        return {
+            methods: [
+                {
+                    responseType: {
+                        ref: "Name[]"
+                    },
+                    method: "GET",
+                    path: "/names",
+                    arguments: {}
+                },
+                {
+                    responseType: {
+                        ref: "Name"
+                    },
+                    method: "POST",
+                    path: "/names",
+                    arguments: {
+                        name: {
+                            type: "string",
+                            transport: "QUERY"
+                        }
+                    }
+                }
+            ]
+        }
+    };
+}
+
+class TestResourceMetaData implements ResourceMetadata {
+    [property: string]: any;
+    name: string = "";
+}

package/test/utils/pathTemplateParser.test.ts

@@ -0,0 +1,24 @@
+import { PathTemplate } from '../../src/utils/pathTemplateParser';
+
+describe('pathTemplateParser', () => {
+    it('must return parameters for query parameters from parse', () => {
+        const template = new PathTemplate('/names');
+        const parse = template.parse('/names?name=Ib#test');
+        console.log(parse);
+        expect(parse).toBeTruthy();
+    });
+
+    it('must return parameters defined in url', () => {
+        const template = new PathTemplate('/names/{identityId}');
+        const parse = template.parse('/names/idn_xxyyzz');
+        expect(parse).toBeTruthy();
+        expect(parse).toMatchObject({ identityId: 'idn_xxyyzz' });
+    });
+
+    it('must return parameters defined in url regardless of query parameters', () => {
+        const template = new PathTemplate('/names/{identityId}');
+        const parse = template.parse('/names/idn_xxyyzz?name=Ib#test');
+        expect(parse).toBeTruthy();
+        expect(parse).toMatchObject({ identityId: 'idn_xxyyzz' });
+    });
+});

package/tsconfig.json

@@ -9,6 +9,6 @@
     "ts-node": {
         "files": true
     },
-    "include": ["definitions.d.ts", "src/**/*", "index.ts", "start.ts"],
+    "include": ["definitions.d.ts", "src/**/*", "index.ts", "start.ts", "test/**/*.ts"],
     "exclude": ["node_modules", "dist"]
 }