@peerbit/string 2.0.3 → 3.0.0

package/lib/esm/query.d.ts

@@ -21,17 +21,21 @@ export declare class StringMatch {
     });
     preprocess(string: string): string;
 }
-export declare class StringQueryRequest {
+export declare class SearchRequest {
     query: StringMatch[];
     constructor(properties?: {
         query: StringMatch[];
     });
 }
-export declare class StringResult {
+export declare abstract class AbstractSearchResult {
+}
+export declare class StringResult extends AbstractSearchResult {
     string: string;
     metadatas?: RangeMetadatas;
-    constructor(properties?: {
+    constructor(properties: {
         string: string;
         metadatas?: RangeMetadatas;
     });
 }
+export declare class NoAccess extends AbstractSearchResult {
+}

package/lib/esm/query.js

@@ -73,7 +73,7 @@ StringMatch = __decorate([
     variant(0),
     __metadata("design:paramtypes", [Object])
 ], StringMatch);
-export let StringQueryRequest = class StringQueryRequest {
+export let SearchRequest = class SearchRequest {
     query;
     constructor(properties) {
         if (properties) {
@@ -84,20 +84,21 @@ export let StringQueryRequest = class StringQueryRequest {
 __decorate([
     field({ type: vec(StringMatch) }),
     __metadata("design:type", Array)
-], StringQueryRequest.prototype, "query", void 0);
-StringQueryRequest = __decorate([
+], SearchRequest.prototype, "query", void 0);
+SearchRequest = __decorate([
     variant(0),
     __metadata("design:paramtypes", [Object])
-], StringQueryRequest);
+], SearchRequest);
 /// ----- RESULTS -----
-export let StringResult = class StringResult {
+export class AbstractSearchResult {
+}
+export let StringResult = class StringResult extends AbstractSearchResult {
     string;
     metadatas;
     constructor(properties) {
-        if (properties) {
-            this.string = properties.string;
-            this.metadatas = properties.metadatas;
-        }
+        super();
+        this.string = properties.string;
+        this.metadatas = properties.metadatas;
     }
 };
 __decorate([
@@ -112,4 +113,9 @@ StringResult = __decorate([
     variant(0),
     __metadata("design:paramtypes", [Object])
 ], StringResult);
+export let NoAccess = class NoAccess extends AbstractSearchResult {
+};
+NoAccess = __decorate([
+    variant(1)
+], NoAccess);
 //# sourceMappingURL=query.js.map

package/lib/esm/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/query.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAGtD,WAAM,aAAa,GAAnB,MAAM,aAAa;IAEzB,MAAM,CAAS;IAGf,MAAM,CAAS;IAEf,YAAY,IAAyC;QACpD,IAAI,IAAI,EAAE;YACT,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC1B;IACF,CAAC;CACD,CAAA;AAVA;IADC,KAAK,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;6CACR;AAGf;IADC,KAAK,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;6CACR;AALH,aAAa;IADzB,OAAO,CAAC,CAAC,CAAC;;GACE,aAAa,CAYzB;AAGM,WAAM,cAAc,GAApB,MAAM,cAAc;IAE1B,SAAS,CAAkB;IAE3B,YAAY,IAAqC;QAChD,IAAI,IAAI,EAAE;YACT,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;SAChC;IACF,CAAC;CACD,CAAA;AAPA;IADC,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;;iDACT;AAFf,cAAc;IAD1B,OAAO,CAAC,CAAC,CAAC;;GACE,cAAc,CAS1B;AAED,qBAAqB;AAGd,WAAM,WAAW,GAAjB,MAAM,WAAW;IAEvB,KAAK,CAAS;IAGd,UAAU,CAAU;IAEpB,YAAY,UAAmD;QAC9D,IAAI,UAAU,EAAE;YACf,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;SAChC;IACF,CAAC;IACD,UAAU,CAAC,MAAc;QACxB,IAAI,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO,MAAM,CAAC,WAAW,EAAE,CAAC;SAC5B;QACD,OAAO,MAAM,CAAC;IACf,CAAC;CACD,CAAA;AAhBA;IADC,KAAK,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;;0CACZ;AAGd;IADC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;+CACF;AALR,WAAW;IADvB,OAAO,CAAC,CAAC,CAAC;;GACE,WAAW,CAkBvB;AAGM,WAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAE9B,KAAK,CAAiB;IAEtB,YAAY,UAAqC;QAChD,IAAI,UAAU,EAAE;YACf,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;SAC9B;IACF,CAAC;CACD,CAAA;AAPA;IADC,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;;iDACZ;AAFV,kBAAkB;IAD9B,OAAO,CAAC,CAAC,CAAC;;GACE,kBAAkB,CAS9B;AAED,uBAAuB;AAEhB,WAAM,YAAY,GAAlB,MAAM,YAAY;IAExB,MAAM,CAAS;IAGf,SAAS,CAAkB;IAE3B,YAAY,UAA2D;QACtE,IAAI,UAAU,EAAE;YACf,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;YAChC,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;SACtC;IACF,CAAC;CACD,CAAA;AAXA;IADC,KAAK,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;;4CACX;AAGf;IADC,KAAK,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;8BAC5B,cAAc;+CAAC;AALf,YAAY;IADxB,OAAO,CAAC,CAAC,CAAC;;GACE,YAAY,CAaxB"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/query.ts"],"names":[],"mappings":"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"}

package/lib/esm/string-store.d.ts

@@ -1,32 +1,36 @@
-import { AppendOptions, CanAppend, Entry } from "@peerbit/log";
+import { AppendOptions, Change, Entry } from "@peerbit/log";
 import { SharedLog, SharedLogOptions } from "@peerbit/shared-log";
-import { SignatureWithKey } from "@peerbit/crypto";
-import { Program } from "@peerbit/program";
-import { RPCOptions, CanRead, RPC } from "@peerbit/rpc";
+import { PublicSignKey } from "@peerbit/crypto";
+import { Program, ProgramEvents } from "@peerbit/program";
+import { RPCOptions, RPC, RequestContext } from "@peerbit/rpc";
 import { StringOperation, StringIndex } from "./string-index.js";
-import { StringQueryRequest, StringResult } from "./query.js";
+import { AbstractSearchResult, SearchRequest } from "./query.js";
 import { Range } from "./range.js";
 export declare const STRING_STORE_TYPE = "string_store";
-export type StringStoreOptions = {
-    canRead?: (key: SignatureWithKey) => Promise<boolean>;
-};
+export type CanRead = (key?: PublicSignKey) => Promise<boolean> | boolean;
+export interface StringEvents {
+    change: CustomEvent<Change<StringOperation>>;
+}
+type CanPerform = (operation: StringOperation, context: TransactionContext) => Promise<boolean> | boolean;
 type Args = {
     canRead?: CanRead;
-    canAppend?: CanAppend<StringOperation>;
+    canPerform?: CanPerform;
     log?: SharedLogOptions;
 };
-export declare class DString extends Program {
+export type TransactionContext = {
+    entry: Entry<StringOperation>;
+};
+export declare class DString extends Program<Args, StringEvents & ProgramEvents> {
     _log: SharedLog<StringOperation>;
-    query: RPC<StringQueryRequest, StringResult>;
+    query: RPC<SearchRequest, AbstractSearchResult>;
     _index: StringIndex;
-    _optionCanAppend?: CanAppend<StringOperation>;
+    _canRead?: CanRead;
     constructor(properties: {
         id?: Uint8Array;
-        query?: RPC<StringQueryRequest, StringResult>;
+        query?: RPC<SearchRequest, AbstractSearchResult>;
     });
     open(options?: Args): Promise<void>;
-    canAppend(entry: Entry<StringOperation>): Promise<boolean>;
-    _canAppend(entry: Entry<StringOperation>): Promise<boolean>;
+    private _canPerform;
     add(value: string, index: Range, options?: AppendOptions<StringOperation>): Promise<{
         entry: Entry<StringOperation>;
         removed: Entry<StringOperation>[];
@@ -35,11 +39,11 @@ export declare class DString extends Program {
         entry: Entry<StringOperation>;
         removed: Entry<StringOperation>[];
     }>;
-    queryHandler(query: StringQueryRequest): Promise<StringResult | undefined>;
+    queryHandler(query: SearchRequest, ctx: RequestContext): Promise<AbstractSearchResult | undefined>;
     getValue(options?: {
         remote: {
             callback: (string: string) => any;
-            queryOptions: RPCOptions<StringResult>;
+            queryOptions: RPCOptions<AbstractSearchResult>;
         };
     }): Promise<string | undefined>;
 }

package/lib/esm/string-store.js

@@ -9,11 +9,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { field, variant } from "@dao-xyz/borsh";
 import { SharedLog } from "@peerbit/shared-log";
+import { sha256Base64Sync } from "@peerbit/crypto";
 import { Program } from "@peerbit/program";
 import { RPC } from "@peerbit/rpc";
 import { logger as loggerFn } from "@peerbit/logger";
 import { StringOperation, StringIndex, encoding } from "./string-index.js";
-import { RangeMetadata, RangeMetadatas, StringMatch, StringQueryRequest, StringResult, } from "./query.js";
+import { NoAccess, RangeMetadata, RangeMetadatas, StringMatch, SearchRequest, StringResult, } from "./query.js";
+import { CustomEvent } from "@libp2p/interfaces/events";
+import { concat, fromString } from "uint8arrays";
 const logger = loggerFn({ module: "string" });
 export const STRING_STORE_TYPE = "string_store";
 const findAllOccurrences = (str, substr) => {
@@ -30,7 +33,7 @@ export let DString = class DString extends Program {
     _log;
     query;
     _index;
-    _optionCanAppend;
+    _canRead;
     constructor(properties) {
         super();
         this.query = properties.query || new RPC();
@@ -38,37 +41,42 @@ export let DString = class DString extends Program {
         this._index = new StringIndex();
     }
     async open(options) {
-        this._optionCanAppend = options?.canAppend;
         await this._index.open(this._log.log);
         await this._log.open({
             encoding,
-            canAppend: this.canAppend.bind(this),
-            onChange: this._index.updateIndex.bind(this._index),
+            replicas: {
+                min: 0xffffffff, // assume a document can not be sharded?
+            },
+            canAppend: async (entry) => {
+                const operation = await entry.getPayloadValue();
+                if (!(await this._canPerform(operation, { entry }))) {
+                    return false;
+                }
+                return options?.canPerform
+                    ? options.canPerform(operation, { entry })
+                    : true;
+            },
+            onChange: async (change) => {
+                await this._index.updateIndex(change);
+                this.events.dispatchEvent(new CustomEvent("change", {
+                    detail: change,
+                }));
+            },
         });
         await this.query.open({
             ...options,
-            topic: this._log.log.idString + "/" + "dstring",
-            canRead: options?.canRead,
+            topic: sha256Base64Sync(concat([this._log.log.id, fromString("/dstring")])),
             responseHandler: this.queryHandler.bind(this),
-            queryType: StringQueryRequest,
+            queryType: SearchRequest,
             responseType: StringResult,
         });
     }
-    async canAppend(entry) {
-        if (!(await this._canAppend(entry))) {
-            return false;
-        }
-        if (this._optionCanAppend && !(await this._optionCanAppend(entry))) {
-            return false;
-        }
-        return true;
-    }
-    async _canAppend(entry) {
-        if (this._log.log.length === 0) {
+    async _canPerform(operation, context) {
+        if (this._log.log.length === 0 || context.entry.next.length === 0) {
             return true;
         }
         else {
-            for (const next of entry.next) {
+            for (const next of context.entry.next) {
                 if (this._log.log.has(next)) {
                     return true;
                 }
@@ -80,18 +88,24 @@ export let DString = class DString extends Program {
         return this._log.append(new StringOperation({
             index,
             value,
-        }), { nexts: await this._log.log.getHeads(), ...options });
+        }), {
+            ...options,
+            meta: { ...options?.meta, next: await this._log.log.getHeads() },
+        });
     }
     async del(index, options) {
         return this.add("", index, options);
     }
-    async queryHandler(query) {
+    async queryHandler(query, ctx) {
         logger.debug("Recieved query");
-        if (query instanceof StringQueryRequest == false) {
+        if (query instanceof SearchRequest == false) {
             logger.debug("Recieved query which is not a StringQueryRequest");
             return;
         }
         const stringQuery = query;
+        if (this._canRead && !(await this._canRead(ctx.from))) {
+            return new NoAccess();
+        }
         const content = this._index.string;
         const relaventQueries = stringQuery.query.filter((x) => x instanceof StringMatch);
         if (relaventQueries.length == 0) {
@@ -125,13 +139,22 @@ export let DString = class DString extends Program {
     async getValue(options) {
         if (options?.remote) {
             const counter = new Map();
-            const responses = await this.query.request(new StringQueryRequest({
+            const responses = await this.query.request(new SearchRequest({
                 query: [],
             }), options.remote.queryOptions);
             for (const response of responses) {
-                options?.remote.callback &&
-                    options?.remote.callback(response.response.string);
-                counter.set(response.response.string, (counter.get(response.response.string) || 0) + 1);
+                if (response.response instanceof NoAccess) {
+                    logger.error("Missing access");
+                    continue;
+                }
+                else if (response.response instanceof StringResult) {
+                    options?.remote.callback &&
+                        options?.remote.callback(response.response.string);
+                    counter.set(response.response.string, (counter.get(response.response.string) || 0) + 1);
+                }
+                else {
+                    throw new Error("Unsupported type: " + response?.constructor?.name);
+                }
             }
             let max = -1;
             let ret = undefined;

package/lib/esm/string-store.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@peerbit/string",
-	"version": "2.0.3",
+	"version": "3.0.0",
 	"description": "String store",
 	"type": "module",
 	"sideEffects": false,
@@ -32,13 +32,13 @@
 	"dependencies": {
 		"@dao-xyz/borsh": "^5.1.5",
 		"@peerbit/logger": "1.0.1",
-		"@peerbit/program": "2.1.0",
-		"@peerbit/rpc": "2.0.1",
-		"@peerbit/shared-log": "^2.0.1",
+		"@peerbit/program": "2.2.0",
+		"@peerbit/rpc": "2.1.0",
+		"@peerbit/shared-log": "^3.0.0",
 		"@peerbit/time": "1.0.2"
 	},
 	"devDependencies": {
-		"@peerbit/test-utils": "^1.0.15"
+		"@peerbit/test-utils": "^1.0.16"
 	},
-	"gitHead": "4752c301fb49b2f937b4039533ff5bc3537da3e0"
+	"gitHead": "464e807d679e24b897b7811ac99d6f85fbd756f9"
 }

package/src/query.ts

@@ -51,7 +51,7 @@ export class StringMatch {
 }
 
 @variant(0)
-export class StringQueryRequest {
+export class SearchRequest {
 	@field({ type: vec(StringMatch) })
 	query!: StringMatch[];
 
@@ -63,18 +63,22 @@ export class StringQueryRequest {
 }
 
 /// ----- RESULTS -----
+export abstract class AbstractSearchResult {}
+
 @variant(0)
-export class StringResult {
+export class StringResult extends AbstractSearchResult {
 	@field({ type: "string" })
 	string: string;
 
 	@field({ type: option(RangeMetadatas) })
 	metadatas?: RangeMetadatas;
 
-	constructor(properties?: { string: string; metadatas?: RangeMetadatas }) {
-		if (properties) {
-			this.string = properties.string;
-			this.metadatas = properties.metadatas;
-		}
+	constructor(properties: { string: string; metadatas?: RangeMetadatas }) {
+		super();
+		this.string = properties.string;
+		this.metadatas = properties.metadatas;
 	}
 }
+
+@variant(1)
+export class NoAccess extends AbstractSearchResult {}

package/src/string-store.ts

@@ -1,18 +1,22 @@
 import { field, variant } from "@dao-xyz/borsh";
-import { AppendOptions, CanAppend, Entry } from "@peerbit/log";
+import { AppendOptions, CanAppend, Change, Entry } from "@peerbit/log";
 import { SharedLog, SharedLogOptions } from "@peerbit/shared-log";
-import { SignatureWithKey } from "@peerbit/crypto";
-import { Program } from "@peerbit/program";
-import { RPCOptions, CanRead, RPC } from "@peerbit/rpc";
+import { PublicSignKey, sha256Base64Sync } from "@peerbit/crypto";
+import { Program, ProgramEvents } from "@peerbit/program";
+import { RPCOptions, RPC, RequestContext } from "@peerbit/rpc";
 import { logger as loggerFn } from "@peerbit/logger";
 import { StringOperation, StringIndex, encoding } from "./string-index.js";
 import {
+	AbstractSearchResult,
+	NoAccess,
 	RangeMetadata,
 	RangeMetadatas,
 	StringMatch,
-	StringQueryRequest,
+	SearchRequest,
 	StringResult,
 } from "./query.js";
+import { CustomEvent } from "@libp2p/interfaces/events";
+import { concat, fromString } from "uint8arrays";
 
 import { Range } from "./range.js";
 
@@ -33,31 +37,42 @@ const findAllOccurrences = (str: string, substr: string): number[] => {
 	return result;
 };
 
-export type StringStoreOptions = {
-	canRead?: (key: SignatureWithKey) => Promise<boolean>;
-};
+export type CanRead = (key?: PublicSignKey) => Promise<boolean> | boolean;
+
+export interface StringEvents {
+	change: CustomEvent<Change<StringOperation>>;
+}
+
+type CanPerform = (
+	operation: StringOperation,
+	context: TransactionContext
+) => Promise<boolean> | boolean;
 
 type Args = {
 	canRead?: CanRead;
-	canAppend?: CanAppend<StringOperation>;
+	canPerform?: CanPerform;
 	log?: SharedLogOptions;
 };
+
+export type TransactionContext = {
+	entry: Entry<StringOperation>;
+};
 @variant("dstring")
-export class DString extends Program {
+export class DString extends Program<Args, StringEvents & ProgramEvents> {
 	@field({ type: SharedLog })
 	_log: SharedLog<StringOperation>;
 
 	@field({ type: RPC })
-	query: RPC<StringQueryRequest, StringResult>;
+	query: RPC<SearchRequest, AbstractSearchResult>;
 
 	@field({ type: StringIndex })
 	_index: StringIndex;
 
-	_optionCanAppend?: CanAppend<StringOperation>;
+	_canRead?: CanRead;
 
 	constructor(properties: {
 		id?: Uint8Array;
-		query?: RPC<StringQueryRequest, StringResult>;
+		query?: RPC<SearchRequest, AbstractSearchResult>;
 	}) {
 		super();
 		this.query = properties.query || new RPC();
@@ -66,40 +81,52 @@ export class DString extends Program {
 	}
 
 	async open(options?: Args) {
-		this._optionCanAppend = options?.canAppend;
 		await this._index.open(this._log.log);
 
 		await this._log.open({
 			encoding,
-			canAppend: this.canAppend.bind(this),
-			onChange: this._index.updateIndex.bind(this._index),
+			replicas: {
+				min: 0xffffffff, // assume a document can not be sharded?
+			},
+			canAppend: async (entry) => {
+				const operation = await entry.getPayloadValue();
+
+				if (!(await this._canPerform(operation, { entry }))) {
+					return false;
+				}
+				return options?.canPerform
+					? options.canPerform(operation, { entry })
+					: true;
+			},
+			onChange: async (change) => {
+				await this._index.updateIndex(change);
+				this.events.dispatchEvent(
+					new CustomEvent("change", {
+						detail: change,
+					})
+				);
+			},
 		});
 
 		await this.query.open({
 			...options,
-			topic: this._log.log.idString + "/" + "dstring",
-			canRead: options?.canRead,
+			topic: sha256Base64Sync(
+				concat([this._log.log.id, fromString("/dstring")])
+			),
 			responseHandler: this.queryHandler.bind(this),
-			queryType: StringQueryRequest,
+			queryType: SearchRequest,
 			responseType: StringResult,
 		});
 	}
 
-	async canAppend(entry: Entry<StringOperation>): Promise<boolean> {
-		if (!(await this._canAppend(entry))) {
-			return false;
-		}
-		if (this._optionCanAppend && !(await this._optionCanAppend(entry))) {
-			return false;
-		}
-		return true;
-	}
-
-	async _canAppend(entry: Entry<StringOperation>): Promise<boolean> {
-		if (this._log.log.length === 0) {
+	private async _canPerform(
+		operation: StringOperation,
+		context: TransactionContext
+	): Promise<boolean> {
+		if (this._log.log.length === 0 || context.entry.next.length === 0) {
 			return true;
 		} else {
-			for (const next of entry.next) {
+			for (const next of context.entry.next) {
 				if (this._log.log.has(next)) {
 					return true;
 				}
@@ -118,7 +145,10 @@ export class DString extends Program {
 				index,
 				value,
 			}),
-			{ nexts: await this._log.log.getHeads(), ...options }
+			{
+				...options,
+				meta: { ...options?.meta, next: await this._log.log.getHeads() },
+			}
 		);
 	}
 
@@ -127,14 +157,19 @@ export class DString extends Program {
 	}
 
 	async queryHandler(
-		query: StringQueryRequest
-	): Promise<StringResult | undefined> {
+		query: SearchRequest,
+		ctx: RequestContext
+	): Promise<AbstractSearchResult | undefined> {
 		logger.debug("Recieved query");
-		if (query instanceof StringQueryRequest == false) {
+		if (query instanceof SearchRequest == false) {
 			logger.debug("Recieved query which is not a StringQueryRequest");
 			return;
 		}
-		const stringQuery = query as StringQueryRequest;
+
+		const stringQuery = query as SearchRequest;
+		if (this._canRead && !(await this._canRead(ctx.from))) {
+			return new NoAccess();
+		}
 
 		const content = this._index.string;
 		const relaventQueries = stringQuery.query.filter(
@@ -177,24 +212,31 @@ export class DString extends Program {
 	async getValue(options?: {
 		remote: {
 			callback: (string: string) => any;
-			queryOptions: RPCOptions<StringResult>;
+			queryOptions: RPCOptions<AbstractSearchResult>;
 		};
 	}): Promise<string | undefined> {
 		if (options?.remote) {
 			const counter: Map<string, number> = new Map();
 			const responses = await this.query.request(
-				new StringQueryRequest({
+				new SearchRequest({
 					query: [],
 				}),
 				options.remote.queryOptions
 			);
 			for (const response of responses) {
-				options?.remote.callback &&
-					options?.remote.callback(response.response.string);
-				counter.set(
-					response.response.string,
-					(counter.get(response.response.string) || 0) + 1
-				);
+				if (response.response instanceof NoAccess) {
+					logger.error("Missing access");
+					continue;
+				} else if (response.response instanceof StringResult) {
+					options?.remote.callback &&
+						options?.remote.callback(response.response.string);
+					counter.set(
+						response.response.string,
+						(counter.get(response.response.string) || 0) + 1
+					);
+				} else {
+					throw new Error("Unsupported type: " + response?.constructor?.name);
+				}
 			}
 
 			let max = -1;