@junobuild/storage 1.0.0 → 1.1.0

package/dist/browser/index.js

@@ -1,2 +1,2 @@
-import{toNullable as p}from"@dfinity/utils";import{isBrowser as k}from"@junobuild/utils";var b=async({asset:{data:t,headers:a,...o},actor:s})=>{let{init_asset_upload:e,upload_asset_chunk:n,commit_asset_upload:l}=s,{batch_id:i}=await e(c(o)),{chunkIds:d}=await h({data:t,uploadFn:n,batchId:i});await u({commitFn:l,batchId:i,data:t,headers:a,chunkIds:d})},P=async({asset:{data:t,headers:a,...o},proposalId:s,actor:e})=>{let{init_proposal_asset_upload:n,upload_proposal_asset_chunk:l,commit_proposal_asset_upload:i}=e,{batch_id:d}=await n(c(o),s),{chunkIds:m}=await h({data:t,uploadFn:l,batchId:d});await u({commitFn:i,batchId:d,data:t,headers:a,chunkIds:m})},c=({filename:t,collection:a,token:o,fullPath:s,encoding:e,description:n})=>({collection:a,full_path:s,name:t,token:p(o),encoding_type:p(e),description:p(n)}),u=async({commitFn:t,batchId:a,chunkIds:o,headers:s,data:e})=>{let n=s.find(([l,i])=>l.toLowerCase()==="content-type")===void 0&&e.type!==void 0&&e.type!==""?[["Content-Type",e.type]]:void 0;await t({batch_id:a,chunk_ids:o.map(({chunk_id:l})=>l),headers:[...s,...n??[]]})},h=async({data:t,uploadFn:a,batchId:o})=>{let s=[],e=k()?new Blob([await t.arrayBuffer()]):t,n=0n;for(let i=0;i<e.size;i+=19e5){let d=e.slice(i,i+19e5);s.push({batchId:o,chunk:d,uploadFn:a,orderId:n}),n++}let l=[];for await(let i of y({uploadChunks:s}))l=[...l,...i];return{chunkIds:l}};async function*y({uploadChunks:t,limit:a=12}){for(let o=0;o<t.length;o=o+a){let s=t.slice(o,o+a);yield await Promise.all(s.map(n=>C(n)))}}var C=async({batchId:t,chunk:a,uploadFn:o,orderId:s})=>o({batch_id:t,content:new Uint8Array(await a.arrayBuffer()),order_id:p(s)});export{b as uploadAsset,P as uploadAssetWithProposal};
+import{assertNonNullish as B,toNullable as u}from"@dfinity/utils";import{isBrowser as A}from"@junobuild/utils";var K=async({asset:{data:o,headers:s,...t},actor:a,progress:e})=>{let{init_asset_upload:n,upload_asset_chunk:d,commit_asset_upload:i}=a,{batch_id:l}=await n(m(t));e?.onInitiatedBatch();let{chunkIds:p}=await h({data:o,uploadFn:d,batchId:l});e?.onUploadedFileChunks(t.fullPath),await U({commitFn:i,batchId:l,data:o,headers:s,chunkIds:p}),e?.onCommittedBatch()},S=async({asset:{data:o,headers:s,...t},proposalId:a,actor:e,progress:n})=>{let{init_proposal_asset_upload:d,upload_proposal_asset_chunk:i,commit_proposal_asset_upload:l}=e;n?.onInitiatedBatch();let{batch_id:p}=await d(m(t),a),{chunkIds:c}=await h({data:o,uploadFn:i,batchId:p});n?.onUploadedFileChunks(t.fullPath),await U({commitFn:l,batchId:p,data:o,headers:s,chunkIds:c}),n?.onCommittedBatch()},v=async({assets:o,proposalId:s,actor:t,progress:a})=>{let{init_proposal_many_assets_upload:e,upload_proposal_asset_chunk:n,commit_proposal_many_assets_upload:d}=t,i=await e(o.map(m),s);a?.onInitiatedBatch();let l=async({fullPath:c,data:r,headers:P})=>{let C=i.find(([I])=>I===c);B(C);let[g,b]=C,{batch_id:k}=b,{chunkIds:f}=await h({data:r,uploadFn:n,batchId:k});return a?.onUploadedFileChunks(c),{batchId:k,headers:P,chunkIds:f,data:r}},p=await Promise.all(o.map(l));await d(p.map(y)),a?.onCommittedBatch()},m=({filename:o,collection:s,token:t,fullPath:a,encoding:e,description:n})=>({collection:s,full_path:a,name:o,token:u(t),encoding_type:u(e),description:u(n)}),y=({batchId:o,chunkIds:s,headers:t,data:a})=>{let e=t.find(([n,d])=>n.toLowerCase()==="content-type")===void 0&&a.type!==void 0&&a.type!==""?[["Content-Type",a.type]]:void 0;return{batch_id:o,chunk_ids:s.map(({chunk_id:n})=>n),headers:[...t,...e??[]]}},U=async({commitFn:o,...s})=>{let t=y(s);await o(t)},h=async({data:o,uploadFn:s,batchId:t})=>{let a=[],e=A()?new Blob([await o.arrayBuffer()]):o,n=0n;for(let i=0;i<e.size;i+=19e5){let l=e.slice(i,i+19e5);a.push({batchId:t,chunk:l,uploadFn:s,orderId:n}),n++}let d=[];for await(let i of w({uploadChunks:a}))d=[...d,...i];return{chunkIds:d}};async function*w({uploadChunks:o,limit:s=12}){for(let t=0;t<o.length;t=t+s){let a=o.slice(t,t+s);yield await Promise.all(a.map(n=>F(n)))}}var F=async({batchId:o,chunk:s,uploadFn:t,orderId:a})=>t({batch_id:o,content:new Uint8Array(await s.arrayBuffer()),order_id:u(a)});export{K as uploadAsset,S as uploadAssetWithProposal,v as uploadAssetsWithProposal};
 //# sourceMappingURL=index.js.map

package/dist/browser/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/services/upload.services.ts"],
-  "sourcesContent": ["import {toNullable} from '@dfinity/utils';\nimport type {ConsoleDid, SatelliteDid} from '@junobuild/ic-client';\nimport {isBrowser} from '@junobuild/utils';\nimport {UPLOAD_CHUNK_SIZE} from '../constants/upload.constants';\nimport type {EncodingType} from '../types/storage';\nimport type {UploadAsset, UploadAssetActor, UploadAssetWithProposalActor} from '../types/upload';\n\ntype InitAssetKey = SatelliteDid.InitAssetKey | ConsoleDid.InitAssetKey;\ntype UploadChunk = SatelliteDid.UploadChunk | ConsoleDid.UploadChunk;\ntype CommitBatch = SatelliteDid.CommitBatch | ConsoleDid.CommitBatch;\n\nexport const uploadAsset = async ({\n  asset: {data, headers, ...restAsset},\n  actor\n}: {\n  asset: UploadAsset;\n  actor: UploadAssetActor;\n}): Promise<void> => {\n  const {init_asset_upload, upload_asset_chunk, commit_asset_upload} = actor;\n\n  const {batch_id: batchId} = await init_asset_upload(mapInitAssetUploadParams(restAsset));\n\n  const {chunkIds} = await uploadChunks({data, uploadFn: upload_asset_chunk, batchId});\n\n  await commitAsset({\n    commitFn: commit_asset_upload,\n    batchId,\n    data,\n    headers,\n    chunkIds\n  });\n};\n\nexport const uploadAssetWithProposal = async ({\n  asset: {data, headers, ...restAsset},\n  proposalId,\n  actor\n}: {\n  asset: UploadAsset;\n  proposalId: bigint;\n  actor: UploadAssetWithProposalActor;\n}): Promise<void> => {\n  const {init_proposal_asset_upload, upload_proposal_asset_chunk, commit_proposal_asset_upload} =\n    actor;\n\n  const {batch_id: batchId} = await init_proposal_asset_upload(\n    mapInitAssetUploadParams(restAsset),\n    proposalId\n  );\n\n  const {chunkIds} = await uploadChunks({data, uploadFn: upload_proposal_asset_chunk, batchId});\n\n  await commitAsset({\n    commitFn: commit_proposal_asset_upload,\n    batchId,\n    data,\n    headers,\n    chunkIds\n  });\n};\n\nconst mapInitAssetUploadParams = ({\n  filename,\n  collection,\n  token,\n  fullPath,\n  encoding,\n  description\n}: Omit<UploadAsset, 'headers' | 'data'>): InitAssetKey => ({\n  collection,\n  full_path: fullPath,\n  name: filename,\n  token: toNullable<string>(token),\n  encoding_type: toNullable<EncodingType>(encoding),\n  description: toNullable(description)\n});\n\nconst commitAsset = async ({\n  commitFn,\n  batchId,\n  chunkIds,\n  headers,\n  data\n}: {\n  commitFn: (commitBatch: CommitBatch) => Promise<void>;\n  batchId: bigint;\n  chunkIds: UploadChunkResult[];\n} & Pick<UploadAsset, 'headers' | 'data'>) => {\n  const contentType: [[string, string]] | undefined =\n    headers.find(([type, _]) => type.toLowerCase() === 'content-type') === undefined &&\n    data.type !== undefined &&\n    data.type !== ''\n      ? [['Content-Type', data.type]]\n      : undefined;\n\n  await commitFn({\n    batch_id: batchId,\n    chunk_ids: chunkIds.map(({chunk_id}: UploadChunkResult) => chunk_id),\n    headers: [...headers, ...(contentType ?? [])]\n  });\n};\n\nconst uploadChunks = async ({\n  data,\n  uploadFn,\n  batchId\n}: {\n  batchId: bigint;\n} & Pick<UploadAsset, 'data'> &\n  Pick<UploadChunkParams, 'uploadFn'>): Promise<{chunkIds: UploadChunkResult[]}> => {\n  const uploadChunks: UploadChunkParams[] = [];\n\n  // Prevent transforming chunk to arrayBuffer error: The requested file could not be read, typically due to permission problems that have occurred after a reference to a file was acquired.\n  const clone: Blob = isBrowser() ? new Blob([await data.arrayBuffer()]) : data;\n\n  // Split data into chunks\n  let orderId = 0n;\n  for (let start = 0; start < clone.size; start += UPLOAD_CHUNK_SIZE) {\n    const chunk: Blob = clone.slice(start, start + UPLOAD_CHUNK_SIZE);\n\n    uploadChunks.push({\n      batchId,\n      chunk,\n      uploadFn,\n      orderId\n    });\n\n    orderId++;\n  }\n\n  // Upload chunks to the IC in batch - i.e. 12 chunks uploaded at a time.\n  let chunkIds: UploadChunkResult[] = [];\n  for await (const results of batchUploadChunks({uploadChunks})) {\n    chunkIds = [...chunkIds, ...results];\n  }\n\n  return {chunkIds};\n};\n\nasync function* batchUploadChunks({\n  uploadChunks,\n  limit = 12\n}: {\n  uploadChunks: UploadChunkParams[];\n  limit?: number;\n}): AsyncGenerator<UploadChunkResult[], void> {\n  for (let i = 0; i < uploadChunks.length; i = i + limit) {\n    const batch = uploadChunks.slice(i, i + limit);\n    const result = await Promise.all(batch.map((params) => uploadChunk(params)));\n    yield result;\n  }\n}\n\ninterface UploadChunkResult {\n  chunk_id: bigint;\n}\n\ninterface UploadChunkParams {\n  batchId: bigint;\n  chunk: Blob;\n  uploadFn: (uploadChunk: UploadChunk) => Promise<UploadChunkResult>;\n  orderId: bigint;\n}\n\nconst uploadChunk = async ({\n  batchId,\n  chunk,\n  uploadFn,\n  orderId\n}: UploadChunkParams): Promise<UploadChunkResult> =>\n  uploadFn({\n    batch_id: batchId,\n    content: new Uint8Array(await chunk.arrayBuffer()),\n    order_id: toNullable(orderId)\n  });\n"],
-  "mappings": "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",
-  "names": ["toNullable", "isBrowser", "uploadAsset", "data", "headers", "restAsset", "actor", "init_asset_upload", "upload_asset_chunk", "commit_asset_upload", "batchId", "mapInitAssetUploadParams", "chunkIds", "uploadChunks", "commitAsset", "uploadAssetWithProposal", "proposalId", "init_proposal_asset_upload", "upload_proposal_asset_chunk", "commit_proposal_asset_upload", "filename", "collection", "token", "fullPath", "encoding", "description", "toNullable", "commitFn", "contentType", "type", "_", "chunk_id", "uploadFn", "clone", "isBrowser", "orderId", "start", "chunk", "results", "batchUploadChunks", "limit", "i", "batch", "params", "uploadChunk"]
+  "sourcesContent": ["import {assertNonNullish, toNullable} from '@dfinity/utils';\nimport type {ConsoleDid, SatelliteDid} from '@junobuild/ic-client';\nimport {isBrowser} from '@junobuild/utils';\nimport {UPLOAD_CHUNK_SIZE} from '../constants/upload.constants';\nimport type {EncodingType} from '../types/storage';\nimport type {UploadAsset, UploadParams, UploadWithProposalParams} from '../types/upload';\n\ntype InitAssetKey = SatelliteDid.InitAssetKey | ConsoleDid.InitAssetKey;\ntype UploadChunk = SatelliteDid.UploadChunk | ConsoleDid.UploadChunk;\ntype CommitBatch = SatelliteDid.CommitBatch | ConsoleDid.CommitBatch;\n\nexport const uploadAsset = async ({\n  asset: {data, headers, ...restAsset},\n  actor,\n  progress\n}: {\n  asset: UploadAsset;\n} & UploadParams): Promise<void> => {\n  const {init_asset_upload, upload_asset_chunk, commit_asset_upload} = actor;\n\n  const {batch_id: batchId} = await init_asset_upload(mapInitAssetUploadParams(restAsset));\n\n  progress?.onInitiatedBatch();\n\n  const {chunkIds} = await uploadChunks({data, uploadFn: upload_asset_chunk, batchId});\n\n  progress?.onUploadedFileChunks(restAsset.fullPath);\n\n  await commitAsset({\n    commitFn: commit_asset_upload,\n    batchId,\n    data,\n    headers,\n    chunkIds\n  });\n\n  progress?.onCommittedBatch();\n};\n\nexport const uploadAssetWithProposal = async ({\n  asset: {data, headers, ...restAsset},\n  proposalId,\n  actor,\n  progress\n}: {\n  asset: UploadAsset;\n} & UploadWithProposalParams): Promise<void> => {\n  const {init_proposal_asset_upload, upload_proposal_asset_chunk, commit_proposal_asset_upload} =\n    actor;\n\n  progress?.onInitiatedBatch();\n\n  const {batch_id: batchId} = await init_proposal_asset_upload(\n    mapInitAssetUploadParams(restAsset),\n    proposalId\n  );\n\n  const {chunkIds} = await uploadChunks({data, uploadFn: upload_proposal_asset_chunk, batchId});\n\n  progress?.onUploadedFileChunks(restAsset.fullPath);\n\n  await commitAsset({\n    commitFn: commit_proposal_asset_upload,\n    batchId,\n    data,\n    headers,\n    chunkIds\n  });\n\n  progress?.onCommittedBatch();\n};\n\nexport const uploadAssetsWithProposal = async ({\n  assets,\n  proposalId,\n  actor,\n  progress\n}: {\n  assets: UploadAsset[];\n} & UploadWithProposalParams): Promise<void> => {\n  const {\n    init_proposal_many_assets_upload,\n    upload_proposal_asset_chunk,\n    commit_proposal_many_assets_upload\n  } = actor;\n\n  const batchIds = await init_proposal_many_assets_upload(\n    assets.map(mapInitAssetUploadParams),\n    proposalId\n  );\n\n  progress?.onInitiatedBatch();\n\n  const uploadAssetChunk = async ({\n    fullPath,\n    data,\n    headers\n  }: UploadAsset): Promise<BatchToCommit> => {\n    const initializedBatch = batchIds.find(([batchIdFullPath]) => batchIdFullPath === fullPath);\n\n    assertNonNullish(initializedBatch);\n\n    const [_, initUpload] = initializedBatch;\n    const {batch_id: batchId} = initUpload;\n\n    const {chunkIds} = await uploadChunks({data, uploadFn: upload_proposal_asset_chunk, batchId});\n\n    progress?.onUploadedFileChunks(fullPath);\n\n    return {\n      batchId,\n      headers,\n      chunkIds,\n      data\n    };\n  };\n\n  const batchAndChunkIdsToCommit = await Promise.all(assets.map(uploadAssetChunk));\n\n  await commit_proposal_many_assets_upload(batchAndChunkIdsToCommit.map(mapCommitBatch));\n\n  progress?.onCommittedBatch();\n};\n\nconst mapInitAssetUploadParams = ({\n  filename,\n  collection,\n  token,\n  fullPath,\n  encoding,\n  description\n}: Omit<UploadAsset, 'headers' | 'data'>): InitAssetKey => ({\n  collection,\n  full_path: fullPath,\n  name: filename,\n  token: toNullable<string>(token),\n  encoding_type: toNullable<EncodingType>(encoding),\n  description: toNullable(description)\n});\n\ntype BatchToCommit = {\n  batchId: bigint;\n  chunkIds: UploadChunkResult[];\n} & Pick<UploadAsset, 'headers' | 'data'>;\n\nconst mapCommitBatch = ({batchId, chunkIds, headers, data}: BatchToCommit): CommitBatch => {\n  const contentType: [[string, string]] | undefined =\n    headers.find(([type, _]) => type.toLowerCase() === 'content-type') === undefined &&\n    data.type !== undefined &&\n    data.type !== ''\n      ? [['Content-Type', data.type]]\n      : undefined;\n\n  return {\n    batch_id: batchId,\n    chunk_ids: chunkIds.map(({chunk_id}: UploadChunkResult) => chunk_id),\n    headers: [...headers, ...(contentType ?? [])]\n  };\n};\n\nconst commitAsset = async ({\n  commitFn,\n  ...rest\n}: {\n  commitFn: (commitBatch: CommitBatch) => Promise<void>;\n  batchId: bigint;\n  chunkIds: UploadChunkResult[];\n} & Pick<UploadAsset, 'headers' | 'data'>) => {\n  const commitBatch = mapCommitBatch(rest);\n  await commitFn(commitBatch);\n};\n\nconst uploadChunks = async ({\n  data,\n  uploadFn,\n  batchId\n}: {\n  batchId: bigint;\n} & Pick<UploadAsset, 'data'> &\n  Pick<UploadChunkParams, 'uploadFn'>): Promise<{chunkIds: UploadChunkResult[]}> => {\n  const uploadChunks: UploadChunkParams[] = [];\n\n  // Prevent transforming chunk to arrayBuffer error: The requested file could not be read, typically due to permission problems that have occurred after a reference to a file was acquired.\n  const clone: Blob = isBrowser() ? new Blob([await data.arrayBuffer()]) : data;\n\n  // Split data into chunks\n  let orderId = 0n;\n  for (let start = 0; start < clone.size; start += UPLOAD_CHUNK_SIZE) {\n    const chunk: Blob = clone.slice(start, start + UPLOAD_CHUNK_SIZE);\n\n    uploadChunks.push({\n      batchId,\n      chunk,\n      uploadFn,\n      orderId\n    });\n\n    orderId++;\n  }\n\n  // Upload chunks to the IC in batch - i.e. 12 chunks uploaded at a time.\n  let chunkIds: UploadChunkResult[] = [];\n  for await (const results of batchUploadChunks({uploadChunks})) {\n    chunkIds = [...chunkIds, ...results];\n  }\n\n  return {chunkIds};\n};\n\nasync function* batchUploadChunks({\n  uploadChunks,\n  limit = 12\n}: {\n  uploadChunks: UploadChunkParams[];\n  limit?: number;\n}): AsyncGenerator<UploadChunkResult[], void> {\n  for (let i = 0; i < uploadChunks.length; i = i + limit) {\n    const batch = uploadChunks.slice(i, i + limit);\n    const result = await Promise.all(batch.map((params) => uploadChunk(params)));\n    yield result;\n  }\n}\n\ninterface UploadChunkResult {\n  chunk_id: bigint;\n}\n\ninterface UploadChunkParams {\n  batchId: bigint;\n  chunk: Blob;\n  uploadFn: (uploadChunk: UploadChunk) => Promise<UploadChunkResult>;\n  orderId: bigint;\n}\n\nconst uploadChunk = async ({\n  batchId,\n  chunk,\n  uploadFn,\n  orderId\n}: UploadChunkParams): Promise<UploadChunkResult> =>\n  uploadFn({\n    batch_id: batchId,\n    content: new Uint8Array(await chunk.arrayBuffer()),\n    order_id: toNullable(orderId)\n  });\n"],
+  "mappings": "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",
+  "names": ["assertNonNullish", "toNullable", "isBrowser", "uploadAsset", "data", "headers", "restAsset", "actor", "progress", "init_asset_upload", "upload_asset_chunk", "commit_asset_upload", "batchId", "mapInitAssetUploadParams", "chunkIds", "uploadChunks", "commitAsset", "uploadAssetWithProposal", "proposalId", "init_proposal_asset_upload", "upload_proposal_asset_chunk", "commit_proposal_asset_upload", "uploadAssetsWithProposal", "assets", "init_proposal_many_assets_upload", "commit_proposal_many_assets_upload", "batchIds", "uploadAssetChunk", "fullPath", "initializedBatch", "batchIdFullPath", "assertNonNullish", "_", "initUpload", "batchAndChunkIdsToCommit", "mapCommitBatch", "filename", "collection", "token", "encoding", "description", "toNullable", "contentType", "type", "chunk_id", "commitFn", "rest", "commitBatch", "uploadFn", "clone", "isBrowser", "orderId", "start", "chunk", "results", "batchUploadChunks", "limit", "i", "batch", "params", "uploadChunk"]
 }

package/dist/node/index.mjs

@@ -1,4 +1,4 @@
 import { createRequire as topLevelCreateRequire } from 'module';
  const require = topLevelCreateRequire(import.meta.url);
-import{toNullable as p}from"@dfinity/utils";import{isBrowser as k}from"@junobuild/utils";var b=async({asset:{data:t,headers:a,...o},actor:s})=>{let{init_asset_upload:e,upload_asset_chunk:n,commit_asset_upload:l}=s,{batch_id:i}=await e(c(o)),{chunkIds:d}=await h({data:t,uploadFn:n,batchId:i});await u({commitFn:l,batchId:i,data:t,headers:a,chunkIds:d})},P=async({asset:{data:t,headers:a,...o},proposalId:s,actor:e})=>{let{init_proposal_asset_upload:n,upload_proposal_asset_chunk:l,commit_proposal_asset_upload:i}=e,{batch_id:d}=await n(c(o),s),{chunkIds:m}=await h({data:t,uploadFn:l,batchId:d});await u({commitFn:i,batchId:d,data:t,headers:a,chunkIds:m})},c=({filename:t,collection:a,token:o,fullPath:s,encoding:e,description:n})=>({collection:a,full_path:s,name:t,token:p(o),encoding_type:p(e),description:p(n)}),u=async({commitFn:t,batchId:a,chunkIds:o,headers:s,data:e})=>{let n=s.find(([l,i])=>l.toLowerCase()==="content-type")===void 0&&e.type!==void 0&&e.type!==""?[["Content-Type",e.type]]:void 0;await t({batch_id:a,chunk_ids:o.map(({chunk_id:l})=>l),headers:[...s,...n??[]]})},h=async({data:t,uploadFn:a,batchId:o})=>{let s=[],e=k()?new Blob([await t.arrayBuffer()]):t,n=0n;for(let i=0;i<e.size;i+=19e5){let d=e.slice(i,i+19e5);s.push({batchId:o,chunk:d,uploadFn:a,orderId:n}),n++}let l=[];for await(let i of y({uploadChunks:s}))l=[...l,...i];return{chunkIds:l}};async function*y({uploadChunks:t,limit:a=12}){for(let o=0;o<t.length;o=o+a){let s=t.slice(o,o+a);yield await Promise.all(s.map(n=>C(n)))}}var C=async({batchId:t,chunk:a,uploadFn:o,orderId:s})=>o({batch_id:t,content:new Uint8Array(await a.arrayBuffer()),order_id:p(s)});export{b as uploadAsset,P as uploadAssetWithProposal};
+import{assertNonNullish as B,toNullable as u}from"@dfinity/utils";import{isBrowser as A}from"@junobuild/utils";var K=async({asset:{data:o,headers:s,...t},actor:a,progress:e})=>{let{init_asset_upload:n,upload_asset_chunk:d,commit_asset_upload:i}=a,{batch_id:l}=await n(m(t));e?.onInitiatedBatch();let{chunkIds:p}=await h({data:o,uploadFn:d,batchId:l});e?.onUploadedFileChunks(t.fullPath),await U({commitFn:i,batchId:l,data:o,headers:s,chunkIds:p}),e?.onCommittedBatch()},S=async({asset:{data:o,headers:s,...t},proposalId:a,actor:e,progress:n})=>{let{init_proposal_asset_upload:d,upload_proposal_asset_chunk:i,commit_proposal_asset_upload:l}=e;n?.onInitiatedBatch();let{batch_id:p}=await d(m(t),a),{chunkIds:c}=await h({data:o,uploadFn:i,batchId:p});n?.onUploadedFileChunks(t.fullPath),await U({commitFn:l,batchId:p,data:o,headers:s,chunkIds:c}),n?.onCommittedBatch()},v=async({assets:o,proposalId:s,actor:t,progress:a})=>{let{init_proposal_many_assets_upload:e,upload_proposal_asset_chunk:n,commit_proposal_many_assets_upload:d}=t,i=await e(o.map(m),s);a?.onInitiatedBatch();let l=async({fullPath:c,data:r,headers:P})=>{let C=i.find(([I])=>I===c);B(C);let[g,b]=C,{batch_id:k}=b,{chunkIds:f}=await h({data:r,uploadFn:n,batchId:k});return a?.onUploadedFileChunks(c),{batchId:k,headers:P,chunkIds:f,data:r}},p=await Promise.all(o.map(l));await d(p.map(y)),a?.onCommittedBatch()},m=({filename:o,collection:s,token:t,fullPath:a,encoding:e,description:n})=>({collection:s,full_path:a,name:o,token:u(t),encoding_type:u(e),description:u(n)}),y=({batchId:o,chunkIds:s,headers:t,data:a})=>{let e=t.find(([n,d])=>n.toLowerCase()==="content-type")===void 0&&a.type!==void 0&&a.type!==""?[["Content-Type",a.type]]:void 0;return{batch_id:o,chunk_ids:s.map(({chunk_id:n})=>n),headers:[...t,...e??[]]}},U=async({commitFn:o,...s})=>{let t=y(s);await o(t)},h=async({data:o,uploadFn:s,batchId:t})=>{let a=[],e=A()?new Blob([await o.arrayBuffer()]):o,n=0n;for(let i=0;i<e.size;i+=19e5){let l=e.slice(i,i+19e5);a.push({batchId:t,chunk:l,uploadFn:s,orderId:n}),n++}let d=[];for await(let i of w({uploadChunks:a}))d=[...d,...i];return{chunkIds:d}};async function*w({uploadChunks:o,limit:s=12}){for(let t=0;t<o.length;t=t+s){let a=o.slice(t,t+s);yield await Promise.all(a.map(n=>F(n)))}}var F=async({batchId:o,chunk:s,uploadFn:t,orderId:a})=>t({batch_id:o,content:new Uint8Array(await s.arrayBuffer()),order_id:u(a)});export{K as uploadAsset,S as uploadAssetWithProposal,v as uploadAssetsWithProposal};
 //# sourceMappingURL=index.mjs.map

package/dist/node/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/services/upload.services.ts"],
-  "sourcesContent": ["import {toNullable} from '@dfinity/utils';\nimport type {ConsoleDid, SatelliteDid} from '@junobuild/ic-client';\nimport {isBrowser} from '@junobuild/utils';\nimport {UPLOAD_CHUNK_SIZE} from '../constants/upload.constants';\nimport type {EncodingType} from '../types/storage';\nimport type {UploadAsset, UploadAssetActor, UploadAssetWithProposalActor} from '../types/upload';\n\ntype InitAssetKey = SatelliteDid.InitAssetKey | ConsoleDid.InitAssetKey;\ntype UploadChunk = SatelliteDid.UploadChunk | ConsoleDid.UploadChunk;\ntype CommitBatch = SatelliteDid.CommitBatch | ConsoleDid.CommitBatch;\n\nexport const uploadAsset = async ({\n  asset: {data, headers, ...restAsset},\n  actor\n}: {\n  asset: UploadAsset;\n  actor: UploadAssetActor;\n}): Promise<void> => {\n  const {init_asset_upload, upload_asset_chunk, commit_asset_upload} = actor;\n\n  const {batch_id: batchId} = await init_asset_upload(mapInitAssetUploadParams(restAsset));\n\n  const {chunkIds} = await uploadChunks({data, uploadFn: upload_asset_chunk, batchId});\n\n  await commitAsset({\n    commitFn: commit_asset_upload,\n    batchId,\n    data,\n    headers,\n    chunkIds\n  });\n};\n\nexport const uploadAssetWithProposal = async ({\n  asset: {data, headers, ...restAsset},\n  proposalId,\n  actor\n}: {\n  asset: UploadAsset;\n  proposalId: bigint;\n  actor: UploadAssetWithProposalActor;\n}): Promise<void> => {\n  const {init_proposal_asset_upload, upload_proposal_asset_chunk, commit_proposal_asset_upload} =\n    actor;\n\n  const {batch_id: batchId} = await init_proposal_asset_upload(\n    mapInitAssetUploadParams(restAsset),\n    proposalId\n  );\n\n  const {chunkIds} = await uploadChunks({data, uploadFn: upload_proposal_asset_chunk, batchId});\n\n  await commitAsset({\n    commitFn: commit_proposal_asset_upload,\n    batchId,\n    data,\n    headers,\n    chunkIds\n  });\n};\n\nconst mapInitAssetUploadParams = ({\n  filename,\n  collection,\n  token,\n  fullPath,\n  encoding,\n  description\n}: Omit<UploadAsset, 'headers' | 'data'>): InitAssetKey => ({\n  collection,\n  full_path: fullPath,\n  name: filename,\n  token: toNullable<string>(token),\n  encoding_type: toNullable<EncodingType>(encoding),\n  description: toNullable(description)\n});\n\nconst commitAsset = async ({\n  commitFn,\n  batchId,\n  chunkIds,\n  headers,\n  data\n}: {\n  commitFn: (commitBatch: CommitBatch) => Promise<void>;\n  batchId: bigint;\n  chunkIds: UploadChunkResult[];\n} & Pick<UploadAsset, 'headers' | 'data'>) => {\n  const contentType: [[string, string]] | undefined =\n    headers.find(([type, _]) => type.toLowerCase() === 'content-type') === undefined &&\n    data.type !== undefined &&\n    data.type !== ''\n      ? [['Content-Type', data.type]]\n      : undefined;\n\n  await commitFn({\n    batch_id: batchId,\n    chunk_ids: chunkIds.map(({chunk_id}: UploadChunkResult) => chunk_id),\n    headers: [...headers, ...(contentType ?? [])]\n  });\n};\n\nconst uploadChunks = async ({\n  data,\n  uploadFn,\n  batchId\n}: {\n  batchId: bigint;\n} & Pick<UploadAsset, 'data'> &\n  Pick<UploadChunkParams, 'uploadFn'>): Promise<{chunkIds: UploadChunkResult[]}> => {\n  const uploadChunks: UploadChunkParams[] = [];\n\n  // Prevent transforming chunk to arrayBuffer error: The requested file could not be read, typically due to permission problems that have occurred after a reference to a file was acquired.\n  const clone: Blob = isBrowser() ? new Blob([await data.arrayBuffer()]) : data;\n\n  // Split data into chunks\n  let orderId = 0n;\n  for (let start = 0; start < clone.size; start += UPLOAD_CHUNK_SIZE) {\n    const chunk: Blob = clone.slice(start, start + UPLOAD_CHUNK_SIZE);\n\n    uploadChunks.push({\n      batchId,\n      chunk,\n      uploadFn,\n      orderId\n    });\n\n    orderId++;\n  }\n\n  // Upload chunks to the IC in batch - i.e. 12 chunks uploaded at a time.\n  let chunkIds: UploadChunkResult[] = [];\n  for await (const results of batchUploadChunks({uploadChunks})) {\n    chunkIds = [...chunkIds, ...results];\n  }\n\n  return {chunkIds};\n};\n\nasync function* batchUploadChunks({\n  uploadChunks,\n  limit = 12\n}: {\n  uploadChunks: UploadChunkParams[];\n  limit?: number;\n}): AsyncGenerator<UploadChunkResult[], void> {\n  for (let i = 0; i < uploadChunks.length; i = i + limit) {\n    const batch = uploadChunks.slice(i, i + limit);\n    const result = await Promise.all(batch.map((params) => uploadChunk(params)));\n    yield result;\n  }\n}\n\ninterface UploadChunkResult {\n  chunk_id: bigint;\n}\n\ninterface UploadChunkParams {\n  batchId: bigint;\n  chunk: Blob;\n  uploadFn: (uploadChunk: UploadChunk) => Promise<UploadChunkResult>;\n  orderId: bigint;\n}\n\nconst uploadChunk = async ({\n  batchId,\n  chunk,\n  uploadFn,\n  orderId\n}: UploadChunkParams): Promise<UploadChunkResult> =>\n  uploadFn({\n    batch_id: batchId,\n    content: new Uint8Array(await chunk.arrayBuffer()),\n    order_id: toNullable(orderId)\n  });\n"],
-  "mappings": "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",
-  "names": ["toNullable", "isBrowser", "uploadAsset", "data", "headers", "restAsset", "actor", "init_asset_upload", "upload_asset_chunk", "commit_asset_upload", "batchId", "mapInitAssetUploadParams", "chunkIds", "uploadChunks", "commitAsset", "uploadAssetWithProposal", "proposalId", "init_proposal_asset_upload", "upload_proposal_asset_chunk", "commit_proposal_asset_upload", "filename", "collection", "token", "fullPath", "encoding", "description", "toNullable", "commitFn", "contentType", "type", "_", "chunk_id", "uploadFn", "clone", "isBrowser", "orderId", "start", "chunk", "results", "batchUploadChunks", "limit", "i", "batch", "params", "uploadChunk"]
+  "sourcesContent": ["import {assertNonNullish, toNullable} from '@dfinity/utils';\nimport type {ConsoleDid, SatelliteDid} from '@junobuild/ic-client';\nimport {isBrowser} from '@junobuild/utils';\nimport {UPLOAD_CHUNK_SIZE} from '../constants/upload.constants';\nimport type {EncodingType} from '../types/storage';\nimport type {UploadAsset, UploadParams, UploadWithProposalParams} from '../types/upload';\n\ntype InitAssetKey = SatelliteDid.InitAssetKey | ConsoleDid.InitAssetKey;\ntype UploadChunk = SatelliteDid.UploadChunk | ConsoleDid.UploadChunk;\ntype CommitBatch = SatelliteDid.CommitBatch | ConsoleDid.CommitBatch;\n\nexport const uploadAsset = async ({\n  asset: {data, headers, ...restAsset},\n  actor,\n  progress\n}: {\n  asset: UploadAsset;\n} & UploadParams): Promise<void> => {\n  const {init_asset_upload, upload_asset_chunk, commit_asset_upload} = actor;\n\n  const {batch_id: batchId} = await init_asset_upload(mapInitAssetUploadParams(restAsset));\n\n  progress?.onInitiatedBatch();\n\n  const {chunkIds} = await uploadChunks({data, uploadFn: upload_asset_chunk, batchId});\n\n  progress?.onUploadedFileChunks(restAsset.fullPath);\n\n  await commitAsset({\n    commitFn: commit_asset_upload,\n    batchId,\n    data,\n    headers,\n    chunkIds\n  });\n\n  progress?.onCommittedBatch();\n};\n\nexport const uploadAssetWithProposal = async ({\n  asset: {data, headers, ...restAsset},\n  proposalId,\n  actor,\n  progress\n}: {\n  asset: UploadAsset;\n} & UploadWithProposalParams): Promise<void> => {\n  const {init_proposal_asset_upload, upload_proposal_asset_chunk, commit_proposal_asset_upload} =\n    actor;\n\n  progress?.onInitiatedBatch();\n\n  const {batch_id: batchId} = await init_proposal_asset_upload(\n    mapInitAssetUploadParams(restAsset),\n    proposalId\n  );\n\n  const {chunkIds} = await uploadChunks({data, uploadFn: upload_proposal_asset_chunk, batchId});\n\n  progress?.onUploadedFileChunks(restAsset.fullPath);\n\n  await commitAsset({\n    commitFn: commit_proposal_asset_upload,\n    batchId,\n    data,\n    headers,\n    chunkIds\n  });\n\n  progress?.onCommittedBatch();\n};\n\nexport const uploadAssetsWithProposal = async ({\n  assets,\n  proposalId,\n  actor,\n  progress\n}: {\n  assets: UploadAsset[];\n} & UploadWithProposalParams): Promise<void> => {\n  const {\n    init_proposal_many_assets_upload,\n    upload_proposal_asset_chunk,\n    commit_proposal_many_assets_upload\n  } = actor;\n\n  const batchIds = await init_proposal_many_assets_upload(\n    assets.map(mapInitAssetUploadParams),\n    proposalId\n  );\n\n  progress?.onInitiatedBatch();\n\n  const uploadAssetChunk = async ({\n    fullPath,\n    data,\n    headers\n  }: UploadAsset): Promise<BatchToCommit> => {\n    const initializedBatch = batchIds.find(([batchIdFullPath]) => batchIdFullPath === fullPath);\n\n    assertNonNullish(initializedBatch);\n\n    const [_, initUpload] = initializedBatch;\n    const {batch_id: batchId} = initUpload;\n\n    const {chunkIds} = await uploadChunks({data, uploadFn: upload_proposal_asset_chunk, batchId});\n\n    progress?.onUploadedFileChunks(fullPath);\n\n    return {\n      batchId,\n      headers,\n      chunkIds,\n      data\n    };\n  };\n\n  const batchAndChunkIdsToCommit = await Promise.all(assets.map(uploadAssetChunk));\n\n  await commit_proposal_many_assets_upload(batchAndChunkIdsToCommit.map(mapCommitBatch));\n\n  progress?.onCommittedBatch();\n};\n\nconst mapInitAssetUploadParams = ({\n  filename,\n  collection,\n  token,\n  fullPath,\n  encoding,\n  description\n}: Omit<UploadAsset, 'headers' | 'data'>): InitAssetKey => ({\n  collection,\n  full_path: fullPath,\n  name: filename,\n  token: toNullable<string>(token),\n  encoding_type: toNullable<EncodingType>(encoding),\n  description: toNullable(description)\n});\n\ntype BatchToCommit = {\n  batchId: bigint;\n  chunkIds: UploadChunkResult[];\n} & Pick<UploadAsset, 'headers' | 'data'>;\n\nconst mapCommitBatch = ({batchId, chunkIds, headers, data}: BatchToCommit): CommitBatch => {\n  const contentType: [[string, string]] | undefined =\n    headers.find(([type, _]) => type.toLowerCase() === 'content-type') === undefined &&\n    data.type !== undefined &&\n    data.type !== ''\n      ? [['Content-Type', data.type]]\n      : undefined;\n\n  return {\n    batch_id: batchId,\n    chunk_ids: chunkIds.map(({chunk_id}: UploadChunkResult) => chunk_id),\n    headers: [...headers, ...(contentType ?? [])]\n  };\n};\n\nconst commitAsset = async ({\n  commitFn,\n  ...rest\n}: {\n  commitFn: (commitBatch: CommitBatch) => Promise<void>;\n  batchId: bigint;\n  chunkIds: UploadChunkResult[];\n} & Pick<UploadAsset, 'headers' | 'data'>) => {\n  const commitBatch = mapCommitBatch(rest);\n  await commitFn(commitBatch);\n};\n\nconst uploadChunks = async ({\n  data,\n  uploadFn,\n  batchId\n}: {\n  batchId: bigint;\n} & Pick<UploadAsset, 'data'> &\n  Pick<UploadChunkParams, 'uploadFn'>): Promise<{chunkIds: UploadChunkResult[]}> => {\n  const uploadChunks: UploadChunkParams[] = [];\n\n  // Prevent transforming chunk to arrayBuffer error: The requested file could not be read, typically due to permission problems that have occurred after a reference to a file was acquired.\n  const clone: Blob = isBrowser() ? new Blob([await data.arrayBuffer()]) : data;\n\n  // Split data into chunks\n  let orderId = 0n;\n  for (let start = 0; start < clone.size; start += UPLOAD_CHUNK_SIZE) {\n    const chunk: Blob = clone.slice(start, start + UPLOAD_CHUNK_SIZE);\n\n    uploadChunks.push({\n      batchId,\n      chunk,\n      uploadFn,\n      orderId\n    });\n\n    orderId++;\n  }\n\n  // Upload chunks to the IC in batch - i.e. 12 chunks uploaded at a time.\n  let chunkIds: UploadChunkResult[] = [];\n  for await (const results of batchUploadChunks({uploadChunks})) {\n    chunkIds = [...chunkIds, ...results];\n  }\n\n  return {chunkIds};\n};\n\nasync function* batchUploadChunks({\n  uploadChunks,\n  limit = 12\n}: {\n  uploadChunks: UploadChunkParams[];\n  limit?: number;\n}): AsyncGenerator<UploadChunkResult[], void> {\n  for (let i = 0; i < uploadChunks.length; i = i + limit) {\n    const batch = uploadChunks.slice(i, i + limit);\n    const result = await Promise.all(batch.map((params) => uploadChunk(params)));\n    yield result;\n  }\n}\n\ninterface UploadChunkResult {\n  chunk_id: bigint;\n}\n\ninterface UploadChunkParams {\n  batchId: bigint;\n  chunk: Blob;\n  uploadFn: (uploadChunk: UploadChunk) => Promise<UploadChunkResult>;\n  orderId: bigint;\n}\n\nconst uploadChunk = async ({\n  batchId,\n  chunk,\n  uploadFn,\n  orderId\n}: UploadChunkParams): Promise<UploadChunkResult> =>\n  uploadFn({\n    batch_id: batchId,\n    content: new Uint8Array(await chunk.arrayBuffer()),\n    order_id: toNullable(orderId)\n  });\n"],
+  "mappings": "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",
+  "names": ["assertNonNullish", "toNullable", "isBrowser", "uploadAsset", "data", "headers", "restAsset", "actor", "progress", "init_asset_upload", "upload_asset_chunk", "commit_asset_upload", "batchId", "mapInitAssetUploadParams", "chunkIds", "uploadChunks", "commitAsset", "uploadAssetWithProposal", "proposalId", "init_proposal_asset_upload", "upload_proposal_asset_chunk", "commit_proposal_asset_upload", "uploadAssetsWithProposal", "assets", "init_proposal_many_assets_upload", "commit_proposal_many_assets_upload", "batchIds", "uploadAssetChunk", "fullPath", "initializedBatch", "batchIdFullPath", "assertNonNullish", "_", "initUpload", "batchAndChunkIdsToCommit", "mapCommitBatch", "filename", "collection", "token", "encoding", "description", "toNullable", "contentType", "type", "chunk_id", "commitFn", "rest", "commitBatch", "uploadFn", "clone", "isBrowser", "orderId", "start", "chunk", "results", "batchUploadChunks", "limit", "i", "batch", "params", "uploadChunk"]
 }

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
 export * from './services/upload.services';
+export type * from './types/progress';
 export type * from './types/storage';
 export type * from './types/upload';

package/dist/types/services/upload.services.d.ts

@@ -1,10 +1,10 @@
-import type { UploadAsset, UploadAssetActor, UploadAssetWithProposalActor } from '../types/upload';
-export declare const uploadAsset: ({ asset: { data, headers, ...restAsset }, actor }: {
+import type { UploadAsset, UploadParams, UploadWithProposalParams } from '../types/upload';
+export declare const uploadAsset: ({ asset: { data, headers, ...restAsset }, actor, progress }: {
     asset: UploadAsset;
-    actor: UploadAssetActor;
-}) => Promise<void>;
-export declare const uploadAssetWithProposal: ({ asset: { data, headers, ...restAsset }, proposalId, actor }: {
+} & UploadParams) => Promise<void>;
+export declare const uploadAssetWithProposal: ({ asset: { data, headers, ...restAsset }, proposalId, actor, progress }: {
     asset: UploadAsset;
-    proposalId: bigint;
-    actor: UploadAssetWithProposalActor;
-}) => Promise<void>;
+} & UploadWithProposalParams) => Promise<void>;
+export declare const uploadAssetsWithProposal: ({ assets, proposalId, actor, progress }: {
+    assets: UploadAsset[];
+} & UploadWithProposalParams) => Promise<void>;

package/dist/types/types/progress.d.ts

@@ -0,0 +1,8 @@
+export interface OnUploadProgressCallbacks {
+    onUploadedFileChunks: (fullPath: string) => void;
+    onInitiatedBatch: () => void;
+    onCommittedBatch: () => void;
+}
+export interface OnUploadProgress {
+    progress?: OnUploadProgressCallbacks;
+}

package/dist/types/types/upload.d.ts

@@ -1,5 +1,13 @@
 import type { ConsoleActor, SatelliteActor } from '@junobuild/ic-client';
+import type { OnUploadProgress } from './progress';
 import type { Storage } from './storage';
 export type UploadAsset = Required<Omit<Storage, 'token' | 'encoding' | 'description'>> & Pick<Storage, 'token' | 'encoding' | 'description'>;
 export type UploadAssetActor = SatelliteActor;
 export type UploadAssetWithProposalActor = ConsoleActor | SatelliteActor;
+export type UploadParams = {
+    actor: UploadAssetActor;
+} & OnUploadProgress;
+export type UploadWithProposalParams = {
+    proposalId: bigint;
+    actor: UploadAssetWithProposalActor;
+} & OnUploadProgress;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@junobuild/storage",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "A library for interfacing with Juno's Storage features.",
   "author": "David Dal Busco (https://daviddalbusco.com)",
   "license": "MIT",