Merge branch 'master' into preferred-portal-refresh

.eslintrc.json

@@ -13,6 +13,7 @@
   "extends": ["eslint:recommended", "plugin:jsdoc/recommended", "plugin:@typescript-eslint/recommended"],
   "rules": {
     "@typescript-eslint/no-floating-promises": 1,
+    "@typescript-eslint/no-unused-vars": ["warn", { "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }],
 
     "jsdoc/require-description": 1,
     "jsdoc/require-throws": 1,

integration/registry.test.ts

@@ -65,4 +65,20 @@ describe(`Registry end to end integration tests for portal '${portal}'`, () => {
 
     expect(returnedEntry).toEqual(entry);
   });
+
+  it("Should fail to set an entry with a revision number that's too low", async () => {
+    const { privateKey } = genKeyPairAndSeed();
+
+    const entry = {
+      dataKey,
+      data: new Uint8Array(),
+      revision: BigInt(1),
+    };
+
+    await client.registry.setEntry(privateKey, entry);
+    entry.revision--;
+    await expect(client.registry.setEntry(privateKey, entry)).rejects.toThrowError(
+      "Unable to update the registry: provided revision number is invalid"
+    );
+  });
 });

integration/skydb.test.ts

@@ -1,10 +1,23 @@
 import { client, dataKey, portal } from ".";
-import { ExecuteRequestError, genKeyPairAndSeed, getEntryLink, URI_SKYNET_PREFIX } from "../src";
+import {
+  ExecuteRequestError,
+  genKeyPairAndSeed,
+  getEntryLink,
+  JsonData,
+  JSONResponse,
+  SkynetClient,
+  URI_SKYNET_PREFIX,
+} from "../src";
 import { hashDataKey } from "../src/crypto";
 import { decodeSkylinkBase64 } from "../src/utils/encoding";
 import { toHexString } from "../src/utils/string";
 
 describe(`SkyDB end to end integration tests for portal '${portal}'`, () => {
+  // Sleep for a second before each test to try to avoid rate limiter.
+  beforeEach(async () => {
+    await new Promise((r) => setTimeout(r, 1000));
+  });
+
   it("Should get existing SkyDB data", async () => {
     const publicKey = "89e5147864297b80f5ddf29711ba8c093e724213b0dcbefbc3860cc6d598cc35";
     const dataKey = "dataKey1";
@@ -241,4 +254,260 @@ describe(`SkyDB end to end integration tests for portal '${portal}'`, () => {
 
     expect(data).toEqual(json);
   });
+
+  it("Should update the revision number cache", async () => {
+    const { publicKey, privateKey } = genKeyPairAndSeed();
+    const json = { message: 1 };
+
+    await client.db.setJSON(privateKey, dataKey, json);
+
+    const cachedRevisionEntry = await client.db.revisionNumberCache.getRevisionAndMutexForEntry(publicKey, dataKey);
+    expect(cachedRevisionEntry.revision.toString()).toEqual("0");
+
+    await client.db.setJSON(privateKey, dataKey, json);
+
+    expect(cachedRevisionEntry.revision.toString()).toEqual("1");
+
+    await client.db.getJSON(publicKey, dataKey);
+
+    expect(cachedRevisionEntry.revision.toString()).toEqual("1");
+  });
+
+  // REGRESSION TESTS: By creating a gap between setJSON and getJSON, a user
+  // could call getJSON, get outdated data, then call setJSON, and overwrite
+  // more up to date data with outdated data, but still use a high enough
+  // revision number.
+  //
+  // The fix is that you cannot retrieve the revision number while calling
+  // setJSON. You have to use the same revision number that you had when you
+  // called getJSON.
+  describe("getJSON/setJSON data race regression integration tests", () => {
+    const jsonOld = { message: 1 };
+    const jsonNew = { message: 2 };
+
+    const delays = [0, 10, 100, 500];
+
+    const concurrentAccessError = "Concurrent access prevented in SkyDB";
+    const registryUpdateError = "Unable to update the registry";
+
+    const getJSONWithDelay = async function (
+      client: SkynetClient,
+      delay: number,
+      publicKey: string,
+      dataKey: string
+    ): Promise<JSONResponse> {
+      await new Promise((r) => setTimeout(r, delay));
+      return await client.db.getJSON(publicKey, dataKey);
+    };
+    const setJSONWithDelay = async function (
+      client: SkynetClient,
+      delay: number,
+      privateKey: string,
+      dataKey: string,
+      data: JsonData
+    ) {
+      await new Promise((r) => setTimeout(r, delay));
+      return await client.db.setJSON(privateKey, dataKey, data);
+    };
+
+    it.each(delays)(
+      "should not get old data when getJSON is called after setJSON on a single client with a '%s' ms delay and getJSON doesn't fail",
+      async (delay) => {
+        const { publicKey, privateKey } = genKeyPairAndSeed();
+
+        // Set the data.
+        await client.db.setJSON(privateKey, dataKey, jsonOld);
+
+        // Try to invoke the data race.
+        let receivedJson;
+        try {
+          // Get the data while also calling setJSON.
+          [{ data: receivedJson }] = await Promise.all([
+            getJSONWithDelay(client, delay, publicKey, dataKey),
+            setJSONWithDelay(client, 0, privateKey, dataKey, jsonNew),
+          ]);
+        } catch (e) {
+          if ((e as Error).message.includes(concurrentAccessError)) {
+            // The data race condition has been prevented and we received the
+            // expected error. Return from test early.
+            //
+            // NOTE: I've manually confirmed that both code paths (no error, and
+            // return on expected error) are hit.
+            return;
+          }
+
+          // Unexpected error, throw.
+          throw e;
+        }
+
+        // Data race did not occur, getJSON should have latest JSON.
+        expect(receivedJson).toEqual(jsonNew);
+      }
+    );
+
+    // NOTE: We can't guarantee that data won't be lost if two (or more) actors
+    // write to the registry at the same time, but we can guarantee that the
+    // final state will be the desired final state by at least one of the
+    // actors. One of the two clients will lose, but the other will win and be
+    // consistent, so the data won't be corrupt, it'll just be missing one
+    // update.
+    it.each(delays)(
+      "should get either old or new data when getJSON is called after setJSON on two different clients with a '%s' ms delay",
+      async (delay) => {
+        // Create two new clients with a fresh revision cache.
+        const client1 = new SkynetClient(portal);
+        const client2 = new SkynetClient(portal);
+        const { publicKey, privateKey } = genKeyPairAndSeed();
+
+        // Get revision entry cache handles.
+        const cachedRevisionEntry1 = await client1.db.revisionNumberCache.getRevisionAndMutexForEntry(
+          publicKey,
+          dataKey
+        );
+        const cachedRevisionEntry2 = await client2.db.revisionNumberCache.getRevisionAndMutexForEntry(
+          publicKey,
+          dataKey
+        );
+
+        // Set the initial data.
+        {
+          await client1.db.setJSON(privateKey, dataKey, jsonOld);
+          expect(cachedRevisionEntry1.revision.toString()).toEqual("0");
+          expect(cachedRevisionEntry2.revision.toString()).toEqual("-1");
+        }
+
+        // Call getJSON and setJSON concurrently on different clients -- both
+        // should succeeed.
+        {
+          // Get the data while also calling setJSON.
+          const [_, { data: receivedJson }] = await Promise.all([
+            setJSONWithDelay(client1, 0, privateKey, dataKey, jsonNew),
+            getJSONWithDelay(client2, delay, publicKey, dataKey),
+          ]);
+
+          // See if we got the new or old data.
+          expect(receivedJson).not.toBeNull();
+          expect(cachedRevisionEntry1.revision.toString()).toEqual("1");
+          if (receivedJson?.message === jsonNew.message) {
+            expect(cachedRevisionEntry2.revision.toString()).toEqual("1");
+            // Return if we got the new data -- both clients are in sync.
+            //
+            // NOTE: I've manually confirmed that both code paths (old data and
+            // new data) are hit.
+            return;
+          }
+          // client2 should have old data and cached revision at this point.
+          expect(receivedJson).toEqual(jsonOld);
+          expect(cachedRevisionEntry2.revision.toString()).toEqual("0");
+        }
+
+        // If we got old data and an old revision from getJSON, the client may
+        // still be able to write to that entry, overwriting the new data.
+        //
+        // Try to update the entry with client2 which has the old revision.
+        const updatedJson = { message: 3 };
+        let expectedJson: JsonData;
+        try {
+          await client2.db.setJSON(privateKey, dataKey, updatedJson);
+          expectedJson = updatedJson;
+        } catch (e) {
+          // Catches both "doesn't have enough pow" and "provided revision number
+          // is already registered" errors.
+          if ((e as Error).message.includes(registryUpdateError)) {
+            // NOTE: I've manually confirmed that both code paths (no error, and
+            // return on expected error) are hit.
+            expectedJson = jsonNew;
+          } else {
+            // Unexpected error, throw.
+            throw e;
+          }
+        }
+
+        // The entry should have the overriden, updated data at this point.
+        await Promise.all([
+          async () => {
+            const { data: receivedJson } = await client1.db.getJSON(publicKey, dataKey);
+            expect(cachedRevisionEntry1.revision.toString()).toEqual("1");
+            expect(receivedJson).toEqual(expectedJson);
+          },
+          async () => {
+            const { data: receivedJson } = await client2.db.getJSON(publicKey, dataKey);
+            expect(cachedRevisionEntry2.revision.toString()).toEqual("1");
+            expect(receivedJson).toEqual(expectedJson);
+          },
+        ]);
+      }
+    );
+
+    it.each(delays)(
+      "should make sure that two concurrent setJSON calls on a single client with a '%s' ms delay either fail with the right error or succeed ",
+      async (delay) => {
+        const { publicKey, privateKey } = genKeyPairAndSeed();
+
+        // Try to invoke two concurrent setJSON calls.
+        try {
+          await Promise.all([
+            setJSONWithDelay(client, delay, privateKey, dataKey, jsonNew),
+            setJSONWithDelay(client, 0, privateKey, dataKey, jsonOld),
+          ]);
+        } catch (e) {
+          if ((e as Error).message.includes(concurrentAccessError)) {
+            // The data race condition has been prevented and we received the
+            // expected error. Return from test early.
+            //
+            // NOTE: I've manually confirmed that both code paths (no error, and
+            // return on expected error) are hit.
+            return;
+          }
+
+          // Unexpected error, throw.
+          throw e;
+        }
+
+        // Data race did not occur, getJSON should get latest JSON.
+        const { data: receivedJson } = await client.db.getJSON(publicKey, dataKey);
+        expect(receivedJson).toEqual(jsonNew);
+      }
+    );
+
+    it.each(delays)(
+      "should make sure that two concurrent setJSON calls on different clients with a '%s' ms delay fail with the right error or succeed",
+      async (delay) => {
+        // Create two new clients with a fresh revision cache.
+        const client1 = new SkynetClient(portal);
+        const client2 = new SkynetClient(portal);
+        const { publicKey, privateKey } = genKeyPairAndSeed();
+
+        // Try to invoke two concurrent setJSON calls.
+        try {
+          await Promise.all([
+            setJSONWithDelay(client2, delay, privateKey, dataKey, jsonNew),
+            setJSONWithDelay(client1, 0, privateKey, dataKey, jsonOld),
+          ]);
+        } catch (e) {
+          if ((e as Error).message.includes(registryUpdateError)) {
+            // The data race condition has been prevented and we received the
+            // expected error. Return from test early.
+            //
+            // NOTE: I've manually confirmed that both code paths (no error, and
+            // return on expected error) are hit.
+            return;
+          }
+
+          // Unexpected error, throw.
+          throw e;
+        }
+
+        // Data race did not occur, getJSON should get one of the JSON values.
+        let client3;
+        if (Math.random() < 0.5) {
+          client3 = client1;
+        } else {
+          client3 = client2;
+        }
+        const { data: receivedJson } = await client3.db.getJSON(publicKey, dataKey);
+        expect([jsonOld, jsonNew]).toContainEqual(receivedJson);
+      }
+    );
+  });
 });

integration/upload_download.test.ts

@@ -148,7 +148,7 @@ describe(`Upload and download end-to-end tests for portal '${portal}'`, () => {
     expect(contentType).toEqual("application/json");
   });
 
-  it("Should get file contents when content type is not specified", async () => {
+  it("should get file contents when content type is not specified", async () => {
     // Upload the data to acquire its skylink. Don't specify a content type.
 
     const file = new File([JSON.stringify(json)], dataKey);
@@ -159,11 +159,24 @@ describe(`Upload and download end-to-end tests for portal '${portal}'`, () => {
 
     const { data, contentType } = await client.getFileContent(skylink);
 
-    expect(data).toEqual(expect.any(Object));
+    expect(typeof data).toEqual("object");
     expect(data).toEqual(json);
     expect(contentType).toEqual("application/octet-stream");
   });
 
+  it('should get binary data with responseType: "arraybuffer"', async () => {
+    // Hard-code skylink for a sqlite3 database.
+    const skylink = "DABchy1Q3tBUggIP9IF_7ha9vAfBZ1d2aYRxUnHSQg9QNA";
+
+    // Get file content and check returned values.
+
+    const { data, contentType } = await client.getFileContent(skylink, { responseType: "arraybuffer" });
+
+    expect(typeof data).toEqual("object");
+    expect(data instanceof ArrayBuffer).toBeTruthy();
+    expect(contentType).toEqual("application/octet-stream");
+  });
+
   it("Should upload and download a file with spaces in the filename", async () => {
     const filename = " foo bar ";
 

jest.config.ts

@@ -11,7 +11,7 @@ const config: Config.InitialOptions = {
   preset: "ts-jest",
 
   // From old package.json.
-  testTimeout: 90000,
+  testTimeout: 120000,
   // Automatically clear mock calls and instances between every test
   clearMocks: true,
   // An array of glob patterns indicating a set of files for which coverage information should be collected

package.json

@@ -52,6 +52,7 @@
   },
   "homepage": "https://github.com/SkynetLabs/skynet-js",
   "dependencies": {
+    "async-mutex": "^0.3.2",
     "axios": "^0.24.0",
     "base32-decode": "^1.0.0",
     "base32-encode": "^1.1.1",
@@ -64,7 +65,7 @@
     "randombytes": "^2.1.0",
     "sjcl": "^1.0.8",
     "skynet-mysky-utils": "^0.3.0",
-    "tus-js-client": "^2.2.0",
+    "@skynetlabs/tus-js-client": "^2.3.0",
     "tweetnacl": "^1.0.3",
     "url-join": "^4.0.1",
     "url-parse": "^1.5.1"

src/client.test.ts

@@ -1,9 +1,9 @@
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 
-import { combineStrings } from "../utils/testing";
-import { buildRequestUrl } from "./client";
 import { SkynetClient } from "./index";
+import { buildRequestUrl } from "./request";
+import { combineStrings } from "../utils/testing";
 import { DEFAULT_SKYNET_PORTAL_URL } from "./utils/url";
 
 const portalUrl = DEFAULT_SKYNET_PORTAL_URL;