Merge pull request #12 from windingtree/develop

Bump beta.11

Author: kostysh

examples/client/package.json

@@ -19,7 +19,7 @@
     "typescript": "^5.0.3",
     "vite": "^4.2.1",
     "zod": "^3.21.4",
-    "@windingtree/sdk": "0.1.0-beta.9"
+    "@windingtree/sdk": "0.1.0-beta.10"
   },
   "eslintConfig": {
     "extends": [

examples/client/src/App.tsx

@@ -16,6 +16,8 @@ const defaultExpire = '30s';
 /** Default topic to publish requests the same as for the supplier node */
 const defaultTopic = 'hello';
 
+type RequestsRegistryRecord = Required<RequestRecord<RequestQuery, OfferOptions>>;
+
 interface FormValues {
   topic: string;
   message: string;
@@ -27,7 +29,7 @@ interface RequestFormProps {
 }
 
 interface RequestsProps {
-  requests: Required<RequestRecord<RequestQuery, OfferOptions>>[];
+  requests: RequestsRegistryRecord[];
   subscribed?: (id: string) => boolean;
   onClear(): void;
   onCancel(id: string): void;
@@ -147,7 +149,7 @@ export const Requests = ({ requests, subscribed, onClear, onCancel }: RequestsPr
 export const App = () => {
   const client = useRef<Client<RequestQuery, OfferOptions> | undefined>();
   const [connected, setConnected] = useState<boolean>(false);
-  const [requests, setRequests] = useState<Required<RequestRecord<RequestQuery, OfferOptions>>[]>(
+  const [requests, setRequests] = useState<RequestsRegistryRecord[]>(
     [],
   );
   const [error, setError] = useState<string | undefined>();

examples/client/yarn.lock

@@ -2177,10 +2177,10 @@
     magic-string "^0.27.0"
     react-refresh "^0.14.0"
 
-"@windingtree/[email protected].9":
-  version "0.1.0-beta.9"
-  resolved "https://registry.yarnpkg.com/@windingtree/sdk/-/sdk-0.1.0-beta.9.tgz#215fe4729d0bb7b777de449d9e3d4ce56241b432"
-  integrity sha512-L2RuVtCGcCuSAEcUjE25k2BaDx3SbZQJos/ncU9ncmilKFNuPbt+QAmxgveZVZRXCb5fInJyWa+V9bD9NvPAaw==
+"@windingtree/[email protected].10":
+  version "0.1.0-beta.10"
+  resolved "https://registry.yarnpkg.com/@windingtree/sdk/-/sdk-0.1.0-beta.10.tgz#f2092903077a597ffb3c46a6af1fda25b8586bea"
+  integrity sha512-9CsUr+njuL71L0eHX9GmNuaTgauGHqJzsky/annmW7WDa/GJ5cFI6mowGSMRHeCIAhtOZEtMQUAlWrHRgk1TBQ==
   dependencies:
     "@chainsafe/libp2p-gossipsub" "^6.2.0"
     "@chainsafe/libp2p-noise" "^11.0.4"

package.json

@@ -23,8 +23,8 @@
   ],
   "license": "MIT",
   "type": "module",
-  "types": "./lib/src/index.d.ts",
-  "main": "./lib/src/index.js",
+  "types": "./lib/index.d.ts",
+  "main": "./lib/index.js",
   "files": [
     "lib/**/*",
     "!**/*.tsbuildinfo"

src/client/index.ts

@@ -329,10 +329,10 @@ export class Client<
         }
 
         /** Check is the message is an offer */
-        const offer = createOfferDataSchema<
-          z.ZodType<CustomRequestQuery>,
-          z.ZodType<CustomOfferOptions>
-        >(this.querySchema, this.offerOptionsSchema).parse(JSON.parse(decodeText(detail.data)));
+        const offer = createOfferDataSchema<CustomRequestQuery, CustomOfferOptions>(
+          this.querySchema,
+          this.offerOptionsSchema,
+        ).parse(JSON.parse(decodeText(detail.data)));
         logger.trace('Offer received:', offer);
 
         // Verify the offer

src/client/requestsRegistry.ts

@@ -19,24 +19,29 @@ const logger = createLogger('RequestsRegistry');
 /**
  * Creates request record schema
  *
- * @param {z.ZodType} querySchema Custom request query schema
- * @param {z.ZodType} offerOptionsSchema
+ * @template {CustomRequestQuery}
+ * @template {CustomOfferOptions}
+ * @param {z.ZodType<CustomRequestQuery>} querySchema Custom request query schema
+ * @param {z.ZodType<CustomOfferOptions>} offerOptionsSchema
  * @returns {z.ZodType} Request record schema
  */
 export const createRequestRecordSchema = <
-  TQuery extends z.ZodTypeAny,
-  TOfferOptions extends z.ZodTypeAny,
+  CustomRequestQuery extends GenericQuery,
+  CustomOfferOptions extends GenericOfferOptions,
 >(
-  querySchema: TQuery,
-  offerOptionsSchema: TOfferOptions,
+  querySchema: z.ZodType<CustomRequestQuery>,
+  offerOptionsSchema: z.ZodType<CustomOfferOptions>,
 ) =>
   z
     .object({
       /** Raw request data */
-      data: createRequestDataSchema<TQuery>(querySchema),
+      data: createRequestDataSchema<CustomRequestQuery>(querySchema),
       /** Offers associated with a request*/
       offers: z.array(
-        createOfferDataSchema<TQuery, TOfferOptions>(querySchema, offerOptionsSchema),
+        createOfferDataSchema<CustomRequestQuery, CustomOfferOptions>(
+          querySchema,
+          offerOptionsSchema,
+        ),
       ),
       /** Request cancelation flag */
       cancelled: z.boolean().default(false),
@@ -84,11 +89,7 @@ export type RequestsRegistryOptions<
 export type RequestRecord<
   CustomRequestQuery extends GenericQuery,
   CustomOfferOptions extends GenericOfferOptions,
-> = z.infer<
-  ReturnType<
-    typeof createRequestRecordSchema<z.ZodType<CustomRequestQuery>, z.ZodType<CustomOfferOptions>>
-  >
->;
+> = z.infer<ReturnType<typeof createRequestRecordSchema<CustomRequestQuery, CustomOfferOptions>>>;
 
 /**
  * Request manager events interface
@@ -260,10 +261,10 @@ export class RequestsRegistry<
 
       for (let requestRecord of rawRecords) {
         try {
-          requestRecord = createRequestRecordSchema<
-            z.ZodType<CustomRequestQuery>,
-            z.ZodType<CustomOfferOptions>
-          >(this.client.querySchema, this.client.offerOptionsSchema).parse(requestRecord);
+          requestRecord = createRequestRecordSchema<CustomRequestQuery, CustomOfferOptions>(
+            this.client.querySchema,
+            this.client.offerOptionsSchema,
+          ).parse(requestRecord);
 
           // `record.data` marked as optional because of Zod generics issue
           this.requests.set(
@@ -379,13 +380,11 @@ export class RequestsRegistry<
       throw new Error('Client not connected to the coordination server yet');
     }
 
-    request = createRequestDataSchema<z.ZodType<CustomRequestQuery>>(this.client.querySchema).parse(
-      request,
-    );
-    const requestRecord = createRequestRecordSchema<
-      z.ZodType<CustomRequestQuery>,
-      z.ZodType<CustomOfferOptions>
-    >(this.client.querySchema, this.client.offerOptionsSchema).parse({
+    request = createRequestDataSchema<CustomRequestQuery>(this.client.querySchema).parse(request);
+    const requestRecord = createRequestRecordSchema<CustomRequestQuery, CustomOfferOptions>(
+      this.client.querySchema,
+      this.client.offerOptionsSchema,
+    ).parse({
       data: request,
       offers: [],
     });
@@ -452,7 +451,7 @@ export class RequestsRegistry<
 
     this.requests.set(
       id,
-      createRequestRecordSchema<z.ZodType<CustomRequestQuery>, z.ZodType<CustomOfferOptions>>(
+      createRequestRecordSchema<CustomRequestQuery, CustomOfferOptions>(
         this.client.querySchema,
         this.client.offerOptionsSchema,
       ).parse(record),
@@ -512,7 +511,7 @@ export class RequestsRegistry<
    * @memberof RequestsRegistry
    */
   addOffer(offer: OfferData<CustomRequestQuery, CustomOfferOptions>) {
-    offer = createOfferDataSchema<z.ZodType<CustomRequestQuery>, z.ZodType<CustomOfferOptions>>(
+    offer = createOfferDataSchema<CustomRequestQuery, CustomOfferOptions>(
       this.client.querySchema,
       this.client.offerOptionsSchema,
     ).parse(offer);
@@ -529,7 +528,7 @@ export class RequestsRegistry<
 
     this.requests.set(
       requestId,
-      createRequestRecordSchema<z.ZodType<CustomRequestQuery>, z.ZodType<CustomOfferOptions>>(
+      createRequestRecordSchema<CustomRequestQuery, CustomOfferOptions>(
         this.client.querySchema,
         this.client.offerOptionsSchema,
       ).parse({

src/node/index.ts

@@ -249,7 +249,7 @@ export class Node<
     }
 
     const offer = await buildOffer<CustomRequestQuery, CustomOfferOptions>(
-      createBuildOfferOptions<z.ZodType<CustomRequestQuery>, z.ZodType<CustomOfferOptions>>(
+      createBuildOfferOptions<CustomRequestQuery, CustomOfferOptions>(
         this.querySchema,
         this.offerOptionsSchema,
       ).parse({

src/node/requestManager.ts

@@ -45,7 +45,7 @@ export class RequestManager<CustomRequestQuery extends GenericQuery> extends Eve
   }
 
   add(topic: string, data: string) {
-    const requestData = createRequestDataSchema<typeof this.querySchema>(this.querySchema).parse(
+    const requestData = createRequestDataSchema<CustomRequestQuery>(this.querySchema).parse(
       JSON.parse(data),
     );