@shopify/oxygen-cli 2.1.1-unstable.202310110934.0 → 2.1.1-unstable.202310110958.0

package/dist/deploy/index.js

@@ -78,10 +78,10 @@ async function createDeploy(options) {
         hooks
       });
     }
-    const urlMessage = config.publicDeployment ? "Public" : "Private";
+    const urlMessage = config.publicDeployment ? "public" : "private";
     outputSuccess(
-      `Deployment complete.
-${urlMessage} preview URL: ${deploymentCompleteOp.deployment.url}`,
+      `
+The deployment can be reached at the ${deploymentCompleteOp.deployment.url} ${urlMessage} preview URL`,
       logger
     );
     if (metadata.name !== "none") {

package/dist/deploy/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/deploy/index.ts"],"names":[],"mappings":"AAAA;AAAA,EAEE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAQ,cAAc,oBAAmB;AACzC,SAAQ,YAAY,yBAAwB;AAE5C,SAAQ,qBAAoB;AAC5B,SAAQ,mBAAkB;AAC1B,SAAQ,sBAAqB;AAC7B,SAAQ,0BAAyB;AACjC,SAAQ,0BAAyB;AACjC,SAAQ,wBAAuB;AAC/B,SAAQ,wBAAuB;AAC/B,SAAQ,mBAAkB;AAC1B;AAAA,EAIE;AAAA,OACK;AACP,SAAQ,oBAAmB;AAC3B,SAAQ,cAAc,aAAa,2BAA0B;AAQ7D,eAAsB,aACpB,SAC6B;AAC7B,oBAAkB,CAAC,QAAQ,OAAO,OAAO;AACzC,QAAM,UAAU,WAAW;AAC3B,WAAS,YAAY,UAAU,QAAQ,MAAM;AAE7C,QAAM,EAAC,QAAQ,MAAK,IAAI;AACxB,QAAM,SAAS,QAAQ,UAAU;AACjC,QAAM,QAAQ,CAAC;AACf,MAAI;AACJ,MAAI;AAEJ,MAAI;AACF,UAAM,WAAW,MAAM,YAAY,QAAQ,MAAM;AACjD,UAAM,SAAS,aAAa,QAAQ;AACpC,UAAM,cAAc,oBAAoB,QAAQ,QAAQ;AACxD,aAAS,YAAY,YAAY;AAAA,MAC/B;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAED,QAAI,CAAC,OAAO,cAAc,CAAC,OAAO,WAAW;AAC3C,YAAM,wBAAwB,MAAM,cAAc;AAAA,QAChD;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF,CAAC;AACD,YAAM,KAAK,sBAAsB,MAAM;AACvC,YAAM,YAAY,sBAAsB,MAAM;AAAA,IAChD;AAEA,QAAI,CAAC,OAAO,WAAW;AACrB,YAAM,aAAa;AAAA,QACjB;AAAA,QACA,WAAW,MAAM;AAAA,QACjB;AAAA,MACF,CAAC;AACD,mBAAa,EAAC,QAAQ,gBAAgB,KAAI,CAAC;AAAA,IAC7C;AACA,qBAAiB;AAEjB,UAAM,WAAW,MAAM,eAAe,MAAM;AAC5C,aAAS,YAAY,YAAY,QAAQ;AACzC,UAAM,0BAA0B,MAAM,KAClC,EAAC,SAAS,MAAM,IAAI,SAAQ,IAC5B,EAAC,aAAa,UAAU,OAAM;AAElC,iBAAa,MAAM,mBAAmB;AAAA,MACpC;AAAA,MACA,OAAO;AAAA,MACP;AAAA,IACF,CAAC;AACD,aAAS,YAAY,WAAW,WAAW,iBAAiB;AAC5D,UAAM,YAAY;AAAA,MAChB;AAAA,MACA,SAAS,WAAW;AAAA,MACpB;AAAA,MACA;AAAA,IACF,CAAC;AACD,UAAM,uBAAuB,MAAM;AAAA,MACjC;AAAA,MACA,WAAW,WAAW;AAAA,IACxB;AAEA,QAAI,CAAC,OAAO,kBAAkB;AAC5B,YAAM,iBAAiB;AAAA,QACrB;AAAA,QACA,KAAK,qBAAqB,WAAW;AAAA,QACrC;AAAA,QACA;AAAA,MACF,CAAC;AAAA,IACH;AAEA,UAAM,aAAa,OAAO,mBAAmB,WAAW;AACxD;AAAA,MACE;AAAA,EAAyB,UAAU,iBAAiB,qBAAqB,WAAW,GAAG;AAAA,MACvF;AAAA,IACF;AAEA,QAAI,SAAS,SAAS,QAAQ;AAC5B,iBAAW,qBAAqB,WAAW,GAAG;AAAA,IAChD;AAEA,WAAO,qBAAqB,WAAW;AAAA,EACzC,SAAS,OAAO;AACd,QACE,OAAO,WACP,YACC,iBAAiB,SAAS,OAAO,UAAU,WAC5C;AACA,cAAQ,OAAO,KAAK;AAAA,IACtB;AAEA,QAAI,EAAE,iBAAiB,QAAQ;AAE7B,cAAQ,MAAM,iBAAiB,KAAK;AACpC,aAAO,QAAQ,OAAO,IAAI,MAAM,eAAe,CAAC;AAAA,IAClD;AAEA,QAAI,iBAAiB,mBAAmB;AACtC,iBAAW,MAAM,SAAS,MAAM;AAAA,IAClC,WAAW,MAAM,MAAM,CAAC,gBAAgB;AACtC;AAAA,QACE,sBAAsB,MAAM,OAAO;AAAA,QACnC;AAAA,MACF;AACA,YAAM,YAAY;AAAA,QAChB;AAAA,QACA,SAAS,MAAM;AAAA,QACf,QAAQ,MAAM;AAAA,QACd;AAAA,MACF,CAAC,EAAE,MAAM,CAAC,QAAQ;AAChB,YAAI,eAAe,OAAO;AACxB,qBAAW,2BAA2B,IAAI,OAAO,IAAI,MAAM;AAAA,QAC7D;AAAA,MACF,CAAC;AAAA,IACH,WAAW,YAAY,WAAW,IAAI;AACpC;AAAA,QACE,2BAA2B,MAAM,OAAO;AAAA,QACxC;AAAA,MACF;AACA,YAAM,iBAAiB;AAAA,QACrB;AAAA,QACA,cAAc,WAAW,WAAW;AAAA,QACpC,QAAQ,MAAM;AAAA,QACd;AAAA,MACF,CAAC,EAAE,MAAM,CAAC,QAAQ;AAChB,YAAI,eAAe,OAAO;AACxB,qBAAW,gCAAgC,IAAI,OAAO,IAAI,MAAM;AAAA,QAClE;AAAA,MACF,CAAC;AAAA,IACH;AACA,WAAO,QAAQ,OAAO,KAAK;AAAA,EAC7B;AACF;AAGA,SAAQ,kBAAiB","sourcesContent":["import {\n  Logger,\n  outputInfo,\n  outputSuccess,\n  outputWarn,\n} from '@shopify/cli-kit/node/output';\n\nimport {stderrLogger, verifyConfig} from '../utils/utils.js';\nimport {getBugsnag, initializeBugsnag} from '../utils/bugsnag.js';\n\nimport {buildInitiate} from './build-initiate.js';\nimport {buildCancel} from './build-cancel.js';\nimport {getUploadFiles} from './get-upload-files.js';\nimport {deploymentInitiate} from './deployment-initiate.js';\nimport {deploymentComplete} from './deployment-complete.js';\nimport {verifyDeployment} from './verify-deployment.js';\nimport {deploymentCancel} from './deployment-cancel.js';\nimport {uploadFiles} from './upload-files.js';\nimport {\n  Build,\n  DeploymentConfig,\n  DeploymentHooks,\n  VerificationError,\n} from './types.js';\nimport {buildProject} from './build-project.js';\nimport {createLabels, getMetadata, getEnvironmentInput} from './metadata.js';\n\ninterface CreateDeployOptions {\n  config: DeploymentConfig;\n  hooks?: DeploymentHooks;\n  logger?: Logger;\n}\n\nexport async function createDeploy(\n  options: CreateDeployOptions,\n): Promise<string | undefined> {\n  initializeBugsnag(!options.config.bugsnag);\n  const Bugsnag = getBugsnag();\n  Bugsnag?.addMetadata('config', options.config);\n\n  const {config, hooks} = options;\n  const logger = options.logger ?? stderrLogger;\n  const build = {} as Build;\n  let buildCompleted;\n  let deployment;\n\n  try {\n    const metadata = await getMetadata(config, logger);\n    const labels = createLabels(metadata);\n    const environment = getEnvironmentInput(config, metadata);\n    Bugsnag?.addMetadata('metadata', {\n      environment,\n      labels,\n      metadata,\n    });\n\n    if (!config.workerOnly && !config.skipBuild) {\n      const buildInitiateResponse = await buildInitiate({\n        config,\n        environment,\n        labels,\n        logger,\n      });\n      build.id = buildInitiateResponse.build.id;\n      build.assetPath = buildInitiateResponse.build.assetPath;\n    }\n\n    if (!config.skipBuild) {\n      await buildProject({\n        config,\n        assetPath: build.assetPath,\n        hooks,\n      });\n      verifyConfig({config, performedBuild: true});\n    }\n    buildCompleted = true;\n\n    const manifest = await getUploadFiles(config);\n    Bugsnag?.addMetadata('manifest', manifest);\n    const deploymentInitiateInput = build.id\n      ? {buildId: build.id, manifest}\n      : {environment, manifest, labels};\n\n    deployment = await deploymentInitiate({\n      config,\n      input: deploymentInitiateInput,\n      logger,\n    });\n    Bugsnag?.addMetadata('targets', deployment.deploymentTargets);\n    await uploadFiles({\n      config,\n      targets: deployment.deploymentTargets,\n      hooks,\n      logger,\n    });\n    const deploymentCompleteOp = await deploymentComplete(\n      config,\n      deployment.deployment.id,\n    );\n\n    if (!config.skipVerification) {\n      await verifyDeployment({\n        config,\n        url: deploymentCompleteOp.deployment.url,\n        logger,\n        hooks,\n      });\n    }\n\n    const urlMessage = config.publicDeployment ? 'Public' : 'Private';\n    outputSuccess(\n      `Deployment complete.\\n${urlMessage} preview URL: ${deploymentCompleteOp.deployment.url}`,\n      logger,\n    );\n    // in CI environments, we want to output the URL to stdout\n    if (metadata.name !== 'none') {\n      outputInfo(deploymentCompleteOp.deployment.url);\n    }\n\n    return deploymentCompleteOp.deployment.url;\n  } catch (error) {\n    if (\n      config.bugsnag &&\n      Bugsnag &&\n      (error instanceof Error || typeof error === 'string')\n    ) {\n      Bugsnag.notify(error);\n    }\n\n    if (!(error instanceof Error)) {\n      // eslint-disable-next-line no-console\n      console.error('Unknown error', error);\n      return Promise.reject(new Error('Unknown error'));\n    }\n\n    if (error instanceof VerificationError) {\n      outputWarn(error.message, logger);\n    } else if (build.id && !buildCompleted) {\n      outputWarn(\n        `Build failed with: ${error.message}, cancelling build.`,\n        logger,\n      );\n      await buildCancel({\n        config,\n        buildId: build.id!,\n        reason: error.message,\n        logger,\n      }).catch((err) => {\n        if (err instanceof Error) {\n          outputWarn(`Failed to cancel build: ${err.message}`, logger);\n        }\n      });\n    } else if (deployment?.deployment.id) {\n      outputWarn(\n        `Deployment failed with: ${error.message}, cancelling deployment.`,\n        logger,\n      );\n      await deploymentCancel({\n        config,\n        deploymentId: deployment.deployment.id,\n        reason: error.message,\n        logger,\n      }).catch((err) => {\n        if (err instanceof Error) {\n          outputWarn(`Failed to cancel deployment: ${err.message}`, logger);\n        }\n      });\n    }\n    return Promise.reject(error);\n  }\n}\n\nexport type {DeploymentConfig, DeploymentHooks};\nexport {parseToken} from '../utils/utils.js';\n"]}
+{"version":3,"sources":["../../src/deploy/index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Logger,\n  outputInfo,\n  outputSuccess,\n  outputWarn,\n} from '@shopify/cli-kit/node/output';\n\nimport {stderrLogger, verifyConfig} from '../utils/utils.js';\nimport {getBugsnag, initializeBugsnag} from '../utils/bugsnag.js';\n\nimport {buildInitiate} from './build-initiate.js';\nimport {buildCancel} from './build-cancel.js';\nimport {getUploadFiles} from './get-upload-files.js';\nimport {deploymentInitiate} from './deployment-initiate.js';\nimport {deploymentComplete} from './deployment-complete.js';\nimport {verifyDeployment} from './verify-deployment.js';\nimport {deploymentCancel} from './deployment-cancel.js';\nimport {uploadFiles} from './upload-files.js';\nimport {\n  Build,\n  DeploymentConfig,\n  DeploymentHooks,\n  VerificationError,\n} from './types.js';\nimport {buildProject} from './build-project.js';\nimport {createLabels, getMetadata, getEnvironmentInput} from './metadata.js';\n\ninterface CreateDeployOptions {\n  config: DeploymentConfig;\n  hooks?: DeploymentHooks;\n  logger?: Logger;\n}\n\nexport async function createDeploy(\n  options: CreateDeployOptions,\n): Promise<string | undefined> {\n  initializeBugsnag(!options.config.bugsnag);\n  const Bugsnag = getBugsnag();\n  Bugsnag?.addMetadata('config', options.config);\n\n  const {config, hooks} = options;\n  const logger = options.logger ?? stderrLogger;\n  const build = {} as Build;\n  let buildCompleted;\n  let deployment;\n\n  try {\n    const metadata = await getMetadata(config, logger);\n    const labels = createLabels(metadata);\n    const environment = getEnvironmentInput(config, metadata);\n    Bugsnag?.addMetadata('metadata', {\n      environment,\n      labels,\n      metadata,\n    });\n\n    if (!config.workerOnly && !config.skipBuild) {\n      const buildInitiateResponse = await buildInitiate({\n        config,\n        environment,\n        labels,\n        logger,\n      });\n      build.id = buildInitiateResponse.build.id;\n      build.assetPath = buildInitiateResponse.build.assetPath;\n    }\n\n    if (!config.skipBuild) {\n      await buildProject({\n        config,\n        assetPath: build.assetPath,\n        hooks,\n      });\n      verifyConfig({config, performedBuild: true});\n    }\n    buildCompleted = true;\n\n    const manifest = await getUploadFiles(config);\n    Bugsnag?.addMetadata('manifest', manifest);\n    const deploymentInitiateInput = build.id\n      ? {buildId: build.id, manifest}\n      : {environment, manifest, labels};\n\n    deployment = await deploymentInitiate({\n      config,\n      input: deploymentInitiateInput,\n      logger,\n    });\n    Bugsnag?.addMetadata('targets', deployment.deploymentTargets);\n    await uploadFiles({\n      config,\n      targets: deployment.deploymentTargets,\n      hooks,\n      logger,\n    });\n    const deploymentCompleteOp = await deploymentComplete(\n      config,\n      deployment.deployment.id,\n    );\n\n    if (!config.skipVerification) {\n      await verifyDeployment({\n        config,\n        url: deploymentCompleteOp.deployment.url,\n        logger,\n        hooks,\n      });\n    }\n\n    const urlMessage = config.publicDeployment ? 'public' : 'private';\n    outputSuccess(\n      `\\nThe deployment can be reached at the ${deploymentCompleteOp.deployment.url} ${urlMessage} preview URL`,\n      logger,\n    );\n    // in CI environments, we want to output the URL to stdout\n    if (metadata.name !== 'none') {\n      outputInfo(deploymentCompleteOp.deployment.url);\n    }\n\n    return deploymentCompleteOp.deployment.url;\n  } catch (error) {\n    if (\n      config.bugsnag &&\n      Bugsnag &&\n      (error instanceof Error || typeof error === 'string')\n    ) {\n      Bugsnag.notify(error);\n    }\n\n    if (!(error instanceof Error)) {\n      // eslint-disable-next-line no-console\n      console.error('Unknown error', error);\n      return Promise.reject(new Error('Unknown error'));\n    }\n\n    if (error instanceof VerificationError) {\n      outputWarn(error.message, logger);\n    } else if (build.id && !buildCompleted) {\n      outputWarn(\n        `Build failed with: ${error.message}, cancelling build.`,\n        logger,\n      );\n      await buildCancel({\n        config,\n        buildId: build.id!,\n        reason: error.message,\n        logger,\n      }).catch((err) => {\n        if (err instanceof Error) {\n          outputWarn(`Failed to cancel build: ${err.message}`, logger);\n        }\n      });\n    } else if (deployment?.deployment.id) {\n      outputWarn(\n        `Deployment failed with: ${error.message}, cancelling deployment.`,\n        logger,\n      );\n      await deploymentCancel({\n        config,\n        deploymentId: deployment.deployment.id,\n        reason: error.message,\n        logger,\n      }).catch((err) => {\n        if (err instanceof Error) {\n          outputWarn(`Failed to cancel deployment: ${err.message}`, logger);\n        }\n      });\n    }\n    return Promise.reject(error);\n  }\n}\n\nexport type {DeploymentConfig, DeploymentHooks};\nexport {parseToken} from '../utils/utils.js';\n"]}

package/dist/deploy/upload-files.js

@@ -1,3 +1,4 @@
+import { Agent } from 'https';
 import { formData, fetch } from '@shopify/cli-kit/node/http';
 import { createFileReadStream } from '@shopify/cli-kit/node/fs';
 import { outputInfo, outputCompleted } from '@shopify/cli-kit/node/output';
@@ -8,18 +9,21 @@ import { deployDefaults } from '../utils/utils.js';
 async function uploadFiles(options) {
   const { config, logger, targets, hooks } = options;
   outputInfo(`Uploading ${targets.length} files...`, logger);
+  const agent = new Agent({ keepAlive: true });
   hooks?.onUploadFilesStart?.();
   return mapLimit(targets, 6, async (target) => {
-    await uploadFile(config, target);
+    await uploadFile(config, target, agent);
   }).then(() => {
     hooks?.onUploadFilesComplete?.();
     outputCompleted(`Files uploaded successfully`, logger);
   }).catch((err) => {
     hooks?.onUploadFilesError?.(err);
     throw err;
+  }).finally(() => {
+    agent.destroy();
   });
 }
-async function uploadFile(config, target) {
+async function uploadFile(config, target, agent) {
   const localFolderPath = target.fileType === "WORKER" ? joinPath(config.rootPath, config.workerDir) : joinPath(config.rootPath, config.assetsDir);
   if (target.parameters !== null && target.parameters.length > 0) {
     const form = formData();
@@ -30,18 +34,19 @@ async function uploadFile(config, target) {
       "file",
       createFileReadStream(joinPath(localFolderPath, target.filePath))
     );
-    await formUpload(form, target);
+    await formUpload(form, target, agent);
   } else {
-    const initData = await initiateResumableUpload(target);
+    const initData = await initiateResumableUpload(target, agent);
     await performResumableUpload(
       joinPath(localFolderPath, target.filePath),
-      initData
+      initData,
+      agent
     );
   }
 }
-async function formUpload(form, target, attemptNumber = 0) {
+async function formUpload(form, target, agent, attemptNumber = 0) {
   try {
-    const timeoutDuration = 6e4;
+    const timeoutDuration = 12e4;
     const controller = new AbortController();
     const timeout = setTimeout(() => {
       controller.abort();
@@ -52,7 +57,8 @@ async function formUpload(form, target, attemptNumber = 0) {
       signal: controller.signal,
       headers: {
         Connection: "keep-alive"
-      }
+      },
+      agent
     });
     clearTimeout(timeout);
     if (!response.ok) {
@@ -63,7 +69,7 @@ async function formUpload(form, target, attemptNumber = 0) {
       throw new Error(`File not found: ${target.filePath}`);
     }
     if (attemptNumber < Number(deployDefaults.maxUploadAttempts)) {
-      await formUpload(form, target, attemptNumber + 1);
+      await formUpload(form, target, agent, attemptNumber + 1);
     } else {
       if (err instanceof Error && err.name === "AbortError") {
         throw new Error(`Request timeout whilst uploading ${target.filePath}`);
@@ -72,14 +78,15 @@ async function formUpload(form, target, attemptNumber = 0) {
     }
   }
 }
-async function initiateResumableUpload(target) {
+async function initiateResumableUpload(target, agent) {
   return fetch(target.uploadUrl, {
     method: "POST",
     headers: {
       "x-goog-resumable": "start",
       "X-Goog-Content-Length-Range": `0,${target.fileSize}`,
       "User-Agent": "oxygen-cli"
-    }
+    },
+    agent
   }).then((res) => {
     return {
       sessionUri: res.headers.get("x-guploader-uploadid"),
@@ -92,44 +99,50 @@ async function initiateResumableUpload(target) {
     );
   });
 }
-async function performResumableUpload(localFilePath, initData, startByte = 0, attemptNumber = 0) {
-  await uploadResumable(initData.location, localFilePath, startByte).catch(
-    async (err) => {
-      if (isErrorCode(err, "ENOENT")) {
-        throw new Error(`File not found: ${initData.target.filePath}`);
-      }
-      if (err && attemptNumber >= Number(deployDefaults.maxResumabeUploadAttempts)) {
-        throw new Error(
-          `Failed to upload file ${initData.target.filePath} after ${deployDefaults.maxResumabeUploadAttempts} attempts`
-        );
-      }
-      const status = await resumableUploadStatus(
-        initData.location,
-        initData.target.fileSize
+async function performResumableUpload(localFilePath, initData, agent, startByte = 0, attemptNumber = 0) {
+  await uploadResumable(
+    initData.location,
+    localFilePath,
+    startByte,
+    agent
+  ).catch(async (err) => {
+    if (isErrorCode(err, "ENOENT")) {
+      throw new Error(`File not found: ${initData.target.filePath}`);
+    }
+    if (err && attemptNumber >= Number(deployDefaults.maxResumabeUploadAttempts)) {
+      throw new Error(
+        `Failed to upload file ${initData.target.filePath} after ${deployDefaults.maxResumabeUploadAttempts} attempts`
+      );
+    }
+    const status = await resumableUploadStatus(
+      initData.location,
+      initData.target.fileSize,
+      agent
+    );
+    if (!status.complete) {
+      const nextAttemptStartByte = status.lastReceivedByte;
+      const attempt = attemptNumber + 1;
+      await performResumableUpload(
+        localFilePath,
+        initData,
+        agent,
+        nextAttemptStartByte,
+        attempt
       );
-      if (!status.complete) {
-        const nextAttemptStartByte = status.lastReceivedByte;
-        const attempt = attemptNumber + 1;
-        await performResumableUpload(
-          localFilePath,
-          initData,
-          nextAttemptStartByte,
-          attempt
-        );
-      }
     }
-  );
+  });
 }
-async function uploadResumable(location, filePath, lastReceivedByte) {
+async function uploadResumable(location, filePath, lastReceivedByte, agent) {
   const file = createFileReadStream(filePath, { start: lastReceivedByte });
   return fetch(location, {
     method: "PUT",
-    body: file
+    body: file,
+    agent
   }).then((res) => {
     return res.status;
   });
 }
-async function resumableUploadStatus(location, fileSize) {
+async function resumableUploadStatus(location, fileSize, agent) {
   const getLastByte = (range) => {
     if (!range || range.split("-").length !== 2)
       return 0;
@@ -141,7 +154,8 @@ async function resumableUploadStatus(location, fileSize) {
     headers: {
       "Content-Length": "0",
       "Content-Range": `bytes */${fileSize}`
-    }
+    },
+    agent
   }).then((res) => {
     return {
       complete: res.status === 200,

package/dist/deploy/upload-files.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/deploy/upload-files.ts"],"names":[],"mappings":"AACA,SAAQ,OAAO,gBAAe;AAC9B,SAAQ,4BAA2B;AACnC;AAAA,EAEE;AAAA,EACA;AAAA,OACK;AACP,SAAQ,gBAAe;AACvB,SAAQ,gBAAe;AAEvB,SAAQ,sBAAqB;AAuB7B,eAAsB,YAAY,SAA4C;AAC5E,QAAM,EAAC,QAAQ,QAAQ,SAAS,MAAK,IAAI;AACzC,aAAW,aAAa,QAAQ,MAAM,aAAa,MAAM;AACzD,SAAO,qBAAqB;AAC5B,SAAO,SAAS,SAAS,GAAG,OAAO,WAAqC;AACtE,UAAM,WAAW,QAAQ,MAAM;AAAA,EACjC,CAAC,EACE,KAAK,MAAM;AACV,WAAO,wBAAwB;AAC/B,oBAAgB,+BAA+B,MAAM;AAAA,EACvD,CAAC,EACA,MAAM,CAAC,QAAQ;AACd,WAAO,qBAAqB,GAAG;AAC/B,UAAM;AAAA,EACR,CAAC;AACL;AAEA,eAAe,WACb,QACA,QACA;AACA,QAAM,kBACJ,OAAO,aAAa,WAChB,SAAS,OAAO,UAAW,OAAO,SAAU,IAC5C,SAAS,OAAO,UAAW,OAAO,SAAU;AAElD,MAAI,OAAO,eAAe,QAAQ,OAAO,WAAW,SAAS,GAAG;AAE9D,UAAM,OAAO,SAAS;AACtB,WAAO,WAAW,QAAQ,CAAC,UAAU;AACnC,WAAK,OAAO,MAAM,MAAM,MAAM,KAAK;AAAA,IACrC,CAAC;AACD,SAAK;AAAA,MACH;AAAA,MACA,qBAAqB,SAAS,iBAAiB,OAAO,QAAQ,CAAC;AAAA,IACjE;AACA,UAAM,WAAW,MAAM,MAAM;AAAA,EAC/B,OAAO;AAEL,UAAM,WAAW,MAAM,wBAAwB,MAAM;AACrD,UAAM;AAAA,MACJ,SAAS,iBAAiB,OAAO,QAAQ;AAAA,MACzC;AAAA,IACF;AAAA,EACF;AACF;AAEA,eAAe,WACb,MACA,QACA,gBAAgB,GAChB;AACA,MAAI;AACF,UAAM,kBAAkB;AACxB,UAAM,aAAa,IAAI,gBAAgB;AACvC,UAAM,UAAU,WAAW,MAAM;AAC/B,iBAAW,MAAM;AAAA,IACnB,GAAG,eAAe;AAElB,UAAM,WAAW,MAAM,MAAM,OAAO,WAAW;AAAA,MAC7C,QAAQ;AAAA,MACR,MAAM;AAAA,MACN,QAAQ,WAAW;AAAA,MACnB,SAAS;AAAA,QACP,YAAY;AAAA,MACd;AAAA,IACF,CAAC;AACD,iBAAa,OAAO;AAEpB,QAAI,CAAC,SAAS,IAAI;AAChB,YAAM,IAAI,MAAM,GAAG,SAAS,MAAM,EAAE;AAAA,IACtC;AAAA,EACF,SAAS,KAAK;AACZ,QAAI,YAAY,KAAK,QAAQ,GAAG;AAC9B,YAAM,IAAI,MAAM,mBAAmB,OAAO,QAAQ,EAAE;AAAA,IACtD;AAEA,QAAI,gBAAgB,OAAO,eAAe,iBAAiB,GAAG;AAC5D,YAAM,WAAW,MAAM,QAAQ,gBAAgB,CAAC;AAAA,IAClD,OAAO;AACL,UAAI,eAAe,SAAS,IAAI,SAAS,cAAc;AACrD,cAAM,IAAI,MAAM,oCAAoC,OAAO,QAAQ,EAAE;AAAA,MACvE;AACA,YAAM,IAAI,MAAM,yBAAyB,OAAO,QAAQ,EAAE;AAAA,IAC5D;AAAA,EACF;AACF;AAEA,eAAe,wBACb,QACoC;AACpC,SAAO,MAAM,OAAO,WAAW;AAAA,IAC7B,QAAQ;AAAA,IACR,SAAS;AAAA,MACP,oBAAoB;AAAA,MACpB,+BAA+B,KAAK,OAAO,QAAQ;AAAA,MACnD,cAAc;AAAA,IAChB;AAAA,EACF,CAAC,EACE,KAAK,CAAC,QAAQ;AACb,WAAO;AAAA,MACL,YAAY,IAAI,QAAQ,IAAI,sBAAsB;AAAA,MAClD,UAAU,IAAI,QAAQ,IAAI,UAAU;AAAA,MACpC;AAAA,IACF;AAAA,EACF,CAAC,EACA,MAAM,CAAC,QAAQ;AACd,UAAM,IAAI;AAAA,MACR,gDAAgD,OAAO,QAAQ,iBAAiB,IAAI,UAAU;AAAA,IAChG;AAAA,EACF,CAAC;AACL;AAEA,eAAe,uBACb,eACA,UACA,YAAY,GACZ,gBAAgB,GAChB;AACA,QAAM,gBAAgB,SAAS,UAAU,eAAe,SAAS,EAAE;AAAA,IACjE,OAAO,QAAQ;AACb,UAAI,YAAY,KAAK,QAAQ,GAAG;AAC9B,cAAM,IAAI,MAAM,mBAAmB,SAAS,OAAO,QAAQ,EAAE;AAAA,MAC/D;AAEA,UACE,OACA,iBAAiB,OAAO,eAAe,yBAAyB,GAChE;AACA,cAAM,IAAI;AAAA,UACR,yBAAyB,SAAS,OAAO,QAAQ,UAAU,eAAe,yBAAyB;AAAA,QACrG;AAAA,MACF;AACA,YAAM,SAAS,MAAM;AAAA,QACnB,SAAS;AAAA,QACT,SAAS,OAAO;AAAA,MAClB;AACA,UAAI,CAAC,OAAO,UAAU;AACpB,cAAM,uBAAuB,OAAO;AACpC,cAAM,UAAU,gBAAgB;AAChC,cAAM;AAAA,UACJ;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;AAEA,eAAe,gBACb,UACA,UACA,kBACiB;AACjB,QAAM,OAAO,qBAAqB,UAAU,EAAC,OAAO,iBAAgB,CAAC;AACrE,SAAO,MAAM,UAAU;AAAA,IACrB,QAAQ;AAAA,IACR,MAAM;AAAA,EACR,CAAC,EAAE,KAAK,CAAC,QAAQ;AACf,WAAO,IAAI;AAAA,EACb,CAAC;AACH;AAEA,eAAe,sBACb,UACA,UACgC;AAChC,QAAM,cAAc,CAAC,UAAiC;AACpD,QAAI,CAAC,SAAS,MAAM,MAAM,GAAG,EAAE,WAAW;AAAG,aAAO;AACpD,UAAM,aAAa,MAAM,MAAM,GAAG;AAClC,WAAO,SAAS,WAAW,CAAC,GAAI,EAAE;AAAA,EACpC;AAEA,SAAO,MAAM,UAAU;AAAA,IACrB,QAAQ;AAAA,IACR,SAAS;AAAA,MACP,kBAAkB;AAAA,MAClB,iBAAiB,WAAW,QAAQ;AAAA,IACtC;AAAA,EACF,CAAC,EACE,KAAK,CAAC,QAAQ;AACb,WAAO;AAAA,MACL,UAAU,IAAI,WAAW;AAAA,MACzB,kBAAkB,YAAY,IAAI,QAAQ,IAAI,OAAO,CAAC;AAAA,IACxD;AAAA,EACF,CAAC,EACA,MAAM,CAAC,QAAQ;AAEd,YAAQ,MAAM,GAAG;AACjB,WAAO;AAAA,MACL,UAAU;AAAA,MACV,kBAAkB;AAAA,IACpB;AAAA,EACF,CAAC;AACL;AAEA,SAAS,YAAY,KAAc,MAAuB;AACxD,SAAO,eAAe,SAAS,UAAU,OAAO,IAAI,SAAS;AAC/D","sourcesContent":["/* eslint-disable @typescript-eslint/naming-convention */\nimport {fetch, formData} from '@shopify/cli-kit/node/http';\nimport {createFileReadStream} from '@shopify/cli-kit/node/fs';\nimport {\n  Logger,\n  outputCompleted,\n  outputInfo,\n} from '@shopify/cli-kit/node/output';\nimport {joinPath} from '@shopify/cli-kit/node/path';\nimport {mapLimit} from 'async';\n\nimport {deployDefaults} from '../utils/utils.js';\n\nimport {DeploymentConfig, DeploymentHooks} from './types.js';\nimport {DeploymentTargetResponse} from './graphql/deployment-initiate.js';\n\ninterface InitiateResumableResponse {\n  target: DeploymentTargetResponse;\n  sessionUri: string;\n  location: string;\n}\n\ninterface ResumableUploadStatus {\n  complete: boolean;\n  lastReceivedByte: number;\n}\n\ninterface UploadFilesOptions {\n  config: DeploymentConfig;\n  hooks?: DeploymentHooks;\n  logger: Logger;\n  targets: DeploymentTargetResponse[];\n}\n\nexport async function uploadFiles(options: UploadFilesOptions): Promise<void> {\n  const {config, logger, targets, hooks} = options;\n  outputInfo(`Uploading ${targets.length} files...`, logger);\n  hooks?.onUploadFilesStart?.();\n  return mapLimit(targets, 6, async (target: DeploymentTargetResponse) => {\n    await uploadFile(config, target);\n  })\n    .then(() => {\n      hooks?.onUploadFilesComplete?.();\n      outputCompleted(`Files uploaded successfully`, logger);\n    })\n    .catch((err) => {\n      hooks?.onUploadFilesError?.(err);\n      throw err;\n    });\n}\n\nasync function uploadFile(\n  config: DeploymentConfig,\n  target: DeploymentTargetResponse,\n) {\n  const localFolderPath =\n    target.fileType === 'WORKER'\n      ? joinPath(config.rootPath!, config.workerDir!)\n      : joinPath(config.rootPath!, config.assetsDir!);\n\n  if (target.parameters !== null && target.parameters.length > 0) {\n    // If parameters exist perform a form upload\n    const form = formData();\n    target.parameters.forEach((param) => {\n      form.append(param.name, param.value);\n    });\n    form.append(\n      'file',\n      createFileReadStream(joinPath(localFolderPath, target.filePath)),\n    );\n    await formUpload(form, target);\n  } else {\n    // If no parameters exist perform a resumable upload\n    const initData = await initiateResumableUpload(target);\n    await performResumableUpload(\n      joinPath(localFolderPath, target.filePath),\n      initData,\n    );\n  }\n}\n\nasync function formUpload(\n  form: ReturnType<typeof formData>,\n  target: DeploymentTargetResponse,\n  attemptNumber = 0,\n) {\n  try {\n    const timeoutDuration = 60000;\n    const controller = new AbortController();\n    const timeout = setTimeout(() => {\n      controller.abort();\n    }, timeoutDuration);\n\n    const response = await fetch(target.uploadUrl, {\n      method: 'POST',\n      body: form,\n      signal: controller.signal,\n      headers: {\n        Connection: 'keep-alive',\n      },\n    });\n    clearTimeout(timeout);\n\n    if (!response.ok) {\n      throw new Error(`${response.status}`);\n    }\n  } catch (err) {\n    if (isErrorCode(err, 'ENOENT')) {\n      throw new Error(`File not found: ${target.filePath}`);\n    }\n\n    if (attemptNumber < Number(deployDefaults.maxUploadAttempts)) {\n      await formUpload(form, target, attemptNumber + 1);\n    } else {\n      if (err instanceof Error && err.name === 'AbortError') {\n        throw new Error(`Request timeout whilst uploading ${target.filePath}`);\n      }\n      throw new Error(`Failed to upload file ${target.filePath}`);\n    }\n  }\n}\n\nasync function initiateResumableUpload(\n  target: DeploymentTargetResponse,\n): Promise<InitiateResumableResponse> {\n  return fetch(target.uploadUrl, {\n    method: 'POST',\n    headers: {\n      'x-goog-resumable': 'start',\n      'X-Goog-Content-Length-Range': `0,${target.fileSize}`,\n      'User-Agent': 'oxygen-cli',\n    },\n  })\n    .then((res) => {\n      return {\n        sessionUri: res.headers.get('x-guploader-uploadid')!,\n        location: res.headers.get('location')!,\n        target,\n      };\n    })\n    .catch((err) => {\n      throw new Error(\n        `Failed to initiate resumable upload for file ${target.filePath} (status code ${err.statusCode})`,\n      );\n    });\n}\n\nasync function performResumableUpload(\n  localFilePath: string,\n  initData: InitiateResumableResponse,\n  startByte = 0,\n  attemptNumber = 0,\n) {\n  await uploadResumable(initData.location, localFilePath, startByte).catch(\n    async (err) => {\n      if (isErrorCode(err, 'ENOENT')) {\n        throw new Error(`File not found: ${initData.target.filePath}`);\n      }\n\n      if (\n        err &&\n        attemptNumber >= Number(deployDefaults.maxResumabeUploadAttempts)\n      ) {\n        throw new Error(\n          `Failed to upload file ${initData.target.filePath} after ${deployDefaults.maxResumabeUploadAttempts} attempts`,\n        );\n      }\n      const status = await resumableUploadStatus(\n        initData.location,\n        initData.target.fileSize,\n      );\n      if (!status.complete) {\n        const nextAttemptStartByte = status.lastReceivedByte;\n        const attempt = attemptNumber + 1;\n        await performResumableUpload(\n          localFilePath,\n          initData,\n          nextAttemptStartByte,\n          attempt,\n        );\n      }\n    },\n  );\n}\n\nasync function uploadResumable(\n  location: string,\n  filePath: string,\n  lastReceivedByte: number,\n): Promise<number> {\n  const file = createFileReadStream(filePath, {start: lastReceivedByte});\n  return fetch(location, {\n    method: 'PUT',\n    body: file,\n  }).then((res) => {\n    return res.status;\n  });\n}\n\nasync function resumableUploadStatus(\n  location: string,\n  fileSize: number,\n): Promise<ResumableUploadStatus> {\n  const getLastByte = (range: string | null): number => {\n    if (!range || range.split('-').length !== 2) return 0;\n    const rangeParts = range.split('-');\n    return parseInt(rangeParts[1]!, 10);\n  };\n\n  return fetch(location, {\n    method: 'PUT',\n    headers: {\n      'Content-Length': '0',\n      'Content-Range': `bytes */${fileSize}`,\n    },\n  })\n    .then((res) => {\n      return {\n        complete: res.status === 200,\n        lastReceivedByte: getLastByte(res.headers.get('range')),\n      };\n    })\n    .catch((err) => {\n      // eslint-disable-next-line no-console\n      console.error(err);\n      return {\n        complete: false,\n        lastReceivedByte: 0,\n      };\n    });\n}\n\nfunction isErrorCode(err: unknown, code: string): boolean {\n  return err instanceof Error && 'code' in err && err.code === code;\n}\n"]}
+{"version":3,"sources":["../../src/deploy/upload-files.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/naming-convention */\nimport {Agent} from 'https';\n\nimport {fetch, formData} from '@shopify/cli-kit/node/http';\nimport {createFileReadStream} from '@shopify/cli-kit/node/fs';\nimport {\n  Logger,\n  outputCompleted,\n  outputInfo,\n} from '@shopify/cli-kit/node/output';\nimport {joinPath} from '@shopify/cli-kit/node/path';\nimport {mapLimit} from 'async';\n\nimport {deployDefaults} from '../utils/utils.js';\n\nimport {DeploymentConfig, DeploymentHooks} from './types.js';\nimport {DeploymentTargetResponse} from './graphql/deployment-initiate.js';\n\ninterface InitiateResumableResponse {\n  target: DeploymentTargetResponse;\n  sessionUri: string;\n  location: string;\n}\n\ninterface ResumableUploadStatus {\n  complete: boolean;\n  lastReceivedByte: number;\n}\n\ninterface UploadFilesOptions {\n  config: DeploymentConfig;\n  hooks?: DeploymentHooks;\n  logger: Logger;\n  targets: DeploymentTargetResponse[];\n}\n\nexport async function uploadFiles(options: UploadFilesOptions): Promise<void> {\n  const {config, logger, targets, hooks} = options;\n  outputInfo(`Uploading ${targets.length} files...`, logger);\n  const agent = new Agent({keepAlive: true});\n  hooks?.onUploadFilesStart?.();\n  return mapLimit(targets, 6, async (target: DeploymentTargetResponse) => {\n    await uploadFile(config, target, agent);\n  })\n    .then(() => {\n      hooks?.onUploadFilesComplete?.();\n      outputCompleted(`Files uploaded successfully`, logger);\n    })\n    .catch((err) => {\n      hooks?.onUploadFilesError?.(err);\n      throw err;\n    })\n    .finally(() => {\n      agent.destroy();\n    });\n}\n\nasync function uploadFile(\n  config: DeploymentConfig,\n  target: DeploymentTargetResponse,\n  agent: Agent,\n) {\n  const localFolderPath =\n    target.fileType === 'WORKER'\n      ? joinPath(config.rootPath!, config.workerDir!)\n      : joinPath(config.rootPath!, config.assetsDir!);\n\n  if (target.parameters !== null && target.parameters.length > 0) {\n    // If parameters exist perform a form upload\n    const form = formData();\n    target.parameters.forEach((param) => {\n      form.append(param.name, param.value);\n    });\n    form.append(\n      'file',\n      createFileReadStream(joinPath(localFolderPath, target.filePath)),\n    );\n    await formUpload(form, target, agent);\n  } else {\n    // If no parameters exist perform a resumable upload\n    const initData = await initiateResumableUpload(target, agent);\n    await performResumableUpload(\n      joinPath(localFolderPath, target.filePath),\n      initData,\n      agent,\n    );\n  }\n}\n\nasync function formUpload(\n  form: ReturnType<typeof formData>,\n  target: DeploymentTargetResponse,\n  agent: Agent,\n  attemptNumber = 0,\n) {\n  try {\n    const timeoutDuration = 120000;\n    const controller = new AbortController();\n    const timeout = setTimeout(() => {\n      controller.abort();\n    }, timeoutDuration);\n\n    const response = await fetch(target.uploadUrl, {\n      method: 'POST',\n      body: form,\n      signal: controller.signal,\n      headers: {\n        Connection: 'keep-alive',\n      },\n      agent,\n    });\n    clearTimeout(timeout);\n\n    if (!response.ok) {\n      throw new Error(`${response.status}`);\n    }\n  } catch (err) {\n    if (isErrorCode(err, 'ENOENT')) {\n      throw new Error(`File not found: ${target.filePath}`);\n    }\n\n    if (attemptNumber < Number(deployDefaults.maxUploadAttempts)) {\n      await formUpload(form, target, agent, attemptNumber + 1);\n    } else {\n      if (err instanceof Error && err.name === 'AbortError') {\n        throw new Error(`Request timeout whilst uploading ${target.filePath}`);\n      }\n      throw new Error(`Failed to upload file ${target.filePath}`);\n    }\n  }\n}\n\nasync function initiateResumableUpload(\n  target: DeploymentTargetResponse,\n  agent: Agent,\n): Promise<InitiateResumableResponse> {\n  return fetch(target.uploadUrl, {\n    method: 'POST',\n    headers: {\n      'x-goog-resumable': 'start',\n      'X-Goog-Content-Length-Range': `0,${target.fileSize}`,\n      'User-Agent': 'oxygen-cli',\n    },\n    agent,\n  })\n    .then((res) => {\n      return {\n        sessionUri: res.headers.get('x-guploader-uploadid')!,\n        location: res.headers.get('location')!,\n        target,\n      };\n    })\n    .catch((err) => {\n      throw new Error(\n        `Failed to initiate resumable upload for file ${target.filePath} (status code ${err.statusCode})`,\n      );\n    });\n}\n\nasync function performResumableUpload(\n  localFilePath: string,\n  initData: InitiateResumableResponse,\n  agent: Agent,\n  startByte = 0,\n  attemptNumber = 0,\n) {\n  await uploadResumable(\n    initData.location,\n    localFilePath,\n    startByte,\n    agent,\n  ).catch(async (err) => {\n    if (isErrorCode(err, 'ENOENT')) {\n      throw new Error(`File not found: ${initData.target.filePath}`);\n    }\n\n    if (\n      err &&\n      attemptNumber >= Number(deployDefaults.maxResumabeUploadAttempts)\n    ) {\n      throw new Error(\n        `Failed to upload file ${initData.target.filePath} after ${deployDefaults.maxResumabeUploadAttempts} attempts`,\n      );\n    }\n    const status = await resumableUploadStatus(\n      initData.location,\n      initData.target.fileSize,\n      agent,\n    );\n    if (!status.complete) {\n      const nextAttemptStartByte = status.lastReceivedByte;\n      const attempt = attemptNumber + 1;\n      await performResumableUpload(\n        localFilePath,\n        initData,\n        agent,\n        nextAttemptStartByte,\n        attempt,\n      );\n    }\n  });\n}\n\nasync function uploadResumable(\n  location: string,\n  filePath: string,\n  lastReceivedByte: number,\n  agent: Agent,\n): Promise<number> {\n  const file = createFileReadStream(filePath, {start: lastReceivedByte});\n  return fetch(location, {\n    method: 'PUT',\n    body: file,\n    agent,\n  }).then((res) => {\n    return res.status;\n  });\n}\n\nasync function resumableUploadStatus(\n  location: string,\n  fileSize: number,\n  agent: Agent,\n): Promise<ResumableUploadStatus> {\n  const getLastByte = (range: string | null): number => {\n    if (!range || range.split('-').length !== 2) return 0;\n    const rangeParts = range.split('-');\n    return parseInt(rangeParts[1]!, 10);\n  };\n\n  return fetch(location, {\n    method: 'PUT',\n    headers: {\n      'Content-Length': '0',\n      'Content-Range': `bytes */${fileSize}`,\n    },\n    agent,\n  })\n    .then((res) => {\n      return {\n        complete: res.status === 200,\n        lastReceivedByte: getLastByte(res.headers.get('range')),\n      };\n    })\n    .catch((err) => {\n      // eslint-disable-next-line no-console\n      console.error(err);\n      return {\n        complete: false,\n        lastReceivedByte: 0,\n      };\n    });\n}\n\nfunction isErrorCode(err: unknown, code: string): boolean {\n  return err instanceof Error && 'code' in err && err.code === code;\n}\n"]}

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.1.1-unstable.202310110934.0",
+  "version": "2.1.1-unstable.202310110958.0",
   "commands": {
     "oxygen:deploy": {
       "id": "oxygen:deploy",

package/package.json

@@ -5,7 +5,7 @@
     "@shopify:registry": "https://registry.npmjs.org"
   },
   "license": "MIT",
-  "version": "2.1.1-unstable.202310110934.0",
+  "version": "2.1.1-unstable.202310110958.0",
   "type": "module",
   "scripts": {
     "build": "tsup --sourcemap --clean --config ./tsup.config.ts && oclif manifest",