Merge pull request #50 from CoLearn-Dev/fix-redis-stream

Fix redis stream and add macOS release

Author: stneng

.github/workflows/build.yml

@@ -5,36 +5,21 @@ on:
 name: Build
 
 jobs:
-  linux-x86_64:
-    runs-on: ubuntu-20.04
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-      - name: Build
-        run: cargo build --release --target x86_64-unknown-linux-gnu
-      - name: Pack
-        run: |
-          cp target/x86_64-unknown-linux-gnu/release/colink-server ./
-          tar -zcvf colink-server-linux-x86_64.tar.gz colink-server README.md user_init_config.template.toml
-      - name: Upload Release Asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: colink-server-linux-x86_64.tar.gz
-          asset_name: colink-server-linux-x86_64.tar.gz
-          asset_content_type: application/tar+gzip
-  
-  linux-x86_64-musl:
-    runs-on: ubuntu-latest
+  build:
+    strategy:
+      matrix:
+        platform: [linux-x86_64, linux-x86_64-musl, macos-x86_64]
+        include:
+          - platform: linux-x86_64
+            ci_image: ubuntu-20.04
+            cargo_target: x86_64-unknown-linux-gnu
+          - platform: linux-x86_64-musl
+            ci_image: ubuntu-latest
+            cargo_target: x86_64-unknown-linux-musl
+          - platform: macos-x86_64
+            ci_image: macos-12
+            cargo_target: x86_64-apple-darwin
+    runs-on: ${{ matrix.ci_image }}
     defaults:
       run:
         shell: bash
@@ -46,21 +31,25 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          target: x86_64-unknown-linux-musl
+          target: ${{ matrix.cargo_target }}
+      - name: Install musl
+        if: ${{ endsWith(matrix.cargo_target, 'musl') }}
+        run: sudo apt update && sudo apt install musl-tools
       - name: Build
-        run: |
-          sudo apt update && sudo apt install musl-tools
-          cargo build --release --target x86_64-unknown-linux-musl
+        run: cargo build --release --target ${{ matrix.cargo_target }}
       - name: Pack
         run: |
-          cp target/x86_64-unknown-linux-musl/release/colink-server ./
-          tar -zcvf colink-server-linux-x86_64-musl.tar.gz colink-server README.md user_init_config.template.toml
+          cp target/${{ matrix.cargo_target }}/release/colink-server ./
+          tar -zcvf colink-server-${{ matrix.platform }}.tar.gz colink-server README.md user_init_config.template.toml
       - name: Upload Release Asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: actions/github-script@v6
         with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: colink-server-linux-x86_64-musl.tar.gz
-          asset_name: colink-server-linux-x86_64-musl.tar.gz
-          asset_content_type: application/tar+gzip
+          script: |
+            const fs = require('fs').promises;
+            github.rest.repos.uploadReleaseAsset({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              release_id: ${{ github.event.release.id }},
+              name: 'colink-server-${{ matrix.platform }}.tar.gz',
+              data: await fs.readFile('colink-server-${{ matrix.platform }}.tar.gz')
+            });

.github/workflows/check.yml

@@ -29,7 +29,7 @@ jobs:
         ports:
           - 5672:5672   # rabbitmq
           - 15672:15672 # rabbitmq
-          - 6379:6379   # redis          
+          - 6379:6379   # redis
     steps:
       - name: Checkout
         uses: actions/checkout@v3

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "colink-server"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 
 [dependencies]

Cargo.toml

@@ -32,6 +32,7 @@ impl crate::mq::common::MQ for RedisStream {
             .lowercase_letters(true)
             .uppercase_letters(true);
         let username = ug.generate_one().unwrap();
+        let username = format!("{}--{}", self.mq_prefix, username);
         let password = pg.generate_one().unwrap();
         let admin_uri = match url::Url::parse(&self.redis_uri) {
             Ok(admin_uri) => admin_uri,
@@ -61,7 +62,7 @@ impl crate::mq::common::MQ for RedisStream {
                 &[
                     Rule::On,
                     Rule::AddPass(password.to_owned()),
-                    Rule::Pattern(format!("{}--{}:*", self.mq_prefix, username).to_owned()),
+                    Rule::Pattern(format!("{}:*", username).to_owned()),
                     Rule::AddCategory("stream".to_owned()),
                 ],
             )
@@ -80,10 +81,7 @@ impl crate::mq::common::MQ for RedisStream {
         };
         let user_name = user_uri.username();
         let mut con = self.connect().await?;
-        let key_list: Vec<String> = match con
-            .keys(format!("{}--{}:*", self.mq_prefix, user_name))
-            .await
-        {
+        let key_list: Vec<String> = match con.keys(format!("{}:*", user_name)).await {
             Ok(key_list) => key_list,
             Err(e) => return Err(format!("RedisStream KEYS Error: {}", e)),
         };
@@ -120,7 +118,7 @@ impl crate::mq::common::MQ for RedisStream {
             Ok(user_name) => user_name,
             Err(e) => return Err(format!("RedisStream ACL WHOAMI Error: {}", e)),
         };
-        users.retain(|x| x != &my_user_name);
+        users.retain(|x| x != &my_user_name && x.starts_with(&format!("{}--", self.mq_prefix)));
         if !users.is_empty() {
             match con.acl_deluser::<String, ()>(&users).await {
                 Ok(_) => {}
@@ -147,7 +145,7 @@ impl crate::mq::common::MQ for RedisStream {
             Err(e) => return Err(format!("URI Parse Error: {}", e)),
         };
         let user_name = user_uri.username();
-        let queue_name = format!("{}--{}:{}", self.mq_prefix, user_name, queue_name);
+        let queue_name = format!("{}:{}", user_name, queue_name);
         match con
             .xgroup_create_mkstream::<&str, &str, &str, ()>(&queue_name, &queue_name, "$")
             .await