@feasibleone/blong 1.17.0 → 1.18.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [1.18.0](https://github.com/feasibleone/blong/compare/blong-v1.17.0...blong-v1.18.0) (2026-04-29)
+
+
+### Features
+
+* rename blong-int-sql → blong-int-adapter with full adapter integration test suite ([#135](https://github.com/feasibleone/blong/issues/135)) ([ee2b0f6](https://github.com/feasibleone/blong/commit/ee2b0f64b181f787a71c404e08fd62959a7f0e8e))
+
+
+### Bug Fixes
+
+* type errors ([2f105bd](https://github.com/feasibleone/blong/commit/2f105bd3546b30ad1505ccde63ba43f3ccd575a8))
+* type errors ([#133](https://github.com/feasibleone/blong/issues/133)) ([5b33e54](https://github.com/feasibleone/blong/commit/5b33e54b6b57eb561748a72f400a48f70af7f311))
+
 ## [1.17.0](https://github.com/feasibleone/blong/compare/blong-v1.16.1...blong-v1.17.0) (2026-04-26)
 
 

package/dist/types.d.ts

@@ -17968,37 +17968,32 @@ export interface IGateway {
 export type Handlers = ((params: {
 	remote: unknown;
 	lib: object;
-	port: object;
+	port: object | undefined;
 	local: object;
 	literals: object[];
 	gateway: IGateway;
 	apiSchema: IApiSchema;
+	attachCheckpoint?: (meta: IMeta) => void;
 }) => void)[];
 export interface IRegistry {
-	start: (configOverride?: object) => Promise<IRegistry>;
+	start: (configOverride: object) => Promise<IRegistry>;
 	test: (tester?: unknown) => Promise<void>;
 	stop: () => Promise<IRegistry>;
-	ports: Map<string, IAdapterFactory>;
+	ports: Map<string, IAdapterRegistry>;
 	methods: Map<string, Handlers>;
 	modules: Map<string | symbol, IRegistry[]>;
-	createPort: (id: string) => Promise<ReturnType<IAdapterFactory>>;
-	getPort: (id: string) => ReturnType<IAdapterFactory> | undefined;
-	replaceHandlers: (id: string, handlers: object) => Promise<void>;
+	createPort: (id: string) => Promise<Adapter | undefined>;
+	getPort: (id: string) => Adapter | undefined;
+	replaceHandlers: (id: string, handlers: Handlers) => Promise<void>;
 	loadApi: (id: string, def: {
 		namespace: Record<string, string | string[]>;
-	}, source?: string) => Promise<void>;
+	}, source: string) => Promise<void>;
 	connected: () => Promise<boolean>;
 }
 export interface IApi {
 	id?: string;
 	type: typeof Type;
-	adapter: (id: string) => (api: {
-		utError: IError;
-		remote: IRemote;
-		rpc: IRpcServer;
-		local: ILocal;
-		registry: IRegistry;
-	}) => object;
+	adapter: (id: string) => IAdapterRegistry | undefined;
 	utError: IError;
 	errors: IErrorFactory;
 	gateway: unknown;
@@ -18018,7 +18013,13 @@ export interface IApi {
 	methodId: (name: string) => string;
 	getPath: (name: string) => string;
 	importMethod: (methodName: string, options?: object) => (...params: unknown[]) => Promise<unknown>;
-	attachHandlers: (target: object, patterns: unknown, adapter?: boolean) => unknown;
+	attachHandlers: (target: {
+		importedMap?: Map<string, object>;
+		imported: object;
+		config: {
+			namespace?: string | string[];
+		};
+	}, patterns: (string | RegExp)[] | string | RegExp, adapter?: boolean) => unknown;
 	createLog: ILog["logger"];
 	attachCheckpoint?: (meta: IMeta) => void;
 	handlers?: (api: {
@@ -18042,6 +18043,7 @@ export interface IErrorMap {
 		statusCode?: number;
 	};
 }
+export type Adapter<T = Record<string, unknown>, C = Record<string, unknown>> = IAdapter<T, C> & Pick<Required<IAdapter<T, C>>, "init" | "start" | "stop" | "ready" | "config" | "imported" | "errors" | "error" | "findValidation" | "getConversion" | "dispatch">;
 export interface IAdapter<T, C> {
 	validation?: TSchema;
 	config?: Config<T, C>;
@@ -18049,55 +18051,50 @@ export interface IAdapter<T, C> {
 	configBase?: string;
 	log?: ILogger;
 	errors?: Errors<IErrorMap>;
-	imported?: ReturnType<IAdapterFactory<T, C>>;
+	imported?: Record<string, PortHandlerBound>;
 	importedMap?: Map<string, IRemoteHandler>;
 	extends?: object | `adapter.${string}` | `orchestrator.${string}`;
-	activeConfig?: (this: ReturnType<IAdapterFactory<T, C>>) => Partial<Config<T, C>>;
-	init?: (this: ReturnType<IAdapterFactory<T, C>>, ...config: Partial<Config<T, C>>[]) => Promise<void>;
-	start?: (this: ReturnType<IAdapterFactory<T, C>>, configOverride: object) => Promise<object>;
-	ready?: (this: ReturnType<IAdapterFactory<T, C>>) => Promise<object>;
-	stop?: (this: ReturnType<IAdapterFactory<T, C>>) => Promise<object>;
-	connected?: (this: ReturnType<IAdapterFactory<T, C>>) => Promise<boolean>;
-	error?: (error: Error, $meta: IMeta) => void;
-	pack?: (this: ReturnType<IAdapterFactory<T, C>>, packet: {
-		size: number;
-		data: Buffer;
-	}) => Buffer;
-	unpackSize?: (this: ReturnType<IAdapterFactory<T, C>>, buffer: Buffer) => {
-		size: number;
-		data: Buffer;
-	};
-	unpack?: (this: ReturnType<IAdapterFactory<T, C>>, buffer: Buffer, options?: {
-		size: number;
-	}) => Buffer;
-	encode?: (data: unknown, $meta: IMeta, context: object, log: ILogger) => string | Buffer;
-	decode?: (buff: string | Buffer, $meta: IMeta, context: object, log: ILogger) => object[];
-	request?: (...params: unknown[]) => Promise<unknown>;
-	publish?: () => Promise<unknown>;
-	drain?: () => void;
-	findValidation?: (this: ReturnType<IAdapterFactory<T, C>>, $meta: IMeta) => () => object;
-	getConversion?: (this: ReturnType<IAdapterFactory<T, C>>, $meta: IMeta, type: "send" | "receive") => {
+	activeConfig?(this: Adapter<T, C>): Partial<Config<T, C>>;
+	init?(this: Adapter<T, C>, ...config: unknown[]): Promise<unknown>;
+	start?(this: Adapter<T, C>, ...params: unknown[]): Promise<unknown>;
+	ready?(this: Adapter<T, C>): Promise<unknown>;
+	stop?(this: Adapter<T, C>, ...params: unknown[]): Promise<unknown>;
+	link?(this: Adapter<T, C>, patterns: (string | RegExp)[] | string | RegExp, target: object): Promise<{
+		importedMap?: Map<string, object>;
+		imported?: object;
+		config?: {
+			namespace?: string | string[];
+		};
+	}>;
+	connected?(this: Adapter<T, C>): Promise<boolean>;
+	error?(error: unknown, $meta: unknown): void;
+	pack?(this: Adapter<T, C>, ...params: unknown[]): unknown;
+	unpackSize?(this: Adapter<T, C>, ...params: unknown[]): unknown;
+	unpack?(this: Adapter<T, C>, ...params: unknown[]): unknown;
+	encode?(data: unknown, $meta: unknown, context: unknown, log: unknown): Promise<string | Buffer>;
+	decode?(buff: string | Buffer, $meta: unknown, context: unknown, log: unknown): Promise<object[]>;
+	request?(...params: unknown[]): Promise<unknown>;
+	publish?(): Promise<unknown>;
+	drain?(): void;
+	findValidation?(this: Adapter<T, C>, $meta: unknown): (...params: unknown[]) => object;
+	getConversion?(this: Adapter<T, C>, $meta: unknown, type: string): {
 		name: string;
-		fn: () => object;
+		fn: (...params: unknown[]) => Promise<object>;
 	};
-	findHandler?: (this: ReturnType<IAdapterFactory<T, C>>, name: string) => () => unknown;
-	handles?: (this: ReturnType<IAdapterFactory<T, C>>, name: string) => boolean;
-	forNamespaces?: <T>(reducer: (prev: T, current: unknown) => T, initial: T) => T;
-	methodPath?: (name: string) => string;
-	dispatch?: (...params: unknown[]) => Promise<unknown>;
-	exec?: (this: ReturnType<IAdapterFactory<T, C>>, ...params: unknown[]) => Promise<unknown>;
-	bytesSent?: (count: number) => void;
-	bytesReceived?: (count: number) => void;
-	msgSent?: (count: number) => void;
-	msgReceived?: (count: number) => void;
+	findHandler?(this: Adapter<T, C>, name: string): () => unknown;
+	handles?(this: Adapter<T, C>, name: string): boolean;
+	forNamespaces?<U>(reducer: (prev: U, current: unknown) => U, initial: U): U;
+	methodPath?(name: string): string;
+	dispatch?(...params: unknown[]): Promise<unknown>;
+	exec?(this: Adapter<T, C>, ...params: unknown[]): Promise<unknown>;
+	bytesSent?(count: number): void;
+	bytesReceived?(count: number): void;
+	msgSent?(count: number): void;
+	msgReceived?(count: number): void;
 	isConnected?: Promise<boolean>;
-	event?: (name: string, params?: unknown) => Promise<object>;
-	handle?: (...params: unknown[]) => Promise<unknown>;
-	connect?: (what: unknown, context: {
-		requests: unknown;
-		waiting: unknown;
-		buffer: unknown;
-	}) => void;
+	event?(name: string, params?: unknown): Promise<object>;
+	handle?(...params: unknown[]): Promise<unknown>;
+	connect?(what: unknown, context: unknown): void;
 	/**
 	 * Optional lifecycle hook called when configuration changes.
 	 * When present, the framework calls this instead of a full stop+start cycle.
@@ -18109,15 +18106,24 @@ export interface IAdapter<T, C> {
 	 * @param next   The full new effective config snapshot (via proxy)
 	 * @param prev   The full previous effective config snapshot
 	 */
-	configChanged?: (diff: Map<string, {
-		prev: unknown;
-		next: unknown;
-	}>, next: object, prev: object) => Promise<void>;
+	configChanged?(this: Adapter<T, C>, diff: unknown, next: unknown, prev?: unknown): Promise<void>;
+	/** Allow arbitrary extra methods on adapter definitions (e.g. authenticate) */
+	[key: string]: unknown;
 }
 export interface IAdapterFactory<T = Record<string, unknown>, C = Record<string, unknown>> {
 	config?: Config<T, C> | false;
 	(api: IApi): IAdapter<T, C>;
 }
+export interface IAdapterRegistry {
+	config: unknown;
+	(api: {
+		utError: IError;
+		remote: IRemote;
+		rpc: IRpcServer;
+		local: ILocal;
+		registry: IRegistry;
+	}): Promise<Adapter>;
+}
 export interface IMeta {
 	mtid?: "request" | "response" | "error" | "notification" | "discard" | "event";
 	request?: IMeta;
@@ -18129,7 +18135,7 @@ export interface IMeta {
 	expect?: string[] | string;
 	opcode?: string;
 	source?: string;
-	forward?: object;
+	forward?: Record<string, string>;
 	httpResponse?: {
 		type?: string;
 		redirect?: string;
@@ -18178,14 +18184,14 @@ export interface IMeta {
 	deviceId?: string | string[];
 	latitude?: string | string[];
 	longitude?: string | string[];
-	conId?: number;
+	conId?: string | number;
 	dispatch?: (msg?: object, $meta?: IMeta) => [
 		msg: object,
 		$meta: IMeta
 	] | boolean | void | Promise<boolean>;
 	reply?: unknown;
-	timeout?: number;
-	timer?: (name?: string, newTime?: HRTime | false) => {
+	timeout?: HRTime;
+	timer?: (name?: string, newTime?: HRTime | undefined) => {
 		[name: string]: number;
 	};
 	gateway?: object;
@@ -18199,19 +18205,19 @@ export interface IMeta {
 	}>;
 }
 export interface IContext {
-	trace: number;
 	session?: {
 		[name: string]: unknown;
 	};
-	conId?: string;
+	conId?: string | number;
 	requests: Map<string, {
 		$meta: IMeta;
-		end: (error: Error) => {
+		end?: (error: Error) => {
 			local: object;
 			literals: object[];
 		};
 	}>;
 	waiting: Set<(error: Error) => void>;
+	buffer?: Buffer;
 }
 export interface ITypedError extends Error {
 	type: string;
@@ -18265,7 +18271,7 @@ export interface IModuleConfig<T extends TSchema = TNever> {
 	url: string;
 	config?: IActivationConfig<Partial<Static<T>> & Partial<Static<IBaseConfig>>>;
 	validation?: T;
-	children?: (string | (() => Promise<object>))[] | ((layer: ModuleApi) => unknown)[];
+	children?: (string | (() => Promise<object>))[] | ((layer: ModuleApi) => unknown)[] | Record<string, () => Promise<unknown>>;
 	glob?: Record<string, () => Promise<object>>;
 }
 export interface ILogger {
@@ -18366,8 +18372,10 @@ export type ApiDefinition = (blong: IValidationProxy) => {
 } | {
 	url: string;
 };
-export type PortHandler<T, C> = <R>(this: ReturnType<IAdapterFactory<T, C>>, params: {}, $meta: IMeta, context?: IContext) => Promise<R> | R;
-export type PortHandlerBound = <T>(params: {}, $meta: IMeta, context?: IContext) => Promise<T> | T;
+export type PortHandler<T, C> = <R>(this: Adapter<T, C>, params: object, $meta: IMeta, context?: IContext) => Promise<R> | R;
+export type PortHandlerBound = (<T>(params: object, $meta: IMeta, context?: IContext) => Promise<T> | T) & {
+	[name: string]: PortHandlerBound;
+};
 export type LibFn = <T>(...params: unknown[]) => T;
 export interface IRemoteHandler {
 	[name: string]: PortHandlerBound;
@@ -18430,11 +18438,11 @@ export declare abstract class Internal {
 	#private;
 	protected log?: ReturnType<ILog["logger"]>;
 	constructor(api?: {
-		log: ILog;
+		log?: ILog;
 	});
 	protected merge: ILib["merge"];
 	stop(): Promise<unknown>;
-	start(...params: unknown[]): Promise<unknown>;
+	start(..._args: unknown[]): Promise<unknown>;
 }
 export declare const handler: <T = Record<string, unknown>, C = AdapterContext>(definition: Definition<T, C>) => Definition<T, C>;
 /**
@@ -18496,12 +18504,12 @@ export declare const fixture: <T extends IMock>(definition: () => T) => (() => T
 export declare const validationHandlers: (handlers: Record<string, TFunction<[
 	ApiSchema
 ]>>) => ValidationDefinition;
-export declare const realm: <T extends TObject>(definition: SolutionFactory<T>) => SolutionFactory<T>;
-export declare const server: <T extends TObject>(definition: SolutionFactory<T>) => SolutionFactory<T>;
-export declare const browser: <T extends TObject>(definition: SolutionFactory<T>) => SolutionFactory<T>;
-export declare const layer: (activation: Record<string, boolean | object>) => Record<string, boolean | object>;
-export declare const adapter: <T, C = AdapterContext>(definition: IAdapterFactory<T, C>) => IAdapterFactory<T, C>;
-export declare const orchestrator: <T, C = AdapterContext>(definition: IAdapterFactory<T, C>) => IAdapterFactory<T, C>;
+export declare const realm: <T extends TObject>(definition: SolutionFactory<T>) => SolutionFactory<T> & {};
+export declare const server: <T extends TObject>(definition: SolutionFactory<T>) => SolutionFactory<T> & {};
+export declare const browser: <T extends TObject>(definition: SolutionFactory<T>) => SolutionFactory<T> & {};
+export declare const layer: (activation: Record<string, boolean | object>) => Record<string, boolean | object> & {};
+export declare const adapter: <T, C = AdapterContext>(definition: IAdapterFactory<T, C>) => IAdapterFactory<T, C> & {};
+export declare const orchestrator: <T, C = AdapterContext>(definition: IAdapterFactory<T, C>) => IAdapterFactory<T, C> & {};
 export type Kinds = "lib" | "validation" | "api" | "solution" | "server" | "browser" | "adapter" | "orchestrator" | "handler" | "model" | "fixture" | "";
 export declare const kind: (what: {}) => Kinds;
 declare const _default: {
@@ -18510,11 +18518,11 @@ declare const _default: {
 	library: <T = Record<string, unknown>>(definition: Lib<T>) => Lib<T>;
 	validation: (validation: ValidationDefinition) => ValidationDefinition;
 	api: (api: ApiDefinition) => ApiDefinition;
-	realm: <T extends TObject>(definition: SolutionFactory<T>) => SolutionFactory<T>;
-	server: <T extends TObject>(definition: SolutionFactory<T>) => SolutionFactory<T>;
-	browser: <T extends TObject>(definition: SolutionFactory<T>) => SolutionFactory<T>;
-	adapter: <T, C = AdapterContext>(definition: IAdapterFactory<T, C>) => IAdapterFactory<T, C>;
-	orchestrator: <T, C = AdapterContext>(definition: IAdapterFactory<T, C>) => IAdapterFactory<T, C>;
+	realm: <T extends TObject>(definition: SolutionFactory<T>) => SolutionFactory<T> & {};
+	server: <T extends TObject>(definition: SolutionFactory<T>) => SolutionFactory<T> & {};
+	browser: <T extends TObject>(definition: SolutionFactory<T>) => SolutionFactory<T> & {};
+	adapter: <T, C = AdapterContext>(definition: IAdapterFactory<T, C>) => IAdapterFactory<T, C> & {};
+	orchestrator: <T, C = AdapterContext>(definition: IAdapterFactory<T, C>) => IAdapterFactory<T, C> & {};
 	fixture: <T extends IMock>(definition: () => T) => (() => T);
 	kind: (what: {}) => Kinds;
 };

package/dist/types.js

@@ -16,7 +16,8 @@ export class Internal {
     async stop() {
         return this;
     }
-    async start(...params) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    async start(..._args) {
         return this;
     }
 }
@@ -40,7 +41,7 @@ export const handler = (definition) => Object.defineProperty(definition, Kind, {
  * });
  * ```
  */
-export const defineActions = (actions) => Object.defineProperty((_blong) => Object.fromEntries(Object.entries(actions).map(([key, value]) => [key, () => value])), Kind, { value: 'handler' });
+export const defineActions = (actions) => Object.defineProperty(() => Object.fromEntries(Object.entries(actions).map(([key, value]) => [key, () => value])), Kind, { value: 'handler' });
 export const library = (definition) => Object.defineProperty(definition, Kind, { value: 'lib' });
 export const validation = (validation) => Object.defineProperty(validation, Kind, { value: 'validation' });
 export const api = (api) => Object.defineProperty(api, Kind, { value: 'api' });
@@ -54,12 +55,22 @@ export const validationHandlers = handlers => validation(() => Object.fromEntrie
         description: 'description' in handler ? handler.description : undefined,
     }), 'name', { value: name }),
 ])));
-export const realm = (definition) => Object.defineProperty(definition, Kind, { value: 'solution' });
-export const server = (definition) => Object.defineProperty(definition, Kind, { value: 'server' });
-export const browser = (definition) => Object.defineProperty(definition, Kind, { value: 'browser' });
+export const realm = (definition) => Object.defineProperty(definition, Kind, {
+    value: 'solution',
+});
+export const server = (definition) => Object.defineProperty(definition, Kind, {
+    value: 'server',
+});
+export const browser = (definition) => Object.defineProperty(definition, Kind, {
+    value: 'browser',
+});
 export const layer = (activation) => Object.defineProperty(activation, Kind, { value: 'layer' });
-export const adapter = (definition) => Object.defineProperty(definition, Kind, { value: 'adapter' });
-export const orchestrator = (definition) => Object.defineProperty(definition, Kind, { value: 'orchestrator' });
+export const adapter = (definition) => Object.defineProperty(definition, Kind, {
+    value: 'adapter',
+});
+export const orchestrator = (definition) => Object.defineProperty(definition, Kind, {
+    value: 'orchestrator',
+});
 export const kind = (what) => what[Kind] || '';
 export default {
     handler,

package/dist/types.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feasibleone/blong",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "description": "API and DRY focused RAD framework https://feasibleone.github.io/blong-docs",
   "keywords": [
     "blong",
@@ -48,6 +48,7 @@
   },
   "scripts": {
     "build": "heft build --clean;dts-bundle-generator --config dts-gen.config.json",
+    "ci-lint": "tsc --noEmit",
     "ci-publish": "node ../../common/scripts/install-run-rush-pnpm.js publish --access public --provenance"
   }
 }

package/types.ts

@@ -266,29 +266,30 @@ export interface IGateway {
 export type Handlers = ((params: {
     remote: unknown;
     lib: object;
-    port: object;
+    port: object | undefined;
     local: object;
     literals: object[];
     gateway: IGateway;
     apiSchema: IApiSchema;
+    attachCheckpoint?: (meta: IMeta) => void;
 }) => void)[];
 
 export interface IRegistry {
-    start: (configOverride?: object) => Promise<IRegistry>;
+    start: (configOverride: object) => Promise<IRegistry>;
     test: (tester?: unknown) => Promise<void>;
     stop: () => Promise<IRegistry>;
-    ports: Map<string, IAdapterFactory>;
+    ports: Map<string, IAdapterRegistry>;
     methods: Map<string, Handlers>;
     modules: Map<string | symbol, IRegistry[]>;
-    createPort: (id: string) => Promise<ReturnType<IAdapterFactory>>;
-    getPort: (id: string) => ReturnType<IAdapterFactory> | undefined;
-    replaceHandlers: (id: string, handlers: object) => Promise<void>;
+    createPort: (id: string) => Promise<Adapter | undefined>;
+    getPort: (id: string) => Adapter | undefined;
+    replaceHandlers: (id: string, handlers: Handlers) => Promise<void>;
     loadApi: (
         id: string,
         def: {
             namespace: Record<string, string | string[]>;
         },
-        source?: string,
+        source: string,
     ) => Promise<void>;
     connected: () => Promise<boolean>;
 }
@@ -296,15 +297,7 @@ export interface IRegistry {
 export interface IApi {
     id?: string;
     type: typeof Type;
-    adapter: (
-        id: string,
-    ) => (api: {
-        utError: IError;
-        remote: IRemote;
-        rpc: IRpcServer;
-        local: ILocal;
-        registry: IRegistry;
-    }) => object;
+    adapter: (id: string) => IAdapterRegistry | undefined;
     utError: IError;
     errors: IErrorFactory;
     gateway: unknown;
@@ -323,7 +316,15 @@ export interface IApi {
         methodName: string,
         options?: object,
     ) => (...params: unknown[]) => Promise<unknown>;
-    attachHandlers: (target: object, patterns: unknown, adapter?: boolean) => unknown;
+    attachHandlers: (
+        target: {
+            importedMap?: Map<string, object>;
+            imported: object;
+            config: {namespace?: string | string[]};
+        },
+        patterns: (string | RegExp)[] | string | RegExp,
+        adapter?: boolean,
+    ) => unknown;
     createLog: ILog['logger'];
     attachCheckpoint?: (meta: IMeta) => void;
     handlers?: (api: {utError: IError; remote: IRemote; type: typeof Type}) => {
@@ -349,6 +350,21 @@ export interface IErrorMap {
           };
 }
 
+export type Adapter<T = Record<string, unknown>, C = Record<string, unknown>> = IAdapter<T, C> &
+    Pick<
+        Required<IAdapter<T, C>>,
+        | 'init'
+        | 'start'
+        | 'stop'
+        | 'ready'
+        | 'config'
+        | 'imported'
+        | 'errors'
+        | 'error'
+        | 'findValidation'
+        | 'getConversion'
+        | 'dispatch'
+    >;
 export interface IAdapter<T, C> {
     validation?: TSchema;
     config?: Config<T, C>;
@@ -356,60 +372,63 @@ export interface IAdapter<T, C> {
     configBase?: string;
     log?: ILogger;
     errors?: Errors<IErrorMap>;
-    imported?: ReturnType<IAdapterFactory<T, C>>;
+    imported?: Record<string, PortHandlerBound>;
     importedMap?: Map<string, IRemoteHandler>;
     extends?: object | `adapter.${string}` | `orchestrator.${string}`;
-    activeConfig?: (this: ReturnType<IAdapterFactory<T, C>>) => Partial<Config<T, C>>;
-    init?: (
-        this: ReturnType<IAdapterFactory<T, C>>,
-        ...config: Partial<Config<T, C>>[]
-    ) => Promise<void>;
-    start?: (this: ReturnType<IAdapterFactory<T, C>>, configOverride: object) => Promise<object>;
-    ready?: (this: ReturnType<IAdapterFactory<T, C>>) => Promise<object>;
-    stop?: (this: ReturnType<IAdapterFactory<T, C>>) => Promise<object>;
-    connected?: (this: ReturnType<IAdapterFactory<T, C>>) => Promise<boolean>;
-    error?: (error: Error, $meta: IMeta) => void;
-    pack?: (
-        this: ReturnType<IAdapterFactory<T, C>>,
-        packet: {size: number; data: Buffer},
-    ) => Buffer;
-    unpackSize?: (
-        this: ReturnType<IAdapterFactory<T, C>>,
-        buffer: Buffer,
-    ) => {size: number; data: Buffer};
-    unpack?: (
-        this: ReturnType<IAdapterFactory<T, C>>,
-        buffer: Buffer,
-        options?: {size: number},
-    ) => Buffer;
-    encode?: (data: unknown, $meta: IMeta, context: object, log: ILogger) => string | Buffer;
-    decode?: (buff: string | Buffer, $meta: IMeta, context: object, log: ILogger) => object[];
-    request?: (...params: unknown[]) => Promise<unknown>;
-    publish?: () => Promise<unknown>;
-    drain?: () => void;
-    findValidation?: (this: ReturnType<IAdapterFactory<T, C>>, $meta: IMeta) => () => object;
-    getConversion?: (
-        this: ReturnType<IAdapterFactory<T, C>>,
-        $meta: IMeta,
-        type: 'send' | 'receive',
-    ) => {name: string; fn: () => object};
-    findHandler?: (this: ReturnType<IAdapterFactory<T, C>>, name: string) => () => unknown;
-    handles?: (this: ReturnType<IAdapterFactory<T, C>>, name: string) => boolean;
-    forNamespaces?: <T>(reducer: (prev: T, current: unknown) => T, initial: T) => T;
-    methodPath?: (name: string) => string;
-    dispatch?: (...params: unknown[]) => Promise<unknown>;
-    exec?: (this: ReturnType<IAdapterFactory<T, C>>, ...params: unknown[]) => Promise<unknown>;
-    bytesSent?: (count: number) => void;
-    bytesReceived?: (count: number) => void;
-    msgSent?: (count: number) => void;
-    msgReceived?: (count: number) => void;
+    activeConfig?(this: Adapter<T, C>): Partial<Config<T, C>>;
+    init?(this: Adapter<T, C>, ...config: unknown[]): Promise<unknown>;
+    start?(this: Adapter<T, C>, ...params: unknown[]): Promise<unknown>;
+    ready?(this: Adapter<T, C>): Promise<unknown>;
+    stop?(this: Adapter<T, C>, ...params: unknown[]): Promise<unknown>;
+    link?(
+        this: Adapter<T, C>,
+        patterns: (string | RegExp)[] | string | RegExp,
+        target: object,
+    ): Promise<{
+        importedMap?: Map<string, object>;
+        imported?: object;
+        config?: {namespace?: string | string[]};
+    }>;
+    connected?(this: Adapter<T, C>): Promise<boolean>;
+    error?(error: unknown, $meta: unknown): void;
+    pack?(this: Adapter<T, C>, ...params: unknown[]): unknown;
+    unpackSize?(this: Adapter<T, C>, ...params: unknown[]): unknown;
+    unpack?(this: Adapter<T, C>, ...params: unknown[]): unknown;
+    encode?(
+        data: unknown,
+        $meta: unknown,
+        context: unknown,
+        log: unknown,
+    ): Promise<string | Buffer>;
+    decode?(
+        buff: string | Buffer,
+        $meta: unknown,
+        context: unknown,
+        log: unknown,
+    ): Promise<object[]>;
+    request?(...params: unknown[]): Promise<unknown>;
+    publish?(): Promise<unknown>;
+    drain?(): void;
+    findValidation?(this: Adapter<T, C>, $meta: unknown): (...params: unknown[]) => object;
+    getConversion?(
+        this: Adapter<T, C>,
+        $meta: unknown,
+        type: string,
+    ): {name: string; fn: (...params: unknown[]) => Promise<object>};
+    findHandler?(this: Adapter<T, C>, name: string): () => unknown;
+    handles?(this: Adapter<T, C>, name: string): boolean;
+    forNamespaces?<U>(reducer: (prev: U, current: unknown) => U, initial: U): U;
+    methodPath?(name: string): string;
+    dispatch?(...params: unknown[]): Promise<unknown>;
+    exec?(this: Adapter<T, C>, ...params: unknown[]): Promise<unknown>;
+    bytesSent?(count: number): void;
+    bytesReceived?(count: number): void;
+    msgSent?(count: number): void;
+    msgReceived?(count: number): void;
     isConnected?: Promise<boolean>;
-    event?: (name: string, params?: unknown) => Promise<object>;
-    handle?: (...params: unknown[]) => Promise<unknown>;
-    connect?: (
-        what: unknown,
-        context: {requests: unknown; waiting: unknown; buffer: unknown},
-    ) => void;
+    event?(name: string, params?: unknown): Promise<object>;
+    handle?(...params: unknown[]): Promise<unknown>;
+    connect?(what: unknown, context: unknown): void;
     /**
      * Optional lifecycle hook called when configuration changes.
      * When present, the framework calls this instead of a full stop+start cycle.
@@ -421,11 +440,14 @@ export interface IAdapter<T, C> {
      * @param next   The full new effective config snapshot (via proxy)
      * @param prev   The full previous effective config snapshot
      */
-    configChanged?: (
-        diff: Map<string, {prev: unknown; next: unknown}>,
-        next: object,
-        prev: object,
-    ) => Promise<void>;
+    configChanged?(
+        this: Adapter<T, C>,
+        diff: unknown,
+        next: unknown,
+        prev?: unknown,
+    ): Promise<void>;
+    /** Allow arbitrary extra methods on adapter definitions (e.g. authenticate) */
+    [key: string]: unknown;
 }
 
 export interface IAdapterFactory<T = Record<string, unknown>, C = Record<string, unknown>> {
@@ -433,6 +455,17 @@ export interface IAdapterFactory<T = Record<string, unknown>, C = Record<string,
     (api: IApi): IAdapter<T, C>;
 }
 
+export interface IAdapterRegistry {
+    config: unknown;
+    (api: {
+        utError: IError;
+        remote: IRemote;
+        rpc: IRpcServer;
+        local: ILocal;
+        registry: IRegistry;
+    }): Promise<Adapter>;
+}
+
 export interface IMeta {
     mtid?: 'request' | 'response' | 'error' | 'notification' | 'discard' | 'event';
     request?: IMeta;
@@ -444,7 +477,7 @@ export interface IMeta {
     expect?: string[] | string;
     opcode?: string;
     source?: string;
-    forward?: object;
+    forward?: Record<string, string>;
     httpResponse?: {
         type?: string;
         redirect?: string;
@@ -490,16 +523,16 @@ export interface IMeta {
     deviceId?: string | string[];
     latitude?: string | string[];
     longitude?: string | string[];
-    conId?: number;
+    conId?: string | number;
     dispatch?: (
         msg?: object,
         $meta?: IMeta,
     ) => [msg: object, $meta: IMeta] | boolean | void | Promise<boolean>;
     reply?: unknown;
-    timeout?: number;
+    timeout?: HRTime;
     timer?: (
         name?: string,
-        newTime?: HRTime | false,
+        newTime?: HRTime | undefined,
     ) => {
         [name: string]: number;
     };
@@ -511,16 +544,17 @@ export interface IMeta {
 }
 
 export interface IContext {
-    trace: number;
+    // trace: number;
     session?: {
         [name: string]: unknown;
     };
-    conId?: string;
+    conId?: string | number;
     requests: Map<
         string,
-        {$meta: IMeta; end: (error: Error) => {local: object; literals: object[]}}
+        {$meta: IMeta; end?: (error: Error) => {local: object; literals: object[]}}
     >;
     waiting: Set<(error: Error) => void>;
+    buffer?: Buffer;
 }
 
 export interface ITypedError extends Error {
@@ -578,7 +612,10 @@ export interface IModuleConfig<T extends TSchema = TNever> {
     url: string;
     config?: IActivationConfig<Partial<Static<T>> & Partial<Static<IBaseConfig>>>;
     validation?: T;
-    children?: (string | (() => Promise<object>))[] | ((layer: ModuleApi) => unknown)[];
+    children?:
+        | (string | (() => Promise<object>))[]
+        | ((layer: ModuleApi) => unknown)[]
+        | Record<string, () => Promise<unknown>>;
     glob?: Record<string, () => Promise<object>>;
 }
 
@@ -702,17 +739,24 @@ export type ApiDefinition = (blong: IValidationProxy) =>
       };
 
 export type PortHandler<T, C> = <R>(
-    this: ReturnType<IAdapterFactory<T, C>>,
-    params: {},
+    this: Adapter<T, C>,
+    params: object,
     $meta: IMeta,
     context?: IContext,
 ) => Promise<R> | R;
-export type PortHandlerBound = <T>(params: {}, $meta: IMeta, context?: IContext) => Promise<T> | T;
+export type PortHandlerBound = (<T>(
+    params: object,
+    $meta: IMeta,
+    context?: IContext,
+) => Promise<T> | T) & {
+    [name: string]: PortHandlerBound;
+};
 export type LibFn = <T>(...params: unknown[]) => T;
 export interface IRemoteHandler {
     [name: string]: PortHandlerBound;
 }
-export interface ISchema {}
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
+export interface ISchema {} // this is being extended via ambient declarations in ~.schema.ts
 export interface IHandlerProxy<T> {
     config: T;
     handler: {
@@ -769,9 +813,9 @@ const Kind: symbol = Symbol.for('blong:kind');
 export type Kind = typeof Kind;
 
 export abstract class Internal {
-    #log?: ILog;
+    #log?: ILog | undefined;
     protected log?: ReturnType<ILog['logger']>;
-    public constructor(api?: {log: ILog}) {
+    public constructor(api?: {log?: ILog}) {
         this.#log = api?.log;
     }
     protected merge: ILib['merge'] = (...args: Parameters<ILib['merge']>) => {
@@ -783,7 +827,8 @@ export abstract class Internal {
     public async stop(): Promise<unknown> {
         return this;
     }
-    public async start(...params: unknown[]): Promise<unknown> {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    public async start(..._args: unknown[]): Promise<unknown> {
         return this;
     }
 }
@@ -850,8 +895,7 @@ export const defineActions = (
     actions: Record<string, IActionDef>,
 ): ((_blong: unknown) => Record<string, () => IActionDef>) =>
     Object.defineProperty(
-        (_blong: unknown) =>
-            Object.fromEntries(Object.entries(actions).map(([key, value]) => [key, () => value])),
+        () => Object.fromEntries(Object.entries(actions).map(([key, value]) => [key, () => value])),
         Kind,
         {value: 'handler'},
     );
@@ -888,21 +932,40 @@ export const validationHandlers: (
         ),
     );
 
-export const realm = <T extends TObject>(definition: SolutionFactory<T>): SolutionFactory<T> =>
-    Object.defineProperty(definition, Kind, {value: 'solution'});
-export const server = <T extends TObject>(definition: SolutionFactory<T>): SolutionFactory<T> =>
-    Object.defineProperty(definition, Kind, {value: 'server'});
-export const browser = <T extends TObject>(definition: SolutionFactory<T>): SolutionFactory<T> =>
-    Object.defineProperty(definition, Kind, {value: 'browser'});
+export const realm = <T extends TObject>(
+    definition: SolutionFactory<T>,
+): SolutionFactory<T> & {[Kind]: 'solution'} =>
+    Object.defineProperty(definition as SolutionFactory<T> & {[Kind]: 'solution'}, Kind, {
+        value: 'solution',
+    });
+export const server = <T extends TObject>(
+    definition: SolutionFactory<T>,
+): SolutionFactory<T> & {[Kind]: 'server'} =>
+    Object.defineProperty(definition as SolutionFactory<T> & {[Kind]: 'server'}, Kind, {
+        value: 'server',
+    });
+export const browser = <T extends TObject>(
+    definition: SolutionFactory<T>,
+): SolutionFactory<T> & {[Kind]: 'browser'} =>
+    Object.defineProperty(definition as SolutionFactory<T> & {[Kind]: 'browser'}, Kind, {
+        value: 'browser',
+    });
 export const layer = (
     activation: Record<string, boolean | object>,
-): Record<string, boolean | object> => Object.defineProperty(activation, Kind, {value: 'layer'});
+): Record<string, boolean | object> & {[Kind]: 'layer'} =>
+    Object.defineProperty(activation, Kind, {value: 'layer'});
 export const adapter = <T, C = AdapterContext>(
     definition: IAdapterFactory<T, C>,
-): IAdapterFactory<T, C> => Object.defineProperty(definition, Kind, {value: 'adapter'});
+): IAdapterFactory<T, C> & {[Kind]: 'adapter'} =>
+    Object.defineProperty(definition as IAdapterFactory<T, C> & {[Kind]: 'adapter'}, Kind, {
+        value: 'adapter',
+    });
 export const orchestrator = <T, C = AdapterContext>(
     definition: IAdapterFactory<T, C>,
-): IAdapterFactory<T, C> => Object.defineProperty(definition, Kind, {value: 'orchestrator'});
+): IAdapterFactory<T, C> & {[Kind]: 'orchestrator'} =>
+    Object.defineProperty(definition as IAdapterFactory<T, C> & {[Kind]: 'orchestrator'}, Kind, {
+        value: 'orchestrator',
+    });
 
 export type Kinds =
     | 'lib'