WIP

leibale · leibale · commit 05f9f0ee0d72 · 2023-06-07T11:41:23.000-04:00
diff --git a/examples/README.md b/examples/README.md
@@ -90,5 +90,5 @@ await client.connect();
 
 // Add your example code here...
 
-await client.quit();
+client.destroy();
 ```
diff --git a/examples/blocking-list-pop.js b/examples/blocking-list-pop.js
@@ -27,4 +27,4 @@ console.log('blpopPromise resolved');
 // {"key":"keyName","element":"value"}
 console.log(`listItem is '${JSON.stringify(listItem)}'`);
 
-await client.quit();
+client.destroy();
diff --git a/examples/bloom-filter.js b/examples/bloom-filter.js
@@ -77,4 +77,4 @@ const info = await client.bf.info('mybloom');
 //  }
 console.log(info);
 
-await client.quit();
+client.destroy();
diff --git a/examples/check-connection-status.js b/examples/check-connection-status.js
@@ -25,4 +25,4 @@ console.log('Afer connectPromise has resolved...');
 // isReady will return True here, client is ready to use.
 console.log(`client.isOpen: ${client.isOpen}, client.isReady: ${client.isReady}`);
 
-await client.quit();
+client.destroy();
diff --git a/examples/command-with-modifiers.js b/examples/command-with-modifiers.js
@@ -1,25 +1,31 @@
 // Define a custom script that shows example of SET command
 // with several modifiers.
 
-import { createClient } from 'redis';
+import { createClient } from '../packages/client';
 
 const client = createClient();
 
 await client.connect();
 await client.del('mykey');
 
-let result = await client.set('mykey', 'myvalue', {
-  EX: 60,
-  GET: true
-});
-
-console.log(result); //null
-
-result = await client.set('mykey', 'newvalue', {
-  EX: 60,
-  GET: true
-});
-
-console.log(result); //myvalue
-
-await client.quit();
+console.log(
+  await client.set('mykey', 'myvalue', {
+    expiration: {
+      type: 'EX',
+      value: 60
+    },
+    GET: true
+  })
+); // null
+
+console.log(
+  await client.set('mykey', 'newvalue', {
+    expiration: { 
+      type: 'EX',
+      value: 60
+    },
+    GET: true
+  })
+); // 'myvalue'
+
+await client.close();
diff --git a/examples/connect-as-acl-user.js b/examples/connect-as-acl-user.js
@@ -23,4 +23,4 @@ try {
   console.log(`GET command failed: ${e.message}`);
 }
 
-await client.quit();
+client.destroy();
diff --git a/examples/count-min-sketch.js b/examples/count-min-sketch.js
@@ -77,4 +77,4 @@ console.log('Count-Min Sketch info:');
 // }
 console.log(info);
 
-await client.quit();
+client.destroy();
diff --git a/examples/cuckoo-filter.js b/examples/cuckoo-filter.js
@@ -76,4 +76,4 @@ const info = await client.cf.info('mycuckoo');
 // }
 console.log(info);
 
-await client.quit();
+client.destroy();
diff --git a/examples/get-server-time.js b/examples/get-server-time.js
@@ -9,4 +9,4 @@ const serverTime = await client.time();
 // 2022-02-25T12:57:40.000Z { microseconds: 351346 }
 console.log(serverTime);
 
-await client.quit();
+client.destroy();
diff --git a/examples/hyperloglog.js b/examples/hyperloglog.js
@@ -48,4 +48,4 @@ try {
   console.error(e);
 }
 
-await client.quit();
+client.destroy();
diff --git a/examples/lua-multi-incr.js b/examples/lua-multi-incr.js
@@ -24,4 +24,4 @@ await client.connect();
 await client.set('mykey', '5');
 console.log(await client.mincr('mykey', 'myotherkey', 10)); // [ 15, 10 ]
 
-await client.quit();
+client.destroy();
diff --git a/examples/managing-json.js b/examples/managing-json.js
@@ -73,4 +73,4 @@ const numPets = await client.json.arrLen('noderedis:jsondata', '$.pets');
 // We now have 4 pets.
 console.log(`We now have ${numPets} pets.`);
 
-await client.quit();
+client.destroy();
diff --git a/examples/search-hashes.js b/examples/search-hashes.js
@@ -85,4 +85,4 @@ for (const doc of results.documents) {
   console.log(`${doc.id}: ${doc.value.name}, ${doc.value.age} years old.`);
 }
 
-await client.quit();
+client.destroy();
diff --git a/examples/search-json.js b/examples/search-json.js
@@ -145,4 +145,4 @@ console.log(
 //   ]
 // }
 
-await client.quit();
+client.destroy();
diff --git a/examples/search-knn.js b/examples/search-knn.js
@@ -88,4 +88,4 @@ console.log(JSON.stringify(results, null, 2));
 //     }
 //   ]
 // }
-await client.quit();
+client.destroy();
diff --git a/examples/set-scan.js b/examples/set-scan.js
@@ -12,4 +12,4 @@ for await (const member of client.sScanIterator(setName)) {
   console.log(member);
 }
 
-await client.quit();
+client.destroy();
diff --git a/examples/sorted-set.js b/examples/sorted-set.js
@@ -28,4 +28,4 @@ for await (const memberWithScore of client.zScanIterator('mysortedset')) {
   console.log(memberWithScore);
 }
 
-await client.quit();
+client.destroy();
diff --git a/examples/stream-producer.js b/examples/stream-producer.js
@@ -47,4 +47,4 @@ console.log(`Length of mystream: ${await client.xLen('mystream')}.`);
 // Should be approximately 1000:
 console.log(`Length of mytrimmedstream: ${await client.xLen('mytrimmedstream')}.`);
 
-await client.quit();
+client.destroy();
diff --git a/examples/time-series.js b/examples/time-series.js
@@ -119,4 +119,4 @@ try {
   console.error(e);
 }
 
-await client.quit();
+client.destroy();
diff --git a/examples/topk.js b/examples/topk.js
@@ -110,4 +110,4 @@ const [ simonCount, lanceCount ] = await client.topK.count('mytopk', [
 console.log(`Count estimate for simon: ${simonCount}.`);
 console.log(`Count estimate for lance: ${lanceCount}.`);
 
-await client.quit();
+client.destroy();
diff --git a/examples/transaction-with-arbitrary-commands.js b/examples/transaction-with-arbitrary-commands.js
@@ -37,4 +37,4 @@ console.log(responses);
 // Clean up fixtures.
 await client.del(['hash1', 'hash2', 'hash3']);
 
-await client.quit();
+client.destroy();
diff --git a/packages/client/lib/RESP/decoder.ts b/packages/client/lib/RESP/decoder.ts
diff --git a/packages/client/lib/RESP/types.ts b/packages/client/lib/RESP/types.ts
diff --git a/packages/client/lib/client/commands-queue.ts b/packages/client/lib/client/commands-queue.ts
diff --git a/packages/client/lib/client/index.ts b/packages/client/lib/client/index.ts
diff --git a/packages/client/lib/client/legacy-mode.ts b/packages/client/lib/client/legacy-mode.ts
diff --git a/packages/client/lib/client/multi-command.ts b/packages/client/lib/client/multi-command.ts
diff --git a/packages/client/lib/client/socket.ts b/packages/client/lib/client/socket.ts
diff --git a/packages/client/lib/cluster/multi-command.ts b/packages/client/lib/cluster/multi-command.ts
diff --git a/packages/client/lib/multi-command.spec.ts b/packages/client/lib/multi-command.spec.ts
diff --git a/packages/client/lib/multi-command.ts b/packages/client/lib/multi-command.ts

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,4 @@ try {`
`23`	`23`	console.log(`GET command failed: ${e.message}`);
`24`	`24`	`}`
`25`	`25`
`26`		`-await client.quit();`
	`26`	`+client.destroy();`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,4 @@ try {`
`48`	`48`	`console.error(e);`
`49`	`49`	`}`
`50`	`50`
`51`		`-await client.quit();`
	`51`	`+client.destroy();`