Changing fetch package for better web support

.npmignore

@@ -1,3 +1,3 @@
 tsconfig.json
-src/
 node_modules/
+.vscode/

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-   "cSpell.enabled": false
-}

package-lock.json

@@ -1,6 +1,6 @@
 {
-   "name": "secure-file-wrapper",
-   "version": "1.1.0",
+   "name": "@hibas123/secure-file-wrapper",
+   "version": "2.3.0",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
@@ -10,12 +10,6 @@
          "integrity": "sha512-2Y8uPt0/jwjhQ6EiluT0XCri1Dbplr0ZxfFXUz+ye13gaqE8u5gL5ppao1JrUYr9cIip5S6MvQzBS7Kke7U9VA==",
          "dev": true
       },
-      "@types/isomorphic-fetch": {
-         "version": "0.0.34",
-         "resolved": "https://registry.npmjs.org/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.34.tgz",
-         "integrity": "sha1-PDSD5gbAQTeEOOlRRk8A5OYHBtY=",
-         "dev": true
-      },
       "@types/mocha": {
          "version": "5.2.5",
          "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.5.tgz",
@@ -37,6 +31,15 @@
             "@types/node": "*"
          }
       },
+      "@types/uuid": {
+         "version": "3.4.4",
+         "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
+         "integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==",
+         "dev": true,
+         "requires": {
+            "@types/node": "*"
+         }
+      },
       "assertion-error": {
          "version": "1.1.0",
          "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
@@ -97,6 +100,22 @@
          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
          "dev": true
       },
+      "cross-fetch": {
+         "version": "3.0.0",
+         "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.0.tgz",
+         "integrity": "sha512-P8HyKlMwT1ed9LqEWlJu+zfcxfn0KI4Nl4nxyvu1a8sg4vgtHdwhElZOgSNzoar44zQMdliZcve4QG/04AUi9Q==",
+         "requires": {
+            "node-fetch": "2.3.0",
+            "whatwg-fetch": "3.0.0"
+         },
+         "dependencies": {
+            "whatwg-fetch": {
+               "version": "3.0.0",
+               "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
+               "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
+            }
+         }
+      },
       "debug": {
          "version": "3.1.0",
          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@@ -121,14 +140,6 @@
          "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
          "dev": true
       },
-      "encoding": {
-         "version": "0.1.12",
-         "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-         "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-         "requires": {
-            "iconv-lite": "~0.4.13"
-         }
-      },
       "escape-string-regexp": {
          "version": "1.0.5",
          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -179,11 +190,6 @@
          "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
          "dev": true
       },
-      "iconv-lite": {
-         "version": "0.4.19",
-         "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-         "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
-      },
       "inflight": {
          "version": "1.0.6",
          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -200,31 +206,6 @@
          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
          "dev": true
       },
-      "is-stream": {
-         "version": "1.1.0",
-         "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-         "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-      },
-      "isomorphic-fetch": {
-         "version": "2.2.1",
-         "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
-         "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
-         "requires": {
-            "node-fetch": "^1.0.1",
-            "whatwg-fetch": ">=0.10.0"
-         },
-         "dependencies": {
-            "node-fetch": {
-               "version": "1.7.3",
-               "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
-               "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
-               "requires": {
-                  "encoding": "^0.1.11",
-                  "is-stream": "^1.0.1"
-               }
-            }
-         }
-      },
       "minimatch": {
          "version": "3.0.4",
          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -274,6 +255,11 @@
          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
          "dev": true
       },
+      "node-fetch": {
+         "version": "2.3.0",
+         "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz",
+         "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA=="
+      },
       "once": {
          "version": "1.4.0",
          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -316,10 +302,10 @@
          "integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
          "dev": true
       },
-      "whatwg-fetch": {
-         "version": "2.0.3",
-         "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
-         "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ="
+      "uuid": {
+         "version": "3.3.2",
+         "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+         "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
       },
       "wrappy": {
          "version": "1.0.2",

package.json

@@ -1,6 +1,6 @@
 {
-   "name": "secure-file-wrapper",
-   "version": "2.0.0",
+   "name": "@hibas123/secure-file-wrapper",
+   "version": "2.3.1",
    "main": "lib/index.js",
    "author": "Fabian Stamm <dev@fabianstamm.de>",
    "license": "MIT",
@@ -8,18 +8,19 @@
    "scripts": {
       "build": "tsc",
       "watch": "tsc --watch",
-      "prepublish": "tsc",
+      "prepublishOnly": "tsc",
       "test": "mocha lib/test.js"
    },
    "dependencies": {
-      "isomorphic-fetch": "^2.2.1"
+      "cross-fetch": "^3.0.0",
+      "uuid": "^3.3.2"
    },
    "devDependencies": {
       "@types/chai": "^4.1.4",
-      "@types/isomorphic-fetch": "^0.0.34",
       "@types/mocha": "^5.2.2",
       "@types/node": "^10.12.18",
       "@types/node-fetch": "^2.1.4",
+      "@types/uuid": "^3.4.4",
       "chai": "^4.1.2",
       "mocha": "^5.2.0",
       "typescript": "^3.2.2"

src/index.ts

@@ -1,5 +1,6 @@
 import Observable from "./observable";
 import Lock from "./lock";
+import fetch from "cross-fetch"
 
 export interface IFileVersion {
    version: string;
@@ -66,8 +67,6 @@ export class BadRequest extends Error {
    }
 }
 
-import * as fetch from "isomorphic-fetch";
-
 function statusParser(res: Response) {
    if (res.status !== 200) {
       switch (res.status) {
@@ -86,12 +85,12 @@ function statusParser(res: Response) {
 }
 
 export default class SecureFileWrapper {
-   private _jwtObservableServer: Observable<(jwt: string) => void> = new Observable();
+   private _jwtObservableServer: Observable<(jwt: string) => void> = new Observable(false);
    jwtObservable = this._jwtObservableServer.getPublicApi();
 
-   jwt: string;
+   private jwt: string;
 
-   auth_lock = new Lock();
+   private auth_lock = new Lock();
 
    constructor(private server: string) {
       if (this.server.endsWith("/")) {
@@ -131,13 +130,11 @@ export default class SecureFileWrapper {
          "cache-control": "no-cache"
       };
 
-      let body_n;
       if (body) {
          headers["Content-Type"] = "application/octet-stream"
-         body_n = Buffer ? Buffer.from(body instanceof ArrayBuffer ? body : body.buffer) : body;
       }
       try {
-         let res = await fetch(this.server + endpoint + query_str, { method, body: body_n, headers });
+         let res = await fetch(this.server + endpoint + query_str, { method, body, headers });
          if (res.status === 401 && !second) {
             await this.getJWT();
             return this.makeRequest(endpoint, method, query, body, true);
@@ -152,6 +149,19 @@ export default class SecureFileWrapper {
       }
    }
 
+   private fixIFileVersion(version: IFileVersion): IFileVersion {
+      version.time = new Date(version.time)
+      return version;
+   }
+
+   private fixIFile(file: IFile): IFile {
+      file.active.time = new Date(file.active.time)
+      if (file.versions) {
+         file.versions = file.versions.map(e => this.fixIFileVersion(e))
+      }
+      return file;
+   }
+
    // async test(jwt): Promise<{ user: string, test: true }> {
    //    let res = await this.makeRequest("/test", "GET", {}, undefined, this.jwt_enabled);
    //    statusParser(res);
@@ -162,21 +172,27 @@ export default class SecureFileWrapper {
       let query: any = {}
       if (folder) query.folder = folder;
       let res = await this.makeRequest("/files", "GET", query);
-      let d = await res.json();
-      return d.files;
+      let d: { files: IFile[] } = await res.json();
+      return d.files.map(e => this.fixIFile(e));
    }
 
-   async create(name: string, data: ArrayBuffer | ArrayBufferView, type: "text" | "binary", folder?: string, preview?: string): Promise<IFile> {
+   async create(name: string, data: ArrayBuffer | ArrayBufferView, type: "text" | "binary", folder?: string, preview?: string, id?: string, date?: Date): Promise<IFile> {
       let params: any = { type: type, name: name };
-      if (preview) {
+      if (preview)
          params.preview = preview;
-      }
-      if (folder) {
+
+      if (folder)
          params.folder = folder;
-      }
+
+      if (id)
+         params.id = id
+
+      if (date)
+         params.date = date.toJSON()
+
 
       let res = await this.makeRequest("/files", "POST", params, data);
-      return (await res.json()).file;
+      return this.fixIFile((await res.json()).file);
    }
 
    async get(id: string, version?: string): Promise<ArrayBuffer> {
@@ -187,34 +203,30 @@ export default class SecureFileWrapper {
          res = await this.makeRequest("/files/" + id, "GET", {});
       }
 
-      if (res.arrayBuffer) {
-         return res.arrayBuffer()
-      } else {
-         let blob: Buffer = await (<any>res).buffer()
-         // console.log(blob.length);
-         return Uint8Array.from(blob).buffer;
-      }
+      return res.arrayBuffer()
    }
 
-   async update(id: string, data: ArrayBuffer | ArrayBufferView, preview?: string): Promise<IFile> {
-      let put: any = {};
-      if (preview) put.preview = preview;
-      let res = await this.makeRequest("/files/" + id, "PUT", put, data);
+   async update(id: string, data: ArrayBuffer | ArrayBufferView, preview?: string, date?: Date, old = false): Promise<IFile> {
+      let params: any = { old };
+      if (preview) params.preview = preview;
+      if (date)
+         params.date = date.toJSON()
+      let res = await this.makeRequest("/files/" + id, "PUT", params, data);
 
       let json = await res.json()
-      return json.file;
+      return this.fixIFile(json.file);
    }
 
-   async delete(id: string): Promise<boolean> {
+   async delete(id: string): Promise<void> {
       let res = await this.makeRequest("/files/" + id, "DELETE", {});
-
-      return res.json();
    }
 
    async history(id: string): Promise<IHistory> {
       let res = await this.makeRequest(`/files/${id}/history`, "GET", {});
-      statusParser(res);
-      return res.json();
+      let data: IHistory = await res.json();
+      data.file = this.fixIFile(data.file)
+      data.history = data.history.map(v => this.fixIFileVersion(v));
+      return data;
    }
 
    async restore(id: string, version: string) {

src/test.ts

@@ -1,5 +1,5 @@
 import SecureFile, { NotFound } from "./index";
-
+import * as v4 from "uuid/v4"
 import { TextEncoder, TextDecoder } from "util";
 
 const testname = "ouiavgbsop687463743"
@@ -7,6 +7,7 @@ const encoder = new TextEncoder();
 const decoder = new TextDecoder();
 const testdata = encoder.encode("Ich bin ein Test");
 const newTestData = encoder.encode("neue test daten");
+const newTestDataOld = encoder.encode("neue test daten asd");
 const testprev = "Ich bin...";
 
 const testfolder = "iabos";
@@ -53,6 +54,15 @@ function test(sf: SecureFile) {
       expect(found, "Element not in List").to.be.true;
    })
 
+   it("update to history", async () => {
+      let res = await sf.update(testid, newTestDataOld, undefined, undefined, true);
+      expect(res, "No data returned").to.exist;
+      expect(res._id, "_id missing").to.exist;
+      expect(res.active.version, "New version was created").to.equal(testver);
+      let res2 = await sf.get(testid);
+      expect(decoder.decode(res2), "Fetched data not updated").to.be.equal(decoder.decode(testdata));
+   })
+
    it("update", async () => {
       let res = await sf.update(testid, newTestData, undefined);
       expect(res, "No data returned").to.exist;
@@ -68,9 +78,9 @@ function test(sf: SecureFile) {
       expect(his, "no data returned").to.exist;
       expect(his.file, "file not set").to.exist;
       expect(his.history, "history not set").to.exist;
-      expect(his.history.length, `Not expected history length. Expected 1 got ${his.history.length}`).to.be.equal(1);
+      expect(his.history.length, `Not expected history length. Expected 1 got ${his.history.length}`).to.be.equal(2);
 
-      expect(his.history[0].version, "Wrong version on history").to.be.equal(testver);
+      expect(his.history[1].version, "Wrong version on history").to.be.equal(testver);
       expect(his.file.active.version, "Wrong version on file").to.be.equal(testver2);
    });
 
@@ -88,8 +98,42 @@ function test(sf: SecureFile) {
    })
 
    it("delete", async () => {
-      let res = await sf.delete(testid);
-      expect(res, "Res not set").to.exist;
+      await sf.delete(testid);
+   })
+
+
+   describe("fixed id", () => {
+      let id = v4();
+      it("create", async () => {
+         let res = await sf.create(testname, testdata, "text", undefined, testprev, id)
+         expect(res, "Res isnnot set").to.exist;
+         expect(res._id, "Res has no _id").to.exist;
+         expect(res._id, "Res has invalid _id").to.be.equal(id)
+      })
+
+      it("get", async () => {
+         let res = await sf.get(id);
+         expect(res, "No data returned").to.exist;
+         expect(decoder.decode(res), "Returned data not equal to stored").to.be.equal(decoder.decode(testdata));
+      })
+   })
+
+   describe("predefined date", () => {
+      let id = v4();
+      it("create", async () => {
+         const date = new Date("2017-01-01T00:00:00.000Z")
+         let res = await sf.create(testname, testdata, "text", undefined, testprev, id, date)
+         expect(res, "Res isnnot set").to.exist;
+         expect(res._id, "Res has no _id").to.exist;
+         expect(res._id, "Res has invalid _id").to.be.equal(id)
+         expect(res.active.time.toJSON()).to.be.equal(date.toJSON())
+      })
+
+      it("list", async () => {
+         let res = await sf.get(id);
+         expect(res, "No data returned").to.exist;
+         expect(decoder.decode(res), "Returned data not equal to stored").to.be.equal(decoder.decode(testdata));
+      })
    })
 
    describe("folder", () => {
@@ -115,8 +159,7 @@ function test(sf: SecureFile) {
       })
 
       it("delete", async () => {
-         let res = await sf.delete(ftestid);
-         expect(res, "Res not set").to.exist;
+         await sf.delete(ftestid);
       });
    })
 }