feat: Change the exception about No JUMBF Found to null (#34)

* feat: update c2pa version

Add builder methods addIngredient and addAction

Breaking change: old addIngredient renamed to addIngredientFromAsset

* feat: change the exception about No JUMBF Found to null

* fix: Make asset optional for addIngredient

* chore: add changeset

Author: cdmurph32

.changeset/hot-dancers-open.md

@@ -0,0 +1,5 @@
+---
+"@contentauth/c2pa-node": patch
+---
+
+Make asset in Builder.addIngredient optional. Add Builder.addAction

Cargo.lock

@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 [dependencies]
 async-trait = "0.1.77"
 ciborium = "0.2.2"
-c2pa = { version = "0.70.0", default-features = false, features = ["file_io", "pdf", "fetch_remote_manifests", "add_thumbnails", "rust_native_crypto", "default_http"] }
+c2pa = { version = "0.72.0", default-features = false, features = ["file_io", "pdf", "fetch_remote_manifests", "add_thumbnails", "rust_native_crypto", "default_http"] }
 futures = "0.3"
 image = "0.25.6"
 neon = { version = "1.0.0", default-features = false, features = [

Cargo.toml

@@ -210,8 +210,9 @@ describe("Builder", () => {
       expect(bytes.length).toBeGreaterThan(0);
 
       const reader = await Reader.fromAsset(dest);
-      const manifestStore = reader.json();
-      const activeManifest = reader.getActive();
+      expect(reader).not.toBeNull();
+      const manifestStore = reader!.json();
+      const activeManifest = reader!.getActive();
       expect(manifestStore.validation_status![0].code).toBe(
         "signingCredential.untrusted",
       );
@@ -237,7 +238,8 @@ describe("Builder", () => {
 
       // Read and verify the assertion in the signed manifest
       const reader = await Reader.fromAsset(dest);
-      const activeManifest = reader.getActive();
+      expect(reader).not.toBeNull();
+      const activeManifest = reader!.getActive();
       const cborAssertion = activeManifest?.assertions?.find(
         (a: any) => a.label === "c2pa.actions.v2",
       );
@@ -265,8 +267,9 @@ describe("Builder", () => {
         buffer: dest.buffer! as Buffer,
         mimeType: "jpeg",
       });
-      const manifestStore = reader.json();
-      const activeManifest = reader.getActive();
+      expect(reader).not.toBeNull();
+      const manifestStore = reader!.json();
+      const activeManifest = reader!.getActive();
       expect(manifestStore.validation_status![0].code).toBe(
         "signingCredential.untrusted",
       );
@@ -296,8 +299,9 @@ describe("Builder", () => {
       expect(bytes.length).toBeGreaterThan(0);
 
       const reader = await Reader.fromAsset(dest);
-      const manifestStore = reader.json();
-      const activeManifest = reader.getActive();
+      expect(reader).not.toBeNull();
+      const manifestStore = reader!.json();
+      const activeManifest = reader!.getActive();
       expect(manifestStore.validation_status![0].code).toBe(
         "signingCredential.untrusted",
       );
@@ -330,8 +334,9 @@ describe("Builder", () => {
         buffer: dest.buffer! as Buffer,
         mimeType: "jpeg",
       });
-      const manifestStore = reader.json();
-      const activeManifest = reader.getActive();
+      expect(reader).not.toBeNull();
+      const manifestStore = reader!.json();
+      const activeManifest = reader!.getActive();
       expect(manifestStore.validation_status![0].code).toBe(
         "signingCredential.untrusted",
       );
@@ -360,8 +365,9 @@ describe("Builder", () => {
         buffer: dest.buffer! as Buffer,
         mimeType: "jpeg",
       });
-      const manifestStore = reader.json();
-      const activeManifest = reader.getActive();
+      expect(reader).not.toBeNull();
+      const manifestStore = reader!.json();
+      const activeManifest = reader!.getActive();
       expect(manifestStore.validation_status![0].code).toBe(
         "signingCredential.untrusted",
       );
@@ -390,7 +396,8 @@ describe("Builder", () => {
       builder.sign(signer, source, dest);
 
       const reader = await Reader.fromAsset(dest);
-      const manifest = reader.json();
+      expect(reader).not.toBeNull();
+      const manifest = reader!.json();
 
       // Check that our specific JSON assertion doesn't have escaped characters
       const activeManifest = manifest.manifests[manifest.active_manifest!];
@@ -475,7 +482,8 @@ describe("Builder", () => {
         buffer: dest.buffer! as Buffer,
         mimeType: "jpeg",
       });
-      const manifestStore = reader.json();
+      expect(reader).not.toBeNull();
+      const manifestStore = reader!.json();
       expect(JSON.stringify(manifestStore)).toContain("Test Ingredient");
       expect(JSON.stringify(manifestStore)).toContain("thumbnail.ingredient");
     });
@@ -485,7 +493,8 @@ describe("Builder", () => {
 
       // Create a reader to get the parent manifest label from the existing source
       const reader = await Reader.fromAsset(source);
-      const parentManifestLabel = reader.activeLabel();
+      expect(reader).not.toBeNull();
+      const parentManifestLabel = reader!.activeLabel();
       expect(parentManifestLabel).toBeDefined();
 
       // Create a redacted URI for the assertion we are going to redact
@@ -550,10 +559,11 @@ describe("Builder", () => {
         buffer: dest.buffer! as Buffer,
         mimeType: "image/jpeg",
       });
+      expect(signedReader).not.toBeNull();
       expect(signedReader).toBeDefined();
 
       // Check that the manifest was created successfully
-      const activeManifest = signedReader.getActive();
+      const activeManifest = signedReader!.getActive();
       expect(activeManifest).toBeDefined();
 
       // Verify the redacted action was added
@@ -643,9 +653,112 @@ describe("Builder", () => {
       });
 
       // Check if the manifest has the expected structure
-      const activeManifest = reader.getActive();
+      const activeManifest = reader!.getActive();
       expect(activeManifest).toBeDefined();
       expect(activeManifest?.title).toBe("Test_Manifest");
     });
+
+    it("should add action using addAction method", async () => {
+      const simpleManifestDefinition = {
+        claim_generator_info: [
+          {
+            name: "c2pa_test",
+            version: "1.0.0",
+          },
+        ],
+        title: "Test_AddAction",
+        format: "image/jpeg",
+        assertions: [],
+        resources: { resources: {} },
+      };
+
+      const builder = Builder.withJson(simpleManifestDefinition);
+
+      // Add an action using addAction method
+      // The action needs to be a structured object matching the c2pa Action type
+      const actionJson = JSON.stringify({
+        action: "c2pa.edited",
+      });
+      builder.addAction(actionJson);
+
+      // Sign the manifest
+      const dest = { path: path.join(tempDir, "add_action_test.jpg") };
+      const signer = LocalSigner.newSigner(publicKey, privateKey, "es256");
+      builder.sign(signer, source, dest);
+
+      // Verify the action was added
+      const reader = await Reader.fromAsset(dest);
+      expect(reader).not.toBeNull();
+      const activeManifest = reader!.getActive();
+      const actionsAssertion = activeManifest?.assertions?.find(
+        (a: any) => a.label === "c2pa.actions.v2",
+      );
+      expect(actionsAssertion).toBeDefined();
+      if (isActionsAssertion(actionsAssertion)) {
+        const actions = actionsAssertion.data.actions;
+        const editedAction = actions.find((a: any) => a.action === "c2pa.edited");
+        expect(editedAction).toBeDefined();
+        expect(editedAction?.action).toBe("c2pa.edited");
+      } else {
+        throw new Error("Actions assertion does not have the expected structure");
+      }
+    });
+
+    it("should add ingredient using addIngredient method", async () => {
+      const simpleManifestDefinition = {
+        claim_generator_info: [
+          {
+            name: "c2pa_test",
+            version: "1.0.0",
+          },
+        ],
+        title: "Test_AddIngredient",
+        format: "image/jpeg",
+        ingredients: [],
+        assertions: [
+          {
+            label: "c2pa.actions",
+            data: {
+              actions: [
+                {
+                  action: "c2pa.created",
+                  digitalSourceType: "http://c2pa.org/digitalsourcetype/empty",
+                },
+              ],
+            },
+          },
+        ],
+        resources: { resources: {} },
+      };
+
+      const builder = Builder.withJson(simpleManifestDefinition);
+
+      // Add an ingredient using addIngredient method
+      const ingredientJson = JSON.stringify({
+        title: "Test Ingredient via addIngredient",
+        format: "image/jpeg",
+        instance_id: "ingredient-12345",
+        relationship: "componentOf",
+      });
+      builder.addIngredient(ingredientJson);
+
+      // Sign the manifest
+      const dest = { path: path.join(tempDir, "add_ingredient_test.jpg") };
+      const signer = LocalSigner.newSigner(publicKey, privateKey, "es256");
+      builder.sign(signer, source, dest);
+
+      // Verify the ingredient was added
+      const reader = await Reader.fromAsset(dest);
+      expect(reader).not.toBeNull();
+      const activeManifest = reader!.getActive();
+      expect(activeManifest?.ingredients).toBeDefined();
+      expect(activeManifest?.ingredients?.length).toBeGreaterThan(0);
+      const addedIngredient = activeManifest?.ingredients?.find(
+        (ing: any) => ing.title === "Test Ingredient via addIngredient",
+      );
+      expect(addedIngredient).toBeDefined();
+      expect(addedIngredient?.instance_id).toBe("ingredient-12345");
+      expect(addedIngredient?.relationship).toBe("componentOf");
+    });
   });
 });

js-src/Builder.spec.ts

@@ -70,6 +70,10 @@ export class Builder implements BuilderInterface {
     getNeonBinary().builderSetRemoteUrl.call(this.builder, remoteUrl);
   }
 
+  addAction(actionJson: string): void {
+    return getNeonBinary().builderAddAction.call(this.builder, actionJson);
+  }
+
   addAssertion(
     label: string,
     assertion: unknown,
@@ -89,13 +93,20 @@ export class Builder implements BuilderInterface {
 
   async addIngredient(
     ingredientJson: string,
-    ingredient: SourceAsset,
+    ingredient?: SourceAsset,
   ): Promise<void> {
-    return getNeonBinary().builderAddIngredient.call(
-      this.builder,
-      ingredientJson,
-      ingredient,
-    );
+    if (ingredient) {
+      return getNeonBinary().builderAddIngredientFromAsset.call(
+        this.builder,
+        ingredientJson,
+        ingredient,
+      );
+    } else {
+      return getNeonBinary().builderAddIngredient.call(
+        this.builder,
+        ingredientJson,
+      );
+    }
   }
 
   async toArchive(asset: DestinationAsset): Promise<void> {