npm - @twin.org/immutable-proof-service - Versions diffs - 0.0.1-next.3 → 0.0.1-next.4 - Mend

@twin.org/immutable-proof-service 0.0.1-next.3 → 0.0.1-next.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/cjs/index.cjs CHANGED Viewed

@@ -393,7 +393,7 @@ class ImmutableProofService {
                 proofObjectHash: core.Converter.bytesToBase64(hash)
             };
             await this._proofStorage.set(proofEntity);
-            this.startProcessingProofs();
+            this.startProcessingProofs(0);
             return new core.Urn(ImmutableProofService.NAMESPACE, id).toString();
         }
         catch (error) {
@@ -524,14 +524,16 @@ class ImmutableProofService {
     }
     /**
      * Start processing proofs.
+     * @param interval The interval to process proofs.
      * @returns Nothing.
      * @internal
      */
-    startProcessingProofs() {
+    startProcessingProofs(interval) {
         if (!this._processing) {
+            this._processing = true;
             setTimeout(async () => {
                 await this.processProofs();
-            }, 0);
+            }, interval);
         }
     }
     /**
@@ -539,32 +541,40 @@ class ImmutableProofService {
      * @internal
      */
     async processProofs() {
-        // Get the oldest pending proof, plus one more, we can then determine whether to
-        // trigger another process after this one
-        const pendingProofs = await this._proofStorage.query({
-            property: "immutableStorageId",
-            comparison: entity.ComparisonOperator.Equals,
-            value: undefined
-        }, [
-            {
-                property: "dateCreated",
-                sortDirection: entity.SortDirection.Ascending
+        let remainingProofs = 0;
+        try {
+            // Get the oldest pending proof, plus one more, we can then determine whether to
+            // trigger another process after this one
+            const pendingProofs = await this._proofStorage.query({
+                property: "immutableStorageId",
+                comparison: entity.ComparisonOperator.Equals,
+                value: undefined
+            }, [
+                {
+                    property: "dateCreated",
+                    sortDirection: entity.SortDirection.Ascending
+                }
+            ], undefined, undefined, 2);
+            remainingProofs = pendingProofs.entities.length;
+            if (remainingProofs > 0) {
+                const proofEntity = pendingProofs.entities[0];
+                const immutableProof = this.proofEntityToModel(proofEntity);
+                const hashData = await this.generateHashData(proofEntity.nodeIdentity, immutableProof);
+                immutableProof.proof = await this._identityConnector.createProof(proofEntity.nodeIdentity, `${proofEntity.nodeIdentity}#${this._assertionMethodId}`, hashData);
+                proofEntity.dateCreated =
+                    immutableProof.proof.created ?? new Date(Date.now()).toISOString();
+                const compacted = await dataJsonLd.JsonLdProcessor.compact(immutableProof, immutableProof["@context"]);
+                proofEntity.immutableStorageId = await this._immutableStorage.store(proofEntity.nodeIdentity, core.ObjectHelper.toBytes(compacted));
+                await this._proofStorage.set(proofEntity);
+                remainingProofs--;
             }
-        ], undefined, undefined, 2);
-        if (pendingProofs.entities.length > 0) {
-            const proofEntity = pendingProofs.entities[0];
-            const immutableProof = this.proofEntityToModel(proofEntity);
-            const hashData = await this.generateHashData(proofEntity.nodeIdentity, immutableProof);
-            immutableProof.proof = await this._identityConnector.createProof(proofEntity.nodeIdentity, `${proofEntity.nodeIdentity}#${this._assertionMethodId}`, hashData);
-            proofEntity.dateCreated = immutableProof.proof.created ?? new Date(Date.now()).toISOString();
-            const compacted = await dataJsonLd.JsonLdProcessor.compact(immutableProof, immutableProof["@context"]);
-            proofEntity.immutableStorageId = await this._immutableStorage.store(proofEntity.nodeIdentity, core.ObjectHelper.toBytes(compacted));
-            await this._proofStorage.set(proofEntity);
         }
-        // If there are still remaining proofs, start the timer again
-        this._processing = false;
-        if (pendingProofs.entities.length > 1) {
-            this.startProcessingProofs();
+        finally {
+            // If there are still remaining proofs, start the timer again
+            this._processing = false;
+            if (remainingProofs > 0) {
+                this.startProcessingProofs(100);
+            }
         }
     }
     /**

package/dist/esm/index.mjs CHANGED Viewed

@@ -391,7 +391,7 @@ class ImmutableProofService {
                 proofObjectHash: Converter.bytesToBase64(hash)
             };
             await this._proofStorage.set(proofEntity);
-            this.startProcessingProofs();
+            this.startProcessingProofs(0);
             return new Urn(ImmutableProofService.NAMESPACE, id).toString();
         }
         catch (error) {
@@ -522,14 +522,16 @@ class ImmutableProofService {
     }
     /**
      * Start processing proofs.
+     * @param interval The interval to process proofs.
      * @returns Nothing.
      * @internal
      */
-    startProcessingProofs() {
+    startProcessingProofs(interval) {
         if (!this._processing) {
+            this._processing = true;
             setTimeout(async () => {
                 await this.processProofs();
-            }, 0);
+            }, interval);
         }
     }
     /**
@@ -537,32 +539,40 @@ class ImmutableProofService {
      * @internal
      */
     async processProofs() {
-        // Get the oldest pending proof, plus one more, we can then determine whether to
-        // trigger another process after this one
-        const pendingProofs = await this._proofStorage.query({
-            property: "immutableStorageId",
-            comparison: ComparisonOperator.Equals,
-            value: undefined
-        }, [
-            {
-                property: "dateCreated",
-                sortDirection: SortDirection.Ascending
+        let remainingProofs = 0;
+        try {
+            // Get the oldest pending proof, plus one more, we can then determine whether to
+            // trigger another process after this one
+            const pendingProofs = await this._proofStorage.query({
+                property: "immutableStorageId",
+                comparison: ComparisonOperator.Equals,
+                value: undefined
+            }, [
+                {
+                    property: "dateCreated",
+                    sortDirection: SortDirection.Ascending
+                }
+            ], undefined, undefined, 2);
+            remainingProofs = pendingProofs.entities.length;
+            if (remainingProofs > 0) {
+                const proofEntity = pendingProofs.entities[0];
+                const immutableProof = this.proofEntityToModel(proofEntity);
+                const hashData = await this.generateHashData(proofEntity.nodeIdentity, immutableProof);
+                immutableProof.proof = await this._identityConnector.createProof(proofEntity.nodeIdentity, `${proofEntity.nodeIdentity}#${this._assertionMethodId}`, hashData);
+                proofEntity.dateCreated =
+                    immutableProof.proof.created ?? new Date(Date.now()).toISOString();
+                const compacted = await JsonLdProcessor.compact(immutableProof, immutableProof["@context"]);
+                proofEntity.immutableStorageId = await this._immutableStorage.store(proofEntity.nodeIdentity, ObjectHelper.toBytes(compacted));
+                await this._proofStorage.set(proofEntity);
+                remainingProofs--;
             }
-        ], undefined, undefined, 2);
-        if (pendingProofs.entities.length > 0) {
-            const proofEntity = pendingProofs.entities[0];
-            const immutableProof = this.proofEntityToModel(proofEntity);
-            const hashData = await this.generateHashData(proofEntity.nodeIdentity, immutableProof);
-            immutableProof.proof = await this._identityConnector.createProof(proofEntity.nodeIdentity, `${proofEntity.nodeIdentity}#${this._assertionMethodId}`, hashData);
-            proofEntity.dateCreated = immutableProof.proof.created ?? new Date(Date.now()).toISOString();
-            const compacted = await JsonLdProcessor.compact(immutableProof, immutableProof["@context"]);
-            proofEntity.immutableStorageId = await this._immutableStorage.store(proofEntity.nodeIdentity, ObjectHelper.toBytes(compacted));
-            await this._proofStorage.set(proofEntity);
         }
-        // If there are still remaining proofs, start the timer again
-        this._processing = false;
-        if (pendingProofs.entities.length > 1) {
-            this.startProcessingProofs();
+        finally {
+            // If there are still remaining proofs, start the timer again
+            this._processing = false;
+            if (remainingProofs > 0) {
+                this.startProcessingProofs(100);
+            }
         }
     }
     /**

package/docs/changelog.md CHANGED Viewed

@@ -1,5 +1,5 @@
 # @twin.org/immutable-proof-service - Changelog
-## v0.0.1-next.3
+## v0.0.1-next.4
 - Initial Release

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/immutable-proof-service",
-	"version": "0.0.1-next.3",
+	"version": "0.0.1-next.4",
 	"description": "Immutable proof contract implementation and REST endpoint definitions",
 	"repository": {
 		"type": "git",
@@ -22,7 +22,7 @@
 		"@twin.org/entity": "next",
 		"@twin.org/entity-storage-models": "next",
 		"@twin.org/identity-models": "next",
-		"@twin.org/immutable-proof-models": "0.0.1-next.3",
+		"@twin.org/immutable-proof-models": "0.0.1-next.4",
 		"@twin.org/immutable-storage-models": "next",
 		"@twin.org/nameof": "next",
 		"@twin.org/standards-w3c-did": "next",