Merge pull request #390 from appwrite/fix-chunk-upload

Fix: chunk upload

Author: TorstenDittmann

composer.lock

@@ -12,6 +12,27 @@ public function getName()
         return 'NodeJS';
     }
 
+    /**
+     * @param $type
+     * @return string
+     */
+    public function getTypeName($type)
+    {
+        switch ($type) {
+            case self::TYPE_INTEGER:
+            case self::TYPE_NUMBER:
+                return 'number';
+            break;
+            case self::TYPE_ARRAY:
+                return 'string[]';
+            case self::TYPE_FILE:
+                return 'string';
+            break;
+        }
+
+        return $type;
+    }
+
     /**
      * @return array
      */

src/SDK/Language/Node.php

@@ -101,7 +101,7 @@ class Client {
       process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = 0;
     }
 
-    headers = Object.assign(this.headers, headers);
+    headers = Object.assign({}, this.headers, headers);
 
     let contentType = headers["content-type"].toLowerCase();
 

templates/cli/lib/client.js.twig

@@ -66,7 +66,7 @@ export class Client {
     }
 
     async call(method: string, path: string = '', headers: Payload = {}, params: Payload = {}) {
-        headers = { ...this.headers, ...headers };
+        headers = Object.assign({}, this.headers, headers);
 
         let body;
         const url = new URL(this.endpoint + path);

templates/deno/src/client.ts.twig

@@ -70,13 +70,13 @@ export class {{ service.name | caseUcfirst }} extends Service {
 
 {% for parameter in method.parameters.query %}
         if (typeof {{ parameter.name | caseCamel | escapeKeyword }} !== 'undefined') {
-            payload['{{ parameter.name }}'] = {{ parameter.name | caseCamel | escapeKeyword }};
+            payload['{{ parameter.name }}'] = {{ parameter.name | caseCamel | escapeKeyword }}{% if method.consumes[0] == "multipart/form-data" and ( parameter.type != "string" and parameter.type != "array" ) %}.toString(){% endif %};
         }
 
 {% endfor %}
 {% for parameter in method.parameters.body %}
         if (typeof {{ parameter.name | caseCamel | escapeKeyword }} !== 'undefined') {
-            payload['{{ parameter.name }}'] = {{ parameter.name | caseCamel | escapeKeyword }};
+            payload['{{ parameter.name }}'] = {{ parameter.name | caseCamel | escapeKeyword }}{% if method.consumes[0] == "multipart/form-data" and ( parameter.type != "string" and parameter.type != "array" ) %}.toString(){% endif %};
         }
 {% endfor %}
 {% if 'multipart/form-data' in method.consumes %}

templates/deno/src/services/service.ts.twig

@@ -79,7 +79,8 @@ class Client {
             process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = 0;
         }
 
-        headers = Object.assign(this.headers, headers);
+
+        headers = Object.assign({}, this.headers, headers);
 
         let contentType = headers['content-type'].toLowerCase();
 

templates/node/lib/client.js.twig

@@ -34,13 +34,13 @@ class {{ service.name | caseUcfirst }} extends Service {
 {% for parameter in method.parameters.query %}
 
         if (typeof {{ parameter.name | caseCamel | escapeKeyword }} !== 'undefined') {
-            payload['{{ parameter.name }}'] = {{ parameter.name | caseCamel | escapeKeyword }};
+            payload['{{ parameter.name }}'] = {{ parameter.name | caseCamel | escapeKeyword }}{% if method.consumes[0] == "multipart/form-data" and ( parameter.type != "string" and parameter.type != "array" ) %}.toString(){% endif %};
         }
 {% endfor %}
 {% for parameter in method.parameters.body %}
 
         if (typeof {{ parameter.name | caseCamel | escapeKeyword }} !== 'undefined') {
-            payload['{{ parameter.name }}'] = {{ parameter.name | caseCamel | escapeKeyword}};
+            payload['{{ parameter.name }}'] = {{ parameter.name | caseCamel | escapeKeyword}}{% if method.consumes[0] == "multipart/form-data" and ( parameter.type != "string" and parameter.type != "array" ) %}.toString(){% endif %};
         }
 {% endfor %}
 

templates/node/lib/services/service.js.twig

@@ -89,9 +89,10 @@ class {{ service.name | caseUcfirst }} extends Service
                     $id = $response['$id'];
                 }
                 if($onProgress !== null) {
+                    $end = min(((($counter * Client::CHUNK_SIZE) + Client::CHUNK_SIZE) - 1), $size);
                     $onProgress([
                         '$id' => $response['$id'],
-                        'progress' => min(($counter+1) * Client.CHUNK_SIZE, $size) / $size * 100,
+                        'progress' => min(($counter+1) * Client::CHUNK_SIZE, $size) / $size * 100,
                         'sizeUploaded' => $end + 1,
                         'chunksTotal' => $response['chunksTotal'],
                         'chunksUploaded' => $response['chunksUploaded']

templates/php/src/Services/Service.php.twig

@@ -49,6 +49,7 @@ class Client:
         data = {}
         json = {}
         files = {}
+        stringify = False
 
         headers = {**self._global_headers, **headers}
 
@@ -62,7 +63,7 @@ class Client:
 
         if headers['content-type'].startswith('multipart/form-data'):
             del headers['content-type']
-            
+            stringify = True
             for key in data.copy():
                 if isinstance(data[key], InputFile):
                     files[key] = (data[key].name, data[key].file)
@@ -72,7 +73,7 @@ class Client:
             response = requests.request(  # call method dynamically https://stackoverflow.com/a/4246075/2299554
                 method=method,
                 url=self._endpoint + path,
-                params=self.flatten(params),
+                params=self.flatten(params, stringify=stringify),
                 data=self.flatten(data),
                 json=json,
                 files=files,
@@ -152,7 +153,7 @@ class Client:
 
         return result
 
-    def flatten(self, data, prefix=''):
+    def flatten(self, data, prefix='', stringify=False):
         output = {}
         i = 0
 
@@ -163,9 +164,12 @@ class Client:
             i += 1
 
             if isinstance(value, list) or isinstance(value, dict):
-                output = {**output, **self.flatten(value, finalKey)}
+                output = {**output, **self.flatten(value, finalKey, stringify)}
             else:
-                output[finalKey] = value
+                if stringify:
+                    output[finalKey] = str(value)
+                else:
+                    output[finalKey] = value
 
         return output
 

templates/python/package/client.py.twig

@@ -352,10 +352,10 @@ class {{ spec.title | caseUcfirst }} {
 
     private async call(method: string, url: URL, headers: Headers = {}, params: Payload = {}): Promise<any> {
         method = method.toUpperCase();
-        headers = {
-            ...headers,
-            ...this.headers
-        }
+
+
+        headers = Object.assign({}, this.headers, headers);
+        
         let options: RequestInit = {
             method,
             headers,