@squiz/component-cli-lib 1.2.1-alpha.107 → 1.2.1-alpha.18

package/jest.config.ts

@@ -1,19 +1,11 @@
-import type { Config } from 'jest';
-import path from 'path';
-
-process.env.DATA_MOUNT_POINT = path.join(__dirname, '..', '..', 'test-components');
+import type { Config } from '@jest/types';
 
 // Sync object
-const config: Config = {
+const config: Config.InitialOptions = {
   preset: 'ts-jest',
   testEnvironment: 'node',
-  testPathIgnorePatterns: ['<rootDir>/lib/', '<rootDir>/src/integration-tests', '<rootDir>/src/test.ts'],
+  testPathIgnorePatterns: ['<rootDir>/lib/'],
   maxWorkers: '80%',
-  globals: {
-    'ts-jest': {
-      tsconfig: 'tsconfig.json',
-    },
-  },
 };
 
 export default config;

package/lib/index.d.ts

@@ -1,2 +1 @@
-export { uploadComponentFolder } from './upload-component-folder';
-export { startDevelopmentRender } from './component-dev';
+export declare function uploadComponentFolder(folderPath: string, componentServiceManagementUrl: string): Promise<void>;

package/lib/index.js

@@ -1,8 +1,82 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startDevelopmentRender = exports.uploadComponentFolder = void 0;
-var upload_component_folder_1 = require("./upload-component-folder");
-Object.defineProperty(exports, "uploadComponentFolder", { enumerable: true, get: function () { return upload_component_folder_1.uploadComponentFolder; } });
-var component_dev_1 = require("./component-dev");
-Object.defineProperty(exports, "startDevelopmentRender", { enumerable: true, get: function () { return component_dev_1.startDevelopmentRender; } });
+exports.uploadComponentFolder = void 0;
+const zipDirectory_1 = require("./utils/zipDirectory");
+const virus_scanner_lib_1 = require("@squiz/virus-scanner-lib");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const axios_1 = require("axios");
+async function uploadComponentFolder(folderPath, componentServiceManagementUrl) {
+    const tmpDir = path_1.default.resolve(fs_1.default.mkdtempSync('cmp-upload'));
+    try {
+        const axios = new axios_1.Axios({
+            baseURL: componentServiceManagementUrl,
+            headers: {
+                accept: 'application/json',
+            },
+        });
+        const zip = await (0, zipDirectory_1.zipDirectory)(folderPath, tmpDir);
+        const initialUpload = await handleResponse(axios.post('upload-component'));
+        await (0, virus_scanner_lib_1.uploadFile)(initialUpload, zip);
+        await watchAndWaitForUploadAndScanComplete(initialUpload.id, axios);
+        const result = await handleResponse(axios.post('upload-component/next/' + initialUpload.id));
+        if (result.status === 'Success') {
+            console.log('Success');
+        }
+    }
+    catch (e) {
+        if (e instanceof Error) {
+            console.log(e.stack);
+            console.error(e.message);
+        }
+        else {
+            throw e;
+        }
+    }
+    finally {
+        fs_1.default.rmSync(tmpDir, { force: true, recursive: true });
+    }
+}
+exports.uploadComponentFolder = uploadComponentFolder;
+async function watchAndWaitForUploadAndScanComplete(id, axios) {
+    return new Promise((resolve, reject) => {
+        setTimeout(async () => {
+            const req = await handleResponse(axios.get('upload-component/status/' + id));
+            if (req.status == 'Success') {
+                resolve();
+                return;
+            }
+            if (req.status == 'Flagged') {
+                reject(new Error('upload has been flagged as a virus'));
+                return;
+            }
+            if (req.status == 'Error') {
+                reject(new Error('there has been an error'));
+                return;
+            }
+            watchAndWaitForUploadAndScanComplete(id, axios);
+        }, 1000);
+    });
+}
+async function handleResponse(promise) {
+    try {
+        const result = await promise;
+        if (result.status > 299 || result.status < 200) {
+            throw new Error(`Unexpected response code ${result.status}`);
+        }
+        if (result.headers['content-type'].includes('application/json') && typeof result.data == 'string') {
+            return JSON.parse(result.data);
+        }
+        return result.data;
+    }
+    catch (error) {
+        if (typeof error == 'object' && error.isAxiosError) {
+            throw new Error(`Error received after making request ${error === null || error === void 0 ? void 0 : error.message}`);
+        }
+        throw error;
+    }
+}
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,qEAAkE;AAAzD,gIAAA,qBAAqB,OAAA;AAC9B,iDAAyD;AAAhD,uHAAA,sBAAsB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/test.js

@@ -0,0 +1,12 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const _1 = require(".");
+const dotenv_1 = require("dotenv");
+const path_1 = __importDefault(require("path"));
+(0, dotenv_1.config)();
+const dir = path_1.default.resolve(process.argv[2]);
+(0, _1.uploadComponentFolder)(dir, process.env.COMPONENT_MANAGEMENT_URL);
+//# sourceMappingURL=test.js.map

package/lib/test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":";;;;;AAAA,wBAA0C;AAC1C,mCAAgC;AAChC,gDAAwB;AAExB,IAAA,eAAM,GAAE,CAAC;AAET,MAAM,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAE1C,IAAA,wBAAqB,EAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAyB,CAAC,CAAC"}

package/lib/utils/zipDirectory.d.ts

@@ -0,0 +1 @@
+export declare function zipDirectory(sourceDirectory: string, outputDirectory: string): Promise<string>;

package/lib/utils/zipDirectory.js

@@ -0,0 +1,32 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.zipDirectory = void 0;
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const archiver_1 = __importDefault(require("archiver"));
+function zipDirectory(sourceDirectory, outputDirectory) {
+    return new Promise((resolve, reject) => {
+        const outputZipFile = path_1.default.join(outputDirectory, '/export.zip');
+        const output = fs_1.default.createWriteStream(outputZipFile);
+        const archive = (0, archiver_1.default)('zip', {
+            zlib: { level: 9 }, // Sets the compression level.
+        });
+        output.on('close', function () {
+            resolve(outputZipFile);
+        });
+        archive.on('warning', function (err) {
+            reject(err);
+        });
+        archive.on('error', function (err) {
+            reject(err);
+        });
+        archive.pipe(output);
+        archive.directory(sourceDirectory, false);
+        archive.finalize();
+    });
+}
+exports.zipDirectory = zipDirectory;
+//# sourceMappingURL=zipDirectory.js.map

package/lib/utils/zipDirectory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zipDirectory.js","sourceRoot":"","sources":["../../src/utils/zipDirectory.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,4CAAoB;AAEpB,wDAAgC;AAEhC,SAAgB,YAAY,CAAC,eAAuB,EAAE,eAAuB;IAC3E,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,YAAE,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QAEnD,MAAM,OAAO,GAAG,IAAA,kBAAQ,EAAC,KAAK,EAAE;YAC9B,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,8BAA8B;SACnD,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE;YACjB,OAAO,CAAC,aAAa,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,UAAU,GAAG;YACjC,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,GAAG;YAC/B,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrB,OAAO,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;QAC1C,OAAO,CAAC,QAAQ,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC;AAzBD,oCAyBC"}

package/package.json

@@ -1,41 +1,35 @@
 {
   "name": "@squiz/component-cli-lib",
-  "version": "1.2.1-alpha.107",
+  "version": "1.2.1-alpha.18",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
+    "start": "node ./lib/index.js",
     "compile": "tsc",
     "lint": "eslint ./src --ext .ts",
-    "test": "jest -c jest.config.ts",
-    "test:integration": "jest -c jest.integration.config.ts",
+    "test": "echo \"No unit tests, to be tested in integration tests\"",
     "clean": "rimraf \".tsbuildinfo\" \"./lib\""
   },
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@types/cli-color": "2.0.2",
+    "@jest/types": "27.5.1",
+    "@types/archiver": "^5.3.1",
     "@types/express": "4.17.13",
-    "@types/jest": "28.1.8",
+    "@types/jest": "27.4.1",
     "@types/node": "17.0.27",
-    "@types/supertest": "2.0.12",
-    "dotenv": "16.0.1",
-    "eslint": "8.22.0",
-    "jest": "28.1.3",
-    "ts-jest": "28.0.8",
-    "ts-loader": "9.3.1",
-    "ts-node": "10.9.1",
-    "typescript": "4.7.4"
+    "dotenv": "^16.0.0",
+    "eslint": "8.13.0",
+    "jest": "27.5.1",
+    "ts-jest": "27.1.4",
+    "ts-loader": "9.2.8",
+    "ts-node": "10.7.0",
+    "typescript": "4.6.3"
   },
   "dependencies": {
-    "@squiz/component-lib": "^1.2.1-alpha.107",
-    "@squiz/dx-common-lib": "^1.2.1-alpha.107",
-    "@squiz/dx-logger-lib": "^1.2.1-alpha.107",
-    "@squiz/render-runtime-lib": "^1.2.1-alpha.107",
-    "@squiz/virus-scanner-lib": "^1.2.1-alpha.107",
+    "@squiz/virus-scanner-lib": "^1.2.1-alpha.18",
     "archiver": "5.3.1",
-    "axios": "0.27.2",
-    "cli-color": "^2.0.2",
-    "supertest": "^6.2.3"
+    "axios": "0.27.2"
   },
-  "gitHead": "dc09e24c89b0f6d6afd23e958523cf9c9add89ec"
+  "gitHead": "c95a3237ebd214ca179bdb881a509dbd94f7514c"
 }

package/src/index.ts

@@ -1,2 +1,90 @@
-export { uploadComponentFolder } from './upload-component-folder';
-export { startDevelopmentRender } from './component-dev';
+import { zipDirectory } from './utils/zipDirectory';
+import { uploadFile } from '@squiz/virus-scanner-lib';
+import fs from 'fs';
+import path from 'path';
+import { Axios, AxiosResponse } from 'axios';
+import { ScanStatus } from 'packages/virus-scanner-lib/src/generated';
+
+export async function uploadComponentFolder(folderPath: string, componentServiceManagementUrl: string): Promise<void> {
+  const tmpDir = path.resolve(fs.mkdtempSync('cmp-upload'));
+
+  try {
+    const axios = new Axios({
+      baseURL: componentServiceManagementUrl,
+      headers: {
+        accept: 'application/json',
+      },
+    });
+
+    const zip = await zipDirectory(folderPath, tmpDir);
+
+    const initialUpload = await handleResponse<any>(axios.post('upload-component'));
+
+    await uploadFile(initialUpload, zip);
+
+    await watchAndWaitForUploadAndScanComplete(initialUpload.id, axios);
+
+    const result = await handleResponse<any>(axios.post('upload-component/next/' + initialUpload.id));
+
+    if (result.status === 'Success') {
+      console.log('Success');
+    }
+  } catch (e) {
+    if (e instanceof Error) {
+      console.log(e.stack);
+      console.error(e.message);
+    } else {
+      throw e;
+    }
+  } finally {
+    fs.rmSync(tmpDir, { force: true, recursive: true });
+  }
+}
+
+async function watchAndWaitForUploadAndScanComplete(id: string, axios: Axios): Promise<void> {
+  return new Promise((resolve, reject) => {
+    setTimeout(async () => {
+      const req = await handleResponse<ScanStatus>(axios.get('upload-component/status/' + id));
+
+      if (req.status == 'Success') {
+        resolve();
+        return;
+      }
+
+      if (req.status == 'Flagged') {
+        reject(new Error('upload has been flagged as a virus'));
+
+        return;
+      }
+
+      if (req.status == 'Error') {
+        reject(new Error('there has been an error'));
+        return;
+      }
+
+      watchAndWaitForUploadAndScanComplete(id, axios);
+    }, 1000);
+  });
+}
+
+async function handleResponse<T>(promise: Promise<AxiosResponse<T>>): Promise<T> {
+  try {
+    const result = await promise;
+
+    if (result.status > 299 || result.status < 200) {
+      throw new Error(`Unexpected response code ${result.status}`);
+    }
+
+    if (result.headers['content-type'].includes('application/json') && typeof result.data == 'string') {
+      return JSON.parse(result.data);
+    }
+
+    return result.data;
+  } catch (error: any) {
+    if (typeof error == 'object' && error.isAxiosError) {
+      throw new Error(`Error received after making request ${error?.message}`);
+    }
+
+    throw error;
+  }
+}

package/src/test.ts

@@ -0,0 +1,9 @@
+import { uploadComponentFolder } from '.';
+import { config } from 'dotenv';
+import path from 'path';
+
+config();
+
+const dir = path.resolve(process.argv[2]);
+
+uploadComponentFolder(dir, process.env.COMPONENT_MANAGEMENT_URL!);

package/src/utils/zipDirectory.ts

@@ -0,0 +1,31 @@
+import path from 'path';
+import fs from 'fs';
+
+import archiver from 'archiver';
+
+export function zipDirectory(sourceDirectory: string, outputDirectory: string) {
+  return new Promise<string>((resolve, reject) => {
+    const outputZipFile = path.join(outputDirectory, '/export.zip');
+    const output = fs.createWriteStream(outputZipFile);
+
+    const archive = archiver('zip', {
+      zlib: { level: 9 }, // Sets the compression level.
+    });
+
+    output.on('close', function () {
+      resolve(outputZipFile);
+    });
+
+    archive.on('warning', function (err) {
+      reject(err);
+    });
+
+    archive.on('error', function (err) {
+      reject(err);
+    });
+
+    archive.pipe(output);
+    archive.directory(sourceDirectory, false);
+    archive.finalize();
+  });
+}

package/tsconfig.json

@@ -9,12 +9,7 @@
     "sourceMap": true
   },
 
-  "references": [
-    { "path": "../virus-scanner-lib" },
-    { "path": "../component-lib" },
-    { "path": "../render-runtime-lib" },
-    { "path": "../dx-logger-lib" }
-  ],
+  "references": [{ "path": "../virus-scanner-lib" }],
 
   "include": ["src/**/*.ts", "src/**/*.json"],
   "exclude": ["jest.config.ts"]