Upgrade

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Install rust
         uses: hecrj/setup-rust-action@v1
         with:
-          rust-version: "1.42.0"
+          rust-version: "1.43.0"
 
       - name: Install clippy and rustfmt
         if: matrix.kind == 'lint'
@@ -30,7 +30,7 @@ jobs:
       - name: Install Deno
         uses: denolib/setup-deno@master
         with:
-          deno-version: 0.39.0
+          deno-version: 1.0.0
 
       - name: Start MongoDB (MacOs)
         if: matrix.kind == 'test' && startsWith(matrix.os, 'mac')
@@ -62,28 +62,21 @@ jobs:
           rustc --version
           cargo --version
 
-      - name: Cache cargo registry
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/registry
-          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
-      - name: Cache cargo index
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/git
-          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
-      - name: Cache cargo build
-        uses: actions/cache@v1
-        with:
-          path: target
-          key: ${{ matrix.kind }}-${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
+      - name: Configure cargo data directory
+        run: echo "::set-env name=CARGO_HOME::$(pwd)/.cargo_home"
 
-      # Fix the problem that the second build of windows will fail
-      - name: Remove Some Cache
-        if: matrix.os == 'windows-2019'
-        run: |
-          rm target/release/gn_root -Recurse -ErrorAction Ignore
-          rm target/debug/gn_root -Recurse -ErrorAction Ignore
+      - name: Cache
+        uses: denoland/github-actions-cache@stable-prerelease
+        with:
+          path: |-
+            .cargo_home
+            target/*/.*
+            target/*/build
+            target/*/deps
+          key:
+            ${{ matrix.os }}-${{ matrix.kind }}-${{ hashFiles('Cargo.lock') }}
+          restore-keys: |
+            ${{ matrix.os }}-${{ matrix.kind }}-
 
       - name: Install python
         uses: actions/setup-python@v1
@@ -102,7 +95,7 @@ jobs:
         run: cargo test --release --locked --all-targets
       - name: Test TS
         if: matrix.kind == 'test'
-        run: deno run -A ./test.ts
+        run: deno test -A --unstable ./test.ts
 
       - name: Release
         uses: softprops/action-gh-release@v1

Cargo.toml

@@ -8,11 +8,10 @@ edition = "2018"
 crate-type = ["cdylib"]
 
 [dependencies]
-mongodb = "0.9.2"
+mongodb = { version = "0.9.2" }
 bson = "0.14.1"
-serde_json = "1.0.50"
+serde_json = "1.0.52"
 serde = "1.0.106"
 futures = "0.3.4"
-deno_core = "0.39.0"
-lazy_static = "1.4.0"
-# deno = "0.29.0"
+deno_core = "0.45.0"
+lazy_static = "1.4.0"

deps.ts

@@ -1 +1 @@
-export { prepare } from "https://deno.land/x/plugin_prepare@v0.3.1/mod.ts";
+export { prepare } from "https://deno.land/x/plugin_prepare@v0.6.0/mod.ts";

mod.ts

@@ -4,5 +4,5 @@ export * from "./ts/database.ts";
 export * from "./ts/result.ts";
 export { ObjectId } from "./ts/types.ts";
 export * from "./ts/util.ts";
-export const VERSION = "v0.5.2";
-export const RELEASE_URL = `https://github.com/manyuanrong/deno_mongo/releases/download/${VERSION}`;
+export const VERSION = "v0.6.0";
+export const RELEASE_URL = `https://github.com/manyuanrong/deno_mongo/releases/download/${VERSION}`;

src/command/aggregation.rs

@@ -12,7 +12,7 @@ struct AggregationArgs {
     pipeline: Vec<Value>,
 }
 
-pub fn aggregate(command: Command) -> CoreOp {
+pub fn aggregate(command: Command) -> Op {
     let fut = async move {
         let client = command.get_client();
         let data = command.data;
@@ -31,7 +31,7 @@ pub fn aggregate(command: Command) -> CoreOp {
                 _ => None,
             })
             .collect();
-        Ok(util::async_result(&command.args, docs))
+        util::async_result(&command.args, docs)
     };
-    CoreOp::Async(fut.boxed())
+    Op::Async(fut.boxed())
 }

src/command/connect.rs

@@ -20,7 +20,7 @@ struct ConnectArgs {
     password: Option<String>,
 }
 
-pub fn connect_with_options(command: Command) -> CoreOp {
+pub fn connect_with_options(command: Command) -> Op {
     let args: ConnectArgs = serde_json::from_slice(command.data.unwrap().as_ref()).unwrap();
     let hosts = args
         .hosts
@@ -56,14 +56,14 @@ pub fn connect_with_options(command: Command) -> CoreOp {
     let client = mongodb::Client::with_options(options).unwrap();
     let client_id: usize = NEXT_CLIENT_ID.fetch_add(1, Ordering::SeqCst);
     CLIENTS.lock().unwrap().insert(client_id, client);
-    CoreOp::Sync(Buf::from(client_id.to_string().as_bytes()))
+    Op::Sync(Buf::from(client_id.to_string().as_bytes()))
 }
 
-pub fn connect_with_uri(command: Command) -> CoreOp {
+pub fn connect_with_uri(command: Command) -> Op {
     let uri: Vec<u8> = command.data.unwrap().as_ref().to_vec();
     let uri = String::from_utf8(uri).unwrap();
     let client = mongodb::Client::with_uri_str(&uri).unwrap();
     let client_id: usize = NEXT_CLIENT_ID.fetch_add(1, Ordering::SeqCst);
     CLIENTS.lock().unwrap().insert(client_id, client);
-    CoreOp::Sync(Buf::from(client_id.to_string().as_bytes()))
+    Op::Sync(Buf::from(client_id.to_string().as_bytes()))
 }

src/command/count.rs

@@ -10,7 +10,7 @@ struct CountArgs {
     filter: Option<Value>,
 }
 
-pub fn count(command: Command) -> CoreOp {
+pub fn count(command: Command) -> Op {
     let fut = async move {
         let client = command.get_client();
         let data = command.data;
@@ -23,7 +23,7 @@ pub fn count(command: Command) -> CoreOp {
         let collection = database.collection(&collection_name);
 
         let count = collection.count_documents(filter, None).unwrap();
-        Ok(util::async_result(&command.args, count))
+        util::async_result(&command.args, count)
     };
-    CoreOp::Async(fut.boxed())
+    Op::Async(fut.boxed())
 }

src/command/delete.rs

@@ -10,7 +10,7 @@ struct DeleteArgs {
     delete_one: bool,
 }
 
-pub fn delete(command: Command) -> CoreOp {
+pub fn delete(command: Command) -> Op {
     let fut = async move {
         let client = command.get_client();
         let data = command.data;
@@ -27,10 +27,7 @@ pub fn delete(command: Command) -> CoreOp {
         } else {
             collection.delete_many(query, None).unwrap()
         };
-        Ok(util::async_result(
-            &command.args,
-            delete_result.deleted_count,
-        ))
+        util::async_result(&command.args, delete_result.deleted_count)
     };
-    CoreOp::Async(fut.boxed())
+    Op::Async(fut.boxed())
 }

src/command/find.rs

@@ -16,7 +16,7 @@ struct FindArgs {
     limit: Option<i64>,
 }
 
-pub fn find(command: Command) -> CoreOp {
+pub fn find(command: Command) -> Op {
     let fut = async move {
         let client = command.get_client();
         let data = command.data;
@@ -32,7 +32,7 @@ pub fn find(command: Command) -> CoreOp {
 
         if args.find_one {
             let doc = collection.find_one(filter, None).unwrap();
-            Ok(util::async_result(&command.args, doc))
+            util::async_result(&command.args, doc)
         } else {
             let mut options: FindOptions = FindOptions::default();
             options.skip = skip;
@@ -45,8 +45,8 @@ pub fn find(command: Command) -> CoreOp {
                     _ => None,
                 })
                 .collect();
-            Ok(util::async_result(&command.args, docs))
+            util::async_result(&command.args, docs)
         }
     };
-    CoreOp::Async(fut.boxed())
+    Op::Async(fut.boxed())
 }

src/command/indexes.rs

@@ -23,7 +23,7 @@ impl IndexModelArgs {
     }
 }
 
-pub fn create_indexes(command: Command) -> CoreOp {
+pub fn create_indexes(command: Command) -> Op {
     let fut = async move {
         let client = command.get_client();
         let data = command.data;
@@ -48,7 +48,7 @@ pub fn create_indexes(command: Command) -> CoreOp {
         let collection = database.collection(&collection_name);
 
         let result = collection.create_indexes(models).unwrap();
-        Ok(util::async_result(&command.args, result))
+        util::async_result(&command.args, result)
     };
-    CoreOp::Async(fut.boxed())
+    Op::Async(fut.boxed())
 }

src/command/insert.rs

@@ -18,7 +18,7 @@ struct InsertOneArgs {
     doc: Value,
 }
 
-pub fn insert_one(command: Command) -> CoreOp {
+pub fn insert_one(command: Command) -> Op {
     let fut = async move {
         let client = command.get_client();
         let data = command.data;
@@ -30,12 +30,12 @@ pub fn insert_one(command: Command) -> CoreOp {
         let collection = database.collection(&collection_name);
 
         let insert_result = collection.insert_one(doc, None).unwrap();
-        Ok(util::async_result(&command.args, insert_result.inserted_id))
+        util::async_result(&command.args, insert_result.inserted_id)
     };
-    CoreOp::Async(fut.boxed())
+    Op::Async(fut.boxed())
 }
 
-pub fn insert_many(command: Command) -> CoreOp {
+pub fn insert_many(command: Command) -> Op {
     let fut = async move {
         let client = command.get_client();
         let data = command.data;
@@ -54,7 +54,7 @@ pub fn insert_many(command: Command) -> CoreOp {
             .map(|(_, id)| id.to_owned())
             .collect();
 
-        Ok(util::async_result(&command.args, ids))
+        util::async_result(&command.args, ids)
     };
-    CoreOp::Async(fut.boxed())
+    Op::Async(fut.boxed())
 }

src/command/list_collection_names.rs

@@ -1,6 +1,6 @@
 use crate::*;
 
-pub fn list_collection_names(command: Command) -> CoreOp {
+pub fn list_collection_names(command: Command) -> Op {
     let fut = async move {
         let client = command.get_client();
         let data = command.data;
@@ -9,7 +9,7 @@ pub fn list_collection_names(command: Command) -> CoreOp {
         let database = client.database(&db_name);
         let collection_names = database.list_collection_names(None::<bson::Document>);
 
-        Ok(util::async_result(&command.args, collection_names.unwrap()))
+        util::async_result(&command.args, collection_names.unwrap())
     };
-    CoreOp::Async(fut.boxed())
+    Op::Async(fut.boxed())
 }