@squiz/component-cli-lib 1.32.1-alpha.7 → 1.32.1-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/component-cli-lib",
-  "version": "1.32.1-alpha.7",
+  "version": "1.32.1-alpha.9",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -13,12 +13,12 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@squiz/component-lib": "1.32.1-alpha.7",
-    "@squiz/component-web-api-lib": "1.32.1-alpha.7",
-    "@squiz/dx-common-lib": "1.32.1-alpha.7",
-    "@squiz/dx-json-schema-lib": "1.32.1-alpha.7",
-    "@squiz/dx-logger-lib": "1.32.1-alpha.7",
-    "@squiz/virus-scanner-lib": "1.32.1-alpha.7",
+    "@squiz/component-lib": "1.32.1-alpha.9",
+    "@squiz/component-web-api-lib": "1.32.1-alpha.9",
+    "@squiz/dx-common-lib": "1.32.1-alpha.9",
+    "@squiz/dx-json-schema-lib": "1.32.1-alpha.9",
+    "@squiz/dx-logger-lib": "1.32.1-alpha.9",
+    "@squiz/virus-scanner-lib": "1.32.1-alpha.9",
     "@types/cli-color": "2.0.2",
     "@types/express": "4.17.17",
     "@types/jest": "28.1.8",
@@ -32,12 +32,12 @@
     "typescript": "4.9.4"
   },
   "dependencies": {
-    "@squiz/render-runtime-lib": "1.32.1-alpha.7",
+    "@squiz/render-runtime-lib": "1.32.1-alpha.9",
     "archiver": "5.3.1",
     "axios": "1.3.2",
     "cli-color": "^2.0.2",
     "open": "^8.4.0",
     "supertest": "^6.2.3"
   },
-  "gitHead": "7a8dbe890700b2df2f6194aff44a569267f32d35"
+  "gitHead": "61f757e6b67833114010b04397303c1cd41a180d"
 }

package/src/upload-component-folder.ts

@@ -19,7 +19,12 @@ export async function uploadComponentFolder(
   const tmpDir = await fsp.mkdtemp(path.resolve(baseTempDir, 'cmp-upload'));
 
   try {
-    await preUploadChecks(apiClient, componentServiceManagementUrl, folderPath);
+    const manifestService = new ManifestServiceForDev(folderPath, logger);
+    const manifestPath = path.join(folderPath, `manifest.json`);
+    const manifest = await manifestService.readManifest(manifestPath);
+    await manifestService.assertManifestIsValid(manifestPath, manifest.getModel());
+
+    await preUploadChecks(apiClient, componentServiceManagementUrl, manifest);
     logger.info('Initial scanning');
     const zip = await zipDirectory(folderPath, tmpDir);
 
@@ -39,28 +44,27 @@ export async function uploadComponentFolder(
       apiClient.post(`/v1/upload-component/next/${initialUpload.id}`, {}, { baseURL: componentServiceManagementUrl }),
     );
 
-    if (result.toString().includes('504 Gateway Time-out')) {
-      let retriesAllowed = 3;
-      while (retriesAllowed > 0 && result.toString().includes('504 Gateway Time-out')) {
+    if (!isAxiosResponse(result)) {
+      let retriesAllowed = 12;
+      while (retriesAllowed > 0) {
         logger.info(
           `deployment id: ${initialUpload.id} status: ${color.yellow(
-            `timed out, retrying ${retriesAllowed} more times`,
+            `unknown, retrying to check the upload status ${retriesAllowed} more times`,
           )}`,
         );
-        result = await handleResponse<any>(
-          apiClient.post(
-            `/v1/upload-component/next/${initialUpload.id}`,
-            {},
-            {
-              baseURL: componentServiceManagementUrl,
-            },
-          ),
-        );
+        if (await checkIfVersionExists(apiClient, componentServiceManagementUrl, manifest)) {
+          result = {
+            status: 'successful',
+            accessLink: 'unknown',
+          };
+          break;
+        }
+        await new Promise((r) => setTimeout(r, 10000));
         retriesAllowed--;
       }
       if (retriesAllowed === 0) {
-        logger.error(`deployment id: ${initialUpload.id} status: ${color.red('failed due to timeout')}`);
-        throw new Error('504 Gateway Time-out');
+        logger.error(`deployment id: ${initialUpload.id} status: ${color.red('failed to check the upload status')}`);
+        throw new Error(result.toString());
       }
     }
 
@@ -86,16 +90,9 @@ export async function uploadComponentFolder(
   }
 }
 
-async function preUploadChecks(apiClient: AxiosInstance, managementURL: string, folderPath: string) {
-  const service = new ManifestServiceForDev(folderPath, logger);
-  const manifestPath = path.join(folderPath, `manifest.json`);
-
-  const result = await service.readManifest(manifestPath);
-
-  await service.assertManifestIsValid(manifestPath, result.getModel());
-
-  if (await checkIfVersionExists(apiClient, managementURL, result)) {
-    throw new Error(`Cannot upload component version, ${result.getName()} ${result.getVersion()} already exists`);
+async function preUploadChecks(apiClient: AxiosInstance, managementURL: string, manifest: Manifest) {
+  if (await checkIfVersionExists(apiClient, managementURL, manifest)) {
+    throw new Error(`Cannot upload component version, ${manifest.getName()} ${manifest.getVersion()} already exists`);
   }
 }
 
@@ -185,3 +182,7 @@ function handleError(error: any): Error {
 function isAxiosError(error: any): error is AxiosError {
   return error && error.isAxiosError === true;
 }
+
+function isAxiosResponse(response: unknown): response is AxiosResponse {
+  return response instanceof Object && Object.prototype.hasOwnProperty.call(response, 'status');
+}