@xyo-network/url-safety-plugin 2.70.12 → 2.70.14

package/dist/esm/Plugin.js

@@ -1,10 +1,10 @@
 import { PayloadSetSchema } from '@xyo-network/payload-model';
 import { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin';
-import { UrlSchema } from '@xyo-network/url-payload-plugin';
-import { UrlWitness } from './Witness';
-export const UrlPlugin = () => createPayloadSetWitnessPlugin({ required: { [UrlSchema]: 1 }, schema: PayloadSetSchema }, {
+import { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin';
+import { UrlSafetyWitness } from './Witness';
+export const UrlSafetyPlugin = () => createPayloadSetWitnessPlugin({ required: { [UrlSafetySchema]: 1 }, schema: PayloadSetSchema }, {
     witness: async (params) => {
-        const result = await UrlWitness.create(params);
+        const result = await UrlSafetyWitness.create(params);
         return result;
     },
 });

package/dist/esm/Plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAA;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,EAAE,CAC5B,6BAA6B,CAC3B,EAAE,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAC1D;IACE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC9C,OAAO,MAAM,CAAA;IACf,CAAC;CACF,CACF,CAAA"}
+{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAA;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAExE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAE5C,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE,CAClC,6BAA6B,CAC3B,EAAE,QAAQ,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAChE;IACE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACpD,OAAO,MAAM,CAAA;IACf,CAAC;CACF,CACF,CAAA"}

package/dist/esm/Witness/Witness.js

@@ -1,10 +1,12 @@
 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';
 const checkUrlSafety = async (urls, config) => {
     const axios = new AxiosJson();
-    const endPoint = config?.endPoint ?? 'https://safebrowsing.googleapis.com/v5/threatMatches:find';
+    const endPoint = config?.endPoint ?? 'https://safebrowsing.googleapis.com/v4/threatMatches:find';
     const key = config?.key;
     const mutatedUrls = urls.map((url) => url.replace('ipfs://', 'https://cloudflare-ipfs.com/'));
     if (mutatedUrls.length === 0) {
@@ -22,12 +24,17 @@ const checkUrlSafety = async (urls, config) => {
             threatTypes: ['SOCIAL_ENGINEERING', 'POTENTIALLY_HARMFUL_APPLICATION', 'UNWANTED_SOFTWARE', 'THREAT_TYPE_UNSPECIFIED'],
         },
     };
-    const result = (await axios.post(`${endPoint}?key=${key}`, postData)).data;
-    console.log(`checkUrlSafety: ${JSON.stringify(result, null, 2)}`);
-    return [];
+    console.log(`checkUrlSafetyIn: ${JSON.stringify(postData, null, 2)}`);
+    const result = (await axios.post(`${endPoint}?key=${key}`, postData, { headers: { referer: 'http://localhost:3000' } }))
+        .data;
+    console.log(`checkUrlSafetyOut: ${JSON.stringify(result, null, 2)}`);
+    return result.matches?.map((match) => ({ ...match, schema: GoogleSafeBrowsingMatchSchema })) ?? [];
 };
-export class UrlWitness extends AbstractWitness {
+export class UrlSafetyWitness extends AbstractWitness {
     static configSchemas = [UrlSafetyWitnessConfigSchema];
+    get key() {
+        return this.params.google?.safeBrowsing?.key;
+    }
     get urls() {
         return this.config?.urls;
     }
@@ -38,7 +45,20 @@ export class UrlWitness extends AbstractWitness {
                 .map((p) => {
                 return p.url;
             });
-        return await checkUrlSafety(urls);
+        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":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAc,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAEvE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA;AAGvD,MAAM,cAAc,GAAG,KAAK,EAC1B,IAAc,EACd,MAGC,EAC4B,EAAE;IAC/B,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAA;IAC7B,MAAM,QAAQ,GAAG,MAAM,EAAE,QAAQ,IAAI,2DAA2D,CAAA;IAChG,MAAM,GAAG,GAAG,MAAM,EAAE,GAAG,CAAA;IACvB,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,8BAA8B,CAAC,CAAC,CAAA;IAC7F,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,OAAO,EAAE,CAAA;KACV;IACD,MAAM,QAAQ,GAAG;QACf,MAAM,EAAE;YACN,QAAQ,EAAE,aAAa;YACvB,aAAa,EAAE,KAAK;SACrB;QACD,UAAU,EAAE;YACV,aAAa,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC;YAC1C,aAAa,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;YAClD,gBAAgB,EAAE,CAAC,KAAK,CAAC;YACzB,WAAW,EAAE,CAAC,oBAAoB,EAAE,iCAAiC,EAAE,mBAAmB,EAAE,yBAAyB,CAAC;SACvH;KACF,CAAA;IACD,MAAM,MAAM,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,QAAQ,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAA;IAC1E,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;IACjE,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAED,MAAM,OAAO,UAA4E,SAAQ,eAAwB;IACvH,MAAM,CAAU,aAAa,GAAG,CAAC,4BAA4B,CAAC,CAAA;IAE9D,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,MAAM,EAAE,IAAI,CAAA;IAC1B,CAAC;IAEkB,KAAK,CAAC,cAAc,CAAC,WAAyB,EAAE;QACjE,MAAM,IAAI,GACR,IAAI,CAAC,IAAI;YACT,QAAQ;iBACL,MAAM,CAAC,CAAC,CAAC,EAAmB,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC;iBACtD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACT,OAAO,CAAC,CAAC,GAAG,CAAA;YACd,CAAC,CAAC,CAAA;QAEN,OAAO,MAAM,cAAc,CAAC,IAAI,CAAC,CAAA;IACnC,CAAC"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"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"}

package/dist/esm/index.js

@@ -1,6 +1,6 @@
-import { UrlPlugin } from './Plugin';
+import { UrlSafetyPlugin } from './Plugin';
 export * from './Witness';
-export { UrlPlugin };
+export { UrlSafetyPlugin };
 // eslint-disable-next-line import/no-default-export
-export default UrlPlugin;
+export default UrlSafetyPlugin;
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAEpC,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,SAAS,EAAE,CAAA;AAEpB,oDAAoD;AACpD,eAAe,SAAS,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,eAAe,EAAE,CAAA;AAE1B,oDAAoD;AACpD,eAAe,eAAe,CAAA"}

package/dist/types/Plugin.d.ts

@@ -1,5 +1,5 @@
-import { UrlWitness } from './Witness';
-export declare const UrlPlugin: () => import("@xyo-network/payloadset-plugin").PayloadSetWitnessPlugin<UrlWitness<import("@xyo-network/core").BaseParamsFields & {
+import { UrlSafetyWitness } from './Witness';
+export declare const UrlSafetyPlugin: () => import("@xyo-network/payloadset-plugin").PayloadSetWitnessPlugin<UrlSafetyWitness<import("@xyo-network/core").BaseParamsFields & {
     account?: import("@xyo-network/account-model").AccountInstance | "random" | undefined;
     accountDerivationPath?: string | undefined;
     config: import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {

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

@@ -1 +1 @@
-{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GASnB,CAAA"}
+{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAE5C,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GASzB,CAAA"}

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

@@ -1,9 +1,23 @@
+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 declare class UrlWitness<TParams extends UrlSafetyWitnessParams = UrlSafetyWitnessParams> extends AbstractWitness<TParams> {
+export type GoogleSafeBrowsingMatchSchema = 'com.google.safebrowsing.match';
+export declare const GoogleSafeBrowsingMatchSchema: GoogleSafeBrowsingMatchSchema;
+export interface GoogleSafeBrowsingMatch {
+    cacheDuration: string;
+    platformType: string;
+    threat: {
+        url: string;
+    };
+    threatEntryType: string;
+    threatType: string;
+}
+export type GoogleSafeBrowsingMatchPayload = Payload<GoogleSafeBrowsingMatch, GoogleSafeBrowsingMatchSchema>;
+export declare class UrlSafetyWitness<TParams extends UrlSafetyWitnessParams = UrlSafetyWitnessParams> extends AbstractWitness<TParams> {
     static configSchemas: "network.xyo.url.safety.witness.config"[];
+    get key(): string | undefined;
     get urls(): string[] | undefined;
     protected observeHandler(payloads?: UrlPayload[]): Promise<UrlSafetyPayload[]>;
 }

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,UAAU,EAAa,MAAM,iCAAiC,CAAA;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAA;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAGtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AAiCjD,qBAAa,UAAU,CAAC,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;IACvH,OAAgB,aAAa,4CAAiC;IAE9D,IAAI,IAAI,yBAEP;cAEwB,cAAc,CAAC,QAAQ,GAAE,UAAU,EAAO,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAWlG"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AAEA,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/dist/types/index.d.ts

@@ -1,5 +1,5 @@
-import { UrlPlugin } from './Plugin';
+import { UrlSafetyPlugin } from './Plugin';
 export * from './Witness';
-export { UrlPlugin };
-export default UrlPlugin;
+export { UrlSafetyPlugin };
+export default UrlSafetyPlugin;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAEpC,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,SAAS,EAAE,CAAA;AAGpB,eAAe,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,eAAe,EAAE,CAAA;AAG1B,eAAe,eAAe,CAAA"}

package/package.json

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

package/src/Plugin.ts

@@ -1,15 +1,15 @@
 import { PayloadSetSchema } from '@xyo-network/payload-model'
 import { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'
-import { UrlSchema } from '@xyo-network/url-payload-plugin'
+import { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'
 
-import { UrlWitness } from './Witness'
+import { UrlSafetyWitness } from './Witness'
 
-export const UrlPlugin = () =>
-  createPayloadSetWitnessPlugin<UrlWitness>(
-    { required: { [UrlSchema]: 1 }, schema: PayloadSetSchema },
+export const UrlSafetyPlugin = () =>
+  createPayloadSetWitnessPlugin<UrlSafetyWitness>(
+    { required: { [UrlSafetySchema]: 1 }, schema: PayloadSetSchema },
     {
       witness: async (params) => {
-        const result = await UrlWitness.create(params)
+        const result = await UrlSafetyWitness.create(params)
         return result
       },
     },

package/src/Witness/Witness.ts

@@ -1,20 +1,40 @@
 import { AxiosJson } from '@xyo-network/axios'
+import { Payload } from '@xyo-network/payload-model'
 import { UrlPayload, UrlSchema } from '@xyo-network/url-payload-plugin'
-import { UrlSafetyPayload } from '@xyo-network/url-safety-payload-plugin'
+import { UrlSafetyPayload, UrlSafetySchema, UrlSafetyThreatType } from '@xyo-network/url-safety-payload-plugin'
 import { AbstractWitness } from '@xyo-network/witness'
 
 import { UrlSafetyWitnessConfigSchema } from './Config'
 import { UrlSafetyWitnessParams } from './Params'
 
+export type GoogleSafeBrowsingMatchSchema = 'com.google.safebrowsing.match'
+export const GoogleSafeBrowsingMatchSchema: GoogleSafeBrowsingMatchSchema = 'com.google.safebrowsing.match'
+
+export interface GoogleSafeBrowsingMatch {
+  cacheDuration: string
+  platformType: string
+  threat: {
+    url: string
+  }
+  threatEntryType: string
+  threatType: string
+}
+
+export type GoogleSafeBrowsingMatchPayload = Payload<GoogleSafeBrowsingMatch, GoogleSafeBrowsingMatchSchema>
+
+interface GoogleSafeBrowsingResult {
+  matches?: GoogleSafeBrowsingMatch[]
+}
+
 const checkUrlSafety = async (
   urls: string[],
   config?: {
     endPoint?: string
     key?: string
   },
-): Promise<UrlSafetyPayload[]> => {
+): Promise<GoogleSafeBrowsingMatchPayload[]> => {
   const axios = new AxiosJson()
-  const endPoint = config?.endPoint ?? 'https://safebrowsing.googleapis.com/v5/threatMatches:find'
+  const endPoint = config?.endPoint ?? 'https://safebrowsing.googleapis.com/v4/threatMatches:find'
   const key = config?.key
   const mutatedUrls = urls.map((url) => url.replace('ipfs://', 'https://cloudflare-ipfs.com/'))
   if (mutatedUrls.length === 0) {
@@ -32,14 +52,20 @@ const checkUrlSafety = async (
       threatTypes: ['SOCIAL_ENGINEERING', 'POTENTIALLY_HARMFUL_APPLICATION', 'UNWANTED_SOFTWARE', 'THREAT_TYPE_UNSPECIFIED'],
     },
   }
-  const result = (await axios.post(`${endPoint}?key=${key}`, postData)).data
-  console.log(`checkUrlSafety: ${JSON.stringify(result, null, 2)}`)
-  return []
+  console.log(`checkUrlSafetyIn: ${JSON.stringify(postData, null, 2)}`)
+  const result = (await axios.post<GoogleSafeBrowsingResult>(`${endPoint}?key=${key}`, postData, { headers: { referer: 'http://localhost:3000' } }))
+    .data
+  console.log(`checkUrlSafetyOut: ${JSON.stringify(result, null, 2)}`)
+  return result.matches?.map<GoogleSafeBrowsingMatchPayload>((match) => ({ ...match, schema: GoogleSafeBrowsingMatchSchema })) ?? []
 }
 
-export class UrlWitness<TParams extends UrlSafetyWitnessParams = UrlSafetyWitnessParams> extends AbstractWitness<TParams> {
+export class UrlSafetyWitness<TParams extends UrlSafetyWitnessParams = UrlSafetyWitnessParams> extends AbstractWitness<TParams> {
   static override configSchemas = [UrlSafetyWitnessConfigSchema]
 
+  get key() {
+    return this.params.google?.safeBrowsing?.key
+  }
+
   get urls() {
     return this.config?.urls
   }
@@ -53,6 +79,23 @@ export class UrlWitness<TParams extends UrlSafetyWitnessParams = UrlSafetyWitnes
           return p.url
         })
 
-    return await checkUrlSafety(urls)
+    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
+    })
   }
 }

package/src/index.ts

@@ -1,8 +1,8 @@
-import { UrlPlugin } from './Plugin'
+import { UrlSafetyPlugin } from './Plugin'
 
 export * from './Witness'
 
-export { UrlPlugin }
+export { UrlSafetyPlugin }
 
 // eslint-disable-next-line import/no-default-export
-export default UrlPlugin
+export default UrlSafetyPlugin