@kapeta/local-cluster-service 0.24.3 → 0.25.0

package/dist/esm/src/utils/commandLineUtils.d.ts

@@ -1,2 +1,7 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
 export declare function hasCLI(): Promise<boolean>;
 export declare function ensureCLI(): Promise<import("../taskManager").Task<void> | null>;
+export declare function ensureCLICommands(): Promise<void>;

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

@@ -1,6 +1,10 @@
 "use strict";
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureCLI = exports.hasCLI = void 0;
+exports.ensureCLICommands = exports.ensureCLI = exports.hasCLI = void 0;
 const nodejs_process_1 = require("@kapeta/nodejs-process");
 const taskManager_1 = require("../taskManager");
 async function hasCLI() {
@@ -21,3 +25,9 @@ async function ensureCLI() {
     });
 }
 exports.ensureCLI = ensureCLI;
+function ensureCLICommands() {
+    console.log('Run `kap init` to ensure default commands are installed');
+    const process = (0, nodejs_process_1.spawn)('kap', ['init'], { shell: true });
+    return process.wait();
+}
+exports.ensureCLICommands = ensureCLICommands;

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

@@ -1,3 +1,7 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
 import { StringMap } from '../types';
 /**
  * A path template is a string that can be used to match a path and extract variables from it.

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

@@ -1,4 +1,8 @@
 "use strict";
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pathTemplateParser = exports.PathTemplate = void 0;
 const TYPE_VARIABLE = 'variable';

package/dist/esm/src/utils/utils.d.ts

@@ -1,3 +1,7 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
 import { EntityList } from '@kapeta/schemas';
 import { AnyMap } from '../types';
 export declare function getBlockInstanceContainerName(systemId: string, instanceId: string): string;

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

@@ -1,4 +1,8 @@
 "use strict";
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/esm/start.d.ts

@@ -1 +1,5 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
 export {};

package/dist/esm/start.js

@@ -1,4 +1,8 @@
 "use strict";
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

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

@@ -1 +1,5 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
 export {};

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

@@ -1,4 +1,8 @@
 "use strict";
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 const rest_1 = require("../../../src/proxy/types/rest");
 describe('getRestMethodId', () => {

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

@@ -1 +1,5 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
 export {};

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

@@ -1,4 +1,8 @@
 "use strict";
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 const pathTemplateParser_1 = require("../../src/utils/pathTemplateParser");
 describe('pathTemplateParser', () => {

package/index.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import { clusterService } from './src/clusterService';
 import { storageService } from './src/storageService';
 import { serviceManager } from './src/serviceManager';
@@ -21,7 +26,8 @@ import APIRoutes from './src/api';
 import { getBindHost } from './src/utils/utils';
 import request from 'request';
 import { repositoryManager } from './src/repositoryManager';
-import { ensureCLI } from './src/utils/commandLineUtils';
+import { taskManager } from './src/taskManager';
+import { ensureCLI, ensureCLICommands } from './src/utils/commandLineUtils';
 import { defaultProviderInstaller } from './src/utils/DefaultProviderInstaller';
 import { authManager } from './src/authManager';
 import { codeGeneratorManager } from './src/codeGeneratorManager';
@@ -179,7 +185,7 @@ export default {
             storageService.put('cluster', 'host', host);
         }
 
-        return new Promise(async (resolve, reject) => {
+        return new Promise((resolve, reject) => {
             if (!currentServer) {
                 reject(new Error(`Current server wasn't set`));
                 return;
@@ -196,11 +202,20 @@ export default {
 
             currentServer.listen(port, bindHost, async () => {
                 try {
-                    ensureCLI().catch((e: any) => console.error('Failed to install CLI.', e));
+                    const ensureCLITask = await ensureCLI();
+                    if (ensureCLITask) {
+                        await taskManager.waitFor((t) => t === ensureCLITask);
+                    }
                 } catch (e: any) {
                     console.error('Failed to install CLI.', e);
                 }
 
+                try {
+                    await ensureCLICommands();
+                } catch (error) {
+                    console.error('Failed to ensure default CLI commands', error);
+                }
+
                 try {
                     // Start installation process for all default providers
                     await repositoryManager.ensureDefaultProviders();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.24.3",
+    "version": "0.25.0",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {
@@ -24,8 +24,12 @@
     "keywords": [
         "kapeta"
     ],
-    "author": "Henrik Hofmeister <hh@kapeta.com>",
-    "license": "MIT",
+    "license": "BUSL-1.1",
+    "author": {
+        "email": "engineering@kapeta.com",
+        "name": "Kapeta",
+        "url": "https://kapeta.com"
+    },
     "bugs": {
         "url": "https://github.com/kapetacom/local-cluster-service/issues"
     },

package/src/RepositoryWatcher.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import chokidar, { FSWatcher } from 'chokidar';
 import ClusterConfiguration, { Definition, DefinitionInfo } from '@kapeta/local-cluster-config';
 import FS from 'fs-extra';

package/src/api.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Router from 'express-promise-router';
 import { corsHandler } from './middleware/cors';
 import { KapetaAPI } from '@kapeta/nodejs-api-client';

package/src/assetManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Path from 'node:path';
 import FS from 'fs-extra';
 import YAML from 'yaml';

package/src/assets/routes.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Router from 'express-promise-router';
 import { Request, Response } from 'express';
 import YAML from 'yaml';

package/src/attachments/routes.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Router from 'express-promise-router';
 import { KapetaAPI } from '@kapeta/nodejs-api-client';
 

package/src/authManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import { EventEmitter } from 'node:events';
 import Path from 'node:path';
 import chokidar, { FSWatcher } from 'chokidar';

package/src/cacheManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import NodeCache from 'node-cache';
 
 const DEFAULT_CACHE_TTL = 60 * 1000; // 1 min

package/src/clusterService.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import { normalizeKapetaUri } from '@kapeta/nodejs-utils';
 
 const net = require('net');

package/src/codeGeneratorManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Path from 'path';
 import { registry as Targets, BlockCodeGenerator, CodeWriter } from '@kapeta/codegen';
 import { BlockDefinition } from '@kapeta/schemas';

package/src/config/routes.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Router from 'express-promise-router';
 import { configManager, SYSTEM_ID } from '../configManager';
 import { serviceManager } from '../serviceManager';

package/src/configManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import { EnrichedAsset } from './assetManager';
 import { BlockInstance } from '@kapeta/schemas';
 import { storageService } from './storageService';

package/src/containerManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Path from 'path';
 import { storageService } from './storageService';
 import os from 'os';

package/src/definitionsManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import ClusterConfiguration, { DefinitionInfo } from '@kapeta/local-cluster-config';
 import { parseKapetaUri, normalizeKapetaUri } from '@kapeta/nodejs-utils';
 import { cacheManager, doCached } from './cacheManager';

package/src/filesystem/routes.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Router from 'express-promise-router';
 import { stringBody, StringBodyRequest } from '../middleware/stringBody';
 import { filesystemManager } from '../filesystemManager';

package/src/filesystemManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Path from 'path';
 import FS from 'fs';
 import FSExtra from 'fs-extra';

package/src/identities/routes.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Router from 'express-promise-router';
 import { KapetaAPI } from '@kapeta/nodejs-api-client';
 

package/src/instanceManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import _ from 'lodash';
 import request from 'request';
 import AsyncLock from 'async-lock';

package/src/instances/routes.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Router from 'express-promise-router';
 import { instanceManager } from '../instanceManager';
 import { serviceManager } from '../serviceManager';

package/src/middleware/cors.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import { NextFunction, Request, Response } from 'express';
 
 export function corsHandler(req: Request, res: Response, next: NextFunction) {

package/src/middleware/kapeta.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import { NextFunction, Request, Response } from 'express';
 import { EnvironmentType } from '../types';
 import { normalizeKapetaUri } from '@kapeta/nodejs-utils';

package/src/middleware/stringBody.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import { NextFunction, Request, Response } from 'express';
 
 export type StringBodyRequest = Request<any> & {

package/src/networkManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import { Connection } from '@kapeta/schemas';
 import uuid from 'node-uuid';
 import { SimpleRequest, SimpleResponse } from './types';

package/src/operatorManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import { DefinitionInfo } from '@kapeta/local-cluster-config';
 import Path from 'path';
 import md5 from 'md5';

package/src/progressListener.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import { spawn } from '@kapeta/nodejs-process';
 import { socketManager } from './socketManager';
 import { LogEntry } from './types';

package/src/providerManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Path from 'path';
 import FSExtra from 'fs-extra';
 import { definitionsManager } from './definitionsManager';

package/src/providers/routes.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Router from 'express-promise-router';
 import { providerManager } from '../providerManager';
 

package/src/proxy/routes.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Router from 'express-promise-router';
 import { Request, Response } from 'express';
 import { Resource } from '@kapeta/schemas';

package/src/proxy/types/rest.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import _ from 'lodash';
 import request from 'request';
 import Path from 'path';

package/src/proxy/types/web.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import request from 'request';
 import _ from 'lodash';
 import { networkManager } from '../../networkManager';

package/src/repositoryManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import os from 'node:os';
 import { socketManager } from './socketManager';
 import { Dependency } from '@kapeta/schemas';

package/src/serviceManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import _ from 'lodash';
 import { clusterService } from './clusterService';
 import { storageService } from './storageService';

package/src/socketManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import _ from 'lodash';
 import { Socket, Server } from 'socket.io';
 import { normalizeKapetaUri } from '@kapeta/nodejs-utils';

package/src/storageService.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import _ from 'lodash';
 import FS from 'fs';
 import FSExtra from 'fs-extra';

package/src/taskManager.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 /**
  * Class that handles processing background tasks.
  */

package/src/tasks/routes.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Router from 'express-promise-router';
 import { Request, Response } from 'express';
 

package/src/traffic/routes.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Router from 'express-promise-router';
 import { Request, Response } from 'express';
 import { networkManager } from '../networkManager';

package/src/types.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import express from 'express';
 import { Connection, Resource } from '@kapeta/schemas';
 import { StringBodyRequest } from './middleware/stringBody';

package/src/utils/BlockInstanceRunner.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import FS from 'node:fs';
 import ClusterConfig, { DefinitionInfo } from '@kapeta/local-cluster-config';
 import { getBindHost, getBlockInstanceContainerName, readYML } from './utils';
@@ -153,7 +158,7 @@ export class BlockInstanceRunner {
         if (!FS.existsSync(baseDir)) {
             throw new Error(
                 `Local block not registered correctly - expected symlink here: ${baseDir}.\n` +
-                    `Make sure you've run "blockctl registry link" in your local directory to connect it to Kapeta`
+                    `Make sure you've run "kap registry link" in your local directory to connect it to Kapeta`
             );
         }
 

package/src/utils/DefaultProviderInstaller.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Path from 'node:path';
 import OS from 'node:os';
 import ClusterConfiguration from '@kapeta/local-cluster-config';

package/src/utils/LogData.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import { LogEntry, LogLevel, LogSource } from '../types';
 
 const MAX_LINES = 1000;

package/src/utils/commandLineUtils.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import { spawn, hasApp } from '@kapeta/nodejs-process';
 import { taskManager } from '../taskManager';
 
@@ -24,3 +29,9 @@ export async function ensureCLI() {
         }
     );
 }
+
+export function ensureCLICommands() {
+    console.log('Run `kap init` to ensure default commands are installed');
+    const process = spawn('kap', ['init'], { shell: true });
+    return process.wait();
+}

package/src/utils/pathTemplateParser.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import { StringMap } from '../types';
 
 const TYPE_VARIABLE = 'variable';

package/src/utils/utils.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import FS from 'node:fs';
 import YAML from 'yaml';
 import { parseKapetaUri } from '@kapeta/nodejs-utils';

package/start.ts

@@ -1,3 +1,8 @@
+/**
+ * Copyright 2023 Kapeta Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import localClusterService from './index';
 
 localClusterService