@oino-ts/blob-azure 1.0.2 → 1.0.4

package/dist/cjs/OINOBlobAzure.js

@@ -0,0 +1,213 @@
+"use strict";
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OINOBlobAzure = void 0;
+const node_buffer_1 = require("node:buffer");
+const storage_blob_1 = require("@azure/storage-blob");
+const identity_1 = require("@azure/identity");
+const common_1 = require("@oino-ts/common");
+const common_2 = require("@oino-ts/common");
+const blob_1 = require("@oino-ts/blob");
+/**
+ * Azure Blob Storage implementation of `OINOBlob`.
+ *
+ * Authenticates using an Azure Storage connection string.  Connection parameters map as:
+ * - `params.url`           → blob service endpoint, e.g. `https://<account>.blob.core.windows.net`
+ * - `params.container`     → container name
+ * - `params.connectionStr` → Azure Storage connection string (e.g. `DefaultEndpointsProtocol=https;AccountName=...`)
+ *
+ * Register and use via the factory:
+ * ```ts
+ * import { OINOBlobFactory } from "@oino-ts/blob"
+ * import { OINOBlobAzure }   from "@oino-ts/blob-azure"
+ *
+ * OINOBlobFactory.registerBlob("OINOBlobAzure", OINOBlobAzure)
+ *
+ * const blob = await OINOBlobFactory.createBlob({
+ *     type:          "OINOBlobAzure",
+ *     container:     "my-container",
+ *     credentials:   either connectionStr or url and clientId
+ * })
+ * const api = await OINOBlobFactory.createApi(blob, {
+ *     apiName:   "files",
+ *     tableName: "uploads/"   // blob prefix / folder
+ * })
+ * ```
+ */
+class OINOBlobAzure extends blob_1.OINOBlob {
+    _containerClient = null;
+    constructor(params) {
+        super(params);
+        if ((!this.blobParams.credentials?.connectionStr) && !(this.blobParams.credentials?.url)) { // && this.blobParams.credentials?.clientId)) {
+            throw new Error("OINOBlobAzure: missing or invalid credentials (provide either connectionStr or url and clientId)");
+        }
+    }
+    /**
+     * Initialise the Azure SDK client.  Does not perform any network call.
+     */
+    async connect() {
+        const result = new common_2.OINOResult();
+        let serviceClient;
+        try {
+            if (this.blobParams.credentials?.connectionStr) {
+                serviceClient = storage_blob_1.BlobServiceClient.fromConnectionString(this.blobParams.credentials.connectionStr);
+            }
+            else if (this.blobParams.credentials?.url) { // && this.blobParams.credentials?.clientId) {
+                // Use ContainerClient directly to avoid double-container path when combining service URL + container
+                serviceClient = new storage_blob_1.BlobServiceClient(this.blobParams.credentials.url, new identity_1.DefaultAzureCredential());
+                this.isConnected = true;
+            }
+            this._containerClient = serviceClient.getContainerClient(this.blobParams.container);
+            this.isConnected = true;
+        }
+        catch (e) {
+            result.setError(500, "OINOBlobAzure connect failed: " + e.message, "connect");
+            common_1.OINOLog.exception("@oino-ts/blob-azure", "OINOBlobAzure", "connect", "OINOBlobAzure connect failed", { error: e, stack: e.stack });
+        }
+        return result;
+    }
+    /**
+     * Verify that the target container exists and is accessible.
+     */
+    async validate() {
+        if (!this._containerClient) {
+            return new common_2.OINOResult({ success: false, status: 500, statusText: "OINOBlobAzure: not connected" });
+        }
+        try {
+            const exists = await this._containerClient.exists();
+            if (!exists) {
+                return new common_2.OINOResult({
+                    success: false,
+                    status: 404,
+                    statusText: "OINOBlobAzure: container '" + this.blobParams.container + "' not found"
+                });
+            }
+            this.isValidated = true;
+        }
+        catch (e) {
+            return new common_2.OINOResult({ success: false, status: 500, statusText: "OINOBlobAzure validate failed: " + e.message });
+        }
+        return new common_2.OINOResult();
+    }
+    /**
+     * Release the client reference (Azure SDK is stateless per-request so nothing to close).
+     */
+    async disconnect() {
+        this._containerClient = null;
+        this.isConnected = false;
+        this.isValidated = false;
+    }
+    // ── OINOBlob operations ───────────────────────────────────────────────
+    /**
+     * List all blobs, applying native Azure query filtering where possible and
+     * in-memory result filtering for predicates that cannot be expressed as a
+     * native query.
+     *
+     * - The `name` field supports server-side prefix filtering via the Azure
+     *   `listBlobsFlat` `prefix` option (query filtering).
+     * - All other field predicates (`etag`, `lastModified`, `contentLength`,
+     *   `contentType`) are evaluated in-memory after the listing (result
+     *   filtering).
+     *
+     * @param filter optional query filter to apply
+     */
+    async listEntries(filter) {
+        if (!this._containerClient) {
+            throw new Error("OINOBlobAzure: not connected");
+        }
+        const queryPrefix = (filter && !filter.isEmpty())
+            ? blob_1.OINOBlob.extractNamePrefix(filter)
+            : undefined;
+        const entries = [];
+        for await (const blob of this._containerClient.listBlobsFlat({ prefix: queryPrefix })) {
+            entries.push({
+                name: blob.name,
+                etag: blob.properties.etag ?? "",
+                lastModified: blob.properties.lastModified,
+                contentLength: blob.properties.contentLength ?? 0,
+                contentType: blob.properties.contentType ?? "application/octet-stream"
+            });
+        }
+        if (!filter || filter.isEmpty()) {
+            return entries;
+        }
+        return entries.filter(e => blob_1.OINOBlob.matchesEntry(e, filter));
+    }
+    /**
+     * Download the raw content of a named blob.
+     *
+     * @param name full blob name (path within the container)
+     */
+    async fetchEntry(name) {
+        if (!this._containerClient) {
+            throw new Error("OINOBlobAzure: not connected");
+        }
+        const blobClient = this._containerClient.getBlobClient(name);
+        const downloadResponse = await blobClient.download(0);
+        const contentType = downloadResponse.contentType ?? "application/octet-stream";
+        const stream = downloadResponse.readableStreamBody;
+        if (!stream) {
+            throw new Error("OINOBlobAzure: no readable stream returned for blob '" + name + "'");
+        }
+        const chunks = [];
+        for await (const chunk of stream) {
+            chunks.push(chunk instanceof node_buffer_1.Buffer ? chunk : node_buffer_1.Buffer.from(chunk));
+        }
+        return {
+            content: new Uint8Array(node_buffer_1.Buffer.concat(chunks)),
+            contentType
+        };
+    }
+    /**
+     * Upload (create or replace) a blob with the given binary content.
+     *
+     * @param name full blob name (path within the container)
+     * @param content binary content to store
+     * @param contentType MIME type of the content (e.g. `"image/jpeg"`)
+     */
+    async uploadEntry(name, content, contentType) {
+        if (!this._containerClient) {
+            throw new Error("OINOBlobAzure: not connected");
+        }
+        const blockBlobClient = this._containerClient.getBlockBlobClient(name);
+        const headers = { blobDataType: contentType };
+        await blockBlobClient.upload(content, content.length, { blobHTTPHeaders: headers });
+    }
+    /**
+     * Delete a named blob.
+     *
+     * @param name full blob name (path within the container)
+     */
+    async deleteEntry(name) {
+        if (!this._containerClient) {
+            throw new Error("OINOBlobAzure: not connected");
+        }
+        const blobClient = this._containerClient.getBlobClient(name);
+        await blobClient.delete();
+    }
+    // ── OINODataSource datamodel initialisation ───────────────────────────
+    /**
+     * Attach a static `OINOBlobDataModel` to the given API, adding all five
+     * standard fields that Azure Blob Storage returns in a listing.
+     *
+     * @param api the `OINOBlobApi` whose data model is to be initialised
+     */
+    async initializeApiDatamodel(api) {
+        const blobApi = api;
+        const datamodel = new blob_1.OINOBlobDataModel(blobApi);
+        const ds = this;
+        const FIELD = { isPrimaryKey: false, isForeignKey: false, isAutoInc: false, isNotNull: false };
+        const PK = { isPrimaryKey: true, isForeignKey: false, isAutoInc: false, isNotNull: true };
+        datamodel.addField(new common_2.OINOStringDataField(ds, "name", "TEXT", PK, 1024));
+        datamodel.addField(new common_2.OINOStringDataField(ds, "etag", "TEXT", FIELD, 256));
+        datamodel.addField(new common_2.OINODatetimeDataField(ds, "lastModified", "DATETIME", FIELD));
+        datamodel.addField(new common_2.OINONumberDataField(ds, "contentLength", "INTEGER", FIELD));
+        datamodel.addField(new common_2.OINOStringDataField(ds, "contentType", "TEXT", FIELD, 256));
+        blobApi.initializeDatamodel(datamodel);
+    }
+}
+exports.OINOBlobAzure = OINOBlobAzure;

package/dist/cjs/index.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OINOBlobAzureTable = void 0;
-var OINOBlobAzureTable_js_1 = require("./OINOBlobAzureTable.js");
-Object.defineProperty(exports, "OINOBlobAzureTable", { enumerable: true, get: function () { return OINOBlobAzureTable_js_1.OINOBlobAzureTable; } });
+exports.OINOBlobAzure = void 0;
+var OINOBlobAzure_js_1 = require("./OINOBlobAzure.js");
+Object.defineProperty(exports, "OINOBlobAzure", { enumerable: true, get: function () { return OINOBlobAzure_js_1.OINOBlobAzure; } });

package/dist/esm/OINOBlobAzure.js

@@ -0,0 +1,209 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+import { Buffer } from "node:buffer";
+import { BlobServiceClient } from "@azure/storage-blob";
+import { DefaultAzureCredential } from "@azure/identity";
+import { OINOLog } from "@oino-ts/common";
+import { OINOResult, OINOStringDataField, OINONumberDataField, OINODatetimeDataField } from "@oino-ts/common";
+import { OINOBlob, OINOBlobDataModel } from "@oino-ts/blob";
+/**
+ * Azure Blob Storage implementation of `OINOBlob`.
+ *
+ * Authenticates using an Azure Storage connection string.  Connection parameters map as:
+ * - `params.url`           → blob service endpoint, e.g. `https://<account>.blob.core.windows.net`
+ * - `params.container`     → container name
+ * - `params.connectionStr` → Azure Storage connection string (e.g. `DefaultEndpointsProtocol=https;AccountName=...`)
+ *
+ * Register and use via the factory:
+ * ```ts
+ * import { OINOBlobFactory } from "@oino-ts/blob"
+ * import { OINOBlobAzure }   from "@oino-ts/blob-azure"
+ *
+ * OINOBlobFactory.registerBlob("OINOBlobAzure", OINOBlobAzure)
+ *
+ * const blob = await OINOBlobFactory.createBlob({
+ *     type:          "OINOBlobAzure",
+ *     container:     "my-container",
+ *     credentials:   either connectionStr or url and clientId
+ * })
+ * const api = await OINOBlobFactory.createApi(blob, {
+ *     apiName:   "files",
+ *     tableName: "uploads/"   // blob prefix / folder
+ * })
+ * ```
+ */
+export class OINOBlobAzure extends OINOBlob {
+    _containerClient = null;
+    constructor(params) {
+        super(params);
+        if ((!this.blobParams.credentials?.connectionStr) && !(this.blobParams.credentials?.url)) { // && this.blobParams.credentials?.clientId)) {
+            throw new Error("OINOBlobAzure: missing or invalid credentials (provide either connectionStr or url and clientId)");
+        }
+    }
+    /**
+     * Initialise the Azure SDK client.  Does not perform any network call.
+     */
+    async connect() {
+        const result = new OINOResult();
+        let serviceClient;
+        try {
+            if (this.blobParams.credentials?.connectionStr) {
+                serviceClient = BlobServiceClient.fromConnectionString(this.blobParams.credentials.connectionStr);
+            }
+            else if (this.blobParams.credentials?.url) { // && this.blobParams.credentials?.clientId) {
+                // Use ContainerClient directly to avoid double-container path when combining service URL + container
+                serviceClient = new BlobServiceClient(this.blobParams.credentials.url, new DefaultAzureCredential());
+                this.isConnected = true;
+            }
+            this._containerClient = serviceClient.getContainerClient(this.blobParams.container);
+            this.isConnected = true;
+        }
+        catch (e) {
+            result.setError(500, "OINOBlobAzure connect failed: " + e.message, "connect");
+            OINOLog.exception("@oino-ts/blob-azure", "OINOBlobAzure", "connect", "OINOBlobAzure connect failed", { error: e, stack: e.stack });
+        }
+        return result;
+    }
+    /**
+     * Verify that the target container exists and is accessible.
+     */
+    async validate() {
+        if (!this._containerClient) {
+            return new OINOResult({ success: false, status: 500, statusText: "OINOBlobAzure: not connected" });
+        }
+        try {
+            const exists = await this._containerClient.exists();
+            if (!exists) {
+                return new OINOResult({
+                    success: false,
+                    status: 404,
+                    statusText: "OINOBlobAzure: container '" + this.blobParams.container + "' not found"
+                });
+            }
+            this.isValidated = true;
+        }
+        catch (e) {
+            return new OINOResult({ success: false, status: 500, statusText: "OINOBlobAzure validate failed: " + e.message });
+        }
+        return new OINOResult();
+    }
+    /**
+     * Release the client reference (Azure SDK is stateless per-request so nothing to close).
+     */
+    async disconnect() {
+        this._containerClient = null;
+        this.isConnected = false;
+        this.isValidated = false;
+    }
+    // ── OINOBlob operations ───────────────────────────────────────────────
+    /**
+     * List all blobs, applying native Azure query filtering where possible and
+     * in-memory result filtering for predicates that cannot be expressed as a
+     * native query.
+     *
+     * - The `name` field supports server-side prefix filtering via the Azure
+     *   `listBlobsFlat` `prefix` option (query filtering).
+     * - All other field predicates (`etag`, `lastModified`, `contentLength`,
+     *   `contentType`) are evaluated in-memory after the listing (result
+     *   filtering).
+     *
+     * @param filter optional query filter to apply
+     */
+    async listEntries(filter) {
+        if (!this._containerClient) {
+            throw new Error("OINOBlobAzure: not connected");
+        }
+        const queryPrefix = (filter && !filter.isEmpty())
+            ? OINOBlob.extractNamePrefix(filter)
+            : undefined;
+        const entries = [];
+        for await (const blob of this._containerClient.listBlobsFlat({ prefix: queryPrefix })) {
+            entries.push({
+                name: blob.name,
+                etag: blob.properties.etag ?? "",
+                lastModified: blob.properties.lastModified,
+                contentLength: blob.properties.contentLength ?? 0,
+                contentType: blob.properties.contentType ?? "application/octet-stream"
+            });
+        }
+        if (!filter || filter.isEmpty()) {
+            return entries;
+        }
+        return entries.filter(e => OINOBlob.matchesEntry(e, filter));
+    }
+    /**
+     * Download the raw content of a named blob.
+     *
+     * @param name full blob name (path within the container)
+     */
+    async fetchEntry(name) {
+        if (!this._containerClient) {
+            throw new Error("OINOBlobAzure: not connected");
+        }
+        const blobClient = this._containerClient.getBlobClient(name);
+        const downloadResponse = await blobClient.download(0);
+        const contentType = downloadResponse.contentType ?? "application/octet-stream";
+        const stream = downloadResponse.readableStreamBody;
+        if (!stream) {
+            throw new Error("OINOBlobAzure: no readable stream returned for blob '" + name + "'");
+        }
+        const chunks = [];
+        for await (const chunk of stream) {
+            chunks.push(chunk instanceof Buffer ? chunk : Buffer.from(chunk));
+        }
+        return {
+            content: new Uint8Array(Buffer.concat(chunks)),
+            contentType
+        };
+    }
+    /**
+     * Upload (create or replace) a blob with the given binary content.
+     *
+     * @param name full blob name (path within the container)
+     * @param content binary content to store
+     * @param contentType MIME type of the content (e.g. `"image/jpeg"`)
+     */
+    async uploadEntry(name, content, contentType) {
+        if (!this._containerClient) {
+            throw new Error("OINOBlobAzure: not connected");
+        }
+        const blockBlobClient = this._containerClient.getBlockBlobClient(name);
+        const headers = { blobDataType: contentType };
+        await blockBlobClient.upload(content, content.length, { blobHTTPHeaders: headers });
+    }
+    /**
+     * Delete a named blob.
+     *
+     * @param name full blob name (path within the container)
+     */
+    async deleteEntry(name) {
+        if (!this._containerClient) {
+            throw new Error("OINOBlobAzure: not connected");
+        }
+        const blobClient = this._containerClient.getBlobClient(name);
+        await blobClient.delete();
+    }
+    // ── OINODataSource datamodel initialisation ───────────────────────────
+    /**
+     * Attach a static `OINOBlobDataModel` to the given API, adding all five
+     * standard fields that Azure Blob Storage returns in a listing.
+     *
+     * @param api the `OINOBlobApi` whose data model is to be initialised
+     */
+    async initializeApiDatamodel(api) {
+        const blobApi = api;
+        const datamodel = new OINOBlobDataModel(blobApi);
+        const ds = this;
+        const FIELD = { isPrimaryKey: false, isForeignKey: false, isAutoInc: false, isNotNull: false };
+        const PK = { isPrimaryKey: true, isForeignKey: false, isAutoInc: false, isNotNull: true };
+        datamodel.addField(new OINOStringDataField(ds, "name", "TEXT", PK, 1024));
+        datamodel.addField(new OINOStringDataField(ds, "etag", "TEXT", FIELD, 256));
+        datamodel.addField(new OINODatetimeDataField(ds, "lastModified", "DATETIME", FIELD));
+        datamodel.addField(new OINONumberDataField(ds, "contentLength", "INTEGER", FIELD));
+        datamodel.addField(new OINOStringDataField(ds, "contentType", "TEXT", FIELD, 256));
+        blobApi.initializeDatamodel(datamodel);
+    }
+}

package/dist/esm/index.js

@@ -1 +1 @@
-export { OINOBlobAzureTable } from "./OINOBlobAzureTable.js";
+export { OINOBlobAzure } from "./OINOBlobAzure.js";

package/dist/types/OINOBlobAzure.d.ts

@@ -0,0 +1,85 @@
+import { OINOApi, OINOResult, OINOQueryFilter } from "@oino-ts/common";
+import { OINOBlob, OINOBlobParams, type OINOBlobEntry, type OINOBlobFetchResult } from "@oino-ts/blob";
+/**
+ * Azure Blob Storage implementation of `OINOBlob`.
+ *
+ * Authenticates using an Azure Storage connection string.  Connection parameters map as:
+ * - `params.url`           → blob service endpoint, e.g. `https://<account>.blob.core.windows.net`
+ * - `params.container`     → container name
+ * - `params.connectionStr` → Azure Storage connection string (e.g. `DefaultEndpointsProtocol=https;AccountName=...`)
+ *
+ * Register and use via the factory:
+ * ```ts
+ * import { OINOBlobFactory } from "@oino-ts/blob"
+ * import { OINOBlobAzure }   from "@oino-ts/blob-azure"
+ *
+ * OINOBlobFactory.registerBlob("OINOBlobAzure", OINOBlobAzure)
+ *
+ * const blob = await OINOBlobFactory.createBlob({
+ *     type:          "OINOBlobAzure",
+ *     container:     "my-container",
+ *     credentials:   either connectionStr or url and clientId
+ * })
+ * const api = await OINOBlobFactory.createApi(blob, {
+ *     apiName:   "files",
+ *     tableName: "uploads/"   // blob prefix / folder
+ * })
+ * ```
+ */
+export declare class OINOBlobAzure extends OINOBlob {
+    private _containerClient;
+    constructor(params: OINOBlobParams);
+    /**
+     * Initialise the Azure SDK client.  Does not perform any network call.
+     */
+    connect(): Promise<OINOResult>;
+    /**
+     * Verify that the target container exists and is accessible.
+     */
+    validate(): Promise<OINOResult>;
+    /**
+     * Release the client reference (Azure SDK is stateless per-request so nothing to close).
+     */
+    disconnect(): Promise<void>;
+    /**
+     * List all blobs, applying native Azure query filtering where possible and
+     * in-memory result filtering for predicates that cannot be expressed as a
+     * native query.
+     *
+     * - The `name` field supports server-side prefix filtering via the Azure
+     *   `listBlobsFlat` `prefix` option (query filtering).
+     * - All other field predicates (`etag`, `lastModified`, `contentLength`,
+     *   `contentType`) are evaluated in-memory after the listing (result
+     *   filtering).
+     *
+     * @param filter optional query filter to apply
+     */
+    listEntries(filter?: OINOQueryFilter): Promise<OINOBlobEntry[]>;
+    /**
+     * Download the raw content of a named blob.
+     *
+     * @param name full blob name (path within the container)
+     */
+    fetchEntry(name: string): Promise<OINOBlobFetchResult>;
+    /**
+     * Upload (create or replace) a blob with the given binary content.
+     *
+     * @param name full blob name (path within the container)
+     * @param content binary content to store
+     * @param contentType MIME type of the content (e.g. `"image/jpeg"`)
+     */
+    uploadEntry(name: string, content: Uint8Array, contentType: string): Promise<void>;
+    /**
+     * Delete a named blob.
+     *
+     * @param name full blob name (path within the container)
+     */
+    deleteEntry(name: string): Promise<void>;
+    /**
+     * Attach a static `OINOBlobDataModel` to the given API, adding all five
+     * standard fields that Azure Blob Storage returns in a listing.
+     *
+     * @param api the `OINOBlobApi` whose data model is to be initialised
+     */
+    initializeApiDatamodel(api: OINOApi): Promise<void>;
+}

package/dist/types/index.d.ts

@@ -1 +1 @@
-export { OINOBlobAzureTable } from "./OINOBlobAzureTable.js";
+export { OINOBlobAzure } from "./OINOBlobAzure.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/blob-azure",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "OINO TS package for using Azure Blob Storage as a REST API.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -21,11 +21,12 @@
   "types": "./dist/types/index.d.ts",
   "dependencies": {
     "@azure/storage-blob": "^12.0.0",
-    "@oino-ts/blob": "1.0.2",
-    "@oino-ts/common": "1.0.2"
+    "@azure/identity": "^3.0.0",
+    "@oino-ts/blob": "1.0.4",
+    "@oino-ts/common": "1.0.4"
   },
   "devDependencies": {
-    "@oino-ts/types": "1.0.2",
+    "@oino-ts/types": "1.0.4",
     "@types/bun": "^1.1.14",
     "@types/node": "^22.0.00",
     "typescript": "~5.9.0"

package/src/{OINOBlobAzureTable.ts → OINOBlobAzure.ts}

@@ -8,12 +8,13 @@ import { Buffer } from "node:buffer"
 
 import {
     BlobServiceClient,
-    type ContainerClient
+    ContainerClient
 } from "@azure/storage-blob"
+import { DefaultAzureCredential } from "@azure/identity"
 
+import { OINOLog } from "@oino-ts/common"
 import { OINOApi, OINOResult, OINOQueryFilter, OINOStringDataField, OINONumberDataField, OINODatetimeDataField, type OINODataFieldParams } from "@oino-ts/common"
-import { OINOBlob, OINOBlobDataModel, OINOBlobApi } from "@oino-ts/blob"
-import { type OINOBlobEntry, type OINOBlobFetchResult } from "@oino-ts/blob"
+import { OINOBlob, OINOBlobParams, OINOBlobDataModel, OINOBlobApi, type OINOBlobEntry, type OINOBlobFetchResult } from "@oino-ts/blob"
 
 /**
  * Azure Blob Storage implementation of `OINOBlob`.
@@ -26,15 +27,14 @@ import { type OINOBlobEntry, type OINOBlobFetchResult } from "@oino-ts/blob"
  * Register and use via the factory:
  * ```ts
  * import { OINOBlobFactory } from "@oino-ts/blob"
- * import { OINOBlobAzureTable }   from "@oino-ts/blob-azure"
+ * import { OINOBlobAzure }   from "@oino-ts/blob-azure"
  *
- * OINOBlobFactory.registerBlob("OINOBlobAzureTable", OINOBlobAzureTable)
+ * OINOBlobFactory.registerBlob("OINOBlobAzure", OINOBlobAzure)
  *
  * const blob = await OINOBlobFactory.createBlob({
- *     type:          "OINOBlobAzureTable",
- *     url:           "https://myaccount.blob.core.windows.net",
+ *     type:          "OINOBlobAzure",
  *     container:     "my-container",
- *     connectionStr: process.env.AZURE_STORAGE_CONNECTION_STRING
+ *     credentials:   either connectionStr or url and clientId 
  * })
  * const api = await OINOBlobFactory.createApi(blob, {
  *     apiName:   "files",
@@ -42,31 +42,40 @@ import { type OINOBlobEntry, type OINOBlobFetchResult } from "@oino-ts/blob"
  * })
  * ```
  */
-export class OINOBlobAzureTable extends OINOBlob {
+export class OINOBlobAzure extends OINOBlob {
     private _containerClient: ContainerClient | null = null
 
-    // ── OINODataSource lifecycle ──────────────────────────────────────────
+    constructor(params: OINOBlobParams) {
+        super(params)
+        if ((!this.blobParams.credentials?.connectionStr) && !(this.blobParams.credentials?.url)) { // && this.blobParams.credentials?.clientId)) {
+            throw new Error("OINOBlobAzure: missing or invalid credentials (provide either connectionStr or url and clientId)")
+        }
+    }
 
     /**
      * Initialise the Azure SDK client.  Does not perform any network call.
      */
     async connect(): Promise<OINOResult> {
         const result = new OINOResult()
+        let serviceClient: BlobServiceClient
         try {
-            let serviceClient: BlobServiceClient
-            if (this.blobParams.connectionStr) {
-                serviceClient = BlobServiceClient.fromConnectionString(this.blobParams.connectionStr)
-            } else {
-                return new OINOResult({
-                    success: false,
-                    status: 400,
-                    statusText: "OINOBlobAzureTable: params.connectionStr is required"
-                })
+            if (this.blobParams.credentials?.connectionStr) {
+                serviceClient = BlobServiceClient.fromConnectionString(this.blobParams.credentials.connectionStr)
+
+            } else if (this.blobParams.credentials?.url) { // && this.blobParams.credentials?.clientId) {
+                // Use ContainerClient directly to avoid double-container path when combining service URL + container
+                serviceClient = new BlobServiceClient(
+                    this.blobParams.credentials.url,
+                    new DefaultAzureCredential()
+                )
+                this.isConnected = true
             }
-            this._containerClient = serviceClient.getContainerClient(this.blobParams.container)
+            this._containerClient = serviceClient!.getContainerClient(this.blobParams.container)
             this.isConnected = true
+
         } catch (e: any) {
-            return new OINOResult({ success: false, status: 500, statusText: "OINOBlobAzureTable connect failed: " + e.message })
+            result.setError(500, "OINOBlobAzure connect failed: " + e.message, "connect")
+            OINOLog.exception("@oino-ts/blob-azure", "OINOBlobAzure", "connect", "OINOBlobAzure connect failed", { error: e, stack: e.stack })
         }
         return result
     }
@@ -76,7 +85,7 @@ export class OINOBlobAzureTable extends OINOBlob {
      */
     async validate(): Promise<OINOResult> {
         if (!this._containerClient) {
-            return new OINOResult({ success: false, status: 500, statusText: "OINOBlobAzureTable: not connected" })
+            return new OINOResult({ success: false, status: 500, statusText: "OINOBlobAzure: not connected" })
         }
         try {
             const exists = await this._containerClient.exists()
@@ -84,12 +93,12 @@ export class OINOBlobAzureTable extends OINOBlob {
                 return new OINOResult({
                     success: false,
                     status: 404,
-                    statusText: "OINOBlobAzureTable: container '" + this.blobParams.container + "' not found"
+                    statusText: "OINOBlobAzure: container '" + this.blobParams.container + "' not found"
                 })
             }
             this.isValidated = true
         } catch (e: any) {
-            return new OINOResult({ success: false, status: 500, statusText: "OINOBlobAzureTable validate failed: " + e.message })
+            return new OINOResult({ success: false, status: 500, statusText: "OINOBlobAzure validate failed: " + e.message })
         }
         return new OINOResult()
     }
@@ -120,7 +129,7 @@ export class OINOBlobAzureTable extends OINOBlob {
      */
     async listEntries(filter?: OINOQueryFilter): Promise<OINOBlobEntry[]> {
         if (!this._containerClient) {
-            throw new Error("OINOBlobAzureTable: not connected")
+            throw new Error("OINOBlobAzure: not connected")
         }
 
         const queryPrefix = (filter && !filter.isEmpty())
@@ -153,14 +162,14 @@ export class OINOBlobAzureTable extends OINOBlob {
      */
     async fetchEntry(name: string): Promise<OINOBlobFetchResult> {
         if (!this._containerClient) {
-            throw new Error("OINOBlobAzureTable: not connected")
+            throw new Error("OINOBlobAzure: not connected")
         }
         const blobClient = this._containerClient.getBlobClient(name)
         const downloadResponse = await blobClient.download(0)
         const contentType = downloadResponse.contentType ?? "application/octet-stream"
         const stream = downloadResponse.readableStreamBody
         if (!stream) {
-            throw new Error("OINOBlobAzureTable: no readable stream returned for blob '" + name + "'")
+            throw new Error("OINOBlobAzure: no readable stream returned for blob '" + name + "'")
         }
         const chunks: Buffer[] = []
         for await (const chunk of stream) {
@@ -181,7 +190,7 @@ export class OINOBlobAzureTable extends OINOBlob {
      */
     async uploadEntry(name: string, content: Uint8Array, contentType: string): Promise<void> {
         if (!this._containerClient) {
-            throw new Error("OINOBlobAzureTable: not connected")
+            throw new Error("OINOBlobAzure: not connected")
         }
         const blockBlobClient = this._containerClient.getBlockBlobClient(name)
         const headers:any = { blobDataType: contentType }
@@ -195,7 +204,7 @@ export class OINOBlobAzureTable extends OINOBlob {
      */
     async deleteEntry(name: string): Promise<void> {
         if (!this._containerClient) {
-            throw new Error("OINOBlobAzureTable: not connected")
+            throw new Error("OINOBlobAzure: not connected")
         }
         const blobClient = this._containerClient.getBlobClient(name)
         await blobClient.delete()

package/src/index.ts

@@ -1 +1 @@
-export { OINOBlobAzureTable } from "./OINOBlobAzureTable.js"
+export { OINOBlobAzure } from "./OINOBlobAzure.js"