Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhance info endpoint and bump to v0.1.13 #117

Merged
merged 9 commits into from
Mar 5, 2024
Merged

enhance info endpoint and bump to v0.1.13 #117

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
33eb885
enhance info endpoint
LiranCohen Mar 4, 2024
899dbd9
better environment variable
LiranCohen Mar 5, 2024
a56068e
read versions from package json path in docker server
LiranCohen Mar 5, 2024
53c44ac
add more optionality to the info endpoint
LiranCohen Mar 5, 2024
06a915c
bump dwn-server version
LiranCohen Mar 5, 2024
d78eba3
add empty line at the end of the readme markdown file
LiranCohen Mar 5, 2024
1da1676
add some coverage, move to config and constructor for http api
LiranCohen Mar 5, 2024
63a3f29
comments
LiranCohen Mar 5, 2024
b3c811b
update comments per review suggestions
LiranCohen Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/http-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,16 @@ import { jsonRpcRouter } from './json-rpc-api.js';
import { requestCounter, responseHistogram } from './metrics.js';
import type { RegistrationManager } from './registration/registration-manager.js';

const packageJson = process.env.npm_package_json ? JSON.parse(readFileSync(process.env.npm_package_json).toString()) : {};
const packageJson = process.env.npm_package_json ? JSON.parse(readFileSync(process.env.npm_package_json).toString()) : {
dependencies: {}
};

// when this server runs as a docker container, it is not run using the `npm` package, so `npm_package_json` env does not exist.
// we inject the versions using the respective environment variables.
const packageVersions = {
version : packageJson.version || process.env.DWN_SERVER_VERSION,
sdkVersion : packageJson.dependencies['@tbd54566975/dwn-sdk-js'] || process.env.DWN_SDK_VERSION
}

export class HttpApi {
#config: DwnServerConfig;
Expand Down Expand Up @@ -188,8 +197,8 @@ export class HttpApi {
server : process.env.npm_package_name,
maxFileSize : config.maxRecordDataSize,
registrationRequirements : registrationRequirements,
version : packageJson.version,
sdkVersion : packageJson.dependencies['@tbd54566975/dwn-sdk-js'],
version : packageVersions.version,
sdkVersion : packageVersions.sdkVersion,
webSocketSupport : config.webSocketSupport,
});
});
Expand Down
2 changes: 1 addition & 1 deletion src/json-rpc-handlers/dwn/process-message.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export const handleDwnProcessMessage: JsonRpcHandler = async (
);

// log the unhandled error response
log.error('handleDwnProcessMessage error', jsonRpcResponse, e);
log.error('handleDwnProcessMessage error', jsonRpcResponse, dwnRequest, e);
return { jsonRpcResponse } as HandlerResponse;
}
};
Loading