Skip to content

Commit 2fba236

Browse files
Update again
1 parent 244189e commit 2fba236

File tree

9 files changed

+89
-46
lines changed

9 files changed

+89
-46
lines changed

packages/restate-sdk-cloudflare-workers/patches/vm/sdk_shared_core_wasm_bindings.d.ts

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
export function start(): void;
77
/**
8+
* This will set the log level of the overall log subscriber.
89
* @param {LogLevel} level
910
*/
1011
export function set_log_level(level: LogLevel): void;
@@ -22,6 +23,8 @@ export interface WasmFailure {
2223
message: string;
2324
}
2425

26+
export type WasmSendHandle = number;
27+
2528
export interface WasmExponentialRetryConfig {
2629
initial_interval: number | undefined;
2730
factor: number;
@@ -35,7 +38,7 @@ export interface WasmAwakeable {
3538
handle: number;
3639
}
3740

38-
export type WasmAsyncResultValue = "NotReady" | "Empty" | { Success: Uint8Array } | { Failure: WasmFailure } | { StateKeys: string[] } | { CombinatorResult: WasmAsyncResultHandle[] };
41+
export type WasmAsyncResultValue = "NotReady" | "Empty" | { Success: Uint8Array } | { Failure: WasmFailure } | { StateKeys: string[] } | { InvocationId: string } | { CombinatorResult: WasmAsyncResultHandle[] };
3942

4043
export type WasmRunEnterResult = { ExecutedWithSuccess: Uint8Array } | { ExecutedWithFailure: WasmFailure } | "NotExecuted";
4144

@@ -103,8 +106,10 @@ export class WasmVM {
103106
free(): void;
104107
/**
105108
* @param {(WasmHeader)[]} headers
109+
* @param {LogLevel} log_level
110+
* @param {number} logger_id
106111
*/
107-
constructor(headers: (WasmHeader)[]);
112+
constructor(headers: (WasmHeader)[], log_level: LogLevel, logger_id: number);
108113
/**
109114
* @returns {WasmResponseHead}
110115
*/
@@ -172,18 +177,21 @@ export class WasmVM {
172177
* @param {string} service
173178
* @param {string} handler
174179
* @param {Uint8Array} buffer
175-
* @param {string | undefined} [key]
180+
* @param {string | undefined} key
181+
* @param {(WasmHeader)[]} headers
176182
* @returns {number}
177183
*/
178-
sys_call(service: string, handler: string, buffer: Uint8Array, key?: string): number;
184+
sys_call(service: string, handler: string, buffer: Uint8Array, key: string | undefined, headers: (WasmHeader)[]): number;
179185
/**
180186
* @param {string} service
181187
* @param {string} handler
182188
* @param {Uint8Array} buffer
183-
* @param {string | undefined} [key]
189+
* @param {string | undefined} key
190+
* @param {(WasmHeader)[]} headers
184191
* @param {bigint | undefined} [delay]
192+
* @returns {WasmSendHandle}
185193
*/
186-
sys_send(service: string, handler: string, buffer: Uint8Array, key?: string, delay?: bigint): void;
194+
sys_send(service: string, handler: string, buffer: Uint8Array, key: string | undefined, headers: (WasmHeader)[], delay?: bigint): WasmSendHandle;
187195
/**
188196
* @returns {WasmAwakeable}
189197
*/

packages/restate-sdk-cloudflare-workers/patches/vm/sdk_shared_core_wasm_bindings_bg.js

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,12 @@ export function start() {
197197
wasm.start();
198198
}
199199

200+
function getArrayU8FromWasm0(ptr, len) {
201+
ptr = ptr >>> 0;
202+
return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
203+
}
200204
/**
205+
* This will set the log level of the overall log subscriber.
201206
* @param {LogLevel} level
202207
*/
203208
export function set_log_level(level) {
@@ -568,13 +573,15 @@ export class WasmVM {
568573
}
569574
/**
570575
* @param {(WasmHeader)[]} headers
576+
* @param {LogLevel} log_level
577+
* @param {number} logger_id
571578
*/
572-
constructor(headers) {
579+
constructor(headers, log_level, logger_id) {
573580
try {
574581
const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
575582
const ptr0 = passArrayJsValueToWasm0(headers, wasm.__wbindgen_malloc);
576583
const len0 = WASM_VECTOR_LEN;
577-
wasm.wasmvm_new(retptr, ptr0, len0);
584+
wasm.wasmvm_new(retptr, ptr0, len0, log_level, logger_id);
578585
var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
579586
var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
580587
var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
@@ -801,10 +808,11 @@ export class WasmVM {
801808
* @param {string} service
802809
* @param {string} handler
803810
* @param {Uint8Array} buffer
804-
* @param {string | undefined} [key]
811+
* @param {string | undefined} key
812+
* @param {(WasmHeader)[]} headers
805813
* @returns {number}
806814
*/
807-
sys_call(service, handler, buffer, key) {
815+
sys_call(service, handler, buffer, key, headers) {
808816
try {
809817
const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
810818
const ptr0 = passStringToWasm0(service, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -813,7 +821,9 @@ export class WasmVM {
813821
const len1 = WASM_VECTOR_LEN;
814822
var ptr2 = isLikeNone(key) ? 0 : passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
815823
var len2 = WASM_VECTOR_LEN;
816-
wasm.wasmvm_sys_call(retptr, this.__wbg_ptr, ptr0, len0, ptr1, len1, addHeapObject(buffer), ptr2, len2);
824+
const ptr3 = passArrayJsValueToWasm0(headers, wasm.__wbindgen_malloc);
825+
const len3 = WASM_VECTOR_LEN;
826+
wasm.wasmvm_sys_call(retptr, this.__wbg_ptr, ptr0, len0, ptr1, len1, addHeapObject(buffer), ptr2, len2, ptr3, len3);
817827
var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
818828
var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
819829
var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
@@ -829,10 +839,12 @@ export class WasmVM {
829839
* @param {string} service
830840
* @param {string} handler
831841
* @param {Uint8Array} buffer
832-
* @param {string | undefined} [key]
842+
* @param {string | undefined} key
843+
* @param {(WasmHeader)[]} headers
833844
* @param {bigint | undefined} [delay]
845+
* @returns {WasmSendHandle}
834846
*/
835-
sys_send(service, handler, buffer, key, delay) {
847+
sys_send(service, handler, buffer, key, headers, delay) {
836848
try {
837849
const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
838850
const ptr0 = passStringToWasm0(service, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -841,12 +853,16 @@ export class WasmVM {
841853
const len1 = WASM_VECTOR_LEN;
842854
var ptr2 = isLikeNone(key) ? 0 : passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
843855
var len2 = WASM_VECTOR_LEN;
844-
wasm.wasmvm_sys_send(retptr, this.__wbg_ptr, ptr0, len0, ptr1, len1, addHeapObject(buffer), ptr2, len2, !isLikeNone(delay), isLikeNone(delay) ? BigInt(0) : delay);
856+
const ptr3 = passArrayJsValueToWasm0(headers, wasm.__wbindgen_malloc);
857+
const len3 = WASM_VECTOR_LEN;
858+
wasm.wasmvm_sys_send(retptr, this.__wbg_ptr, ptr0, len0, ptr1, len1, addHeapObject(buffer), ptr2, len2, ptr3, len3, !isLikeNone(delay), isLikeNone(delay) ? BigInt(0) : delay);
845859
var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
846860
var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
847-
if (r1) {
848-
throw takeObject(r0);
861+
var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
862+
if (r2) {
863+
throw takeObject(r1);
849864
}
865+
return takeObject(r0);
850866
} finally {
851867
wasm.__wbindgen_add_to_stack_pointer(16);
852868
}
@@ -1229,8 +1245,8 @@ export class WasmVM {
12291245
}
12301246
}
12311247

1232-
export function __wbg_vmlog_13455a06b760bbc0(arg0, arg1, arg2) {
1233-
vm_log(arg0, getStringFromWasm0(arg1, arg2));
1248+
export function __wbg_vmlog_13455a06b760bbc0(arg0, arg1, arg2, arg3, arg4) {
1249+
vm_log(arg0, getArrayU8FromWasm0(arg1, arg2), arg3 === 0 ? undefined : arg4 >>> 0);
12341250
};
12351251

12361252
export function __wbindgen_object_drop_ref(arg0) {

packages/restate-sdk-cloudflare-workers/patches/vm/sdk_shared_core_wasm_bindings_bg.wasm.d.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function __wbg_wasminput_free(a: number, b: number): void;
1414
export function __wbg_get_wasminput_headers(a: number, b: number): void;
1515
export function __wbg_get_wasminput_input(a: number): number;
1616
export function __wbg_wasmvm_free(a: number, b: number): void;
17-
export function wasmvm_new(a: number, b: number, c: number): void;
17+
export function wasmvm_new(a: number, b: number, c: number, d: number, e: number): void;
1818
export function wasmvm_get_response_head(a: number): number;
1919
export function wasmvm_notify_input(a: number, b: number, c: number): void;
2020
export function wasmvm_notify_input_closed(a: number): void;
@@ -30,8 +30,8 @@ export function wasmvm_sys_set_state(a: number, b: number, c: number, d: number,
3030
export function wasmvm_sys_clear_state(a: number, b: number, c: number, d: number): void;
3131
export function wasmvm_sys_clear_all_state(a: number, b: number): void;
3232
export function wasmvm_sys_sleep(a: number, b: number, c: number): void;
33-
export function wasmvm_sys_call(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number): void;
34-
export function wasmvm_sys_send(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number): void;
33+
export function wasmvm_sys_call(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number): void;
34+
export function wasmvm_sys_send(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number): void;
3535
export function wasmvm_sys_awakeable(a: number, b: number): void;
3636
export function wasmvm_sys_complete_awakeable_success(a: number, b: number, c: number, d: number, e: number): void;
3737
export function wasmvm_sys_complete_awakeable_failure(a: number, b: number, c: number, d: number, e: number): void;

packages/restate-sdk/src/endpoint/handlers/vm/sdk_shared_core_wasm_bindings.d.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
export function start(): void;
77
/**
8+
* This will set the log level of the overall log subscriber.
89
* @param {LogLevel} level
910
*/
1011
export function set_log_level(level: LogLevel): void;
@@ -115,8 +116,10 @@ export class WasmVM {
115116
free(): void;
116117
/**
117118
* @param {(WasmHeader)[]} headers
119+
* @param {LogLevel} log_level
120+
* @param {number} logger_id
118121
*/
119-
constructor(headers: WasmHeader[]);
122+
constructor(headers: WasmHeader[], log_level: LogLevel, logger_id: number);
120123
/**
121124
* @returns {WasmResponseHead}
122125
*/

packages/restate-sdk/src/endpoint/handlers/vm/sdk_shared_core_wasm_bindings.js

Lines changed: 22 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk-shared-core-wasm-bindings/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk-shared-core-wasm-bindings/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ default = ["console_error_panic_hook"]
1212

1313
[dependencies]
1414
wasm-bindgen = "0.2.84"
15-
restate-sdk-shared-core = { git = "https://github.com/restatedev/sdk-shared-core.git", rev = "3c342c43e91514aaa20c7ee42295162842b223ab", features = ["request_identity"] }
15+
restate-sdk-shared-core = { git = "https://github.com/restatedev/sdk-shared-core.git", rev = "0a45d53317a6e28e4c081802dff3bc2dfa111e03", features = ["request_identity"] }
1616
console_error_panic_hook = { version = "0.1.7", optional = true }
1717
serde = { version = "1.0.210", features = ["derive"] }
1818
serde-wasm-bindgen = "0.6.5"

sdk-shared-core-wasm-bindings/src/lib.rs

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,6 @@ impl WasmVM {
434434
Some(Value::CombinatorResult(handles)) => WasmAsyncResultValue::CombinatorResult(
435435
handles.into_iter().map(Into::into).collect(),
436436
),
437-
_ => {
438-
panic!("Unsupported yet")
439-
}
440437
},
441438
)
442439
}
@@ -507,8 +504,9 @@ impl WasmVM {
507504
service,
508505
handler,
509506
key,
510-
idempotency_key: None,
511-
headers: headers.into_iter().map(Header::from).collect(),},
507+
idempotency_key: None,
508+
headers: headers.into_iter().map(Header::from).collect(),
509+
},
512510
buffer.to_vec().into()
513511
))
514512
.map(Into::into)
@@ -526,18 +524,19 @@ impl WasmVM {
526524
delay: Option<u64>,
527525
) -> Result<WasmSendHandle, WasmFailure> {
528526
use_log_dispatcher!(self, |vm| CoreVM::sys_send(
529-
Target {
530-
service,
531-
handler,
532-
key,
533-
idempotency_key: None,
534-
headers: headers.into_iter().map(Header::from).collect(),
535-
},
536-
buffer.to_vec().into(),
537-
delay.map(|delay| duration_since_unix_epoch() + Duration::from_millis(delay)),
538-
))
539-
.map(Into::into)
540-
.map_err(Into::into)
527+
vm,
528+
Target {
529+
service,
530+
handler,
531+
key,
532+
idempotency_key: None,
533+
headers: headers.into_iter().map(Header::from).collect(),
534+
},
535+
buffer.to_vec().into(),
536+
delay.map(|delay| now_since_unix_epoch() + Duration::from_millis(delay)),
537+
))
538+
.map(Into::into)
539+
.map_err(Into::into)
541540
}
542541

543542
pub fn sys_awakeable(&mut self) -> Result<WasmAwakeable, WasmFailure> {

0 commit comments

Comments
 (0)