Merge pull request #4 from windingtree/develop

Fix module exports

Author: kostysh

examples/client/package.json

@@ -18,7 +18,8 @@
     "react-dom": "^18.2.0",
     "typescript": "^4.9.3",
     "vite": "^4.1.0",
-    "zod": "^3.21.4"
+    "zod": "^3.21.4",
+    "@windingtree/sdk": "^0.1.0-beta.3"
   },
   "eslintConfig": {
     "extends": [

examples/client/src/App.tsx

@@ -1,3 +1,4 @@
+import { useState, useEffect, useRef } from 'react';
 import {
   RequestQuerySchema,
   RequestQuery,
@@ -6,11 +7,11 @@ import {
   contractConfig,
   serverAddress,
 } from '../../shared/types.js';
-import { useState, useEffect, useRef } from 'react';
-import { createClient, Client, ClientOptions } from '../../../src/index.js';
-import { localStorage } from '../../../src/storage/index.js';
 import { isExpired } from '../../../src/utils/time.js';
-import { RequestRecord } from '../../../src/client/requestManager.js';
+import { RequestRecord } from '../../../src/client/requestsRegistry.js';
+import { createClient, Client } from '../../../src/client/index.js';
+import { ClientOptions, storage } from '@windingtree/sdk';
+// import { isExpired } from '@windingtree/sdk/utils';
 
 /** Default request expiration time */
 const defaultExpire = '30s';
@@ -165,7 +166,7 @@ export const App = () => {
           offerOptionsSchema: OfferOptionsSchema,
           contractConfig,
           serverAddress,
-          storageInitializer: localStorage.createInitializer({
+          storageInitializer: storage.localStorage.createInitializer({
             session: true,
           }),
           requestRegistryPrefix: 'requestsRegistry',

examples/client/yarn.lock

@@ -1,6 +1,6 @@
 import { createServer, ServerOptions } from '../../src/index.js';
 import { memoryStorage } from '../../src/storage/index.js';
-import peerKey from '../../test/peerKey.json';
+import peerKey from '../../test/peerKey.json' assert { type: 'json' };
 import { createLogger } from '../../src/utils/logger.js';
 
 const logger = createLogger('ServerMain');

examples/server/index.ts

@@ -13,25 +13,26 @@
     "windingtree",
     "market",
     "protocol",
-    "p2p",
     "libp2p",
     "sdk",
-    "typescript"
+    "typescript",
+    "p2p",
+    "peer",
+    "peer-to-peer",
+    "network"
   ],
   "license": "MIT",
   "type": "module",
   "exports": {
     ".": {
-      "import": {
-        "default": "./lib/esm/index.mjs",
-        "types": "./lib/esm/types/index.d.ts",
-        "utils": "./lib/esm/utils"
-      },
-      "require": {
-        "default": "./lib/cjs/index.js",
-        "types": "./lib/cjs/types/index.d.ts",
-        "utils": "./lib/cjs/utils"
-      }
+      "types": "./lib/cjs/types/index.d.ts",
+      "import": "./lib/esm/index.mjs",
+      "require": "./lib/cjs/index.js"
+    },
+    "./utils": {
+      "types": "./lib/cjs/types/utils/index.d.ts",
+      "import": "./lib/esm/utils/index.js",
+      "require": "./lib/cjs/utils/index.js"
     }
   },
   "types": "./lib/cjs/types/index.d.ts",

package.json

@@ -20,7 +20,7 @@ import {
   RequestData,
 } from '../shared/messages.js';
 import { ClientOptions, createClientOptionsSchema } from '../shared/options.js';
-import { RequestRecord, RequestsRegistry } from './requestManager.js';
+import { RequestRecord, RequestsRegistry } from './requestsRegistry.js';
 import { decodeText } from '../utils/text.js';
 import { ContractConfig } from '../utils/contract.js';
 import { StorageInitializer } from '../storage/index.js';
@@ -617,3 +617,8 @@ export const createClient = <
 ): Client<CustomRequestQuery, CustomOfferOptions> => {
   return new Client(options);
 };
+
+/**
+ * Requests registry exports
+ */
+export * from './requestsRegistry.js';

src/client/index.ts

@@ -54,7 +54,7 @@ export const RequestRegistryPrefixSchema = z.string().default('requestsRegistry'
  * @template CustomRequestQuery
  * @template CustomOfferOptions
  */
-const createRequestManagerOptionsSchema = <
+const createRequestsRegistryOptionsSchema = <
   CustomRequestQuery extends GenericQuery,
   CustomOfferOptions extends GenericOfferOptions,
 >() =>
@@ -71,11 +71,11 @@ const createRequestManagerOptionsSchema = <
 /**
  * Request manager initialization options type
  */
-export type RequestManagerOptions<
+export type RequestsRegistryOptions<
   CustomRequestQuery extends GenericQuery,
   CustomOfferOptions extends GenericOfferOptions,
 > = z.infer<
-  ReturnType<typeof createRequestManagerOptionsSchema<CustomRequestQuery, CustomOfferOptions>>
+  ReturnType<typeof createRequestsRegistryOptionsSchema<CustomRequestQuery, CustomOfferOptions>>
 >;
 
 /**
@@ -198,7 +198,7 @@ export interface RequestEvents<
 }
 
 /**
- * Requests manager
+ * Requests registry
  *
  * @class RequestsRegistry
  * @extends {EventEmitter<RequestEvents<CustomRequestQuery, CustomOfferOptions>>}
@@ -218,13 +218,13 @@ export class RequestsRegistry<
   /**
    * Creates an instance of RequestsRegistry.
    *
-   * @param {RequestManagerOptions<CustomRequestQuery, CustomOfferOptions>} options
+   * @param {RequestsRegistryOptions<CustomRequestQuery, CustomOfferOptions>} options
    * @memberof RequestsRegistry
    */
-  constructor(options: RequestManagerOptions<CustomRequestQuery, CustomOfferOptions>) {
+  constructor(options: RequestsRegistryOptions<CustomRequestQuery, CustomOfferOptions>) {
     super();
 
-    const { client, storage, prefix } = createRequestManagerOptionsSchema<
+    const { client, storage, prefix } = createRequestsRegistryOptionsSchema<
       CustomRequestQuery,
       CustomOfferOptions
     >().parse(options);

src/client/requestManager.ts renamed to src/client/requestsRegistry.ts

@@ -374,3 +374,8 @@ export const createNode = <
 ): Node<CustomRequestQuery, CustomOfferOptions> => {
   return new Node<CustomRequestQuery, CustomOfferOptions>(options);
 };
+
+/**
+ * Request manager exports
+ */
+export * from './requestManager.js';

src/node/index.ts

@@ -5,7 +5,7 @@ import { ContractConfigSchema } from '../utils/contract.js';
 import { parseSeconds } from '../utils/time.js';
 import { noncePeriod } from '../constants.js';
 import { StorageInitializerSchema } from '../storage/abstract.js';
-import { RequestRegistryPrefixSchema } from '../client/requestManager.js';
+import { RequestRegistryPrefixSchema } from '../client/requestsRegistry.js';
 
 export const createQuerySchemaOptionSchema = <CustomRequestQuery extends GenericQuery>() =>
   z.object({