Skip to content

Commit

Permalink
Use request identity from shared core
Browse files Browse the repository at this point in the history
  • Loading branch information
@slinkydeveloper
slinkydeveloper committed Oct 1, 2024
1 parent ab2609d commit 56395e7
Show file tree
Hide file tree
Showing 18 changed files with 819 additions and 635 deletions.
14 changes: 14 additions & 0 deletions packages/restate-sdk-cloudflare-workers/patches/vm/sdk_shared_core_wasm_bindings.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,20 @@ export class WasmHeader {
}
/**
*/
export class WasmIdentityVerifier {
free(): void;
/**
* @param {(string)[]} keys
*/
constructor(keys: (string)[]);
/**
* @param {(WasmHeader)[]} hm
* @param {string} path
*/
verify_identity(hm: (WasmHeader)[], path: string): void;
}
/**
*/
export class WasmInput {
free(): void;
/**
Expand Down
208 changes: 191 additions & 17 deletions packages/restate-sdk-cloudflare-workers/patches/vm/sdk_shared_core_wasm_bindings_bg.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,7 @@ function addHeapObject(obj) {
return idx;
}

const lTextDecoder = typeof TextDecoder === 'undefined' ? (0, module.require)('util').TextDecoder : TextDecoder;

let cachedTextDecoder = new lTextDecoder('utf-8', { ignoreBOM: true, fatal: true });

cachedTextDecoder.decode();
let WASM_VECTOR_LEN = 0;

let cachedUint8ArrayMemory0 = null;

Expand All @@ -63,13 +59,6 @@ function getUint8ArrayMemory0() {
return cachedUint8ArrayMemory0;
}

function getStringFromWasm0(ptr, len) {
ptr = ptr >>> 0;
return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
}

let WASM_VECTOR_LEN = 0;

const lTextEncoder = typeof TextEncoder === 'undefined' ? (0, module.require)('util').TextEncoder : TextEncoder;

let cachedTextEncoder = new lTextEncoder('utf-8');
Expand Down Expand Up @@ -126,6 +115,17 @@ function passStringToWasm0(arg, malloc, realloc) {
return ptr;
}

const lTextDecoder = typeof TextDecoder === 'undefined' ? (0, module.require)('util').TextDecoder : TextDecoder;

let cachedTextDecoder = new lTextDecoder('utf-8', { ignoreBOM: true, fatal: true });

cachedTextDecoder.decode();

function getStringFromWasm0(ptr, len) {
ptr = ptr >>> 0;
return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
}

function debugString(val) {
// primitive types
const type = typeof val;
Expand Down Expand Up @@ -246,6 +246,14 @@ function passArray32ToWasm0(arg, malloc) {
WASM_VECTOR_LEN = arg.length;
return ptr;
}

function handleError(f, args) {
try {
return f.apply(this, args);
} catch (e) {
wasm.__wbindgen_exn_store(addHeapObject(e));
}
}
/**
*/
export const LogLevel = Object.freeze({ TRACE:0,"0":"TRACE",DEBUG:1,"1":"DEBUG",INFO:2,"2":"INFO",WARN:3,"3":"WARN",ERROR:4,"4":"ERROR", });
Expand Down Expand Up @@ -337,6 +345,69 @@ export class WasmHeader {
}
}

const WasmIdentityVerifierFinalization = (typeof FinalizationRegistry === 'undefined')
? { register: () => {}, unregister: () => {} }
: new FinalizationRegistry(ptr => wasm.__wbg_wasmidentityverifier_free(ptr >>> 0, 1));
/**
*/
export class WasmIdentityVerifier {

__destroy_into_raw() {
const ptr = this.__wbg_ptr;
this.__wbg_ptr = 0;
WasmIdentityVerifierFinalization.unregister(this);
return ptr;
}

free() {
const ptr = this.__destroy_into_raw();
wasm.__wbg_wasmidentityverifier_free(ptr, 0);
}
/**
* @param {(string)[]} keys
*/
constructor(keys) {
try {
const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
const ptr0 = passArrayJsValueToWasm0(keys, wasm.__wbindgen_malloc);
const len0 = WASM_VECTOR_LEN;
wasm.wasmidentityverifier_new(retptr, ptr0, len0);
var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
if (r2) {
throw takeObject(r1);
}
this.__wbg_ptr = r0 >>> 0;
WasmIdentityVerifierFinalization.register(this, this.__wbg_ptr, this);
return this;
} finally {
wasm.__wbindgen_add_to_stack_pointer(16);
}
}
/**
* @param {(WasmHeader)[]} hm
* @param {string} path
*/
verify_identity(hm, path) {
try {
const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
const ptr0 = passArrayJsValueToWasm0(hm, wasm.__wbindgen_malloc);
const len0 = WASM_VECTOR_LEN;
const ptr1 = passStringToWasm0(path, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
wasm.wasmidentityverifier_verify_identity(retptr, this.__wbg_ptr, ptr0, len0, ptr1, len1);
var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
if (r1) {
throw takeObject(r0);
}
} finally {
wasm.__wbindgen_add_to_stack_pointer(16);
}
}
}

const WasmInputFinalization = (typeof FinalizationRegistry === 'undefined')
? { register: () => {}, unregister: () => {} }
: new FinalizationRegistry(ptr => wasm.__wbg_wasminput_free(ptr >>> 0, 1));
Expand Down Expand Up @@ -1193,11 +1264,6 @@ export function __wbg_wasmheader_new(arg0) {
return addHeapObject(ret);
};

export function __wbindgen_error_new(arg0, arg1) {
const ret = new Error(getStringFromWasm0(arg0, arg1));
return addHeapObject(ret);
};

export function __wbindgen_is_undefined(arg0) {
const ret = getObject(arg0) === undefined;
return ret;
Expand Down Expand Up @@ -1238,6 +1304,11 @@ export function __wbindgen_is_object(arg0) {
return ret;
};

export function __wbindgen_error_new(arg0, arg1) {
const ret = new Error(getStringFromWasm0(arg0, arg1));
return addHeapObject(ret);
};

export function __wbg_new_abda76e883ba8a5f() {
const ret = new Error();
return addHeapObject(ret);
Expand Down Expand Up @@ -1296,16 +1367,94 @@ export function __wbg_set_841ac57cff3d672b(arg0, arg1, arg2) {
getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
};

export function __wbg_crypto_1d1f22824a6a080c(arg0) {
const ret = getObject(arg0).crypto;
return addHeapObject(ret);
};

export function __wbg_process_4a72847cc503995b(arg0) {
const ret = getObject(arg0).process;
return addHeapObject(ret);
};

export function __wbg_versions_f686565e586dd935(arg0) {
const ret = getObject(arg0).versions;
return addHeapObject(ret);
};

export function __wbg_node_104a2ff8d6ea03a2(arg0) {
const ret = getObject(arg0).node;
return addHeapObject(ret);
};

export function __wbindgen_is_string(arg0) {
const ret = typeof(getObject(arg0)) === 'string';
return ret;
};

export function __wbg_require_cca90b1a94a0255b() { return handleError(function () {
const ret = module.require;
return addHeapObject(ret);
}, arguments) };

export function __wbg_msCrypto_eb05e62b530a1508(arg0) {
const ret = getObject(arg0).msCrypto;
return addHeapObject(ret);
};

export function __wbg_randomFillSync_5c9c955aa56b6049() { return handleError(function (arg0, arg1) {
getObject(arg0).randomFillSync(takeObject(arg1));
}, arguments) };

export function __wbg_getRandomValues_3aa56aa6edec874c() { return handleError(function (arg0, arg1) {
getObject(arg0).getRandomValues(getObject(arg1));
}, arguments) };

export function __wbg_new_a220cf903aa02ca2() {
const ret = new Array();
return addHeapObject(ret);
};

export function __wbindgen_is_function(arg0) {
const ret = typeof(getObject(arg0)) === 'function';
return ret;
};

export function __wbg_newnoargs_76313bd6ff35d0f2(arg0, arg1) {
const ret = new Function(getStringFromWasm0(arg0, arg1));
return addHeapObject(ret);
};

export function __wbg_call_1084a111329e68ce() { return handleError(function (arg0, arg1) {
const ret = getObject(arg0).call(getObject(arg1));
return addHeapObject(ret);
}, arguments) };

export function __wbg_new_525245e2b9901204() {
const ret = new Object();
return addHeapObject(ret);
};

export function __wbg_self_3093d5d1f7bcb682() { return handleError(function () {
const ret = self.self;
return addHeapObject(ret);
}, arguments) };

export function __wbg_window_3bcfc4d31bc012f8() { return handleError(function () {
const ret = window.window;
return addHeapObject(ret);
}, arguments) };

export function __wbg_globalThis_86b222e13bdf32ed() { return handleError(function () {
const ret = globalThis.globalThis;
return addHeapObject(ret);
}, arguments) };

export function __wbg_global_e5a3fe56f8be9485() { return handleError(function () {
const ret = global.global;
return addHeapObject(ret);
}, arguments) };

export function __wbg_set_673dda6c73d19609(arg0, arg1, arg2) {
getObject(arg0)[arg1 >>> 0] = takeObject(arg2);
};
Expand All @@ -1326,11 +1475,26 @@ export function __wbg_instanceof_ArrayBuffer_61dfc3198373c902(arg0) {
return ret;
};

export function __wbg_call_89af060b4e1523f2() { return handleError(function (arg0, arg1, arg2) {
const ret = getObject(arg0).call(getObject(arg1), getObject(arg2));
return addHeapObject(ret);
}, arguments) };

export function __wbg_isSafeInteger_7f1ed56200d90674(arg0) {
const ret = Number.isSafeInteger(getObject(arg0));
return ret;
};

export function __wbg_getTime_91058879093a1589(arg0) {
const ret = getObject(arg0).getTime();
return ret;
};

export function __wbg_new0_65387337a95cf44d() {
const ret = new Date();
return addHeapObject(ret);
};

export function __wbg_now_b7a162010a9e75b4() {
const ret = Date.now();
return ret;
Expand Down Expand Up @@ -1371,6 +1535,16 @@ export function __wbg_instanceof_Uint8Array_247a91427532499e(arg0) {
return ret;
};

export function __wbg_newwithlength_ec548f448387c968(arg0) {
const ret = new Uint8Array(arg0 >>> 0);
return addHeapObject(ret);
};

export function __wbg_subarray_7c2e3576afe181d1(arg0, arg1, arg2) {
const ret = getObject(arg0).subarray(arg1 >>> 0, arg2 >>> 0);
return addHeapObject(ret);
};

export function __wbindgen_bigint_get_as_i64(arg0, arg1) {
const v = getObject(arg1);
const ret = typeof(v) === 'bigint' ? v : undefined;
Expand Down
Binary file modified packages/restate-sdk-cloudflare-workers/patches/vm/sdk_shared_core_wasm_bindings_bg.wasm
View file
Binary file not shown.
5 changes: 5 additions & 0 deletions ...ages/restate-sdk-cloudflare-workers/patches/vm/sdk_shared_core_wasm_bindings_bg.wasm.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,15 @@ export function wasmvm_sys_try_complete_all_combinator(a: number, b: number, c:
export function wasmvm_sys_try_complete_any_combinator(a: number, b: number, c: number, d: number): void;
export function wasmvm_sys_try_complete_all_settled_combinator(a: number, b: number, c: number, d: number): void;
export function wasmvm_sys_try_complete_race_combinator(a: number, b: number, c: number, d: number): void;
export function __wbg_wasmidentityverifier_free(a: number, b: number): void;
export function wasmidentityverifier_new(a: number, b: number, c: number): void;
export function wasmidentityverifier_verify_identity(a: number, b: number, c: number, d: number, e: number, f: number): void;
export function __wbg_get_wasminput_invocation_id(a: number, b: number): void;
export function __wbg_get_wasminput_key(a: number, b: number): void;
export function ring_core_0_17_8_bn_mul_mont(a: number, b: number, c: number, d: number, e: number, f: number): void;
export function __wbindgen_malloc(a: number, b: number): number;
export function __wbindgen_realloc(a: number, b: number, c: number, d: number): number;
export function __wbindgen_add_to_stack_pointer(a: number): number;
export function __wbindgen_free(a: number, b: number, c: number): void;
export function __wbindgen_exn_store(a: number): void;
export function __wbindgen_start(): void;
14 changes: 3 additions & 11 deletions packages/restate-sdk/src/endpoint/endpoint_builder.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ import {
} from "../types/components.js";

import type * as discovery from "../types/discovery.js";
import type { KeySetV1 } from "./request_signing/v1.js";
import { parseKeySetV1 } from "./request_signing/v1.js";
import {
LogSource,
type Logger,
Expand Down Expand Up @@ -65,9 +63,9 @@ export class EndpointBuilder {
*/
public rlog = createRestateConsole(this.logger, LogSource.SYSTEM);

private _keySet?: KeySetV1;
private _keySet: string[] = [];

public get keySet(): KeySetV1 | undefined {
public get keySet(): string[] {
return this._keySet;
}

Expand Down Expand Up @@ -112,13 +110,7 @@ export class EndpointBuilder {
}

public withIdentityV1(...keys: string[]) {
if (!this._keySet) {
this._keySet = parseKeySetV1(keys);
return this;
}
parseKeySetV1(keys).forEach((buffer, key) =>
this._keySet?.set(key, buffer)
);
this._keySet.push(...keys);
return this;
}

Expand Down
3 changes: 1 addition & 2 deletions packages/restate-sdk/src/endpoint/fetch_endpoint.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import type {
WorkflowDefinition,
} from "@restatedev/restate-sdk-core";
import type { Component } from "../types/components.js";
import type { KeySetV1 } from "./request_signing/v1.js";
import { EndpointBuilder } from "./endpoint_builder.js";
import type {
RestateEndpoint,
Expand Down Expand Up @@ -62,7 +61,7 @@ export class FetchEndpointImpl implements FetchEndpoint {
constructor(private protocolMode: ProtocolMode) {}
private builder: EndpointBuilder = new EndpointBuilder();

public get keySet(): KeySetV1 | undefined {
public get keySet(): string[] {
return this.builder.keySet;
}

Expand Down
Loading

0 comments on commit 56395e7

Please sign in to comment.