Update wasm file versioning (#8)

* Remove wasm file versioning

* Add wasm dep versions and upgrade to latest releases

* Replace sed with jq for parsing wasm version data

Author: samkim

README.md

@@ -62,11 +62,13 @@ NODE_OPTIONS=--openssl-legacy-provider vercel build
 vercel deploy --prebuilt
 ```
 
+> ℹ️  Git Large File Storage (LFS) must be enabled in your Vercel project settings.
+
 ### NodeJS
 
 The `build` directory in the project root directory after running `yarn build` will contain an optimized production React application that can be served using your preferred NodeJS hosting method.
 
-> ℹ️ Node v18.x is required.
+> ℹ️  Node v18.x is required.
 
 For example:
 
@@ -84,12 +86,17 @@ Run `yarn install` in the _root_ project directory.
 
 ## Updating wasm dependencies
 
-The project contains prebuilt WASM files for versions of both SpiceDB and zed. To update the versions, edit the following script files with the appropriate tag/commit hash and then run from the project root:
+The project contains prebuilt WASM files for versions of both SpiceDB and zed. To update the versions, edit the [wasm-config.json] file with the desired tag/commit hash and then run from the project root:
 
 `yarn run update:spicedb`
 
 `yarn run update:zed`
 
+> ℹ️ [jq] is required and must be installed.
+
+[wasm-config.json]: https://github.com/authzed/playground/blob/wasm-caching/spicedb-common/wasm-config.json
+[jq]: https://jqlang.github.io/jq/
+
 ## Developing your own schema
 
 You can try both [SpiceDB](https://github.com/authzed/spicedb) and [zed](https://github.com/authzed/zed) entirely in your browser on a SpiceDB Playground deployment thanks to the power of [WebAssembly](https://authzed.com/blog/some-assembly-required).

playground/craco.config.js

@@ -9,12 +9,7 @@ const resolvePackage = (relativePath) => {
 
 module.exports = {
   webpack: {
-    plugins: [
-      new DefinePlugin({
-        // Use build timestamp as version id
-        'process.env.WASM_VERSION': DefinePlugin.runtimeValue(Date.now, true),
-      }),
-    ],
+    plugins: [],
     configure: (webpackConfig, { env, paths }) => {
       return webpackConfig;
     },

scripts/update-spicedb.sh

@@ -1,11 +1,21 @@
 #!/usr/bin/env sh
 
 set -e
+
+VERSION=$(jq -r '.spicedb' ./spicedb-common/wasm-config.json)
+if [ -z ${VERSION} ] ; then
+    echo "SpiceDB version not defined in wasm config" >&2
+    exit 1
+fi
+echo "Updating SpiceDB wasm to version: ${VERSION}"
+
+
 if [ ! -d "spicedb" ] ; then
   git clone https://github.com/authzed/spicedb.git
 fi
 cd spicedb
-git checkout 3b37d794c689d635f62d94b868abe3cb66e109f0
+git fetch
+git checkout ${VERSION}
 cd pkg/development/wasm
 GOOS=js GOARCH=wasm go build -o main.wasm
 mv main.wasm ../../../../wasm

scripts/update-zed.sh

@@ -1,11 +1,20 @@
 #!/usr/bin/env sh
 
 set -e
+
+VERSION=$(jq -r '.zed' ./spicedb-common/wasm-config.json)
+if [ -z ${VERSION} ] ; then
+    echo "zed version not defined in wasm config" >&2
+    exit 1
+fi
+echo "Updating zed wasm to version: ${VERSION}"
+
 if [ ! -d "zed" ] ; then
     git clone https://github.com/authzed/zed.git
 fi
 cd zed
-git checkout e4815f1475e320c0b008f7d016db59ee158a965c
+git fetch
+git checkout ${VERSION}
 cd pkg/wasm
 GOOS=js GOARCH=wasm go build -o zed.wasm
 mv zed.wasm ../../../wasm

spicedb-common/src/services/developerservice.ts

@@ -15,9 +15,10 @@ import {
   RunValidationParameters,
   RunValidationResult,
 } from '../protodevdefs/developer/v1/developer';
+import wasmConfig from '../../wasm-config.json';
 
 const WASM_FILE = `${process.env.PUBLIC_URL}/static/main.wasm`;
-const ESTIMATED_WASM_BINARY_SIZE = 31161196; // bytes
+const ESTIMATED_WASM_BINARY_SIZE = 46376012; // bytes
 const ENTRYPOINT_FUNCTION = 'runSpiceDBDeveloperRequest';
 
 /**
@@ -210,7 +211,9 @@ class DeveloperServiceRequest {
   }
 }
 
-const wasmVersion: number | string = Math.random();
+const wasmVersion: number | string = wasmConfig?.spicedb
+  ? encodeURIComponent(wasmConfig.spicedb)
+  : Math.random();
 
 /**
  * useDeveloperService returns a reference to the developer service for invoking calls against the WASM-based

spicedb-common/src/services/zedservice.ts

@@ -2,9 +2,10 @@ import { RelationTuple as Relationship } from '@code/spicedb-common/src/protodev
 import { useCallback, useEffect, useState } from 'react';
 import { parseRelationships } from '../parsing';
 import { RequestContext } from '../protodevdefs/developer/v1/developer';
+import wasmConfig from '../../wasm-config.json';
 
 const WASM_FILE = `${process.env.PUBLIC_URL}/static/zed.wasm`;
-const ESTIMATED_WASM_BINARY_SIZE = 49262480; // bytes
+const ESTIMATED_WASM_BINARY_SIZE = 55126053; // bytes
 const ENTRYPOINT_FUNCTION = 'runZedCommand';
 
 /**
@@ -59,7 +60,9 @@ export type ZedServiceState =
       progress: number;
     };
 
-const wasmVersion: number | string = Math.random();
+const wasmVersion: number | string = wasmConfig?.zed
+  ? encodeURIComponent(wasmConfig.zed)
+  : Math.random();
 
 export function useZedService(): ZedService {
   const [state, setState] = useState<ZedServiceState>({

spicedb-common/wasm-config.json

@@ -0,0 +1,4 @@
+{
+  "spicedb": "v1.29.5",
+  "zed": "v0.17.1"
+}

wasm/main.wasm

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af26f81fd57ac5d5573368fa2cf7a1be097a88f1155fae53cfd8b5e8801af1d7
-size 45260507
+oid sha256:ae5a38d52353841c6b82c373ab8b1a7ce5f80169d4c682e462b3a2e704d037ec
+size 46376012

wasm/zed.wasm

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:927d0bd5f6c6d2f2d4962dcde7580c0438f584a5f4f35e7fb471891c4ba598b0
-size 52643236
+oid sha256:61829b42380be0aefd67068d9ee95b77147002ad843e920d410f9883745f1a05
+size 55126053