@xyo-network/url-safety-plugin 2.70.13 → 2.70.15

package/dist/esm/Witness/Witness.js

@@ -1,5 +1,6 @@
 import { AxiosJson } from '@xyo-network/axios';
 import { UrlSchema } from '@xyo-network/url-payload-plugin';
+import { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin';
 import { AbstractWitness } from '@xyo-network/witness';
 import { UrlSafetyWitnessConfigSchema } from './Config';
 export const GoogleSafeBrowsingMatchSchema = 'com.google.safebrowsing.match';
@@ -44,7 +45,20 @@ export class UrlSafetyWitness extends AbstractWitness {
                 .map((p) => {
                 return p.url;
             });
-        return await checkUrlSafety(urls, { key: this.key });
+        const matches = await checkUrlSafety(urls, { key: this.key });
+        return urls.map((url) => {
+            const payload = matches.reduce((prev, match) => {
+                if (match.threat.url === url) {
+                    prev.threatTypes = prev.threatTypes ?? [];
+                    if (!prev.threatTypes.includes(match.threatEntryType)) {
+                        prev.threatTypes.push(match.threatEntryType);
+                    }
+                }
+                return prev;
+            }, { schema: UrlSafetySchema, url });
+            payload.threatTypes = payload.threatTypes?.sort();
+            return payload;
+        });
     }
 }
 //# sourceMappingURL=Witness.js.map

package/dist/esm/Witness/Witness.js.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"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"}

package/dist/types/Witness/Witness.d.ts

@@ -1,5 +1,6 @@
 import { Payload } from '@xyo-network/payload-model';
 import { UrlPayload } from '@xyo-network/url-payload-plugin';
+import { UrlSafetyPayload } from '@xyo-network/url-safety-payload-plugin';
 import { AbstractWitness } from '@xyo-network/witness';
 import { UrlSafetyWitnessParams } from './Params';
 export type GoogleSafeBrowsingMatchSchema = 'com.google.safebrowsing.match';
@@ -18,6 +19,6 @@ export declare class UrlSafetyWitness<TParams extends UrlSafetyWitnessParams = U
     static configSchemas: "network.xyo.url.safety.witness.config"[];
     get key(): string | undefined;
     get urls(): string[] | undefined;
-    protected observeHandler(payloads?: UrlPayload[]): Promise<GoogleSafeBrowsingMatchPayload[]>;
+    protected observeHandler(payloads?: UrlPayload[]): Promise<UrlSafetyPayload[]>;
 }
 //# sourceMappingURL=Witness.d.ts.map

package/dist/types/Witness/Witness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAa,MAAM,iCAAiC,CAAA;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAGtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AAEjD,MAAM,MAAM,6BAA6B,GAAG,+BAA+B,CAAA;AAC3E,eAAO,MAAM,6BAA6B,EAAE,6BAA+D,CAAA;AAE3G,MAAM,WAAW,uBAAuB;IACtC,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE;QACN,GAAG,EAAE,MAAM,CAAA;KACZ,CAAA;IACD,eAAe,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,MAAM,8BAA8B,GAAG,OAAO,CAAC,uBAAuB,EAAE,6BAA6B,CAAC,CAAA;AAuC5G,qBAAa,gBAAgB,CAAC,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;IAC7H,OAAgB,aAAa,4CAAiC;IAE9D,IAAI,GAAG,uBAEN;IAED,IAAI,IAAI,yBAEP;cAEwB,cAAc,CAAC,QAAQ,GAAE,UAAU,EAAO,GAAG,OAAO,CAAC,8BAA8B,EAAE,CAAC;CAWhH"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAa,MAAM,iCAAiC,CAAA;AACvE,OAAO,EAAE,gBAAgB,EAAwC,MAAM,wCAAwC,CAAA;AAC/G,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAGtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AAEjD,MAAM,MAAM,6BAA6B,GAAG,+BAA+B,CAAA;AAC3E,eAAO,MAAM,6BAA6B,EAAE,6BAA+D,CAAA;AAE3G,MAAM,WAAW,uBAAuB;IACtC,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE;QACN,GAAG,EAAE,MAAM,CAAA;KACZ,CAAA;IACD,eAAe,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,MAAM,8BAA8B,GAAG,OAAO,CAAC,uBAAuB,EAAE,6BAA6B,CAAC,CAAA;AAuC5G,qBAAa,gBAAgB,CAAC,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;IAC7H,OAAgB,aAAa,4CAAiC;IAE9D,IAAI,GAAG,uBAEN;IAED,IAAI,IAAI,yBAEP;cAEwB,cAAc,CAAC,QAAQ,GAAE,UAAU,EAAO,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CA4BlG"}

package/package.json

@@ -10,13 +10,13 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/axios": "~2.70.13",
-    "@xyo-network/module": "~2.70.13",
-    "@xyo-network/payload-model": "~2.70.13",
-    "@xyo-network/payloadset-plugin": "~2.70.13",
-    "@xyo-network/url-payload-plugin": "~2.70.13",
-    "@xyo-network/url-safety-payload-plugin": "~2.70.13",
-    "@xyo-network/witness": "~2.70.13"
+    "@xyo-network/axios": "~2.70.15",
+    "@xyo-network/module": "~2.70.15",
+    "@xyo-network/payload-model": "~2.70.15",
+    "@xyo-network/payloadset-plugin": "~2.70.15",
+    "@xyo-network/url-payload-plugin": "~2.70.15",
+    "@xyo-network/url-safety-payload-plugin": "~2.70.15",
+    "@xyo-network/witness": "~2.70.15"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^2.19.0",
@@ -56,5 +56,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.70.13"
+  "version": "2.70.15"
 }

package/src/Witness/Witness.ts

@@ -1,6 +1,7 @@
 import { AxiosJson } from '@xyo-network/axios'
 import { Payload } from '@xyo-network/payload-model'
 import { UrlPayload, UrlSchema } from '@xyo-network/url-payload-plugin'
+import { UrlSafetyPayload, UrlSafetySchema, UrlSafetyThreatType } from '@xyo-network/url-safety-payload-plugin'
 import { AbstractWitness } from '@xyo-network/witness'
 
 import { UrlSafetyWitnessConfigSchema } from './Config'
@@ -69,7 +70,7 @@ export class UrlSafetyWitness<TParams extends UrlSafetyWitnessParams = UrlSafety
     return this.config?.urls
   }
 
-  protected override async observeHandler(payloads: UrlPayload[] = []): Promise<GoogleSafeBrowsingMatchPayload[]> {
+  protected override async observeHandler(payloads: UrlPayload[] = []): Promise<UrlSafetyPayload[]> {
     const urls: string[] =
       this.urls ??
       payloads
@@ -78,6 +79,23 @@ export class UrlSafetyWitness<TParams extends UrlSafetyWitnessParams = UrlSafety
           return p.url
         })
 
-    return await checkUrlSafety(urls, { key: this.key })
+    const matches = await checkUrlSafety(urls, { key: this.key })
+
+    return urls.map((url) => {
+      const payload = matches.reduce<UrlSafetyPayload>(
+        (prev, match) => {
+          if (match.threat.url === url) {
+            prev.threatTypes = prev.threatTypes ?? []
+            if (!prev.threatTypes.includes(match.threatEntryType as UrlSafetyThreatType)) {
+              prev.threatTypes.push(match.threatEntryType as UrlSafetyThreatType)
+            }
+          }
+          return prev
+        },
+        { schema: UrlSafetySchema, url },
+      )
+      payload.threatTypes = payload.threatTypes?.sort()
+      return payload
+    })
   }
 }