@tinycloud/sdk-core 2.3.0-beta.2 → 2.3.0-beta.3

package/dist/index.cjs

@@ -67,6 +67,7 @@ __export(index_exports, {
   EnsDataSchema: () => EnsDataSchema,
   ErrorCodes: () => import_sdk_services5.ErrorCodes,
   HooksService: () => import_sdk_services5.HooksService,
+  IdentityParseError: () => IdentityParseError,
   KVService: () => import_sdk_services5.KVService,
   LocationRecordValidationError: () => LocationRecordValidationError,
   ManifestValidationError: () => ManifestValidationError,
@@ -97,6 +98,7 @@ __export(index_exports, {
   VaultPublicSpaceKVActions: () => import_sdk_services5.VaultPublicSpaceKVActions,
   VersionCheckError: () => VersionCheckError,
   activateSessionWithHost: () => activateSessionWithHost,
+  addressStorageKey: () => addressStorageKey,
   applyPrefix: () => applyPrefix,
   buildCanonicalDecryptRequest: () => import_sdk_services5.buildCanonicalDecryptRequest,
   buildDecryptAttenuation: () => import_sdk_services5.buildDecryptAttenuation,
@@ -107,6 +109,9 @@ __export(index_exports, {
   canonicalHashHex: () => import_sdk_services5.canonicalHashHex,
   canonicalLocationPayload: () => canonicalLocationPayload,
   canonicalSignedResponse: () => import_sdk_services5.canonicalSignedResponse,
+  canonicalizeAddress: () => canonicalizeAddress,
+  canonicalizeDid: () => canonicalizeDid,
+  canonicalizeDidUrl: () => canonicalizeDidUrl,
   canonicalizeEncryptionJson: () => import_sdk_services5.canonicalizeEncryptionJson,
   canonicalizeSecretScope: () => import_sdk_services5.canonicalizeSecretScope,
   checkDecryptInvocationInput: () => import_sdk_services5.checkDecryptInvocationInput,
@@ -121,6 +126,8 @@ __export(index_exports, {
   defaultSignStrategy: () => defaultSignStrategy,
   defaultSpaceCreationHandler: () => defaultSpaceCreationHandler,
   deriveSignedReceiverKey: () => import_sdk_services5.deriveSignedReceiverKey,
+  didCacheKey: () => didCacheKey,
+  didEquals: () => didEquals,
   discoverNetwork: () => import_sdk_services5.discoverNetwork,
   encryptToNetwork: () => import_sdk_services5.encryptToNetwork,
   encryptionBase64Decode: () => import_sdk_services5.base64Decode,
@@ -140,9 +147,11 @@ __export(index_exports, {
   hexEncode: () => import_sdk_services5.hexEncode,
   httpUrlToMultiaddr: () => httpUrlToMultiaddr,
   isCapabilitySubset: () => isCapabilitySubset,
+  isEvmAddress: () => isEvmAddress,
   isNetworkId: () => import_sdk_services5.isNetworkId,
   loadManifest: () => loadManifest,
   locationPayloadForRecord: () => locationPayloadForRecord,
+  makePkhSpaceId: () => makePkhSpaceId,
   makePublicSpaceId: () => makePublicSpaceId,
   manifestAbilitiesUnion: () => manifestAbilitiesUnion,
   multiaddrToHttpUrl: () => multiaddrToHttpUrl,
@@ -152,8 +161,12 @@ __export(index_exports, {
   openWrappedKey: () => import_sdk_services5.openWrappedKey,
   parseExpiry: () => parseExpiry,
   parseNetworkId: () => import_sdk_services5.parseNetworkId,
+  parsePkhDid: () => parsePkhDid,
   parseRecapCapabilities: () => parseRecapCapabilities,
   parseSpaceUri: () => parseSpaceUri,
+  pkhDid: () => pkhDid,
+  principalDid: () => principalDid,
+  principalDidEquals: () => principalDidEquals,
   resolveCloudLocation: () => resolveCloudLocation,
   resolveManifest: () => resolveManifest,
   resolveSecretListPrefix: () => import_sdk_services5.resolveSecretListPrefix,
@@ -218,6 +231,97 @@ var SilentNotificationHandler = class {
   }
 };
 
+// src/identity.ts
+var import_viem = require("viem");
+var IdentityParseError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "IdentityParseError";
+  }
+};
+var PKH_DID_RE = /^did:pkh:eip155:(\d+):(0x[a-fA-F0-9]{40})$/;
+var DID_RE = /^did:[a-z0-9]+:.+$/;
+function splitDidUrl(input) {
+  const fragmentIndex = input.indexOf("#");
+  if (fragmentIndex < 0) {
+    return { did: input, fragment: "" };
+  }
+  return {
+    did: input.slice(0, fragmentIndex),
+    fragment: input.slice(fragmentIndex)
+  };
+}
+function assertValidChainId(chainId) {
+  if (!Number.isSafeInteger(chainId) || chainId <= 0) {
+    throw new IdentityParseError(`Invalid EIP-155 chain ID: ${chainId}`);
+  }
+}
+function isEvmAddress(input) {
+  return (0, import_viem.isAddress)(input, { strict: false });
+}
+function canonicalizeAddress(address) {
+  if (!isEvmAddress(address)) {
+    throw new IdentityParseError(`Invalid EVM address: ${address}`);
+  }
+  return (0, import_viem.getAddress)(address);
+}
+function addressStorageKey(address) {
+  return canonicalizeAddress(address).toLowerCase();
+}
+function pkhDid(address, chainId = 1) {
+  assertValidChainId(chainId);
+  return `did:pkh:eip155:${chainId}:${canonicalizeAddress(address)}`;
+}
+function parsePkhDid(did) {
+  const match = did.match(PKH_DID_RE);
+  if (!match) return null;
+  const chainId = Number(match[1]);
+  assertValidChainId(chainId);
+  return {
+    method: "pkh",
+    namespace: "eip155",
+    chainId,
+    address: canonicalizeAddress(match[2])
+  };
+}
+function canonicalizeDid(did) {
+  const pkh = parsePkhDid(did);
+  if (pkh) {
+    return pkhDid(pkh.address, pkh.chainId);
+  }
+  if (DID_RE.test(did)) {
+    return did;
+  }
+  throw new IdentityParseError(`Invalid DID: ${did}`);
+}
+function canonicalizeDidUrl(didUrl) {
+  const { did, fragment } = splitDidUrl(didUrl);
+  return `${canonicalizeDid(did)}${fragment}`;
+}
+function principalDid(didUrl) {
+  return canonicalizeDid(splitDidUrl(didUrl).did);
+}
+function didEquals(a, b, options = {}) {
+  const canonicalize = options.ignoreFragment ? principalDid : canonicalizeDidUrl;
+  return canonicalize(a) === canonicalize(b);
+}
+function principalDidEquals(a, b) {
+  return didEquals(a, b, { ignoreFragment: true });
+}
+function didCacheKey(input, options = {}) {
+  const { did, fragment } = splitDidUrl(input);
+  const pkh = parsePkhDid(did);
+  const base = pkh ? `did:pkh:eip155:${pkh.chainId}:${addressStorageKey(pkh.address)}` : canonicalizeDid(did);
+  return options.preserveFragment ? `${base}${fragment}` : base;
+}
+function makePkhSpaceId(address, chainId, name) {
+  assertValidChainId(chainId);
+  if (!name) {
+    throw new IdentityParseError("Space name cannot be empty");
+  }
+  return `tinycloud:pkh:eip155:${chainId}:${canonicalizeAddress(address)}:${name}`;
+}
+
 // src/storage.schema.ts
 var import_zod2 = require("zod");
 var ethereumAddressPattern = /^0x[a-fA-F0-9]{40}$/;
@@ -915,6 +1019,14 @@ var DEFAULT_SIGNED_READ_URL_EXPIRY_MS = EXPIRY.SIGNED_READ_URL_MS;
 
 // src/spaces/SpaceService.ts
 var SERVICE_NAME = "space";
+function ownerDidEquals(a, b) {
+  if (!b) return false;
+  try {
+    return principalDidEquals(a, b);
+  } catch {
+    return a === b;
+  }
+}
 var SpaceErrorCodes = {
   /** Space not found */
   NOT_FOUND: "SPACE_NOT_FOUND",
@@ -932,7 +1044,7 @@ var SpaceErrorCodes = {
   NOT_INITIALIZED: "NOT_INITIALIZED"
 };
 function makePublicSpaceId(address, chainId) {
-  return `tinycloud:pkh:eip155:${chainId}:${address}:public`;
+  return makePkhSpaceId(address, chainId, "public");
 }
 function parseSpaceUri(uri) {
   const fullUriMatch = uri.match(
@@ -940,12 +1052,18 @@ function parseSpaceUri(uri) {
   );
   if (fullUriMatch) {
     const [, chainId, address, name] = fullUriMatch;
-    return {
-      owner: `did:pkh:eip155:${chainId}:${address}`,
-      name,
-      chainId,
-      address
-    };
+    try {
+      const chainIdNumber = Number(chainId);
+      const canonicalAddress = canonicalizeAddress(address);
+      return {
+        owner: pkhDid(canonicalAddress, chainIdNumber),
+        name,
+        chainId: String(chainIdNumber),
+        address: canonicalAddress
+      };
+    } catch {
+      return null;
+    }
   }
   if (/^[a-zA-Z0-9_-]+$/.test(uri)) {
     return {
@@ -957,10 +1075,9 @@ function parseSpaceUri(uri) {
   return null;
 }
 function buildSpaceUri(owner, name) {
-  const pkhMatch = owner.match(/^did:pkh:eip155:(\d+):(0x[a-fA-F0-9]{40})$/);
-  if (pkhMatch) {
-    const [, chainId, address] = pkhMatch;
-    return `tinycloud:pkh:eip155:${chainId}:${address}:${name}`;
+  const pkh = parsePkhDid(owner);
+  if (pkh) {
+    return makePkhSpaceId(pkh.address, pkh.chainId, name);
   }
   return `tinycloud:${owner}:${name}`;
 }
@@ -1409,7 +1526,7 @@ var SpaceService = class {
         id: data.id,
         name: data.name ?? this.extractNameFromId(data.id),
         owner: data.owner,
-        type: data.type ?? (data.owner === this.userDid ? "owned" : "delegated"),
+        type: data.type ?? (ownerDidEquals(data.owner, this.userDid) ? "owned" : "delegated"),
         permissions: data.permissions,
         expiresAt: data.expiresAt ? new Date(data.expiresAt) : void 0
       };
@@ -4762,7 +4879,7 @@ var import_multiaddr_to_uri = require("@multiformats/multiaddr-to-uri");
 var import_uri_to_multiaddr = require("@multiformats/uri-to-multiaddr");
 var import_ed25519 = require("@noble/curves/ed25519");
 var import_basics = require("multiformats/basics");
-var import_viem = require("viem");
+var import_viem2 = require("viem");
 var DEFAULT_TINYCLOUD_LOCATION_REGISTRY_URL = "https://registry.tinycloud.xyz";
 var DEFAULT_TINYCLOUD_FALLBACK_HOST = "https://node.tinycloud.xyz";
 var LocationRecordValidationError = class extends Error {
@@ -5068,7 +5185,7 @@ async function verifyPkhSignature(did, payload, signature) {
   if (!/^0x[0-9a-fA-F]+$/.test(signature)) {
     throw new LocationRecordValidationError("did:pkh signature must be hex");
   }
-  return (0, import_viem.verifyMessage)({
+  return (0, import_viem2.verifyMessage)({
     address,
     message: payload,
     signature
@@ -5303,6 +5420,7 @@ function parseRecapCapabilities(parseWasm, siwe) {
   EnsDataSchema,
   ErrorCodes,
   HooksService,
+  IdentityParseError,
   KVService,
   LocationRecordValidationError,
   ManifestValidationError,
@@ -5333,6 +5451,7 @@ function parseRecapCapabilities(parseWasm, siwe) {
   VaultPublicSpaceKVActions,
   VersionCheckError,
   activateSessionWithHost,
+  addressStorageKey,
   applyPrefix,
   buildCanonicalDecryptRequest,
   buildDecryptAttenuation,
@@ -5343,6 +5462,9 @@ function parseRecapCapabilities(parseWasm, siwe) {
   canonicalHashHex,
   canonicalLocationPayload,
   canonicalSignedResponse,
+  canonicalizeAddress,
+  canonicalizeDid,
+  canonicalizeDidUrl,
   canonicalizeEncryptionJson,
   canonicalizeSecretScope,
   checkDecryptInvocationInput,
@@ -5357,6 +5479,8 @@ function parseRecapCapabilities(parseWasm, siwe) {
   defaultSignStrategy,
   defaultSpaceCreationHandler,
   deriveSignedReceiverKey,
+  didCacheKey,
+  didEquals,
   discoverNetwork,
   encryptToNetwork,
   encryptionBase64Decode,
@@ -5376,9 +5500,11 @@ function parseRecapCapabilities(parseWasm, siwe) {
   hexEncode,
   httpUrlToMultiaddr,
   isCapabilitySubset,
+  isEvmAddress,
   isNetworkId,
   loadManifest,
   locationPayloadForRecord,
+  makePkhSpaceId,
   makePublicSpaceId,
   manifestAbilitiesUnion,
   multiaddrToHttpUrl,
@@ -5388,8 +5514,12 @@ function parseRecapCapabilities(parseWasm, siwe) {
   openWrappedKey,
   parseExpiry,
   parseNetworkId,
+  parsePkhDid,
   parseRecapCapabilities,
   parseSpaceUri,
+  pkhDid,
+  principalDid,
+  principalDidEquals,
   resolveCloudLocation,
   resolveManifest,
   resolveSecretListPrefix,