update PrivateM3U8 API

Author: markjrzhang

pom.xml

@@ -150,6 +150,12 @@
             <artifactId>xstream</artifactId>
             <version>1.4.20</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>4.4.0</version>
+        </dependency>
     </dependencies>
 
     <distributionManagement>

src/main/java/com/qcloud/cos/COS.java

@@ -51,6 +51,8 @@
 import com.qcloud.cos.model.ciModel.job.v2.*;
 import com.qcloud.cos.model.ciModel.mediaInfo.MediaInfoRequest;
 import com.qcloud.cos.model.ciModel.mediaInfo.MediaInfoResponse;
+import com.qcloud.cos.model.ciModel.metaInsight.CreateDatasetRequest;
+import com.qcloud.cos.model.ciModel.metaInsight.CreateDatasetResponse;
 import com.qcloud.cos.model.ciModel.persistence.AIGameRecResponse;
 import com.qcloud.cos.model.ciModel.persistence.CIUploadResult;
 import com.qcloud.cos.model.ciModel.persistence.AIRecRequest;
@@ -3256,6 +3258,8 @@ SelectObjectContentResult selectObjectContent(SelectObjectContentRequest selectR
     InputStream getPlayList(GetPlayListRequest request);
 
     RecognizeLogoResponse recognizeLogo(RecognizeLogoRequest customRequest);
+
+    CreateDatasetResponse createDataset(CreateDatasetRequest customRequest);
 }
 
 

src/main/java/com/qcloud/cos/COSClient.java

@@ -102,6 +102,8 @@
 import com.qcloud.cos.model.ciModel.job.v2.*;
 import com.qcloud.cos.model.ciModel.mediaInfo.MediaInfoRequest;
 import com.qcloud.cos.model.ciModel.mediaInfo.MediaInfoResponse;
+import com.qcloud.cos.model.ciModel.metaInsight.CreateDatasetRequest;
+import com.qcloud.cos.model.ciModel.metaInsight.CreateDatasetResponse;
 import com.qcloud.cos.model.ciModel.persistence.AIGameRecResponse;
 import com.qcloud.cos.model.ciModel.persistence.CIUploadResult;
 import com.qcloud.cos.model.ciModel.persistence.AIRecRequest;
@@ -139,14 +141,7 @@
 import com.qcloud.cos.model.transform.ObjectTaggingXmlFactory;
 import com.qcloud.cos.region.Region;
 import com.qcloud.cos.retry.RetryUtils;
-import com.qcloud.cos.utils.Base64;
-import com.qcloud.cos.utils.BinaryUtils;
-import com.qcloud.cos.utils.DateUtils;
-import com.qcloud.cos.utils.Jackson;
-import com.qcloud.cos.utils.Md5Utils;
-import com.qcloud.cos.utils.ServiceUtils;
-import com.qcloud.cos.utils.StringUtils;
-import com.qcloud.cos.utils.UrlEncoderUtils;
+import com.qcloud.cos.utils.*;
 import com.qcloud.cos.http.TimeOutCosHttpClient;
 
 import org.apache.commons.codec.DecoderException;
@@ -5102,7 +5097,6 @@ public GetHLSPlayKeyResponse getHLSPlayKey(GetHLSPlayKeyRequest customRequest) {
 
         CosHttpRequest<GetHLSPlayKeyRequest> request = createRequest(customRequest.getBucketName(), "/playKey", customRequest , HttpMethodName.GET);
 
-
         return invoke(request, new Unmarshallers.CICommonUnmarshaller<GetHLSPlayKeyResponse>(GetHLSPlayKeyResponse.class));
     }
 
@@ -5132,11 +5126,25 @@ public MediaListTemplateResponse describeMediaTemplatesV2(MediaTemplateRequest r
 
     @Override
     public InputStream getPlayList(GetPlayListRequest getPlayListRequest) {
-        CosHttpRequest<GetPlayListRequest> request = createRequest(getPlayListRequest.getBucketName(), "/getplaylist", getPlayListRequest, HttpMethodName.GET);
+        CosHttpRequest<GetPlayListRequest> request = createRequest(getPlayListRequest.getBucketName(), getPlayListRequest.getObject(), getPlayListRequest, HttpMethodName.GET);
+        request.addParameter("ci-process","pm3u8");
         addParameterIfNotNull(request, "object", getPlayListRequest.getObject());
         addParameterIfNotNull(request, "expires", getPlayListRequest.getExpires());
+        addParameterIfNotNull(request, "tokenType", getPlayListRequest.getTokenType());
+        addParameterIfNotNull(request, "token", getPlayListRequest.getToken());
+
         return invoke(request, new CIGetSnapshotResponseHandler());
     }
+//@Override
+//    public InputStream getPlayList(GetPlayListRequest getPlayListRequest) {
+//        CosHttpRequest<GetPlayListRequest> request = createRequest(getPlayListRequest.getBucketName(), "/getplaylist", getPlayListRequest, HttpMethodName.GET);
+//        addParameterIfNotNull(request, "object", getPlayListRequest.getObject());
+//        addParameterIfNotNull(request, "expires", getPlayListRequest.getExpires());
+//        addParameterIfNotNull(request, "tokenType", getPlayListRequest.getTokenType());
+//        addParameterIfNotNull(request, "token", getPlayListRequest.getToken());
+//
+//        return invoke(request, new CIGetSnapshotResponseHandler());
+//    }
 
     @Override
     public RecognizeLogoResponse recognizeLogo(RecognizeLogoRequest customRequest) {
@@ -5148,7 +5156,39 @@ public RecognizeLogoResponse recognizeLogo(RecognizeLogoRequest customRequest) {
         return invoke(request, new Unmarshallers.CICommonUnmarshaller<RecognizeLogoResponse>(RecognizeLogoResponse.class));
     }
 
+    @Override
+    public CreateDatasetResponse createDataset(CreateDatasetRequest customRequest) {
+        rejectNull(customRequest, "The request parameter must be specified setting the object tags");
+
+        CosHttpRequest<CreateDatasetRequest> request = createRequest(customRequest.getAppId(), "/dataset", customRequest , HttpMethodName.POST);
+        request.addHeader("Accept", "application/json");
+        this.setContent(request, CIJackson.toJsonString(request).getBytes(), "application/json", false);
+        return invoke(request, new Unmarshallers.CICommonUnmarshaller<CreateDatasetResponse>(CreateDatasetResponse.class));
+    }
 
 
+    public String generateCosDomainPrivateM3U8Url(PrivateM3U8Request privateM3U8Request) {
+        CosHttpRequest<PrivateM3U8Request> request = createRequest(privateM3U8Request.getBucketName(), privateM3U8Request.getObject(), privateM3U8Request, HttpMethodName.GET);
+        request.addParameter("ci-process","pm3u8");
+        addParameterIfNotNull(request, "object", privateM3U8Request.getObject());
+        addParameterIfNotNull(request, "expires", privateM3U8Request.getExpires());
+        addParameterIfNotNull(request, "tokenType", privateM3U8Request.getTokenType());
+        addParameterIfNotNull(request, "token", privateM3U8Request.getToken());
+
+        return buildPrivateM3U8Url(request,clientConfig);
+    }
+
+    private String buildPrivateM3U8Url(CosHttpRequest<PrivateM3U8Request> request, ClientConfig clientConfig) {
+        Date expiredTime = new Date(System.currentTimeMillis() + clientConfig.getSignExpired() * 1000);
+        HashMap<String, String> params = new HashMap<>();
+        params.put("ci-process", "pm3u8");
+        PrivateM3U8Request originalRequest = request.getOriginalRequest();
+        putIfNotNull(params, "object", originalRequest.getObject());
+        putIfNotNull(params, "expires", originalRequest.getExpires());
+        putIfNotNull(params, "tokenType", originalRequest.getTokenType());
+        putIfNotNull(params, "token", originalRequest.getToken());
+        URL url = generatePresignedUrl(request.getBucketName(), request.getResourcePath(), expiredTime, HttpMethodName.GET, new HashMap<String, String>(), params, false, false);
+        return url.toString();
+    }
 }
 

src/main/java/com/qcloud/cos/demo/ci/LiveTranscodeDemo.java

@@ -0,0 +1,59 @@
+package com.qcloud.cos.demo.ci;
+
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.JWTCreator;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.qcloud.cos.COSClient;
+import com.qcloud.cos.model.ciModel.snapshot.PrivateM3U8Request;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+
+public class LiveTranscodeDemo {
+    private static String appId = "1251704708";
+    private static String bucket = "markjrzhang-1251704708";
+    private static String objectKey = "output/media/test.m3u8";
+    private static String expires = "3600";
+    private static byte[] secret = "ui0KZSbUbhApT2OjF1BNiU04FvqloQEL".getBytes();
+
+
+    public static void main(String[] args) {
+        COSClient client = ClientUtils.getTestClient();
+        String url = generateCosDomainPrivateM3U8Url(client);
+        System.out.println("Generated url: " + url);
+    }
+
+    public static String  generateCosDomainPrivateM3U8Url(COSClient client) {
+        PrivateM3U8Request request = new PrivateM3U8Request();
+        request.setBucketName(bucket);
+        request.setObject(objectKey);
+        request.setExpires(expires);
+        String token =generateToken(appId, bucket, objectKey, secret,expires);
+        request.setTokenType(token);
+        return client.generateCosDomainPrivateM3U8Url(request);
+    }
+
+    public static String generateToken(String appId, String bucketId, String objectKey, byte[] secret, String expires) {
+
+        Instant now = Instant.now();
+        Instant expire = now.plus(6, ChronoUnit.DAYS);
+
+        String encodedObjectKey;
+        try {
+            encodedObjectKey = URLEncoder.encode(objectKey, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException("Error encoding object key", e);
+        }
+
+        Algorithm algorithm = Algorithm.HMAC256(secret);
+        JWTCreator.Builder builder = JWT.create().withIssuer("client").withIssuedAt(Date.from(now)).withExpiresAt(Date.from(expire)).withClaim("Type", "CosCiToken").withClaim("AppId", appId).withClaim("BucketId", bucketId).withClaim("Object", encodedObjectKey).withClaim("Issuer", "client").withClaim("IssuedTimeStamp", now.getEpochSecond()).withClaim("ExpireTimeStamp", expire.getEpochSecond()).withClaim("UsageLimit", 20).withClaim("ProtectSchema", "rsa1024")
+//                .withClaim("PublicKey", "xxx")
+                .withClaim("ProtectContentKey", 0);
+        return builder.sign(algorithm);
+    }
+
+
+}

src/main/java/com/qcloud/cos/model/ciModel/snapshot/PrivateM3U8Request.java

@@ -23,6 +23,24 @@ public class PrivateM3U8Request extends CosServiceRequest implements Serializabl
      */
     private String expires;
 
+    private String tokenType;
+    private String token;
+
+    public String getTokenType() {
+        return tokenType;
+    }
+
+    public void setTokenType(String tokenType) {
+        this.tokenType = tokenType;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
     public String getBucketName() {
         return bucketName;
     }