@juzi/wechaty-puppet-service 1.0.28 → 1.0.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.packageJson = void 0;
4
4
  exports.packageJson = {
5
5
  "name": "@juzi/wechaty-puppet-service",
6
- "version": "1.0.28",
6
+ "version": "1.0.29",
7
7
  "description": "Puppet Service for Wechaty",
8
8
  "type": "module",
9
9
  "exports": {
@@ -45,37 +45,37 @@ class PuppetServer {
45
45
  return config_js_1.VERSION;
46
46
  }
47
47
  async start() {
48
- wechaty_puppet_1.log.verbose('PuppetServer', 'start()');
48
+ wechaty_puppet_1.log.info('PuppetServer', 'start()');
49
49
  if (this.grpcServer) {
50
50
  throw new Error('grpc server existed!');
51
51
  }
52
52
  if (!this.urnRegistry) {
53
- wechaty_puppet_1.log.verbose('PuppetServer', 'start() initializing FileBox UUID URN Registry ...');
53
+ wechaty_puppet_1.log.info('PuppetServer', 'start() initializing FileBox UUID URN Registry ...');
54
54
  this.urnRegistry = new file_box_1.UniformResourceNameRegistry({
55
55
  expireMilliseconds: 2 * 60 * 60 * 1000, // 2h
56
56
  });
57
57
  await this.urnRegistry.init();
58
- wechaty_puppet_1.log.verbose('PuppetServer', 'start() initializing FileBox UUID URN Registry ... done');
58
+ wechaty_puppet_1.log.info('PuppetServer', 'start() initializing FileBox UUID URN Registry ... done');
59
59
  }
60
60
  /**
61
61
  * Connect FileBox with UUID Manager
62
62
  */
63
63
  const FileBoxUuid = (0, uuidify_file_box_local_js_1.uuidifyFileBoxLocal)(this.urnRegistry);
64
- wechaty_puppet_1.log.verbose('PuppetServer', 'start() initializing gRPC Server with options "%s"', JSON.stringify(config_js_1.GRPC_OPTIONS));
64
+ wechaty_puppet_1.log.info('PuppetServer', 'start() initializing gRPC Server with options "%s"', JSON.stringify(config_js_1.GRPC_OPTIONS));
65
65
  this.grpcServer = new wechaty_grpc_1.grpc.Server(config_js_1.GRPC_OPTIONS);
66
- wechaty_puppet_1.log.verbose('PuppetServer', 'start() initializing gRPC Server ... done', JSON.stringify(config_js_1.GRPC_OPTIONS));
67
- wechaty_puppet_1.log.verbose('PuppetServer', 'start() initializing puppet implementation with FileBoxUuid...');
66
+ wechaty_puppet_1.log.info('PuppetServer', 'start() initializing gRPC Server ... done', JSON.stringify(config_js_1.GRPC_OPTIONS));
67
+ wechaty_puppet_1.log.info('PuppetServer', 'start() initializing puppet implementation with FileBoxUuid...');
68
68
  const puppetImpl = (0, puppet_implementation_js_1.puppetImplementation)(this.options.puppet, FileBoxUuid);
69
- wechaty_puppet_1.log.verbose('PuppetServer', 'start() initializing puppet implementation with FileBoxUuid... done');
70
- wechaty_puppet_1.log.verbose('PuppetServer', 'start() initializing authorization with token ...');
69
+ wechaty_puppet_1.log.info('PuppetServer', 'start() initializing puppet implementation with FileBoxUuid... done');
70
+ wechaty_puppet_1.log.info('PuppetServer', 'start() initializing authorization with token ...');
71
71
  const puppetImplAuth = (0, mod_js_1.authImplToken)(this.options.token)(puppetImpl);
72
72
  this.grpcServer.addService(wechaty_grpc_1.puppet.PuppetService, puppetImplAuth);
73
- wechaty_puppet_1.log.verbose('PuppetServer', 'start() initializing authorization with token ... done');
74
- wechaty_puppet_1.log.verbose('PuppetServer', 'start() initializing gRPC health service ...');
73
+ wechaty_puppet_1.log.info('PuppetServer', 'start() initializing authorization with token ... done');
74
+ wechaty_puppet_1.log.info('PuppetServer', 'start() initializing gRPC health service ...');
75
75
  const healthImpl = (0, health_implementation_js_1.healthImplementation)(this.options.puppet);
76
76
  this.grpcServer.addService(wechaty_grpc_1.google.HealthService, healthImpl);
77
- wechaty_puppet_1.log.verbose('PuppetServer', 'start() initializing gRPC health service ... done');
78
- wechaty_puppet_1.log.verbose('PuppetServer', 'start() initializing TLS CA ...');
77
+ wechaty_puppet_1.log.info('PuppetServer', 'start() initializing gRPC health service ... done');
78
+ wechaty_puppet_1.log.info('PuppetServer', 'start() initializing TLS CA ...');
79
79
  const caCerts = config_js_1.envVars.WECHATY_PUPPET_SERVICE_TLS_CA_CERT();
80
80
  const caCertBuf = caCerts
81
81
  ? Buffer.from(caCerts)
@@ -94,7 +94,7 @@ class PuppetServer {
94
94
  * we introduced the WECHATY_PUPPET_SERVICE_NO_TLS_INSECURE_{SERVER,CLIENT} environment variables.
95
95
  * if it has been set, then we will run under HTTP instead of HTTPS
96
96
  */
97
- wechaty_puppet_1.log.verbose('PuppetServer', 'start() initializing gRPC server credentials ...');
97
+ wechaty_puppet_1.log.info('PuppetServer', 'start() initializing gRPC server credentials ...');
98
98
  let credential;
99
99
  if (config_js_1.envVars.WECHATY_PUPPET_SERVICE_NO_TLS_INSECURE_SERVER(this.options.tls?.disable)) {
100
100
  wechaty_puppet_1.log.warn('PuppetServer', 'start() TLS disabled: INSECURE!');
@@ -104,25 +104,25 @@ class PuppetServer {
104
104
  wechaty_puppet_1.log.verbose('PuppetServer', 'start() TLS enabled.');
105
105
  credential = wechaty_grpc_1.grpc.ServerCredentials.createSsl(caCertBuf, keyCertPairs);
106
106
  }
107
- wechaty_puppet_1.log.verbose('PuppetServer', 'start() initializing gRPC server credentials ... done');
107
+ wechaty_puppet_1.log.info('PuppetServer', 'start() initializing gRPC server credentials ... done');
108
108
  /***
109
109
  * Start Grpc Server
110
110
  */
111
- wechaty_puppet_1.log.verbose('PuppetServer', 'start() gRPC server starting ...');
111
+ wechaty_puppet_1.log.info('PuppetServer', 'start() gRPC server starting ...');
112
112
  const port = await util_1.default.promisify(this.grpcServer.bindAsync
113
113
  .bind(this.grpcServer))(this.options.endpoint, credential);
114
114
  if (port === 0) {
115
115
  throw new Error('grpc server bind fail!');
116
116
  }
117
117
  this.grpcServer.start();
118
- wechaty_puppet_1.log.verbose('PuppetServer', 'start() gRPC server starting ... done');
118
+ wechaty_puppet_1.log.info('PuppetServer', 'start() gRPC server starting ... done');
119
119
  }
120
120
  async stop() {
121
- wechaty_puppet_1.log.verbose('PuppetServer', 'stop()');
121
+ wechaty_puppet_1.log.info('PuppetServer', 'stop()');
122
122
  if (this.grpcServer) {
123
123
  const grpcServer = this.grpcServer;
124
124
  this.grpcServer = undefined;
125
- wechaty_puppet_1.log.verbose('PuppetServer', 'stop() shuting down gRPC server ...');
125
+ wechaty_puppet_1.log.info('PuppetServer', 'stop() shuting down gRPC server ...');
126
126
  // const future = await util.promisify(
127
127
  // grpcServer.tryShutdown
128
128
  // .bind(grpcServer),
@@ -143,17 +143,17 @@ class PuppetServer {
143
143
  wechaty_puppet_1.log.warn('PuppetServer', 'stop() gRPC shutdown rejection: %s', e.message);
144
144
  }
145
145
  finally {
146
- wechaty_puppet_1.log.verbose('PuppetServer', 'stop() shuting down gRPC server ... done');
146
+ wechaty_puppet_1.log.info('PuppetServer', 'stop() shuting down gRPC server ... done');
147
147
  }
148
148
  }
149
149
  else {
150
- wechaty_puppet_1.log.warn('PuppetServer', 'stop() no grpcServer exist');
150
+ wechaty_puppet_1.log.info('PuppetServer', 'stop() no grpcServer exist');
151
151
  }
152
152
  if (this.urnRegistry) {
153
- wechaty_puppet_1.log.verbose('PuppetServer', 'stop() destory URN Registry ...');
153
+ wechaty_puppet_1.log.info('PuppetServer', 'stop() destory URN Registry ...');
154
154
  await this.urnRegistry.destroy();
155
155
  this.urnRegistry = undefined;
156
- wechaty_puppet_1.log.verbose('PuppetServer', 'stop() destory URN Registry ... done');
156
+ wechaty_puppet_1.log.info('PuppetServer', 'stop() destory URN Registry ... done');
157
157
  }
158
158
  }
159
159
  }
@@ -1 +1 @@
1
- {"version":3,"file":"puppet-server.js","sourceRoot":"","sources":["../../../../src/server/puppet-server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"puppet-server.js","sourceRoot":"","sources":["../../../../src/server/puppet-server.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  export const packageJson = {
2
2
  "name": "@juzi/wechaty-puppet-service",
3
- "version": "1.0.28",
3
+ "version": "1.0.29",
4
4
  "description": "Puppet Service for Wechaty",
5
5
  "type": "module",
6
6
  "exports": {
@@ -39,37 +39,37 @@ export class PuppetServer {
39
39
  return VERSION;
40
40
  }
41
41
  async start() {
42
- log.verbose('PuppetServer', 'start()');
42
+ log.info('PuppetServer', 'start()');
43
43
  if (this.grpcServer) {
44
44
  throw new Error('grpc server existed!');
45
45
  }
46
46
  if (!this.urnRegistry) {
47
- log.verbose('PuppetServer', 'start() initializing FileBox UUID URN Registry ...');
47
+ log.info('PuppetServer', 'start() initializing FileBox UUID URN Registry ...');
48
48
  this.urnRegistry = new UniformResourceNameRegistry({
49
49
  expireMilliseconds: 2 * 60 * 60 * 1000, // 2h
50
50
  });
51
51
  await this.urnRegistry.init();
52
- log.verbose('PuppetServer', 'start() initializing FileBox UUID URN Registry ... done');
52
+ log.info('PuppetServer', 'start() initializing FileBox UUID URN Registry ... done');
53
53
  }
54
54
  /**
55
55
  * Connect FileBox with UUID Manager
56
56
  */
57
57
  const FileBoxUuid = uuidifyFileBoxLocal(this.urnRegistry);
58
- log.verbose('PuppetServer', 'start() initializing gRPC Server with options "%s"', JSON.stringify(GRPC_OPTIONS));
58
+ log.info('PuppetServer', 'start() initializing gRPC Server with options "%s"', JSON.stringify(GRPC_OPTIONS));
59
59
  this.grpcServer = new grpc.Server(GRPC_OPTIONS);
60
- log.verbose('PuppetServer', 'start() initializing gRPC Server ... done', JSON.stringify(GRPC_OPTIONS));
61
- log.verbose('PuppetServer', 'start() initializing puppet implementation with FileBoxUuid...');
60
+ log.info('PuppetServer', 'start() initializing gRPC Server ... done', JSON.stringify(GRPC_OPTIONS));
61
+ log.info('PuppetServer', 'start() initializing puppet implementation with FileBoxUuid...');
62
62
  const puppetImpl = puppetImplementation(this.options.puppet, FileBoxUuid);
63
- log.verbose('PuppetServer', 'start() initializing puppet implementation with FileBoxUuid... done');
64
- log.verbose('PuppetServer', 'start() initializing authorization with token ...');
63
+ log.info('PuppetServer', 'start() initializing puppet implementation with FileBoxUuid... done');
64
+ log.info('PuppetServer', 'start() initializing authorization with token ...');
65
65
  const puppetImplAuth = authImplToken(this.options.token)(puppetImpl);
66
66
  this.grpcServer.addService(grpcPuppet.PuppetService, puppetImplAuth);
67
- log.verbose('PuppetServer', 'start() initializing authorization with token ... done');
68
- log.verbose('PuppetServer', 'start() initializing gRPC health service ...');
67
+ log.info('PuppetServer', 'start() initializing authorization with token ... done');
68
+ log.info('PuppetServer', 'start() initializing gRPC health service ...');
69
69
  const healthImpl = healthImplementation(this.options.puppet);
70
70
  this.grpcServer.addService(grpcGoogle.HealthService, healthImpl);
71
- log.verbose('PuppetServer', 'start() initializing gRPC health service ... done');
72
- log.verbose('PuppetServer', 'start() initializing TLS CA ...');
71
+ log.info('PuppetServer', 'start() initializing gRPC health service ... done');
72
+ log.info('PuppetServer', 'start() initializing TLS CA ...');
73
73
  const caCerts = envVars.WECHATY_PUPPET_SERVICE_TLS_CA_CERT();
74
74
  const caCertBuf = caCerts
75
75
  ? Buffer.from(caCerts)
@@ -88,7 +88,7 @@ export class PuppetServer {
88
88
  * we introduced the WECHATY_PUPPET_SERVICE_NO_TLS_INSECURE_{SERVER,CLIENT} environment variables.
89
89
  * if it has been set, then we will run under HTTP instead of HTTPS
90
90
  */
91
- log.verbose('PuppetServer', 'start() initializing gRPC server credentials ...');
91
+ log.info('PuppetServer', 'start() initializing gRPC server credentials ...');
92
92
  let credential;
93
93
  if (envVars.WECHATY_PUPPET_SERVICE_NO_TLS_INSECURE_SERVER(this.options.tls?.disable)) {
94
94
  log.warn('PuppetServer', 'start() TLS disabled: INSECURE!');
@@ -98,25 +98,25 @@ export class PuppetServer {
98
98
  log.verbose('PuppetServer', 'start() TLS enabled.');
99
99
  credential = grpc.ServerCredentials.createSsl(caCertBuf, keyCertPairs);
100
100
  }
101
- log.verbose('PuppetServer', 'start() initializing gRPC server credentials ... done');
101
+ log.info('PuppetServer', 'start() initializing gRPC server credentials ... done');
102
102
  /***
103
103
  * Start Grpc Server
104
104
  */
105
- log.verbose('PuppetServer', 'start() gRPC server starting ...');
105
+ log.info('PuppetServer', 'start() gRPC server starting ...');
106
106
  const port = await util.promisify(this.grpcServer.bindAsync
107
107
  .bind(this.grpcServer))(this.options.endpoint, credential);
108
108
  if (port === 0) {
109
109
  throw new Error('grpc server bind fail!');
110
110
  }
111
111
  this.grpcServer.start();
112
- log.verbose('PuppetServer', 'start() gRPC server starting ... done');
112
+ log.info('PuppetServer', 'start() gRPC server starting ... done');
113
113
  }
114
114
  async stop() {
115
- log.verbose('PuppetServer', 'stop()');
115
+ log.info('PuppetServer', 'stop()');
116
116
  if (this.grpcServer) {
117
117
  const grpcServer = this.grpcServer;
118
118
  this.grpcServer = undefined;
119
- log.verbose('PuppetServer', 'stop() shuting down gRPC server ...');
119
+ log.info('PuppetServer', 'stop() shuting down gRPC server ...');
120
120
  // const future = await util.promisify(
121
121
  // grpcServer.tryShutdown
122
122
  // .bind(grpcServer),
@@ -137,17 +137,17 @@ export class PuppetServer {
137
137
  log.warn('PuppetServer', 'stop() gRPC shutdown rejection: %s', e.message);
138
138
  }
139
139
  finally {
140
- log.verbose('PuppetServer', 'stop() shuting down gRPC server ... done');
140
+ log.info('PuppetServer', 'stop() shuting down gRPC server ... done');
141
141
  }
142
142
  }
143
143
  else {
144
- log.warn('PuppetServer', 'stop() no grpcServer exist');
144
+ log.info('PuppetServer', 'stop() no grpcServer exist');
145
145
  }
146
146
  if (this.urnRegistry) {
147
- log.verbose('PuppetServer', 'stop() destory URN Registry ...');
147
+ log.info('PuppetServer', 'stop() destory URN Registry ...');
148
148
  await this.urnRegistry.destroy();
149
149
  this.urnRegistry = undefined;
150
- log.verbose('PuppetServer', 'stop() destory URN Registry ... done');
150
+ log.info('PuppetServer', 'stop() destory URN Registry ... done');
151
151
  }
152
152
  }
153
153
  }
@@ -1 +1 @@
1
- {"version":3,"file":"puppet-server.js","sourceRoot":"","sources":["../../../../src/server/puppet-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,IAAI,MAAkB,MAAM,CAAA;AAEnC,OAAO,EAEL,GAAG,GACJ,MAAoC,sBAAsB,CAAA;AAC3D,OAAO,EACL,IAAI,EACJ,MAAM,IAAI,UAAU,EACpB,MAAM,IAAI,UAAU,GACrB,MAAoC,oBAAoB,CAAA;AACzD,OAAO,EACL,2BAA2B,GAC5B,MAAoC,UAAU,CAAA;AAE/C,OAAO,EACL,OAAO,EACP,OAAO,EACP,YAAY,GACb,MAAkC,cAAc,CAAA;AAEjD,OAAO,EACL,aAAa,GACd,MAAkC,gBAAgB,CAAA;AACnD,OAAO,EACL,wBAAwB,EACxB,uBAAuB,GACxB,MAAkC,eAAe,CAAA;AAElD,OAAO,EACL,oBAAoB,GACrB,MAAkC,4BAA4B,CAAA;AAC/D,OAAO,EACL,oBAAoB,GACrB,MAAkC,4BAA4B,CAAA;AAC/D,OAAO,EACL,mBAAmB,GACpB,MAAkC,8CAA8C,CAAA;AAajF,MAAM,OAAO,YAAY;IAML;IAJR,UAAU,CAAgB;IAC1B,WAAW,CAA+B;IAEpD,YACkB,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;QAE5C,GAAG,CAAC,OAAO,CAAC,cAAc,EACxB,0DAA0D,EAC1D,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,KAAK,CACd,CAAA;IACH,CAAC;IAEM,OAAO;QACZ,OAAO,OAAO,CAAA;IAChB,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC,CAAA;QAEtC,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QAED,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACrB,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,oDAAoD,CAAC,CAAA;YACjF,IAAI,CAAC,WAAW,GAAG,IAAI,2BAA2B,CAAC;gBACjD,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,KAAK;aAC9C,CAAC,CAAA;YACF,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAA;YAC7B,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,yDAAyD,CAAC,CAAA;SACvF;QAED;;WAEG;QACH,MAAM,WAAW,GAAG,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAEzD,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,oDAAoD,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAA;QAC/G,IAAI,CAAC,UAAU,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QAC/C,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,2CAA2C,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAA;QAEtG,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,gEAAgE,CAAC,CAAA;QAC7F,MAAM,UAAU,GAAG,oBAAoB,CACrC,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,WAAW,CACZ,CAAA;QACD,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,qEAAqE,CAAC,CAAA;QAElG,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,mDAAmD,CAAC,CAAA;QAChF,MAAM,cAAc,GAAG,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,CAAA;QACpE,IAAI,CAAC,UAAU,CAAC,UAAU,CACxB,UAAU,CAAC,aAAa,EACxB,cAAc,CACf,CAAA;QACD,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,wDAAwD,CAAC,CAAA;QAErF,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,8CAA8C,CAAC,CAAA;QAC3E,MAAM,UAAU,GAAG,oBAAoB,CACrC,IAAI,CAAC,OAAO,CAAC,MAAM,CACpB,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,UAAU,CACxB,UAAU,CAAC,aAAa,EACxB,UAAU,CACX,CAAA;QACD,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,mDAAmD,CAAC,CAAA;QAEhF,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,iCAAiC,CAAC,CAAA;QAC9D,MAAM,OAAO,GAAG,OAAO,CAAC,kCAAkC,EAAE,CAAA;QAC5D,MAAM,SAAS,GAAG,OAAO;YACvB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;YACtB,CAAC,CAAC,IAAI,CAAA;QAER,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAC3B,OAAO,CAAC,sCAAsC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC;eACzE,wBAAwB,CAC5B,CAAA;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAC5B,OAAO,CAAC,qCAAqC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC;eACvE,uBAAuB,CAC3B,CAAA;QACD,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,sCAAsC,CAAC,CAAA;QAEnE,MAAM,YAAY,GAAuB,CAAC;gBACxC,UAAU,EAAI,SAAS;gBACvB,WAAW,EAAG,UAAU;aACzB,CAAC,CAAA;QAEF;;;;WAIG;QACH,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,kDAAkD,CAAC,CAAA;QAC/E,IAAI,UAAU,CAAA;QACd,IAAI,OAAO,CAAC,6CAA6C,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE;YACpF,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,iCAAiC,CAAC,CAAA;YAC3D,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,CAAA;SACrD;aAAM;YACL,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAAA;YACnD,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;SACvE;QACD,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,uDAAuD,CAAC,CAAA;QAEpF;;WAEG;QACH,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,kCAAkC,CAAC,CAAA;QAC/D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAC/B,IAAI,CAAC,UAAU,CAAC,SAAS;aACtB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CACzB,CACC,IAAI,CAAC,OAAO,CAAC,QAAQ,EACrB,UAAU,CACX,CAAA;QAED,IAAI,IAAI,KAAK,CAAC,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;SAC1C;QAED,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;QACvB,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,uCAAuC,CAAC,CAAA;IACtE,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAA;QAErC,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAA;YAClC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;YAE3B,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,qCAAqC,CAAC,CAAA;YAClE,uCAAuC;YACvC,2BAA2B;YAC3B,yBAAyB;YACzB,MAAM;YAEN,IAAI;gBACF,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAA;gBACnD,UAAU,CAAC,aAAa,EAAE,CAAA;gBAC1B;;;;;;mBAMG;gBACH,eAAe;aAEhB;YAAC,OAAO,CAAC,EAAE;gBACV,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,oCAAoC,EAAG,CAAW,CAAC,OAAO,CAAC,CAAA;aACrF;oBAAS;gBACR,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,0CAA0C,CAAC,CAAA;aACxE;SAEF;aAAM;YACL,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,4BAA4B,CAAC,CAAA;SACvD;QAED,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,iCAAiC,CAAC,CAAA;YAC9D,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAA;YAChC,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;YAC5B,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,sCAAsC,CAAC,CAAA;SACpE;IAEH,CAAC;CAEF"}
1
+ {"version":3,"file":"puppet-server.js","sourceRoot":"","sources":["../../../../src/server/puppet-server.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@juzi/wechaty-puppet-service",
3
- "version": "1.0.28",
3
+ "version": "1.0.29",
4
4
  "description": "Puppet Service for Wechaty",
5
5
  "type": "module",
6
6
  "exports": {
@@ -4,7 +4,7 @@
4
4
  import type { PackageJson } from 'type-fest'
5
5
  export const packageJson: PackageJson = {
6
6
  "name": "@juzi/wechaty-puppet-service",
7
- "version": "1.0.28",
7
+ "version": "1.0.29",
8
8
  "description": "Puppet Service for Wechaty",
9
9
  "type": "module",
10
10
  "exports": {
@@ -88,19 +88,19 @@ export class PuppetServer {
88
88
  }
89
89
 
90
90
  public async start (): Promise<void> {
91
- log.verbose('PuppetServer', 'start()')
91
+ log.info('PuppetServer', 'start()')
92
92
 
93
93
  if (this.grpcServer) {
94
94
  throw new Error('grpc server existed!')
95
95
  }
96
96
 
97
97
  if (!this.urnRegistry) {
98
- log.verbose('PuppetServer', 'start() initializing FileBox UUID URN Registry ...')
98
+ log.info('PuppetServer', 'start() initializing FileBox UUID URN Registry ...')
99
99
  this.urnRegistry = new UniformResourceNameRegistry({
100
100
  expireMilliseconds: 2 * 60 * 60 * 1000, // 2h
101
101
  })
102
102
  await this.urnRegistry.init()
103
- log.verbose('PuppetServer', 'start() initializing FileBox UUID URN Registry ... done')
103
+ log.info('PuppetServer', 'start() initializing FileBox UUID URN Registry ... done')
104
104
  }
105
105
 
106
106
  /**
@@ -108,26 +108,26 @@ export class PuppetServer {
108
108
  */
109
109
  const FileBoxUuid = uuidifyFileBoxLocal(this.urnRegistry)
110
110
 
111
- log.verbose('PuppetServer', 'start() initializing gRPC Server with options "%s"', JSON.stringify(GRPC_OPTIONS))
111
+ log.info('PuppetServer', 'start() initializing gRPC Server with options "%s"', JSON.stringify(GRPC_OPTIONS))
112
112
  this.grpcServer = new grpc.Server(GRPC_OPTIONS)
113
- log.verbose('PuppetServer', 'start() initializing gRPC Server ... done', JSON.stringify(GRPC_OPTIONS))
113
+ log.info('PuppetServer', 'start() initializing gRPC Server ... done', JSON.stringify(GRPC_OPTIONS))
114
114
 
115
- log.verbose('PuppetServer', 'start() initializing puppet implementation with FileBoxUuid...')
115
+ log.info('PuppetServer', 'start() initializing puppet implementation with FileBoxUuid...')
116
116
  const puppetImpl = puppetImplementation(
117
117
  this.options.puppet,
118
118
  FileBoxUuid,
119
119
  )
120
- log.verbose('PuppetServer', 'start() initializing puppet implementation with FileBoxUuid... done')
120
+ log.info('PuppetServer', 'start() initializing puppet implementation with FileBoxUuid... done')
121
121
 
122
- log.verbose('PuppetServer', 'start() initializing authorization with token ...')
122
+ log.info('PuppetServer', 'start() initializing authorization with token ...')
123
123
  const puppetImplAuth = authImplToken(this.options.token)(puppetImpl)
124
124
  this.grpcServer.addService(
125
125
  grpcPuppet.PuppetService,
126
126
  puppetImplAuth,
127
127
  )
128
- log.verbose('PuppetServer', 'start() initializing authorization with token ... done')
128
+ log.info('PuppetServer', 'start() initializing authorization with token ... done')
129
129
 
130
- log.verbose('PuppetServer', 'start() initializing gRPC health service ...')
130
+ log.info('PuppetServer', 'start() initializing gRPC health service ...')
131
131
  const healthImpl = healthImplementation(
132
132
  this.options.puppet,
133
133
  )
@@ -135,9 +135,9 @@ export class PuppetServer {
135
135
  grpcGoogle.HealthService,
136
136
  healthImpl,
137
137
  )
138
- log.verbose('PuppetServer', 'start() initializing gRPC health service ... done')
138
+ log.info('PuppetServer', 'start() initializing gRPC health service ... done')
139
139
 
140
- log.verbose('PuppetServer', 'start() initializing TLS CA ...')
140
+ log.info('PuppetServer', 'start() initializing TLS CA ...')
141
141
  const caCerts = envVars.WECHATY_PUPPET_SERVICE_TLS_CA_CERT()
142
142
  const caCertBuf = caCerts
143
143
  ? Buffer.from(caCerts)
@@ -163,7 +163,7 @@ export class PuppetServer {
163
163
  * we introduced the WECHATY_PUPPET_SERVICE_NO_TLS_INSECURE_{SERVER,CLIENT} environment variables.
164
164
  * if it has been set, then we will run under HTTP instead of HTTPS
165
165
  */
166
- log.verbose('PuppetServer', 'start() initializing gRPC server credentials ...')
166
+ log.info('PuppetServer', 'start() initializing gRPC server credentials ...')
167
167
  let credential
168
168
  if (envVars.WECHATY_PUPPET_SERVICE_NO_TLS_INSECURE_SERVER(this.options.tls?.disable)) {
169
169
  log.warn('PuppetServer', 'start() TLS disabled: INSECURE!')
@@ -172,12 +172,12 @@ export class PuppetServer {
172
172
  log.verbose('PuppetServer', 'start() TLS enabled.')
173
173
  credential = grpc.ServerCredentials.createSsl(caCertBuf, keyCertPairs)
174
174
  }
175
- log.verbose('PuppetServer', 'start() initializing gRPC server credentials ... done')
175
+ log.info('PuppetServer', 'start() initializing gRPC server credentials ... done')
176
176
 
177
177
  /***
178
178
  * Start Grpc Server
179
179
  */
180
- log.verbose('PuppetServer', 'start() gRPC server starting ...')
180
+ log.info('PuppetServer', 'start() gRPC server starting ...')
181
181
  const port = await util.promisify(
182
182
  this.grpcServer.bindAsync
183
183
  .bind(this.grpcServer),
@@ -191,17 +191,17 @@ export class PuppetServer {
191
191
  }
192
192
 
193
193
  this.grpcServer.start()
194
- log.verbose('PuppetServer', 'start() gRPC server starting ... done')
194
+ log.info('PuppetServer', 'start() gRPC server starting ... done')
195
195
  }
196
196
 
197
197
  public async stop (): Promise<void> {
198
- log.verbose('PuppetServer', 'stop()')
198
+ log.info('PuppetServer', 'stop()')
199
199
 
200
200
  if (this.grpcServer) {
201
201
  const grpcServer = this.grpcServer
202
202
  this.grpcServer = undefined
203
203
 
204
- log.verbose('PuppetServer', 'stop() shuting down gRPC server ...')
204
+ log.info('PuppetServer', 'stop() shuting down gRPC server ...')
205
205
  // const future = await util.promisify(
206
206
  // grpcServer.tryShutdown
207
207
  // .bind(grpcServer),
@@ -222,18 +222,18 @@ export class PuppetServer {
222
222
  } catch (e) {
223
223
  log.warn('PuppetServer', 'stop() gRPC shutdown rejection: %s', (e as Error).message)
224
224
  } finally {
225
- log.verbose('PuppetServer', 'stop() shuting down gRPC server ... done')
225
+ log.info('PuppetServer', 'stop() shuting down gRPC server ... done')
226
226
  }
227
227
 
228
228
  } else {
229
- log.warn('PuppetServer', 'stop() no grpcServer exist')
229
+ log.info('PuppetServer', 'stop() no grpcServer exist')
230
230
  }
231
231
 
232
232
  if (this.urnRegistry) {
233
- log.verbose('PuppetServer', 'stop() destory URN Registry ...')
233
+ log.info('PuppetServer', 'stop() destory URN Registry ...')
234
234
  await this.urnRegistry.destroy()
235
235
  this.urnRegistry = undefined
236
- log.verbose('PuppetServer', 'stop() destory URN Registry ... done')
236
+ log.info('PuppetServer', 'stop() destory URN Registry ... done')
237
237
  }
238
238
 
239
239
  }