Merge pull request #600 from appwrite/fix-36-node-input-file

Author: lohanidamodar

templates/node/base/requests/file.twig

@@ -82,7 +82,7 @@
                     const chunks = [];
 
                     for(let i = 0; i < chunksCount; i++) {
-                        const chunk = mainChunk.slice(i * client.CHUNK_SIZE, client.CHUNK_SIZE);
+                        const chunk = mainChunk.slice(i * client.CHUNK_SIZE, (i + 1) * client.CHUNK_SIZE);
                         chunks.push(chunk);
                     }
 

templates/node/index.d.ts.twig

@@ -131,11 +131,13 @@ declare module "{{ language.params.npmPackage|caseDash }}" {
 
     static fromBuffer(buffer: Buffer, filename: string): InputFile;
 
-    static fromBlob(blob: Blob, filename: string): InputFile;
+    static fromBlob(blob: buffer.Blob, filename: string): Promise<InputFile>;
 
-    static fromStream(stream: any, filename: string, size: number): InputFile;
+    static fromStream(stream: NodeJS.ReadableStream, filename: string, size: number): InputFile;
 
     static fromPlainText(content: string, filename: string): InputFile;
+
+    constructor(stream: NodeJS.ReadableStream, filename: string, size: number);
   }
 
   type QueryTypesSingle = string | number | boolean;
@@ -235,7 +237,7 @@ declare module "{{ language.params.npmPackage|caseDash }}" {
      * @throws {{ '{' }}{{ spec.title | caseUcfirst}}Exception}
      * @returns {Promise}
      */
-    {{ method.name | caseCamel }}{% if generics %}<{{generics}}>{% endif %}({% for parameter in method.parameters.all %}{{ parameter.name | caseCamel | escapeKeyword }}{% if not parameter.required %}?{% endif %}: {{ parameter | typeName }}{% if not loop.last %}, {% endif %}{% endfor %}): Promise<{% if method.type == 'location' %}Buffer{% else %}{% if method.responseModel and method.responseModel != 'any' %}{% if not spec.definitions[method.responseModel].additionalProperties %}Models.{% endif %}{{method.responseModel | caseUcfirst}}{% if generics_return %}<{{generics_return}}>{% endif %}{% else %}Response{% endif %}{% endif %}>;
+    {{ method.name | caseCamel }}{% if generics %}<{{generics}}>{% endif %}({% for parameter in method.parameters.all %}{{ parameter.name | caseCamel | escapeKeyword }}{% if not parameter.required %}?{% endif %}: {{ parameter | typeName }}{% if not loop.last %}, {% endif %}{% endfor %}): Promise<{% if method.type == 'location' %}Buffer{% else %}{% if method.responseModel and method.responseModel != 'any' %}{% if not spec.definitions[method.responseModel].additionalProperties %}Models.{% endif %}{{method.responseModel | caseUcfirst}}{% if generics_return %}<{{generics_return}}>{% endif %}{% else %}string{% endif %}{% endif %}>;
 {% endfor %}
   }
 {% endfor %}

templates/node/lib/inputFile.js.twig

@@ -1,6 +1,5 @@
 const { Readable } = require('stream');
 const fs = require('fs');
-const { promisify } = require('util');
 
 class InputFile {
   stream; // Content of file, readable stream
@@ -14,16 +13,15 @@ class InputFile {
   };
 
   static fromBuffer = (buffer, filename) => {
-    const stream = Readable.from(buffer.toString());
+    const stream = Readable.from(buffer);
     const size = Buffer.byteLength(buffer);
     return new InputFile(stream, filename, size);
   };
 
-  static fromBlob = (blob, filename) => {
-    const buffer = blob.arrayBuffer();
-    const stream = Readable.from(buffer.toString());
-    const size = Buffer.byteLength(buffer);
-    return new InputFile(stream, filename);
+  static fromBlob = async (blob, filename) => {
+    const arrayBuffer = await blob.arrayBuffer();
+    const buffer = Buffer.from(arrayBuffer);
+    return InputFile.fromBuffer(buffer, filename);
   };
 
   static fromStream = (stream, filename, size) => {
@@ -32,7 +30,7 @@ class InputFile {
 
   static fromPlainText = (content, filename) => {
     const buffer = Buffer.from(content, "utf-8");
-    const stream = Readable.from(buffer.toString());
+    const stream = Readable.from(buffer);
     const size = Buffer.byteLength(buffer);
     return new InputFile(stream, filename, size);
   };