gcf-common-lib 0.25.38 → 0.25.39
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.
- package/package.json +1 -1
- package/src/index.js +4 -3
- package/src/index.ts +4 -3
package/package.json
CHANGED
package/src/index.js
CHANGED
|
@@ -68,7 +68,7 @@ class GcfCommon {
|
|
|
68
68
|
return __awaiter(this, void 0, void 0, function* () {
|
|
69
69
|
return Promise.race([(0, utils_1.timeoutAfter)(timeout), (handler !== null && handler !== void 0 ? handler : (() => Promise.resolve(undefined)))(event, context)])
|
|
70
70
|
.then((res) => __awaiter(this, void 0, void 0, function* () {
|
|
71
|
-
|
|
71
|
+
console.log('res:', res);
|
|
72
72
|
yield this.publish(event, context, res);
|
|
73
73
|
}))
|
|
74
74
|
.catch((err) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -123,9 +123,10 @@ class GcfCommon {
|
|
|
123
123
|
var _a, _b, _c, _d;
|
|
124
124
|
return __awaiter(this, void 0, void 0, function* () {
|
|
125
125
|
let metaOrAttr = this.getMetadataOrAttribute(event, context);
|
|
126
|
-
const everyPropIsNil = props.map(prop =>
|
|
126
|
+
// const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
|
|
127
|
+
const someProp = props.map(prop => (0, lodash_1.get)(metaOrAttr, prop)).some(v => !(0, lodash_1.isNil)(v));
|
|
127
128
|
// if no prop then check file metadata
|
|
128
|
-
if (
|
|
129
|
+
if (!someProp && ((_a = context === null || context === void 0 ? void 0 : context.resource) === null || _a === void 0 ? void 0 : _a.type) === 'storage#object') {
|
|
129
130
|
console.log('get metadata from file');
|
|
130
131
|
if ((context === null || context === void 0 ? void 0 : context.eventType) === 'google.storage.object.finalize') {
|
|
131
132
|
const gsEvent = event;
|
package/src/index.ts
CHANGED
|
@@ -48,7 +48,7 @@ export class GcfCommon {
|
|
|
48
48
|
) {
|
|
49
49
|
return Promise.race([timeoutAfter(timeout), (handler ?? (() => Promise.resolve(undefined)))(event, context)])
|
|
50
50
|
.then(async (res: T | undefined) => {
|
|
51
|
-
|
|
51
|
+
console.log('res:', res);
|
|
52
52
|
await this.publish(event, context, res);
|
|
53
53
|
})
|
|
54
54
|
.catch(async (err: Error) => {
|
|
@@ -109,10 +109,11 @@ export class GcfCommon {
|
|
|
109
109
|
|
|
110
110
|
static async safeGetAttributes(event: TEvent, context: TContext, props: string[]) {
|
|
111
111
|
let metaOrAttr = this.getMetadataOrAttribute(event, context);
|
|
112
|
-
const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
|
|
112
|
+
// const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
|
|
113
|
+
const someProp = props.map(prop => get(metaOrAttr, prop)).some(v => !isNil(v));
|
|
113
114
|
|
|
114
115
|
// if no prop then check file metadata
|
|
115
|
-
if (
|
|
116
|
+
if (!someProp && context?.resource?.type === 'storage#object') {
|
|
116
117
|
console.log('get metadata from file');
|
|
117
118
|
if (context?.eventType === 'google.storage.object.finalize') {
|
|
118
119
|
const gsEvent = event as TGSEvent;
|