Merge remote-tracking branch 'origin/v1' into chore/merge-v1-into-v2

Author: FabianLars

.changes/feat-log-attachlogger.md

@@ -0,0 +1,5 @@
+---
+"log-js": patch
+---
+
+Added `attachLogger` helper function to register a function that should be called for each log entry.

.changes/feat-single-instance-semver.md

@@ -0,0 +1,5 @@
+---
+"single-instance": patch
+---
+
+Added the `semver` feature flag to make the single instance mechanism only trigger for semver compatible versions.

.changes/feat-websocket-tls-connector.md

@@ -0,0 +1,5 @@
+---
+"websocket": patch
+---
+
+**Breaking change:** Enable rustls by default and added a method to configure the TLS Connector for tungstenite.

.changes/upload-returnval.md

@@ -0,0 +1,6 @@
+---
+"upload": patch
+"upload-js": patch
+---
+
+Return the upload response as a string and error out if the status code is not within 200-299.

.github/workflows/covector-version-or-publish.yml

@@ -64,5 +64,5 @@ jobs:
           title: "Publish New Versions"
           commit-message: "publish new versions"
           labels: "version updates"
-          branch: "release"
+          branch: "ci/release-v1"
           body: ${{ steps.covector.outputs.change }}

Cargo.lock

@@ -13,20 +13,20 @@
     "@rollup/plugin-node-resolve": "15.2.3",
     "@rollup/plugin-terser": "0.4.4",
     "@rollup/plugin-typescript": "11.1.6",
-    "@typescript-eslint/eslint-plugin": "6.20.0",
-    "@typescript-eslint/parser": "6.20.0",
+    "@typescript-eslint/eslint-plugin": "7.6.0",
+    "@typescript-eslint/parser": "7.6.0",
     "covector": "^0.10.2",
-    "eslint": "8.56.0",
+    "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-config-standard-with-typescript": "43.0.1",
     "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-n": "16.6.2",
+    "eslint-plugin-n": "17.2.1",
     "eslint-plugin-promise": "6.1.1",
-    "eslint-plugin-security": "2.1.0",
-    "prettier": "3.2.2",
-    "rollup": "4.9.6",
+    "eslint-plugin-security": "3.0.0",
+    "prettier": "3.2.5",
+    "rollup": "4.14.3",
     "tslib": "2.6.2",
-    "typescript": "5.3.3"
+    "typescript": "5.4.5"
   },
   "resolutions": {
     "semver": ">=7.5.2",

package.json

@@ -23,7 +23,9 @@ tauri-plugin-log = "2.0.0-beta"
 tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 ```
 
-You can install the JavaScript Guest bindings using your preferred JavaScript package manager:
+If you want the single instance mechanism to only trigger for semver compatible instances of your apps, for example if you expect users to have multiple installations of your app installed, you can add `features = ["semver"]` to the dependency declaration in `Cargo.toml`.
+
+Then you can install the JavaScript Guest bindings using your preferred JavaScript package manager:
 
 > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use.
 

plugins/log/README.md

@@ -2,9 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-import { listen, UnlistenFn } from "@tauri-apps/api/event";
-
 import { invoke } from "@tauri-apps/api/core";
+import { listen, type UnlistenFn, type Event } from "@tauri-apps/api/event";
 
 export type LogOptions = {
   file?: string;
@@ -189,19 +188,38 @@ interface RecordPayload {
   message: string;
 }
 
-export async function attachConsole(): Promise<UnlistenFn> {
-  return await listen("log://log", (event) => {
-    const payload = event.payload as RecordPayload;
+type LoggerFn = (fn: RecordPayload) => void;
+
+/**
+ * Attaches a listener for the log, and calls the passed function for each log entry.
+ * @param fn
+ *
+ * @returns a function to cancel the listener.
+ */
+export async function attachLogger(fn: LoggerFn): Promise<UnlistenFn> {
+  return await listen("log://log", (event: Event<RecordPayload>) => {
+    const { level } = event.payload;
+    let { message } = event.payload;
 
     // Strip ANSI escape codes
-    const message = payload.message.replace(
+    message = message.replace(
       // TODO: Investigate security/detect-unsafe-regex
       // eslint-disable-next-line no-control-regex, security/detect-unsafe-regex
       /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
       "",
     );
+    fn({ message, level });
+  });
+}
 
-    switch (payload.level) {
+/**
+ * Attaches a listener that writes log entries to the console as they come in.
+ *
+ * @returns a function to cancel the listener.
+ */
+export async function attachConsole(): Promise<UnlistenFn> {
+  return attachLogger(({ level, message }: RecordPayload) => {
+    switch (level) {
       case LogLevel.Trace:
         console.log(message);
         break;
@@ -219,7 +237,7 @@ export async function attachConsole(): Promise<UnlistenFn> {
         break;
       default:
         // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-        throw new Error(`unknown log level ${payload.level}`);
+        throw new Error(`unknown log level ${level}`);
     }
   });
 }