@squiz/component-cli-lib 1.2.1-alpha.68 → 1.2.1-alpha.70

package/lib/upload-component-folder.js

@@ -0,0 +1,90 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uploadComponentFolder = void 0;
+const virus_scanner_lib_1 = require("@squiz/virus-scanner-lib");
+const component_lib_1 = require("@squiz/component-lib");
+const promises_1 = __importDefault(require("fs/promises"));
+const path_1 = __importDefault(require("path"));
+const axios_1 = __importDefault(require("axios"));
+const cli_color_1 = __importDefault(require("cli-color"));
+async function uploadComponentFolder(folderPath, componentServiceManagementUrl) {
+    const tmpDir = path_1.default.resolve(await promises_1.default.mkdtemp('cmp-upload'));
+    try {
+        const axiosInstance = axios_1.default.create({
+            baseURL: componentServiceManagementUrl,
+        });
+        console.log('Initial scanning');
+        const zip = await (0, component_lib_1.zipDirectory)(folderPath, tmpDir);
+        const initialUpload = await handleResponse(axiosInstance.post('upload-component'));
+        console.log(`deployment id: ${initialUpload.id} status: transferring`);
+        await (0, virus_scanner_lib_1.uploadFile)(initialUpload, zip);
+        await watchAndWaitForUploadAndScanComplete(initialUpload.id, axiosInstance);
+        console.log(`deployment id: ${initialUpload.id} status: deploying component folder`);
+        const result = await handleResponse(axiosInstance.post(`upload-component/next/${initialUpload.id}`));
+        await promises_1.default.rm(tmpDir, { force: true, recursive: true });
+        if (result.status === 'successful') {
+            console.log(`deployment id: ${initialUpload.id} status: ${cli_color_1.default.green('success')}`);
+            console.log(`uploaded location: ${result.accessLink}`);
+        }
+        else {
+            console.error('failed for an unknown reason', cli_color_1.default.red(result));
+        }
+    }
+    catch (e) {
+        await promises_1.default.rm(tmpDir, { force: true, recursive: true });
+        if (e instanceof Error) {
+            console.error(cli_color_1.default.red(e.message));
+        }
+        else {
+            throw e;
+        }
+    }
+}
+exports.uploadComponentFolder = uploadComponentFolder;
+async function watchAndWaitForUploadAndScanComplete(id, axiosInstance) {
+    const poll = () => handleResponse(axiosInstance.get('upload-component/status/' + id));
+    return new Promise((resolve, reject) => {
+        const recurse = () => poll().then(async (req) => {
+            if (req.status == 'Success') {
+                resolve();
+            }
+            else if (req.status == 'Flagged') {
+                reject(new Error('upload has been flagged as a virus'));
+            }
+            else if (req.status == 'Error') {
+                reject(new Error('there has been an error'));
+            }
+            else {
+                setTimeout(async () => {
+                    await recurse();
+                }, 1000);
+            }
+        });
+        recurse();
+    });
+}
+async function handleResponse(axiosInstance) {
+    const result = axiosInstance
+        .then((response) => response.data)
+        .catch((error) => {
+        throw handleAxiosError(error);
+    });
+    return result;
+}
+function handleAxiosError(error) {
+    const { response } = error;
+    if (!response || (typeof error == 'object' && !error.isAxiosError)) {
+        return error;
+    }
+    const message = response.data.message;
+    if (message) {
+        return new Error(`Unexpected response code ${response.status}. message: ${message}`);
+    }
+    else {
+        return new Error(`Unexpected response code ${response.status}.`);
+    }
+}
+//# sourceMappingURL=upload-component-folder.js.map

package/lib/upload-component-folder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upload-component-folder.js","sourceRoot":"","sources":["../src/upload-component-folder.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@squiz/component-cli-lib",
-  "version": "1.2.1-alpha.68",
+  "version": "1.2.1-alpha.70",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
     "start": "node ./lib/index.js",
     "compile": "tsc",
     "lint": "eslint ./src --ext .ts",
-    "test": "jest",
+    "test": "jest -c jest.config.ts",
     "test:integration": "jest -c jest.integration.config.ts",
     "clean": "rimraf \".tsbuildinfo\" \"./lib\""
   },
@@ -16,25 +16,25 @@
   "devDependencies": {
     "@types/cli-color": "2.0.2",
     "@types/express": "4.17.13",
-    "@types/jest": "28.1.3",
+    "@types/jest": "28.1.6",
     "@types/node": "17.0.27",
     "@types/supertest": "2.0.12",
     "dotenv": "16.0.1",
     "eslint": "8.18.0",
-    "jest": "28.1.1",
+    "jest": "28.1.3",
     "ts-jest": "28.0.5",
     "ts-loader": "9.3.1",
     "ts-node": "10.8.1",
     "typescript": "4.7.4"
   },
   "dependencies": {
-    "@squiz/component-lib": "^1.2.1-alpha.68",
-    "@squiz/render-runtime-lib": "^1.2.1-alpha.68",
-    "@squiz/virus-scanner-lib": "^1.2.1-alpha.68",
+    "@squiz/component-lib": "^1.2.1-alpha.70",
+    "@squiz/render-runtime-lib": "^1.2.1-alpha.70",
+    "@squiz/virus-scanner-lib": "^1.2.1-alpha.70",
     "archiver": "5.3.1",
     "axios": "0.27.2",
     "cli-color": "^2.0.2",
     "supertest": "^6.2.3"
   },
-  "gitHead": "09a8b880d1b213bd3956724c5de2cebe550f5316"
+  "gitHead": "f8d9c77cc30b5b66c4c3c66ac9cf8e30b5c27373"
 }

package/src/component-dev.spec.ts

@@ -1,65 +1,105 @@
 import path from 'path';
+import fsp from 'fs/promises';
 
-import { stopRenderStack, TestHelpers } from '@squiz/render-runtime-lib';
+import { routeTests, TestHelpers } from '@squiz/render-runtime-lib';
 import { startDevelopmentRender } from './component-dev';
+import supertest from 'supertest';
 
 jest.setTimeout(20_000);
+
 describe('component-dev', () => {
-  describe('folder structures', () => {
-    beforeEach(() => {
-      return stopRenderStack().catch(() => null);
+  describe('production style folder structure', () => {
+    let doStopStack: Awaited<ReturnType<typeof startDevelopmentRender>>;
+
+    beforeAll(async () => {
+      doStopStack = await startDevelopmentRender(path.join(__dirname, '../../../test-components'), { port: 0 });
+    });
+
+    afterAll(async () => {
+      await doStopStack();
+    });
+
+    it('should find the component', async () => {
+      const testServer = TestHelpers.getTestServer();
+      const response = await testServer.get(`/r/set/test-component/1.0.0?something=hello`);
+      expect(response.text).toEqual('<h1>hello</h1>');
+    });
+  });
+
+  describe('local developer style folders', () => {
+    let doStopStack: Awaited<ReturnType<typeof startDevelopmentRender>>;
+    let version: string;
+    let componentName: string;
+    let fixtureDirectory: string;
+
+    beforeAll(async () => {
+      const {
+        fixtureDirectory: ceratedFixtureDirectory,
+        version: createdVersion,
+        componentName: createdName,
+      } = await TestHelpers.ComponentFixture.setupFullComponentDirectory('<h1>Hello World</h1>');
+
+      version = createdVersion;
+      fixtureDirectory = ceratedFixtureDirectory;
+      componentName = createdName;
+
+      doStopStack = await startDevelopmentRender(fixtureDirectory, { port: 0 });
     });
 
-    afterEach(() => {
-      return stopRenderStack().catch(() => null);
+    afterAll(async () => {
+      await doStopStack();
+      await fsp.rm(path.join(fixtureDirectory, componentName), { force: true, recursive: true });
     });
 
-    it('handles production style folder structure', async () => {
-      const { fixtureDirectory, version, componentName } =
-        await TestHelpers.ComponentFixture.setupFullComponentDirectory('<h1>Hello World</h1>');
+    it('should handle recursing folders to find the component', async () => {
+      const testServer = TestHelpers.getTestServer();
+      const response = await testServer.get(`/r/set/${componentName}/${version}/`);
+      expect(response.text).toEqual('<h1>Hello World</h1>');
+    });
+  });
 
-      // /fixtures/
-      const doStopStack = await startDevelopmentRender(path.dirname(fixtureDirectory), { port: 0 });
+  describe('accessing local dev routes', () => {
+    let stopServer: Awaited<ReturnType<typeof startDevelopmentRender>>;
+    const port = 3006;
+    const url = `http://localhost:${port}`;
+    const request = supertest(url);
 
-      try {
-        const testServer = TestHelpers.getTestServer();
-        const response = await testServer.get(`/r/set/${componentName}/${version}/`);
-        expect(response.text).toEqual('<h1>Hello World</h1>');
-      } finally {
-        await doStopStack();
-      }
+    beforeAll(async () => {
+      const compDir = path.join(__dirname, '../', '../../test-components');
+
+      stopServer = await startDevelopmentRender(compDir, {
+        port: port,
+      });
     });
 
-    it('handles list of versions style folder structure', async () => {
-      const { fixtureDirectory, version, componentName } =
-        await TestHelpers.ComponentFixture.setupFullComponentDirectory('<h1>Hello World</h1>');
+    afterAll(async () => {
+      await stopServer();
+    });
 
-      // /fixtures/${componentName}/
-      const doStopStack = await startDevelopmentRender(fixtureDirectory, { port: 0 });
+    describe('definition routes', () => {
+      routeTests.definition(url, url);
+    });
 
-      try {
-        const testServer = TestHelpers.getTestServer();
-        const response = await testServer.get(`/r/set/${componentName}/${version}/`);
-        expect(response.text).toEqual('<h1>Hello World</h1>');
-      } finally {
-        await doStopStack();
-      }
+    describe('static routes', () => {
+      routeTests.static(url);
     });
 
-    it('handles specific component folder structure', async () => {
-      const { fixtureDirectory, version, componentName } =
-        await TestHelpers.ComponentFixture.setupFullComponentDirectory('<h1>Hello World</h1>');
+    describe('render routes', () => {
+      routeTests.render(url, url);
+    });
 
-      // /fixtures/${componentName}/${version}/
-      const doStopStack = await startDevelopmentRender(path.resolve(fixtureDirectory, version), { port: 0 });
+    describe('GET /r/set/test-component/1.0.1', () => {
+      //
+      // this scenario is different to the 'production' tests
+      // this is should 500 in prod and 404 locally
+      it('should fail validation if trying to render a component with an invalid schema', async () => {
+        const response = await request.get('/r/set/test-component/1.0.1?something=not-used');
 
-      try {
-        const testServer = TestHelpers.getTestServer();
-        const response = await testServer.get(`/r/set/${componentName}/${version}/`);
-        expect(response.text).toEqual('<h1>Hello World</h1>');
-      } finally {
-        await doStopStack();
-      }
+        expect(response.statusCode).toEqual(404);
+        expect(response.body).toEqual({
+          message: 'manifest could not be found',
+        });
+      });
     });
   });
 });

package/src/component-dev.ts

@@ -16,12 +16,14 @@ export async function startDevelopmentRender(componentPath: string, options: { p
     webserver: {
       port: options.port,
       rootUrl: `http://localhost:${options.port}`,
+      shouldRunMigrations: false,
     },
     componentRunner: {
       // Considering the component path will be passed in from CLI
       // We need to generate the path from the calling directory
       dataMountPoint: path.resolve(process.cwd(), componentPath),
       doDevReload: true,
+
       workerTimeout: 20_000,
     },
   });

package/src/index.ts

@@ -1,92 +1,2 @@
-import { ScanStatus, uploadFile } from '@squiz/virus-scanner-lib';
-import { zipDirectory } from '@squiz/component-lib';
-import fsp from 'fs/promises';
-import path from 'path';
-import axios, { AxiosResponse, AxiosError, AxiosInstance } from 'axios';
-import color from 'cli-color';
-
+export { uploadComponentFolder } from './upload-component-folder';
 export { startDevelopmentRender } from './component-dev';
-
-export async function uploadComponentFolder(folderPath: string, componentServiceManagementUrl: string): Promise<void> {
-  const tmpDir = path.resolve(await fsp.mkdtemp('cmp-upload'));
-
-  try {
-    const axiosInstance = axios.create({
-      baseURL: componentServiceManagementUrl,
-    });
-    console.log('Initial scanning');
-    const zip = await zipDirectory(folderPath, tmpDir);
-
-    const initialUpload = await handleResponse<any>(axiosInstance.post('upload-component'));
-
-    console.log(`deployment id: ${initialUpload.id} status: transferring`);
-    await uploadFile(initialUpload, zip);
-
-    await watchAndWaitForUploadAndScanComplete(initialUpload.id, axiosInstance);
-
-    console.log(`deployment id: ${initialUpload.id} status: deploying component folder`);
-    const result = await handleResponse<any>(axiosInstance.post(`upload-component/next/${initialUpload.id}`));
-
-    await fsp.rm(tmpDir, { force: true, recursive: true });
-
-    if (result.status === 'successful') {
-      console.log(`deployment id: ${initialUpload.id} status: ${color.green('success')}`);
-      console.log(`uploaded location: ${result.accessLink}`);
-    } else {
-      console.error('failed for an unknown reason', color.red(result));
-    }
-  } catch (e) {
-    await fsp.rm(tmpDir, { force: true, recursive: true });
-
-    if (e instanceof Error) {
-      console.error(color.red(e.message));
-    } else {
-      throw e;
-    }
-  }
-}
-
-async function watchAndWaitForUploadAndScanComplete(id: string, axiosInstance: AxiosInstance): Promise<void> {
-  const poll = () => handleResponse<ScanStatus>(axiosInstance.get('upload-component/status/' + id));
-
-  return new Promise((resolve, reject) => {
-    const recurse = () =>
-      poll().then(async (req) => {
-        if (req.status == 'Success') {
-          resolve();
-        } else if (req.status == 'Flagged') {
-          reject(new Error('upload has been flagged as a virus'));
-        } else if (req.status == 'Error') {
-          reject(new Error('there has been an error'));
-        } else {
-          setTimeout(async () => {
-            await recurse();
-          }, 1000);
-        }
-      });
-
-    recurse();
-  });
-}
-
-async function handleResponse<T>(axiosInstance: Promise<AxiosResponse<T>>): Promise<T> {
-  const result = axiosInstance
-    .then((response) => response.data)
-    .catch((error) => {
-      throw handleAxiosError(error);
-    });
-  return result;
-}
-
-function handleAxiosError(error: AxiosError): Error {
-  const { response } = error;
-  if (!response || (typeof error == 'object' && !error.isAxiosError)) {
-    return error;
-  }
-  const message = (response.data as any).message;
-  if (message) {
-    return new Error(`Unexpected response code ${response.status}. message: ${message}`);
-  } else {
-    return new Error(`Unexpected response code ${response.status}.`);
-  }
-}

package/src/integration-tests/__components__/big-package/manifest.json

@@ -0,0 +1,33 @@
+{
+  "$schema": "http://localhost:3000/schemas/v1.json#",
+
+  "name": "big-package",
+  "version": "1.0.2",
+  "main-function": "render-json",
+  "functions": [
+    {
+      "name": "render-json",
+      "entry": "render-json.js",
+      "input": {
+        "type": "object",
+        "properties": {
+          "something": {
+            "type": "string"
+          }
+        },
+        "required": ["something"]
+      },
+      "output": {
+        "response-type": "json",
+        "definition": {
+          "properties": {
+            "my-prop": {
+              "type": "string"
+            }
+          },
+          "required": ["my-prop"]
+        }
+      }
+    }
+  ]
+}

package/src/integration-tests/__components__/big-package/render-json.js

@@ -0,0 +1,5 @@
+module.exports = async function () {
+  return {
+    'my-prop': 'test value for my-prop',
+  };
+};

package/src/integration-tests/helper.ts

@@ -2,6 +2,8 @@ import axios from 'axios';
 import fs from 'fs';
 import path from 'path';
 import configVars from '../config';
+import fsp from 'fs/promises';
+import { randomBytes } from 'crypto';
 
 export const managementService = axios.create({
   baseURL: configVars.managementServiceUrl,
@@ -23,3 +25,11 @@ export function getTestComponents(): string[] {
   }
   return componets;
 }
+export async function createFile(filePath: string, sizeInMB: number) {
+  const content = randomBytes(sizeInMB * 1000000);
+  await fsp.writeFile(`${filePath}`, content);
+}
+
+export function removeFile(filePath: string) {
+  fsp.unlink(filePath);
+}

package/src/integration-tests/test-setup.ts

@@ -1 +1 @@
-jest.setTimeout(30_000);
+jest.setTimeout(60_000);

package/src/integration-tests/upload-and-render-component.spec.ts

@@ -1,5 +1,5 @@
 import { uploadComponentFolder } from '../index';
-import { renderService, managementService, getTestComponents } from './helper';
+import { renderService, managementService, getTestComponents, createFile, removeFile } from './helper';
 import configVars from '../config';
 import color from 'cli-color';
 import path from 'path';
@@ -13,11 +13,15 @@ const orgConsoleError = console.error;
 afterAll(async () => {
   // clean up the component added by the test
   getTestComponents().forEach(async (componentName) => {
-    await managementService.delete(`/component/${componentName}`);
+    try {
+      await managementService.delete(`/component/${componentName}`);
+    } catch {
+      // no op
+    }
   });
 });
 
-describe('Deploy basic component having a static file', () => {
+describe('Test isolated test cases', () => {
   beforeEach(() => {
     console.error = mockConsoleError;
     console.log = mockConsoleLog;
@@ -27,32 +31,56 @@ describe('Deploy basic component having a static file', () => {
     console.error = orgConsoleError;
   });
 
+  it('Should fail uploading the component that has size more than 100MB', async () => {
+    const componentPath = path.join(__dirname, '/__components__/big-package');
+    const filePath = `${componentPath}/105mb-file`;
+    await createFile(filePath, 105); // Higher limit has been used because compression reduces the size if you use closer to 100MB
+    await uploadComponentFolder(componentPath, configVars.managementServiceUrl);
+    expect(mockConsoleError.mock.calls[0][0]).toEqual(
+      color.red(['Request body larger than maxBodyLength limit'].join('')),
+    );
+    removeFile(filePath);
+  });
+});
+
+describe('Deploy basic component having a static file', () => {
   // component to deploy for this test
   const componentPath = path.join(__dirname, '/__components__/cmp-static-file-test');
-  let url = '';
+
+  beforeAll(async () => {
+    try {
+      await managementService.delete(`/component/cmp-static-file-test`);
+    } catch {
+      // no op
+    }
+  });
+
+  beforeEach(() => {
+    console.error = mockConsoleError;
+    console.log = mockConsoleLog;
+  });
+
+  afterEach(() => {
+    console.error = orgConsoleError;
+  });
 
   it('Should upload the component and return a valid url to preview', async () => {
     mockConsoleLog.mockClear();
-
     await uploadComponentFolder(componentPath, configVars.managementServiceUrl);
 
-    url = /uploaded location: (.*)/.exec(mockConsoleLog.mock.lastCall)?.[1] || '';
-
+    const url = /uploaded location: (.*)/.exec(mockConsoleLog.mock.lastCall)?.[1] || '';
     const uploadedComponent = '<a href="/r/set/cmp-static-file-test/1.0.0">1.0.0</a>';
-    const get = await supertest(url).get('');
+    const get = await supertest(url).get('/');
+
     expect(get.status).toEqual(200);
     expect((get as any)?.res?.text).toContain(uploadedComponent);
   });
 
   it('Should fail upload the component with same version', async () => {
+    mockConsoleError.mockClear();
     await uploadComponentFolder(componentPath, configVars.managementServiceUrl);
     expect(mockConsoleError.mock.calls[0][0]).toEqual(
-      color.red(
-        [
-          'Unexpected response code 400. message: ',
-          'cmp-static-file-test version 1.0.0 already exists and cannot be uploaded',
-        ].join(''),
-      ),
+      color.red('Unexpected response code 400. message: Component cmp-static-file-test 1.0.0 already exists'),
     );
   });
 

package/src/test.ts

@@ -1,8 +1,5 @@
-import { uploadComponentFolder } from '.';
-import configVars from './config';
-import path from 'path';
+import { startDevelopmentRender } from './component-dev';
 
-const dir = path.resolve(process.argv[2]);
-// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-const componentManagementURL = configVars.managementServiceUrl || process.argv[3];
-uploadComponentFolder(dir, componentManagementURL);
+startDevelopmentRender('/Users/wfagerstrom/Code/component-service/test-components', { port: 3000 }).then(() => {
+  console.log('starting');
+});

package/src/upload-component-folder.ts

@@ -0,0 +1,91 @@
+import { ScanStatus, uploadFile } from '@squiz/virus-scanner-lib';
+import { zipDirectory } from '@squiz/component-lib';
+import fsp from 'fs/promises';
+import path from 'path';
+import axios, { AxiosResponse, AxiosError, AxiosInstance } from 'axios';
+import color from 'cli-color';
+
+export async function uploadComponentFolder(folderPath: string, componentServiceManagementUrl: string): Promise<void> {
+  const tmpDir = path.resolve(await fsp.mkdtemp('cmp-upload'));
+
+  try {
+    const axiosInstance = axios.create({
+      baseURL: componentServiceManagementUrl,
+    });
+
+    console.log('Initial scanning');
+    const zip = await zipDirectory(folderPath, tmpDir);
+
+    const initialUpload = await handleResponse<any>(axiosInstance.post('upload-component'));
+
+    console.log(`deployment id: ${initialUpload.id} status: transferring`);
+    await uploadFile(initialUpload, zip);
+
+    await watchAndWaitForUploadAndScanComplete(initialUpload.id, axiosInstance);
+
+    console.log(`deployment id: ${initialUpload.id} status: deploying component folder`);
+    const result = await handleResponse<any>(axiosInstance.post(`upload-component/next/${initialUpload.id}`));
+
+    await fsp.rm(tmpDir, { force: true, recursive: true });
+
+    if (result.status === 'successful') {
+      console.log(`deployment id: ${initialUpload.id} status: ${color.green('success')}`);
+      console.log(`uploaded location: ${result.accessLink}`);
+    } else {
+      console.error('failed for an unknown reason', color.red(result));
+    }
+  } catch (e) {
+    await fsp.rm(tmpDir, { force: true, recursive: true });
+
+    if (e instanceof Error) {
+      console.error(color.red(e.message));
+    } else {
+      throw e;
+    }
+  }
+}
+
+async function watchAndWaitForUploadAndScanComplete(id: string, axiosInstance: AxiosInstance): Promise<void> {
+  const poll = () => handleResponse<ScanStatus>(axiosInstance.get('upload-component/status/' + id));
+
+  return new Promise((resolve, reject) => {
+    const recurse = () =>
+      poll().then(async (req) => {
+        if (req.status == 'Success') {
+          resolve();
+        } else if (req.status == 'Flagged') {
+          reject(new Error('upload has been flagged as a virus'));
+        } else if (req.status == 'Error') {
+          reject(new Error('there has been an error'));
+        } else {
+          setTimeout(async () => {
+            await recurse();
+          }, 1000);
+        }
+      });
+
+    recurse();
+  });
+}
+
+async function handleResponse<T>(axiosInstance: Promise<AxiosResponse<T>>): Promise<T> {
+  const result = axiosInstance
+    .then((response) => response.data)
+    .catch((error) => {
+      throw handleAxiosError(error);
+    });
+  return result;
+}
+
+function handleAxiosError(error: AxiosError): Error {
+  const { response } = error;
+  if (!response || (typeof error == 'object' && !error.isAxiosError)) {
+    return error;
+  }
+  const message = (response.data as any).message;
+  if (message) {
+    return new Error(`Unexpected response code ${response.status}. message: ${message}`);
+  } else {
+    return new Error(`Unexpected response code ${response.status}.`);
+  }
+}