@gapi/cli-builder 1.8.168 → 1.8.170

package/dist/core/services/get-ip-adresses.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNetworkIP = exports.getIpAdresses = void 0;
 const net_1 = require("net");
-exports.getIpAdresses = (network) => Object.values(network).reduce((acc, interfaces) => {
+const getIpAdresses = (network) => Object.values(network).reduce((acc, interfaces) => {
     let alias = 0;
     interfaces.forEach((iface) => {
         if ('IPv4' !== iface.family ||
@@ -22,8 +22,9 @@ exports.getIpAdresses = (network) => Object.values(network).reduce((acc, interfa
     });
     return acc;
 }, []);
-exports.getNetworkIP = () => new Promise((resolve, reject) => {
-    const socket = net_1.createConnection(80, 'www.google.com');
+exports.getIpAdresses = getIpAdresses;
+const getNetworkIP = () => new Promise((resolve, reject) => {
+    const socket = (0, net_1.createConnection)(80, 'www.google.com');
     socket.on('connect', function () {
         let addressInfo = socket.address();
         if (typeof addressInfo === 'string') {
@@ -36,3 +37,4 @@ exports.getNetworkIP = () => new Promise((resolve, reject) => {
         reject(e);
     });
 });
+exports.getNetworkIP = getNetworkIP;

package/dist/core/services/subscription.service.d.ts

@@ -22,6 +22,6 @@ export declare class SubscriptionService {
     unsubscribe(): void;
     closePubsub(): void;
     sendStatus(variables: MachineStatus): Promise<void>;
-    sendMachineStatus(variables: MachineStatus): Promise<import("apollo-link").FetchResult<any, Record<string, any>, Record<string, any>>>;
+    sendMachineStatus(variables: MachineStatus): Promise<import("apollo-link").FetchResult<any>>;
 }
 export {};

package/dist/core/services/subscription.service.js

@@ -22,7 +22,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SubscriptionService = void 0;
-/* eslint-disable @typescript-eslint/no-var-requires */
 const core_1 = require("@gapi/core");
 const apollo_cache_inmemory_1 = require("apollo-cache-inmemory");
 const apollo_client_1 = require("apollo-client");
@@ -32,6 +31,7 @@ const app_constants_1 = require("../../app.constants");
 const app_tokents_1 = require("../../app.tokents");
 const commands_1 = require("../executors/commands");
 const get_ip_adresses_1 = require("./get-ip-adresses");
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 const webSocketImpl = require('ws');
 let SubscriptionService = class SubscriptionService {
     constructor(subscriptionsQuery, machineStatusQuery) {
@@ -53,23 +53,23 @@ let SubscriptionService = class SubscriptionService {
                         worker_type,
                         label,
                         ip: app_constants_1.Environment.GRAPHQL_RUNNER_NAT_IP ||
-                            (yield get_ip_adresses_1.getNetworkIP()),
-                        networkInterfaces: JSON.stringify(os_1.networkInterfaces()),
+                            (yield (0, get_ip_adresses_1.getNetworkIP)()),
+                        networkInterfaces: JSON.stringify((0, os_1.networkInterfaces)()),
                     },
                     reconnect: true,
                 },
                 webSocketImpl,
             });
-            this.subscription = core_1.subscribeToTopic(this.subscriptionsQuery.query, this.subscriptionsQuery.variables, this.link)
-                .pipe(operators_1.map(({ data }) => this.subscriptionsQuery.map(data)))
-                .subscribe(({ args, command, cwd }) => __awaiter(this, void 0, void 0, function* () {
+            this.subscription = (0, core_1.subscribeToTopic)(this.subscriptionsQuery.query, this.subscriptionsQuery.variables, this.link)
+                .pipe((0, operators_1.map)(({ data }) => this.subscriptionsQuery.map(data)))
+                .subscribe((_a) => __awaiter(this, [_a], void 0, function* ({ args, command, cwd, }) {
                 const cmd = core_1.Container.get(app_tokents_1.EnumToken)[command];
                 if (!cmd) {
                     console.log('Missing command');
                     throw new Error('Missing command');
                 }
                 try {
-                    const data = yield commands_1.executeAction(command)(JSON.parse(args), cwd);
+                    const data = yield (0, commands_1.executeAction)(command)(JSON.parse(args), cwd);
                     yield this.sendStatus({
                         label,
                         machineHash: app_tokents_1.machineHash,
@@ -119,12 +119,12 @@ let SubscriptionService = class SubscriptionService {
         });
     }
 };
-SubscriptionService = __decorate([
-    core_1.Injectable({
+exports.SubscriptionService = SubscriptionService;
+exports.SubscriptionService = SubscriptionService = __decorate([
+    (0, core_1.Injectable)({
         init: true,
     }),
-    __param(0, core_1.Inject(app_tokents_1.SubscriptionQuery)),
-    __param(1, core_1.Inject(app_tokents_1.MachineStatusQuery)),
+    __param(0, (0, core_1.Inject)(app_tokents_1.SubscriptionQuery)),
+    __param(1, (0, core_1.Inject)(app_tokents_1.MachineStatusQuery)),
     __metadata("design:paramtypes", [Object, Object])
 ], SubscriptionService);
-exports.SubscriptionService = SubscriptionService;

package/dist/core/services/systemctl.js

@@ -31,28 +31,38 @@ let SystemctlService = class SystemctlService {
             try {
                 yield this.install(service_description, service, executableBinary);
             }
-            catch (e) { }
+            catch (e) {
+                console.error(e);
+            }
             try {
                 yield this.reload();
             }
-            catch (e) { }
+            catch (e) {
+                console.error(e);
+            }
             try {
                 yield this.enable(service);
             }
-            catch (e) { }
+            catch (e) {
+                console.error(e);
+            }
             try {
                 yield this.stop(service);
             }
-            catch (e) { }
+            catch (e) {
+                console.error(e);
+            }
             try {
                 yield this.start(service);
             }
-            catch (e) { }
+            catch (e) {
+                console.error(e);
+            }
         });
     }
     enable(name) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield util_1.promisify(child_process_1.exec)(`systemctl enable ${name}`);
+            yield (0, util_1.promisify)(child_process_1.exec)(`systemctl enable ${name}`);
         });
     }
     generateConfig(description = 'Graphql Runner', executable = 'runner-linux') {
@@ -77,20 +87,20 @@ RestartSec=3
 WantedBy=multi-user.target
     `;
     }
-    install(description = 'Graphql Runner', name = defaultRunnerName, executable = 'runner-linux') {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield util_1.promisify(fs_1.writeFile)(`/etc/systemd/system/${name}.service`, this.generateConfig(description, executable), { encoding: 'utf-8' });
+    install() {
+        return __awaiter(this, arguments, void 0, function* (description = 'Graphql Runner', name = defaultRunnerName, executable = 'runner-linux') {
+            yield (0, util_1.promisify)(fs_1.writeFile)(`/etc/systemd/system/${name}.service`, this.generateConfig(description, executable), { encoding: 'utf-8' });
         });
     }
     reload() {
         return __awaiter(this, void 0, void 0, function* () {
-            const data = yield util_1.promisify(child_process_1.exec)(`systemctl daemon-reload`);
+            const data = yield (0, util_1.promisify)(child_process_1.exec)(`systemctl daemon-reload`);
             console.log(data);
         });
     }
-    start(name = defaultRunnerName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const data = yield util_1.promisify(child_process_1.exec)(`systemctl start ${name}`);
+    start() {
+        return __awaiter(this, arguments, void 0, function* (name = defaultRunnerName) {
+            const data = yield (0, util_1.promisify)(child_process_1.exec)(`systemctl start ${name}`);
             console.log(data);
         });
     }
@@ -101,20 +111,20 @@ WantedBy=multi-user.target
             yield this.start();
         });
     }
-    stop(name = defaultRunnerName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const data = yield util_1.promisify(child_process_1.exec)(`systemctl stop ${name}`);
+    stop() {
+        return __awaiter(this, arguments, void 0, function* (name = defaultRunnerName) {
+            const data = yield (0, util_1.promisify)(child_process_1.exec)(`systemctl stop ${name}`);
             console.log(data);
         });
     }
-    status(name = defaultRunnerName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const data = yield util_1.promisify(child_process_1.exec)(`systemctl status ${name}`);
+    status() {
+        return __awaiter(this, arguments, void 0, function* (name = defaultRunnerName) {
+            const data = yield (0, util_1.promisify)(child_process_1.exec)(`systemctl status ${name}`);
             console.log(data);
         });
     }
 };
-SystemctlService = __decorate([
-    core_1.Injectable()
-], SystemctlService);
 exports.SystemctlService = SystemctlService;
+exports.SystemctlService = SystemctlService = __decorate([
+    (0, core_1.Injectable)()
+], SystemctlService);

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-export * from './cli-builder';
 export * from './app.constants';
-export { GenericEnum } from './core/executors/commands';
+export * from './app.tokents';
+export * from './cli-builder';
 export { executeCommand, ProcessReturn, } from './core/executors';
+export { GenericEnum } from './core/executors/commands';
 export { Bootstrap } from '@gapi/core';
 export { SpawnOptionsWithoutStdio } from 'child_process';
-export * from './app.tokents';

package/dist/index.js

@@ -1,19 +1,24 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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 __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./cli-builder"), exports);
+exports.Bootstrap = exports.executeCommand = void 0;
 __exportStar(require("./app.constants"), exports);
+__exportStar(require("./app.tokents"), exports);
+__exportStar(require("./cli-builder"), exports);
 var executors_1 = require("./core/executors");
 Object.defineProperty(exports, "executeCommand", { enumerable: true, get: function () { return executors_1.executeCommand; } });
 var core_1 = require("@gapi/core");
 Object.defineProperty(exports, "Bootstrap", { enumerable: true, get: function () { return core_1.Bootstrap; } });
-__exportStar(require("./app.tokents"), exports);

package/dist/scalar-object.d.ts

@@ -1,4 +1,4 @@
 import { GraphQLScalarType } from 'graphql';
-export declare const GraphQLJSON: GraphQLScalarType;
+export declare const GraphQLJSON: GraphQLScalarType<any, any>;
 export default GraphQLJSON;
-export declare const GraphQLJSONObject: GraphQLScalarType;
+export declare const GraphQLJSONObject: GraphQLScalarType<any, any>;

package/dist/scalar-object.js

@@ -17,7 +17,6 @@ function ensureObject(value) {
 function parseObject(ast, variables) {
     const value = Object.create(null);
     ast.fields.forEach((field) => {
-        // eslint-disable-next-line @typescript-eslint/no-use-before-define
         value[field.name.value] = parseLiteral(field.value, variables);
     });
     return value;

package/eslint.config.mjs

@@ -0,0 +1,38 @@
+import { defineConfig, globalIgnores } from 'eslint/config';
+import tsParser from '@typescript-eslint/parser';
+import tsPlugin from '@typescript-eslint/eslint-plugin';
+import prettierPlugin from 'eslint-plugin-prettier';
+import simpleImportSort from 'eslint-plugin-simple-import-sort';
+import prettierConfig from 'eslint-config-prettier';
+
+export default defineConfig([
+  globalIgnores(["dist/*"]),
+  {
+    files: ['./src/**/*.ts', './src/**/*.tsx'],
+    languageOptions: {
+      parser: tsParser,
+      ecmaVersion: 2018,
+      sourceType: 'module',
+    },
+    plugins: {
+      '@typescript-eslint': tsPlugin,
+      prettier: prettierPlugin,
+      'simple-import-sort': simpleImportSort, // ✅ MUST MATCH RULE PREFIX
+    },
+    rules: {
+      ...tsPlugin.configs.recommended.rules,
+      ...prettierConfig.rules,
+
+      '@typescript-eslint/explicit-function-return-type': 'off',
+      '@typescript-eslint/camelcase': 'off',
+      '@typescript-eslint/interface-name-prefix': 'off',
+
+      'simple-import-sort/imports': 'error',
+      'simple-import-sort/exports': 'error',
+      'sort-imports': 'off',
+      'import/order': 'off',
+
+      'prettier/prettier': 'error',
+    },
+  },
+]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gapi/cli-builder",
-  "version": "1.8.168",
+  "version": "1.8.170",
   "repository": {
     "type": "git",
     "url": "https://github.com/Stradivario/gapi.git"
@@ -33,18 +33,18 @@
   "module": "./dist/index.js",
   "typings": "./dist/index.d.ts",
   "dependencies": {
-    "@gapi/core": "^1.8.167",
+    "@gapi/core": "^1.8.169",
     "bufferutil": "^4.0.1",
     "apollo-cache-inmemory": "^1.6.5",
     "apollo-client": "^2.6.8",
     "ws": "^7.2.3"
   },
   "devDependencies": {
-    "jest": "^25.5.4",
+    "jest": "^30.2.0",
     "@types/jest": "^25.2.1",
-    "ts-jest": "^25.4.0",
+    "ts-jest": "^29.4.6",
     "@types/hapi": "^18.0.2",
-    "@types/node": "^13.11.1"
+    "@types/node": "^25.0.3"
   },
   "jest": {
     "testEnvironment": "node",

package/src/app.constants.ts

@@ -18,7 +18,7 @@ export const includes = (i: Commands) =>
 export const nextOrDefault = (
   i: Commands,
   fb: unknown = true,
-  type = (p) => p
+  type = (p) => p,
 ) => {
   if (process.argv.toString().includes(i)) {
     const isNextArgumentPresent =

package/src/app.controller.ts

@@ -16,12 +16,12 @@ export class AppController {
   stoppedListener: NodeJS.Timeout;
 
   constructor(
-    private subscriptionService: SubscriptionService
+    private subscriptionService: SubscriptionService,
   ) {}
 
   @Mutation({
     uri: {
-      type: GraphQLNonNull(GraphQLString),
+      type: new GraphQLNonNull(GraphQLString),
     },
     authorization: {
       type: GraphQLString,
@@ -35,14 +35,14 @@ export class AppController {
   })
   subscribeToGraphqlPubsub(
     root,
-    { uri, worker_type, authorization, label }
+    { uri, worker_type, authorization, label },
   ) {
     this.subscriptionService.unsubscribe();
     this.subscriptionService.subscribe(
       uri,
       authorization,
       worker_type || 'runner',
-      label
+      label,
     );
     return {
       data: `Success subscribed to pubsub ${uri}`,

package/src/app.frame.ts

@@ -19,7 +19,7 @@ export class AppFrameModule {
           useFactory: () => async (next, request) => {
             if (
               request.payload.query.includes(
-                'query { status { status } }'
+                'query { status { status } }',
               )
             ) {
               return next();
@@ -38,13 +38,15 @@ export class AppFrameModule {
       frameworkImports: [
         CoreModule.forRoot({
           server: {
-            randomPort: !!Environment.GRAPHQL_RUNNER_RANDOM_PORT,
+            randomPort:
+              !!Environment.GRAPHQL_RUNNER_RANDOM_PORT,
             hapi: {
               port: Environment.GRAPHQL_RUNNER_API_PORT,
             },
           },
           graphql: {
-            graphiQlPlayground: !!Environment.GRAPHQL_RUNNER_GRAPHIQL,
+            graphiQlPlayground:
+              !!Environment.GRAPHQL_RUNNER_GRAPHIQL,
             openBrowser: false,
           },
         }),

package/src/app.tokents.ts

@@ -7,10 +7,12 @@ import { Environment } from './app.constants';
 
 export const CommandsToken = new InjectionToken();
 export const EnumToken = new InjectionToken();
-export const SubscriptionQuery = new InjectionToken<NetworkItem>();
+export const SubscriptionQuery =
+  new InjectionToken<NetworkItem>();
 
 export type SubscriptionQuery = NetworkItem;
-export const MachineStatusQuery = new InjectionToken<NetworkItem>();
+export const MachineStatusQuery =
+  new InjectionToken<NetworkItem>();
 
 export type MachineStatusQuery = NetworkItem;
 
@@ -27,7 +29,7 @@ export const machineHash = createHash('md5')
 export class Network {
   subscription: NetworkItem = {
     query: gql`
-      subscription($machineHash: String, $label: String) {
+      subscription ($machineHash: String, $label: String) {
         registerWorker(
           machineHash: $machineHash
           label: $label

package/src/cli-builder.ts

@@ -47,7 +47,7 @@ export class CLIBuilder {
   public static forRoot<C, T = unknown, K = unknown>(
     commands: GenericEnum<C, T, K>,
     enumerables,
-    network: Network = new Network()
+    network: Network = new Network(),
   ): ModuleWithProviders {
     return {
       module: CLIBuilder,
@@ -99,7 +99,7 @@ export class CLIBuilder {
                               new GraphqlEnumType({
                                 name: 'Commands',
                                 values: enumerables,
-                              })
+                              }),
                             ),
                           },
                           args: {
@@ -119,10 +119,10 @@ export class CLIBuilder {
                             cmd: string;
                             args: string[];
                             cwd: string;
-                          }
+                          },
                         ) =>
                           executeAction<number, string[]>(
-                            cmd
+                            cmd,
                           )(args, cwd),
                       },
                     }),
@@ -132,9 +132,10 @@ export class CLIBuilder {
             }),
         },
       ],
-      controllers: Environment.GRAPHQL_RUNNER_SUBSCRIPTION_URI
-        ? []
-        : [AppController],
+      controllers:
+        Environment.GRAPHQL_RUNNER_SUBSCRIPTION_URI
+          ? []
+          : [AppController],
     };
   }
 }

package/src/core/executors/commands.ts

@@ -14,16 +14,16 @@ type GenericEnumType<T, K, A> = {
 export type GenericEnum<
   C,
   T = any,
-  K = any
+  K = any,
 > = GenericEnumType<C, T, K>;
 
-export const getAction = <T = {}, K = {}>(
-  cmd: string | number
+export const getAction = <T = object, K = object>(
+  cmd: string | number,
 ): ((args: K, cwd?: string) => Promise<T>) =>
   Container.get(CommandsToken)[
     Container.get(EnumToken)[cmd]
   ];
 
-export const executeAction = <T = {}, K = {}>(
-  action: string | number
+export const executeAction = <T = object, K = object>(
+  action: string | number,
 ) => getAction<T, K>(action);

package/src/core/executors/helpers/execute.ts

@@ -12,7 +12,7 @@ export interface ProcessReturn {
 export const executeCommand = (
   command: string,
   args: string[] = [],
-  options?: SpawnOptionsWithoutStdio
+  options?: SpawnOptionsWithoutStdio,
 ) => {
   return new Promise<ProcessReturn>((resolve, reject) => {
     const child = spawn(command, args, options);

package/src/core/services/get-ip-adresses.ts

@@ -4,7 +4,7 @@ export const getIpAdresses = (
   network: Record<
     string,
     { family: string; internal: boolean; address: string }[]
-  >
+  >,
 ) =>
   Object.values(network).reduce((acc, interfaces) => {
     let alias = 0;

package/src/core/services/subscription.service.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
 import {
   Container,
   Inject,
@@ -23,7 +22,9 @@ import {
 import { executeAction } from '../executors/commands';
 import { getNetworkIP } from './get-ip-adresses';
 
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 const webSocketImpl = require('ws');
+
 interface MachineStatus {
   machineHash: string;
   label: string;
@@ -47,14 +48,14 @@ export class SubscriptionService {
     @Inject(SubscriptionQuery)
     private subscriptionsQuery: SubscriptionQuery,
     @Inject(MachineStatusQuery)
-    private machineStatusQuery: MachineStatusQuery
+    private machineStatusQuery: MachineStatusQuery,
   ) {
     if (Environment.GRAPHQL_RUNNER_SUBSCRIPTION_URI) {
       this.subscribe(
         Environment.GRAPHQL_RUNNER_SUBSCRIPTION_URI,
         Environment.GRAPHQL_RUNNER_SECRET,
         Environment.GRAPHQL_RUNNER_TYPE,
-        Environment.GRAPHQL_RUNNER_LABEL
+        Environment.GRAPHQL_RUNNER_LABEL,
       );
     }
   }
@@ -62,7 +63,7 @@ export class SubscriptionService {
     uri: string,
     authorization?: string,
     worker_type?: string,
-    label?: string
+    label?: string,
   ) {
     this.currentSubscriptionUri = uri;
     this.link = new WebSocketLink({
@@ -77,7 +78,7 @@ export class SubscriptionService {
             Environment.GRAPHQL_RUNNER_NAT_IP ||
             (await getNetworkIP()),
           networkInterfaces: JSON.stringify(
-            networkInterfaces()
+            networkInterfaces(),
           ),
         },
         reconnect: true,
@@ -90,37 +91,46 @@ export class SubscriptionService {
     }>(
       this.subscriptionsQuery.query,
       this.subscriptionsQuery.variables,
-      this.link
+      this.link,
     )
       .pipe(
-        map(({ data }) => this.subscriptionsQuery.map(data))
+        map(({ data }) =>
+          this.subscriptionsQuery.map(data),
+        ),
       )
-      .subscribe(async ({ args, command, cwd }) => {
-        const cmd = Container.get(EnumToken)[command];
-        if (!cmd) {
-          console.log('Missing command');
-          throw new Error('Missing command');
-        }
-        try {
-          const data = await executeAction(command)(
-            JSON.parse(args),
-            cwd
-          );
-          await this.sendStatus({
-            label,
-            machineHash,
-            data: JSON.stringify(data),
-          });
-        } catch (error) {
-          console.log(error);
-          await this.sendStatus({
-            label,
-            machineHash,
-            data: '',
-            error: JSON.stringify(error),
-          });
-        }
-      }, console.error);
+      .subscribe(
+        async ({
+          args,
+          command,
+          cwd,
+        }: IInstanceConnectionType) => {
+          const cmd = Container.get(EnumToken)[command];
+          if (!cmd) {
+            console.log('Missing command');
+            throw new Error('Missing command');
+          }
+          try {
+            const data = await executeAction(command)(
+              JSON.parse(args),
+              cwd,
+            );
+            await this.sendStatus({
+              label,
+              machineHash,
+              data: JSON.stringify(data),
+            });
+          } catch (error) {
+            console.log(error);
+            await this.sendStatus({
+              label,
+              machineHash,
+              data: '',
+              error: JSON.stringify(error),
+            });
+          }
+        },
+        console.error,
+      );
     return this.subscription;
   }
 
@@ -148,7 +158,7 @@ export class SubscriptionService {
 
   sendMachineStatus(variables: MachineStatus) {
     const client = new ApolloClient({
-      link: this.link,
+      link: this.link as never,
       cache: new InMemoryCache(),
     });
     return client.mutate({