@geolonia/geonicdb-sdk 0.7.1 → 0.9.0

package/geonicdb.mjs

@@ -403,8 +403,16 @@ var _AuthManager = class _AuthManager {
   emitCacheEvent(name, payload) {
     this._emitCacheEvent?.(name, payload);
   }
-  /** Login with email and password (Bearer JWT). */
-  async login(email, password) {
+  /**
+   * Login with email and password (Bearer JWT).
+   *
+   * Pass `{ dpop: true }` to immediately exchange the Bearer session for a
+   * DPoP sender-constrained session via `/auth/dpop-bind` (RFC 9449). The
+   * returned tokens become unusable without this SDK instance's
+   * non-extractable private key, so a token leaked from storage (e.g.
+   * localStorage XSS) cannot be replayed from another origin.
+   */
+  async login(email, password, options) {
     this._log("login", email);
     const headers = {
       "Content-Type": "application/json"
@@ -428,8 +436,75 @@ var _AuthManager = class _AuthManager {
     this._tokenType = "Bearer";
     this._refreshToken = data.refreshToken;
     this._invalidateAuthScopedState();
+    if (options?.dpop) {
+      const bound = await this._bindDpopSession();
+      return bound;
+    }
     return data;
   }
+  /**
+   * Exchange the current Bearer session for a DPoP-bound session via
+   * `POST /auth/dpop-bind` (RFC 9449). The server re-issues access and
+   * refresh tokens with `cnf.jkt` matching this SDK's DPoP key pair.
+   *
+   * Assumes `_token` / `_refreshToken` are already populated by a prior
+   * `login()` call (callers should not invoke this directly).
+   *
+   * @internal
+   */
+  async _bindDpopSession() {
+    if (!this._token) {
+      throw new AuthenticationError(
+        "Cannot bind DPoP session: no Bearer token. login() must succeed first."
+      );
+    }
+    if (this._dpopReady) await this._dpopReady;
+    if (!this._dpopKeyPair) {
+      throw new AuthenticationError(
+        "DPoP binding requires a generated DPoP key pair, but key generation was unavailable or failed. DPoP requires Web Crypto subtle.generateKey."
+      );
+    }
+    const bindUrl = this._baseUrl + "/auth/dpop-bind";
+    const accessToken = this._token;
+    const data = await this._doDpopBind(bindUrl, accessToken, this._dpopNonce, 0);
+    this._token = data.accessToken;
+    this._tokenExpiry = Date.now() + (data.expiresIn - 60) * 1e3;
+    this._tokenType = "DPoP";
+    this._refreshToken = data.refreshToken;
+    this._invalidateAuthScopedState();
+    return { ...data, tokenType: "DPoP" };
+  }
+  async _doDpopBind(bindUrl, accessToken, dpopNonce, retryCount) {
+    const dpopProof = await createDPoPProof(
+      this._dpopKeyPair,
+      "POST",
+      bindUrl,
+      accessToken,
+      dpopNonce
+    );
+    if (!dpopProof) {
+      throw new AuthenticationError("DPoP proof generation failed");
+    }
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + accessToken,
+      DPoP: dpopProof
+    };
+    if (this._tenant) headers["NGSILD-Tenant"] = this._tenant;
+    const res = await fetch(bindUrl, { method: "POST", headers });
+    const serverNonce = res.headers.get("DPoP-Nonce");
+    if (serverNonce) this._dpopNonce = serverNonce;
+    if (res.status === 401 && serverNonce && serverNonce !== dpopNonce && retryCount < _AuthManager.MAX_DPOP_RETRIES) {
+      return this._doDpopBind(bindUrl, accessToken, serverNonce, retryCount + 1);
+    }
+    if (!res.ok) {
+      const e = await res.json().catch(() => ({}));
+      throw new AuthenticationError(
+        e.detail || e.description || "DPoP bind failed: " + res.status
+      );
+    }
+    return await res.json();
+  }
   /**
    * Set credentials externally (e.g. from a login API response).
    * When tokenType is 'Bearer' and refreshToken is provided, all subsequent
@@ -501,12 +576,15 @@ var _AuthManager = class _AuthManager {
     return this._tokenPromise;
   }
   async _refreshBearerToken() {
-    this._log("refreshing Bearer token");
+    this._log("refreshing token (type=%s)", this._tokenType);
     try {
-      const res = await fetch(this._baseUrl + "/auth/refresh", {
+      const isDPoP = this._tokenType === "DPoP";
+      const refreshUrl = this._baseUrl + "/auth/refresh";
+      const body = JSON.stringify({ refreshToken: this._refreshToken });
+      const res = isDPoP ? await this._doDpopRefresh(refreshUrl, body, this._dpopNonce, 0) : await fetch(refreshUrl, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ refreshToken: this._refreshToken })
+        body
       });
       if (!res.ok) {
         this._refreshToken = null;
@@ -517,7 +595,7 @@ var _AuthManager = class _AuthManager {
       const data = await res.json();
       this._token = data.accessToken;
       this._tokenExpiry = Date.now() + (data.expiresIn - 60) * 1e3;
-      this._tokenType = "Bearer";
+      this._tokenType = data.tokenType ?? (isDPoP ? "DPoP" : "Bearer");
       this._refreshToken = data.refreshToken;
       this._tokenPromise = null;
       this.onTokenRefresh?.({
@@ -532,6 +610,44 @@ var _AuthManager = class _AuthManager {
       throw err;
     }
   }
+  /**
+   * Perform a DPoP-bound `/auth/refresh` call with the standard RFC 9449 §8
+   * `use_dpop_nonce` retry handshake.
+   *
+   * @internal
+   */
+  async _doDpopRefresh(refreshUrl, body, dpopNonce, retryCount) {
+    if (this._dpopReady) await this._dpopReady;
+    if (!this._dpopKeyPair) {
+      throw new AuthenticationError(
+        "DPoP-bound refresh requires a DPoP key pair, but key generation was unavailable."
+      );
+    }
+    const proof = await createDPoPProof(
+      this._dpopKeyPair,
+      "POST",
+      refreshUrl,
+      null,
+      dpopNonce
+    );
+    if (!proof) {
+      throw new AuthenticationError("DPoP proof generation failed");
+    }
+    const res = await fetch(refreshUrl, {
+      method: "POST",
+      headers: { "Content-Type": "application/json", DPoP: proof },
+      body
+    });
+    const serverNonce = res.headers.get("DPoP-Nonce");
+    if (serverNonce) this._dpopNonce = serverNonce;
+    if (res.status === 401 && serverNonce && serverNonce !== dpopNonce && retryCount < _AuthManager.MAX_DPOP_RETRIES) {
+      return this._doDpopRefresh(refreshUrl, body, serverNonce, retryCount + 1);
+    }
+    return res;
+  }
+  /* istanbul ignore next: PoW + DPoP token-exchange flow is exercised by E2E
+     against a live server. Unit-mocking each fetch + crypto step would not
+     verify the actual nonce/proof exchange. */
   async _acquireTokenViaPow() {
     try {
       if (this._dpopReady) await this._dpopReady;
@@ -568,6 +684,8 @@ var _AuthManager = class _AuthManager {
       throw err;
     }
   }
+  /* istanbul ignore next: DPoP nonce-retry handshake (RFC 9449 §8) — requires
+     a real server emitting `use_dpop_nonce` 400s. Exercised by E2E. */
   async _doTokenExchange(tokenUrl, tokenBody, dpopNonce, retryCount = 0) {
     const reqHeaders = {
       "Content-Type": "application/json"
@@ -839,6 +957,7 @@ var WebSocketManager = class {
     if (options) {
       if (options.entityTypes) msg.entityTypes = options.entityTypes;
       if (options.idPattern) msg.idPattern = options.idPattern;
+      if (options.scopeQ) msg.scopeQ = options.scopeQ;
     }
     this._subscription = msg;
     if (this._pendingSubscription) return;
@@ -1064,9 +1183,26 @@ var GeonicDB = class extends EventEmitter {
     }
   }
   // --- Authentication ---
-  /** Login with email and password (Bearer JWT). */
-  async login(email, password) {
-    return this._auth.login(email, password);
+  /**
+   * Login with email and password (Bearer JWT).
+   *
+   * Pass `{ dpop: true }` to immediately upgrade the session to a DPoP
+   * sender-constrained token (RFC 9449). Recommended for browser apps that
+   * persist tokens in storage exposed to XSS (localStorage / sessionStorage),
+   * since DPoP-bound tokens are unusable without this SDK instance's
+   * non-extractable private key.
+   *
+   * @example
+   * ```ts
+   * // Bearer (default, backward compatible)
+   * await db.login('user@example.com', 'password');
+   *
+   * // DPoP-bound (recommended for SPAs)
+   * await db.login('user@example.com', 'password', { dpop: true });
+   * ```
+   */
+  async login(email, password, options) {
+    return this._auth.login(email, password, options);
   }
   /**
    * Whether the SDK is currently operating in anonymous mode (no token held).
@@ -1191,14 +1327,14 @@ var GeonicDB = class extends EventEmitter {
   }
   /** Count entities matching the given filters. */
   async count(params) {
-    const parts = ["count=true", "limit=0"];
-    if (params?.type) parts.push("type=" + encodeURIComponent(params.type));
-    if (params?.q) parts.push("q=" + encodeURIComponent(params.q));
-    const qs = "?" + parts.join("&");
-    const res = await this._auth.request(
-      "GET",
-      "/ngsi-ld/v1/entities" + qs
-    );
+    const path = buildPathWithParams("/ngsi-ld/v1/entities", {
+      count: true,
+      limit: 0,
+      type: params?.type,
+      q: params?.q,
+      scopeQ: params?.scopeQ
+    });
+    const res = await this._auth.request("GET", path);
     if (!res.ok) {
       const e = await res.json().catch(() => ({}));
       throw createErrorFromResponse(res.status, e, "Count failed");
@@ -1257,24 +1393,11 @@ var GeonicDB = class extends EventEmitter {
   // --- Temporal API ---
   /** Query temporal entities. */
   async getTemporalEntities(params) {
-    let qs = "";
-    if (params) {
-      const parts = [];
-      if (params.type) parts.push("type=" + encodeURIComponent(params.type));
-      if (params.id) parts.push("id=" + encodeURIComponent(params.id));
-      if (params.idPattern) parts.push("idPattern=" + encodeURIComponent(params.idPattern));
-      if (params.attrs) parts.push("attrs=" + encodeURIComponent(params.attrs));
-      if (params.q) parts.push("q=" + encodeURIComponent(params.q));
-      if (params.timeproperty) parts.push("timeproperty=" + encodeURIComponent(params.timeproperty));
-      if (params.timeAt) parts.push("timeAt=" + encodeURIComponent(params.timeAt));
-      if (params.endTimeAt) parts.push("endTimeAt=" + encodeURIComponent(params.endTimeAt));
-      if (params.timerel) parts.push("timerel=" + encodeURIComponent(params.timerel));
-      if (params.limit != null) parts.push("limit=" + params.limit);
-      if (params.offset != null) parts.push("offset=" + params.offset);
-      if (parts.length) qs = "?" + parts.join("&");
-    }
     return this._jsonGet(
-      "/ngsi-ld/v1/temporal/entities" + qs,
+      buildPathWithParams(
+        "/ngsi-ld/v1/temporal/entities",
+        params
+      ),
       "Temporal query failed"
     );
   }
@@ -1342,6 +1465,11 @@ var GeonicDB = class extends EventEmitter {
   /**
    * Make an authenticated API request.
    * Automatically checks response status, parses JSON, and throws on error.
+   *
+   * Empty bodies (`Content-Length: 0` 含む) は Content-Type に関係なく `null`
+   * を返す (#1145)。NGSI-LD の POST / DELETE / PATCH 系は仕様上ボディが
+   * 空だが、サーバ実装が `Content-Type: application/ld+json` を付けて返す
+   * ケースがあり、そこで `res.json()` が SyntaxError を投げて止まっていた。
    */
   async request(method, path, body) {
     const res = await this._auth.request(method, path, body);
@@ -1349,9 +1477,15 @@ var GeonicDB = class extends EventEmitter {
       const e = await res.json().catch(() => ({}));
       throw createErrorFromResponse(res.status, e, "Request failed: " + res.status);
     }
+    if (res.status === 204) return null;
+    if (res.headers.get("Content-Length") === "0") return null;
     const ct = res.headers.get("Content-Type") || "";
-    if (res.status === 204 || !ct) return null;
-    if (ct.indexOf("json") !== -1) return res.json();
+    if (!ct) return null;
+    if (ct.indexOf("json") !== -1) {
+      const text = await res.text();
+      if (!text) return null;
+      return JSON.parse(text);
+    }
     return res.text();
   }
   /**
@@ -1388,13 +1522,29 @@ if (typeof window !== "undefined") {
   window.GeonicDB = GeonicDB;
 }
 function buildEntitiesPath(params) {
-  if (!params) return "/ngsi-ld/v1/entities";
-  const parts = [];
-  if (params.type) parts.push("type=" + encodeURIComponent(params.type));
-  if (params.limit != null) parts.push("limit=" + params.limit);
-  if (params.offset != null) parts.push("offset=" + params.offset);
-  if (params.q) parts.push("q=" + encodeURIComponent(params.q));
-  return parts.length > 0 ? "/ngsi-ld/v1/entities?" + parts.join("&") : "/ngsi-ld/v1/entities";
+  return buildPathWithParams(
+    "/ngsi-ld/v1/entities",
+    params
+  );
+}
+function buildPathWithParams(path, params) {
+  if (!params) return path;
+  const sp = new URLSearchParams();
+  for (const [key, value] of Object.entries(params)) {
+    if (value === void 0 || value === null) continue;
+    if (typeof value === "boolean") {
+      sp.append(key, value ? "true" : "false");
+    } else if (typeof value === "number") {
+      sp.append(key, String(value));
+    } else if (typeof value === "string") {
+      if (value === "") continue;
+      sp.append(key, value);
+    } else {
+      continue;
+    }
+  }
+  const qs = sp.toString();
+  return qs ? `${path}?${qs}` : path;
 }
 export {
   AuthenticationError,
@@ -1406,6 +1556,7 @@ export {
   NotFoundError,
   RateLimitError,
   ValidationError,
+  buildPathWithParams,
   index_default as default
 };
 //# sourceMappingURL=geonicdb.mjs.map