Merge pull request #138 from web3-storage/fix/fix-split-uploads

fix: Fix issue with chunked uploads invalid origin.

Author: ice-breaker-tg

src/commands/car/generate.js

@@ -14,7 +14,6 @@ import toIterator from 'stream-to-it'
 /**
  * @typedef {object} GenerateCar
  * @property {string} [filePath='']
- * @property {boolean} [split=false]
  * @typedef {import('yargs').Arguments<GenerateCar>} GenerateCarArgs
  */
 
@@ -35,7 +34,7 @@ export const writeFileLocally = async (car, outPath = 'output.car') => {
  * @param {GenerateCarArgs} argv
  * @returns {Promise<void>}
  */
-const handler = async ({ filePath = '', split = false }) => {
+const handler = async ({ filePath = '' }) => {
   const resolvedPath = path.normalize(filePath)
 
   /** @type import('ora').Options */
@@ -46,7 +45,7 @@ const handler = async ({ filePath = '', split = false }) => {
   const view = ora(oraOpts).start()
 
   try {
-    const { stream } = await buildCar(resolvedPath, MAX_CAR_SIZE, !split)
+    const { stream } = await buildCar(resolvedPath, MAX_CAR_SIZE, false)
     /** @type Array<CID> */
     let roots = []
     /** @type CID */

src/commands/upload.js

@@ -12,7 +12,7 @@ import path from 'path'
 import toIterator from 'stream-to-it'
 
 /**
- * @typedef {{path?: string, split?: boolean, profile?: string}} Upload
+ * @typedef {{path?: string, profile?: string}} Upload
  * @typedef {import('yargs').Arguments<Upload>} UploadArgs
  */
 
@@ -40,7 +40,8 @@ async function generateCarUploads (filePath, view, chunkSize = 512, profile) {
       const cid = await bytesToCarCID(car.bytes)
       cids.push(cid)
 
-      const result = await client.upload(car.bytes, origin?.toString())
+      // @ts-expect-error
+      const result = await client.upload(car.bytes, origin)
       if (result.error) {
         // @ts-expect-error
         throw new Error(result?.cause?.message)
@@ -112,13 +113,6 @@ const builder = (yargs) =>
     .option('chunk-size', {
       type: 'number'
     })
-    .option('split', {
-      type: 'boolean',
-      alias: 'split',
-      showInHelp: true,
-      describe:
-        'Split the data into multiple when cars when size limit is hit.'
-    })
 
 export default {
   //   command: ['upload <path>', 'import <path>'],