bump 0.0.40 to fix alpine and a few smaller issues

skadefro · skadefro · commit 32dc6c0435ec · 2025-08-11T11:10:53.000+02:00
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -0,0 +1,20 @@
+[target.x86_64-unknown-linux-gnu]
+runner = "sudo -E"
+rustflags = [
+    "-C", "link-arg=-lgcc_s",
+    "-C", "link-arg=-Wl,--no-as-needed",
+    "-C", "link-arg=-ldl"
+]
+
+[env]
+OPENSSL_NO_PKG_CONFIG = "1"
+OPENSSL_STATIC = "1"
+
+[target.x86_64-unknown-linux-musl]
+# allow building .so files on musl
+rustflags = ["-Ctarget-feature=-crt-static"]
+
+[target.aarch64-unknown-linux-musl]
+# allow building .so files on musl
+rustflags = ["-Ctarget-feature=-crt-static"]
+
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cross.toml b/Cross.toml
@@ -1,8 +1,14 @@
 [build]
 default-target = "x86_64-unknown-linux-gnu"
+pre-build = [
+    "apt-get update && apt-get install --assume-yes protobuf-compiler curl libc6-dev"
+]
+
+[target.aarch64-apple-darwin]
+image = "registry.demo.openiap.io/aarch64-apple-darwin"
 
 [target.x86_64-apple-darwin]
 image = "registry.demo.openiap.io/x86_64-apple-darwin"
 
-[target.aarch64-apple-darwin]
-image = "registry.demo.openiap.io/aarch64-apple-darwin"
+#cross-util run -i -v  --target target.aarch64-apple-darwin -- bash
+#cross-util run -i -v  --target target.x86_64-apple-darwin -- bash
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: clean build build-all package package-all publish publish-all
 # Variables
-VERSION = 0.0.39
+VERSION = 0.0.40
 NUGET_API_KEY ?= $(NUGET_API_KEY)
 PS_API_KEY := $(PS_API_KEY)
 MAVEN_AUTH := $(shell echo "$(MAVEN_USERNAME):$(MAVEN_PASSWORD)" | base64)
@@ -59,6 +59,7 @@ clean:
 	# rm -rf target/lib target/cli php/vendor
 	rm -rf java/lib java/target
 	rm -rf lib
+	cargo clean
 
 # Create target directories
 prepare:
@@ -67,25 +68,29 @@ prepare:
 # Build Rust binaries
 build-linux:
 	mkdir -p target/lib target/bootstrap target/cli lib
+	rm -rf target/release/
 	cross build --target x86_64-unknown-linux-gnu --release
 	cp target/x86_64-unknown-linux-gnu/release/libopeniap_clib.so target/lib/libopeniap-linux-x64.so
 	cp target/x86_64-unknown-linux-gnu/release/libopeniap_bootstrap.so target/bootstrap/bootstrap-linux-x64.so
 	cp target/x86_64-unknown-linux-gnu/release/openiap target/cli/linux-x64-openiap
 	cp target/x86_64-unknown-linux-gnu/release/openiap-bootstrap target/cli/linux-x64-openiap-bootstrap
+	rm -rf target/release/
 	cross build --target aarch64-unknown-linux-gnu --release
 	cp target/aarch64-unknown-linux-gnu/release/libopeniap_clib.so target/lib/libopeniap-linux-arm64.so
 	cp target/aarch64-unknown-linux-gnu/release/libopeniap_bootstrap.so target/bootstrap/bootstrap-linux-arm64.so
 	cp target/aarch64-unknown-linux-gnu/release/openiap target/cli/linux-arm64-openiap
 	cp target/aarch64-unknown-linux-gnu/release/openiap-bootstrap target/cli/linux-arm64-openiap-bootstrap
 
+	rm -rf target/release/
 	cross build --target x86_64-unknown-linux-musl --release
-	cp target/x86_64-unknown-linux-musl/release/libopeniap_clib.a target/lib/libopeniap-linux-musl-x64.a
-	cp target/x86_64-unknown-linux-musl/release/libopeniap_bootstrap.a target/bootstrap/bootstrap-linux-musl-x64.a
+	cp target/x86_64-unknown-linux-musl/release/libopeniap_clib.so target/lib/libopeniap-linux-musl-x64.so
+	cp target/x86_64-unknown-linux-musl/release/libopeniap_bootstrap.so target/bootstrap/bootstrap-linux-musl-x64.so
 	cp target/x86_64-unknown-linux-musl/release/openiap target/cli/linux-x64-musl-openiap
 	cp target/x86_64-unknown-linux-musl/release/openiap-bootstrap target/cli/linux-x64-musl-openiap-bootstrap
+	rm -rf target/release/
 	cross build --target aarch64-unknown-linux-musl --release
-	cp target/aarch64-unknown-linux-musl/release/libopeniap_clib.a target/lib/libopeniap-linux-musl-arm64.a
-	cp target/aarch64-unknown-linux-musl/release/libopeniap_bootstrap.a target/bootstrap/bootstrap-linux-musl-arm64.a
+	cp target/aarch64-unknown-linux-musl/release/libopeniap_clib.so target/lib/libopeniap-linux-musl-arm64.so
+	cp target/aarch64-unknown-linux-musl/release/libopeniap_bootstrap.so target/bootstrap/bootstrap-linux-musl-arm64.so
 	cp target/aarch64-unknown-linux-musl/release/openiap target/cli/linux-arm64-musl-openiap
 	cp target/aarch64-unknown-linux-musl/release/openiap-bootstrap target/cli/linux-arm64-musl-openiap-bootstrap
 	
@@ -96,11 +101,13 @@ build-linux:
 
 build-macos:
 	mkdir -p target/lib target/cli target/bootstrap target/cli lib
+	rm -rf target/release/
 	cross build --target aarch64-apple-darwin --release
 	cp target/aarch64-apple-darwin/release/libopeniap_clib.dylib target/lib/libopeniap-macos-arm64.dylib
 	cp target/aarch64-apple-darwin/release/libopeniap_bootstrap.dylib target/bootstrap/bootstrap-macos-arm64.dylib
 	cp target/aarch64-apple-darwin/release/openiap target/cli/macos-arm64-openiap
 	cp target/aarch64-apple-darwin/release/openiap-bootstrap target/cli/macos-arm64-openiap-bootstrap
+	rm -rf target/release/
 	cross build --target x86_64-apple-darwin --release
 	cp target/x86_64-apple-darwin/release/libopeniap_clib.dylib target/lib/libopeniap-macos-x64.dylib
 	cp target/x86_64-apple-darwin/release/libopeniap_bootstrap.dylib target/bootstrap/bootstrap-macos-x64.dylib
@@ -109,11 +116,13 @@ build-macos:
 
 build-windows:
 	mkdir -p target/lib target/cli target/bootstrap target/cli lib
+	rm -rf target/release/
 	cross build --target x86_64-pc-windows-gnu --release
 	cp target/x86_64-pc-windows-gnu/release/openiap_clib.dll target/lib/openiap-windows-x64.dll
 	cp target/x86_64-pc-windows-gnu/release/openiap_bootstrap.dll target/bootstrap/bootstrap-windows-x64.dll
 	cp target/x86_64-pc-windows-gnu/release/openiap.exe target/cli/windows-x64-openiap.exe
 	cp target/x86_64-pc-windows-gnu/release/openiap-bootstrap.exe target/cli/windows-x64-openiap-bootstrap.exe
+	rm -rf target/release/
 	cross build --target i686-pc-windows-gnu --release
 	cp target/i686-pc-windows-gnu/release/openiap_clib.dll target/lib/openiap-windows-i686.dll
 	cp target/i686-pc-windows-gnu/release/openiap_bootstrap.dll target/bootstrap/bootstrap-windows-i686.dll
@@ -126,10 +135,10 @@ build-go:
 	(cd go && go build -o cli ./cmd/cli)
 
 copy-lib:
-	rm -rf node/lib && mkdir -p node/lib && cp target/bootstrap/* node/lib && rm -rf node/lib/*.a
-	rm -rf dotnet/lib && mkdir -p dotnet/lib && cp target/bootstrap/* dotnet/lib && rm -rf dotnet/lib/*.a
-	rm -rf python/openiap/lib && mkdir -p python/openiap/lib && cp target/bootstrap/* python/openiap/lib && rm -rf python/openiap/lib/*.a
-	rm -rf java/lib && mkdir -p java/lib && cp target/bootstrap/* java/lib && rm -rf java/lib/*.a
+	rm -rf node/lib && mkdir -p node/lib && cp target/bootstrap/* node/lib 
+	rm -rf dotnet/lib && mkdir -p dotnet/lib && cp target/bootstrap/* dotnet/lib 
+	rm -rf python/openiap/lib && mkdir -p python/openiap/lib && cp target/bootstrap/* python/openiap/lib 
+	rm -rf java/lib && mkdir -p java/lib && cp target/bootstrap/* java/lib 
 	rm -rf c/lib && mkdir -p c/lib && cp target/lib/* c/lib 
 	rm -rf go/lib && mkdir -p go/lib && cp target/lib/* go/lib && rm -rf go/lib/*.a
 
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ node test.js
 python
 ```bash
 cd python
-pip uninstall openiap -y && pip install dist/openiap-0.0.39-py3-none-any.whl && python test.py
+pip uninstall openiap -y && pip install dist/openiap-0.0.40-py3-none-any.whl && python test.py
 
 ```
 dotnet
diff --git a/c/Makefile b/c/Makefile
@@ -1,6 +1,6 @@
 TARGET          := client_cli
 SRCS            := main.c
-OPENIAP_VERSION := 0.0.39
+OPENIAP_VERSION := 0.0.40
 INCLUDE_DIR     := include
 OBJS            := $(SRCS:.c=.o)
 
diff --git a/crates/bootstrap/Cargo.toml b/crates/bootstrap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "openiap-bootstrap"
-version = "0.0.39"
+version = "0.0.40"
 edition = "2021"
 description = "Bootstrap helper for downloading OpenIAP shared library"
 
diff --git a/crates/bootstrap/src/lib2.rs b/crates/bootstrap/src/lib2.rs
@@ -78,14 +78,14 @@ pub extern "C" fn bootstrap() -> *const c_char {
         ("windows", "aarch64") => "openiap-windows-arm64.dll",
         ("linux", "x86_64") => {
             if std::path::Path::new("/etc/alpine-release").exists() {
-                "libopeniap-linux-musl-x64.a"
+                "libopeniap-linux-musl-x64.so"
             } else {
                 "libopeniap-linux-x64.so"
             }
         },
         ("linux", "aarch64") => {
             if std::path::Path::new("/etc/alpine-release").exists() {
-                "libopeniap-linux-musl-arm64.a"
+                "libopeniap-linux-musl-arm64.so"
             } else {
                 "libopeniap-linux-arm64.so"
             }
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -2,7 +2,7 @@
 name = "openiap"
 description = "openiap test client"
 license = "MPL-2.0"
-version = "0.0.39"
+version = "0.0.40"
 edition = "2021"
 
 [dependencies]
diff --git a/crates/clib/Cargo.toml b/crates/clib/Cargo.toml
@@ -2,7 +2,7 @@
 name = "openiap-clib"
 description = "openiap client c library for SDK wrappers"
 license = "MPL-2.0"
-version = "0.0.39"
+version = "0.0.40"
 edition = "2021"
 
 [lib]
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
@@ -2,7 +2,7 @@
 name = "openiap-client"
 description = "openiap client library"
 license = "MPL-2.0"
-version = "0.0.39"
+version = "0.0.40"
 edition = "2021"
 
 [dependencies]
diff --git a/crates/proto/Cargo.toml b/crates/proto/Cargo.toml
@@ -2,7 +2,7 @@
 name = "openiap-proto"
 description = "compiled protos for openiap"
 license = "MPL-2.0"
-version = "0.0.39"
+version = "0.0.40"
 edition = "2021"
 
 [dependencies]
diff --git a/dotnet/Client.cs b/dotnet/Client.cs
@@ -856,7 +856,7 @@ private static string GetBootstrapPath()
                 if (!Environment.Is64BitProcess) throw new LibraryLoadError("Linux requires a 64-bit process");
                 if (System.IO.File.Exists("/etc/alpine-release"))
                 {
-                    libfile = arc == Architecture.Arm64 ? "bootstrap-linux-musl-arm64.a" : "bootstrap-linux-musl-x64.a";
+                    libfile = arc == Architecture.Arm64 ? "bootstrap-linux-musl-arm64.so" : "bootstrap-linux-musl-x64.so";
                 }
                 else
                 {
diff --git a/dotnet/openiap.csproj b/dotnet/openiap.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <PackageId>openiap</PackageId>
     <id>openiap</id>
-    <version>0.0.39</version>
+    <version>0.0.40</version>
     <title>OpenIAP API Wrapper</title>
     <authors>OpenIAP ApS / Allan Zimmermann</authors>
     <owners>OpenIAP ApS</owners>
@@ -48,6 +48,11 @@
   <None Include="runtimes/win-x86/native/openiap_clib.dll" Pack="true" PackagePath="runtimes/win-x86/native/openiap_clib.dll" />
   <None Include="runtimes/win-x64/native/openiap_clib.dll" Pack="true" PackagePath="runtimes/win-x64/native/openiap_clib.dll" /> -->
 
+  <Content Include="lib/*.a">
+    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <PackageCopyToOutput>true</PackageCopyToOutput>
+    <pack>true</pack>
+  </Content>
   <Content Include="lib/*.so">
     <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     <PackageCopyToOutput>true</PackageCopyToOutput>
diff --git a/java/README.md b/java/README.md
@@ -7,19 +7,19 @@ mvn clean package
 
 in pom.xml, add:
 ```
-io.openiap:client:0.0.39
+io.openiap:client:0.0.40
 ```
 
 or for Gradle uses, add:
 ```bash
 dependencies {
-    implementation 'io.openiap:client:0.0.39'
+    implementation 'io.openiap:client:0.0.40'
 }
 ```
 
 To run the test application:
 ```bash
 mvn package
-java -jar target/client-0.0.39-jar-with-dependencies.jar
+java -jar target/client-0.0.40-jar-with-dependencies.jar
 ```
 
diff --git a/java/pom.xml b/java/pom.xml
@@ -6,7 +6,7 @@
     <name>OpenIAP Java Client</name>
     <groupId>io.openiap</groupId>
     <artifactId>client</artifactId>
-    <version>0.0.39</version>
+    <version>0.0.40</version>
     <url>https://github.com/openiap/rustapi/tree/main/java</url>
     <description>Java SDK for OpenIAP core</description>
     <scm>
diff --git a/java/src/main/java/io/openiap/NativeLoader.java b/java/src/main/java/io/openiap/NativeLoader.java
@@ -33,8 +33,8 @@ public static String getBootstrapPath() {
                 throw new RuntimeException("Linux requires a 64-bit process");
             boolean isAlpine = new File("/etc/alpine-release").exists();
             if (isAlpine) {
-                libfile = arch.contains("aarch64") || arch.contains("arm64") ? "bootstrap-linux-musl-arm64.a"
-                        : "bootstrap-linux-musl-x64.a";
+                libfile = arch.contains("aarch64") || arch.contains("arm64") ? "bootstrap-linux-musl-arm64.so"
+                        : "bootstrap-linux-musl-x64.so";
             } else {
                 libfile = arch.contains("aarch64") || arch.contains("arm64") ? "bootstrap-linux-arm64.so"
                         : "bootstrap-linux-x64.so";
diff --git a/node/cli.js b/node/cli.js
@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 const { Client, ClientError } = require('./lib');
 const client = new Client();
 const readline = require("readline");
@@ -47,6 +48,15 @@ target = "_new" > function addOneLoop(numLoops) {
 
 // Main function
 async function doit() {
+    // print arguments
+    let args = process.argv.slice(2);
+    // console.log("Arguments (" + args.length + "):", args.join(" "));
+    // console.log(process.env.npm_execpath);
+    if (process.env.npm_execpath && process.env.npm_execpath.includes("npm") && args.length === 0) {
+        console.log("Running with npm and no args, so exiting.");
+        return;
+    }
+
     if (global.gc) {
         global.gc();
     } else {
diff --git a/node/lib.d.ts b/node/lib.d.ts
@@ -225,14 +225,16 @@ export class Client {
         id: any;
         recursive?: boolean;
     }): any;
-    delete_many({ collectionname, query, recursive }: {
+    delete_many({ collectionname, query, ids, recursive }: {
         collectionname: any;
         query: any;
+        ids?: any[];
         recursive?: boolean;
     }): any;
-    delete_many_async({ collectionname, query, recursive }: {
+    delete_many_async({ collectionname, query, ids, recursive }: {
         collectionname: any;
         query: any;
+        ids?: any[];
         recursive?: boolean;
     }): any;
     download({ collectionname, id, folder, filename }: {
diff --git a/node/lib.d.ts.map b/node/lib.d.ts.map
diff --git a/node/lib.js b/node/lib.js
diff --git a/node/package.json b/node/package.json
diff --git a/pwsh/openiap/bootstrap.ps1 b/pwsh/openiap/bootstrap.ps1
diff --git a/python/README.md b/python/README.md
diff --git a/python/openiap/main.py b/python/openiap/main.py
diff --git a/python/pyproject.toml b/python/pyproject.toml
diff --git a/python/setup.py b/python/setup.py
