@wovin/connect-nftstorage 0.0.1-RC21 → 0.0.1-RC23

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import { Crypto, ucan } from '@oddjs/odd';
 import * as ucans from '@ucans/ucans';
 import { type StorageConnector } from '@wovin/core/pubsub';
 import { CID } from 'multiformats';
@@ -7,13 +6,12 @@ export declare class NftStorageConnector implements StorageConnector {
     private keypair;
     serviceDID: string;
     apiKey: string;
-    rootUcan: ucan.Ucan;
+    rootUcan: ucans.Ucan;
     static init({ apiKey }: {
-        oddCrypto: Crypto.Implementation;
         apiKey?: string;
-        rootUcan?: ucan.Ucan;
+        rootUcan?: ucans.Ucan;
     }): Promise<NftStorageConnector>;
-    constructor(keypair: ucans.DidableKey, serviceDID: string, apiKey: string, rootUcan: ucan.Ucan);
+    constructor(keypair: ucans.DidableKey, serviceDID: string, apiKey: string, rootUcan: ucans.Ucan);
     storeCar(car: Blob): Promise<CID<unknown, number, number, import("multiformats").Version>>;
     retrieveCar(cid: CID): Promise<import("@ipld/car").CarReader>;
 }

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAO,IAAI,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE1D,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAOlC,cAAc,YAAY,CAAA;AAG1B,qBAAa,mBAAoB,YAAW,gBAAgB;IAoB1D,OAAO,CAAC,OAAO;IACR,UAAU,EAAE,MAAM;IAClB,MAAM,EAAE,MAAM;IACd,QAAQ,EAAE,IAAI,CAAC,IAAI;WAtBd,IAAI,CAAC,EAAE,MAAM,EACzB,EAAE;QACF,SAAS,EAAE,MAAM,CAAC,cAAc,CAAA;QAChC,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,QAAQ,CAAC,EAAE,IAAI,CAAC,IAAI,CAAA;KACpB;gBAcQ,OAAO,EAAE,KAAK,CAAC,UAAU,EAC1B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,IAAI,CAAC,IAAI;IAGrB,QAAQ,CAAC,GAAG,EAAE,IAAI;IAiBlB,WAAW,CAAC,GAAG,EAAE,GAAG;CAG1B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE1D,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAMlC,cAAc,YAAY,CAAA;AAG1B,qBAAa,mBAAoB,YAAW,gBAAgB;IAmB1D,OAAO,CAAC,OAAO;IACR,UAAU,EAAE,MAAM;IAClB,MAAM,EAAE,MAAM;IACd,QAAQ,EAAE,KAAK,CAAC,IAAI;WArBf,IAAI,CAAC,EAAE,MAAM,EAA4B,EAAE;QAEvD,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,QAAQ,CAAC,EAAE,KAAK,CAAC,IAAI,CAAA;KACrB;gBAcQ,OAAO,EAAE,KAAK,CAAC,UAAU,EAC1B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,KAAK,CAAC,IAAI;IAGtB,QAAQ,CAAC,GAAG,EAAE,IAAI;IAiBlB,WAAW,CAAC,GAAG,EAAE,GAAG;CAG1B"}

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   resolveIPNS,
   retrieveCar,
   retrievePubStream
-} from "./chunk-JS6FK6O4.js";
+} from "./chunk-UEOOYEN2.js";
 import {
   EdKeypair,
   createRequestToken,
@@ -10,17 +10,12 @@ import {
   getRootUcan,
   registerDid,
   storeCar
-} from "./chunk-JPD6PCG6.js";
+} from "./chunk-7HXBFNXR.js";
 import {
   Logger
-} from "./chunk-JN4DQDNQ.js";
-import "./chunk-4FG7WPTV.js";
-import {
-  init_dirname
-} from "./chunk-RXHOK4WI.js";
+} from "./chunk-R6GDUZUI.js";
 
 // src/index.ts
-init_dirname();
 var { WARN, LOG, DEBUG, VERBOSE, ERROR } = Logger.setup(Logger.DEBUG);
 var NftStorageConnector = class _NftStorageConnector {
   constructor(keypair, serviceDID, apiKey, rootUcan) {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { Crypto, did, ucan } from '@oddjs/odd'\nimport * as ucans from '@ucans/ucans'\nimport { CidString } from '@wovin/core'\nimport { type StorageConnector } from '@wovin/core/pubsub'\nimport { Logger } from 'besonders-logger'\nimport { CID } from 'multiformats'\nimport { retrieveCar, retrievePubStream } from './retrieve'\nimport { createRequestToken, getRootUcan, registerDid, storeCar } from './store'\nimport { getDid } from './utils'\n\nconst { WARN, LOG, DEBUG, VERBOSE, ERROR } = Logger.setup(Logger.DEBUG) // eslint-disable-line no-unused-vars\n\nexport * from './retrieve'\n// export * from './store'\n\nexport class NftStorageConnector implements StorageConnector {\n\tstatic async init({ apiKey /* rootUcan,  oddCrypto*/\n\t}: {\n\t\toddCrypto: Crypto.Implementation\n\t\tapiKey?: string\n\t\trootUcan?: ucan.Ucan\n\t}) {\n\t\tconst { value: serviceDID } = await (await fetch('https://api.nft.storage/did')).json()\n\t\t// const myDid =  await getDid(oddCrypto)\n\t\tconst keypair = await ucans.EdKeypair.create()\n\t\tLOG(`Service DID:`, serviceDID)\n\t\t// LOG(`My DID:`, myDid, keypair)\n\t\t// if (!rootUcan) {\n\t\t// await registerDid(apiKey, myDid)\n\t\t// rootUcan = await getRootUcan(apiKey)\n\t\t// }\n\t\treturn new NftStorageConnector(keypair, serviceDID, apiKey, null /* rootUcan */)\n\t}\n\tconstructor(\n\t\t// private oddCrypto: Crypto.Implementation,\n\t\tprivate keypair: ucans.DidableKey,\n\t\tpublic serviceDID: string,\n\t\tpublic apiKey: string,\n\t\tpublic rootUcan: ucan.Ucan,\n\t) {}\n\n\tasync storeCar(car: Blob) {\n\t\tfor (let attempt = 0; attempt < 3; attempt++) {\n\t\t\ttry {\n\t\t\t\tif (!this.rootUcan) {\n\t\t\t\t\tawait registerDid(this.apiKey, this.keypair.did())\n\t\t\t\t\tthis.rootUcan = await getRootUcan(this.apiKey)\n\t\t\t\t}\n\t\t\t\tconst requestUcan = await createRequestToken(this.keypair, this.serviceDID, this.rootUcan)\n\t\t\t\treturn storeCar(car, ucans.encode(requestUcan))\n\t\t\t} catch (err) {\n\t\t\t\tif ((err as any).message?.contains('ERROR_TOKEN_NOT_FOUND')) {\n\t\t\t\t\tWARN(`Token not found (might be a race condition), retrying...`, err)\n\t\t\t\t} else throw err\n\t\t\t}\n\t\t}\n\t}\n\n\tasync retrieveCar(cid: CID) {\n\t\treturn retrieveCar(cid)\n\t}\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA;AAUA,IAAM,EAAE,MAAM,KAAK,OAAO,SAAS,MAAM,IAAI,OAAO,MAAM,OAAO,KAAK;AAK/D,IAAM,sBAAN,MAAM,qBAAgD;AAAA,EAkB5D,YAES,SACD,YACA,QACA,UACN;AAJO;AACD;AACA;AACA;AAAA,EACL;AAAA,EAvBH,aAAa,KAAK;AAAA,IAAE;AAAA;AAAA,EACpB,GAIG;AACF,UAAM,EAAE,OAAO,WAAW,IAAI,OAAO,MAAM,MAAM,6BAA6B,GAAG,KAAK;AAEtF,UAAM,UAAU,MAAY,UAAU,OAAO;AAC7C,QAAI,gBAAgB,UAAU;AAM9B,WAAO,IAAI;AAAA,MAAoB;AAAA,MAAS;AAAA,MAAY;AAAA,MAAQ;AAAA;AAAA,IAAmB;AAAA,EAChF;AAAA,EASA,MAAM,SAAS,KAAW;AACzB,aAAS,UAAU,GAAG,UAAU,GAAG,WAAW;AAC7C,UAAI;AACH,YAAI,CAAC,KAAK,UAAU;AACnB,gBAAM,YAAY,KAAK,QAAQ,KAAK,QAAQ,IAAI,CAAC;AACjD,eAAK,WAAW,MAAM,YAAY,KAAK,MAAM;AAAA,QAC9C;AACA,cAAM,cAAc,MAAM,mBAAmB,KAAK,SAAS,KAAK,YAAY,KAAK,QAAQ;AACzF,eAAO,SAAS,KAAW,OAAO,WAAW,CAAC;AAAA,MAC/C,SAAS,KAAK;AACb,YAAK,IAAY,SAAS,SAAS,uBAAuB,GAAG;AAC5D,eAAK,4DAA4D,GAAG;AAAA,QACrE;AAAO,gBAAM;AAAA,MACd;AAAA,IACD;AAAA,EACD;AAAA,EAEA,MAAM,YAAY,KAAU;AAC3B,WAAO,YAAY,GAAG;AAAA,EACvB;AACD;","names":[]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["// import { Crypto, did, ucan } from '@oddjs/odd/'\nimport * as ucans from '@ucans/ucans'\nimport { CidString } from '@wovin/core'\nimport { type StorageConnector } from '@wovin/core/pubsub'\nimport { Logger } from 'besonders-logger'\nimport { CID } from 'multiformats'\nimport { retrieveCar, retrievePubStream } from './retrieve'\nimport { createRequestToken, getRootUcan, registerDid, storeCar } from './store'\n\nconst { WARN, LOG, DEBUG, VERBOSE, ERROR } = Logger.setup(Logger.DEBUG) // eslint-disable-line no-unused-vars\n\nexport * from './retrieve'\n// export * from './store'\n\nexport class NftStorageConnector implements StorageConnector {\n\tstatic async init({ apiKey /* rootUcan,  oddCrypto*/ }: {\n\t\t// oddCrypto: Crypto.Implementation\n\t\tapiKey?: string\n\t\trootUcan?: ucans.Ucan\n\t}) {\n\t\tconst { value: serviceDID } = await (await fetch('https://api.nft.storage/did')).json()\n\t\t// const myDid =  await getDid(oddCrypto)\n\t\tconst keypair = await ucans.EdKeypair.create()\n\t\tLOG(`Service DID:`, serviceDID)\n\t\t// LOG(`My DID:`, myDid, keypair)\n\t\t// if (!rootUcan) {\n\t\t// await registerDid(apiKey, myDid)\n\t\t// rootUcan = await getRootUcan(apiKey)\n\t\t// }\n\t\treturn new NftStorageConnector(keypair, serviceDID, apiKey, null /* rootUcan */)\n\t}\n\tconstructor(\n\t\t// private oddCrypto: Crypto.Implementation,\n\t\tprivate keypair: ucans.DidableKey,\n\t\tpublic serviceDID: string,\n\t\tpublic apiKey: string,\n\t\tpublic rootUcan: ucans.Ucan,\n\t) {}\n\n\tasync storeCar(car: Blob) {\n\t\tfor (let attempt = 0; attempt < 3; attempt++) {\n\t\t\ttry {\n\t\t\t\tif (!this.rootUcan) {\n\t\t\t\t\tawait registerDid(this.apiKey, this.keypair.did())\n\t\t\t\t\tthis.rootUcan = await getRootUcan(this.apiKey)\n\t\t\t\t}\n\t\t\t\tconst requestUcan = await createRequestToken(this.keypair, this.serviceDID, this.rootUcan)\n\t\t\t\treturn storeCar(car, ucans.encode(requestUcan))\n\t\t\t} catch (err) {\n\t\t\t\tif ((err as any).message?.contains('ERROR_TOKEN_NOT_FOUND')) {\n\t\t\t\t\tWARN(`Token not found (might be a race condition), retrying...`, err)\n\t\t\t\t} else throw err\n\t\t\t}\n\t\t}\n\t}\n\n\tasync retrieveCar(cid: CID) {\n\t\treturn retrieveCar(cid)\n\t}\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AASA,IAAM,EAAE,MAAM,KAAK,OAAO,SAAS,MAAM,IAAI,OAAO,MAAM,OAAO,KAAK;AAK/D,IAAM,sBAAN,MAAM,qBAAgD;AAAA,EAiB5D,YAES,SACD,YACA,QACA,UACN;AAJO;AACD;AACA;AACA;AAAA,EACL;AAAA,EAtBH,aAAa,KAAK;AAAA,IAAE;AAAA;AAAA,EAAiC,GAIlD;AACF,UAAM,EAAE,OAAO,WAAW,IAAI,OAAO,MAAM,MAAM,6BAA6B,GAAG,KAAK;AAEtF,UAAM,UAAU,MAAY,UAAU,OAAO;AAC7C,QAAI,gBAAgB,UAAU;AAM9B,WAAO,IAAI;AAAA,MAAoB;AAAA,MAAS;AAAA,MAAY;AAAA,MAAQ;AAAA;AAAA,IAAmB;AAAA,EAChF;AAAA,EASA,MAAM,SAAS,KAAW;AACzB,aAAS,UAAU,GAAG,UAAU,GAAG,WAAW;AAC7C,UAAI;AACH,YAAI,CAAC,KAAK,UAAU;AACnB,gBAAM,YAAY,KAAK,QAAQ,KAAK,QAAQ,IAAI,CAAC;AACjD,eAAK,WAAW,MAAM,YAAY,KAAK,MAAM;AAAA,QAC9C;AACA,cAAM,cAAc,MAAM,mBAAmB,KAAK,SAAS,KAAK,YAAY,KAAK,QAAQ;AACzF,eAAO,SAAS,KAAW,OAAO,WAAW,CAAC;AAAA,MAC/C,SAAS,KAAK;AACb,YAAK,IAAY,SAAS,SAAS,uBAAuB,GAAG;AAC5D,eAAK,4DAA4D,GAAG;AAAA,QACrE;AAAO,gBAAM;AAAA,MACd;AAAA,IACD;AAAA,EACD;AAAA,EAEA,MAAM,YAAY,KAAU;AAC3B,WAAO,YAAY,GAAG;AAAA,EACvB;AACD;","names":[]}

package/dist/retrieve.js

@@ -2,9 +2,8 @@ import {
   resolveIPNS,
   retrieveCar,
   retrievePubStream
-} from "./chunk-JS6FK6O4.js";
-import "./chunk-JN4DQDNQ.js";
-import "./chunk-RXHOK4WI.js";
+} from "./chunk-UEOOYEN2.js";
+import "./chunk-R6GDUZUI.js";
 export {
   resolveIPNS,
   retrieveCar,

package/dist/store.d.ts

@@ -1,8 +1,7 @@
-import { ucan } from '@oddjs/odd';
 import * as ucans from '@ucans/ucans';
 import { CID } from 'multiformats';
 export declare function storeCar(car: Blob, encodedUcan: string): Promise<CID>;
-export declare function createRequestToken(keypair: ucans.DidableKey, serviceDID: string, ucanToken: ucan.Ucan): Promise<ucans.Ucan<string>>;
+export declare function createRequestToken(keypair: ucans.DidableKey, serviceDID: string, ucanToken: ucans.Ucan): Promise<ucans.Ucan<string>>;
 export declare function registerDid(apiKey: string, did: string): Promise<void>;
-export declare function getRootUcan(apiKey: string): Promise<ucan.Ucan>;
+export declare function getRootUcan(apiKey: string): Promise<ucans.Ucan<string>>;
 //# sourceMappingURL=store.d.ts.map

package/dist/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,IAAI,EAAE,MAAM,YAAY,CAAA;AACzD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAIlC,wBAAsB,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAmB,OAAO,CAAC,GAAG,CAAC,CAgB3F;AA0BD,wBAAsB,kBAAkB,CACvC,OAAO,EAAE,KAAK,CAAC,UAAU,EAEzB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,IAAI,CAAC,IAAI,+BA0BpB;AACD,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAa5D;AACD,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,sBAW/C"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAIlC,wBAAsB,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAmB,OAAO,CAAC,GAAG,CAAC,CAgB3F;AA0BD,wBAAsB,kBAAkB,CACvC,OAAO,EAAE,KAAK,CAAC,UAAU,EAEzB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,KAAK,CAAC,IAAI,+BA0BrB;AACD,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAa5D;AACD,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,+BAW/C"}

package/dist/store.js

@@ -3,10 +3,8 @@ import {
   getRootUcan,
   registerDid,
   storeCar
-} from "./chunk-JPD6PCG6.js";
-import "./chunk-JN4DQDNQ.js";
-import "./chunk-4FG7WPTV.js";
-import "./chunk-RXHOK4WI.js";
+} from "./chunk-7HXBFNXR.js";
+import "./chunk-R6GDUZUI.js";
 export {
   createRequestToken,
   getRootUcan,

package/dist/utils.d.ts

@@ -1,3 +1 @@
-import { Crypto } from '@oddjs/odd';
-export declare function getDid(crypto: Crypto.Implementation): Promise<string>;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAO,MAAM,YAAY,CAAA;AAExC,wBAAsB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAQ3E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":""}

package/dist/utils.js

@@ -1,21 +1 @@
-import {
-  did_exports
-} from "./chunk-4FG7WPTV.js";
-import {
-  init_dirname
-} from "./chunk-RXHOK4WI.js";
-
-// src/utils.ts
-init_dirname();
-async function getDid(crypto) {
-  const pubKey = await crypto.keystore.publicExchangeKey();
-  return did_exports.publicKeyToDid(
-    crypto,
-    pubKey,
-    "ed25519"
-  );
-}
-export {
-  getDid
-};
 //# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/utils.ts"],"sourcesContent":["import { Crypto, did } from '@oddjs/odd'\n\nexport async function getDid(crypto: Crypto.Implementation): Promise<string> {\n\tconst pubKey = await crypto.keystore.publicExchangeKey()\n\n\treturn did.publicKeyToDid(\n\t\tcrypto,\n\t\tpubKey,\n\t\t'ed25519',\n\t)\n}\n"],"mappings":";;;;;;;;AAAA;AAEA,eAAsB,OAAO,QAAgD;AAC5E,QAAM,SAAS,MAAM,OAAO,SAAS,kBAAkB;AAEvD,SAAO,YAAI;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,EACD;AACD;","names":[]}
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wovin/connect-nftstorage",
-	"version": "0.0.1-RC21",
+	"version": "0.0.1-RC23",
 	"type": "module",
 	"scripts": {
 		"build": "tsup && tsc --emitDeclarationOnly --declaration",
@@ -9,7 +9,7 @@
 		"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
 		"pub": "npm publish --tag latest --access=public"
 	},
-	"main": "dist/index.cjs",
+	"//main": "dist/index.cjs",
 	"module": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"exports": {
@@ -23,9 +23,8 @@
 	],
 	"dependencies": {
 		"@ipld/car": "^5.2.4",
-		"@oddjs/odd": "^0.37.2",
 		"@ucans/ucans": "^0.12.0",
-		"@wovin/core": "0.0.1-RC21",
+		"@wovin/core": "0.0.1-RC23",
 		"besonders-logger": "1.0.0-RC11",
 		"multiformats": "^12.1.3",
 		"ucan-storage": "^1.3.0"