Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,9 @@ jobs:
- bindings-ts-native-linux
uses: ./.github/workflows/docs-ts.yml

benchmark-ts:
benchmark-ts-browser:
needs:
- bindings-ts-browser
- bindings-ts-native-linux
uses: ./.github/workflows/benchmark-ts-browser.yml
with:
publish: false
Expand All @@ -252,6 +251,18 @@ jobs:
benchmark_user_counts: "1"
benchmark_cipher_suites: "Mls128Dhkemx25519Aes128gcmSha256Ed25519"

benchmark-ts-native:
needs:
- bindings-ts-native-darwin
- bindings-ts-native-linux
uses: ./.github/workflows/benchmark-ts-native.yml
with:
publish: false
benchmark_message_counts: "1"
benchmark_message_sizes: "16"
benchmark_user_counts: "1"
benchmark_cipher_suites: "Mls128Dhkemx25519Aes128gcmSha256Ed25519"

#################
# Rust

Expand Down
16 changes: 8 additions & 8 deletions crypto-ffi/bindings/js/packages/browser/shared/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import {
type KeyPackage,
type MlsTransport,
type MlsTransportData,
Database
} from "@wireapp/core-crypto/browser";

import { browser } from "@wdio/globals";
import type { local } from "webdriver";
import type { Database } from "#core-crypto-ffi";

// Logging can be adjusted via the CC_TEST_LOG_LEVEL variable:
// 0 = no logs
Expand Down Expand Up @@ -504,14 +504,14 @@ export interface LogEntry {

type CcInitOptions =
| {
withBasicCredential: false;
clientId?: ClientId;
}
withBasicCredential: false;
clientId?: ClientId;
}
| {
withBasicCredential?: true;
cipherSuite?: Ciphersuite;
clientId?: ClientId;
};
withBasicCredential?: true;
cipherSuite?: Ciphersuite;
clientId?: ClientId;
};

export interface Helpers {
newClientId(clientIdStr?: string): ClientId;
Expand Down
2 changes: 1 addition & 1 deletion make/ts.mk
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ ts-clean: ## Cleanup old TypeScript build outputs
&& rm -rf $(WASM_TARGET_DIR) \
&& rm -rf $(JS_DIR)/rust_modules

ubrn-deps := $(RUST_SOURCES)
ubrn-deps := $(RUST_SOURCES) $(BUN_LOCK) $(NODE_MODULES)
$(WASM_FFI_LIB) $(BROWSER_TS_IMPL) $(RUST_MODULES_STAMP) &: $(ubrn-deps)
cd $(JS_DIR) && $(WASM_BUILD_ENV) bun ubrn build web --no-wasm-pack
touch $(RUST_MODULES_STAMP)
Expand Down
Loading