ignore already published

chore: Bump to 0.5.2
fix(stable): improve the way the kernel calculates how many pages to allocate (#471 )
2026-01-13 07:47:56 -05:00 · 2023-09-21 10:15:12 -05:00 · 2023-09-21 09:41:27 -05:00 · 2023-09-20 16:02:42 -07:00 · 2023-09-18 19:17:47 -05:00 · 2023-09-18 19:08:27 -05:00
16 changed files with 245 additions and 217 deletions
--- a/.github/workflows/release-rust.yaml
+++ b/.github/workflows/release-rust.yaml
@@ -29,11 +29,11 @@ jobs:
          sleep 5 

      - name: Release Rust Host SDK
+        if: always()
        env:
          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_API_TOKEN }}
        run: |
-
-          cargo publish --manifest-path runtime/Cargo.toml --no-verify
+          #cargo publish --manifest-path runtime/Cargo.toml --no-verify
          cargo publish --manifest-path rust/Cargo.toml
      
  
--- a/dotnet/src/Extism.Sdk/Extism.Sdk.csproj
+++ b/dotnet/src/Extism.Sdk/Extism.Sdk.csproj
@@ -1,28 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<PropertyGroup>
-		<TargetFramework>netstandard2.1</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-		<LangVersion>10</LangVersion>
-	</PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <LangVersion>10</LangVersion>
+  </PropertyGroup>

-	<PropertyGroup>
-		<PackageId>Extism.Sdk</PackageId>
-		<Version>0.6.0</Version>
-		<Authors>Extism Contributors</Authors>
-		<Description>Extism SDK that allows hosting Extism plugins in .NET apps.</Description>
-		<Tags>extism, wasm, plugin</Tags>
-		<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
-		<PackageReadmeFile>README.md</PackageReadmeFile>
-	</PropertyGroup>
+  <PropertyGroup>
+    <PackageId>Extism.Sdk</PackageId>
+    <Version>0.7.0</Version>
+    <Authors>Extism Contributors</Authors>
+    <Description>Extism SDK that allows hosting Extism plugins in .NET apps.</Description>
+    <Tags>extism, wasm, plugin</Tags>
+    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+  </PropertyGroup>

-	<ItemGroup>
-		<None Include="README.md" Pack="true" PackagePath="\"/>
-	</ItemGroup>
+  <ItemGroup>
+    <None Include="README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>

-	<ItemGroup>
-		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+  </ItemGroup>
 </Project>
--- a/elixir/mix.exs
+++ b/elixir/mix.exs
@@ -4,7 +4,7 @@ defmodule Extism.MixProject do
  def project do
    [
      app: :extism,
-      version: "0.4.0",
+      version: "0.5.0",
      elixir: "~> 1.12",
      start_permanent: Mix.env() == :prod,
      deps: deps(),
--- a/elixir/native/extism_nif/Cargo.toml
+++ b/elixir/native/extism_nif/Cargo.toml
@@ -14,5 +14,5 @@ crate-type = ["cdylib"]

 [dependencies]
 rustler = "0.28.0"
-extism = "0.4.0"
+extism = "0.5.0"
 log = "0.4"
--- a/haskell/extism.cabal
+++ b/haskell/extism.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               extism
-version:            0.4.0
+version:            0.5.0
 license:            BSD-3-Clause
 maintainer:         oss@extism.org
 author:             Extism authors
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -1,193 +1,194 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.extism.sdk</groupId>
-    <artifactId>extism</artifactId>
-    <packaging>jar</packaging>
-    <version>0.4.0</version>
-    <name>extism</name>
-    <url>https://github.com/extism/extism</url>
-    <description>Java-SDK for Extism to use webassembly from Java</description>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.extism.sdk</groupId>
+  <artifactId>extism</artifactId>
+  <packaging>jar</packaging>
+  <version>0.5.0</version>
+  <name>extism</name>
+  <url>https://github.com/extism/extism</url>
+  <description>Java-SDK for Extism to use webassembly from Java</description>

-    <licenses>
-        <license>
-            <name>BSD 3-Clause</name>
-            <url>https://opensource.org/licenses/BSD-3-Clause</url>
-        </license>
-    </licenses>
+  <licenses>
+    <license>
+      <name>BSD 3-Clause</name>
+      <url>https://opensource.org/licenses/BSD-3-Clause</url>
+    </license>
+  </licenses>

-    <organization>
-        <name>Dylibso, Inc.</name>
-        <url>https://dylib.so</url>
-    </organization>
+  <organization>
+    <name>Dylibso, Inc.</name>
+    <url>https://dylib.so</url>
+  </organization>

-    <developers>
-        <developer>
-            <name>The Extism Authors</name>
-            <email>oss@extism.org</email>
-            <roles>
-                <role>Maintainer</role>
-            </roles>
-            <organization>Dylibso, Inc.</organization>
-            <organizationUrl>https://dylib.so</organizationUrl>
-        </developer>
-    </developers>
+  <developers>
+    <developer>
+      <name>The Extism Authors</name>
+      <email>oss@extism.org</email>
+      <roles>
+        <role>Maintainer</role>
+      </roles>
+      <organization>Dylibso, Inc.</organization>
+      <organizationUrl>https://dylib.so</organizationUrl>
+    </developer>
+  </developers>

-    <scm>
-        <connection>scm:git:git://github.com/extism/extism.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com/extism/extism.git</developerConnection>
-        <url>https://github.com/extism/extism/tree/main/java</url>
-        <tag>main</tag>
-    </scm>
+  <scm>
+    <connection>scm:git:git://github.com/extism/extism.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/extism/extism.git</developerConnection>
+    <url>https://github.com/extism/extism/tree/main/java</url>
+    <tag>main</tag>
+  </scm>

-    <issueManagement>
-        <system>Github</system>
-        <url>https://github.com/extism/extism/issues</url>
-    </issueManagement>
+  <issueManagement>
+    <system>Github</system>
+    <url>https://github.com/extism/extism/issues</url>
+  </issueManagement>

-    <properties>
-        <java.version>11</java.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  <properties>
+    <java.version>11</java.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

-        <!-- dependencies -->
-        <jna.version>5.12.1</jna.version>
-        <gson.version>2.10</gson.version>
+    <!-- dependencies -->
+    <jna.version>5.12.1</jna.version>
+    <gson.version>2.10</gson.version>

-        <!-- testing -->
-        <junit-jupiter-engine.version>5.9.1</junit-jupiter-engine.version>
-        <assertj-core.version>3.23.1</assertj-core.version>
+    <!-- testing -->
+    <junit-jupiter-engine.version>5.9.1</junit-jupiter-engine.version>
+    <assertj-core.version>3.23.1</assertj-core.version>

-        <!-- maven plugins -->
-        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+    <!-- maven plugins -->
+    <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+    <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>

-        <!-- jreleaser -->
-        <jreleaser.git.root.search>true</jreleaser.git.root.search>
-    </properties>
+    <!-- jreleaser -->
+    <jreleaser.git.root.search>true</jreleaser.git.root.search>
+  </properties>

-    <profiles>
-      <profile>
-        <id>release</id>
-        <build>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-javadoc-plugin</artifactId>
-              <version>3.4.1</version>
-              <configuration>
-               <additionalJOption>-Xdoclint:none</additionalJOption>
-              </configuration>
-              <executions>
-                <execution>
-                  <id>attach-javadoc</id>
-                  <goals>
-                    <goal>jar</goal>
-                  </goals>
-                </execution>
-              </executions>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-source-plugin</artifactId>
-              <version>3.2.1</version>
-              <executions>
-                <execution>
-                  <id>attach-source</id>
-                  <goals>
-                    <goal>jar</goal>
-                  </goals>
-                </execution>
-              </executions>
-            </plugin>
-            <plugin>
-              <groupId>org.jreleaser</groupId>
-              <artifactId>jreleaser-maven-plugin</artifactId>
-              <version>1.3.1</version>
-              <configuration>
-                <jreleaser>
-                  <release>
-                    <github>
-                      <skipRelease>true</skipRelease>
-                    </github>
-                  </release>
-                  <signing>
-                    <active>ALWAYS</active>
-                    <armored>true</armored>
-                  </signing>
-                  <deploy>
-                    <maven>
-                      <nexus2>
-                        <maven-central>
-                          <active>ALWAYS</active>
-                          <url>https://s01.oss.sonatype.org/service/local</url>
-                          <!--
+  <profiles>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>3.4.1</version>
+            <configuration>
+              <additionalJOption>-Xdoclint:none</additionalJOption>
+            </configuration>
+            <executions>
+              <execution>
+                <id>attach-javadoc</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>3.2.1</version>
+            <executions>
+              <execution>
+                <id>attach-source</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.jreleaser</groupId>
+            <artifactId>jreleaser-maven-plugin</artifactId>
+            <version>1.3.1</version>
+            <configuration>
+              <jreleaser>
+                <release>
+                  <github>
+                    <skipRelease>true</skipRelease>
+                  </github>
+                </release>
+                <signing>
+                  <active>ALWAYS</active>
+                  <armored>true</armored>
+                </signing>
+                <deploy>
+                  <maven>
+                    <nexus2>
+                      <maven-central>
+                        <active>ALWAYS</active>
+                        <url>https://s01.oss.sonatype.org/service/local</url>
+                        <!--
                          <closeRepository>false</closeRepository>
                          <releaseRepository>false</releaseRepository>
                          -->
-                          <stagingRepositories>target/staging-deploy</stagingRepositories>
-                        </maven-central>
-                      </nexus2>
-                    </maven>
-                  </deploy>
-                </jreleaser>
-              </configuration>
-            </plugin>
-          </plugins>
-        </build>
-      </profile>
-    </profiles>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <release>${java.version}</release>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <systemPropertyVariables>
-                        <jna.library.path>../target/release</jna.library.path>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
+                        <stagingRepositories>target/staging-deploy</stagingRepositories>
+                      </maven-central>
+                    </nexus2>
+                  </maven>
+                </deploy>
+              </jreleaser>
+            </configuration>
+          </plugin>
        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>net.java.dev.jna</groupId>
-            <artifactId>jna</artifactId>
-            <version>${jna.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit-jupiter-engine.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertj-core.version}</version>
-            <scope>test</scope>
-        </dependency>
+      </build>
+    </profile>
+  </profiles>

-        <dependency>
-            <groupId>uk.org.webcompere</groupId>
-            <artifactId>model-assert</artifactId>
-            <version>1.0.0</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${maven-compiler-plugin.version}</version>
+        <configuration>
+          <release>${java.version}</release>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${maven-surefire-plugin.version}</version>
+        <configuration>
+          <systemPropertyVariables>
+            <jna.library.path>../target/release</jna.library.path>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna</artifactId>
+      <version>${jna.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>${gson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>${junit-jupiter-engine.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>${assertj-core.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>uk.org.webcompere</groupId>
+      <artifactId>model-assert</artifactId>
+      <version>1.0.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
--- a/kernel/src/lib.rs
+++ b/kernel/src/lib.rs
@@ -119,9 +119,13 @@ pub struct MemoryBlock {

 /// Returns the number of pages needed for the given number of bytes
 pub fn num_pages(nbytes: u64) -> usize {
-    let nbytes = nbytes as f64;
-    let page = PAGE_SIZE as f64;
-    ((nbytes / page) + 0.5) as usize
+    let npages = nbytes / PAGE_SIZE as u64;
+    let remainder = nbytes % PAGE_SIZE as u64;
+    if remainder != 0 {
+        (npages + 1) as usize
+    } else {
+        npages as usize
+    }
 }

 // Get the `MemoryRoot` at the correct offset in memory
@@ -242,13 +246,13 @@ impl MemoryRoot {
        let curr = self.blocks.as_ptr() as u64 + self_position;

        // Get the number of bytes available
-        let mem_left = self_length - self_position;
+        let mem_left = self_length - self_position - core::mem::size_of::<MemoryRoot>() as u64;

        // When the allocation is larger than the number of bytes available
        // we will need to try to grow the memory
        if length >= mem_left {
            // Calculate the number of pages needed to cover the remaining bytes
-            let npages = num_pages(length);
+            let npages = num_pages(length - mem_left);
            let x = core::arch::wasm32::memory_grow(0, npages);
            if x == usize::MAX {
                return None;
--- a/libextism/Cargo.toml
+++ b/libextism/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libextism"
-version = "0.5.0"
+version = "0.5.2"
 edition = "2021"
 authors = ["The Extism Authors", "oss@extism.org"]
 license = "BSD-3-Clause"
--- a/node/package.json
+++ b/node/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@extism/extism",
-  "version": "0.4.0",
+  "version": "0.5.0",
  "description": "Extism Host SDK for Node",
  "keywords": [
    "extism",
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "extism"
-version = "0.4.0"
+version = "0.5.0"
 description = "Extism Host SDK for python"
 authors = ["The Extism Authors <oss@extism.org>"]
 license = "BSD-3-Clause"
--- a/ruby/lib/extism/version.rb
+++ b/ruby/lib/extism/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true

 module Extism
-  VERSION = "0.4.0"
+  VERSION = '0.5.0'
 end
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "extism-runtime"
-version = "0.5.0"
+version = "0.5.2"
 edition = "2021"
 authors = ["The Extism Authors", "oss@extism.org"]
 license = "BSD-3-Clause"
--- a/runtime/src/extism-runtime.wasm
+++ b/runtime/src/extism-runtime.wasm
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "extism"
-version = "0.5.0"
+version = "0.5.1"
 edition = "2021"
 authors = ["The Extism Authors", "oss@extism.org"]
 license = "BSD-3-Clause"
@@ -10,7 +10,7 @@ description = "Extism Host SDK for Rust"

 [dependencies]
 extism-manifest = { version = "0.5.0", path = "../manifest" }
-extism-runtime = { version = "0.5.0", path = "../runtime"}
+extism-runtime = { version = "0.5.2", path = "../runtime"}
 serde_json = "1"
 log = "0.4"
 anyhow = "1"
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -45,6 +45,7 @@ mod tests {
    const WASM: &[u8] = include_bytes!("../../wasm/code-functions.wasm");
    const WASM_LOOP: &[u8] = include_bytes!("../../wasm/loop.wasm");
    const WASM_GLOBALS: &[u8] = include_bytes!("../../wasm/globals.wasm");
+    const REFLECT_WASM: &[u8] = include_bytes!("../../wasm/reflect.wasm");

    fn hello_world(
        plugin: &mut CurrentPlugin,
@@ -53,8 +54,8 @@ mod tests {
        _user_data: UserData,
    ) -> Result<(), Error> {
        let input_offs = inputs[0].unwrap_i64() as u64;
-        let input = plugin.memory_read_str(input_offs).unwrap().to_string();
-
+        let length = plugin.memory_length(input_offs);
+        let input = plugin.memory_read(input_offs, length).to_vec();
        let output = plugin.memory_alloc_bytes(&input).unwrap();
        outputs[0] = Val::I64(output as i64);
        Ok(())
@@ -319,4 +320,26 @@ mod tests {
            assert_eq!(count.get("count").unwrap().as_i64().unwrap(), i);
        }
    }
+
+    #[test]
+    fn test_fuzz_reflect_plugin() {
+        // assert!(set_log_file("stdout", Some(log::Level::Trace)));
+        let f = Function::new(
+            "host_reflect",
+            [ValType::I64],
+            [ValType::I64],
+            None,
+            hello_world,
+        );
+
+        let context = Context::new();
+        let mut plugin = Plugin::new(&context, REFLECT_WASM, [f], true).unwrap();
+
+        for i in 1..65540 {
+            let input = "a".repeat(i);
+            let output = plugin.call("reflect", input.clone());
+            let output = std::str::from_utf8(output.unwrap()).unwrap();
+            assert_eq!(output, input);
+        }
+    }
 }
--- a/wasm/reflect.wasm
+++ b/wasm/reflect.wasm
Author	SHA1	Message	Date
Benjamin Eckel	14d7eae99c	ignore already published	2023-09-21 10:15:12 -05:00
Benjamin Eckel	e89ddd5a2a	chore: Bump to 0.5.2	2023-09-21 09:41:27 -05:00
zach	93392e0884	fix(stable): improve the way the kernel calculates how many pages to allocate (#471 ) Fixes a bug in the kernel memory allocator where the space used by the `MemoryRoot` wasn't being considered --------- Co-authored-by: Benjamin Eckel <bhelx@users.noreply.github.com>	2023-09-20 16:02:42 -07:00
Benjamin Eckel	4ebd0eb372	chore: always run the publish of SDK	2023-09-18 19:17:47 -05:00
zach	8feee0c693	cleanup(stable): use wasm-strip on extism-runtime.wasm (#467 )	2023-09-18 19:08:27 -05:00
Benjamin Eckel	773ab32a45	chore: Bump to 0.5.1	2023-09-18 18:55:46 -05:00
Benjamin Eckel	6a041d0c39	fix: Fixes rounding issue in kernel num_pages (#466 ) There were some scenarios where the kernel was not allocating enough pages to get data back into the plugin. So some host functions were failing when the output was right on this boundary. Related https://github.com/moonrepo/proto/issues/208 We will come back with tests and cherry pick this over to main. For now we want to get out a 0.5.1 fix	2023-09-18 18:53:30 -05:00
Benjamin Eckel	745a03ece4	release: Bump elixir nif to rust 0.5 (#431 )	2023-08-24 13:37:48 -05:00
Benjamin Eckel	67eb8c1571	release: Bump the rest of the SDKs (#430 )	2023-08-24 12:41:31 -05:00