Merge pull request #155 from wchaws/dev2

fix: add split1 function to support base64url

Author: wchaws

source/new-image-handler/src/processor/image/_base.ts

@@ -69,4 +69,9 @@ export class ActionMask implements IActionMask {
       cb(action, this.isEnabled(index), index);
     });
   }
-}
+}
+
+export function split1(s: string, sep: string = ',') {
+  const split = s.split(sep, 1);
+  return [split[0], s.substring(split[0].length + sep.length)];
+}

source/new-image-handler/src/processor/image/watermark.ts

@@ -2,7 +2,7 @@ import * as sharp from 'sharp';
 import { IImageContext } from '.';
 import { IActionOpts, ReadOnly, InvalidArgument, Features, IProcessContext } from '..';
 import * as is from '../../is';
-import { BaseImageAction } from './_base';
+import { BaseImageAction, split1 } from './_base';
 
 export interface WatermarkOpts extends IActionOpts {
   text: string;
@@ -69,7 +69,7 @@ export class WatermarkAction extends BaseImageAction {
       if ((this.name === param) || (!param)) {
         continue;
       }
-      const [k, v] = param.split('_');
+      const [k, v] = split1(param, '_');
       if (k === 'text') {
         if (v) {
           const buff = Buffer.from(v, 'base64');

source/new-image-handler/test/processor/image/_base.test.ts

@@ -1,4 +1,4 @@
-import { ActionMask } from '../../../src/processor/image/_base';
+import { ActionMask, split1 } from '../../../src/processor/image/_base';
 
 test(`${ActionMask.name} all enabled by default`, () => {
   const actions = '1 1 1 1 1 1'.split(' ');
@@ -58,4 +58,12 @@ test(`${ActionMask.name} index out of range`, () => {
   }).toThrowError(/Index out of range/);
 });
 
+test(`${split1.name} split`, () => {
+  const s = 'text_SG9ZT0xBQkBvZmZjaWFsK0DvvIEjQO-8gSPvvIEj77-l77yBQO-_pe-8gUAj77-l77yB77-l77yBZQ==';
+  expect(split1(s, '_')).toEqual([
+    'text',
+    'SG9ZT0xBQkBvZmZjaWFsK0DvvIEjQO-8gSPvvIEj77-l77yBQO-_pe-8gUAj77-l77yB77-l77yBZQ==',
+  ]);
+});
+