@noormdev/sdk 1.4.1 → 1.5.0

package/dist/{mssql-3BQB6ACD.js → mssql-II62FO2B.js}

@@ -1,4 +1,6 @@
 import { createRequire } from 'module';
+import { explainMssqlLoginFailure } from './chunk-OXTXFKWJ.js';
+import { attempt } from './chunk-TXDGFA44.js';
 import { DEFAULT_PORTS, connectTimeoutFor } from './chunk-WE2JLJMT.js';
 import './chunk-D2XW2UOP.js';
 import { isIP } from 'net';
@@ -73,7 +75,7 @@ function resolveTlsServerName(config) {
   }
   return UNVERIFIED_TLS_SERVER_NAME;
 }
-function buildTediousOptions(config, database) {
+function buildTediousOptions(config) {
   return {
     server: config.host ?? "localhost",
     authentication: {
@@ -85,7 +87,7 @@ function buildTediousOptions(config, database) {
     },
     options: {
       port: config.port ?? DEFAULT_PORTS.mssql,
-      database: database ?? config.database,
+      database: config.database,
       trustServerCertificate: !config.ssl,
       encrypt: true,
       serverName: resolveTlsServerName(config),
@@ -98,46 +100,19 @@ function buildTediousOptions(config, database) {
     }
   };
 }
-function buildTediousConfig(Tedious, config, database) {
-  return new Tedious.Connection(buildTediousOptions(config, database));
-}
-async function verifyDatabaseExists(Tedious, Tarn, config) {
-  const masterDb = new Kysely({
-    dialect: new MssqlDialect({
-      tarn: {
-        ...Tarn,
-        options: {
-          min: 0,
-          max: 1,
-          propagateCreateError: true
-        }
-      },
-      tedious: {
-        ...Tedious,
-        connectionFactory: () => buildTediousConfig(Tedious, config, "master")
-      }
-    }),
-    plugins: [new MssqlLimitPlugin()]
-  });
-  try {
-    const { rows } = await sql`
-            SELECT name FROM sys.databases WHERE name = ${config.database}
-        `.execute(masterDb);
-    if (rows.length === 0) {
-      throw new Error(
-        `Database '${config.database}' does not exist on ${config.host ?? "localhost"}:${config.port ?? DEFAULT_PORTS.mssql}`
-      );
-    }
-  } finally {
-    await masterDb.destroy();
-  }
+function buildTediousConnection(Tedious, config, loginErrors) {
+  const connection = new Tedious.Connection(buildTediousOptions(config));
+  const record = (token) => loginErrors.push({ number: token.number, message: token.message });
+  connection.on("errorMessage", record);
+  connection.once("connect", () => connection.removeListener("errorMessage", record));
+  return connection;
 }
 async function createMssqlConnection(config) {
   const TediousImport = await import('tedious');
   const TarnImport = await import('tarn');
   const Tedious = TediousImport.default ?? TediousImport;
   const Tarn = TarnImport.default ?? TarnImport;
-  await verifyDatabaseExists(Tedious, Tarn, config);
+  let loginErrors = [];
   const db = new Kysely({
     dialect: new MssqlDialect({
       tarn: {
@@ -150,11 +125,19 @@ async function createMssqlConnection(config) {
       },
       tedious: {
         ...Tedious,
-        connectionFactory: () => buildTediousConfig(Tedious, config)
+        connectionFactory: () => {
+          loginErrors = [];
+          return buildTediousConnection(Tedious, config, loginErrors);
+        }
       }
     }),
     plugins: [new MssqlLimitPlugin()]
   });
+  const [, connectErr] = await attempt(() => sql`SELECT 1`.execute(db));
+  if (connectErr) {
+    await db.destroy();
+    throw explainMssqlLoginFailure(loginErrors, connectErr, config);
+  }
   return {
     db,
     dialect: "mssql",
@@ -163,5 +146,5 @@ async function createMssqlConnection(config) {
 }
 
 export { MssqlTlsServerNameError, UNVERIFIED_TLS_SERVER_NAME, buildTediousOptions, createMssqlConnection, resolveTlsServerName };
-//# sourceMappingURL=mssql-3BQB6ACD.js.map
-//# sourceMappingURL=mssql-3BQB6ACD.js.map
+//# sourceMappingURL=mssql-II62FO2B.js.map
+//# sourceMappingURL=mssql-II62FO2B.js.map

package/dist/{storage-V5I67ANZ.js → storage-FBDOY3MC.js}

@@ -1,8 +1,9 @@
 import { createRequire } from 'module';
-export { deleteVaultSecret, deleteVaultSecretChecked, getAllVaultSecrets, getVaultKey, getVaultKeyChecked, getVaultSecret, getVaultStatus, initializeVault, initializeVaultChecked, listVaultSecretKeys, listVaultSecretKeysChecked, setVaultSecret, setVaultSecretChecked, vaultSecretExists } from './chunk-FSVO6NAJ.js';
-import './chunk-LY2F7ZFI.js';
+export { deleteVaultSecret, deleteVaultSecretChecked, getAllVaultSecrets, getVaultKey, getVaultKeyChecked, getVaultSecret, getVaultStatus, initializeVault, initializeVaultChecked, listVaultSecretKeys, listVaultSecretKeysChecked, setVaultSecret, setVaultSecretChecked, vaultSecretExists } from './chunk-WUMCIKEQ.js';
+import './chunk-6LG4ENOJ.js';
+import './chunk-TXDGFA44.js';
 import './chunk-D2XW2UOP.js';
 
 createRequire(import.meta.url);
-//# sourceMappingURL=storage-V5I67ANZ.js.map
-//# sourceMappingURL=storage-V5I67ANZ.js.map
+//# sourceMappingURL=storage-FBDOY3MC.js.map
+//# sourceMappingURL=storage-FBDOY3MC.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noormdev/sdk",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Database schema & changeset manager SDK",
   "type": "module",
   "main": "./dist/index.js",