@restorecommerce/gql-bot 0.2.1 → 0.2.4

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.4](https://github.com/restorecommerce/libs/compare/@restorecommerce/gql-bot@0.2.3...@restorecommerce/gql-bot@0.2.4) (2022-06-20)
+
+**Note:** Version bump only for package @restorecommerce/gql-bot
+
+
+
+
+
+## [0.2.3](https://github.com/restorecommerce/libs/compare/@restorecommerce/gql-bot@0.2.2...@restorecommerce/gql-bot@0.2.3) (2022-06-20)
+
+
+### Bug Fixes
+
+* **gql-bot:** correctly handle null objects ([e7e44ef](https://github.com/restorecommerce/libs/commit/e7e44ef95585d423ddee7d41b6cc196ad1668284))
+
+
+
+
+
+## [0.2.2](https://github.com/restorecommerce/libs/compare/@restorecommerce/gql-bot@0.2.1...@restorecommerce/gql-bot@0.2.2) (2022-06-20)
+
+
+### Bug Fixes
+
+* **gql-bot:** resume if errors are skipped ([7f01a84](https://github.com/restorecommerce/libs/commit/7f01a84f19a81360b94d8dc9421cb572d0fb3cd5))
+
+
+
+
+
 ## [0.2.1](https://github.com/restorecommerce/libs/compare/@restorecommerce/gql-bot@0.2.0...@restorecommerce/gql-bot@0.2.1) (2022-06-20)
 
 

package/lib/client.d.ts

@@ -5,5 +5,5 @@ export declare class Client {
     constructor(opts: any);
     _buildURLs(): any;
     _normalizeUrl(source?: any): string;
-    post(source: any, job?: any, verbose?: boolean, ignoreSelfSigned?: boolean): Promise<any>;
+    post(source: any, job?: any, verbose?: boolean, ignoreErrors?: boolean, ignoreSelfSigned?: boolean): Promise<any>;
 }

package/lib/client.js

@@ -19,6 +19,7 @@ const apollo_cache_inmemory_1 = require("apollo-cache-inmemory");
 const node_fetch_1 = require("node-fetch"); // required for apollo-link-http
 const apollo_link_http_1 = require("apollo-link-http");
 const https = require("https");
+const utils_1 = require("./utils");
 const _checkVariableMutation = (mutation) => {
     const mutationName = mutation.slice(mutation.indexOf(' '), mutation.indexOf('($'));
     if (mutationName.indexOf('$') > 0) {
@@ -45,7 +46,7 @@ const _createQueryVariables = (inputVarName, queryVarKey, varValue) => {
     };
 };
 const checkError = (data) => {
-    if (typeof data === 'object') {
+    if (typeof data === 'object' && data !== null) {
         if (Array.isArray(data)) {
             const result = data.map(value => {
                 const inner = checkError(value);
@@ -133,7 +134,7 @@ class Client {
         }
         return url.resolve(this.entryBaseUrl, extendURL);
     }
-    post(source, job, verbose = false, ignoreSelfSigned = false) {
+    post(source, job, verbose = false, ignoreErrors = false, ignoreSelfSigned = false) {
         return __awaiter(this, void 0, void 0, function* () {
             const normalUrl = this._normalizeUrl();
             let mutation;
@@ -177,14 +178,14 @@ class Client {
                     agent: new https.Agent({ rejectUnauthorized: false }),
                 };
             }
-            let apolloLink = apollo_link_http_1.createHttpLink(apolloLinkOpts);
+            let apolloLink = (0, apollo_link_http_1.createHttpLink)(apolloLinkOpts);
             const apolloCache = new apollo_cache_inmemory_1.InMemoryCache();
             const apolloClient = new apollo_client_1.ApolloClient({
                 cache: apolloCache,
                 link: apolloLink
             });
             const response = yield apolloClient.mutate({
-                mutation: graphql_tag_1.default `${mutation}`,
+                mutation: (0, graphql_tag_1.default) `${mutation}`,
                 variables
             });
             const error = checkError(response);
@@ -196,6 +197,10 @@ class Client {
                         response
                     }));
                 }
+                else if (ignoreErrors) {
+                    const processed = (0, utils_1.processResponse)(response);
+                    console.error(JSON.stringify(processed));
+                }
                 throw new Error(JSON.stringify(error));
             }
             return response;

package/lib/job_processor.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import * as ps from 'promise-streams';
 import { Readable } from 'stream';
 import { EventEmitter } from 'events';

package/lib/job_processor.js

@@ -18,33 +18,6 @@ const readdirp = require("readdirp");
 const path = require("path");
 const events_1 = require("events");
 const utils_1 = require("./utils");
-const unwrap = (data) => {
-    let result = data;
-    while (typeof result === 'object' && Object.keys(result).length == 1) {
-        result = result[Object.keys(result)[0]];
-    }
-    return result;
-};
-const removeType = (data) => {
-    if (typeof data === 'object') {
-        if (Array.isArray(data)) {
-            data = data.map(removeType);
-        }
-        else {
-            delete data['__typename'];
-            Object.keys(data).forEach(k => data[k] = removeType(data[k]));
-        }
-    }
-    return data;
-};
-const processResponse = (body) => {
-    const result = [];
-    for (const response of Array.isArray(body) ? body : [body]) {
-        const clean = unwrap(removeType(response));
-        result.push(clean);
-    }
-    return result;
-};
 class ReadArrayStream extends stream_1.Readable {
     constructor(opts, array) {
         super(opts);
@@ -106,13 +79,13 @@ class JobProcessor {
             const concurrency = this.jobInfo.options.concurrency;
             this.taskStream = ps.map({ concurrent: concurrency }, (task) => {
                 return this.jobInfo.options.processor.process(task, verbose, ignoreErrors, ignoreSelfSigned).then((body) => {
-                    const logColor = utils_1.stringToChalk(task.name);
+                    const logColor = (0, utils_1.stringToChalk)(task.name);
                     if (verbose) {
-                        const processed = processResponse(body);
-                        console.log(`[${logColor(task.name)}] Completed successfully`, JSON.stringify(processed));
+                        const processed = (0, utils_1.processResponse)(body);
+                        console.log(`[${logColor(task.name)}] Completed`, JSON.stringify(processed));
                     }
                     else {
-                        console.log(`[${logColor(task.name)}] Completed successfully`);
+                        console.log(`[${logColor(task.name)}] Completed`);
                     }
                     task.inputTask.processing--;
                     task.progress.value = 100; // task complete

package/lib/job_processor_gql.js

@@ -35,7 +35,7 @@ class GraphQLProcessor {
             let yamlStream = new yaml_document_stream_1.YamlStreamReadTransformer();
             let jobPath = task.path;
             let data = false;
-            const logColor = utils_1.stringToChalk(task.name);
+            const logColor = (0, utils_1.stringToChalk)(task.name);
             switch (task.operation) {
                 case 'sync': { //  synchronous operation
                     return new Promise((resolve, reject) => {
@@ -68,7 +68,7 @@ class GraphQLProcessor {
                                         counter = 0;
                                         let batchText = '';
                                         if (batchsize > 0) {
-                                            const from = batchCounter * batchsize;
+                                            const from = batchCounter * batchsize + 1;
                                             const to = from + (docArr.length - 1);
                                             batchText = from == to ? ` (${from})` : ` (${from} - ${to})`;
                                         }
@@ -89,11 +89,12 @@ class GraphQLProcessor {
                             // 'yamlStream' readable stream.
                             yamlStream.on('pause', () => __awaiter(this, void 0, void 0, function* () {
                                 try {
-                                    resultArr.push(yield this.client.post(docArr, task, verbose, ignoreSelfSigned));
+                                    resultArr.push(yield this.client.post(docArr, task, verbose, ignoreErrors, ignoreSelfSigned));
                                     yamlStream.resume();
                                 }
                                 catch (e) {
                                     !ignoreErrors && reject(e);
+                                    ignoreErrors && yamlStream.resume();
                                 }
                             }));
                             let runOnResume;
@@ -113,14 +114,14 @@ class GraphQLProcessor {
                                 if (docArr && !_.isEmpty(docArr)) {
                                     let batchText = '';
                                     if (batchsize > 0) {
-                                        const from = batchCounter * batchsize;
+                                        const from = batchCounter * batchsize + 1;
                                         const to = from + (docArr.length - 1);
                                         batchText = from == to ? ` (${from})` : ` (${from} - ${to})`;
                                     }
                                     batchCounter++;
                                     console.log(`[${logColor(task.name)}] Processing batch: ${batchCounter}${batchText}`);
                                     try {
-                                        resultArr.push(yield this.client.post(docArr, task, verbose, ignoreSelfSigned));
+                                        resultArr.push(yield this.client.post(docArr, task, verbose, ignoreErrors, ignoreSelfSigned));
                                     }
                                     catch (e) {
                                         !ignoreErrors && reject(e);

package/lib/utils.d.ts

@@ -1,2 +1,3 @@
 import * as chalk from 'chalk';
 export declare const stringToChalk: (str: any) => chalk.Chalk;
+export declare const processResponse: (body: any | any[]) => any;

package/lib/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringToChalk = void 0;
+exports.processResponse = exports.stringToChalk = void 0;
 const color_hash_1 = require("color-hash");
 const chalk = require("chalk");
 const colorHash = new color_hash_1.default({
@@ -10,3 +10,31 @@ const stringToChalk = (str) => {
     return chalk.hex(colorHash.hex(str));
 };
 exports.stringToChalk = stringToChalk;
+const unwrap = (data) => {
+    let result = data;
+    while (typeof result === 'object' && Object.keys(result).length == 1) {
+        result = result[Object.keys(result)[0]];
+    }
+    return result;
+};
+const removeType = (data) => {
+    if (typeof data === 'object' && data !== null) {
+        if (Array.isArray(data)) {
+            data = data.map(removeType);
+        }
+        else {
+            delete data['__typename'];
+            Object.keys(data).forEach(k => data[k] = removeType(data[k]));
+        }
+    }
+    return data;
+};
+const processResponse = (body) => {
+    const result = [];
+    for (const response of Array.isArray(body) ? body : [body]) {
+        const clean = unwrap(removeType(response));
+        result.push(clean);
+    }
+    return result;
+};
+exports.processResponse = processResponse;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@restorecommerce/gql-bot",
   "description": "GraphQL Client Automated Task Processor",
   "main": "lib/index",
-  "version": "0.2.1",
+  "version": "0.2.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/restorecommerce/libs.git"
@@ -22,7 +22,7 @@
     "chalk": "^4.1.2",
     "color-hash": "^2.0.1",
     "graphql": "^15.5.0",
-    "graphql-tag": "^2.11.0",
+    "graphql-tag": "^2.12.6",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.0",
@@ -37,16 +37,16 @@
     "@types/node": "^14.14.41",
     "@typescript-eslint/eslint-plugin": "^4.22.0",
     "@typescript-eslint/parser": "^4.22.0",
-    "coveralls": "^3.1.0",
+    "coveralls": "^3.1.1",
     "eslint": "^7.24.0",
     "eslint-plugin-prefer-arrow-functions": "^3.1.4",
     "mocha": "^8.3.2",
-    "nock": "^13.0.11",
+    "nock": "^13.2.7",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
     "should": "^13.2.3",
     "ts-node": "^10.5.0",
-    "typescript": "^4.2.4"
+    "typescript": "^4.7.4"
   },
   "scripts": {
     "pretest": "npm run lint",
@@ -71,5 +71,5 @@
       }
     }
   },
-  "gitHead": "81045bce9b7838e15911349d28685be9416ac773"
+  "gitHead": "4dd7fcfeb6b9be52a91beb8b6353fbe69c17cc44"
 }

package/src/client.ts

@@ -7,6 +7,7 @@ import { InMemoryCache } from 'apollo-cache-inmemory';
 import fetch from 'node-fetch'; // required for apollo-link-http
 import { createHttpLink, HttpLink } from 'apollo-link-http';
 import * as https from 'https';
+import { processResponse } from './utils';
 
 const _checkVariableMutation = (mutation: string): Boolean => {
   const mutationName = mutation.slice(mutation.indexOf(' '),
@@ -38,7 +39,7 @@ const _createQueryVariables = (inputVarName: string, queryVarKey: string, varVal
 };
 
 const checkError = (data: any): any => {
-  if (typeof data === 'object') {
+  if (typeof data === 'object' && data !== null) {
     if (Array.isArray(data)) {
       const result = data.map(value => {
         const inner = checkError(value);
@@ -139,7 +140,7 @@ export class Client {
     return url.resolve(this.entryBaseUrl, extendURL);
   }
 
-  async post(source: any, job?: any, verbose = false, ignoreSelfSigned = false): Promise<any> {
+  async post(source: any, job?: any, verbose = false, ignoreErrors = false, ignoreSelfSigned = false): Promise<any> {
     const normalUrl = this._normalizeUrl();
 
     let mutation;
@@ -209,6 +210,9 @@ export class Client {
           variables,
           response
         }));
+      } else if (ignoreErrors) {
+        const processed = processResponse(response);
+        console.error(JSON.stringify(processed));
       }
       throw new Error(JSON.stringify(error));
     }

package/src/job_processor.ts

@@ -5,36 +5,7 @@ import * as through2 from 'through2';
 import * as readdirp from 'readdirp';
 import * as path from 'path';
 import { EventEmitter } from 'events';
-import { stringToChalk } from './utils';
-
-const unwrap = (data: any): any => {
-  let result = data;
-  while (typeof result === 'object' && Object.keys(result).length == 1) {
-    result = result[Object.keys(result)[0]];
-  }
-  return result;
-};
-
-const removeType = (data: any): any => {
-  if (typeof data === 'object') {
-    if (Array.isArray(data)) {
-      data = data.map(removeType);
-    } else {
-      delete data['__typename'];
-      Object.keys(data).forEach(k => data[k] = removeType(data[k]));
-    }
-  }
-  return data;
-};
-
-const processResponse = (body: any | any[]): any => {
-  const result = [];
-  for (const response of Array.isArray(body) ? body : [body]) {
-    const clean = unwrap(removeType(response));
-    result.push(clean);
-  }
-  return result;
-};
+import { stringToChalk, processResponse } from './utils';
 
 export class ReadArrayStream extends Readable {
   array: any[];
@@ -112,9 +83,9 @@ export class JobProcessor {
 
         if (verbose) {
           const processed = processResponse(body);
-          console.log(`[${logColor(task.name)}] Completed successfully`, JSON.stringify(processed));
+          console.log(`[${logColor(task.name)}] Completed`, JSON.stringify(processed));
         } else {
-          console.log(`[${logColor(task.name)}] Completed successfully`);
+          console.log(`[${logColor(task.name)}] Completed`);
         }
 
         task.inputTask.processing--;

package/src/job_processor_gql.ts

@@ -64,7 +64,7 @@ export class GraphQLProcessor {
                   counter = 0;
                   let batchText = '';
                   if (batchsize > 0) {
-                    const from = batchCounter * batchsize;
+                    const from = batchCounter * batchsize + 1;
                     const to = from + (docArr.length - 1);
                     batchText = from == to ? ` (${from})` : ` (${from} - ${to})`;
                   }
@@ -85,10 +85,11 @@ export class GraphQLProcessor {
             // 'yamlStream' readable stream.
             yamlStream.on('pause', async () => {
               try {
-                resultArr.push(await this.client.post(docArr, task, verbose, ignoreSelfSigned));
+                resultArr.push(await this.client.post(docArr, task, verbose, ignoreErrors, ignoreSelfSigned));
                 yamlStream.resume();
               } catch (e) {
                 !ignoreErrors && reject(e);
+                ignoreErrors && yamlStream.resume();
               }
             });
 
@@ -111,14 +112,14 @@ export class GraphQLProcessor {
               if (docArr && !_.isEmpty(docArr)) {
                 let batchText = '';
                 if (batchsize > 0) {
-                  const from = batchCounter * batchsize;
+                  const from = batchCounter * batchsize + 1;
                   const to = from + (docArr.length - 1);
                   batchText = from == to ? ` (${from})` : ` (${from} - ${to})`;
                 }
                 batchCounter++;
                 console.log(`[${logColor(task.name)}] Processing batch: ${batchCounter}${batchText}`);
                 try {
-                  resultArr.push(await this.client.post(docArr, task, verbose, ignoreSelfSigned));
+                  resultArr.push(await this.client.post(docArr, task, verbose, ignoreErrors, ignoreSelfSigned));
                 } catch (e) {
                   !ignoreErrors && reject(e);
                 }

package/src/utils.ts

@@ -8,3 +8,32 @@ const colorHash = new ColorHash({
 export const stringToChalk = (str) => {
   return chalk.hex(colorHash.hex(str));
 };
+
+const unwrap = (data: any): any => {
+  let result = data;
+  while (typeof result === 'object' && Object.keys(result).length == 1) {
+    result = result[Object.keys(result)[0]];
+  }
+  return result;
+};
+
+const removeType = (data: any): any => {
+  if (typeof data === 'object' && data !== null) {
+    if (Array.isArray(data)) {
+      data = data.map(removeType);
+    } else {
+      delete data['__typename'];
+      Object.keys(data).forEach(k => data[k] = removeType(data[k]));
+    }
+  }
+  return data;
+};
+
+export const processResponse = (body: any | any[]): any => {
+  const result = [];
+  for (const response of Array.isArray(body) ? body : [body]) {
+    const clean = unwrap(removeType(response));
+    result.push(clean);
+  }
+  return result;
+};