chore: fix cli failure

Author: christyjacob4

templates/cli/lib/commands/command.js.twig

@@ -136,10 +136,6 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
 
     } else {
         const streamFilePath = payload['{{ parameter.name }}'];
-        let id = undefined;
-
-        let counter = 0;
-        const totalCounters = Math.ceil(size / libClient.CHUNK_SIZE);
 
         const apiHeaders = {
 {% for parameter in method.parameters.header %}
@@ -150,49 +146,44 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
 {% endfor %}
         };
 
+        let offset = 0;
 {% for parameter in method.parameters.all %}
 {% if parameter.isUploadID %}
         if({{ parameter.name | caseCamel | escapeKeyword }} != 'unique()') {
             try {
                 response = await client.call('get', apiPath + '/' + {{ parameter.name }}, apiHeaders);
-                counter = response.chunksUploaded;
+                offset = response.chunksUploaded * libClient.CHUNK_SIZE;
             } catch(e) {
             }
         }
 {% endif %}
 {% endfor %}
 
-        for (counter; counter < totalCounters; counter++) {
-            const start = (counter * libClient.CHUNK_SIZE);
-            const end = Math.min((((counter * libClient.CHUNK_SIZE) + libClient.CHUNK_SIZE) - 1), size - 1);
-
-            apiHeaders['content-range'] = 'bytes ' + start + '-' + end + '/' + size;
+        while (offset < size) {
+            let end = Math.min(offset + libClient.CHUNK_SIZE - 1, size - 1);
 
-            if (id) {
-                apiHeaders['x-appwrite-id'] = id;
+            apiHeaders['content-range'] = 'bytes ' + offset + '-' + end + '/' + size;
+            if (response && response.$id) {
+                apiHeaders['x-{{spec.title | caseLower }}-id'] = response.$id;
             }
 
             const stream = fs.createReadStream(streamFilePath, {
-                start,
+                start: offset,
                 end
             });
             payload['{{ parameter.name }}'] = stream;
-
             response = await client.call('{{ method.method | caseLower }}', apiPath, apiHeaders, payload{% if method.type == 'location' %}, 'arraybuffer'{% endif %});
 
-            if (!id) {
-                id = response['$id'];
-            }
-
-            if (onProgress !== null) {
+            if (onProgress) {
                 onProgress({
-                    $id: response['$id'],
-                    progress: Math.min((counter+1) * libClient.CHUNK_SIZE, size) / size * 100,
-                    sizeUploaded: end+1,
-                    chunksTotal: response['chunksTotal'],
-                    chunksUploaded: response['chunksUploaded']
+                    $id: response.$id,
+                    progress: ( offset / size ) * 100,
+                    sizeUploaded: offset,
+                    chunksTotal: response.chunksTotal,
+                    chunksUploaded: response.chunksUploaded
                 });
             }
+            offset += libClient.CHUNK_SIZE;
         }
     }
 {% endif %}

templates/web/src/services/template.ts.twig

@@ -120,25 +120,25 @@ export class {{ service.name | caseUcfirst }} extends Service {
         while (offset < size) {
             let end = Math.min(offset + Service.CHUNK_SIZE - 1, size - 1);
 
-            const chunk = {{ parameter.name | caseCamel | escapeKeyword }}.slice(offset, end + 1);
-            payload['{{ parameter.name }}'] = new File([chunk], {{ parameter.name | caseCamel | escapeKeyword }}.name);
             apiHeaders['content-range'] = 'bytes ' + offset + '-' + end + '/' + size;
-            response = await this.client.call('{{ method.method | caseLower }}', uri, apiHeaders, payload);
-
-            offset += Service.CHUNK_SIZE;
-            if (offset < size) {
+            if (response && response.$id) {
                 apiHeaders['x-{{spec.title | caseLower }}-id'] = response.$id;
             }
 
+            const chunk = {{ parameter.name | caseCamel | escapeKeyword }}.slice(offset, end + 1);
+            payload['{{ parameter.name }}'] = new File([chunk], {{ parameter.name | caseCamel | escapeKeyword }}.name);
+            response = await this.client.call('{{ method.method | caseLower }}', uri, apiHeaders, payload);
+
             if (onProgress) {
                 onProgress({
                     $id: response.$id,
-                    progress: Math.min(offset, size) / size * 100,
-                    sizeUploaded: Math.min(offset, size),
+                    progress: (offset / size) * 100,
+                    sizeUploaded: offset,
                     chunksTotal: response.chunksTotal,
                     chunksUploaded: response.chunksUploaded
                 });
             }
+            offset += Service.CHUNK_SIZE;
         }
         return response;
 {% endif %}