@xyo-network/url-safety-plugin 2.79.4 → 2.79.5
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.
- package/dist/browser/Witness/Witness.d.cts.map +1 -1
- package/dist/browser/Witness/Witness.d.mts.map +1 -1
- package/dist/browser/Witness/Witness.d.ts.map +1 -1
- package/dist/browser/index.cjs +1 -3
- package/dist/browser/index.cjs.map +1 -1
- package/dist/browser/index.js +1 -3
- package/dist/browser/index.js.map +1 -1
- package/dist/node/Witness/Witness.d.cts.map +1 -1
- package/dist/node/Witness/Witness.d.mts.map +1 -1
- package/dist/node/Witness/Witness.d.ts.map +1 -1
- package/dist/node/index.js +1 -3
- package/dist/node/index.js.map +1 -1
- package/dist/node/index.mjs +1 -3
- package/dist/node/index.mjs.map +1 -1
- package/package.json +11 -11
- package/src/Witness/Witness.ts +1 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAa,MAAM,iCAAiC,CAAA;AACvE,OAAO,EAAE,gBAAgB,EAAwC,MAAM,wCAAwC,CAAA;AAG/G,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;AAqC5G,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAa,MAAM,iCAAiC,CAAA;AACvE,OAAO,EAAE,gBAAgB,EAAwC,MAAM,wCAAwC,CAAA;AAG/G,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;AAqC5G,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAa,MAAM,iCAAiC,CAAA;AACvE,OAAO,EAAE,gBAAgB,EAAwC,MAAM,wCAAwC,CAAA;AAG/G,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;AAqC5G,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/browser/index.cjs
CHANGED
|
@@ -38,8 +38,8 @@ var import_url_safety_payload_plugin = require("@xyo-network/url-safety-payload-
|
|
|
38
38
|
var UrlSafetyWitnessConfigSchema = `${import_url_safety_payload_plugin.UrlSafetySchema}.witness.config`;
|
|
39
39
|
|
|
40
40
|
// src/Witness/Witness.ts
|
|
41
|
+
var import_axios = require("@xylabs/axios");
|
|
41
42
|
var import_abstract_witness = require("@xyo-network/abstract-witness");
|
|
42
|
-
var import_axios = require("@xyo-network/axios");
|
|
43
43
|
var import_url_payload_plugin = require("@xyo-network/url-payload-plugin");
|
|
44
44
|
var import_url_safety_payload_plugin2 = require("@xyo-network/url-safety-payload-plugin");
|
|
45
45
|
var GoogleSafeBrowsingMatchSchema = "com.google.safebrowsing.match";
|
|
@@ -63,9 +63,7 @@ var checkUrlSafety = async (urls, config) => {
|
|
|
63
63
|
threatTypes: ["SOCIAL_ENGINEERING", "POTENTIALLY_HARMFUL_APPLICATION", "UNWANTED_SOFTWARE", "THREAT_TYPE_UNSPECIFIED"]
|
|
64
64
|
}
|
|
65
65
|
};
|
|
66
|
-
console.log(`checkUrlSafetyIn: ${JSON.stringify(postData, null, 2)}`);
|
|
67
66
|
const result = (await axios.post(`${endPoint}?key=${key}`, postData, { headers: { referer: "http://localhost:3000" } })).data;
|
|
68
|
-
console.log(`checkUrlSafetyOut: ${JSON.stringify(result, null, 2)}`);
|
|
69
67
|
return result.matches?.map((match) => ({ ...match, schema: GoogleSafeBrowsingMatchSchema })) ?? [];
|
|
70
68
|
};
|
|
71
69
|
var UrlSafetyWitness = class extends import_abstract_witness.AbstractWitness {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/Plugin.ts","../../src/Witness/Config.ts","../../src/Witness/Witness.ts"],"sourcesContent":["import { UrlSafetyPlugin } from './Plugin'\n\nexport * from './Witness'\n\nexport { UrlSafetyPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default UrlSafetyPlugin\n","import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\n\nimport { UrlSafetyWitness } from './Witness'\n\nexport const UrlSafetyPlugin = () =>\n createPayloadSetWitnessPlugin<UrlSafetyWitness>(\n { required: { [UrlSafetySchema]: 1 }, schema: PayloadSetSchema },\n {\n witness: async (params) => {\n const result = await UrlSafetyWitness.create(params)\n return result\n },\n },\n )\n","import { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\nimport { WitnessConfig } from '@xyo-network/witness-model'\n\nexport const UrlSafetyWitnessConfigSchema = `${UrlSafetySchema}.witness.config` as const\nexport type UrlSafetyWitnessConfigSchema = typeof UrlSafetyWitnessConfigSchema\n\nexport type UrlSafetyWitnessConfig = WitnessConfig<{\n google?: {\n safeBrowsing?: {\n endPoint?: string\n }\n }\n schema: UrlSafetyWitnessConfigSchema\n urls?: string[]\n}>\n","import {
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/Plugin.ts","../../src/Witness/Config.ts","../../src/Witness/Witness.ts"],"sourcesContent":["import { UrlSafetyPlugin } from './Plugin'\n\nexport * from './Witness'\n\nexport { UrlSafetyPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default UrlSafetyPlugin\n","import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\n\nimport { UrlSafetyWitness } from './Witness'\n\nexport const UrlSafetyPlugin = () =>\n createPayloadSetWitnessPlugin<UrlSafetyWitness>(\n { required: { [UrlSafetySchema]: 1 }, schema: PayloadSetSchema },\n {\n witness: async (params) => {\n const result = await UrlSafetyWitness.create(params)\n return result\n },\n },\n )\n","import { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\nimport { WitnessConfig } from '@xyo-network/witness-model'\n\nexport const UrlSafetyWitnessConfigSchema = `${UrlSafetySchema}.witness.config` as const\nexport type UrlSafetyWitnessConfigSchema = typeof UrlSafetyWitnessConfigSchema\n\nexport type UrlSafetyWitnessConfig = WitnessConfig<{\n google?: {\n safeBrowsing?: {\n endPoint?: string\n }\n }\n schema: UrlSafetyWitnessConfigSchema\n urls?: string[]\n}>\n","import { AxiosJson } from '@xylabs/axios'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { Payload } from '@xyo-network/payload-model'\nimport { UrlPayload, UrlSchema } from '@xyo-network/url-payload-plugin'\nimport { UrlSafetyPayload, UrlSafetySchema, UrlSafetyThreatType } from '@xyo-network/url-safety-payload-plugin'\n\nimport { UrlSafetyWitnessConfigSchema } from './Config'\nimport { UrlSafetyWitnessParams } from './Params'\n\nexport type GoogleSafeBrowsingMatchSchema = 'com.google.safebrowsing.match'\nexport const GoogleSafeBrowsingMatchSchema: GoogleSafeBrowsingMatchSchema = 'com.google.safebrowsing.match'\n\nexport interface GoogleSafeBrowsingMatch {\n cacheDuration: string\n platformType: string\n threat: {\n url: string\n }\n threatEntryType: string\n threatType: string\n}\n\nexport type GoogleSafeBrowsingMatchPayload = Payload<GoogleSafeBrowsingMatch, GoogleSafeBrowsingMatchSchema>\n\ninterface GoogleSafeBrowsingResult {\n matches?: GoogleSafeBrowsingMatch[]\n}\n\nconst checkUrlSafety = async (\n urls: string[],\n config?: {\n endPoint?: string\n key?: string\n },\n): Promise<GoogleSafeBrowsingMatchPayload[]> => {\n const axios = new AxiosJson()\n const endPoint = config?.endPoint ?? 'https://safebrowsing.googleapis.com/v4/threatMatches:find'\n const key = config?.key\n const mutatedUrls = urls.map((url) => url.replace('ipfs://', 'https://cloudflare-ipfs.com/'))\n if (mutatedUrls.length === 0) {\n return []\n }\n const postData = {\n client: {\n clientId: 'foreventory',\n clientVersion: '1.0',\n },\n threatInfo: {\n platformTypes: ['WINDOWS', 'LINUX', 'OSX'],\n threatEntries: mutatedUrls.map((url) => ({ url })),\n threatEntryTypes: ['URL'],\n threatTypes: ['SOCIAL_ENGINEERING', 'POTENTIALLY_HARMFUL_APPLICATION', 'UNWANTED_SOFTWARE', 'THREAT_TYPE_UNSPECIFIED'],\n },\n }\n const result = (await axios.post<GoogleSafeBrowsingResult>(`${endPoint}?key=${key}`, postData, { headers: { referer: 'http://localhost:3000' } }))\n .data\n return result.matches?.map<GoogleSafeBrowsingMatchPayload>((match) => ({ ...match, schema: GoogleSafeBrowsingMatchSchema })) ?? []\n}\n\nexport class UrlSafetyWitness<TParams extends UrlSafetyWitnessParams = UrlSafetyWitnessParams> extends AbstractWitness<TParams> {\n static override configSchemas = [UrlSafetyWitnessConfigSchema]\n\n get key() {\n return this.params.google?.safeBrowsing?.key\n }\n\n get urls() {\n return this.config?.urls\n }\n\n protected override async observeHandler(payloads: UrlPayload[] = []): Promise<UrlSafetyPayload[]> {\n const urls: string[] =\n this.urls ??\n payloads\n .filter((p): p is UrlPayload => p.schema === UrlSchema)\n .map((p) => {\n return p.url\n })\n\n const matches = await checkUrlSafety(urls, { key: this.key })\n\n return urls.map((url) => {\n const payload = matches.reduce<UrlSafetyPayload>(\n (prev, match) => {\n if (match.threat.url === url) {\n prev.threatTypes = prev.threatTypes ?? []\n if (!prev.threatTypes.includes(match.threatEntryType as UrlSafetyThreatType)) {\n prev.threatTypes.push(match.threatEntryType as UrlSafetyThreatType)\n }\n }\n return prev\n },\n { schema: UrlSafetySchema, url },\n )\n payload.threatTypes = payload.threatTypes?.sort()\n return payload\n })\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,2BAAiC;AACjC,+BAA8C;AAC9C,IAAAA,oCAAgC;;;ACFhC,uCAAgC;AAGzB,IAAM,+BAA+B,GAAG,gDAAe;;;ACH9D,mBAA0B;AAC1B,8BAAgC;AAEhC,gCAAsC;AACtC,IAAAC,oCAAuE;AAMhE,IAAM,gCAA+D;AAkB5E,IAAM,iBAAiB,OACrB,MACA,WAI8C;AAC9C,QAAM,QAAQ,IAAI,uBAAU;AAC5B,QAAM,WAAW,QAAQ,YAAY;AACrC,QAAM,MAAM,QAAQ;AACpB,QAAM,cAAc,KAAK,IAAI,CAAC,QAAQ,IAAI,QAAQ,WAAW,8BAA8B,CAAC;AAC5F,MAAI,YAAY,WAAW,GAAG;AAC5B,WAAO,CAAC;AAAA,EACV;AACA,QAAM,WAAW;AAAA,IACf,QAAQ;AAAA,MACN,UAAU;AAAA,MACV,eAAe;AAAA,IACjB;AAAA,IACA,YAAY;AAAA,MACV,eAAe,CAAC,WAAW,SAAS,KAAK;AAAA,MACzC,eAAe,YAAY,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE;AAAA,MACjD,kBAAkB,CAAC,KAAK;AAAA,MACxB,aAAa,CAAC,sBAAsB,mCAAmC,qBAAqB,yBAAyB;AAAA,IACvH;AAAA,EACF;AACA,QAAM,UAAU,MAAM,MAAM,KAA+B,GAAG,QAAQ,QAAQ,GAAG,IAAI,UAAU,EAAE,SAAS,EAAE,SAAS,wBAAwB,EAAE,CAAC,GAC7I;AACH,SAAO,OAAO,SAAS,IAAoC,CAAC,WAAW,EAAE,GAAG,OAAO,QAAQ,8BAA8B,EAAE,KAAK,CAAC;AACnI;AAEO,IAAM,mBAAN,cAAgG,wCAAyB;AAAA,EAC9H,OAAgB,gBAAgB,CAAC,4BAA4B;AAAA,EAE7D,IAAI,MAAM;AACR,WAAO,KAAK,OAAO,QAAQ,cAAc;AAAA,EAC3C;AAAA,EAEA,IAAI,OAAO;AACT,WAAO,KAAK,QAAQ;AAAA,EACtB;AAAA,EAEA,MAAyB,eAAe,WAAyB,CAAC,GAAgC;AAChG,UAAM,OACJ,KAAK,QACL,SACG,OAAO,CAAC,MAAuB,EAAE,WAAW,mCAAS,EACrD,IAAI,CAAC,MAAM;AACV,aAAO,EAAE;AAAA,IACX,CAAC;AAEL,UAAM,UAAU,MAAM,eAAe,MAAM,EAAE,KAAK,KAAK,IAAI,CAAC;AAE5D,WAAO,KAAK,IAAI,CAAC,QAAQ;AACvB,YAAM,UAAU,QAAQ;AAAA,QACtB,CAAC,MAAM,UAAU;AACf,cAAI,MAAM,OAAO,QAAQ,KAAK;AAC5B,iBAAK,cAAc,KAAK,eAAe,CAAC;AACxC,gBAAI,CAAC,KAAK,YAAY,SAAS,MAAM,eAAsC,GAAG;AAC5E,mBAAK,YAAY,KAAK,MAAM,eAAsC;AAAA,YACpE;AAAA,UACF;AACA,iBAAO;AAAA,QACT;AAAA,QACA,EAAE,QAAQ,mDAAiB,IAAI;AAAA,MACjC;AACA,cAAQ,cAAc,QAAQ,aAAa,KAAK;AAChD,aAAO;AAAA,IACT,CAAC;AAAA,EACH;AACF;;;AF5FO,IAAM,kBAAkB,UAC7B;AAAA,EACE,EAAE,UAAU,EAAE,CAAC,iDAAe,GAAG,EAAE,GAAG,QAAQ,sCAAiB;AAAA,EAC/D;AAAA,IACE,SAAS,OAAO,WAAW;AACzB,YAAM,SAAS,MAAM,iBAAiB,OAAO,MAAM;AACnD,aAAO;AAAA,IACT;AAAA,EACF;AACF;;;ADRF,IAAO,cAAQ;","names":["import_url_safety_payload_plugin","import_url_safety_payload_plugin"]}
|
package/dist/browser/index.js
CHANGED
|
@@ -8,8 +8,8 @@ import { UrlSafetySchema } from "@xyo-network/url-safety-payload-plugin";
|
|
|
8
8
|
var UrlSafetyWitnessConfigSchema = `${UrlSafetySchema}.witness.config`;
|
|
9
9
|
|
|
10
10
|
// src/Witness/Witness.ts
|
|
11
|
+
import { AxiosJson } from "@xylabs/axios";
|
|
11
12
|
import { AbstractWitness } from "@xyo-network/abstract-witness";
|
|
12
|
-
import { AxiosJson } from "@xyo-network/axios";
|
|
13
13
|
import { UrlSchema } from "@xyo-network/url-payload-plugin";
|
|
14
14
|
import { UrlSafetySchema as UrlSafetySchema2 } from "@xyo-network/url-safety-payload-plugin";
|
|
15
15
|
var GoogleSafeBrowsingMatchSchema = "com.google.safebrowsing.match";
|
|
@@ -33,9 +33,7 @@ var checkUrlSafety = async (urls, config) => {
|
|
|
33
33
|
threatTypes: ["SOCIAL_ENGINEERING", "POTENTIALLY_HARMFUL_APPLICATION", "UNWANTED_SOFTWARE", "THREAT_TYPE_UNSPECIFIED"]
|
|
34
34
|
}
|
|
35
35
|
};
|
|
36
|
-
console.log(`checkUrlSafetyIn: ${JSON.stringify(postData, null, 2)}`);
|
|
37
36
|
const result = (await axios.post(`${endPoint}?key=${key}`, postData, { headers: { referer: "http://localhost:3000" } })).data;
|
|
38
|
-
console.log(`checkUrlSafetyOut: ${JSON.stringify(result, null, 2)}`);
|
|
39
37
|
return result.matches?.map((match) => ({ ...match, schema: GoogleSafeBrowsingMatchSchema })) ?? [];
|
|
40
38
|
};
|
|
41
39
|
var UrlSafetyWitness = class extends AbstractWitness {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/Plugin.ts","../../src/Witness/Config.ts","../../src/Witness/Witness.ts","../../src/index.ts"],"sourcesContent":["import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\n\nimport { UrlSafetyWitness } from './Witness'\n\nexport const UrlSafetyPlugin = () =>\n createPayloadSetWitnessPlugin<UrlSafetyWitness>(\n { required: { [UrlSafetySchema]: 1 }, schema: PayloadSetSchema },\n {\n witness: async (params) => {\n const result = await UrlSafetyWitness.create(params)\n return result\n },\n },\n )\n","import { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\nimport { WitnessConfig } from '@xyo-network/witness-model'\n\nexport const UrlSafetyWitnessConfigSchema = `${UrlSafetySchema}.witness.config` as const\nexport type UrlSafetyWitnessConfigSchema = typeof UrlSafetyWitnessConfigSchema\n\nexport type UrlSafetyWitnessConfig = WitnessConfig<{\n google?: {\n safeBrowsing?: {\n endPoint?: string\n }\n }\n schema: UrlSafetyWitnessConfigSchema\n urls?: string[]\n}>\n","import {
|
|
1
|
+
{"version":3,"sources":["../../src/Plugin.ts","../../src/Witness/Config.ts","../../src/Witness/Witness.ts","../../src/index.ts"],"sourcesContent":["import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\n\nimport { UrlSafetyWitness } from './Witness'\n\nexport const UrlSafetyPlugin = () =>\n createPayloadSetWitnessPlugin<UrlSafetyWitness>(\n { required: { [UrlSafetySchema]: 1 }, schema: PayloadSetSchema },\n {\n witness: async (params) => {\n const result = await UrlSafetyWitness.create(params)\n return result\n },\n },\n )\n","import { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\nimport { WitnessConfig } from '@xyo-network/witness-model'\n\nexport const UrlSafetyWitnessConfigSchema = `${UrlSafetySchema}.witness.config` as const\nexport type UrlSafetyWitnessConfigSchema = typeof UrlSafetyWitnessConfigSchema\n\nexport type UrlSafetyWitnessConfig = WitnessConfig<{\n google?: {\n safeBrowsing?: {\n endPoint?: string\n }\n }\n schema: UrlSafetyWitnessConfigSchema\n urls?: string[]\n}>\n","import { AxiosJson } from '@xylabs/axios'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { Payload } from '@xyo-network/payload-model'\nimport { UrlPayload, UrlSchema } from '@xyo-network/url-payload-plugin'\nimport { UrlSafetyPayload, UrlSafetySchema, UrlSafetyThreatType } from '@xyo-network/url-safety-payload-plugin'\n\nimport { UrlSafetyWitnessConfigSchema } from './Config'\nimport { UrlSafetyWitnessParams } from './Params'\n\nexport type GoogleSafeBrowsingMatchSchema = 'com.google.safebrowsing.match'\nexport const GoogleSafeBrowsingMatchSchema: GoogleSafeBrowsingMatchSchema = 'com.google.safebrowsing.match'\n\nexport interface GoogleSafeBrowsingMatch {\n cacheDuration: string\n platformType: string\n threat: {\n url: string\n }\n threatEntryType: string\n threatType: string\n}\n\nexport type GoogleSafeBrowsingMatchPayload = Payload<GoogleSafeBrowsingMatch, GoogleSafeBrowsingMatchSchema>\n\ninterface GoogleSafeBrowsingResult {\n matches?: GoogleSafeBrowsingMatch[]\n}\n\nconst checkUrlSafety = async (\n urls: string[],\n config?: {\n endPoint?: string\n key?: string\n },\n): Promise<GoogleSafeBrowsingMatchPayload[]> => {\n const axios = new AxiosJson()\n const endPoint = config?.endPoint ?? 'https://safebrowsing.googleapis.com/v4/threatMatches:find'\n const key = config?.key\n const mutatedUrls = urls.map((url) => url.replace('ipfs://', 'https://cloudflare-ipfs.com/'))\n if (mutatedUrls.length === 0) {\n return []\n }\n const postData = {\n client: {\n clientId: 'foreventory',\n clientVersion: '1.0',\n },\n threatInfo: {\n platformTypes: ['WINDOWS', 'LINUX', 'OSX'],\n threatEntries: mutatedUrls.map((url) => ({ url })),\n threatEntryTypes: ['URL'],\n threatTypes: ['SOCIAL_ENGINEERING', 'POTENTIALLY_HARMFUL_APPLICATION', 'UNWANTED_SOFTWARE', 'THREAT_TYPE_UNSPECIFIED'],\n },\n }\n const result = (await axios.post<GoogleSafeBrowsingResult>(`${endPoint}?key=${key}`, postData, { headers: { referer: 'http://localhost:3000' } }))\n .data\n return result.matches?.map<GoogleSafeBrowsingMatchPayload>((match) => ({ ...match, schema: GoogleSafeBrowsingMatchSchema })) ?? []\n}\n\nexport class UrlSafetyWitness<TParams extends UrlSafetyWitnessParams = UrlSafetyWitnessParams> extends AbstractWitness<TParams> {\n static override configSchemas = [UrlSafetyWitnessConfigSchema]\n\n get key() {\n return this.params.google?.safeBrowsing?.key\n }\n\n get urls() {\n return this.config?.urls\n }\n\n protected override async observeHandler(payloads: UrlPayload[] = []): Promise<UrlSafetyPayload[]> {\n const urls: string[] =\n this.urls ??\n payloads\n .filter((p): p is UrlPayload => p.schema === UrlSchema)\n .map((p) => {\n return p.url\n })\n\n const matches = await checkUrlSafety(urls, { key: this.key })\n\n return urls.map((url) => {\n const payload = matches.reduce<UrlSafetyPayload>(\n (prev, match) => {\n if (match.threat.url === url) {\n prev.threatTypes = prev.threatTypes ?? []\n if (!prev.threatTypes.includes(match.threatEntryType as UrlSafetyThreatType)) {\n prev.threatTypes.push(match.threatEntryType as UrlSafetyThreatType)\n }\n }\n return prev\n },\n { schema: UrlSafetySchema, url },\n )\n payload.threatTypes = payload.threatTypes?.sort()\n return payload\n })\n }\n}\n","import { UrlSafetyPlugin } from './Plugin'\n\nexport * from './Witness'\n\nexport { UrlSafetyPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default UrlSafetyPlugin\n"],"mappings":";AAAA,SAAS,wBAAwB;AACjC,SAAS,qCAAqC;AAC9C,SAAS,mBAAAA,wBAAuB;;;ACFhC,SAAS,uBAAuB;AAGzB,IAAM,+BAA+B,GAAG,eAAe;;;ACH9D,SAAS,iBAAiB;AAC1B,SAAS,uBAAuB;AAEhC,SAAqB,iBAAiB;AACtC,SAA2B,mBAAAC,wBAA4C;AAMhE,IAAM,gCAA+D;AAkB5E,IAAM,iBAAiB,OACrB,MACA,WAI8C;AAC9C,QAAM,QAAQ,IAAI,UAAU;AAC5B,QAAM,WAAW,QAAQ,YAAY;AACrC,QAAM,MAAM,QAAQ;AACpB,QAAM,cAAc,KAAK,IAAI,CAAC,QAAQ,IAAI,QAAQ,WAAW,8BAA8B,CAAC;AAC5F,MAAI,YAAY,WAAW,GAAG;AAC5B,WAAO,CAAC;AAAA,EACV;AACA,QAAM,WAAW;AAAA,IACf,QAAQ;AAAA,MACN,UAAU;AAAA,MACV,eAAe;AAAA,IACjB;AAAA,IACA,YAAY;AAAA,MACV,eAAe,CAAC,WAAW,SAAS,KAAK;AAAA,MACzC,eAAe,YAAY,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE;AAAA,MACjD,kBAAkB,CAAC,KAAK;AAAA,MACxB,aAAa,CAAC,sBAAsB,mCAAmC,qBAAqB,yBAAyB;AAAA,IACvH;AAAA,EACF;AACA,QAAM,UAAU,MAAM,MAAM,KAA+B,GAAG,QAAQ,QAAQ,GAAG,IAAI,UAAU,EAAE,SAAS,EAAE,SAAS,wBAAwB,EAAE,CAAC,GAC7I;AACH,SAAO,OAAO,SAAS,IAAoC,CAAC,WAAW,EAAE,GAAG,OAAO,QAAQ,8BAA8B,EAAE,KAAK,CAAC;AACnI;AAEO,IAAM,mBAAN,cAAgG,gBAAyB;AAAA,EAC9H,OAAgB,gBAAgB,CAAC,4BAA4B;AAAA,EAE7D,IAAI,MAAM;AACR,WAAO,KAAK,OAAO,QAAQ,cAAc;AAAA,EAC3C;AAAA,EAEA,IAAI,OAAO;AACT,WAAO,KAAK,QAAQ;AAAA,EACtB;AAAA,EAEA,MAAyB,eAAe,WAAyB,CAAC,GAAgC;AAChG,UAAM,OACJ,KAAK,QACL,SACG,OAAO,CAAC,MAAuB,EAAE,WAAW,SAAS,EACrD,IAAI,CAAC,MAAM;AACV,aAAO,EAAE;AAAA,IACX,CAAC;AAEL,UAAM,UAAU,MAAM,eAAe,MAAM,EAAE,KAAK,KAAK,IAAI,CAAC;AAE5D,WAAO,KAAK,IAAI,CAAC,QAAQ;AACvB,YAAM,UAAU,QAAQ;AAAA,QACtB,CAAC,MAAM,UAAU;AACf,cAAI,MAAM,OAAO,QAAQ,KAAK;AAC5B,iBAAK,cAAc,KAAK,eAAe,CAAC;AACxC,gBAAI,CAAC,KAAK,YAAY,SAAS,MAAM,eAAsC,GAAG;AAC5E,mBAAK,YAAY,KAAK,MAAM,eAAsC;AAAA,YACpE;AAAA,UACF;AACA,iBAAO;AAAA,QACT;AAAA,QACA,EAAE,QAAQC,kBAAiB,IAAI;AAAA,MACjC;AACA,cAAQ,cAAc,QAAQ,aAAa,KAAK;AAChD,aAAO;AAAA,IACT,CAAC;AAAA,EACH;AACF;;;AF5FO,IAAM,kBAAkB,MAC7B;AAAA,EACE,EAAE,UAAU,EAAE,CAACC,gBAAe,GAAG,EAAE,GAAG,QAAQ,iBAAiB;AAAA,EAC/D;AAAA,IACE,SAAS,OAAO,WAAW;AACzB,YAAM,SAAS,MAAM,iBAAiB,OAAO,MAAM;AACnD,aAAO;AAAA,IACT;AAAA,EACF;AACF;;;AGRF,IAAO,cAAQ;","names":["UrlSafetySchema","UrlSafetySchema","UrlSafetySchema","UrlSafetySchema"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAa,MAAM,iCAAiC,CAAA;AACvE,OAAO,EAAE,gBAAgB,EAAwC,MAAM,wCAAwC,CAAA;AAG/G,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;AAqC5G,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAa,MAAM,iCAAiC,CAAA;AACvE,OAAO,EAAE,gBAAgB,EAAwC,MAAM,wCAAwC,CAAA;AAG/G,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;AAqC5G,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAa,MAAM,iCAAiC,CAAA;AACvE,OAAO,EAAE,gBAAgB,EAAwC,MAAM,wCAAwC,CAAA;AAG/G,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;AAqC5G,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/node/index.js
CHANGED
|
@@ -38,8 +38,8 @@ var import_url_safety_payload_plugin = require("@xyo-network/url-safety-payload-
|
|
|
38
38
|
var UrlSafetyWitnessConfigSchema = `${import_url_safety_payload_plugin.UrlSafetySchema}.witness.config`;
|
|
39
39
|
|
|
40
40
|
// src/Witness/Witness.ts
|
|
41
|
+
var import_axios = require("@xylabs/axios");
|
|
41
42
|
var import_abstract_witness = require("@xyo-network/abstract-witness");
|
|
42
|
-
var import_axios = require("@xyo-network/axios");
|
|
43
43
|
var import_url_payload_plugin = require("@xyo-network/url-payload-plugin");
|
|
44
44
|
var import_url_safety_payload_plugin2 = require("@xyo-network/url-safety-payload-plugin");
|
|
45
45
|
var GoogleSafeBrowsingMatchSchema = "com.google.safebrowsing.match";
|
|
@@ -64,9 +64,7 @@ var checkUrlSafety = async (urls, config) => {
|
|
|
64
64
|
threatTypes: ["SOCIAL_ENGINEERING", "POTENTIALLY_HARMFUL_APPLICATION", "UNWANTED_SOFTWARE", "THREAT_TYPE_UNSPECIFIED"]
|
|
65
65
|
}
|
|
66
66
|
};
|
|
67
|
-
console.log(`checkUrlSafetyIn: ${JSON.stringify(postData, null, 2)}`);
|
|
68
67
|
const result = (await axios.post(`${endPoint}?key=${key}`, postData, { headers: { referer: "http://localhost:3000" } })).data;
|
|
69
|
-
console.log(`checkUrlSafetyOut: ${JSON.stringify(result, null, 2)}`);
|
|
70
68
|
return ((_a = result.matches) == null ? void 0 : _a.map((match) => ({ ...match, schema: GoogleSafeBrowsingMatchSchema }))) ?? [];
|
|
71
69
|
};
|
|
72
70
|
var UrlSafetyWitness = class extends import_abstract_witness.AbstractWitness {
|
package/dist/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/Plugin.ts","../../src/Witness/Config.ts","../../src/Witness/Witness.ts"],"sourcesContent":["import { UrlSafetyPlugin } from './Plugin'\n\nexport * from './Witness'\n\nexport { UrlSafetyPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default UrlSafetyPlugin\n","import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\n\nimport { UrlSafetyWitness } from './Witness'\n\nexport const UrlSafetyPlugin = () =>\n createPayloadSetWitnessPlugin<UrlSafetyWitness>(\n { required: { [UrlSafetySchema]: 1 }, schema: PayloadSetSchema },\n {\n witness: async (params) => {\n const result = await UrlSafetyWitness.create(params)\n return result\n },\n },\n )\n","import { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\nimport { WitnessConfig } from '@xyo-network/witness-model'\n\nexport const UrlSafetyWitnessConfigSchema = `${UrlSafetySchema}.witness.config` as const\nexport type UrlSafetyWitnessConfigSchema = typeof UrlSafetyWitnessConfigSchema\n\nexport type UrlSafetyWitnessConfig = WitnessConfig<{\n google?: {\n safeBrowsing?: {\n endPoint?: string\n }\n }\n schema: UrlSafetyWitnessConfigSchema\n urls?: string[]\n}>\n","import {
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/Plugin.ts","../../src/Witness/Config.ts","../../src/Witness/Witness.ts"],"sourcesContent":["import { UrlSafetyPlugin } from './Plugin'\n\nexport * from './Witness'\n\nexport { UrlSafetyPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default UrlSafetyPlugin\n","import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\n\nimport { UrlSafetyWitness } from './Witness'\n\nexport const UrlSafetyPlugin = () =>\n createPayloadSetWitnessPlugin<UrlSafetyWitness>(\n { required: { [UrlSafetySchema]: 1 }, schema: PayloadSetSchema },\n {\n witness: async (params) => {\n const result = await UrlSafetyWitness.create(params)\n return result\n },\n },\n )\n","import { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\nimport { WitnessConfig } from '@xyo-network/witness-model'\n\nexport const UrlSafetyWitnessConfigSchema = `${UrlSafetySchema}.witness.config` as const\nexport type UrlSafetyWitnessConfigSchema = typeof UrlSafetyWitnessConfigSchema\n\nexport type UrlSafetyWitnessConfig = WitnessConfig<{\n google?: {\n safeBrowsing?: {\n endPoint?: string\n }\n }\n schema: UrlSafetyWitnessConfigSchema\n urls?: string[]\n}>\n","import { AxiosJson } from '@xylabs/axios'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { Payload } from '@xyo-network/payload-model'\nimport { UrlPayload, UrlSchema } from '@xyo-network/url-payload-plugin'\nimport { UrlSafetyPayload, UrlSafetySchema, UrlSafetyThreatType } from '@xyo-network/url-safety-payload-plugin'\n\nimport { UrlSafetyWitnessConfigSchema } from './Config'\nimport { UrlSafetyWitnessParams } from './Params'\n\nexport type GoogleSafeBrowsingMatchSchema = 'com.google.safebrowsing.match'\nexport const GoogleSafeBrowsingMatchSchema: GoogleSafeBrowsingMatchSchema = 'com.google.safebrowsing.match'\n\nexport interface GoogleSafeBrowsingMatch {\n cacheDuration: string\n platformType: string\n threat: {\n url: string\n }\n threatEntryType: string\n threatType: string\n}\n\nexport type GoogleSafeBrowsingMatchPayload = Payload<GoogleSafeBrowsingMatch, GoogleSafeBrowsingMatchSchema>\n\ninterface GoogleSafeBrowsingResult {\n matches?: GoogleSafeBrowsingMatch[]\n}\n\nconst checkUrlSafety = async (\n urls: string[],\n config?: {\n endPoint?: string\n key?: string\n },\n): Promise<GoogleSafeBrowsingMatchPayload[]> => {\n const axios = new AxiosJson()\n const endPoint = config?.endPoint ?? 'https://safebrowsing.googleapis.com/v4/threatMatches:find'\n const key = config?.key\n const mutatedUrls = urls.map((url) => url.replace('ipfs://', 'https://cloudflare-ipfs.com/'))\n if (mutatedUrls.length === 0) {\n return []\n }\n const postData = {\n client: {\n clientId: 'foreventory',\n clientVersion: '1.0',\n },\n threatInfo: {\n platformTypes: ['WINDOWS', 'LINUX', 'OSX'],\n threatEntries: mutatedUrls.map((url) => ({ url })),\n threatEntryTypes: ['URL'],\n threatTypes: ['SOCIAL_ENGINEERING', 'POTENTIALLY_HARMFUL_APPLICATION', 'UNWANTED_SOFTWARE', 'THREAT_TYPE_UNSPECIFIED'],\n },\n }\n const result = (await axios.post<GoogleSafeBrowsingResult>(`${endPoint}?key=${key}`, postData, { headers: { referer: 'http://localhost:3000' } }))\n .data\n return result.matches?.map<GoogleSafeBrowsingMatchPayload>((match) => ({ ...match, schema: GoogleSafeBrowsingMatchSchema })) ?? []\n}\n\nexport class UrlSafetyWitness<TParams extends UrlSafetyWitnessParams = UrlSafetyWitnessParams> extends AbstractWitness<TParams> {\n static override configSchemas = [UrlSafetyWitnessConfigSchema]\n\n get key() {\n return this.params.google?.safeBrowsing?.key\n }\n\n get urls() {\n return this.config?.urls\n }\n\n protected override async observeHandler(payloads: UrlPayload[] = []): Promise<UrlSafetyPayload[]> {\n const urls: string[] =\n this.urls ??\n payloads\n .filter((p): p is UrlPayload => p.schema === UrlSchema)\n .map((p) => {\n return p.url\n })\n\n const matches = await checkUrlSafety(urls, { key: this.key })\n\n return urls.map((url) => {\n const payload = matches.reduce<UrlSafetyPayload>(\n (prev, match) => {\n if (match.threat.url === url) {\n prev.threatTypes = prev.threatTypes ?? []\n if (!prev.threatTypes.includes(match.threatEntryType as UrlSafetyThreatType)) {\n prev.threatTypes.push(match.threatEntryType as UrlSafetyThreatType)\n }\n }\n return prev\n },\n { schema: UrlSafetySchema, url },\n )\n payload.threatTypes = payload.threatTypes?.sort()\n return payload\n })\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,2BAAiC;AACjC,+BAA8C;AAC9C,IAAAA,oCAAgC;;;ACFhC,uCAAgC;AAGzB,IAAM,+BAA+B,GAAG,gDAAe;;;ACH9D,mBAA0B;AAC1B,8BAAgC;AAEhC,gCAAsC;AACtC,IAAAC,oCAAuE;AAMhE,IAAM,gCAA+D;AAkB5E,IAAM,iBAAiB,OACrB,MACA,WAI8C;AAlChD;AAmCE,QAAM,QAAQ,IAAI,uBAAU;AAC5B,QAAM,YAAW,iCAAQ,aAAY;AACrC,QAAM,MAAM,iCAAQ;AACpB,QAAM,cAAc,KAAK,IAAI,CAAC,QAAQ,IAAI,QAAQ,WAAW,8BAA8B,CAAC;AAC5F,MAAI,YAAY,WAAW,GAAG;AAC5B,WAAO,CAAC;AAAA,EACV;AACA,QAAM,WAAW;AAAA,IACf,QAAQ;AAAA,MACN,UAAU;AAAA,MACV,eAAe;AAAA,IACjB;AAAA,IACA,YAAY;AAAA,MACV,eAAe,CAAC,WAAW,SAAS,KAAK;AAAA,MACzC,eAAe,YAAY,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE;AAAA,MACjD,kBAAkB,CAAC,KAAK;AAAA,MACxB,aAAa,CAAC,sBAAsB,mCAAmC,qBAAqB,yBAAyB;AAAA,IACvH;AAAA,EACF;AACA,QAAM,UAAU,MAAM,MAAM,KAA+B,GAAG,QAAQ,QAAQ,GAAG,IAAI,UAAU,EAAE,SAAS,EAAE,SAAS,wBAAwB,EAAE,CAAC,GAC7I;AACH,WAAO,YAAO,YAAP,mBAAgB,IAAoC,CAAC,WAAW,EAAE,GAAG,OAAO,QAAQ,8BAA8B,QAAO,CAAC;AACnI;AAEO,IAAM,mBAAN,cAAgG,wCAAyB;AAAA,EAC9H,OAAgB,gBAAgB,CAAC,4BAA4B;AAAA,EAE7D,IAAI,MAAM;AA9DZ;AA+DI,YAAO,gBAAK,OAAO,WAAZ,mBAAoB,iBAApB,mBAAkC;AAAA,EAC3C;AAAA,EAEA,IAAI,OAAO;AAlEb;AAmEI,YAAO,UAAK,WAAL,mBAAa;AAAA,EACtB;AAAA,EAEA,MAAyB,eAAe,WAAyB,CAAC,GAAgC;AAChG,UAAM,OACJ,KAAK,QACL,SACG,OAAO,CAAC,MAAuB,EAAE,WAAW,mCAAS,EACrD,IAAI,CAAC,MAAM;AACV,aAAO,EAAE;AAAA,IACX,CAAC;AAEL,UAAM,UAAU,MAAM,eAAe,MAAM,EAAE,KAAK,KAAK,IAAI,CAAC;AAE5D,WAAO,KAAK,IAAI,CAAC,QAAQ;AAjF7B;AAkFM,YAAM,UAAU,QAAQ;AAAA,QACtB,CAAC,MAAM,UAAU;AACf,cAAI,MAAM,OAAO,QAAQ,KAAK;AAC5B,iBAAK,cAAc,KAAK,eAAe,CAAC;AACxC,gBAAI,CAAC,KAAK,YAAY,SAAS,MAAM,eAAsC,GAAG;AAC5E,mBAAK,YAAY,KAAK,MAAM,eAAsC;AAAA,YACpE;AAAA,UACF;AACA,iBAAO;AAAA,QACT;AAAA,QACA,EAAE,QAAQ,mDAAiB,IAAI;AAAA,MACjC;AACA,cAAQ,eAAc,aAAQ,gBAAR,mBAAqB;AAC3C,aAAO;AAAA,IACT,CAAC;AAAA,EACH;AACF;;;AF5FO,IAAM,kBAAkB,UAC7B;AAAA,EACE,EAAE,UAAU,EAAE,CAAC,iDAAe,GAAG,EAAE,GAAG,QAAQ,sCAAiB;AAAA,EAC/D;AAAA,IACE,SAAS,OAAO,WAAW;AACzB,YAAM,SAAS,MAAM,iBAAiB,OAAO,MAAM;AACnD,aAAO;AAAA,IACT;AAAA,EACF;AACF;;;ADRF,IAAO,cAAQ;","names":["import_url_safety_payload_plugin","import_url_safety_payload_plugin"]}
|
package/dist/node/index.mjs
CHANGED
|
@@ -8,8 +8,8 @@ import { UrlSafetySchema } from "@xyo-network/url-safety-payload-plugin";
|
|
|
8
8
|
var UrlSafetyWitnessConfigSchema = `${UrlSafetySchema}.witness.config`;
|
|
9
9
|
|
|
10
10
|
// src/Witness/Witness.ts
|
|
11
|
+
import { AxiosJson } from "@xylabs/axios";
|
|
11
12
|
import { AbstractWitness } from "@xyo-network/abstract-witness";
|
|
12
|
-
import { AxiosJson } from "@xyo-network/axios";
|
|
13
13
|
import { UrlSchema } from "@xyo-network/url-payload-plugin";
|
|
14
14
|
import { UrlSafetySchema as UrlSafetySchema2 } from "@xyo-network/url-safety-payload-plugin";
|
|
15
15
|
var GoogleSafeBrowsingMatchSchema = "com.google.safebrowsing.match";
|
|
@@ -34,9 +34,7 @@ var checkUrlSafety = async (urls, config) => {
|
|
|
34
34
|
threatTypes: ["SOCIAL_ENGINEERING", "POTENTIALLY_HARMFUL_APPLICATION", "UNWANTED_SOFTWARE", "THREAT_TYPE_UNSPECIFIED"]
|
|
35
35
|
}
|
|
36
36
|
};
|
|
37
|
-
console.log(`checkUrlSafetyIn: ${JSON.stringify(postData, null, 2)}`);
|
|
38
37
|
const result = (await axios.post(`${endPoint}?key=${key}`, postData, { headers: { referer: "http://localhost:3000" } })).data;
|
|
39
|
-
console.log(`checkUrlSafetyOut: ${JSON.stringify(result, null, 2)}`);
|
|
40
38
|
return ((_a = result.matches) == null ? void 0 : _a.map((match) => ({ ...match, schema: GoogleSafeBrowsingMatchSchema }))) ?? [];
|
|
41
39
|
};
|
|
42
40
|
var UrlSafetyWitness = class extends AbstractWitness {
|
package/dist/node/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/Plugin.ts","../../src/Witness/Config.ts","../../src/Witness/Witness.ts","../../src/index.ts"],"sourcesContent":["import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\n\nimport { UrlSafetyWitness } from './Witness'\n\nexport const UrlSafetyPlugin = () =>\n createPayloadSetWitnessPlugin<UrlSafetyWitness>(\n { required: { [UrlSafetySchema]: 1 }, schema: PayloadSetSchema },\n {\n witness: async (params) => {\n const result = await UrlSafetyWitness.create(params)\n return result\n },\n },\n )\n","import { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\nimport { WitnessConfig } from '@xyo-network/witness-model'\n\nexport const UrlSafetyWitnessConfigSchema = `${UrlSafetySchema}.witness.config` as const\nexport type UrlSafetyWitnessConfigSchema = typeof UrlSafetyWitnessConfigSchema\n\nexport type UrlSafetyWitnessConfig = WitnessConfig<{\n google?: {\n safeBrowsing?: {\n endPoint?: string\n }\n }\n schema: UrlSafetyWitnessConfigSchema\n urls?: string[]\n}>\n","import {
|
|
1
|
+
{"version":3,"sources":["../../src/Plugin.ts","../../src/Witness/Config.ts","../../src/Witness/Witness.ts","../../src/index.ts"],"sourcesContent":["import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\n\nimport { UrlSafetyWitness } from './Witness'\n\nexport const UrlSafetyPlugin = () =>\n createPayloadSetWitnessPlugin<UrlSafetyWitness>(\n { required: { [UrlSafetySchema]: 1 }, schema: PayloadSetSchema },\n {\n witness: async (params) => {\n const result = await UrlSafetyWitness.create(params)\n return result\n },\n },\n )\n","import { UrlSafetySchema } from '@xyo-network/url-safety-payload-plugin'\nimport { WitnessConfig } from '@xyo-network/witness-model'\n\nexport const UrlSafetyWitnessConfigSchema = `${UrlSafetySchema}.witness.config` as const\nexport type UrlSafetyWitnessConfigSchema = typeof UrlSafetyWitnessConfigSchema\n\nexport type UrlSafetyWitnessConfig = WitnessConfig<{\n google?: {\n safeBrowsing?: {\n endPoint?: string\n }\n }\n schema: UrlSafetyWitnessConfigSchema\n urls?: string[]\n}>\n","import { AxiosJson } from '@xylabs/axios'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { Payload } from '@xyo-network/payload-model'\nimport { UrlPayload, UrlSchema } from '@xyo-network/url-payload-plugin'\nimport { UrlSafetyPayload, UrlSafetySchema, UrlSafetyThreatType } from '@xyo-network/url-safety-payload-plugin'\n\nimport { UrlSafetyWitnessConfigSchema } from './Config'\nimport { UrlSafetyWitnessParams } from './Params'\n\nexport type GoogleSafeBrowsingMatchSchema = 'com.google.safebrowsing.match'\nexport const GoogleSafeBrowsingMatchSchema: GoogleSafeBrowsingMatchSchema = 'com.google.safebrowsing.match'\n\nexport interface GoogleSafeBrowsingMatch {\n cacheDuration: string\n platformType: string\n threat: {\n url: string\n }\n threatEntryType: string\n threatType: string\n}\n\nexport type GoogleSafeBrowsingMatchPayload = Payload<GoogleSafeBrowsingMatch, GoogleSafeBrowsingMatchSchema>\n\ninterface GoogleSafeBrowsingResult {\n matches?: GoogleSafeBrowsingMatch[]\n}\n\nconst checkUrlSafety = async (\n urls: string[],\n config?: {\n endPoint?: string\n key?: string\n },\n): Promise<GoogleSafeBrowsingMatchPayload[]> => {\n const axios = new AxiosJson()\n const endPoint = config?.endPoint ?? 'https://safebrowsing.googleapis.com/v4/threatMatches:find'\n const key = config?.key\n const mutatedUrls = urls.map((url) => url.replace('ipfs://', 'https://cloudflare-ipfs.com/'))\n if (mutatedUrls.length === 0) {\n return []\n }\n const postData = {\n client: {\n clientId: 'foreventory',\n clientVersion: '1.0',\n },\n threatInfo: {\n platformTypes: ['WINDOWS', 'LINUX', 'OSX'],\n threatEntries: mutatedUrls.map((url) => ({ url })),\n threatEntryTypes: ['URL'],\n threatTypes: ['SOCIAL_ENGINEERING', 'POTENTIALLY_HARMFUL_APPLICATION', 'UNWANTED_SOFTWARE', 'THREAT_TYPE_UNSPECIFIED'],\n },\n }\n const result = (await axios.post<GoogleSafeBrowsingResult>(`${endPoint}?key=${key}`, postData, { headers: { referer: 'http://localhost:3000' } }))\n .data\n return result.matches?.map<GoogleSafeBrowsingMatchPayload>((match) => ({ ...match, schema: GoogleSafeBrowsingMatchSchema })) ?? []\n}\n\nexport class UrlSafetyWitness<TParams extends UrlSafetyWitnessParams = UrlSafetyWitnessParams> extends AbstractWitness<TParams> {\n static override configSchemas = [UrlSafetyWitnessConfigSchema]\n\n get key() {\n return this.params.google?.safeBrowsing?.key\n }\n\n get urls() {\n return this.config?.urls\n }\n\n protected override async observeHandler(payloads: UrlPayload[] = []): Promise<UrlSafetyPayload[]> {\n const urls: string[] =\n this.urls ??\n payloads\n .filter((p): p is UrlPayload => p.schema === UrlSchema)\n .map((p) => {\n return p.url\n })\n\n const matches = await checkUrlSafety(urls, { key: this.key })\n\n return urls.map((url) => {\n const payload = matches.reduce<UrlSafetyPayload>(\n (prev, match) => {\n if (match.threat.url === url) {\n prev.threatTypes = prev.threatTypes ?? []\n if (!prev.threatTypes.includes(match.threatEntryType as UrlSafetyThreatType)) {\n prev.threatTypes.push(match.threatEntryType as UrlSafetyThreatType)\n }\n }\n return prev\n },\n { schema: UrlSafetySchema, url },\n )\n payload.threatTypes = payload.threatTypes?.sort()\n return payload\n })\n }\n}\n","import { UrlSafetyPlugin } from './Plugin'\n\nexport * from './Witness'\n\nexport { UrlSafetyPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default UrlSafetyPlugin\n"],"mappings":";AAAA,SAAS,wBAAwB;AACjC,SAAS,qCAAqC;AAC9C,SAAS,mBAAAA,wBAAuB;;;ACFhC,SAAS,uBAAuB;AAGzB,IAAM,+BAA+B,GAAG,eAAe;;;ACH9D,SAAS,iBAAiB;AAC1B,SAAS,uBAAuB;AAEhC,SAAqB,iBAAiB;AACtC,SAA2B,mBAAAC,wBAA4C;AAMhE,IAAM,gCAA+D;AAkB5E,IAAM,iBAAiB,OACrB,MACA,WAI8C;AAlChD;AAmCE,QAAM,QAAQ,IAAI,UAAU;AAC5B,QAAM,YAAW,iCAAQ,aAAY;AACrC,QAAM,MAAM,iCAAQ;AACpB,QAAM,cAAc,KAAK,IAAI,CAAC,QAAQ,IAAI,QAAQ,WAAW,8BAA8B,CAAC;AAC5F,MAAI,YAAY,WAAW,GAAG;AAC5B,WAAO,CAAC;AAAA,EACV;AACA,QAAM,WAAW;AAAA,IACf,QAAQ;AAAA,MACN,UAAU;AAAA,MACV,eAAe;AAAA,IACjB;AAAA,IACA,YAAY;AAAA,MACV,eAAe,CAAC,WAAW,SAAS,KAAK;AAAA,MACzC,eAAe,YAAY,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE;AAAA,MACjD,kBAAkB,CAAC,KAAK;AAAA,MACxB,aAAa,CAAC,sBAAsB,mCAAmC,qBAAqB,yBAAyB;AAAA,IACvH;AAAA,EACF;AACA,QAAM,UAAU,MAAM,MAAM,KAA+B,GAAG,QAAQ,QAAQ,GAAG,IAAI,UAAU,EAAE,SAAS,EAAE,SAAS,wBAAwB,EAAE,CAAC,GAC7I;AACH,WAAO,YAAO,YAAP,mBAAgB,IAAoC,CAAC,WAAW,EAAE,GAAG,OAAO,QAAQ,8BAA8B,QAAO,CAAC;AACnI;AAEO,IAAM,mBAAN,cAAgG,gBAAyB;AAAA,EAC9H,OAAgB,gBAAgB,CAAC,4BAA4B;AAAA,EAE7D,IAAI,MAAM;AA9DZ;AA+DI,YAAO,gBAAK,OAAO,WAAZ,mBAAoB,iBAApB,mBAAkC;AAAA,EAC3C;AAAA,EAEA,IAAI,OAAO;AAlEb;AAmEI,YAAO,UAAK,WAAL,mBAAa;AAAA,EACtB;AAAA,EAEA,MAAyB,eAAe,WAAyB,CAAC,GAAgC;AAChG,UAAM,OACJ,KAAK,QACL,SACG,OAAO,CAAC,MAAuB,EAAE,WAAW,SAAS,EACrD,IAAI,CAAC,MAAM;AACV,aAAO,EAAE;AAAA,IACX,CAAC;AAEL,UAAM,UAAU,MAAM,eAAe,MAAM,EAAE,KAAK,KAAK,IAAI,CAAC;AAE5D,WAAO,KAAK,IAAI,CAAC,QAAQ;AAjF7B;AAkFM,YAAM,UAAU,QAAQ;AAAA,QACtB,CAAC,MAAM,UAAU;AACf,cAAI,MAAM,OAAO,QAAQ,KAAK;AAC5B,iBAAK,cAAc,KAAK,eAAe,CAAC;AACxC,gBAAI,CAAC,KAAK,YAAY,SAAS,MAAM,eAAsC,GAAG;AAC5E,mBAAK,YAAY,KAAK,MAAM,eAAsC;AAAA,YACpE;AAAA,UACF;AACA,iBAAO;AAAA,QACT;AAAA,QACA,EAAE,QAAQC,kBAAiB,IAAI;AAAA,MACjC;AACA,cAAQ,eAAc,aAAQ,gBAAR,mBAAqB;AAC3C,aAAO;AAAA,IACT,CAAC;AAAA,EACH;AACF;;;AF5FO,IAAM,kBAAkB,MAC7B;AAAA,EACE,EAAE,UAAU,EAAE,CAACC,gBAAe,GAAG,EAAE,GAAG,QAAQ,iBAAiB;AAAA,EAC/D;AAAA,IACE,SAAS,OAAO,WAAW;AACzB,YAAM,SAAS,MAAM,iBAAiB,OAAO,MAAM;AACnD,aAAO;AAAA,IACT;AAAA,EACF;AACF;;;AGRF,IAAO,cAAQ;","names":["UrlSafetySchema","UrlSafetySchema","UrlSafetySchema","UrlSafetySchema"]}
|
package/package.json
CHANGED
|
@@ -10,20 +10,20 @@
|
|
|
10
10
|
"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@
|
|
14
|
-
"@xyo-network/
|
|
15
|
-
"@xyo-network/module-model": "~2.79.
|
|
16
|
-
"@xyo-network/payload-model": "~2.79.
|
|
17
|
-
"@xyo-network/payloadset-plugin": "~2.79.
|
|
18
|
-
"@xyo-network/url-payload-plugin": "~2.79.
|
|
19
|
-
"@xyo-network/url-safety-payload-plugin": "~2.79.
|
|
20
|
-
"@xyo-network/witness-model": "~2.79.
|
|
13
|
+
"@xylabs/axios": "^2.13.8",
|
|
14
|
+
"@xyo-network/abstract-witness": "~2.79.5",
|
|
15
|
+
"@xyo-network/module-model": "~2.79.5",
|
|
16
|
+
"@xyo-network/payload-model": "~2.79.5",
|
|
17
|
+
"@xyo-network/payloadset-plugin": "~2.79.5",
|
|
18
|
+
"@xyo-network/url-payload-plugin": "~2.79.5",
|
|
19
|
+
"@xyo-network/url-safety-payload-plugin": "~2.79.5",
|
|
20
|
+
"@xyo-network/witness-model": "~2.79.5"
|
|
21
21
|
},
|
|
22
22
|
"devDependencies": {
|
|
23
|
-
"@xylabs/jest-helpers": "^2.13.
|
|
23
|
+
"@xylabs/jest-helpers": "^2.13.8",
|
|
24
24
|
"@xylabs/ts-scripts-yarn3": "^3.1.21",
|
|
25
25
|
"@xylabs/tsconfig": "^3.1.21",
|
|
26
|
-
"@xyo-network/account": "~2.79.
|
|
26
|
+
"@xyo-network/account": "~2.79.5",
|
|
27
27
|
"jest": "^29.7.0",
|
|
28
28
|
"typescript": "^5.2.2"
|
|
29
29
|
},
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
|
|
68
68
|
},
|
|
69
69
|
"sideEffects": false,
|
|
70
|
-
"version": "2.79.
|
|
70
|
+
"version": "2.79.5"
|
|
71
71
|
}
|
package/src/Witness/Witness.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import { AxiosJson } from '@xylabs/axios'
|
|
1
2
|
import { AbstractWitness } from '@xyo-network/abstract-witness'
|
|
2
|
-
import { AxiosJson } from '@xyo-network/axios'
|
|
3
3
|
import { Payload } from '@xyo-network/payload-model'
|
|
4
4
|
import { UrlPayload, UrlSchema } from '@xyo-network/url-payload-plugin'
|
|
5
5
|
import { UrlSafetyPayload, UrlSafetySchema, UrlSafetyThreatType } from '@xyo-network/url-safety-payload-plugin'
|
|
@@ -52,10 +52,8 @@ const checkUrlSafety = async (
|
|
|
52
52
|
threatTypes: ['SOCIAL_ENGINEERING', 'POTENTIALLY_HARMFUL_APPLICATION', 'UNWANTED_SOFTWARE', 'THREAT_TYPE_UNSPECIFIED'],
|
|
53
53
|
},
|
|
54
54
|
}
|
|
55
|
-
console.log(`checkUrlSafetyIn: ${JSON.stringify(postData, null, 2)}`)
|
|
56
55
|
const result = (await axios.post<GoogleSafeBrowsingResult>(`${endPoint}?key=${key}`, postData, { headers: { referer: 'http://localhost:3000' } }))
|
|
57
56
|
.data
|
|
58
|
-
console.log(`checkUrlSafetyOut: ${JSON.stringify(result, null, 2)}`)
|
|
59
57
|
return result.matches?.map<GoogleSafeBrowsingMatchPayload>((match) => ({ ...match, schema: GoogleSafeBrowsingMatchSchema })) ?? []
|
|
60
58
|
}
|
|
61
59
|
|