From d78e44c98d9dddc761113a0871f4fb24bc49097f Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Wed, 23 Apr 2025 13:45:48 +0100 Subject: [PATCH] Updates --- dist/package-shared/actions/upload-file.d.ts | 3 ++- dist/package-shared/actions/upload-file.js | 4 ++-- dist/package-shared/actions/upload-image.d.ts | 3 ++- dist/package-shared/actions/upload-image.js | 4 ++-- .../package-shared/functions/backend/api-cred.js | 3 +-- dist/package-shared/utils/grab-host-names.d.ts | 3 +++ dist/package-shared/utils/grab-host-names.js | 16 ++++++++++------ package-shared/actions/upload-file.ts | 4 +++- package-shared/actions/upload-image.ts | 4 +++- package-shared/functions/backend/api-cred.ts | 5 +++-- package-shared/utils/grab-host-names.ts | 12 ++++++++++-- package.json | 2 +- 12 files changed, 42 insertions(+), 21 deletions(-) diff --git a/dist/package-shared/actions/upload-file.d.ts b/dist/package-shared/actions/upload-file.d.ts index e4454f8..e0258ac 100644 --- a/dist/package-shared/actions/upload-file.d.ts +++ b/dist/package-shared/actions/upload-file.d.ts @@ -15,9 +15,10 @@ type Param = { isPrivate?: boolean; }; user_id?: string | number; + useDefault?: boolean; }; /** * # Upload File via API */ -export default function uploadImage({ key, payload, user_id, }: Param): Promise; +export default function uploadImage({ key, payload, user_id, useDefault, }: Param): Promise; export {}; diff --git a/dist/package-shared/actions/upload-file.js b/dist/package-shared/actions/upload-file.js index b28f973..df4d8d1 100644 --- a/dist/package-shared/actions/upload-file.js +++ b/dist/package-shared/actions/upload-file.js @@ -18,9 +18,9 @@ const grab_host_names_1 = __importDefault(require("../utils/grab-host-names")); * # Upload File via API */ function uploadImage(_a) { - return __awaiter(this, arguments, void 0, function* ({ key, payload, user_id, }) { + return __awaiter(this, arguments, void 0, function* ({ key, payload, user_id, useDefault, }) { var _b; - const grabedHostNames = (0, grab_host_names_1.default)(); + const grabedHostNames = (0, grab_host_names_1.default)({ useDefault }); const { host, port, scheme } = grabedHostNames; try { /** diff --git a/dist/package-shared/actions/upload-image.d.ts b/dist/package-shared/actions/upload-image.d.ts index 26c5cdd..6f88d9e 100644 --- a/dist/package-shared/actions/upload-image.d.ts +++ b/dist/package-shared/actions/upload-image.d.ts @@ -17,9 +17,10 @@ type Param = { isPrivate?: boolean; }; user_id?: string | number; + useDefault?: boolean; }; /** * # Upload Image via API */ -export default function uploadImage({ key, payload, user_id, }: Param): Promise; +export default function uploadImage({ key, payload, user_id, useDefault, }: Param): Promise; export {}; diff --git a/dist/package-shared/actions/upload-image.js b/dist/package-shared/actions/upload-image.js index f25807f..45cfd72 100644 --- a/dist/package-shared/actions/upload-image.js +++ b/dist/package-shared/actions/upload-image.js @@ -19,9 +19,9 @@ const grab_host_names_1 = __importDefault(require("../utils/grab-host-names")); * # Upload Image via API */ function uploadImage(_a) { - return __awaiter(this, arguments, void 0, function* ({ key, payload, user_id, }) { + return __awaiter(this, arguments, void 0, function* ({ key, payload, user_id, useDefault, }) { var _b; - const grabedHostNames = (0, grab_host_names_1.default)(); + const grabedHostNames = (0, grab_host_names_1.default)({ useDefault }); const { host, port, scheme } = grabedHostNames; try { /** diff --git a/dist/package-shared/functions/backend/api-cred.js b/dist/package-shared/functions/backend/api-cred.js index 2df8e62..4134ec2 100644 --- a/dist/package-shared/functions/backend/api-cred.js +++ b/dist/package-shared/functions/backend/api-cred.js @@ -19,7 +19,6 @@ const grabApiCred = ({ key, database, table, user_id, media, }) => { if (!allowedKeysPath) throw new Error("process.env.DSQL_API_KEYS_PATH variable not found"); const ApiJSON = (0, decrypt_1.default)({ encryptedString: key }); - /** @type {import("../../types").ApiKeyObject} */ const ApiObject = JSON.parse(ApiJSON || ""); const isApiKeyValid = fs_1.default.existsSync(`${allowedKeysPath}/${ApiObject.sign}`); if (String(ApiObject.user_id) !== String(user_id)) @@ -42,7 +41,7 @@ const grabApiCred = ({ key, database, table, user_id, media, }) => { return ApiObject; return null; } - catch ( /** @type {any} */error) { + catch (error) { console.log(`api-cred ERROR: ${error.message}`); return { error: `api-cred ERROR: ${error.message}` }; } diff --git a/dist/package-shared/utils/grab-host-names.d.ts b/dist/package-shared/utils/grab-host-names.d.ts index 5296a8b..17e9af8 100644 --- a/dist/package-shared/utils/grab-host-names.d.ts +++ b/dist/package-shared/utils/grab-host-names.d.ts @@ -11,6 +11,9 @@ type Param = { env?: { [k: string]: string; }; + remoteHost?: string; + remoteHostPort?: string; + useDefault?: boolean; }; /** * # Grab Names For Query diff --git a/dist/package-shared/utils/grab-host-names.js b/dist/package-shared/utils/grab-host-names.js index feb6da7..f7e52be 100644 --- a/dist/package-shared/utils/grab-host-names.js +++ b/dist/package-shared/utils/grab-host-names.js @@ -17,12 +17,16 @@ function grabHostNames(param) { 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 = finalEnv["DSQL_API_REMOTE_HOST_PORT"]) === null || _b === void 0 ? void 0 : _b.match(/./)) - ? finalEnv["DSQL_API_REMOTE_HOST_PORT"] - : undefined; + const remoteHost = (param === null || param === void 0 ? void 0 : param.useDefault) + ? undefined + : ((_a = finalEnv["DSQL_API_REMOTE_HOST"]) === null || _a === void 0 ? void 0 : _a.match(/.*\..*/)) + ? finalEnv["DSQL_API_REMOTE_HOST"] + : undefined; + const remoteHostPort = (param === null || param === void 0 ? void 0 : param.useDefault) + ? undefined + : ((_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, diff --git a/package-shared/actions/upload-file.ts b/package-shared/actions/upload-file.ts index 117476b..68e39ad 100644 --- a/package-shared/actions/upload-file.ts +++ b/package-shared/actions/upload-file.ts @@ -18,6 +18,7 @@ type Param = { isPrivate?: boolean; }; user_id?: string | number; + useDefault?: boolean; }; /** @@ -27,8 +28,9 @@ export default async function uploadImage({ key, payload, user_id, + useDefault, }: Param): Promise { - const grabedHostNames = grabHostNames(); + const grabedHostNames = grabHostNames({ useDefault }); const { host, port, scheme } = grabedHostNames; try { diff --git a/package-shared/actions/upload-image.ts b/package-shared/actions/upload-image.ts index 2db1190..66f3d91 100644 --- a/package-shared/actions/upload-image.ts +++ b/package-shared/actions/upload-image.ts @@ -22,6 +22,7 @@ type Param = { isPrivate?: boolean; }; user_id?: string | number; + useDefault?: boolean; }; /** @@ -31,8 +32,9 @@ export default async function uploadImage({ key, payload, user_id, + useDefault, }: Param): Promise { - const grabedHostNames = grabHostNames(); + const grabedHostNames = grabHostNames({ useDefault }); const { host, port, scheme } = grabedHostNames; try { diff --git a/package-shared/functions/backend/api-cred.ts b/package-shared/functions/backend/api-cred.ts index 0aa54c1..f729ce4 100644 --- a/package-shared/functions/backend/api-cred.ts +++ b/package-shared/functions/backend/api-cred.ts @@ -24,10 +24,11 @@ const grabApiCred: CheckApiCredentialsFn = ({ ); const ApiJSON = decrypt({ encryptedString: key }); - /** @type {import("../../types").ApiKeyObject} */ + const ApiObject: import("../../types").ApiKeyObject = JSON.parse( ApiJSON || "" ); + const isApiKeyValid = fs.existsSync( `${allowedKeysPath}/${ApiObject.sign}` ); @@ -50,7 +51,7 @@ const grabApiCred: CheckApiCredentialsFn = ({ .includes(String(table)); if (isTableAllowed) return ApiObject; return null; - } catch (/** @type {any} */ error: any) { + } catch (error: any) { console.log(`api-cred ERROR: ${error.message}`); return { error: `api-cred ERROR: ${error.message}` }; } diff --git a/package-shared/utils/grab-host-names.ts b/package-shared/utils/grab-host-names.ts index 43625b3..1b3782d 100644 --- a/package-shared/utils/grab-host-names.ts +++ b/package-shared/utils/grab-host-names.ts @@ -13,6 +13,9 @@ type GrabHostNamesReturn = { type Param = { userId?: string | number; env?: { [k: string]: string }; + remoteHost?: string; + remoteHostPort?: string; + useDefault?: boolean; }; /** @@ -26,10 +29,15 @@ export default function grabHostNames(param?: Param): GrabHostNamesReturn { const scheme = finalEnv["DSQL_HTTP_SCHEME"]; const localHost = finalEnv["DSQL_LOCAL_HOST"]; const localHostPort = finalEnv["DSQL_LOCAL_HOST_PORT"]; - const remoteHost = finalEnv["DSQL_API_REMOTE_HOST"]?.match(/.*\..*/) + + const remoteHost = param?.useDefault + ? undefined + : finalEnv["DSQL_API_REMOTE_HOST"]?.match(/.*\..*/) ? finalEnv["DSQL_API_REMOTE_HOST"] : undefined; - const remoteHostPort = finalEnv["DSQL_API_REMOTE_HOST_PORT"]?.match(/./) + const remoteHostPort = param?.useDefault + ? undefined + : finalEnv["DSQL_API_REMOTE_HOST_PORT"]?.match(/./) ? finalEnv["DSQL_API_REMOTE_HOST_PORT"] : undefined; diff --git a/package.json b/package.json index f35a339..0bd3822 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "4.4.2", + "version": "4.4.3", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {