Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Benjamin Toby
2025-04-17 11:42:53 +01:00
parent ba1a4aeeb8
commit ee23d71b66
11 changed files with 74 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/package-shared/actions/get-schema.d.ts
Vendored
+1 -1
View File
@@ -6,5 +6,5 @@ type GetSchemaReturn = {
/**
* # Get Schema for Database, table, or field *
*/
export default function getSchema({ key, database, field, table, user_id, }: GetSchemaAPIParam): Promise<GetSchemaReturn>;
export default function getSchema({ key, database, field, table, user_id, env, }: GetSchemaAPIParam): Promise<GetSchemaReturn>;
export {};
dist/package-shared/actions/get-schema.js
Vendored
+2 -2
View File
@@ -18,8 +18,8 @@ const grab_host_names_1 = __importDefault(require("../utils/grab-host-names"));
* # Get Schema for Database, table, or field *
*/
function getSchema(_a) {
return __awaiter(this, arguments, void 0, function* ({ key, database, field, table, user_id, }) {
const grabedHostNames = (0, grab_host_names_1.default)();
return __awaiter(this, arguments, void 0, function* ({ key, database, field, table, user_id, env, }) {
const grabedHostNames = (0, grab_host_names_1.default)({ env });
const { host, port, scheme } = grabedHostNames;
/**
* Make https request
dist/package-shared/types/index.d.ts
Vendored
+3
View File
@@ -290,6 +290,9 @@ export interface GetSchemaRequestQuery {
table?: string;
field?: string;
user_id?: string | number;
env?: {
[k: string]: string;
};
}
export interface GetSchemaAPICredentialsParam {
key: string;
dist/package-shared/utils/grab-host-names.d.ts
Vendored
+3
View File
@@ -8,6 +8,9 @@ type GrabHostNamesReturn = {
};
type Param = {
userId?: string | number;
env?: {
[k: string]: string;
};
};
/**
* # Grab Names For Query
dist/package-shared/utils/grab-host-names.js
Vendored
+10 -8
View File
@@ -12,19 +12,21 @@ const http_1 = __importDefault(require("http"));
*/
function grabHostNames(param) {
var _a, _b;
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
const remoteHost = ((_a = process.env.DSQL_API_REMOTE_HOST) === null || _a === void 0 ? void 0 : _a.match(/.*\..*/))
? process.env.DSQL_API_REMOTE_HOST
const finalEnv = (param === null || param === void 0 ? void 0 : param.env)
? Object.assign(Object.assign({}, process.env), param.env) : process.env;
const scheme = finalEnv["DSQL_HTTP_SCHEME"];
const localHost = finalEnv["DSQL_LOCAL_HOST"];
const localHostPort = finalEnv["DSQL_LOCAL_HOST_PORT"];
const remoteHost = ((_a = finalEnv["DSQL_API_REMOTE_HOST"]) === null || _a === void 0 ? void 0 : _a.match(/.*\..*/))
? finalEnv["DSQL_API_REMOTE_HOST"]
: undefined;
const remoteHostPort = ((_b = process.env.DSQL_API_REMOTE_HOST_PORT) === null || _b === void 0 ? void 0 : _b.match(/./))
? process.env.DSQL_API_REMOTE_HOST_PORT
const remoteHostPort = ((_b = finalEnv["DSQL_API_REMOTE_HOST_PORT"]) === null || _b === void 0 ? void 0 : _b.match(/./))
? finalEnv["DSQL_API_REMOTE_HOST_PORT"]
: undefined;
return {
host: remoteHost || localHost || "datasquirel.com",
port: remoteHostPort || localHostPort || 443,
scheme: (scheme === null || scheme === void 0 ? void 0 : scheme.match(/^http$/i)) ? http_1.default : https_1.default,
user_id: (param === null || param === void 0 ? void 0 : param.userId) || String(process.env.DSQL_API_USER_ID || 0),
user_id: (param === null || param === void 0 ? void 0 : param.userId) || String(finalEnv["DSQL_API_USER_ID"] || 0),
};
}